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

[bonivart at users.sourceforge.net]

Revision: 2687
          http://gar.svn.sourceforge.net/gar/?rev=2687&view=rev
Author:   bonivart
Date:     2008-12-22 18:37:35 +0000 (Mon, 22 Dec 2008)

Log Message:
-----------
dhcp: removed preremove

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

Removed Paths:
-------------
    csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove

Modified: csw/mgar/pkg/dhcp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dhcp/trunk/Makefile	2008-12-22 13:37:15 UTC (rev 2686)
+++ csw/mgar/pkg/dhcp/trunk/Makefile	2008-12-22 18:37:35 UTC (rev 2687)
@@ -12,7 +12,7 @@
 
 MASTER_SITES = http://ftp.isc.org/isc/dhcp/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWdhcp,preremove)
+DISTFILES += $(call admfiles,CSWdhcp,)
 DISTFILES += $(call admfiles,CSWdhcpdevel,)
 
 SPKG_DESC_CSWdhcp = ISC DHCP reference implementation
@@ -38,7 +38,7 @@
 
 INSTALL_SCRIPTS = custom
 
-PROTOTYPE_FILTER  = awk '$$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/dhclient.conf.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 }'
 
 SPKG_SOURCEURL = https://www.isc.org/software/dhcp
 SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf
@@ -57,6 +57,6 @@
 	@ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)
 	@cp $(WORKSRC)/LICENSE $(DESTDIR)$(docdir)/$(GARNAME)
 	@cp $(FILEDIR)/CSWdhcp.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW
-	@ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)
-	@touch $(DESTDIR)/var/opt/csw/dhcp/dhcpd.pid
+	@ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/db
+	@touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases.CSW
 	@$(MAKECOOKIE)

Deleted: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove
===================================================================
--- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove	2008-12-22 13:37:15 UTC (rev 2686)
+++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove	2008-12-22 18:37:35 UTC (rev 2687)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# 2008-12-22
-
-VAR=$PKG_INSTALL_ROOT/var/opt/csw/dhcp
-
-# clean up work dir
-[ -f "$VAR/dhcpd.leases" -a ! -s "$VAR/dhcpd.leases" ] && /bin/rm "$VAR/dhcpd.leases"
-[ -f "$VAR/dhcpd.leases~" -a ! -s "$VAR/dhcpd.leases~" ] && /bin/rm "$VAR/dhcpd.leases~"
-[ -f "$VAR/dhcpd.pid" ] && /bin/rm "$VAR/dhcpd.pid"
-
-exit 0


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