Revision: 2805
http://gar.svn.sourceforge.net/gar/?rev=2805&view=rev
Author: aigoshin
Date: 2009-01-13 15:09:38 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
nginx: milestone 1.6
Modified Paths:
--------------
csw/mgar/pkg/nginx/trunk/Makefile
csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec
Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile 2009-01-13 13:59:13 UTC (rev 2804)
+++ csw/mgar/pkg/nginx/trunk/Makefile 2009-01-13 15:09:38 UTC (rev 2805)
@@ -23,7 +23,6 @@
#CONFIGURE_ARGS += --with-cpu-opt=pentium3
CONFIGURE_ARGS += --with-cc-opt="-I$(includedir) -I$(includedir)/openssl"
CONFIGURE_ARGS += --with-ld-opt="$(LDFLAGS)"
-#CONFIGURE_ARGS += --with-ld-opt="-R$(libdir) -R$(libdir) -L$(libdir)"
CONFIGURE_ARGS += --prefix=$(prefix)/var/nginx
CONFIGURE_ARGS += --conf-path=$(sysconfdir)/nginx/nginx.conf
CONFIGURE_ARGS += --sbin-path=$(sbindir)/nginx
@@ -44,7 +43,7 @@
TEST_SCRIPTS =
-PROTOTYPE_FILTER = awk '$$$$3 ~
/\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "?" }
$$$$3 ~ /\/var\/spool\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } {
print }'
+PROTOTYPE_FILTER = awk '$$$$3 ~
/\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys"
} $$$$3 ~ /\/var\/spool\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } {
print }'
include gar/category.mk
@@ -57,6 +56,12 @@
post-install-modulated:
cp $(WORKDIR)/svc-cswnginx $(WORKDIR)/cswnginx
+ ginstall -d $(DESTDIR)/etc/init.d
+ cp $(WORKDIR)/cswnginx $(DESTDIR)/etc/init.d
+ ginstall -d $(DESTDIR)$(prefix)/var/svc/manifest/site
+ cp $(WORKDIR)/cswnginx.xml $(DESTDIR)$(prefix)/var/svc/manifest/site
+ ginstall -d $(DESTDIR)$(libdir)/svc/method
+ cp $(WORKDIR)/svc-cswnginx $(DESTDIR)$(libdir)/svc/method
ginstall -d $(DESTDIR)$(sysconfdir)/nginx/conf.d
ginstall -d $(DESTDIR)$(sharedstatedir)/nginx/contrib
ginstall -d $(DESTDIR)$(docdir)/nginx
@@ -70,5 +75,5 @@
mv $(DESTDIR)$(sysconfdir)/nginx/nginx.conf
$(DESTDIR)$(sysconfdir)/nginx/nginx.conf.CSW
cd $(WORKSRC); \
cp -r contrib/* $(DESTDIR)$(sharedstatedir)/nginx/contrib; \
- cp $(NGINXDOCS) $(DESTDIR)$(docdir)/nginx; \
+ cp $(NGINXDOCS) $(DESTDIR)$(docdir)/nginx
$(MAKECOOKIE)
Modified: csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec
===================================================================
--- csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec 2009-01-13 13:59:13 UTC
(rev 2804)
+++ csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec 2009-01-13 15:09:38 UTC
(rev 2805)
@@ -2,7 +2,7 @@
%var pkgname CSWnginx
%include url file://%{PKGLIB}/csw_dyndepend.gspec
%include url file://%{PKGLIB}/smf_enabled.gspec
-%var SERVICE_CONF_FILES /opt/csw/etc/nginx/nginx.conf
+%var SERVICE_CONF_FILES /opt/csw/etc/nginx/nginx.conf
%var RC_INIT_SCRIPT cswnginx
%var INIT_KILL_PRIO 16
%var INIT_START_PRIO 90
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
