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

[aigoshin at users.sourceforge.net]

Revision: 2784
          http://gar.svn.sourceforge.net/gar/?rev=2784&view=rev
Author:   aigoshin
Date:     2009-01-10 19:11:21 +0000 (Sat, 10 Jan 2009)

Log Message:
-----------
nginx: switch to SUNPRO C

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-10 15:54:08 UTC (rev 2783)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2009-01-10 19:11:21 UTC (rev 2784)
@@ -18,9 +18,11 @@
 
 REQUIRED_PKGS = CSWosslrt CSWpcre  CSWzlib
 
-GARCOMPILER = GNU
+CFLAGS =
 
-#CONFIGURE_ARGS += --with-cpu-opt=pentiumpro
+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 += --prefix=$(prefix)/var/nginx
 CONFIGURE_ARGS += --conf-path=$(sysconfdir)/nginx/nginx.conf
 CONFIGURE_ARGS += --sbin-path=$(sbindir)/nginx
@@ -31,8 +33,6 @@
 CONFIGURE_ARGS += --http-proxy-temp-path=$(prefix)/var/spool/nginx/proxy
 CONFIGURE_ARGS += --error-log-path=$(prefix)/var/log/nginx/error.log
 CONFIGURE_ARGS += --http-log-path=$(prefix)/var/log/nginx/access.log
-CONFIGURE_ARGS += --with-cc-opt="-I/opt/csw/include/openssl"
-CONFIGURE_ARGS += --with-ld-opt="-L/opt/csw/lib"
 CONFIGURE_ARGS += --with-md5=YES
 CONFIGURE_ARGS += --with-sha1=YES
 CONFIGURE_ARGS += --with-http_ssl_module
@@ -47,15 +47,14 @@
 
 include gar/category.mk
 
-
 NGINXDOC = CHANGES CHANGES.ru LICENSE README
 
 post-install:
 	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)/sbin
 	ginstall -d $(DESTDIR)$(prefix)/var/nginx
 	ginstall -d $(DESTDIR)$(prefix)/var/nginx/sites
 	ginstall -d $(DESTDIR)$(prefix)/var/log/nginx

Modified: csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec
===================================================================
--- csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec	2009-01-10 15:54:08 UTC (rev 2783)
+++ csw/mgar/pkg/nginx/trunk/files/CSWnginx.gspec	2009-01-10 19:11:21 UTC (rev 2784)
@@ -1,7 +1,7 @@
 %var            bitname nginx
 %var            pkgname CSWnginx
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/LICENSE
+%copyright      url file://%{DESTDIR}/LICENSE
 %var            SERVICE_CONF_FILES /opt/csw/etc/nginx/nginx.conf       
 %include        url file://%{PKGLIB}/smf_enabled.gspec
 %var            RC_INIT_SCRIPT     cswnginx


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