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 /converters | |
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 'converters')
-rw-r--r-- | converters/2vcard/Makefile | 6 | ||||
-rw-r--r-- | converters/ack/Makefile | 6 | ||||
-rw-r--r-- | converters/bbcim/Makefile | 6 | ||||
-rw-r--r-- | converters/bibtex2html/Makefile | 10 | ||||
-rw-r--r-- | converters/code2html/Makefile | 6 | ||||
-rw-r--r-- | converters/dvi2tty/Makefile | 6 | ||||
-rw-r--r-- | converters/fondu/Makefile | 16 | ||||
-rw-r--r-- | converters/hztty/Makefile | 6 | ||||
-rw-r--r-- | converters/ja-dvi2tty/Makefile | 6 | ||||
-rw-r--r-- | converters/kcc/Makefile | 4 | ||||
-rw-r--r-- | converters/nkf/Makefile | 6 | ||||
-rw-r--r-- | converters/txt2pdbdoc/Makefile | 4 | ||||
-rw-r--r-- | converters/unix2dos/Makefile | 8 | ||||
-rw-r--r-- | converters/uulib/Makefile | 6 | ||||
-rw-r--r-- | converters/xdeview/Makefile | 4 |
15 files changed, 50 insertions, 50 deletions
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" |