Fix build with GCC 4. DESTDIR support.

4 files changed, 41 insertions, 7 deletions

diff --git a/net/cmu-dhcpd/Makefile b/net/cmu-dhcpd/Makefile
index b7beff19969..5c9ad354ebb 100644
--- a/net/cmu-dhcpd/Makefile
+++ b/net/cmu-dhcpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:02 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2008/10/01 12:16:45 joerg Exp $
 #
 
 DISTNAME=	CMU-dhcp-3.3.7+PU-9
@@ -7,6 +7,8 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.net.princeton.edu/software/dhcpd/
 EXTRACT_SUFX=	.tar.Z
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.net.princeton.edu/software/dhcpd/
 COMMENT=	CMU BootP and DHCP server, plus Princeton patches
@@ -18,11 +20,12 @@ GNU_CONFIGURE=	YES
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
 
+REQD_DIRS+=	/var/db/bindings
+
 do-install:
-	${INSTALL_DATA_DIR} /var/db/bindings
-	${INSTALL_PROGRAM} ${WRKSRC}/dhcpd ${PREFIX}/sbin/cmu-dhcpd
-	${INSTALL_MAN} ${WRKSRC}/man/bootptab.5 ${PREFIX}/${PKGMANDIR}/man5/bootptab.5
-	${INSTALL_MAN} ${WRKSRC}/man/dhcpd.8 ${PREFIX}/${PKGMANDIR}/man8/dhcpd.8
-	${INSTALL_MAN} ${WRKSRC}/man/dhcpd.conf.5 ${PREFIX}/${PKGMANDIR}/man5/dhcpd.conf.5
+	${INSTALL_PROGRAM} ${WRKSRC}/dhcpd ${DESTDIR}${PREFIX}/sbin/cmu-dhcpd
+	${INSTALL_MAN} ${WRKSRC}/man/bootptab.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/bootptab.5
+	${INSTALL_MAN} ${WRKSRC}/man/dhcpd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/dhcpd.8
+	${INSTALL_MAN} ${WRKSRC}/man/dhcpd.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/dhcpd.conf.5
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/cmu-dhcpd/distinfo b/net/cmu-dhcpd/distinfo
index 4ec9597cb8a..42f4c190ae7 100644
--- a/net/cmu-dhcpd/distinfo
+++ b/net/cmu-dhcpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2006/03/14 02:21:46 joerg Exp $
+$NetBSD: distinfo,v 1.5 2008/10/01 12:16:45 joerg Exp $
 
 SHA1 (CMU-dhcp-3.3.7+PU-9.tar.Z) = 9c7eb8f498eddd35d0eb9ceaa90451f06bb5cf27
 RMD160 (CMU-dhcp-3.3.7+PU-9.tar.Z) = b426f5580771ef635a34c336d0422cc31dd934d2
@@ -9,3 +9,5 @@ SHA1 (patch-ac) = 0729cc8ff71b57fba0975b802ed4cbcfaeb78a5b
 SHA1 (patch-ad) = 25771145085881630fbc807ad2537e254f144161
 SHA1 (patch-ae) = 648f6fe130c060c926ba6d43508701bbf7c0cfbd
 SHA1 (patch-af) = 2d355ecde64da2ea5d9f1afdb608884691ccd0f0
+SHA1 (patch-ag) = 1aa3fe933938f26aca96a4973b11d1840639cd73
+SHA1 (patch-ah) = 35ff79c48bf11c161a4f1d3e8c2b72228f5b423f
diff --git a/net/cmu-dhcpd/patches/patch-ag b/net/cmu-dhcpd/patches/patch-ag
new file mode 100644
index 00000000000..ed80f509dc4
--- /dev/null
+++ b/net/cmu-dhcpd/patches/patch-ag
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.1 2008/10/01 12:16:45 joerg Exp $
+
+--- getif.h.orig	2008-10-01 12:25:14.000000000 +0200
++++ getif.h
+@@ -1,5 +1,7 @@
+ /* getif.h */
+ 
++#ifndef getif_h
++#define getif_h
+ /* ANSI function prototypes or empty arg list? */
+ #ifdef  __STDC__
+ #define P(args) args
+@@ -22,3 +24,4 @@ struct interface_addrs {
+ };
+ 
+ #undef P
++#endif
diff --git a/net/cmu-dhcpd/patches/patch-ah b/net/cmu-dhcpd/patches/patch-ah
new file mode 100644
index 00000000000..c4441c60219
--- /dev/null
+++ b/net/cmu-dhcpd/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2008/10/01 12:16:45 joerg Exp $
+
+--- bootpd.h.orig	2008-10-01 12:24:45.000000000 +0200
++++ bootpd.h
+@@ -27,6 +27,7 @@ SOFTWARE.
+ 
+ #ifndef BOOTPD_H_
+ #define BOOTPD_H_
++#include "getif.h"
+ #include "hash.h"
+ #include "hashf.h"
+ #include "hwaddr.h"