diff options
| author | joerg <joerg@pkgsrc.org> | 2009-10-19 18:30:31 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-10-19 18:30:31 +0000 |
| commit | 6c87fa5b96b29f3df734840bdd1de1b95fddd63d (patch) | |
| tree | f8dcae2aabbacd8d0a4a4caf32e07ebcad662e73 | |
| parent | 2aa19a3b9f64c94ae4eecb08aed37cfef6295118 (diff) | |
| download | pkgsrc-6c87fa5b96b29f3df734840bdd1de1b95fddd63d.tar.gz | |
PKG_DESTDIR_SUPPORT=no is not a supported value. Provide actually
working DESTDIR support.
| -rw-r--r-- | devel/generate/Makefile | 6 | ||||
| -rw-r--r-- | devel/generate/distinfo | 4 | ||||
| -rw-r--r-- | devel/generate/patches/patch-aa | 17 |
3 files changed, 21 insertions, 6 deletions
diff --git a/devel/generate/Makefile b/devel/generate/Makefile index 54fcfb5c9e1..42e36dd7a61 100644 --- a/devel/generate/Makefile +++ b/devel/generate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2009/10/08 12:59:48 darcy Exp $ +# $NetBSD: Makefile,v 1.19 2009/10/19 18:30:31 joerg Exp $ # DISTNAME= generate-2.6 @@ -11,7 +11,9 @@ OWNER= darcy@NetBSD.org HOMEPAGE= http://www.druid.net/darcy/readme-generate.html COMMENT= Simple text pre-processor -PKG_DESTDIR_SUPPORT= no +PKG_DESTDIR_SUPPORT= user-destdir + +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 MAKE_ENV+= ${BSD_MAKE_ENV} LIBS=${LIBS:Q} USE_TOOLS+= gmake diff --git a/devel/generate/distinfo b/devel/generate/distinfo index e502f1b4607..d3a4a4219e6 100644 --- a/devel/generate/distinfo +++ b/devel/generate/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.15 2008/12/19 12:12:53 darcy Exp $ +$NetBSD: distinfo,v 1.16 2009/10/19 18:30:31 joerg Exp $ SHA1 (generate-2.6.tgz) = ab97858005c03531d8d8cc57328ffcf4b8e42aec RMD160 (generate-2.6.tgz) = e996dd4dbf553ed3467d01907686d2cc09936db2 Size (generate-2.6.tgz) = 29045 bytes -SHA1 (patch-aa) = eeee7e0c0ed02728ccebc295869a82139da183a4 +SHA1 (patch-aa) = 8dc109772d4685f6a33f4fddf79fc6c5da273e92 diff --git a/devel/generate/patches/patch-aa b/devel/generate/patches/patch-aa index 33d61a3ad34..1ffad076ea9 100644 --- a/devel/generate/patches/patch-aa +++ b/devel/generate/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.9 2008/12/19 12:12:53 darcy Exp $ +$NetBSD: patch-aa,v 1.10 2009/10/19 18:30:32 joerg Exp $ ---- Makefile.orig 2008-11-17 16:12:39.000000000 -0500 +--- Makefile.orig 2008-11-17 22:12:39.000000000 +0100 +++ Makefile @@ -9,7 +9,7 @@ VERSION_MAJOR = 2 VERSION_MINOR = 6 @@ -11,3 +11,16 @@ $NetBSD: patch-aa,v 1.9 2008/12/19 12:12:53 darcy Exp $ -Wwrite-strings -Wstrict-prototypes \ -Wformat -Wmissing-prototypes -funsigned-char \ -I/usr/local/include -L/usr/local/lib \ +@@ -48,10 +48,8 @@ clean: + rm -rf build + + install: all +- chmod 644 generate.1 +- cp generate.1 /${MANDIR}/man1 +- chmod 755 ${BINS} +- cp ${BINS} ${BINDIR} ++ ${BSD_INSTALL_MAN} generate.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ++ ${BSD_INSTALL_PROGRAM} ${BINS} ${DESTDIR}${PREFIX}/bin + + python: + gmake clean |