[csw-devel] SF.net SVN: gar:[2801] csw/mgar/pkg/nginx/trunk

[aigoshin at users.sourceforge.net]

Revision: 2801
          http://gar.svn.sourceforge.net/gar/?rev=2801&view=rev
Author:   aigoshin
Date:     2009-01-12 17:54:04 +0000 (Mon, 12 Jan 2009)

Log Message:
-----------
nginx: fixing sources about ISALIST

Modified Paths:
--------------
    csw/mgar/pkg/nginx/trunk/Makefile
    csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec
    csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2009-01-12 17:24:30 UTC (rev 2800)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2009-01-12 17:54:04 UTC (rev 2801)
@@ -2,7 +2,7 @@
 GARVERSION = 0.7.30
 CATEGORIES = server
 
-DESCRIPTION = HTTP server and mail proxy server
+DESCRIPTION = nginx HTTP server and mail proxy server
 define BLURB
   Nginx (pronounced "engine x") is a free, open-source, high-performance
   HTTP server and reverse proxy, as well as an IMAP/POP3 proxy server.
@@ -22,8 +22,8 @@
 
 #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 += --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,19 +44,24 @@
 
 TEST_SCRIPTS =
 
-PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys" } $$$$3 ~ /\/var\/spool\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }'
+PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "?" } $$$$3 ~ /\/var\/spool\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }'
 
 include gar/category.mk
 
 NGINXDOCS = CHANGES CHANGES.ru LICENSE README
 
+post-configure-modulated:
+	$(foreach MODULATION,$(MODULATIONS), \
+		gsed -i s#/...ISALIST#/'$$ISALIST'# $(WORKSRC)/objs/ngx_auto_config.h;)
+	$(MAKECOOKIE)
+
 post-install-modulated:
 	cp $(WORKDIR)/svc-cswnginx $(WORKDIR)/cswnginx
+	ginstall -d $(DESTDIR)$(sysconfdir)/nginx/conf.d
 	ginstall -d $(DESTDIR)$(sharedstatedir)/nginx/contrib
 	ginstall -d $(DESTDIR)$(docdir)/nginx
-	ginstall -d $(DESTDIR)$(prefix)/var/nginx
+	ginstall -d $(DESTDIR)$(prefix)/var/log/nginx
 	ginstall -d $(DESTDIR)$(prefix)/var/nginx/sites
-	ginstall -d $(DESTDIR)$(prefix)/var/log/nginx
 	ginstall -d $(DESTDIR)$(prefix)/var/spool/nginx/client
 	ginstall -d $(DESTDIR)$(prefix)/var/spool/nginx/fastcgi
 	ginstall -d $(DESTDIR)$(prefix)/var/spool/nginx/proxy

Modified: csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec
===================================================================
--- csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec	2009-01-12 17:24:30 UTC (rev 2800)
+++ csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec	2009-01-12 17:54:04 UTC (rev 2801)
@@ -1,10 +1,10 @@
 %var            bitname nginx
 %var            pkgname CSWnginx
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC_FIRSTMOD}/LICENSE
+%include        url file://%{PKGLIB}/smf_enabled.gspec
 %var            SERVICE_CONF_FILES /opt/csw/etc/nginx/nginx.conf       
-%include        url file://%{PKGLIB}/smf_enabled.gspec
 %var            RC_INIT_SCRIPT     cswnginx
 %var            INIT_KILL_PRIO     16
 %var            INIT_START_PRIO    90
 %var            CAN_BE_AUTOENABLED no
+%copyright      url file://%{WORKSRC_FIRSTMOD}/LICENSE

Modified: csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall
===================================================================
--- csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall	2009-01-12 17:24:30 UTC (rev 2800)
+++ csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall	2009-01-12 17:54:04 UTC (rev 2801)
@@ -1,23 +1,5 @@
 #!/sbin/sh
 
-CONFDIR=$BASEDIR/opt/csw/etc/nginx
-CONFFILES="fastcgi_params mime.types nginx.conf"
-
-# copy new config files, if it's not existing
-for file in $CONFFILES; do
-	confpath="$CONFDIR/$file"
-	if [ -f "$confpath" ]; then
-		echo "Not touching existing $confpath"
-	else
-		if [ -r "$confpath.CSW" ]; then
-			echo "Copying $confpath.CSW to $confpath"
-			cp -p "$confpath.CSW" "$confpath"
-		else
-			echo "Skipping $confpath.CSW..."
-		fi
-	fi
-done
-
 if [ "$NEEDUPGRADE" = "1" ] ; then
 	if [ -x "$BASEDIR/opt/csw/lib/svc/method/svc-cswnginx" ]; then
 		$BASEDIR/opt/csw/lib/svc/method/svc-cswnginx upgrade


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