update to 2.8

x11/tktable/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2002/10/29 17:50:08 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2003/06/20 05:24:19 kevlo Exp $
 
 COMMENT=	"tk extension"
 
-DISTNAME=	Tktable2.7
+DISTNAME=	Tktable2.8
-PKGNAME=	Tktable-2.7
+PKGNAME=	Tktable-2.8
 CATEGORIES=	x11
 
 HOMEPAGE= 	http://tktable.sourceforge.net/
@@ -19,13 +19,12 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tktable/}
 
 BUILD_DEPENDS=	::x11/tk/8.3
 
-WRKDIST=	${WRKDIR}/${DISTNAME}/unix
-
 USE_X11=	Yes
-USE_GMAKE=	Yes
+CONFIGURE_STYLE= gnu
-CONFIGURE_STYLE= gnu dest
 CONFIGURE_ARGS=	--with-tcl=${PREFIX}/lib/tcl8.3 \
-		--with-tk=${PREFIX}/lib/tk8.3
+		--with-tk=${PREFIX}/lib/tk8.3 \
+		--with-tclinclude=${PREFIX}/include/tcl8.3 \
+		--with-tkinclude=${PREFIX}/include/tk8.3
 
 MAKE_ENV=	DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}"
 REGRESS_TARGET=	test
@@ -39,9 +38,7 @@ pre-regress:
 .endfor
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Tktable
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/Tktable
-	${INSTALL_DATA} ${WRKSRC}/../doc/tkTable.html ${PREFIX}/share/doc/Tktable
+	@cp ${WRKSRC}/demos/* ${PREFIX}/share/examples/Tktable
-	@cp ${WRKSRC}/../demos/* ${PREFIX}/share/examples/Tktable
 
 .include <bsd.port.mk>

x11/tktable/distinfo

@@ -1,3 +1,3 @@
-MD5 (Tktable2.7.tar.gz) = 1f6ef046f21b5195fa3f2ad4321668d7
+MD5 (Tktable2.8.tar.gz) = 6d29fe86f925acf58bb3a268cc511564
-RMD160 (Tktable2.7.tar.gz) = cb7feba71f41c54389fb4b9072d97ff954dab974
+RMD160 (Tktable2.8.tar.gz) = e0aa1b374fcdfc60fd84e112353da754dc70cee1
-SHA1 (Tktable2.7.tar.gz) = 05745f4c2b3f6b324c58bc046dd3e3fea8aee26f
+SHA1 (Tktable2.8.tar.gz) = 979350bca4a3ebb526062da75b083f93d2f22519

x11/tktable/patches/patch-Makefile.in

@@ -1,23 +0,0 @@
---- Makefile.in.orig	Sat Aug 11 18:04:47 2001
-+++ Makefile.in	Sat Aug 11 18:06:27 2001
-@@ -52,9 +52,6 @@
- TK_VERSION	= @TK_VERSION@
- WISH		= wish$(TK_VERSION)
- 
--TCL_SRC_DIR 	= @TCL_SRC_DIR@
--TK_SRC_DIR 	= @TK_SRC_DIR@
--
- TK_LIB_SPEC		= @TK_LIB_SPEC@
- TK_STUB_LIB_SPEC	= @TK_STUB_LIB_SPEC@
- TK_LIBS			= @TK_LIBS@
-@@ -118,8 +115,8 @@
- LIB_RUNTIME_DIR = @libdir@
- 
- INCLUDES	= -I@includedir@ $(TK_XINCLUDES)\
--		  -I$(TCL_SRC_DIR)/generic\
--		  -I$(TK_SRC_DIR)/generic
-+		  -I$(TCL_PREFIX)/include/tcl$(TCL_VERSION)/generic\
-+		  -I$(TCL_PREFIX)/include/tk$(TK_VERSION)/generic
- 
- DLL		= $(PACKAGE)$(SHLIB_SUFFIX)
- STATIC_LIB	= $(PACKAGE).a

x11/tktable/pkg/PLIST

@@ -1,8 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.3 2001/08/11 16:04:50 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.4 2003/06/20 05:24:31 kevlo Exp $
-lib/Tktable2.7/pkgIndex.tcl
+lib/Tktable2.8/README.txt
-lib/Tktable2.7/tkTable.tcl
+lib/Tktable2.8/html/tkTable.html
-man/mann/tkTable.n
+lib/Tktable2.8/libTktable28.so
-share/doc/Tktable/tkTable.html
+lib/Tktable2.8/license.txt
+lib/Tktable2.8/pkgIndex.tcl
+lib/Tktable2.8/tkTable.tcl
 share/examples/Tktable/basic.tcl
 share/examples/Tktable/buttons.tcl
 share/examples/Tktable/command.tcl
@@ -12,8 +14,9 @@ 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%%
 @dirrm share/examples/Tktable
-@dirrm share/doc/Tktable
+@dirrm lib/Tktable2.8/html
-@dirrm lib/Tktable2.7
+@dirrm lib/Tktable2.8