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

[dmichelsen at users.sourceforge.net]

Revision: 19812
          http://gar.svn.sourceforge.net/gar/?rev=19812&view=rev
Author:   dmichelsen
Date:     2012-12-04 16:19:05 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
nginx/trunk: Courtesy to 1.2.5, enable additional modules

Modified Paths:
--------------
    csw/mgar/pkg/nginx/trunk/Makefile
    csw/mgar/pkg/nginx/trunk/checksums

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2012-12-04 16:01:05 UTC (rev 19811)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2012-12-04 16:19:05 UTC (rev 19812)
@@ -1,5 +1,5 @@
 NAME       = nginx
-VERSION    = 1.1.8
+VERSION    = 1.2.5
 GARTYPE = v2
 
 GARCOMPILER = SOS11
@@ -19,11 +19,19 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
-BUILD_DEP_PKGS = CSWlibz-dev
-RUNTIME_DEP_PKGS = CSWosslrt CSWlibpcre0 CSWlibz1 CSWperl
+BUILD_DEP_PKGS += CSWlibz-dev
 
-PACKAGING_PLATFORMS  = solaris9-sparc  solaris9-i386
-PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+PACKAGES += CSWnginx
+SPKG_DESC_CSWnginx = HTTP server and mail proxy server
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibexslt0
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibgeoip1
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibgd2
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibz1
+RUNTIME_DEP_PKGS_CSWnginx += CSWperl
 
 # default sparc arch is set to sparcv8plus because nginx contains
 # assembler parts specific to v8plus and v9 arches:
@@ -35,12 +43,15 @@
 #	casxa   [%o2] 0x80, %o1, %o0
 #	.end
 
-ISAEXEC                = 1
-ISA_DEFAULT_sparc      = sparcv8plus
-EXTRA_BUILD_ISAS_i386  = amd64
-EXTRA_BUILD_ISAS_sparc = sparcv9
+# These are the default now
 
-NGINXCPU_i386          = pentium3
+#ISA_DEFAULT_sparc      = sparcv8plus
+#EXTRA_BUILD_ISAS_i386  = pentium_pro amd64
+#EXTRA_BUILD_ISAS_sparc = sparcv9
+
+ISAEXEC = 1
+
+NGINXCPU_i386          = pentium
 NGINXCPU_pentium_pro   = pentium3
 NGINXCPU_sparcv8plus   = sparc32
 NGINXCPU_sparcv9       = sparc64
@@ -49,9 +60,6 @@
 
 CFLAGS =
 
-sysconfdir=/etc/opt/csw
-localstatedir=/var/opt/csw
-
 #CONFIGURE_ARGS += --with-debug
 CONFIGURE_ARGS += --with-cpu-opt=$(NGINXCPU)
 CONFIGURE_ARGS += --with-cc-opt="-I$(includedir) -I$(includedir)/openssl"
@@ -72,15 +80,34 @@
 CONFIGURE_ARGS += --with-http_addition_module
 CONFIGURE_ARGS += --with-http_dav_module
 CONFIGURE_ARGS += --with-http_flv_module
+CONFIGURE_ARGS += --with-http_mp4_module
 CONFIGURE_ARGS += --with-http_realip_module
 CONFIGURE_ARGS += --with-http_secure_link_module
 CONFIGURE_ARGS += --with-http_ssl_module
 CONFIGURE_ARGS += --with-http_stub_status_module
+CONFIGURE_ARGS += --with-http_gzip_static_module
+CONFIGURE_ARGS += --with-http_geoip_module
+CONFIGURE_ARGS += --with-http_xslt_module
+CONFIGURE_ARGS += --with-http_image_filter_module
+CONFIGURE_ARGS += --with-http_sub_module
+CONFIGURE_ARGS += --with-http_random_index_module
+CONFIGURE_ARGS += --with-http_secure_link_module
+CONFIGURE_ARGS += --with-http_degradation_module
+CONFIGURE_ARGS += --with-http_stub_status_module
+# Enable when we have 64 bit perl
+# CONFIGURE_ARGS += --with-http_perl_module
 
 TEST_SCRIPTS =
 
 INITSMF      = $(sysconfdir)/init.d/cswnginx
-PRESERVECONF = $(sysconfdir)/nginx/fastcgi.conf $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf $(sysconfdir)/nginx/scgi_params $(sysconfdir)/nginx/uwsgi_params $(localstatedir)/nginx/html/50x.html $(localstatedir)/nginx/html/index.html
+PRESERVECONF += $(sysconfdir)/nginx/fastcgi.conf
+PRESERVECONF += $(sysconfdir)/nginx/fastcgi_params
+PRESERVECONF += $(sysconfdir)/nginx/mime.types
+PRESERVECONF += $(sysconfdir)/nginx/nginx.conf
+PRESERVECONF += $(sysconfdir)/nginx/scgi_params
+PRESERVECONF += $(sysconfdir)/nginx/uwsgi_params
+PRESERVECONF += $(localstatedir)/nginx/html/50x.html
+PRESERVECONF += $(localstatedir)/nginx/html/index.html
 
 NGINXDOCS    = CHANGES CHANGES.ru LICENSE README
 
@@ -90,7 +117,7 @@
 post-configure-modulated:
 	gsed -i  s#/...ISALIST#/'$$ISALIST'# $(WORKSRC)/objs/ngx_auto_config.h
 	gsed -i 's#  pause#  rep; nop#'      $(WORKSRC)/src/os/unix/ngx_sunpro_amd64.il
-	$(MAKECOOKIE)
+	@$(MAKECOOKIE)
 
 post-install-modulated:
 	ginstall -d $(DESTDIR)$(sysconfdir)/init.d
@@ -109,4 +136,4 @@
 	cp -r contrib/* $(DESTDIR)$(sharedstatedir)/nginx/contrib; \
 	cp $(NGINXDOCS) $(DESTDIR)$(docdir)/nginx
 	rm -rf $(DESTDIR)/var/run/nginx
-	$(MAKECOOKIE)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/nginx/trunk/checksums
===================================================================
--- csw/mgar/pkg/nginx/trunk/checksums	2012-12-04 16:01:05 UTC (rev 19811)
+++ csw/mgar/pkg/nginx/trunk/checksums	2012-12-04 16:19:05 UTC (rev 19812)
@@ -1 +1 @@
-f9f3e60f498b7ffac778ee72ea7db309  nginx-1.1.8.tar.gz
+4f5a55187a3d45fa37d99d07ddd90800  nginx-1.2.5.tar.gz

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