[csw-devel] SF.net SVN: gar:[7620] csw/mgar/pkg/dcc/trunk

[bonivart at users.sourceforge.net]

Revision: 7620
          http://gar.svn.sourceforge.net/gar/?rev=7620&view=rev
Author:   bonivart
Date:     2009-12-14 15:52:48 +0000 (Mon, 14 Dec 2009)

Log Message:
-----------
dcc: update to 1.3.116

Modified Paths:
--------------
    csw/mgar/pkg/dcc/trunk/Makefile
    csw/mgar/pkg/dcc/trunk/checksums
    csw/mgar/pkg/dcc/trunk/files/CSWdcc.dcc.xml

Removed Paths:
-------------
    csw/mgar/pkg/dcc/trunk/files/CSWdcc.gspec

Modified: csw/mgar/pkg/dcc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dcc/trunk/Makefile	2009-12-14 14:44:28 UTC (rev 7619)
+++ csw/mgar/pkg/dcc/trunk/Makefile	2009-12-14 15:52:48 UTC (rev 7620)
@@ -1,15 +1,18 @@
+# dep to perl?
+
 GARNAME = dcc
-GARVERSION = 1.3.102
+GARVERSION = 1.3.116
 CATEGORIES = net
 
 DESCRIPTION = E-mail greylisting and a cooperative, distributed system to identify spam
 
 MASTER_SITES = http://www.rhyolite.com/dcc/source/
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.Z
-DISTFILES += $(call admfiles,CSWdcc,)
+DISTFILES  = $(GARNAME).tar.Z
 
+LICENSE = LICENSE
+
 # Upstream watch
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.Z
+#UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.Z
 
 #CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS  =
@@ -19,23 +22,32 @@
 CONFIGURE_ARGS += --mandir=/opt/csw/share/man
 CONFIGURE_ARGS += --with-installroot=$(DESTDIR)
 CONFIGURE_ARGS += --with-DCC-MD5
+#CONFIGURE_ARGS += --with-uid=dcc
 CONFIGURE_ARGS += --with-uid=bonivart
 #CONFIGURE_ARGS += --with-cgibin=/var/opt/csw/dcc/cgi-bin
 CONFIGURE_ARGS += --with-cgibin=/opt/csw/dcc/cgi-bin
 CONFIGURE_ARGS += --with-rundir=/var/opt/csw/dcc/run
 CONFIGURE_ARGS += --with-sendmail=/home/bonivart/tmp/sendmail-8.14.2/include/libmilter
 
+GARCOMPILER = GNU
+
 # dcc has no tests
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
-PROTOTYPE_FILTER  = awk '$$$$3 ~ /.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }'
+SAMPLECONF  = /var/opt/csw/dcc/dcc_conf
+SAMPLECONF += /var/opt/csw/dcc/flod
+SAMPLECONF += /var/opt/csw/dcc/grey_flod
+SAMPLECONF += /var/opt/csw/dcc/grey_whitelist
+SAMPLECONF += /var/opt/csw/dcc/ids
+SAMPLECONF += /var/opt/csw/dcc/map.txt
+SAMPLECONF += /var/opt/csw/dcc/whiteclnt
+SAMPLECONF += /var/opt/csw/dcc/whitecommon
+SAMPLECONF += /var/opt/csw/dcc/whitelist
 
 SPKG_SOURCEURL = http://www.rhyolite.com/dcc/
-REQUIRED_PKGS = CSWcswclassutils
-SPKG_CLASSES = none cswcpsampleconf
 CONFFILES =  dcc_conf flod grey_flod grey_whitelist ids map.txt whiteclnt whitecommon whitelist
-DOCFILES = CHANGES FAQ.txt INSTALL.txt LICENSE RESTRICTIONS misc/README misc/dcc.m4 misc/dccdnsbl.m4 misc/site.config.m4
+DOCFILES = CHANGES FAQ.txt INSTALL.txt RESTRICTIONS misc/README misc/dcc.m4 misc/dccdnsbl.m4 misc/site.config.m4
 
 include gar/category.mk
 
@@ -53,7 +65,7 @@
 	@( cd $(DESTDIR)/var/opt/csw/$(GARNAME) ; \
 	  sed 's/bonivart/dcc/' dcc_conf > tmp.sed ; \
 	  mv tmp.sed dcc_conf )
-	@$(foreach FILE, $(CONFFILES), mv $(DESTDIR)/var/opt/csw/$(GARNAME)/$(FILE) $(DESTDIR)/var/opt/csw/$(GARNAME)/$(FILE).CSW ;)
+#	@$(foreach FILE, $(CONFFILES), mv $(DESTDIR)/var/opt/csw/$(GARNAME)/$(FILE) $(DESTDIR)/var/opt/csw/$(GARNAME) ;)
 	@ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/misc
 	@$(foreach FILE, $(DOCFILES), cp $(WORKSRC)/$(FILE) $(DESTDIR)$(docdir)/$(GARNAME)/$(FILE) ;)
 	@cp $(FILEDIR)/CSWdcc.INSTALL.CSW.txt $(DESTDIR)$(docdir)/$(GARNAME)/INSTALL.CSW.txt

Modified: csw/mgar/pkg/dcc/trunk/checksums
===================================================================
--- csw/mgar/pkg/dcc/trunk/checksums	2009-12-14 14:44:28 UTC (rev 7619)
+++ csw/mgar/pkg/dcc/trunk/checksums	2009-12-14 15:52:48 UTC (rev 7620)
@@ -1,2 +1 @@
-6abf97babd8555d37ad91efc7ba4ae7b  download/dcc-1.3.102.tar.Z
-472a0e3cfd53e0080ddeb5db77d5b708  download/CSWdcc.gspec
+dab3c668b82c931eb7191246cb11791f  dcc.tar.Z

Modified: csw/mgar/pkg/dcc/trunk/files/CSWdcc.dcc.xml
===================================================================
--- csw/mgar/pkg/dcc/trunk/files/CSWdcc.dcc.xml	2009-12-14 14:44:28 UTC (rev 7619)
+++ csw/mgar/pkg/dcc/trunk/files/CSWdcc.dcc.xml	2009-12-14 15:52:48 UTC (rev 7620)
@@ -2,7 +2,7 @@
  <!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
 <!--
 
-        Alex Moore (blastwave.org) 01/06
+        Alex Moore 01/06
         Service manifest for DCC
  -->
 

Deleted: csw/mgar/pkg/dcc/trunk/files/CSWdcc.gspec
===================================================================
--- csw/mgar/pkg/dcc/trunk/files/CSWdcc.gspec	2009-12-14 14:44:28 UTC (rev 7619)
+++ csw/mgar/pkg/dcc/trunk/files/CSWdcc.gspec	2009-12-14 15:52:48 UTC (rev 7620)
@@ -1,7 +0,0 @@
-%var            bitname dcc
-%var            pkgname CSWdcc
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright
-
-Please see /opt/csw/share/doc/dcc/LICENSE for license information.
-


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