[91703] trunk/dports/net/dhcp

[cal at macports.org]

Revision: 91703
          https://trac.macports.org/changeset/91703
Author:   cal at macports.org
Date:     2012-04-08 05:14:36 -0700 (Sun, 08 Apr 2012)
Log Message:
-----------
dhcp: Update to 4.1-ESV-R4

Revision Links:
--------------
    https://trac.macports.org/changeset/4

Modified Paths:
--------------
    trunk/dports/net/dhcp/Portfile

Added Paths:
-----------
    trunk/dports/net/dhcp/files/RFC3542.include.patch

Removed Paths:
-------------
    trunk/dports/net/dhcp/files/site.conf

Modified: trunk/dports/net/dhcp/Portfile
===================================================================
--- trunk/dports/net/dhcp/Portfile	2012-04-08 11:26:08 UTC (rev 91702)
+++ trunk/dports/net/dhcp/Portfile	2012-04-08 12:14:36 UTC (rev 91703)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name			dhcp
-version			3.1.2
+version			4.1-ESV-R4
 categories		net
 description		ISC dhcpd server
 long_description	ISC's Dynamic Host Configuration Protocol Distribution \
@@ -25,21 +25,19 @@
 homepage		http://www.isc.org/products/DHCP/
 platforms		darwin
 maintainers		nomaintainer
-master_sites		http://ftp.isc.org/isc/dhcp/ \
-			http://ftp.isc.org/isc/dhcp/dhcp-3.1-history/
-checksums		md5 85901a9554650030df7d1ef3e5959fdf
+master_sites		http://ftp.isc.org/isc/dhcp/${version}/
 
-post-patch {
-	file copy -force ${filespath}/site.conf ${worksrcpath}
-	reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/site.conf
-	reinplace "s|CC = gcc|CC = ${configure.cc}|g" ${worksrcpath}/site.conf
-}
+checksums           md5     99e6f31170c96af3bcd614aa7517bf05 \
+                    sha1    2c05a978f5bcc47d9e2a9125ce51903144ebb940 \
+                    rmd160  792eab5695ae0803dfaa57d74072dd990e361c31
 
-configure.pre_args
+patchfiles	RFC3542.include.patch
 
+depends_lib	port:openssl
+
 startupitem.create	yes
 startupitem.name	dhcpd
-startupitem.executable	${prefix}/sbin/dhcpd -f
+startupitem.executable	${prefix}/sbin/dhcpd -f -cf ${prefix}/etc/dhcp/dhcpd.conf -lf ${prefix}/var/db/dhcpd/dhcpd.leases
 startupitem.netchange	yes
 
 destroot.keepdirs	${destroot}${prefix}/var/db/dhcpd
@@ -49,17 +47,11 @@
 	xinstall -m 644 ${worksrcpath}/server/dhcpd.conf ${etc}/dhcpd.conf.sample
 	xinstall -m 644 ${worksrcpath}/client/dhclient.conf \
 		${etc}/dhclient.conf.sample
+	file delete ${destroot}${prefix}/etc/dhcpd.conf
+	file delete ${destroot}${prefix}/etc/dhclient.conf
 }
 
-post-activate {
-                ui_msg "\n
+notes "The dhcpd .conf and .leases files must be named and located as shown for dhcpd to find them:\n\
+    ${prefix}/etc/dhcp/dhcpd.conf (there is a sample file)\n\
+    ${prefix}/var/db/dhcpd/dhcpd.leases (use the touch command to create a blank one)\n"
 
-NOTE:
-
--The dhcpd .conf and .leases files must be named and located as shown for dhcpd to find them:
-	${prefix}/etc/dhcp/dhcpd.conf (there is a sample file)
-	${prefix}/var/db/dhcpd/dhcpd.leases (use the touch command to create a blank one)
-
-\n"
-}
-

Added: trunk/dports/net/dhcp/files/RFC3542.include.patch
===================================================================
--- trunk/dports/net/dhcp/files/RFC3542.include.patch	                        (rev 0)
+++ trunk/dports/net/dhcp/files/RFC3542.include.patch	2012-04-08 12:14:36 UTC (rev 91703)
@@ -0,0 +1,10 @@
+--- common/socket.c.orig	2012-01-03 15:26:10.000000000 +0100
++++ common/socket.c	2012-01-03 15:26:34.000000000 +0100
+@@ -40,6 +40,7 @@
+  * I have implemented it under Linux; other systems should be doable also.
+  */
+ 
++#define __APPLE_USE_RFC_3542
+ #include "dhcpd.h"
+ #include <errno.h>
+ #include <sys/ioctl.h>

Deleted: trunk/dports/net/dhcp/files/site.conf
===================================================================
--- trunk/dports/net/dhcp/files/site.conf	2012-04-08 11:26:08 UTC (rev 91702)
+++ trunk/dports/net/dhcp/files/site.conf	2012-04-08 12:14:36 UTC (rev 91703)
@@ -1,25 +0,0 @@
-# Put local site configuration stuff here to override the default
-# # settings in Makefile.conf
-#
-
-USERBINDIR = __PREFIX__/bin
-BINDIR = __PREFIX__/sbin
-CLIENTBINDIR = __PREFIX__/sbin
-ADMMANDIR = __PREFIX__/share/man/cat8
-ADMMANEXT = .8
-FFMANDIR = __PREFIX__/share/man/cat5
-FFMANEXT = .5
-LIBMANDIR = __PREFIX__/share/man/cat3
-LIBMANEXT = .3
-USRMANDIR = __PREFIX__/share/man/cat1
-USRMANEXT = .1
-ETC = __PREFIX__/etc/dhcp
-VARRUN = __PREFIX__/var/run
-VARDB = __PREFIX__/var/db/dhcpd
-LIBDIR = __PREFIX__/lib
-INCDIR = __PREFIX__/include
-CC = gcc
-
-COPTS = -D_PATH_DHCPD_DB="\"$(VARDB)/dhcpd.leases\"" \
-        -D_PATH_DHCPD_CONF="\"$(ETC)/dhcpd.conf\"" \
-        -D_PATH_DHCPD_PID="\"$(VARRUN)/dhcpd.pid\""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120408/93c7b79f/attachment.html>