Revision: 3272
http://gar.svn.sourceforge.net/gar/?rev=3272&view=rev
Author: idogan23
Date: 2009-02-19 18:17:55 +0000 (Thu, 19 Feb 2009)
Log Message:
-----------
apache2: few changes for mGARv2
Modified Paths:
--------------
csw/mgar/pkg/apache2/trunk/Makefile
csw/mgar/pkg/apache2/trunk/checksums
csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.gspec
csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.gspec
csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec
csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec
csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec
csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec
csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec
csw/mgar/pkg/apache2/trunk/files/rules.mk
Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile 2009-02-19 12:09:40 UTC (rev 3271)
+++ csw/mgar/pkg/apache2/trunk/Makefile 2009-02-19 18:17:55 UTC (rev 3272)
@@ -40,7 +40,7 @@
DISTFILES += httpd-ssl.conf.CSW
DISTFILES += update20to22
-pre-configure:
+pre-configure-modulated:
(cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); \
./buildconf)
@@ -59,12 +59,12 @@
FIXCONFIG_DIRS = $(DESTDIR)
FIXCONFIG_RMPATHS = $(DESTDIR)
-FIXCONFIG_RMPATHS += $(CURDIR)/$(WORKSRC)/srclib/apr-util
-FIXCONFIG_RMPATHS += $(CURDIR)/$(WORKSRC)/srclib/apr-util/include
-FIXCONFIG_RMPATHS += $(CURDIR)/$(WORKSRC)/srclib/apr
-FIXCONFIG_RMPATHS += $(CURDIR)/$(WORKSRC)/srclib/apr/include
+FIXCONFIG_RMPATHS +=
$(CURDIR)/$(WORKSRC)/$(GARNAME)-$(GARVERSION)/srclib/apr-util
+FIXCONFIG_RMPATHS +=
$(CURDIR)/$(WORKSRC)/$(GARNAME)-$(GARVERSION)/srclib/apr-util/include
+FIXCONFIG_RMPATHS += $(CURDIR)/$(WORKSRC)/$(GARNAME)-$(GARVERSION)/srclib/apr
+FIXCONFIG_RMPATHS +=
$(CURDIR)/$(WORKSRC)/$(GARNAME)-$(GARVERSION)/srclib/apr/include
-post-install: rename-httpd copy-local-files create-templates
+post-install-modulated: rename-httpd copy-local-files create-templates
rename-httpd:
@if test -f $(APACHE_ROOT)/sbin/httpd ; then \
Modified: csw/mgar/pkg/apache2/trunk/checksums
===================================================================
--- csw/mgar/pkg/apache2/trunk/checksums 2009-02-19 12:09:40 UTC (rev
3271)
+++ csw/mgar/pkg/apache2/trunk/checksums 2009-02-19 18:17:55 UTC (rev
3272)
@@ -1,32 +1,32 @@
03e0a99a5de0f3f568a0087fb9993af9 download/httpd-2.2.11.tar.gz
a7467a756cbd980d4cfe3c2cfb6a9e35 download/config.layout
-a8d5878f31f6a2081bc178351b2dda1e download/CSWapache2.gspec
+1b57e8fd32556ee3a3d9fb2a908ddc6c download/CSWapache2.gspec
44ec414654dec572fd43d6a45c001746 download/CSWapache2.depend
d41d8cd98f00b204e9800998ecf8427e download/CSWapache2.prototype
-c3d5a482125aa27e63e434bc65154b1c download/CSWapache2rt.gspec
+7546bc4336d9656e5b02e392264ce114 download/CSWapache2rt.gspec
be2c3e3b32389699b606c1a000032577 download/CSWapache2rt.depend
c05690175946f1b9b6f6dcf2dcf22a91 download/CSWapache2rt.prototype
523b1f316a67090dfc08fe7506cb1aa0 download/CSWapache2rt.checkinstall
-4e2f813b608f759aec286eeb6267dcd4 download/CSWapache2c.gspec
+b466feb59956a06e33fada72d6b69f8d download/CSWapache2c.gspec
a5c969155aec617cdae566c6cef9ffb7 download/CSWapache2c.depend
3285a1402de1315873637ec8a331a50f download/CSWapache2c.prototype
e629a549294b2d91e8a0365c43d097cd download/CSWapache2c.postinstall
0dd379f20ceb32fc77bb3a9bf045097f download/CSWapache2c.space
-5bc2d908f90108670ea72f09dce54d12 download/CSWap2prefork.gspec
+03b893953995a59649b9afbc5253f9e1 download/CSWap2prefork.gspec
c0109a5cde3571708a153b17c192a7aa download/CSWap2prefork.depend
f02746d1ed7d57d1171fc4c536451fdb download/CSWap2prefork.prototype
ced35f8e68421f6f4db9d0c45b4f8602 download/CSWap2prefork.postinstall
9df2944f619992604f78f477ff5e8c1f download/CSWap2prefork.postremove
0dd379f20ceb32fc77bb3a9bf045097f download/CSWap2prefork.space
-5f2418e17d19e3831479dce58757290f download/CSWap2suexec.gspec
+f90d0488f01ba57bffa88a4c1897ca28 download/CSWap2suexec.gspec
f7a0bada3461bba12b806211802804d0 download/CSWap2suexec.depend
27cc92536c2335868e727f4517a967db download/CSWap2suexec.prototype
405bc4df4662e9faebe34f9b6a093d14 download/CSWap2suexec.postinstall
36128341749fa79f9942f4156b85f5b6 download/CSWap2suexec.preremove
-b4adf3121c1d52eecb2748a75a0c28b1 download/CSWapache2-manual.gspec
+cb25d4b9c4e32f9e308c84824a4ca8f3 download/CSWapache2-manual.gspec
f7a0bada3461bba12b806211802804d0 download/CSWapache2-manual.depend
987a8d901c2a82e82b23b03fb6f29960 download/CSWapache2-manual.prototype
-e14dde24b9b6753a28c292d046311034 download/CSWapache2-devel.gspec
+020f593630a0d59a4e398814e0e02c0f download/CSWapache2-devel.gspec
f67ef45b94e60a34fd81f099aa6bf925 download/CSWapache2-devel.depend
86699bad7fbfc5e0af4659435b5d815b download/CSWapache2-devel.prototype
61b6b11aa70677da9386e90c3b5ba21c download/CSWapache2.killproc
Modified: csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.gspec
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.gspec 2009-02-19
12:09:40 UTC (rev 3271)
+++ csw/mgar/pkg/apache2/trunk/files/CSWap2prefork.gspec 2009-02-19
18:17:55 UTC (rev 3272)
@@ -2,6 +2,6 @@
%var pkgname CSWap2prefork
%include url file://%{PKGLIB}/csw_dyndepend.gspec
%var desc Apache 2.2 prefork MPM
-%copyright url file://%{WORKSRC}/LICENSE
+%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE
%preinstall url file://%{WORKDIR}/CSWapache2.killproc
%preremove url file://%{WORKDIR}/CSWapache2.killproc
Modified: csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.gspec
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.gspec 2009-02-19 12:09:40 UTC
(rev 3271)
+++ csw/mgar/pkg/apache2/trunk/files/CSWap2suexec.gspec 2009-02-19 18:17:55 UTC
(rev 3272)
@@ -2,4 +2,4 @@
%var pkgname CSWap2suexec
%include url file://%{PKGLIB}/csw_dyndepend.gspec
%var desc Apache 2.2 suEXEC support
-%copyright url file://%{WORKSRC}/LICENSE
+%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE
Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec 2009-02-19
12:09:40 UTC (rev 3271)
+++ csw/mgar/pkg/apache2/trunk/files/CSWapache2-devel.gspec 2009-02-19
18:17:55 UTC (rev 3272)
@@ -2,4 +2,4 @@
%var pkgname CSWapache2-devel
%include url file://%{PKGLIB}/csw_standard.gspec
%var desc Apache 2.2 development support
-%copyright url file://%{WORKSRC}/LICENSE
+%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE
Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec 2009-02-19
12:09:40 UTC (rev 3271)
+++ csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.gspec 2009-02-19
18:17:55 UTC (rev 3272)
@@ -3,4 +3,4 @@
%var arch all
%include url file://%{PKGLIB}/csw_dyndepend.gspec
%var desc Apache 2.2 manual
-%copyright url file://%{WORKSRC}/LICENSE
+%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE
Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec 2009-02-19 12:09:40 UTC
(rev 3271)
+++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.gspec 2009-02-19 18:17:55 UTC
(rev 3272)
@@ -3,4 +3,4 @@
%var arch all
%include url file://%{PKGLIB}/csw_dyndepend.gspec
%var desc Apache 2.2 web server
-%copyright url file://%{WORKSRC}/LICENSE
+%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE
Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec 2009-02-19 12:09:40 UTC
(rev 3271)
+++ csw/mgar/pkg/apache2/trunk/files/CSWapache2c.gspec 2009-02-19 18:17:55 UTC
(rev 3272)
@@ -8,5 +8,5 @@
%var INIT_START_PRIO 50
%include url file://%{PKGLIB}/csw_dyndepend.gspec
%var desc Apache 2.2 web server (core)
-%copyright url file://%{WORKSRC}/LICENSE
+%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE
%include url file://%{PKGLIB}/smf_enabled.gspec
Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec 2009-02-19 12:09:40 UTC
(rev 3271)
+++ csw/mgar/pkg/apache2/trunk/files/CSWapache2rt.gspec 2009-02-19 18:17:55 UTC
(rev 3272)
@@ -2,4 +2,4 @@
%var pkgname CSWapache2rt
%include url file://%{PKGLIB}/csw_standard.gspec
%var desc Apache 2.2 runtime libraries
-%copyright url file://%{WORKSRC}/LICENSE
+%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE
Modified: csw/mgar/pkg/apache2/trunk/files/rules.mk
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/rules.mk 2009-02-19 12:09:40 UTC (rev
3271)
+++ csw/mgar/pkg/apache2/trunk/files/rules.mk 2009-02-19 18:17:55 UTC (rev
3272)
@@ -1,8 +1,8 @@
-pre-configure: install-layout install-dbd-drivers apu-make-configure
+pre-configure-modulated: install-layout install-dbd-drivers apu-make-configure
install-layout:
@gsed -e s,INSTALL_PREFIX,$(prefix)/apache2,g \
- $(WORKDIR)/config.layout > $(WORKSRC)/config.layout
+ $(WORKDIR)/config.layout >
$(WORKDIR)/$(GARNAME)-$(GARVERSION)/config.layout
@$(MAKECOOKIE)
install-dbd-drivers:
@@ -10,6 +10,6 @@
# @gcp -v $(FILEDIR)/apr_dbd_mysql.c $(WORKSRC)/srclib/apr-util/dbd
apu-make-configure:
- @( cd $(WORKSRC)/srclib/apr-util ; autoconf )
+ @( cd $(WORKDIR)/$(GARNAME)-$(GARVERSION)/srclib/apr-util ; autoconf )
@$(MAKECOOKIE)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
