diff options
417 files changed, 1248 insertions, 1248 deletions
diff --git a/audio/amp/Makefile b/audio/amp/Makefile index 33fdc2103ea..a5773933ae7 100644 --- a/audio/amp/Makefile +++ b/audio/amp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/09/03 00:56:28 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:46 rillig Exp $ # DISTNAME= amp-0.7.6 @@ -19,10 +19,10 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/amp ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/amp.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/amp.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/audio/bladeenc/Makefile b/audio/bladeenc/Makefile index bfd2b98891a..b8a1754b4d3 100644 --- a/audio/bladeenc/Makefile +++ b/audio/bladeenc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/03/04 21:28:54 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2007/01/07 09:13:46 rillig Exp $ # DISTNAME= bladeenc-0.94.2-src-stable @@ -17,6 +17,6 @@ GNU_CONFIGURE= yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/bladeenc ${INSTALL_DATA} ${WRKSRC}/bladeenc.html ${PREFIX}/share/doc/html/bladeenc - ${INSTALL_MAN} ${WRKSRC}/bladeenc.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/bladeenc.1 ${PREFIX}/${PKGMANDIR}/man1/ .include "../../mk/bsd.pkg.mk" diff --git a/audio/cam/Makefile b/audio/cam/Makefile index 7d96813062e..0af9e846275 100644 --- a/audio/cam/Makefile +++ b/audio/cam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/03/09 21:04:39 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2007/01/07 09:13:47 rillig Exp $ # DISTNAME= cam-1.02 @@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews NO_CONFIGURE= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../mk/bsd.prefs.mk" diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index bd8a5eb2dea..5eff2cd4a5e 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/07/10 00:56:25 minskim Exp $ +# $NetBSD: Makefile,v 1.3 2007/01/07 09:13:47 rillig Exp $ # DISTNAME= cmus-2.0.3 @@ -20,7 +20,7 @@ CONFIGURE_ARGS+= CONFIG_OSS=y CONFIGURE_ARGS+= CONFIG_MAD=y CONFIGURE_ARGS+= CONFIG_AO=y CONFIGURE_ARGS+= CONFIG_FLAC=y -CONFIGURE_ARGS+= mandir=${PREFIX}/man/ +CONFIGURE_ARGS+= mandir=${PREFIX}/${PKGMANDIR}/ .if exists(/usr/include/sys/audioio.h) PLIST_SUBST+= SUN="" diff --git a/audio/disc-cover/Makefile b/audio/disc-cover/Makefile index 718bda30d0c..346bbd47384 100644 --- a/audio/disc-cover/Makefile +++ b/audio/disc-cover/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/07/03 18:45:24 drochner Exp $ +# $NetBSD: Makefile,v 1.22 2007/01/07 09:13:47 rillig Exp $ # DISTNAME= disc-cover-1.5.6 @@ -16,7 +16,7 @@ REPLACE_PERL= disc-cover DCTMPL= ${PREFIX}/share/disc-cover/templates -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: cd ${WRKSRC} && ${POD2MAN} disc-cover > disc-cover.1 @@ -25,7 +25,7 @@ do-build: do-install: ${INSTALL_SCRIPT} ${WRKDIR}/disc-cover ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/disc-cover.1 ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/disc-cover.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${DCTMPL} ${INSTALL_DATA} ${WRKSRC}/templates/* ${DCTMPL} diff --git a/audio/festival/Makefile b/audio/festival/Makefile index 5f5df2f90d7..aac082a741c 100644 --- a/audio/festival/Makefile +++ b/audio/festival/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2006/05/19 16:18:51 rillig Exp $ +# $NetBSD: Makefile,v 1.52 2007/01/07 09:13:47 rillig Exp $ DISTNAME= festival-1.95-beta PKGNAME= festival-1.95beta @@ -69,7 +69,7 @@ MAKE_ENV+= PKG_EST_HOME=${SPEECHTOOLS:Q} \ CC=${CC:Q} \ CXX=${CXX:Q} -INSTALLATION_DIRS= bin libexec man/man1 +INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man1 post-patch: ${CP} ${FILESDIR}/top-Makefile ${WRKSRC}/Makefile @@ -96,8 +96,8 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/festival.sh ${PREFIX}/bin/festival ${INSTALL_SCRIPT} ${WRKDIR}/festival_client.sh ${PREFIX}/bin/festival_client ${INSTALL_DATA} ${WRKDIR}/sitevars.scm ${FHOME}/lib/sitevars.scm - ${INSTALL_MAN} ${FESTIVAL}/doc/festival.1 ${PREFIX}/man/man1/festival.1 - ${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${PREFIX}/man/man1/festival_client.1 + ${INSTALL_MAN} ${FESTIVAL}/doc/festival.1 ${PREFIX}/${PKGMANDIR}/man1/festival.1 + ${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${PREFIX}/${PKGMANDIR}/man1/festival_client.1 .include "../../audio/nas/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/audio/ices-mp3/Makefile b/audio/ices-mp3/Makefile index 4304e76da67..c045884340b 100644 --- a/audio/ices-mp3/Makefile +++ b/audio/ices-mp3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:10 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:47 rillig Exp $ # DISTNAME= ices-${ICES_VERSION} @@ -32,14 +32,14 @@ DOCDIR= ${PREFIX}/share/doc/${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} MODDIR= ${PREFIX}/share/${PKGBASE} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 pre-configure: cd ${WRKSRC} && autoreconf --force do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/ices ${PREFIX}/bin/${PKGBASE} - ${INSTALL_MAN} ${WRKSRC}/doc/ices.1 ${PREFIX}/man/man1/${PKGBASE}.1 + ${INSTALL_MAN} ${WRKSRC}/doc/ices.1 ${PREFIX}/${PKGMANDIR}/man1/${PKGBASE}.1 ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/doc/icesmanual.html ${DOCDIR} for i in AUTHORS BUGS COPYING NEWS README README.playlist TODO ; \ diff --git a/audio/mad123/Makefile b/audio/mad123/Makefile index c4461740f15..7a2c6a90570 100644 --- a/audio/mad123/Makefile +++ b/audio/mad123/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/11/19 11:50:24 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2007/01/07 09:13:47 rillig Exp $ # DISTNAME= mad123-0.8.5 @@ -37,11 +37,11 @@ MAKE_FLAGS+= USE_OSS=yes MAKE_FLAGS+= USE_SUN=yes .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mad123 ${DESTDIR}${PREFIX}/bin/mad123 - ${INSTALL_MAN} ${WRKSRC}/mad123.1 ${DESTDIR}${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/mad123.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ .include "../../audio/taglib/buildlink3.mk" .include "../../audio/libmad/buildlink3.mk" diff --git a/audio/mp3check/Makefile b/audio/mp3check/Makefile index c76bdd45839..f2594ca2e17 100644 --- a/audio/mp3check/Makefile +++ b/audio/mp3check/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/10/14 07:59:09 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:47 rillig Exp $ DISTNAME= mp3check-0.8.0 CATEGORIES= audio @@ -13,10 +13,10 @@ USE_LANGUAGES= c c++ BUILD_TARGET= mp3check -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mp3check ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/mp3check.1 ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/mp3check.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/audio/mpegaudio/Makefile b/audio/mpegaudio/Makefile index 80684967af2..336a07c88b8 100644 --- a/audio/mpegaudio/Makefile +++ b/audio/mpegaudio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/03/04 21:28:57 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:47 rillig Exp $ DISTNAME= mpegaudio PKGNAME= mpegaudio-3.9 @@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= MPEG/audio Layer 1 and Layer 2 encoder/decoder package post-install: - ${INSTALL_MAN} ${FILESDIR}/mpeg_musicin.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${FILESDIR}/mpeg_musicout.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${FILESDIR}/mpeg_musicin.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${FILESDIR}/mpeg_musicout.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/audio/mpg123-esound/Makefile b/audio/mpg123-esound/Makefile index 3432f595153..aa6f6dc1863 100644 --- a/audio/mpg123-esound/Makefile +++ b/audio/mpg123-esound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/05/26 12:33:37 drochner Exp $ +# $NetBSD: Makefile,v 1.18 2007/01/07 09:13:47 rillig Exp $ PKGNAME= mpg123-esound-${MPG123_VERSION} PKGREVISION= 7 @@ -11,11 +11,11 @@ TARGET_SUFFIX= -esd PKG_OPTIONS_VAR=PKG_OPTIONS.mpg123-esound .include "../../audio/mpg123/Makefile.common" -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mpg123 ${PREFIX}/bin/mpg123-esound - ${INSTALL_MAN} ${WRKSRC}/mpg123.1 ${PREFIX}/man/man1/mpg123-esound.1 + ${INSTALL_MAN} ${WRKSRC}/mpg123.1 ${PREFIX}/${PKGMANDIR}/man1/mpg123-esound.1 .include "../../audio/esound/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/nspmod/Makefile b/audio/nspmod/Makefile index 817602c9677..07263b1710f 100644 --- a/audio/nspmod/Makefile +++ b/audio/nspmod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/09/03 00:56:28 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2007/01/07 09:13:47 rillig Exp $ # DISTNAME= nspmod-0.1 @@ -13,10 +13,10 @@ NOT_FOR_PLATFORM= Interix-*-* PKG_INSTALLATION_TYPES= overwrite pkgviews -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/nspmod ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/nspmod.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/nspmod.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/audio/oggasm/Makefile b/audio/oggasm/Makefile index 9be0de4c971..901ec4f10ad 100644 --- a/audio/oggasm/Makefile +++ b/audio/oggasm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/10/04 20:44:19 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:47 rillig Exp $ # DISTNAME= oggasm_1.4.0 @@ -22,10 +22,10 @@ REPLACE_PERL= oggasm NO_BUILD= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/oggasm ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/oggasm.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/oggasm.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile index b94fd09fab4..c688823412a 100644 --- a/audio/tosha/Makefile +++ b/audio/tosha/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/10/04 20:44:19 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:47 rillig Exp $ DISTNAME= tosha-0.05 PKGREVISION= 1 @@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../devel/libscsi/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile index b42612f9ec9..d2dd004a799 100644 --- a/audio/xamp/Makefile +++ b/audio/xamp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/10/04 20:44:20 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2007/01/07 09:13:47 rillig Exp $ DISTNAME= xamp-0.8-10 PKGNAME= xamp-0.8.10 @@ -27,7 +27,7 @@ MAKE_ENV+= QT1DIR=${QT1DIR:Q} SKIN_DATA= bfamp.tar.gz chrome.tar.gz mmxamp.tar.gz SKIN_DIR= ${PREFIX}/lib/X11/xamp -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-patch: for f in about.cpp aboutData.cpp readmex.h; do \ @@ -38,7 +38,7 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/xamp.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/xamp.1 ${PREFIX}/${PKGMANDIR}/man1 @${INSTALL_DATA_DIR} ${SKIN_DIR}/bfamp-xamp ${INSTALL_DATA} ${WRKDIR}/bfamp-xamp/*.bmp ${SKIN_DIR}/bfamp-xamp @${INSTALL_DATA_DIR} ${SKIN_DIR}/chrome-xamp diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile index 6647b97a86c..541f3c21e6e 100644 --- a/benchmarks/bonnie/Makefile +++ b/benchmarks/bonnie/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/06/06 00:02:54 minskim Exp $ +# $NetBSD: Makefile,v 1.29 2007/01/07 09:13:47 rillig Exp $ DISTNAME= bonnie PKGNAME= bonnie-2.06 @@ -22,7 +22,7 @@ MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE} MAKE_ENV+= MANOWN=${MANOWN} MANGRP=${MANGRP} MANMODE=${MANMODE} MANCOMPRESSED_IF_MANZ= yes -INSTALLATION_DIRS= bin man/cat1 man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 post-extract: ${MV} ${WRKSRC}/Bonnie.c ${WRKSRC}/bonnie.c diff --git a/benchmarks/hint/Makefile b/benchmarks/hint/Makefile index e14fd31f8c9..5e57d1d6156 100644 --- a/benchmarks/hint/Makefile +++ b/benchmarks/hint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/10/04 20:46:42 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2007/01/07 09:13:47 rillig Exp $ DISTNAME= hint_unix_serial PKGNAME= hint.serial-98.06.12 @@ -16,7 +16,7 @@ BUILD_TARGET= DOUBLE INT WRKSRC= ${WRKDIR}/unix -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-extract: ${CP} ${FILESDIR}/hint.1 ${WRKSRC}/hint.1 @@ -24,7 +24,7 @@ post-extract: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/DOUBLE ${PREFIX}/bin/hint-double ${INSTALL_PROGRAM} ${WRKSRC}/INT ${PREFIX}/bin/hint-int - ${INSTALL_MAN} ${WRKSRC}/hint.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/hint.1 ${PREFIX}/${PKGMANDIR}/man1 benchmark: cd ${WRKSRC} ; ${MKDIR} data ; ./DOUBLE | tee hint.out diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile index 9c2f3f80850..ebcaaa7d416 100644 --- a/benchmarks/iozone/Makefile +++ b/benchmarks/iozone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/09/09 02:41:55 obache Exp $ +# $NetBSD: Makefile,v 1.36 2007/01/07 09:13:47 rillig Exp $ DISTNAME= iozone3_263 PKGNAME= iozone-3.263 @@ -39,11 +39,11 @@ BUILD_TARGET= ${OPSYS} BUILD_TARGET= generic .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/iozone ${PREFIX}/bin - ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/IOzone ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/Iozone_ps.gz \ ${PREFIX}/share/doc/IOzone diff --git a/benchmarks/netperf/Makefile b/benchmarks/netperf/Makefile index 437bc55833b..8d39bf7ea11 100644 --- a/benchmarks/netperf/Makefile +++ b/benchmarks/netperf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2006/11/21 10:59:25 tron Exp $ +# $NetBSD: Makefile,v 1.2 2007/01/07 09:13:48 rillig Exp $ # KAME Id: Makefile,v 1.3 2000/01/21 12:34:29 itojun Exp # @@ -19,8 +19,8 @@ CFLAGS.IRIX+= -DIRIX post-install: strip ${PREFIX}/netperf/netperf strip ${PREFIX}/netperf/netserver - ${INSTALL_MAN} ${WRKSRC}/netperf.man ${PREFIX}/man/man1/netperf.1 - ${INSTALL_MAN} ${WRKSRC}/netserver.man ${PREFIX}/man/man1/netserver.1 + ${INSTALL_MAN} ${WRKSRC}/netperf.man ${PREFIX}/${PKGMANDIR}/man1/netperf.1 + ${INSTALL_MAN} ${WRKSRC}/netserver.man ${PREFIX}/${PKGMANDIR}/man1/netserver.1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/netperf ${INSTALL_MAN} ${WRKSRC}/netperf.ps ${PREFIX}/share/doc/netperf ${GZIP_CMD} ${PREFIX}/share/doc/netperf/netperf.ps diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile index 02a48aba4d6..9ded7b74e74 100644 --- a/benchmarks/netpipe/Makefile +++ b/benchmarks/netpipe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/03/04 21:29:01 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:48 rillig Exp $ DISTNAME= NetPIPE_2.4 PKGNAME= netpipe-2.4 @@ -20,11 +20,11 @@ CFLAGS+= -DHAVE_GETRUSAGE MAKE_ENV+= EXTRA_LIBS="-lsocket -lnsl" .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: cd ${WRKSRC} ; \ ${INSTALL_PROGRAM} NPtcp ${PREFIX}/bin/NPtcp ; \ - ${INSTALL_MAN} netpipe.1 ${PREFIX}/man/man1/netpipe.1 + ${INSTALL_MAN} netpipe.1 ${PREFIX}/${PKGMANDIR}/man1/netpipe.1 .include "../../mk/bsd.pkg.mk" diff --git a/benchmarks/nettest/Makefile b/benchmarks/nettest/Makefile index ff1eb5eeb3a..ac34a7cd75f 100644 --- a/benchmarks/nettest/Makefile +++ b/benchmarks/nettest/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/01/12 20:49:17 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2007/01/07 09:13:48 rillig Exp $ DISTNAME= nettest.92.11.09 PKGNAME= nettest-92.11.09 @@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR} -INSTALLATION_DIRS= bin man/man8 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 do-install: ${INSTALL_PROGRAM} ${WRKSRC:Q}/nettest ${PREFIX:Q}/bin/nettest diff --git a/benchmarks/nttcp/Makefile b/benchmarks/nttcp/Makefile index 5ec7047772c..498165d3c36 100644 --- a/benchmarks/nttcp/Makefile +++ b/benchmarks/nttcp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/10/04 20:46:42 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:48 rillig Exp $ DISTNAME= nttcp-1.47 PKGREVISION= 1 @@ -17,11 +17,11 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews MAKE_ENV+= LIB="-lsocket -lnsl" .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: cd ${WRKSRC} ; \ ${INSTALL_PROGRAM} nttcp ${PREFIX}/bin/nttcp ; \ - ${INSTALL_MAN} nttcp.1 ${PREFIX}/man/man1/nttcp.1 + ${INSTALL_MAN} nttcp.1 ${PREFIX}/${PKGMANDIR}/man1/nttcp.1 .include "../../mk/bsd.pkg.mk" diff --git a/benchmarks/ttcp/Makefile b/benchmarks/ttcp/Makefile index c3c1c02c33e..5b90ccb4085 100644 --- a/benchmarks/ttcp/Makefile +++ b/benchmarks/ttcp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/12/21 11:49:51 tron Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:48 rillig Exp $ DISTNAME= ttcp PKGNAME= ${DISTNAME}-1.12 @@ -26,7 +26,7 @@ MANCOMPRESSED_IF_MANZ= YES #MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} #.endif -INSTALLATION_DIRS= bin man/cat1 man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 .if (${OPSYS} == SunOS) do-build: diff --git a/biology/arka/Makefile b/biology/arka/Makefile index 44c330ec7a6..eeef080bf9b 100644 --- a/biology/arka/Makefile +++ b/biology/arka/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:20 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:48 rillig Exp $ # DISTNAME= arka-0.11 @@ -19,7 +19,7 @@ CONF_FILES= ${PREFIX}/share/examples/arka/arkarc ${PKG_SYSCONFDIR}/arkarc CPPFLAGS+= -DARKA_GLOBAL=\"${PKG_SYSCONFDIR}/arkarc\" CPPFLAGS+= -DARKA_PROGRAMS=\"${PKG_SYSCONFDIR}/arkarc\" -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 USE_TOOLS+= gunzip post-build: @@ -27,7 +27,7 @@ post-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/arka ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/arka.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/arka.1 ${PREFIX}/${PKGMANDIR}/man1 .for f in arka_16x16.xpm arka_32x32.xpm ${INSTALL_DATA} ${WRKSRC}/icons/${f} ${PREFIX}/share/pixmaps .endfor diff --git a/biology/lucy/Makefile b/biology/lucy/Makefile index 037a395db72..c4fdbd79050 100644 --- a/biology/lucy/Makefile +++ b/biology/lucy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/10/04 20:47:03 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2007/01/07 09:13:48 rillig Exp $ # DISTNAME= lucy-1.18p @@ -11,11 +11,11 @@ COMMENT= Sequence Cleanup Program PKG_INSTALLATION_TYPES= overwrite pkgviews -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/lucy ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/lucy.1 ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/lucy.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lucy .for EXAMPLE in PUC19 PUC19splice PUC19splice.for PUC19splice.rev \ atie.seq atie.qul atie.2nd pSPORT1splice pSPORT1vector ARMTM40TR.seq \ diff --git a/biology/nut/Makefile b/biology/nut/Makefile index 79de1e411af..2090f49825b 100644 --- a/biology/nut/Makefile +++ b/biology/nut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:20 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2007/01/07 09:13:48 rillig Exp $ DISTNAME= nut-10.18 PKGREVISION= 1 @@ -13,12 +13,12 @@ COMMENT= Record what you eat and analyze your meals BUILD_TARGET= nut USE_TOOLS+= gmake -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/nut ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/nut ${INSTALL_DATA} ${WRKSRC}/raw.data/* ${PREFIX}/share/nut - ${INSTALL_MAN} ${WRKSRC}/nut.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/nut.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/cad/spice/Makefile b/cad/spice/Makefile index cf20efa1258..896c8c8c120 100644 --- a/cad/spice/Makefile +++ b/cad/spice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/10/09 20:04:38 mlelstv Exp $ +# $NetBSD: Makefile,v 1.36 2007/01/07 09:13:48 rillig Exp $ DISTNAME= sp3f4.kit PKGNAME= spice-3f5.1 @@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR} #PATCH_SITES= ftp://ilpsoft.eecs.berkeley.edu/pub/SPICE3F5/ #PATCHFILES= grid.patch newcoms.patch spsmp.patch -INSTALLATION_DIRS= bin man/man1 man/man3 man/man5 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 post-extract: ${CP} ${FILESDIR}/NetBSD ${WRKSRC}/conf @@ -54,11 +54,11 @@ do-install: ${PREFIX}/bin/sconvert ${PREFIX}/bin/help \ ${PREFIX}/bin/proc2mod ${PREFIX}/bin/multidec ${CHMOD} -R a+rX ${PREFIX}/share/spice3 - ${INSTALL_MAN} ${WRKSRC}/man/man5/mfbcap.5 ${PREFIX}/man/man5/mfbcap.5 - ${INSTALL_MAN} ${WRKSRC}/man/man1/sconvert.1 ${PREFIX}/man/man1/sconvert.1 - ${INSTALL_MAN} ${WRKSRC}/man/man1/nutmeg.1 ${PREFIX}/man/man1/nutmeg.1 - ${INSTALL_MAN} ${WRKSRC}/man/man1/spice.1 ${PREFIX}/man/man1/spice.1 - ${INSTALL_MAN} ${WRKSRC}/man/man3/mfb.3 ${PREFIX}/man/man3/mfb.3 + ${INSTALL_MAN} ${WRKSRC}/man/man5/mfbcap.5 ${PREFIX}/${PKGMANDIR}/man5/mfbcap.5 + ${INSTALL_MAN} ${WRKSRC}/man/man1/sconvert.1 ${PREFIX}/${PKGMANDIR}/man1/sconvert.1 + ${INSTALL_MAN} ${WRKSRC}/man/man1/nutmeg.1 ${PREFIX}/${PKGMANDIR}/man1/nutmeg.1 + ${INSTALL_MAN} ${WRKSRC}/man/man1/spice.1 ${PREFIX}/${PKGMANDIR}/man1/spice.1 + ${INSTALL_MAN} ${WRKSRC}/man/man3/mfb.3 ${PREFIX}/${PKGMANDIR}/man3/mfb.3 post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/spice3 diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile index d39103eaec8..089c224a606 100644 --- a/chat/bitlbee/Makefile +++ b/chat/bitlbee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/08/16 09:46:27 tonio Exp $ +# $NetBSD: Makefile,v 1.36 2007/01/07 09:13:48 rillig Exp $ # DISTNAME= bitlbee-1.0.3 @@ -34,7 +34,7 @@ OWN_DIRS_PERMS= ${STATEDIR} bitlbee nobody 700 PKG_USERS= bitlbee:nobody PKG_HOME.bitlbee= ${VARBASE}/db/bitlbee -INSTALLATION_DIRS= man/man5 man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin do-install: ${INSTALL_DATA_DIR} ${DATADIR} @@ -44,8 +44,8 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bitlbee ${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC}/doc/user-guide/help.txt ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/motd.txt ${DATADIR} - ${INSTALL_MAN} ${WRKSRC}/doc/bitlbee.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/doc/bitlbee.conf.5 ${PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/doc/bitlbee.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKSRC}/doc/bitlbee.conf.5 ${PREFIX}/${PKGMANDIR}/man5 .for f in AUTHORS FAQ README CREDITS user-guide/user-guide.txt user-guide/user-guide.html ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCDIR} .endfor diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile index 96b26f58137..0e29c469db1 100644 --- a/chat/centericq/Makefile +++ b/chat/centericq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2006/11/19 11:50:24 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2007/01/07 09:13:48 rillig Exp $ # DISTNAME= centericq-4.21.0 @@ -58,7 +58,7 @@ CONFIGURE_ENV+= ac_cv_lib_iconv_iconv=yes .endif post-install: - ${INSTALL_MAN} ${WRKSRC}/centericq.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/centericq.1 ${PREFIX}/${PKGMANDIR}/man1/ .include "../../mk/bsd.pkg.mk" diff --git a/chat/eggdrop/Makefile b/chat/eggdrop/Makefile index 0c1f5a5b579..b180a1fd8cb 100644 --- a/chat/eggdrop/Makefile +++ b/chat/eggdrop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/03/04 21:29:02 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2007/01/07 09:13:48 rillig Exp $ DISTNAME= eggdrop1.6.17 PKGNAME= eggdrop-1.6.17 @@ -27,7 +27,7 @@ PLIST_SUBST+= NOIPV6= EGDIR= ${PREFIX}/share/examples/eggdrop CONF_FILES= ${EGDIR}/eggdrop.conf ${PKG_SYSCONFDIR}/eggdrop.conf -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-patch: cd ${WRKSRC} && ${SED} -e 's,modules/,${PREFIX}/lib/eggdrop/,' \ @@ -39,7 +39,7 @@ post-configure: do-install: do-install-program do-install-program: ${INSTALL_PROGRAM} ${WRKSRC}/eggdrop ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/doc/man1/eggdrop.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/doc/man1/eggdrop.1 ${PREFIX}/${PKGMANDIR}/man1/ ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/eggdrop.conf.dist.new ${EGDIR}/eggdrop.conf ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/eggdrop diff --git a/chat/goofey/Makefile b/chat/goofey/Makefile index 8132a4c8735..a280a883cea 100644 --- a/chat/goofey/Makefile +++ b/chat/goofey/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/12/05 20:49:52 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:49 rillig Exp $ # DISTNAME= goofey-3.15 @@ -13,13 +13,13 @@ COMMENT= Text-based client for goofey, a flexible short message system NO_CONFIGURE= yes LDFLAGS.SunOS+= -lnsl -lsocket -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: cd ${WRKSRC}; ${CC} ${CFLAGS} ${LDFLAGS} -o goofey goofey.c do-install: ${INSTALL} ${WRKSRC}/goofey ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/goofey.1 ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/goofey.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/chat/icbirc/Makefile b/chat/icbirc/Makefile index bfc4eb2d3c4..233ad938754 100644 --- a/chat/icbirc/Makefile +++ b/chat/icbirc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/22 22:50:31 tv Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:49 rillig Exp $ DISTNAME= icbirc-1.8 CATEGORIES= chat @@ -16,7 +16,7 @@ SRCS= icb.c irc.c icbirc.c CPPFLAGS.Interix+= -Dsocklen_t=int LDFLAGS.SunOS+= -lsocket -lnsl -INSTALLATION_DIRS= bin man/man8 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 do-build: .for f in ${SRCS} @@ -26,6 +26,6 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/icbirc ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/icbirc.8 ${PREFIX}/man/man8/ + ${INSTALL_MAN} ${WRKSRC}/icbirc.8 ${PREFIX}/${PKGMANDIR}/man8/ .include "../../mk/bsd.pkg.mk" diff --git a/chat/iip/Makefile b/chat/iip/Makefile index fdbee3091bd..74e141c7da2 100644 --- a/chat/iip/Makefile +++ b/chat/iip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/06/18 08:02:03 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2007/01/07 09:13:49 rillig Exp $ # DISTNAME= iip-1.1.0 @@ -20,6 +20,6 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/isproxy ${PREFIX}/bin/ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/iip ${INSTALL_DATA} ${WRKSRC}/src/node.ref ${PREFIX}/share/examples/iip/ - ${INSTALL_DATA} ${WRKSRC}/doc/isproxy.1 ${PREFIX}/man/man1/ + ${INSTALL_DATA} ${WRKSRC}/doc/isproxy.1 ${PREFIX}/${PKGMANDIR}/man1/ .include "../../mk/bsd.pkg.mk" diff --git a/chat/sirc/Makefile b/chat/sirc/Makefile index dcb80d1eeb1..b8928a002ba 100644 --- a/chat/sirc/Makefile +++ b/chat/sirc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/07/27 00:09:05 hubertf Exp $ +# $NetBSD: Makefile,v 1.18 2007/01/07 09:13:49 rillig Exp $ DISTNAME= sirc-2.211 PKGREVISION= 2 @@ -54,7 +54,7 @@ IRC_SERVER= ${DEFAULT_IRC_SERVER} IRC_SERVER= us.undernet.org .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/sirc @@ -71,7 +71,7 @@ do-install: ${ECHO} "${PREFIX}/lib/sirc" ; \ ${ECHO} "y" ; \ ${ECHO} "n" ; \ - ${ECHO} "${PREFIX}/man/man1" ; \ + ${ECHO} "${PREFIX}/${PKGMANDIR}/man1" ; \ ${ECHO} "${IRC_SERVER}" ; \ ${ECHO} "" ; \ ) | ./install diff --git a/comms/gkermit/Makefile b/comms/gkermit/Makefile index 89a8591d9f8..c98bd9bf28e 100644 --- a/comms/gkermit/Makefile +++ b/comms/gkermit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/09/09 02:41:55 obache Exp $ +# $NetBSD: Makefile,v 1.23 2007/01/07 09:13:49 rillig Exp $ # DISTNAME= gku100 @@ -22,11 +22,11 @@ MAKE_ENV+= KFLAGS=${CFLAGS:M*:Q} CFLAGS+= -DERRNO_H -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gkermit ${PREFIX}/bin/gkermit; \ - ${INSTALL_MAN} ${WRKSRC}/gkermit.nr ${PREFIX}/man/man1/gkermit.1; \ + ${INSTALL_MAN} ${WRKSRC}/gkermit.nr ${PREFIX}/${PKGMANDIR}/man1/gkermit.1; \ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gkermit ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gkermit diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index 666044d8d8c..78143cf2dcd 100644 --- a/comms/jpilot/Makefile +++ b/comms/jpilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2006/11/20 18:34:27 bad Exp $ +# $NetBSD: Makefile,v 1.59 2007/01/07 09:13:49 rillig Exp $ # DISTNAME= jpilot-0.99.9 @@ -26,7 +26,7 @@ LDFLAGS+= -export-dynamic DOCDIR= ${PREFIX}/share/doc/jpilot INCDIR= ${PREFIX}/include/jpilot -MAN1DIR= ${PREFIX}/man/man1 +MAN1DIR= ${PREFIX}/${PKGMANDIR}/man1 PLUGINSDIR= ${PREFIX}/lib/jpilot/plugins .include "../../comms/pilot-link-libs/buildlink3.mk" diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile index 9647357ea16..f6a7524a85c 100644 --- a/comms/kermit/Makefile +++ b/comms/kermit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2006/10/01 14:16:21 rillig Exp $ +# $NetBSD: Makefile,v 1.69 2007/01/07 09:13:49 rillig Exp $ DISTNAME= cku211 PKGNAME= kermit-8.0.211 @@ -52,12 +52,12 @@ do-install: case $$OPT in \ catinstall) \ nroff -man ${WRKSRC}/ckuker.nr > ${WRKSRC}/kermit.0; \ - ${INSTALL_MAN_DIR} ${PREFIX}/man/cat1; \ - ${INSTALL_MAN} ${WRKSRC}/kermit.0 ${PREFIX}/man/cat1/kermit.0; \ + ${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/cat1; \ + ${INSTALL_MAN} ${WRKSRC}/kermit.0 ${PREFIX}/${PKGMANDIR}/cat1/kermit.0; \ ;; \ maninstall) \ - ${INSTALL_MAN_DIR} ${PREFIX}/man/man1; \ - ${INSTALL_MAN} ${WRKSRC}/ckuker.nr ${PREFIX}/man/man1/kermit.1; \ + ${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1; \ + ${INSTALL_MAN} ${WRKSRC}/ckuker.nr ${PREFIX}/${PKGMANDIR}/man1/kermit.1; \ ;; \ esac; \ done diff --git a/comms/linuxsms/Makefile b/comms/linuxsms/Makefile index 96498d5643d..5040183743c 100644 --- a/comms/linuxsms/Makefile +++ b/comms/linuxsms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:05 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:49 rillig Exp $ # DISTNAME= linuxsms-0.65 @@ -14,11 +14,11 @@ NO_BUILD= yes REPLACE_PERL= linuxsms -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/linuxsms ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/linuxsms.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/linuxsms.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/linuxsms .for f in BUGS CHANGES README README.ES TODO ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/linuxsms diff --git a/converters/2vcard/Makefile b/converters/2vcard/Makefile index 83029e51ce9..fd1436752f6 100644 --- a/converters/2vcard/Makefile +++ b/converters/2vcard/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/07/16 01:19:07 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:49 rillig Exp $ # DISTNAME= 2vcard-0.5 @@ -15,11 +15,11 @@ REPLACE_PERL= src/2vcard NO_BUILD= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/src/2vcard ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/2vcard.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/doc/2vcard.1 ${PREFIX}/${PKGMANDIR}/man1/ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/2vcard ${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/html/2vcard diff --git a/converters/ack/Makefile b/converters/ack/Makefile index 6c2b6ca0e95..81ee50fdea6 100644 --- a/converters/ack/Makefile +++ b/converters/ack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:43 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:49 rillig Exp $ DISTNAME= ack139 PKGNAME= ack-1.39 @@ -10,10 +10,10 @@ COMMENT= Japanese code converter BUILD_TARGET= ack -INSTALLATION_DIRS= bin man/ja_JP.EUC/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/ja_JP.EUC/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ack ${PREFIX}/bin/ack - ${INSTALL_DATA} ${WRKSRC}/ack.1 ${PREFIX}/man/ja_JP.EUC/man1/ack.1 + ${INSTALL_DATA} ${WRKSRC}/ack.1 ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/ack.1 .include "../../mk/bsd.pkg.mk" diff --git a/converters/bbcim/Makefile b/converters/bbcim/Makefile index f8aba0bf4b1..196036d4617 100644 --- a/converters/bbcim/Makefile +++ b/converters/bbcim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:28 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:49 rillig Exp $ # DISTNAME= bbcim095-5 @@ -14,13 +14,13 @@ COMMENT= File and diskimage conversion utility for BBC Micro software WRKSRC= ${WRKDIR}/bbcim MAN_PAGE= ${FILESDIR}/bbcim.1 -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: (cd ${WRKSRC} && ${WRKSRC}/mkbbcim) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bbcim ${PREFIX}/bin/ - ${INSTALL_MAN} ${MAN_PAGE} ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${MAN_PAGE} ${PREFIX}/${PKGMANDIR}/man1/ .include "../../mk/bsd.pkg.mk" diff --git a/converters/bibtex2html/Makefile b/converters/bibtex2html/Makefile index 04dbc89c06f..3776897b4a1 100644 --- a/converters/bibtex2html/Makefile +++ b/converters/bibtex2html/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/08/10 03:21:39 minskim Exp $ +# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:49 rillig Exp $ DISTNAME= bibtex2html-1.82 CATEGORIES= converters @@ -20,7 +20,7 @@ SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= aux2bib.1 SUBST_SED.paths= -e 's,/usr/share,${PREFIX}/share,g' -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-build: cd ${WRKSRC}; ${MAKE} doc @@ -29,9 +29,9 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/aux2bib ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bibtex2html ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bib2bib ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/bibtex2html.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/bibtex2html.1 ${PREFIX}/man/man1/bib2bib.1 - ${INSTALL_MAN} ${WRKSRC}/aux2bib.1 ${PREFIX}/man/man1/aux2bib.1 + ${INSTALL_MAN} ${WRKSRC}/bibtex2html.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/bibtex2html.1 ${PREFIX}/${PKGMANDIR}/man1/bib2bib.1 + ${INSTALL_MAN} ${WRKSRC}/aux2bib.1 ${PREFIX}/${PKGMANDIR}/man1/aux2bib.1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE} ${INSTALL_DATA} ${WRKSRC}/manual.html ${PREFIX}/share/doc/${PKGBASE} ${INSTALL_DATA} ${WRKSRC}/manual.ps ${PREFIX}/share/doc/${PKGBASE} diff --git a/converters/code2html/Makefile b/converters/code2html/Makefile index dee982350f6..5010648e03c 100644 --- a/converters/code2html/Makefile +++ b/converters/code2html/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/09/28 20:52:18 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:49 rillig Exp $ # DISTNAME= code2html-0.9.1 @@ -13,10 +13,10 @@ NO_BUILD= yes REPLACE_PERL= code2html USE_TOOLS+= perl:run -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/code2html ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/code2html.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/code2html.1 ${PREFIX}/${PKGMANDIR}/man1/ .include "../../mk/bsd.pkg.mk" diff --git a/converters/dvi2tty/Makefile b/converters/dvi2tty/Makefile index a18edbe95cf..0fb627b71e8 100644 --- a/converters/dvi2tty/Makefile +++ b/converters/dvi2tty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:55 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:49 rillig Exp $ # DISTNAME= dvi2tty @@ -14,7 +14,7 @@ LICENSE= no-commercial-use MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 pre-patch: cd ${WRKSRC}; \ @@ -26,6 +26,6 @@ pre-patch: do-install: ${INSTALL_PROGRAM} \ ${WRKSRC}/disdvi ${WRKSRC}/dvi2tty ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/dvi2tty.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/dvi2tty.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/converters/fondu/Makefile b/converters/fondu/Makefile index 0a1ff9991b8..8efc0d2a48a 100644 --- a/converters/fondu/Makefile +++ b/converters/fondu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:43 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:49 rillig Exp $ # DISTNAME= fondu_src-030428 @@ -13,7 +13,7 @@ COMMENT= Utility to convert between Mac fonts and UNIX fonts WRKSRC= ${WRKDIR}/fondu GNU_CONFIGURE= YES -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fondu ${PREFIX}/bin @@ -22,11 +22,11 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tobin ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/showfond ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/ufond ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/fondu.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/dfont2res.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/frombin.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/tobin.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/showfond.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/ufond.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/fondu.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/dfont2res.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/frombin.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/tobin.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/showfond.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/ufond.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/converters/hztty/Makefile b/converters/hztty/Makefile index d5f807507c1..623a8e420f3 100644 --- a/converters/hztty/Makefile +++ b/converters/hztty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/01/19 16:11:41 tv Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:49 rillig Exp $ DISTNAME= hztty-2.0 CATEGORIES= converters @@ -21,10 +21,10 @@ BUILD_TARGET= svr4 BUILD_TARGET= bsd .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hztty ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/hztty.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/hztty.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/converters/ja-dvi2tty/Makefile b/converters/ja-dvi2tty/Makefile index 9b891377666..daac2c6a8fc 100644 --- a/converters/ja-dvi2tty/Makefile +++ b/converters/ja-dvi2tty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:29:06 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:49 rillig Exp $ DISTNAME= dvi2tty5.0 PKGNAME= ja-dvi2tty-5.0 @@ -23,11 +23,11 @@ LICENSE= no-commercial-use MAKE_FLAGS+= CFLAGS="${CFLAGS} -DDEFPAGER='\"${PREFIX}/bin/jless\"'" -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/jdvi2tty ${PREFIX}/bin/jdvi2tty ${INSTALL_PROGRAM} ${WRKSRC}/disdvi ${PREFIX}/bin/jdisdvi - ${INSTALL_MAN} ${WRKSRC}/dvi2tty.1 ${PREFIX}/man/man1/jdvi2tty.1 + ${INSTALL_MAN} ${WRKSRC}/dvi2tty.1 ${PREFIX}/${PKGMANDIR}/man1/jdvi2tty.1 .include "../../mk/bsd.pkg.mk" diff --git a/converters/kcc/Makefile b/converters/kcc/Makefile index efdb8b03b19..07e59624813 100644 --- a/converters/kcc/Makefile +++ b/converters/kcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/02/11 16:49:04 rillig Exp $ +# $NetBSD: Makefile,v 1.2 2007/01/07 09:13:49 rillig Exp $ DISTNAME= kcc PKGNAME= kcc-1.0 @@ -15,6 +15,6 @@ MAKE_FLAGS+= MANPATH=${PREFIX:Q}/man MAKE_FLAGS+= JMANDIR=ja_JP.EUC INSTALL_TARGET= install install.man -INSTALLATION_DIRS= man/ja_JP.EUC/man1 +INSTALLATION_DIRS= ${PKGMANDIR}/ja_JP.EUC/man1 .include "../../mk/bsd.pkg.mk" diff --git a/converters/nkf/Makefile b/converters/nkf/Makefile index 7e9a869f7ae..d41d9623c95 100644 --- a/converters/nkf/Makefile +++ b/converters/nkf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/25 12:29:17 taca Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:50 rillig Exp $ DISTNAME= nkf205 PKGNAME= nkf-2.05 @@ -11,12 +11,12 @@ COMMENT= Convert between various Japanese character encodings PKG_INSTALLATION_TYPES= overwrite pkgviews -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 BUILD_TARGET= nkf do-install: ${INSTALL_PROGRAM} ${WRKSRC}/nkf ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/nkf.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/nkf.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/converters/txt2pdbdoc/Makefile b/converters/txt2pdbdoc/Makefile index 10b0453bcee..7d39596ac31 100644 --- a/converters/txt2pdbdoc/Makefile +++ b/converters/txt2pdbdoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/10/29 18:07:48 minskim Exp $ +# $NetBSD: Makefile,v 1.4 2007/01/07 09:13:50 rillig Exp $ DISTNAME= txt2pdbdoc-1.4.4 PKGREVISION= 1 @@ -14,6 +14,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= perl:run GNU_CONFIGURE= yes -INSTALLATION_DIRS= bin man/man1 man/man4 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man4 .include "../../mk/bsd.pkg.mk" diff --git a/converters/unix2dos/Makefile b/converters/unix2dos/Makefile index 3fe4320358c..2efa427cb65 100644 --- a/converters/unix2dos/Makefile +++ b/converters/unix2dos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/06/16 06:57:43 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2007/01/07 09:13:50 rillig Exp $ DISTNAME= unix2dos-1.2 CATEGORIES= converters @@ -11,12 +11,12 @@ COMMENT= Translate ASCII files to/from DOS (cr/lf) and UNIX (lf) WRKSRC= ${WRKDIR} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/unix2dos ${PREFIX}/bin/unix2dos ${LN} -f ${PREFIX}/bin/unix2dos ${PREFIX}/bin/dos2unix - ${INSTALL_MAN} ${WRKSRC}/man1/unix2dos.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/man1/dos2unix.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man1/unix2dos.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/man1/dos2unix.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile index a74317ee587..e4fd3461aa3 100644 --- a/converters/uulib/Makefile +++ b/converters/uulib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2006/06/04 16:26:53 joerg Exp $ +# $NetBSD: Makefile,v 1.39 2007/01/07 09:13:50 rillig Exp $ # DISTNAME= uudeview-0.5.20 @@ -24,14 +24,14 @@ DOCFILES= HISTORY doc/Makefile doc/README doc/binhex.fig \ .include "../../mk/bsd.prefs.mk" -INSTALLATION_DIRS= include lib man/man3 +INSTALLATION_DIRS= include lib ${PKGMANDIR}/man3 do-install: ${LIBTOOL} ${INSTALL_LIB} ${WRKSRC}/uulib/libuu.la ${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/uulib/uudeview.h ${PREFIX}/include ${SED} -e 's|FUNKYTOKENHERE|${PREFIX}|g' \ < ${FILESDIR}/uulib.3 > ${WRKSRC}/uulib.3 - ${INSTALL_MAN} ${WRKSRC}/uulib.3 ${PREFIX}/man/man3 + ${INSTALL_MAN} ${WRKSRC}/uulib.3 ${PREFIX}/${PKGMANDIR}/man3 @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uulib .for docfile in ${DOCFILES} @${INSTALL_MAN} ${WRKSRC}/${docfile} ${PREFIX}/share/doc/uulib diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile index 404d0e72360..08e9cdcab53 100644 --- a/converters/xdeview/Makefile +++ b/converters/xdeview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/03/04 21:29:07 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2007/01/07 09:13:50 rillig Exp $ DISTNAME= uudeview-0.5.20 PKGNAME= xdeview-0.5.20 @@ -19,7 +19,7 @@ BUILD_TARGET= xdeview INSTALL_TARGET= install-tcl post-install: - ${INSTALL_MAN} ${WRKSRC}/man/xdeview.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/xdeview.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../converters/uulib/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" diff --git a/cross/atasm/Makefile b/cross/atasm/Makefile index 08d27b8160c..d067062da4e 100644 --- a/cross/atasm/Makefile +++ b/cross/atasm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:07 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:50 rillig Exp $ # DISTNAME= atasm104 @@ -19,13 +19,13 @@ NO_CONFIGURE= YES DOCDIR= ${PREFIX}/share/doc/atasm -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_PROGRAM} ${WRKSRC}/atasm ${PREFIX}/bin/atasm ${SED} -e 's,%%DOCDIR%%,${DOCDIR},g' < ${WRKSRC}/atasm.1.in > ${WRKSRC}/atasm.1 - ${INSTALL_DATA} ${WRKSRC}/atasm.1 ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/atasm.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/atasm.txt ${DOCDIR} .include "../../devel/zlib/buildlink3.mk" diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile index f3b53f0686f..fbf9abb833b 100644 --- a/databases/mysql5-server/Makefile +++ b/databases/mysql5-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/08/06 16:30:40 tron Exp $ +# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:50 rillig Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} SVR4_PKGNAME= mysqs @@ -59,9 +59,9 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqld_safe ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/man/mysqld_multi.1 ${PREFIX}/man/man1 - #${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/man/mysqld_multi.1 ${PREFIX}/${PKGMANDIR}/man1 + #${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_secure_installation.sh \ ${PREFIX}/bin/mysql_secure_installation diff --git a/databases/sdbm/Makefile b/databases/sdbm/Makefile index 9bf6b6e1c11..b146166f9aa 100644 --- a/databases/sdbm/Makefile +++ b/databases/sdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:11 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:50 rillig Exp $ # DISTNAME= sdbm @@ -21,6 +21,6 @@ post-extract: post-install: ${INSTALL_DATA} ${WRKSRC}/sdbm.h ${PREFIX}/include/ - ${INSTALL_MAN} ${WRKSRC}/sdbm.3 ${PREFIX}/man/man3/ + ${INSTALL_MAN} ${WRKSRC}/sdbm.3 ${PREFIX}/${PKGMANDIR}/man3/ .include "../../mk/bsd.pkg.mk" diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile index 623daba6d77..34e4d5db48f 100644 --- a/databases/sqlite/Makefile +++ b/databases/sqlite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/03/04 21:29:11 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2007/01/07 09:13:50 rillig Exp $ DISTNAME= sqlite-2.8.16 PKGREVISION= 1 @@ -30,7 +30,7 @@ post-extract: ${MKDIR} ${WRKSRC} post-install: - ${INSTALL_MAN} ${WRKDIR}/sqlite-2.8.16/sqlite.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKDIR}/sqlite-2.8.16/sqlite.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile index 95552e0522f..4bb122d3536 100644 --- a/devel/argtable/Makefile +++ b/devel/argtable/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/10/04 21:35:58 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:50 rillig Exp $ DISTNAME= argtable-1.2 CATEGORIES= devel @@ -12,10 +12,10 @@ GNU_CONFIGURE= YES USE_LANGUAGES= c c++ -INSTALLATION_DIRS= include lib man/man3 share/doc/argtable +INSTALLATION_DIRS= include lib ${PKGMANDIR}/man3 share/doc/argtable post-install: - ${INSTALL_DATA} ${WRKSRC}/man/man3/*.3 ${PREFIX}/man/man3 + ${INSTALL_DATA} ${WRKSRC}/man/man3/*.3 ${PREFIX}/${PKGMANDIR}/man3 ${INSTALL_DATA} ${WRKSRC}/COPYING.LIB ${PREFIX}/share/doc/argtable .include "../../mk/bsd.pkg.mk" diff --git a/devel/as31/Makefile b/devel/as31/Makefile index 68cdde5a1a8..e9b1eb091c7 100644 --- a/devel/as31/Makefile +++ b/devel/as31/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/09/09 02:41:56 obache Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:50 rillig Exp $ DISTNAME= asm.8051 PKGNAME= as31-19900126 @@ -18,10 +18,10 @@ USE_TOOLS+= yacc MAKE_FILE= makefile BUILD_TARGET= as31 -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/as31 ${PREFIX}/bin/as31 - ${INSTALL_DATA} ${WRKSRC}/as31.man ${PREFIX}/man/man1/as31.1 + ${INSTALL_DATA} ${WRKSRC}/as31.man ${PREFIX}/${PKGMANDIR}/man1/as31.1 .include "../../mk/bsd.pkg.mk" diff --git a/devel/c4/Makefile b/devel/c4/Makefile index 1fae4dfa22f..c76e6d395b5 100644 --- a/devel/c4/Makefile +++ b/devel/c4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:45 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:50 rillig Exp $ # DISTNAME= c4 @@ -14,10 +14,10 @@ DEPENDS+= p4-[0-9]*:../../devel/p4 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} BUILD_TARGET= c4 -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/c4 ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/c4.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/c4.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/devel/cvsps/Makefile b/devel/cvsps/Makefile index affb79f2946..3e8b94a2608 100644 --- a/devel/cvsps/Makefile +++ b/devel/cvsps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:40 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2007/01/07 09:13:50 rillig Exp $ # DISTNAME= cvsps-2.1 @@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= gmake -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 LIBS.SunOS+= -lnsl -lsocket MAKE_ENV+= LIBS=${LIBS:M*:Q} diff --git a/devel/cvsup-bin/Makefile b/devel/cvsup-bin/Makefile index 13bf13a82c3..699a9fee1cb 100644 --- a/devel/cvsup-bin/Makefile +++ b/devel/cvsup-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:13 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:50 rillig Exp $ DISTNAME= cvsup-static-16.1.h PKGNAME= ${DISTNAME:C/static/bin/} @@ -19,7 +19,7 @@ DIST_SUBDIR= cvsup-i386-1.6 CONFLICTS= cvsup-[0-9]* cvsup-gui-[0-9]* -INSTALLATION_DIRS= bin man/man1 man/man5 sbin +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 sbin do-install: for i in cvpasswd cvsup ; do \ @@ -29,10 +29,10 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sbin/$$i ${PREFIX}/sbin; \ done for i in cvpasswd.1 cvsup.1; do \ - ${INSTALL_MAN} ${WRKSRC}/man/man1/$$i ${PREFIX}/man/man1; \ + ${INSTALL_MAN} ${WRKSRC}/man/man1/$$i ${PREFIX}/${PKGMANDIR}/man1; \ done for i in cvsupd.8; do \ - ${INSTALL_MAN} ${WRKSRC}/man/man8/$$i ${PREFIX}/man/man8; \ + ${INSTALL_MAN} ${WRKSRC}/man/man8/$$i ${PREFIX}/${PKGMANDIR}/man8; \ done ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cvsup ${INSTALL_DATA} ${WRKSRC}/share/doc/cvsup/License \ diff --git a/devel/dmake/Makefile b/devel/dmake/Makefile index 680c904f00d..7a2cbc88c06 100644 --- a/devel/dmake/Makefile +++ b/devel/dmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/09/09 02:41:57 obache Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:50 rillig Exp $ # DISTNAME= dmake-v4.1-src-export.all-unknown-all @@ -16,7 +16,7 @@ MAKE_FILE= makefile BUILD_TARGET= linux WRKSRC= ${WRKDIR}/dmake -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-configure: cd ${WRKSRC} && ${RM} unix/bsd43/dirent.h && \ @@ -26,7 +26,7 @@ do-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dmake ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/dmake.tf ${PREFIX}/man/man1/dmake.1 + ${INSTALL_MAN} ${WRKSRC}/man/dmake.tf ${PREFIX}/${PKGMANDIR}/man1/dmake.1 ${INSTALL_DATA_DIR} ${PREFIX}/share/dmake ${CP} -pR ${WRKSRC}/startup ${PREFIX}/share/dmake diff --git a/devel/electricfence/Makefile b/devel/electricfence/Makefile index 0ca2651792b..3821d3fd46c 100644 --- a/devel/electricfence/Makefile +++ b/devel/electricfence/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/01/08 20:25:34 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:50 rillig Exp $ DISTNAME= ElectricFence-2.1 PKGREVISION= 1 @@ -17,10 +17,10 @@ CFLAGS+= -g -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS CFLAGS+= -g .endif -INSTALLATION_DIRS= lib man/man3 +INSTALLATION_DIRS= lib ${PKGMANDIR}/man3 do-install: ${INSTALL_DATA} ${WRKSRC}/libefence.a ${PREFIX}/lib - ${INSTALL_MAN} ${WRKSRC}/libefence.3 ${PREFIX}/man/man3 + ${INSTALL_MAN} ${WRKSRC}/libefence.3 ${PREFIX}/${PKGMANDIR}/man3 .include "../../mk/bsd.pkg.mk" diff --git a/devel/its4/Makefile b/devel/its4/Makefile index afcc67ead0b..e6a15357659 100644 --- a/devel/its4/Makefile +++ b/devel/its4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/06/02 14:14:31 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:50 rillig Exp $ # DISTNAME= its4-1.1.1 @@ -16,13 +16,13 @@ WRKSRC= ${WRKDIR}/its4 HAS_CONFIGURE= YES CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --datadir=${PREFIX}/share/its4 -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 USE_LANGUAGES= c++ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/its4 ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/docs/its4.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/docs/its4.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/its4 cd ${WRKSRC} && ${INSTALL_DATA} LICENSE TODO vulns.i4d \ ${PREFIX}/share/its4 diff --git a/devel/lcc/Makefile b/devel/lcc/Makefile index 6f95e58834e..4bf8124f3f3 100644 --- a/devel/lcc/Makefile +++ b/devel/lcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/09/09 02:41:58 obache Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:51 rillig Exp $ DISTNAME= lcc-4.1 CATEGORIES= devel lang @@ -19,7 +19,7 @@ ONLY_FOR_PLATFORM= *-*-i386 BUILDDIR= ${WRKSRC}/src MAKE_FILE= makefile -INSTALLATION_DIRS= bin libexec man/man1 +INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man1 post-extract: ${CP} ${FILESDIR}/x86bsd.md ${WRKSRC}/src/ @@ -44,7 +44,7 @@ do-install: ${PREFIX}/share/lcc/include ${INSTALL_DATA} ${FILESDIR}/cdefs.h \ ${PREFIX}/share/lcc/include/sys - ${INSTALL_MAN} ${WRKSRC}/doc/lcc.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/bprint.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/lcc.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/bprint.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/devel/libgetopt/Makefile b/devel/libgetopt/Makefile index 3f274e1a8c3..2504fdb7c9c 100644 --- a/devel/libgetopt/Makefile +++ b/devel/libgetopt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/03/04 21:29:17 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2007/01/07 09:13:51 rillig Exp $ # DISTNAME= libgetopt-1.4.1 @@ -20,7 +20,7 @@ MAKEFLAGS+= NETBSD_COMPATIBLE=YES CFLAGS+= -DREPLACE_GETOPT .endif -INSTALLATION_DIRS= include lib man/man3 +INSTALLATION_DIRS= include lib ${PKGMANDIR}/man3 do-extract: ${MKDIR} ${WRKSRC} @@ -34,6 +34,6 @@ do-build: do-install: ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libgetopt.la ${PREFIX}/lib/ ${INSTALL_DATA} ${WRKSRC}/getopt.h ${PREFIX}/include/ - ${INSTALL_MAN} ${WRKSRC}/getopt_long.3 ${PREFIX}/man/man3/ + ${INSTALL_MAN} ${WRKSRC}/getopt_long.3 ${PREFIX}/${PKGMANDIR}/man3/ .include "../../mk/bsd.pkg.mk" diff --git a/devel/libnet11/Makefile b/devel/libnet11/Makefile index 7fd12f7ecfa..157e9c6ef2b 100644 --- a/devel/libnet11/Makefile +++ b/devel/libnet11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/06/17 20:39:36 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2007/01/07 09:13:51 rillig Exp $ DISTNAME= libnet-1.1.2.1 PKGREVISION= 1 @@ -23,7 +23,7 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libnet ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libnet/html ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/libnet - ${INSTALL_MAN_DIR} ${PREFIX}/man/man3 + ${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man3 ${INSTALL_DATA} ${WRKSRC}/doc/html/*.html \ ${PREFIX}/share/doc/libnet/html @@ -38,7 +38,7 @@ post-install: ${PREFIX}/share/examples/libnet ${INSTALL_MAN} ${WRKSRC}/doc/man/man3/*.3 \ - ${PREFIX}/man/man3 + ${PREFIX}/${PKGMANDIR}/man3 for f in ${LNDOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/doc/$$f \ diff --git a/devel/libscsi/Makefile b/devel/libscsi/Makefile index ba023f3e0b0..5e8677f6de5 100644 --- a/devel/libscsi/Makefile +++ b/devel/libscsi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/06/18 12:10:30 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:51 rillig Exp $ # DISTNAME= libscsi-1.6 @@ -19,6 +19,6 @@ MAKE_ENV+= MANOWN=${MANOWN} MANGRP=${MANGRP} MANCOMPRESSED_IF_MANZ= yes -INSTALLATION_DIRS= include lib man/cat3 man/man3 +INSTALLATION_DIRS= include lib ${PKGMANDIR}/cat3 ${PKGMANDIR}/man3 .include "../../mk/bsd.pkg.mk" diff --git a/devel/memcached/Makefile b/devel/memcached/Makefile index cc1d5f150b0..adc6229f322 100644 --- a/devel/memcached/Makefile +++ b/devel/memcached/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:18 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:51 rillig Exp $ # DISTNAME= memcached-1.1.12 @@ -13,11 +13,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent} -INSTALLATION_DIRS= bin share/doc/${PKGBASE} man/man1 +INSTALLATION_DIRS= bin share/doc/${PKGBASE} ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/memcached ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/doc/memcached.1 ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/doc/memcached.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/${PKGBASE} .include "../../devel/libevent/buildlink3.mk" diff --git a/devel/mkcmd/Makefile b/devel/mkcmd/Makefile index dae9c52f898..92e70a99f27 100644 --- a/devel/mkcmd/Makefile +++ b/devel/mkcmd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/01/25 15:19:16 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:51 rillig Exp $ # DISTNAME= mkcmd-8.14 @@ -11,7 +11,7 @@ MAINTAINER= epg@NetBSD.org COMMENT= Command-line parser and manual page generator -INSTALLATION_DIRS= bin man/man1 man/man5 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 PKG_INSTALLATION_TYPES= overwrite pkgviews do-build: @@ -25,8 +25,8 @@ do-install: install .endfor ${INSTALL_MAN} ${WRKSRC}/bin/mkcmd/mkcmd.man \ - ${PREFIX}/man/man1/mkcmd.1 + ${PREFIX}/${PKGMANDIR}/man1/mkcmd.1 ${INSTALL_MAN} ${WRKSRC}/lib/mkcmd/mkcmd.man \ - ${PREFIX}/man/man5/mkcmd.5 + ${PREFIX}/${PKGMANDIR}/man5/mkcmd.5 .include "../../mk/bsd.pkg.mk" diff --git a/devel/netbsd-iscsi/Makefile b/devel/netbsd-iscsi/Makefile index cebeef91461..03081689395 100644 --- a/devel/netbsd-iscsi/Makefile +++ b/devel/netbsd-iscsi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/06/17 16:52:27 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:51 rillig Exp $ DISTNAME= netbsd-iscsi-20060527 CATEGORIES= devel @@ -16,8 +16,8 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/iscsi-harness ${PREFIX}/sbin/iscsi-harness ${INSTALL_DATA_DIR} ${PREFIX}/share/iscsi ${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${PREFIX}/share/iscsi/FAQ - ${INSTALL_MAN} ${WRKSRC}/src/iscsi-target.8 ${PREFIX}/man/man8/iscsi-target.8 - ${INSTALL_MAN} ${WRKSRC}/src/targets.5 ${PREFIX}/man/man5/targets.5 + ${INSTALL_MAN} ${WRKSRC}/src/iscsi-target.8 ${PREFIX}/${PKGMANDIR}/man8/iscsi-target.8 + ${INSTALL_MAN} ${WRKSRC}/src/targets.5 ${PREFIX}/${PKGMANDIR}/man5/targets.5 .include "../../mk/pthread.buildlink3.mk" diff --git a/devel/newfile/Makefile b/devel/newfile/Makefile index 83a7b4e5f18..92f10ab65a2 100644 --- a/devel/newfile/Makefile +++ b/devel/newfile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/02/03 04:43:47 taca Exp $ +# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:51 rillig Exp $ # DISTNAME= newfile-1.0.14 @@ -19,7 +19,7 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/src/newfile.rb ${PREFIX}/bin/newfile ${INSTALL_DATA} ${WRKSRC}/src/fileproc.rb ${WRKSRC}/src/sytab.rb \ ${PREFIX}/share/newfile/ - ${INSTALL_MAN} ${WRKSRC}/doc/newfile.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/doc/newfile.1 ${PREFIX}/${PKGMANDIR}/man1/ .include "../../lang/ruby/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/p4-docs/Makefile b/devel/p4-docs/Makefile index 5d77d2204b6..48bbf1bdba4 100644 --- a/devel/p4-docs/Makefile +++ b/devel/p4-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/03/12 14:32:45 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:51 rillig Exp $ # DISTNAME= p4-docs @@ -43,10 +43,10 @@ HTMLDIR= share/doc/html/p4 PLIST_SUBST+= DOCDIR=${DOCDIR:Q} PLIST_SUBST+= HTMLDIR=${HTMLDIR:Q} -INSTALLATION_DIRS= man/man1 +INSTALLATION_DIRS= ${PKGMANDIR}/man1 do-install: - ${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/*.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/*.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/relnotes.txt \ diff --git a/devel/palmpower/Makefile b/devel/palmpower/Makefile index 647d3063390..dec61609d46 100644 --- a/devel/palmpower/Makefile +++ b/devel/palmpower/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/03/04 21:29:25 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2007/01/07 09:13:51 rillig Exp $ # DISTNAME= palmpower-1.0.2 @@ -13,7 +13,7 @@ CPPFLAGS+= -Dunix USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-build: cd ${WRKSRC}/utils && \ @@ -23,6 +23,6 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/pila/pila ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/src/pilotdis/pilotdis ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/utils/splitprc ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/pilotdis.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/pilotdis.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/devel/ratfor/Makefile b/devel/ratfor/Makefile index f52a2381d37..5ba5297caab 100644 --- a/devel/ratfor/Makefile +++ b/devel/ratfor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/03/04 21:29:29 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:51 rillig Exp $ DISTNAME= ratfor77 PKGNAME= ratfor-1.0 @@ -12,10 +12,10 @@ COMMENT= Preprocessor for the Ratfor dialect of Fortran BUILD_TARGET= ratfor77 USE_TOOLS+= gmake -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ratfor77 ${PREFIX}/bin/ratfor - ${INSTALL_MAN} ${WRKSRC}/ratfor.man ${PREFIX}/man/man1/ratfor.1 + ${INSTALL_MAN} ${WRKSRC}/ratfor.man ${PREFIX}/${PKGMANDIR}/man1/ratfor.1 .include "../../mk/bsd.pkg.mk" diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile index 4cfc86c71ce..b80c6b7f322 100644 --- a/devel/rcs/Makefile +++ b/devel/rcs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/07/01 22:03:12 heinz Exp $ +# $NetBSD: Makefile,v 1.22 2007/01/07 09:13:51 rillig Exp $ # DISTNAME= rcs-5.7 @@ -25,7 +25,7 @@ CONFIGURE_HAS_MANDIR= no post-install: ${RM} -f ${PREFIX}/bin/rcslog ${LN} -s ${PREFIX}/bin/rlog ${PREFIX}/bin/rcslog - ${RM} -f ${PREFIX}/man/man1/rcslog.1 ${PREFIX}/man/man1/rcslog.1.gz - ${LN} -s ${PREFIX}/man/man1/rlog.1 ${PREFIX}/man/man1/rcslog.1 + ${RM} -f ${PREFIX}/${PKGMANDIR}/man1/rcslog.1 ${PREFIX}/${PKGMANDIR}/man1/rcslog.1.gz + ${LN} -s ${PREFIX}/${PKGMANDIR}/man1/rlog.1 ${PREFIX}/${PKGMANDIR}/man1/rcslog.1 .include "../../mk/bsd.pkg.mk" diff --git a/devel/roundup/Makefile b/devel/roundup/Makefile index 189c2155a66..331c4fa1489 100644 --- a/devel/roundup/Makefile +++ b/devel/roundup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/10/04 21:36:00 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2007/01/07 09:13:51 rillig Exp $ DISTNAME= roundup-1.1.2 CATEGORIES= devel @@ -29,10 +29,10 @@ PYTHON_PATCH_SCRIPTS+= tools/migrate-queries.py tools/pygettext.py ROUNDUPDOCDIR= ${PREFIX}/share/doc/roundup post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/roundup-admin.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/roundup-demo.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/roundup-mailgw.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/roundup-server.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/roundup-admin.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/roundup-demo.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/roundup-mailgw.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/roundup-server.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${ROUNDUPDOCDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${ROUNDUPDOCDIR} ${INSTALL_DATA} ${WRKSRC}/COPYING.txt ${ROUNDUPDOCDIR} diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile index 62f74bcc496..a4fbb47ac4b 100644 --- a/devel/sfio/Makefile +++ b/devel/sfio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:29 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:51 rillig Exp $ # # pkgsrc/mail/sendmail (as of 8.11.0) specifically wants 1999, not 2000. @@ -20,7 +20,7 @@ COMMENT= Safe and Fast IO library WRKSRC= ${WRKDIR} -INSTALLATION_DIRS= man/man3 +INSTALLATION_DIRS= ${PKGMANDIR}/man3 do-extract: @${MKDIR} ${WRKDIR} diff --git a/devel/unidiff/Makefile b/devel/unidiff/Makefile index 13fffd1cd94..535a8e4909f 100644 --- a/devel/unidiff/Makefile +++ b/devel/unidiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:30 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:51 rillig Exp $ # DISTNAME= part01 @@ -17,11 +17,11 @@ BUILD_DEPENDS+= gsharutils>=4.2.1:../../archivers/gsharutils WRKSRC= ${WRKDIR} EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${PREFIX}/bin/gunshar -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/unify ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/unipatch ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/unify.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/unify.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/devel/uno/Makefile b/devel/uno/Makefile index 6f4ffc412fb..ec52bb0eb6f 100644 --- a/devel/uno/Makefile +++ b/devel/uno/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/09/09 02:41:58 obache Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:51 rillig Exp $ # DISTNAME= uno_v28 @@ -31,7 +31,7 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/Uno/doc/uno_man.pdf ${PREFIX}/share/doc/uno ${INSTALL_DATA} ${WRKDIR}/Uno/doc/uno_manpage.pdf ${PREFIX}/share/doc/uno ${INSTALL_DATA} ${WRKDIR}/Uno/doc/uno_short.pdf ${PREFIX}/share/doc/uno - ${INSTALL_MAN} ${WRKDIR}/Uno/doc/uno.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKDIR}/Uno/doc/uno.1 ${PREFIX}/${PKGMANDIR}/man1 USE_TOOLS+= bison gmake flex diff --git a/devel/xmake/Makefile b/devel/xmake/Makefile index c4a617ed0b1..91f8a035a46 100644 --- a/devel/xmake/Makefile +++ b/devel/xmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/05/28 16:35:38 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2007/01/07 09:13:52 rillig Exp $ # DISTNAME= xmake-1.06 @@ -14,6 +14,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/xmake -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile index 06d3ca66aeb..9daea4a888e 100644 --- a/devel/xxgdb/Makefile +++ b/devel/xxgdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:36 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:52 rillig Exp $ # DISTNAME= xxgdb-1.12 @@ -18,12 +18,12 @@ USE_IMAKE= yes MAKE_ENV+= CPPFLAGS= .endif -INSTALLATION_DIRS= bin lib/X11/app-defaults man/man1 +INSTALLATION_DIRS= bin lib/X11/app-defaults ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xxgdb ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/XDbx.ad ${PREFIX}/lib/X11/app-defaults/XDbx - ${INSTALL_DATA} ${WRKSRC}/xxgdb.man ${PREFIX}/man/man1/xxgdb.1 + ${INSTALL_DATA} ${WRKSRC}/xxgdb.man ${PREFIX}/${PKGMANDIR}/man1/xxgdb.1 .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/devel/z80-asm/Makefile b/devel/z80-asm/Makefile index 7cfd6633a6f..741556f03d7 100644 --- a/devel/z80-asm/Makefile +++ b/devel/z80-asm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:54 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:52 rillig Exp $ # DISTNAME= z80-asm-1.0 @@ -13,14 +13,14 @@ COMMENT= Z80 assembly code assembler and disassembler GNU_CONFIGURE= yes USE_TOOLS+= gmake -INSTALLATION_DIRS= bin man/man1 man/man5 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/z80-asm ${PREFIX}/bin/z80-asm ${INSTALL_PROGRAM} ${WRKSRC}/z80-dis ${PREFIX}/bin/z80-dis - ${INSTALL_DATA} ${WRKSRC}/doc/z80-asm.1 ${PREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/doc/z80-dis.1 ${PREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/doc/z80-asm.5 ${PREFIX}/man/man5 - ${INSTALL_DATA} ${WRKSRC}/doc/z80-file.5 ${PREFIX}/man/man5 + ${INSTALL_DATA} ${WRKSRC}/doc/z80-asm.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_DATA} ${WRKSRC}/doc/z80-dis.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_DATA} ${WRKSRC}/doc/z80-asm.5 ${PREFIX}/${PKGMANDIR}/man5 + ${INSTALL_DATA} ${WRKSRC}/doc/z80-file.5 ${PREFIX}/${PKGMANDIR}/man5 .include "../../mk/bsd.pkg.mk" diff --git a/editors/ce-x11/Makefile b/editors/ce-x11/Makefile index 09e47a00775..c1b21573871 100644 --- a/editors/ce-x11/Makefile +++ b/editors/ce-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:55 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:52 rillig Exp $ # .include "../../editors/ce/Makefile.common" @@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews BUILD_TARGET= xce INSTALL_TARGET= install-x11 man-install-x11 -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../mk/curses.buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/editors/ce/Makefile b/editors/ce/Makefile index 7749dd14102..6638e580c68 100644 --- a/editors/ce/Makefile +++ b/editors/ce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/03/11 10:07:49 ghen Exp $ +# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:52 rillig Exp $ # .include "Makefile.common" @@ -15,7 +15,7 @@ REPLACE_FILES.bash= teach-ce.in BUILD_TARGET= ce INSTALL_TARGET= install man-install -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/easyedit/Makefile b/editors/easyedit/Makefile index 7620da6c70f..da25e771ed8 100644 --- a/editors/easyedit/Makefile +++ b/editors/easyedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:29:31 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:52 rillig Exp $ # DISTNAME= ee-1.4.6.src @@ -13,10 +13,10 @@ COMMENT= Easy to use text editor WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ee ${PREFIX}/bin/easyedit - ${INSTALL_MAN} ${WRKSRC}/ee.1 ${PREFIX}/man/man1/easyedit.1 + ${INSTALL_MAN} ${WRKSRC}/ee.1 ${PREFIX}/${PKGMANDIR}/man1/easyedit.1 .include "../../mk/bsd.pkg.mk" diff --git a/editors/heme/Makefile b/editors/heme/Makefile index 296d304f1c0..8dc39b88de0 100644 --- a/editors/heme/Makefile +++ b/editors/heme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:56 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2007/01/07 09:13:52 rillig Exp $ # DISTNAME= heme-0.4 @@ -16,12 +16,12 @@ BUILD_TARGET= heme USE_NCURSES= # mvwchgat USE_TOOLS+= gmake -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../devel/ncurses/buildlink3.mk" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/heme ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/heme.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/heme.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile index 8713e6539bf..06f081c7ba8 100644 --- a/editors/hnb/Makefile +++ b/editors/hnb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/03/04 21:29:31 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:52 rillig Exp $ # DISTNAME= hnb-1.9.17 @@ -17,11 +17,11 @@ USE_TOOLS+= gmake BUILD_DIRS= ${WRKSRC}/src BUILD_TARGET= hnb -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/hnb ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/hnb.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/hnb.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile index 35ff75c9ce4..ee10a89a6ab 100644 --- a/editors/manedit/Makefile +++ b/editors/manedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/09/09 02:41:58 obache Exp $ +# $NetBSD: Makefile,v 1.27 2007/01/07 09:13:52 rillig Exp $ # DISTNAME= manedit-0.5.6 @@ -20,7 +20,7 @@ MAKE_ENV+= CPP=${CXX:Q} # The FreeBSD makefile may be used as "generic UNIX". MAKE_FILE= Makefile.FreeBSD -INSTALLATION_DIRS= bin man/man1 man/man7 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man7 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/manedit ${PREFIX}/bin @@ -29,11 +29,11 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/manedit \ ${PREFIX}/share/manedit/templates \ ${PREFIX}/share/manedit/icons - ${INSTALL_MAN} ${WRKSRC}/manedit.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/manedit.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_MAN} ${WRKSRC}/help/manpage_writing_procedures \ - ${PREFIX}/man/man7/manpage_writing_procedures.7 + ${PREFIX}/${PKGMANDIR}/man7/manpage_writing_procedures.7 ${INSTALL_MAN} ${WRKSRC}/help/manpage_xml_referance \ - ${PREFIX}/man/man7/manpage_xml_reference.7 + ${PREFIX}/${PKGMANDIR}/man7/manpage_xml_reference.7 cd ${WRKSRC}/templates && ${INSTALL_DATA} api.mpt config.mpt \ intro.mpt program.mpt ${PREFIX}/share/manedit/templates cd ${WRKSRC} && ${INSTALL_DATA} manedit.xpm \ diff --git a/editors/ne/Makefile b/editors/ne/Makefile index 4e15d384f2a..624c5836f06 100644 --- a/editors/ne/Makefile +++ b/editors/ne/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:10 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:52 rillig Exp $ DISTNAME= ne-1.31 CATEGORIES= editors @@ -15,11 +15,11 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz BUILD_TARGET= NetBSD ne -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/nenewp ${PREFIX}/bin/ne - ${INSTALL_MAN} ${_DISTDIR}/ne.manpage.1 ${PREFIX}/man/man1/ne.1 + ${INSTALL_MAN} ${_DISTDIR}/ne.manpage.1 ${PREFIX}/${PKGMANDIR}/man1/ne.1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ne ${INSTALL_DATA} ${_DISTDIR}/NE.spec.ascii ${_DISTDIR}/NE.changes.spec \ ${WRKSRC}/LICENCE ${PREFIX}/share/doc/ne diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index 2ddad2af5a1..ab859c45f7b 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2006/11/06 11:08:37 joerg Exp $ +# $NetBSD: Makefile,v 1.47 2007/01/07 09:13:52 rillig Exp $ DISTNAME= nedit-${VERS}-src PKGNAME= nedit-${VERS} @@ -20,13 +20,13 @@ VERS= 5.5 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} BUILD_TARGET= netbsd -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/source/nedit ${DESTDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/source/nc ${DESTDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/nedit.man ${DESTDIR}${PREFIX}/man/man1/nedit.1 - ${INSTALL_MAN} ${WRKSRC}/doc/nc.man ${DESTDIR}${PREFIX}/man/man1/nedit-nc.1 + ${INSTALL_MAN} ${WRKSRC}/doc/nedit.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nedit.1 + ${INSTALL_MAN} ${WRKSRC}/doc/nc.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nedit-nc.1 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/nedit ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/nedit ${INSTALL_DATA} ${WRKSRC}/ReleaseNotes ${DESTDIR}${PREFIX}/share/doc/nedit diff --git a/emulators/fceu/Makefile b/emulators/fceu/Makefile index 61b233ce564..dcc4f7c8639 100644 --- a/emulators/fceu/Makefile +++ b/emulators/fceu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/06/12 16:28:06 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:53 rillig Exp $ # DISTNAME= fceu-0.98.13.src @@ -24,7 +24,7 @@ SUBST_SED.dsp= -e "s|/dev/dsp|${DEVOSSAUDIO}|" post-install: ${INSTALL_DATA} ${WRKSRC}/Documentation/fceu-sdl.6 \ - ${PREFIX}/man/man6/fceu.6 + ${PREFIX}/${PKGMANDIR}/man6/fceu.6 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fceu ${INSTALL_DATA} ${WRKSRC}/Documentation/*.html \ ${PREFIX}/share/doc/fceu diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile index d051a2bc9b9..d6d4b939185 100644 --- a/emulators/gxemul/Makefile +++ b/emulators/gxemul/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/11/09 20:01:55 xtraeme Exp $ +# $NetBSD: Makefile,v 1.26 2007/01/07 09:13:53 rillig Exp $ # DISTNAME= gxemul-0.4.3 @@ -19,7 +19,7 @@ INSTALLATION_DIRS= bin share/doc/${PKGBASE} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gxemul ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/gxemul.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/gxemul.1 ${PREFIX}/${PKGMANDIR}/man1 .for f in README HISTORY TODO RELEASE LICENSE ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/${PKGBASE} .endfor diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile index ff74764642a..98957bfc71a 100644 --- a/emulators/ski/Makefile +++ b/emulators/ski/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/07/18 23:27:14 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:53 rillig Exp $ DISTNAME= ski-0.9.81-l6-i686 PKGNAME= ski-0.9.81.6 @@ -38,7 +38,7 @@ FETCH_MESSAGE= \ do-install: ${INSTALL_PROGRAM} ${WRKDIR}/nue/usr/bin/*ski* ${PREFIX}/bin - ${INSTALL_MAN} ${WRKDIR}/nue/usr/man/man1/*ski*.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKDIR}/nue/usr/man/man1/*ski*.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA} ${WRKDIR}/nue/usr/X11R6/lib/X11/app-defaults/XSki ${PREFIX}/lib/X11/app-defaults/XSki .include "../../mk/bsd.pkg.mk" diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile index adee8ffaea9..37f4d0cdb44 100644 --- a/emulators/twin/Makefile +++ b/emulators/twin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/05/18 20:29:58 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2007/01/07 09:13:53 rillig Exp $ # DISTNAME= twin-src-3.1.14 @@ -27,8 +27,8 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/documentation/* ${PREFIX}/share/doc/twin/ ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/ ${INSTALL_DATA} ${WRKSRC}/include/*.h.in ${PREFIX}/include/ - ${INSTALL_DATA} ${WRKSRC}/documentation/rc.1 ${PREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/documentation/debugger.1 ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/documentation/rc.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_DATA} ${WRKSRC}/documentation/debugger.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_PROGRAM} ${WRKSRC}/tools/rc/rc ${PREFIX}/bin .include "../../mk/x11.buildlink3.mk" diff --git a/emulators/vmips/Makefile b/emulators/vmips/Makefile index 356ff20526b..30a55fac166 100644 --- a/emulators/vmips/Makefile +++ b/emulators/vmips/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/06/02 14:02:45 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2007/01/07 09:13:53 rillig Exp $ # DISTNAME= vmips-1.3.1 @@ -11,7 +11,7 @@ COMMENT= MIPS R3000 emulator USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -INSTALLATION_DIRS= bin include/vmips man/man1 share/vmips share/examples/vmips +INSTALLATION_DIRS= bin include/vmips ${PKGMANDIR}/man1 share/vmips share/examples/vmips INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q} EGDIR= ${PREFIX}/share/examples/vmips diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile index 08ad80635a4..cdca5b5de31 100644 --- a/emulators/vmware/Makefile +++ b/emulators/vmware/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2007/01/01 22:43:50 adrianp Exp $ +# $NetBSD: Makefile,v 1.16 2007/01/07 09:13:53 rillig Exp $ DISTNAME= VMware-2.0.4-1142 PKGNAME= vmware-2.0.4 @@ -36,7 +36,7 @@ VMWARE_CFG_DIR= ${PREFIX}/emul/linux/etc/vmware .include "../../mk/bsd.prefs.mk" -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: ${GZCAT} ${WRKSRC}/man/man1/vmware.1.gz > ${WRKDIR}/vmware.1 @@ -67,7 +67,7 @@ do-install-share: ${INSTALL_DATA} ${WRKSRC}/lib/configurator/* ${PREFIX}/share/vmware/configurator ${INSTALL_DATA} ${WRKSRC}/lib/config ${PREFIX}/share/vmware ${INSTALL_DATA} ${WRKSRC}/lib/floppy.nvr ${PREFIX}/share/vmware - ${INSTALL_MAN} ${WRKDIR}/vmware.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKDIR}/vmware.1 ${PREFIX}/${PKGMANDIR}/man1 post-install: @${RM} -f ${VMWARE_CFG_DIR}/config diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile index df30b9444a8..567f8ff0ccb 100644 --- a/emulators/vmware3/Makefile +++ b/emulators/vmware3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/01/01 22:43:50 adrianp Exp $ +# $NetBSD: Makefile,v 1.19 2007/01/07 09:13:53 rillig Exp $ DISTNAME= VMware-workstation-3.2.1-2242 PKGNAME= vmware-3.2.1pl1 @@ -48,7 +48,7 @@ VMWARE_CFG_DIR= ${PREFIX}/emul/linux/etc/vmware .include "../../mk/bsd.prefs.mk" -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: ${GZCAT} ${WRKSRC}/man/man1/vmware.1.gz > ${WRKDIR}/vmware.1 @@ -93,7 +93,7 @@ do-install-share: ${INSTALL_DATA} ${WRKSRC}/lib/smb/codepages/* ${PREFIX}/share/vmware/smb/codepages ${INSTALL_DATA} ${WRKSRC}/lib/configurator/* ${PREFIX}/share/vmware/configurator ${INSTALL_DATA} ${WRKSRC}/lib/config ${PREFIX}/share/vmware - ${INSTALL_MAN} ${WRKDIR}/vmware.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKDIR}/vmware.1 ${PREFIX}/${PKGMANDIR}/man1 post-install: @${RM} -f ${VMWARE_CFG_DIR}/config diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index f3e680fb680..192805a494d 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.147 2006/09/09 02:42:00 obache Exp $ +# $NetBSD: Makefile,v 1.148 2007/01/07 09:13:53 rillig Exp $ # DISTNAME= xmame-0.106 @@ -76,7 +76,7 @@ MAKE_FLAGS+= JOY_USB=1 .endif OWN_DIRS= ${SPOOLDIR} -INSTALLATION_DIRS= bin man/man6 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 post-configure: cd ${WRKSRC}/doc; \ @@ -97,7 +97,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/chdman ${PREFIX}/bin/chdman ${INSTALL_PROGRAM} ${WRKSRC}/xml2info ${PREFIX}/bin/xml2info ${INSTALL_MAN} ${WRKSRC}/doc/${TARGET}.6 \ - ${PREFIX}/man/man6/${TARGET}.6 + ${PREFIX}/${PKGMANDIR}/man6/${TARGET}.6 ${INSTALL_DATA_DIR} ${ROMPATH} ${INSTALL_DATA} ${WRKSRC}/doc/${TARGET}rc ${ROMPATH}/${TARGET}rc ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/xmame/ diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile index b622bcd06d6..52312053538 100644 --- a/emulators/xmess/Makefile +++ b/emulators/xmess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2006/09/09 02:42:00 obache Exp $ +# $NetBSD: Makefile,v 1.88 2007/01/07 09:13:53 rillig Exp $ # DISTNAME= xmame-0.106 @@ -77,7 +77,7 @@ MAKE_FLAGS+= JOY_USB=1 .endif OWN_DIRS= ${SPOOLDIR} -INSTALLATION_DIRS= bin man/man6 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 post-configure: cd ${WRKSRC}/doc; \ @@ -96,7 +96,7 @@ do-install: ${PREFIX}/bin/${TARGET} ${INSTALL_PROGRAM} ${WRKSRC}/imgtool ${PREFIX}/bin/imgtool ${INSTALL_MAN} ${WRKSRC}/doc/${TARGET}.6 \ - ${PREFIX}/man/man6/${TARGET}.6 + ${PREFIX}/${PKGMANDIR}/man6/${TARGET}.6 ${INSTALL_DATA_DIR} ${ROMPATH} ${INSTALL_DATA} ${WRKSRC}/doc/${TARGET}rc ${ROMPATH}/${TARGET}rc diff --git a/emulators/xyame/Makefile b/emulators/xyame/Makefile index be22d006c74..1be1ea8ae9e 100644 --- a/emulators/xyame/Makefile +++ b/emulators/xyame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/12/18 01:35:35 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:53 rillig Exp $ # DISTNAME= xyame038 @@ -22,10 +22,10 @@ NO_CONFIGURE= yes NO_BUILD= yes ONLY_FOR_PLATFORM+= *-*-i386 -INSTALLATION_DIRS= bin man/man6 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xyame ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/yame.6 ${PREFIX}/man/man6/xyame.6 + ${INSTALL_MAN} ${WRKSRC}/yame.6 ${PREFIX}/${PKGMANDIR}/man6/xyame.6 .include "../../mk/bsd.pkg.mk" diff --git a/finance/xfinans/Makefile b/finance/xfinans/Makefile index 2f9954e44d2..92ae42868af 100644 --- a/finance/xfinans/Makefile +++ b/finance/xfinans/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/06/17 18:01:17 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:53 rillig Exp $ # DISTNAME= xfinans-5.9 @@ -31,6 +31,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/variables ${PREFIX}/share/examples/Xfinans ${INSTALL_DATA} ${WRKSRC}/categories ${PREFIX}/share/examples/Xfinans ${INSTALL_DATA} ${WRKSRC}/category_engine ${PREFIX}/share/examples/Xfinans - ${RM} -f ${PREFIX}/man/cat1/xfinans.0 + ${RM} -f ${PREFIX}/${PKGMANDIR}/cat1/xfinans.0 .include "../../mk/bsd.pkg.mk" diff --git a/fonts/chkfontpath/Makefile b/fonts/chkfontpath/Makefile index e14f61427d9..311b7e85456 100644 --- a/fonts/chkfontpath/Makefile +++ b/fonts/chkfontpath/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:38 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2007/01/07 09:13:54 rillig Exp $ # DISTNAME= chkfontpath-1.9.7 @@ -15,7 +15,7 @@ BUILD_DEPENDS+= rpm2cpio>=1.1:../../converters/rpm2cpio MAKE_ENV+= VERSION=${PKGVERSION:Q} USE_TOOLS+= gmake gtar -INSTALLATION_DIRS= bin man/man8 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 # Might as well make this a general scheme for .src.rpm files... - HF do-extract: @@ -26,7 +26,7 @@ do-extract: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/chkfontpath ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/en/chkfontpath.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/man/en/chkfontpath.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../devel/popt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/pcf2bdf/Makefile b/fonts/pcf2bdf/Makefile index 039e1586450..e158484e02c 100644 --- a/fonts/pcf2bdf/Makefile +++ b/fonts/pcf2bdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/09/09 02:42:00 obache Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:54 rillig Exp $ # DISTNAME= pcf2bdf-1.04 @@ -16,10 +16,10 @@ USE_TOOLS+= gmake USE_LANGUAGES= c++ MAKE_FILE= Makefile.gcc -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pcf2bdf ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/pcf2bdf.man ${PREFIX}/man/man1/pcf2bdf.1 + ${INSTALL_MAN} ${WRKSRC}/pcf2bdf.man ${PREFIX}/${PKGMANDIR}/man1/pcf2bdf.1 .include "../../mk/bsd.pkg.mk" diff --git a/fonts/ttf2pk/Makefile b/fonts/ttf2pk/Makefile index f51b8c90c11..ff4dd2d036b 100644 --- a/fonts/ttf2pk/Makefile +++ b/fonts/ttf2pk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/07/27 00:09:06 hubertf Exp $ +# $NetBSD: Makefile,v 1.18 2007/01/07 09:13:54 rillig Exp $ # .include "../../graphics/freetype-lib/Makefile.common" @@ -24,7 +24,7 @@ BUILD_TARGET= depend all USE_DIRS+= texmf-1.0 USE_LIBTOOL= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../graphics/freetype-lib/buildlink3.mk" .include "../../print/teTeX/module.mk" @@ -35,7 +35,7 @@ do-install: ${PREFIX}/bin ${INSTALL_DATA} ${T2PSRC}/ttf2pk.1 \ ${T2PSRC}/ttf2tfm.1 \ - ${PREFIX}/man/man1 + ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/doc/ttf2pk ${INSTALL_DATA} ${T2PSRC}/BUGS \ ${T2PSRC}/README \ diff --git a/fonts/type1inst/Makefile b/fonts/type1inst/Makefile index aeaa2adad46..28b08e476df 100644 --- a/fonts/type1inst/Makefile +++ b/fonts/type1inst/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:09:11 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:54 rillig Exp $ # DISTNAME= type1inst-0.6.1 @@ -14,12 +14,12 @@ USE_TOOLS+= perl:run REPLACE_PERL= t1embed type1inst NO_BUILD= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: @${INSTALL_SCRIPT} ${WRKSRC}/type1inst ${PREFIX}/bin @${INSTALL_SCRIPT} ${WRKSRC}/t1embed ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/type1inst.man ${PREFIX}/man/man1/type1inst.1 + @${INSTALL_MAN} ${WRKSRC}/type1inst.man ${PREFIX}/${PKGMANDIR}/man1/type1inst.1 @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/type1inst @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/type1inst diff --git a/fonts/xmbdfed/Makefile b/fonts/xmbdfed/Makefile index 044714fe764..4975a43222a 100644 --- a/fonts/xmbdfed/Makefile +++ b/fonts/xmbdfed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/02/05 23:09:11 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:54 rillig Exp $ DISTNAME= xmbdfed-4.5 PKGREVISION= 2 @@ -11,11 +11,11 @@ COMMENT= Motif-based BDF font editor with lots of features USE_X11BASE= YES -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xmbdfed ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/xmbdfed.man ${PREFIX}/man/man1/xmbdfed.1 + ${INSTALL_MAN} ${WRKSRC}/xmbdfed.man ${PREFIX}/${PKGMANDIR}/man1/xmbdfed.1 .include "../../graphics/freetype-lib/buildlink3.mk" .include "../../mk/motif.buildlink3.mk" diff --git a/games/battalion/Makefile b/games/battalion/Makefile index 1163cf74903..489ef15a0ad 100644 --- a/games/battalion/Makefile +++ b/games/battalion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2006/04/28 14:58:32 joerg Exp $ +# $NetBSD: Makefile,v 1.35 2007/01/07 09:13:54 rillig Exp $ DISTNAME= battalion PKGNAME= battalion-1.4 @@ -23,7 +23,7 @@ USE_TOOLS+= gtar MAKE_ENV+= LIBFLAGS=-lcompat .endif -INSTALLATION_DIRS= bin man/man6 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 do-install: ${INSTALL} -c -s -o ${ROOT_USER} -g games -m 2755 ${WRKSRC}/battalion ${PREFIX}/bin @@ -39,7 +39,7 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/SOUNDS/* ${PREFIX}/share/battalion/battalion.data/SOUNDS ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/TEXTURES/* ${PREFIX}/share/battalion/battalion.data/TEXTURES ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/battalion.sho ${PREFIX}/share/battalion/battalion.data - ${INSTALL_MAN} ${WRKDIR}/battalionSUN4/battalion.man ${PREFIX}/man/man6/battalion.6 + ${INSTALL_MAN} ${WRKDIR}/battalionSUN4/battalion.man ${PREFIX}/${PKGMANDIR}/man6/battalion.6 ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/HELP/* ${PREFIX}/share/battalion/HELP ${INSTALL} -o bin -g games -m 664 /dev/null /var/games/battalion_hiscore diff --git a/games/cmatrix/Makefile b/games/cmatrix/Makefile index 557929c9463..341d1c87f00 100644 --- a/games/cmatrix/Makefile +++ b/games/cmatrix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:40 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:54 rillig Exp $ # DISTNAME= cmatrix-1.2a @@ -11,11 +11,11 @@ COMMENT= Make your console feel like Nadbuchonazor's bridge USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cmatrix ${PREFIX}/bin/cmatrix - ${INSTALL_MAN} ${WRKSRC}/cmatrix.1 ${PREFIX}/man/man1/cmatrix.1 + ${INSTALL_MAN} ${WRKSRC}/cmatrix.1 ${PREFIX}/${PKGMANDIR}/man1/cmatrix.1 ${INSTALL_DATA_DIR} ${PREFIX}/share/cmatrix ${INSTALL_DATA} ${WRKSRC}/mtx.pcf ${PREFIX}/share/cmatrix/mtx.pcf diff --git a/games/frotz/Makefile b/games/frotz/Makefile index 8b8755c6f03..d16739ac562 100644 --- a/games/frotz/Makefile +++ b/games/frotz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/03/09 21:04:43 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:54 rillig Exp $ DISTNAME= frotz-2.43 PKGREVISION= 2 @@ -21,11 +21,11 @@ INCOMPAT_CURSES= NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-V]-* SAMPLEDIR= ${PREFIX}/share/examples/frotz DOCDIR= ${PREFIX}/share/doc/frotz -INSTALLATION_DIRS= bin man/man6 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/frotz ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/frotz.6 ${PREFIX}/man/man6 + ${INSTALL_MAN} ${WRKSRC}/doc/frotz.6 ${PREFIX}/${PKGMANDIR}/man6 ${INSTALL_DATA_DIR} ${SAMPLEDIR} ${INSTALL_DATA} ${WRKSRC}/doc/frotz.conf-big ${SAMPLEDIR}/frotz.conf ${INSTALL_DATA_DIR} ${DOCDIR} diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile index c70202c590a..a82fcd4dc96 100644 --- a/games/icebreaker/Makefile +++ b/games/icebreaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/10/04 21:43:00 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2007/01/07 09:13:54 rillig Exp $ # DISTNAME= icebreaker-1.9.7 @@ -15,7 +15,7 @@ USE_TOOLS+= gmake MAKE_ENV+= mandir="${PREFIX}/man" highscoredir="/var/games" MAKE_ENV+= prefix=${PREFIX:Q} -INSTALLATION_DIRS= bin man/man6 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/icebreaker @@ -23,7 +23,7 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} *.ibt *.wav *.bmp \ ${PREFIX}/share/icebreaker ${INSTALL_PROGRAM} -g games -m 2755 ${WRKSRC}/icebreaker ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/icebreaker.6 ${PREFIX}/man/man6 + ${INSTALL_MAN} ${WRKSRC}/icebreaker.6 ${PREFIX}/${PKGMANDIR}/man6 ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/icebreaker .include "../../audio/SDL_mixer/buildlink3.mk" diff --git a/games/jetpack/Makefile b/games/jetpack/Makefile index 43209ea64c5..2acbac85932 100644 --- a/games/jetpack/Makefile +++ b/games/jetpack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/12/27 13:37:36 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:54 rillig Exp $ DISTNAME= jetpack PKGNAME= jetpack-1.0 @@ -19,7 +19,7 @@ post-install: @${CHMOD} 2755 ${PREFIX}/bin/jetpack ${INSTALL} -o bin -g games -m 664 /dev/null /var/games/jetpack.scores @${CHMOD} 0775 ${PREFIX}/share/jetpack - ${INSTALL_MAN} ${WRKSRC}/jetpack.man ${PREFIX}/man/man6/jetpack.6 + ${INSTALL_MAN} ${WRKSRC}/jetpack.man ${PREFIX}/${PKGMANDIR}/man6/jetpack.6 .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/games/kajaani-kombat/Makefile b/games/kajaani-kombat/Makefile index 2815d864cc8..f3400675d19 100644 --- a/games/kajaani-kombat/Makefile +++ b/games/kajaani-kombat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/08/07 19:35:06 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:54 rillig Exp $ # DISTNAME= kajaani-kombat-0.7 @@ -11,11 +11,11 @@ COMMENT= Rampart-like multiplayer game set in space USE_LANGUAGES= c++ USE_TOOLS+= gmake -INSTALLATION_DIRS= bin man/man6 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/kajaani-kombat ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/kajaani-kombat.6 ${PREFIX}/man/man6 + ${INSTALL_MAN} ${WRKSRC}/kajaani-kombat.6 ${PREFIX}/${PKGMANDIR}/man6 ${INSTALL_DATA_DIR} ${PREFIX}/share/kajaani-kombat ${INSTALL_DATA} ${WRKSRC}/*.ogg ${PREFIX}/share/kajaani-kombat ${INSTALL_DATA} ${WRKSRC}/*.png ${PREFIX}/share/kajaani-kombat diff --git a/games/lincity/Makefile b/games/lincity/Makefile index 1a0643bcdc8..aa83337be8c 100644 --- a/games/lincity/Makefile +++ b/games/lincity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/07/02 10:11:09 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:54 rillig Exp $ DISTNAME= lincity-1.12.1 PKGREVISION= 1 @@ -23,7 +23,7 @@ pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/lincity/opening post-install: - ${LN} -sf lincity.6 ${PREFIX}/man/man6/xlincity.6 + ${LN} -sf lincity.6 ${PREFIX}/${PKGMANDIR}/man6/xlincity.6 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/games/omega/Makefile b/games/omega/Makefile index 16110c9bd63..594a5968253 100644 --- a/games/omega/Makefile +++ b/games/omega/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/03/04 21:29:43 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2007/01/07 09:13:54 rillig Exp $ DISTNAME= omega-0.90.4-src PKGNAME= omega-0.90.4 @@ -21,11 +21,11 @@ FILEMODE= 0660 FILEMODE= 0600 .endif -INSTALLATION_DIRS= bin man/man6 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 do-install: ${INSTALL_GAME} ${WRKSRC}/omega ${PREFIX}/bin/Omega - ${INSTALL_MAN} ${WRKSRC}/docs/omega.6 ${PREFIX}/man/man6 + ${INSTALL_MAN} ${WRKSRC}/docs/omega.6 ${PREFIX}/${PKGMANDIR}/man6 ${INSTALL_DATA_DIR} ${PREFIX}/share/omega ${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/share/omega ${RM} ${PREFIX}/share/omega/license.old diff --git a/games/powwow/Makefile b/games/powwow/Makefile index de1c1a3ecd4..f8c510e274f 100644 --- a/games/powwow/Makefile +++ b/games/powwow/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/02/05 23:09:21 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:54 rillig Exp $ DISTNAME= powwow-1.2.5 PKGREVISION= 1 @@ -12,14 +12,14 @@ COMMENT= Client to play MUDs USE_TOOLS+= gmake POWWOW_DIR= ${PREFIX}/share/powwow -INSTALLATION_DIRS= bin man/man6 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 do-build: cd ${WRKSRC} && POWWOW_DIR="${POWWOW_DIR}" CFLAGS="${CFLAGS}" ./make_it do-install: ${INSTALL_PROGRAM} ${WRKSRC}/powwow ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/powwow.6 ${PREFIX}/man/man6 + ${INSTALL_MAN} ${WRKSRC}/powwow.6 ${PREFIX}/${PKGMANDIR}/man6 ${INSTALL_DATA_DIR} ${POWWOW_DIR} ${INSTALL_DATA} ${WRKSRC}/powwow.doc ${POWWOW_DIR} ${INSTALL_DATA} ${WRKSRC}/powwow.help ${POWWOW_DIR} diff --git a/games/pysol/Makefile b/games/pysol/Makefile index c9342bd0f71..9b570ea0bb6 100644 --- a/games/pysol/Makefile +++ b/games/pysol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/09/03 00:56:29 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2007/01/07 09:13:54 rillig Exp $ # DISTNAME= pysol-4.81 @@ -19,14 +19,14 @@ PYTHON_VERSIONS_ACCEPTED= 22 21 20 15 CARDSETS= pysol-cardsets-4.40 -INSTALLATION_DIRS= bin man/man6 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 do-install: ${SED} -e "s|@pkgdatadir@|${PREFIX}/share/pysol|" \ -e "s|python|${PYTHONBIN}|" \ < ${WRKSRC}/pysol > ${PREFIX}/bin/pysol ${CHMOD} +x ${PREFIX}/bin/pysol - ${INSTALL_DATA} ${WRKSRC}/pysol.6 ${PREFIX}/man/man6 + ${INSTALL_DATA} ${WRKSRC}/pysol.6 ${PREFIX}/${PKGMANDIR}/man6 @${INSTALL_DATA_DIR} ${PREFIX}/share/pysol (cd ${WRKSRC}/data; tar cf - *) | \ (cd ${PREFIX}/share/pysol; tar xf -) diff --git a/games/qnetwalk/Makefile b/games/qnetwalk/Makefile index c21139ca7fc..e6de528e76f 100644 --- a/games/qnetwalk/Makefile +++ b/games/qnetwalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/04/22 09:22:09 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:54 rillig Exp $ # DISTNAME= qnetwalk-1.2 @@ -15,7 +15,7 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= YES QNETWALK_BIN= ${PREFIX}/bin -QNETWALK_MAN= ${PREFIX}/man/man6 +QNETWALK_MAN= ${PREFIX}/${PKGMANDIR}/man6 QNETWALK_DATA= ${PREFIX}/share/games/${PKGBASE} QNETWALK_TR= ${QNETWALK_DATA} KDEDIR= ${PREFIX:Q}/share/kde diff --git a/games/sl/Makefile b/games/sl/Makefile index c99da088920..250f9d6c782 100644 --- a/games/sl/Makefile +++ b/games/sl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:17 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:54 rillig Exp $ # DISTNAME= sl @@ -19,13 +19,13 @@ DIST_SUBDIR= ${PKGNAME_NOREV} BUILD_DEPENDS+= nkf-[0-9]*:../../converters/nkf -INSTALLATION_DIRS= bin man/ja_JP.EUC/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/ja_JP.EUC/man1 post-build: nkf -e ${WRKSRC}/sl.1 > ${WRKSRC}/sl.1.euc do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sl ${PREFIX}/bin/sl - ${INSTALL_DATA} ${WRKSRC}/sl.1.euc ${PREFIX}/man/ja_JP.EUC/man1/sl.1 + ${INSTALL_DATA} ${WRKSRC}/sl.1.euc ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/sl.1 .include "../../mk/bsd.pkg.mk" diff --git a/games/svb/Makefile b/games/svb/Makefile index 37a2a348f43..b3075de137e 100644 --- a/games/svb/Makefile +++ b/games/svb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:36 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:55 rillig Exp $ DISTNAME= svb PKGNAME= svb-1.0 @@ -18,7 +18,7 @@ post-install: ${INSTALL_GAME_DATA} /dev/null /var/games/svb.scorefile ${CHOWN} ${GAMEOWN}:${GAMEGRP} ${PREFIX}/bin/svb ${CHMOD} ${GAMEMODE} ${PREFIX}/bin/svb - ${INSTALL_MAN} ${WRKSRC}/svb.man ${PREFIX}/man/man6/svb.6 + ${INSTALL_MAN} ${WRKSRC}/svb.man ${PREFIX}/${PKGMANDIR}/man6/svb.6 .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/vms-empire/Makefile b/games/vms-empire/Makefile index d1ecaee54d8..1d556ac2526 100644 --- a/games/vms-empire/Makefile +++ b/games/vms-empire/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:56 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:55 rillig Exp $ # DISTNAME= vms-empire-1.7 @@ -9,11 +9,11 @@ MAINTAINER= pancake@phreaker.net HOMEPAGE= http://www.catb.org/~esr/vms-empire/ COMMENT= Solitaire Empire (sometimes called "VMS Empire") -INSTALLATION_DIRS= bin man/man6 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/vms-empire ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/vms-empire.6 ${PREFIX}/man/man6/vms-empire.6 + ${INSTALL_MAN} ${WRKSRC}/vms-empire.6 ${PREFIX}/${PKGMANDIR}/man6/vms-empire.6 .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xblast/Makefile b/games/xblast/Makefile index 0bd6da3ade7..c25b46a52fd 100644 --- a/games/xblast/Makefile +++ b/games/xblast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/05/07 03:16:48 dsainty Exp $ +# $NetBSD: Makefile,v 1.24 2007/01/07 09:13:55 rillig Exp $ # DISTNAME= xblast-2.10.2 @@ -34,7 +34,7 @@ pre-build: ${MV} ${WRKDIR}/musics-2005-01-06/* ${WRKSRC}/sounds post-install: - ${INSTALL_MAN} ${WRKSRC}/xblast.man ${PREFIX}/man/man6/xblast.6 + ${INSTALL_MAN} ${WRKSRC}/xblast.man ${PREFIX}/${PKGMANDIR}/man6/xblast.6 .include "../../mk/oss.buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/games/xboing/Makefile b/games/xboing/Makefile index da7e241ad3d..8cc5d00a2ff 100644 --- a/games/xboing/Makefile +++ b/games/xboing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/12/27 13:37:37 joerg Exp $ +# $NetBSD: Makefile,v 1.23 2007/01/07 09:13:55 rillig Exp $ # DISTNAME= xboing2.4 @@ -21,7 +21,7 @@ MAKE_ENV+= VARBASE=${VARBASE:Q} post-install: ${CHOWN} ${GAMEOWN}:${GAMEGRP} ${PREFIX}/bin/xboing ${CHMOD} ${GAMEMODE} ${PREFIX}/bin/xboing - ${INSTALL_MAN} ${WRKSRC}/xboing.man ${PREFIX}/man/man6/xboing.6 + ${INSTALL_MAN} ${WRKSRC}/xboing.man ${PREFIX}/${PKGMANDIR}/man6/xboing.6 .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile index 9e7518a5dff..0cbe17c01e2 100644 --- a/games/xbomb/Makefile +++ b/games/xbomb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/06/08 15:50:14 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:55 rillig Exp $ DISTNAME= xbomb-2.1a PKGREVISION= 2 @@ -22,7 +22,7 @@ SCORE_GROUP= games PKG_USERS= ${SCORE_USER}:${SCORE_GROUP} PKG_GROUPS= ${SCORE_GROUP} -INSTALLATION_DIRS= bin man/man6 lib/X11/app-defaults +INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 lib/X11/app-defaults CONF_FILES_PERMS+= /dev/null ${SCORE_PATH}/xbomb3.hi ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE} CONF_FILES_PERMS+= /dev/null ${SCORE_PATH}/xbomb4.hi ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE} CONF_FILES_PERMS+= /dev/null ${SCORE_PATH}/xbomb6.hi ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE} diff --git a/games/xmris/Makefile b/games/xmris/Makefile index 055a5b5ae3c..ba6ec92834b 100644 --- a/games/xmris/Makefile +++ b/games/xmris/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:37 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:55 rillig Exp $ DISTNAME= xmris.4.0.5 PKGNAME= xmris-4.05 @@ -20,9 +20,9 @@ post-patch: < ${WRKSRC}/Imakefile-pre > ${WRKSRC}/Imakefile post-install: - ${INSTALL_MAN} ${WRKSRC}/xmris.man ${PREFIX}/man/man6/xmris.6 - ${LN} -fs xmris.6 ${PREFIX}/man/man6/xmsit.6 - ${INSTALL_MAN} ${WRKSRC}/xmred.man ${PREFIX}/man/man6/xmred.6 + ${INSTALL_MAN} ${WRKSRC}/xmris.man ${PREFIX}/${PKGMANDIR}/man6/xmris.6 + ${LN} -fs xmris.6 ${PREFIX}/${PKGMANDIR}/man6/xmsit.6 + ${INSTALL_MAN} ${WRKSRC}/xmred.man ${PREFIX}/${PKGMANDIR}/man6/xmred.6 .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile index ee9fbcebcde..8570f4d92b8 100644 --- a/games/xpipeman/Makefile +++ b/games/xpipeman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:37 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:55 rillig Exp $ # DISTNAME= xpipeman-1.5 @@ -14,12 +14,12 @@ COMMENT= Connect the pipes to contain the water flow game for X11 WRKSRC= ${WRKDIR}/xpipeman USE_IMAKE= yes -INSTALLATION_DIRS= bin man/man6 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 do-install: ${INSTALL} -o bin -g games -m 2755 ${WRKSRC}/xpipeman \ ${PREFIX}/bin/xpipeman - ${INSTALL_MAN} ${WRKSRC}/xpipeman.man ${PREFIX}/man/man6/xpipeman.6 + ${INSTALL_MAN} ${WRKSRC}/xpipeman.man ${PREFIX}/${PKGMANDIR}/man6/xpipeman.6 ${INSTALL} -d -o bin -g games -m 0775 ${PREFIX}/share/xpipeman if [ ! -r /var/games/xpipescores ]; then \ ${INSTALL} -o bin -g games -m 0664 ${WRKSRC}/xpipescores /var/games ; \ diff --git a/games/xrick/Makefile b/games/xrick/Makefile index f6cf0fc6343..d9a186ddac1 100644 --- a/games/xrick/Makefile +++ b/games/xrick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/06/12 16:28:11 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:55 rillig Exp $ # DISTNAME= xrick-021212 @@ -25,14 +25,14 @@ SUBST_MESSAGE.data= Adjusting path to data.zip SUBST_FILES.data= src/xrick.c SUBST_SED.data= -e "s|data.zip|${PREFIX}/share/xrick/&|" -INSTALLATION_DIRS= bin man/man6 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 post-extract: cd ${WRKSRC} && ${GUNZIP_CMD} xrick.6.gz do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xrick ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/xrick.6 ${PREFIX}/man/man6 + ${INSTALL_MAN} ${WRKSRC}/xrick.6 ${PREFIX}/${PKGMANDIR}/man6 ${INSTALL_DATA_DIR} ${PREFIX}/share/xrick ${INSTALL_DATA} ${WRKSRC}/data.zip ${PREFIX}/share/xrick diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile index 6c81b92a613..2d118054508 100644 --- a/games/xscavenger/Makefile +++ b/games/xscavenger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/12/27 13:37:37 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2007/01/07 09:13:55 rillig Exp $ # DISTNAME= xscavenger-1.4.4 @@ -20,12 +20,12 @@ NO_INSTALL_MANPAGES= yes CPPFLAGS+= -DSOUNDDEV="\"${DEVOSSSOUND}\"" -INSTALLATION_DIRS= man/man6 +INSTALLATION_DIRS= ${PKGMANDIR}/man6 .include "../../mk/oss.buildlink3.mk" post-install: - @${INSTALL_MAN} ${WRKSRC}/src/scavenger.6 ${PREFIX}/man/man6/ + @${INSTALL_MAN} ${WRKSRC}/src/scavenger.6 ${PREFIX}/${PKGMANDIR}/man6/ @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scavenger @${INSTALL_MAN} ${WRKSRC}/DOC ${PREFIX}/share/doc/scavenger diff --git a/games/zombies/Makefile b/games/zombies/Makefile index 22e1d8f235d..835b4eef18f 100644 --- a/games/zombies/Makefile +++ b/games/zombies/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:59 tv Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:55 rillig Exp $ DISTNAME= zombies-1.0 PKGREVISION= 1 @@ -10,7 +10,7 @@ MAINTAINER= simonb@NetBSD.org HOMEPAGE= http://www.thistledown.com.au/software/ COMMENT= Simple robots-like game where you destroy the zombies -INSTALLATION_DIRS= bin man/man6 share/games +INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 share/games .include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/geography/postgresql81-postgis/Makefile b/geography/postgresql81-postgis/Makefile index f30f40242ff..8f61293ee00 100644 --- a/geography/postgresql81-postgis/Makefile +++ b/geography/postgresql81-postgis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/12/09 17:07:39 gdt Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:55 rillig Exp $ DISTNAME= postgis-${VERSION} VERSION= 1.2.0 @@ -36,7 +36,7 @@ do-install: ${INSTALL_DATA} ${BUILD_DIRS:Q}/doc/*.txt ${DOCDIR} ${INSTALL_DATA_DIR} ${HTMLDIR} cd ${WRKSRC}/doc/html && ${PAX} -rw -pp *.html *.css ${HTMLDIR} - ${INSTALL_MAN} ${BUILD_DIRS:Q}/doc/man/*.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${BUILD_DIRS:Q}/doc/man/*.1 ${PREFIX}/${PKGMANDIR}/man1 DEPENDS+= postgresql81-server>=8.1:../../databases/postgresql81-server diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile index 4d964e0c1ec..c3a63e6a00a 100644 --- a/graphics/cqcam/Makefile +++ b/graphics/cqcam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/03/04 21:29:46 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2007/01/07 09:13:55 rillig Exp $ # DISTNAME= cqcam-0.45a @@ -30,9 +30,9 @@ post-patch: ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.in post-install: - ${RM} ${PREFIX}/man/man1/webcam.1.gz - ${RM} ${PREFIX}/man/man1/xcqcam.1.gz - ${LN} ${PREFIX}/man/man1/cqcam.1 ${PREFIX}/man/man1/webcam.1 - ${LN} ${PREFIX}/man/man1/cqcam.1 ${PREFIX}/man/man1/xcqcam.1 + ${RM} ${PREFIX}/${PKGMANDIR}/man1/webcam.1.gz + ${RM} ${PREFIX}/${PKGMANDIR}/man1/xcqcam.1.gz + ${LN} ${PREFIX}/${PKGMANDIR}/man1/cqcam.1 ${PREFIX}/${PKGMANDIR}/man1/webcam.1 + ${LN} ${PREFIX}/${PKGMANDIR}/man1/cqcam.1 ${PREFIX}/${PKGMANDIR}/man1/xcqcam.1 .include "../../mk/bsd.pkg.mk" diff --git a/graphics/dcraw/Makefile b/graphics/dcraw/Makefile index fe67e4f107e..4d5972485cd 100644 --- a/graphics/dcraw/Makefile +++ b/graphics/dcraw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/04/12 13:16:26 markd Exp $ +# $NetBSD: Makefile,v 1.27 2007/01/07 09:13:55 rillig Exp $ # DISTNAME= dcraw @@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR} DIST_SUBDIR= ${PKGNAME_NOREV} LIBS+= -lm -ljpeg -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 PKG_OPTIONS_VAR= PKG_OPTIONS.dcraw PKG_SUPPORTED_OPTIONS= lcms @@ -38,7 +38,7 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dcraw ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/dcraw.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/dcraw.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../graphics/jpeg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gif320/Makefile b/graphics/gif320/Makefile index b8b69e47670..14fa952a14c 100644 --- a/graphics/gif320/Makefile +++ b/graphics/gif320/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/03/04 21:29:47 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:55 rillig Exp $ # DISTNAME= gif320-3.3 @@ -12,11 +12,11 @@ COMMENT= GIF file viewer for use with VT-320 terminals BUILD_TARGET= # empty WRKSRC= ${WRKDIR}/gif320 -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gif320 ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/gif320.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/gif320.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gif320 ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gif320 ${INSTALL_DATA} ${WRKSRC}/README.VMS ${PREFIX}/share/doc/gif320 diff --git a/graphics/giftrans/Makefile b/graphics/giftrans/Makefile index 96f5dca5eb2..9dfee5af6f8 100644 --- a/graphics/giftrans/Makefile +++ b/graphics/giftrans/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/10/04 21:44:46 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:55 rillig Exp $ # DISTNAME= sgif1122 @@ -13,10 +13,10 @@ COMMENT= Manipulate GIF89a images' transparency, comment and other data WRKSRC= ${WRKDIR}/usr/src/${PKGNAME_NOREV} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/giftrans ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/giftrans.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/giftrans.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile index 70c43efb650..89ac11bc325 100644 --- a/graphics/gtksee/Makefile +++ b/graphics/gtksee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/04/17 13:46:33 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2007/01/07 09:13:55 rillig Exp $ # DISTNAME= gtksee-0.5.6 @@ -15,7 +15,7 @@ USE_TOOLS+= gmake msgfmt USE_PKGLOCALEDIR= YES post-install: - ${INSTALL_MAN} ${WRKSRC}/man/gtksee.1 ${PREFIX}/man/man1/gtksee.1 + ${INSTALL_MAN} ${WRKSRC}/man/gtksee.1 ${PREFIX}/${PKGMANDIR}/man1/gtksee.1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gtksee ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gtksee ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/gtksee diff --git a/graphics/jhead/Makefile b/graphics/jhead/Makefile index 61b0effefb4..75bdfbad2d1 100644 --- a/graphics/jhead/Makefile +++ b/graphics/jhead/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/09/09 02:42:01 obache Exp $ +# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:56 rillig Exp $ # DISTNAME= jhead-2.4 @@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= gunzip MAKE_FILE= makefile -INSTALLATION_DIRS= bin man/man1 share/doc/html/jhead +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/html/jhead post-extract: ${GUNZIP_CMD} ${WRKSRC}/jhead.1.gz @@ -22,7 +22,7 @@ post-extract: do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/jhead ${INSTALL_PROGRAM} ${WRKSRC}/jhead ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/jhead.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/jhead.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_MAN} ${WRKSRC}/usage.html ${PREFIX}/share/doc/html/jhead .include "../../mk/bsd.pkg.mk" diff --git a/graphics/jpeg2ps/Makefile b/graphics/jpeg2ps/Makefile index 14e5fe017f5..ad56b8e0154 100644 --- a/graphics/jpeg2ps/Makefile +++ b/graphics/jpeg2ps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/10/04 21:44:47 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:56 rillig Exp $ # DISTNAME= jpeg2ps-1.9 @@ -14,10 +14,10 @@ RESTRICTED= may not be sold NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/jpeg2ps ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/jpeg2ps.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/jpeg2ps.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/graphics/mpgtx/Makefile b/graphics/mpgtx/Makefile index 74bf33203d3..f63feaa1eaa 100644 --- a/graphics/mpgtx/Makefile +++ b/graphics/mpgtx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/06/02 13:44:55 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:56 rillig Exp $ # DISTNAME= mpgtx-1.3.1 @@ -18,17 +18,17 @@ BUILD_TARGET= mpgtx PLINKS= mpgjoin mpgcat mpgsplit mpginfo mpgdemux tagmp3 MLINKS= mpgcat.1 mpgjoin.1 mpginfo.1 mpgsplit.1 mpgdemux.1 -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mpgtx ${PREFIX}/bin .for f in ${PLINKS} ${LN} -f ${PREFIX}/bin/mpgtx ${PREFIX}/bin/${f} .endfor - ${INSTALL_MAN} ${WRKSRC}/man/mpgtx.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/mpgtx.1 ${PREFIX}/${PKGMANDIR}/man1 .for f in ${MLINKS} - ${LN} -f ${PREFIX}/man/man1/mpgtx.1 ${PREFIX}/man/man1/${f} + ${LN} -f ${PREFIX}/${PKGMANDIR}/man1/mpgtx.1 ${PREFIX}/${PKGMANDIR}/man1/${f} .endfor - ${INSTALL_MAN} ${WRKSRC}/man/tagmp3.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/tagmp3.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/graphics/pgraf/Makefile b/graphics/pgraf/Makefile index 2598cf491e2..85a81890016 100644 --- a/graphics/pgraf/Makefile +++ b/graphics/pgraf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:51 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:56 rillig Exp $ DISTNAME= pgraf-20010131 PKGREVISION= 1 @@ -9,7 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Portable graphics system NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL -INSTALLATION_DIRS= bin include lib man/man1 man/man3 man/man5 +INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 CONFLICTS= pgp5-[0-9]* # Both have a `pgps' executable @@ -19,9 +19,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/include/pgraf.h ${PREFIX}/include ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pgraf ${INSTALL_DATA} ${WRKSRC}/doc/pgraf_paper ${PREFIX}/share/doc/pgraf - ${INSTALL_DATA} ${WRKSRC}/man/man1/pgraf.1 ${PREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/man/man3/pgraf.3 ${PREFIX}/man/man3 - ${INSTALL_DATA} ${WRKSRC}/man/man5/pgraf.5 ${PREFIX}/man/man5 + ${INSTALL_DATA} ${WRKSRC}/man/man1/pgraf.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_DATA} ${WRKSRC}/man/man3/pgraf.3 ${PREFIX}/${PKGMANDIR}/man3 + ${INSTALL_DATA} ${WRKSRC}/man/man5/pgraf.5 ${PREFIX}/${PKGMANDIR}/man5 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pgraf ${INSTALL_DATA} ${WRKSRC}/metagens/*.r ${WRKSRC}/tests/* \ ${PREFIX}/share/examples/pgraf/ diff --git a/graphics/prag/Makefile b/graphics/prag/Makefile index 0c748b9b6d2..d3cb703dd0b 100644 --- a/graphics/prag/Makefile +++ b/graphics/prag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:58 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:56 rillig Exp $ DISTNAME= prag-1.0pl2 PKGNAME= prag-1.0.2 @@ -12,7 +12,7 @@ COMMENT= Replacement to "grap" graph generator backend to pic WRKSRC= ${WRKDIR}/prag-1.0 NO_BUILD= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-patch: (cd ${WRKSRC}; ${MV} prag prag.orig) @@ -20,6 +20,6 @@ post-patch: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/prag ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/prag.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/prag.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile index 870b51ea6a9..df07932f9b3 100644 --- a/graphics/qiv/Makefile +++ b/graphics/qiv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/04/17 13:46:35 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:56 rillig Exp $ DISTNAME= qiv-2.0-src PKGNAME= ${DISTNAME:S/-src//} @@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_TOOLS+= gmake -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../devel/libgetopt/buildlink3.mk" .include "../../graphics/imlib/buildlink3.mk" diff --git a/graphics/xdvipresent/Makefile b/graphics/xdvipresent/Makefile index 8139d5eeabb..f883c3c9391 100644 --- a/graphics/xdvipresent/Makefile +++ b/graphics/xdvipresent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/04/07 02:17:53 minskim Exp $ +# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:56 rillig Exp $ # DISTNAME= xdvipresent-0.6p14 @@ -22,7 +22,7 @@ STYDIR= ${PKG_LOCALTEXMFPREFIX}/tex/latex/xdvipresent EXAMPLES_DIR= ${PREFIX}/share/examples/xdvipresent HTML_DIR= ${PREFIX}/share/doc/xdvipresent -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_DATA_DIR} ${STYDIR} diff --git a/inputmethod/canna-canuum/Makefile b/inputmethod/canna-canuum/Makefile index 49ed75350fe..f290204df70 100644 --- a/inputmethod/canna-canuum/Makefile +++ b/inputmethod/canna-canuum/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/07/05 04:48:28 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:56 rillig Exp $ PKGREVISION= 1 CANNA_MODULE= canuum @@ -9,7 +9,7 @@ MAINTAINER= oishi@ims.ac.jp MAKE_ARGS+= PREFIX=${PREFIX} -INSTALLATION_DIRS= man/ja_JP.EUC/man1 +INSTALLATION_DIRS= ${PKGMANDIR}/ja_JP.EUC/man1 CONFIGURE_DIRS= ${WRKSRC} ${WRKSRC}/canuum BUILD_DIRS= ${WRKSRC}/canuum diff --git a/inputmethod/skkfep/Makefile b/inputmethod/skkfep/Makefile index b7fbb36e0cd..00d0e3e9950 100644 --- a/inputmethod/skkfep/Makefile +++ b/inputmethod/skkfep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/03/04 21:29:53 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:56 rillig Exp $ DISTNAME= skkfep0.86c PKGNAME= skkfep-0.86c @@ -16,13 +16,13 @@ WRKSRC= ${WRKDIR}/skkfep NO_CONFIGURE= yes MAKE_ENV+= MAKE_FLAGS=EXECBASE=${LOCALBASE:Q}\ CC=${CC:Q} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 CONF_FILES+= ${PREFIX}/share/examples/skk/skk.conf ${PKG_SYSCONFDIR}/skk.conf do-install: ${INSTALL_PROGRAM} ${WRKSRC}/skkfep ${PREFIX}/bin/skkfep - ${INSTALL_MAN} ${WRKSRC}/skkfep.1 ${PREFIX}/man/man1/skkfep.1 + ${INSTALL_MAN} ${WRKSRC}/skkfep.1 ${PREFIX}/${PKGMANDIR}/man1/skkfep.1 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/skk ${INSTALL_DATA} ${FILESDIR}/skk.conf ${PREFIX}/share/examples/skk/skk.conf diff --git a/lang/Cg-compiler/Makefile b/lang/Cg-compiler/Makefile index c9c1ed8f625..cfae5b6df32 100644 --- a/lang/Cg-compiler/Makefile +++ b/lang/Cg-compiler/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/06/30 13:47:06 salo Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:56 rillig Exp $ # DISTNAME= CgLinux-1.3.0408-0400 @@ -22,7 +22,7 @@ NO_BUILD= yes DEPENDS+= suse_base>=7.3:../../emulators/${SUSE_DIR_PREFIX}_base .endif -INSTALLATION_DIRS= bin lib man/man3 share +INSTALLATION_DIRS= bin lib ${PKGMANDIR}/man3 share do-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/Cg @@ -33,7 +33,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/usr/include/Cg/* ${PREFIX}/include/Cg ${INSTALL_DATA} ${WRKSRC}/usr/include/CgFX/* ${PREFIX}/include/CgFX ${INSTALL_DATA} ${WRKSRC}/usr/lib/* ${PREFIX}/lib - ${INSTALL_MAN} ${WRKSRC}/usr/share/man/man3/* ${PREFIX}/man/man3 + ${INSTALL_MAN} ${WRKSRC}/usr/share/man/man3/* ${PREFIX}/${PKGMANDIR}/man3 cd ${WRKSRC}/usr/local && ${PAX} -rwppm . ${PREFIX}/share/NVIDIA-Cg-linux .include "../../emulators/suse_linux/Makefile.application" diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile index 61b29e4fb36..e8289b438be 100644 --- a/lang/bwbasic/Makefile +++ b/lang/bwbasic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/11/03 22:19:01 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:56 rillig Exp $ PKGNAME= ${DISTNAME:=pl2} DISTNAME= bwbasic-2.20 @@ -27,6 +27,6 @@ post-install: ${CP} -r ${BWBASIC_WRKSRC}/bwbtest ${SHARE_DIR} ${FIND} ${SHARE_DIR} -type d -print | ${XARGS} ${CHMOD} ${BINMODE} ${FIND} ${SHARE_DIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} - ${INSTALL_MAN} ${BWBASIC_WRKSRC}/bwbasic.doc ${PREFIX}/man/man1/bwbasic.1 + ${INSTALL_MAN} ${BWBASIC_WRKSRC}/bwbasic.doc ${PREFIX}/${PKGMANDIR}/man1/bwbasic.1 .include "../../mk/bsd.pkg.mk" diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile index 8fffdadb1df..16ea7512a21 100644 --- a/lang/drscheme/Makefile +++ b/lang/drscheme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2006/08/22 20:17:23 joerg Exp $ +# $NetBSD: Makefile,v 1.39 2007/01/07 09:13:56 rillig Exp $ # DISTNAME= plt-${DRSCHEME_VERSION}-src-unix @@ -64,8 +64,8 @@ post-patch: @${FIND} ${WRKDIR} -name '*.orig' -print | ${XARGS} ${RM} -f post-install: - ${INSTALL_MAN_DIR} ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/../man/man1/*.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/../man/man1/*.1 ${PREFIX}/${PKGMANDIR}/man1/ @cd ${PREFIX}/lib/plt && PATH="${OLD_PATH}" ${SH} install || ${TRUE} .for f in ${PROGRAMS} @cd ${PREFIX}/bin && ${LN} -s ../lib/plt/bin/${f} diff --git a/lang/mpd/Makefile b/lang/mpd/Makefile index 4293c976a92..d1e2ab501c5 100644 --- a/lang/mpd/Makefile +++ b/lang/mpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/07/10 04:04:22 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:56 rillig Exp $ # DISTNAME= mpd.1.0.1 @@ -29,7 +29,7 @@ SUBST_SED.mpd+= -e 's,_WRKSRC_,${WRKSRC},g' SUBST_SED.mpd+= -e 's,_XINC_,${X11BASE}/include,g' SUBST_SED.mpd+= -e 's,_XLIB_,${X11BASE}/lib,g' -INSTALLATION_DIRS= bin lib/mpd man/man1 man/man3 share/doc/mpd +INSTALLATION_DIRS= bin lib/mpd ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 share/doc/mpd post-install: ${INSTALL_PROGRAM} ${WRKSRC}/csw/cstest ${PREFIX}/bin/mpd-cstest diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index c608b3c29f8..eda29987508 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2006/12/06 16:34:42 taca Exp $ +# $NetBSD: Makefile,v 1.42 2007/01/07 09:13:57 rillig Exp $ DISTNAME= ruby-${RUBY_VERSION}.${RUBY_PATCH_DATE} CATEGORIES= lang ruby @@ -24,7 +24,7 @@ RUBY_COMMANDS= irb ruby RUBY_COMMANDS+= erb h2rb rdoc ri testrb .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} @@ -33,7 +33,7 @@ do-install: ${LN} -sf ${f}${RUBY_VER} ${PREFIX}/bin/${f} ${ECHO} bin/${f} >> ${PLIST_SRC} .endfor - ${LN} -sf ${RUBY_NAME}.1 ${PREFIX}/man/man1/ruby.1 + ${LN} -sf ${RUBY_NAME}.1 ${PREFIX}/${PKGMANDIR}/man1/ruby.1 ${ECHO} man/man1/ruby.1 >> ${PLIST_SRC} .endif diff --git a/lang/sather/Makefile b/lang/sather/Makefile index 628930aa46e..1529134032c 100644 --- a/lang/sather/Makefile +++ b/lang/sather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2006/04/22 09:22:10 rillig Exp $ +# $NetBSD: Makefile,v 1.35 2007/01/07 09:13:57 rillig Exp $ DISTNAME= sather-1.2.1 PKGREVISION= 6 @@ -46,7 +46,7 @@ SUBST_SED.sather-configure= \ -e 's:@LINKER_RPATH_FLAG@:${LINKER_RPATH_FLAG}:g' \ -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' -INSTALLATION_DIRS= man/man1 +INSTALLATION_DIRS= ${PKGMANDIR}/man1 post-patch: cd ${WRKSRC}/System/Platforms && ${CP} -r netbsd dragonfly diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile index 24a9a35d967..5d2b3ca86f9 100644 --- a/lang/snobol/Makefile +++ b/lang/snobol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:48 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:57 rillig Exp $ # DISTNAME= snobol-0.99.4 @@ -20,7 +20,7 @@ BUILD_TARGET= it USE_CONFIGURE= NO USE_TOOLS+= gzip -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: @${CP} ${WRKSRC}/doc/head ${WRKSRC}/doc/tutorial @@ -28,7 +28,7 @@ do-install: @unzip -p -opaaqqLC ${WRKSRC}/pm.exe >> ${WRKSRC}/doc/tutorial @${GZIP_CMD} ${WRKSRC}/doc/tutorial @${INSTALL_PROGRAM} ${WRKSRC}/xsnobol4 ${PREFIX}/bin/snobol4 - @${INSTALL_MAN} ${WRKSRC}/doc/snobol4.1 ${PREFIX}/man/man1 + @${INSTALL_MAN} ${WRKSRC}/doc/snobol4.1 ${PREFIX}/${PKGMANDIR}/man1 @${INSTALL_DATA_DIR} ${PREFIX}/lib/snobol4 @cd ${WRKSRC} && ${INSTALL_DATA} snolib.a snolib/bq.sno \ ${PREFIX}/lib/snobol4 diff --git a/lang/stalin/Makefile b/lang/stalin/Makefile index 83ad8d4747f..2c7413e6a22 100644 --- a/lang/stalin/Makefile +++ b/lang/stalin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/03/04 21:29:56 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2007/01/07 09:13:57 rillig Exp $ DISTNAME= stalin-0.9 PKGREVISION= 5 @@ -21,7 +21,7 @@ UNLIMIT_RESOURCES= stacksize datasize CFLAGS:= ${CFLAGS:C/-O[0-9]*/-O0/} .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-patch: ${SED} -e 's:@PREFIX@:${PREFIX}:g' \ @@ -35,7 +35,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/stalin.sh ${PREFIX}/bin/stalin ${INSTALL_DATA} ${WRKSRC}/include/*.sc ${PREFIX}/lib/stalin ${INSTALL_DATA} ${WRKSRC}/libstalin.a ${PREFIX}/lib/stalin - ${INSTALL_MAN} ${WRKSRC}/stalin.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/stalin.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/stalin cd ${WRKSRC} && ${INSTALL_DATA} ANNOUNCEMENT COPYING README \ stalin.el ${PREFIX}/share/doc/stalin/ diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile index 2c5c9f6a96d..d31d94ed325 100644 --- a/lang/tcl-tclX/Makefile +++ b/lang/tcl-tclX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/11/10 17:34:09 tv Exp $ +# $NetBSD: Makefile,v 1.36 2007/01/07 09:13:57 rillig Exp $ # DISTNAME= tclx8.3.5-src @@ -57,8 +57,8 @@ post-build: post-install: ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type f -print | ${XARGS} ${CHMOD} ${DOCMODE} - @${RM} ${PREFIX}/man/man3/TkX_Main.3 - @${RM} ${PREFIX}/man/man3/Tkx_Init.3 + @${RM} ${PREFIX}/${PKGMANDIR}/man3/TkX_Main.3 + @${RM} ${PREFIX}/${PKGMANDIR}/man3/Tkx_Init.3 # the above links are installed based on the contents of the man page. # we don't want to modify the man page, as it is also used by ../tk-tclX, # so... diff --git a/lang/tk-expect/Makefile b/lang/tk-expect/Makefile index 5288b6dbdc2..94fbda9b703 100644 --- a/lang/tk-expect/Makefile +++ b/lang/tk-expect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/02/05 23:09:53 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:57 rillig Exp $ .include "../../lang/tcl-expect/Makefile.common" @@ -17,11 +17,11 @@ CONFIGURE_ARGS+= --with-tclinclude=${PREFIX}/include/tcl CONFIGURE_ARGS+= --with-tkconfig=${PREFIX}/lib CONFIGURE_ARGS+= --with-tkinclude=${PREFIX}/include/tk -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/expectk ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/expectk.man ${PREFIX}/man/man1/expectk.1 + ${INSTALL_MAN} ${WRKSRC}/expectk.man ${PREFIX}/${PKGMANDIR}/man1/expectk.1 .include "../../x11/tk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile index 96c8762e665..369850abed9 100644 --- a/lang/tk-tclX/Makefile +++ b/lang/tk-tclX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2006/11/10 17:34:47 tv Exp $ +# $NetBSD: Makefile,v 1.34 2007/01/07 09:13:57 rillig Exp $ # DISTNAME= tclx8.3.5-src @@ -83,8 +83,8 @@ post-install: ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} ${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type f -print | ${XARGS} ${CHMOD} ${DOCMODE} -# @${RM} ${PREFIX}/man/man3/TkX_Main.3 -# @${RM} ${PREFIX}/man/man3/Tkx_Init.3 +# @${RM} ${PREFIX}/${PKGMANDIR}/man3/TkX_Main.3 +# @${RM} ${PREFIX}/${PKGMANDIR}/man3/Tkx_Init.3 # the above links are installed based on the contents of the man page. # we don't want to modify the man page, as it is also used by ../tk-tclX, # so... diff --git a/lang/umb-scheme/Makefile b/lang/umb-scheme/Makefile index 80713e6b711..8f4c35bdd1c 100644 --- a/lang/umb-scheme/Makefile +++ b/lang/umb-scheme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/03/04 21:29:57 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:57 rillig Exp $ DISTNAME= umb-scheme-3.2 CATEGORIES= lang @@ -10,7 +10,7 @@ COMMENT= UMB Scheme interpreter WRKSRC= ${WRKDIR}/scheme-3.2 BUILD_TARGET= default -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 pre-patch: ${MV} ${WRKSRC}/scheme.1 ${WRKSRC}/scheme.1.dist @@ -35,7 +35,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/prelude.scheme ${PREFIX}/share/umb-scheme ${INSTALL_DATA} ${WRKSRC}/SLIB-for-umb-scheme.init \ ${PREFIX}/share/umb-scheme - ${INSTALL_MAN} ${WRKSRC}/scheme.1 ${PREFIX}/man/man1/umb-scheme.1 + ${INSTALL_MAN} ${WRKSRC}/scheme.1 ${PREFIX}/${PKGMANDIR}/man1/umb-scheme.1 ${INSTALL_DATA_DIR} ${PREFIX}/share/umb-scheme/slib ${INSTALL_DATA} ${WRKSRC}/slib/*.scm ${PREFIX}/share/umb-scheme/slib diff --git a/mail/autorespond/Makefile b/mail/autorespond/Makefile index 9cc2a1aa96a..1a1b09062a9 100644 --- a/mail/autorespond/Makefile +++ b/mail/autorespond/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/16 06:58:02 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:57 rillig Exp $ # DISTNAME= autorespond-2.0.5 @@ -17,11 +17,11 @@ SUBST_STAGE.qmaildir= do-configure SUBST_FILES.qmaildir= autorespond.c SUBST_SED.qmaildir= -e 's|/var/qmail|${QMAILDIR}|g' -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/autorespond ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/autorespond.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/autorespond.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/autorespond ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/autorespond ${INSTALL_DATA} ${WRKSRC}/qmail-auto ${PREFIX}/share/doc/autorespond diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile index 492fa8749b9..5c06864eecc 100644 --- a/mail/bbmail/Makefile +++ b/mail/bbmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/07/22 04:46:16 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:57 rillig Exp $ # DISTNAME= bbmail-0.8.3 @@ -13,13 +13,13 @@ COMMENT= Mailbox monitor (not only) for the blackbox windowmanager GNU_CONFIGURE= YES USE_LANGUAGES= c c++ -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../mk/x11.buildlink3.mk" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bbmail ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/bbmail.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/bbmail.1 ${PREFIX}/${PKGMANDIR}/man1/ ${INSTALL_DATA_DIR} ${PREFIX}/share/bbtools/ ${INSTALL_DATA} ${WRKSRC}/data/bbmail.bb ${PREFIX}/share/bbtools/ diff --git a/mail/bulk_mailer/Makefile b/mail/bulk_mailer/Makefile index 550f19df1f3..67d04a269e4 100644 --- a/mail/bulk_mailer/Makefile +++ b/mail/bulk_mailer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/11/07 21:17:52 tv Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:57 rillig Exp $ # DISTNAME= bulk_mailer-1.13 @@ -13,11 +13,11 @@ BUILD_TARGET= bulk_mailer CPPFLAGS.SunOS+= -DPIPECOMMAND=\"/usr/sbin/sendmail -bs %s\" -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bulk_mailer ${PREFIX}/bin/bulk_mailer - ${INSTALL_MAN} ${WRKSRC}/bulk_mailer.1 ${PREFIX}/man/man1/bulk_mailer.1 + ${INSTALL_MAN} ${WRKSRC}/bulk_mailer.1 ${PREFIX}/${PKGMANDIR}/man1/bulk_mailer.1 .include "../../devel/sysexits/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile index 897263caa88..6afdef4de76 100644 --- a/mail/cucipop/Makefile +++ b/mail/cucipop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/03/04 21:29:58 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2007/01/07 09:13:57 rillig Exp $ # DISTNAME= cucipop-1.31 @@ -41,7 +41,7 @@ MAKE_ENV+= CFLAGS_INET6=-DINET6 LDFLAGS.SunOS+= -lnsl -lsocket -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin pre-configure: @(cd ${WRKSRC}; \ for f in config.h cucipop.8 makevpopdb.8; do \ @@ -52,7 +52,7 @@ pre-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cucipop ${PREFIX}/sbin ${INSTALL_PROGRAM} ${WRKSRC}/makevpopdb ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/cucipop.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/makevpopdb.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/cucipop.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKSRC}/makevpopdb.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../mk/bsd.pkg.mk" diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile index d4f5067d658..2ed4d6da4ef 100644 --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/04/22 09:22:10 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:57 rillig Exp $ # DISTNAME= dbmail-2.0.7 @@ -30,7 +30,7 @@ SUBST_FILES.sysconf+= dbmail.h SUBST_SED.sysconf= -e 's|/etc/dbmail\.conf|${PKG_SYSCONFDIR}/dbmail.conf|g' SUBST_MESSAGE.sysconf= Fixing sysconf paths. -INSTALLATION_DIRS= lib man man/man1 man/man8 sbin share/examples/dbmail +INSTALLATION_DIRS= lib man ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 sbin share/examples/dbmail post-install: ${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${EGDIR} diff --git a/mail/deliver/Makefile b/mail/deliver/Makefile index 45eb0cabf8d..e35dd6bec57 100644 --- a/mail/deliver/Makefile +++ b/mail/deliver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/10/28 15:17:17 schwarz Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:57 rillig Exp $ DISTNAME= deliver-2.1.14 PKGREVISION= 1 @@ -39,8 +39,8 @@ post-install: for FILE in deliver.1 header.1; do \ CATFILE=`${BASENAME} $${FILE} .1`.0; \ nroff -man $${FILE} > $${CATFILE}; \ - ${INSTALL_MAN} $${FILE} ${PREFIX}/man/man1; \ - ${INSTALL_MAN} $${CATFILE} ${PREFIX}/man/cat1; \ + ${INSTALL_MAN} $${FILE} ${PREFIX}/${PKGMANDIR}/man1; \ + ${INSTALL_MAN} $${CATFILE} ${PREFIX}/${PKGMANDIR}/cat1; \ done ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/deliver \ ${PREFIX}/share/examples/deliver diff --git a/mail/demime/Makefile b/mail/demime/Makefile index fde199279a6..25e7561ec38 100644 --- a/mail/demime/Makefile +++ b/mail/demime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/03/04 21:29:59 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:57 rillig Exp $ # DISTNAME= demime-1.1d @@ -24,7 +24,7 @@ USE_TOOLS+= perl:run pod2man EGDIR= ${PREFIX}/share/examples CONF_FILES= ${EGDIR}/demime_junkmail.cf ${PKG_SYSCONFDIR}/demime_junkmail.cf -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-extract: @${MKDIR} ${WRKSRC} @@ -39,6 +39,6 @@ do-build: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/demime ${PREFIX}/bin/demime ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/demime_junkmail.cf ${EGDIR} - ${INSTALL_MAN} ${WRKSRC}/demime.1 ${PREFIX}/man/man1/demime.1 + ${INSTALL_MAN} ${WRKSRC}/demime.1 ${PREFIX}/${PKGMANDIR}/man1/demime.1 .include "../../mk/bsd.pkg.mk" diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile index 6e524bb46b9..e6bb07d6748 100644 --- a/mail/dk-milter/Makefile +++ b/mail/dk-milter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/10/04 21:47:16 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:57 rillig Exp $ DISTNAME= dk-milter-0.3.0 PKGREVISION= 1 @@ -40,7 +40,7 @@ post-build: do-install: cd ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ -` && \ ${INSTALL_PROGRAM} dk-filter/dk-filter ${PREFIX}/sbin/dk-milter - ${INSTALL_MAN} ${WRKSRC}/dk-filter/dk-milter.8 ${PREFIX}/man/man8/ + ${INSTALL_MAN} ${WRKSRC}/dk-filter/dk-milter.8 ${PREFIX}/${PKGMANDIR}/man8/ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dk-milter ${INSTALL_DATA} ${WRKSRC}/FEATURES ${PREFIX}/share/doc/dk-milter ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/dk-milter diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile index d51fbe5f1ae..22674527792 100644 --- a/mail/dkim-milter/Makefile +++ b/mail/dkim-milter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/04/22 09:22:10 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:57 rillig Exp $ DISTNAME= dkim-milter-0.1.1 CATEGORIES= mail @@ -39,7 +39,7 @@ post-build: do-install: cd ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ -` && \ ${INSTALL_PROGRAM} dkim-filter/dkim-filter ${PREFIX}/sbin/dkim-milter - ${INSTALL_MAN} ${WRKSRC}/dkim-filter/dkim-milter.8 ${PREFIX}/man/man8/ + ${INSTALL_MAN} ${WRKSRC}/dkim-filter/dkim-milter.8 ${PREFIX}/${PKGMANDIR}/man8/ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dkim-milter ${INSTALL_DATA} ${WRKSRC}/FEATURES ${PREFIX}/share/doc/dkim-milter ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/dkim-milter diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile index 23719ebd51d..5c4e070e485 100644 --- a/mail/exim3/Makefile +++ b/mail/exim3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/04/23 00:12:38 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2007/01/07 09:13:57 rillig Exp $ DISTNAME= exim-3.36 PKGREVISION= 7 @@ -103,7 +103,7 @@ pre-install: post-install: ${INSTALL_SCRIPT} ${WRKDIR}/exim_newaliases ${PREFIX}/sbin/exim_newaliases ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR} - ${CP} ${FILESDIR}/exim.8 ${PREFIX}/man/man8/exim.8 + ${CP} ${FILESDIR}/exim.8 ${PREFIX}/${PKGMANDIR}/man8/exim.8 .include "../../devel/pcre/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile index 5a23bb4aeee..298fabbd38f 100644 --- a/mail/exmh/Makefile +++ b/mail/exmh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2006/10/20 08:15:14 dsainty Exp $ +# $NetBSD: Makefile,v 1.45 2007/01/07 09:13:58 rillig Exp $ DISTNAME= exmh-2.7.2 CATEGORIES= mail tk @@ -32,7 +32,7 @@ do-build: FILESDIR=${FILESDIR} ${SH} ${FILESDIR}/build do-install: - ${INSTALL_MAN} ${WRKSRC}/exmh.l ${PREFIX}/man/man1/exmh.1 + ${INSTALL_MAN} ${WRKSRC}/exmh.l ${PREFIX}/${PKGMANDIR}/man1/exmh.1 for binfile in exmh-async exmh-bg exmh-strip exmh ftp.expect; do \ ${INSTALL_SCRIPT} ${WRKSRC}/$$binfile ${PREFIX}/bin; \ done diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile index 69df421e9b1..499cbee56f4 100644 --- a/mail/ezmlm/Makefile +++ b/mail/ezmlm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/08/19 04:44:09 schmonz Exp $ +# $NetBSD: Makefile,v 1.19 2007/01/07 09:13:58 rillig Exp $ # .include "../../mail/ezmlm/Makefile.common" @@ -18,7 +18,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews # and don't provide compatibility symlinks. DJB_RESTRICTED= YES -INSTALLATION_DIRS= bin man man/man1 man/man5 man/cat1 man/cat5 +INSTALLATION_DIRS= bin man ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/cat1 ${PKGMANDIR}/cat5 .include "../../mk/djbware.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile index 021d0252b8c..77e4d218339 100644 --- a/mail/fetchmailconf/Makefile +++ b/mail/fetchmailconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2006/03/04 21:30:00 jlam Exp $ +# $NetBSD: Makefile,v 1.69 2007/01/07 09:13:58 rillig Exp $ DISTNAME= fetchmail-6.2.5.5 PKGNAME= ${DISTNAME:S/fetchmail/fetchmailconf/} @@ -19,11 +19,11 @@ PATCHDIR= ${.CURDIR}/../../mail/fetchmail/patches PYTHON_PATCH_SCRIPTS= fetchmailconf -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf ${PREFIX}/bin - ${LN} -s fetchmail.1 ${PREFIX}/man/man1/fetchmailconf.1 + ${LN} -s fetchmail.1 ${PREFIX}/${PKGMANDIR}/man1/fetchmailconf.1 .include "../../lang/python/application.mk" .include "../../x11/py-Tk/buildlink3.mk" diff --git a/mail/gotmail/Makefile b/mail/gotmail/Makefile index e32b76092cf..cc2d343ded9 100644 --- a/mail/gotmail/Makefile +++ b/mail/gotmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/02/05 23:09:55 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2007/01/07 09:13:58 rillig Exp $ # DISTNAME= gotmail-0.8.6 @@ -29,6 +29,6 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gotmail ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gotmail ${INSTALL_DATA} ${WRKSRC}/sample.gotmailrc ${EGDIR} - ${INSTALL_MAN} ${WRKSRC}/gotmail.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/gotmail.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/mail/imap-uw-utils/Makefile b/mail/imap-uw-utils/Makefile index b11802891bd..632d1318315 100644 --- a/mail/imap-uw-utils/Makefile +++ b/mail/imap-uw-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/04/06 06:22:18 reed Exp $ +# $NetBSD: Makefile,v 1.25 2007/01/07 09:13:58 rillig Exp $ DISTNAME= imap-utils PKGNAME= imap-uw-utils-20050108 @@ -19,7 +19,7 @@ SRCDIRS= icat ifrom CFLAGS+= -I${BUILDLINK_PREFIX.imap-uw}/include/c-client LIBS+= -lc-client -lssl -lcrypto -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: @for prog in ${SRCDIRS}; do \ @@ -33,7 +33,7 @@ do-install: ${ECHO} "==> Installing $${prog}"; \ cd ${WRKSRC}/$${prog}; \ ${INSTALL_PROGRAM} $${prog} ${PREFIX}/bin; \ - ${INSTALL_MAN} $${prog}.1 ${PREFIX}/man/man1; \ + ${INSTALL_MAN} $${prog}.1 ${PREFIX}/${PKGMANDIR}/man1; \ done .include "../../mail/imap-uw/buildlink3.mk" diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile index a08cd9841fa..11166b9ba58 100644 --- a/mail/ja-squirrelmail/Makefile +++ b/mail/ja-squirrelmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2006/12/07 05:38:44 taca Exp $ +# $NetBSD: Makefile,v 1.37 2007/01/07 09:13:58 rillig Exp $ DISTNAME= squirrelmail-1.4.9a PKGNAME= ja-${DISTNAME} @@ -83,7 +83,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/ ${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/ ${MV} ${PREFIX}/share/squirrelmail/contrib/conf.pl.8 \ - ${PREFIX}/man/man8/squirrelmail-conf.pl.8 + ${PREFIX}/${PKGMANDIR}/man8/squirrelmail-conf.pl.8 .include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile index d30203fcfb0..0761f80e487 100644 --- a/mail/mailscanner/Makefile +++ b/mail/mailscanner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/07/04 09:13:49 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:58 rillig Exp $ # DISTNAME= MailScanner-4.30.3-2 @@ -88,7 +88,7 @@ SUBST_SED.systemdefs= -e s,/bin/rm,${RM},g SUBST_SED.systemdefs= -e s,/bin/sed,${SED},g .endif -INSTALLATION_DIRS= bin man/man5 man/man8 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 # get rid of CVS backup files post-extract: @@ -123,8 +123,8 @@ do-install: ${INSTALL_DATA_DIR} ${DOCSDIR} cd ${WRKSRC}/docs && ${FIND} * -type d -exec ${INSTALL_DATA_DIR} ${DOCSDIR}'/{}' \; cd ${WRKSRC}/docs && ${FIND} * -type f -exec ${INSTALL_DATA} '{}' ${DOCSDIR} \; - cd ${WRKSRC}/docs/man && ${INSTALL_MAN} MailScanner.conf.5 ${PREFIX}/man/man5 - cd ${WRKSRC}/docs/man && ${INSTALL_MAN} MailScanner.8 ${PREFIX}/man/man8 + cd ${WRKSRC}/docs/man && ${INSTALL_MAN} MailScanner.conf.5 ${PREFIX}/${PKGMANDIR}/man5 + cd ${WRKSRC}/docs/man && ${INSTALL_MAN} MailScanner.8 ${PREFIX}/${PKGMANDIR}/man8 post-install: ${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC} diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile index 0ed9b18f58d..d55578110ae 100644 --- a/mail/mailsync/Makefile +++ b/mail/mailsync/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/04/22 09:22:11 rillig Exp $ +# $NetBSD: Makefile,v 1.25 2007/01/07 09:13:58 rillig Exp $ # DISTNAME= mailsync_5.2.1.orig @@ -30,7 +30,7 @@ SUBST_MESSAGE.conf= Fixing configure script. DOCS= COPYING NEWS README THANKS TODO doc/ABSTRACT doc/HACKING -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailsync @@ -38,7 +38,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/mailsync ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/doc/examples/mailsync \ ${PREFIX}/share/examples/mailsync/dot.mailsync - ${INSTALL_MAN} ${WRKSRC}/doc/mailsync.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/mailsync.1 ${PREFIX}/${PKGMANDIR}/man1 .for d in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${d} ${PREFIX}/share/doc/mailsync .endfor diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile index e4388d79219..da4e3028e68 100644 --- a/mail/mailwrapper/Makefile +++ b/mail/mailwrapper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/03/14 01:14:30 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2007/01/07 09:13:58 rillig Exp $ DISTNAME= mailwrapper-19990412 PKGREVISION= 4 @@ -23,7 +23,7 @@ MAILWRAPPEES= /usr/bin/mailq \ /usr/sbin/sendmail /usr/lib/sendmail FILES_SUBST+= MAILWRAPPEES=${MAILWRAPPEES:Q} -INSTALLATION_DIRS= man/cat5 man/cat8 man/man5 man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/cat5 ${PKGMANDIR}/cat8 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin do-configure: cd ${WRKSRC}; \ diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile index 3f50c6ae8d0..607c78daca0 100644 --- a/mail/mess822/Makefile +++ b/mail/mess822/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/02/19 00:41:49 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:58 rillig Exp $ # DISTNAME= mess822-0.58 @@ -29,7 +29,7 @@ CONF_FILES+= ${EGDIR}/leapsecs.dat ${PKG_SYSCONFDIR}/leapsecs.dat DJB_BUILD_TARGETS= install instcheck -INSTALLATION_DIRS= bin include lib man man/cat1 man/cat3 man/cat5 man/cat8 +INSTALLATION_DIRS= bin include lib man ${PKGMANDIR}/cat1 ${PKGMANDIR}/cat3 ${PKGMANDIR}/cat5 ${PKGMANDIR}/cat8 INSTALLATION_DIRS+= man/man1 man/man3 man/man5 man/man8 share/examples/mess822 SUBST_FILES.djbware+= cdb_seek.c leapsecs_read.c diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile index 13d6a006782..889c11852f0 100644 --- a/mail/milter-regex/Makefile +++ b/mail/milter-regex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/06/14 19:13:00 tron Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:58 rillig Exp $ DISTNAME= milter-regex-1.6 PKGREVISION= 1 @@ -9,7 +9,7 @@ MAINTAINER= jdarrow@NetBSD.org HOMEPAGE= http://www.benzedrine.cx/milter-regex.html COMMENT= Milter enabling regular expression filtering -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin PKG_GROUPS= smmsp PKG_USERS= smmsp:smmsp @@ -34,7 +34,7 @@ post-extract: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/milter-regex ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/milter-regex.8 ${PREFIX}/man/man8 + ${INSTALL_DATA} ${WRKSRC}/milter-regex.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../mail/libmilter/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/mail/mini_sendmail/Makefile.common b/mail/mini_sendmail/Makefile.common index 444aefd8fa4..1e2a7c4034f 100644 --- a/mail/mini_sendmail/Makefile.common +++ b/mail/mini_sendmail/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2005/06/29 22:01:19 is Exp $ +# $NetBSD: Makefile.common,v 1.13 2007/01/07 09:13:58 rillig Exp $ # DISTNAME= mini_sendmail-1.3.6 @@ -16,7 +16,7 @@ FILESDIR= ${.CURDIR}/../mini_sendmail/files EGDIR= ${PREFIX}/share/examples/mini_sendmail -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin .include "../../mk/bsd.prefs.mk" diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 5b3235c1358..3b72e28af5e 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.147 2006/12/11 12:46:51 salo Exp $ +# $NetBSD: Makefile,v 1.148 2007/01/07 09:13:58 rillig Exp $ DISTNAME= mutt-1.4.2.2i PKGREVISION= 3 @@ -101,7 +101,7 @@ pre-install: post-install: .if (${PKG_INSTALLATION_TYPE} == "pkgviews") - ${MV} ${PREFIX}/man/man5/mutt-mbox.5 ${PREFIX}/man/man5/mbox.5 + ${MV} ${PREFIX}/${PKGMANDIR}/man5/mutt-mbox.5 ${PREFIX}/${PKGMANDIR}/man5/mbox.5 .endif .include "../../mk/bsd.pkg.mk" diff --git a/mail/nail/Makefile b/mail/nail/Makefile index d57a1f109bc..ebcd15234b8 100644 --- a/mail/nail/Makefile +++ b/mail/nail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/12/29 06:21:51 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2007/01/07 09:13:58 rillig Exp $ DISTNAME= nail-11.25 CATEGORIES= mail @@ -29,11 +29,11 @@ EGDIR= ${PREFIX}/share/examples/nail CONF_FILES= ${EGDIR}/nail.rc ${PKG_SYSCONFDIR}/nail.rc -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/nail ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/nail.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/nail.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/nail.rc ${EGDIR} diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile index a1a3a1fbd50..486a1938e3d 100644 --- a/mail/offlineimap/Makefile +++ b/mail/offlineimap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:01 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= offlineimap_${_OFFLINEIMAP_VER} @@ -21,13 +21,13 @@ PYDISTUTILSPKG= yes PYTHON_PATCH_SCRIPTS= bin/offlineimap PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q} -INSTALLATION_DIRS= man/man1 share/examples/offlineimap +INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/examples/offlineimap post-install: .for _f_ in offlineimap.conf offlineimap.conf.minimal ${INSTALL_DATA} ${WRKSRC}/${_f_} ${PREFIX}/share/examples/offlineimap/${_f_} .endfor - ${INSTALL_MAN} ${WRKSRC}/offlineimap.1 ${PREFIX}/man/man1/offlineimap.1 + ${INSTALL_MAN} ${WRKSRC}/offlineimap.1 ${PREFIX}/${PKGMANDIR}/man1/offlineimap.1 .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile index 8602b3f3b77..3f766e188fa 100644 --- a/mail/pfqueue/Makefile +++ b/mail/pfqueue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/03/04 21:30:01 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= pfqueue-0.1.4 @@ -12,11 +12,11 @@ COMMENT= Real-time queue scanner for postfix GNU_CONFIGURE= yes INCOMPAT_CURSES= NetBSD-1.*-* -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pfqueue ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/pfqueue.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/pfqueue.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/pine/Makefile b/mail/pine/Makefile index 9716f06e3cf..813b74b874d 100644 --- a/mail/pine/Makefile +++ b/mail/pine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.111 2006/05/31 18:22:24 ghen Exp $ +# $NetBSD: Makefile,v 1.112 2007/01/07 09:13:59 rillig Exp $ DISTNAME= pine4.64 PKGNAME= pine-4.64 @@ -55,7 +55,7 @@ PINE_LDAPCFLAGS= LDAPCFLAGS="-DENABLE_LDAP" PINE_LDAPLIBS= LDAPLIBS="-lldap -llber" .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 # Make sure the imap lib that comes with pine isn't # used (see http://www.securityfocus.com/advisories/2646) @@ -84,9 +84,9 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/rpdump ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/rpload ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pine - ${INSTALL_MAN} ${WRKSRC}/doc/pine.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/rpdump.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/rpload.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/pine.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/rpdump.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/rpload.1 ${PREFIX}/${PKGMANDIR}/man1 ( ${ECHO} '# (This file is not part of the pine distribution! - HF)' ; \ ${PREFIX}/bin/pine -conf ) | ${SED} \ -e 's|^\(use-only-domain-name\)=.*$$|\1=No|g' \ diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile index 22f798be924..f0686ca8908 100644 --- a/mail/popa3d/Makefile +++ b/mail/popa3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2006/10/07 18:14:11 reed Exp $ +# $NetBSD: Makefile,v 1.47 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= popa3d-1.0.2 @@ -29,11 +29,11 @@ SUBST_FILES.params= params.h SUBST_SED.params= -e 's,/var/empty,${PREFIX}/share/empty,' \ -e 's,@@POPA3D_USER@@,"${POPA3D_USER}",' -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin do-install: ${INSTALL_PROGRAM} -m 500 ${WRKSRC}/popa3d ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/popa3d.8 ${PREFIX}/man/man8/ + ${INSTALL_DATA} ${WRKSRC}/popa3d.8 ${PREFIX}/${PKGMANDIR}/man8/ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/popa3d cd ${WRKSRC} && ${INSTALL_DATA} DESIGN INSTALL LICENSE \ ${PREFIX}/share/doc/popa3d diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile index 645445f83f2..3af814f9d13 100644 --- a/mail/poppassd/Makefile +++ b/mail/poppassd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/06/01 22:27:17 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= qpopper${VERSION} @@ -22,7 +22,7 @@ MAKE_ENV+= ROOT_USER=${ROOT_USER:Q} ROOT_GROUP=${ROOT_GROUP:Q} .include "options.mk" -INSTALLATION_DIRS= man/man8 share/doc libexec +INSTALLATION_DIRS= ${PKGMANDIR}/man8 share/doc libexec do-build: .for DIR in common password @@ -34,7 +34,7 @@ do-build: do-install: cd ${WRKSRC}/password; ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET} - ${INSTALL_MAN} ${WRKSRC}/man/poppassd.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/man/poppassd.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_DATA} ${WRKSRC}/License.txt \ ${PREFIX}/share/doc/poppassd.License; diff --git a/mail/poppy/Makefile b/mail/poppy/Makefile index 6c9b07419bf..5c238287bcc 100644 --- a/mail/poppy/Makefile +++ b/mail/poppy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:13 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= poppy-3.1 @@ -13,10 +13,10 @@ NO_BUILD= YES USE_TOOLS+= perl:run REPLACE_PERL= poppy -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/poppy ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/poppy.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/poppy.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile index c9cb44dcff7..42ff72c8028 100644 --- a/mail/procmail/Makefile +++ b/mail/procmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/12/23 04:36:45 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= procmail-3.22 @@ -23,7 +23,7 @@ BUILD_DEFS+= PROCMAIL_MAILSPOOLHOME PROCMAIL_TRUSTED_IDS PROCMAIL_TRUSTED_IDS?=\ "root","daemon","uucp","mail","x400","network","list","slist","lists","news",0 -INSTALLATION_DIRS= bin man/man1 man/man5 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 pre-configure: ${ECHO} "#define TRUSTED_IDS {${PROCMAIL_TRUSTED_IDS:Q}}" \ @@ -47,10 +47,10 @@ do-install: done; \ ${INSTALL_SCRIPT} mailstat ${PREFIX}/bin/mailstat; \ for f in procmail.1 formail.1 lockfile.1; do \ - ${INSTALL_MAN} $$f ${PREFIX}/man/man1/$$f; \ + ${INSTALL_MAN} $$f ${PREFIX}/${PKGMANDIR}/man1/$$f; \ done; \ for f in procmailex.5 procmailrc.5 procmailsc.5; do \ - ${INSTALL_MAN} $$f ${PREFIX}/man/man5/$$f; \ + ${INSTALL_MAN} $$f ${PREFIX}/${PKGMANDIR}/man5/$$f; \ done ${SH} ${WRKSRC}/suid.sh .endif diff --git a/mail/qmail-qfilter/Makefile b/mail/qmail-qfilter/Makefile index f0bdd4213f5..169d4f59517 100644 --- a/mail/qmail-qfilter/Makefile +++ b/mail/qmail-qfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/08/02 02:36:17 schmonz Exp $ +# $NetBSD: Makefile,v 1.18 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= qmail-qfilter-2.1 @@ -27,7 +27,7 @@ SUBST_SED.paths= -e 's|/tmp|${QMAIL_QFILTER_TMPDIR}|g' SUBST_SED.paths+= -e 's|/var/qmail|${QMAILDIR}|g' SUBST_MESSAGE.paths= Fixing paths. -INSTALLATION_DIRS= bin man man/man1 share/examples/qmail-qfilter +INSTALLATION_DIRS= bin man ${PKGMANDIR}/man1 share/examples/qmail-qfilter DJB_RESTRICTED= NO DJB_MAKE_TARGETS= NO diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile index ef783732126..2df7c495b2e 100644 --- a/mail/rss2email/Makefile +++ b/mail/rss2email/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/07/01 19:32:40 schmonz Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= rss2email-2.59 @@ -27,7 +27,7 @@ SUBST_SED.bin+= -e 's|@PYTHONBIN@|${PYTHONBIN}|g' SHAREDIR= ${PREFIX}/share/rss2email EGDIR= ${PREFIX}/share/examples/rss2email -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-extract: ${_PKG_SILENT}${_PKG_DEBUG} \ @@ -39,7 +39,7 @@ do-install: ${INSTALL_SCRIPT} rss2email.py ${SHAREDIR}; \ ${INSTALL_DATA_DIR} ${EGDIR}; \ ${INSTALL_DATA} config.py ${EGDIR}; \ - ${INSTALL_MAN} r2e.1 ${PREFIX}/man/man1; \ + ${INSTALL_MAN} r2e.1 ${PREFIX}/${PKGMANDIR}/man1; \ ${INSTALL_SCRIPT} r2e ${PREFIX}/bin .include "../../lang/python/application.mk" diff --git a/mail/sigrot/Makefile b/mail/sigrot/Makefile index 46615177c36..6c49d7adcad 100644 --- a/mail/sigrot/Makefile +++ b/mail/sigrot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/10/04 21:47:17 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:59 rillig Exp $ DISTNAME= sigrot_1.2-1 PKGNAME= sigrot-1.2 @@ -16,14 +16,14 @@ USE_TOOLS+= gmake DOCDIR= ${PREFIX}/share/doc/sigrot EGDIR= ${PREFIX}/share/examples/sigrot -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: cd ${WRKSRC} && ${CC} sigrot.c -o sigrot do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sigrot ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/sigrot.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/sigrot.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/copyright ${DOCDIR}/COPYRIGHT ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR}/INSTALL diff --git a/mail/sma/Makefile b/mail/sma/Makefile index 314097f7658..9e19c36438c 100644 --- a/mail/sma/Makefile +++ b/mail/sma/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/11/14 12:31:30 obache Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:59 rillig Exp $ DISTNAME= sma-1.4 CATEGORIES= mail @@ -24,7 +24,7 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 do-install: cd ${WRKSRC}; \ ${INSTALL_PROGRAM} sma ${PREFIX}/bin; \ - ${INSTALL_MAN} docs/sma.8 ${PREFIX}/man/man8; \ + ${INSTALL_MAN} docs/sma.8 ${PREFIX}/${PKGMANDIR}/man8; \ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sma; \ ${INSTALL_DATA} README ${PREFIX}/share/doc/sma; \ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sma; \ diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile index 96f60fc65d2..d276d3d2887 100644 --- a/mail/smtpfeed/Makefile +++ b/mail/smtpfeed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/06/03 00:45:15 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2007/01/07 09:13:59 rillig Exp $ DISTNAME= smtpfeed-1.18 PKGREVISION= 1 @@ -29,7 +29,7 @@ DOCS= COPYRIGHT FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \ BUILD_DEFS+= USE_INET6 -INSTALLATION_DIRS= libexec man/man8 share/doc/smtpfeed +INSTALLATION_DIRS= libexec ${PKGMANDIR}/man8 share/doc/smtpfeed .include "../../mk/bsd.prefs.mk" @@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--enable-ipv6 .endif post-install: - ${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${PREFIX}/${PKGMANDIR}/man8 for i in ${DOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/smtpfeed; \ done diff --git a/math/aribas/Makefile b/math/aribas/Makefile index 6116bec71fa..ac9f90729fc 100644 --- a/math/aribas/Makefile +++ b/math/aribas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:02 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2007/01/07 09:13:59 rillig Exp $ DISTNAME= aribas-1.53 CATEGORIES= math @@ -12,11 +12,11 @@ CPPFLAGS+= -DUNiX -DPROTO BUILD_DIRS= src -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/aribas ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/aribas.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/aribas.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/aribas ${INSTALL_DATA} ${WRKSRC}/doc/aribas.[dmt]* ${PREFIX}/share/doc/aribas/ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/aribas diff --git a/math/mathomatic/Makefile b/math/mathomatic/Makefile index 99094539a1e..c34b7f30e9e 100644 --- a/math/mathomatic/Makefile +++ b/math/mathomatic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2007/01/02 16:56:19 minskim Exp $ +# $NetBSD: Makefile,v 1.76 2007/01/07 09:13:59 rillig Exp $ # DISTNAME= mathomatic-12.6.8 @@ -17,14 +17,14 @@ MAKE_FILE= makefile CFLAGS.SunOS+= -DSOLARIS -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 BUILDLINK_API_DEPENDS.readline+= readline>=5.1pl1nb1 .include "../../devel/readline/buildlink3.mk" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mathomatic ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/mathomatic.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/mathomatic.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE} ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${WRKSRC}/README.txt \ ${PREFIX}/share/doc/${PKGBASE} diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile index 6cb08e104c4..474e307e796 100644 --- a/math/xldlas/Makefile +++ b/math/xldlas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/12/15 20:32:58 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2007/01/07 09:14:00 rillig Exp $ DISTNAME= xldlas-0.85 PKGREVISION= 5 @@ -13,11 +13,11 @@ COMMENT= XForms-based statistics package WRKSRC= ${WRKDIR}/xldlas USE_X11BASE= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xldlas ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/xldlas.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/xldlas.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/xldlas ${CP} -R ${WRKSRC}/help ${PREFIX}/share/xldlas diff --git a/mbone/mdd/Makefile b/mbone/mdd/Makefile index e013d914eb7..2d8f3529e00 100644 --- a/mbone/mdd/Makefile +++ b/mbone/mdd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/10/10 17:09:39 hira Exp $ +# $NetBSD: Makefile,v 1.5 2007/01/07 09:14:00 rillig Exp $ # DISTNAME= mdd-20050318 @@ -9,10 +9,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= manu@NetBSD.org COMMENT= Multicast file distribution tool -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mdd ${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/mdd.1 ${PREFIX}/man/man1/ + ${INSTALL_DATA} ${WRKSRC}/mdd.1 ${PREFIX}/${PKGMANDIR}/man1/ .include "../../mk/bsd.pkg.mk" diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile index e3dfb4b358c..9d39f46906b 100644 --- a/mbone/rat/Makefile +++ b/mbone/rat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/09/03 00:56:29 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2007/01/07 09:14:00 rillig Exp $ # DISTNAME= rat-3.0.28 @@ -17,7 +17,7 @@ USE_X11BASE= yes USER= build -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-patch: ${CP} ${WRKSRC}/Makefile_NetBSD_1 ${WRKSRC}/Makefile_NetBSD_2 diff --git a/mbone/sapserver/Makefile b/mbone/sapserver/Makefile index 04ed205ac01..076107be520 100644 --- a/mbone/sapserver/Makefile +++ b/mbone/sapserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/06/02 16:12:21 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2007/01/07 09:14:00 rillig Exp $ # DISTNAME= miniSAPserver-0.2.4 @@ -13,6 +13,6 @@ GNU_CONFIGURE= YES USE_LANGUAGES= c c++ -INSTALLATION_DIRS= bin man/man1 share/doc/sapserver +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/sapserver .include "../../mk/bsd.pkg.mk" diff --git a/misc/9menu/Makefile b/misc/9menu/Makefile index 085de2e1642..dc776912a8e 100644 --- a/misc/9menu/Makefile +++ b/misc/9menu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/09/09 02:43:11 obache Exp $ +# $NetBSD: Makefile,v 1.20 2007/01/07 09:14:00 rillig Exp $ DISTNAME= 9menu-1.8 PKGREVISION= 1 @@ -13,12 +13,12 @@ MAKE_FILE= Makefile.noimake BUILD_TARGET= 9menu WRKSRC= ${WRKDIR} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../mk/x11.buildlink3.mk" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/9menu ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/9menu.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/9menu.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/misc/ascii/Makefile b/misc/ascii/Makefile index 28175411bcb..ecd2934c2db 100644 --- a/misc/ascii/Makefile +++ b/misc/ascii/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:10 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:00 rillig Exp $ # DISTNAME= ascii-3.0 @@ -11,11 +11,11 @@ COMMENT= ASCII character table program BUILD_TARGET= ascii -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ascii ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/ascii.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/ascii.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ascii ${INSTALL_DATA} ${WRKSRC}/ascii.cgi ${PREFIX}/share/examples/ascii diff --git a/misc/asr-manpages/Makefile b/misc/asr-manpages/Makefile index e24ee84625e..3aeca5c316d 100644 --- a/misc/asr-manpages/Makefile +++ b/misc/asr-manpages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:10 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:00 rillig Exp $ # DISTNAME= asr.pages @@ -14,25 +14,25 @@ COMMENT= alt.sysadmin.recovery man page distribution NO_CONFIGURE= yes NO_BUILD= yes DIST_SUBDIR= ${PKGNAME_NOREV} -INSTALLATION_DIRS= man/man1 man/man2 man/man3 man5 man/man8 +INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man2 ${PKGMANDIR}/man3 man5 ${PKGMANDIR}/man8 do-install: - ${INSTALL_MAN} ${WRKDIR}/bosskill.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKDIR}/c.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKDIR}/chastise.3 ${PREFIX}/man/man3 - ${INSTALL_MAN} ${WRKDIR}/ctluser.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKDIR}/guru.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKDIR}/knife.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKDIR}/lart.1m ${PREFIX}/man/man1/lart.1 - ${INSTALL_MAN} ${WRKDIR}/luser.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKDIR}/normality.5 ${PREFIX}/man/man5 - ${INSTALL_MAN} ${WRKDIR}/nuke.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKDIR}/people.2 ${PREFIX}/man/man2 - ${INSTALL_MAN} ${WRKDIR}/pmsd.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKDIR}/rtfm.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKDIR}/slave.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKDIR}/sysadmin.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKDIR}/think.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKDIR}/whack.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKDIR}/bosskill.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKDIR}/c.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKDIR}/chastise.3 ${PREFIX}/${PKGMANDIR}/man3 + ${INSTALL_MAN} ${WRKDIR}/ctluser.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKDIR}/guru.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKDIR}/knife.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKDIR}/lart.1m ${PREFIX}/${PKGMANDIR}/man1/lart.1 + ${INSTALL_MAN} ${WRKDIR}/luser.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKDIR}/normality.5 ${PREFIX}/${PKGMANDIR}/man5 + ${INSTALL_MAN} ${WRKDIR}/nuke.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKDIR}/people.2 ${PREFIX}/${PKGMANDIR}/man2 + ${INSTALL_MAN} ${WRKDIR}/pmsd.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKDIR}/rtfm.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKDIR}/slave.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKDIR}/sysadmin.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKDIR}/think.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKDIR}/whack.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/misc/autocue/Makefile b/misc/autocue/Makefile index db4637a92a5..b944d76d765 100644 --- a/misc/autocue/Makefile +++ b/misc/autocue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/02/05 23:10:07 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2007/01/07 09:14:00 rillig Exp $ # DISTNAME= autocue-20060129 @@ -18,6 +18,6 @@ do-extract: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/autocue ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/autocue.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/autocue.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/misc/bbappconf/Makefile b/misc/bbappconf/Makefile index 6d03bab7cb3..326d1b9360c 100644 --- a/misc/bbappconf/Makefile +++ b/misc/bbappconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/02/05 23:10:07 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:00 rillig Exp $ # DISTNAME= bbappconf-0.0.2 @@ -24,7 +24,7 @@ post-patch: ${MV} ${WRKSRC}/data/README.bbappconf.tmp ${WRKSRC}/data/README.bbappconf post-install: - ${INSTALL_MAN_DIR} ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/data/bbappconf.1 ${PREFIX}/man/man1 + ${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/data/bbappconf.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/misc/bbweather/Makefile b/misc/bbweather/Makefile index fbf782376ce..87e327b4995 100644 --- a/misc/bbweather/Makefile +++ b/misc/bbweather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/05/13 21:06:02 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:00 rillig Exp $ # DISTNAME= bbweather-0.6.2 @@ -21,7 +21,7 @@ USE_TOOLS+= gunzip perl:run .include "../../mk/x11.buildlink3.mk" post-install: - cd ${PREFIX}/man/man1 && ${GUNZIP_CMD} GrabWeather.1.gz - cd ${PREFIX}/man/man1 && ${GUNZIP_CMD} bbweather.1.gz + cd ${PREFIX}/${PKGMANDIR}/man1 && ${GUNZIP_CMD} GrabWeather.1.gz + cd ${PREFIX}/${PKGMANDIR}/man1 && ${GUNZIP_CMD} bbweather.1.gz .include "../../mk/bsd.pkg.mk" diff --git a/misc/colorize/Makefile b/misc/colorize/Makefile index 436ee674b73..e44cbe5355a 100644 --- a/misc/colorize/Makefile +++ b/misc/colorize/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/06/16 17:48:47 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:00 rillig Exp $ # DISTNAME= colorize_0.3.0 @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} NO_BUILD= yes USE_TOOLS+= gunzip perl:run -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 SUBST_CLASSES+= color SUBST_STAGE.color= pre-configure @@ -35,7 +35,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/colorize.pl ${PREFIX}/bin/colorize ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/colorize ${INSTALL_DATA} ${WRKSRC}/colorizerc ${PREFIX}/share/examples/colorize - ${INSTALL_MAN} ${WRKSRC}/colorize.pl.1 ${PREFIX}/man/man1/colorize.1 + ${INSTALL_MAN} ${WRKSRC}/colorize.pl.1 ${PREFIX}/${PKGMANDIR}/man1/colorize.1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/colorize cd ${WRKSRC} && ${INSTALL_DATA} README TIPS ${PREFIX}/share/doc/colorize ${INSTALL_SCRIPT} ${WRKSRC}/examples/colorize-fifo.sh \ diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile index 4ffe0fe01c7..732f2dff5a6 100644 --- a/misc/colorls/Makefile +++ b/misc/colorls/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/03/04 21:30:10 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:00 rillig Exp $ DISTNAME= ls PKGNAME= colorls-2.2 @@ -16,7 +16,7 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL MANCOMPRESSED_IF_MANZ= yes MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} \ MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q} -INSTALLATION_DIRS= bin man/man1 man/cat1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1 pre-patch: ${CP} ${WRKSRC}/ls.1 ${WRKSRC}/colorls.1 diff --git a/misc/colortail/Makefile b/misc/colortail/Makefile index cdec7dfffe2..02d40f1dc52 100644 --- a/misc/colortail/Makefile +++ b/misc/colortail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/07/22 04:46:17 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:00 rillig Exp $ DISTNAME= colortail-0.3.0 CATEGORIES= misc @@ -15,7 +15,7 @@ CONFIGURE_ARGS+=--datadir=${PREFIX}/share/examples/colortail DESCR_SRC= ${WRKDIR}/.DESCR_SRC post-install: - ${INSTALL_MAN} ${WRKSRC}/colortail.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/colortail.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/colortail cd ${WRKSRC}/example-conf/ && \ ${INSTALL_DATA} conf.kernel conf.messages conf.secure \ diff --git a/misc/cowsay/Makefile b/misc/cowsay/Makefile index ed82f2613b5..f7822c6bbe3 100644 --- a/misc/cowsay/Makefile +++ b/misc/cowsay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:10 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:00 rillig Exp $ DISTNAME= cowsay-3.03 PKGREVISION= 1 @@ -20,13 +20,13 @@ SUBST_SED.pap= -e "s|%BANGPERL%|!${PERL5}|" -e "s|%PREFIX%|${PREFIX}|" NO_CONFIGURE= yes NO_BUILD= yes -INSTALLATION_DIRS= bin man/man1 share/cows +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/cows do-install: ${INSTALL_SCRIPT} ${WRKSRC}/cowsay ${PREFIX}/bin cd ${PREFIX}/bin; ${LN} -s cowsay cowthink - ${INSTALL_DATA} ${WRKSRC}/cowsay.1 ${PREFIX}/man/man1 - cd ${PREFIX}/man/man1; ${LN} -s cowsay.1 cowthink.1 + ${INSTALL_DATA} ${WRKSRC}/cowsay.1 ${PREFIX}/${PKGMANDIR}/man1 + cd ${PREFIX}/${PKGMANDIR}/man1; ${LN} -s cowsay.1 cowthink.1 ${INSTALL_DATA} ${WRKSRC}/cows/*.cow ${PREFIX}/share/cows .include "../../mk/bsd.pkg.mk" diff --git a/misc/cuetools/Makefile b/misc/cuetools/Makefile index 61251bae5a6..41bda1b53e7 100644 --- a/misc/cuetools/Makefile +++ b/misc/cuetools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/07/22 00:45:10 minskim Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:00 rillig Exp $ # DISTNAME= cuetools-1.2 @@ -14,18 +14,18 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= flex gmake yacc -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tools/cuebreakpoints ${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/tools/cueconvert ${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/tools/cueprint ${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/man/cuebreakpoints.man \ - ${PREFIX}/man/man1/cuebreakpoints.1 + ${PREFIX}/${PKGMANDIR}/man1/cuebreakpoints.1 ${INSTALL_DATA} ${WRKSRC}/man/cueconvert.man \ - ${PREFIX}/man/man1/cueconvert.1 + ${PREFIX}/${PKGMANDIR}/man1/cueconvert.1 ${INSTALL_DATA} ${WRKSRC}/man/cueprint.man \ - ${PREFIX}/man/man1/cueprint.1 + ${PREFIX}/${PKGMANDIR}/man1/cueprint.1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cuetools/ ${INSTALL_DATA} ${WRKSRC}/formats.txt ${PREFIX}/share/doc/cuetools/ diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile index 263e1089df9..dddf0ac8985 100644 --- a/misc/gnuls/Makefile +++ b/misc/gnuls/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:11 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2007/01/07 09:14:00 rillig Exp $ # DISTNAME= coreutils-5.2.1 @@ -19,7 +19,7 @@ GNU_CONFIGURE= YES PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/dircolors \ @@ -27,9 +27,9 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/ls \ ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}ls ${INSTALL_DATA} ${WRKSRC}/man/dircolors.1 \ - ${PREFIX}/man/man1/${GNU_PROGRAM_PREFIX}dircolors.1 + ${PREFIX}/${PKGMANDIR}/man1/${GNU_PROGRAM_PREFIX}dircolors.1 ${INSTALL_DATA} ${WRKSRC}/man/ls.1 \ - ${PREFIX}/man/man1/${GNU_PROGRAM_PREFIX}ls.1 + ${PREFIX}/${PKGMANDIR}/man1/${GNU_PROGRAM_PREFIX}ls.1 .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/misc/jhd/Makefile b/misc/jhd/Makefile index 91c3af0c662..16266c8b572 100644 --- a/misc/jhd/Makefile +++ b/misc/jhd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/05/26 19:09:43 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:01 rillig Exp $ DISTNAME= jhd-2.3 CATEGORIES= japanese misc @@ -9,13 +9,13 @@ COMMENT= Japanese Hexadecimal Dump BUILD_DEPENDS+= nkf>=1.7:../../converters/nkf -INSTALLATION_DIRS= bin man/ja_JP.EUC/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/ja_JP.EUC/man1 post-build: @(cd ${WRKSRC}; ${MV} jhd.1 jhd.1.org; nkf -e jhd.1.org > jhd.1) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/jhd ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/jhd.1 ${PREFIX}/man/ja_JP.EUC/man1 + ${INSTALL_MAN} ${WRKSRC}/jhd.1 ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1 .include "../../mk/bsd.pkg.mk" diff --git a/misc/jive/Makefile b/misc/jive/Makefile index ad994ca3d2e..fa557af66a0 100644 --- a/misc/jive/Makefile +++ b/misc/jive/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:11 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:01 rillig Exp $ DISTNAME= jive-1.1 CATEGORIES= misc @@ -8,12 +8,12 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Filter that converts English text to Jive WRKSRC= ${WRKDIR}/jive -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 USE_TOOLS+= flex do-install: ${INSTALL_PROGRAM} ${WRKSRC}/jive ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/jive.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/jive.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile index 6347879ee7e..0058785a846 100644 --- a/misc/mmv/Makefile +++ b/misc/mmv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:11 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:01 rillig Exp $ # DISTNAME= mmv_1.01b.orig @@ -19,10 +19,10 @@ BUILD_TARGET= mmv CFLAGS+= -DIS_SYSV .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mmv ${PREFIX}/bin/mmv - ${INSTALL_MAN} ${WRKSRC}/mmv.1 ${PREFIX}/man/man1/mmv.1 + ${INSTALL_MAN} ${WRKSRC}/mmv.1 ${PREFIX}/${PKGMANDIR}/man1/mmv.1 .include "../../mk/bsd.pkg.mk" diff --git a/misc/multitail/Makefile b/misc/multitail/Makefile index 1516075eb95..81a9994f0c9 100644 --- a/misc/multitail/Makefile +++ b/misc/multitail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/06/25 00:01:44 hubertf Exp $ +# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:01 rillig Exp $ # DISTNAME= multitail-4.0.6 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.vanheusden.com/multitail/ COMMENT= View one or multiple files USE_NCURSES= yes # Needs the <panel> library. -INSTALLATION_DIRS= bin man/man1 share/doc/multitail share/examples/multitail +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/multitail share/examples/multitail CONF_FILES= ${PREFIX:Q}/share/examples/multitail/multitail.conf \ ${PKG_SYSCONFDIR:Q}/multitail.conf diff --git a/misc/reed/Makefile b/misc/reed/Makefile index 11ec09cb2b1..86d3847b45f 100644 --- a/misc/reed/Makefile +++ b/misc/reed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/06/15 13:31:29 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:01 rillig Exp $ DISTNAME= reed-5.4 PKGREVISION= 2 @@ -18,15 +18,15 @@ REPLACE_PERL= breed fix_bookmarks.pl wrap # wgetnstr() INCOMPAT_CURSES= NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-U]-* -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/reed ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/breed ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/wrap ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/breed.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/reed.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/wrap.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/breed.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/reed.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/wrap.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/reed ${INSTALL_DATA} ${WRKSRC}/help ${PREFIX}/share/reed/ diff --git a/misc/splitvt/Makefile b/misc/splitvt/Makefile index 4680358d308..9468e731251 100644 --- a/misc/splitvt/Makefile +++ b/misc/splitvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:13 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:01 rillig Exp $ DISTNAME= splitvt-1.6.3 CATEGORIES= misc @@ -10,10 +10,10 @@ COMMENT= Run two shells in a split window/terminal BUILD_TARGET= CONFIGURE_SCRIPT= ./Configure HAS_CONFIGURE= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/splitvt ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/splitvt.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/splitvt.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/misc/ttyrec/Makefile b/misc/ttyrec/Makefile index b418185fa1d..ef4e9b123b5 100644 --- a/misc/ttyrec/Makefile +++ b/misc/ttyrec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/09/09 13:48:02 obache Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:01 rillig Exp $ DISTNAME= ttyrec-1.0.8 CATEGORIES= misc @@ -14,14 +14,14 @@ COMMENT= ttyrec is a tty recorder CFLAGS+= -DSVR4 .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ttyplay ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/ttyrec ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/ttytime ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/ttyplay.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/ttyrec.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/ttytime.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/ttyplay.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/ttyrec.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/ttytime.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/misc/xjdic/Makefile b/misc/xjdic/Makefile index aab80c9ec7b..fe8bf687201 100644 --- a/misc/xjdic/Makefile +++ b/misc/xjdic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:13 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:01 rillig Exp $ # DISTNAME= xjdic24 @@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR} MESSAGE_SUBST+= PREFIX=${PREFIX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: cd ${WRKSRC} ; \ @@ -50,7 +50,7 @@ do-install: ${WRKSRC}/xjdic24.inf \ ${WRKSRC}/xjdic24.install \ ${PREFIX}/share/doc/xjdic - ${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${PREFIX}/${PKGMANDIR}/man1 ${LN} -s ../edict/edict ${PREFIX}/share/xjdic/edict ${LN} -s ../kanjidic/kanjidic ${PREFIX}/share/xjdic/kanjidic ${PREFIX}/bin/xjdxgen ${PREFIX}/share/xjdic/edict diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index b1a3a9966f7..d7669f05cc8 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/11/02 02:26:55 rillig Exp $ +# $NetBSD: Makefile,v 1.32 2007/01/07 09:14:01 rillig Exp $ DISTNAME= ffmpeg-0.4.9-pre1 PKGNAME= ffmpeg-0.4.9pre1 @@ -45,8 +45,8 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \ ${PREFIX}/share/examples/ffmpeg # ffplay not installed - if [ -f ${PREFIX}/man/man1/ffplay.1 ]; then \ - ${RM} ${PREFIX}/man/man1/ffplay.1 ; \ + if [ -f ${PREFIX}/${PKGMANDIR}/man1/ffplay.1 ]; then \ + ${RM} ${PREFIX}/${PKGMANDIR}/man1/ffplay.1 ; \ fi ${INSTALL_DATA} ${WRKSRC}/libavcodec/libpostproc/postprocess.h \ ${PREFIX}/include/ffmpeg/libpostproc diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index ec8d9ff2985..3eb0ebcce0b 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/12/07 14:09:02 drochner Exp $ +# $NetBSD: Makefile,v 1.30 2007/01/07 09:14:01 rillig Exp $ PKGNAME= mencoder-${MPLAYER_PKG_VERSION} @@ -13,16 +13,16 @@ CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer BUILD_TARGET= mencoder MANCOMPRESSED_IF_MANZ= 1 -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${PREFIX}/bin if [ X"${MANZ}" = X"" ]; then \ - ${LN} -s -f ${PREFIX}/man/man1/mplayer.1 \ - ${PREFIX}/man/man1/mencoder.1; \ + ${LN} -s -f ${PREFIX}/${PKGMANDIR}/man1/mplayer.1 \ + ${PREFIX}/${PKGMANDIR}/man1/mencoder.1; \ else \ - ${LN} -s -f ${PREFIX}/man/man1/mplayer.1.gz \ - ${PREFIX}/man/man1/mencoder.1.gz; \ + ${LN} -s -f ${PREFIX}/${PKGMANDIR}/man1/mplayer.1.gz \ + ${PREFIX}/${PKGMANDIR}/man1/mencoder.1.gz; \ fi .include "../../multimedia/mplayer-share/Makefile.depends" diff --git a/multimedia/mpeg_encode/Makefile b/multimedia/mpeg_encode/Makefile index 8914ca0301e..990796b788b 100644 --- a/multimedia/mpeg_encode/Makefile +++ b/multimedia/mpeg_encode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:15 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:01 rillig Exp $ # DISTNAME= mpeg_encode-1.5b-src @@ -13,7 +13,7 @@ COMMENT= The Parallel Berkeley MPEG Encoder WRKSRC= ${WRKDIR}/mpeg_encode USE_TOOLS+= gmake -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-build: @cd ${WRKSRC}/convert && \ @@ -33,7 +33,7 @@ do-install: cd ${WRKSRC}/examples ; for i in * ; do \ ${INSTALL_DATA} $$i ${PREFIX}/share/examples/mpeg_encode; \ done - ${INSTALL_MAN} ${WRKSRC}/docs/mpeg_encode.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/docs/mpeg_encode.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../graphics/jpeg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 350c063c92c..86d6c2ab02f 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2006/09/26 07:27:19 martti Exp $ +# $NetBSD: Makefile,v 1.40 2007/01/07 09:14:01 rillig Exp $ # DISTNAME= vlc-${VLC_VER} @@ -63,8 +63,8 @@ pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/osdmenu/dvd/selection ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/skins2 ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/skins2/fonts - ${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${PREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${PREFIX}/${PKGMANDIR}/man1 ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf diff --git a/multimedia/vlc07/Makefile b/multimedia/vlc07/Makefile index f2877042aa8..589fe8f1c2b 100644 --- a/multimedia/vlc07/Makefile +++ b/multimedia/vlc07/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/09/26 07:19:41 martti Exp $ +# $NetBSD: Makefile,v 1.2 2007/01/07 09:14:01 rillig Exp $ # DISTNAME= vlc-${VLC_VER} @@ -49,8 +49,8 @@ PLIST_SUBST+= DVDCSS="@comment " pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/admin ${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/skins/default - ${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${PREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${PREFIX}/${PKGMANDIR}/man1 ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf diff --git a/net/6tunnel/Makefile b/net/6tunnel/Makefile index d7050478072..97a295bed15 100644 --- a/net/6tunnel/Makefile +++ b/net/6tunnel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/17 03:50:23 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:01 rillig Exp $ # DISTNAME= 6tunnel-0.09 @@ -18,13 +18,13 @@ NOT_FOR_PLATFORM+= Interix-*-* # no IPv6 support LDFLAGS+= -lsocket -lnsl .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: ${CC} ${CFLAGS} -o ${WRKSRC}/6tunnel ${WRKSRC}/6tunnel.c ${LDFLAGS} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/6tunnel ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/6tunnel.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/6tunnel.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/net/arping/Makefile b/net/arping/Makefile index f3bdc83662a..03aee17d4dc 100644 --- a/net/arping/Makefile +++ b/net/arping/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/12/20 00:00:58 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:01 rillig Exp $ # DISTNAME= arping-2.05 @@ -32,12 +32,12 @@ BUILD_FOR= macosx BUILD_TARGET= arping1 ${BUILD_FOR} .endif -INSTALLATION_DIRS= bin man/man8 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 .include "../../net/libpcap/buildlink3.mk" do-install: - ${INSTALL_MAN} ${WRKSRC}/arping.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/arping.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_PROGRAM} ${WRKSRC}/arping ${PREFIX}/bin .include "../../mk/bsd.pkg.mk" diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile index 28f3957ed18..509bff97835 100644 --- a/net/arpwatch/Makefile +++ b/net/arpwatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/04/22 09:22:12 rillig Exp $ +# $NetBSD: Makefile,v 1.29 2007/01/07 09:14:02 rillig Exp $ # DISTNAME= arpwatch-2.1a13 @@ -33,8 +33,8 @@ pre-patch: ${SED} -e '/Header/s|\$$||g' ${WRKSRC}/$$f-prepatch > ${WRKSRC}/$$f post-install: - ${INSTALL_MAN} ${WRKSRC}/arpwatch.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/arpsnmp.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/arpwatch.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKSRC}/arpsnmp.8 ${PREFIX}/${PKGMANDIR}/man8 @${INSTALL_DATA_DIR} ${VARBASE}/db/arpwatch ${TOUCH} ${VARBASE}/db/arpwatch/arp.dat ${INSTALL_DATA_DIR} ${PREFIX}/share/arpwatch diff --git a/net/balance/Makefile b/net/balance/Makefile index cf6206a0ac6..9f7925ec65e 100644 --- a/net/balance/Makefile +++ b/net/balance/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/10/28 20:46:26 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2007/01/07 09:14:02 rillig Exp $ # DISTNAME= balance-3.15 @@ -13,6 +13,6 @@ BUILD_TARGET= balance do-install: ${INSTALL_PROGRAM} ${WRKSRC}/balance ${PREFIX}/sbin/ - ${INSTALL_MAN} ${WRKSRC}/balance.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/balance.1 ${PREFIX}/${PKGMANDIR}/man1/ .include "../../mk/bsd.pkg.mk" diff --git a/net/bind4/Makefile b/net/bind4/Makefile index 3a8b674bdaf..057c56dcfb1 100644 --- a/net/bind4/Makefile +++ b/net/bind4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/03/04 21:30:16 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2007/01/07 09:14:02 rillig Exp $ # DISTNAME= bind-4.9.11-REL @@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR} NOT_FOR_PLATFORM= NetBSD-0.*-* NetBSD-1.[0123]*-* -INSTALLATION_DIRS= libexec man/man8 sbin +INSTALLATION_DIRS= libexec ${PKGMANDIR}/man8 sbin post-extract: @${RM} -f ${WRKSRC}/compat/include/sys/cdefs.h @@ -29,6 +29,6 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/named/named ${PREFIX}/sbin/named4 ${INSTALL_PROGRAM} ${WRKSRC}/named/named-xfer ${PREFIX}/libexec/named4-xfer ${INSTALL_SCRIPT} ${WRKSRC}/named/ndc4 ${PREFIX}/sbin/ - ${INSTALL_MAN} ${WRKSRC}/man/named.8 ${PREFIX}/man/man8/named4.8 + ${INSTALL_MAN} ${WRKSRC}/man/named.8 ${PREFIX}/${PKGMANDIR}/man8/named4.8 .include "../../mk/bsd.pkg.mk" diff --git a/net/bmon/Makefile b/net/bmon/Makefile index 7987898aca6..040261a5a02 100644 --- a/net/bmon/Makefile +++ b/net/bmon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/09/09 02:43:11 obache Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:02 rillig Exp $ # DISTNAME= bmon-2.0.1 @@ -26,11 +26,11 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/bmon CONF_FILES= ${EGDIR}/bmon.conf ${PKG_SYSCONFDIR}/bmon.conf -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/bmon ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/bmon.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/bmon.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bmon ${INSTALL_DATA} ${WRKSRC}/etc/bmon.conf \ ${PREFIX}/share/examples/bmon/bmon.conf diff --git a/net/btget/Makefile b/net/btget/Makefile index 9f681c99437..f19b43ba923 100644 --- a/net/btget/Makefile +++ b/net/btget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/11/19 11:50:25 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:02 rillig Exp $ # DISTNAME= libbt-1.05 @@ -19,9 +19,9 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/btget ${PREFIX}/bin/btget ${INSTALL_PROGRAM} ${WRKSRC}/src/btlist ${PREFIX}/bin/btlist ${INSTALL_PROGRAM} ${WRKSRC}/src/btcheck ${PREFIX}/bin/btcheck - ${INSTALL_MAN} ${WRKSRC}/man/btget.1 ${PREFIX}/man/man1/btget.1 - ${INSTALL_MAN} ${WRKSRC}/man/btlist.1 ${PREFIX}/man/man1/btlist.1 - ${INSTALL_MAN} ${WRKSRC}/man/btcheck.1 ${PREFIX}/man/man1/btcheck.1 + ${INSTALL_MAN} ${WRKSRC}/man/btget.1 ${PREFIX}/${PKGMANDIR}/man1/btget.1 + ${INSTALL_MAN} ${WRKSRC}/man/btlist.1 ${PREFIX}/${PKGMANDIR}/man1/btlist.1 + ${INSTALL_MAN} ${WRKSRC}/man/btcheck.1 ${PREFIX}/${PKGMANDIR}/man1/btcheck.1 .include "../../www/curl/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/net/cdpd/Makefile b/net/cdpd/Makefile index b09284f1a1a..52eb092c757 100644 --- a/net/cdpd/Makefile +++ b/net/cdpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/04/06 06:22:31 reed Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:02 rillig Exp $ # DISTNAME= cdpd-1.0.2 @@ -13,11 +13,11 @@ GNU_CONFIGURE= YES BUILDLINK_API_DEPENDS.libnet+= libnet-1.0.* -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cdpd ${PREFIX}/sbin/cdpd - ${INSTALL_DATA} ${WRKSRC}/cdpd.8 ${PREFIX}/man/man8/cdpd.8 + ${INSTALL_DATA} ${WRKSRC}/cdpd.8 ${PREFIX}/${PKGMANDIR}/man8/cdpd.8 .include "../../devel/libnet/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/cmu-dhcpd/Makefile b/net/cmu-dhcpd/Makefile index fc6b90f86a3..b7beff19969 100644 --- a/net/cmu-dhcpd/Makefile +++ b/net/cmu-dhcpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/10/04 21:53:16 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:02 rillig Exp $ # DISTNAME= CMU-dhcp-3.3.7+PU-9 @@ -16,13 +16,13 @@ NOT_FOR_PLATFORM= Interix-*-* # no userland routing table support WRKSRC= ${WRKDIR}/CMU-dhcp-3.3.7+PU-9 GNU_CONFIGURE= YES -INSTALLATION_DIRS= man/man5 man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin do-install: ${INSTALL_DATA_DIR} /var/db/bindings ${INSTALL_PROGRAM} ${WRKSRC}/dhcpd ${PREFIX}/sbin/cmu-dhcpd - ${INSTALL_MAN} ${WRKSRC}/man/bootptab.5 ${PREFIX}/man/man5/bootptab.5 - ${INSTALL_MAN} ${WRKSRC}/man/dhcpd.8 ${PREFIX}/man/man8/dhcpd.8 - ${INSTALL_MAN} ${WRKSRC}/man/dhcpd.conf.5 ${PREFIX}/man/man5/dhcpd.conf.5 + ${INSTALL_MAN} ${WRKSRC}/man/bootptab.5 ${PREFIX}/${PKGMANDIR}/man5/bootptab.5 + ${INSTALL_MAN} ${WRKSRC}/man/dhcpd.8 ${PREFIX}/${PKGMANDIR}/man8/dhcpd.8 + ${INSTALL_MAN} ${WRKSRC}/man/dhcpd.conf.5 ${PREFIX}/${PKGMANDIR}/man5/dhcpd.conf.5 .include "../../mk/bsd.pkg.mk" diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile index ac3d9af3ae4..f6638c8b691 100644 --- a/net/djbdns/Makefile +++ b/net/djbdns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2006/07/27 18:48:03 jlam Exp $ +# $NetBSD: Makefile,v 1.53 2007/01/07 09:14:02 rillig Exp $ DISTNAME= djbdns-1.05 PKGREVISION= 7 @@ -26,11 +26,11 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR} CONF_FILES+= ${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global PLIST_SRC= ${PKGDIR}/PLIST -INSTALLATION_DIRS= bin man man/man1 man/man5 man/man8 share/examples/djbdns +INSTALLATION_DIRS= bin man ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 share/examples/djbdns post-install: cd ${WRKDIR}/*-man; for i in 1 5 8; do \ - for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/man/man$$i; done \ + for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/${PKGMANDIR}/man$$i; done \ done .include "../../mk/djbware.mk" diff --git a/net/dnstop/Makefile b/net/dnstop/Makefile index bcd72b35de5..15c2d48ecaf 100644 --- a/net/dnstop/Makefile +++ b/net/dnstop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/10/08 12:43:38 obache Exp $ +# $NetBSD: Makefile,v 1.17 2007/01/07 09:14:02 rillig Exp $ # DISTNAME= dnstop-20060517 @@ -9,11 +9,11 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://dns.measurement-factory.com/tools/dnstop/ COMMENT= Diagnose tcpdump trace for DNS queries/replies -INSTALLATION_DIRS= bin man/man8 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dnstop ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/dnstop.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/dnstop.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dnstop ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/dnstop diff --git a/net/driftnet/Makefile b/net/driftnet/Makefile index c304b684a0d..efc8406385b 100644 --- a/net/driftnet/Makefile +++ b/net/driftnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/06/09 06:33:27 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2007/01/07 09:14:02 rillig Exp $ # DISTNAME= driftnet-0.1.6 @@ -17,11 +17,11 @@ BUILD_TARGET= default MAKE_ENV+= CAT=${CAT:Q} TRUE=${TRUE:Q} USE_TOOLS+= makedepend -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/driftnet ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/driftnet.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/driftnet.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../graphics/libungif/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" diff --git a/net/dynipclient/Makefile b/net/dynipclient/Makefile index 3d0ec5c15d7..c34e984917b 100644 --- a/net/dynipclient/Makefile +++ b/net/dynipclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:18 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:02 rillig Exp $ # DISTNAME= dynip_3.00 @@ -17,7 +17,7 @@ RCD_SCRIPTS= dynipclient EGDIR= ${PREFIX}/share/examples/dynipclient CONF_FILES= ${EGDIR}/dynip.cfg ${PKG_SYSCONFDIR}/dynip.cfg -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: cd ${WRKSRC} && ./Configure freebsd ${PREFIX}/bin ${PKG_SYSCONFDIR} \ @@ -26,7 +26,7 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dynipadmin ${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/dynipclient ${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/*.1 ${PREFIX}/man/man1/ + ${INSTALL_DATA} ${WRKSRC}/*.1 ${PREFIX}/${PKGMANDIR}/man1/ ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/dynip.cfg ${EGDIR} diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile index a373a024d18..ac5ab63f210 100644 --- a/net/firewalk/Makefile +++ b/net/firewalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/04/06 06:22:32 reed Exp $ +# $NetBSD: Makefile,v 1.17 2007/01/07 09:14:02 rillig Exp $ DISTNAME= firewalk-5.0 PKGREVISION= 1 @@ -23,6 +23,6 @@ MAKE_ENV+= FIREWALK_LOC=${PREFIX:Q} .include "../../net/libpcap/buildlink3.mk" post-install: - ${INSTALL_MAN} ${WRKSRC}/man/firewalk.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/man/firewalk.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../mk/bsd.pkg.mk" diff --git a/net/flodo/Makefile b/net/flodo/Makefile index 73cbc11e136..67d6935deeb 100644 --- a/net/flodo/Makefile +++ b/net/flodo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/04/06 06:22:32 reed Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:02 rillig Exp $ # DISTNAME= flodo-v4 @@ -16,14 +16,14 @@ BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.8 CPPFLAGS+= -I${BUILDLINK_PREFIX.libpcap}/include LDFLAGS+= -L${BUILDLINK_PREFIX.libpcap}/lib -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin do-build: cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o flodo flodo.c hash.c local_mac.c -lpcap do-install: ${INSTALL_PROGRAM} ${WRKSRC}/flodo ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/flodo.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/flodo.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../net/libpcap/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile index ddc26441087..a843158e1fc 100644 --- a/net/flow-tools/Makefile +++ b/net/flow-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/01/08 18:35:11 xtraeme Exp $ +# $NetBSD: Makefile,v 1.23 2007/01/07 09:14:02 rillig Exp $ DISTNAME= flow-tools-0.68 PKGREVISION= 2 @@ -53,7 +53,7 @@ PLIST_SUBST+= PYTHON_OPT="" post-install: . for s in flow-rpt2rrd flow-log2rrd flow-rptfmt ${INSTALL_SCRIPT} ${WRKSRC}/bin/${s} ${PREFIX}/bin/${s} - ${INSTALL_MAN} ${WRKSRC}/docs/${s}.1 ${PREFIX}/man/man1/${s}.1 + ${INSTALL_MAN} ${WRKSRC}/docs/${s}.1 ${PREFIX}/${PKGMANDIR}/man1/${s}.1 . endfor .else PLIST_SUBST+= PYTHON_OPT="@comment " diff --git a/net/ftpproxy/Makefile b/net/ftpproxy/Makefile index b5066e741fd..85224f3c57f 100644 --- a/net/ftpproxy/Makefile +++ b/net/ftpproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:18 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:02 rillig Exp $ # DISTNAME= ftpproxy-${VERSION} @@ -22,7 +22,7 @@ OSFLAG= -DSOLARIS .endif MAKE_ENV+= OSFLAG=${OSFLAG:Q} OSLIB=${LIBS:M*:Q} VERSION=${VERSION:Q} -INSTALLATION_DIRS= libexec man/man8 +INSTALLATION_DIRS= libexec ${PKGMANDIR}/man8 do-install: ${INSTALL_PROGRAM} ${WRKSRC:Q}/src/ftp.proxy ${PREFIX:Q}/libexec/ diff --git a/net/hf6to4/Makefile b/net/hf6to4/Makefile index 0540df03550..a32bfbd609e 100644 --- a/net/hf6to4/Makefile +++ b/net/hf6to4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/10/14 08:07:06 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:02 rillig Exp $ # DISTNAME= hf6to4-1.3 @@ -23,7 +23,7 @@ NO_BUILD= yes CONF_FILES+= ${PREFIX}/share/examples/hf6to4/hf6to4.conf ${PKG_SYSCONFDIR}/hf6to4.conf -INSTALLATION_DIRS= man/man8 sbin share/examples/hf6to4 share/doc/hf6to4 +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/examples/hf6to4 share/doc/hf6to4 SUBST_CLASSES+= paths SUBST_FILES.paths= hf6to4 @@ -36,7 +36,7 @@ post-extract: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/hf6to4 ${PREFIX}/sbin/hf6to4 - ${INSTALL_MAN} ${FILESDIR}/hf6to4.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${FILESDIR}/hf6to4.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_DATA} ${FILESDIR}/hf6to4.html ${PREFIX}/share/doc/hf6to4/hf6to4.html ${INSTALL_DATA} ${FILESDIR}/hf6to4.conf ${PREFIX}/share/examples/hf6to4 diff --git a/net/hping/Makefile b/net/hping/Makefile index 6b937ced189..db8d3ea24af 100644 --- a/net/hping/Makefile +++ b/net/hping/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/03/30 13:51:28 salo Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:02 rillig Exp $ # DISTNAME= hping2.0.0-rc3 @@ -15,7 +15,7 @@ HAS_CONFIGURE= YES MANPATH= ${PREFIX}/man CONFIGURE_ENV+= MANPATH=${MANPATH:Q} -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin CONFIGURE_ENV+= PCAPINCDIR=${BUILDLINK_PREFIX.libpcap}/include CONFIGURE_ENV+= PCAPLIBDIR=${BUILDLINK_PREFIX.libpcap}/lib @@ -25,8 +25,8 @@ CONFIGURE_ENV+= PCAPLIBDIR=${BUILDLINK_PREFIX.libpcap}/lib do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hping2 ${PREFIX}/sbin ${LN} -s ../sbin/hping2 ${PREFIX}/sbin/hping - ${INSTALL_MAN} ${WRKSRC}/docs/hping2.8 ${PREFIX}/man/man8 - ${LN} -s ../../man/man8/hping2.8 ${PREFIX}/man/man8/hping.8 + ${INSTALL_MAN} ${WRKSRC}/docs/hping2.8 ${PREFIX}/${PKGMANDIR}/man8 + ${LN} -s ../../man/man8/hping2.8 ${PREFIX}/${PKGMANDIR}/man8/hping.8 .include "../../net/libpcap/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/httping/Makefile b/net/httping/Makefile index 2df7214a913..ebd2190796a 100644 --- a/net/httping/Makefile +++ b/net/httping/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/09/16 10:07:55 rillig Exp $ +# $NetBSD: Makefile,v 1.3 2007/01/07 09:14:03 rillig Exp $ # DISTNAME= httping-1.2.1 @@ -13,7 +13,7 @@ COMMENT= Like 'ping' but for http-requests LDFLAGS.SunOS= -lnsl -lsocket do-install: - ${INSTALL_MAN} ${WRKSRC}/httping.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/httping.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_PROGRAM} ${WRKSRC}/httping ${PREFIX}/bin .include "../../security/openssl/buildlink3.mk" diff --git a/net/irrtoolset-nox11/Makefile b/net/irrtoolset-nox11/Makefile index 8ed9be626f4..c4b7c9f2709 100644 --- a/net/irrtoolset-nox11/Makefile +++ b/net/irrtoolset-nox11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/07/07 12:30:56 spz Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:03 rillig Exp $ # DISTNAME= IRRToolSet-4.8.2 @@ -12,7 +12,7 @@ COMMENT= The Internet Routing Registry Toolset - client to IRRd USE_LANGUAGES= c c++ -INSTALLATION_DIRS= bin man/man1 man/man3 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 LICENSE= no-commercial-use diff --git a/net/lftp/Makefile b/net/lftp/Makefile index 686691c5e43..bca9291012e 100644 --- a/net/lftp/Makefile +++ b/net/lftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2007/01/04 13:27:12 ghen Exp $ +# $NetBSD: Makefile,v 1.76 2007/01/07 09:14:03 rillig Exp $ DISTNAME= lftp-3.5.6 CATEGORIES= net @@ -33,7 +33,7 @@ CONFIGURE_ENV+= F77=${FALSE:Q} EGDIR= ${PREFIX}/share/examples/lftp CONF_FILES= ${EGDIR}/lftp.conf.default ${PKG_SYSCONFDIR}/lftp.conf -INSTALLATION_DIRS= bin lib/lftp man/man1 share/examples/lftp share/lftp +INSTALLATION_DIRS= bin lib/lftp ${PKGMANDIR}/man1 share/examples/lftp share/lftp post-install: post-install-perl ${INSTALL_DATA_DIR} ${EGDIR} diff --git a/net/mDNSResponder-nss/Makefile b/net/mDNSResponder-nss/Makefile index 21b8ec720ea..968087f72b2 100644 --- a/net/mDNSResponder-nss/Makefile +++ b/net/mDNSResponder-nss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/09/21 18:06:18 drochner Exp $ +# $NetBSD: Makefile,v 1.4 2007/01/07 09:14:03 rillig Exp $ DISTNAME= mDNSResponder-108 PKGNAME= mDNSResponder-nss-108 @@ -27,7 +27,7 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nss_mdns ${INSTALL_DATA} ${WRKSRC}/mDNSPosix/nss_mdns.conf \ ${PREFIX}/share/examples/nss_mdns - ${INSTALL_MAN} ${WRKSRC}/mDNSPosix/nss_mdns.conf.5 ${PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/mDNSPosix/nss_mdns.conf.5 ${PREFIX}/${PKGMANDIR}/man5 .include "../../net/mDNSResponder/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index 9ae2935dd7c..a4da4ca124a 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2006/10/19 06:40:54 martti Exp $ +# $NetBSD: Makefile,v 1.76 2007/01/07 09:14:04 rillig Exp $ DISTNAME= mrtg-2.14.7 CATEGORIES= net @@ -70,9 +70,9 @@ do-install: for FILE in ${WRKSRC}/doc/*.??*; do \ ${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/mrtg; \ done - ${INSTALL_DATA} ${WRKSRC}/doc/mrtg*.1 ${PREFIX}/man/man1/ + ${INSTALL_DATA} ${WRKSRC}/doc/mrtg*.1 ${PREFIX}/${PKGMANDIR}/man1/ for FILE in cfgmaker.1 indexmaker.1; do \ - ${INSTALL_DATA} ${WRKSRC}/doc/$$FILE ${PREFIX}/man/man1/mrtg$$FILE; \ + ${INSTALL_DATA} ${WRKSRC}/doc/$$FILE ${PREFIX}/${PKGMANDIR}/man1/mrtg$$FILE; \ done for FILE in CHANGES COPYING COPYRIGHT README; do \ ${INSTALL_DATA} ${WRKSRC}/$$FILE ${PREFIX}/share/doc/mrtg; \ diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 4d260e85a21..5abcfa605d0 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2006/10/03 19:15:20 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2007/01/07 09:14:04 rillig Exp $ DISTNAME= mtr-0.72 CATEGORIES= net @@ -12,7 +12,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_TOOLS+= gmake -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin .include "options.mk" @@ -24,7 +24,7 @@ BUILDLINK_TRANSFORM+= l:termcap:ncurses do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mtr ${INSTALL} -c -s -m 4755 -o ${ROOT_USER} -g ${ROOT_GROUP} ${WRKSRC}/mtr ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8 + ${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr .include "../../devel/ncurses/buildlink3.mk" diff --git a/net/nam/Makefile b/net/nam/Makefile index c6a14e234e9..1cfa42afea8 100644 --- a/net/nam/Makefile +++ b/net/nam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/08/23 10:43:49 minskim Exp $ +# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:04 rillig Exp $ DISTNAME= ns-allinone-2.29.3 PKGNAME= nam-1.11 @@ -36,7 +36,7 @@ INSTALLATION_DIRS= bin .include "../../x11/tk/buildlink3.mk" post-install: - ${INSTALL_MAN_DIR} ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/nam.1 ${PREFIX}/man/man1 + ${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/nam.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile index 55a60d4ee5f..859b5c39f14 100644 --- a/net/ncftp2/Makefile +++ b/net/ncftp2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2006/03/04 21:30:21 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2007/01/07 09:14:04 rillig Exp $ DISTNAME= ncftp-2.4.3 PKGREVISION= 2 @@ -18,11 +18,11 @@ USE_TOOLS+= gzcat .include "options.mk" -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/ncftp2 - ${INSTALL_MAN} ${WRKSRC}/ncftp.1 ${PREFIX}/man/man1/ncftp2.1 + ${INSTALL_MAN} ${WRKSRC}/ncftp.1 ${PREFIX}/${PKGMANDIR}/man1/ncftp2.1 .include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ns/Makefile b/net/ns/Makefile index 92f49e4e40d..9a647bc35b7 100644 --- a/net/ns/Makefile +++ b/net/ns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/08/23 10:28:06 minskim Exp $ +# $NetBSD: Makefile,v 1.28 2007/01/07 09:14:04 rillig Exp $ DISTNAME= ns-allinone-2.29.3 PKGNAME= ${DISTNAME:S/-allinone//} @@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --with-tclcl=${BUILDLINK_PREFIX.tcl-tclcl} MESSAGE_SUBST+= HOMEPAGE=${HOMEPAGE} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../devel/tcl-tclcl/buildlink3.mk" .include "../../lang/tcl/buildlink3.mk" diff --git a/net/oinkmaster/Makefile b/net/oinkmaster/Makefile index 3c247d00c8c..2e0c3e7032c 100644 --- a/net/oinkmaster/Makefile +++ b/net/oinkmaster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/09 14:06:03 adrianp Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:04 rillig Exp $ DISTNAME= oinkmaster-2.0 CATEGORIES= net @@ -43,7 +43,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/oinkmaster.conf ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/template-examples.conf ${EGDIR} - ${INSTALL_MAN} ${WRKSRC}/oinkmaster.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/oinkmaster.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_SCRIPT} ${WRKSRC}/oinkmaster.pl ${PREFIX}/bin/oinkmaster ${LN} -s ${PKG_SYSCONFDIR}/classification.config \ ${PREFIX}/share/snort/rules/classification.config diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile index a465ae1031f..04c383577d9 100644 --- a/net/openntpd/Makefile +++ b/net/openntpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/08/20 14:50:43 peter Exp $ +# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:05 rillig Exp $ DISTNAME= openntpd-3.9p1 CATEGORIES= net @@ -27,12 +27,12 @@ PKG_USERS= _ntp:_ntp PKG_HOME._ntp= ${VARBASE}/chroot/ntpd OWN_DIRS= ${VARBASE}/chroot/ntpd -INSTALLATION_DIRS= man/man5 man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ntpd ${PREFIX}/sbin/ntpd - ${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${PREFIX}/man/man8/ntpd.8 - ${INSTALL_MAN} ${WRKSRC}/ntpd.conf.5 ${PREFIX}/man/man5/ntpd.conf.5 + ${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${PREFIX}/${PKGMANDIR}/man8/ntpd.8 + ${INSTALL_MAN} ${WRKSRC}/ntpd.conf.5 ${PREFIX}/${PKGMANDIR}/man5/ntpd.conf.5 post-install: @${INSTALL_DATA_DIR} ${EGDIR} diff --git a/net/pchar/Makefile b/net/pchar/Makefile index 652ceb5532a..51df32a0621 100644 --- a/net/pchar/Makefile +++ b/net/pchar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/10/04 21:53:17 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:05 rillig Exp $ DISTNAME= pchar-1.5 CATEGORIES= net @@ -26,11 +26,11 @@ CONFIGURE_ARGS+= --with-snmp=${BUILDLINK_PREFIX.net-snmp} LIBS+= -lsnmp -lcrypto -ldes .endif -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pchar ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/pchar.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/pchar.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/pim6sd/Makefile b/net/pim6sd/Makefile index 026e0a86c2e..f76431edf34 100644 --- a/net/pim6sd/Makefile +++ b/net/pim6sd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2007/01/03 15:23:25 tv Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:05 rillig Exp $ DISTNAME= pim6sd-20031021a CATEGORIES= net @@ -11,7 +11,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/pim6sd/ USE_TOOLS+= lex yacc post-install: - ${INSTALL_MAN} ${WRKSRC}/pim6stat.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/pim6stat.1 ${PREFIX}/${PKGMANDIR}/man1 PKG_OPTIONS_VAR= PKG_OPTIONS.pim6sd PKG_OPTIONS_REQUIRED_GROUPS= inet6 # require inet6 capability diff --git a/net/poink/Makefile b/net/poink/Makefile index 13f0aac1b95..e1db939f49e 100644 --- a/net/poink/Makefile +++ b/net/poink/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2007/01/03 15:21:35 tv Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:05 rillig Exp $ # DISTNAME= poink-1.6 @@ -10,11 +10,11 @@ COMMENT= Nosuid, absolutely secure version of ping utility NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL. -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/poink ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/ping.1 ${PREFIX}/man/man1/poink.1 + ${INSTALL_MAN} ${WRKSRC}/ping.1 ${PREFIX}/${PKGMANDIR}/man1/poink.1 .include "../../devel/libgetopt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ppp-lzs/Makefile b/net/ppp-lzs/Makefile index e89d98fc529..574abeb915f 100644 --- a/net/ppp-lzs/Makefile +++ b/net/ppp-lzs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/05/18 20:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:05 rillig Exp $ DISTNAME= ppp-lzs-1.2 CATEGORIES= net @@ -23,7 +23,7 @@ USE_TOOLS+= patch BUILDLINK_PASSTHRU_DIRS= ${NETBSDSRCDIR}/lib/libpcap -INSTALLATION_DIRS= lkm man/cat8 man/man8 sbin +INSTALLATION_DIRS= lkm ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 sbin pre-extract: .if !exists(${NETBSDSRCDIR}/usr.sbin/pppd/Makefile) @@ -59,8 +59,8 @@ pre-install: do-install: ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m 4555 \ ${WRKSRC}/pppd/pppd ${PREFIX}/sbin/pppd - ${INSTALL_MAN} ${WRKSRC}/pppd/pppd.cat8 ${PREFIX}/man/cat8/pppd.0 - ${INSTALL_MAN} ${WRKSRC}/pppd/pppd.8 ${PREFIX}/man/man8/pppd.8 + ${INSTALL_MAN} ${WRKSRC}/pppd/pppd.cat8 ${PREFIX}/${PKGMANDIR}/cat8/pppd.0 + ${INSTALL_MAN} ${WRKSRC}/pppd/pppd.8 ${PREFIX}/${PKGMANDIR}/man8/pppd.8 ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${WRKSRC}/lkm/lzs.o ${PREFIX}/lkm/lzs.o diff --git a/net/proxycheck/Makefile b/net/proxycheck/Makefile index 77fea1cd5b5..807c95e1f22 100644 --- a/net/proxycheck/Makefile +++ b/net/proxycheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/03/22 22:50:32 tv Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:05 rillig Exp $ # DISTNAME= proxycheck-0.49a @@ -12,10 +12,10 @@ COMMENT= Tester for open (promiscuous) proxy systems HAS_CONFIGURE= YES MAKE_FLAGS+= CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} LDFLAGS=${LDFLAGS:M*:Q} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/proxycheck ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/proxycheck.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/proxycheck.1 ${PREFIX}/${PKGMANDIR}/man1/ .include "../../mk/bsd.pkg.mk" diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile index a54f40a6c7e..b271c3ab169 100644 --- a/net/pygopherd/Makefile +++ b/net/pygopherd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:23 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:05 rillig Exp $ # DISTNAME= pygopherd_2.0.9 @@ -61,7 +61,7 @@ post-install: for egfile in ${EGFILES}; do \ ${INSTALL_DATA} $$egfile ${EXAMPLEDIR}; \ done - ${INSTALL_MAN} ${WRKSRC}/doc/pygopherd.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/doc/pygopherd.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/qadsl/Makefile b/net/qadsl/Makefile index 7671b62f56d..448574216ab 100644 --- a/net/qadsl/Makefile +++ b/net/qadsl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/10/04 21:53:18 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:06 rillig Exp $ # # qadsl is now GNU Alive (wip/alive) @@ -17,12 +17,12 @@ MANCOMPRESSED= yes MAKE_ENV+= LIBS=${LIBS:M*:Q} MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} -INSTALLATION_DIRS= man/man8 sbin share/examples +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/examples do-install: ${INSTALL_PROGRAM} ${WRKSRC}/qadsl ${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC}/qadsl.conf \ ${PREFIX}/share/examples/qadsl.conf.sample - ${INSTALL_MAN} ${WRKSRC}/qadsl.8.gz ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/qadsl.8.gz ${PREFIX}/${PKGMANDIR}/man8 .include "../../mk/bsd.pkg.mk" diff --git a/net/ra-rtsp-proxy/Makefile b/net/ra-rtsp-proxy/Makefile index b1f1fcfcd66..489d7578c4e 100644 --- a/net/ra-rtsp-proxy/Makefile +++ b/net/ra-rtsp-proxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/12/29 06:22:02 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2007/01/07 09:14:06 rillig Exp $ DISTNAME= rtspd-src-1.0.0.0 PKGNAME= ra-rtsp-proxy-1.0.0.0 @@ -27,10 +27,10 @@ WRKSRC= ${WRKDIR}/rtspd-1.0.0.0a MAKE_ENV+= LOCAL_LIBS="-lsocket -lnsl" .endif -INSTALLATION_DIRS= etc/rc.d man/man8 sbin +INSTALLATION_DIRS= etc/rc.d ${PKGMANDIR}/man8 sbin do-install: - ${INSTALL_MAN} ${WRKSRC}/rtspd.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/rtspd.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_PROGRAM} ${WRKSRC}/rtspd ${PREFIX}/sbin ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ra-rtsp-proxy ${INSTALL_DATA} ${WRKSRC}/license.txt ${PREFIX}/share/doc/ra-rtsp-proxy diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile index 80dd5bb99e1..cf9db6edb0b 100644 --- a/net/radiusd-cistron/Makefile +++ b/net/radiusd-cistron/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/09/09 02:43:11 obache Exp $ +# $NetBSD: Makefile,v 1.21 2007/01/07 09:14:06 rillig Exp $ DISTNAME= radiusd-cistron-1.6.7 PKGREVISION= 1 @@ -42,13 +42,13 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/radiusd-cistron/ .endfor .for i in radclient.1 radlast.1 radtest.1 radwho.1 radzap.1 - ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man1/ .endfor .for i in clients.5rad naslist.5rad - ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man5/ + ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man5/ .endfor .for i in radiusd.8 radrelay.8 radwatch.8 - ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man8/ + ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man8/ .endfor # The sources assume <malloc.h> exists. Create a fake one for platforms diff --git a/net/sdig/Makefile b/net/sdig/Makefile index eb49aff1407..e6861918f91 100644 --- a/net/sdig/Makefile +++ b/net/sdig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:24 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:06 rillig Exp $ DISTNAME= sdig-0.30 PKGREVISION= 1 @@ -23,8 +23,8 @@ post-build: my-post-build post-install: ${INSTALL_DATA} ${WRKDIR}/sdig.conf ${PREFIX}/share/examples/ ${INSTALL_DATA} ${WRKDIR}/mactable ${PREFIX}/share/misc/ - ${INSTALL_DATA} ${WRKSRC}/sdig.8 ${PREFIX}/man/man8/ - ${INSTALL_DATA} ${WRKSRC}/sdig.conf.5 ${PREFIX}/man/man5/ + ${INSTALL_DATA} ${WRKSRC}/sdig.8 ${PREFIX}/${PKGMANDIR}/man8/ + ${INSTALL_DATA} ${WRKSRC}/sdig.conf.5 ${PREFIX}/${PKGMANDIR}/man5/ .include "../../net/net-snmp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/sharity-light/Makefile b/net/sharity-light/Makefile index a193ec0e6c6..369f83c0ff5 100644 --- a/net/sharity-light/Makefile +++ b/net/sharity-light/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/10/14 08:07:06 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:06 rillig Exp $ # DISTNAME= Sharity-Light.1.2 @@ -15,7 +15,7 @@ NOT_FOR_PLATFORM= Interix-*-* # SMB is all native # avoid picking up a bad value from a users environment MAKE_ENV+= "ARCH= " -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin post-extract: ${MKDIR} ${WRKDIR}/unshlight @@ -31,6 +31,6 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sharity-light ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/FAQ.txt \ ${PREFIX}/share/doc/sharity-light/ - ${INSTALL_MAN} ${WRKSRC}/smbmount.8 ${PREFIX}/man/man8/shlight.8 + ${INSTALL_MAN} ${WRKSRC}/smbmount.8 ${PREFIX}/${PKGMANDIR}/man8/shlight.8 .include "../../mk/bsd.pkg.mk" diff --git a/net/sitescooper/Makefile b/net/sitescooper/Makefile index af3edb46bd6..ade2467f0ab 100644 --- a/net/sitescooper/Makefile +++ b/net/sitescooper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/02/22 22:51:28 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:06 rillig Exp $ # DISTNAME= sitescooper-2.2.8 @@ -19,7 +19,7 @@ NO_BUILD= yes CONF_FILES+= ${PREFIX}/share/examples/sitescooper/sitescooper.cf \ ${PREFIX}/etc/sitescooper.cf \ -INSTALLATION_DIRS= bin etc man/man1 +INSTALLATION_DIRS= bin etc ${PKGMANDIR}/man1 do-configure: .for file in sitescooper rss-to-site subs-to-site @@ -38,7 +38,7 @@ do-configure: do-install: .for file in sitescooper rss-to-site subs-to-site ${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/doc/${file}.man ${PREFIX}/man/man1/${file}.1 + ${INSTALL_DATA} ${WRKSRC}/doc/${file}.man ${PREFIX}/${PKGMANDIR}/man1/${file}.1 .endfor ${INSTALL_DATA_DIR} ${PREFIX}/share/sitescooper/lib ${CP} -R ${WRKSRC}/site_samples ${PREFIX}/share/sitescooper diff --git a/net/slurm/Makefile b/net/slurm/Makefile index 2ecb00324c3..565e58b5a59 100644 --- a/net/slurm/Makefile +++ b/net/slurm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/09/30 04:56:27 minskim Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:06 rillig Exp $ # DISTNAME= slurm-0.3.3 @@ -11,11 +11,11 @@ COMMENT= Realtime traffic statistics GNU_CONFIGURE= YES -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/slurm ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/slurm.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/slurm.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/slurm for theme in black blue cyan foo; do \ ${INSTALL_DATA} ${WRKSRC}/themes/$${theme}.theme ${PREFIX}/share/slurm ; \ diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile index 93f1590a51d..f13d1ec6525 100644 --- a/net/sniffit/Makefile +++ b/net/sniffit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/03/04 21:30:24 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:06 rillig Exp $ # DISTNAME= sniffit.0.3.5 @@ -15,12 +15,12 @@ NOT_FOR_PLATFORM= *-*-alpha # severe LP64 loss GNU_CONFIGURE= YES BUILD_TARGET= -INSTALLATION_DIRS= man/man5 man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sniffit ${PREFIX}/sbin/sniffit - ${INSTALL_MAN} ${WRKSRC}/sniffit.5 ${PREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/sniffit.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/sniffit.5 ${PREFIX}/${PKGMANDIR}/man5 + ${INSTALL_MAN} ${WRKSRC}/sniffit.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common index e3404c631e6..49a937f4e11 100644 --- a/net/snort/Makefile.common +++ b/net/snort/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.36 2006/06/18 00:25:26 rillig Exp $ +# $NetBSD: Makefile.common,v 1.37 2007/01/07 09:14:06 rillig Exp $ # DISTNAME= snort-2.4.5 @@ -71,7 +71,7 @@ post-install: for i in `${LS} | ${EGREP} -v "(Makefile|signatures)"` ; do \ ${INSTALL_DATA} $$i ${PREFIX}/share/doc/snort ; \ done - ${INSTALL_MAN} ${WRKSRC}/snort.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/snort.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_DATA} ${WRKSRC}/schemas/create_mysql \ ${PREFIX}/share/doc/snort/schemas ${INSTALL_DATA} ${WRKSRC}/schemas/create_postgresql \ diff --git a/net/socks4/Makefile b/net/socks4/Makefile index 14a41b08357..9ae3eae700c 100644 --- a/net/socks4/Makefile +++ b/net/socks4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/03/04 21:30:24 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2007/01/07 09:14:06 rillig Exp $ # DISTNAME= export.socks.cstc.4.2.2 @@ -21,7 +21,7 @@ MAKE_ENV+= OPTIMIZE=${CFLAGS:M*:Q} EGDIR= ${PREFIX}/share/examples/socks4 CONF_FILES= ${EGDIR}/socks.conf ${PKG_SYSCONFDIR}/socks.conf -INSTALLATION_DIRS= bin lib libexec man/man1 man/man5 man/man8 +INSTALLATION_DIRS= bin lib libexec ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 post-patch: @cd ${WRKSRC}; \ diff --git a/net/tacacs/Makefile b/net/tacacs/Makefile index bf25d99921c..a40b7b04262 100644 --- a/net/tacacs/Makefile +++ b/net/tacacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:28 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:06 rillig Exp $ # DISTNAME= tac_plus.F4.0.4.alpha @@ -18,11 +18,11 @@ BUILD_TARGET= tac_plus MAKE_FLAGS+= OS=-DSOLARIS OSLIBS="-lsocket -lnsl" .endif -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tac_plus ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/tac_plus.1 ${PREFIX}/man/man8/tac_plus.8 + ${INSTALL_MAN} ${WRKSRC}/tac_plus.1 ${PREFIX}/${PKGMANDIR}/man8/tac_plus.8 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tacacs ${INSTALL_DATA} ${WRKSRC}/users_guide ${PREFIX}/share/doc/tacacs diff --git a/net/tcpdpriv/Makefile b/net/tcpdpriv/Makefile index 32d29ee6d02..f7b4a972b7c 100644 --- a/net/tcpdpriv/Makefile +++ b/net/tcpdpriv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/08/06 05:16:51 kristerw Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:06 rillig Exp $ DISTNAME= tcpd-tools-0.8 PKGNAME= tcpdpriv-0.8 @@ -10,10 +10,10 @@ COMMENT= Anonymize tcpdump traces WRKSRC= ${WRKDIR}/${DISTNAME}/wide-tcpdpriv -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tcpdpriv ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/tcpdpriv.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/tcpdpriv.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile index c8720dd0956..989aa20f4f5 100644 --- a/net/tcptrace/Makefile +++ b/net/tcptrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/03/04 21:30:25 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:07 rillig Exp $ DISTNAME= tcptrace-6.6.7 CATEGORIES= net @@ -16,11 +16,11 @@ DOCFILES= COPYRIGHT FAQ README README.tput_graphs LDFLAGS.SunOS+= -lm -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tcptrace ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/tcptrace.man ${PREFIX}/man/man1/tcptrace.1 + ${INSTALL_DATA} ${WRKSRC}/tcptrace.man ${PREFIX}/${PKGMANDIR}/man1/tcptrace.1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcptrace .for f in ${DOCFILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/tcptrace diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile index 1edfec9ad97..993d525bee3 100644 --- a/net/tcptraceroute/Makefile +++ b/net/tcptraceroute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/04/06 06:22:35 reed Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:07 rillig Exp $ # DISTNAME= tcptraceroute-1.4 @@ -20,11 +20,11 @@ BINMODE= 4711 .include "../../mk/bsd.prefs.mk" -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tcptraceroute ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/tcptraceroute.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/tcptraceroute.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/examples.txt ${DOCDIR} diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index 4fc2c741773..0bf29befb6f 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/02/05 23:10:31 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:07 rillig Exp $ # DISTNAME= tightvnc-1.2.9 @@ -27,22 +27,22 @@ post-install: ${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc \ ${PREFIX}/bin/Xvnc ${INSTALL_MAN} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc.man \ - ${PREFIX}/man/man1/Xvnc.1 + ${PREFIX}/${PKGMANDIR}/man1/Xvnc.1 ${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect \ ${PREFIX}/bin/vncconnect ${INSTALL_MAN} ${WRKSRC}/vncconnect/vncconnect.man \ - ${PREFIX}/man/man1/vncconnect.1 + ${PREFIX}/${PKGMANDIR}/man1/vncconnect.1 ${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd \ ${PREFIX}/bin/vncpasswd ${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \ - ${PREFIX}/man/man1/vncpasswd.1 + ${PREFIX}/${PKGMANDIR}/man1/vncpasswd.1 ${SED} -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \ -e 's|/usr/bin/perl|${PERL5}|g' \ < ${WRKSRC}/vncserver \ > ${WRKSRC}/vncserver.local ${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver ${INSTALL_MAN} ${WRKSRC}/vncserver.man \ - ${PREFIX}/man/man1/vncserver.1 + ${PREFIX}/${PKGMANDIR}/man1/vncserver.1 .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/net/tkined/Makefile b/net/tkined/Makefile index 40e8c66b563..15df0a35bc1 100644 --- a/net/tkined/Makefile +++ b/net/tkined/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/10/04 21:53:18 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2007/01/07 09:14:07 rillig Exp $ # DISTNAME= scotty-2.1.11 @@ -26,14 +26,14 @@ DISTINFO_FILE= ${.CURDIR}/../../net/tcl-scotty/distinfo FILESDIR= ${.CURDIR}/../../net/tcl-scotty/files PATCHDIR= ${.CURDIR}/../../net/tcl-scotty/patches -INSTALLATION_DIRS= man/man1 +INSTALLATION_DIRS= ${PKGMANDIR}/man1 .include "../../net/tcl-scotty/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" do-install: @cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} tki-install - ${INSTALL_DATA} ${WRKSRC}/../doc/tkined.1 ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/../doc/tkined.1 ${PREFIX}/${PKGMANDIR}/man1 post-install: cd ${PREFIX}/bin && ${LN} -f -s tkined1.4.11 tkined diff --git a/net/tnftpd/Makefile b/net/tnftpd/Makefile index 83d37d287ef..eba039f9b1b 100644 --- a/net/tnftpd/Makefile +++ b/net/tnftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/12/02 23:00:04 adrianp Exp $ +# $NetBSD: Makefile,v 1.16 2007/01/07 09:14:07 rillig Exp $ # DISTNAME= tnftpd-20040810 @@ -28,13 +28,13 @@ OPSYSVARS+= MAKE_ENV MAKE_ENV.SunOS+= CPPFLAGS="" EXAMPLEDIR= ${PREFIX}/share/examples/tnftpd -INSTALLATION_DIRS= libexec man/man5 man/man8 +INSTALLATION_DIRS= libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/tnftpd ${PREFIX}/libexec - ${INSTALL_MAN} ${WRKSRC}/src/ftpd.conf.5 ${PREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/src/ftpusers.5 ${PREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/src/ftpd.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/src/ftpd.conf.5 ${PREFIX}/${PKGMANDIR}/man5 + ${INSTALL_MAN} ${WRKSRC}/src/ftpusers.5 ${PREFIX}/${PKGMANDIR}/man5 + ${INSTALL_MAN} ${WRKSRC}/src/ftpd.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_DATA_DIR} ${EXAMPLEDIR} ${INSTALL_DATA} ${WRKSRC}/examples/ftpd.conf ${EXAMPLEDIR} ${INSTALL_DATA} ${WRKSRC}/examples/ftpusers ${EXAMPLEDIR} diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile index 111b35d7cb9..16c960deebd 100644 --- a/net/ucspi-tcp/Makefile +++ b/net/ucspi-tcp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/07/27 18:48:03 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:07 rillig Exp $ DISTNAME= ucspi-tcp-0.88 PKGREVISION= 1 @@ -17,11 +17,11 @@ DJB_RESTRICTED= YES PKG_INSTALLATION_TYPES= overwrite pkgviews -INSTALLATION_DIRS= bin man man/man1 +INSTALLATION_DIRS= bin man ${PKGMANDIR}/man1 post-install: cd ${WRKDIR}/*-man; for i in 1; do \ - for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/man/man$$i; done \ + for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/${PKGMANDIR}/man$$i; done \ done .include "../../mk/djbware.mk" diff --git a/net/vncviewer/Makefile b/net/vncviewer/Makefile index afe722c6e79..ac4144e4310 100644 --- a/net/vncviewer/Makefile +++ b/net/vncviewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/12/27 13:37:39 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:07 rillig Exp $ DISTNAME= vnc-4_1_2-unixsrc PKGNAME= vncviewer-4.1.2 @@ -27,10 +27,10 @@ pre-fetch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer ${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man \ - ${PREFIX}/man/man1/vncviewer.1 + ${PREFIX}/${PKGMANDIR}/man1/vncviewer.1 ${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd ${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \ - ${PREFIX}/man/man1/vncpasswd.1 + ${PREFIX}/${PKGMANDIR}/man1/vncpasswd.1 BUILDLINK_DEPMETHOD.libXt?= build diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile index 9fdfceb866e..ef6ddf185c3 100644 --- a/net/vpnc/Makefile +++ b/net/vpnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/09/27 12:50:29 hubertf Exp $ +# $NetBSD: Makefile,v 1.16 2007/01/07 09:14:07 rillig Exp $ # DISTNAME= vpnc-0.3.3 @@ -14,7 +14,7 @@ NOT_FOR_PLATFORM= Interix-*-* USE_TOOLS+= gmake BUILD_TARGET= vpnc -INSTALLATION_DIRS= bin man/man8 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES+= ${EGDIR}/vpnc.conf ${PKG_SYSCONFDIR}/vpnc.conf @@ -26,7 +26,7 @@ do-install: : ${INSTALL_PROGRAM} ${WRKSRC}/vpnc ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/vpnc-disconnect ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/vpnc.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/vpnc.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/vpnc ${INSTALL_MAN} ${WRKSRC}/vpnc.conf ${EGDIR} ${INSTALL_SCRIPT} ${WRKSRC}/vpnc-script ${EGDIR} diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile index eb208f6369a..3789b2ed8c1 100644 --- a/net/vsftpd/Makefile +++ b/net/vsftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2007/01/03 15:54:56 tv Exp $ +# $NetBSD: Makefile,v 1.26 2007/01/07 09:14:07 rillig Exp $ # DISTNAME= vsftpd-2.0.4 @@ -29,7 +29,7 @@ CONF_FILES= ${EGDIR}/vsftpd.conf.default ${PKG_SYSCONFDIR}/vsftpd.conf MAKE_DIRS= ${VARBASE}/chroot OWN_DIRS= ${VARBASE}/chroot/vsftpd -INSTALLATION_DIRS= libexec man/man5 man/man8 +INSTALLATION_DIRS= libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 SUBST_CLASSES+= paths SUBST_FILES.paths= vsftpd.8 vsftpd.conf.5 vsftpd.conf @@ -46,8 +46,8 @@ LIBS.SunOS= -lsocket -lnsl -lrt -lsendfile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${PREFIX}/libexec - ${INSTALL_MAN} ${WRKSRC}/vsftpd.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/vsftpd.conf.5 ${PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/vsftpd.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKSRC}/vsftpd.conf.5 ${PREFIX}/${PKGMANDIR}/man5 ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${EGDIR}/vsftpd.conf.default ${INSTALL_DATA_DIR} ${DOCDIR} diff --git a/net/vtun/Makefile b/net/vtun/Makefile index b395c9c7379..e0cbed83cb4 100644 --- a/net/vtun/Makefile +++ b/net/vtun/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2006/03/14 01:14:31 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2007/01/07 09:14:08 rillig Exp $ DISTNAME= vtun-2.6 PKGREVISION= 6 @@ -33,7 +33,7 @@ CONF_FILES_PERMS= ${EGDIR}/vtund.conf ${PKG_SYSCONFDIR}/vtund.conf \ ${ROOT_USER} ${ROOT_GROUP} 0600 OWN_DIRS= ${LOCKDIR} ${LOGDIR} -INSTALLATION_DIRS= man/man5 man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin post-build: @cd ${WRKSRC}; for file in vtund.8; do \ @@ -52,10 +52,10 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README.Setup ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/README.Shaper ${DOCDIR} ${INSTALL_DATA} ${WRKDIR}/vtund.conf ${EGDIR}/vtund.conf - ${INSTALL_MAN} ${WRKSRC}/vtund.conf.5 ${PREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/vtund.8 ${PREFIX}/man/man8 - ${RM} -f ${PREFIX}/man/man8/vtun.8 - ${LN} -s vtund.8 ${PREFIX}/man/man8/vtun.8 + ${INSTALL_MAN} ${WRKSRC}/vtund.conf.5 ${PREFIX}/${PKGMANDIR}/man5 + ${INSTALL_MAN} ${WRKSRC}/vtund.8 ${PREFIX}/${PKGMANDIR}/man8 + ${RM} -f ${PREFIX}/${PKGMANDIR}/man8/vtun.8 + ${LN} -s vtund.8 ${PREFIX}/${PKGMANDIR}/man8/vtun.8 .include "../../archivers/liblzo/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/net/wimon/Makefile b/net/wimon/Makefile index 042d4942710..56dd6ec0a7d 100644 --- a/net/wimon/Makefile +++ b/net/wimon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/12/09 17:04:51 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:08 rillig Exp $ # DISTNAME= wimon-0.3 @@ -19,11 +19,11 @@ NOT_FOR_PLATFORM+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-* WRKSRC= ${WRKDIR}/wimon -INSTALLATION_DIRS= bin man/man8 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wimon ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/wimon.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/wimon.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/news/nntpclnt/Makefile b/news/nntpclnt/Makefile index e97f3bec3c9..1270d0b135b 100644 --- a/news/nntpclnt/Makefile +++ b/news/nntpclnt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/09/26 19:00:20 christos Exp $ +# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:08 rillig Exp $ DISTNAME= nntpclnt-1.6.1 PKGREVISION= 6 @@ -26,7 +26,7 @@ PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} CONFIG_SH= ${FILESDIR}/config.${OPSYS}.sh ONLY_FOR_PLATFORM= NetBSD-*-* SunOS-*-* DragonFly-*-* Linux-*-* -INSTALLATION_DIRS= bin include lib man/man3 +INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man3 do-configure: ${SED} -e s,@PREFIX@,${PREFIX}, -e s,@PKGSYSCONFDIR@,${PKG_SYSCONFDIR}, \ @@ -42,7 +42,7 @@ do-install: ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/nntp.h ${PREFIX}/include/ ${INSTALL_DATA} ${WRKSRC}/libnntpclnt.a ${PREFIX}/lib/ - ${INSTALL_DATA} ${WRKSRC}/nntpclnt.3 ${PREFIX}/man/man3/ + ${INSTALL_DATA} ${WRKSRC}/nntpclnt.3 ${PREFIX}/${PKGMANDIR}/man3/ ${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR} .include "../../mk/bsd.pkg.mk" diff --git a/news/trn/Makefile b/news/trn/Makefile index 3884d820859..cf86a0b4cfc 100644 --- a/news/trn/Makefile +++ b/news/trn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/03/04 21:30:26 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2007/01/07 09:14:08 rillig Exp $ DISTNAME= trn-4.0-test76 PKGNAME= trn-4.76 @@ -71,9 +71,9 @@ CONFIGURE_ARGS+= -d -e -D bin=${PREFIX:Q}/bin \ -D useinews=${PREFIX:Q}'/bin/inews' post-install: - @${RM} -f ${PREFIX}/bin/rn ${PREFIX}/man/man1/rn.1 \ - ${PREFIX}/man/man1/rn.1.gz + @${RM} -f ${PREFIX}/bin/rn ${PREFIX}/${PKGMANDIR}/man1/rn.1 \ + ${PREFIX}/${PKGMANDIR}/man1/rn.1.gz @${LN} -s trn ${PREFIX}/bin/rn - @${LN} -s trn.1 ${PREFIX}/man/man1/rn.1 + @${LN} -s trn.1 ${PREFIX}/${PKGMANDIR}/man1/rn.1 .include "../../mk/bsd.pkg.mk" diff --git a/parallel/ganglia-monitor-core/Makefile b/parallel/ganglia-monitor-core/Makefile index fda57da5a94..a80cb28a1e3 100644 --- a/parallel/ganglia-monitor-core/Makefile +++ b/parallel/ganglia-monitor-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/08/06 05:16:51 kristerw Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:08 rillig Exp $ # DISTNAME= ganglia-3.0.1 @@ -55,10 +55,10 @@ post-patch: .endfor post-install: - ${INSTALL_MAN} ${WRKSRC}/mans/gmetad.1 ${PREFIX}/man/man1/ - ${INSTALL_MAN} ${WRKSRC}/mans/gmetric.1 ${PREFIX}/man/man1/ - ${INSTALL_MAN} ${WRKSRC}/mans/gmond.1 ${PREFIX}/man/man1/ - ${INSTALL_MAN} ${WRKSRC}/mans/gstat.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/mans/gmetad.1 ${PREFIX}/${PKGMANDIR}/man1/ + ${INSTALL_MAN} ${WRKSRC}/mans/gmetric.1 ${PREFIX}/${PKGMANDIR}/man1/ + ${INSTALL_MAN} ${WRKSRC}/mans/gmond.1 ${PREFIX}/${PKGMANDIR}/man1/ + ${INSTALL_MAN} ${WRKSRC}/mans/gstat.1 ${PREFIX}/${PKGMANDIR}/man1/ ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/gmetad/gmetad.conf ${EGDIR}/ ${PREFIX}/sbin/gmond -t > ${EGDIR}/gmond.conf diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile index cc5c6a81377..22da7bcc9b1 100644 --- a/parallel/mpi-ch/Makefile +++ b/parallel/mpi-ch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2006/12/22 13:24:16 obache Exp $ +# $NetBSD: Makefile,v 1.49 2007/01/07 09:14:08 rillig Exp $ DISTNAME= mpich-1.2.6 PKGREVISION= 6 @@ -108,7 +108,7 @@ post-patch: post-install: cd ${WRKDIR}/docs && ${PAX} -rw . ${PREFIX}/share/doc/mpi-ch/html - @${RM} ${PREFIX}/man/mandesc + @${RM} ${PREFIX}/${PKGMANDIR}/mandesc @${MV} ${PREFIX}/sbin/mpiuninstall ${PREFIX}/sbin/mpiuninstall.not @${CHMOD} 444 ${PREFIX}/sbin/mpiuninstall.not @${ECHO} "#!/bin/sh" > ${PREFIX}/sbin/mpiuninstall diff --git a/pkgtools/autoswc/Makefile b/pkgtools/autoswc/Makefile index dd690370ff6..a05d37255a0 100644 --- a/pkgtools/autoswc/Makefile +++ b/pkgtools/autoswc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/04/22 09:22:13 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:08 rillig Exp $ DISTNAME= autoswc-1.5 CATEGORIES= pkgtools sysutils @@ -48,7 +48,7 @@ SUBST_SED.build+= -e 's|@PREFIX@|${PREFIX}|g' SUBST_SED.build+= -e 's|@SH@|${SH}|g' SUBST_SED.build+= -e 's|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g' -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin do-extract: ${CP} ${FILESDIR}/autoswc.8 ${WRKSRC} @@ -61,7 +61,7 @@ do-build: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/autoswc ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/autoswc.8 ${PREFIX}/man/man8 + ${INSTALL_DATA} ${WRKSRC}/autoswc.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_DATA_DIR} ${PREFIX}/share/autoswc ${INSTALL_DATA} ${WRKSRC}/autoswc.mk ${PREFIX}/share/autoswc ${INSTALL_DATA} ${WRKSRC}/config.site ${PREFIX}/share/autoswc diff --git a/pkgtools/binpatch/Makefile b/pkgtools/binpatch/Makefile index 9ec30f47175..f2d57aafc81 100644 --- a/pkgtools/binpatch/Makefile +++ b/pkgtools/binpatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/09/28 20:52:25 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:08 rillig Exp $ # DISTNAME= binpatch-1.0 @@ -15,7 +15,7 @@ NO_CHECKSUM= yes .include "../../mk/bsd.prefs.mk" -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-extract: @${CP} -R ${FILESDIR} ${WRKSRC} @@ -27,6 +27,6 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/binpatch ${PREFIX}/bin/binpatch - ${INSTALL_MAN} ${WRKSRC}/binpatch.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/binpatch.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/cdpack/Makefile b/pkgtools/cdpack/Makefile index aee900381a7..28b8f904534 100644 --- a/pkgtools/cdpack/Makefile +++ b/pkgtools/cdpack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/02/05 23:10:34 joerg Exp $ +# $NetBSD: Makefile,v 1.23 2007/01/07 09:14:08 rillig Exp $ # DISTNAME= cdpack-1.7 @@ -23,7 +23,7 @@ USE_TOOLS+= expr:run USE_TOOLS+= sort:run USE_TOOLS+= tsort:run -INSTALLATION_DIRS= bin libexec man/man1 +INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man1 do-build: ${SED} -e 's;@prefix@;${PREFIX};g' \ @@ -43,6 +43,6 @@ do-build: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/cdpack ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/cdgen.awk ${PREFIX}/libexec - ${INSTALL_MAN} ${WRKSRC}/cdpack.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/cdpack.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/dfdisk/Makefile b/pkgtools/dfdisk/Makefile index b63550f609c..ac818d61431 100644 --- a/pkgtools/dfdisk/Makefile +++ b/pkgtools/dfdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/01/08 21:00:22 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:08 rillig Exp $ # DISTNAME= dfdisk-1.0 @@ -25,7 +25,7 @@ FILES_SUBST+= FTP="${ZOULARISBASE}/bin/ftp -p" FILES_SUBST+= FTP="/usr/bin/ftp -p" .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 SUBST_CLASSES+= paths SUBST_FILES.paths= dfdisk.sh dfdisk.1 dfdisk.conf @@ -44,7 +44,7 @@ post-extract: do-install: ${INSTALL_SCRIPT} ${WRKDIR}/dfdisk.sh ${PREFIX}/bin/dfdisk - ${INSTALL_DATA} ${WRKDIR}/dfdisk.1 ${PREFIX}/man/man1/dfdisk.1 + ${INSTALL_DATA} ${WRKDIR}/dfdisk.1 ${PREFIX}/${PKGMANDIR}/man1/dfdisk.1 ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKDIR}/dfdisk.conf ${EGDIR} diff --git a/pkgtools/genrpm/Makefile b/pkgtools/genrpm/Makefile index a198ecf32d9..bf15679efa8 100644 --- a/pkgtools/genrpm/Makefile +++ b/pkgtools/genrpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:34 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2007/01/07 09:14:08 rillig Exp $ DISTNAME= genrpm-1.0 PKGREVISION= 1 @@ -18,7 +18,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR} NO_CHECKSUM= yes -INSTALLATION_DIRS= man/cat8 man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 sbin .include "../../mk/bsd.prefs.mk" @@ -36,7 +36,7 @@ do-build: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/genrpm ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/genrpm.0 ${PREFIX}/man/cat8 - ${INSTALL_MAN} ${WRKSRC}/genrpm.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/genrpm.0 ${PREFIX}/${PKGMANDIR}/cat8 + ${INSTALL_MAN} ${WRKSRC}/genrpm.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkg_comp/Makefile b/pkgtools/pkg_comp/Makefile index 5fa4dbe5c18..e2304de4b23 100644 --- a/pkgtools/pkg_comp/Makefile +++ b/pkgtools/pkg_comp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/06/17 12:18:24 seb Exp $ +# $NetBSD: Makefile,v 1.38 2007/01/07 09:14:08 rillig Exp $ DISTNAME= pkg_comp-1.29 CATEGORIES= pkgtools @@ -17,10 +17,10 @@ NO_CHECKSUM= YES NO_CONFIGURE= YES NO_BUILD= YES -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin do-install: ${INSTALL_SCRIPT} ${FILESDIR}/pkg_comp.sh ${PREFIX}/sbin/pkg_comp - ${INSTALL_MAN} ${FILESDIR}/pkg_comp.8 ${PREFIX}/man/man8/pkg_comp.8 + ${INSTALL_MAN} ${FILESDIR}/pkg_comp.8 ${PREFIX}/${PKGMANDIR}/man8/pkg_comp.8 .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkg_rolling-replace/Makefile b/pkgtools/pkg_rolling-replace/Makefile index 7fceac3004b..1848e78d5a9 100644 --- a/pkgtools/pkg_rolling-replace/Makefile +++ b/pkgtools/pkg_rolling-replace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/12/18 12:36:17 gdt Exp $ +# $NetBSD: Makefile,v 1.4 2007/01/07 09:14:08 rillig Exp $ DISTNAME= pkg_rolling-replace-0.04 PKGREVISION= 3 @@ -21,7 +21,7 @@ NO_CHECKSUM= yes NO_BUILD= yes USE_LANGUAGES= # none -INSTALLATION_DIRS= sbin man/man8 +INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8 SUBST_CLASSES+= makepath SUBST_STAGE.makepath= pre-configure diff --git a/pkgtools/pkgclean/Makefile b/pkgtools/pkgclean/Makefile index 8904592dfe1..9bb6fcd9b0a 100644 --- a/pkgtools/pkgclean/Makefile +++ b/pkgtools/pkgclean/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/04/22 09:22:13 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:09 rillig Exp $ DISTNAME= pkgclean-20051116 CATEGORIES= pkgtools @@ -14,14 +14,14 @@ NO_CHECKSUM= yes NO_CONFIGURE= yes NO_BUILD= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-extract: @${CP} -R ${FILESDIR} ${WRKSRC} do-install: ${INSTALL_SCRIPT} ${WRKSRC}/pkgclean.sh ${PREFIX}/bin/pkgclean - ${INSTALL_MAN} ${WRKSRC}/pkgclean.1 ${PREFIX}/man/man1/pkgclean.1 + ${INSTALL_MAN} ${WRKSRC}/pkgclean.1 ${PREFIX}/${PKGMANDIR}/man1/pkgclean.1 SUBST_CLASSES+= path SUBST_STAGE.path= post-patch diff --git a/pkgtools/pkgdepgraph/Makefile b/pkgtools/pkgdepgraph/Makefile index 9879daebf9c..e46789cc11b 100644 --- a/pkgtools/pkgdepgraph/Makefile +++ b/pkgtools/pkgdepgraph/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:17 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2007/01/07 09:14:09 rillig Exp $ # DISTNAME= pkgdepgraph-2.8 @@ -24,7 +24,7 @@ DISTVER= ${DISTNAME:S/pkgdepgraph-//} .include "../../mk/bsd.prefs.mk" -INSTALLATION_DIRS= bin man/cat1 man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 do-extract: ${CP} ${FILESDIR}/pkgdepgraph.pl ${WRKSRC}/pkgdepgraph.pl @@ -53,7 +53,7 @@ do-build: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/pkgdepgraph ${PREFIX}/bin/pkgdepgraph - ${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.0 ${PREFIX}/man/cat1 - ${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.0 ${PREFIX}/${PKGMANDIR}/cat1 + ${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkgfind/Makefile b/pkgtools/pkgfind/Makefile index 57ba6490750..da1fe34b9fb 100644 --- a/pkgtools/pkgfind/Makefile +++ b/pkgtools/pkgfind/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/04/22 09:22:13 rillig Exp $ +# $NetBSD: Makefile,v 1.16 2007/01/07 09:14:09 rillig Exp $ DISTNAME= pkgfind-20050804 CATEGORIES= pkgtools @@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews NO_CONFIGURE= yes NO_CHECKSUM= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-extract: @${CP} -R ${FILESDIR} ${WRKSRC} @@ -23,7 +23,7 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pkgfind ${PREFIX}/bin/pkgfind - ${INSTALL_MAN} ${WRKSRC}/pkgfind.1 ${PREFIX}/man/man1/pkgfind.1 + ${INSTALL_MAN} ${WRKSRC}/pkgfind.1 ${PREFIX}/${PKGMANDIR}/man1/pkgfind.1 SUBST_CLASSES+= path SUBST_STAGE.path= post-patch diff --git a/pkgtools/port2pkg/Makefile b/pkgtools/port2pkg/Makefile index f253e067b8b..efe99d83aba 100644 --- a/pkgtools/port2pkg/Makefile +++ b/pkgtools/port2pkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/09/13 17:33:20 ginsbach Exp $ +# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:09 rillig Exp $ # DISTNAME= port2pkg-1.11 @@ -21,7 +21,7 @@ USE_TOOLS+= gtar perl:run .include "../../mk/bsd.prefs.mk" -INSTALLATION_DIRS= bin man/cat1 man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 do-build: .if ${OPSYS} == "SunOS" || ${OPSYS} == "AIX" @@ -35,7 +35,7 @@ do-build: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/port2pkg ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/port2pkg.0 ${PREFIX}/man/cat1 - ${INSTALL_MAN} ${FILESDIR}/port2pkg.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/port2pkg.0 ${PREFIX}/${PKGMANDIR}/cat1 + ${INSTALL_MAN} ${FILESDIR}/port2pkg.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/print/bww2tex/Makefile b/print/bww2tex/Makefile index a5ad85f86c5..0653843475f 100644 --- a/print/bww2tex/Makefile +++ b/print/bww2tex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/09/09 02:46:08 obache Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:09 rillig Exp $ # DISTNAME= bww2tex-2.00 @@ -16,11 +16,11 @@ WRKSRC= ${WRKDIR} NO_CONFIGURE= yes MAKE_FILE= ${WRKSRC}/makefile -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_MAN} ${FILESDIR}/bww2tex.1 \ - ${PREFIX}/man/man1 + ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_PROGRAM} ${WRKSRC}/bww2tex \ ${PREFIX}/bin diff --git a/print/dvidvi/Makefile b/print/dvidvi/Makefile index 81589fc820d..5332aae00ca 100644 --- a/print/dvidvi/Makefile +++ b/print/dvidvi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:30 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:09 rillig Exp $ # DISTNAME= dvidvi-1.0 @@ -14,10 +14,10 @@ NO_SRC_ON_CDROM=Unable to determine distribution license NO_BIN_ON_FTP= Unable to determine distribution license NO_BIN_ON_CDROM=Unable to determine distribution license -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dvidvi ${PREFIX}/bin/dvidvi - ${INSTALL_MAN} ${WRKSRC}/dvidvi.1 ${PREFIX}/man/man1/dvidvi.1 + ${INSTALL_MAN} ${WRKSRC}/dvidvi.1 ${PREFIX}/${PKGMANDIR}/man1/dvidvi.1 .include "../../mk/bsd.pkg.mk" diff --git a/print/if-psprint/Makefile b/print/if-psprint/Makefile index 72eade16227..f30d25f1f2c 100644 --- a/print/if-psprint/Makefile +++ b/print/if-psprint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/02/05 23:10:37 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2007/01/07 09:14:09 rillig Exp $ # DISTNAME= if-psprint-1.7 @@ -14,7 +14,7 @@ DEPENDS+= enscript>=1.6.3nb1:../../print/enscript USE_TOOLS+= gs:run perl:run -INSTALLATION_DIRS= libexec man/man1 +INSTALLATION_DIRS= libexec ${PKGMANDIR}/man1 do-build: ${SED} -e 's|/usr/local|${PREFIX}|g' \ @@ -24,6 +24,6 @@ do-build: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/if-psprint ${PREFIX}/libexec/if-psprint - ${INSTALL_MAN} ${WRKSRC}/if-psprint.1 ${PREFIX}/man/man1/if-psprint.1 + ${INSTALL_MAN} ${WRKSRC}/if-psprint.1 ${PREFIX}/${PKGMANDIR}/man1/if-psprint.1 .include "../../mk/bsd.pkg.mk" diff --git a/print/pcps/Makefile b/print/pcps/Makefile index e05346eeec5..14b247a15c6 100644 --- a/print/pcps/Makefile +++ b/print/pcps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/09/09 02:46:08 obache Exp $ +# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:09 rillig Exp $ # DISTNAME= pcps840 @@ -22,7 +22,7 @@ RESTRICTED= This is shareware for your evaluation and subsequent payment NO_BIN_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM=${RESTRICTED} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 CONF_FILES+= ${PREFIX}/share/examples/pcps/pcps.cfg ${PREFIX}/bin/pcps.cfg @@ -31,7 +31,7 @@ post-patch: do-install: @${INSTALL_PROGRAM} ${WRKSRC}/pcps ${PREFIX}/bin/pcps - @${INSTALL_MAN} ${WRKDIR}/pcps.1 ${PREFIX}/man/man1 + @${INSTALL_MAN} ${WRKDIR}/pcps.1 ${PREFIX}/${PKGMANDIR}/man1 @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pcps @${INSTALL_DATA} ${WRKSRC}/license.doc ${PREFIX}/share/doc/pcps @${INSTALL_DATA} ${WRKSRC}/register.doc ${PREFIX}/share/doc/pcps diff --git a/print/pdfjam/Makefile b/print/pdfjam/Makefile index cc025a91aa1..f645773f56e 100644 --- a/print/pdfjam/Makefile +++ b/print/pdfjam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/08/14 08:39:51 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2007/01/07 09:14:09 rillig Exp $ # DISTNAME= pdfjam_1.20 @@ -21,7 +21,7 @@ UTILS= pdf90 pdfjoin pdfnup do-install: .for _util in ${UTILS} ${INSTALL_SCRIPT} ${WRKSRC}/scripts/${_util} ${PREFIX}/bin/${_util} - ${INSTALL_MAN} ${WRKSRC}/man1/${_util}.1 ${PREFIX}/man/man1/${_util}.1 + ${INSTALL_MAN} ${WRKSRC}/man1/${_util}.1 ${PREFIX}/${PKGMANDIR}/man1/${_util}.1 .endfor .undef ${_util} diff --git a/print/poster/Makefile b/print/poster/Makefile index f772fc6f8e4..d49c9c35e8e 100644 --- a/print/poster/Makefile +++ b/print/poster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/03/04 21:30:31 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2007/01/07 09:14:09 rillig Exp $ DISTNAME= poster PKGNAME= poster-1.0 @@ -12,10 +12,10 @@ COMMENT= Resize a ps image to print on larger media and/or multiple sheets BUILD_TARGET= poster WRKSRC= ${WRKDIR} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: @${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin - @${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.1 ${PREFIX}/man/man1/ + @${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.1 ${PREFIX}/${PKGMANDIR}/man1/ .include "../../mk/bsd.pkg.mk" diff --git a/print/tex-musixtex/Makefile b/print/tex-musixtex/Makefile index 5462b325c7c..e6d770355e4 100644 --- a/print/tex-musixtex/Makefile +++ b/print/tex-musixtex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/10/04 21:56:35 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2007/01/07 09:14:09 rillig Exp $ # DISTNAME= musixtex-112 @@ -25,7 +25,7 @@ INITEX= initex # teTeX2 INITEX= tex -ini # teTeX3 .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../print/teTeX/module.mk" @@ -63,7 +63,7 @@ do-install: ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/system/c-source/musixflx.1 \ - ${PREFIX}/man/man1 + ${PREFIX}/${PKGMANDIR}/man1 .if exists(${LOCALBASE}/bin/virtex) cd ${PREFIX}/bin ; ${LN} -sf virtex musixtex # teTeX2 diff --git a/print/yup/Makefile b/print/yup/Makefile index 8424b09a18f..43445ab4c39 100644 --- a/print/yup/Makefile +++ b/print/yup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/09/28 20:52:26 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:09 rillig Exp $ # DISTNAME= yup-r1-rel @@ -18,10 +18,10 @@ WRKSRC= ${WRKDIR}/yup-r1 NO_CONFIGURE= yes NO_BUILD= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/yup ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/yup.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/yup.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/security/avcheck/Makefile b/security/avcheck/Makefile index 354626bef27..dc447dd75a3 100644 --- a/security/avcheck/Makefile +++ b/security/avcheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:33 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:09 rillig Exp $ DISTNAME= avcheck-0.9 CATEGORIES= security mail @@ -10,12 +10,12 @@ COMMENT= Mail content filter for SMTP servers USE_TOOLS+= gsed -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/avcheck ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/uchroot ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/avcheck.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/avcheck.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/avcheck ${INSTALL_DATA} ${WRKSRC}/README.AVP ${PREFIX}/share/doc/avcheck diff --git a/security/bcrypt/Makefile b/security/bcrypt/Makefile index 4e5beea5683..842f3343bfb 100644 --- a/security/bcrypt/Makefile +++ b/security/bcrypt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/03/04 21:30:33 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2007/01/07 09:14:09 rillig Exp $ # DISTNAME= bcrypt-1.1 @@ -13,11 +13,11 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews BUILD_TARGET= bcrypt -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bcrypt ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/bcrypt.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/bcrypt.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/cfs/Makefile b/security/cfs/Makefile index f01df4b0268..8c3c7ce7955 100644 --- a/security/cfs/Makefile +++ b/security/cfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/08/05 13:38:26 adrianp Exp $ +# $NetBSD: Makefile,v 1.29 2007/01/07 09:14:09 rillig Exp $ DISTNAME= cfs-1.4.1 PKGREVISION= 6 @@ -101,10 +101,10 @@ do-build: post-install: cd ${WRKSRC}; for file in *.1; do \ - ${INSTALL_MAN} $${file} ${PREFIX}/man/man1/$${file}; \ + ${INSTALL_MAN} $${file} ${PREFIX}/${PKGMANDIR}/man1/$${file}; \ done cd ${WRKSRC}; for file in *.8; do \ - ${INSTALL_MAN} $${file} ${PREFIX}/man/man8/$${file}; \ + ${INSTALL_MAN} $${file} ${PREFIX}/${PKGMANDIR}/man8/$${file}; \ done ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/notes.ms ${DOCDIR} diff --git a/security/destroy/Makefile b/security/destroy/Makefile index eb2875177d1..ce91b3ca52a 100644 --- a/security/destroy/Makefile +++ b/security/destroy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:55 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:09 rillig Exp $ # DISTNAME= destroy-20040415 @@ -10,10 +10,10 @@ MAINTAINER= shane@freebsdhackers.net HOMEPAGE= http://www.freebsdhackers.net/destroy/ COMMENT= Program to securely destroy files on the hard disk -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/destroy ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/destroy.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/destroy.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/security/dsniff-nox11/Makefile b/security/dsniff-nox11/Makefile index 0845990cc01..80c7bd71e09 100644 --- a/security/dsniff-nox11/Makefile +++ b/security/dsniff-nox11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:55 rillig Exp $ +# $NetBSD: Makefile,v 1.3 2007/01/07 09:14:09 rillig Exp $ .include "../../security/dsniff/Makefile.common" @@ -8,6 +8,6 @@ COMMENT= Password sniffer CONFIGURE_ARGS+= --without-x post-install: - ${RM} ${PREFIX}/man/man8/webspy.8 + ${RM} ${PREFIX}/${PKGMANDIR}/man8/webspy.8 .include "../../mk/bsd.pkg.mk" diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile index c936e9f740e..8558d6d9a2c 100644 --- a/security/dsniff/Makefile +++ b/security/dsniff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/02/05 23:10:43 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2007/01/07 09:14:09 rillig Exp $ .include "Makefile.common" @@ -15,6 +15,6 @@ INSTALLATION_DIRS+= sbin man/man8 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/webspy ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/webspy.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/webspy.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../mk/bsd.pkg.mk" diff --git a/security/fprot-workstation-bin/Makefile b/security/fprot-workstation-bin/Makefile index a9df72d56f6..5154c3af329 100644 --- a/security/fprot-workstation-bin/Makefile +++ b/security/fprot-workstation-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/12/07 05:40:07 taca Exp $ +# $NetBSD: Makefile,v 1.36 2007/01/07 09:14:09 rillig Exp $ DISTNAME= #defined PKGNAME= fprot-workstation-bin-${FPVER} @@ -76,8 +76,8 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 sbin do-install: ${INSTALL_SCRIPT} ${WRKSRC}/f-prot.sh ${PREFIX}/bin/f-prot ${INSTALL_SCRIPT} ${WRKSRC}/tools/check-updates.pl ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/man_pages/check-updates.pl.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/man_pages/f-prot.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man_pages/check-updates.pl.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKSRC}/man_pages/f-prot.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${DATDIR} ${INSTALL_DATA} ${WRKSRC}/*.DEF ${DATDIR} ${INSTALL_DATA_DIR} ${DOCDIR} diff --git a/security/gpg2dot/Makefile b/security/gpg2dot/Makefile index a3e46120074..c00d39c5a8c 100644 --- a/security/gpg2dot/Makefile +++ b/security/gpg2dot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:18 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:10 rillig Exp $ # DISTNAME= gpg2dot-1.4 @@ -41,6 +41,6 @@ do-build: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/gpg2dot ${PREFIX}/bin/gpg2dot -# ${INSTALL_MAN} ${WRKSRC}/gpg2dot.1 ${PREFIX}/man/man1 +# ${INSTALL_MAN} ${WRKSRC}/gpg2dot.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/security/hackbot/Makefile b/security/hackbot/Makefile index 1d5313b623d..8dc732f2dbd 100644 --- a/security/hackbot/Makefile +++ b/security/hackbot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:19 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2007/01/07 09:14:10 rillig Exp $ DISTNAME= hackbot-2.15 CATEGORIES= security net @@ -16,7 +16,7 @@ MANCOMPRESSED= YES USE_TOOLS+= perl:run REPLACE_PERL= hackbot.pl -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: ${SED} "s,/usr/local/etc,${PREFIX}/share/hackbot,g" ${WRKSRC}/hackbot.pl > ${WRKSRC}/hackbot.pl.done @@ -26,6 +26,6 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/hackbot ${INSTALL_SCRIPT} ${WRKSRC}/hackbot.pl ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/cgi.db ${WRKSRC}/fingerprint.db ${PREFIX}/share/hackbot - ${INSTALL_MAN} ${WRKSRC}/hackbot.1.gz ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/hackbot.1.gz ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/security/hashcash/Makefile b/security/hashcash/Makefile index ed898ad5c84..2cdd7e54570 100644 --- a/security/hashcash/Makefile +++ b/security/hashcash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/04/17 12:44:01 gdt Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:10 rillig Exp $ # DISTNAME= hashcash-1.22 @@ -14,10 +14,10 @@ COMMENT= Hash collision based postage stamp .include "../../mk/bsd.prefs.mk" CFLAGS+= -Dunix -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hashcash ${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/hashcash.1 ${PREFIX}/man/man1/ + ${INSTALL_DATA} ${WRKSRC}/hashcash.1 ${PREFIX}/${PKGMANDIR}/man1/ .include "../../mk/bsd.pkg.mk" diff --git a/security/libtcpa/Makefile b/security/libtcpa/Makefile index bd437dd7a88..a8906013a3e 100644 --- a/security/libtcpa/Makefile +++ b/security/libtcpa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/07/27 18:48:03 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:10 rillig Exp $ # DISTNAME= tpm-1.1b @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/TPM SITES.tcpa_man_20031210.tgz= http://www.citi.umich.edu/u/rwash/projects/trusted/ BUILD_DIRS= ${WRKSRC}/libtcpa ${WRKSRC}/examples -INSTALLATION_DIRS= bin lib man/man3 share/doc/${PKGBASE} +INSTALLATION_DIRS= bin lib ${PKGMANDIR}/man3 share/doc/${PKGBASE} do-install: ${INSTALL_DATA} ${WRKSRC}/libtcpa/libtcpa.a ${PREFIX}/lib @@ -28,7 +28,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/examples/$${f} ${PREFIX}/bin; \ done for f in ${WRKDIR}/tcpa_man/*.3; do \ - ${INSTALL_MAN} $${f} ${PREFIX}/man/man3; \ + ${INSTALL_MAN} $${f} ${PREFIX}/${PKGMANDIR}/man3; \ done ${INSTALL_DATA} ${WRKSRC}/libtcpa/License ${PREFIX}/share/doc/${PKGBASE} ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PKGBASE} diff --git a/security/otpcalc/Makefile b/security/otpcalc/Makefile index 87babc1548f..bc22184bf84 100644 --- a/security/otpcalc/Makefile +++ b/security/otpcalc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/11/24 23:04:14 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:10 rillig Exp $ # DISTNAME= otpCalc-0.96 @@ -14,11 +14,11 @@ GNU_CONFIGURE= YES USE_TOOLS+= gmake BUILD_TARGET= otpCalc otpCalc.1 -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/otpCalc ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/otpCalc.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/otpCalc.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../x11/gtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/p0f/Makefile b/security/p0f/Makefile index cc3dccd7c13..fe9b211baa6 100644 --- a/security/p0f/Makefile +++ b/security/p0f/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/06/01 23:14:34 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:10 rillig Exp $ # DISTNAME= p0f-2.0.5 @@ -25,7 +25,7 @@ SUBST_FILES.paths= config.h p0f.1 SUBST_SED.paths= -e "s|/etc/p0f|${PKG_SYSCONFDIR}|g" SUBST_MESSAGE.paths= Fixing paths. -INSTALLATION_DIRS= bin man/man1 share/doc/p0f share/examples/p0f +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/p0f share/examples/p0f post-patch: ${LN} -s NetBSD ${WRKSRC}/mk/DragonFly @@ -37,7 +37,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/p0f.fp ${PREFIX}/share/examples/p0f ${INSTALL_DATA} ${WRKSRC}/p0fa.fp ${PREFIX}/share/examples/p0f ${INSTALL_DATA} ${WRKSRC}/p0fr.fp ${PREFIX}/share/examples/p0f - ${INSTALL_MAN} ${WRKSRC}/p0f.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/p0f.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../net/libpcap/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile index ae7eac3a5fb..d0f72446a14 100644 --- a/security/pgp2/Makefile +++ b/security/pgp2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2006/10/04 21:58:14 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2007/01/07 09:14:10 rillig Exp $ DISTNAME= pgp263is PKGREVISION= 1 @@ -42,7 +42,7 @@ CFLAGS+= -DHIGHFIRST BUILD_DEFS+= ASMFLAG -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-extract: cd ${WRKDIR} && ${TAR} xf pgp263ii.tar && ${RM} -f pgp263ii.tar @@ -55,7 +55,7 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pgp ${PREFIX}/bin - ${INSTALL_DATA} ${WRKDIR}/doc/pgp.1 ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKDIR}/doc/pgp.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PGPLIB} cd ${WRKDIR}/doc && ${INSTALL_DATA} pgpdoc1.txt pgpdoc2.txt ${PGPLIB} cd ${WRKDIR} && \ diff --git a/security/prngd/Makefile b/security/prngd/Makefile index f0bf59fcf82..1a3b84e4122 100644 --- a/security/prngd/Makefile +++ b/security/prngd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/04/13 01:35:10 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2007/01/07 09:14:10 rillig Exp $ DISTNAME= prngd-0.9.29 CATEGORIES= security @@ -19,7 +19,7 @@ MAKE_ENV+= DEFS='-DRANDSAVENAME="\"${VARBASE}/db/prngd-seed\"" -DCONFIGFILE="\" EGDIR= ${PREFIX}/share/examples/prngd CONF_FILES= ${EGDIR}/prngd.conf.netbsd ${PKG_SYSCONFDIR}/prngd.conf -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 SUBST_CLASSES+= path SUBST_STAGE.path= pre-install @@ -39,6 +39,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/00README.gatherers ${PREFIX}/share/doc/prngd ${INSTALL_DATA} ${WRKSRC}/00DESIGN ${PREFIX}/share/doc/prngd ${INSTALL_DATA} ${WRKSRC}/contrib/NetBSD1/prngd.conf.netbsd ${PREFIX}/share/examples/prngd - ${INSTALL_MAN} ${WRKSRC}/prngd.man ${PREFIX}/man/man1/prngd.1 + ${INSTALL_MAN} ${WRKSRC}/prngd.man ${PREFIX}/${PKGMANDIR}/man1/prngd.1 .include "../../mk/bsd.pkg.mk" diff --git a/security/sign/Makefile b/security/sign/Makefile index 48cd597d7c8..ea8841d41d1 100644 --- a/security/sign/Makefile +++ b/security/sign/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:38 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:10 rillig Exp $ # DISTNAME= sign-1.0.4 @@ -12,11 +12,11 @@ COMMENT= File signing and signature verification utility USE_TOOLS+= gmake -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/sign ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/sign.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/sign.1 ${PREFIX}/${PKGMANDIR}/man1 ${LN} -sf ${PREFIX}/bin/sign ${PREFIX}/bin/unsign .include "../../security/openssl/buildlink3.mk" diff --git a/security/skey/Makefile b/security/skey/Makefile index d81fd8e5350..81f6ebc3a09 100644 --- a/security/skey/Makefile +++ b/security/skey/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/07/09 13:39:06 schwarz Exp $ +# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:10 rillig Exp $ # DISTNAME= skey-1.1.5 @@ -23,7 +23,7 @@ SUBST_STAGE.perl= post-extract SUBST_FILES.perl= skeyprune.pl SUBST_SED.perl= -e "s,^\#!/usr/bin/perl,\#!${PERL5}," -INSTALLATION_DIRS= bin include lib man/man1 man/man8 +INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 post-install: ${RANLIB} ${PREFIX}/lib/libskey.a diff --git a/security/srp_client/Makefile b/security/srp_client/Makefile index ae6d0b73bac..56db67fc292 100644 --- a/security/srp_client/Makefile +++ b/security/srp_client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/03/04 21:30:38 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2007/01/07 09:14:10 rillig Exp $ DISTNAME= srp-1.4.4 PKGNAME= srp-client-1.4.4 @@ -33,7 +33,7 @@ SED_PATTERN+= -e "s,-ldes,-ldes -lroken -lcom_err -lcrypt," SED_PATTERN+= -e "s,-ldes,-ldes -lcom_err," .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-patch: for FILE in ftp/ftp/Makefile.in ftp/ftpd/Makefile.in \ @@ -49,9 +49,9 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/telnet/telnet/telnet \ ${PREFIX}/bin/srptelnet ${INSTALL_DATA} ${WRKSRC}/telnet/telnet/telnet.1 \ - ${PREFIX}/man/man1/srptelnet.1 + ${PREFIX}/${PKGMANDIR}/man1/srptelnet.1 ${INSTALL_PROGRAM} ${WRKSRC}/ftp/ftp/ftp ${PREFIX}/bin/srpftp - ${INSTALL_DATA} ${WRKSRC}/ftp/ftp/ftp.M ${PREFIX}/man/man1/srpftp.1 + ${INSTALL_DATA} ${WRKSRC}/ftp/ftp/ftp.M ${PREFIX}/${PKGMANDIR}/man1/srpftp.1 .include "../../devel/gmp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/shells/ast-ksh/Makefile.common b/shells/ast-ksh/Makefile.common index e32820239ff..fc89a1ba19b 100644 --- a/shells/ast-ksh/Makefile.common +++ b/shells/ast-ksh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2006/10/03 14:32:37 obache Exp $ +# $NetBSD: Makefile.common,v 1.22 2007/01/07 09:14:10 rillig Exp $ DISTNAME= ast-ksh-${ASTKSH_VERSION} PKGNAME= ast-ksh-${ASTKSH_VERSION:S/-//g} @@ -37,7 +37,7 @@ PDKSH= /bin/ksh PKG_SHELL= bin/ksh93 -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 # ${KSH93_MAKEFLAGS} is set as "LDFLAGS=-static" only when built as a # static binary. diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 39d3bb86052..a296238d1e9 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2006/06/15 13:24:50 wiz Exp $ +# $NetBSD: Makefile,v 1.74 2007/01/07 09:14:11 rillig Exp $ # DISTNAME= bash-2.05b @@ -61,7 +61,7 @@ BUILDLINK_API_DEPENDS.readline+= readline>=4.3 .include "../../devel/readline/buildlink3.mk" post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/acpidump/Makefile b/sysutils/acpidump/Makefile index 90a23b09f73..7fa432dee30 100644 --- a/sysutils/acpidump/Makefile +++ b/sysutils/acpidump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:10:48 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2007/01/07 09:14:11 rillig Exp $ # DISTNAME= pacpidump @@ -14,10 +14,10 @@ COMMENT= Portable ACPI table dumper USE_TOOLS+= gmake BUILD_TARGET= # null -INSTALLATION_DIRS= bin man/man8 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 do-install: @${INSTALL_PROGRAM} ${WRKSRC}/acpidump ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/acpidump.8 ${PREFIX}/man/man8 + @${INSTALL_MAN} ${WRKSRC}/acpidump.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/adjustkernel/Makefile b/sysutils/adjustkernel/Makefile index 220cd7120bc..df1f6836ac4 100644 --- a/sysutils/adjustkernel/Makefile +++ b/sysutils/adjustkernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:39 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:11 rillig Exp $ DISTNAME= adjustkernel-1.7 CATEGORIES= sysutils @@ -16,13 +16,13 @@ NO_MTREE= yes USE_TOOLS+= perl:run REPLACE_PERL= adjustkernel -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-extract: ${CP} ${FILESDIR}/adjustkernel ${WRKDIR} do-install: ${INSTALL_SCRIPT} ${WRKDIR}/adjustkernel ${PREFIX}/bin - ${INSTALL_MAN} ${FILESDIR}/adjustkernel.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${FILESDIR}/adjustkernel.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/bbsload/Makefile b/sysutils/bbsload/Makefile index 213c6359903..474194f7026 100644 --- a/sysutils/bbsload/Makefile +++ b/sysutils/bbsload/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/06/08 19:29:16 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:11 rillig Exp $ # DISTNAME= bbsload-0.2.6 @@ -17,6 +17,6 @@ USE_X11BASE= YES .include "../../mk/x11.buildlink3.mk" post-install: - ${INSTALL_MAN} ${WRKSRC}/bbsload.1 ${PREFIX}/man/man1/bbsload.1 + ${INSTALL_MAN} ${WRKSRC}/bbsload.1 ${PREFIX}/${PKGMANDIR}/man1/bbsload.1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/bchunk/Makefile b/sysutils/bchunk/Makefile index 8a2baa9b228..433923d8e2c 100644 --- a/sysutils/bchunk/Makefile +++ b/sysutils/bchunk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/10/04 21:59:34 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:11 rillig Exp $ DISTNAME= bchunk-1.1.1 CATEGORIES= sysutils @@ -10,10 +10,10 @@ COMMENT= ".bin/.cue" CD image converter MAKE_FLAGS+= CC=${CC:Q} LD=${CC:Q} CFLAGS=${CFLAGS:M*:Q} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bchunk ${PREFIX}/bin/bchunk - ${INSTALL_MAN} ${WRKSRC}/bchunk.1 ${PREFIX}/man/man1/bchunk.1 + ${INSTALL_MAN} ${WRKSRC}/bchunk.1 ${PREFIX}/${PKGMANDIR}/man1/bchunk.1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile index f6e483088bd..bbd5c890464 100644 --- a/sysutils/cdrtools-ossdvd/Makefile +++ b/sysutils/cdrtools-ossdvd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/08/27 01:01:15 ben Exp $ +# $NetBSD: Makefile,v 1.27 2007/01/07 09:14:11 rillig Exp $ DISTNAME= cdrtools-2.01.01a05 PKGNAME= cdrtools-ossdvd-2.01.1.36 @@ -52,7 +52,7 @@ MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q} MESSAGE_SUBST+= CDRECORD_CONF=${CDRECORD_CONF:Q} .endif -INSTALLATION_DIRS= bin man/man1 man/man8 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 SUBST_CLASSES+= fix SUBST_STAGE.fix= post-patch diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile index 7bdde5e7613..a8622b48887 100644 --- a/sysutils/cdrtools/Makefile +++ b/sysutils/cdrtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/11/03 19:15:45 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:11 rillig Exp $ DISTNAME= cdrtools-2.01 PKGREVISION= 4 @@ -46,7 +46,7 @@ MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q} MESSAGE_SUBST+= CDRECORD_CONF=${CDRECORD_CONF:Q} .endif -INSTALLATION_DIRS= bin man/man1 man/man8 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 SUBST_CLASSES+= fix SUBST_STAGE.fix= post-patch diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile index aac88587327..0d95de558c9 100644 --- a/sysutils/cfengine2/Makefile +++ b/sysutils/cfengine2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/01/06 15:10:07 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:11 rillig Exp $ # PKGREVISION= 4 @@ -23,8 +23,8 @@ pre-configure: ${WRKSRC}/contrib/vicf.in.orig > ${WRKSRC}/contrib/vicf.in post-install: - ${INSTALL_MAN_DIR} ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${PREFIX}/man/man8 + ${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_DATA} ${WRKSRC}/inputs/*.example \ ${PREFIX}/share/examples/cfengine ${INSTALL_DATA_DIR} /var/cfengine/inputs diff --git a/sysutils/checkpassword-pam/Makefile b/sysutils/checkpassword-pam/Makefile index 5bbee959630..45674d932f0 100644 --- a/sysutils/checkpassword-pam/Makefile +++ b/sysutils/checkpassword-pam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:23 tv Exp $ +# $NetBSD: Makefile,v 1.5 2007/01/07 09:14:11 rillig Exp $ # DISTNAME= checkpassword-pam-0.99 @@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -INSTALLATION_DIRS= bin man/man8 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 .include "../../mk/pam.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/cvsreport/Makefile b/sysutils/cvsreport/Makefile index ddfa5fba95a..547c1477733 100644 --- a/sysutils/cvsreport/Makefile +++ b/sysutils/cvsreport/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/11/05 17:53:44 seb Exp $ +# $NetBSD: Makefile,v 1.3 2007/01/07 09:14:11 rillig Exp $ # DISTNAME= cvsreport-0.3.5 @@ -15,6 +15,6 @@ NO_BUILD= yes do-install: ${INSTALL_SCRIPT} ${WRKSRC}/cvsreport ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/cvsreport.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/cvsreport.1 ${PREFIX}/${PKGMANDIR}/man1/ .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile index 4426c870931..c08295a3e14 100644 --- a/sysutils/daemontools/Makefile +++ b/sysutils/daemontools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/07/27 18:48:03 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2007/01/07 09:14:11 rillig Exp $ DISTNAME= daemontools-0.76 PKGREVISION= 1 @@ -22,7 +22,7 @@ DJB_SLASHPACKAGE= YES CMDDIR= ${WRKSRC}/command -INSTALLATION_DIRS= bin man man/man8 +INSTALLATION_DIRS= bin man ${PKGMANDIR}/man8 SUBST_FILES.djbware+= src/error.h @@ -37,7 +37,7 @@ do-install: post-install: cd ${WRKDIR}/*-man; for i in 8; do \ - for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/man/man$$i; done \ + for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/${PKGMANDIR}/man$$i; done \ done .include "../../mk/djbware.mk" diff --git a/sysutils/dmesg2gif/Makefile b/sysutils/dmesg2gif/Makefile index 2c6d8e4feae..e37240a8891 100644 --- a/sysutils/dmesg2gif/Makefile +++ b/sysutils/dmesg2gif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/07/27 00:09:06 hubertf Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:11 rillig Exp $ # DISTNAME= dmesg2gif-1.3 @@ -18,10 +18,10 @@ NO_BUILD= yes NO_CHECKSUM= yes NO_CONFIGURE= yes USE_TOOLS+= perl:run -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${FILESDIR}/dmesg2gif ${PREFIX}/bin/dmesg2gif - ${INSTALL_MAN} ${FILESDIR}/dmesg2gif.1 ${PREFIX}/man/man1/dmesg2gif.1 + ${INSTALL_MAN} ${FILESDIR}/dmesg2gif.1 ${PREFIX}/${PKGMANDIR}/man1/dmesg2gif.1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile index 8ff2e04d8ee..c8ff113952d 100644 --- a/sysutils/dvd+rw-tools/Makefile +++ b/sysutils/dvd+rw-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/07/25 13:17:28 abs Exp $ +# $NetBSD: Makefile,v 1.25 2007/01/07 09:14:11 rillig Exp $ # DISTNAME= dvd+rw-tools-6.1 @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_LANGUAGES= c c++ -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 # These are the only platforms listed in growisofs.c ONLY_FOR_PLATFORM=Linux-*-* OpenBSD-*-* NetBSD-*-* FreeBSD-*-* \ @@ -26,7 +26,7 @@ LDFLAGS.NetBSD+= -lrt # sem_* functions do-install: ${INSTALL_PROGRAM} ${WRKSRC}/growisofs ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/growisofs.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/growisofs.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_PROGRAM} ${WRKSRC}/dvd+rw-booktype ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/dvd+rw-format ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/dvd+rw-mediainfo ${PREFIX}/bin diff --git a/sysutils/dvdrecord/Makefile b/sysutils/dvdrecord/Makefile index ecd219c5f79..5bee93a4774 100644 --- a/sysutils/dvdrecord/Makefile +++ b/sysutils/dvdrecord/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:40 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:11 rillig Exp $ DISTNAME= dvdrtools-${VERSION} PKGNAME= ${DISTNAME:S/dvdrtools/dvdrecord/} @@ -15,11 +15,11 @@ VERSION= 0.1.5 GNU_CONFIGURE= yes LIBS.SunOS+= -lsocket -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: cd ${WRKSRC}/cdrecord; \ ${INSTALL_PROGRAM} dvdrecord ${PREFIX}/bin; \ - ${INSTALL_MAN} dvdrecord.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} dvdrecord.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/free/Makefile b/sysutils/free/Makefile index 522dd8fc76b..122f0e909c7 100644 --- a/sysutils/free/Makefile +++ b/sysutils/free/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:41 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:11 rillig Exp $ # DISTNAME= free-1.0 @@ -17,10 +17,10 @@ NO_CHECKSUM= yes NO_CONFIGURE= yes NO_BUILD= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${FILESDIR}/free ${PREFIX}/bin/free - ${INSTALL_MAN} ${FILESDIR}/free.1 ${PREFIX}/man/man1/free.1 + ${INSTALL_MAN} ${FILESDIR}/free.1 ${PREFIX}/${PKGMANDIR}/man1/free.1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile index 97ff45299ea..96b39b02777 100644 --- a/sysutils/gcdmaster/Makefile +++ b/sysutils/gcdmaster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/12/11 12:31:53 drochner Exp $ +# $NetBSD: Makefile,v 1.36 2007/01/07 09:14:11 rillig Exp $ .include "../../sysutils/cdrdao/Makefile.common" @@ -12,7 +12,7 @@ WRKSRC= ${WRKDIR}/cdrdao-${CDRDAO_VER} USE_DIRS+= xdg-1.1 CONFIGURE_ARGS+= --without-posix-threads CONFIGURE_ARGS+= --with-xdao -INSTALLATION_DIRS= bin man/man1 share/applications share/pixmaps +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/applications share/pixmaps USE_TOOLS+= pkg-config INSTALL_DIRS= xdao diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile index 24289dcdfd3..f8d1417fc17 100644 --- a/sysutils/grun/Makefile +++ b/sysutils/grun/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:41 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:11 rillig Exp $ DISTNAME= grun-0.9.2 PKGREVISION= 5 @@ -15,7 +15,7 @@ USE_TOOLS+= gmake PTHREAD_OPTS+= require post-install: - ${MV} ${PREFIX}/man/man1/grun.1x ${PREFIX}/man/man1/grun.1 + ${MV} ${PREFIX}/${PKGMANDIR}/man1/grun.1x ${PREFIX}/${PKGMANDIR}/man1/grun.1 .include "../../x11/gtk/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index 6d8ec8b88c2..45186a08cbb 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2006/09/26 13:14:03 dsainty Exp $ +# $NetBSD: Makefile,v 1.89 2007/01/07 09:14:12 rillig Exp $ # DISTNAME= lsof_4.76 @@ -39,7 +39,7 @@ REAL_GROUP= -g kmem .elif ${OPSYS} == "SunOS" MAKE_ENV+= CPPFLAGS= .endif -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin LSOF_MORE_SECURE?= 0 @@ -62,7 +62,7 @@ post-extract: do-install: ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m 2755 ${REAL_GROUP} \ ${WRKSRC}/lsof ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/lsof.8 ${PREFIX}/man/man8/lsof.8 + ${INSTALL_MAN} ${WRKSRC}/lsof.8 ${PREFIX}/${PKGMANDIR}/man8/lsof.8 @${INSTALL_DATA_DIR} ${PREFIX}/share/lsof ${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${PREFIX}/share/lsof @${CHMOD} 0444 ${PREFIX}/share/lsof/00* diff --git a/sysutils/mbmon/Makefile b/sysutils/mbmon/Makefile index d84d622673e..bf014802c3a 100644 --- a/sysutils/mbmon/Makefile +++ b/sysutils/mbmon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:41 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:12 rillig Exp $ # .include "../../sysutils/mbmon/Makefile.common" @@ -11,10 +11,10 @@ COMMENT= Motherboard monitoring utility BUILD_TARGET= mbmon -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mbmon ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/mbmon.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/mbmon.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/memtester/Makefile b/sysutils/memtester/Makefile index d1b2e4d775f..2fb73aefbdd 100644 --- a/sysutils/memtester/Makefile +++ b/sysutils/memtester/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/11/01 19:01:17 tv Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:12 rillig Exp $ # DISTNAME= memtester-4.0.5 @@ -16,11 +16,11 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews DJB_RESTRICTED= NO DJB_MAKE_TARGETS= NO -INSTALLATION_DIRS= bin man/man8 share/doc/memtester +INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 share/doc/memtester do-install: ${INSTALL_PROGRAM} ${WRKSRC}/memtester ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/memtester.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/memtester.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_DATA} ${WRKSRC}/README.tests ${PREFIX}/share/doc/memtester .include "../../mk/djbware.mk" diff --git a/sysutils/mklivecd/Makefile b/sysutils/mklivecd/Makefile index cc121de265c..dcd7e60cc82 100644 --- a/sysutils/mklivecd/Makefile +++ b/sysutils/mklivecd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2006/12/02 01:04:47 xtraeme Exp $ +# $NetBSD: Makefile,v 1.34 2007/01/07 09:14:12 rillig Exp $ DISTNAME= mklivecd-0.14.4 CATEGORIES= sysutils @@ -22,7 +22,7 @@ NO_CONFIGURE= YES NO_BUILD= YES USE_TOOLS+= tar -INSTALLATION_DIRS= man/man8 sbin share/mklivecd +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/mklivecd FILES= KERN-LIVECD personal_config @@ -36,7 +36,7 @@ do-install: .endfor ${INSTALL_DATA_DIR} ${PREFIX}/share/mklivecd ${INSTALL_SCRIPT} ${WRKDIR}/mklivecd.sh ${PREFIX}/sbin/mklivecd - ${INSTALL_MAN} ${WRKDIR}/mklivecd.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKDIR}/mklivecd.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_DATA} ${WRKDIR}/livecd ${PREFIX}/share/mklivecd .for F in ${FILES} ${INSTALL_DATA} ${FILESDIR}/${F} ${PREFIX}/share/mklivecd diff --git a/sysutils/news/Makefile b/sysutils/news/Makefile index 528a833ca7d..8cd5e677700 100644 --- a/sysutils/news/Makefile +++ b/sysutils/news/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/11/01 19:07:45 tv Exp $ +# $NetBSD: Makefile,v 1.6 2007/01/07 09:14:12 rillig Exp $ # DISTNAME= news-0.2 @@ -9,11 +9,11 @@ MAINTAINER= jschauma@NetBSD.org HOMEPAGE= http://www.netmeister.org/ COMMENT= System V news(1) -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/news ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/news.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/news.1 ${PREFIX}/${PKGMANDIR}/man1/ .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/nvnet/Makefile b/sysutils/nvnet/Makefile index efbeef14ea5..4a679633439 100644 --- a/sysutils/nvnet/Makefile +++ b/sysutils/nvnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/05/18 20:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2007/01/07 09:14:12 rillig Exp $ # PKGNAME= nvnet-20050620nb1 @@ -29,7 +29,7 @@ WRKSRC= ${WRKDIR}/nvnet ONLY_FOR_PLATFORM= NetBSD-*-i386 -INSTALLATION_DIRS= lkm man/man4 +INSTALLATION_DIRS= lkm ${PKGMANDIR}/man4 MESSAGE_SUBST+= PREFIX=${PREFIX:Q} @@ -39,6 +39,6 @@ do-extract: do-install: ${INSTALL} -c -m 755 ${WRKSRC}/module/nv.o ${PREFIX}/lkm/nv.o - ${INSTALL_MAN} ${WRKSRC}/man/nv.4 ${PREFIX}/man/man4/nv.4 + ${INSTALL_MAN} ${WRKSRC}/man/nv.4 ${PREFIX}/${PKGMANDIR}/man4/nv.4 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/pdumpfs/Makefile b/sysutils/pdumpfs/Makefile index 5728571248c..a08fe13f28a 100644 --- a/sysutils/pdumpfs/Makefile +++ b/sysutils/pdumpfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/10/04 21:59:35 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2007/01/07 09:14:12 rillig Exp $ # DISTNAME= pdumpfs-${VER} @@ -19,8 +19,8 @@ INSTALLATION_DIRS= share/doc/pdumpfs do-install: ${INSTALL_SCRIPT} ${WRKSRC}/pdumpfs ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/man8/pdumpfs.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/man/ja/man8/pdumpfs.8 ${PREFIX}/man/ja_JP.EUC/man8 + ${INSTALL_MAN} ${WRKSRC}/man/man8/pdumpfs.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKSRC}/man/ja/man8/pdumpfs.8 ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man8 cd ${WRKSRC}/doc && \ ${PAX} -rw -pp -pm . ${PREFIX}/share/doc/pdumpfs diff --git a/sysutils/pflogsumm/Makefile b/sysutils/pflogsumm/Makefile index c8e43b3841e..c464bf489ee 100644 --- a/sysutils/pflogsumm/Makefile +++ b/sysutils/pflogsumm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/09/28 20:52:27 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:12 rillig Exp $ # DISTNAME= pflogsumm-1.1.0 @@ -15,7 +15,7 @@ DEPENDS+= p5-Date-Calc-[0-9]*:../../devel/p5-Date-Calc NO_CONFIGURE= yes USE_TOOLS+= perl:run -INSTALLATION_DIRS= man/man1 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man1 sbin do-build: ${SED} 's;/usr/bin/perl;${PERL5};' ${WRKSRC}/pflogsumm.pl \ @@ -23,6 +23,6 @@ do-build: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/pflogsumm ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/pflogsumm.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/pflogsumm.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile index c00573add50..70f75360789 100644 --- a/sysutils/pfstat/Makefile +++ b/sysutils/pfstat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/04/17 13:46:48 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:12 rillig Exp $ DISTNAME= pfstat-1.7 PKGREVISION= 2 @@ -11,11 +11,11 @@ COMMENT= Utility to render graphical statistics for PF NO_CONFIGURE= yes -INSTALLATION_DIRS= bin man/man8 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pfstat ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/pfstat.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/pfstat.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../graphics/gd/buildlink3.mk" .include "../../graphics/freetype-lib/buildlink3.mk" diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile index 0920e77c1e0..9294e935cc7 100644 --- a/sysutils/pftop/Makefile +++ b/sysutils/pftop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/03/06 23:02:07 peter Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:12 rillig Exp $ DISTNAME= pftop-0.4 CATEGORIES= sysutils net @@ -13,11 +13,11 @@ NO_CONFIGURE= yes MAKE_ENV+= OSLEVEL=${PF_VERSION:S/.//} CFLAGS+= -I${PREFIX}/include -INSTALLATION_DIRS= man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pftop ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/pftop.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/pftop.8 ${PREFIX}/${PKGMANDIR}/man8 .include "../../security/pflkm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/sarah/Makefile b/sysutils/sarah/Makefile index a11c69616d8..4dac4bad00d 100644 --- a/sysutils/sarah/Makefile +++ b/sysutils/sarah/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:42 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:12 rillig Exp $ DISTNAME= sarah-0.9.1b CATEGORIES= sysutils @@ -13,7 +13,7 @@ USE_TOOLS+= perl:run REPLACE_PERL= sarah NO_BUILD= YES -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 CONF_FILES+= ${PREFIX}/share/examples/sarah/sarah.conf.sample \ ${PKG_SYSCONFDIR}/sarah.conf @@ -31,7 +31,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/sarah ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sarah ${INSTALL_DATA} ${WRKSRC}/sarah.conf.sample ${PREFIX}/share/examples/sarah - ${INSTALL_MAN} ${WRKSRC}/sarah.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/sarah.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sarah ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sarah diff --git a/sysutils/scsiinfo/Makefile b/sysutils/scsiinfo/Makefile index dfa164a7210..1d5d2e93a80 100644 --- a/sysutils/scsiinfo/Makefile +++ b/sysutils/scsiinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:01 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:12 rillig Exp $ DISTNAME= scsiinfo-4.7 CATEGORIES= sysutils @@ -13,7 +13,7 @@ WRKSRC= ${WRKDIR} ONLY_FOR_PLATFORM= SunOS-*-* -INSTALLATION_DIRS= man/man1 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man1 sbin do-extract: cd ${WRKSRC} && \ @@ -24,6 +24,6 @@ pre-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/scsiinfo ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/scsiinfo.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/scsiinfo.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/sformat/Makefile b/sysutils/sformat/Makefile index 32f0f4d3430..38b70698a72 100644 --- a/sysutils/sformat/Makefile +++ b/sysutils/sformat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:43 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:12 rillig Exp $ # DISTNAME= sformat-3.5 @@ -30,6 +30,6 @@ MAKE_FLAGS+= INS_BASE=${LOCALBASE:Q} # won't work in MAKE_ENV! MAKE_ENV+= CCOM="gcc" .endif -INSTALLATION_DIRS= bin include lib man/man5 man/man8 +INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/shc/Makefile b/sysutils/shc/Makefile index a8010b43e5c..b1292a61eb2 100644 --- a/sysutils/shc/Makefile +++ b/sysutils/shc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/03/04 21:30:43 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2007/01/07 09:14:13 rillig Exp $ # DISTNAME= shc-3.7 @@ -10,10 +10,10 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.datsi.fi.upm.es/~frosal/ COMMENT= Shell script to C compiler -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/shc ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/shc.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/shc.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile index 5b46942f355..a5e529a3051 100644 --- a/sysutils/skill/Makefile +++ b/sysutils/skill/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/10/28 21:29:47 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:13 rillig Exp $ # DISTNAME= skill-4.1.1 @@ -28,9 +28,9 @@ MAKE_ENV+= OSTYPE=sys-5r4 BINGRP=sys CPPFLAGS= pre-install: ${INSTALL_PROGRAM} ${WRKSRC}/skill ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/skill.1 ${PREFIX}/man/man1 - ${RM} -f ${PREFIX}/bin/snice ${PREFIX}/man/man1/snice.1 + ${INSTALL_MAN} ${WRKSRC}/skill.1 ${PREFIX}/${PKGMANDIR}/man1 + ${RM} -f ${PREFIX}/bin/snice ${PREFIX}/${PKGMANDIR}/man1/snice.1 ${LN} -s skill ${PREFIX}/bin/snice - ${LN} -s skill.1 ${PREFIX}/man/man1/snice.1 + ${LN} -s skill.1 ${PREFIX}/${PKGMANDIR}/man1/snice.1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/storage-manager/Makefile b/sysutils/storage-manager/Makefile index 2bea44f02e9..34c0efe9d60 100644 --- a/sysutils/storage-manager/Makefile +++ b/sysutils/storage-manager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/07/18 23:27:14 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:13 rillig Exp $ DISTNAME= sm_linux_v314_install PKGNAME= storage-manager-3.14 @@ -85,7 +85,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.so ${PREFIX}/lib/dpt ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.so.1 ${PREFIX}/lib/dpt ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.so.1.0.2 ${PREFIX}/lib/dpt - ${INSTALL_MAN} ${WRKSRC}/usr/local/man/man8/raidutil.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/usr/local/man/man8/raidutil.8 ${PREFIX}/${PKGMANDIR}/man8 ${INSTALL_SCRIPT} ${WRKDIR}/dptmgr.sh ${PREFIX}/sbin/dptmgr ${INSTALL_SCRIPT} ${WRKDIR}/dptsig.sh ${PREFIX}/sbin/dptsig ${INSTALL_SCRIPT} ${WRKDIR}/raidutil.sh ${PREFIX}/sbin/raidutil diff --git a/sysutils/sysgen/Makefile b/sysutils/sysgen/Makefile index 537bc9fb9b2..6917ac5d7a6 100644 --- a/sysutils/sysgen/Makefile +++ b/sysutils/sysgen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:35 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:13 rillig Exp $ # DISTNAME= sysgen @@ -13,10 +13,10 @@ COMMENT= Assign DEC Qbus or UNIBUS standard CSR and vector addresses WRKSRC= ${WRKDIR} BUILD_TARGET= sysgen -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sysgen ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/sysgen.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/sysgen.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/tdir/Makefile b/sysutils/tdir/Makefile index 4dfb5ef33ba..e0dab8b03c1 100644 --- a/sysutils/tdir/Makefile +++ b/sysutils/tdir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:56 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:13 rillig Exp $ # DISTNAME= tdir-1.58 @@ -13,12 +13,12 @@ LICENSE= tdir-license USE_TOOLS+= gunzip PYTHON_PATCH_SCRIPTS= tdir -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/tdir ${PREFIX}/bin/tdir ${GUNZIP_CMD} ${WRKSRC}/tdir.1.gz - ${INSTALL_MAN} ${WRKSRC}/tdir.1 ${PREFIX}/man/man1/tdir.1 + ${INSTALL_MAN} ${WRKSRC}/tdir.1 ${PREFIX}/${PKGMANDIR}/man1/tdir.1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tdir ${INSTALL_DATA} ${WRKSRC}/tdir-license.txt ${PREFIX}/share/doc/tdir/ diff --git a/sysutils/tload/Makefile b/sysutils/tload/Makefile index 6c26132556f..da03306abff 100644 --- a/sysutils/tload/Makefile +++ b/sysutils/tload/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:35 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:13 rillig Exp $ # DISTNAME= procps-2.0.6 @@ -10,7 +10,7 @@ MASTER_SITES= ftp://people.redhat.com/johnsonm/procps/ MAINTAINER= hubertf@NetBSD.org COMMENT= Terminal version of xload -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: cd ${WRKSRC} ; \ @@ -18,6 +18,6 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tload ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/tload.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/tload.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/vip/Makefile b/sysutils/vip/Makefile index 86ff9721137..9741cd3c91b 100644 --- a/sysutils/vip/Makefile +++ b/sysutils/vip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:43 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:13 rillig Exp $ DISTNAME= vip-19971113 PKGREVISION= 2 @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR} NO_CONFIGURE= yes NO_BUILD= yes -INSTALLATION_DIRS= bin man/man8 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 do-extract: ${CP} ${DISTDIR}/${DIST_SUBDIR}/vip ${WRKSRC} @@ -26,6 +26,6 @@ do-extract: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/vip ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/vip.man ${PREFIX}/man/man8/vip.8 + ${INSTALL_MAN} ${WRKSRC}/vip.man ${PREFIX}/${PKGMANDIR}/man8/vip.8 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/vobcopy/Makefile b/sysutils/vobcopy/Makefile index b14cf386cb2..fb23b386ef7 100644 --- a/sysutils/vobcopy/Makefile +++ b/sysutils/vobcopy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:43 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:13 rillig Exp $ # DISTNAME= vobcopy-0.5.14 @@ -15,11 +15,11 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews BUILD_TARGET= vobcopy -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/vobcopy ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/vobcopy.1 ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/vobcopy.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../multimedia/libdvdread/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wmSMPmon/Makefile b/sysutils/wmSMPmon/Makefile index b01de3bb39d..9a5018c07e5 100644 --- a/sysutils/wmSMPmon/Makefile +++ b/sysutils/wmSMPmon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:00 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:13 rillig Exp $ DISTNAME= wmSMPmon-2.3 PKGREVISION= 1 @@ -13,7 +13,7 @@ WRKSRC= ${WRKDIR}/wmSMPmon-2.x/wmSMPmon post-install: - ${INSTALL_MAN} ${WRKSRC}/wmsmpmon.1 ${PREFIX}/man/man1/wmSMPmon.1 + ${INSTALL_MAN} ${WRKSRC}/wmsmpmon.1 ${PREFIX}/${PKGMANDIR}/man1/wmSMPmon.1 .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xapply/Makefile b/sysutils/xapply/Makefile index 196d9590b03..e5b9632a51c 100644 --- a/sysutils/xapply/Makefile +++ b/sysutils/xapply/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/11/02 20:32:24 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2007/01/07 09:14:13 rillig Exp $ # DISTNAME= xapply-3.4 @@ -12,7 +12,7 @@ COMMENT= Parallel Execution tool a la xargs/apply BUILD_DEPENDS+= mkcmd>=8.14:../../devel/mkcmd -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 PKG_INSTALLATION_TYPES= overwrite pkgviews do-build: @@ -24,6 +24,6 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/xapply/xapply ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/bin/xapply/xapply.man \ - ${PREFIX}/man/man1/xapply.1 + ${PREFIX}/${PKGMANDIR}/man1/xapply.1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index 2021c96674f..be4188a217c 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2006/12/15 20:33:01 joerg Exp $ +# $NetBSD: Makefile,v 1.62 2007/01/07 09:14:13 rillig Exp $ DISTNAME= xosview-1.8.3 CATEGORIES= sysutils @@ -18,7 +18,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib -INSTALLATION_DIRS= bin lib/X11/app-defaults man/man1 +INSTALLATION_DIRS= bin lib/X11/app-defaults ${PKGMANDIR}/man1 MAKE_FLAGS+= MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}/man1 .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/zidrav/Makefile b/sysutils/zidrav/Makefile index 1cedd3b2e93..09b5a80f8c6 100644 --- a/sysutils/zidrav/Makefile +++ b/sysutils/zidrav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/12/05 20:51:02 rillig Exp $ +# $NetBSD: Makefile,v 1.3 2007/01/07 09:14:13 rillig Exp $ # DISTNAME= zidrav4unix-1.2.0 @@ -20,10 +20,10 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews CXXFLAGS+= -DCPU_BIGENDIAN .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/zidrav ${PREFIX}/bin/zidrav - ${INSTALL_MAN} ${WRKSRC}/zidrav.1 ${PREFIX}/man/man1/zidrav.1 + ${INSTALL_MAN} ${WRKSRC}/zidrav.1 ${PREFIX}/${PKGMANDIR}/man1/zidrav.1 .include "../../mk/bsd.pkg.mk" diff --git a/textproc/cawf/Makefile b/textproc/cawf/Makefile index 113c8d79add..1c1eb8a551f 100644 --- a/textproc/cawf/Makefile +++ b/textproc/cawf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/03/22 22:50:33 tv Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:13 rillig Exp $ # # Possible TODOs: # - set CH based on manual page section number, and real OS name @@ -34,7 +34,7 @@ post-extract: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bsfilt ${WRKSRC}/cawf ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/${PKGMANDIR}/man1/ ${INSTALL_DATA_DIR} ${PREFIX}/share/cawf ${INSTALL_DATA} ${WRKSRC}/common ${PREFIX}/share/cawf/ ${INSTALL_DATA} ${WRKSRC}/device.cf ${PREFIX}/share/cawf/ diff --git a/textproc/detex/Makefile b/textproc/detex/Makefile index 096c3be5ba6..a2c55e08d4b 100644 --- a/textproc/detex/Makefile +++ b/textproc/detex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/06/20 22:23:27 minskim Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:13 rillig Exp $ # DISTNAME= detex-2.7 @@ -12,10 +12,10 @@ COMMENT= Remove LaTeX commands USE_TOOLS+= lex -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/detex ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/detex.1l ${PREFIX}/man/man1/detex.1 + ${INSTALL_MAN} ${WRKSRC}/detex.1l ${PREFIX}/${PKGMANDIR}/man1/detex.1 .include "../../mk/bsd.pkg.mk" diff --git a/textproc/html2wml/Makefile b/textproc/html2wml/Makefile index 7a716c3b9c2..c56e50f9b39 100644 --- a/textproc/html2wml/Makefile +++ b/textproc/html2wml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/10/14 08:23:29 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2007/01/07 09:14:13 rillig Exp $ DISTNAME= html2wml-0.4.8r2 PKGNAME= html2wml-0.4.8.2 @@ -20,10 +20,10 @@ NO_BUILD= yes USE_TOOLS+= perl:run REPLACE_PERL= ${WRKSRC}/html2wml.cgi -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/html2wml.cgi ${PREFIX}/bin/html2wml - ${INSTALL_MAN} ${WRKSRC}/doc/html2wml.man ${PREFIX}/man/man1/html2wml.1 + ${INSTALL_MAN} ${WRKSRC}/doc/html2wml.man ${PREFIX}/${PKGMANDIR}/man1/html2wml.1 .include "../../mk/bsd.pkg.mk" diff --git a/textproc/kakasi/Makefile b/textproc/kakasi/Makefile index 6ca219d8153..2035026536c 100644 --- a/textproc/kakasi/Makefile +++ b/textproc/kakasi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/13 09:17:51 taca Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:13 rillig Exp $ DISTNAME= kakasi-2.3.4 PKGREVISION= 4 @@ -14,8 +14,8 @@ USE_TOOLS+= gmake USE_LIBTOOL= YES post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/kakasi.1 ${PREFIX}/man/ja_JP.EUC/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/kakasi.1 ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1 ${INSTALL_MAN} ${WRKSRC}/doc/kakasi.cat \ - ${PREFIX}/man/ja_JP.EUC/cat1/kakasi.0 + ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/cat1/kakasi.0 .include "../../mk/bsd.pkg.mk" diff --git a/textproc/par/Makefile b/textproc/par/Makefile index e29e40eba08..943640233d8 100644 --- a/textproc/par/Makefile +++ b/textproc/par/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:51 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:13 rillig Exp $ DISTNAME= Par152 PKGNAME= par-1.52 @@ -10,13 +10,13 @@ HOMEPAGE= http://www.nicemice.net/par/ COMMENT= Paragraph reformatter, vaguely similar to fmt, but better BUILD_TARGET= -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-configure: (cd ${WRKSRC}; ${CP} protoMakefile Makefile) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/par ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/par.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/par.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/textproc/rtf-tools/Makefile b/textproc/rtf-tools/Makefile index 1f5ee764314..9cea9abdb7c 100644 --- a/textproc/rtf-tools/Makefile +++ b/textproc/rtf-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/12/15 14:34:21 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2007/01/07 09:14:13 rillig Exp $ # DISTNAME= RTF-1.10 @@ -14,7 +14,7 @@ COMMENT= RTF to troff/groff/text converter WRKSRC= ${WRKDIR}/rtf INSTALL_TARGET= install install.man -INSTALLATION_DIRS= bin man/manl +INSTALLATION_DIRS= bin ${PKGMANDIR}/manl SUBST_CLASSES+= rtf SUBST_STAGE.rtf= pre-configure @@ -46,7 +46,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rtfindent/rtfindent ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/rtfwc/rtfwc ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/rtf2troff.man \ - ${PREFIX}/man/manl/rtf2troff.l + ${PREFIX}/${PKGMANDIR}/manl/rtf2troff.l .include "../../devel/libts/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/rtfm/Makefile b/textproc/rtfm/Makefile index 8894d1d35d2..c916a9560f6 100644 --- a/textproc/rtfm/Makefile +++ b/textproc/rtfm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:37 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:14 rillig Exp $ DISTNAME= rtfm-1.0 CATEGORIES= textproc @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/ \ MAINTAINER= zuntum@NetBSD.org COMMENT= NetBSD documentation and GNU Texinfo files search mechanism -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-patch: ${SED} "s,@LOCALBASE@,${LOCALBASE},g" ${WRKSRC}/rtfm.c \ @@ -17,6 +17,6 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rtfm ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/rtfm.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/rtfm.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/textproc/texi2roff/Makefile b/textproc/texi2roff/Makefile index f25782a6e7f..5f06483cbbd 100644 --- a/textproc/texi2roff/Makefile +++ b/textproc/texi2roff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/12/15 14:34:21 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:14 rillig Exp $ DISTNAME= texi2roff-2.0 CATEGORIES= textproc @@ -9,10 +9,10 @@ HOMEPAGE= http://texinfo.org/texi2roff/ COMMENT= Texinfo-to-ROFF direct translator BUILD_TARGET= -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/texi2roff ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/texi2roff.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/texi2roff.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/textproc/troffcvt/Makefile b/textproc/troffcvt/Makefile index 0fed14c3aee..6e0403e69c5 100644 --- a/textproc/troffcvt/Makefile +++ b/textproc/troffcvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/12/15 14:34:21 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:14 rillig Exp $ # DISTNAME= troffcvt-1.04 @@ -13,7 +13,7 @@ COMMENT= Troff/groff to RTF/HTML/TEXT converter USE_TOOLS+= perl:run INSTALL_TARGET= install install.man -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-patch: for i in `${FIND} ${WRKSRC} -name Makefile -print`; do \ @@ -43,16 +43,16 @@ do-install: html-specials rtf-fonts rtf-spec-ansi rtf-spec-mac \ rtf-spec-pc rtf-spec-pca text-specials text-8-specials \ ${PREFIX}/lib/troffcvt - ${INSTALL_MAN} ${WRKSRC}/man/tblcvt.man ${PREFIX}/man/man1/tblcvt.1 - ${INSTALL_MAN} ${WRKSRC}/man/unroff.man ${PREFIX}/man/man1/unroff.1 + ${INSTALL_MAN} ${WRKSRC}/man/tblcvt.man ${PREFIX}/${PKGMANDIR}/man1/tblcvt.1 + ${INSTALL_MAN} ${WRKSRC}/man/unroff.man ${PREFIX}/${PKGMANDIR}/man1/unroff.1 ${INSTALL_MAN} ${WRKSRC}/man/troff2rtf.man \ - ${PREFIX}/man/man1/troff2rtf.1 + ${PREFIX}/${PKGMANDIR}/man1/troff2rtf.1 ${INSTALL_MAN} ${WRKSRC}/man/tc2html-toc.man \ - ${PREFIX}/man/man1/tc2html-toc.1 + ${PREFIX}/${PKGMANDIR}/man1/tc2html-toc.1 ${INSTALL_MAN} ${WRKSRC}/man/troff2html.man \ - ${PREFIX}/man/man1/troff2html.1 - ${INSTALL_MAN} ${WRKSRC}/man/tc2html.man ${PREFIX}/man/man1/tc2html.1 - ${INSTALL_MAN} ${WRKSRC}/man/troffcvt.man ${PREFIX}/man/man1/troffcvt.1 + ${PREFIX}/${PKGMANDIR}/man1/troff2html.1 + ${INSTALL_MAN} ${WRKSRC}/man/tc2html.man ${PREFIX}/${PKGMANDIR}/man1/tc2html.1 + ${INSTALL_MAN} ${WRKSRC}/man/troffcvt.man ${PREFIX}/${PKGMANDIR}/man1/troffcvt.1 .include "../../devel/libmemmgr/buildlink3.mk" .include "../../devel/libportlib/buildlink3.mk" diff --git a/textproc/untex/Makefile b/textproc/untex/Makefile index 41ad82c9e5f..1aa0d8b08c0 100644 --- a/textproc/untex/Makefile +++ b/textproc/untex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:51 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:14 rillig Exp $ # DISTNAME= untex-1.3 @@ -10,10 +10,10 @@ COMMENT= Remove LaTeX commands WRKSRC= ${WRKDIR} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKDIR}/untex ${PREFIX}/bin - ${INSTALL_MAN} ${WRKDIR}/untex.man ${PREFIX}/man/man1/untex.1 + ${INSTALL_MAN} ${WRKDIR}/untex.man ${PREFIX}/${PKGMANDIR}/man1/untex.1 .include "../../mk/bsd.pkg.mk" diff --git a/textproc/xmlindent/Makefile b/textproc/xmlindent/Makefile index 83c446d40fd..781c4b13949 100644 --- a/textproc/xmlindent/Makefile +++ b/textproc/xmlindent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:08 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:14 rillig Exp $ # DISTNAME= xmlindent-0.2.16 @@ -15,10 +15,10 @@ USE_TOOLS+= lex GCC_REQD+= 3.0 -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xmlindent ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/xmlindent.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/xmlindent.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/time/anacron/Makefile b/time/anacron/Makefile index 8b156afad7f..068af17010e 100644 --- a/time/anacron/Makefile +++ b/time/anacron/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/04/22 09:22:15 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:14 rillig Exp $ # DISTNAME= anacron-2.3 @@ -52,7 +52,7 @@ OWN_DIRS= /var/spool/anacron RCD_SCRIPTS= anacron -INSTALLATION_DIRS= man/man5 man/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin post-install: ${INSTALL_DATA_DIR} ${EGDIR} diff --git a/time/cal/Makefile b/time/cal/Makefile index 8b1ed0526f9..95781f2a6ab 100644 --- a/time/cal/Makefile +++ b/time/cal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/09/09 02:46:09 obache Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:14 rillig Exp $ DISTNAME= cal-3.5 PKGREVISION= 1 @@ -17,11 +17,11 @@ CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" EGDIR= ${PREFIX}/share/examples/cal # CONF_FILES not used as calcol and caldat are optional. -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cal ${PREFIX}/bin/cal - ${INSTALL_MAN} ${WRKSRC}/cal.1 ${PREFIX}/man/man1/cal.1 + ${INSTALL_MAN} ${WRKSRC}/cal.1 ${PREFIX}/${PKGMANDIR}/man1/cal.1 ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.col ${EGDIR}/calcol ${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.dat ${EGDIR}/caldat diff --git a/time/gnyaclock/Makefile b/time/gnyaclock/Makefile index 001bc324e32..3af5ee526ce 100644 --- a/time/gnyaclock/Makefile +++ b/time/gnyaclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/12/27 13:37:40 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:14 rillig Exp $ # DISTNAME= gnya @@ -15,12 +15,12 @@ COMMENT= Accessory with Bezier curve WRKSRC= ${WRKDIR}/gnyaclock USE_IMAKE= YES -INSTALLATION_DIRS= bin man/ja_JP.EUC/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/ja_JP.EUC/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gnyaclock ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/gnyaclock.man \ - ${PREFIX}/man/ja_JP.EUC/man1/gnyaclock.1 + ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/gnyaclock.1 .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXp/buildlink3.mk" diff --git a/time/pcal/Makefile b/time/pcal/Makefile index 4ae9e020994..1c32bce888a 100644 --- a/time/pcal/Makefile +++ b/time/pcal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/10/04 22:01:52 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:14 rillig Exp $ # DISTNAME= pcal-4.7 @@ -21,7 +21,7 @@ MAKE_ENV+= CC=${CC:Q} HOST_CC=${CC:Q} BUILD_TARGET= pcal -INSTALLATION_DIRS= bin man/man1 share/doc/pcal ${HTDOCS} +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/pcal ${HTDOCS} pre-install: ${MV} ${WRKSRC}/pcal.cgi ${WRKSRC}/pcal.cgi.tmp @@ -38,7 +38,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pcal ${PREFIX}/bin ${INSTALL_SCRIPT_DIR} ${CGIBINDIR} ${INSTALL_SCRIPT} ${WRKSRC}/pcal.cgi ${CGIBINDIR} - ${INSTALL_MAN} ${WRKSRC}/pcal.man ${PREFIX}/man/man1/pcal.1 + ${INSTALL_MAN} ${WRKSRC}/pcal.man ${PREFIX}/${PKGMANDIR}/man1/pcal.1 ${INSTALL_DATA} ${WRKSRC}/ReadMe ${PREFIX}/share/doc/pcal/ReadMe ${INSTALL_DATA} ${WRKSRC}/pcal.html ${HTDOCS} ${INSTALL_DATA} ${WRKSRC}/pcalw.html ${HTDOCS} diff --git a/time/ptimetracker/Makefile b/time/ptimetracker/Makefile index 3aab6770c1c..af52405df1e 100644 --- a/time/ptimetracker/Makefile +++ b/time/ptimetracker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/05/22 22:04:15 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:14 rillig Exp $ DISTNAME= ptimetracker-1.7.3 PKGREVISION= 3 @@ -13,14 +13,14 @@ COMMENT= Keep track of the time spent on projects USE_LANGUAGES= c++ USE_TOOLS+= gmake USE_LIBTOOL= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-configure: cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile ptt.pro do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ptimetracker ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/ptimetracker.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/ptimetracker.1 ${PREFIX}/${PKGMANDIR}/man1/ .include "../../x11/qt3-libs/buildlink3.mk" .include "../../x11/qt3-tools/buildlink3.mk" diff --git a/time/wmcalclock/Makefile b/time/wmcalclock/Makefile index 1d2d7637aec..4fecc9dcf07 100644 --- a/time/wmcalclock/Makefile +++ b/time/wmcalclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/12/27 13:37:40 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:14 rillig Exp $ # DISTNAME= wmCalClock-1.25 @@ -20,10 +20,10 @@ USE_TOOLS+= gmake MAKE_ENV+= EXTRALIBS="-lsocket -lnsl" .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: - ${INSTALL_MAN} ${WRKSRC}/wmCalClock.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/wmCalClock.1 ${PREFIX}/${PKGMANDIR}/man1/ ${INSTALL_PROGRAM} ${WRKSRC}/wmCalClock ${PREFIX}/bin/ .include "../../x11/libXext/buildlink3.mk" diff --git a/time/xdkcal/Makefile b/time/xdkcal/Makefile index 01a86a25e54..50eef618524 100644 --- a/time/xdkcal/Makefile +++ b/time/xdkcal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/02/05 23:11:11 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2007/01/07 09:14:14 rillig Exp $ # DISTNAME= xdkcal-0.9d @@ -14,12 +14,12 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../mk/x11.buildlink3.mk" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xdkcal ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/xdkcal.1x ${PREFIX}/man/man1/xdkcal.1 + ${INSTALL_MAN} ${WRKSRC}/xdkcal.1x ${PREFIX}/${PKGMANDIR}/man1/xdkcal.1 .include "../../mk/bsd.pkg.mk" diff --git a/wm/bbpager/Makefile b/wm/bbpager/Makefile index d73d5c22b5b..82cfd464db6 100644 --- a/wm/bbpager/Makefile +++ b/wm/bbpager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/08/20 23:08:44 jschauma Exp $ +# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:14 rillig Exp $ # DISTNAME= bbpager-0.3.1 @@ -18,7 +18,7 @@ USE_LANGUAGES= c c++ .include "../../mk/x11.buildlink3.mk" post-install: - ${INSTALL_MAN} ${WRKSRC}/bbpager.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/bbpager.bb.5 ${PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/bbpager.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/bbpager.bb.5 ${PREFIX}/${PKGMANDIR}/man5 .include "../../mk/bsd.pkg.mk" diff --git a/wm/bbpager04/Makefile b/wm/bbpager04/Makefile index 2c96fbb023c..085b1e12ad1 100644 --- a/wm/bbpager04/Makefile +++ b/wm/bbpager04/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/09/03 10:16:56 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2007/01/07 09:14:14 rillig Exp $ # DISTNAME= bbpager-0.4.1beta1 @@ -15,8 +15,8 @@ USE_LANGUAGES= c c++ USE_TOOLS+= pkg-config post-install: - ${INSTALL_MAN} ${WRKSRC}/bbpager.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/bbpager.bb.5 ${PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/bbpager.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/bbpager.bb.5 ${PREFIX}/${PKGMANDIR}/man5 .include "../../wm/blackbox70/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/wm/bsetroot/Makefile b/wm/bsetroot/Makefile index b3f6f900f27..b1d32f403af 100644 --- a/wm/bsetroot/Makefile +++ b/wm/bsetroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/02/05 23:11:12 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:14 rillig Exp $ # DISTNAME= blackbox-0.65.0 @@ -16,13 +16,13 @@ GNU_CONFIGURE= YES BUILD_DIRS= ${WRKSRC}/nls ${WRKSRC}/util -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/util/bsetbg ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/util/bsetroot ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/bsetbg.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/bsetroot.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/bsetbg.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/bsetroot.1 ${PREFIX}/${PKGMANDIR}/man1 ( cd ${WRKSRC}/nls && ${MAKE} install ) .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/wm/evilwm/Makefile b/wm/evilwm/Makefile index 57c84e1b20f..26ed647d02a 100644 --- a/wm/evilwm/Makefile +++ b/wm/evilwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/04/27 10:03:05 sketch Exp $ +# $NetBSD: Makefile,v 1.24 2007/01/07 09:14:15 rillig Exp $ # DISTNAME= evilwm-0.99.25 @@ -9,13 +9,13 @@ MAINTAINER= sketch@NetBSD.org HOMEPAGE= http://www.6809.org.uk/evilwm/ COMMENT= Minimalist Window Manager for X -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../mk/x11.buildlink3.mk" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/evilwm ${PREFIX}/bin/evilwm - ${INSTALL_MAN} ${WRKSRC}/evilwm.1 ${PREFIX}/man/man1/evilwm.1 + ${INSTALL_MAN} ${WRKSRC}/evilwm.1 ${PREFIX}/${PKGMANDIR}/man1/evilwm.1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/evilwm for docfile in ChangeLog README TODO; \ do \ diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile index b058e997057..a5e5062df36 100644 --- a/wm/qvwm/Makefile +++ b/wm/qvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2007/01/07 09:14:15 rillig Exp $ # DISTNAME= qvwm-1.1.12 @@ -17,7 +17,7 @@ CONFIGURE_ENV+= PATH_RM=${TOOLS_RM:Q} USE_LANGUAGES= c c++ post-install: - ${MV} ${PREFIX}/man/man1/qvwm.1x ${PREFIX}/man/man1/qvwm.1 + ${MV} ${PREFIX}/${PKGMANDIR}/man1/qvwm.1x ${PREFIX}/${PKGMANDIR}/man1/qvwm.1 .include "options.mk" .include "../../audio/esound/buildlink3.mk" diff --git a/wm/weewm/Makefile b/wm/weewm/Makefile index e8504475cf9..2503295a423 100644 --- a/wm/weewm/Makefile +++ b/wm/weewm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:11:15 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:15 rillig Exp $ # DISTNAME= weewm-0.0.2 @@ -15,13 +15,13 @@ COMMENT= Fast and ultra light windowmanager with total keyboard control EXAMPLESDIR= ${PREFIX}/share/examples/weewm DOCDIR= ${PREFIX}/share/doc/weewm -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../mk/x11.buildlink3.mk" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/weewm ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/weewm.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/weewm.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/config.rc ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/keys.rc ${EXAMPLESDIR} diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile index 5e60078117f..c73e7ce724d 100644 --- a/wm/wm2/Makefile +++ b/wm/wm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/02/05 23:11:15 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2007/01/07 09:14:15 rillig Exp $ DISTNAME= wm2-4 PKGNAME= wm2-4.0 @@ -16,12 +16,12 @@ USE_LANGUAGES= c c++ USE_X11BASE= YES MAKE_ENV+= CCC=${CXX:Q} -INSTALLATION_DIRS= bin man/cat1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 .include "../../mk/x11.buildlink3.mk" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wm2 ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/man/cat1/wm2.0 + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/${PKGMANDIR}/cat1/wm2.0 .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmdrawer/Makefile b/wm/wmdrawer/Makefile index 515c1a37ee8..5da5fd146cf 100644 --- a/wm/wmdrawer/Makefile +++ b/wm/wmdrawer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/04/18 20:04:28 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:15 rillig Exp $ # DISTNAME= wmdrawer-0.10.5 @@ -11,14 +11,14 @@ HOMEPAGE= http://people.easter-eggs.org/~valos/wmdrawer/ COMMENT= Drawer (retractable button bar) to launch applications USE_TOOLS+= gmake -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 DIST_SUBDIR= ${PKGNAME_NOREV} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmdrawer ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmdrawer ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/wmdrawer - ${INSTALL_MAN} ${WRKSRC}/doc/wmdrawer.1x.gz ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/wmdrawer.1x.gz ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA} ${WRKSRC}/wmdrawerrc.example ${PREFIX}/share/examples/wmdrawer ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/wmdrawer ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/wmdrawer diff --git a/www/analog/Makefile b/www/analog/Makefile index efeeeaffef9..78b037b2cd9 100644 --- a/www/analog/Makefile +++ b/www/analog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2006/06/02 13:11:49 joerg Exp $ +# $NetBSD: Makefile,v 1.54 2007/01/07 09:14:15 rillig Exp $ DISTNAME= analog-6.0 CATEGORIES= www @@ -23,7 +23,7 @@ CONF_FILES= ${EGDIR}/analog.cfg ${PKG_SYSCONFDIR}/analog.cfg CFLAGS+= -DNOGLOB .endif -INSTALLATION_DIRS= bin man/man1 lib/analog/lang lib/analog/images +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 lib/analog/lang lib/analog/images INSTALLATION_DIRS+= share/doc/analog share/examples LIBS+= -lm @@ -32,7 +32,7 @@ MAKE_ENV+= LIBS=${LIBS:M*:Q} do-install: ${INSTALL_PROGRAM} ${WRKDISTDIR}/analog ${PREFIX}/bin - ${INSTALL_DATA} ${WRKDISTDIR}/analog.man ${PREFIX}/man/man1/analog.1 + ${INSTALL_DATA} ${WRKDISTDIR}/analog.man ${PREFIX}/${PKGMANDIR}/man1/analog.1 ${INSTALL_DATA} ${WRKDISTDIR}/docs/* ${PREFIX}/share/doc/analog ${INSTALL_DATA} ${WRKDISTDIR}/images/* ${PREFIX}/lib/analog/images ${INSTALL_DATA} ${WRKDISTDIR}/lang/* ${PREFIX}/lib/analog/lang diff --git a/www/bins/Makefile b/www/bins/Makefile index 1c6341aca84..958bbdc93e1 100644 --- a/www/bins/Makefile +++ b/www/bins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2006/03/04 21:30:57 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2007/01/07 09:14:15 rillig Exp $ # DISTNAME= bins-1.1.29 @@ -38,7 +38,7 @@ USE_TOOLS+= perl:run REPLACE_PERL= bins bins_edit bins-edit-gui tools/bins_addtext \ tools/bins_cleanupgallery tools/bins_txt2xml -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-patch: ${MV} ${WRKSRC}/bins ${WRKSRC}/bins.bak @@ -52,8 +52,8 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bins ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/tools/bins_cleanupgallery ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/bins_edit ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/bins.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/bins_edit.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/bins.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/bins_edit.1 ${PREFIX}/${PKGMANDIR}/man1 # HTML documentation ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/bins ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/html/bins/ diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile index 043c7a8ccb2..95148d73825 100644 --- a/www/bozohttpd/Makefile +++ b/www/bozohttpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2006/06/10 20:00:55 minskim Exp $ +# $NetBSD: Makefile,v 1.56 2007/01/07 09:14:15 rillig Exp $ # DISTNAME= bozohttpd-20060517 @@ -34,7 +34,7 @@ MAKE_ENV+= BINDIR=${PREFIX}/libexec MANDIR=${PREFIX}/man CPPFLAGS+= -DDO_HTPASSWD .endif -INSTALLATION_DIRS= libexec man/cat8 man/man8 +INSTALLATION_DIRS= libexec ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 .include "../../security/openssl/buildlink3.mk" diff --git a/www/calamaris/Makefile b/www/calamaris/Makefile index 3aee40b07f8..6664d13cd13 100644 --- a/www/calamaris/Makefile +++ b/www/calamaris/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:25 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:15 rillig Exp $ # DISTNAME= calamaris-2.58 @@ -13,11 +13,11 @@ USE_TOOLS+= perl:run REPLACE_PERL= calamaris NO_BUILD= YES -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/calamaris ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/calamaris.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/calamaris.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/calamaris .for doc in CHANGES COPYRIGHT EXAMPLES README ${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/calamaris diff --git a/www/htmlfix/Makefile b/www/htmlfix/Makefile index 5553cbf629c..5aa49327f18 100644 --- a/www/htmlfix/Makefile +++ b/www/htmlfix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:25 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:15 rillig Exp $ # DISTNAME= htmlfix-1.03 @@ -11,10 +11,10 @@ COMMENT= Fix latin1 to html entities and/or line endings DEPENDS+= p5-HTML-FixEntities-[0-9]*:../../www/p5-HTML-FixEntities USE_TOOLS+= perl:run -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/htmlfix.pl ${PREFIX}/bin/htmlfix - ${INSTALL_MAN} ${WRKSRC}/htmlfix.1 ${PREFIX}/man/man1/htmlfix.1 + ${INSTALL_MAN} ${WRKSRC}/htmlfix.1 ${PREFIX}/${PKGMANDIR}/man1/htmlfix.1 .include "../../mk/bsd.pkg.mk" diff --git a/www/ijb/Makefile b/www/ijb/Makefile index 00a66cd2afe..57332da7551 100644 --- a/www/ijb/Makefile +++ b/www/ijb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:12 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:15 rillig Exp $ # DISTNAME= ijb20 @@ -14,11 +14,11 @@ COMMENT= The Internet Junkbuster Proxy blocks unwanted banner ads and cookies MAKE_ENV+= MORE_CFLAGS=${CFLAGS:M*:Q} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/junkbuster ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/junkbuster.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/junkbuster.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/junkbuster ${INSTALL_DATA} ${WRKSRC}/junkbstr.ini \ ${PREFIX}/share/examples/junkbuster/junkbuster.ini diff --git a/www/ns-plugger-common/Makefile b/www/ns-plugger-common/Makefile index 44c92b285cb..45b685d4265 100644 --- a/www/ns-plugger-common/Makefile +++ b/www/ns-plugger-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/05/22 22:22:05 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:15 rillig Exp $ DISTNAME= plugger-4.0-linux-x86-glibc PKGNAME= ns-${PLUGGERNAME}-${BINNAME}-${PLUGGERVERS} @@ -36,7 +36,7 @@ DOCDIR= ${PREFIX}/share/doc/plugger PLIST_SUBST+= NS_PLUGINS_DIR=${NS_PLUGINS_DIR:S/${PREFIX}\///} -INSTALLATION_DIRS= bin man/man7 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man7 do-install: .if ${BINNAME} != common @@ -45,7 +45,7 @@ do-install: ${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR} ${DOCDIR} cd ${WRKSRC}; ${INSTALL_PROGRAM} plugger.so ${NS_PLUGINS_DIR} cd ${WRKSRC}; ${INSTALL_PROGRAM} plugger-4.0 ${PREFIX}/bin - cd ${WRKSRC}; ${INSTALL_DATA} plugger.7 ${PREFIX}/man/man7 + cd ${WRKSRC}; ${INSTALL_DATA} plugger.7 ${PREFIX}/${PKGMANDIR}/man7 cd ${WRKSRC}; ${INSTALL_DATA} README COPYING ${DOCDIR} .endif diff --git a/www/opera/Makefile b/www/opera/Makefile index ca1a674cbb2..9f8fd96572d 100644 --- a/www/opera/Makefile +++ b/www/opera/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2006/12/19 23:02:12 jdolecek Exp $ +# $NetBSD: Makefile,v 1.62 2007/01/07 09:14:15 rillig Exp $ DISTNAME= opera-${OPERA_PKG_VERSION:S/u/pl/} CATEGORIES= www @@ -92,7 +92,7 @@ SUBST_SED.opera= -e 's,/usr/,${PREFIX}/,g' .endif -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: .if (${_OPERA_OPSYS} == NetBSD) || (${_OPERA_OPSYS} == DragonFly) @@ -113,10 +113,10 @@ post-install-manpage: # The SuSE common makefile defines "MANCOMPRESSED=yes". . if defined(MANCOMPRESSED) && !empty(MANCOMPRESSED:M[yY][eE][sS]) ${LN} -fs ../../${EMULSUBDIR}/usr/share/man/man1/opera.1.gz \ - ${PREFIX}/man/man1 + ${PREFIX}/${PKGMANDIR}/man1 . else ${GUNZIP_CMD} -c ${EMULDIR}/usr/share/man/man1/opera.1.gz > - ${PREFIX}/man/man1/opera.1 + ${PREFIX}/${PKGMANDIR}/man1/opera.1 . endif .endif @@ -129,7 +129,7 @@ do-install: @${ECHO} post-install: - @${INSTALL_MAN} ${WRKSRC}/man/opera.1 ${PREFIX}/man/man1 + @${INSTALL_MAN} ${WRKSRC}/man/opera.1 ${PREFIX}/${PKGMANDIR}/man1 .endif # regenerate distinfo for all ports supported by this package diff --git a/www/php4/Makefile b/www/php4/Makefile index d5950569844..dde661ba97e 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2006/11/04 11:19:41 adrianp Exp $ +# $NetBSD: Makefile,v 1.74 2007/01/07 09:14:15 rillig Exp $ PKGNAME= php-${PHP_BASE_VERS} PKGREVISION= 3 @@ -63,7 +63,7 @@ post-extract: post-install: ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${PREFIX}/bin/php - ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/man/man1/php.1 + ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/${PKGMANDIR}/man1/php.1 ${INSTALL_DATA_DIR} ${CGIDIR} ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php ${CGIDIR} ${INSTALL_DATA_DIR} ${EGDIR} diff --git a/www/snownews/Makefile b/www/snownews/Makefile index b982405a162..a28a3b5fbb3 100644 --- a/www/snownews/Makefile +++ b/www/snownews/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/04/13 18:23:39 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2007/01/07 09:14:15 rillig Exp $ DISTNAME= snownews-1.5.7 PKGREVISION= 4 @@ -26,17 +26,17 @@ MAKE_ENV+= EXTRA_CFLAGS=${CFLAGS:M*:Q} .include "../../devel/gettext-lib/buildlink3.mk" MAKE_ENV+= EXTRA_LDFLAGS="${LDFLAGS} ${BUILDLINK_LDADD.gettext}" -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/snownews ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/opml2snow ${PREFIX}/bin .for M in de fr it nl ru_RU.KOI8-R - ${INSTALL_DATA_DIR} ${PREFIX}/man/${M}/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/man/${M}/snownews.1 ${PREFIX}/man/${M}/man1 + ${INSTALL_DATA_DIR} ${PREFIX}/${PKGMANDIR}/${M}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/man/${M}/snownews.1 ${PREFIX}/${PKGMANDIR}/${M}/man1 .endfor - ${INSTALL_MAN} ${WRKSRC}/doc/man/snownews.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/man/opml2snow.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/man/snownews.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/man/opml2snow.1 ${PREFIX}/${PKGMANDIR}/man1 .for L in de es ja nl pl pt_BR ru sl zh_TW zh_CN ${INSTALL_DATA_DIR} ${PREFIX}/${PKGLOCALEDIR}/locale/${L}/LC_MESSAGES ${INSTALL_DATA} ${WRKSRC}/po/${L}.mo ${PREFIX}/${PKGLOCALEDIR}/locale/${L}/LC_MESSAGES/snownews.mo diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index b63c6493e75..271b358658b 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2006/04/17 13:46:52 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2007/01/07 09:14:15 rillig Exp $ # DISTNAME= webalizer-2.01-10-src @@ -30,7 +30,7 @@ _DOCFILES= CHANGES Copyright DNS.README README README.FIRST PLIST_ADD= ${WRKSRC}/.PLIST_ADD PLIST_SRC= ${PKGDIR}/PLIST ${PLIST_ADD} -INSTALLATION_DIRS= bin man/man1 share/examples ${_DOC_SUBDIR} +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples ${_DOC_SUBDIR} SUBST_CLASSES+= webalizer SUBST_STAGE.webalizer= post-build diff --git a/www/webnew/Makefile b/www/webnew/Makefile index 467e49475e1..c6b15632c06 100644 --- a/www/webnew/Makefile +++ b/www/webnew/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/10/14 08:24:59 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:16 rillig Exp $ # DISTNAME= webnew-1.3 @@ -14,10 +14,10 @@ USE_TOOLS+= perl:run NO_CONFIGURE= yes BUILD_TARGET= all DEST=${PREFIX} PERL=${PERL5} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/webnew ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/webnew.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/webnew.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/www/wml/Makefile b/www/wml/Makefile index 6b4a5134ab3..59d72c08903 100644 --- a/www/wml/Makefile +++ b/www/wml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/12/05 23:55:23 rillig Exp $ +# $NetBSD: Makefile,v 1.26 2007/01/07 09:14:16 rillig Exp $ # DISTNAME= wml-2.0.9 @@ -44,12 +44,12 @@ pre-configure: done post-install: - cd ${PREFIX}/man/cat1 ; \ + cd ${PREFIX}/${PKGMANDIR}/cat1 ; \ for i in wml_aux_tidy wml_aux_txt2html wml_p4_gm4 ; \ do \ ${MV} $${i}.1 $${i}.0 ; \ done - cd ${PREFIX}/man/cat7 ; \ + cd ${PREFIX}/${PKGMANDIR}/cat7 ; \ for i in wml_barebone wml_std_css1 wml_std_css2 wml_std_csspos \ wml_std_html20 wml_std_html32 wml_std_html40 wml_std_html401 \ wml_std_wai10 wml_std_xhtml10 ; \ diff --git a/www/zopeedit/Makefile b/www/zopeedit/Makefile index 827f91ca1be..54072360aac 100644 --- a/www/zopeedit/Makefile +++ b/www/zopeedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:31:06 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:16 rillig Exp $ # DISTNAME= zopeedit-0.7-src @@ -18,7 +18,7 @@ PYDISTUTILSPKG= yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zopeedit ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/zopeedit - ${INSTALL_MAN} ${WRKSRC}/man/zopeedit.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/zopeedit.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" diff --git a/x11/dfm/Makefile b/x11/dfm/Makefile index e936edb0a8a..568c36c49b8 100644 --- a/x11/dfm/Makefile +++ b/x11/dfm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/04/17 14:52:12 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:16 rillig Exp $ # PKGREVISION= 6 @@ -8,6 +8,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Desktop File Manager post-install: - ${MV} ${PREFIX}/man/man1/dfm.1x ${PREFIX}/man/man1/dfm.1 + ${MV} ${PREFIX}/${PKGMANDIR}/man1/dfm.1x ${PREFIX}/${PKGMANDIR}/man1/dfm.1 .include "Makefile.common" diff --git a/x11/fvwm-wharf/Makefile b/x11/fvwm-wharf/Makefile index 12c0142867d..092cde9e276 100644 --- a/x11/fvwm-wharf/Makefile +++ b/x11/fvwm-wharf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:42 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2007/01/07 09:14:16 rillig Exp $ DISTNAME= AfterStep-1.0 PKGNAME= fvwm-wharf-1.0 @@ -12,14 +12,14 @@ COMMENT= Copy of AfterStep's Wharf compatible with fvwm2 USE_IMAKE= YES -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-configure: cd ${WRKSRC}; ${MAKE} Makefiles do-install: ${INSTALL_PROGRAM} ${WRKSRC}/modules/Wharf/Wharf ${PREFIX}/bin/Fvwm-Wharf - ${INSTALL_MAN} ${WRKSRC}/modules/Wharf/Wharf.man ${PREFIX}/man/man1/Fvwm-Wharf.1 + ${INSTALL_MAN} ${WRKSRC}/modules/Wharf/Wharf.man ${PREFIX}/${PKGMANDIR}/man1/Fvwm-Wharf.1 .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" diff --git a/x11/gtk2-theme-switch/Makefile b/x11/gtk2-theme-switch/Makefile index 5368718518b..2e2bf563d40 100644 --- a/x11/gtk2-theme-switch/Makefile +++ b/x11/gtk2-theme-switch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/04/17 13:46:53 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:16 rillig Exp $ # DISTNAME= gtk-theme-switch-2.0.0rc2 @@ -14,13 +14,13 @@ COMMENT= Allows quick & easy switching of GTK+ 2.x themes USE_TOOLS+= gmake pkg-config BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/switch2 \ ${PREFIX}/bin/gtk2-theme-switch ${INSTALL_MAN} ${WRKSRC}/switch.1 \ - ${PREFIX}/man/man1/gtk2-theme-switch.1 + ${PREFIX}/${PKGMANDIR}/man1/gtk2-theme-switch.1 .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/p5-gtk/Makefile b/x11/p5-gtk/Makefile index 8f17bb1c3e4..db20d3fcd45 100644 --- a/x11/p5-gtk/Makefile +++ b/x11/p5-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2006/10/11 19:31:31 rillig Exp $ +# $NetBSD: Makefile,v 1.35 2007/01/07 09:14:16 rillig Exp $ # .include "Makefile.common" @@ -11,7 +11,7 @@ MAINTAINER= root@garbled.net COMMENT= Perl bindings for GTK+ WRKSRC= ${WRKDIR}/${DISTNAME}/Gtk -MAKE_PARAMS= INSTALLMAN3DIR=${PREFIX}/man/man3 +MAKE_PARAMS= INSTALLMAN3DIR=${PREFIX}/${PKGMANDIR}/man3 PERL5_PACKLIST= auto/Gtk/.packlist REPLACE_PERL+= ../tools/* diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile index dcfe9e17ee5..7c3c58b0b2d 100644 --- a/x11/qwt/Makefile +++ b/x11/qwt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/05/19 07:48:12 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:16 rillig Exp $ DISTNAME= qwt-0.3.0 PKGREVISION= 5 @@ -18,7 +18,7 @@ MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} CONFLICTS= qwtlib-[0-9]* -INSTALLATION_DIRS= lib man/man3 +INSTALLATION_DIRS= lib ${PKGMANDIR}/man3 post-patch: ${LN} -s ${WRKSRC}/makefiles/netbsd-g++ ${WRKSRC}/Makefile @@ -28,7 +28,7 @@ do-install: ${PREFIX}/lib ${INSTALL_DATA_DIR} ${PREFIX}/include/qwt ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qwt - ${INSTALL_DATA} ${WRKSRC}/doc/man/man3/* ${PREFIX}/man/man3 + ${INSTALL_DATA} ${WRKSRC}/doc/man/man3/* ${PREFIX}/${PKGMANDIR}/man3 .include "../../x11/qt2-libs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tkinfo/Makefile b/x11/tkinfo/Makefile index 1026fa330f0..44b25cb90d7 100644 --- a/x11/tkinfo/Makefile +++ b/x11/tkinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/03/04 21:31:11 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2007/01/07 09:14:16 rillig Exp $ DISTNAME= tkinfo-2.8 PKGREVISION= 1 @@ -13,7 +13,7 @@ DEPENDS+= tk>=8.3.2:../../x11/tk NO_BUILD= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-patch: cd ${WRKSRC}; \ @@ -25,6 +25,6 @@ post-patch: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/tkinfo ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/tkinfo.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/tkinfo.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/x11/xbindkeys-tk/Makefile b/x11/xbindkeys-tk/Makefile index a9ea3a8b4b0..a41385a76d6 100644 --- a/x11/xbindkeys-tk/Makefile +++ b/x11/xbindkeys-tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/12/08 16:16:12 obache Exp $ +# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:16 rillig Exp $ # .include "../../x11/xbindkeys/Makefile.common" @@ -12,10 +12,10 @@ DEPENDS+= tk>=8.3.4:../../x11/tk NO_CONFIGURE= yes NO_BUILD= yes -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/xbindkeys_show ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/xbindkeys_show.1 ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/xbindkeys_show.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/x11/xdesktopwaves/Makefile b/x11/xdesktopwaves/Makefile index af3a8439a02..99116bc403f 100644 --- a/x11/xdesktopwaves/Makefile +++ b/x11/xdesktopwaves/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/03/04 21:31:12 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:16 rillig Exp $ # DISTNAME= xdesktopwaves-1.1 @@ -15,13 +15,13 @@ USE_DIRS+= xdg-1.1 MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q} MAKE_FLAGS+= LFLAGS=${LDFLAGS:M*:Q} -INSTALLATION_DIRS= bin man/man1 share/doc/xdesktopwaves +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/xdesktopwaves .include "../../mk/x11.buildlink3.mk" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xdesktopwaves ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/xdesktopwaves.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/xdesktopwaves.1 ${PREFIX}/${PKGMANDIR}/man1/ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xdesktopwaves/ ${INSTALL_DATA} ${WRKSRC}/xdesktopwaves.xpm ${PREFIX}/share/pixmaps/ diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile index c770282e188..8f9b54606d9 100644 --- a/x11/xfstt/Makefile +++ b/x11/xfstt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/05/10 23:31:30 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2007/01/07 09:14:16 rillig Exp $ # DISTNAME= xfstt-1.6 @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --disable-nls CXXFLAGS+= -fomit-frame-pointer -ffast-math RCD_SCRIPTS= xfstt -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../mk/x11.buildlink3.mk" @@ -32,7 +32,7 @@ SUBST_STAGE.paths= post-patch do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/xfstt ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/xfstt.1x ${PREFIX}/man/man1/xfstt.1 + ${INSTALL_MAN} ${WRKSRC}/doc/xfstt.1x ${PREFIX}/${PKGMANDIR}/man1/xfstt.1 ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/TTF ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfstt ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xfstt diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile index 81cc960750c..99d73bf8046 100644 --- a/x11/xscreensaver-demo/Makefile +++ b/x11/xscreensaver-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/07/18 18:40:36 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2007/01/07 09:14:16 rillig Exp $ # PKGNAME= ${DISTNAME:S/-/-demo-/} @@ -23,7 +23,7 @@ INSTALL_TARGET= install-gnome post-install: ${INSTALL_PROGRAM} ${WRKSRC}/driver/xscreensaver-demo ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/driver/xscreensaver-demo.man \ - ${PREFIX}/man/man1/xscreensaver-demo.1 + ${PREFIX}/${PKGMANDIR}/man1/xscreensaver-demo.1 .include "../../devel/libglade2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" |