Date: Tue, 13 Mar 2007 10:33:42 +0100 (CET) From: Martin Matuska <martin@matuska.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/110258: [MAINTAINER] x11-toolkits/tk85 Message-ID: <20070313093342.5B4A53F47C@mail.vx.sk> Resent-Message-ID: <200703130940.l2D9e6cd070573@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110258
>Category: ports
>Synopsis: [MAINTAINER] x11-toolkits/tk85
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 13 09:40:06 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Martin Matuska
>Release: FreeBSD 6.2-RELEASE
>Organization:
>Environment:
FreeBSD 6.2-RELEASE i386 and amd64
>Description:
This update changes the following:
- improved handling of WITH_TK85_MAN
- manpages are not installed by default (default on for default TK - 8.4)
- fixed pkg-plist if no manpages are installed
Portlint -A and tinderbox do not complain.
>How-To-Repeat:
>Fix:
diff -Nbur x11-toolkits/tk85.orig/Makefile x11-toolkits/tk85/Makefile
--- x11-toolkits/tk85.orig/Makefile Fri Mar 9 10:49:12 2007
+++ x11-toolkits/tk85/Makefile Mon Mar 12 18:36:57 2007
@@ -7,7 +7,7 @@
PORTNAME= tk
PORTVERSION= 8.5.a.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
@@ -37,7 +37,7 @@
MANCOMPRESSED= no
DATADIR= ${PREFIX}/share/${PORTNAME}${TK_VER}
-OPTIONS= TK85_MAN "Install tk 8.5 manpages" on \
+OPTIONS= TK85_MAN "Install tk 8.5 manpages" off \
WISH_WRAPPER "Require wish wrapper from ports" off
.include <bsd.port.pre.mk>
@@ -69,7 +69,14 @@
RUN_DEPENDS+= wish:${PORTSDIR}/lang/tcl-tk-wrapper
.endif
-.if !defined(NO_INSTALL_MANPAGES) && !defined(WITHOUT_TK85_MAN)
+.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK84_MAN)
+
+PLIST_SUB+= INSTMAN='@comment '
+
+.else
+
+DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER}
+PLIST_SUB+= INSTMAN=''
MAN1= wish.1
MAN3= 3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
@@ -389,26 +396,22 @@
pre-configure:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/configure
-.for mp in ${MAN1} ${MAN3} ${MANN}
- @${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \
- ${WRKSRC}/../doc/${mp}
-.endfor
post-configure:
${REINPLACE_CMD} \
-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
${WRKSRC}/tkConfig.sh
-.if defined(NO_INSTALL_MANPAGES) || defined(WITHOUT_TK85_MAN)
- ${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
- ${WRKSRC}/Makefile
-.endif
post-install:
${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/
+.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK85_MAN)
${MKDIR} ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
-.if exists(${PKGINSTALL})
- ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
+. for mp in ${MAN1} ${MAN3} ${MANN}
+ @${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \
+ ${WRKSRC}/../doc/${mp}
+. endfor
+ @cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
.endif
regression-test: build
diff -Nbur x11-toolkits/tk85.orig/files/patch-unix::Makefile.in x11-toolkits/tk85/files/patch-unix::Makefile.in
--- x11-toolkits/tk85.orig/files/patch-unix::Makefile.in Mon Feb 5 14:48:38 2007
+++ x11-toolkits/tk85/files/patch-unix::Makefile.in Mon Mar 12 18:32:41 2007
@@ -1,5 +1,5 @@
---- Makefile.in.orig Tue Jan 30 11:20:44 2007
-+++ Makefile.in Tue Jan 30 11:30:35 2007
+--- Makefile.in.orig Mon Oct 23 15:45:33 2006
++++ Makefile.in Mon Mar 12 18:32:29 2007
@@ -64,6 +64,8 @@
# Directory in which to install the include file tk.h:
@@ -58,6 +58,15 @@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
+@@ -613,7 +623,7 @@
+ gdb ./wish --command=gdb.run
+ rm gdb.run
+
+-INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@
++INSTALL_TARGETS = install-binaries install-libraries install-demos @EXTRA_INSTALL@
+
+ install: $(INSTALL_TARGETS)
+
@@ -626,7 +636,8 @@
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
diff -Nbur x11-toolkits/tk85.orig/pkg-plist x11-toolkits/tk85/pkg-plist
--- x11-toolkits/tk85.orig/pkg-plist Mon Feb 5 14:48:38 2007
+++ x11-toolkits/tk85/pkg-plist Mon Mar 12 18:37:10 2007
@@ -166,8 +166,8 @@
lib/tk%%TK_VER%%/tkfbox.tcl
lib/tk%%TK_VER%%/unsupported.tcl
lib/tk%%TK_VER%%/xmfbox.tcl
-%%DATADIR%%/man.macros
-@dirrm %%DATADIR%%
+%%INSTMAN%%%%DATADIR%%/man.macros
+%%INSTMAN%%@dirrm %%DATADIR%%
@dirrm lib/tk%%TK_VER%%/demos/images
@dirrm lib/tk%%TK_VER%%/demos
@dirrm lib/tk%%TK_VER%%/images
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070313093342.5B4A53F47C>