Permalink
Browse files

Add DESTDIR support

  • Loading branch information...
1 parent a1c7858 commit 12d8966f0e975fd0707a5206ae64ffee1b17333f agc committed Aug 20, 2007
Showing with 25 additions and 15 deletions.
  1. +2 −1 lang/mawk/Makefile
  2. +2 −2 lang/mawk/distinfo
  3. +8 −6 lang/mawk/patches/patch-aa
  4. +7 −3 misc/autocue/Makefile
  5. +6 −3 pkgtools/pkgsurvey/Makefile
View
3 lang/mawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/02/22 19:26:38 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/08/20 21:42:26 agc Exp $
#
DISTNAME= mawk-1.3.3
@@ -14,6 +14,7 @@ INSTALLATION_DIRS= ${PKGMANDIR}/man1
GNU_CONFIGURE= yes
CONFIGURE_HAS_MANDIR= no
TEST_TARGET= mawk_test fpe_test
+PKG_DESTDIR_SUPPORT= user-destdir
.include "../../mk/bsd.prefs.mk"
View
4 lang/mawk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2005/12/27 21:20:49 reed Exp $
+$NetBSD: distinfo,v 1.11 2007/08/20 21:42:26 agc Exp $
SHA1 (mawk-1.3.3.tar.gz) = 314bcdb6543733f47ef4d9d9356b23f53d6a7f89
RMD160 (mawk-1.3.3.tar.gz) = f1c939aa032ec7f5e8157a9440d3520f2ecc8501
Size (mawk-1.3.3.tar.gz) = 209942 bytes
-SHA1 (patch-aa) = 1ea234849f068e6cbb216b680508c983e49bdd33
+SHA1 (patch-aa) = f8a341ca2dddad31e3ccb63a29561b5a87792c08
SHA1 (patch-ab) = b8faa90c98fac027b295336936a8e43c7087d972
SHA1 (patch-ac) = e6671c71b7fdc2c8ccc0866e530c38057a80d48f
SHA1 (patch-ad) = 1b35b227a1de472d419b034599507933a4b797dc
View
14 lang/mawk/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2005/12/27 21:20:49 reed Exp $
+$NetBSD: patch-aa,v 1.5 2007/08/20 21:42:26 agc Exp $
--- Makefile.in.orig 1996-01-31 21:05:40.000000000 -0800
+++ Makefile.in
-@@ -11,10 +11,11 @@ MATHLIB = @MATHLIB@
+@@ -11,10 +11,11 @@
YACC = @YACC@
@@ -16,24 +16,26 @@ $NetBSD: patch-aa,v 1.4 2005/12/27 21:20:49 reed Exp $
MANEXT = @MANEXT@
#######################################
-@@ -32,6 +33,7 @@ REXP_C=rexp/rexp.c rexp/rexp0.c rexp/rex
+@@ -32,6 +33,7 @@
rexp/rexp3.c
+all: mawk_and_test
mawk_and_test : mawk mawk_test fpe_test
mawk : $(O) rexp/.done
-@@ -74,10 +76,8 @@ scancode.c : makescan.c scan.h
+@@ -74,10 +76,10 @@
MAWKMAN = $(MANDIR)/mawk.$(MANEXT)
install : mawk
- cp mawk $(BINDIR)
- chmod 0755 $(BINDIR)/mawk
- cp man/mawk.1 $(MAWKMAN)
- chmod 0644 $(MAWKMAN)
-+ ${BSD_INSTALL_PROGRAM} mawk $(BINDIR)
-+ ${BSD_INSTALL_MAN} man/mawk.1 $(MAWKMAN)
++ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${BINDIR}
++ ${BSD_INSTALL_PROGRAM} mawk ${DESTDIR}$(BINDIR)
++ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}
++ ${BSD_INSTALL_MAN} man/mawk.1 ${DESTDIR}$(MAWKMAN)
clean :
rm -f *.o rexp/*.o rexp/.done test/mawk core test/core mawk
View
10 misc/autocue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/02/24 12:16:12 agc Exp $
+# $NetBSD: Makefile,v 1.6 2007/08/20 21:42:26 agc Exp $
#
DISTNAME= autocue-20070224
@@ -12,11 +12,15 @@ COMMENT= Time-based text formatter, sending output to xcb for pasting
DEPENDS+= xcb-[0-9]*:../../x11/xcb
+PKG_DESTDIR_SUPPORT= user-destdir
+
do-extract:
@${CP} -R ${FILESDIR} ${WRKSRC}
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/autocue ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/autocue.1 ${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/autocue ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_MAN} ${WRKSRC}/autocue.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.include "../../mk/bsd.pkg.mk"
View
9 pkgtools/pkgsurvey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:02 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/08/20 21:42:26 agc Exp $
#
DISTNAME= pkgsurvey-0.0
@@ -16,10 +16,13 @@ NO_BUILD= yes
INSTALLATION_DIRS= bin
+PKG_DESTDIR_SUPPORT= user-destdir
+
do-install:
+ ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
${SED} -e 's|\$${PKG_INFO}|${PKG_INFO}|' \
-e 's|\$${UNAME}|${UNAME}|g' \
- ${FILESDIR}/pkgsurvey.sh > ${PREFIX}/bin/pkgsurvey
- ${CHMOD} 755 ${PREFIX}/bin/pkgsurvey
+ ${FILESDIR}/pkgsurvey.sh > ${DESTDIR}${PREFIX}/bin/pkgsurvey
+ ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/pkgsurvey
.include "../../mk/bsd.pkg.mk"

0 comments on commit 12d8966

Please sign in to comment.