diff options
Diffstat (limited to 'x11/tkinfo')
| -rw-r--r-- | x11/tkinfo/Makefile | 23 | ||||
| -rw-r--r-- | x11/tkinfo/files/md5 | 4 | ||||
| -rw-r--r-- | x11/tkinfo/files/patch-sum | 4 | ||||
| -rw-r--r-- | x11/tkinfo/patches/patch-aa | 23 | ||||
| -rw-r--r-- | x11/tkinfo/pkg/PLIST | 3 |
5 files changed, 34 insertions, 23 deletions
diff --git a/x11/tkinfo/Makefile b/x11/tkinfo/Makefile index 06fce983e83..8a032276988 100644 --- a/x11/tkinfo/Makefile +++ b/x11/tkinfo/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.11 1999/04/26 19:30:28 garbled Exp $ +# $NetBSD: Makefile,v 1.12 1999/10/08 01:45:37 fredb Exp $ # FreeBSD Id: Makefile,v 1.15 1997/12/16 09:26:12 tg Exp # -DISTNAME= tkinfo-1.5 -CATEGORIES= x11 tk80 -MASTER_SITES= http://www.math.ucsb.edu/~boldt/tkinfo/ \ +DISTNAME= tkinfo-2.5 +CATEGORIES= x11 +MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/doctools/info/} \ http://math-www.uni-paderborn.de/~axel/tkinfo/ MAINTAINER= packages@netbsd.org @@ -15,11 +15,16 @@ DEPENDS= tk-8.0.5:../../x11/tk80 USE_X11= yes NO_BUILD= yes -do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/tkinfo ${PREFIX}/bin - post-patch: - ( cd ${WRKSRC} ; ${SED} 's|@PREFIX@|${PREFIX}|g' \ - <tkinfo >tkinfo.BAK ; ${MV} tkinfo.BAK tkinfo ) + cd ${WRKSRC}; \ + ${MV} tkinfo tkinfo.src; \ + ${SED} \ + -e 's|@LOCALBASE@|${LOCALBASE}|g' \ + -e 's|@X11BASE@|${X11BASE}|g' \ + < tkinfo.src > tkinfo + +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/tkinfo ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/tkinfo.1 ${PREFIX}/man/man1 .include "../../mk/bsd.pkg.mk" diff --git a/x11/tkinfo/files/md5 b/x11/tkinfo/files/md5 index e8023551168..56bd862f6c4 100644 --- a/x11/tkinfo/files/md5 +++ b/x11/tkinfo/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1998/08/07 13:29:07 agc Exp $ +$NetBSD: md5,v 1.3 1999/10/08 01:45:38 fredb Exp $ -MD5 (tkinfo-1.5.tar.gz) = fca3d35cf9017ffb7935c65323568436 +MD5 (tkinfo-2.5.tar.gz) = e194131e1900d1214c4157b247054c0b diff --git a/x11/tkinfo/files/patch-sum b/x11/tkinfo/files/patch-sum index 50192da81b2..dcb4f77f9f7 100644 --- a/x11/tkinfo/files/patch-sum +++ b/x11/tkinfo/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:31 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/10/08 01:45:38 fredb Exp $ -MD5 (patch-aa) = 62d331cee6fb502353b4d9e18b2822b0 +MD5 (patch-aa) = 0da3d76b25c79eacc97161f47cf6a896 diff --git a/x11/tkinfo/patches/patch-aa b/x11/tkinfo/patches/patch-aa index deaf870ecba..54500627912 100644 --- a/x11/tkinfo/patches/patch-aa +++ b/x11/tkinfo/patches/patch-aa @@ -1,22 +1,27 @@ -$NetBSD: patch-aa,v 1.3 1998/08/07 11:18:19 agc Exp $ +$NetBSD: patch-aa,v 1.4 1999/10/08 01:45:38 fredb Exp $ ---- tkinfo.orig Wed Jun 18 20:17:45 1997 -+++ tkinfo Fri Oct 24 22:34:48 1997 +--- tkinfo.orig Wed Apr 29 17:53:41 1998 ++++ tkinfo Fri Oct 1 14:39:53 1999 @@ -1,6 +1,6 @@ #!/bin/sh # This is a Tcl/Tk script to be interpreted by wish (Tk4.0 or better): \ -exec wish "$0" "$@" +exec wish8.0 "$0" "$@" + ########################################################################## - # Version of TkInfo: -@@ -484,7 +484,8 @@ +@@ -509,11 +509,9 @@ proc tkiInit { } { global tki env auto_path tkiEmbed geometry - set defInfoPath [list . \ +- /usr/info /usr/local/info /usr/local/gnu/info \ +- /usr/local/emacs/info /usr/local/lib/emacs/info \ +- /usr/lib/xemacs/info /usr/local/lib/xemacs/info \ +- /usr/gnu/info \ + set defInfoPath [list . /usr/share/info \ -+ @PREFIX@/info \ - /usr/info /usr/local/info /usr/local/gnu/info \ - /usr/local/emacs/info /usr/local/lib/emacs/info \ - /usr/lib/xemacs/info /usr/local/lib/xemacs/info \ ++ @LOCALBASE@/info @X11BASE@/info \ ++ /usr/info /usr/local/info \ + ] + + set defInfoSuffix [list .info -info ""] diff --git a/x11/tkinfo/pkg/PLIST b/x11/tkinfo/pkg/PLIST index bb28e8dd5fe..8098015419e 100644 --- a/x11/tkinfo/pkg/PLIST +++ b/x11/tkinfo/pkg/PLIST @@ -1,2 +1,3 @@ -@comment $NetBSD: PLIST,v 1.2 1997/11/06 10:03:10 agc Exp $ +@comment $NetBSD: PLIST,v 1.3 1999/10/08 01:45:38 fredb Exp $ bin/tkinfo +man/man1/tkinfo.1 |