Upgrade to December 2, 1997 snapshot and change all CFLAGS = 's to

CFLAGS += 's.

6 files changed, 48 insertions, 4 deletions

diff --git a/net/isc-dhcp2/Makefile b/net/isc-dhcp2/Makefile
index 25c6c016c299..97360879dfdf 100644
--- a/net/isc-dhcp2/Makefile
+++ b/net/isc-dhcp2/Makefile
@@ -1,12 +1,12 @@
 # Ports collection makefile for:    dhcp
-# Version required:     97-11-22
+# Version required:     97-12-02
 # Date created:         7 Mar 1996
 # Whom:                 se
 #
-# $Id: Makefile,v 1.13 1997/11/14 14:19:02 obrien Exp $
+# $Id: Makefile,v 1.14 1997/12/01 23:48:35 jseger Exp $
 #
 
-DISTNAME=       dhcp-971122
+DISTNAME=       dhcp-971202
 PKGNAME=	isc-${DISTNAME}
 CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.isc.org/isc/dhcp/
diff --git a/net/isc-dhcp2/distinfo b/net/isc-dhcp2/distinfo
index 87f9c5ad19a4..a80fb9d5fd6f 100644
--- a/net/isc-dhcp2/distinfo
+++ b/net/isc-dhcp2/distinfo
@@ -1 +1 @@
-MD5 (dhcp-971122.tar.gz) = 38f9b1b576caa5ffc7696a99c3ca5138
+MD5 (dhcp-971202.tar.gz) = 4336f9a83e63e24357bb3bcfd53b433d
diff --git a/net/isc-dhcp2/files/patch-ad b/net/isc-dhcp2/files/patch-ad
new file mode 100644
index 000000000000..f00dfad3936f
--- /dev/null
+++ b/net/isc-dhcp2/files/patch-ad
@@ -0,0 +1,11 @@
+--- common/Makefile.dist.orig	Tue Dec  2 06:40:05 1997
++++ common/Makefile.dist	Tue Dec  2 06:40:13 1997
+@@ -42,7 +42,7 @@
+ 
+ DEBUG  = -g
+ INCLUDES = -I.. -I../includes
+-CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
++CFLAGS += $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
+ 
+ all:	libdhcp.a $(CATMANPAGES)
+ 
diff --git a/net/isc-dhcp2/files/patch-ae b/net/isc-dhcp2/files/patch-ae
new file mode 100644
index 000000000000..e253ac86ff2a
--- /dev/null
+++ b/net/isc-dhcp2/files/patch-ae
@@ -0,0 +1,11 @@
+--- relay/Makefile.dist.orig	Tue Dec  2 06:40:54 1997
++++ relay/Makefile.dist	Tue Dec  2 06:41:05 1997
+@@ -39,7 +39,7 @@
+ DEBUG  = -g
+ INCLUDES = -I.. -I../includes
+ DHCPLIB = ../common/libdhcp.a
+-CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
++CFLAGS += $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
+ 
+ all:	$(PROG) $(CATMANPAGES)
+ 
diff --git a/net/isc-dhcp2/files/patch-af b/net/isc-dhcp2/files/patch-af
new file mode 100644
index 000000000000..41230398c7b0
--- /dev/null
+++ b/net/isc-dhcp2/files/patch-af
@@ -0,0 +1,11 @@
+--- server/Makefile.dist.orig	Tue Dec  2 06:41:29 1997
++++ server/Makefile.dist	Tue Dec  2 06:41:37 1997
+@@ -39,7 +39,7 @@
+ DEBUG  = -g
+ INCLUDES = -I.. -I../includes
+ DHCPLIB = ../common/libdhcp.a
+-CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
++CFLAGS += $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
+ 
+ all:	$(PROG) $(CATMANPAGES)
+ 
diff --git a/net/isc-dhcp2/files/patch-ai b/net/isc-dhcp2/files/patch-ai
new file mode 100644
index 000000000000..7927cbffb9ff
--- /dev/null
+++ b/net/isc-dhcp2/files/patch-ai
@@ -0,0 +1,11 @@
+--- client/Makefile.dist.orig	Wed Dec  3 19:33:35 1997
++++ client/Makefile.dist	Wed Dec  3 19:33:44 1997
+@@ -40,7 +40,7 @@
+ DEBUG  = -g
+ INCLUDES = -I.. -I../includes
+ DHCPLIB = ../common/libdhcp.a
+-CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
++CFLAGS += $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
+ 
+ all:	$(PROG) $(CATMANPAGES)
+