Took over maintainership (is that even a word? ;) with previous
maintainer's permission. Tidied-up Makefile.
Changed the case of the package name and some files
and directories from "Tktable" to "tktable". I don't like mixed-case
package names and directories. Hopefully this won't cause problems.
Makes use of the changes to tcl.port.mk.
Stu
Flip - I just noticed that my ports tree is slightly out of date.
If that's a problem let me know and I'll re-roll the patch.
Index: x11/tktable/Makefile
===================================================================
RCS file: /cvs/ports/x11/tktable/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- x11/tktable/Makefile 28 Jan 2008 15:19:16 -0000 1.18
+++ x11/tktable/Makefile 6 Feb 2009 12:33:58 -0000
@@ -1,49 +1,66 @@
-# $OpenBSD: Makefile,v 1.18 2008/01/28 15:19:16 merdely Exp $
+# $OpenBSD: Makefile,v 1.16 2006/01/08 20:56:08 naddy Exp $
-COMMENT= tk extension
+COMMENT = table/matrix widget extension to Tcl/Tk
-V= 2.9
-DISTNAME= Tktable$V
-PKGNAME= Tktable-$Vp0
-SHARED_LIBS= Tktable29 1.0
-CATEGORIES= x11
-
-HOMEPAGE= http://tktable.sourceforge.net/
-
-MAINTAINER= Kevin Lo <[email protected]>
-
-# BSD-like
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11
-
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tktable/}
-
-BUILD_DEPENDS= ::x11/tk/8.4
-
-USE_X11= Yes
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.4 \
- --with-tk=${PREFIX}/lib/tk8.4 \
- --with-tclinclude=${PREFIX}/include/tcl8.4 \
- --with-tkinclude=${PREFIX}/include/tk8.4
-CONFIGURE_ENV= LIBTktable29_VERSION=${LIBTktable29_VERSION}
-
-MAKE_ENV= DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}"
-REGRESS_TARGET= test
-REGRESS_IS_INTERACTIVE= Yes
+DISTNAME = Tktable2.10
+PKGNAME = tktable-2.10
+SHARED_LIBS = Tktable210 0.0
+CATEGORIES = x11 x11/tk
+HOMEPAGE = http://tktable.sourceforge.net/
+
+MAINTAINER = Stuart Cassoff <[email protected]>
+
+# BSD style
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
+
+WANTLIB += X11
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tktable/}
+MODULES = x11/tk
+BUILD_DEPENDS = ${MODTK_BUILD_DEPENDS}
+FAKE_FLAGS = INSTALL_PROGRAM="${INSTALL_DATA}" DESTDIR=${DESTDIR}
+REGRESS_FLAGS = DISPLAY=${DISPLAY} XAUTHORITY=${XAUTHORITY}
+SEPARATE_BUILD = concurrent
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
+ --with-tcl=${MODTCL_LIBDIR} \
+ --with-tk=${MODTK_LIBDIR} \
+ --with-tkinclude=${MODTK_INCDIR}
+CONFIGURE_ENV += SHLIB_VERSION=${LIBTktable210_VERSION} \
+ CFLAGS=""
+REGRESS_IS_INTERACTIVE =Yes
+REGRESS_TARGET = test
+
+SCRIPTS_TCLSH = basic.tcl buttons.tcl command.tcl debug.tcl
dynarows.tcl \
+ maxsize.tcl spreadsheet.tcl valid.tcl
+
+EXAMPLE_FILES = loadtable.tcl tcllogo.gif tktable.py
+
+pre-configure:
+ ${MODTCL_TCLSH_ADJ} ${SCRIPTS_TCLSH:S!^!${WRKSRC}/demos/!}
+
+do-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/tktable
+ ${INSTALL_DATA} ${WRKBUILD}/libTktable210.so.${LIBTktable210_VERSION} \
+ ${WRKBUILD}/pkgIndex.tcl ${WRKSRC}/library/tkTable.tcl \
+ ${WRKSRC}/library/tktable.py ${PREFIX}/lib/tktable
+ ${INSTALL_DATA_DIR} ${PREFIX}/man/mann
+ ${INSTALL_DATA} ${WRKSRC}/doc/tkTable.n ${PREFIX}/man/mann/tktable.n
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tktable
+ ${INSTALL_DATA} ${WRKSRC}/doc/tkTable.html
${PREFIX}/share/doc/tktable/tktable.html
+ ${INSTALL_DATA} ${WRKSRC}/README.txt ${WRKSRC}/license.txt
${PREFIX}/share/doc/tktable
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tktable
+ ${INSTALL_SCRIPT} ${SCRIPTS_TCLSH:S!^!${WRKSRC}/demos/!}
${PREFIX}/share/examples/tktable
+ ${INSTALL_DATA} ${EXAMPLE_FILES:S!^!${WRKSRC}/demos/!}
${PREFIX}/share/examples/tktable
+# This regression test needs an X11 display
pre-regress:
-.for t in DISPLAY XAUTHORITY
-. if !defined($t)
- @echo "$t needs to be set to run regress"; exit 1
+.for i in DISPLAY XAUTHORITY
+. if !defined($i)
+ @echo "$i needs to be set to run regress"; exit 1
. endif
.endfor
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/Tktable
- @cp ${WRKSRC}/demos/* ${PREFIX}/share/examples/Tktable
.include <bsd.port.mk>
Index: x11/tktable/distinfo
===================================================================
RCS file: /cvs/ports/x11/tktable/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- x11/tktable/distinfo 5 Apr 2007 17:36:24 -0000 1.5
+++ x11/tktable/distinfo 6 Feb 2009 12:33:58 -0000
@@ -1,5 +1,5 @@
-MD5 (Tktable2.9.tar.gz) = qRysQnCgxGlFcj2PUQboCw==
-RMD160 (Tktable2.9.tar.gz) = PSkGu8CWMDESrtas5hdOLDwMQWs=
-SHA1 (Tktable2.9.tar.gz) = W0sr6aRWkKXlCR2vSpqg5lI5JNg=
-SHA256 (Tktable2.9.tar.gz) = 8iebO2qwNT1tW7KNNEdoFgUW3bVD5xk9VFrC9PUpPuE=
-SIZE (Tktable2.9.tar.gz) = 272816
+MD5 (Tktable2.10.tar.gz) = 7N2Ws5rUm4IL8ITrHHhvZg==
+RMD160 (Tktable2.10.tar.gz) = syakclhKaWUyjz8n3Jj2ndvdRfk=
+SHA1 (Tktable2.10.tar.gz) = tYBLrx1+av1aVaxw48rbQ2rZWMI=
+SHA256 (Tktable2.10.tar.gz) = wzURf6G+Rf5NMDLpb9S0ZB//ak+EZ4eGCNq+0RGYpMs=
+SIZE (Tktable2.10.tar.gz) = 284135
Index: x11/tktable/patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/tktable/patches/patch-configure,v
retrieving revision 1.2
diff -u -r1.2 patch-configure
--- x11/tktable/patches/patch-configure 28 Jan 2008 15:19:17 -0000 1.2
+++ x11/tktable/patches/patch-configure 6 Feb 2009 12:33:58 -0000
@@ -1,25 +1,21 @@
-$OpenBSD: patch-configure,v 1.2 2008/01/28 15:19:17 merdely Exp $
---- configure.orig Thu Jul 22 12:43:15 2004
-+++ configure Wed Jan 23 09:55:43 2008
-@@ -7337,7 +7337,6 @@ fi
- ECHO_VERSION='`echo ${PACKAGE_VERSION}`'
- TCL_LIB_VERSIONS_OK=ok
- CFLAGS_DEBUG=-g
-- CFLAGS_OPTIMIZE=-O
- if test "$GCC" = "yes" ; then
- CFLAGS_WARNING="-Wall -Wno-implicit-int"
- else
-@@ -8600,11 +8599,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-+
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${LIBTktable29_VERSION}'
- else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-+
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${LIBTktable29_VERSION}'
+$OpenBSD$
+--- configure.orig Sun Jan 25 03:55:46 2009
++++ configure Sun Jan 25 03:56:17 2009
+@@ -7944,7 +7944,7 @@ fi
+
+ # TEA specific:
+ CFLAGS_OPTIMIZE=-O2
+- CFLAGS_WARNING="-Wall -Wno-implicit-int"
++ CFLAGS_WARNING="-Wall"
+ else
+ CFLAGS_WARNING=""
+@@ -9141,7 +9141,7 @@ fi
fi
- rm -f conftest*
+
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+ echo "$as_me:$LINENO: checking for ELF" >&5
+ echo $ECHO_N "checking for ELF... $ECHO_C" >&6
+ if test "${tcl_cv_ld_elf+set}" = set; then
Index: x11/tktable/patches/patch-doc_tkTable_n
===================================================================
RCS file: x11/tktable/patches/patch-doc_tkTable_n
diff -N x11/tktable/patches/patch-doc_tkTable_n
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/tktable/patches/patch-doc_tkTable_n 6 Feb 2009 12:33:58 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- doc/tkTable.n.orig Thu Feb 5 10:55:20 2009
++++ doc/tkTable.n Thu Feb 5 10:55:39 2009
+@@ -233,7 +233,7 @@ Database Class: \\fB\\$3\\fR
+ .de UL
+ \\$1\l'|0\(ul'\\$2
+ ..
+-.TH table n 2.8 Tk "Tk Table Extension"
++.TH table n 2.10 Tk "Tk Table Extension"
+ .HS table tk
+ .BS
+ .SH NAME
Index: x11/tktable/pkg/DESCR
===================================================================
RCS file: /cvs/ports/x11/tktable/pkg/DESCR,v
retrieving revision 1.3
diff -u -r1.3 DESCR
--- x11/tktable/pkg/DESCR 15 Dec 2003 21:55:54 -0000 1.3
+++ x11/tktable/pkg/DESCR 6 Feb 2009 12:33:58 -0000
@@ -1,20 +1,19 @@
TkTable is a table/matrix widget extension to Tcl/Tk.
The basic features of the widget are:
- * multi-line cells
- * support for embedded windows (one per cell)
- * row & column spanning
- * variable width columns / height rows (interactively resizable)
- * row and column titles
- * multiple data sources ((Tcl array || Tcl command) &| internal caching)
- * supports standard Tk reliefs, fonts, colors, etc.
- * x/y scrollbar support
- * 'tag' styles per row, column or cell to change visual appearance
- * in-cell editing - returns value back to data source
- * support for disabled (read-only) tables or cells (via tags)
- * multiple selection modes, with "active" cell
- * multiple drawing modes to get optimal performance for larger tables
- * optional 'flashes' when things update
- * cell validation support
- * Works everywhere Tk does (including Windows and Mac!)
- * Unicode support (Tk8.1+)
+ * Multi-line cells
+ * Support for embedded windows (one per cell)
+ * Row & column spanning
+ * Variable width columns / height rows (interactively resizable)
+ * Row and column titles
+ * Multiple data sources ((Tcl array || Tcl command) &| internal caching)
+ * Supports standard Tk reliefs, fonts, colors, etc.
+ * X/y scrollbar support
+ * Tag styles per row, column or cell to change visual appearance
+ * In-cell editing - returns value back to data source
+ * Support for disabled (read-only) tables or cells (via tags)
+ * Multiple selection modes, with "active" cell
+ * Multiple drawing modes to get optimal performance for larger tables
+ * Optional "flashes" when things update
+ * Cell validation support
+ * Unicode support
Index: x11/tktable/pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/x11/tktable/pkg/PFRAG.shared,v
retrieving revision 1.5
diff -u -r1.5 PFRAG.shared
--- x11/tktable/pkg/PFRAG.shared 8 Jan 2006 20:56:08 -0000 1.5
+++ x11/tktable/pkg/PFRAG.shared 6 Feb 2009 12:33:58 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2006/01/08 20:56:08 naddy Exp $
-...@lib lib/Tktable2.9/libTktable29.so.${LIBTktable29_VERSION}
+...@lib lib/tktable/libTktable210.so.${LIBTktable210_VERSION}
Index: x11/tktable/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/tktable/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- x11/tktable/pkg/PLIST 24 Nov 2004 02:35:28 -0000 1.7
+++ x11/tktable/pkg/PLIST 6 Feb 2009 12:33:58 -0000
@@ -1,21 +1,23 @@
@comment $OpenBSD: PLIST,v 1.7 2004/11/24 02:35:28 kevlo Exp $
-lib/Tktable2.9/
-lib/Tktable2.9/README.txt
-lib/Tktable2.9/html/
-lib/Tktable2.9/html/tkTable.html
-lib/Tktable2.9/license.txt
-lib/Tktable2.9/pkgIndex.tcl
-lib/Tktable2.9/tkTable.tcl
-share/examples/Tktable/
-share/examples/Tktable/basic.tcl
-share/examples/Tktable/buttons.tcl
-share/examples/Tktable/command.tcl
-share/examples/Tktable/debug.tcl
-share/examples/Tktable/dynarows.tcl
-share/examples/Tktable/loadtable.tcl
-share/examples/Tktable/maxsize.tcl
-share/examples/Tktable/spreadsheet.tcl
-share/examples/Tktable/tcllogo.gif
-share/examples/Tktable/tktable.py
-share/examples/Tktable/valid.tcl
%%SHARED%%
+lib/tktable/
+lib/tktable/pkgIndex.tcl
+lib/tktable/tkTable.tcl
+lib/tktable/tktable.py
+...@man man/mann/tktable.n
+share/doc/tktable/
+share/doc/tktable/README.txt
+share/doc/tktable/license.txt
+share/doc/tktable/tktable.html
+share/examples/tktable/
+share/examples/tktable/basic.tcl
+share/examples/tktable/buttons.tcl
+share/examples/tktable/command.tcl
+share/examples/tktable/debug.tcl
+share/examples/tktable/dynarows.tcl
+share/examples/tktable/loadtable.tcl
+share/examples/tktable/maxsize.tcl
+share/examples/tktable/spreadsheet.tcl
+share/examples/tktable/tcllogo.gif
+share/examples/tktable/tktable.py
+share/examples/tktable/valid.tcl
