date:20090211

[csw-devel] SF.net SVN: gar:[3060] csw/mgar/pkg/gettext/trunk/Makefile

2009-02-11 Thread harpchad

Revision: 3060
  http://gar.svn.sourceforge.net/gar/?rev=3060&view=rev
Author:   harpchad
Date: 2009-02-11 18:02:39 + (Wed, 11 Feb 2009)

Log Message:
---
Add a devel package

Modified Paths:
--
csw/mgar/pkg/gettext/trunk/Makefile

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===
--- csw/mgar/pkg/gettext/trunk/Makefile 2009-02-10 21:17:01 UTC (rev 3059)
+++ csw/mgar/pkg/gettext/trunk/Makefile 2009-02-11 18:02:39 UTC (rev 3060)
@@ -7,11 +7,13 @@
GNU gettext utilities are a set of tools that provides a framework to 
help other GNU packages produce multi-lingual messages
 endef
 
-PACKAGES = CSWggettext CSWggettextdoc
+PACKAGES = CSWggettext CSWggettextdevel CSWggettextdoc
 CATALOGNAME_CSWggettext = ggettext
 CATALOGNAME_CSWggettextdoc = ggettextdoc
+CATALOGNAME_CSWggettextdevel = ggettextdevel
 SPKG_DESC_CSWggettext = GNU locale utilities
 SPKG_DESC_CSWggettextdoc = GNU locale utilities documentation
+SPKG_DESC_CSWggettextdevel = GNU locale utilities development headers and 
utilities
 ARCHALL_CSWggettextdoc = 1
 
 MASTER_SITES = $(GNU_MIRROR)
@@ -59,6 +61,7 @@
 MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/.*
 
 PKGFILES_CSWggettextdoc  = $(PKGFILES_DOC)
+PKGFILES_CSWgettextdevel = $(PKGFILES_DEVEL)
 
 include gar/category.mk
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

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

2009-02-11 Thread aigoshin

Revision: 3061
  http://gar.svn.sourceforge.net/gar/?rev=3061&view=rev
Author:   aigoshin
Date: 2009-02-11 19:17:34 + (Wed, 11 Feb 2009)

Log Message:
---
nginx: milestone 2.4

Modified Paths:
--
csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall
csw/mgar/pkg/nginx/trunk/files/svc-cswnginx

Modified: csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall
===
--- csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall 2009-02-11 18:02:39 UTC 
(rev 3060)
+++ csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall 2009-02-11 19:17:34 UTC 
(rev 3061)
@@ -4,42 +4,50 @@
 
#
 
 if [ $UPGRADE_NGINX -eq 1 ]; then
+   MSG=""
UPGRADE_NGINX_ERR=0
-   if [ -x "$BASEDIR/opt/csw/lib/svc/method/svc-cswnginx" ]; then
-   MSG=`$BASEDIR/opt/csw/lib/svc/method/svc-cswnginx upgrade`
-   if [ $? -eq 0 ]; then
-   echo " "
-   echo "nginx was upgraded"
-   else
+   if [ "$SMF" = "yes" ]; then
+   CSWNGINX="$BASEDIR/opt/csw/lib/svc/method/svc-cswnginx"
+   else
+   CSWNGINX="$BASEDIR/etc/init.d/cswnginx"
+   fi
+   if [ -x $CSWNGINX ]; then
+   MSG=`$CSWNGINX upgrade`
+   if [ $? -ne 0 ]; then
UPGRADE_NGINX_ERR=1
fi
-   else
-   if [ -x $BASEDIR/etc/init.d/cswnginx ]; then
-   MSG=`$BASEDIR/etc/init.d/cswnginx upgrade`
-   if [ $? -eq 0 ]; then
-   echo " "
-   echo "nginx was upgraded"
-   else
-   UPGRADE_NGINX_ERR=1
-   fi
-   else
-   echo " "
-   echo "nginx was NOT upgraded"
-   fi
fi
 
-   if [ $UPGRADE_NGINX_ERR -eq 1 ]; then
+   if [ $UPGRADE_NGINX_ERR -eq 0 ]; then
echo " "
+   echo "nginx was upgraded"
+   echo " "
+   echo "If this new version of nginx works properly please run"
+   echo "'$CSWNGINX upgrade-commit'"
+   echo "to finalize the online upgrade process."
+   echo " "
+   echo "If there are problems with new version you can rollback"
+   echo "to the old version (which is still running) by command"
+   echo "'$CSWNGINX upgrade-rollback'"
+   echo "and subsequent reinstallation of the old package."
+   echo " "
+   echo "More details can be found in the nginx documentation:"
+   echo "http://sysoev.ru/nginx/docs/control.html";
+   else
+   echo " "
echo "nginx was NOT upgraded"
echo "$MSG"
fi
 else
