diff options
author | rillig <rillig> | 2007-01-07 09:13:46 +0000 |
---|---|---|
committer | rillig <rillig> | 2007-01-07 09:13:46 +0000 |
commit | 87e1bea888d90a6044a18e46681bc456ea30305c (patch) | |
tree | 77b9cef42b625156081609e43af1544d569620be /graphics | |
parent | 0e3f31f90a7d6a3a3dc9c7045ed1c6c9c8dac0ac (diff) | |
download | pkgsrc-87e1bea888d90a6044a18e46681bc456ea30305c.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 'graphics')
-rw-r--r-- | graphics/cqcam/Makefile | 10 | ||||
-rw-r--r-- | graphics/dcraw/Makefile | 6 | ||||
-rw-r--r-- | graphics/gif320/Makefile | 6 | ||||
-rw-r--r-- | graphics/giftrans/Makefile | 6 | ||||
-rw-r--r-- | graphics/gtksee/Makefile | 4 | ||||
-rw-r--r-- | graphics/jhead/Makefile | 6 | ||||
-rw-r--r-- | graphics/jpeg2ps/Makefile | 6 | ||||
-rw-r--r-- | graphics/mpgtx/Makefile | 10 | ||||
-rw-r--r-- | graphics/pgraf/Makefile | 10 | ||||
-rw-r--r-- | graphics/prag/Makefile | 6 | ||||
-rw-r--r-- | graphics/qiv/Makefile | 4 | ||||
-rw-r--r-- | graphics/xdvipresent/Makefile | 4 |
12 files changed, 39 insertions, 39 deletions
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} |