[csw-devel] SF.net SVN: gar:[4286] csw/mgar/pkg/vsftpd/trunk

[chninkel at users.sourceforge.net]

Revision: 4286
          http://gar.svn.sourceforge.net/gar/?rev=4286&view=rev
Author:   chninkel
Date:     2009-04-12 13:46:36 +0000 (Sun, 12 Apr 2009)

Log Message:
-----------
vsftpd: switched to dynamic gspec

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

Added Paths:
-----------
    csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec

Removed Paths:
-------------
    csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.gspec

Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile	2009-04-12 13:32:03 UTC (rev 4285)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2009-04-12 13:46:36 UTC (rev 4286)
@@ -27,23 +27,24 @@
 
 MASTER_SITES = ftp://vsftpd.beasts.org/users/cevans/
 
+PACKAGES = CSWvsftpd
 
+REQUIRED_PKGS  = CSWtcpwrap 
+REQUIRED_PKGS += CSWosslrt 
+REQUIRED_PKGS += CSWcswclassutils
+
 # adding configuration handling classes
 # (init/smf classes are dynamically added in checkinstall)
 SPKG_CLASSES = none cswpreserveconf
 
-REQUIRED_PKGS  = CSWtcpwrap 
-REQUIRED_PKGS += CSWosslrt 
-REQUIRED_PKGS += CSWcswclassutils
 
-
 ###### Upstream and opencsw files information #######
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWvsftpd,prototype preinstall csw_usrgrp_config)
+DISTFILES += CSWvsftpd.prototype CSWvsftpd.preinstall CSWvsftpd.csw_usrgrp_config
 DISTFILES += changelog.CSW README.CSW
 DISTFILES += vsftpd.conf vsftpd.userlist
 DISTFILES += cswvsftpd cswvsftpd.xml svc-cswvsftpd 
@@ -80,7 +81,12 @@
 DOCFILES += EXAMPLE/INTERNET_SITE_NOINETD/README EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf
 
 
+# little hack to be able to still use old smf support with gar v2
+# until openssh is migrated to cswclassutils init system
+DISTFILES += vsftpd_dyngspec.fakespec
+_CATEGORY_GSPEC_INCLUDE = ../../$(DOWNLOADDIR)/vsftpd_dyngspec.fakespec
 
+
 ##### Build and installation information #####
 
 GARCOMPILER = SUN

Modified: csw/mgar/pkg/vsftpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/checksums	2009-04-12 13:32:03 UTC (rev 4285)
+++ csw/mgar/pkg/vsftpd/trunk/checksums	2009-04-12 13:46:36 UTC (rev 4286)
@@ -1,5 +1,4 @@
 314e73654490c2abe742b7ed7be798b1  download/CSWvsftpd.csw_usrgrp_config
-598e429baa86555a44a3da6581a78704  download/CSWvsftpd.gspec
 a2f5b70fe49839b0463c9d90af0f11dd  download/CSWvsftpd.preinstall
 3445fbf0fc7e28cc7f2db827dfbaddb0  download/CSWvsftpd.prototype
 eeaf77528b2da0c7730323838f30b7ef  download/README.CSW
@@ -15,3 +14,4 @@
 7890b54e7ffa6106ffbdfda53f47fa41  download/vsftpd-2.1.0.tar.gz
 f6ce22a6959b93e500a4ae800295c2ee  download/vsftpd.conf
 60c736802e2ce00c531953b01e4a26f6  download/vsftpd.userlist
+0b0357e8470ccea567eabe6103daa769  download/vsftpd_dyngspec.fakespec

Deleted: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.gspec
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.gspec	2009-04-12 13:32:03 UTC (rev 4285)
+++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.gspec	2009-04-12 13:46:36 UTC (rev 4286)
@@ -1,7 +0,0 @@
-%var            bitname vsftpd
-%var            pkgname CSWvsftpd
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/LICENSE
-%var		SERVICE_CONF_FILES /opt/csw/etc/vsftpd/vsftpd.conf
-%include  	url file://%{PKGLIB}/smf_enabled.gspec
-%include  	url file://files/csw_usrgrp.gspec

Added: csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec	                        (rev 0)
+++ csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec	2009-04-12 13:46:36 UTC (rev 4286)
@@ -0,0 +1,4 @@
+%include        url file://%{PKGLIB}/csw_dyngspec.gspec
+%var		SERVICE_CONF_FILES /opt/csw/etc/vsftpd/vsftpd.conf
+%include        url file://%{PKGLIB}/smf_enabled.gspec
+%include  	url file://files/csw_usrgrp.gspec


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