Revision: 2789
http://gar.svn.sourceforge.net/gar/?rev=2789&view=rev
Author: aigoshin
Date: 2009-01-11 14:51:28 +0000 (Sun, 11 Jan 2009)
Log Message:
-----------
nginx: milestone 1.5
Modified Paths:
--------------
csw/mgar/pkg/nginx/trunk/Makefile
csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec
Added Paths:
-----------
csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall
Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile 2009-01-10 21:58:05 UTC (rev 2788)
+++ csw/mgar/pkg/nginx/trunk/Makefile 2009-01-11 14:51:28 UTC (rev 2789)
@@ -10,7 +10,7 @@
MASTER_SITES = http://sysoev.ru/nginx/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWnginx,)
+DISTFILES += $(call admfiles,CSWnginx,postinstall)
DISTFILES += cswnginx.xml svc-cswnginx
# We define upstream file regex so we can be notifed of new upstream software
release
@@ -20,9 +20,10 @@
CFLAGS =
-CONFIGURE_ARGS += --with-cpu-opt=pentium3
-CONFIGURE_ARGS += --with-cc-opt="-I/opt/csw/include -I/opt/csw/include/openssl"
-CONFIGURE_ARGS += --with-ld-opt="-R$(ISALIBDIR) -R/opt/csw/lib -L/opt/csw/lib"
+#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
@@ -43,26 +44,26 @@
TEST_SCRIPTS =
-PROTOTYPE_FILTER = awk '$$$$3 ~
/\/var\/((log|run)|(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 = "sys"
} $$$$3 ~ /\/var\/spool\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } {
print }'
include gar/category.mk
-NGINXDOC = CHANGES CHANGES.ru LICENSE README
+NGINXDOCS = CHANGES CHANGES.ru LICENSE README
-post-install:
+post-install-modulated:
cp $(WORKDIR)/svc-cswnginx $(WORKDIR)/cswnginx
- ginstall -d $(DESTDIR)$(sbindir)
- ginstall -d $(DESTDIR)$(sysconfdir)
ginstall -d $(DESTDIR)$(sharedstatedir)/nginx/contrib
ginstall -d $(DESTDIR)$(docdir)/nginx
ginstall -d $(DESTDIR)$(prefix)/var/nginx
ginstall -d $(DESTDIR)$(prefix)/var/nginx/sites
ginstall -d $(DESTDIR)$(prefix)/var/log/nginx
- ginstall -d $(DESTDIR)$(prefix)/var/spool/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
+ mv $(DESTDIR)$(sysconfdir)/nginx/fastcgi_params
$(DESTDIR)$(sysconfdir)/nginx/fastcgi_params.CSW
+ mv $(DESTDIR)$(sysconfdir)/nginx/mime.types
$(DESTDIR)$(sysconfdir)/nginx/mime.types.CSW
+ mv $(DESTDIR)$(sysconfdir)/nginx/nginx.conf
$(DESTDIR)$(sysconfdir)/nginx/nginx.conf.CSW
cd $(WORKSRC); \
cp -r contrib/* $(DESTDIR)$(sharedstatedir)/nginx/contrib; \
- cp $(NGINXDOC) $(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-10 21:58:05 UTC
(rev 2788)
+++ csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec 2009-01-11 14:51:28 UTC
(rev 2789)
@@ -1,7 +1,7 @@
%var bitname nginx
%var pkgname CSWnginx
%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{DESTDIR}/LICENSE
+%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE
%var SERVICE_CONF_FILES /opt/csw/etc/nginx/nginx.conf
%include url file://%{PKGLIB}/smf_enabled.gspec
%var RC_INIT_SCRIPT cswnginx
Added: csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall
===================================================================
--- csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall
(rev 0)
+++ csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall 2009-01-11 14:51:28 UTC
(rev 2789)
@@ -0,0 +1,29 @@
+#!/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
+ else
+ test -x $BASEDIR/etc/init.d/cswnginx &&
$BASEDIR/etc/init.d/cswnginx upgrade
+ fi
+fi
+
+exit 0
Property changes on: csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall
___________________________________________________________________
Added: svn:executable
+ *
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
