[csw-devel] SF.net SVN: gar:[3283] csw/mgar/pkg/apache2-worker/trunk

[idogan23 at users.sourceforge.net]

Revision: 3283
          http://gar.svn.sourceforge.net/gar/?rev=3283&view=rev
Author:   idogan23
Date:     2009-02-20 10:02:32 +0000 (Fri, 20 Feb 2009)

Log Message:
-----------
apache2-worker: small changes for mGAR v2

Modified Paths:
--------------
    csw/mgar/pkg/apache2-worker/trunk/Makefile
    csw/mgar/pkg/apache2-worker/trunk/checksums
    csw/mgar/pkg/apache2-worker/trunk/files/CSWap2worker.gspec

Property Changed:
----------------
    csw/mgar/pkg/apache2-worker/trunk/


Property changes on: csw/mgar/pkg/apache2-worker/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/apache2-worker/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2-worker/trunk/Makefile	2009-02-20 04:36:12 UTC (rev 3282)
+++ csw/mgar/pkg/apache2-worker/trunk/Makefile	2009-02-20 10:02:32 UTC (rev 3283)
@@ -19,14 +19,18 @@
 
 APACHE_ROOT = $(DESTDIR)$(prefix)/apache2
 
+include gar/category.mk
+include ../../apache2/trunk/files/rules.mk
+
+pre-configure-modulated:
+	(cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); \
+	./buildconf)
+
 # Build Configuration
 CONFIGURE_ARGS += --with-mpm=worker
 
-include gar/category.mk
-include ../../apache2/trunk/files/rules.mk
+post-install-modulated: rename-httpd
 
-post-install: rename-httpd
-
 rename-httpd:
 	@if test -f $(APACHE_ROOT)/sbin/httpd ; then \
 	    ( cd $(APACHE_ROOT)/sbin ; mv httpd httpd.worker ) ; \

Modified: csw/mgar/pkg/apache2-worker/trunk/checksums
===================================================================
--- csw/mgar/pkg/apache2-worker/trunk/checksums	2009-02-20 04:36:12 UTC (rev 3282)
+++ csw/mgar/pkg/apache2-worker/trunk/checksums	2009-02-20 10:02:32 UTC (rev 3283)
@@ -1,6 +1,6 @@
 03e0a99a5de0f3f568a0087fb9993af9  download/httpd-2.2.11.tar.gz
 a7467a756cbd980d4cfe3c2cfb6a9e35  download/config.layout
-b2ab257a1d86f3e5787e493eb58c503a  download/CSWap2worker.gspec
+ae291b068f37a385a1fc78a8c342aa56  download/CSWap2worker.gspec
 260260d6a4d17b88d25658c38cae6875  download/CSWap2worker.depend
 2e11e4af177c4af6fe9af08325c4292a  download/CSWap2worker.prototype
 f942f827f0a9f463fd4d9ef0eb00f78a  download/CSWap2worker.postinstall

Modified: csw/mgar/pkg/apache2-worker/trunk/files/CSWap2worker.gspec
===================================================================
--- csw/mgar/pkg/apache2-worker/trunk/files/CSWap2worker.gspec	2009-02-20 04:36:12 UTC (rev 3282)
+++ csw/mgar/pkg/apache2-worker/trunk/files/CSWap2worker.gspec	2009-02-20 10:02:32 UTC (rev 3283)
@@ -2,6 +2,6 @@
 %var            pkgname CSWap2worker
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
 %var            desc Apache 2.2 worker MPM
-%copyright      url file://%{WORKSRC}/LICENSE
-%preinstall     url file://%{WORKDIR}/CSWapache2.killproc
+%copyright      url file://%{WORKDIR_FIRSTMOD}/LICENSE
+%preinstall     url file://%{WORKDIR/CSWapache2.killproc
 %preremove      url file://%{WORKDIR}/CSWapache2.killproc


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