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

2009-05-16 Thread idogan23
Revision: 4890
  http://gar.svn.sourceforge.net/gar/?rev=4890&view=rev
Author:   idogan23
Date: 2009-05-16 10:51:17 + (Sat, 16 May 2009)

Log Message:
---
rrdtoo: added Ruby support

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

Modified: csw/mgar/pkg/rrdtool/trunk/Makefile
===
--- csw/mgar/pkg/rrdtool/trunk/Makefile 2009-05-16 02:11:27 UTC (rev 4889)
+++ csw/mgar/pkg/rrdtool/trunk/Makefile 2009-05-16 10:51:17 UTC (rev 4890)
@@ -26,6 +26,7 @@
 REQUIRED_PKGS += CSWsunmath
 REQUIRED_PKGS += CSWzlib
 REQUIRED_PKGS += CSWperl
+REQUIRED_PKGS += CSWruby
 
 EXTRA_INC = $(prefix)/include/cairo
 EXTRA_INC += $(prefix)/include/libxml2/libxml
@@ -38,7 +39,7 @@
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-docdir=$(sharedstatedir)/doc/$(GARNAME)
 CONFIGURE_ARGS += --disable-python
-CONFIGURE_ARGS += --disable-ruby
+CONFIGURE_ARGS += --enable-ruby
 CONFIGURE_ARGS += --disable-libintl
 CONFIGURE_ARGS += --enable-perl
 CONFIGURE_ARGS += --with-perl-options=INSTALLDIRS=vendor


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:[4891] csw/mgar/pkg/php5/trunk

2009-05-16 Thread valholla
Revision: 4891
  http://gar.svn.sourceforge.net/gar/?rev=4891&view=rev
Author:   valholla
Date: 2009-05-16 11:04:22 + (Sat, 16 May 2009)

Log Message:
---
even more generic admin scripts

Modified Paths:
--
csw/mgar/pkg/php5/trunk/Makefile
csw/mgar/pkg/php5/trunk/Makefile.Orig
csw/mgar/pkg/php5/trunk/Makefile.default-dirs
csw/mgar/pkg/php5/trunk/checksums
csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall
csw/mgar/pkg/php5/trunk/files/php.ini.CSW

Modified: csw/mgar/pkg/php5/trunk/Makefile
===
--- csw/mgar/pkg/php5/trunk/Makefile2009-05-16 10:51:17 UTC (rev 4890)
+++ csw/mgar/pkg/php5/trunk/Makefile2009-05-16 11:04:22 UTC (rev 4891)
@@ -21,12 +21,13 @@
 MASTER_SITES   = http://us.php.net/distributions/
 SPKG_SOURCEURL = http://www.php.net/downloads.php
 INSTALL_ENV   += INSTALL_ROOT=$(DESTDIR)
-STRIP_DIRS+= $(DESTDIR)$(prefix)/lib/php/extensions/*/
+STRIP_DIRS+= $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config 
--extension-dir)/*/
 
 DISTFILES += $(DISTNAME).tar.bz2
 DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall
 
 PACKAGES = CSWphp5 CSWphp5devel
+
 CATALOGNAME_CSWphp5= php5
 SPKG_DESC_CSWphp5  = A High-Level Scripting Languages
 CATALOGNAME_CSWphp5devel   = php5_devel
@@ -68,9 +69,9 @@
 NOISALIST = 1
 STRIP_LIBTOOL = 1
 
-CONFIGURE_ARGS += --prefix=$(prefix)
+CONFIGURE_ARGS += --prefix=$(prefix)/php5
 CONFIGURE_ARGS += --disable-static
-CONFIGURE_ARGS += --with-exec-dir=$(prefix)/bin
+CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin
 CONFIGURE_ARGS += --enable-cli
 CONFIGURE_ARGS += --enable-fastcgi
 CONFIGURE_ARGS += --enable-force-cgi-redirect
@@ -84,6 +85,18 @@
 SKIPTEST = 1
 ENABLE_CHECK = 0
 
+define _get_php_config
+$(abspath $(shell gfind $(1) -name php-config -print))
+endef
+
+define _get_php_prefix
+$(shell $(call _get_php_config,$(1)) --prefix)
+endef
+
+define _get_php_ini_path
+$(shell $(call _get_php_prefix,$(1))/bin/php -i | grep "Configuration File .* 
Path" | gawk '{print $$NF}')
+endef
+
 PI_SCRIPTS  = install-extras
 PI_SCRIPTS += install-ap2modphp5
 PI_SCRIPTS += install-modphp5
@@ -94,53 +107,44 @@
 
 install-extras:
@echo "[> Fixing Admin Scripts <]"
-   PHP_INI_FILE=`$(DESTDIR)$(bindir)/php -i | \
-   grep "Configuration File .* Path" | awk '{print $$NF}'`; \
-   perl -i -pne "s|_PHPINIFILE_|$${PHP_INI_FILE}/php.ini|" 
\
-   `gfind $(DOWNLOADDIR) -type f -print`
-   perl -i -pne "s|_PHPLIBDIR_|$(libdir)|" \
-   `gfind $(DOWNLOADDIR) -type f -print`
-   perl -i -pne "s|_PHPBINDIR_|$(bindir)|" \
-   `gfind $(DOWNLOADDIR) -type f -print`
+   perl -i -pne "s|_PHPINIFILE_|$(call 
_get_php_ini_path,$(DESTDIR))/php.ini|" `gfind $(DOWNLOADDIR) -type f -print`
+   perl -i -pne "s|_PHPLIBDIR_|$(call _get_php_ini_path,$(DESTDIR))|" 
`gfind $(DOWNLOADDIR) -type f -print`
+   perl -i -pne "s|_PHPBINDIR_|$(call _get_php_prefix,$(DESTDIR))/bin|" 
`gfind $(DOWNLOADDIR) -type f -print`
@echo "[> Installing Extra Files <]"
-   ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(bindir)
-   gsed -i -e s,PHPEXTDIR,`$(DESTDIR)$(bindir)/php-config 
--extension-dir`,\
-   $(DOWNLOADDIR)/php.ini.CSW
-   ginstall -m 0644 $(DOWNLOADDIR)/php.ini.CSW $(DESTDIR)$(libdir)
-   ginstall -m 0644 $(DOWNLOADDIR)/pear.conf.CSW $(DESTDIR)$(sysconfdir)
-   ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
-   ginstall -m 0644 $(DOWNLOADDIR)/httpd-php5.conf.CSW \
-   $(DESTDIR)$(prefix)/apache2/etc/extra
+   ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin
+   perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' 
$(DOWNLOADDIR)/php.ini.CSW
+   ginstall -m 0644 $(DOWNLOADDIR)/php.ini.CSW $(DESTDIR)$(call 
_get_php_ini_path,$(DESTDIR))
+   ginstall -m 0644 $(DOWNLOADDIR)/pear.conf.CSW $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/etc
@$(MAKECOOKIE)
 
 install-ap2modphp5:
