Permalink
Browse files

Mechanically replaced man/* with ${PKGMANDIR}/* in the definition of

INSTALLATION_DIRS, as well as all occurrences of ${PREFIX}/man with
${PREFIX}/${PKGMANDIR}.

Fixes PR 35265, although I did not use the patch provided therein.
  • Loading branch information...
1 parent 2f83645 commit 457ae4a7e20c5fc922b07edbe88044948a187ef9 rillig committed Jan 7, 2007
Showing 417 changed files with 1,248 additions and 1,248 deletions.
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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=""
@@ -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}
View
@@ -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"
View
@@ -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 ; \
View
@@ -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"
View
@@ -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"
View
@@ -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"
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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
@@ -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
View
@@ -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,15 +16,15 @@ 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
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
@@ -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
@@ -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
@@ -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"
@@ -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
Oops, something went wrong.

0 comments on commit 457ae4a

Please sign in to comment.