Date: Thu, 8 Mar 2007 16:01:55 +0100 (CET) From: Martin Matuska <martin@matuska.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/110089: [UPDATE] x11-toolkits/tk82 Message-ID: <20070308150155.614263F431@mail.vx.sk> Resent-Message-ID: <200703081510.l28FA2Bq015058@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110089
>Category: ports
>Synopsis: [UPDATE] x11-toolkits/tk82
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 08 15:10:02 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:
- adds TK83_MAN and WISH_WRAPPER to OPTIONS
- removes pseudo-installation of wish in favour of new lang/tcl-tk-wrapper port
- adds support for NO_INSTALL_MANPAGES knob
- uses USE_TCL from bsd.tcl.mk
Portlint -A and tinderbox do not complain.
>How-To-Repeat:
>Fix:
diff -Nbur x11-toolkits/tk82.orig/Makefile x11-toolkits/tk82/Makefile
--- x11-toolkits/tk82.orig/Makefile Tue Aug 15 03:13:40 2006
+++ x11-toolkits/tk82/Makefile Thu Mar 8 15:27:12 2007
@@ -7,7 +7,7 @@
PORTNAME= tk
PORTVERSION= 8.2.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits tk82
MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= tcl8_2
@@ -16,7 +16,8 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical toolkit for TCL
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/${TCL82_PORT}
+USE_TCL= 82
+USE_TCL_BUILD= 82
LATEST_LINK= tk82
USE_XLIB= yes
@@ -34,9 +35,16 @@
TCL82_PORT?= lang/tcl82
MANCOMPRESSED= no
+OPTIONS= TK82_MAN "Install tk 8.2 manpages" on \
+ WISH_WRAPPER "Require wish wrapper from ports" off
+
.include <bsd.port.pre.mk>
-.if defined(WITH_TK82_MAN)
+.if defined(WITH_WISH_WRAPPER)
+RUN_DEPENDS+= wish:${PORTSDIR}/lang/tcl-tk-wrapper
+.endif
+
+.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK82_MAN)
MAN1= wish.1
MAN3= 3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \
@@ -312,7 +320,7 @@
${REINPLACE_CMD} \
-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
${WRKSRC}/tkConfig.sh
-.if !defined(WITH_TK82_MAN)
+.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK82_MAN)
${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
${WRKSRC}/Makefile
.endif
diff -Nbur x11-toolkits/tk82.orig/pkg-deinstall.wish x11-toolkits/tk82/pkg-deinstall.wish
--- x11-toolkits/tk82.orig/pkg-deinstall.wish Fri Jun 2 09:15:23 2000
+++ x11-toolkits/tk82/pkg-deinstall.wish Thu Jan 1 01:00:00 1970
@@ -1,22 +0,0 @@
-#! /bin/sh
-#
-# Remove the ${PREFIX}/bin/wish script that gets installed by INSTALL.wish
-# if we are the last wish installation to be pkg_delete'd.
-#
-# $FreeBSD: ports/x11-toolkits/tk82/pkg-deinstall.wish,v 1.1 2000/06/02 07:15:23 hoek Exp $
-#
-
-#
-# Explicitly listing /usr/X11R6/bin here is debatable.
-#
-BINDIR="${PKG_PREFIX}/bin /usr/X11R6/bin"
-WISH=${PKG_PREFIX}/bin/wish
-
-wishes=$(/bin/ls ${BINDIR} 2> /dev/null | \
- egrep '^o?wish(step)?(x|([0-9]+\.[0-9]+))([a-z][a-z])?$')
-
-if [ "$wishes" = "" -a -f ${WISH} ] && \
- (head -3 ${WISH} | grep awieYJFnsuILOnfsYEW) > /dev/null 2>&1
-then
- rm -f ${PKG_PREFIX}/bin/wish
-fi
diff -Nbur x11-toolkits/tk82.orig/pkg-install.wish x11-toolkits/tk82/pkg-install.wish
--- x11-toolkits/tk82.orig/pkg-install.wish Wed May 26 02:34:26 1999
+++ x11-toolkits/tk82/pkg-install.wish Thu Jan 1 01:00:00 1970
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# The user may have a wish they want to preserve
-ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/wish 2> /dev/null \
- | sed -e 's/.*\*\*//'`
-if [ ! -e ${PKG_PREFIX}/bin/wish ] || [ "$ver" != "" -a "$ver" -lt 001 ]
-then
- [ -f ${PKG_PREFIX}/bin/wish ] && chmod u+w ${PKG_PREFIX}/bin/wish
-
- mkdir -p ${PKG_PREFIX}/bin
- cat > ${PKG_PREFIX}/bin/wish <<'EOF'
-#!/bin/sh
-# Installed by ports system. id: awieYJFnsuILOnfsYEW**001
-
-(
-echo "In FreeBSD, wish is named with a version number. This is because"
-echo "different versions of wish are not compatible with each other and"
-echo "they can not all be called \"wish\"! You may need multiple versions"
-echo "installed because a given port may depend on a specific version."
-echo
-echo "On your system, wish is installed under at least the following names:"
-echo
-for name in $(/bin/ls $(echo $PATH | sed 's/:/ /g') 2> /dev/null | egrep '^wish(step)?(x|([0-9]+\.[0-9]+))([a-z][a-z])?$')
-do
- echo $name
-done
-[ "$name" = "" ] && echo "No wish installations found, sorry."
-) 1>&2
-exit 1
-EOF
- chmod a+rx ${PKG_PREFIX}/bin/wish
-fi
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070308150155.614263F431>