diff options
author | salo <salo> | 2003-01-19 06:52:54 +0000 |
---|---|---|
committer | salo <salo> | 2003-01-19 06:52:54 +0000 |
commit | 7b8f8e7b639ae2888b9dcdb17a94d2b8394a0c16 (patch) | |
tree | c113467448f8852bf0356e69123b6b45b97afa46 /graphics | |
parent | 22ae5aa7aa540b3bbec3b1714b2913af0f18d75d (diff) | |
download | pkgsrc-7b8f8e7b639ae2888b9dcdb17a94d2b8394a0c16.tar.gz |
s/INSTALL_*/BSD_INSTALL_*/ in patches, remove unnecessary MAKE_ENV.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/cdlabelgen/Makefile | 5 | ||||
-rw-r--r-- | graphics/cdlabelgen/distinfo | 4 | ||||
-rw-r--r-- | graphics/cdlabelgen/patches/patch-ab | 12 | ||||
-rw-r--r-- | graphics/hermes/Makefile | 3 | ||||
-rw-r--r-- | graphics/hermes/distinfo | 4 | ||||
-rw-r--r-- | graphics/hermes/patches/patch-ac | 4 |
6 files changed, 14 insertions, 18 deletions
diff --git a/graphics/cdlabelgen/Makefile b/graphics/cdlabelgen/Makefile index 39eaabfd0ce..50527fb879b 100644 --- a/graphics/cdlabelgen/Makefile +++ b/graphics/cdlabelgen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/06/04 06:50:44 tron Exp $ +# $NetBSD: Makefile,v 1.7 2003/01/19 06:59:51 salo Exp $ DISTNAME= cdlabelgen-1.5.0 CATEGORIES= graphics @@ -10,8 +10,5 @@ COMMENT= generate frontcards and traycards for CDs USE_PERL5= YES MAKE_ENV+= SED="${SED}" MV="${MV}" -MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" -MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" -MAKE_ENV+= INSTALL_MAN="${INSTALL_MAN}" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/cdlabelgen/distinfo b/graphics/cdlabelgen/distinfo index fe7557210e0..a9534834d9d 100644 --- a/graphics/cdlabelgen/distinfo +++ b/graphics/cdlabelgen/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2002/06/04 06:50:44 tron Exp $ +$NetBSD: distinfo,v 1.6 2003/01/19 06:59:51 salo Exp $ SHA1 (cdlabelgen-1.5.0.tar.gz) = 5fba7a67b3f4c86cd879fa9dc231501c77ac8374 Size (cdlabelgen-1.5.0.tar.gz) = 88979 bytes SHA1 (patch-aa) = f33817230b73212c31735f21596aa99a0f138400 -SHA1 (patch-ab) = c7246d7b685450f38f985165431a531a7599c91d +SHA1 (patch-ab) = caf7182b6fe9ad9790ebb1e90391bcc03062cf95 diff --git a/graphics/cdlabelgen/patches/patch-ab b/graphics/cdlabelgen/patches/patch-ab index 8ae1b267a38..f17a32242dc 100644 --- a/graphics/cdlabelgen/patches/patch-ab +++ b/graphics/cdlabelgen/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2000/09/01 20:42:56 jlam Exp $ +$NetBSD: patch-ab,v 1.4 2003/01/19 06:59:52 salo Exp $ --- Makefile.orig Sun Jul 4 18:44:37 1999 +++ Makefile Fri Sep 1 16:34:47 2000 @@ -38,14 +38,14 @@ $NetBSD: patch-ab,v 1.3 2000/09/01 20:42:56 jlam Exp $ - $(INSTALL) cdlabelgen $(BASE_DIR)/bin - $(INSTALL_DIR) $(BASE_DIR)/share/cdlabelgen - $(INSTALL_FILE) $(TEMPLATE) $(BASE_DIR)/share/cdlabelgen -+ ${INSTALL_SCRIPT} cdlabelgen ${BASE_DIR}/bin/cdlabelgen -+ mkdir ${BASE_DIR}/share/cdlabelgen -+ ${INSTALL_DATA} $(TEMPLATE) ${BASE_DIR}/share/cdlabelgen/ -+ ${INSTALL_MAN} cdlabelgen.0 ${BASE_DIR}/man/cat1/ ++ ${BSD_INSTALL_SCRIPT} cdlabelgen ${BASE_DIR}/bin/cdlabelgen ++ ${BSD_INSTALL_DATA_DIR} ${BASE_DIR}/share/cdlabelgen ++ ${BSD_INSTALL_DATA} $(TEMPLATE) ${BASE_DIR}/share/cdlabelgen/ ++ ${BSD_INSTALL_MAN} cdlabelgen.0 ${BASE_DIR}/man/cat1/ set -e; \ for file in $(POSTSCRIPT); do \ - $(INSTALL_FILE) postscript/$$file $(BASE_DIR)/share/cdlabelgen/; \ -+ ${INSTALL_DATA} postscript/$$file ${BASE_DIR}/share/cdlabelgen/; \ ++ ${BSD_INSTALL_DATA} postscript/$$file ${BASE_DIR}/share/cdlabelgen/; \ done dist: diff --git a/graphics/hermes/Makefile b/graphics/hermes/Makefile index 5b3fdddd543..051aa678de2 100644 --- a/graphics/hermes/Makefile +++ b/graphics/hermes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/08/25 18:39:09 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2003/01/19 06:59:52 salo Exp $ DISTNAME= Hermes-1.3.2 PKGREVISION= 1 @@ -16,6 +16,5 @@ USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= yes USE_GMAKE= yes -MAKE_ENV= INSTALL_PROGRAM_DIR="${INSTALL_PROGRAM_DIR}" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/hermes/distinfo b/graphics/hermes/distinfo index db1d92848ee..b77ed3162cd 100644 --- a/graphics/hermes/distinfo +++ b/graphics/hermes/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2002/08/25 18:39:10 jlam Exp $ +$NetBSD: distinfo,v 1.5 2003/01/19 06:59:53 salo Exp $ SHA1 (Hermes-1.3.2.tar.gz) = d1a0edd8814ac3e9e699fd33843e60879d285083 Size (Hermes-1.3.2.tar.gz) = 258439 bytes SHA1 (patch-aa) = 459804a7fe816c4b2d37bc0461d923352f99c129 -SHA1 (patch-ac) = 680c52e97a7645a38245c7351fc79119828f97a9 +SHA1 (patch-ac) = 986475db735c3e01b7c7f0edb0c3bf5d6708b704 SHA1 (patch-ad) = 480f7ef8dd9ec2ebb7b273328be163ae152d8226 SHA1 (patch-ae) = b45652212ece5a7c70f86717ed81ba9993e03e9a diff --git a/graphics/hermes/patches/patch-ac b/graphics/hermes/patches/patch-ac index e68158e8209..035f0efe310 100644 --- a/graphics/hermes/patches/patch-ac +++ b/graphics/hermes/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 1999/11/30 08:22:16 rh Exp $ +$NetBSD: patch-ac,v 1.3 2003/01/19 06:59:53 salo Exp $ --- src/Makefile.in.orig Mon Nov 29 16:22:58 1999 +++ src/Makefile.in Mon Nov 29 16:22:58 1999 @@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.2 1999/11/30 08:22:16 rh Exp $ install-data-local: - $(INSTALL) -m 0755 -d $(includedir)/Hermes -+ $(INSTALL_PROGRAM_DIR) -m 0755 $(includedir)/Hermes ++ $(BSD_INSTALL_PROGRAM_DIR) -m 0755 $(includedir)/Hermes for incfile in $(publicheaders); do \ $(INSTALL) -m 0644 $$incfile $(includedir)/Hermes; \ done |