- Update to 2.9

- Switch to USE_XORG and USE_TK
- Alter pkg-plist and PORTDOCS
- Change maintainer to mm@FreeBSD.org

PR:		ports/109432

4 files changed, 48 insertions, 45 deletions

diff --git a/x11-toolkits/tktable/Makefile b/x11-toolkits/tktable/Makefile
index 2b3f0f89001..e4bf808d288 100644
--- a/x11-toolkits/tktable/Makefile
+++ b/x11-toolkits/tktable/Makefile
@@ -6,37 +6,34 @@
 #
 
 PORTNAME=	tktable
-PORTVERSION=	2.8
-PORTREVISION=	2
+PORTVERSION=	2.9
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME:S/tk/Tk/}${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A table/matrix widget extension to tk/tcl
+MAINTAINER=	mm@FreeBSD.org
+COMMENT=	A table/matrix widget extension to Tk
 
-LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
-
-USE_XLIB=	yes
+USE_XORG=	x11
+USE_TK=		84+
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
-		--with-tk=${LOCALBASE}/lib/tk${TK_VER} \
-		--with-tclinclude=${LOCALBASE}/include/tcl${TK_VER} \
-		--with-tkinclude=${LOCALBASE}/include/tk${TK_VER} \
-		--with-x
+PORTDOCS=	*
+
+PLIST_SUB=	DISTNAME=${DISTNAME}
 
-TK_VER=		8.4
-PLIST_SUB=	DESTDIR=lib/${DISTNAME}
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
+		--with-tk=${TK_LIBDIR} \
+		--with-tclinclude=${TCL_INCLUDEDIR} \
+		--with-tkinclude=${TK_INCLUDEDIR} \
+		--with-x
 
 post-patch:
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e "s:install-libraries install-doc:install-libraries:" \
-		${WRKSRC}/Makefile.in
-.else
-	@${REINPLACE_CMD} -e "s:%%DOCSDIR%%:${DOCSDIR}:g" ${WRKSRC}/Makefile.in
+.if !defined(NOPORTDOCS)
+INSTALL_TARGET=	install install-doc
 .endif
 
 post-install:
@@ -50,4 +47,4 @@ test: build
 	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/tktable/distinfo b/x11-toolkits/tktable/distinfo
index 5d6d8792b21..c6351b82390 100644
--- a/x11-toolkits/tktable/distinfo
+++ b/x11-toolkits/tktable/distinfo
@@ -1,3 +1,3 @@
-MD5 (Tktable2.8.tar.gz) = 6d29fe86f925acf58bb3a268cc511564
-SHA256 (Tktable2.8.tar.gz) = c0adf101c4cf096d869fe3bfe363901d44e3e15f86719e1d549ba014c574d60e
-SIZE (Tktable2.8.tar.gz) = 240148
+MD5 (Tktable2.9.tar.gz) = a91cac4270a0c46945723d8f5106e80b
+SHA256 (Tktable2.9.tar.gz) = f2279b3b6ab0353d6d5bb28d344768160516ddb543e7193d545ac2f4f5293ee1
+SIZE (Tktable2.9.tar.gz) = 272816
diff --git a/x11-toolkits/tktable/files/patch-Makefile.in b/x11-toolkits/tktable/files/patch-Makefile.in
index 1d5de029ff3..e3990211627 100644
--- a/x11-toolkits/tktable/files/patch-Makefile.in
+++ b/x11-toolkits/tktable/files/patch-Makefile.in
@@ -1,28 +1,39 @@
---- Makefile.in.orig	Wed Oct 16 09:40:33 2002
-+++ Makefile.in	Wed Jul 23 12:19:40 2003
-@@ -98,6 +98,7 @@
+--- Makefile.in.orig	2004-07-20 22:49:05.000000000 +0200
++++ Makefile.in	2007-08-20 14:47:36.000000000 +0200
+@@ -44,7 +44,7 @@
+ 
+ PKG_HEADERS	= @PKG_HEADERS@
+ 
+-PKG_EXTRA_FILES = license.txt README.txt
++PKG_EXTRA_FILES =
+ 
+ PKG_MAN_PAGES	= tkTable.n
+ 
+@@ -70,6 +70,7 @@
  datadir		= @datadir@
  mandir		= @mandir@
  includedir	= @includedir@
-+docsdir		= %%DOCSDIR%%
++docsdir		= /usr/local/share/doc/tktable
  
  DESTDIR		=
  
-@@ -241,7 +242,6 @@
- 	@mkdir -p $(DESTDIR)$(pkglibdir)
- 	$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
- 	$(INSTALL_DATA) $(srcdir)/license.txt $(DESTDIR)$(pkglibdir)
--	$(INSTALL_DATA) $(srcdir)/README.txt $(DESTDIR)$(pkglibdir)
+@@ -204,7 +205,7 @@
  
- #========================================================================
- # This rule installs platform-independent files, such as header files.
-@@ -255,10 +255,11 @@
+ doc:
+ 
+-install: all install-binaries install-libraries install-doc
++install: all install-binaries install-libraries
+ 
+ install-binaries: binaries install-lib-binaries install-bin-binaries
+ 	@mkdir -p $(DESTDIR)$(pkglibdir)
+@@ -229,10 +230,12 @@
  #========================================================================
  
  install-doc: doc
 -	@mkdir -p $(DESTDIR)$(pkglibdir)/html
 +	@mkdir -p $(docsdir)/html
 +	$(INSTALL_DATA) $(srcdir)/README.txt $(docsdir)
++	$(INSTALL_DATA) $(srcdir)/license.txt $(docsdir)
  	@list='$(PKG_MAN_PAGES)'; for p in $$list; do \
  		html=`basename $$p|sed -e 's/.[^.]*$$//'`.html; \
 -	  	$(INSTALL_DATA) $(srcdir)/doc/$$html $(DESTDIR)$(pkglibdir)/html/; \
diff --git a/x11-toolkits/tktable/pkg-plist b/x11-toolkits/tktable/pkg-plist
index 31e1ca6ba34..dbc18186525 100644
--- a/x11-toolkits/tktable/pkg-plist
+++ b/x11-toolkits/tktable/pkg-plist
@@ -1,9 +1,4 @@
-%%DESTDIR%%/libTktable2.8.so
-%%DESTDIR%%/tkTable.tcl
-%%DESTDIR%%/pkgIndex.tcl
-%%DESTDIR%%/license.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/tkTable.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DESTDIR%%
+lib/%%DISTNAME%%/lib%%DISTNAME%%.so
+lib/%%DISTNAME%%/tkTable.tcl
+lib/%%DISTNAME%%/pkgIndex.tcl
+@dirrm lib/%%DISTNAME%%