Attachment 76360 Details for Bug 110087 – file.diff

[patch] file.diff

file.diff (text/plain), 3.35 KB, created by Martin Matuska on 2007-03-08 14:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2007-03-08 14:30:03 UTC

Size: 3.35 KB

patch

obsolete

>diff -Nbur x11-toolkits/tk83.orig/Makefile x11-toolkits/tk83/Makefile
>--- x11-toolkits/tk83.orig/Makefile	Tue Aug 15 03:13:40 2006
>+++ x11-toolkits/tk83/Makefile	Thu Mar  8 15:08:54 2007
>@@ -16,7 +16,8 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Graphical toolkit for TCL
> 
>-LIB_DEPENDS=	tcl83.1:${PORTSDIR}/${TCL83_PORT}
>+USE_TCL=	83
>+USE_TCL_BUILD=	83
> 
> LATEST_LINK=	tk83
> USE_XLIB=	yes
>@@ -36,9 +37,16 @@
> TCL83_PORT?=	lang/tcl83
> MANCOMPRESSED=	no
> 
>+OPTIONS=	TK83_MAN "Install tk 8.3 manpages" on \
>+		WISH_WRAPPER "Require wish wrapper from ports" off
>+
> .include <bsd.port.pre.mk>
> 
>-.if defined(WITH_TK83_MAN)
>+.if defined(WITH_WISH_WRAPPER)
>+RUN_DEPENDS+=		wish:${PORTSDIR}/lang/tcl-tk-wrapper
>+.endif
>+
>+.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK83_MAN)
> 
> MAN1=	wish.1
> MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
>@@ -330,7 +338,7 @@
> 	${REINPLACE_CMD} \
> 		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
> 		${WRKSRC}/tkConfig.sh
>-.if !defined(WITH_TK83_MAN)
>+.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK83_MAN)
> 	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
> 		${WRKSRC}/Makefile
> .endif
>diff -Nbur x11-toolkits/tk83.orig/pkg-deinstall.wish x11-toolkits/tk83/pkg-deinstall.wish
>--- x11-toolkits/tk83.orig/pkg-deinstall.wish	Fri Jun  2 09:15:24 2000
>+++ x11-toolkits/tk83/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/tk83/pkg-deinstall.wish,v 1.1 2000/06/02 07:15:24 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/tk83.orig/pkg-install.wish x11-toolkits/tk83/pkg-install.wish
>--- x11-toolkits/tk83.orig/pkg-install.wish	Wed May 26 02:34:26 1999
>+++ x11-toolkits/tk83/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

Actions: View | Diff

Attachments on bug 110087: 76360