[csw-devel] SF.net SVN: gar:[7527] csw/mgar/pkg/dhcp/trunk

[bonivart at users.sourceforge.net]

Revision: 7527
          http://gar.svn.sourceforge.net/gar/?rev=7527&view=rev
Author:   bonivart
Date:     2009-12-01 18:29:07 +0000 (Tue, 01 Dec 2009)

Log Message:
-----------
dhcp: update to 4.1.1 beta 3, update GAR stuff (found a bug?)

Modified Paths:
--------------
    csw/mgar/pkg/dhcp/trunk/Makefile
    csw/mgar/pkg/dhcp/trunk/checksums

Modified: csw/mgar/pkg/dhcp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dhcp/trunk/Makefile	2009-12-01 16:00:20 UTC (rev 7526)
+++ csw/mgar/pkg/dhcp/trunk/Makefile	2009-12-01 18:29:07 UTC (rev 7527)
@@ -1,5 +1,5 @@
 GARNAME = dhcp
-GARVERSION = 4.1.1b2
+GARVERSION = 4.1.1b3
 CATEGORIES = net
 
 DESCRIPTION = ISC DHCP reference implementation
@@ -13,21 +13,24 @@
 MASTER_SITES = http://ftp.isc.org/isc/dhcp/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 
+LICENSE = LICENSE
+
 PACKAGES = CSWdhcp CSWdhcpdevel
-CATALOGNAME_CSWdhcpdevel = dhcp_devel
+
+REQUIRED_PKGS_CSWdhcp = CSWosslrt
 SPKG_DESC_CSWdhcp = ISC DHCP reference implementation
-LICENSE = LICENSE
 
-REQUIRED_PKGS_CSWdhcp = CSWcswclassutils CSWosslrt
 REQUIRED_PKGS_CSWdhcpdevel = CSWdhcp
+CATALOGNAME_CSWdhcpdevel = dhcp_devel
+ARCHALL_CSWdhcpdevel = 1
 
 # We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = (\d+(?:\.\d+)*)
+UFILES_REGEX = ($(GARNAME)-\d+(?:\.\d+)*).tar.gz
 
 GARCOMPILER = GNU
 TEST_TARGET = check
 
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw
 CONFIGURE_ARGS += --localstatedir=/var/opt/csw/dhcp
 
@@ -39,15 +42,18 @@
 
 INSTALL_SCRIPTS = custom
 
-PROTOTYPE_FILTER  = awk ' \
-  $$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } \
-  $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
-  $$$$3 ~ /\/dhclient.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
-  $$$$3 ~ /\/dhcpd.leases.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
-  { print }'
+#PROTOTYPE_FILTER  = awk ' \
+#  $$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } \
+#  $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
+#  $$$$3 ~ /\/dhclient.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
+#  $$$$3 ~ /\/dhcpd.leases.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
+#  { print }'
 
+INITSMF_CSWdhcp = /etc/opt/csw/init.d/cswdhcpd
+SAMPLECONF_CSWdhcp = /etc/opt/csw/dhcpd.conf /etc/opt/csw/dhclient.conf /var/opt/csw/dhcp/db/dhcpd.leases
+
 SPKG_SOURCEURL = https://www.isc.org/software/dhcp
-SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf
+#SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf
 
 include gar/category.mk
 
@@ -58,11 +64,12 @@
 	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	@cp $(FILEDIR)/CSWdhcp.cswdhcpd $(DESTDIR)/etc/opt/csw/init.d/cswdhcpd
 	@chmod 755 $(DESTDIR)/etc/opt/csw/init.d/cswdhcpd
-	@( cd $(DESTDIR)/etc/opt/csw ; \
-	   mv dhcpd.conf dhcpd.conf.CSW ; \
-	   mv dhclient.conf dhclient.conf.CSW )
+#	@( cd $(DESTDIR)/etc/opt/csw ; \
+#	   mv dhcpd.conf dhcpd.conf.CSW ; \
+#	   mv dhclient.conf dhclient.conf.CSW )
 	@ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)
 	@cp $(FILEDIR)/CSWdhcp.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW
 	@ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/db
-	@touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases.CSW
+#	@touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases.CSW
+	@touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/dhcp/trunk/checksums
===================================================================
--- csw/mgar/pkg/dhcp/trunk/checksums	2009-12-01 16:00:20 UTC (rev 7526)
+++ csw/mgar/pkg/dhcp/trunk/checksums	2009-12-01 18:29:07 UTC (rev 7527)
@@ -1 +1 @@
-b85b23edc74514712139b860f74bc650  download/dhcp-4.1.1b2.tar.gz
+085da9c98f3d4ec285b319fcdda6d552  dhcp-4.1.1b3.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.