echo " "
-   echo "This package may use online upgrade feature of nginx which"
-   echo "allows not to interrupt the processing of clients requests"
-   echo "during the nginx version upgrade."
-   echo "To use it you should install the package over the existing"
-   echo "version (without removing)."
+   echo "This package may use online upgrade feature of nginx which allows"
+   echo "not to interrupt the processing of clients requests during the 
nginx"
+   echo "version upgrade. To use it you should install the package over 
the"
+   echo "existing version (without preliminary removing)."
+   echo " "
+   echo "NOTE: if you wish to take advantage of nginx online upgrade 
feature"
+   echo "you should NOT use CSW automatic package update since it 
sequently"
+   echo "runs pkgrm/pkgadd."
 fi
 
 
#

Modified: csw/mgar/pkg/nginx/trunk/files/svc-cswnginx
===
--- csw/mgar/pkg/nginx/trunk/files/svc-cswnginx 2009-02-11 18:02:39 UTC (rev 
3060)
+++ csw/mgar/pkg/nginx/trunk/files/svc-cswnginx 2009-02-11 19:17:34 UTC (rev 
3061)
@@ -9,8 +9,8 @@
 PIDFILE=${VARRUNX}/nginx.pid
 PIDFILO=${VARRUNX}/nginx.pid.oldbin
 
-[ ! -f ${NGINX} ]   && exit $NGINX
-[ ! -f ${CFGFILE} ] && exit $CFGFILE
+#[ ! -f ${NGINX} ]   && exit 255
+#[ ! -f ${CFGFILE} ] && exit 254
 
 
 start() {
@@ -80,8 +80,10 @@
COMM=`/bin/ps -o comm= -p $FPID`
if [ "$NGINX" = "$COMM" ]; then
echo "running"
+   return 0
else
echo "running, but it is not a CSW package"
+   return 1
fi
 }
 
