summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2007-01-07 09:13:46 +0000
committerrillig <rillig@pkgsrc.org>2007-01-07 09:13:46 +0000
commit2829e658f2ba62cb77f3f151f468ec8de1549bd5 (patch)
tree77b9cef42b625156081609e43af1544d569620be /pkgtools
parent5997a7db2d5af7de47f411825619ffc3689f1ce2 (diff)
downloadpkgsrc-2829e658f2ba62cb77f3f151f468ec8de1549bd5.tar.gz
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.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/autoswc/Makefile6
-rw-r--r--pkgtools/binpatch/Makefile6
-rw-r--r--pkgtools/cdpack/Makefile6
-rw-r--r--pkgtools/dfdisk/Makefile6
-rw-r--r--pkgtools/genrpm/Makefile8
-rw-r--r--pkgtools/pkg_comp/Makefile6
-rw-r--r--pkgtools/pkg_rolling-replace/Makefile4
-rw-r--r--pkgtools/pkgclean/Makefile6
-rw-r--r--pkgtools/pkgdepgraph/Makefile8
-rw-r--r--pkgtools/pkgfind/Makefile6
-rw-r--r--pkgtools/port2pkg/Makefile8
11 files changed, 35 insertions, 35 deletions
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"