From 0aa89b920c7871138f3dc95ac07235c006790c3f Mon Sep 17 00:00:00 2001 From: schmonz Date: Mon, 15 Mar 2010 17:28:10 +0000 Subject: DESTDIR support. --- net/djbdns/Makefile | 8 +++++--- net/djbdns/distinfo | 3 ++- net/djbdns/patches/patch-ad | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 net/djbdns/patches/patch-ad (limited to 'net/djbdns') diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile index 168f637eccc..c040aa42cb4 100644 --- a/net/djbdns/Makefile +++ b/net/djbdns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2009/10/18 19:34:54 zafer Exp $ +# $NetBSD: Makefile,v 1.60 2010/03/15 17:31:57 schmonz Exp $ DISTNAME= djbdns-1.05 PKGREVISION= 9 @@ -14,6 +14,7 @@ LICENSE= public-domain MANPAGES= ${DISTNAME}-man-20031023.tar.gz SITES.${MANPAGES}= http://smarden.org/pape/djb/manpages/ +PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews # We change conf-home from the default "/usr/local" and don't @@ -31,8 +32,9 @@ PLIST_SRC= ${PKGDIR}/PLIST INSTALLATION_DIRS= bin man ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 share/examples/djbdns post-install: - cd ${WRKDIR}/*-man; for i in 1 5 8; do \ - for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/${PKGMANDIR}/man$$i; done \ + cd ${WRKDIR}/${PKGBASE}-man; for i in 1 5 8; do \ + for j in *.$$i; do ${INSTALL_MAN} $$j \ + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; done \ done .include "../../mk/djbware.mk" diff --git a/net/djbdns/distinfo b/net/djbdns/distinfo index eadd2a84cc9..cea24681c0e 100644 --- a/net/djbdns/distinfo +++ b/net/djbdns/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2009/04/22 04:48:13 schmonz Exp $ +$NetBSD: distinfo,v 1.18 2010/03/15 17:31:57 schmonz Exp $ SHA1 (djbdns-1.05.tar.gz) = 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d RMD160 (djbdns-1.05.tar.gz) = a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed @@ -24,3 +24,4 @@ Size (0002-dnscache-cache-soa-records.patch) = 2944 bytes SHA1 (patch-aa) = 8953486b88d57d003956c6fe2addea9bcd16e5aa SHA1 (patch-ab) = e14b7cba40d1dc7279c3ab04ede597277e2576d1 SHA1 (patch-ac) = 1d5ab2c90a2c4221bc7ec08d116d3d23799bd5d6 +SHA1 (patch-ad) = 4f3543ff6c2778001c81197c797303929501f66c diff --git a/net/djbdns/patches/patch-ad b/net/djbdns/patches/patch-ad new file mode 100644 index 00000000000..b26c8a1b314 --- /dev/null +++ b/net/djbdns/patches/patch-ad @@ -0,0 +1,40 @@ +$NetBSD: patch-ad,v 1.3 2010/03/15 17:31:57 schmonz Exp $ + +--- Makefile.orig 2001-02-11 21:11:45.000000000 +0000 ++++ Makefile +@@ -29,6 +29,14 @@ auto-str.o: \ + compile auto-str.c buffer.h exit.h + ./compile auto-str.c + ++auto_destdir.c: \ ++auto-str conf-destdir ++ ./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c ++ ++auto_destdir.o: \ ++compile auto_destdir.c ++ ./compile auto_destdir.c ++ + auto_home.c: \ + auto-str conf-home + ./auto-str auto_home `head -1 conf-home` > auto_home.c +@@ -519,16 +527,16 @@ compile hier.c auto_home.h + ./compile hier.c + + install: \ +-load install.o hier.o auto_home.o buffer.a unix.a byte.a +- ./load install hier.o auto_home.o buffer.a unix.a byte.a ++load install.o hier.o auto_destdir.o buffer.a unix.a byte.a ++ ./load install hier.o auto_destdir.o buffer.a unix.a byte.a + + install.o: \ + compile install.c buffer.h strerr.h error.h open.h exit.h + ./compile install.c + + instcheck: \ +-load instcheck.o hier.o auto_home.o buffer.a unix.a byte.a +- ./load instcheck hier.o auto_home.o buffer.a unix.a byte.a ++load instcheck.o hier.o auto_destdir.o buffer.a unix.a byte.a ++ ./load instcheck hier.o auto_destdir.o buffer.a unix.a byte.a + + instcheck.o: \ + compile instcheck.c strerr.h error.h exit.h -- cgit v1.2.3