@@ -89,10 +91,47 @@
 {
killpidf -USR2
RETVAL=$?
+   [ $RETVAL -ne 0 ] && return $RETVAL
+   OLDBINPID=0
+   for i in 1 2 3 4 5; do
+   if [ -f $PIDFILO ]; then
+   OLDBINPID=1
+

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

2009-02-11 Thread aigoshin

Revision: 3062
  http://gar.svn.sourceforge.net/gar/?rev=3062&view=rev
Author:   aigoshin
Date: 2009-02-11 19:19:45 + (Wed, 11 Feb 2009)

Log Message:
---
nginx: milestone 2.5

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

Modified: csw/mgar/pkg/nginx/trunk/checksums
===
--- csw/mgar/pkg/nginx/trunk/checksums  2009-02-11 19:17:34 UTC (rev 3061)
+++ csw/mgar/pkg/nginx/trunk/checksums  2009-02-11 19:19:45 UTC (rev 3062)
@@ -1,7 +1,7 @@
 31d26f66824fd2d3f33ac0b3b9db1532  download/nginx-0.7.30.tar.gz
 12b5333e18e985b17f8a5465646e9a8a  download/CSWnginx.gspec
 521cd4c0248aebfdb25df48a11a8cc49  download/CSWnginx.checkinstall
-a47b8ac99b738bb19805459c6c1e5543  download/CSWnginx.postinstall
+1e505987ba8df7f61f21fc28b926fc5a  download/CSWnginx.postinstall
 e9178dc33f2d38aab8f118a8f0550ac7  download/CSWnginx.preremove
 5c832758a62ee319ea9dfd1829d736eb  download/cswnginx.xml
-19bb7c5d6246343f54b13afb327f7bcb  download/svc-cswnginx
+706889f6967b3b327c14aa0ff5c271ab  download/svc-cswnginx


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[3063] csw/mgar/pkg/gettext/trunk/Makefile

2009-02-11 Thread harpchad

Revision: 3063
  http://gar.svn.sourceforge.net/gar/?rev=3063&view=rev
Author:   harpchad
Date: 2009-02-11 20:57:46 + (Wed, 11 Feb 2009)

Log Message:
---
Remove devel, add runtime

Modified Paths:
--
csw/mgar/pkg/gettext/trunk/Makefile

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===
--- csw/mgar/pkg/gettext/trunk/Makefile 2009-02-11 19:19:45 UTC (rev 3062)
+++ csw/mgar/pkg/gettext/trunk/Makefile 2009-02-11 20:57:46 UTC (rev 3063)
@@ -10,10 +10,10 @@
 PACKAGES = CSWggettext CSWggettextdevel CSWggettextdoc
 CATALOGNAME_CSWggettext = ggettext
 CATALOGNAME_CSWggettextdoc = ggettextdoc
-CATALOGNAME_CSWggettextdevel = ggettextdevel
-SPKG_DESC_CSWggettext = GNU locale utilities
-SPKG_DESC_CSWggettextdoc = GNU locale utilities documentation
-SPKG_DESC_CSWggettextdevel = GNU locale utilities development headers and 
utilities
+CATALOGNAME_CSWggettextrt = ggettextrt
+SPKG_DESC_CSWggettext = GNU locale utilities and development headers
+SPKG_DESC_CSWggettextdoc = GNU locale documentation
+SPKG_DESC_CSWggettextdevel = GNU locale runtime
 ARCHALL_CSWggettextdoc = 1
 
 MASTER_SITES = $(GNU_MIRROR)
@@ -48,7 +48,9 @@
 BUILD64 = 1
 NO_ISAEXEC = 1
 
-REQUIRED_PKGS_CSWggettext = CSWiconv CSWexpat CSWncurses
+REQUIRED_PKGS_CSWggettextrt = CSWiconv
+REQUIRED_PKGS_CSWggettext = CSWgettextrt CSWiconv CSWexpat CSWncurses
+REQUIRED_PKGS_CSWggettextdoc = CSWggettext
 
 #NOTE: gettext tests are sensitive to bash environment variables, make sure
 #  custom paths are prefixed by $PATH, may be better to set aside
@@ -60,24 +62,46 @@
 MERGE_EXCLUDE_FILES += .*/iconv.m4
 MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/.*
 
+PKGFILES_CSWggettextrt  = /opt/csw/lib/libintl.* /opt/csw/lib/$(ISA)/libintl.*
+PKGFILES_CSWggettextrt += /opt/csw/lib/libasprintf.* 
/opt/csw/lib/$(ISA)/libasprintf.*
+PKGFILES_CSWggettextrt += /opt/csw/lib/libgettextpo.* 
/opt/csw/lib/$(ISA)/libgettextpo.*
+PKGFILES_CSWggettextrt += /opt/csw/bin/ggettext /opt/csw/bin/gngettext 
/opt/csw/bin/genvsubst
+PKGFILES_CSWggettextrt += /opt/csw/bin/ggettext.sh 
/opt/csw/share/java/libintl.jar
+PKGFILES_CSWggettextrt += /opt/csw/share/locale/.*
 PKGFILES_CSWggettextdoc  = $(PKGFILES_DOC)
-PKGFILES_CSWgettextdevel = $(PKGFILES_DEVEL)
 
 include gar/category.mk
 
 #Include old libraries for compatibility with existing packages
 #  TODO: Convert to modulated builds
 post-install-isa-sparcv8:
+   @mkdir $(INSTALLISADIR)/opt/csw/share/java
+   @mv $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar 
$(INSTALLISADIR)/opt/csw/share/java
@cp $(FILEDIR)/libgettextlib-0.14.1.so.s 
$(INSTALLISADIR)/opt/csw/lib/libgettextlib-0.14.1.so
@cp $(FILEDIR)/libintl.so.2.s $(INSTALLISADIR)/opt/csw/lib/libintl.so.2
@cp $(FILEDIR)/libintl.so.3.s $(INSTALLISADIR)/opt/csw/lib/libintl.so.3
+   @$(MAKECOOKIE)
+   $(DONADA)
 
 post-install-isa-sparcv9:
+   @rm $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar
@cp $(FILEDIR)/libgettextlib-0.14.1.so.s9 
$(INSTALLISADIR)/opt/csw/lib/64/libgettextlib-0.14.1.so
@cp $(FILEDIR)/libintl.so.2.s9 
$(INSTALLISADIR)/opt/csw/lib/64/libintl.so.2
@cp $(FILEDIR)/libintl.so.3.s9 
$(INSTALLISADIR)/opt/csw/lib/64/libintl.so.3
+   @$(MAKECOOKIE)
+   $(DONADA)
 
 post-install-isa-i386:
+   @mkdir $(INSTALLISADIR)/opt/csw/share/java
+   @mv $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar 
$(INSTALLISADIR)/opt/csw/share/java
+   @cp $(FILEDIR)/libgettextlib-0.14.1.so.s 
$(INSTALLISADIR)/opt/csw/lib/libgettextlib-0.14.1.so
@cp $(FILEDIR)/libgettextlib-0.14.1.so.i 
$(INSTALLISADIR)/opt/csw/lib/libgettextlib-0.14.1.so
@cp $(FILEDIR)/libintl.so.2.i $(INSTALLISADIR)/opt/csw/lib/libintl.so.2
@cp $(FILEDIR)/libintl.so.3.i $(INSTALLISADIR)/opt/csw/lib/libintl.so.3
+   @$(MAKECOOKIE)
+   $(DONADA)
+
+post-install-isa-amd64:
+   @rm $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar
+   @$(MAKECOOKIE)
+   $(DONADA)


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[3064] csw/mgar/gar/v2/gar.conf.mk

2009-02-11 Thread wbonnet

Revision: 3064
  http://gar.svn.sourceforge.net/gar/?rev=3064&view=rev
Author:   wbonnet
Date: 2009-02-11 21:06:49 + (Wed, 11 Feb 2009)

Log Message:
---
Add missing uwatch definitions

Modified Paths:
--
csw/mgar/gar/v2/gar.conf.mk

Modified: csw/mgar/gar/v2/gar.conf.mk
===
--- csw/mgar/gar/v2/gar.conf.mk 2009-02-11 20:57:46 UTC (rev 3063)
+++ csw/mgar/gar/v2/gar.conf.mk 2009-02-11 21:06:49 UTC (rev 3064)
@@ -501,6 +501,8 @@
 SF_MIRRORS  ?= http://downloads.sourceforge.net/$(SF_PROJ)/
 # Keep this for compatibility
 SF_MIRROR= $(firstword $(SF_MIRRORS))
+SF_PROJECT_SHOWFILE ?= http://sourceforge.net/project/showfiles.php?group_id
+UPSTREAM_USE_SF?= 0
 
 # Google Code
 GOOGLE_PROJECT ?= $(GARNAME)


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[3065] csw/mgar/pkg/gettext/trunk/Makefile

2009-02-11 Thread harpchad

Revision: 3065
  http://gar.svn.sourceforge.net/gar/?rev=3065&view=rev
Author:   harpchad
Date: 2009-02-11 21:39:47 + (Wed, 11 Feb 2009)

Log Message:
---
fix typos

Modified Paths:
--
csw/mgar/pkg/gettext/trunk/Makefile

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===
--- csw/mgar/pkg/gettext/trunk/Makefile 2009-02-11 21:06:49 UTC (rev 3064)
+++ csw/mgar/pkg/gettext/trunk/Makefile 2009-02-11 21:39:47 UTC (rev 3065)
@@ -7,13 +7,13 @@
GNU gettext utilities are a set of tools that provides a framework to 
help other GNU packages produce multi-lingual messages
 endef
 
-PACKAGES = CSWggettext CSWggettextdevel CSWggettextdoc
+PACKAGES = CSWggettext CSWggettextrt CSWggettextdoc
 CATALOGNAME_CSWggettext = ggettext
 CATALOGNAME_CSWggettextdoc = ggettextdoc
 CATALOGNAME_CSWggettextrt = ggettextrt
 SPKG_DESC_CSWggettext = GNU locale utilities and development headers
 SPKG_DESC_CSWggettextdoc = GNU locale documentation
-SPKG_DESC_CSWggettextdevel = GNU locale runtime
+SPKG_DESC_CSWggettextrt = GNU locale runtime
 ARCHALL_CSWggettextdoc = 1
 
 MASTER_SITES = $(GNU_MIRROR)


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[3066] csw/mgar/pkg/gettext/trunk/Makefile

2009-02-11 Thread harpchad

Revision: 3066
  http://gar.svn.sourceforge.net/gar/?rev=3066&view=rev
Author:   harpchad
Date: 2009-02-11 21:44:29 + (Wed, 11 Feb 2009)

Log Message:
---
fix typos

Modified Paths:
--
csw/mgar/pkg/gettext/trunk/Makefile

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===
--- csw/mgar/pkg/gettext/trunk/Makefile 2009-02-11 21:39:47 UTC (rev 3065)
+++ csw/mgar/pkg/gettext/trunk/Makefile 2009-02-11 21:44:29 UTC (rev 3066)
@@ -7,7 +7,7 @@
GNU gettext utilities are a set of tools that provides a framework to 
help other GNU packages produce multi-lingual messages
 endef
 
-PACKAGES = CSWggettext CSWggettextrt CSWggettextdoc
+PACKAGES = CSWggettextrt CSWggettextdoc CSWggettext
 CATALOGNAME_CSWggettext = ggettext
 CATALOGNAME_CSWggettextdoc = ggettextdoc
 CATALOGNAME_CSWggettextrt = ggettextrt
@@ -49,7 +49,7 @@
 NO_ISAEXEC = 1
 
 REQUIRED_PKGS_CSWggettextrt = CSWiconv
-REQUIRED_PKGS_CSWggettext = CSWgettextrt CSWiconv CSWexpat CSWncurses
+REQUIRED_PKGS_CSWggettext = CSWggettextrt CSWiconv CSWexpat CSWncurses
 REQUIRED_PKGS_CSWggettextdoc = CSWggettext
 
 #NOTE: gettext tests are sensitive to bash environment variables, make sure


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[3067] csw/mgar/pkg/clearsilver/trunk

2009-02-11 Thread valholla

Revision: 3067
  http://gar.svn.sourceforge.net/gar/?rev=3067&view=rev
Author:   valholla
Date: 2009-02-11 21:50:10 + (Wed, 11 Feb 2009)

Log Message:
---
update gar to v2

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

Property Changed:

csw/mgar/pkg/clearsilver/trunk/


Property changes on: csw/mgar/pkg/clearsilver/trunk
___
Deleted: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1


Modified: csw/mgar/pkg/clearsilver/trunk/Makefile
===
--- csw/mgar/pkg/clearsilver/trunk/Makefile 2009-02-11 21:44:29 UTC (rev 
3066)
+++ csw/mgar/pkg/clearsilver/trunk/Makefile 2009-02-11 21:50:10 UTC (rev 
3067)
@@ -1,5 +1,5 @@
 GARNAME = clearsilver
-GARVERSION = 0.10.4
+GARVERSION = 0.10.5
 CATEGORIES = utils
 
 DESCRIPTION = Language-neutral HTML template system
@@ -12,26 +12,36 @@
 
 MASTER_SITES = http://www.clearsilver.net/downloads/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWcs,depend prototype)
-DISTFILES += $(call admfiles,CSWpmcs,depend prototype)
-DISTFILES += $(call admfiles,CSWpycs,depend prototype)
 
+PACKAGES = CSWcs CSWpmcs CSWpycs
+
+REQUIRED_PKGS_CSWcs   = CSWggettext CSWzlib
+REQUIRED_PKGS_CSWpmcs = CSWperl CSWzlib
+REQUIRED_PKGS_CSWpycs = CSWggettext CSWpython CSWzlib
+
+CATALOGNAME_CSWcs   = clearsilver
+CATALOGNAME_CSWpmcs = pm_clearsilver
+CATALOGNAME_CSWpycs = py_clearsilver
+
+SPKG_DESC_CSWcs   = Language-neutral HTML template system
+SPKG_DESC_CSWpmcs = Clearsilver Perl language binding
+SPKG_DESC_CSWpycs = Clearsilver Python language binding
+
+PKGFILES_CSWpmcs  = $(libdir)/perl/.*
+PKGFILES_CSWpmcs += $(mandir)/*perl*
+PKGFILES_CSWpycs =  $(libdir)/python*/.*
+PKGFILES_CSWpmcs += $(mandir)/*python*
+
 # We define upstream file regex so we can be notifed of new upstream software 
release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)
 
-# Remove an unneeded linux-only header
+GNUCOMPILER = 1
+
 PATCHFILES += linuxheader.diff
 
-# Use vendor install for the perl module
-PATCHFILES += perlbuild.diff
-
-GARCOMPILER = GNU
-
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-python=$(bindir)/python
 CONFIGURE_ARGS += --with-perl=$(bindir)/perl
-#CONFIGURE_ARGS += --with-ruby=$(bindir)/ruby
-#CONFIGURE_ARGS += --with-java=/usr/jdk/j2se1.4.2_02/j2se
 CONFIGURE_ARGS += --enable-gettext
 
 # No c-sharp at the moment
@@ -41,18 +51,10 @@
 CONFIGURE_ARGS += --disable-ruby
 CONFIGURE_ARGS += --disable-java
 
+EXTRA_LINKER_FLAGS += -lintl
+
 # No test target
 TEST_SCRIPTS =
 
 include gar/category.mk
 
-# The perl binding needs to use the Sun compiler, regardless of whether the
-# main extension uses gcc.
-ifeq ($(GARCOMPILER),GNU)
-PATH := $(PATH):$(SUN_CC_HOME)/bin
-export PATH
-endif
-
-LIBS += -lintl
-export LIBS
-

Modified: csw/mgar/pkg/clearsilver/trunk/checksums
===
--- csw/mgar/pkg/clearsilver/trunk/checksums2009-02-11 21:44:29 UTC (rev 
3066)
+++ csw/mgar/pkg/clearsilver/trunk/checksums2009-02-11 21:50:10 UTC (rev 
3067)
@@ -1,12 +1,2 @@
-9523df7ef17e41a01dbae5032a3e450b  download/clearsilver-0.10.4.tar.gz
-6135b3efabaf9a4b1e911530437e0aa0  download/CSWcs.gspec
-0c687c75a85aadcd72762d6a1d503165  download/CSWcs.depend
-43de53e64a60770d4e572d42e4a1955a  download/CSWcs.prototype
-566c39b08d4e14ab14f7b836d7fac832  download/CSWpmcs.gspec
-9ebd2fa96ac23e41c6d49743c203628c  download/CSWpmcs.depend
-1ade3938da7c2a375121758122ad4ae8  download/CSWpmcs.prototype
-448f995195c2566dcc1468346124da5d  download/CSWpycs.gspec
-e99be883aad6d8aac5038033cccbdebd  download/CSWpycs.depend
-ea1ef76e146970187d96a69f71e73a97  download/CSWpycs.prototype
+b8c0c7fbe0ef5e06e0c935f134304d44  download/clearsilver-0.10.5.tar.gz
 b026a9b055bd0fa798b98f97680fdce9  download/linuxheader.diff
-977b03892d3c1b0d8e445f09a50a3620  download/perlbuild.diff


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[3068] csw/mgar/pkg/clearsilver/trunk/

2009-02-11 Thread valholla

Revision: 3068
  http://gar.svn.sourceforge.net/gar/?rev=3068&view=rev
Author:   valholla
Date: 2009-02-11 21:54:52 + (Wed, 11 Feb 2009)

Log Message:
---
try again propset

Property Changed:

csw/mgar/pkg/clearsilver/trunk/


Property changes on: csw/mgar/pkg/clearsilver/trunk
___
Added: svn:externals
   + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2



This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[3069] csw/mgar/gar/v2/gar.pkg.mk

2009-02-11 Thread dmichelsen

Revision: 3069
  http://gar.svn.sourceforge.net/gar/?rev=3069&view=rev
Author:   dmichelsen
Date: 2009-02-11 22:11:03 + (Wed, 11 Feb 2009)

Log Message:
---
mGAR v2: Make sure licenses are always put in the right location

Modified Paths:
--
csw/mgar/gar/v2/gar.pkg.mk

Modified: csw/mgar/gar/v2/gar.pkg.mk
===
--- csw/mgar/gar/v2/gar.pkg.mk  2009-02-11 21:54:52 UTC (rev 3068)
+++ csw/mgar/gar/v2/gar.pkg.mk  2009-02-11 22:11:03 UTC (rev 3069)
@@ -70,8 +70,10 @@
 )
 endef
 
+# We do not put this in $(docdir), as the prefix may have been reset to some
+# other location and the license should always be in a fixed location.
 define licensedir
-$(docdir)/$(call catalogname,$(1))
+$(BUILD_PREFIX)/share/doc/$(call catalogname,$(1))
 endef
 
 # Set this to your svn binary


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[3070] csw/mgar/pkg/a52dec/trunk/Makefile

2009-02-11 Thread wbonnet

Revision: 3070
  http://gar.svn.sourceforge.net/gar/?rev=3070&view=rev
Author:   wbonnet
Date: 2009-02-11 22:14:42 + (Wed, 11 Feb 2009)

Log Message:
---
Remove buggy upstream definition

Modified Paths:
--
csw/mgar/pkg/a52dec/trunk/Makefile

Modified: csw/mgar/pkg/a52dec/trunk/Makefile
===
--- csw/mgar/pkg/a52dec/trunk/Makefile  2009-02-11 22:11:03 UTC (rev 3069)
+++ csw/mgar/pkg/a52dec/trunk/Makefile  2009-02-11 22:14:42 UTC (rev 3070)
@@ -13,8 +13,6 @@
 DISTFILES += $(call admfiles,CSWliba52, depend)
 
 # We define upstream file regex so we can be notifed of new upstream software 
release
-UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=33591
-UPSTREAM_USE_SF = 1
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
 CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[3071] csw/mgar/gar/v2/gar.pkg.mk

2009-02-11 Thread dmichelsen

Revision: 3071
  http://gar.svn.sourceforge.net/gar/?rev=3071&view=rev
Author:   dmichelsen
Date: 2009-02-11 22:24:04 + (Wed, 11 Feb 2009)

Log Message:
---
mGAR v2: Add dependency to diretory missing under certain circumstances

Modified Paths:
--
csw/mgar/gar/v2/gar.pkg.mk

Modified: csw/mgar/gar/v2/gar.pkg.mk
===
--- csw/mgar/gar/v2/gar.pkg.mk  2009-02-11 22:14:42 UTC (rev 3070)
+++ csw/mgar/gar/v2/gar.pkg.mk  2009-02-11 22:24:04 UTC (rev 3071)
@@ -374,7 +374,7 @@
 )
 endef
 
-merge-license-%:
+merge-license-%: $(WORKDIR)
$(_DBG)$(if $(and $(LICENSE_$*),$(LICENSE_FULL_$*)),$(error Both 
LICENSE_$* and LICENSE_FULL_$* have been specified where only one is allowed)) \
$(if $(and $(filter $*,$(PACKAGES)),$(or 
$(LICENSE),$(LICENSE_FULL),$(LICENSE_$*),$(LICENSE_FULL_$*))), \
LICENSEFILE=$(or $(call licensefile,$*),$(if 
$(_LICENSE_IS_DEFAULT),,$(error Cannot find license file for package $*))); \


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[3072] csw/mgar/pkg/gettext/trunk/Makefile

2009-02-11 Thread harpchad

Revision: 3072
  http://gar.svn.sourceforge.net/gar/?rev=3072&view=rev
Author:   harpchad
Date: 2009-02-12 01:00:13 + (Thu, 12 Feb 2009)

Log Message:
---
Sytax fixes

Modified Paths:
--
csw/mgar/pkg/gettext/trunk/Makefile

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===
--- csw/mgar/pkg/gettext/trunk/Makefile 2009-02-11 22:24:04 UTC (rev 3071)
+++ csw/mgar/pkg/gettext/trunk/Makefile 2009-02-12 01:00:13 UTC (rev 3072)
@@ -62,9 +62,9 @@
 MERGE_EXCLUDE_FILES += .*/iconv.m4
 MERGE_EXCLUDE_FILES += /opt/csw/bin/$(ISA)/.*
 
-PKGFILES_CSWggettextrt  = /opt/csw/lib/libintl.* /opt/csw/lib/$(ISA)/libintl.*
-PKGFILES_CSWggettextrt += /opt/csw/lib/libasprintf.* 
/opt/csw/lib/$(ISA)/libasprintf.*
-PKGFILES_CSWggettextrt += /opt/csw/lib/libgettextpo.* 
/opt/csw/lib/$(ISA)/libgettextpo.*
+PKGFILES_CSWggettextrt  = $(call baseisadirs,$(libdir),libintl\..*)
+PKGFILES_CSWggettextrt += $(call baseisadirs,$(libdir),libasprintf\..*)
+PKGFILES_CSWggettextrt += $(call baseisadirs,$(libdir),libgettextpo\..*) 
 PKGFILES_CSWggettextrt += /opt/csw/bin/ggettext /opt/csw/bin/gngettext 
/opt/csw/bin/genvsubst
 PKGFILES_CSWggettextrt += /opt/csw/bin/ggettext.sh 
/opt/csw/share/java/libintl.jar
 PKGFILES_CSWggettextrt += /opt/csw/share/locale/.*
@@ -80,7 +80,6 @@
@cp $(FILEDIR)/libgettextlib-0.14.1.so.s 
$(INSTALLISADIR)/opt/csw/lib/libgettextlib-0.14.1.so
@cp $(FILEDIR)/libintl.so.2.s $(INSTALLISADIR)/opt/csw/lib/libintl.so.2
@cp $(FILEDIR)/libintl.so.3.s $(INSTALLISADIR)/opt/csw/lib/libintl.so.3
-   @$(MAKECOOKIE)
$(DONADA)
 
 post-install-isa-sparcv9:
@@ -88,7 +87,6 @@
@cp $(FILEDIR)/libgettextlib-0.14.1.so.s9 
$(INSTALLISADIR)/opt/csw/lib/64/libgettextlib-0.14.1.so
@cp $(FILEDIR)/libintl.so.2.s9 
$(INSTALLISADIR)/opt/csw/lib/64/libintl.so.2
@cp $(FILEDIR)/libintl.so.3.s9 
$(INSTALLISADIR)/opt/csw/lib/64/libintl.so.3
-   @$(MAKECOOKIE)
$(DONADA)
 
 post-install-isa-i386:
@@ -98,10 +96,8 @@
@cp $(FILEDIR)/libgettextlib-0.14.1.so.i 
$(INSTALLISADIR)/opt/csw/lib/libgettextlib-0.14.1.so
@cp $(FILEDIR)/libintl.so.2.i $(INSTALLISADIR)/opt/csw/lib/libintl.so.2
@cp $(FILEDIR)/libintl.so.3.i $(INSTALLISADIR)/opt/csw/lib/libintl.so.3
-   @$(MAKECOOKIE)
$(DONADA)
 
 post-install-isa-amd64:
@rm $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar
-   @$(MAKECOOKIE)
$(DONADA)


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.
___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[3073] csw/mgar/pkg/clearsilver/trunk

2009-02-11 Thread valholla

Revision: 3073
  http://gar.svn.sourceforge.net/gar/?rev=3073&view=rev
Author:   valholla
Date: 2009-02-12 04:17:09 + (Thu, 12 Feb 2009)

Log Message:
---
update for python2.6

Modified Paths:
--
csw/mgar/pkg/clearsilver/trunk/Makefile
csw/mgar/pkg/clearsilver/trunk/checksums
csw/mgar/pkg/clearsilver/trunk/files/perlbuild.diff
csw/mgar/pkg/clearsilver/trunk/files/pybuild.diff

Removed Paths:
-
csw/mgar/pkg/clearsilver/trunk/files/linuxheader.diff

Modified: csw/mgar/pkg/clearsilver/trunk/Makefile
===
--- csw/mgar/pkg/clearsilver/trunk/Makefile 2009-02-12 01:00:13 UTC (rev 
3072)
+++ csw/mgar/pkg/clearsilver/trunk/Makefile 2009-02-12 04:17:09 UTC (rev 
3073)
@@ -32,13 +32,14 @@
 PKGFILES_CSWpycs =  $(libdir)/python*/.*
 PKGFILES_CSWpmcs += $(mandir)/*python*
 
+GARCOMPILER = GNU
+
 # We define upstream file regex so we can be notifed of new upstream software 
release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)
 
-GNUCOMPILER = 1
+PATCHFILES += perlbuild.diff
+PATCHFILES += pybuild.diff
 
-PATCHFILES += linuxheader.diff
-
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-python=$(bindir)/python
 CONFIGURE_ARGS += --with-perl=$(bindir)/perl
@@ -58,3 +59,4 @@
 
 include gar/category.mk
 
+PATH := $(PATH):$(SOS11_CC_HOME)/bin

Modified: csw/mgar/pkg/clearsilver/trunk/checksums
===
--- csw/mgar/pkg/clearsilver/trunk/checksums2009-02-12 01:00:13 UTC (rev 
3072)
+++ csw/mgar/pkg/clearsilver/trunk/checksums2009-02-12 04:17:09 UTC (rev 
3073)
@@ -1,2 +1,3 @@
 b8c0c7fbe0ef5e06e0c935f134304d44  download/clearsilver-0.10.5.tar.gz
-b026a9b055bd0fa798b98f97680fdce9  download/linuxheader.diff
+1c25fda8bb258d8ddcf3ad9b7235  download/perlbuild.diff
+3cf628054d5c839169c1a01d40708f1a  download/pybuild.diff

Deleted: csw/mgar/pkg/clearsilver/trunk/files/linuxheader.diff
===
--- csw/mgar/pkg/clearsilver/trunk/files/linuxheader.diff   2009-02-12 
01:00:13 UTC (rev 3072)
+++ csw/mgar/pkg/clearsilver/trunk/files/linuxheader.diff   2009-02-12 
04:17:09 UTC (rev 3073)
@@ -1,11 +0,0 @@
-diff --speed-large-files --minimal -Nru clearsilver-0.10.4.orig/cgi/cgiwrap.c 
clearsilver-0.10.4/cgi/cgiwrap.c
 clearsilver-0.10.4.orig/cgi/cgiwrap.c  2006-03-28 19:12:37.0 
-0500
-+++ clearsilver-0.10.4/cgi/cgiwrap.c   2007-01-30 13:39:27.43588 -0500
-@@ -11,7 +11,6 @@
- 
- #include "cs_config.h"
- 
--#include 
- #include 
- #include 
- #include 

Modified: csw/mgar/pkg/clearsilver/trunk/files/perlbuild.diff
===
--- csw/mgar/pkg/clearsilver/trunk/files/perlbuild.diff 2009-02-12 01:00:13 UTC 
(rev 3072)
+++ csw/mgar/pkg/clearsilver/trunk/files/perlbuild.diff 2009-02-12 04:17:09 UTC 
(rev 3073)
@@ -1,12 +1,30 @@
-diff --speed-large-files --minimal -Nru clearsilver-0.10.4.orig/Makefile 
clearsilver-0.10.4/Makefile
 clearsilver-0.10.4.orig/Makefile   2006-11-15 01:54:13.0 -0500
-+++ clearsilver-0.10.4/Makefile2007-01-30 13:54:59.322121000 -0500
-@@ -29,7 +29,7 @@
-   @for mdir in $(SUBDIRS); do \
- if test -d $$mdir; then \
-   if test -f $$mdir/Makefile.PL -a ! -f $$mdir/Makefile; then \
--cd $$mdir; $(PERL) Makefile.PL PREFIX=$(prefix); cd ..; \
-+cd $$mdir; $(PERL) Makefile.PL INSTALLDIRS=vendor 
PREFIX=$(prefix); cd ..; \
-   fi; \
-   $(MAKE) -C $$mdir PREFIX=$(prefix); \
- fi; \
+--- clearsilver-0.10.5/util/neo_err.h.orig 2009-02-11 21:47:19.808962558 
-0600
 clearsilver-0.10.5/util/neo_err.h  2009-02-11 21:47:39.950596225 -0600
+@@ -60,16 +60,7 @@
+   struct _neo_err *next;
+ } NEOERR;
+ 
+-/* Technically, we could do this in configure and detect what their compiler
+- * can handle, but for now... */
+-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+-#define USE_C99_VARARG_MACROS 1
+-#elif __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 4) || defined 
(S_SPLINT_S)
+ #define USE_GNUC_VARARG_MACROS 1
+-#else
+-#error The compiler is missing support for variable-argument macros.
+-#endif
+-
+ 
+ /*
+  * function: nerr_raise
+--- clearsilver-0.10.5/perl/Makefile.PL.orig   2009-02-11 22:04:59.952887656 
-0600
 clearsilver-0.10.5/perl/Makefile.PL2009-02-11 22:05:16.980898358 
-0600
+@@ -9,7 +9,7 @@
+   (ABSTRACT_FROM => 'ClearSilver.pm', # retrieve abstract from module
+AUTHOR => 'A. U. Thor ') : ()),
+# TODO: don't include -lz if we aren't depending on it
+-'LIBS'=> ['-L../libs -lneo_cgi -lneo_cs -lneo_utl -lz'], 
++'LIBS'=> ['-R/opt/csw/lib -L../libs -lneo_cgi -lneo_cs 
-lneo_utl -lz -lintl'], 
+ 'DEFINE'  => '', # e.g., '-DHAVE_SOMETHING'
+   # Insert -I. if you add *.h files later:
+

[csw-devel] SF.net SVN: gar:[3060] csw/mgar/pkg/gettext/trunk/Makefile

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

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

[csw-devel] SF.net SVN: gar:[3063] csw/mgar/pkg/gettext/trunk/Makefile

[csw-devel] SF.net SVN: gar:[3064] csw/mgar/gar/v2/gar.conf.mk

[csw-devel] SF.net SVN: gar:[3065] csw/mgar/pkg/gettext/trunk/Makefile

[csw-devel] SF.net SVN: gar:[3066] csw/mgar/pkg/gettext/trunk/Makefile

[csw-devel] SF.net SVN: gar:[3067] csw/mgar/pkg/clearsilver/trunk

[csw-devel] SF.net SVN: gar:[3068] csw/mgar/pkg/clearsilver/trunk/

[csw-devel] SF.net SVN: gar:[3069] csw/mgar/gar/v2/gar.pkg.mk

[csw-devel] SF.net SVN: gar:[3070] csw/mgar/pkg/a52dec/trunk/Makefile

[csw-devel] SF.net SVN: gar:[3071] csw/mgar/gar/v2/gar.pkg.mk

[csw-devel] SF.net SVN: gar:[3072] csw/mgar/pkg/gettext/trunk/Makefile

[csw-devel] SF.net SVN: gar:[3073] csw/mgar/pkg/clearsilver/trunk

14 matches

Site Navigation

Mail list logo

Footer information