diff options
-rw-r--r-- | archivers/gcpio/Makefile | 14 | ||||
-rw-r--r-- | archivers/gtar/Makefile | 11 | ||||
-rw-r--r-- | audio/rplay/Makefile | 9 | ||||
-rw-r--r-- | audio/tracker/Makefile | 11 | ||||
-rw-r--r-- | databases/gdbm/Makefile | 9 | ||||
-rw-r--r-- | devel/autoconf/Makefile | 8 | ||||
-rw-r--r-- | devel/automake/Makefile | 13 | ||||
-rw-r--r-- | devel/bison/Makefile | 8 | ||||
-rw-r--r-- | devel/cvs/Makefile | 8 | ||||
-rw-r--r-- | devel/gindent/Makefile | 18 | ||||
-rw-r--r-- | devel/gmake/Makefile | 8 | ||||
-rw-r--r-- | devel/libg++/Makefile | 9 | ||||
-rw-r--r-- | devel/m4/Makefile | 14 | ||||
-rw-r--r-- | devel/readline/Makefile | 6 | ||||
-rw-r--r-- | editors/emacs/Makefile | 9 | ||||
-rw-r--r-- | graphics/gimp/Makefile | 4 | ||||
-rw-r--r-- | misc/git/Makefile | 6 | ||||
-rw-r--r-- | misc/screen/Makefile | 7 | ||||
-rw-r--r-- | mk/bsd.pkg.mk | 17 | ||||
-rw-r--r-- | net/wget/Makefile | 12 | ||||
-rw-r--r-- | print/teTeX/Makefile | 12 | ||||
-rw-r--r-- | shells/bash2/Makefile | 9 | ||||
-rw-r--r-- | shells/zsh/Makefile | 13 | ||||
-rw-r--r-- | sysutils/mtools/Makefile | 9 | ||||
-rw-r--r-- | x11/gtk/Makefile | 5 |
25 files changed, 74 insertions, 175 deletions
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile index ee40348500f..a92753cbdd9 100644 --- a/archivers/gcpio/Makefile +++ b/archivers/gcpio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:07 agc Exp $ +# $NetBSD: Makefile,v 1.4 1998/04/17 09:37:21 agc Exp $ # DISTNAME= cpio-2.4.2 @@ -8,18 +8,12 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= packages@netbsd.org -OPSYS!= uname -s -.if (${OPSYS} == "NetBSD") -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -.endif - -GNU_CONFIGURE=yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g LDFLAGS= -lgnumalloc -MAN1= gcpio.1 +MAN1= gcpio.1 +INFO_FILES= cpio -post-install: - install-info --info-dir=${PREFIX}/info ${PREFIX}/info/cpio.info .include "../../mk/bsd.pkg.mk" diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile index 9e264da73eb..912007058d1 100644 --- a/archivers/gtar/Makefile +++ b/archivers/gtar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:08 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/17 09:37:22 agc Exp $ # DISTNAME= tar-1.12 @@ -8,15 +8,12 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= packages@netbsd.org -OPSYS!= uname -s -.if (${OPSYS} == "NetBSD") -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -.endif +USE_GTEXINFO= yes -GNU_CONFIGURE=yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g -MAN1= gtar.1 +MAN1= gtar.1 post-install: ${INSTALL_DATA} ${FILESDIR}/gtar.1 ${PREFIX}/man/man1/ diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile index 6e8e53e80c7..9de33ea8033 100644 --- a/audio/rplay/Makefile +++ b/audio/rplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:10 agc Exp $ +# $NetBSD: Makefile,v 1.7 1998/04/17 09:37:22 agc Exp $ # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp # @@ -9,8 +9,6 @@ MASTER_SITES= ftp://ftp.sdsu.edu/pub/rplay/ MAINTAINER= rmallory@csusb.edu LIB_DEPENDS= gsm.1.0:${PORTSDIR}/audio/gsm -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo HAS_CONFIGURE= yes CONFIGURE_ARGS= "--prefix=${PREFIX}" @@ -20,6 +18,7 @@ CONFIGURE_ENV+= LDFLAGS=-L${PREFIX}/lib # XXX #USE_GMAKE= yes MAN1= rplay.1 xrplay.1 rplayd.1 rptp.1 MAN5= rplay.conf.5 rplay.hosts.5 rplay.servers.5 +INFO_FILES= RPTP RPLAY rplay librplay pre-configure: for f in `find ${WRKDIR} -type f -print|xargs $[GREP} -l '/usr/local'`; do \ @@ -40,9 +39,5 @@ post-install: @if [ ! -f ${PREFIX}/etc/rplay.hosts ]; then \ ${ECHO} localhost > ${PREFIX}/etc/rplay.hosts; \ fi - install-info ${PREFIX}/info/RPTP.info ${PREFIX}/info/dir - install-info ${PREFIX}/info/RPLAY.info ${PREFIX}/info/dir - install-info ${PREFIX}/info/rplay.info ${PREFIX}/info/dir - install-info ${PREFIX}/info/librplay.info ${PREFIX}/info/dir .include "../../mk/bsd.pkg.mk" diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile index a8bc5d34842..7ff91d14900 100644 --- a/audio/tracker/Makefile +++ b/audio/tracker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:11 agc Exp $ +# $NetBSD: Makefile,v 1.8 1998/04/17 09:37:22 agc Exp $ # FreeBSD Id: Makefile,v 1.29 1996/12/20 23:46:22 ache Exp # @@ -10,9 +10,6 @@ EXTRACT_SUFX= .tgz # FreeBSD maintainer MAINTAINER= ache@FreeBSD.ORG -RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo - RESTRICTED= "Non-redistributable beta" MIRROR_DISTFILE= no @@ -22,13 +19,15 @@ MAKE_FLAGS= MACHINE=netbsd CC=${CC} INSTALL="${INSTALL}" \ INST_MAN_OPT="-c -m 644 -o ${BINOWN} -g ${BINGRP}" \ COMPRESSION_FILE=${PREFIX}/etc/compression_methods \ -f +INFO_FILES= tracker -post-install: +pre-install: cd ${WRKSRC}/Docs && \ makeinfo --no-split tracker.texinfo -o tracker.info && \ ${CP} tracker.info ${PREFIX}/info && \ - install-info ${PREFIX}/info/tracker.info ${PREFIX}/info/dir && \ ${RM} -f tracker.info *.orig + +post-install: -${MKDIR} ${PREFIX}/share/doc/tracker ${CP} -R ${WRKSRC}/Docs/* ${PREFIX}/share/doc/tracker diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile index 68967db57ec..a55f4af04a1 100644 --- a/databases/gdbm/Makefile +++ b/databases/gdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:18 agc Exp $ +# $NetBSD: Makefile,v 1.5 1998/04/17 09:37:22 agc Exp $ # FreeBSD Id: Makefile,v 1.4 1997/01/28 08:11:23 asami Exp # @@ -8,17 +8,12 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= bjn@visi.com -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo - GNU_CONFIGURE= yes MAKE_FLAGS= CFLAGS="${CFLAGS}" LDFLAGS=-s -f MAN3= gdbm.3 +INFO_FILES= gdbm post-build: cd ${WRKSRC} ; ${RM} gdbm.info ; make gdbm.info -post-install: - @install-info ${PREFIX}/info/gdbm.info ${PREFIX}/info/dir - .include "../../mk/bsd.pkg.mk" diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile index 2b15ff2fc12..b659ebc06af 100644 --- a/devel/autoconf/Makefile +++ b/devel/autoconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1998/04/15 10:38:19 agc Exp $ +# $NetBSD: Makefile,v 1.14 1998/04/17 09:37:22 agc Exp $ # FreeBSD Id: Makefile,v 1.12 1997/06/13 20:00:47 max Exp # @@ -8,16 +8,12 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= packages@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= M4=${PREFIX}/bin/gm4 - -post-install: - @install-info ${PREFIX}/info/autoconf.info ${PREFIX}/info/dir - @install-info ${PREFIX}/info/standards.info ${PREFIX}/info/dir +INFO_FILES= autoconf standards .include "../../mk/bsd.pkg.mk" diff --git a/devel/automake/Makefile b/devel/automake/Makefile index b3b6fc9bf45..e81ef9edf95 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1998/04/15 10:38:19 agc Exp $ +# $NetBSD: Makefile,v 1.12 1998/04/17 09:37:22 agc Exp $ # FreeBSD Id: Makefile,v 1.5 1997/09/19 09:29:04 max Exp # @@ -8,18 +8,9 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= fujimoto@oscar.elec.waseda.ac.jp -OPSYS!= uname -s -.if (${OPSYS} == "NetBSD") -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -.endif - GNU_CONFIGURE= yes CONFIGURE_ENV= PERL=${PREFIX}/bin/perl STRIPFLAG= # none - -pre-install: - @if [ ! -f ${PREFIX}/info/dir ]; then \ - ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ - fi +USE_GTEXINFO= yes .include "../../mk/bsd.pkg.mk" diff --git a/devel/bison/Makefile b/devel/bison/Makefile index ce3402a7fce..0178b416fce 100644 --- a/devel/bison/Makefile +++ b/devel/bison/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:19 agc Exp $ +# $NetBSD: Makefile,v 1.4 1998/04/17 09:37:23 agc Exp $ DISTNAME= bison-1.25 CATEGORIES= devel @@ -6,12 +6,8 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= thorpej@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo - GNU_CONFIGURE= yes MAN1= bison.1 - -post-install: - @install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir +INFO_FILES= bison .include "../../mk/bsd.pkg.mk" diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile index 96ce99e0264..be572ac3fc4 100644 --- a/devel/cvs/Makefile +++ b/devel/cvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:19 agc Exp $ +# $NetBSD: Makefile,v 1.9 1998/04/17 09:37:23 agc Exp $ # DISTNAME= cvs-1.9 @@ -7,9 +7,6 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= lamj@stat.cmu.edu -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo - GNU_CONFIGURE= yes .if exists(/usr/lib/libkrb.a) @@ -21,12 +18,11 @@ MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" MAN1= cvs.1 MAN5= cvs.5 MAN8= cvsbug.8 +INFO_FILES= cvs cvsclient post-install: ${RM} -f ${PREFIX}/bin/cvs ${INSTALL_PROGRAM} ${WRKSRC}/src/cvs ${PREFIX}/bin/ - install-info --info-dir=${PREFIX}/info ${PREFIX}/info/cvs.info - install-info --info-dir=${PREFIX}/info ${PREFIX}/info/cvsclient.info ${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL .include "../../mk/bsd.pkg.mk" diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile index c5739f7e6b0..a4dfcabbc04 100644 --- a/devel/gindent/Makefile +++ b/devel/gindent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:20 agc Exp $ +# $NetBSD: Makefile,v 1.8 1998/04/17 09:37:23 agc Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1997/08/29 09:20:00 obrien Exp # @@ -8,14 +8,10 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= kchowksey@hss.hns.com -OPSYS!= uname -s -.if (${OPSYS} == "NetBSD") -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -.endif - GNU_CONFIGURE= yes MAN1= indent.1 +INFO_FILES= indent MAKEFILE= makefile @@ -25,15 +21,5 @@ pre-install: post-install: @strip ${PREFIX}/bin/indent - @test -d ${PREFIX}/info || ${MKDIR} ${PREFIX}/info \ - && chmod a+rx ${PREFIX}/info - @if [ ! -f ${PREFIX}/info/dir ]; then \ - if [ -f /usr/share/info/dir ]; then \ - ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ - else \ - ${TOUCH} ${PREFIX}/info/dir ; \ - fi ; \ - fi - @install-info ${PREFIX}/info/indent.info ${PREFIX}/info/dir .include "../../mk/bsd.pkg.mk" diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index 587b0817436..edbf7f6e820 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:20 agc Exp $ +# $NetBSD: Makefile,v 1.10 1998/04/17 09:37:23 agc Exp $ # FreeBSD Id: Makefile,v 1.16 1997/06/13 20:00:47 max Exp # @@ -9,13 +9,9 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= packages@netbsd.org -OPSYS!= uname -s -.if (${OPSYS} == "NetBSD") -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -.endif - GNU_CONFIGURE= yes MAN1= gmake.1 +USE_GTEXINFO= yes # joerg@freebsd.org says FreeBSD getloadavg() no longer requires setgid kmem post-install: diff --git a/devel/libg++/Makefile b/devel/libg++/Makefile index 9b39f18283b..4265f6938f5 100644 --- a/devel/libg++/Makefile +++ b/devel/libg++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:20 agc Exp $ +# $NetBSD: Makefile,v 1.4 1998/04/17 09:37:23 agc Exp $ # GXXVERSION= 2.8.1.1a # used by internal Makefile @@ -8,14 +8,13 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= tv@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo LIB_DEPENDS= stdc++.1.: # only from NetBSD's source tree MAKE_ENV+= GXXVERSION="${GXXVERSION}" PLIST_SRC= ${WRKSRC}/.PLIST -MAN1= gperf.1 +MAN1= gperf.1 +INFO_FILES= gperf libg++ do-configure: @${CP} ${FILESDIR}/Makefile ${WRKSRC} @@ -27,8 +26,6 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/genclass ${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/gperf ${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/gperf.info ${WRKSRC}/libg++.info ${PREFIX}/info/ - @install-info ${PREFIX}/info/gperf.info ${PREFIX}/info/dir - @install-info ${PREFIX}/info/libg++.info ${PREFIX}/info/dir ${INSTALL_DATA} ${WRKSRC}/libg++/gperf/gperf.1 ${PREFIX}/man/man1/ @(${CAT} ${PKGDIR}/PLIST.pre; cd ${PREFIX}; \ /bin/ls 2>/dev/null -1d lib/libg++*.a lib/libg++.so*) \ diff --git a/devel/m4/Makefile b/devel/m4/Makefile index ddb9e22d919..50634fc4650 100644 --- a/devel/m4/Makefile +++ b/devel/m4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:20 agc Exp $ +# $NetBSD: Makefile,v 1.8 1998/04/17 09:37:23 agc Exp $ # FreeBSD Id: Makefile,v 1.7 1997/06/16 08:22:35 max Exp # @@ -8,20 +8,12 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= packages@netbsd.org -OPSYS!= uname -s -.if (${OPSYS} == "NetBSD") -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -.endif - -GNU_CONFIGURE=yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g +INFO_FILES= m4 post-install: @${MKDIR} ${PREFIX}/share/examples/gm4 ${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${PREFIX}/share/examples/gm4 - @if [ ! -f ${PREFIX}/info/dir ]; then \ - ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ - fi - @install-info ${PREFIX}/info/m4.info ${PREFIX}/info/dir .include "../../mk/bsd.pkg.mk" diff --git a/devel/readline/Makefile b/devel/readline/Makefile index 68c747fa87f..f86b7b196e6 100644 --- a/devel/readline/Makefile +++ b/devel/readline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:21 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/17 09:37:24 agc Exp $ # DISTNAME= readline-2.1 @@ -7,10 +7,8 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= packages@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo - GNU_CONFIGURE= yes +USE_GTEXINFO= yes MAN3= readline.3 diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 56bcecff7f1..9339767641d 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1998/04/15 10:38:22 agc Exp $ +# $NetBSD: Makefile,v 1.14 1998/04/17 09:37:24 agc Exp $ # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp # @@ -9,9 +9,6 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= hubertf@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo - GNU_CONFIGURE= yes #USE_GMAKE= yes CONFIGURE_ARGS+= ${MACHINE_ARCH}--netbsd --with-pop --with-x --with-x-toolkit=lucid @@ -19,6 +16,7 @@ MAN1= emacs.1 emacs-etags.1 emacs-ctags.1 OPSYS!= uname -s MAKE_ENV+= INSTALL_STRIP=${STRIPFLAG} \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" +INFO_FILES= emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message post-build: (cd ${WRKSRC}/lisp/mail; \ @@ -32,8 +30,5 @@ post-install: ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ fi .endif -.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message - install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir -.endfor .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index b7d1f55a8d2..f595f89f437 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/04/15 20:48:12 tron Exp $ +# $NetBSD: Makefile,v 1.10 1998/04/17 09:37:24 agc Exp $ DISTNAME= gimp-0.99.26 CATEGORIES= graphics @@ -11,7 +11,6 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= bsieker@techfak.uni-bielefeld.de -BUILD_DEPENDS= install-info:${PORTSDIR}/devel/gtexinfo LIB_DEPENDS= jpeg.7.:${PORTSDIR}/graphics/jpeg \ mpeg.1.2:${PORTSDIR}/graphics/mpeg-lib \ png.0.96:${PORTSDIR}/graphics/png \ @@ -25,6 +24,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" CFLAGS= -pipe -O2 -I${LOCALBASE}/include -I${X11BASE}/include +USE_GTEXINFO= yes post-configure: @${ECHO_MSG} "--> now configuring in ${GIMP_DATA}" diff --git a/misc/git/Makefile b/misc/git/Makefile index fec9560d42e..4b7aa587525 100644 --- a/misc/git/Makefile +++ b/misc/git/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:35 agc Exp $ +# $NetBSD: Makefile,v 1.9 1998/04/17 09:37:24 agc Exp $ # FreeBSD Id: Makefile,v 1.8 1996/11/21 11:54:39 asami Exp # @@ -8,12 +8,11 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= packages@netbsd.org -RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo - GNU_CONFIGURE= YES CONFIGURE_ARGS+= ${MACHINE_ARCH}--netbsd MAN1= git.1 gitaction.1 gitkeys.1 gitmount.1 gitps.1 gitrgrep.1 \ gitunpack.1 gitview.1 +INFO_FILES= git pre-install: (cd ${WRKSRC}/info ; ${MAKE} info ) @@ -22,7 +21,6 @@ pre-install: (cd ${WRKSRC}/term ; ${PATCH} --quiet -p0 <${FILESDIR}/gitrc.cons25.patch ) post-install: - install-info ${PREFIX}/info/git.info ${PREFIX}/info/dir ${MKDIR} ${PREFIX}/share/doc ${MV} ${PREFIX}/lib/git/html ${PREFIX}/share/doc/git diff --git a/misc/screen/Makefile b/misc/screen/Makefile index 5e11c8bc3d9..fbab3a0a045 100644 --- a/misc/screen/Makefile +++ b/misc/screen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:37 agc Exp $ +# $NetBSD: Makefile,v 1.8 1998/04/17 09:37:24 agc Exp $ # FreeBSD Id: Makefile,v 1.17 1997/06/16 06:39:51 max Exp # @@ -9,14 +9,11 @@ MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \ MAINTAINER= hubertf@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo - GNU_CONFIGURE= yes MAN1= screen.1 +INFO_FILES= screen post-install: - @install-info ${PREFIX}/info/screen.info ${PREFIX}/info/dir @${MKDIR} ${PREFIX}/share/examples/screen ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc ${PREFIX}/share/examples/screen/screenrc diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 484694bf9fa..5a58748e15f 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.pkg.mk,v 1.63 1998/04/15 10:45:05 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.64 1998/04/17 09:37:24 agc Exp $ # # This file is derived from bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -150,6 +150,7 @@ NetBSD_MAINTAINER= agc@netbsd.org # USE_PERL5 - Says that the port uses perl5 for building and running. # USE_IMAKE - Says that the port uses imake. # USE_X11 - Says that the port uses X11 (i.e., installs in ${X11BASE}). +# USE_GTEXINFO - Says that the package uses gtexinfo # NO_INSTALL_MANPAGES - For imake ports that don't like the install.man # target. # HAS_CONFIGURE - Says that the port has its own configure script. @@ -279,6 +280,8 @@ NetBSD_MAINTAINER= agc@netbsd.org # CAT<sect> - The same as MAN<sect>, only for formatted manpages. # MANPREFIX -The directory prefix for ${MAN<sect>} (default: ${PREFIX}). # CATPREFIX - The directory prefix for ${CAT<sect>} (default: ${PREFIX}). +# INFO_FILES - set to the base names of the info files you wish to be +# installed in the info dir file. Automatically sets USE_GTEXINFO. # # Default targets and their behaviors: # @@ -432,6 +435,14 @@ MAKE_PROGRAM= ${MAKE} BUILD_DEPENDS+= perl5.00404:${PORTSDIR}/lang/perl5 RUN_DEPENDS+= perl5.00404:${PORTSDIR}/lang/perl5 .endif +.if defined(INFO_FILES) +USE_GTEXINFO= yes +.endif +.if defined(USE_GTEXINFO) +BUILD_DEPENDS+= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo +RUN_DEPENDS+= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo +.endif + .if exists(${PORTSDIR}/../Makefile.inc) .include "${PORTSDIR}/../Makefile.inc" @@ -1207,6 +1218,10 @@ do-build: .if !target(do-install) do-install: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) + @for f in ${INFO_FILES}; do \ + ${ECHO} "install-info --info-dir=${PREFIX}/info ${PREFIX}/info/$$f.info"; \ + install-info --info-dir=${PREFIX}/info ${PREFIX}/info/$$f.info; \ + done .endif # Package diff --git a/net/wget/Makefile b/net/wget/Makefile index 5de8538b07e..54d46ebf44f 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:40 agc Exp $ +# $NetBSD: Makefile,v 1.5 1998/04/17 09:37:25 agc Exp $ # FreeBSD Id: Makefile,v 1.4 1997/05/22 07:53:29 tg Exp # @@ -8,16 +8,8 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= tg@FreeBSD.ORG -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo - GNU_CONFIGURE= yes MAN1= wget.1 - -post-install: - if [ ! -f ${PREFIX}/info/dir ]; then \ - ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ - fi - -install-info ${PREFIX}/info/wget.info ${PREFIX}/info/dir +INFO_FILES= wget .include "../../mk/bsd.pkg.mk" diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile index b30e7500cda..226552bc58d 100644 --- a/print/teTeX/Makefile +++ b/print/teTeX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:46 agc Exp $ +# $NetBSD: Makefile,v 1.8 1998/04/17 09:37:25 agc Exp $ # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp # @@ -13,9 +13,6 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= br@schiele-ct.de -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo - DIST_SUBDIR= teTeX NO_CONFIGURE= yes USE_GMAKE= yes @@ -31,11 +28,11 @@ MAN1= afm2tfm.1 allcm.1 alldc.1 allneeded.1 amslatex.1 \ tangle.1 tex.1 texconfig.1 texhash.1 tftopl.1 \ vftovp.1 virtex.1 vptovf.1 weave.1 xdvi.1 MAN5= ls-R.5 +INFO_FILES= kpathsea dvips fontname TETEX_SRC= teTeX-src-0.4pl7.tar.gz TETEX_LIB= teTeX-lib-0.4pl8.tar.gz WRKLIB= ${WRKDIR}/teTeX -INSTALL_INFO= ${PREFIX}/bin/install-info pre-install: @${RM} -f ${PREFIX}/share/texmf/ls-R @@ -49,10 +46,7 @@ pre-install: @${INSTALL_DATA} ${WRKLIB}/texmf.cnf ${PREFIX}/share/texmf/web2c post-install: - ${INSTALL_INFO} ${PREFIX}/info/latex ${PREFIX}/info/dir - ${INSTALL_INFO} ${PREFIX}/info/kpathsea.info ${PREFIX}/info/dir - ${INSTALL_INFO} ${PREFIX}/info/dvips.info ${PREFIX}/info/dir - ${INSTALL_INFO} ${PREFIX}/info/fontname.info ${PREFIX}/info/dir + ${PREFIX}/bin/install-info ${PREFIX}/info/latex ${PREFIX}/info/dir @chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/texmf @find ${PREFIX}/share/texmf/fonts/pk ${PREFIX}/share/texmf/fonts/tfm \ -type d -print | xargs chmod 1777 diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 2cc0a70b2ae..52cb96975f4 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:48 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/17 09:37:25 agc Exp $ # FreeBSD Id: Makefile,v 1.26 1997/06/27 23:03:27 ache Exp # @@ -12,17 +12,12 @@ DISTFILES= bash-2.01.tar.gz bash-doc-2.01.tar.gz MAINTAINER= ache@FreeBSD.ORG -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo - GNU_CONFIGURE= Yes MAN1= bash.1 bashbug.1 +USE_GTEXINFO= yes pre-install: strip ${WRKSRC}/bash - if [ ! -s ${PREFIX}/info/dir ]; then \ - ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ - fi post-install: ${CP} /etc/shells /etc/shells.bak diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index babdf4d7450..3c118a1cd7f 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:48 agc Exp $ +# $NetBSD: Makefile,v 1.7 1998/04/17 09:37:25 agc Exp $ # FreeBSD Id: Makefile,v 1.26 1997/09/26 08:23:14 torstenb Exp # @@ -16,15 +16,10 @@ MASTER_SITES= ftp://ftp.math.gatech.edu/pub/zsh/ \ MAINTAINER= torstenb@FreeBSD.ORG -OPSYS!= uname -s -.if (${OPSYS} == "NetBSD") -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -.endif - GNU_CONFIGURE= yes MAN1= zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 zshmisc.1 \ zshoptions.1 zshall.1 zshparam.1 zshzle.1 +INFO_FILES= zsh # If you want to build a static binary, uncomment the following line #LDFLAGS+=-static @@ -33,9 +28,5 @@ post-install: ${CP} /etc/shells /etc/shells.bak (${GREP} -v ${PREFIX}/bin/zsh /etc/shells.bak; ${ECHO} ${PREFIX}/bin/zsh) >/etc/shells ${RM} /etc/shells.bak - @if [ ! -f ${PREFIX}/info/dir ]; then \ - ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ - fi - @${PREFIX}/bin/install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile index 8cb773f436f..fb2f80acf4b 100644 --- a/sysutils/mtools/Makefile +++ b/sysutils/mtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:49 agc Exp $ +# $NetBSD: Makefile,v 1.7 1998/04/17 09:37:25 agc Exp $ # DISTNAME= mtools-3.8 @@ -8,9 +8,6 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= is@netbsd.org -BUILD_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo -RUN_DEPENDS= ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo - HAS_CONFIGURE= yes GNU_CONFIGURE= yes USE_GMAKE= yes @@ -20,8 +17,6 @@ MAN1= mattrib.1 mbadblocks.1 mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 \ mread.1 mren.1 mtoolstest.1 mtools.1 mtype.1 mwrite.1 mzip.1 MAN5= mtools.5 - -post-install: - ${PREFIX}/bin/install-info ${PREFIX}/info/mtools.info ${PREFIX}/info/dir +INFO_FILES= mtools .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 73443230464..920290df36e 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:53 agc Exp $ +# $NetBSD: Makefile,v 1.8 1998/04/17 09:37:25 agc Exp $ DISTNAME= gtk+-1.0.0 CATEGORIES= x11 @@ -8,10 +8,9 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.0/ \ MAINTAINER= bsieker@techfak.uni-bielefeld.de -BUILD_DEPENDS= ${LOCALBASE}/bin/install-info:${PORTSDIR}/devel/gtexinfo - GNU_CONFIGURE= yes USE_X11= yes +USE_GTEXINFO= yes CFLAGS= -pipe -O2 |