diff options
author | rillig <rillig@pkgsrc.org> | 2007-01-07 09:13:46 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2007-01-07 09:13:46 +0000 |
commit | 2829e658f2ba62cb77f3f151f468ec8de1549bd5 (patch) | |
tree | 77b9cef42b625156081609e43af1544d569620be /textproc | |
parent | 5997a7db2d5af7de47f411825619ffc3689f1ce2 (diff) | |
download | pkgsrc-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 'textproc')
-rw-r--r-- | textproc/cawf/Makefile | 4 | ||||
-rw-r--r-- | textproc/detex/Makefile | 6 | ||||
-rw-r--r-- | textproc/html2wml/Makefile | 6 | ||||
-rw-r--r-- | textproc/kakasi/Makefile | 6 | ||||
-rw-r--r-- | textproc/par/Makefile | 6 | ||||
-rw-r--r-- | textproc/rtf-tools/Makefile | 6 | ||||
-rw-r--r-- | textproc/rtfm/Makefile | 6 | ||||
-rw-r--r-- | textproc/texi2roff/Makefile | 6 | ||||
-rw-r--r-- | textproc/troffcvt/Makefile | 18 | ||||
-rw-r--r-- | textproc/untex/Makefile | 6 | ||||
-rw-r--r-- | textproc/xmlindent/Makefile | 6 |
11 files changed, 38 insertions, 38 deletions
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" |