@echo "[> Now Building ap2_modphp5 <]"
-   @if [ -f $(WORKSRC)/Makefile ]; then \
+   if [ -f $(WORKSRC)/Makefile ]; then \
$(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi
cd $(WORKSRC) && $(BUILD_ENV) \
./configure $(CONFIGURE_ARGS) 
--with-apxs2=$(prefix)/apache2/sbin/apxs
-   @$(GARBIN)/fixlibtool $(WORKSRC)
-   @$(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
-   @strip $(DESTDIR)$(prefix)/apache2/libexec/libphp5.so
+   $(GARBIN)/fixlibtool $(WORKSRC)
+   $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
+   strip $(DESTDIR)$(prefix)/apache2/libexec/libphp5.so
+   ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
+   ginstall -m 0644 $(DOWNLOA

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

2009-05-16 Thread valholla
Revision: 4892
  http://gar.svn.sourceforge.net/gar/?rev=4892&view=rev
Author:   valholla
Date: 2009-05-16 11:07:16 + (Sat, 16 May 2009)

Log Message:
---
update checksums

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

Modified: csw/mgar/pkg/php5/trunk/checksums
===
--- csw/mgar/pkg/php5/trunk/checksums   2009-05-16 11:04:22 UTC (rev 4891)
+++ csw/mgar/pkg/php5/trunk/checksums   2009-05-16 11:07:16 UTC (rev 4892)
@@ -4,7 +4,7 @@
 5f0046fe1b3f8e2228fdb165bdbbe73a  download/CSWmodphp5.postinstall
 2e5dbed2c9dd5e24c331753984946822  download/CSWmodphp5.preremove
 0dd379f20ceb32fc77bb3a9bf045097f  download/CSWmodphp5.space
-61b5c51492268af9e9afc22759c63a6b  download/CSWphp5.postinstall
+dade4fa19b7d3c7ca1d1a12c9eb7473d  download/CSWphp5.postinstall
 ab08e2ba62667bf13fa236099e433e84  download/configure.diff
 a71677d80f5cfd1aeb03547dfdeb705a  download/httpd-php5.conf.CSW
 2206431e47c2075c0b9c4a12de5cf791  download/odbc.diff
@@ -13,5 +13,5 @@
 13db46097c9686302bebf160e2d26ed2  download/pgsql.diff
 280d6cda7f72a4fc6de42fda21ac2db7  download/php-5.2.9.tar.bz2
 a450a46ce0ea9fd0c0abe432e750a873  download/php-bug-45557-fix.diff
-dfd4f19799c8f1e827402f40eda74fad  download/php.ini.CSW
-90ae3cef3692d7e566c47d89fe39c43d  download/phpext
+831a08d280929be816d45bf5ae4f  download/php.ini.CSW
+6251f3adcefc6ffa61d6339ac6b2d1eb  download/phpext


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:[4893] csw/mgar/pkg/php5/trunk

2009-05-16 Thread valholla
Revision: 4893
  http://gar.svn.sourceforge.net/gar/?rev=4893&view=rev
Author:   valholla
Date: 2009-05-16 11:25:46 + (Sat, 16 May 2009)

Log Message:
---
split up Makefile for easier Reading

Modified Paths:
--
csw/mgar/pkg/php5/trunk/Makefile
csw/mgar/pkg/php5/trunk/Makefile.Orig
csw/mgar/pkg/php5/trunk/Makefile.default-dirs

Added Paths:
---
csw/mgar/pkg/php5/trunk/files/scripts.mk

Modified: csw/mgar/pkg/php5/trunk/Makefile
===
--- csw/mgar/pkg/php5/trunk/Makefile2009-05-16 11:07:16 UTC (rev 4892)
+++ csw/mgar/pkg/php5/trunk/Makefile2009-05-16 11:25:46 UTC (rev 4893)
@@ -85,70 +85,5 @@
 SKIPTEST = 1
 ENABLE_CHECK = 0
 
-define _get_php_config
-$(abspath $(shell gfind $(1) -name php-config -print))
-endef
-
-define _get_php_prefix
-$(shell $(call _get_php_config,$(1)) --prefix)
-endef
-
-define _get_php_ini_path
-$(shell $(call _get_php_prefix,$(1))/bin/php -i | grep "Configuration File .* 
Path" | gawk '{print $$NF}')
-endef
-
-PI_SCRIPTS  = install-extras
-PI_SCRIPTS += install-ap2modphp5
-PI_SCRIPTS += install-modphp5
-PI_SCRIPTS += install-cleanup
-
-post-install-modulated: $(PI_SCRIPTS)
-   @$(MAKECOOKIE)
-
-install-extras:
-   @echo "[> Fixing Admin Scripts <]"
-   perl -i -pne "s|_PHPINIFILE_|$(call 
_get_php_ini_path,$(DESTDIR))/php.ini|" `gfind $(DOWNLOADDIR) -type f -print`
-   perl -i -pne "s|_PHPLIBDIR_|$(call _get_php_ini_path,$(DESTDIR))|" 
`gfind $(DOWNLOADDIR) -type f -print`
-   perl -i -pne "s|_PHPBINDIR_|$(call _get_php_prefix,$(DESTDIR))/bin|" 
`gfind $(DOWNLOADDIR) -type f -print`
-   @echo "[> Installing Extra Files <]"
-   ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin
-   perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' 
$(DOWNLOADDIR)/php.ini.CSW
-   ginstall -m 0644 $(DOWNLOADDIR)/php.ini.CSW $(DESTDIR)$(call 
_get_php_ini_path,$(DESTDIR))
-   ginstall -m 0644 $(DOWNLOADDIR)/pear.conf.CSW $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/etc
-   @$(MAKECOOKIE)
-
-install-ap2modphp5:
-   @echo "[> Now Building ap2_modphp5 <]"
-   if [ -f $(WORKSRC)/Makefile ]; then \
-   $(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi
-   cd $(WORKSRC) && $(BUILD_ENV) \
-   ./configure $(CONFIGURE_ARGS) 
--with-apxs2=$(prefix)/apache2/sbin/apxs
-   $(GARBIN)/fixlibtool $(WORKSRC)
-   $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
-   strip $(DESTDIR)$(prefix)/apache2/libexec/libphp5.so
-   ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
-   ginstall -m 0644 $(DOWNLOADDIR)/httpd-php5.conf.CSW 
$(DESTDIR)$(prefix)/apache2/etc/extra
-   @$(MAKECOOKIE)
-
-install-modphp5:
-   @echo "[> Now Building mod_php5 <]"
-   if [ -f $(WORKSRC)/Makefile ]; then $(BUILD_ENV) gmake -C $(WORKSRC) 
distclean; fi
-   cd $(WORKSRC) && $(BUILD_ENV) ./configure $(CONFIGURE_ARGS) 
--with-apxs=$(prefix)/apache/bin/apxs
-   $(GARBIN)/fixlibtool $(WORKSRC)
-   $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
-   strip $(DESTDIR)$(prefix)/apache/libexec/libphp5.so
-   @$(MAKECOOKIE)
-
-install-cleanup:
-   @echo "[> Cleaning Up Extra Install Files <]"
-   gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr
-   grm -f $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf
-   gfind $(DESTDIR)$(prefix)/apache* -mindepth 1 -type d | egrep -v 
"etc|libexec" | xargs grm -fr
-   $(MAKECOOKIE)
-
-EXTFILES = $(shell find extensions/*/files/* -prune -type f)
-pre-fetch:
-   $(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR)))
-
-# System Rules/Configuration
+include files/scripts.mk
 include gar/category.mk

Modified: csw/mgar/pkg/php5/trunk/Makefile.Orig
===
--- csw/mgar/pkg/php5/trunk/Makefile.Orig   2009-05-16 11:07:16 UTC (rev 
4892)
+++ csw/mgar/pkg/php5/trunk/Makefile.Orig   2009-05-16 11:25:46 UTC (rev 
4893)
@@ -85,70 +85,5 @@
 SKIPTEST = 1
 ENABLE_CHECK = 0
 
-define _get_php_config
-$(abspath $(shell gfind $(1) -name php-config -print))
-endef
-
-define _get_php_prefix
-$(shell $(call _get_php_config,$(1)) --prefix)
-endef
-
-define _get_php_ini_path
-$(shell $(call _get_php_prefix,$(1))/bin/php -i | grep "Configuration File .* 
Path" | gawk '{print $$NF}')
-endef
-
-PI_SCRIPTS  = install-extras
-PI_SCRIPTS += install-ap2modphp5
-PI_SCRIPTS += install-modphp5
-PI_SCRIPTS += install-cleanup
-
-post-install-modulated: $(PI_SCRIPTS)
-   @$(MAKECOOKIE)
-
-install-extras:
-   @echo "[> Fixing Admin Scripts <]"
-   perl -i -pne "s|_PHPINIFILE_|$(call 
_get_php_ini_path,$(DESTDIR))/php.ini|" `gfind $(DOWNLOADDIR) -type f -print`
-   perl -i -pne "s|_PHPLIBDIR_|$(call _get_

[csw-devel] SF.net SVN: gar:[4894] csw/mgar/pkg/php5/trunk

2009-05-16 Thread valholla
Revision: 4894
  http://gar.svn.sourceforge.net/gar/?rev=4894&view=rev
Author:   valholla
Date: 2009-05-16 11:27:29 + (Sat, 16 May 2009)

Log Message:
---
rename extra makefiles to more meaningful name

Added Paths:
---
csw/mgar/pkg/php5/trunk/Makefile.cswdir
csw/mgar/pkg/php5/trunk/Makefile.php5dir

Removed Paths:
-
csw/mgar/pkg/php5/trunk/Makefile.Orig
csw/mgar/pkg/php5/trunk/Makefile.default-dirs

Deleted: csw/mgar/pkg/php5/trunk/Makefile.Orig
===
--- csw/mgar/pkg/php5/trunk/Makefile.Orig   2009-05-16 11:25:46 UTC (rev 
4893)
+++ csw/mgar/pkg/php5/trunk/Makefile.Orig   2009-05-16 11:27:29 UTC (rev 
4894)
@@ -1,89 +0,0 @@
-GARNAME = php5
-GARVERSION  = 5.2.9
-CATEGORIES  = lang
-SF_PROJ = $(shell echo $(GARNAME) | sed -e 's/[0-9]//g')
-DISTNAME= $(SF_PROJ)-$(GARVERSION)
-
-DESCRIPTION = A high-level scripting language.
-define BLURB
-   PHP is a widely-used Open Source general-purpose scripting language 
that is
-   especially suited for Web development and can be embedded into HTML. Its
-   syntax draws upon C, Java, and Perl, and is easy to learn. PHP runs on 
many
-   different platforms and can be used as a standalone executable or as a
-   module under a variety of Web servers. It has excellent support for
-   databases, XML, LDAP, IMAP, Java, various Internet protocols, and 
general
-   data manipulation, and is extensible via its powerful API. It is 
actively
-   developed and supported by a talented and energetic international team.
-   Numerous Open Source and commercial PHP-based application packages are
-   available.
-endef
-
-MASTER_SITES   = http://us.php.net/distributions/
-SPKG_SOURCEURL = http://www.php.net/downloads.php
-INSTALL_ENV   += INSTALL_ROOT=$(DESTDIR)
-STRIP_DIRS+= $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config 
--extension-dir)/*/
-
-DISTFILES += $(DISTNAME).tar.bz2
-DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall
-
-PACKAGES = CSWphp5 CSWphp5devel
-
-CATALOGNAME_CSWphp5= php5
-SPKG_DESC_CSWphp5  = A High-Level Scripting Languages
-CATALOGNAME_CSWphp5devel   = php5_devel
-SPKG_DESC_CSWphp5devel = Development files for php5
-REQUIRED_PKGS_CSWphp5  = CSWexpat CSWggettextrt CSWiconv 
-REQUIRED_PKGS_CSWphp5 += CSWlibxml2 CSWzlib CSWmysql5rt
-REQUIRED_PKGS_CSWphp5devel = CSWphp5
-
-PKGFILES_CSWphp5devel  = $(bindir)/php-config
-PKGFILES_CSWphp5devel += $(bindir)/phpize
-PKGFILES_CSWphp5devel += $(bindir)/peardev
-PKGFILES_CSWphp5devel += $(libdir)/php/build/.*
-PKGFILES_CSWphp5devel += $(includedir)/php/TSRM.*
-PKGFILES_CSWphp5devel += $(includedir)/php/Zend.*
-PKGFILES_CSWphp5devel += $(includedir)/php/include.*
-PKGFILES_CSWphp5devel += $(includedir)/php/main.*
-PKGFILES_CSWphp5devel += $(includedir)/php/regex.*
-PKGFILES_CSWphp5devel += $(includedir)/php/ext/date.*
-PKGFILES_CSWphp5devel += $(includedir)/php/ext/filter.*
-PKGFILES_CSWphp5devel += $(includedir)/php/ext/libxml.*
-PKGFILES_CSWphp5devel += $(includedir)/php/ext/pcre.*
-PKGFILES_CSWphp5devel += $(includedir)/php/ext/spl.*
-PKGFILES_CSWphp5devel += $(includedir)/php/ext/standard.*
-PKGFILES_CSWphp5devel += $(includedir)/php/ext/xml.*
-PKGFILES_CSWphp5devel += $(mandir)/man1/php-config.1
-PKGFILES_CSWphp5devel += $(mandir)/man1/phpize.1
-
-PATCHFILES += configure.diff
-PATCHFILES += php-bug-45557-fix.diff
-
-# PHP Extensions
-EXTDIRLIST = $(shell ls -d extensions/*)
-include $(foreach X,$(EXTDIRLIST),$(X)/Makefile)
-
-EXTRA_LIB += $(prefix)/bdb44/lib
-EXTRA_INC += $(prefix)/bdb44/include
-EXTRA_CFLAGS = -I$(prefix)/include/ncursesw
-
-NOISALIST = 1
-STRIP_LIBTOOL = 1
-
-CONFIGURE_ARGS += --prefix=$(prefix)/php5
-CONFIGURE_ARGS += --disable-static
-CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin
-CONFIGURE_ARGS += --enable-cli
-CONFIGURE_ARGS += --enable-fastcgi
-CONFIGURE_ARGS += --enable-force-cgi-redirect
-CONFIGURE_ARGS += --with-mm=$(prefix)
-CONFIGURE_ARGS += --enable-magic-quotes
-CONFIGURE_ARGS += --enable-spl=shared
-CONFIGURE_ARGS += --with-pcre-regex
-CONFIGURE_ARGS += --with-pear=shared
-
-# Disable Tests (report submitted to PHP QA)
-SKIPTEST = 1
-ENABLE_CHECK = 0
-
-include files/scripts.mk
-include gar/category.mk

Copied: csw/mgar/pkg/php5/trunk/Makefile.cswdir (from rev 4893, 
csw/mgar/pkg/php5/trunk/Makefile.default-dirs)
===
--- csw/mgar/pkg/php5/trunk/Makefile.cswdir (rev 0)
+++ csw/mgar/pkg/php5/trunk/Makefile.cswdir 2009-05-16 11:27:29 UTC (rev 
4894)
@@ -0,0 +1,89 @@
+GARNAME = php5
+GARVERSION  = 5.2.9
+CATEGORIES  = lang
+SF_PROJ = $(shell echo $(GARNAME) | sed -e 's/[0-9]//g')
+DISTNAME= $(SF_PROJ)-$(GARVERSION)
+
+DESCRIPTION = A high-level scripting language.
+define BLURB
+   PHP is a widely-used Open Source general-purpose scripting l

[csw-devel] SF.net SVN: gar:[4895] csw/mgar/pkg/lftp/trunk

2009-05-16 Thread chninkel
Revision: 4895
  http://gar.svn.sourceforge.net/gar/?rev=4895&view=rev
Author:   chninkel
Date: 2009-05-16 13:41:31 + (Sat, 16 May 2009)

Log Message:
---
lftp: updated to 3.7.14

Modified Paths:
--
csw/mgar/pkg/lftp/trunk/Makefile
csw/mgar/pkg/lftp/trunk/checksums
csw/mgar/pkg/lftp/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===
--- csw/mgar/pkg/lftp/trunk/Makefile2009-05-16 11:27:29 UTC (rev 4894)
+++ csw/mgar/pkg/lftp/trunk/Makefile2009-05-16 13:41:31 UTC (rev 4895)
@@ -13,7 +13,7 @@
 ## Package information ###
 
 GARNAME = lftp
-GARVERSION = 3.7.13
+GARVERSION = 3.7.14
 CATEGORIES = net
 
 DESCRIPTION = sophisticated command-line ftp/http client

Modified: csw/mgar/pkg/lftp/trunk/checksums
===
--- csw/mgar/pkg/lftp/trunk/checksums   2009-05-16 11:27:29 UTC (rev 4894)
+++ csw/mgar/pkg/lftp/trunk/checksums   2009-05-16 13:41:31 UTC (rev 4895)
@@ -1,3 +1,3 @@
-960f466cde7b6c4db0612808def9b5d1  download/lftp-3.7.13.tar.gz
+b0cad53f75ebd37b9dc6aeeb8d05f88c  download/lftp-3.7.14.tar.gz
 5bc881a13c106b1c97f2137ff1755817  download/CSWlftp.prototype
-31bb98215099006b0142b3d9b5e373d1  download/changelog.CSW
+30af25c9f70093e8b68d0ae8b8c3145d  download/changelog.CSW

Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW
===
--- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-05-16 11:27:29 UTC (rev 
4894)
+++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-05-16 13:41:31 UTC (rev 
4895)
@@ -1,3 +1,9 @@
+lftp (3.7.14,REV=2009.05.16) unstable
+
+  * New upstream release.
+
+   -- Yann Rouillard   Sat, 16 May 2009 15:40:33 +0200
+
 lftp (3.7.13,REV=2009.05.09) unstable
 
   * New upstream release.


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:[4896] csw/mgar/pkg/php5/trunk/files

2009-05-16 Thread valholla
Revision: 4896
  http://gar.svn.sourceforge.net/gar/?rev=4896&view=rev
Author:   valholla
Date: 2009-05-16 13:52:02 + (Sat, 16 May 2009)

Log Message:
---
tweaks

Modified Paths:
--
csw/mgar/pkg/php5/trunk/files/scripts.mk

Removed Paths:
-
csw/mgar/pkg/php5/trunk/files/pear.conf.CSW

Deleted: csw/mgar/pkg/php5/trunk/files/pear.conf.CSW
===
--- csw/mgar/pkg/php5/trunk/files/pear.conf.CSW 2009-05-16 13:41:31 UTC (rev 
4895)
+++ csw/mgar/pkg/php5/trunk/files/pear.conf.CSW 2009-05-16 13:52:02 UTC (rev 
4896)
@@ -1,2 +0,0 @@
-#PEAR_Config 0.9
-a:29:{s:9:"cache_dir";s:15:"/tmp/pear/cache";s:15:"default_channel";s:12:"pear.php.net";s:16:"preferred_mirror";s:12:"pear.php.net";s:13:"remote_config";s:0:"";s:13:"auto_discover";i:0;s:13:"master_server";s:12:"pear.php.net";s:10:"http_proxy";s:0:"";s:7:"php_dir";s:21:"/opt/csw/lib/php";s:7:"ext_dir";s:58:"/opt/csw/lib/php/extensions/no-debug-non-zts-20060613";s:7:"doc_dir";s:25:"/opt/csw/lib/php/doc";s:7:"bin_dir";s:17:"/opt/csw/bin";s:8:"data_dir";s:26:"/opt/csw/lib/php/data";s:7:"cfg_dir";s:25:"/opt/csw/lib/php/cfg";s:7:"www_dir";s:28:"/opt/csw/lib/php/htdocs";s:8:"test_dir";s:26:"/opt/csw/lib/php/test";s:8:"temp_dir";s:14:"/tmp/pear/temp";s:12:"download_dir";s:18:"/tmp/pear/download";s:7:"php_bin";s:21:"/opt/csw/bin/php";s:7:"php_ini";s:0:"";s:8:"username";s:0:"";s:8:"password";s:0:"";s:7:"verbose";i:1;s:15:"preferred_state";s:6:"stable";s:5:"umask";i:18;s:9:"cache_ttl";i:3600;s:8:"sig_type";s:3:"gpg";s:7:"sig_bin";s:16:"/opt/csw/bin/gpg";s:9:"sig_keyid";s:0:"";s:10:"si
 g_keydir";s:26:"/opt/csw/etc/pearkeys";}

Modified: csw/mgar/pkg/php5/trunk/files/scripts.mk
===
--- csw/mgar/pkg/php5/trunk/files/scripts.mk2009-05-16 13:41:31 UTC (rev 
4895)
+++ csw/mgar/pkg/php5/trunk/files/scripts.mk2009-05-16 13:52:02 UTC (rev 
4896)
@@ -29,9 +29,12 @@
perl -i -pne "s|_PHPBINDIR_|$(call _get_php_prefix,$(DESTDIR))/bin|" 
`gfind $(DOWNLOADDIR) -type f -print`
@echo "[> Installing Extra Files <]"
ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin
-   perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' 
$(DOWNLOADDIR)/php.ini.CSW
-   ginstall -m 0644 $(DOWNLOADDIR)/php.ini.CSW $(DESTDIR)$(call 
_get_php_ini_path,$(DESTDIR))
-   ginstall -m 0644 $(DOWNLOADDIR)/pear.conf.CSW $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/etc
+   gcp $(DOWNLOADDIR)/php.ini.CSW $(DOWNLOADDIR)/php.ini.CSW.fixed
+   perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' 
$(DOWNLOADDIR)/php.ini.CSW.fixed
+   gcp $(DOWNLOADDIR)/php.ini.CSW.fixed $(DESTDIR)$(call 
_get_php_ini_path,$(DESTDIR))/php.ini.CSW
+   gmv $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf 
$(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf.CSW
+   gchmod 0644 $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW
+   $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc
@$(MAKECOOKIE)
 
 install-ap2modphp5:
@@ -59,7 +62,6 @@
 install-cleanup:
@echo "[> Cleaning Up Extra Install Files <]"
gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr
-   grm -f $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf
gfind $(DESTDIR)$(prefix)/apache* -mindepth 1 -type d | egrep -v 
"etc|libexec" | xargs grm -fr
$(MAKECOOKIE)
 


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:[4897] csw/mgar/pkg/mod_wsgi/trunk

2009-05-16 Thread rthurner
Revision: 4897
  http://gar.svn.sourceforge.net/gar/?rev=4897&view=rev
Author:   rthurner
Date: 2009-05-16 14:05:22 + (Sat, 16 May 2009)

Log Message:
---
upgrade to mod_wsgi-2.5

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

Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile
===
--- csw/mgar/pkg/mod_wsgi/trunk/Makefile2009-05-16 13:52:02 UTC (rev 
4896)
+++ csw/mgar/pkg/mod_wsgi/trunk/Makefile2009-05-16 14:05:22 UTC (rev 
4897)
@@ -1,5 +1,5 @@
 GARNAME = mod_wsgi
-GARVERSION = 2.4
+GARVERSION = 2.5
 CATEGORIES = lib
 
 DESCRIPTION = an Apache/Python WSGI adapter module

Modified: csw/mgar/pkg/mod_wsgi/trunk/checksums
===
--- csw/mgar/pkg/mod_wsgi/trunk/checksums   2009-05-16 13:52:02 UTC (rev 
4896)
+++ csw/mgar/pkg/mod_wsgi/trunk/checksums   2009-05-16 14:05:22 UTC (rev 
4897)
@@ -1,4 +1,4 @@
-a2b964cc51d6ff86c38c74db5748eab5  download/mod_wsgi-2.4.tar.gz
+43ad11c477799e2f780c50197c420afd  download/mod_wsgi-2.5.tar.gz
 a2e8679f45232e56efbc352597ffe456  download/postinstall
 a67766841dedbaba0d7b15e7f08c8658  download/preremove
 0dd379f20ceb32fc77bb3a9bf045097f  download/space


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:[4898] csw/mgar/pkg/mercurial/trunk

2009-05-16 Thread rthurner
Revision: 4898
  http://gar.svn.sourceforge.net/gar/?rev=4898&view=rev
Author:   rthurner
Date: 2009-05-16 14:23:55 + (Sat, 16 May 2009)

Log Message:
---
upgrade to mercurial-1.2.1

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

Modified: csw/mgar/pkg/mercurial/trunk/Makefile
===
--- csw/mgar/pkg/mercurial/trunk/Makefile   2009-05-16 14:05:22 UTC (rev 
4897)
+++ csw/mgar/pkg/mercurial/trunk/Makefile   2009-05-16 14:23:55 UTC (rev 
4898)
@@ -1,12 +1,12 @@
 GARNAME = mercurial
-GARVERSION = 1.1.2
+GARVERSION = 1.2.1
 CATEGORIES = devel
 
 DESCRIPTION = Fast, lightweight Source Control Management system
 #define BLURB
 #endef
 
-MASTER_SITES = http://www.selenic.com/mercurial/release/
+MASTER_SITES = http://selenic.com/mercurial/release/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 DISTFILES += $(call admfiles,CSWmercurial,changelog.CSW)
 DISTFILES += $(call admfiles,CSWmercurial-common,)

Modified: csw/mgar/pkg/mercurial/trunk/checksums
===
--- csw/mgar/pkg/mercurial/trunk/checksums  2009-05-16 14:05:22 UTC (rev 
4897)
+++ csw/mgar/pkg/mercurial/trunk/checksums  2009-05-16 14:23:55 UTC (rev 
4898)
@@ -1,4 +1,4 @@
-4fd3b9a2e5dcd025840c3849b136bec8  download/mercurial-1.1.2.tar.gz
+24d6994cc58b353398e11c7a19cf1d19  download/mercurial-1.2.1.tar.gz
 d280026d7687f061371e87ff306c97c2  download/CSWmercurial.gspec
 db884ecb306bcbf49b671f880d29c431  download/CSWmercurial.changelog.CSW
 f123d5474de9aeaea428989744b12401  download/CSWmercurial-common.gspec


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:[4899] csw/mgar/pkg/php5/trunk

2009-05-16 Thread valholla
Revision: 4899
  http://gar.svn.sourceforge.net/gar/?rev=4899&view=rev
Author:   valholla
Date: 2009-05-16 14:25:17 + (Sat, 16 May 2009)

Log Message:
---
remove distfile

Modified Paths:
--
csw/mgar/pkg/php5/trunk/Makefile
csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall
csw/mgar/pkg/php5/trunk/files/scripts.mk

Modified: csw/mgar/pkg/php5/trunk/Makefile
===
--- csw/mgar/pkg/php5/trunk/Makefile2009-05-16 14:23:55 UTC (rev 4898)
+++ csw/mgar/pkg/php5/trunk/Makefile2009-05-16 14:25:17 UTC (rev 4899)
@@ -21,10 +21,10 @@
 MASTER_SITES   = http://us.php.net/distributions/
 SPKG_SOURCEURL = http://www.php.net/downloads.php
 INSTALL_ENV   += INSTALL_ROOT=$(DESTDIR)
-STRIP_DIRS+= $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config 
--extension-dir)/*/
+STRIP_DIRS+= $(DESTDIR)$(shell $(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)/*/
 
 DISTFILES += $(DISTNAME).tar.bz2
-DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall
+DISTFILES += php.ini.CSW phpext CSWphp5.postinstall
 
 PACKAGES = CSWphp5 CSWphp5devel
 

Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall
===
--- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall   2009-05-16 14:23:55 UTC 
(rev 4898)
+++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall   2009-05-16 14:25:17 UTC 
(rev 4899)
@@ -1,27 +1,41 @@
 #!/bin/sh
 
 PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin
-PHP_LIB=${PKG_INSTALL_ROOT}_PHPLIBDIR_
-PHP_BIN=${PKG_INSTALL_ROOT}_PHPBINDIR_
-PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_
 
-if [ ! -f $PHP_INI ]; then
-cp -p $PHP_INI.CSW $PHP_INI
+if [ ! -f _PHPETCDIR_/pear.conf ]; then
+cp -p _PHPETCDIR_/pear.conf.CSW _PHPETCDIR_/pear.conf
+_PHPBINDIR_/pear config-set php_ini _PHPINIFILE_
 else
-echo "$PHP_INI already exists"
+echo "_PHPETCDIR_/pear.conf already exists."
+echo "Updateing _PHPETCDIR_/pear.conf with current directories"
+_PHPBINDIR_/pear config-set php_ini _PHPINIFILE_
+_PHPBINDIR_/pear config-set php_bin _PHPBINDIR_
+_PHPBINDIR_/pear config-set php_doc _PHPLIBDIR_/doc
+_PHPBINDIR_/pear config-set cfg_dir _PHPLIBDIR_/cfg
+_PHPBINDIR_/pear config-set data_dir _PHPLIBDIR_/data
+_PHPBINDIR_/pear config-set test_dir _PHPLIBDIR_/test
+_PHPBINDIR_/pear config-set www_dir _PHPLIBDIR_/htdocs
+_PHPBINDIR_/pear config-set sig_keydir _PHPETCDIR_/htdocs
+_PHPBINDIR_/pear config-set php_dir _PHPLIBDIR_
+_PHPBINDIR_/pear config-set php_ext _PHPEXTDIR_
+fi
+if [ ! -f _PHPINIFILE_ ]; then
+cp -p _PHPINIFILE_.CSW _PHPINIFILE_
+else
+echo "_PHPINIFILE_ already exists"
 
 extdir="_PHPEXTDIR_"
-curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' $PHP_INI`
+curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' 
_PHPINIFILE_`
 
-if [ "$extdir" != "$curextdir" ]; then
+if [ "_PHPEXTDIR_" != "$curextdir" ]; then
 echo "updating extension_dir..."
-perl -i.bak -plne "s,no-debug-non-zts-[0-9]+,$extdir," $PHP_INI
+perl -i.bak -plne "s,no-debug-non-zts-[0-9]+,_PHPEXTDIR_," _PHPINIFILE_
 
-old_list="`sed -ne 's/^extension=\(.*\)\.so/\1/p' $PHP_INI`"
+old_list="`sed -ne 's/^extension=\(.*\)\.so/\1/p' _PHPINIFILE_`"
 new_pkgs=''
 non_pkgs=''
 for ext in `echo ${old_list}`; do
-if grep "extension=$ext" $PHP_INI.CSW; then
+if grep "extension=$ext" _PHPINIFILE_.CSW; then
 new_pkgs="${new_pkgs} php5_${ext}"
 else
 non_pkgs="${non_pkgs} ${ext}"
@@ -31,7 +45,7 @@
 cat << _EOT_
 
 **
-* NOTICE: The existing $PHP_INI file is from an older version of PHP5.  
+* NOTICE: The existing _PHPINIFILE_ file is from an older version of PHP5.  
 *
 * *  PLEASE READ  *
 *
@@ -119,14 +133,14 @@
 **
 * WARNING: Short open tag support in this release of CSWphp5 is DISABLED by
 * default.  If you rely on short open tag ( Installing Extra Files <]"
ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin
gcp $(DOWNLOADDIR)/php.ini.CSW $(DOWNLOADDIR)/php.ini.CSW.fixed


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:[4900] csw/mgar/pkg/php5/trunk/checksums

2009-05-16 Thread valholla
Revision: 4900
  http://gar.svn.sourceforge.net/gar/?rev=4900&view=rev
Author:   valholla
Date: 2009-05-16 14:29:17 + (Sat, 16 May 2009)

Log Message:
---
update checksum

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

Modified: csw/mgar/pkg/php5/trunk/checksums
===
--- csw/mgar/pkg/php5/trunk/checksums   2009-05-16 14:25:17 UTC (rev 4899)
+++ csw/mgar/pkg/php5/trunk/checksums   2009-05-16 14:29:17 UTC (rev 4900)
@@ -4,12 +4,11 @@
 5f0046fe1b3f8e2228fdb165bdbbe73a  download/CSWmodphp5.postinstall
 2e5dbed2c9dd5e24c331753984946822  download/CSWmodphp5.preremove
 0dd379f20ceb32fc77bb3a9bf045097f  download/CSWmodphp5.space
-dade4fa19b7d3c7ca1d1a12c9eb7473d  download/CSWphp5.postinstall
+98c6458b20eca91982b67c80a0554586  download/CSWphp5.postinstall
 ab08e2ba62667bf13fa236099e433e84  download/configure.diff
 a71677d80f5cfd1aeb03547dfdeb705a  download/httpd-php5.conf.CSW
 2206431e47c2075c0b9c4a12de5cf791  download/odbc.diff
 230126f76ee6400ccf225bb6a8243532  download/pdopgsql.diff
-04b5f14d8e02b59105e8dad2ead08995  download/pear.conf.CSW
 13db46097c9686302bebf160e2d26ed2  download/pgsql.diff
 280d6cda7f72a4fc6de42fda21ac2db7  download/php-5.2.9.tar.bz2
 a450a46ce0ea9fd0c0abe432e750a873  download/php-bug-45557-fix.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:[4901] csw/mgar/pkg/php5/trunk

2009-05-16 Thread valholla
Revision: 4901
  http://gar.svn.sourceforge.net/gar/?rev=4901&view=rev
Author:   valholla
Date: 2009-05-16 14:38:21 + (Sat, 16 May 2009)

Log Message:
---
fix checkusms

Modified Paths:
--
csw/mgar/pkg/php5/trunk/checksums
csw/mgar/pkg/php5/trunk/files/php.ini.CSW
csw/mgar/pkg/php5/trunk/files/scripts.mk

Modified: csw/mgar/pkg/php5/trunk/checksums
===
--- csw/mgar/pkg/php5/trunk/checksums   2009-05-16 14:29:17 UTC (rev 4900)
+++ csw/mgar/pkg/php5/trunk/checksums   2009-05-16 14:38:21 UTC (rev 4901)
@@ -12,5 +12,5 @@
 13db46097c9686302bebf160e2d26ed2  download/pgsql.diff
 280d6cda7f72a4fc6de42fda21ac2db7  download/php-5.2.9.tar.bz2
 a450a46ce0ea9fd0c0abe432e750a873  download/php-bug-45557-fix.diff
-831a08d280929be816d45bf5ae4f  download/php.ini.CSW
+670b8fbf4cf9105d72f22dbf4b1e29cd  download/php.ini.CSW
 6251f3adcefc6ffa61d6339ac6b2d1eb  download/phpext

Modified: csw/mgar/pkg/php5/trunk/files/php.ini.CSW
===
--- csw/mgar/pkg/php5/trunk/files/php.ini.CSW   2009-05-16 14:29:17 UTC (rev 
4900)
+++ csw/mgar/pkg/php5/trunk/files/php.ini.CSW   2009-05-16 14:38:21 UTC (rev 
4901)
@@ -517,7 +517,7 @@
 user_dir =
 
 ; Directory in which the loadable extensions (modules) reside.
-extension_dir = "_PHPEXTDIR_"
+extension_dir = "x_PHPEXTDIR_x"
 
 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically

Modified: csw/mgar/pkg/php5/trunk/files/scripts.mk
===
--- csw/mgar/pkg/php5/trunk/files/scripts.mk2009-05-16 14:29:17 UTC (rev 
4900)
+++ csw/mgar/pkg/php5/trunk/files/scripts.mk2009-05-16 14:38:21 UTC (rev 
4901)
@@ -24,14 +24,15 @@
 
 install-extras:
@echo "[> Fixing Admin Scripts <]"
+   gcp $(DOWNLOADDIR)/php.ini.CSW $(DOWNLOADDIR)/php.ini.CSW.fixed
+   perl -i -pne "s|x_PHPEXTDIR_x|_PHPEXTDIR_|" 
$(DOWNLOADDIR)/php.ini.CSW.fixed
perl -i -pne "s|_PHPINIFILE_|$(call 
_get_php_ini_path,$(DESTDIR))/php.ini|" `gfind $(DOWNLOADDIR) -type f -print`
perl -i -pne "s|_PHPLIBDIR_|$(call _get_php_ini_path,$(DESTDIR))|" 
`gfind $(DOWNLOADDIR) -type f -print`
perl -i -pne "s|_PHPBINDIR_|$(call _get_php_prefix,$(DESTDIR))/bin|" 
`gfind $(DOWNLOADDIR) -type f -print`
perl -i -pne "s|_PHPETCDIR_|$(call _get_php_prefix,$(DESTDIR))/etc|" 
`gfind $(DOWNLOADDIR) -type f -print`
+   perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' `gfind 
$(DOWNLOADDIR) -type f -print`
@echo "[> Installing Extra Files <]"
ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin
-   gcp $(DOWNLOADDIR)/php.ini.CSW $(DOWNLOADDIR)/php.ini.CSW.fixed
-   perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' 
$(DOWNLOADDIR)/php.ini.CSW.fixed
gcp $(DOWNLOADDIR)/php.ini.CSW.fixed $(DESTDIR)$(call 
_get_php_ini_path,$(DESTDIR))/php.ini.CSW
gmv $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf 
$(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf.CSW
gchmod 0644 $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW


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:[4902] csw/mgar/pkg/php5/trunk

2009-05-16 Thread valholla
Revision: 4902
  http://gar.svn.sourceforge.net/gar/?rev=4902&view=rev
Author:   valholla
Date: 2009-05-16 15:04:59 + (Sat, 16 May 2009)

Log Message:
---
tweaks

Modified Paths:
--
csw/mgar/pkg/php5/trunk/Makefile
csw/mgar/pkg/php5/trunk/files/scripts.mk

Modified: csw/mgar/pkg/php5/trunk/Makefile
===
--- csw/mgar/pkg/php5/trunk/Makefile2009-05-16 14:38:21 UTC (rev 4901)
+++ csw/mgar/pkg/php5/trunk/Makefile2009-05-16 15:04:59 UTC (rev 4902)
@@ -21,7 +21,6 @@
 MASTER_SITES   = http://us.php.net/distributions/
 SPKG_SOURCEURL = http://www.php.net/downloads.php
 INSTALL_ENV   += INSTALL_ROOT=$(DESTDIR)
-STRIP_DIRS+= $(DESTDIR)$(shell $(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)/*/
 
 DISTFILES += $(DISTNAME).tar.bz2
 DISTFILES += php.ini.CSW phpext CSWphp5.postinstall

Modified: csw/mgar/pkg/php5/trunk/files/scripts.mk
===
--- csw/mgar/pkg/php5/trunk/files/scripts.mk2009-05-16 14:38:21 UTC (rev 
4901)
+++ csw/mgar/pkg/php5/trunk/files/scripts.mk2009-05-16 15:04:59 UTC (rev 
4902)
@@ -65,6 +65,7 @@
@echo "[> Cleaning Up Extra Install Files <]"
gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr
gfind $(DESTDIR)$(prefix)/apache* -mindepth 1 -type d | egrep -v 
"etc|libexec" | xargs grm -fr
+   $(GARBIN)/stripbin $(shell $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)
$(MAKECOOKIE)
 
 EXTFILES = $(shell find extensions/*/files/* -prune -type f)


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:[4903] csw/mgar/pkg/php5/trunk/files/scripts.mk

2009-05-16 Thread valholla
Revision: 4903
  http://gar.svn.sourceforge.net/gar/?rev=4903&view=rev
Author:   valholla
Date: 2009-05-16 15:08:26 + (Sat, 16 May 2009)

Log Message:
---
tweaks

Modified Paths:
--
csw/mgar/pkg/php5/trunk/files/scripts.mk

Modified: csw/mgar/pkg/php5/trunk/files/scripts.mk
===
--- csw/mgar/pkg/php5/trunk/files/scripts.mk2009-05-16 15:04:59 UTC (rev 
4902)
+++ csw/mgar/pkg/php5/trunk/files/scripts.mk2009-05-16 15:08:26 UTC (rev 
4903)
@@ -66,6 +66,7 @@
gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr
gfind $(DESTDIR)$(prefix)/apache* -mindepth 1 -type d | egrep -v 
"etc|libexec" | xargs grm -fr
$(GARBIN)/stripbin $(shell $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)
+   $(GARBIN)/stripbin $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin/
$(MAKECOOKIE)
 
 EXTFILES = $(shell find extensions/*/files/* -prune -type f)


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:[4904] csw/mgar/pkg/python/trunk

2009-05-16 Thread valholla
Revision: 4904
  http://gar.svn.sourceforge.net/gar/?rev=4904&view=rev
Author:   valholla
Date: 2009-05-16 15:54:00 + (Sat, 16 May 2009)

Log Message:
---
move modules to unversioned dir

Modified Paths:
--
csw/mgar/pkg/python/trunk/Makefile
csw/mgar/pkg/python/trunk/checksums
csw/mgar/pkg/python/trunk/files/configure.diff
csw/mgar/pkg/python/trunk/files/python-config-in.diff
csw/mgar/pkg/python/trunk/files/setup.diff
csw/mgar/pkg/python/trunk/files/site.diff

Modified: csw/mgar/pkg/python/trunk/Makefile
===
--- csw/mgar/pkg/python/trunk/Makefile  2009-05-16 15:08:26 UTC (rev 4903)
+++ csw/mgar/pkg/python/trunk/Makefile  2009-05-16 15:54:00 UTC (rev 4904)
@@ -55,6 +55,7 @@
 CONFIGURE_ARGS += --enable-ipv6
 CONFIGURE_ARGS += --enable-unicode=ucs4
 CONFIGURE_ARGS += --with-fpectl
+CONFIGURE_ARGS += --with-system-ffi
 CONFIGURE_ARGS += LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib'
 
 PKGFILES_CSWidle  = $(libdir)/python(\d+(?:\.\d+)*)/idlelib/.*

Modified: csw/mgar/pkg/python/trunk/checksums
===
--- csw/mgar/pkg/python/trunk/checksums 2009-05-16 15:08:26 UTC (rev 4903)
+++ csw/mgar/pkg/python/trunk/checksums 2009-05-16 15:54:00 UTC (rev 4904)
@@ -1,12 +1,12 @@
-e81c2f0953aa60f8062c05a4673f2be0  download/Python-2.6.1.tar.bz2
+245db9f1e0f09ab7e0faaa0cf7301011  download/Python-2.6.2.tar.bz2
+9b45df21739387380ba2f5737a443170  download/configure.diff
+42dd6523beb94a805d5764ae1276091c  download/faqwiz.diff
+5664b3970307d7d39d8d4061e7dccbb0  download/libpython2.5.so.1.0-isa-i386
 a87896c48b2f61b32053e6d02b07b022  download/libpython2.5.so.1.0-isa-sparcv8
-5664b3970307d7d39d8d4061e7dccbb0  download/libpython2.5.so.1.0-isa-i386
-42dd6523beb94a805d5764ae1276091c  download/faqwiz.diff
 33f4094ee46ce865d3973a197f3fb4a0  download/makesetup.diff
 b389061e5a556feab6b20a08dad7ea23  download/modules.diff
 369c5593c0c0edda03f3c1844788dbee  download/multiprocess.diff
 05724da367b025ce525de2bb704af6e3  download/pyport.diff
-296f46fb4a6a392093120cd86675309b  download/setup.diff
-918c25923436792b353fac29acc88c22  download/site.diff
-9b45df21739387380ba2f5737a443170  download/configure.diff
 60ffb8b1ad45d337f57b94c5a703e62a  download/python-config-in.diff
+48577bbc43b912a4df66d09b54bd61ae  download/setup.diff
+0c552473ba31916ca04d05af04b9f110  download/site.diff

Modified: csw/mgar/pkg/python/trunk/files/configure.diff
===
--- csw/mgar/pkg/python/trunk/files/configure.diff  2009-05-16 15:08:26 UTC 
(rev 4903)
+++ csw/mgar/pkg/python/trunk/files/configure.diff  2009-05-16 15:54:00 UTC 
(rev 4904)
@@ -6,7 +6,7 @@
elif test `uname -p` = sparc;
 -  then CCSHARED="-xcode=pic32";
 -  else CCSHARED="-Kpic";
-+then CCSHARED="-xO3 -xarch=v8";
++then CCSHARED="-xO3";
fi;;
hp*|HP*) if test "$GCC" = yes;
 then CCSHARED="-fPIC";

Modified: csw/mgar/pkg/python/trunk/files/python-config-in.diff
===
--- csw/mgar/pkg/python/trunk/files/python-config-in.diff   2009-05-16 
15:08:26 UTC (rev 4903)
+++ csw/mgar/pkg/python/trunk/files/python-config-in.diff   2009-05-16 
15:54:00 UTC (rev 4904)
@@ -5,6 +5,6 @@
  if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'):
  libs.insert(0, '-L' + getvar('LIBPL'))
 +if opt == '--ldflags':
-+libs.insert(0, '-R/opt/csw/lib -L/opt/csw/lib')
++libs.insert(0, '-R/opt/csw/lib/$ISALIST -L/opt/csw/lib')
  print ' '.join(libs)
  

Modified: csw/mgar/pkg/python/trunk/files/setup.diff
===
--- csw/mgar/pkg/python/trunk/files/setup.diff  2009-05-16 15:08:26 UTC (rev 
4903)
+++ csw/mgar/pkg/python/trunk/files/setup.diff  2009-05-16 15:54:00 UTC (rev 
4904)
@@ -109,13 +109,3 @@
  else:   # Linux and other unices
  macros = dict(
  HAVE_SEM_OPEN=1,
-@@ -1741,9 +1706,6 @@
-  sources=['_ctypes/_ctypes_test.c'])
- self.extensions.extend([ext, ext_test])
- 
--if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
--return
--
- if sys.platform == 'darwin':
- # OS X 10.5 comes with libffi.dylib; the include files are
- # in /usr/include/ffi

Modified: csw/mgar/pkg/python/trunk/files/site.diff
===
--- csw/mgar/pkg/python/trunk/files/site.diff   2009-05-16 15:08:26 UTC (rev 
4903)
+++ csw/mgar/pkg/python/trunk/files/site.diff   2009-05-16 15:54:00 UTC (rev 
4904)
@@ -1,25 +1,77 @@
 Python-2.6.1/Lib/site.py.orig  2009-02-23 15:13:02.813997871 -0600
-+++ Python-2.6.1/Lib/site.

[csw-devel] SF.net SVN: gar:[4905] csw/mgar/pkg

2009-05-16 Thread rthurner
Revision: 4905
  http://gar.svn.sourceforge.net/gar/?rev=4905&view=rev
Author:   rthurner
Date: 2009-05-16 18:38:49 + (Sat, 16 May 2009)

Log Message:
---
libserf-0.3.0 - initial commit, not compiling yet

Added Paths:
---
csw/mgar/pkg/libserf/
csw/mgar/pkg/libserf/branches/
csw/mgar/pkg/libserf/tags/
csw/mgar/pkg/libserf/trunk/
csw/mgar/pkg/libserf/trunk/Makefile
csw/mgar/pkg/libserf/trunk/checksums
csw/mgar/pkg/libserf/trunk/files/


Property changes on: csw/mgar/pkg/libserf/trunk
___
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/libserf/trunk/Makefile
===
--- csw/mgar/pkg/libserf/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/libserf/trunk/Makefile 2009-05-16 18:38:49 UTC (rev 4905)
@@ -0,0 +1,33 @@
+GARNAME = serf
+GARVERSION = 0.3.0
+CATEGORIES = lib
+
+DESCRIPTION = HTTP client library built on APR, multiplexes connections.
+define BLURB
+The serf library is a C-based HTTP client library built upon the
+Apache Portable Runtime (APR) library. It multiplexes connections,
+running the read/write communication asynchronously. Memory copies
+and transformations are kept to a minimum to provide high performance
+operation.
+endef
+
+MASTER_SITES = http://serf.googlecode.com/files/
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
+
+# We define upstream file regex so we can be notifed of new upstream software 
release
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
+
+# If the url used to check for software update is different of MASTER_SITES, 
then 
+# uncomment the next line. Otherwise it is set by default to the value of 
MASTER_SITES
+# UPSTREAM_MASTER_SITES = 
+
+DEPENDS = server/apache2
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-apr=$(prefix)/apache2
+CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2
+#CONFIGURE_ARGS += --with-apr=$(prefix)/apache2/bin/apr-config
+#CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2/bin/apu-config
+
+
+include gar/category.mk

Added: csw/mgar/pkg/libserf/trunk/checksums
===
--- csw/mgar/pkg/libserf/trunk/checksums(rev 0)
+++ csw/mgar/pkg/libserf/trunk/checksums2009-05-16 18:38:49 UTC (rev 
4905)
@@ -0,0 +1 @@
+d5c7f41d1c9f1589b98affc1fa029982  download/serf-0.3.0.tar.bz2


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:[4906] csw/mgar/pkg/php5/trunk/files/scripts.mk

2009-05-16 Thread valholla
Revision: 4906
  http://gar.svn.sourceforge.net/gar/?rev=4906&view=rev
Author:   valholla
Date: 2009-05-16 19:50:17 + (Sat, 16 May 2009)

Log Message:
---
final tweak

Modified Paths:
--
csw/mgar/pkg/php5/trunk/files/scripts.mk

Modified: csw/mgar/pkg/php5/trunk/files/scripts.mk
===
--- csw/mgar/pkg/php5/trunk/files/scripts.mk2009-05-16 18:38:49 UTC (rev 
4905)
+++ csw/mgar/pkg/php5/trunk/files/scripts.mk2009-05-16 19:50:17 UTC (rev 
4906)
@@ -36,7 +36,6 @@
gcp $(DOWNLOADDIR)/php.ini.CSW.fixed $(DESTDIR)$(call 
_get_php_ini_path,$(DESTDIR))/php.ini.CSW
gmv $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf 
$(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf.CSW
gchmod 0644 $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW
-   $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc
@$(MAKECOOKIE)
 
 install-ap2modphp5:
@@ -65,8 +64,8 @@
@echo "[> Cleaning Up Extra Install Files <]"
gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr
gfind $(DESTDIR)$(prefix)/apache* -mindepth 1 -type d | egrep -v 
"etc|libexec" | xargs grm -fr
-   $(GARBIN)/stripbin $(shell $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)
-   $(GARBIN)/stripbin $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin/
+   $(GARBIN)/stripbin $(DESTDIR)$(shell $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)
+   $(GARBIN)/stripbin $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin
$(MAKECOOKIE)
 
 EXTFILES = $(shell find extensions/*/files/* -prune -type f)


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:[4907] csw/mgar/pkg

2009-05-16 Thread bdwalton
Revision: 4907
  http://gar.svn.sourceforge.net/gar/?rev=4907&view=rev
Author:   bdwalton
Date: 2009-05-17 01:39:59 + (Sun, 17 May 2009)

Log Message:
---
Initial checking.  Steps up to install work.

Added Paths:
---
csw/mgar/pkg/gitosis/
csw/mgar/pkg/gitosis/branches/
csw/mgar/pkg/gitosis/tags/
csw/mgar/pkg/gitosis/trunk/
csw/mgar/pkg/gitosis/trunk/Makefile
csw/mgar/pkg/gitosis/trunk/checksums
csw/mgar/pkg/gitosis/trunk/files/


Property changes on: csw/mgar/pkg/gitosis/trunk
___
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/gitosis/trunk/Makefile
===
--- csw/mgar/pkg/gitosis/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-05-17 01:39:59 UTC (rev 4907)
@@ -0,0 +1,42 @@
+GARNAME = gitosis
+GARVERSION = 0.2
+CATEGORIES = utils
+
+DESCRIPTION = Software for hosting git repositories
+define BLURB
+Manage git repositories, provide access to them over SSH, with tight access 
control and not needing shell accounts.
+
+gitosis aims to make hosting git repos easier and safer. It manages multiple 
repositories under one user account, using SSH keys to identify users. End 
users do not need shell accounts on the server, they will talk to one shared 
account that will not let them run arbitrary commands.
+endef
+
+PACKAGES = CSWgitosis
+CATALOGNAME_CSWgitosis = $(GARNAME)
+ARCHALL_CSWgitosis = 1
+
+PREREQUISITE_PKGS_CSWgitosis = CSWpython
+
+REQUIRED_PKGS_CSWgitosis = CSWgit CSWpython
+
+GIT_REPOS = git://eagain.net/gitosis.git
+GIT_USE_PROXY = 1
+GIT_TREEISH_gitosis.git = release/$(GARVERSION)
+
+# We define upstream file regex so we can be notifed of new upstream
+# software release
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+# If the url used to check for software update is different of
+# MASTER_SITES, then uncomment the next line. Otherwise it is set by
+# default to the value of MASTER_SITES UPSTREAM_MASTER_SITES =
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+
+INSTALL_SCRIPTS = $(WORKSRC)/setup.py
+#INSTALL_ARGS = --root $(DESTDIR) --single-version-externally-managed
+INSTALL_ARGS = --root $(DESTDIR)
+
+include gar/category.mk
+
+PATH := /opt/csw/gnu:$(PATH)
\ No newline at end of file


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:[4908] csw/mgar/pkg/gitosis/trunk/Makefile

2009-05-16 Thread bdwalton
Revision: 4908
  http://gar.svn.sourceforge.net/gar/?rev=4908&view=rev
Author:   bdwalton
Date: 2009-05-17 02:17:05 + (Sun, 17 May 2009)

Log Message:
---
Package the tip of the public branch instead of the tagged 0.2 release,
since we need to handle git 1.6.

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

Modified: csw/mgar/pkg/gitosis/trunk/Makefile
===
--- csw/mgar/pkg/gitosis/trunk/Makefile 2009-05-17 01:39:59 UTC (rev 4907)
+++ csw/mgar/pkg/gitosis/trunk/Makefile 2009-05-17 02:17:05 UTC (rev 4908)
@@ -1,5 +1,8 @@
 GARNAME = gitosis
 GARVERSION = 0.2
+# This represents the tip of master as of 20090516.  It is ahead of
+# release/0.2
+PATCHLEVEL = 73a03
 CATEGORIES = utils
 
 DESCRIPTION = Software for hosting git repositories
@@ -19,7 +22,10 @@
 
 GIT_REPOS = git://eagain.net/gitosis.git
 GIT_USE_PROXY = 1
-GIT_TREEISH_gitosis.git = release/$(GARVERSION)
+# We don't use a specific release tag as we want to get some fixes to
+# support git 1.6+.  We'll simply package the tip of the public branch
+# (as of 2009-05-16: 73a032520493f6b4186185d4826d12edb5614135)
+GIT_TREEISH_gitosis.git = $(PATCHLEVEL)
 
 # We define upstream file regex so we can be notifed of new upstream
 # software release
@@ -34,9 +40,12 @@
 TEST_SCRIPTS =
 
 INSTALL_SCRIPTS = $(WORKSRC)/setup.py
-#INSTALL_ARGS = --root $(DESTDIR) --single-version-externally-managed
-INSTALL_ARGS = --root $(DESTDIR)
+INSTALL_ARGS = --root $(DESTDIR) --single-version-externally-managed
 
 include gar/category.mk
 
-PATH := /opt/csw/gnu:$(PATH)
\ No newline at end of file
+PATH := /opt/csw/gnu:$(PATH)
+
+# Set a slightly altered revstamp to indicate that we're not using a
+# pressed release.
+SPKG_REVSTAMP := $(SPKG_REVSTAMP)_$(PATCHLEVEL)


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:[4909] csw/mgar/gar/v2/gar.conf.mk

2009-05-16 Thread valholla
Revision: 4909
  http://gar.svn.sourceforge.net/gar/?rev=4909&view=rev
Author:   valholla
Date: 2009-05-17 02:53:34 + (Sun, 17 May 2009)

Log Message:
---
remove STRIP_LIBTOOL var so it does not strip by default

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-05-17 02:17:05 UTC (rev 4908)
+++ csw/mgar/gar/v2/gar.conf.mk 2009-05-17 02:53:34 UTC (rev 4909)
@@ -39,9 +39,6 @@
 ftp_proxy  ?= 
 export http_proxy ftp_proxy
 
-# Don't strip libtool by default
-STRIP_LIBTOOL ?= 0
-
 # Don't do full-dependency builds by default
 SKIPDEPEND ?= 1
 


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:[4910] csw/mgar/gar/v2/bin/fixlibtool

2009-05-16 Thread valholla
Revision: 4910
  http://gar.svn.sourceforge.net/gar/?rev=4910&view=rev
Author:   valholla
Date: 2009-05-17 04:43:28 + (Sun, 17 May 2009)

Log Message:
---
fix bug in fixlibtool, the script was not pulling the libdir from the psuedo 
library

Modified Paths:
--
csw/mgar/gar/v2/bin/fixlibtool

Modified: csw/mgar/gar/v2/bin/fixlibtool
===
--- csw/mgar/gar/v2/bin/fixlibtool  2009-05-17 02:53:34 UTC (rev 4909)
+++ csw/mgar/gar/v2/bin/fixlibtool  2009-05-17 04:43:28 UTC (rev 4910)
@@ -1,4 +1,5 @@
 #!/bin/bash
+#set -x
 
 #
 #  $URL$
@@ -33,9 +34,8 @@
 ## Fix Makefiles
 for mk in $(gfind ${BASEPATH} -name Makefile -print); do
 gcp ${mk} ${mk}.orig
-LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \
-gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
-
+LT_FILES=$(for lib in $(ggrep '/opt/csw.*/lib/.*\.la' ${mk}); do \
+   echo $lib |gsed -ne '/\/opt.*\.la/p'; done)
 for file in ${LT_FILES}; do
 LIB_NAME=$(ggrep 'dlname=' ${file} | \
 gsed -e "s/.*'\(.*\)'/\1/" \
@@ -43,7 +43,8 @@
 -e "s/\.so.*$//")
 fixpath=$(gecho $file |gsed 's/\//\\\//g')
 gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >${mk}.new
-gmv ${mk}.new ${mk}
+LIB_DIR=$(ggrep 'libdir=' ${file} | gsed -e "s/.*'\(.*\)'/\1/")
+gsed "s,\(LDFLAGS =.*\),\1 -R${LIB_DIR} -L${LIB_DIR}," ${mk}.new >${mk}
 gchmod +x ${mk}
 done
 done


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