From valholla at users.sourceforge.net Fri May 1 03:27:12 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 01 May 2009 01:27:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[4625] csw/mgar/pkg Message-ID: Revision: 4625 http://gar.svn.sourceforge.net/gar/?rev=4625&view=rev Author: valholla Date: 2009-05-01 01:27:12 +0000 (Fri, 01 May 2009) Log Message: ----------- initial checkin Added Paths: ----------- csw/mgar/pkg/mediawiki/ csw/mgar/pkg/mediawiki/Makefile csw/mgar/pkg/mediawiki/branches/ csw/mgar/pkg/mediawiki/tags/ csw/mgar/pkg/mediawiki/trunk/ csw/mgar/pkg/mediawiki/trunk/Makefile csw/mgar/pkg/mediawiki/trunk/checksums csw/mgar/pkg/mediawiki/trunk/files/ csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.postinstall csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.preremove csw/mgar/pkg/mediawiki/trunk/files/httpd-mediawiki.conf.CSW Added: csw/mgar/pkg/mediawiki/Makefile =================================================================== --- csw/mgar/pkg/mediawiki/Makefile (rev 0) +++ csw/mgar/pkg/mediawiki/Makefile 2009-05-01 01:27:12 UTC (rev 4625) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/mediawiki/trunk/Makefile =================================================================== --- csw/mgar/pkg/mediawiki/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mediawiki/trunk/Makefile 2009-05-01 01:27:12 UTC (rev 4625) @@ -0,0 +1,47 @@ +GARNAME = mediawiki +GARVERSION = 1.14.0 +CATEGORIES = apps +RELVER = $(shell echo $(GARVERSION) |gsed 's/\(^[0-9].*\)\.[0-9]*/\1/') +DESCRIPTION = A free software wiki package written in PHP +define BLURB + MediaWiki is a free software wiki package written in PHP, + originally for use on Wikipedia. It is now used by several + other projects of the non-profit Wikimedia Foundation and + by many other wikis, including this website, the home of MediaWiki. +endef + +MASTER_SITES = http://download.wikimedia.org/mediawiki/$(RELVER)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWmediawiki CSWmediawiki-math +CATALOGNAME_CSWmediawiki = mediawiki +SPKG_DESC_CSWmediawiki = $(DESCRIPTION) +CATALOGNAME_CSWmediawiki-math = mediawiki_math +SPKG_DESC_CSWmediawiki-math = LaTeX compatable Math plugin for MediaWiki + +REQUIRED_PKGS_CSWmediawiki = CSWphp5 +REQUIRED_PKGS_CSWmediawiki-math = CSWphp5 CSWmediawiki + +# We define upstream file regex so we can be notifed of +# new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +ARCHALL_CSWmediawiki = 1 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = math +INSTALL_SCRIPTS = custom +TEST_SCRIPTS = skip + +build-math: + gmake $(WORKSRC)/math + @$(MAKECOOKIE) + +install-custom: + @ginstall -d $(INSTALLISADIR)$(prefix)/mediawiki + @(cd $(WORKSRC); /usr/bin/pax -rw -v ./ $(abspath $(INSTALLISADIR)$(prefix)/mediawiki)) + +test-skip: + @$(MAKECOOKIE) + +include gar/category.mk + Added: csw/mgar/pkg/mediawiki/trunk/checksums =================================================================== --- csw/mgar/pkg/mediawiki/trunk/checksums (rev 0) +++ csw/mgar/pkg/mediawiki/trunk/checksums 2009-05-01 01:27:12 UTC (rev 4625) @@ -0,0 +1 @@ +36bfd924e92b61a6f5fe70c6bc8e5aac download/mediawiki-1.14.0.tar.gz Added: csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.postinstall =================================================================== --- csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.postinstall (rev 0) +++ csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.postinstall 2009-05-01 01:27:12 UTC (rev 4625) @@ -0,0 +1,44 @@ +#!/bin/sh + +CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +AP2_PREFIX=$CSW_PREFIX/apache2 +AP2_BINDIR=$AP2_PREFIX/sbin +AP2_LIBEXEC=$AP2_PREFIX/libexec +AP2_CONFDIR=$AP2_PREFIX/etc +AP2_EXTRADIR=$AP2_CONFDIR/extra +AP2_CONFIG=$AP2_CONFDIR/httpd.conf + +# Enable MediaWiki in httpd.conf +FOUND=`grep "^Include etc/extra/httpd-mediawiki.conf" ${AP2_CONFIG}` + +if [ -n "`grep "^Include etc/extra/httpd-mediawiki.conf" ${AP2_CONFIG}`" ]; then + echo "MediaWiki Already Enabled" +elif [ -n "`grep "^#Include etc/extra/httpd-mediawiki.conf" ${AP2_CONFIG}`" ]; then + echo "Re-enabling existing config" + perl -i -pe 's|^#(Include etc/extra/httpd-mediawiki.conf)|$1|' ${AP2_CONFIG} +else + echo "Adding Include for httpd-mediawiki.conf" + cat << _END_ >>${AP2_CONFIG} +Include etc/extra/httpd-mediawiki.conf +_END_ +fi + +file = ${AP2_EXTRADIR}/httpd-mediawiki.conf +if [ ! -f ${file} ]; then + echo "Creating ${file} from ${file}.CSW" + cp ${file}.CSW ${file} +else + echo "Preserving Existing ${file}" +fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled MediaWiki +* in ${AP2_CONFIG} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + +exit 0 + Added: csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.preremove =================================================================== --- csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.preremove (rev 0) +++ csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.preremove 2009-05-01 01:27:12 UTC (rev 4625) @@ -0,0 +1,24 @@ +#!/bin/sh + +CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +AP2_PREFIX=$CSW_PREFIX/apache2 +AP2_BINDIR=$AP2_PREFIX/sbin +AP2_LIBEXEC=$AP2_PREFIX/libexec +AP2_CONFDIR=$AP2_PREFIX/etc +AP2_EXTRADIR=$AP2_CONFDIR/extra +AP2_CONFIG=$AP2_CONFDIR/httpd.conf + +# Disable MediaWiki in httpd.conf +perl -i -pe 's|^(Include etc/extra/httpd-mediawiki.conf)|#$1|' ${AP2_CONFIG} + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled MediaWiki +* in ${AP2_CONFIG} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + +exit 0 + Added: csw/mgar/pkg/mediawiki/trunk/files/httpd-mediawiki.conf.CSW =================================================================== --- csw/mgar/pkg/mediawiki/trunk/files/httpd-mediawiki.conf.CSW (rev 0) +++ csw/mgar/pkg/mediawiki/trunk/files/httpd-mediawiki.conf.CSW 2009-05-01 01:27:12 UTC (rev 4625) @@ -0,0 +1,12 @@ + + + Alias /MediaWiki /opt/csw/mediawiki + + + + AllowOverride None + Options None + Order allow,deny + Allow from all + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 1 03:28:29 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 01 May 2009 01:28:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[4626] csw/mgar/pkg/mediawiki/trunk/ Message-ID: Revision: 4626 http://gar.svn.sourceforge.net/gar/?rev=4626&view=rev Author: valholla Date: 2009-05-01 01:28:29 +0000 (Fri, 01 May 2009) Log Message: ----------- externals propset Property Changed: ---------------- csw/mgar/pkg/mediawiki/trunk/ Property changes on: csw/mgar/pkg/mediawiki/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. From valholla at users.sourceforge.net Fri May 1 03:38:09 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 01 May 2009 01:38:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[4627] csw/mgar/pkg/mediawiki/trunk/ Message-ID: Revision: 4627 http://gar.svn.sourceforge.net/gar/?rev=4627&view=rev Author: valholla Date: 2009-05-01 01:38:09 +0000 (Fri, 01 May 2009) Log Message: ----------- set ignores Property Changed: ---------------- csw/mgar/pkg/mediawiki/trunk/ Property changes on: csw/mgar/pkg/mediawiki/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 1 03:54:20 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 01 May 2009 01:54:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[4628] csw/mgar/pkg/mediawiki/trunk/Makefile Message-ID: Revision: 4628 http://gar.svn.sourceforge.net/gar/?rev=4628&view=rev Author: valholla Date: 2009-05-01 01:54:20 +0000 (Fri, 01 May 2009) Log Message: ----------- package checkin Modified Paths: -------------- csw/mgar/pkg/mediawiki/trunk/Makefile Modified: csw/mgar/pkg/mediawiki/trunk/Makefile =================================================================== --- csw/mgar/pkg/mediawiki/trunk/Makefile 2009-05-01 01:38:09 UTC (rev 4627) +++ csw/mgar/pkg/mediawiki/trunk/Makefile 2009-05-01 01:54:20 UTC (rev 4628) @@ -22,10 +22,12 @@ REQUIRED_PKGS_CSWmediawiki = CSWphp5 REQUIRED_PKGS_CSWmediawiki-math = CSWphp5 CSWmediawiki +PKGFILES_CSWmediawiki-math = # We define upstream file regex so we can be notifed of # new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +GARCOMPILER = GNU ARCHALL_CSWmediawiki = 1 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = math @@ -33,7 +35,7 @@ TEST_SCRIPTS = skip build-math: - gmake $(WORKSRC)/math + cd $(WORKSRC)/math; $(BUILD_ENV) gmake @$(MAKECOOKIE) install-custom: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 1 04:01:20 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 01 May 2009 02:01:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[4629] csw/mgar/pkg/mediawiki/trunk/Makefile Message-ID: Revision: 4629 http://gar.svn.sourceforge.net/gar/?rev=4629&view=rev Author: valholla Date: 2009-05-01 02:01:20 +0000 (Fri, 01 May 2009) Log Message: ----------- filter for mediawiki-math Modified Paths: -------------- csw/mgar/pkg/mediawiki/trunk/Makefile Modified: csw/mgar/pkg/mediawiki/trunk/Makefile =================================================================== --- csw/mgar/pkg/mediawiki/trunk/Makefile 2009-05-01 01:54:20 UTC (rev 4628) +++ csw/mgar/pkg/mediawiki/trunk/Makefile 2009-05-01 02:01:20 UTC (rev 4629) @@ -22,7 +22,8 @@ REQUIRED_PKGS_CSWmediawiki = CSWphp5 REQUIRED_PKGS_CSWmediawiki-math = CSWphp5 CSWmediawiki -PKGFILES_CSWmediawiki-math = +PKGFILES_CSWmediawiki-math = .*/mediawiki/math.* + # We define upstream file regex so we can be notifed of # new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 1 05:02:37 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 01 May 2009 03:02:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[4630] csw/mgar/pkg/mediawiki/trunk Message-ID: Revision: 4630 http://gar.svn.sourceforge.net/gar/?rev=4630&view=rev Author: valholla Date: 2009-05-01 03:02:37 +0000 (Fri, 01 May 2009) Log Message: ----------- checkin Modified Paths: -------------- csw/mgar/pkg/mediawiki/trunk/Makefile csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.postinstall csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.preremove Removed Paths: ------------- csw/mgar/pkg/mediawiki/trunk/files/httpd-mediawiki.conf.CSW Modified: csw/mgar/pkg/mediawiki/trunk/Makefile =================================================================== --- csw/mgar/pkg/mediawiki/trunk/Makefile 2009-05-01 02:01:20 UTC (rev 4629) +++ csw/mgar/pkg/mediawiki/trunk/Makefile 2009-05-01 03:02:37 UTC (rev 4630) @@ -20,7 +20,7 @@ SPKG_DESC_CSWmediawiki-math = LaTeX compatable Math plugin for MediaWiki REQUIRED_PKGS_CSWmediawiki = CSWphp5 -REQUIRED_PKGS_CSWmediawiki-math = CSWphp5 CSWmediawiki +REQUIRED_PKGS_CSWmediawiki-math = CSWphp5 CSWmediawiki CSWtetex PKGFILES_CSWmediawiki-math = .*/mediawiki/math.* Modified: csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.postinstall =================================================================== --- csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.postinstall 2009-05-01 02:01:20 UTC (rev 4629) +++ csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.postinstall 2009-05-01 03:02:37 UTC (rev 4630) @@ -8,35 +8,18 @@ AP2_EXTRADIR=$AP2_CONFDIR/extra AP2_CONFIG=$AP2_CONFDIR/httpd.conf -# Enable MediaWiki in httpd.conf -FOUND=`grep "^Include etc/extra/httpd-mediawiki.conf" ${AP2_CONFIG}` +AP2_SERVERNAME=`/bin/sed -ne 's/^[\s]*ServerName \(.*\)/\1/p' ${AP2_CONFIG}` +AP2_DOCROOT=`/bin/sed -ne 's/^[\s]*DocumentRoot "\(.*\)"/\1/p' ${AP2_CONFIG}` +/bin/ln -s /opt/csw/mediawiki ${AP2_DOCROOT}/wiki -if [ -n "`grep "^Include etc/extra/httpd-mediawiki.conf" ${AP2_CONFIG}`" ]; then - echo "MediaWiki Already Enabled" -elif [ -n "`grep "^#Include etc/extra/httpd-mediawiki.conf" ${AP2_CONFIG}`" ]; then - echo "Re-enabling existing config" - perl -i -pe 's|^#(Include etc/extra/httpd-mediawiki.conf)|$1|' ${AP2_CONFIG} -else - echo "Adding Include for httpd-mediawiki.conf" - cat << _END_ >>${AP2_CONFIG} -Include etc/extra/httpd-mediawiki.conf -_END_ -fi - -file = ${AP2_EXTRADIR}/httpd-mediawiki.conf -if [ ! -f ${file} ]; then - echo "Creating ${file} from ${file}.CSW" - cp ${file}.CSW ${file} -else - echo "Preserving Existing ${file}" -fi - cat << _EOF_ ****************************************************************************** * NOTICE: Successfully Enabled MediaWiki * in ${AP2_CONFIG} * -* You will need to restart your web server to finish the install +* You will need to point your web browser to +* http://${AP2_SERVERNAME}/wiki/config +* To configure your Wiki ****************************************************************************** _EOF_ Modified: csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.preremove =================================================================== --- csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.preremove 2009-05-01 02:01:20 UTC (rev 4629) +++ csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki.preremove 2009-05-01 03:02:37 UTC (rev 4630) @@ -8,17 +8,8 @@ AP2_EXTRADIR=$AP2_CONFDIR/extra AP2_CONFIG=$AP2_CONFDIR/httpd.conf -# Disable MediaWiki in httpd.conf -perl -i -pe 's|^(Include etc/extra/httpd-mediawiki.conf)|#$1|' ${AP2_CONFIG} +AP2_DOCROOT=`/bin/sed -ne 's/^[\s]*DocumentRoot "\(.*\)"/\1/p' ${AP2_CONFIG}` +/bin/rm -f ${AP2_DOCROOT}/wiki -cat << _EOF_ -****************************************************************************** -* NOTICE: Successfully Disabled MediaWiki -* in ${AP2_CONFIG} -* -* You will need to restart your web server to finish the removal -****************************************************************************** -_EOF_ - exit 0 Deleted: csw/mgar/pkg/mediawiki/trunk/files/httpd-mediawiki.conf.CSW =================================================================== --- csw/mgar/pkg/mediawiki/trunk/files/httpd-mediawiki.conf.CSW 2009-05-01 02:01:20 UTC (rev 4629) +++ csw/mgar/pkg/mediawiki/trunk/files/httpd-mediawiki.conf.CSW 2009-05-01 03:02:37 UTC (rev 4630) @@ -1,12 +0,0 @@ - - - Alias /MediaWiki /opt/csw/mediawiki - - - - AllowOverride None - Options None - Order allow,deny - Allow from all - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 1 05:15:52 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 01 May 2009 03:15:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[4631] csw/mgar/pkg/mediawiki/trunk Message-ID: Revision: 4631 http://gar.svn.sourceforge.net/gar/?rev=4631&view=rev Author: valholla Date: 2009-05-01 03:15:52 +0000 (Fri, 01 May 2009) Log Message: ----------- checkin Modified Paths: -------------- csw/mgar/pkg/mediawiki/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki-math.postinstall Modified: csw/mgar/pkg/mediawiki/trunk/Makefile =================================================================== --- csw/mgar/pkg/mediawiki/trunk/Makefile 2009-05-01 03:02:37 UTC (rev 4630) +++ csw/mgar/pkg/mediawiki/trunk/Makefile 2009-05-01 03:15:52 UTC (rev 4631) @@ -12,7 +12,11 @@ MASTER_SITES = http://download.wikimedia.org/mediawiki/$(RELVER)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWmediawiki-math.postinstall +DISTFILES += CSWmediawiki.postinstall +DISTFILES += CSWmediawiki.preremove + PACKAGES = CSWmediawiki CSWmediawiki-math CATALOGNAME_CSWmediawiki = mediawiki SPKG_DESC_CSWmediawiki = $(DESCRIPTION) Added: csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki-math.postinstall =================================================================== --- csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki-math.postinstall (rev 0) +++ csw/mgar/pkg/mediawiki/trunk/files/CSWmediawiki-math.postinstall 2009-05-01 03:15:52 UTC (rev 4631) @@ -0,0 +1,21 @@ +#!/bin/sh + +CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +AP2_PREFIX=$CSW_PREFIX/apache2 +AP2_BINDIR=$AP2_PREFIX/sbin +AP2_LIBEXEC=$AP2_PREFIX/libexec +AP2_CONFDIR=$AP2_PREFIX/etc +AP2_EXTRADIR=$AP2_CONFDIR/extra +AP2_CONFIG=$AP2_CONFDIR/httpd.conf + +cat << _EOF_ +****************************************************************************** +* +* DO NOT FORGET: +* You will need to set \$wgUseTeX to true in your LocalSettings.php +* +****************************************************************************** +_EOF_ + +exit 0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 1 05:17:00 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 01 May 2009 03:17:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[4632] csw/mgar/pkg/mediawiki/trunk/checksums Message-ID: Revision: 4632 http://gar.svn.sourceforge.net/gar/?rev=4632&view=rev Author: valholla Date: 2009-05-01 03:17:00 +0000 (Fri, 01 May 2009) Log Message: ----------- checkin Modified Paths: -------------- csw/mgar/pkg/mediawiki/trunk/checksums Modified: csw/mgar/pkg/mediawiki/trunk/checksums =================================================================== --- csw/mgar/pkg/mediawiki/trunk/checksums 2009-05-01 03:15:52 UTC (rev 4631) +++ csw/mgar/pkg/mediawiki/trunk/checksums 2009-05-01 03:17:00 UTC (rev 4632) @@ -1 +1,4 @@ +ef5ecd4900918e5bf67929a94a793f22 download/CSWmediawiki-math.postinstall +7643276ab2527aa36dbd6c99c1493f73 download/CSWmediawiki.postinstall +03b5e4fe1408f1fe2a1799b71df504af download/CSWmediawiki.preremove 36bfd924e92b61a6f5fe70c6bc8e5aac download/mediawiki-1.14.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 1 15:09:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 May 2009 13:09:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[4633] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 4633 http://gar.svn.sourceforge.net/gar/?rev=4633&view=rev Author: dmichelsen Date: 2009-05-01 13:09:55 +0000 (Fri, 01 May 2009) Log Message: ----------- mGAR v2: Call bin/upstream_watch only when needed Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-05-01 03:17:00 UTC (rev 4632) +++ csw/mgar/gar/v2/gar.lib.mk 2009-05-01 13:09:55 UTC (rev 4633) @@ -160,12 +160,12 @@ UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) SF_ARGS = $(addprefix -s ,$(UPSTREAM_USE_SF)) -ifneq ($(UFILES_REGEX), "") - FILES2CHECK := $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) -else - FILES2CHECK := "" -endif +define files2check +$(if $(UFILES_REGEX),$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX))))) +endef + +check-upstream-and-mail: FILES2CHECK = $(call files2check) check-upstream-and-mail: @if [ -n '$(FILES2CHECK)' ]; then \ NEW_FILES=""; \ @@ -227,6 +227,7 @@ fi; \ fi +check-upstream: FILES2CHECK = $(call files2check) check-upstream: @if [ -n '$(FILES2CHECK)' ]; then \ NEW_FILES=""; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 1 16:37:32 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 May 2009 14:37:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[4634] csw/mgar/gar/v2 Message-ID: Revision: 4634 http://gar.svn.sourceforge.net/gar/?rev=4634&view=rev Author: dmichelsen Date: 2009-05-01 14:37:31 +0000 (Fri, 01 May 2009) Log Message: ----------- mGAR v2: Allow category-specific compiler flags, use x11/category.mk as example Modified Paths: -------------- csw/mgar/gar/v2/categories/x11/category.mk csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/categories/x11/category.mk =================================================================== --- csw/mgar/gar/v2/categories/x11/category.mk 2009-05-01 13:09:55 UTC (rev 4633) +++ csw/mgar/gar/v2/categories/x11/category.mk 2009-05-01 14:37:31 UTC (rev 4634) @@ -3,41 +3,22 @@ XCB_MASTER_SITES = http://xcb.freedesktop.org/dist/ # C and C++ compiler flags -ifeq ($(GARCOMPILER),GNU) - CFLAGS += - CXXFLAGS += -else - CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION - CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath -endif +_CATEGORY_CFLAGS_SOS11 = -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION +_CATEGORY_CFLAGS_SOS12 = -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION +_CATEGORY_CXXFLAGS_SOS11 = -xlibmil -xlibmopt -features=tmplife -norunpath +_CATEGORY_CXXFLAGS_SOS12 = -xlibmil -xlibmopt -features=tmplife -norunpath -# Preprocessor flags +_CATEGORY_CFLAGS = $(_CATEGORY_CFLAGS_$(GARCOMPILER)) +_CATEGORY_CXXFLAGS = $(_CATEGORY_CFLAGS_$(GARCOMPILER)) -# Linker flags -#LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - # Defines some tools used by autostuff GREP = ggrep _CATEGORY_COMMON_EXPORTS = GREP -# export the variables -#export LDFLAGS CXXFLAGS CFLAGS CPPFLAGS GREP - -# pkg-config options -#_CATEGORY_PKG_CONFIG_PATH = $(abspath $(prefix)/X11/lib/$(MM_LIBDIR)/pkgconfig) - prefix = $(BUILD_PREFIX)/X11 -# Configure common options -#CONFIGURE_ARGS = --prefix=/opt/csw/X11 -#CONFIGURE_ARGS += --exec-prefix=/opt/csw/X11 -#CONFIGURE_ARGS += --libdir=/opt/csw/X11/lib -#CONFIGURE_ARGS += --includedir=/opt/csw/X11/include -#CONFIGURE_ARGS += --datadir=/opt/csw/X11/share -#CONFIGURE_ARGS += --mandir=/opt/csw/X11/share/man - # No tests scripts, thus there is no "gmake test" target -TEST_SCRIPTS = +TEST_SCRIPTS = # Includes the rest of gar include gar/gar.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-05-01 13:09:55 UTC (rev 4633) +++ csw/mgar/gar/v2/gar.conf.mk 2009-05-01 14:37:31 UTC (rev 4634) @@ -466,12 +466,12 @@ CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) CXX = $($(GARCOMPILER)_CXX) -CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(EXTRA_CFLAGS) $(INCLUDE_FLAGS)) -CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(EXTRA_CXXFLAGS) $(INCLUDE_FLAGS)) -CPPFLAGS ?= $(strip $($(GARCOMPILER)_CPP_FLAGS) $(EXTRA_CPPFLAGS) $(INCLUDE_FLAGS)) -LDFLAGS ?= $(strip $($(GARCOMPILER)_LD_FLAGS) $(EXTRA_LDFLAGS) $(LINKER_FLAGS)) -ASFLAGS ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(EXTRA_ASFLAGS)) -OPTFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(EXTRA_OPTFLAGS)) +CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE_FLAGS)) +CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS) $(EXTRA_CXXFLAGS) $(INCLUDE_FLAGS)) +CPPFLAGS ?= $(strip $($(GARCOMPILER)_CPP_FLAGS) $(_CATEGORY_CPPFLAGS) $(EXTRA_CPPFLAGS) $(INCLUDE_FLAGS)) +LDFLAGS ?= $(strip $($(GARCOMPILER)_LD_FLAGS) $(_CATEGORY_LDFLAGS) $(EXTRA_LDFLAGS) $(LINKER_FLAGS)) +ASFLAGS ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(_CATEGORY_ASFLAGS) $(EXTRA_ASFLAGS)) +OPTFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_OPTFLAGS) $(EXTRA_OPTFLAGS)) GCC3_LD_OPTIONS = -R$(GCC3_CC_HOME)/lib $(EXTRA_GCC3_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) $(EXTRA_LD_OPTIONS) GCC4_LD_OPTIONS = -R$(GCC4_CC_HOME)/lib $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) $(EXTRA_LD_OPTIONS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 1 17:25:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 May 2009 15:25:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4635] csw/mgar/pkg/x11/libxcb/trunk Message-ID: Revision: 4635 http://gar.svn.sourceforge.net/gar/?rev=4635&view=rev Author: dmichelsen Date: 2009-05-01 15:25:25 +0000 (Fri, 01 May 2009) Log Message: ----------- x11/libxcb: Update to 1.2 Modified Paths: -------------- csw/mgar/pkg/x11/libxcb/trunk/Makefile csw/mgar/pkg/x11/libxcb/trunk/checksums Modified: csw/mgar/pkg/x11/libxcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-05-01 14:37:31 UTC (rev 4634) +++ csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-05-01 15:25:25 UTC (rev 4635) @@ -1,5 +1,5 @@ GARNAME = libxcb -GARVERSION = 1.1 +GARVERSION = 1.2 CATEGORIES = x11 DESCRIPTION = The XCB library @@ -11,7 +11,7 @@ MASTER_SITES = http://xcb.freedesktop.org/dist/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PREREQUISITE_PKGS = CSWlibxaudevel CSWlibpthreadstubs CSWdoxygen +PREREQUISITE_PKGS = CSWlibxaudevel CSWlibpthreadstubs CSWdoxygen CSWpython REQUIRED_PKGS_CSWlibxcb = CSWxcbproto CSWlibxau PACKAGES = CSWlibxcb CSWlibxcbdevel CSWlibxcbdoc Modified: csw/mgar/pkg/x11/libxcb/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxcb/trunk/checksums 2009-05-01 14:37:31 UTC (rev 4634) +++ csw/mgar/pkg/x11/libxcb/trunk/checksums 2009-05-01 15:25:25 UTC (rev 4635) @@ -1 +1 @@ -90e02378256d5dec96ddc6c7d72119b6 download/libxcb-1.1.tar.gz +f55c731d32ec1a555c77ebbbc8f386aa download/libxcb-1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 1 17:54:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 May 2009 15:54:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[4636] csw/mgar/pkg/x11/libX11/trunk Message-ID: Revision: 4636 http://gar.svn.sourceforge.net/gar/?rev=4636&view=rev Author: dmichelsen Date: 2009-05-01 15:54:13 +0000 (Fri, 01 May 2009) Log Message: ----------- x11/libx11: Update to dynamic gspec, license and bump to 1.2 Modified Paths: -------------- csw/mgar/pkg/x11/libX11/trunk/Makefile csw/mgar/pkg/x11/libX11/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/x11/libX11/trunk/files/CSWlibx11.gspec csw/mgar/pkg/x11/libX11/trunk/files/CSWlibx11devel.gspec Modified: csw/mgar/pkg/x11/libX11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-05-01 15:25:25 UTC (rev 4635) +++ csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-05-01 15:54:13 UTC (rev 4636) @@ -1,32 +1,38 @@ GARNAME = libX11 -GARVERSION = 1.1.5 +GARVERSION = 1.2 CATEGORIES = x11 DESCRIPTION = X11 client-side library define BLURB -This package provides a client interface to the X Window System, otherwise known as 'Xlib'. It provides a complete API for the basic functions of the window system. + This package provides a client interface to the X Window System, + otherwise known as 'Xlib'. It provides a complete API for the basic + functions of the window system. endef MASTER_SITES =http://xorg.freedesktop.org/releases/individual/lib/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PREREQUSITE_PKGS = CSWxextproto CSWxtrans CSWkbproto CSWinputproto + +PACKAGES = CSWlibx11 CSWlibx11devel + SPKG_DESC_CSWlibx11 = $(DESCRIPTION) SPKG_DESC_CSWlibx11devel = $(DESCRIPTION) development package -DISTFILES += $(call admfiles,CSWlibx11devel, ) -DISTFILES += $(call admfiles,CSWlibx11, ) +CATALOGNAME_CSWlibx11 = libx11 +CATALOGNAME_CSWlibx11devel = libx11_devel PKGFILES_CSWlibx11devel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibx11devel += $(prefix)/X11/include/.* -PKGFILES_CSWlibx11devel += $(prefix)/X11/lib/.*\.a -PKGFILES_CSWlibx11devel += $(prefix)/X11/lib/pkgconfig/.* REQUIRED_PKGS_CSWlibx11 = CSWlibxcb REQUIRED_PKGS_CSWlibx11devel = CSWlibx11 +BUILD64 = 1 +NOISALIST = 1 +CONFIGURE_ARGS = $(DIRPATHS) + include gar/category.mk Modified: csw/mgar/pkg/x11/libX11/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/checksums 2009-05-01 15:25:25 UTC (rev 4635) +++ csw/mgar/pkg/x11/libX11/trunk/checksums 2009-05-01 15:54:13 UTC (rev 4636) @@ -1,3 +1 @@ -2feb39a0de6f05b25c308268691d960c download/libX11-1.1.5.tar.gz -227f750748ff9b31fbf803f6a3d2110a download/CSWlibx11devel.gspec -8b5aa1b7f74313397e420e0c3166aaa4 download/CSWlibx11.gspec +a8e045794665c9fb7486c0faa21e3211 download/libX11-1.2.tar.gz Deleted: csw/mgar/pkg/x11/libX11/trunk/files/CSWlibx11.gspec =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/files/CSWlibx11.gspec 2009-05-01 15:25:25 UTC (rev 4635) +++ csw/mgar/pkg/x11/libX11/trunk/files/CSWlibx11.gspec 2009-05-01 15:54:13 UTC (rev 4636) @@ -1,4 +0,0 @@ -%var bitname libx11 -%var pkgname CSWlibx11 -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/x11/libX11/trunk/files/CSWlibx11devel.gspec =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/files/CSWlibx11devel.gspec 2009-05-01 15:25:25 UTC (rev 4635) +++ csw/mgar/pkg/x11/libX11/trunk/files/CSWlibx11devel.gspec 2009-05-01 15:54:13 UTC (rev 4636) @@ -1,4 +0,0 @@ -%var bitname libx11_devel -%var pkgname CSWlibx11devel -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 1 18:29:36 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 May 2009 16:29:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[4637] csw/mgar/pkg/x11/xtrans/trunk Message-ID: Revision: 4637 http://gar.svn.sourceforge.net/gar/?rev=4637&view=rev Author: dmichelsen Date: 2009-05-01 16:29:35 +0000 (Fri, 01 May 2009) Log Message: ----------- x11/xtrans: Update to 1.2.3 Modified Paths: -------------- csw/mgar/pkg/x11/xtrans/trunk/Makefile csw/mgar/pkg/x11/xtrans/trunk/checksums Modified: csw/mgar/pkg/x11/xtrans/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xtrans/trunk/Makefile 2009-05-01 15:54:13 UTC (rev 4636) +++ csw/mgar/pkg/x11/xtrans/trunk/Makefile 2009-05-01 16:29:35 UTC (rev 4637) @@ -1,5 +1,5 @@ GARNAME = xtrans -GARVERSION = 1.2.2 +GARVERSION = 1.2.3 CATEGORIES = x11 DESCRIPTION = X transport library @@ -8,7 +8,7 @@ at time of writing, it includes support for UNIX sockets, IPv4, IPv6, and DECnet. endef -MASTER_SITES =http://xorg.freedesktop.org/releases/individual/lib/ +MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/x11/xtrans/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xtrans/trunk/checksums 2009-05-01 15:54:13 UTC (rev 4636) +++ csw/mgar/pkg/x11/xtrans/trunk/checksums 2009-05-01 16:29:35 UTC (rev 4637) @@ -1 +1 @@ -1b9362b6c7577f1cd5009703949ac5d0 download/xtrans-1.2.2.tar.gz +9e9dcfb9555bbe4eae7ceeb33d9d710e download/xtrans-1.2.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 1 18:59:03 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 May 2009 16:59:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[4638] csw/mgar/pkg/x11/libxcb/trunk/Makefile Message-ID: Revision: 4638 http://gar.svn.sourceforge.net/gar/?rev=4638&view=rev Author: dmichelsen Date: 2009-05-01 16:59:03 +0000 (Fri, 01 May 2009) Log Message: ----------- x11/libxcb: Require CSWxcbproto only on compiletime Modified Paths: -------------- csw/mgar/pkg/x11/libxcb/trunk/Makefile Modified: csw/mgar/pkg/x11/libxcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-05-01 16:29:35 UTC (rev 4637) +++ csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-05-01 16:59:03 UTC (rev 4638) @@ -11,8 +11,8 @@ MASTER_SITES = http://xcb.freedesktop.org/dist/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PREREQUISITE_PKGS = CSWlibxaudevel CSWlibpthreadstubs CSWdoxygen CSWpython -REQUIRED_PKGS_CSWlibxcb = CSWxcbproto CSWlibxau +PREREQUISITE_PKGS = CSWlibxaudevel CSWlibpthreadstubs CSWdoxygen CSWpython CSWxcbproto +REQUIRED_PKGS_CSWlibxcb = CSWlibxau PACKAGES = CSWlibxcb CSWlibxcbdevel CSWlibxcbdoc # We define upstream file regex so we can be notifed of new upstream software release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 1 20:19:38 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 01 May 2009 18:19:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[4639] csw/mgar/pkg/gcc4/trunk/files Message-ID: Revision: 4639 http://gar.svn.sourceforge.net/gar/?rev=4639&view=rev Author: valholla Date: 2009-05-01 18:19:37 +0000 (Fri, 01 May 2009) Log Message: ----------- fix for gnative2ascii Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk csw/mgar/pkg/gcc4/trunk/files/package_files.mk Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-05-01 16:59:03 UTC (rev 4638) +++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-05-01 18:19:37 UTC (rev 4639) @@ -94,7 +94,6 @@ ISAEXEC_FILES += /opt/csw/gcc4/bin/jv-convert ISAEXEC_FILES += /opt/csw/gcc4/bin/gcj ISAEXEC_FILES += /opt/csw/gcc4/bin/gij -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnative2ascii ISAEXEC_FILES += /opt/csw/gcc4/bin/gserialver ISAEXEC_FILES += /opt/csw/gcc4/bin/gappletviewer ISAEXEC_FILES += /opt/csw/gcc4/bin/gcj-dbtool Modified: csw/mgar/pkg/gcc4/trunk/files/package_files.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/package_files.mk 2009-05-01 16:59:03 UTC (rev 4638) +++ csw/mgar/pkg/gcc4/trunk/files/package_files.mk 2009-05-01 18:19:37 UTC (rev 4639) @@ -7,7 +7,7 @@ PKGFILES_CSWgcc4ada += .*/gcc4/.*/adalib/.* PKGFILES_CSWgcc4ada += .*/gcc4/.*/adainclude/.* PKGFILES_CSWgcc4ada += .*/gcc4/info/.*gnat.* -PKGFILES_CSWgcc4ada += .*/gcc4/bin/gnat.* +PKGFILES_CSWgcc4ada += .*/gcc4/bin/gnat(?!ive).* ## gcc4gfortran Definitions PKGFILES_CSWgcc4gfortran = .*/gcc4/bin/.*gfortran This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 1 20:46:16 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 01 May 2009 18:46:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[4640] csw/mgar/pkg/python/trunk/Makefile Message-ID: Revision: 4640 http://gar.svn.sourceforge.net/gar/?rev=4640&view=rev Author: valholla Date: 2009-05-01 18:46:16 +0000 (Fri, 01 May 2009) Log Message: ----------- update to Python 2.6.2 Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-05-01 18:19:37 UTC (rev 4639) +++ csw/mgar/pkg/python/trunk/Makefile 2009-05-01 18:46:16 UTC (rev 4640) @@ -1,5 +1,5 @@ GARNAME = Python -GARVERSION = 2.6.1 +GARVERSION = 2.6.2 CATEGORIES = lang PACKAGES = CSWpython CSWpython-tk CSWidle This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 1 20:56:19 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 01 May 2009 18:56:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[4641] csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk Message-ID: Revision: 4641 http://gar.svn.sourceforge.net/gar/?rev=4641&view=rev Author: valholla Date: 2009-05-01 18:56:19 +0000 (Fri, 01 May 2009) Log Message: ----------- no 64bit ada remove from ISAEXEC Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-05-01 18:46:16 UTC (rev 4640) +++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-05-01 18:56:19 UTC (rev 4641) @@ -100,18 +100,5 @@ ISAEXEC_FILES += /opt/csw/gcc4/bin/gjar ISAEXEC_FILES += /opt/csw/gcc4/bin/gorbd ISAEXEC_FILES += /opt/csw/gcc4/bin/gtnameserv -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnat -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatbind -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatbl -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatchop -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatclean -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatfind ISAEXEC_FILES += /opt/csw/gcc4/bin/gnative2ascii -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatkr -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatlink -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatls -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatmake -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatname -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatprep -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatxref endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 1 21:16:25 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 01 May 2009 19:16:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4642] csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk Message-ID: Revision: 4642 http://gar.svn.sourceforge.net/gar/?rev=4642&view=rev Author: valholla Date: 2009-05-01 19:16:25 +0000 (Fri, 01 May 2009) Log Message: ----------- no 64bit ada remove from ISAEXEC Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-05-01 18:56:19 UTC (rev 4641) +++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-05-01 19:16:25 UTC (rev 4642) @@ -101,4 +101,18 @@ ISAEXEC_FILES += /opt/csw/gcc4/bin/gorbd ISAEXEC_FILES += /opt/csw/gcc4/bin/gtnameserv ISAEXEC_FILES += /opt/csw/gcc4/bin/gnative2ascii +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/gnat +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatls +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatname +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatmake +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatclean +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatkr +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatbind +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnat +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatbl +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatchop +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatfind +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatxref +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatprep +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatlink endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 1 23:23:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 May 2009 21:23:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[4643] csw/mgar/pkg/x11/libxcb/trunk/Makefile Message-ID: Revision: 4643 http://gar.svn.sourceforge.net/gar/?rev=4643&view=rev Author: dmichelsen Date: 2009-05-01 21:23:47 +0000 (Fri, 01 May 2009) Log Message: ----------- x11/libxcb: Add flag to enable use of stdint.h on Solaris Modified Paths: -------------- csw/mgar/pkg/x11/libxcb/trunk/Makefile Modified: csw/mgar/pkg/x11/libxcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-05-01 19:16:25 UTC (rev 4642) +++ csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-05-01 21:23:47 UTC (rev 4643) @@ -36,5 +36,7 @@ NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_CFLAGS = -D__solaris__ + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sat May 2 00:53:40 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 01 May 2009 22:53:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[4644] csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk Message-ID: Revision: 4644 http://gar.svn.sourceforge.net/gar/?rev=4644&view=rev Author: valholla Date: 2009-05-01 22:53:40 +0000 (Fri, 01 May 2009) Log Message: ----------- fix isaexec for ada Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-05-01 21:23:47 UTC (rev 4643) +++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-05-01 22:53:40 UTC (rev 4644) @@ -1,4 +1,3 @@ -AMD_DEBUG = 1 ifeq ($(AMD_DEBUG),) _DBG=@ else @@ -101,18 +100,18 @@ ISAEXEC_FILES += /opt/csw/gcc4/bin/gorbd ISAEXEC_FILES += /opt/csw/gcc4/bin/gtnameserv ISAEXEC_FILES += /opt/csw/gcc4/bin/gnative2ascii -EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/gnat -EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatls -EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatname -EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatmake -EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatclean -EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatkr -EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatbind -EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnat -EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatbl -EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatchop -EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatfind -EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatxref -EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatprep -EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/gcc4/bin/i386/gnatlink +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnat +ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatls +ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatname +ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatmake +ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatclean +ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatkr +ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatbind +ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnat +ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatbl +ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatchop +ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatfind +ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatxref +ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatprep +ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatlink endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat May 2 08:48:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 May 2009 06:48:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[4645] csw/mgar/pkg/x11/libX11/trunk Message-ID: Revision: 4645 http://gar.svn.sourceforge.net/gar/?rev=4645&view=rev Author: dmichelsen Date: 2009-05-02 06:48:26 +0000 (Sat, 02 May 2009) Log Message: ----------- x11/libX11: Update to 1.2.1 Modified Paths: -------------- csw/mgar/pkg/x11/libX11/trunk/Makefile csw/mgar/pkg/x11/libX11/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libX11/trunk/files/patch-stdint.diff Modified: csw/mgar/pkg/x11/libX11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-05-01 22:53:40 UTC (rev 4644) +++ csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-05-02 06:48:26 UTC (rev 4645) @@ -1,5 +1,5 @@ GARNAME = libX11 -GARVERSION = 1.2 +GARVERSION = 1.2.1 CATEGORIES = x11 DESCRIPTION = X11 client-side library @@ -11,11 +11,12 @@ MASTER_SITES =http://xorg.freedesktop.org/releases/individual/lib/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = patch-stdint.diff # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUSITE_PKGS = CSWxextproto CSWxtrans CSWkbproto CSWinputproto +PREREQUISITE_PKGS = CSWxextproto CSWxtrans CSWkbproto CSWinputproto PACKAGES = CSWlibx11 CSWlibx11devel @@ -34,5 +35,7 @@ NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_CFLAGS = -D__solaris__ + include gar/category.mk Modified: csw/mgar/pkg/x11/libX11/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/checksums 2009-05-01 22:53:40 UTC (rev 4644) +++ csw/mgar/pkg/x11/libX11/trunk/checksums 2009-05-02 06:48:26 UTC (rev 4645) @@ -1 +1,2 @@ -a8e045794665c9fb7486c0faa21e3211 download/libX11-1.2.tar.gz +858e013fd4c37689a2a8d86c8765dab0 download/libX11-1.2.1.tar.gz +667f63d38722e29d6fd36b6648bbb757 download/patch-stdint.diff Added: csw/mgar/pkg/x11/libX11/trunk/files/patch-stdint.diff =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/files/patch-stdint.diff (rev 0) +++ csw/mgar/pkg/x11/libX11/trunk/files/patch-stdint.diff 2009-05-02 06:48:26 UTC (rev 4645) @@ -0,0 +1,30 @@ +diff -Naur libX11-1.2.1.orig/src/Xxcbint.h libX11-1.2.1.patched/src/Xxcbint.h +--- libX11-1.2.1.orig/src/Xxcbint.h 2008-11-19 07:42:01.000000000 +0100 ++++ libX11-1.2.1.patched/src/Xxcbint.h 2009-05-02 08:10:56.519976514 +0200 +@@ -5,7 +5,11 @@ + #define XXCBINT_H + + #include ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + #include "locking.h" +diff -Naur libX11-1.2.1.orig/src/xcb_io.c libX11-1.2.1.patched/src/xcb_io.c +--- libX11-1.2.1.orig/src/xcb_io.c 2009-02-24 04:29:22.000000000 +0100 ++++ libX11-1.2.1.patched/src/xcb_io.c 2009-05-02 08:27:43.445731862 +0200 +@@ -9,7 +9,11 @@ + + #include + #include ++#if defined(__solaris__) ++#include ++#else + #include ++#endif + #include + #include + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat May 2 08:57:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 May 2009 06:57:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[4646] csw/mgar/pkg/x11/renderproto/trunk Message-ID: Revision: 4646 http://gar.svn.sourceforge.net/gar/?rev=4646&view=rev Author: dmichelsen Date: 2009-05-02 06:57:59 +0000 (Sat, 02 May 2009) Log Message: ----------- x11/renderproto: Update to dynamic gspec and license Modified Paths: -------------- csw/mgar/pkg/x11/renderproto/trunk/Makefile csw/mgar/pkg/x11/renderproto/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec Modified: csw/mgar/pkg/x11/renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-05-02 06:48:26 UTC (rev 4645) +++ csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-05-02 06:57:59 UTC (rev 4646) @@ -5,20 +5,17 @@ DESCRIPTION = Render extension headers from modular X.org define BLURB -This provides the Render extension headers from modular X.org X11 project. + This provides the Render extension headers from modular X.org X11 project. endef MASTER_SITES = $(X11_PROTO_MASTER_SITE) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWrenderproto) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -pre-install: - @ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME) - @gcp -fp $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME)/COPYING $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))$(datadir)/doc/$(GARNAME)/License.txt +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk - Modified: csw/mgar/pkg/x11/renderproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/checksums 2009-05-02 06:48:26 UTC (rev 4645) +++ csw/mgar/pkg/x11/renderproto/trunk/checksums 2009-05-02 06:57:59 UTC (rev 4646) @@ -1,2 +1 @@ ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz -06af8b4e2064f0af6d8387feac391e2e download/CSWrenderproto.gspec Deleted: csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec 2009-05-02 06:48:26 UTC (rev 4645) +++ csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec 2009-05-02 06:57:59 UTC (rev 4646) @@ -1,7 +0,0 @@ -%var bitname renderproto -%var pkgname CSWrenderproto -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/%{GARNAME}/License.txt for license information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat May 2 09:06:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 May 2009 07:06:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[4647] csw/mgar/pkg/x11/xrender/trunk/Makefile Message-ID: Revision: 4647 http://gar.svn.sourceforge.net/gar/?rev=4647&view=rev Author: dmichelsen Date: 2009-05-02 07:06:29 +0000 (Sat, 02 May 2009) Log Message: ----------- x11/libxrender: Update dependencies Modified Paths: -------------- csw/mgar/pkg/x11/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xrender/trunk/Makefile 2009-05-02 06:57:59 UTC (rev 4646) +++ csw/mgar/pkg/x11/xrender/trunk/Makefile 2009-05-02 07:06:29 UTC (rev 4647) @@ -19,7 +19,8 @@ PACKAGES = CSWlibxrender CSWrenderdev -REQUIRED_PKGS_CSWrenderdev = CSWlibxrender +PREREQUISITE_PKGS = CSWrenderproto +REQUIRED_PKGS_CSWrenderdev = CSWlibxrender REQUIRED_PKGS_CSWlibxrender = CSWlibx11 SPKG_DESC_CSWlibxrender = $(DESCRIPTION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sat May 2 12:24:27 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sat, 02 May 2009 10:24:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[4648] csw/mgar/pkg/nrpe/trunk/Makefile Message-ID: Revision: 4648 http://gar.svn.sourceforge.net/gar/?rev=4648&view=rev Author: j_arndt Date: 2009-05-02 10:24:26 +0000 (Sat, 02 May 2009) Log Message: ----------- nrpe: added option --enable-command-args (issue 3646) Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2009-05-02 07:06:29 UTC (rev 4647) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2009-05-02 10:24:26 UTC (rev 4648) @@ -28,6 +28,7 @@ CONFIGURE_ARGS += --with-ssl-inc=/opt/csw/include CONFIGURE_ARGS += --with-ssl-dir=/opt/csw/bin CONFIGURE_ARGS += --with-kerberos-inc=/opt/csw/include +CONFIGURE_ARGS += --enable-command-args CONFIGURE_ARGS += --prefix=/opt/csw CONFIGURE_ARGS += --exec-prefix=/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sat May 2 21:21:41 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 02 May 2009 19:21:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[4649] csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk Message-ID: Revision: 4649 http://gar.svn.sourceforge.net/gar/?rev=4649&view=rev Author: valholla Date: 2009-05-02 19:21:41 +0000 (Sat, 02 May 2009) Log Message: ----------- fix ada Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-05-02 10:24:26 UTC (rev 4648) +++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-05-02 19:21:41 UTC (rev 4649) @@ -101,17 +101,16 @@ ISAEXEC_FILES += /opt/csw/gcc4/bin/gtnameserv ISAEXEC_FILES += /opt/csw/gcc4/bin/gnative2ascii ISAEXEC_FILES += /opt/csw/gcc4/bin/gnat -ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatls -ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatname -ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatmake -ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatclean -ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatkr -ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatbind -ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnat -ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatbl -ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatchop -ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatfind -ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatxref -ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatprep -ISAEXEC_FILES += /opt/csw/gcc4/bin/i386/gnatlink +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatls +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatname +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatmake +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatclean +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatkr +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatbind +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatbl +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatchop +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatfind +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatxref +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatprep +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatlink endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun May 3 23:23:41 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 03 May 2009 21:23:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[4650] csw/mgar/pkg/libffi/trunk/Makefile Message-ID: Revision: 4650 http://gar.svn.sourceforge.net/gar/?rev=4650&view=rev Author: valholla Date: 2009-05-03 21:23:41 +0000 (Sun, 03 May 2009) Log Message: ----------- checkin Added Paths: ----------- csw/mgar/pkg/libffi/trunk/Makefile Added: csw/mgar/pkg/libffi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libffi/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libffi/trunk/Makefile 2009-05-03 21:23:41 UTC (rev 4650) @@ -0,0 +1,35 @@ +GARNAME = libffi +GARVERSION = 3.0.8 +CATEGORIES = lib + +DESCRIPTION = A portable foreign function interface library +define BLURB + FFI stands for Foreign Function Interface. A foreign function + interface is the popular name for the interface that allows code + written in one language to call code written in another language. + The libffi library really only provides the lowest, machine + dependent layer of a fully featured foreign function interface. + A layer must exist above libffi that handles type conversions for + values passed between the two languages. +endef + +MASTER_SITES = ftp://sourceware.org/pub/libffi/ +SPKG_SOURCEURL = http://sourceware.org/libffi/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWlibffi +CATALOGNAME_CSWlibffi = libffi +SPKG_DESC_CSWlibffi = $(DESCRIPTION) + + +#REQUIRED_PKGS_CSWlibffi += + +# We define upstream file regex so we can be notifed of +# new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun May 3 23:34:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 03 May 2009 21:34:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[4651] csw/mgar/pkg/pango/trunk/Makefile Message-ID: Revision: 4651 http://gar.svn.sourceforge.net/gar/?rev=4651&view=rev Author: dmichelsen Date: 2009-05-03 21:34:05 +0000 (Sun, 03 May 2009) Log Message: ----------- pango: Enable 64 bit build Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2009-05-03 21:23:41 UTC (rev 4650) +++ csw/mgar/pkg/pango/trunk/Makefile 2009-05-03 21:34:05 UTC (rev 4651) @@ -26,6 +26,7 @@ UPSTREAM_MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/pango/ UFILES_REGEX = (\d+(?:\.\d+)*) +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-x --enable-gtk-doc # CONFIGURE_ARGS += --with-included-modules This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun May 3 23:36:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 03 May 2009 21:36:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4652] csw/mgar/pkg/pango/trunk/Makefile Message-ID: Revision: 4652 http://gar.svn.sourceforge.net/gar/?rev=4652&view=rev Author: dmichelsen Date: 2009-05-03 21:36:25 +0000 (Sun, 03 May 2009) Log Message: ----------- pango: Disable isaexec on all builds Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2009-05-03 21:34:05 UTC (rev 4651) +++ csw/mgar/pkg/pango/trunk/Makefile 2009-05-03 21:36:25 UTC (rev 4652) @@ -27,6 +27,7 @@ UFILES_REGEX = (\d+(?:\.\d+)*) BUILD64 = 1 +NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-x --enable-gtk-doc # CONFIGURE_ARGS += --with-included-modules This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun May 3 23:38:52 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 03 May 2009 21:38:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[4653] csw/mgar/pkg/libssh2/Makefile Message-ID: Revision: 4653 http://gar.svn.sourceforge.net/gar/?rev=4653&view=rev Author: valholla Date: 2009-05-03 21:38:52 +0000 (Sun, 03 May 2009) Log Message: ----------- checkin Added Paths: ----------- csw/mgar/pkg/libssh2/Makefile Added: csw/mgar/pkg/libssh2/Makefile =================================================================== --- csw/mgar/pkg/libssh2/Makefile (rev 0) +++ csw/mgar/pkg/libssh2/Makefile 2009-05-03 21:38:52 UTC (rev 4653) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun May 3 23:44:03 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 03 May 2009 21:44:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[4654] csw/mgar/pkg/gnupg_minimal/trunk/ Message-ID: Revision: 4654 http://gar.svn.sourceforge.net/gar/?rev=4654&view=rev Author: valholla Date: 2009-05-03 21:44:03 +0000 (Sun, 03 May 2009) Log Message: ----------- ignores Property Changed: ---------------- csw/mgar/pkg/gnupg_minimal/trunk/ Property changes on: csw/mgar/pkg/gnupg_minimal/trunk ___________________________________________________________________ Added: svn:ignore + . cookies download work This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun May 3 23:45:59 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 03 May 2009 21:45:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[4655] csw/mgar/pkg/libssh2/trunk/ Message-ID: Revision: 4655 http://gar.svn.sourceforge.net/gar/?rev=4655&view=rev Author: valholla Date: 2009-05-03 21:45:58 +0000 (Sun, 03 May 2009) Log Message: ----------- ignores Property Changed: ---------------- csw/mgar/pkg/libssh2/trunk/ Property changes on: csw/mgar/pkg/libssh2/trunk ___________________________________________________________________ Added: svn:ignore + . cookies download work This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun May 3 23:46:47 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 03 May 2009 21:46:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[4656] csw/mgar/pkg/pygobject/trunk/ Message-ID: Revision: 4656 http://gar.svn.sourceforge.net/gar/?rev=4656&view=rev Author: valholla Date: 2009-05-03 21:46:47 +0000 (Sun, 03 May 2009) Log Message: ----------- ignores Property Changed: ---------------- csw/mgar/pkg/pygobject/trunk/ Property changes on: csw/mgar/pkg/pygobject/trunk ___________________________________________________________________ Added: svn:ignore + . cookies download work This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun May 3 23:47:01 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 03 May 2009 21:47:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[4657] csw/mgar/pkg/pygobject Message-ID: Revision: 4657 http://gar.svn.sourceforge.net/gar/?rev=4657&view=rev Author: valholla Date: 2009-05-03 21:47:01 +0000 (Sun, 03 May 2009) Log Message: ----------- ignores Added Paths: ----------- csw/mgar/pkg/pygobject/branches/ csw/mgar/pkg/pygobject/tags/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun May 3 23:48:01 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 03 May 2009 21:48:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[4658] csw/mgar/pkg/libssh2/trunk/ Message-ID: Revision: 4658 http://gar.svn.sourceforge.net/gar/?rev=4658&view=rev Author: valholla Date: 2009-05-03 21:48:01 +0000 (Sun, 03 May 2009) Log Message: ----------- ignores Property Changed: ---------------- csw/mgar/pkg/libssh2/trunk/ Property changes on: csw/mgar/pkg/libssh2/trunk ___________________________________________________________________ Modified: svn:ignore - . cookies download work + . cookies download work This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun May 3 23:50:43 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 03 May 2009 21:50:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[4659] csw/mgar/pkg/libssh2/trunk/Makefile Message-ID: Revision: 4659 http://gar.svn.sourceforge.net/gar/?rev=4659&view=rev Author: valholla Date: 2009-05-03 21:50:42 +0000 (Sun, 03 May 2009) Log Message: ----------- checkin Added Paths: ----------- csw/mgar/pkg/libssh2/trunk/Makefile Added: csw/mgar/pkg/libssh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libssh2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2009-05-03 21:50:42 UTC (rev 4659) @@ -0,0 +1,35 @@ +GARNAME = libssh2 +GARVERSION = 1.1 +CATEGORIES = lib + +DESCRIPTION = A Library Implementing the SSH2 Protocol. +define BLURB + libssh2 is a library implementing the SSH2 protocol as defined by + Internet Drafts: SECSH-TRANS, SECSH-USERAUTH, SECSH-CONNECTION, + SECSH-ARCH, SECSH-FILEXFER, SECSH-DHGEX, SECSH-NUMBERS, and + SECSH-PUBLICKEY. +endef + +MASTER_SITES = $(SF_MIRRORS) +SPKG_SOURCEURL = http://www.libssh2.org +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWlibssh2 +CATALOGNAME_CSWlibssh2 = libssh2 +SPKG_DESC_CSWlibssh2 = $(DESCRIPTION) + +REQUIRED_PKGS_CSWlibssh2 = CSWosslrt CSWzlib + +# We define upstream file regex so we can be notifed of +# new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +NO_ISAEXEC = 1 +TEST_TARGET = check + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-libz +CONFIGURE_ARGS += --with-openssl=/opt/csw + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun May 3 23:51:21 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 03 May 2009 21:51:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[4660] csw/mgar/pkg/libssh2/trunk Message-ID: Revision: 4660 http://gar.svn.sourceforge.net/gar/?rev=4660&view=rev Author: valholla Date: 2009-05-03 21:51:21 +0000 (Sun, 03 May 2009) Log Message: ----------- checkin Added Paths: ----------- csw/mgar/pkg/libssh2/trunk/checksums csw/mgar/pkg/libssh2/trunk/files/ Added: csw/mgar/pkg/libssh2/trunk/checksums =================================================================== --- csw/mgar/pkg/libssh2/trunk/checksums (rev 0) +++ csw/mgar/pkg/libssh2/trunk/checksums 2009-05-03 21:51:21 UTC (rev 4660) @@ -0,0 +1 @@ +f8a3eb9bb814e0a5a2bb76a5423f5129 download/libssh2-1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun May 3 23:52:54 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 03 May 2009 21:52:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[4661] csw/mgar/pkg/squirrelmail/trunk/ Message-ID: Revision: 4661 http://gar.svn.sourceforge.net/gar/?rev=4661&view=rev Author: valholla Date: 2009-05-03 21:52:54 +0000 (Sun, 03 May 2009) Log Message: ----------- ignores Property Changed: ---------------- csw/mgar/pkg/squirrelmail/trunk/ Property changes on: csw/mgar/pkg/squirrelmail/trunk ___________________________________________________________________ Added: svn:ignore + . cookies download work This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 4 00:00:01 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 03 May 2009 22:00:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[4662] csw/mgar/pkg Message-ID: Revision: 4662 http://gar.svn.sourceforge.net/gar/?rev=4662&view=rev Author: valholla Date: 2009-05-03 22:00:01 +0000 (Sun, 03 May 2009) Log Message: ----------- checkins Added Paths: ----------- csw/mgar/pkg/clearsilver/trunk/files/rules.mk.diff csw/mgar/pkg/pyorbit/trunk/branches/ csw/mgar/pkg/pyorbit/trunk/tags/ Property Changed: ---------------- csw/mgar/pkg/php5_apc/trunk/ Added: csw/mgar/pkg/clearsilver/trunk/files/rules.mk.diff =================================================================== --- csw/mgar/pkg/clearsilver/trunk/files/rules.mk.diff (rev 0) +++ csw/mgar/pkg/clearsilver/trunk/files/rules.mk.diff 2009-05-03 22:00:01 UTC (rev 4662) @@ -0,0 +1,20 @@ +--- clearsilver-0.10.5/rules.mk.in.orig 2009-02-27 22:01:06.050961776 -0600 ++++ clearsilver-0.10.5/rules.mk.in 2009-02-27 22:02:35.509950994 -0600 +@@ -74,7 +74,7 @@ + CC = @CC@ + MKDIR = mkdir -p + RM = rm -f +-CPP = g++ ++CPP = CC + JAVAC = $(JAVA_PATH)/bin/javac + JAVAH = $(JAVA_PATH)/bin/javah + JAR = $(JAVA_PATH)/bin/jar +@@ -84,7 +84,7 @@ + RUBY = @RUBY@ + + CPPFLAGS = -I$(NEOTONIC_ROOT) @CPPFLAGS@ +-CFLAGS = @CFLAGS@ -Wall $(CPPFLAGS) $(PICFLG) ++CFLAGS = @CFLAGS@ $(CPPFLAGS) $(PICFLG) + OUTPUT_OPTION = -o $@ + LD = $(CC) -o + LDFLAGS = -L$(LIB_DIR) @LDFLAGS@ Property changes on: csw/mgar/pkg/php5_apc/trunk ___________________________________________________________________ Added: svn:ignore + . cookies download work This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 4 00:00:57 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 03 May 2009 22:00:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[4663] csw/mgar/pkg/fixme Message-ID: Revision: 4663 http://gar.svn.sourceforge.net/gar/?rev=4663&view=rev Author: valholla Date: 2009-05-03 22:00:57 +0000 (Sun, 03 May 2009) Log Message: ----------- checkins Added Paths: ----------- csw/mgar/pkg/fixme/branches/ csw/mgar/pkg/fixme/tags/ csw/mgar/pkg/fixme/trunk/fixlibtool.sh Added: csw/mgar/pkg/fixme/trunk/fixlibtool.sh =================================================================== --- csw/mgar/pkg/fixme/trunk/fixlibtool.sh (rev 0) +++ csw/mgar/pkg/fixme/trunk/fixlibtool.sh 2009-05-03 22:00:57 UTC (rev 4663) @@ -0,0 +1,51 @@ +#!/bin/bash +#################################################### +# +# fixme.sh +# Intended to remove the use of libtool's +# pseudo-libraries for opencsw builds. +# +# Author: Mike Watters mwatters_at_opencsw.org +# Initial Version: 0.1 +# +#################################################### + +umask 0022 +PATH=/opt/csw/bin + +if [ $# -ne 1 ]; then + gecho "USAGE: $(basename $0) WORKSRC" + exit 1 +fi +BASEPATH=$1 + +## Fix Makefiles +for mk in $(gfind ${BASEPATH} -name Makefile -print); do + LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ + gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") + + for file in ${LT_FILES}; do + LIB_NAME=$(ggrep 'dlname=' ${file} | \ + gsed -e "s/.*'\(.*\)'/\1/" \ + -e "s/^lib//" \ + -e "s/\.so.*$//") + fixpath=$(gecho $file |gsed 's/\//\\\//g') + gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new + gmv Makefile.new ${mk} + gchmod +x ${mk} + done +done + +## Fix libtool Script +for lt in $(gfind ${BASEPATH} -name libtool -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new + gmv ${lt}.new ${lt} + gchmod +x ${lt} +done + +for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new + gmv ${LTMAIN}.new ${LTMAIN} + gchmod +x ${LTMAIN} +done + Property changes on: csw/mgar/pkg/fixme/trunk/fixlibtool.sh ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 4 00:08:17 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 03 May 2009 22:08:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[4664] csw/mgar/pkg/libedit/ Message-ID: Revision: 4664 http://gar.svn.sourceforge.net/gar/?rev=4664&view=rev Author: valholla Date: 2009-05-03 22:08:17 +0000 (Sun, 03 May 2009) Log Message: ----------- del libedit dir Removed Paths: ------------- csw/mgar/pkg/libedit/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon May 4 11:07:41 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 04 May 2009 09:07:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[4665] csw/mgar/pkg/cpan/libwww-perl/trunk Message-ID: Revision: 4665 http://gar.svn.sourceforge.net/gar/?rev=4665&view=rev Author: bonivart Date: 2009-05-04 09:07:41 +0000 (Mon, 04 May 2009) Log Message: ----------- libwww-perl: update to 5.826 Modified Paths: -------------- csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile csw/mgar/pkg/cpan/libwww-perl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/libwww-perl/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.gspec Modified: csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile 2009-05-03 22:08:17 UTC (rev 4664) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile 2009-05-04 09:07:41 UTC (rev 4665) @@ -1,5 +1,5 @@ GARNAME = libwww-perl -GARVERSION = 5.825 +GARVERSION = 5.826 CATEGORIES = cpan AUTHOR = GAAS @@ -11,8 +11,13 @@ used. endef -DISTFILES += $(call admfiles,CSWpmlibwww,) +#DISTFILES += $(call admfiles,CSWpmlibwww,) +DISTFILES += COPYING +CATALOGNAME = pm_libwww +PACKAGES = CSWpmlibwww +ARCHALL = 1 + REQUIRED_PKGS = CSWpmhtmltagset CSWpmuri CSWpmhtmlparser CSWpmcompresszlib CSWpmhtmlfmt CSWpmmimebase64 EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod Modified: csw/mgar/pkg/cpan/libwww-perl/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/checksums 2009-05-03 22:08:17 UTC (rev 4664) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/checksums 2009-05-04 09:07:41 UTC (rev 4665) @@ -1,2 +1,2 @@ -7f2db1cb966b9260b395fdbc01b09fae download/CSWpmlibwww.gspec -9b383739e58ac8f8234487e62d5c2818 download/libwww-perl-5.825.tar.gz +d6d74a59bf794b8ffc8da8bbf1e4e15a download/COPYING +3f8e1922193b74ffb7d86efdadfbe865 download/libwww-perl-5.826.tar.gz Added: csw/mgar/pkg/cpan/libwww-perl/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/files/COPYING 2009-05-04 09:07:41 UTC (rev 4665) @@ -0,0 +1,7 @@ +COPYRIGHT + + (C) 1995-2009 Gisle Aas. All rights reserved. + (C) 1995 Martijn Koster. All rights reserved. + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.gspec =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.gspec 2009-05-03 22:08:17 UTC (rev 4664) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.gspec 2009-05-04 09:07:41 UTC (rev 4665) @@ -1,10 +0,0 @@ -%var bitname pm_libwww -%var pkgname CSWpmlibwww -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -1995-2008 Gisle Aas. All rights reserved. -1995 Martijn Koster. All rights reserved. - -This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 4 20:39:16 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 04 May 2009 18:39:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[4666] csw/mgar/pkg/squid/trunk Message-ID: Revision: 4666 http://gar.svn.sourceforge.net/gar/?rev=4666&view=rev Author: valholla Date: 2009-05-04 18:39:16 +0000 (Mon, 04 May 2009) Log Message: ----------- checkin Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile csw/mgar/pkg/squid/trunk/checksums Added Paths: ----------- csw/mgar/pkg/squid/trunk/files/CSWsquid.s8-init Removed Paths: ------------- csw/mgar/pkg/squid/trunk/files/CSWsquid.copyright csw/mgar/pkg/squid/trunk/files/CSWsquid.depend csw/mgar/pkg/squid/trunk/files/CSWsquid.gspec csw/mgar/pkg/squid/trunk/files/CSWsquid.prototype csw/mgar/pkg/squid/trunk/files/etc/ Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2009-05-04 09:07:41 UTC (rev 4665) +++ csw/mgar/pkg/squid/trunk/Makefile 2009-05-04 18:39:16 UTC (rev 4666) @@ -1,7 +1,7 @@ GARNAME = squid -GARVERSION = 3.0 +GARVERSION = 2.7 CATEGORIES = server -RELEASE = STABLE14 +RELEASE = STABLE6 DISTVERSION = $(GARVERSION).$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) RELVER = $(shell echo $(GARVERSION) |gsed 's/\(^[0-9]\).*\.[0-9]*/\1/') @@ -13,13 +13,20 @@ bandwith usage. Squid runs on all popular Unix and Windows platforms. endef +PACKAGES = CSWsquid +CATALOGNAME_CSWsquid = squid +SPKG_DESC_CSWsquid = $(DESCRIPTION) + +LD = /opt/csw/bin/gld +export LD MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(GARVERSION)/ DISTFILES = $(DISTNAME).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --datadir=$(datadir)/$(GARNAME) CONFIGURE_ARGS += --with-large-files +CONFIGURE_ARGS += --with-gnu-ld=yes +CONFIGURE_ARGS += --with-dl CONFIGURE_ARGS += --enable-large-cache-files CONFIGURE_ARGS += --enable-ssl CONFIGURE_ARGS += --with-openssl=$(prefix) @@ -29,8 +36,8 @@ CONFIGURE_ARGS += --enable-referer-log CONFIGURE_ARGS += --enable-arp-acl CONFIGURE_ARGS += --enable-snmp -#CONFIGURE_ARGS += --enable-auth=basic -#CONFIGURE_ARGS += --enable-basic-auth-helpers=LDAP,SMB,YP,PAM,SASL,NCSA +CONFIGURE_ARGS += --enable-auth=basic +CONFIGURE_ARGS += --enable-basic-auth-helpers=LDAP,SMB,YP,PAM,SASL,NCSA TEST_TARGET = check @@ -43,6 +50,3 @@ cd $(WORKSRC) && $(BUILD_ENV) ./bootstrap.sh @$(MAKECOOKIE) -post-install-modulated: - ( cp -r $(FILEDIR)/etc $(DESTDIR)/etc ) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2009-05-04 09:07:41 UTC (rev 4665) +++ csw/mgar/pkg/squid/trunk/checksums 2009-05-04 18:39:16 UTC (rev 4666) @@ -1 +1 @@ -7aaff2319d2263404d788a82a10c8633 download/squid-3.0.STABLE14.tar.bz2 +6de3a6a7a56a7ecae092f2d31a04f039 download/squid-2.7.STABLE6.tar.bz2 Deleted: csw/mgar/pkg/squid/trunk/files/CSWsquid.copyright =================================================================== --- csw/mgar/pkg/squid/trunk/files/CSWsquid.copyright 2009-05-04 09:07:41 UTC (rev 4665) +++ csw/mgar/pkg/squid/trunk/files/CSWsquid.copyright 2009-05-04 18:39:16 UTC (rev 4666) @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) 19yy - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. Deleted: csw/mgar/pkg/squid/trunk/files/CSWsquid.depend =================================================================== --- csw/mgar/pkg/squid/trunk/files/CSWsquid.depend 2009-05-04 09:07:41 UTC (rev 4665) +++ csw/mgar/pkg/squid/trunk/files/CSWsquid.depend 2009-05-04 18:39:16 UTC (rev 4666) @@ -1,3 +0,0 @@ -P CSWosslrt -P CSWoldaprt -P CSWsasl Deleted: csw/mgar/pkg/squid/trunk/files/CSWsquid.gspec =================================================================== --- csw/mgar/pkg/squid/trunk/files/CSWsquid.gspec 2009-05-04 09:07:41 UTC (rev 4665) +++ csw/mgar/pkg/squid/trunk/files/CSWsquid.gspec 2009-05-04 18:39:16 UTC (rev 4666) @@ -1,4 +0,0 @@ -%var bitname squid -%var pkgname CSWsquid -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/squid/trunk/files/CSWsquid.prototype =================================================================== --- csw/mgar/pkg/squid/trunk/files/CSWsquid.prototype 2009-05-04 09:07:41 UTC (rev 4665) +++ csw/mgar/pkg/squid/trunk/files/CSWsquid.prototype 2009-05-04 18:39:16 UTC (rev 4666) @@ -1,967 +0,0 @@ -i pkginfo=CSWsquid.pkginfo -i copyright=CSWsquid.copyright -i depend=CSWsquid.depend -i preremove=CSWsquid.preremove -i postinstall=CSWsquid.postinstall -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man8 0755 root bin -f none /opt/csw/share/man/man8/squid.8 0644 root bin -f none /opt/csw/share/man/man8/cachemgr.cgi.8 0644 root bin -f none /opt/csw/share/man/man8/squid_ldap_auth.8 0644 root bin -f none /opt/csw/share/man/man8/pam_auth.8 0644 root bin -f none /opt/csw/share/mib.txt 0644 root bin -d none /opt/csw/share/icons 0755 root bin -f none /opt/csw/share/icons/anthony-binhex.gif 0644 root bin -f none /opt/csw/share/icons/anthony-bomb.gif 0644 root bin -f none /opt/csw/share/icons/anthony-box.gif 0644 root bin -f none /opt/csw/share/icons/anthony-box2.gif 0644 root bin -f none /opt/csw/share/icons/anthony-c.gif 0644 root bin -f none /opt/csw/share/icons/anthony-compressed.gif 0644 root bin -f none /opt/csw/share/icons/anthony-dir.gif 0644 root bin -f none /opt/csw/share/icons/anthony-dirup.gif 0644 root bin -f none /opt/csw/share/icons/anthony-dvi.gif 0644 root bin -f none /opt/csw/share/icons/anthony-f.gif 0644 root bin -f none /opt/csw/share/icons/anthony-image.gif 0644 root bin -f none /opt/csw/share/icons/anthony-image2.gif 0644 root bin -f none /opt/csw/share/icons/anthony-layout.gif 0644 root bin -f none /opt/csw/share/icons/anthony-link.gif 0644 root bin -f none /opt/csw/share/icons/anthony-movie.gif 0644 root bin -f none /opt/csw/share/icons/anthony-pdf.gif 0644 root bin -f none /opt/csw/share/icons/anthony-portal.gif 0644 root bin -f none /opt/csw/share/icons/anthony-ps.gif 0644 root bin -f none /opt/csw/share/icons/anthony-quill.gif 0644 root bin -f none /opt/csw/share/icons/anthony-script.gif 0644 root bin -f none /opt/csw/share/icons/anthony-sound.gif 0644 root bin -f none /opt/csw/share/icons/anthony-tar.gif 0644 root bin -f none /opt/csw/share/icons/anthony-tex.gif 0644 root bin -f none /opt/csw/share/icons/anthony-text.gif 0644 root bin -f none /opt/csw/share/icons/anthony-unknown.gif 0644 root bin -f none /opt/csw/share/icons/anthony-xbm.gif 0644 root bin -f none /opt/csw/share/icons/anthony-xpm.gif 0644 root bin -d none /opt/csw/share/errors 0755 root bin -d none /opt/csw/share/errors/Bulgarian 0755 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Bulgarian/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Catalan 0755 root bin -f none /opt/csw/share/errors/Catalan/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Catalan/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Czech 0755 root bin -f none /opt/csw/share/errors/Czech/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Czech/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Danish 0755 root bin -f none /opt/csw/share/errors/Danish/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Danish/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Dutch 0755 root bin -f none /opt/csw/share/errors/Dutch/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Dutch/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/English 0755 root bin -f none /opt/csw/share/errors/English/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/English/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/English/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/English/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/English/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/English/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/English/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/English/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/English/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/English/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/English/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/English/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/English/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/English/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/English/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/English/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/English/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/English/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/English/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/English/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/English/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/English/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/English/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/English/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/English/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/English/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/English/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/English/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/English/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/English/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Estonian 0755 root bin -f none /opt/csw/share/errors/Estonian/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Estonian/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Finnish 0755 root bin -f none /opt/csw/share/errors/Finnish/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Finnish/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/French 0755 root bin -f none /opt/csw/share/errors/French/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/French/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/French/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/French/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/French/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/French/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/French/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/French/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/French/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/French/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/French/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/French/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/French/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/French/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/French/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/French/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/French/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/French/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/French/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/French/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/French/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/French/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/French/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/French/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/French/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/French/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/French/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/French/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/French/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/French/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/German 0755 root bin -f none /opt/csw/share/errors/German/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/German/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/German/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/German/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/German/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/German/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/German/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/German/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/German/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/German/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/German/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/German/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/German/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/German/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/German/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/German/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/German/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/German/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/German/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/German/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/German/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/German/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/German/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/German/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/German/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/German/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/German/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/German/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/German/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/German/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Greek 0755 root bin -f none /opt/csw/share/errors/Greek/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Greek/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Hebrew 0755 root bin -f none /opt/csw/share/errors/Hebrew/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Hebrew/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Hungarian 0755 root bin -f none /opt/csw/share/errors/Hungarian/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Hungarian/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Italian 0755 root bin -f none /opt/csw/share/errors/Italian/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Italian/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Japanese 0755 root bin -f none /opt/csw/share/errors/Japanese/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Japanese/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Korean 0755 root bin -f none /opt/csw/share/errors/Korean/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Korean/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Lithuanian 0755 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Lithuanian/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Polish 0755 root bin -f none /opt/csw/share/errors/Polish/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Polish/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Portuguese 0755 root bin -f none /opt/csw/share/errors/Portuguese/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Portuguese/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Romanian 0755 root bin -f none /opt/csw/share/errors/Romanian/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Romanian/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Russian-1251 0755 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Russian-1251/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Russian-koi8-r 0755 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Russian-koi8-r/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Serbian 0755 root bin -f none /opt/csw/share/errors/Serbian/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Serbian/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Simplify_Chinese 0755 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Simplify_Chinese/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Slovak 0755 root bin -f none /opt/csw/share/errors/Slovak/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Slovak/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Spanish 0755 root bin -f none /opt/csw/share/errors/Spanish/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Spanish/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Swedish 0755 root bin -f none /opt/csw/share/errors/Swedish/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Swedish/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Traditional_Chinese 0755 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/share/errors/Turkish 0755 root bin -f none /opt/csw/share/errors/Turkish/ERR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_CACHE_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_CACHE_MGR_ACCESS_DENIED 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_CANNOT_FORWARD 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_CONNECT_FAIL 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_DNS_FAIL 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_FORWARDING_DENIED 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_FTP_DISABLED 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_FTP_FAILURE 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_FTP_FORBIDDEN 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_FTP_NOT_FOUND 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_FTP_PUT_CREATED 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_FTP_PUT_ERROR 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_FTP_PUT_MODIFIED 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_FTP_UNAVAILABLE 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_INVALID_REQ 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_INVALID_RESP 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_INVALID_URL 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_LIFETIME_EXP 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_NO_RELAY 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_ONLY_IF_CACHED_MISS 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_READ_ERROR 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_READ_TIMEOUT 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_SHUTTING_DOWN 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_SOCKET_FAILURE 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_TOO_BIG 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_UNSUP_REQ 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_URN_RESOLVE 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_WRITE_ERROR 0644 root bin -f none /opt/csw/share/errors/Turkish/ERR_ZERO_SIZE_OBJECT 0644 root bin -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/RunCache 0755 root bin -f none /opt/csw/bin/squidclient 0755 root bin -d none /opt/csw/sbin 0755 root bin -f none /opt/csw/sbin/squid 0755 root bin -d none /opt/csw/libexec 0755 root bin -f none /opt/csw/libexec/pinger 0755 root bin -f none /opt/csw/libexec/unlinkd 0755 root bin -f none /opt/csw/libexec/cachemgr.cgi 0755 root bin -f none /opt/csw/libexec/squid_ldap_auth 0755 root bin -f none /opt/csw/libexec/smb_auth 0755 root bin -f none /opt/csw/libexec/smb_auth.sh 0755 root bin -f none /opt/csw/libexec/yp_auth 0755 root bin -f none /opt/csw/libexec/pam_auth 0755 root bin -f none /opt/csw/libexec/sasl_auth 0755 root bin -d none /opt/csw/etc 0755 root bin -f none /opt/csw/etc/squid.conf.default 0644 root bin -f none /opt/csw/etc/mime.conf.default 0644 root bin -f none /opt/csw/etc/cachemgr.conf 0644 root bin -d none /opt/csw/var 0755 root bin -d none /opt/csw/var/logs 0755 root bin -f none /etc/init.d/cswsquid 0755 root bin -s none /etc/rc2.d/S99cswsquid=../init.d/cswsquid -s none /etc/rc1.d/K99cswsquid=../init.d/cswsquid -s none /etc/rc0.d/K99cswsquid=../init.d/cswsquid -s none /etc/rcS.d/K99cswsquid=../init.d/cswsquid Added: csw/mgar/pkg/squid/trunk/files/CSWsquid.s8-init =================================================================== --- csw/mgar/pkg/squid/trunk/files/CSWsquid.s8-init (rev 0) +++ csw/mgar/pkg/squid/trunk/files/CSWsquid.s8-init 2009-05-04 18:39:16 UTC (rev 4666) @@ -0,0 +1,23 @@ +#!/sbin/sh + +case "$1" in +'start') + if [ -f /opt/csw/sbin/squid -a -f /opt/csw/etc/squid.conf ]; then + echo 'starting squid server.' + /opt/csw/sbin/squid -D & + fi + exit 0 + ;; +'stop') + if [ -f /opt/csw/sbin/squid -a -f /opt/csw/etc/squid.conf ]; then + echo 'stopping squid server... please wait for squid to cleanup...' + /opt/csw/sbin/squid -k shutdown && sleep 30 + fi + exit 0 + ;; + +*) + echo "Usage: $0 { start | stop }" + exit 1 + ;; +esac This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 4 22:20:15 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 04 May 2009 20:20:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[4667] csw/mgar/pkg/squid/trunk Message-ID: Revision: 4667 http://gar.svn.sourceforge.net/gar/?rev=4667&view=rev Author: valholla Date: 2009-05-04 20:20:15 +0000 (Mon, 04 May 2009) Log Message: ----------- checkin Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall csw/mgar/pkg/squid/trunk/files/CSWsquid.preremove Added Paths: ----------- csw/mgar/pkg/squid/trunk/files/cswsquid Removed Paths: ------------- csw/mgar/pkg/squid/trunk/files/CSWsquid.s8-init Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2009-05-04 18:39:16 UTC (rev 4666) +++ csw/mgar/pkg/squid/trunk/Makefile 2009-05-04 20:20:15 UTC (rev 4667) @@ -16,7 +16,10 @@ PACKAGES = CSWsquid CATALOGNAME_CSWsquid = squid SPKG_DESC_CSWsquid = $(DESCRIPTION) +SPKG_CLASSES_CSWsquid = none cswinitsmf +PROTOTYPE_FILTER = awk '$$$$3 ~/\/init.d\/cswsquid$$$$/ { $$$$2 = "cswinitsmf" }' + LD = /opt/csw/bin/gld export LD MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(GARVERSION)/ @@ -43,10 +46,15 @@ include gar/category.mk - SPKG_REVSTAMP := $(SPKG_REVSTAMP)_$(RELEASE) pre-configure-modulated: cd $(WORKSRC) && $(BUILD_ENV) ./bootstrap.sh @$(MAKECOOKIE) +post-install-modulated: + ginstall -d $(DESTDIR)/etc/init.d + gcp $(DOWNLOADDIR)/cswsquid $(DESTDIR)/etc/init.d + chmod 0755 $(DESTDIR)/etc/init.d/cswsquid + gmv $(DESTDIR)$(sysconfdir)/squid.conf \ + $(DESTDIR)$(sysconfdir)/squid.conf.CSW Modified: csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall =================================================================== --- csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall 2009-05-04 18:39:16 UTC (rev 4666) +++ csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall 2009-05-04 20:20:15 UTC (rev 4667) @@ -1,12 +1,17 @@ #!/bin/sh # -# Squid-cache postinstall script +# Squid-cache preremove script PATH=/usr/bin:/usr/sbin export PATH +CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +SQUID_CONFDIR=${CSW_PREFIX}/etc -if [ -f /opt/csw/etc/squid.conf ]; then - /etc/init.d/cswsquid start +if [ -f ${SQUID_CONFDIR}/squid.conf ]; then + echo 'squid.conf found, Preserving Existing Config!' +else + cp ${SQUID_CONFDIR}/squid.conf.CSW ${SQUID_CONFDIR}/squid.conf + chmod 0644 ${SQUID_CONFDIR}/squid.conf fi exit 0 Modified: csw/mgar/pkg/squid/trunk/files/CSWsquid.preremove =================================================================== --- csw/mgar/pkg/squid/trunk/files/CSWsquid.preremove 2009-05-04 18:39:16 UTC (rev 4666) +++ csw/mgar/pkg/squid/trunk/files/CSWsquid.preremove 2009-05-04 20:20:15 UTC (rev 4667) @@ -4,7 +4,20 @@ PATH=/usr/bin:/usr/sbin export PATH +CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +SQUID_CONFDIR=${CSW_PREFIX}/etc -/etc/init.d/cswsquid stop +if [ -x /usr/sbin/svccfg -a -x /usr/sbin/svcadm ]; then + echo 'Stopping squid server and unregistering from smf' + svcadm disable -s svc:application/server/cswsquid:default + svccfg delete svc:application/server/cswsquid:default +else + echo 'Stopping squid server' + if [ -x ${PKG_INSTALL_ROOT}/etc/init.d/cswsquid ]; then + ${PKG_INSTALL_ROOT}/etc/init.d/cswsquid stop + else + pkill -9 squid + fi +fi exit 0 Deleted: csw/mgar/pkg/squid/trunk/files/CSWsquid.s8-init =================================================================== --- csw/mgar/pkg/squid/trunk/files/CSWsquid.s8-init 2009-05-04 18:39:16 UTC (rev 4666) +++ csw/mgar/pkg/squid/trunk/files/CSWsquid.s8-init 2009-05-04 20:20:15 UTC (rev 4667) @@ -1,23 +0,0 @@ -#!/sbin/sh - -case "$1" in -'start') - if [ -f /opt/csw/sbin/squid -a -f /opt/csw/etc/squid.conf ]; then - echo 'starting squid server.' - /opt/csw/sbin/squid -D & - fi - exit 0 - ;; -'stop') - if [ -f /opt/csw/sbin/squid -a -f /opt/csw/etc/squid.conf ]; then - echo 'stopping squid server... please wait for squid to cleanup...' - /opt/csw/sbin/squid -k shutdown && sleep 30 - fi - exit 0 - ;; - -*) - echo "Usage: $0 { start | stop }" - exit 1 - ;; -esac Copied: csw/mgar/pkg/squid/trunk/files/cswsquid (from rev 4666, csw/mgar/pkg/squid/trunk/files/CSWsquid.s8-init) =================================================================== --- csw/mgar/pkg/squid/trunk/files/cswsquid (rev 0) +++ csw/mgar/pkg/squid/trunk/files/cswsquid 2009-05-04 20:20:15 UTC (rev 4667) @@ -0,0 +1,60 @@ +#!/sbin/sh + +PATH=/usr/bin +CSWPREFIX=/opt/csw +CSWETC=${CSWPREFIX}/etc +CSWSBIN=${CSWPREFIX}/sbin +SQUID_DAEMON=${CSWSBIN}/squid +SQUID_CONF=${CSWETC}/squid.conf + +case "$1" in + 'start') + if [ -x ${SQUID_DAEMON} -a -f ${SQUID_CONF} ]; then + if [ -n "`pgrep squid`" ]; then + echo 'squid server is already running' + exit 0 + else + echo 'starting squid server.' + ${SQUID_DAEMON} -D & + exit 0 + fi + else + echo '**** NOTICE ****' + echo 'Problem starting squid server,' + echo 'Please make sure it is properly installed' + echo 'and properly configured.' + exit 1 + fi + ;; + 'stop') + if [ -x ${SQUID_DAEMON} -a -f ${SQUID_CONF} ]; then + if [ -n "`pgrep squid`" ]; then + ## stop gracefully + echo 'stopping squid server... please wait for cleanup...' + ${SQUID_DAEMON} -k shutdown && sleep 30 + if [ -n "`pgrep squid`" ]; then + echo 'squid server still running, killing...' + pkill -9 squid + fi + exit 0 + else + ## Not running + echo 'squid server is already down' + exit 0 + fi + else + echo '**** NOTICE ****' + echo 'Squid server not properly installed' + echo 'Forcing Down!' + pkill -9 squid + exit 1 + fi + ;; + + *) + echo "Usage: $0 { start | stop }" + exit 1 + ;; +esac + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 4 22:24:25 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 04 May 2009 20:24:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4668] csw/mgar/pkg/squid/trunk Message-ID: Revision: 4668 http://gar.svn.sourceforge.net/gar/?rev=4668&view=rev Author: valholla Date: 2009-05-04 20:24:25 +0000 (Mon, 04 May 2009) Log Message: ----------- checkin Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile csw/mgar/pkg/squid/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/squid/trunk/TODO Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2009-05-04 20:20:15 UTC (rev 4667) +++ csw/mgar/pkg/squid/trunk/Makefile 2009-05-04 20:24:25 UTC (rev 4668) @@ -24,6 +24,7 @@ export LD MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(GARVERSION)/ DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES = cswsquid CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --datadir=$(datadir)/$(GARNAME) Deleted: csw/mgar/pkg/squid/trunk/TODO =================================================================== --- csw/mgar/pkg/squid/trunk/TODO 2009-05-04 20:20:15 UTC (rev 4667) +++ csw/mgar/pkg/squid/trunk/TODO 2009-05-04 20:24:25 UTC (rev 4668) @@ -1,8 +0,0 @@ -TODO Squid ----------- - -- Don't always start squid, honor blastwave.conf -- move - share/icons -> share/squid/icons - share/errors -> share/squid/errors -- Use GAR-mechanism for rc* instead of harcoding it in .prototype Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2009-05-04 20:20:15 UTC (rev 4667) +++ csw/mgar/pkg/squid/trunk/checksums 2009-05-04 20:24:25 UTC (rev 4668) @@ -1 +1 @@ -6de3a6a7a56a7ecae092f2d31a04f039 download/squid-2.7.STABLE6.tar.bz2 +de390549fd75a2e3b867da1cb3becb1c download/cswsquid This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 4 22:27:13 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 04 May 2009 20:27:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[4669] csw/mgar/pkg/squid/trunk/Makefile Message-ID: Revision: 4669 http://gar.svn.sourceforge.net/gar/?rev=4669&view=rev Author: valholla Date: 2009-05-04 20:27:13 +0000 (Mon, 04 May 2009) Log Message: ----------- checkin Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2009-05-04 20:24:25 UTC (rev 4668) +++ csw/mgar/pkg/squid/trunk/Makefile 2009-05-04 20:27:13 UTC (rev 4669) @@ -59,3 +59,5 @@ chmod 0755 $(DESTDIR)/etc/init.d/cswsquid gmv $(DESTDIR)$(sysconfdir)/squid.conf \ $(DESTDIR)$(sysconfdir)/squid.conf.CSW + @$(MAKECOOKIE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 4 22:47:57 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 04 May 2009 20:47:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[4670] csw/mgar/pkg/squid/trunk/Makefile Message-ID: Revision: 4670 http://gar.svn.sourceforge.net/gar/?rev=4670&view=rev Author: valholla Date: 2009-05-04 20:47:57 +0000 (Mon, 04 May 2009) Log Message: ----------- checkin for package Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2009-05-04 20:27:13 UTC (rev 4669) +++ csw/mgar/pkg/squid/trunk/Makefile 2009-05-04 20:47:57 UTC (rev 4670) @@ -17,9 +17,9 @@ CATALOGNAME_CSWsquid = squid SPKG_DESC_CSWsquid = $(DESCRIPTION) SPKG_CLASSES_CSWsquid = none cswinitsmf +REQUIRED_PKGS_CSWsquid = CSWoldaprt CSWosslrt CSWsasl CSWcswclassutils +PROTOTYPE_FILTER = awk '$$$$3 ~/\/init.d\/cswsquid$$$$/ { $$$$2 = "cswinitsmf" } { print }' -PROTOTYPE_FILTER = awk '$$$$3 ~/\/init.d\/cswsquid$$$$/ { $$$$2 = "cswinitsmf" }' - LD = /opt/csw/bin/gld export LD MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(GARVERSION)/ @@ -54,8 +54,8 @@ @$(MAKECOOKIE) post-install-modulated: - ginstall -d $(DESTDIR)/etc/init.d - gcp $(DOWNLOADDIR)/cswsquid $(DESTDIR)/etc/init.d + ginstall -d $(DESTDIR)/etc/opt/csw/init.d + gcp $(DOWNLOADDIR)/cswsquid $(DESTDIR)/etc/opt/csw/init.d/ chmod 0755 $(DESTDIR)/etc/init.d/cswsquid gmv $(DESTDIR)$(sysconfdir)/squid.conf \ $(DESTDIR)$(sysconfdir)/squid.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 4 23:20:49 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 04 May 2009 21:20:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[4671] csw/mgar/pkg/squid/trunk/Makefile Message-ID: Revision: 4671 http://gar.svn.sourceforge.net/gar/?rev=4671&view=rev Author: valholla Date: 2009-05-04 21:20:49 +0000 (Mon, 04 May 2009) Log Message: ----------- clean package checkin Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2009-05-04 20:47:57 UTC (rev 4670) +++ csw/mgar/pkg/squid/trunk/Makefile 2009-05-04 21:20:49 UTC (rev 4671) @@ -24,7 +24,7 @@ export LD MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(GARVERSION)/ DISTFILES = $(DISTNAME).tar.bz2 -DISTFILES = cswsquid +DISTFILES = CSWsquid.postinstall CSWsquid.preremove cswsquid CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --datadir=$(datadir)/$(GARNAME) @@ -56,7 +56,7 @@ post-install-modulated: ginstall -d $(DESTDIR)/etc/opt/csw/init.d gcp $(DOWNLOADDIR)/cswsquid $(DESTDIR)/etc/opt/csw/init.d/ - chmod 0755 $(DESTDIR)/etc/init.d/cswsquid + chmod 0755 $(DESTDIR)/etc/opt/csw/init.d/cswsquid gmv $(DESTDIR)$(sysconfdir)/squid.conf \ $(DESTDIR)$(sysconfdir)/squid.conf.CSW @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 4 23:23:09 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 04 May 2009 21:23:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[4672] csw/mgar/pkg/squid/trunk/checksums Message-ID: Revision: 4672 http://gar.svn.sourceforge.net/gar/?rev=4672&view=rev Author: valholla Date: 2009-05-04 21:23:09 +0000 (Mon, 04 May 2009) Log Message: ----------- clean package checkin Modified Paths: -------------- csw/mgar/pkg/squid/trunk/checksums Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2009-05-04 21:20:49 UTC (rev 4671) +++ csw/mgar/pkg/squid/trunk/checksums 2009-05-04 21:23:09 UTC (rev 4672) @@ -1 +1,3 @@ +d9cdae9b6c8f1cd706e7c0cc47d3e17b download/CSWsquid.postinstall +60ca435ff29ff327a3f093949cdab958 download/CSWsquid.preremove de390549fd75a2e3b867da1cb3becb1c download/cswsquid This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 4 23:31:07 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 04 May 2009 21:31:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[4673] csw/mgar/pkg/squid/trunk Message-ID: Revision: 4673 http://gar.svn.sourceforge.net/gar/?rev=4673&view=rev Author: valholla Date: 2009-05-04 21:31:07 +0000 (Mon, 04 May 2009) Log Message: ----------- post-install fixes Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile csw/mgar/pkg/squid/trunk/files/cswsquid Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2009-05-04 21:23:09 UTC (rev 4672) +++ csw/mgar/pkg/squid/trunk/Makefile 2009-05-04 21:31:07 UTC (rev 4673) @@ -55,6 +55,7 @@ post-install-modulated: ginstall -d $(DESTDIR)/etc/opt/csw/init.d + ginstall -d $(DESTDIR)$(localstatedir)/cache gcp $(DOWNLOADDIR)/cswsquid $(DESTDIR)/etc/opt/csw/init.d/ chmod 0755 $(DESTDIR)/etc/opt/csw/init.d/cswsquid gmv $(DESTDIR)$(sysconfdir)/squid.conf \ Modified: csw/mgar/pkg/squid/trunk/files/cswsquid =================================================================== --- csw/mgar/pkg/squid/trunk/files/cswsquid 2009-05-04 21:23:09 UTC (rev 4672) +++ csw/mgar/pkg/squid/trunk/files/cswsquid 2009-05-04 21:31:07 UTC (rev 4673) @@ -10,7 +10,7 @@ case "$1" in 'start') if [ -x ${SQUID_DAEMON} -a -f ${SQUID_CONF} ]; then - if [ -n "`pgrep squid`" ]; then + if [ -n "`pgrep /squid`" ]; then echo 'squid server is already running' exit 0 else @@ -28,11 +28,11 @@ ;; 'stop') if [ -x ${SQUID_DAEMON} -a -f ${SQUID_CONF} ]; then - if [ -n "`pgrep squid`" ]; then + if [ -n "`pgrep /squid`" ]; then ## stop gracefully echo 'stopping squid server... please wait for cleanup...' ${SQUID_DAEMON} -k shutdown && sleep 30 - if [ -n "`pgrep squid`" ]; then + if [ -n "`pgrep /squid`" ]; then echo 'squid server still running, killing...' pkill -9 squid fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 4 23:32:33 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 04 May 2009 21:32:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[4674] csw/mgar/pkg/squid/trunk/checksums Message-ID: Revision: 4674 http://gar.svn.sourceforge.net/gar/?rev=4674&view=rev Author: valholla Date: 2009-05-04 21:32:32 +0000 (Mon, 04 May 2009) Log Message: ----------- checksum changes Modified Paths: -------------- csw/mgar/pkg/squid/trunk/checksums Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2009-05-04 21:31:07 UTC (rev 4673) +++ csw/mgar/pkg/squid/trunk/checksums 2009-05-04 21:32:32 UTC (rev 4674) @@ -1,3 +1,3 @@ d9cdae9b6c8f1cd706e7c0cc47d3e17b download/CSWsquid.postinstall 60ca435ff29ff327a3f093949cdab958 download/CSWsquid.preremove -de390549fd75a2e3b867da1cb3becb1c download/cswsquid +ad73bb6b95a42b93cfc62cf5762251a1 download/cswsquid This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 00:17:13 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 04 May 2009 22:17:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[4675] csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall Message-ID: Revision: 4675 http://gar.svn.sourceforge.net/gar/?rev=4675&view=rev Author: valholla Date: 2009-05-04 22:17:13 +0000 (Mon, 04 May 2009) Log Message: ----------- postinstall script changes Modified Paths: -------------- csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall Modified: csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall =================================================================== --- csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall 2009-05-04 21:32:32 UTC (rev 4674) +++ csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall 2009-05-04 22:17:13 UTC (rev 4675) @@ -6,7 +6,10 @@ export PATH CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw SQUID_CONFDIR=${CSW_PREFIX}/etc +SQUID_VARDIR=${CSW_PREFIX}/var +SQUID_SBINDIR=${CSW_PREFIX}/sbin + if [ -f ${SQUID_CONFDIR}/squid.conf ]; then echo 'squid.conf found, Preserving Existing Config!' else @@ -14,4 +17,10 @@ chmod 0644 ${SQUID_CONFDIR}/squid.conf fi +if [ -d ${SQUID_VARDIR}/cache ]; then + chown nobody:nobody ${SQUID_VARDIR}/cache +fi + +${SQUID_SBINDIR}/squid -z + exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 00:19:23 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 04 May 2009 22:19:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[4676] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 4676 http://gar.svn.sourceforge.net/gar/?rev=4676&view=rev Author: valholla Date: 2009-05-04 22:19:23 +0000 (Mon, 04 May 2009) Log Message: ----------- remove cookie for strip binaries on reset-installs Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-05-04 22:17:13 UTC (rev 4675) +++ csw/mgar/gar/v2/gar.mk 2009-05-04 22:19:23 UTC (rev 4676) @@ -480,11 +480,13 @@ reset-install: reset-merge $(addprefix reset-install-,$(MODULATIONS)) @rm -f $(foreach M,$(MODULATIONS),$(COOKIEDIR)/install-$M) $(COOKIEDIR)/install $(COOKIEDIR)/post-install + @rm -f $(COOKIEDIR)/strip reset-install-modulated: @$(call _pmod,Reset install state) @rm -rf $(INSTALLISADIR) $(COOKIEDIR)/install-work @rm -f $(foreach C,pre-install-modulated install-modulated post-install-modulated,$(COOKIEDIR)/$C) + @rm -f $(COOKIEDIR)/strip # merge in all isas to the package directory after installation This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 00:30:52 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 04 May 2009 22:30:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[4677] csw/mgar/pkg/squid/trunk/checksums Message-ID: Revision: 4677 http://gar.svn.sourceforge.net/gar/?rev=4677&view=rev Author: valholla Date: 2009-05-04 22:30:52 +0000 (Mon, 04 May 2009) Log Message: ----------- checksum changes Modified Paths: -------------- csw/mgar/pkg/squid/trunk/checksums Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2009-05-04 22:19:23 UTC (rev 4676) +++ csw/mgar/pkg/squid/trunk/checksums 2009-05-04 22:30:52 UTC (rev 4677) @@ -1,3 +1,3 @@ -d9cdae9b6c8f1cd706e7c0cc47d3e17b download/CSWsquid.postinstall +c382084075531222e45669fd8224088e download/CSWsquid.postinstall 60ca435ff29ff327a3f093949cdab958 download/CSWsquid.preremove ad73bb6b95a42b93cfc62cf5762251a1 download/cswsquid This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 02:34:52 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 00:34:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[4678] csw/mgar/pkg/squid/trunk Message-ID: Revision: 4678 http://gar.svn.sourceforge.net/gar/?rev=4678&view=rev Author: valholla Date: 2009-05-05 00:34:52 +0000 (Tue, 05 May 2009) Log Message: ----------- postinstall tweak Modified Paths: -------------- csw/mgar/pkg/squid/trunk/checksums csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall csw/mgar/pkg/squid/trunk/files/CSWsquid.preremove Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2009-05-04 22:30:52 UTC (rev 4677) +++ csw/mgar/pkg/squid/trunk/checksums 2009-05-05 00:34:52 UTC (rev 4678) @@ -1,3 +1,3 @@ -c382084075531222e45669fd8224088e download/CSWsquid.postinstall -60ca435ff29ff327a3f093949cdab958 download/CSWsquid.preremove +121a5d15dc17f580ace367e8bef2ccd7 download/CSWsquid.postinstall +f97bf395c3d2d73a876f9091707126bc download/CSWsquid.preremove ad73bb6b95a42b93cfc62cf5762251a1 download/cswsquid Modified: csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall =================================================================== --- csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall 2009-05-04 22:30:52 UTC (rev 4677) +++ csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall 2009-05-05 00:34:52 UTC (rev 4678) @@ -3,24 +3,42 @@ # Squid-cache preremove script PATH=/usr/bin:/usr/sbin -export PATH +umask 0022 + CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw SQUID_CONFDIR=${CSW_PREFIX}/etc SQUID_VARDIR=${CSW_PREFIX}/var SQUID_SBINDIR=${CSW_PREFIX}/sbin +USER='' +GRP='' - if [ -f ${SQUID_CONFDIR}/squid.conf ]; then echo 'squid.conf found, Preserving Existing Config!' + USER="`awk '$1 ~ /cache_effective_user/ {print $2}' \ + ${SQUID_CONFDIR}/squid.conf`" + GRP="`awk '$1 ~ /cache_effective_group/ {print $2}' \ + ${SQUID_CONFDIR}/squid.conf`" else cp ${SQUID_CONFDIR}/squid.conf.CSW ${SQUID_CONFDIR}/squid.conf chmod 0644 ${SQUID_CONFDIR}/squid.conf fi -if [ -d ${SQUID_VARDIR}/cache ]; then - chown nobody:nobody ${SQUID_VARDIR}/cache +touch ${SQUID_VARDIR}/logs/access.log +touch ${SQUID_VARDIR}/logs/cache.log +touch ${SQUID_VARDIR}/logs/store.log + +if [ "_x${USER}x_" = "_xx_" ]; then + USER=nobody fi +if [ "_x${GRP}x_" = "_xx_" ]; then + GRP=nobody +fi +chown ${USER}:${GRP} ${SQUID_VARDIR}/logs/access.log +chown ${USER}:${GRP} ${SQUID_VARDIR}/logs/cache.log +chown ${USER}:${GRP} ${SQUID_VARDIR}/logs/store.log +chown ${USER}:${GRP} ${SQUID_VARDIR}/cache + ${SQUID_SBINDIR}/squid -z exit 0 Modified: csw/mgar/pkg/squid/trunk/files/CSWsquid.preremove =================================================================== --- csw/mgar/pkg/squid/trunk/files/CSWsquid.preremove 2009-05-04 22:30:52 UTC (rev 4677) +++ csw/mgar/pkg/squid/trunk/files/CSWsquid.preremove 2009-05-05 00:34:52 UTC (rev 4678) @@ -13,8 +13,8 @@ svccfg delete svc:application/server/cswsquid:default else echo 'Stopping squid server' - if [ -x ${PKG_INSTALL_ROOT}/etc/init.d/cswsquid ]; then - ${PKG_INSTALL_ROOT}/etc/init.d/cswsquid stop + if [ -x ${PKG_INSTALL_ROOT}/etc/opt/csw/init.d/cswsquid ]; then + ${PKG_INSTALL_ROOT}/etc/opt/csw/init.d/cswsquid stop else pkill -9 squid fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 02:49:36 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 00:49:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[4679] csw/mgar/pkg/squid/trunk/Makefile Message-ID: Revision: 4679 http://gar.svn.sourceforge.net/gar/?rev=4679&view=rev Author: valholla Date: 2009-05-05 00:49:36 +0000 (Tue, 05 May 2009) Log Message: ----------- postinstall tweak Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2009-05-05 00:34:52 UTC (rev 4678) +++ csw/mgar/pkg/squid/trunk/Makefile 2009-05-05 00:49:36 UTC (rev 4679) @@ -24,7 +24,7 @@ export LD MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(GARVERSION)/ DISTFILES = $(DISTNAME).tar.bz2 -DISTFILES = CSWsquid.postinstall CSWsquid.preremove cswsquid +DISTFILES += CSWsquid.postinstall CSWsquid.preremove cswsquid CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --datadir=$(datadir)/$(GARNAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 02:52:09 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 00:52:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[4680] csw/mgar/pkg/squid/trunk/checksums Message-ID: Revision: 4680 http://gar.svn.sourceforge.net/gar/?rev=4680&view=rev Author: valholla Date: 2009-05-05 00:52:02 +0000 (Tue, 05 May 2009) Log Message: ----------- checksum changes Modified Paths: -------------- csw/mgar/pkg/squid/trunk/checksums Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2009-05-05 00:49:36 UTC (rev 4679) +++ csw/mgar/pkg/squid/trunk/checksums 2009-05-05 00:52:02 UTC (rev 4680) @@ -1,3 +1,4 @@ 121a5d15dc17f580ace367e8bef2ccd7 download/CSWsquid.postinstall f97bf395c3d2d73a876f9091707126bc download/CSWsquid.preremove ad73bb6b95a42b93cfc62cf5762251a1 download/cswsquid +6de3a6a7a56a7ecae092f2d31a04f039 download/squid-2.7.STABLE6.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 04:47:37 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 02:47:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[4681] csw/mgar/pkg/squid/trunk/Makefile Message-ID: Revision: 4681 http://gar.svn.sourceforge.net/gar/?rev=4681&view=rev Author: valholla Date: 2009-05-05 02:47:36 +0000 (Tue, 05 May 2009) Log Message: ----------- add extra configure options Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2009-05-05 00:52:02 UTC (rev 4680) +++ csw/mgar/pkg/squid/trunk/Makefile 2009-05-05 02:47:36 UTC (rev 4681) @@ -20,28 +20,32 @@ REQUIRED_PKGS_CSWsquid = CSWoldaprt CSWosslrt CSWsasl CSWcswclassutils PROTOTYPE_FILTER = awk '$$$$3 ~/\/init.d\/cswsquid$$$$/ { $$$$2 = "cswinitsmf" } { print }' -LD = /opt/csw/bin/gld -export LD MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(GARVERSION)/ DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += CSWsquid.postinstall CSWsquid.preremove cswsquid CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --datadir=$(datadir)/$(GARNAME) -CONFIGURE_ARGS += --with-large-files -CONFIGURE_ARGS += --with-gnu-ld=yes -CONFIGURE_ARGS += --with-dl +CONFIGURE_ARGS += --enable-arp-acl +CONFIGURE_ARGS += --enable-auth=basic +CONFIGURE_ARGS += --enable-basic-auth-helpers=LDAP,SMB,YP,PAM,SASL,NCSA +CONFIGURE_ARGS += --enable-cache-digests +CONFIGURE_ARGS += --enable-carp +CONFIGURE_ARGS += --enable-delay-pools +CONFIGURE_ARGS += --enable-devpoll +CONFIGURE_ARGS += --enable-forw-via-db +CONFIGURE_ARGS += --enable-htcp +CONFIGURE_ARGS += --enable-icmp CONFIGURE_ARGS += --enable-large-cache-files +CONFIGURE_ARGS += --enable-referer-log +CONFIGURE_ARGS += --enable-removal-policies=heap,lru +CONFIGURE_ARGS += --enable-select +CONFIGURE_ARGS += --enable-snmp CONFIGURE_ARGS += --enable-ssl +CONFIGURE_ARGS += --enable-useragent-log +CONFIGURE_ARGS += --with-dl +CONFIGURE_ARGS += --with-large-files CONFIGURE_ARGS += --with-openssl=$(prefix) -CONFIGURE_ARGS += --enable-icmp -CONFIGURE_ARGS += --enable-delay-pools -CONFIGURE_ARGS += --enable-useragent-log -CONFIGURE_ARGS += --enable-referer-log -CONFIGURE_ARGS += --enable-arp-acl -CONFIGURE_ARGS += --enable-snmp -CONFIGURE_ARGS += --enable-auth=basic -CONFIGURE_ARGS += --enable-basic-auth-helpers=LDAP,SMB,YP,PAM,SASL,NCSA TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Tue May 5 14:28:05 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 05 May 2009 12:28:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[4682] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 4682 http://gar.svn.sourceforge.net/gar/?rev=4682&view=rev Author: aigoshin Date: 2009-05-05 12:28:05 +0000 (Tue, 05 May 2009) Log Message: ----------- nginx: milestone 3.0 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall csw/mgar/pkg/nginx/trunk/files/svc-cswnginx Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2009-05-05 02:47:36 UTC (rev 4681) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-05-05 12:28:05 UTC (rev 4682) @@ -1,8 +1,8 @@ GARNAME = nginx -GARVERSION = 0.7.30 +GARVERSION = $(NGINX_VERSION) CATEGORIES = server -DESCRIPTION = nginx HTTP server and mail proxy server +DESCRIPTION = HTTP server and mail proxy server define BLURB Nginx (pronounced "engine x") is a free, open-source, high-performance HTTP server and reverse proxy, as well as an IMAP/POP3 proxy server. Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2009-05-05 02:47:36 UTC (rev 4681) +++ csw/mgar/pkg/nginx/trunk/checksums 2009-05-05 12:28:05 UTC (rev 4682) @@ -1,7 +1,7 @@ -31d26f66824fd2d3f33ac0b3b9db1532 download/nginx-0.7.30.tar.gz +521cd4c0248aebfdb25df48a11a8cc49 download/CSWnginx.checkinstall 12b5333e18e985b17f8a5465646e9a8a download/CSWnginx.gspec -521cd4c0248aebfdb25df48a11a8cc49 download/CSWnginx.checkinstall -1e505987ba8df7f61f21fc28b926fc5a download/CSWnginx.postinstall +bb404771e330fe98f93cb2d12a808121 download/CSWnginx.postinstall e9178dc33f2d38aab8f118a8f0550ac7 download/CSWnginx.preremove 5c832758a62ee319ea9dfd1829d736eb download/cswnginx.xml -706889f6967b3b327c14aa0ff5c271ab download/svc-cswnginx +15cce6102a2efcf4d4acde9bb71ea6d3 download/nginx-0.6.36.tar.gz +02b720d1ff091b7d2ab005b4db223345 download/svc-cswnginx Modified: csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall =================================================================== --- csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall 2009-05-05 02:47:36 UTC (rev 4681) +++ csw/mgar/pkg/nginx/trunk/files/CSWnginx.postinstall 2009-05-05 12:28:05 UTC (rev 4682) @@ -7,11 +7,11 @@ MSG="" UPGRADE_NGINX_ERR=0 if [ "$SMF" = "yes" ]; then - CSWNGINX="$BASEDIR/opt/csw/lib/svc/method/svc-cswnginx" + CSWNGINX="/opt/csw/lib/svc/method/svc-cswnginx" else - CSWNGINX="$BASEDIR/etc/init.d/cswnginx" + CSWNGINX="/etc/init.d/cswnginx" fi - if [ -x $CSWNGINX ]; then + if [ -x "${BASEDIR}${CSWNGINX}" ]; then MSG=`$CSWNGINX upgrade` if [ $? -ne 0 ]; then UPGRADE_NGINX_ERR=1 Modified: csw/mgar/pkg/nginx/trunk/files/svc-cswnginx =================================================================== --- csw/mgar/pkg/nginx/trunk/files/svc-cswnginx 2009-05-05 02:47:36 UTC (rev 4681) +++ csw/mgar/pkg/nginx/trunk/files/svc-cswnginx 2009-05-05 12:28:05 UTC (rev 4682) @@ -9,9 +9,10 @@ PIDFILE=${VARRUNX}/nginx.pid PIDFILO=${VARRUNX}/nginx.pid.oldbin -#[ ! -f ${NGINX} ] && exit 255 -#[ ! -f ${CFGFILE} ] && exit 254 +[ ! -f ${NGINX} ] && exit 255 +[ ! -f ${CFGFILE} ] && exit 254 +RETVAL=0 start() { $NGINX @@ -48,49 +49,49 @@ reload() { killpidf -HUP - RETVAL=$? return $RETVAL } restart() { stop start - RETVAL=$? return $RETVAL } rotate() { killpidf -USR1 - RETVAL=$? return $RETVAL } -state() { +status() { if [ -s "$PIDFILE" ]; then FPID=`/bin/cat $PIDFILE` else echo "not running" - return 1 + RETVAL=1 + return $RETVAL fi PIDP=`/bin/ps -o pid= -p $FPID` if [ "$PIDP" = "" ]; then echo "not running" - return 1 + RETVAL=1 + return $RETVAL fi COMM=`/bin/ps -o comm= -p $FPID` if [ "$NGINX" = "$COMM" ]; then echo "running" - return 0 + RETVAL=0 + return $RETVAL else echo "running, but it is not a CSW package" - return 1 + RETVAL=1 + return $RETVAL fi } upgrade() { killpidf -USR2 - RETVAL=$? [ $RETVAL -ne 0 ] && return $RETVAL OLDBINPID=0 for i in 1 2 3 4 5; do @@ -102,31 +103,27 @@ fi done if [ $OLDBINPID -eq 1 ]; then - state >/dev/null - RETVAL=$? + status >/dev/null if [ $RETVAL -eq 0 ]; then killpidf -WINCH $PIDFILO - RETVAL=$? fi - return $RETVAL + else + RETVAL=1 fi - return 1 + return $RETVAL } upgrade_commit() { killpidf -QUIT $PIDFILO - RETVAL=$? return $RETVAL } upgrade_rollback() { killpidf -HUP $PIDFILO - RETVAL=$? if [ $RETVAL -eq 0 ]; then killpidf -QUIT $PIDFILE - RETVAL=$? fi return $RETVAL } @@ -134,50 +131,41 @@ case "$1" in start) - [ ! -d $VARRUNX ] && /bin/mkdir -p $VARRUNX + [ ! -d $VARRUNX ] && /bin/mkdir -p $VARRUNX ||: check - start - RETVAL=$? + [ $RETVAL -eq 0 ] && start ||: ;; stop) stop ;; refresh|reload) check - RETVAL=$? [ $RETVAL -eq 0 ] && reload ||: ;; restart) check - RETVAL=$? [ $RETVAL -eq 0 ] && restart ||: ;; rotate) rotate - RETVAL=$? ;; -state) - state - RETVAL=$? +status) + status ;; upgrade) check - RETVAL=$? [ $RETVAL -eq 0 ] && upgrade ||: ;; upgrade-commit) upgrade_commit - RETVAL=$? ;; upgrade-rollback) upgrade_rollback - RETVAL=$? ;; *) - echo "Usage:" `basename $0` "{start|stop|refresh|reload|restart|rotate|state|upgrade|upgrade-commit|upgrade-rollback}" + echo "Usage:" `basename $0` "{start|stop|refresh|reload|restart|rotate|status|upgrade|upgrade-commit|upgrade-rollback}" exit 1 ;; esac -RETVAL=$? exit $RETVAL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue May 5 15:22:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 May 2009 13:22:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[4683] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 4683 http://gar.svn.sourceforge.net/gar/?rev=4683&view=rev Author: dmichelsen Date: 2009-05-05 13:22:27 +0000 (Tue, 05 May 2009) Log Message: ----------- mGAR v2: Fix PKG_CONFIG_PATH as it was not updated due to environment exportation 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-05 12:28:05 UTC (rev 4682) +++ csw/mgar/gar/v2/gar.conf.mk 2009-05-05 13:22:27 UTC (rev 4683) @@ -496,7 +496,9 @@ # This is for foo-config chaos PKG_CONFIG_DIRS ?= $(libpath_install) $(libdir_install) $(EXTRA_PKG_CONFIG_DIRS) -PKG_CONFIG_PATH ?= $(call MAKEPATH,$(foreach D,$(PKG_CONFIG_DIRS),$(abspath $D/$(MM_LIBDIR)/pkgconfig)) $(_CATEGORY_PKG_CONFIG_PATH) $(EXTRA_PKG_CONFIG_PATH)) +ifneq (,$(findstring $(origin PKG_CONFIG_PATH),undefined environment)) +PKG_CONFIG_PATH = $(call MAKEPATH,$(foreach D,$(PKG_CONFIG_DIRS),$(abspath $D/$(MM_LIBDIR)/pkgconfig)) $(_CATEGORY_PKG_CONFIG_PATH) $(EXTRA_PKG_CONFIG_PATH)) +endif # # Mirror Sites This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue May 5 15:24:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 May 2009 13:24:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[4684] csw/mgar/pkg/x11/libX11/trunk Message-ID: Revision: 4684 http://gar.svn.sourceforge.net/gar/?rev=4684&view=rev Author: dmichelsen Date: 2009-05-05 13:24:11 +0000 (Tue, 05 May 2009) Log Message: ----------- x11/libx11: Add header fix for pango Modified Paths: -------------- csw/mgar/pkg/x11/libX11/trunk/Makefile csw/mgar/pkg/x11/libX11/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libX11/trunk/files/patch-xlib-sentinel.diff Modified: csw/mgar/pkg/x11/libX11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-05-05 13:22:27 UTC (rev 4683) +++ csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-05-05 13:24:11 UTC (rev 4684) @@ -12,6 +12,8 @@ MASTER_SITES =http://xorg.freedesktop.org/releases/individual/lib/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = patch-stdint.diff +# Add workaround for http://bugs.sourcemage.org/show_bug.cgi?id=13476 +PATCHFILES += patch-xlib-sentinel.diff # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/x11/libX11/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/checksums 2009-05-05 13:22:27 UTC (rev 4683) +++ csw/mgar/pkg/x11/libX11/trunk/checksums 2009-05-05 13:24:11 UTC (rev 4684) @@ -1,2 +1,3 @@ 858e013fd4c37689a2a8d86c8765dab0 download/libX11-1.2.1.tar.gz 667f63d38722e29d6fd36b6648bbb757 download/patch-stdint.diff +918353b72ffab3f2cff4a8bcc65e9376 download/patch-xlib-sentinel.diff Added: csw/mgar/pkg/x11/libX11/trunk/files/patch-xlib-sentinel.diff =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/files/patch-xlib-sentinel.diff (rev 0) +++ csw/mgar/pkg/x11/libX11/trunk/files/patch-xlib-sentinel.diff 2009-05-05 13:24:11 UTC (rev 4684) @@ -0,0 +1,18 @@ +diff -Naur libX11-1.2.1.orig/include/X11/Xlib.h libX11-1.2.1.patched/include/X11/Xlib.h +--- libX11-1.2.1.orig/include/X11/Xlib.h 2008-10-07 19:18:17.000000000 +0200 ++++ libX11-1.2.1.patched/include/X11/Xlib.h 2009-05-05 13:49:27.444486000 +0200 +@@ -38,6 +38,14 @@ + + #define XlibSpecificationRelease 6 + ++#if defined(__GNUC__) && (__GNUC__ >= 4) ++# define _X_SENTINEL(x) __attribute__ ((__sentinel__(x))) ++# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y))) ++#else ++# define _X_SENTINEL(x) ++# define _X_ATTRIBUTE_PRINTF(x,y) ++#endif /* GNUC >= 4 */ ++ + #ifdef USG + #ifndef __TYPES__ + #include /* forgot to protect it... */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue May 5 15:27:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 May 2009 13:27:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[4685] csw/mgar/pkg/x11 Message-ID: Revision: 4685 http://gar.svn.sourceforge.net/gar/?rev=4685&view=rev Author: dmichelsen Date: 2009-05-05 13:27:05 +0000 (Tue, 05 May 2009) Log Message: ----------- x11/libxft: Initial commit Added Paths: ----------- csw/mgar/pkg/x11/libxft/ csw/mgar/pkg/x11/libxft/branches/ csw/mgar/pkg/x11/libxft/tags/ csw/mgar/pkg/x11/libxft/tags/legacy/ csw/mgar/pkg/x11/libxft/trunk/ csw/mgar/pkg/x11/libxft/trunk/Makefile csw/mgar/pkg/x11/libxft/trunk/checksums csw/mgar/pkg/x11/libxft/trunk/files/ Property changes on: csw/mgar/pkg/x11/libxft/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/x11/libxft/trunk/Makefile (from rev 4636, csw/mgar/pkg/x11/libXau/trunk/Makefile) =================================================================== --- csw/mgar/pkg/x11/libxft/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/libxft/trunk/Makefile 2009-05-05 13:27:05 UTC (rev 4685) @@ -0,0 +1,22 @@ +GARNAME = libXft +GARVERSION = 2.1.13 +CATEGORIES = x11 + +DESCRIPTION = X11 authorisation library +define BLURB +endef + +MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWlibxft2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +NOISALIST = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Added: csw/mgar/pkg/x11/libxft/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libxft/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/libxft/trunk/checksums 2009-05-05 13:27:05 UTC (rev 4685) @@ -0,0 +1 @@ +40ebc53da7efd520e528fa7a564863db download/libXft-2.1.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue May 5 15:29:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 May 2009 13:29:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[4686] csw/mgar/pkg/x11/libxft/trunk/Makefile Message-ID: Revision: 4686 http://gar.svn.sourceforge.net/gar/?rev=4686&view=rev Author: dmichelsen Date: 2009-05-05 13:29:23 +0000 (Tue, 05 May 2009) Log Message: ----------- x11/libxft: Add package dependencies Modified Paths: -------------- csw/mgar/pkg/x11/libxft/trunk/Makefile Modified: csw/mgar/pkg/x11/libxft/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxft/trunk/Makefile 2009-05-05 13:27:05 UTC (rev 4685) +++ csw/mgar/pkg/x11/libxft/trunk/Makefile 2009-05-05 13:29:23 UTC (rev 4686) @@ -11,6 +11,8 @@ PACKAGES = CSWlibxft2 +REQUIRED_PKGS = CSWfconfig CSWftype2 CSWlibx11 CSWlibxrender + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue May 5 16:07:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 May 2009 14:07:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[4687] csw/mgar/pkg/libcairo/trunk/Makefile Message-ID: Revision: 4687 http://gar.svn.sourceforge.net/gar/?rev=4687&view=rev Author: dmichelsen Date: 2009-05-05 14:07:29 +0000 (Tue, 05 May 2009) Log Message: ----------- libcairo: Add x11 dirs Modified Paths: -------------- csw/mgar/pkg/libcairo/trunk/Makefile Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2009-05-05 13:29:23 UTC (rev 4686) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2009-05-05 14:07:29 UTC (rev 4687) @@ -40,8 +40,12 @@ ARCHALL_CSWlibcairodoc = 1 # Wait for libpixman, libfontconfig and libXrender to be 64 bit -#BUILD64 = 1 +BUILD64 = 1 +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-tests --enable-xlib=yes --enable-xlib-xrender=yes --enable-ft=yes --with-x CONFIGURE_ARGS += --enable-png=yes --enable-ps=yes --enable-pdf=yes --enable-svg=yes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 17:48:21 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 15:48:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[4688] csw/mgar/pkg Message-ID: Revision: 4688 http://gar.svn.sourceforge.net/gar/?rev=4688&view=rev Author: valholla Date: 2009-05-05 15:48:21 +0000 (Tue, 05 May 2009) Log Message: ----------- initial checkin Added Paths: ----------- csw/mgar/pkg/squidclamav/ csw/mgar/pkg/squidclamav/Makefile csw/mgar/pkg/squidclamav/branches/ csw/mgar/pkg/squidclamav/tags/ csw/mgar/pkg/squidclamav/trunk/ csw/mgar/pkg/squidclamav/trunk/Makefile csw/mgar/pkg/squidclamav/trunk/checksums csw/mgar/pkg/squidclamav/trunk/files/ Added: csw/mgar/pkg/squidclamav/Makefile =================================================================== --- csw/mgar/pkg/squidclamav/Makefile (rev 0) +++ csw/mgar/pkg/squidclamav/Makefile 2009-05-05 15:48:21 UTC (rev 4688) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 17:49:03 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 15:49:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[4689] csw/mgar/pkg/squidclamav/trunk/ Message-ID: Revision: 4689 http://gar.svn.sourceforge.net/gar/?rev=4689&view=rev Author: valholla Date: 2009-05-05 15:49:03 +0000 (Tue, 05 May 2009) Log Message: ----------- propset for gar Property Changed: ---------------- csw/mgar/pkg/squidclamav/trunk/ Property changes on: csw/mgar/pkg/squidclamav/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. From aigoshin at users.sourceforge.net Tue May 5 18:02:41 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Tue, 05 May 2009 16:02:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[4690] csw/mgar/pkg/nginx/trunk/checksums Message-ID: Revision: 4690 http://gar.svn.sourceforge.net/gar/?rev=4690&view=rev Author: aigoshin Date: 2009-05-05 16:02:27 +0000 (Tue, 05 May 2009) Log Message: ----------- nginx: milestone 3.0 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2009-05-05 15:49:03 UTC (rev 4689) +++ csw/mgar/pkg/nginx/trunk/checksums 2009-05-05 16:02:27 UTC (rev 4690) @@ -3,5 +3,5 @@ bb404771e330fe98f93cb2d12a808121 download/CSWnginx.postinstall e9178dc33f2d38aab8f118a8f0550ac7 download/CSWnginx.preremove 5c832758a62ee319ea9dfd1829d736eb download/cswnginx.xml -15cce6102a2efcf4d4acde9bb71ea6d3 download/nginx-0.6.36.tar.gz +e8e7f1593198ed066939cf2e548d7d2f download/nginx-0.7.54.tar.gz 02b720d1ff091b7d2ab005b4db223345 download/svc-cswnginx This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 18:07:14 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 16:07:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[4691] csw/mgar/pkg/squidclamav/trunk Message-ID: Revision: 4691 http://gar.svn.sourceforge.net/gar/?rev=4691&view=rev Author: valholla Date: 2009-05-05 16:07:14 +0000 (Tue, 05 May 2009) Log Message: ----------- package checkin Modified Paths: -------------- csw/mgar/pkg/squidclamav/trunk/Makefile csw/mgar/pkg/squidclamav/trunk/checksums Modified: csw/mgar/pkg/squidclamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/squidclamav/trunk/Makefile 2009-05-05 16:02:27 UTC (rev 4690) +++ csw/mgar/pkg/squidclamav/trunk/Makefile 2009-05-05 16:07:14 UTC (rev 4691) @@ -0,0 +1,33 @@ +GARNAME = squidclamav +GARVERSION = 4.0 +CATEGORIES = apps + +DESCRIPTION = A Dedicated ClamAV AntiVirus Redirector for Squid +define BLURB + SquidClamAv is a dedicated ClamAV antivirus redirector for Squid. + It can run antivirus checks based on filename regex, + content-type regex, and more. It is easy to install and works + even with heavy Squid access. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWsquidclamav +CATALOGNAME_CSWsquidclamav = squidclamav +SPKG_DESC_CSWsquidclamav = $(DESCRIPTION) + + +REQUIRED_PKGS_CSWsquidclamav = CSWcurlrt CSWsquid CSWlibclamav + +# We define upstream file regex so we can be notifed of +# new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +EXTRA_LINKER_FLAGS += -lrt -lnsl -lsocket + +TEST_TARGET = check + +include gar/category.mk Modified: csw/mgar/pkg/squidclamav/trunk/checksums =================================================================== --- csw/mgar/pkg/squidclamav/trunk/checksums 2009-05-05 16:02:27 UTC (rev 4690) +++ csw/mgar/pkg/squidclamav/trunk/checksums 2009-05-05 16:07:14 UTC (rev 4691) @@ -0,0 +1 @@ +0a5e2fa8a4270a90235621fce9269949 download/squidclamav-4.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 18:09:09 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 16:09:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[4692] csw/mgar/pkg/squidclamav/trunk/ Message-ID: Revision: 4692 http://gar.svn.sourceforge.net/gar/?rev=4692&view=rev Author: valholla Date: 2009-05-05 16:09:09 +0000 (Tue, 05 May 2009) Log Message: ----------- set ignores Property Changed: ---------------- csw/mgar/pkg/squidclamav/trunk/ Property changes on: csw/mgar/pkg/squidclamav/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 18:11:47 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 16:11:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[4693] csw/mgar/pkg/squidclamav/trunk/Makefile Message-ID: Revision: 4693 http://gar.svn.sourceforge.net/gar/?rev=4693&view=rev Author: valholla Date: 2009-05-05 16:11:47 +0000 (Tue, 05 May 2009) Log Message: ----------- fix dependencies Modified Paths: -------------- csw/mgar/pkg/squidclamav/trunk/Makefile Modified: csw/mgar/pkg/squidclamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/squidclamav/trunk/Makefile 2009-05-05 16:09:09 UTC (rev 4692) +++ csw/mgar/pkg/squidclamav/trunk/Makefile 2009-05-05 16:11:47 UTC (rev 4693) @@ -18,7 +18,7 @@ SPKG_DESC_CSWsquidclamav = $(DESCRIPTION) -REQUIRED_PKGS_CSWsquidclamav = CSWcurlrt CSWsquid CSWlibclamav +REQUIRED_PKGS_CSWsquidclamav = CSWcurlrt # We define upstream file regex so we can be notifed of # new upstream software release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 20:07:37 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 18:07:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[4694] csw/mgar/pkg/squidclamav/trunk Message-ID: Revision: 4694 http://gar.svn.sourceforge.net/gar/?rev=4694&view=rev Author: valholla Date: 2009-05-05 18:07:37 +0000 (Tue, 05 May 2009) Log Message: ----------- adjusted postinstall Modified Paths: -------------- csw/mgar/pkg/squidclamav/trunk/Makefile csw/mgar/pkg/squidclamav/trunk/checksums Added Paths: ----------- csw/mgar/pkg/squidclamav/trunk/files/CSWsquidclamav.postinstall csw/mgar/pkg/squidclamav/trunk/files/squidclamav.conf.CSW Modified: csw/mgar/pkg/squidclamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/squidclamav/trunk/Makefile 2009-05-05 16:11:47 UTC (rev 4693) +++ csw/mgar/pkg/squidclamav/trunk/Makefile 2009-05-05 18:07:37 UTC (rev 4694) @@ -12,12 +12,13 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += squidclamav.conf.CSW +DISTFILES += CSWsquidclamav.postinstall PACKAGES = CSWsquidclamav CATALOGNAME_CSWsquidclamav = squidclamav SPKG_DESC_CSWsquidclamav = $(DESCRIPTION) - REQUIRED_PKGS_CSWsquidclamav = CSWcurlrt # We define upstream file regex so we can be notifed of @@ -30,4 +31,17 @@ TEST_TARGET = check +EXTRA_DOCFILES = AUTHORS ChangeLog INSTALL NEWS README + +post-install-modulated: + @ginstall -d $(DESTDIR)$(sysconfdir) + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -d $(DESTDIR)$(libexecdir)/cgi-bin + @cp $(DOWNLOADDIR)/squidclamav.conf.CSW $(DESTDIR)$(sysconfdir) + @( for file in $(EXTRA_DOCFILES); do \ + cp $(abspath $(WORKSRC)/$$file) $(DESTDIR)$(docdir)/$(GARNAME); \ + done ) + @cp $(WORKSRC)/clwarn.cgi* $(DESTDIR)$(libexecdir)/cgi-bin + @$(MAKECOOKIE) + include gar/category.mk Modified: csw/mgar/pkg/squidclamav/trunk/checksums =================================================================== --- csw/mgar/pkg/squidclamav/trunk/checksums 2009-05-05 16:11:47 UTC (rev 4693) +++ csw/mgar/pkg/squidclamav/trunk/checksums 2009-05-05 18:07:37 UTC (rev 4694) @@ -1 +1,3 @@ +eec6f1d7c46890ff70ae88f6967736bd download/CSWsquidclamav.postinstall 0a5e2fa8a4270a90235621fce9269949 download/squidclamav-4.0.tar.gz +731fa1fc58327ee9353c9b4c2a8bd404 download/squidclamav.conf.CSW Added: csw/mgar/pkg/squidclamav/trunk/files/CSWsquidclamav.postinstall =================================================================== --- csw/mgar/pkg/squidclamav/trunk/files/CSWsquidclamav.postinstall (rev 0) +++ csw/mgar/pkg/squidclamav/trunk/files/CSWsquidclamav.postinstall 2009-05-05 18:07:37 UTC (rev 4694) @@ -0,0 +1,60 @@ +#!/bin/sh + +PATH=/usr/bin:/usr/sbin +umask 0022 + +CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +SQUID_CONFDIR=${CSW_PREFIX}/etc +SQUID_DOCDIR=${CSW_PREFIX}/share/doc +SQUID_VARDIR=${CSW_PREFIX}/var +SQUID_SBINDIR=${CSW_PREFIX}/sbin +USER='' +GRP='' +SQUID_PORT='' + +if [ -f ${SQUID_CONFDIR}/squid.conf ]; then + USER="`awk '$1 ~ /cache_effective_user/ {print $2}' \ + ${SQUID_CONFDIR}/squid.conf`" + GRP="`awk '$1 ~ /cache_effective_group/ {print $2}' \ + ${SQUID_CONFDIR}/squid.conf`" + SQUID_PORT="`awk '$1 ~ /http_port/ {print $2}' \ + ${SQUID_CONFDIR}/squid.conf`" +fi + +if [ "_x${USER}x_" = "_xx_" ]; then + USER=nobody +fi +if [ "_x${GRP}x_" = "_xx_" ]; then + GRP=nobody +fi +if [ "_x${SQUID_PORT}x_" = "_xx_" ]; then + SQUID_PORT=3128 +fi + +perl -i -pe "s|_SQUIDPORT_|${SQUID_PORT}|" ${SQUID_CONFDIR}/squidclamav.conf.CSW + +if [ -f ${SQUID_CONFDIR}/squidclamav.conf ]; then + echo 'Found:squidclamav.conf, Preserving Existing Config' +else + echo 'Creating squidclamav.conf' + cp ${SQUID_CONFDIR}/squidclamav.conf.CSW ${SQUID_CONFDIR}/squidclamav.conf + chmod 0644 ${SQUID_CONFDIR}/squidclamav.conf +fi + +touch ${SQUID_VARDIR}/logs/squidclamav.log +chown ${USER}:${GRP} ${SQUID_VARDIR}/logs/squidclamav.log + +cat << _EOF_ +****************************************************************************** +* NOTICE: +* Please be sure to configure squidclamav +* Configuration File Location: +* ${SQUID_CONFDIR}/squidclamav.conf +* +* Details on Configuration can be found in +* ${SQUID_DOCDIR}/squidclamav/README +* +****************************************************************************** +_EOF_ + +exit 0 Added: csw/mgar/pkg/squidclamav/trunk/files/squidclamav.conf.CSW =================================================================== --- csw/mgar/pkg/squidclamav/trunk/files/squidclamav.conf.CSW (rev 0) +++ csw/mgar/pkg/squidclamav/trunk/files/squidclamav.conf.CSW 2009-05-05 18:07:37 UTC (rev 4694) @@ -0,0 +1,100 @@ +# squidclamav.conf.dist +# +# Lines have the form: +# +# regex|regexi pattern +# +# abort|aborti pattern +# +# content|contenti pattern +# +# abortcontent|abortcontenti pattern +# +# redirect cgi_redirect_url +# +# logfile /path/to/log_file +# +# proxy none +# +# squid_ip 127.0.0.1 +# +# squid_port 3128 +# +# debug 0|1 +# +# force 0|1 +# +# timeout secondes +# +# clamd_ip 127.0.0.1 +# +# clamd_port 3310 +# +# clamd_local /tmp/clamd +# +# stat 0|1 +# +# maxredir 10 +# +# squidguard /usr/local/squidGuard/bin/squidGuard +# +# whitelist this.trustdomain.com +# whitelist .*\.domain\.* +# +# useragent String_to_modify_curl_user_agent +# +# trust_cache 0|1 +# +# Note that the ordering of regex|abort|content|abortcontent|whitelist lines +# in this file is critical. Some pattern can not be reached if a previous +# pattern match. +# +# +# Examples of valid lines: +# +#squid_ip 127.0.0.1 +#squid_port 3128 +#logfile /var/log/squidclamav.log +#redirect http://proxy.domain.com/cgi-bin/clwarn.cgi +#squidguard /usr/local/squidGuard/bin/squidGuard +#debug 0 +#force 1 +#stat 1 +#maxredir 10 +#clamd_local /tmp/clamd +#clamd_ip 192.168.1.5 +#clamd_port 3310 +#timeout 60 +#useragent Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) +#trust_cache 0 +# +#abort ^.*\.pdf$ +#abort ^.*\.js$ +#abort ^.*\.html$ +#abort ^.*\.css$ +#abort ^.*\.xml$ +#abort ^.*\.xsl$ +#abort ^.*\.js$ +#abort ^.*\.html$ +#abort ^.*\.css$ +#abort ^.*\.xml$ +#abort ^.*\.xsl$ +#abort ^.*\.js$ +#abort ^.*\.jsp$ +#abort ^.*\.jsp\?.*$ +#aborti ^.*servlet.*$ +#abort ^.*\.ico$ +#aborti ^.*\.gif$ +#aborti ^.*\.png$ +#aborti ^.*\.jpg$ +#aborti ^.*\.swf$ +#abortcontenti ^.*application\/x-mms-framed.*$ +#abortcontenti ^.*application\/x-javascript.*$ +#content ^.*application\/.*$ +#whitelist www.eicar.org + +squid_port _SQUIDPORT_ +logfile /var/log/squidclamav.log + +# Scan all files +content ^.*\/.*$ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 21:10:16 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 19:10:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[4695] csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Message-ID: Revision: 4695 http://gar.svn.sourceforge.net/gar/?rev=4695&view=rev Author: valholla Date: 2009-05-05 19:10:16 +0000 (Tue, 05 May 2009) Log Message: ----------- post-install fix Modified Paths: -------------- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-05 18:07:37 UTC (rev 4694) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-05 19:10:16 UTC (rev 4695) @@ -16,14 +16,66 @@ echo "updating extension_dir..." perl -i.bak -plne "s,no-debug-non-zts-[0-9]+,$extdir," $PHP_INI + old_list="`sed -ne 's/^extension=\(.*\)\.so/\1/p' $PHP_INI`" + new_pkgs='' + non_pkgs='' + for ext in `echo ${old_list}`; do + if grep "extension=$ext" $PHP_INI.CSW; then + new_pkgs="${new_pkgs} php5_${ext}" + else + non_pkgs="${non_pkgs} ${ext}" + fi + done + cat << _EOT_ ****************************************************************************** -* NOTICE: The existing php.ini file is from an older version of PHP5. The new -* php.ini.CSW is based on php.ini-recommended from the PHP 5.2.1 distribution. +* NOTICE: The existing php.ini file is from an older version of PHP5. * -* Please consider merging any local configuration changes into a copy of the -* most recent CSW configuration file. +* ************* PLEASE READ ************* +* +* Starting with php5-5.2.9,REV=2009.04.29 the CSW php5 suite has been +* broken out into seperate packages for the modules. +* +_EOT_ +if [ -n ${new_pkgs} ]; then + cat << _EOT_ +* ************* PLEASE READ ************* +* +* Your existing config contains the following extensions +* that now have become external packages: +* ${new_pkgs} +* to keep the same functionality as the original install +* install ${new_pkgs} using pkg-get +* +* If you have issues with missing extensions, Please check +* the catalog for the missing extension before filing a bug report +* +_EOT_ +else + cat << _EOT_ +* ************* PLEASE READ ************* +* +* Your existing config does not contain any shared extensions +* that are now packages. If you have issues with missing extensions, +* Please Check the catalog for the missing extension before +* filing a bug report. +* +_EOT_ +fi +if [ -n ${non_pkgs} ]; then + cat << _EOT_ +* ************* PLEASE READ ************* +* +* Your existing config contains the following extensions +* that are not part of CSW build: +* ${non_pkgs} +* +* Please verify they are still working after this upgrade. +* +_EOT_ +fi +cat << _EOT_ ****************************************************************************** ****************************************************************************** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 22:10:47 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 20:10:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[4696] csw/mgar/pkg/squid/trunk/Makefile Message-ID: Revision: 4696 http://gar.svn.sourceforge.net/gar/?rev=4696&view=rev Author: valholla Date: 2009-05-05 20:10:47 +0000 (Tue, 05 May 2009) Log Message: ----------- don't force devpoll Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2009-05-05 19:10:16 UTC (rev 4695) +++ csw/mgar/pkg/squid/trunk/Makefile 2009-05-05 20:10:47 UTC (rev 4696) @@ -32,7 +32,6 @@ CONFIGURE_ARGS += --enable-cache-digests CONFIGURE_ARGS += --enable-carp CONFIGURE_ARGS += --enable-delay-pools -CONFIGURE_ARGS += --enable-devpoll CONFIGURE_ARGS += --enable-forw-via-db CONFIGURE_ARGS += --enable-htcp CONFIGURE_ARGS += --enable-icmp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 22:47:41 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 20:47:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[4697] csw/mgar/pkg/php5/trunk/checksums Message-ID: Revision: 4697 http://gar.svn.sourceforge.net/gar/?rev=4697&view=rev Author: valholla Date: 2009-05-05 20:47:40 +0000 (Tue, 05 May 2009) Log Message: ----------- checksum change Modified Paths: -------------- csw/mgar/pkg/php5/trunk/checksums Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-05-05 20:10:47 UTC (rev 4696) +++ csw/mgar/pkg/php5/trunk/checksums 2009-05-05 20:47:40 UTC (rev 4697) @@ -1,11 +1,10 @@ -77076f9a0bab2777c15b84c4c0bd7ba4 download/CSWap2modphp5.depend 632cb357e102e18e04bb5666825a912f download/CSWap2modphp5.postinstall e1381a4ba49e46b2097b76286a1b36fb download/CSWap2modphp5.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWap2modphp5.space 5f0046fe1b3f8e2228fdb165bdbbe73a download/CSWmodphp5.postinstall 2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space -8139c9c02a2f62bac64041fdd0e90bf6 download/CSWphp5.postinstall +50ac22e8d8bd961c8bc69635a202a56a download/CSWphp5.postinstall 89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh de56d3571f4484284d106af158bffc38 download/CSWphp5_ext_enable.sh ab08e2ba62667bf13fa236099e433e84 download/configure.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 23:18:33 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 21:18:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[4698] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4698 http://gar.svn.sourceforge.net/gar/?rev=4698&view=rev Author: valholla Date: 2009-05-05 21:18:33 +0000 (Tue, 05 May 2009) Log Message: ----------- post-install tweak Modified Paths: -------------- csw/mgar/pkg/php5/trunk/checksums csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-05-05 20:47:40 UTC (rev 4697) +++ csw/mgar/pkg/php5/trunk/checksums 2009-05-05 21:18:33 UTC (rev 4698) @@ -4,7 +4,7 @@ 5f0046fe1b3f8e2228fdb165bdbbe73a download/CSWmodphp5.postinstall 2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space -50ac22e8d8bd961c8bc69635a202a56a download/CSWphp5.postinstall +69cc09afe1d73127e48d0d59b4c20b15 download/CSWphp5.postinstall 89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh de56d3571f4484284d106af158bffc38 download/CSWphp5_ext_enable.sh ab08e2ba62667bf13fa236099e433e84 download/configure.diff Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-05 20:47:40 UTC (rev 4697) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-05 21:18:33 UTC (rev 4698) @@ -38,7 +38,7 @@ * broken out into seperate packages for the modules. * _EOT_ -if [ -n ${new_pkgs} ]; then +if [ -n "${new_pkgs}" ]; then cat << _EOT_ * ************* PLEASE READ ************* * @@ -63,7 +63,7 @@ * _EOT_ fi -if [ -n ${non_pkgs} ]; then +if [ -n "${non_pkgs}" ]; then cat << _EOT_ * ************* PLEASE READ ************* * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 23:41:17 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 21:41:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[4699] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4699 http://gar.svn.sourceforge.net/gar/?rev=4699&view=rev Author: valholla Date: 2009-05-05 21:41:17 +0000 (Tue, 05 May 2009) Log Message: ----------- tweak post-install Modified Paths: -------------- csw/mgar/pkg/php5/trunk/checksums csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-05-05 21:18:33 UTC (rev 4698) +++ csw/mgar/pkg/php5/trunk/checksums 2009-05-05 21:41:17 UTC (rev 4699) @@ -4,7 +4,7 @@ 5f0046fe1b3f8e2228fdb165bdbbe73a download/CSWmodphp5.postinstall 2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space -69cc09afe1d73127e48d0d59b4c20b15 download/CSWphp5.postinstall +f98ec3d799fa183694eec035e9454b64 download/CSWphp5.postinstall 89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh de56d3571f4484284d106af158bffc38 download/CSWphp5_ext_enable.sh ab08e2ba62667bf13fa236099e433e84 download/configure.diff Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-05 21:18:33 UTC (rev 4698) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-05 21:41:17 UTC (rev 4699) @@ -44,9 +44,19 @@ * * Your existing config contains the following extensions * that now have become external packages: -* ${new_pkgs} +_EOT_ +cnt=1 +for name in `echo ${non_pkgs}`; do + if [ `expr ${cnt} % 4` -ne 0 ]; then + echo "${name} \c" + else + echo "${name}" + fi + cnt=`expr ${cnt} + 1` +done +cat << _EOT_ * to keep the same functionality as the original install -* install ${new_pkgs} using pkg-get +* install them using pkg-get * * If you have issues with missing extensions, Please check * the catalog for the missing extension before filing a bug report @@ -69,7 +79,17 @@ * * Your existing config contains the following extensions * that are not part of CSW build: -* ${non_pkgs} +_EOT_ +cnt=1 +for name in `echo ${non_pkgs}`; do + if [ `expr ${cnt} % 4` -ne 0 ]; then + echo "${name} \c" + else + echo "${name}" + fi + cnt=`expr ${cnt} + 1` +done +cat << _EOT_ * * Please verify they are still working after this upgrade. * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue May 5 23:54:51 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 21:54:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[4700] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4700 http://gar.svn.sourceforge.net/gar/?rev=4700&view=rev Author: valholla Date: 2009-05-05 21:54:51 +0000 (Tue, 05 May 2009) Log Message: ----------- tweak post-install Modified Paths: -------------- csw/mgar/pkg/php5/trunk/checksums csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-05-05 21:41:17 UTC (rev 4699) +++ csw/mgar/pkg/php5/trunk/checksums 2009-05-05 21:54:51 UTC (rev 4700) @@ -4,7 +4,7 @@ 5f0046fe1b3f8e2228fdb165bdbbe73a download/CSWmodphp5.postinstall 2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space -f98ec3d799fa183694eec035e9454b64 download/CSWphp5.postinstall +dc7c3434b97077f0915985ea6a6b6454 download/CSWphp5.postinstall 89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh de56d3571f4484284d106af158bffc38 download/CSWphp5_ext_enable.sh ab08e2ba62667bf13fa236099e433e84 download/configure.diff Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-05 21:41:17 UTC (rev 4699) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-05 21:54:51 UTC (rev 4700) @@ -44,9 +44,10 @@ * * Your existing config contains the following extensions * that now have become external packages: +* _EOT_ cnt=1 -for name in `echo ${non_pkgs}`; do +for name in `echo ${new_pkgs}`; do if [ `expr ${cnt} % 4` -ne 0 ]; then echo "${name} \c" else @@ -55,8 +56,9 @@ cnt=`expr ${cnt} + 1` done cat << _EOT_ +* * to keep the same functionality as the original install -* install them using pkg-get +* you will need to install them using pkg-get * * If you have issues with missing extensions, Please check * the catalog for the missing extension before filing a bug report This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 6 00:01:12 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 22:01:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[4701] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4701 http://gar.svn.sourceforge.net/gar/?rev=4701&view=rev Author: valholla Date: 2009-05-05 22:01:12 +0000 (Tue, 05 May 2009) Log Message: ----------- tweak post-install Modified Paths: -------------- csw/mgar/pkg/php5/trunk/checksums csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-05-05 21:54:51 UTC (rev 4700) +++ csw/mgar/pkg/php5/trunk/checksums 2009-05-05 22:01:12 UTC (rev 4701) @@ -4,7 +4,7 @@ 5f0046fe1b3f8e2228fdb165bdbbe73a download/CSWmodphp5.postinstall 2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space -dc7c3434b97077f0915985ea6a6b6454 download/CSWphp5.postinstall +bc2a45ba7d5f65b8e027f70d4fefce78 download/CSWphp5.postinstall 89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh de56d3571f4484284d106af158bffc38 download/CSWphp5_ext_enable.sh ab08e2ba62667bf13fa236099e433e84 download/configure.diff Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-05 21:54:51 UTC (rev 4700) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-05 22:01:12 UTC (rev 4701) @@ -55,6 +55,9 @@ fi cnt=`expr ${cnt} + 1` done +if [ `expr ${cnt} - 1` -ne 4 ]; then + echo +fi cat << _EOT_ * * to keep the same functionality as the original install @@ -91,6 +94,9 @@ fi cnt=`expr ${cnt} + 1` done +if [ `expr ${cnt} - 1` -ne 4 ]; then + echo +fi cat << _EOT_ * * Please verify they are still working after this upgrade. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 6 00:09:20 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 22:09:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[4702] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4702 http://gar.svn.sourceforge.net/gar/?rev=4702&view=rev Author: valholla Date: 2009-05-05 22:09:20 +0000 (Tue, 05 May 2009) Log Message: ----------- tweak post-install Modified Paths: -------------- csw/mgar/pkg/php5/trunk/checksums csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-05-05 22:01:12 UTC (rev 4701) +++ csw/mgar/pkg/php5/trunk/checksums 2009-05-05 22:09:20 UTC (rev 4702) @@ -4,7 +4,7 @@ 5f0046fe1b3f8e2228fdb165bdbbe73a download/CSWmodphp5.postinstall 2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space -bc2a45ba7d5f65b8e027f70d4fefce78 download/CSWphp5.postinstall +838488d589349bf4d0cf800e3e60d8a9 download/CSWphp5.postinstall 89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh de56d3571f4484284d106af158bffc38 download/CSWphp5_ext_enable.sh ab08e2ba62667bf13fa236099e433e84 download/configure.diff Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-05 22:01:12 UTC (rev 4701) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-05 22:09:20 UTC (rev 4702) @@ -48,14 +48,18 @@ _EOT_ cnt=1 for name in `echo ${new_pkgs}`; do + if [ ${cnt} -eq 1 ]; then + echo "* \c" + fi if [ `expr ${cnt} % 4` -ne 0 ]; then echo "${name} \c" + cnt=`expr ${cnt} + 1` else echo "${name}" + cnt=1 fi - cnt=`expr ${cnt} + 1` done -if [ `expr ${cnt} - 1` -ne 4 ]; then +if [ ${cnt} -ne 1 ]; then echo fi cat << _EOT_ @@ -87,14 +91,18 @@ _EOT_ cnt=1 for name in `echo ${non_pkgs}`; do + if [ ${cnt} -eq 1 ]; then + echo "* \c" + fi if [ `expr ${cnt} % 4` -ne 0 ]; then echo "${name} \c" + cnt=`expr ${cnt} + 1` else echo "${name}" + cnt=1 fi - cnt=`expr ${cnt} + 1` done -if [ `expr ${cnt} - 1` -ne 4 ]; then +if [ ${cnt} -ne 1 ]; then echo fi cat << _EOT_ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 6 00:16:38 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 05 May 2009 22:16:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[4703] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4703 http://gar.svn.sourceforge.net/gar/?rev=4703&view=rev Author: valholla Date: 2009-05-05 22:16:38 +0000 (Tue, 05 May 2009) Log Message: ----------- tweak post-install Modified Paths: -------------- csw/mgar/pkg/php5/trunk/checksums csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-05-05 22:09:20 UTC (rev 4702) +++ csw/mgar/pkg/php5/trunk/checksums 2009-05-05 22:16:38 UTC (rev 4703) @@ -4,7 +4,7 @@ 5f0046fe1b3f8e2228fdb165bdbbe73a download/CSWmodphp5.postinstall 2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space -838488d589349bf4d0cf800e3e60d8a9 download/CSWphp5.postinstall +41ce1e71884ec05db2ac678c48721a82 download/CSWphp5.postinstall 89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh de56d3571f4484284d106af158bffc38 download/CSWphp5_ext_enable.sh ab08e2ba62667bf13fa236099e433e84 download/configure.diff Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-05 22:09:20 UTC (rev 4702) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-05 22:16:38 UTC (rev 4703) @@ -88,6 +88,7 @@ * * Your existing config contains the following extensions * that are not part of CSW build: +* _EOT_ cnt=1 for name in `echo ${non_pkgs}`; do This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 6 02:35:06 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 06 May 2009 00:35:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[4704] csw/mgar/pkg/fixme/trunk Message-ID: Revision: 4704 http://gar.svn.sourceforge.net/gar/?rev=4704&view=rev Author: valholla Date: 2009-05-06 00:35:05 +0000 (Wed, 06 May 2009) Log Message: ----------- rename to fixlibtool Added Paths: ----------- csw/mgar/pkg/fixme/trunk/fixlibtool Removed Paths: ------------- csw/mgar/pkg/fixme/trunk/fixlibtool.sh csw/mgar/pkg/fixme/trunk/fixme.sh Added: csw/mgar/pkg/fixme/trunk/fixlibtool =================================================================== --- csw/mgar/pkg/fixme/trunk/fixlibtool (rev 0) +++ csw/mgar/pkg/fixme/trunk/fixlibtool 2009-05-06 00:35:05 UTC (rev 4704) @@ -0,0 +1,51 @@ +#!/bin/bash +#################################################### +# +# fixlibtool +# Intended to remove the use of libtool's +# pseudo-libraries for opencsw builds. +# +# Author: Mike Watters mwatters_at_opencsw.org +# Initial Version: 0.1 +# +#################################################### + +umask 0022 +PATH=/opt/csw/bin + +if [ $# -ne 1 ]; then + gecho "USAGE: $(basename $0) WORKSRC" + exit 1 +fi +BASEPATH=$1 + +## Fix Makefiles +for mk in $(gfind ${BASEPATH} -name Makefile -print); do + LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ + gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") + + for file in ${LT_FILES}; do + LIB_NAME=$(ggrep 'dlname=' ${file} | \ + gsed -e "s/.*'\(.*\)'/\1/" \ + -e "s/^lib//" \ + -e "s/\.so.*$//") + fixpath=$(gecho $file |gsed 's/\//\\\//g') + gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new + gmv Makefile.new ${mk} + gchmod +x ${mk} + done +done + +## Fix libtool Script +for lt in $(gfind ${BASEPATH} -name libtool -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new + gmv ${lt}.new ${lt} + gchmod +x ${lt} +done + +for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new + gmv ${LTMAIN}.new ${LTMAIN} + gchmod +x ${LTMAIN} +done + Property changes on: csw/mgar/pkg/fixme/trunk/fixlibtool ___________________________________________________________________ Added: svn:executable + * Deleted: csw/mgar/pkg/fixme/trunk/fixlibtool.sh =================================================================== --- csw/mgar/pkg/fixme/trunk/fixlibtool.sh 2009-05-05 22:16:38 UTC (rev 4703) +++ csw/mgar/pkg/fixme/trunk/fixlibtool.sh 2009-05-06 00:35:05 UTC (rev 4704) @@ -1,51 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} - gchmod +x ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} - gchmod +x ${lt} -done - -for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} - gchmod +x ${LTMAIN} -done - Deleted: csw/mgar/pkg/fixme/trunk/fixme.sh =================================================================== --- csw/mgar/pkg/fixme/trunk/fixme.sh 2009-05-05 22:16:38 UTC (rev 4703) +++ csw/mgar/pkg/fixme/trunk/fixme.sh 2009-05-06 00:35:05 UTC (rev 4704) @@ -1,51 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} - gchmod +x ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} - gchmod +x ${lt} -done - -for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} - gchmod +x ${LTMAIN} -done - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 6 02:37:02 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 06 May 2009 00:37:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[4705] csw/mgar/pkg/fixme/ Message-ID: Revision: 4705 http://gar.svn.sourceforge.net/gar/?rev=4705&view=rev Author: valholla Date: 2009-05-06 00:37:02 +0000 (Wed, 06 May 2009) Log Message: ----------- rename to fixlibtool Removed Paths: ------------- csw/mgar/pkg/fixme/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 6 03:16:25 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 06 May 2009 01:16:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4706] csw/mgar/pkg Message-ID: Revision: 4706 http://gar.svn.sourceforge.net/gar/?rev=4706&view=rev Author: valholla Date: 2009-05-06 01:16:25 +0000 (Wed, 06 May 2009) Log Message: ----------- rename Added Paths: ----------- csw/mgar/pkg/fixlibtool/ csw/mgar/pkg/fixlibtool/trunk/fixlibtool Removed Paths: ------------- csw/mgar/pkg/fixlibtool/trunk/fixlibtool.sh csw/mgar/pkg/fixlibtool/trunk/fixme.sh Copied: csw/mgar/pkg/fixlibtool/trunk/fixlibtool (from rev 4704, csw/mgar/pkg/fixme/trunk/fixlibtool) =================================================================== --- csw/mgar/pkg/fixlibtool/trunk/fixlibtool (rev 0) +++ csw/mgar/pkg/fixlibtool/trunk/fixlibtool 2009-05-06 01:16:25 UTC (rev 4706) @@ -0,0 +1,51 @@ +#!/bin/bash +#################################################### +# +# fixlibtool +# Intended to remove the use of libtool's +# pseudo-libraries for opencsw builds. +# +# Author: Mike Watters mwatters_at_opencsw.org +# Initial Version: 0.1 +# +#################################################### + +umask 0022 +PATH=/opt/csw/bin + +if [ $# -ne 1 ]; then + gecho "USAGE: $(basename $0) WORKSRC" + exit 1 +fi +BASEPATH=$1 + +## Fix Makefiles +for mk in $(gfind ${BASEPATH} -name Makefile -print); do + LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ + gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") + + for file in ${LT_FILES}; do + LIB_NAME=$(ggrep 'dlname=' ${file} | \ + gsed -e "s/.*'\(.*\)'/\1/" \ + -e "s/^lib//" \ + -e "s/\.so.*$//") + fixpath=$(gecho $file |gsed 's/\//\\\//g') + gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new + gmv Makefile.new ${mk} + gchmod +x ${mk} + done +done + +## Fix libtool Script +for lt in $(gfind ${BASEPATH} -name libtool -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new + gmv ${lt}.new ${lt} + gchmod +x ${lt} +done + +for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new + gmv ${LTMAIN}.new ${LTMAIN} + gchmod +x ${LTMAIN} +done + Deleted: csw/mgar/pkg/fixlibtool/trunk/fixlibtool.sh =================================================================== --- csw/mgar/pkg/fixme/trunk/fixlibtool.sh 2009-05-03 22:08:17 UTC (rev 4664) +++ csw/mgar/pkg/fixlibtool/trunk/fixlibtool.sh 2009-05-06 01:16:25 UTC (rev 4706) @@ -1,51 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} - gchmod +x ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} - gchmod +x ${lt} -done - -for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} - gchmod +x ${LTMAIN} -done - Deleted: csw/mgar/pkg/fixlibtool/trunk/fixme.sh =================================================================== --- csw/mgar/pkg/fixme/trunk/fixme.sh 2009-05-03 22:08:17 UTC (rev 4664) +++ csw/mgar/pkg/fixlibtool/trunk/fixme.sh 2009-05-06 01:16:25 UTC (rev 4706) @@ -1,51 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} - gchmod +x ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} - gchmod +x ${lt} -done - -for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} - gchmod +x ${LTMAIN} -done - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 6 03:23:45 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 06 May 2009 01:23:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[4707] csw/mgar/pkg/fixlibtool/trunk/fixlibtool Message-ID: Revision: 4707 http://gar.svn.sourceforge.net/gar/?rev=4707&view=rev Author: valholla Date: 2009-05-06 01:23:45 +0000 (Wed, 06 May 2009) Log Message: ----------- svn keywords Modified Paths: -------------- csw/mgar/pkg/fixlibtool/trunk/fixlibtool Property Changed: ---------------- csw/mgar/pkg/fixlibtool/trunk/fixlibtool Modified: csw/mgar/pkg/fixlibtool/trunk/fixlibtool =================================================================== --- csw/mgar/pkg/fixlibtool/trunk/fixlibtool 2009-05-06 01:16:25 UTC (rev 4706) +++ csw/mgar/pkg/fixlibtool/trunk/fixlibtool 2009-05-06 01:23:45 UTC (rev 4707) @@ -1,13 +1,24 @@ #!/bin/bash #################################################### # -# fixlibtool +# $URL$ +# $Author$ +# $Date$ +# $Revision$ +# $LastChangedRevision$ +# # Intended to remove the use of libtool's # pseudo-libraries for opencsw builds. # -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 +# Usage: fixlibtool $(WORKSRC) # +# Intened usage: +# DISTFILES += fixlibtool +# post-configure-modulated: +# @(echo "~~~ Fixing Libtool ~~~") +# @$(DOWNLOADDIR)/fixlibtool $(WORKSRC) +# @$(MAKECOOKIE) +# #################################################### umask 0022 @@ -49,3 +60,4 @@ gchmod +x ${LTMAIN} done +exit 0 Property changes on: csw/mgar/pkg/fixlibtool/trunk/fixlibtool ___________________________________________________________________ Added: svn:keywords + URL Author Date Revision LastChangedRevision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 6 03:26:59 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 06 May 2009 01:26:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[4708] csw/mgar/pkg/fixlibtool/trunk/fixlibtool Message-ID: Revision: 4708 http://gar.svn.sourceforge.net/gar/?rev=4708&view=rev Author: valholla Date: 2009-05-06 01:26:59 +0000 (Wed, 06 May 2009) Log Message: ----------- svn keywords Modified Paths: -------------- csw/mgar/pkg/fixlibtool/trunk/fixlibtool Modified: csw/mgar/pkg/fixlibtool/trunk/fixlibtool =================================================================== --- csw/mgar/pkg/fixlibtool/trunk/fixlibtool 2009-05-06 01:23:45 UTC (rev 4707) +++ csw/mgar/pkg/fixlibtool/trunk/fixlibtool 2009-05-06 01:26:59 UTC (rev 4708) @@ -7,6 +7,7 @@ # $Revision$ # $LastChangedRevision$ # +# Author: Mike Watters mwatters_at_opencsw_dot_org # Intended to remove the use of libtool's # pseudo-libraries for opencsw builds. # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 6 10:37:44 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 May 2009 08:37:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[4709] csw/mgar/pkg/pixman/trunk Message-ID: Revision: 4709 http://gar.svn.sourceforge.net/gar/?rev=4709&view=rev Author: dmichelsen Date: 2009-05-06 08:37:44 +0000 (Wed, 06 May 2009) Log Message: ----------- pixman: Update to dynamic gspec and 64 bit Modified Paths: -------------- csw/mgar/pkg/pixman/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/pixman/trunk/files/CSWpixman.gspec csw/mgar/pkg/pixman/trunk/files/CSWpixmandevel.gspec csw/mgar/pkg/pixman/trunk/files/license.txt Modified: csw/mgar/pkg/pixman/trunk/Makefile =================================================================== --- csw/mgar/pkg/pixman/trunk/Makefile 2009-05-06 01:26:59 UTC (rev 4708) +++ csw/mgar/pkg/pixman/trunk/Makefile 2009-05-06 08:37:44 UTC (rev 4709) @@ -2,33 +2,24 @@ GARVERSION = 0.15.2 CATEGORIES = lib -DESCRIPTION = The pixel-manipulation library for X and cairo +DESCRIPTION = The pixel-manipulation library for X and cairo define BLURB endef -MASTER_SITES = http://www.cairographics.org/releases/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -# PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = http://www.cairographics.org/releases/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_DESC_CSWpixman = $(DESCRIPTION) +# Same as from gar/x11/categories/x11/category.mk +EXTRA_CFLAGS = -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION +EXTRA_CXXFLAGS = -xlibmil -xlibmopt -features=tmplife -norunpath -DISTFILES += $(call admfiles,CSWpixman, ) -DISTFILES += license.txt - -#REQUIRED_PKGS_CSWpixman = CSWlibx11 - BUILD64 = 1 +NOISALIST = 1 -CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION -CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-gtk +CONFIGURE_ARGS += --disable-gtk -LICENSE = license.txt - include gar/category.mk Deleted: csw/mgar/pkg/pixman/trunk/files/CSWpixman.gspec =================================================================== --- csw/mgar/pkg/pixman/trunk/files/CSWpixman.gspec 2009-05-06 01:26:59 UTC (rev 4708) +++ csw/mgar/pkg/pixman/trunk/files/CSWpixman.gspec 2009-05-06 08:37:44 UTC (rev 4709) @@ -1,6 +0,0 @@ -%var bitname pixman -%var pkgname CSWpixman -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/%{GARNAME} for license information Deleted: csw/mgar/pkg/pixman/trunk/files/CSWpixmandevel.gspec =================================================================== --- csw/mgar/pkg/pixman/trunk/files/CSWpixmandevel.gspec 2009-05-06 01:26:59 UTC (rev 4708) +++ csw/mgar/pkg/pixman/trunk/files/CSWpixmandevel.gspec 2009-05-06 08:37:44 UTC (rev 4709) @@ -1,6 +0,0 @@ -%var bitname pixman_devel -%var pkgname CSWpixmandevel -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/%{GARNAME} for license information Deleted: csw/mgar/pkg/pixman/trunk/files/license.txt =================================================================== --- csw/mgar/pkg/pixman/trunk/files/license.txt 2009-05-06 01:26:59 UTC (rev 4708) +++ csw/mgar/pkg/pixman/trunk/files/license.txt 2009-05-06 08:37:44 UTC (rev 4709) @@ -1,18 +0,0 @@ -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation, and that the name of Red Hat not be used in advertising or -publicity pertaining to distribution of the software without specific, -written prior permission. Red Hat makes no representations about the -suitability of this software for any purpose. It is provided "as is" -without express or implied warranty. - -THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY -SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Wed May 6 10:43:47 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Wed, 06 May 2009 08:43:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[4710] csw/mgar/pkg/nginx/trunk/files/CSWnginx.checkinstall Message-ID: Revision: 4710 http://gar.svn.sourceforge.net/gar/?rev=4710&view=rev Author: aigoshin Date: 2009-05-06 08:43:47 +0000 (Wed, 06 May 2009) Log Message: ----------- nginx: milestone 3.0 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/files/CSWnginx.checkinstall Modified: csw/mgar/pkg/nginx/trunk/files/CSWnginx.checkinstall =================================================================== --- csw/mgar/pkg/nginx/trunk/files/CSWnginx.checkinstall 2009-05-06 08:37:44 UTC (rev 4709) +++ csw/mgar/pkg/nginx/trunk/files/CSWnginx.checkinstall 2009-05-06 08:43:47 UTC (rev 4710) @@ -14,7 +14,7 @@ echo "nginx service is in '$STATE' state" if [ "$STATE" = "online" ]; then if [ -x "$BASEDIR/opt/csw/lib/svc/method/svc-cswnginx" ]; then - NXSTATE=`$BASEDIR/opt/csw/lib/svc/method/svc-cswnginx state` + NXSTATE=`$BASEDIR/opt/csw/lib/svc/method/svc-cswnginx status` echo "nginx is $NXSTATE" if [ "$NXSTATE" = "running" ]; then echo "nginx online upgrade is requested" @@ -25,7 +25,7 @@ fi else if [ -x $BASEDIR/etc/init.d/cswnginx ]; then - NXSTATE=`$BASEDIR/etc/init.d/cswnginx state` + NXSTATE=`$BASEDIR/etc/init.d/cswnginx status` echo "nginx is $NXSTATE" if [ "$NXSTATE" = "running" ]; then echo "nginx online upgrade is requested" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Wed May 6 10:53:11 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Wed, 06 May 2009 08:53:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[4711] csw/mgar/pkg/nginx/trunk/checksums Message-ID: Revision: 4711 http://gar.svn.sourceforge.net/gar/?rev=4711&view=rev Author: aigoshin Date: 2009-05-06 08:53:10 +0000 (Wed, 06 May 2009) Log Message: ----------- nginx: milestone 3.0 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2009-05-06 08:43:47 UTC (rev 4710) +++ csw/mgar/pkg/nginx/trunk/checksums 2009-05-06 08:53:10 UTC (rev 4711) @@ -1,7 +1,7 @@ -521cd4c0248aebfdb25df48a11a8cc49 download/CSWnginx.checkinstall +bb85ec05a172562e6de38a1e8a64198c download/CSWnginx.checkinstall 12b5333e18e985b17f8a5465646e9a8a download/CSWnginx.gspec bb404771e330fe98f93cb2d12a808121 download/CSWnginx.postinstall e9178dc33f2d38aab8f118a8f0550ac7 download/CSWnginx.preremove 5c832758a62ee319ea9dfd1829d736eb download/cswnginx.xml -e8e7f1593198ed066939cf2e548d7d2f download/nginx-0.7.54.tar.gz +15cce6102a2efcf4d4acde9bb71ea6d3 download/nginx-0.6.36.tar.gz 02b720d1ff091b7d2ab005b4db223345 download/svc-cswnginx This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 6 11:01:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 May 2009 09:01:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[4712] csw/mgar/pkg/pango/trunk Message-ID: Revision: 4712 http://gar.svn.sourceforge.net/gar/?rev=4712&view=rev Author: dmichelsen Date: 2009-05-06 09:01:23 +0000 (Wed, 06 May 2009) Log Message: ----------- pango: Update to 1.24.2 Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile csw/mgar/pkg/pango/trunk/checksums Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2009-05-06 08:53:10 UTC (rev 4711) +++ csw/mgar/pkg/pango/trunk/Makefile 2009-05-06 09:01:23 UTC (rev 4712) @@ -1,5 +1,5 @@ GARNAME = libpango -GARVERSION = 1.24.1 +GARVERSION = 1.24.2 CATEGORIES = lib DESCRIPTION = A framework for the layout and rendering of international text @@ -26,6 +26,10 @@ UPSTREAM_MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/pango/ UFILES_REGEX = (\d+(?:\.\d+)*) +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + BUILD64 = 1 NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -34,7 +38,7 @@ PREREQUISITE_PKGS = CSWgtk-doc CSWlibxslt REQUIRED_PKGS_CSWpango = CSWggettextrt CSWglib2 CSWfconfig CSWftype2 -REQUIRED_PKGS_CSWpango += CSWlibcairo CSWlibxft2 CSWlibxrender CSWzlib +REQUIRED_PKGS_CSWpango += CSWlibcairo CSWlibxft2 CSWlibxrender CSWzlib CSWlibx11 REQUIRED_PKGS_CSWpangodevel = CSWpango # Dynamic prototype Modified: csw/mgar/pkg/pango/trunk/checksums =================================================================== --- csw/mgar/pkg/pango/trunk/checksums 2009-05-06 08:53:10 UTC (rev 4711) +++ csw/mgar/pkg/pango/trunk/checksums 2009-05-06 09:01:23 UTC (rev 4712) @@ -1,2 +1,2 @@ 34f5b20f6caf282b2533784fbb1b4395 download/fixme.sh -af0beac1dd1825e241c5728081f16acd download/pango-1.24.1.tar.bz2 +7bc6c884d847cabc613e4c6d663771f5 download/pango-1.24.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 6 15:14:23 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 May 2009 13:14:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[4713] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 4713 http://gar.svn.sourceforge.net/gar/?rev=4713&view=rev Author: dmichelsen Date: 2009-05-06 13:14:23 +0000 (Wed, 06 May 2009) Log Message: ----------- mGAR v2: Allow overriding for test targets just like for configure and build Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-05-06 09:01:23 UTC (rev 4712) +++ csw/mgar/gar/v2/gar.lib.mk 2009-05-06 13:14:23 UTC (rev 4713) @@ -547,17 +547,17 @@ # Run tests on pre-built sources test-%/Makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/GNUmakefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) # Ruby makefiles This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 6 18:04:27 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 06 May 2009 16:04:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[4714] csw/mgar/pkg/fixlibtool/trunk/fixlibtool Message-ID: Revision: 4714 http://gar.svn.sourceforge.net/gar/?rev=4714&view=rev Author: valholla Date: 2009-05-06 16:04:27 +0000 (Wed, 06 May 2009) Log Message: ----------- backup files before changing them Modified Paths: -------------- csw/mgar/pkg/fixlibtool/trunk/fixlibtool Modified: csw/mgar/pkg/fixlibtool/trunk/fixlibtool =================================================================== --- csw/mgar/pkg/fixlibtool/trunk/fixlibtool 2009-05-06 13:14:23 UTC (rev 4713) +++ csw/mgar/pkg/fixlibtool/trunk/fixlibtool 2009-05-06 16:04:27 UTC (rev 4714) @@ -2,12 +2,11 @@ #################################################### # # $URL$ -# $Author$ # $Date$ # $Revision$ # $LastChangedRevision$ # -# Author: Mike Watters mwatters_at_opencsw_dot_org +# Author: Mike Watters (mwatters~~@~~opencsw.org) # Intended to remove the use of libtool's # pseudo-libraries for opencsw builds. # @@ -33,6 +32,7 @@ ## 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/") @@ -42,20 +42,22 @@ -e "s/^lib//" \ -e "s/\.so.*$//") fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} + gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >${mk}.new + gmv ${mk}.new ${mk} gchmod +x ${mk} done done ## Fix libtool Script for lt in $(gfind ${BASEPATH} -name libtool -print); do + gcp ${lt} ${lt}.orig gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new gmv ${lt}.new ${lt} gchmod +x ${lt} done for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do + gcp ${LTMAIN} ${LTMAIN}.orig gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new gmv ${LTMAIN}.new ${LTMAIN} gchmod +x ${LTMAIN} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 6 18:10:16 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 06 May 2009 16:10:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[4715] csw/mgar/gar/v2/bin/orig_fixlibtool Message-ID: Revision: 4715 http://gar.svn.sourceforge.net/gar/?rev=4715&view=rev Author: valholla Date: 2009-05-06 16:10:16 +0000 (Wed, 06 May 2009) Log Message: ----------- prep for new fixlibtool Added Paths: ----------- csw/mgar/gar/v2/bin/orig_fixlibtool Added: csw/mgar/gar/v2/bin/orig_fixlibtool =================================================================== --- csw/mgar/gar/v2/bin/orig_fixlibtool (rev 0) +++ csw/mgar/gar/v2/bin/orig_fixlibtool 2009-05-06 16:10:16 UTC (rev 4715) @@ -0,0 +1,23 @@ +#!/bin/ksh +# +# $Id$ +# +# Copyright 2006 Cory Omand +# All rights reserved. Use is subject to license terms. +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +# +# fixlibtool - remove build-only settings from libtool .la files +# + +# Remove references to temporary directories +perl -i -plne ' + if (/^dependency_libs/) { + s# -[ILR]\s*/tmp\S+##g; + s# -[ILR]\s*/\S+/ # #g; + } + ' $@ + Property changes on: csw/mgar/gar/v2/bin/orig_fixlibtool ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 6 18:10:48 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 06 May 2009 16:10:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[4716] csw/mgar/gar/v2/bin/fixlibtool Message-ID: Revision: 4716 http://gar.svn.sourceforge.net/gar/?rev=4716&view=rev Author: valholla Date: 2009-05-06 16:10:45 +0000 (Wed, 06 May 2009) Log Message: ----------- fixlibtool del Removed Paths: ------------- csw/mgar/gar/v2/bin/fixlibtool Deleted: csw/mgar/gar/v2/bin/fixlibtool =================================================================== --- csw/mgar/gar/v2/bin/fixlibtool 2009-05-06 16:10:16 UTC (rev 4715) +++ csw/mgar/gar/v2/bin/fixlibtool 2009-05-06 16:10:45 UTC (rev 4716) @@ -1,22 +0,0 @@ -#!/bin/ksh -# -# $Id$ -# -# Copyright 2006 Cory Omand -# All rights reserved. Use is subject to license terms. -# -# Redistribution and/or use, with or without modification, is -# permitted. This software is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# -# fixlibtool - remove build-only settings from libtool .la files -# - -# Remove references to temporary directories -perl -i -plne ' - if (/^dependency_libs/) { - s# -[ILR]\s*/tmp\S+##g; - s# -[ILR]\s*/\S+/ # #g; - } - ' $@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 6 18:11:39 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 06 May 2009 16:11:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[4717] csw/mgar/gar/v2/bin/fixlibtool Message-ID: Revision: 4717 http://gar.svn.sourceforge.net/gar/?rev=4717&view=rev Author: valholla Date: 2009-05-06 16:11:36 +0000 (Wed, 06 May 2009) Log Message: ----------- new fixlibtool Added Paths: ----------- csw/mgar/gar/v2/bin/fixlibtool Copied: csw/mgar/gar/v2/bin/fixlibtool (from rev 4714, csw/mgar/pkg/fixlibtool/trunk/fixlibtool) =================================================================== --- csw/mgar/gar/v2/bin/fixlibtool (rev 0) +++ csw/mgar/gar/v2/bin/fixlibtool 2009-05-06 16:11:36 UTC (rev 4717) @@ -0,0 +1,66 @@ +#!/bin/bash +#################################################### +# +# $URL$ +# $Date$ +# $Revision$ +# $LastChangedRevision$ +# +# Author: Mike Watters (mwatters~~@~~opencsw.org) +# Intended to remove the use of libtool's +# pseudo-libraries for opencsw builds. +# +# Usage: fixlibtool $(WORKSRC) +# +# Intened usage: +# DISTFILES += fixlibtool +# post-configure-modulated: +# @(echo "~~~ Fixing Libtool ~~~") +# @$(DOWNLOADDIR)/fixlibtool $(WORKSRC) +# @$(MAKECOOKIE) +# +#################################################### + +umask 0022 +PATH=/opt/csw/bin + +if [ $# -ne 1 ]; then + gecho "USAGE: $(basename $0) WORKSRC" + exit 1 +fi +BASEPATH=$1 + +## 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/") + + for file in ${LT_FILES}; do + LIB_NAME=$(ggrep 'dlname=' ${file} | \ + gsed -e "s/.*'\(.*\)'/\1/" \ + -e "s/^lib//" \ + -e "s/\.so.*$//") + fixpath=$(gecho $file |gsed 's/\//\\\//g') + gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >${mk}.new + gmv ${mk}.new ${mk} + gchmod +x ${mk} + done +done + +## Fix libtool Script +for lt in $(gfind ${BASEPATH} -name libtool -print); do + gcp ${lt} ${lt}.orig + gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new + gmv ${lt}.new ${lt} + gchmod +x ${lt} +done + +for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do + gcp ${LTMAIN} ${LTMAIN}.orig + gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new + gmv ${LTMAIN}.new ${LTMAIN} + gchmod +x ${LTMAIN} +done + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 6 18:12:52 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 06 May 2009 16:12:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[4718] csw/mgar/pkg/fixlibtool/trunk/fixlibtool Message-ID: Revision: 4718 http://gar.svn.sourceforge.net/gar/?rev=4718&view=rev Author: valholla Date: 2009-05-06 16:12:51 +0000 (Wed, 06 May 2009) Log Message: ----------- new fixlibtool Removed Paths: ------------- csw/mgar/pkg/fixlibtool/trunk/fixlibtool Deleted: csw/mgar/pkg/fixlibtool/trunk/fixlibtool =================================================================== --- csw/mgar/pkg/fixlibtool/trunk/fixlibtool 2009-05-06 16:11:36 UTC (rev 4717) +++ csw/mgar/pkg/fixlibtool/trunk/fixlibtool 2009-05-06 16:12:51 UTC (rev 4718) @@ -1,66 +0,0 @@ -#!/bin/bash -#################################################### -# -# $URL$ -# $Date$ -# $Revision$ -# $LastChangedRevision$ -# -# Author: Mike Watters (mwatters~~@~~opencsw.org) -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Usage: fixlibtool $(WORKSRC) -# -# Intened usage: -# DISTFILES += fixlibtool -# post-configure-modulated: -# @(echo "~~~ Fixing Libtool ~~~") -# @$(DOWNLOADDIR)/fixlibtool $(WORKSRC) -# @$(MAKECOOKIE) -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## 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/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >${mk}.new - gmv ${mk}.new ${mk} - gchmod +x ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gcp ${lt} ${lt}.orig - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} - gchmod +x ${lt} -done - -for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do - gcp ${LTMAIN} ${LTMAIN}.orig - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} - gchmod +x ${LTMAIN} -done - -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 6 18:15:09 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 06 May 2009 16:15:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[4719] csw/mgar/pkg/fixlibtool/ Message-ID: Revision: 4719 http://gar.svn.sourceforge.net/gar/?rev=4719&view=rev Author: valholla Date: 2009-05-06 16:15:09 +0000 (Wed, 06 May 2009) Log Message: ----------- move to gar Removed Paths: ------------- csw/mgar/pkg/fixlibtool/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 6 18:16:57 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 06 May 2009 16:16:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[4720] csw/mgar/gar/v2 Message-ID: Revision: 4720 http://gar.svn.sourceforge.net/gar/?rev=4720&view=rev Author: valholla Date: 2009-05-06 16:16:56 +0000 (Wed, 06 May 2009) Log Message: ----------- New Variable STRIP_LIBTOOL Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-05-06 16:15:09 UTC (rev 4719) +++ csw/mgar/gar/v2/gar.conf.mk 2009-05-06 16:16:56 UTC (rev 4720) @@ -39,6 +39,9 @@ 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 Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-05-06 16:15:09 UTC (rev 4719) +++ csw/mgar/gar/v2/gar.mk 2009-05-06 16:16:56 UTC (rev 4720) @@ -381,6 +381,7 @@ #CONFIGURE_BUILDDEPS = $(addprefix $(GARDIR)/,$(addsuffix /$(COOKIEROOTDIR)/build.d/install,$(BUILDDEPS))) endif +ifneq ($(STRIP_LIBTOOL),1) configure: pre-configure $(addprefix configure-,$(MODULATIONS)) post-configure @$(DONADA) @@ -388,7 +389,21 @@ $(addprefix srcdep-$(GARDIR)/,$(SOURCEDEPS)) \ pre-configure-modulated pre-configure-$(MODULATION) $(CONFIGURE_TARGETS) post-configure-$(MODULATION) post-configure-modulated @$(DONADA) +else +configure: pre-configure $(addprefix configure-,$(MODULATIONS)) post-configure strip-libtool + @$(DONADA) +configure-modulated: verify-isa patch-modulated $(CONFIGURE_IMGDEPS) $(CONFIGURE_BUILDDEPS) $(CONFIGURE_DEPS) \ + $(addprefix srcdep-$(GARDIR)/,$(SOURCEDEPS)) \ + pre-configure-modulated pre-configure-$(MODULATION) $(CONFIGURE_TARGETS) post-configure-$(MODULATION) post-configure-modulated strip-libtool + @$(DONADA) +endif + +strip-libtool: + @echo '[===== Stripping Libtool =====]' + fixlibtool $(WORKSRC) + @$(DONADA) + .PHONY: reset-configure reset-configure-modulated reconfigure: reset-configure configure This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 7 03:28:45 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 07 May 2009 01:28:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[4721] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4721 http://gar.svn.sourceforge.net/gar/?rev=4721&view=rev Author: valholla Date: 2009-05-07 01:28:45 +0000 (Thu, 07 May 2009) Log Message: ----------- add STRIP_LIBTOOL variable and cgi sapi module Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_apache2/Makefile Removed Paths: ------------- csw/mgar/pkg/php5/trunk/files/fixme.sh Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-05-06 16:16:56 UTC (rev 4720) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-05-07 01:28:45 UTC (rev 4721) @@ -65,8 +65,9 @@ EXTRA_CFLAGS = -I$(prefix)/include/ncursesw NOISALIST = 1 -DISTFILES += fixme.sh +STRIP_LIBTOOL = 1 + CONFIGURE_ARGS += --prefix=$(prefix)/php5 CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin @@ -92,6 +93,7 @@ # Copy over template config files and utility scripts PI_SCRIPTS = install-extras +PI_SCRIPTS += install-ap2modphp5 PI_SCRIPTS += install-modphp5 post-install-modulated: $(PI_SCRIPTS) @@ -110,23 +112,32 @@ @(gfind $(PHP5ROOT)/lib -name "*.a" -exec grm {} \;) @$(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 ) + @( gfind $(DESTDIR)$(prefix)/apache* \ + -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr ) + @$(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 $(NEW_CONFIGURE_ARGS) ) - @( $(DOWNLOADDIR)/fixme.sh $(WORKSRC) ) + @( 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 ) @( gfind $(DESTDIR)$(prefix)/apache* \ -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr ) @$(MAKECOOKIE) -post-configure-modulated: - @(echo "~~~ Fixing Libtool ~~~") - @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) - $(DONADA) - EXTFILES = $(shell find extensions/*/files/* -prune -type f) pre-fetch: $(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR))) Modified: csw/mgar/pkg/php5/trunk/extensions/php5_apache2/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_apache2/Makefile 2009-05-06 16:16:56 UTC (rev 4720) +++ csw/mgar/pkg/php5/trunk/extensions/php5_apache2/Makefile 2009-05-07 01:28:45 UTC (rev 4721) @@ -12,7 +12,6 @@ STRIP_DIRS += $(DESTDIR)$(prefix)/apache2/libexec -CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs - PKGFILES_CSWap2modphp5 = .*/csw/apache2/.* +## This is configured in a post-install from the main Makefile Deleted: csw/mgar/pkg/php5/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/php5/trunk/files/fixme.sh 2009-05-06 16:16:56 UTC (rev 4720) +++ csw/mgar/pkg/php5/trunk/files/fixme.sh 2009-05-07 01:28:45 UTC (rev 4721) @@ -1,49 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} -done - -LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print) -if [ -f ${LTMAIN} ]; then - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} -fi - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 7 03:49:26 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 07 May 2009 01:49:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[4722] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 4722 http://gar.svn.sourceforge.net/gar/?rev=4722&view=rev Author: valholla Date: 2009-05-07 01:49:26 +0000 (Thu, 07 May 2009) Log Message: ----------- remove pear.conf from install Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-05-07 01:28:45 UTC (rev 4721) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-05-07 01:49:26 UTC (rev 4722) @@ -110,6 +110,7 @@ $(DESTDIR)$(prefix)/apache2/etc/extra @(grm -fr $(DESTDIR)/.[a-z]*) @(gfind $(PHP5ROOT)/lib -name "*.a" -exec grm {} \;) + @(grm -f $(DESTDIR)$(prefix)/php5/etc/pear.conf) @$(MAKECOOKIE) install-ap2modphp5: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu May 7 14:17:03 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 May 2009 12:17:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[4723] csw/mgar/pkg/cpan/Compress-Zlib/trunk Message-ID: Revision: 4723 http://gar.svn.sourceforge.net/gar/?rev=4723&view=rev Author: bonivart Date: 2009-05-07 12:17:02 +0000 (Thu, 07 May 2009) Log Message: ----------- Compress-Zlib: update to 2.015 Modified Paths: -------------- csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile csw/mgar/pkg/cpan/Compress-Zlib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/CSWpmcompresszlib.depend csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/CSWpmcompresszlib.gspec csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/CSWpmcompresszlib.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Compress-Zlib/trunk/ Property changes on: csw/mgar/pkg/cpan/Compress-Zlib/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile 2009-05-07 01:49:26 UTC (rev 4722) +++ csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile 2009-05-07 12:17:02 UTC (rev 4723) @@ -1,5 +1,5 @@ GARNAME = Compress-Zlib -GARVERSION = 2.004 +GARVERSION = 2.015 CATEGORIES = cpan AUTHOR = PMQS @@ -10,10 +10,24 @@ functionality provided by zlib is available in Compress::Zlib. endef -DISTFILES = $(call admfiles,CSWpmcompresszlib,depend prototype) +#DISTFILES += $(call admfiles,CSWpmlibwww,) +DISTFILES += COPYING +#DISTFILES = $(call admfiles,CSWpmcompresszlib,depend prototype) +CATALOGNAME = pm_compresszlib +PACKAGES = CSWpmcompresszlib +ARCHALL = 1 + +REQUIRED_PKGS = CSWpmiocompresszlib CSWpmcompressrawzlib CSWpmiocompressbase + +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + DEPENDS += cpan/Compress-Raw-Zlib DEPENDS += cpan/IO-Compress-Base DEPENDS += cpan/IO-Compress-Zlib +CONFIGURE_ARGS = + +SKIPTEST = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Compress-Zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Compress-Zlib/trunk/checksums 2009-05-07 01:49:26 UTC (rev 4722) +++ csw/mgar/pkg/cpan/Compress-Zlib/trunk/checksums 2009-05-07 12:17:02 UTC (rev 4723) @@ -1,4 +1,2 @@ -dc01163b6927dda4b16353b4fe04c0c3 download/CSWpmcompresszlib.gspec -73374517031c86a44d56d865f473eb2d download/CSWpmcompresszlib.depend -b71434787441686b486f848cb55d5c69 download/CSWpmcompresszlib.prototype -ea7837294a3a434c1266c7e9862c4360 download/Compress-Zlib-2.004.tar.gz +1334cbfa08be3947a3a149521242587c download/COPYING +689ba2cc399b019d0bf76a0575c32947 download/Compress-Zlib-2.015.tar.gz Added: csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/COPYING 2009-05-07 12:17:02 UTC (rev 4723) @@ -0,0 +1,3 @@ + Copyright (c) 1995-2008 Paul Marquess. All rights reserved. + This program is free software; you can redistribute it + and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/CSWpmcompresszlib.depend =================================================================== --- csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/CSWpmcompresszlib.depend 2009-05-07 01:49:26 UTC (rev 4722) +++ csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/CSWpmcompresszlib.depend 2009-05-07 12:17:02 UTC (rev 4723) @@ -1,3 +0,0 @@ -P CSWpmcomprawzlib pm_comprawzlib - Low-Level Interface to zlib compression library -P CSWpmiocompbase pm_iocompbase - Base Class for IO::Compress modules -P CSWpmiocompzlib pm_iocompzlib - Read and write gzip and zip files/buffers. Deleted: csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/CSWpmcompresszlib.gspec =================================================================== --- csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/CSWpmcompresszlib.gspec 2009-05-07 01:49:26 UTC (rev 4722) +++ csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/CSWpmcompresszlib.gspec 2009-05-07 12:17:02 UTC (rev 4723) @@ -1,8 +0,0 @@ -%var bitname pm_compresszlib -%var pkgname CSWpmcompresszlib -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1995-2004 Paul Marquess. All rights reserved. -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/CSWpmcompresszlib.prototype =================================================================== --- csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/CSWpmcompresszlib.prototype 2009-05-07 01:49:26 UTC (rev 4722) +++ csw/mgar/pkg/cpan/Compress-Zlib/trunk/files/CSWpmcompresszlib.prototype 2009-05-07 12:17:02 UTC (rev 4723) @@ -1,19 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Compress 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Compress/Zlib 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Compress/Zlib/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Compress::Zlib.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Compress 0755 root bin -f none /opt/csw/share/perl/csw/Compress/Zlib.pm 0444 root bin -d none /opt/csw/share/perl/csw/auto 0755 root bin -d none /opt/csw/share/perl/csw/auto/Compress 0755 root bin -d none /opt/csw/share/perl/csw/auto/Compress/Zlib 0755 root bin -f none /opt/csw/share/perl/csw/auto/Compress/Zlib/autosplit.ix 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Thu May 7 15:28:03 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Thu, 07 May 2009 13:28:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[4724] csw/mgar/pkg/nginx/trunk/files/svc-cswnginx Message-ID: Revision: 4724 http://gar.svn.sourceforge.net/gar/?rev=4724&view=rev Author: aigoshin Date: 2009-05-07 13:28:03 +0000 (Thu, 07 May 2009) Log Message: ----------- nginx: milestone 3.0 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/files/svc-cswnginx Modified: csw/mgar/pkg/nginx/trunk/files/svc-cswnginx =================================================================== --- csw/mgar/pkg/nginx/trunk/files/svc-cswnginx 2009-05-07 12:17:02 UTC (rev 4723) +++ csw/mgar/pkg/nginx/trunk/files/svc-cswnginx 2009-05-07 13:28:03 UTC (rev 4724) @@ -95,8 +95,9 @@ [ $RETVAL -ne 0 ] && return $RETVAL OLDBINPID=0 for i in 1 2 3 4 5; do - if [ -f $PIDFILO ]; then + if [ -s $PIDFILO ]; then OLDBINPID=1 + sleep 2 break else sleep 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu May 7 15:45:39 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 May 2009 13:45:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[4725] csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk Message-ID: Revision: 4725 http://gar.svn.sourceforge.net/gar/?rev=4725&view=rev Author: bonivart Date: 2009-05-07 13:45:39 +0000 (Thu, 07 May 2009) Log Message: ----------- Compress-Raw-Zlib: update to 2.019 Modified Paths: -------------- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/CSWpmcomprawzlib.depend csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/CSWpmcomprawzlib.gspec csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/CSWpmcomprawzlib.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/ Property changes on: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2009-05-07 13:28:03 UTC (rev 4724) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2009-05-07 13:45:39 UTC (rev 4725) @@ -1,5 +1,5 @@ GARNAME = Compress-Raw-Zlib -GARVERSION = 2.004 +GARVERSION = 2.019 CATEGORIES = cpan AUTHOR = PMQS @@ -9,11 +9,23 @@ compression library. endef -DISTFILES = $(call admfiles,CSWpmcomprawzlib,depend prototype) +DISTFILES += COPYING +CATALOGNAME = pm_compressrawzlib +PACKAGES = CSWpmcompressrawzlib +ARCHALL = 1 + +REQUIRED_PKGS = CSWzlib + +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + +CONFIGURE_ARGS = + +#SKIPTEST = 1 + # Use CSWzlib instead of the dist version -PATCHFILES += cswzlib.diff +#PATCHFILES += cswzlib.diff -#DEPEND += lib/zlib +DEPEND += lib/zlib include gar/category.mk Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums 2009-05-07 13:28:03 UTC (rev 4724) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums 2009-05-07 13:45:39 UTC (rev 4725) @@ -1,5 +1,2 @@ -1961d25b21a6407ae4c2b7548a34ab9e download/CSWpmcomprawzlib.gspec -4322ee21ea3117bcf0fd1f3f9da66ffb download/CSWpmcomprawzlib.depend -d92ba057b3b8ea592a5ef7d646af26e7 download/CSWpmcomprawzlib.prototype -e5b78784b4e3ec857793cc3fa4e51346 download/Compress-Raw-Zlib-2.004.tar.gz -09d9b21c80fe136c1790bf90ba0ae4bb download/cswzlib.diff +f3f53ce3a53b4a71d94574bdde1364de download/COPYING +cb87f8cfc7c1c032da97c8118cc073be download/Compress-Raw-Zlib-2.019.tar.gz Added: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/COPYING 2009-05-07 13:45:39 UTC (rev 4725) @@ -0,0 +1,3 @@ +Copyright (c) 2005-2007 Paul Marquess. All rights reserved. +This program is free software; you can redistribute it +and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/CSWpmcomprawzlib.depend =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/CSWpmcomprawzlib.depend 2009-05-07 13:28:03 UTC (rev 4724) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/CSWpmcomprawzlib.depend 2009-05-07 13:45:39 UTC (rev 4725) @@ -1 +0,0 @@ -P CSWzlib zlib - Zlib Data Compression Library Deleted: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/CSWpmcomprawzlib.gspec =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/CSWpmcomprawzlib.gspec 2009-05-07 13:28:03 UTC (rev 4724) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/CSWpmcomprawzlib.gspec 2009-05-07 13:45:39 UTC (rev 4725) @@ -1,7 +0,0 @@ -%var bitname pm_comprawzlib -%var pkgname CSWpmcomprawzlib -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2005-2007 Paul Marquess. All rights reserved. -This program is free software; you can redistribute it -and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/CSWpmcomprawzlib.prototype =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/CSWpmcomprawzlib.prototype 2009-05-07 13:28:03 UTC (rev 4724) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/CSWpmcomprawzlib.prototype 2009-05-07 13:45:39 UTC (rev 4725) @@ -1,17 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/Compress 0755 root bin -d none /opt/csw/lib/perl/csw/Compress/Raw 0755 root bin -f none /opt/csw/lib/perl/csw/Compress/Raw/Zlib.pm 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Compress 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Compress/Raw 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Compress/Raw/Zlib 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Compress/Raw/Zlib/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/Compress/Raw/Zlib/Zlib.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/Compress/Raw/Zlib/Zlib.so 0555 root bin -f none /opt/csw/lib/perl/csw/auto/Compress/Raw/Zlib/autosplit.ix 0444 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Compress::Raw::Zlib.3perl 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu May 7 15:55:21 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 May 2009 13:55:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[4726] csw/mgar/pkg/cpan/IO-Compress-Base/trunk Message-ID: Revision: 4726 http://gar.svn.sourceforge.net/gar/?rev=4726&view=rev Author: bonivart Date: 2009-05-07 13:55:21 +0000 (Thu, 07 May 2009) Log Message: ----------- IO-Compress-Base: update to 2.015 Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/Makefile csw/mgar/pkg/cpan/IO-Compress-Base/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/CSWpmiocompbase.depend csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/CSWpmiocompbase.gspec csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/CSWpmiocompbase.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/ Property changes on: csw/mgar/pkg/cpan/IO-Compress-Base/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/IO-Compress-Base/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/Makefile 2009-05-07 13:45:39 UTC (rev 4725) +++ csw/mgar/pkg/cpan/IO-Compress-Base/trunk/Makefile 2009-05-07 13:55:21 UTC (rev 4726) @@ -1,5 +1,5 @@ GARNAME = IO-Compress-Base -GARVERSION = 2.004 +GARVERSION = 2.015 CATEGORIES = cpan AUTHOR = PMQS @@ -9,8 +9,14 @@ purpose if to to be sub-classed by IO::Compress modules. endef -DISTFILES = $(call admfiles,CSWpmiocompbase,depend prototype) +DISTFILES += COPYING -DEPENDS += cpan/Scalar-List-Utils +CATALOGNAME = pm_iocompressbase +PACKAGES = CSWpmiocompressbase +ARCHALL = 1 +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + +CONFIGURE_ARGS = + include gar/category.mk Modified: csw/mgar/pkg/cpan/IO-Compress-Base/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/checksums 2009-05-07 13:45:39 UTC (rev 4725) +++ csw/mgar/pkg/cpan/IO-Compress-Base/trunk/checksums 2009-05-07 13:55:21 UTC (rev 4726) @@ -1,4 +1,2 @@ -036bc15f3efac88ebf2fb81770889bf1 download/CSWpmiocompbase.gspec -7934c0cef8bd5362646280de26fee5ae download/CSWpmiocompbase.depend -d3f3598813a503bb7dda3331c6dc5861 download/CSWpmiocompbase.prototype -a48a6185d239985d3a9755a36c2ff659 download/IO-Compress-Base-2.004.tar.gz +f3f53ce3a53b4a71d94574bdde1364de download/COPYING +009813067e40c73c28c23fde8d9abfd5 download/IO-Compress-Base-2.015.tar.gz Added: csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/COPYING 2009-05-07 13:55:21 UTC (rev 4726) @@ -0,0 +1,3 @@ +Copyright (c) 2005-2007 Paul Marquess. All rights reserved. +This program is free software; you can redistribute it +and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/CSWpmiocompbase.depend =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/CSWpmiocompbase.depend 2009-05-07 13:45:39 UTC (rev 4725) +++ csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/CSWpmiocompbase.depend 2009-05-07 13:55:21 UTC (rev 4726) @@ -1 +0,0 @@ -P CSWpmscalarlist pm_scalarlistutils - a selection of general-utility list and scalar subroutines. Deleted: csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/CSWpmiocompbase.gspec =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/CSWpmiocompbase.gspec 2009-05-07 13:45:39 UTC (rev 4725) +++ csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/CSWpmiocompbase.gspec 2009-05-07 13:55:21 UTC (rev 4726) @@ -1,8 +0,0 @@ -%var bitname pm_iocompbase -%var pkgname CSWpmiocompbase -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2005-2007 Paul Marquess. All rights reserved. -This program is free software; you can redistribute it -and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/CSWpmiocompbase.prototype =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/CSWpmiocompbase.prototype 2009-05-07 13:45:39 UTC (rev 4725) +++ csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/CSWpmiocompbase.prototype 2009-05-07 13:55:21 UTC (rev 4726) @@ -1,27 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/IO 0755 root bin -d none /opt/csw/lib/perl/csw/auto/IO/Compress 0755 root bin -d none /opt/csw/lib/perl/csw/auto/IO/Compress/Base 0755 root bin -f none /opt/csw/lib/perl/csw/auto/IO/Compress/Base/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/File::GlobMapper.3perl 0444 root bin -f none /opt/csw/share/man/man3/IO::Compress::Base.3perl 0444 root bin -f none /opt/csw/share/man/man3/IO::Uncompress::AnyUncompress.3perl 0444 root bin -f none /opt/csw/share/man/man3/IO::Uncompress::Base.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/File 0755 root bin -f none /opt/csw/share/perl/csw/File/GlobMapper.pm 0444 root bin -d none /opt/csw/share/perl/csw/IO 0755 root bin -d none /opt/csw/share/perl/csw/IO/Compress 0755 root bin -d none /opt/csw/share/perl/csw/IO/Compress/Base 0755 root bin -f none /opt/csw/share/perl/csw/IO/Compress/Base.pm 0444 root bin -f none /opt/csw/share/perl/csw/IO/Compress/Base/Common.pm 0444 root bin -d none /opt/csw/share/perl/csw/IO/Uncompress 0755 root bin -f none /opt/csw/share/perl/csw/IO/Uncompress/AnyUncompress.pm 0444 root bin -f none /opt/csw/share/perl/csw/IO/Uncompress/Base.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu May 7 16:05:32 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 May 2009 14:05:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[4727] csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk Message-ID: Revision: 4727 http://gar.svn.sourceforge.net/gar/?rev=4727&view=rev Author: bonivart Date: 2009-05-07 14:05:31 +0000 (Thu, 07 May 2009) Log Message: ----------- IO-Compress-Zlib: update to 2.015 Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/CSWpmiocompzlib.gspec csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/CSWpmiocompzlib.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/ Property changes on: csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile 2009-05-07 13:55:21 UTC (rev 4726) +++ csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile 2009-05-07 14:05:31 UTC (rev 4727) @@ -1,5 +1,5 @@ GARNAME = IO-Compress-Zlib -GARVERSION = 2.004 +GARVERSION = 2.015 CATEGORIES = cpan AUTHOR = PMQS @@ -9,9 +9,16 @@ 1950, 1951, 1952 (i.e. gzip) and zip files/buffers. endef -DISTFILES = $(call admfiles,CSWpmiocompzlib,prototype) +DISTFILES += COPYING -DEPENDS += cpan/IO-Compress-Base -DEPENDS += cpan/Compress-Raw-Zlib +CATALOGNAME = pm_iocompresszlib +PACKAGES = CSWpmiocompresszlib +ARCHALL = 1 +REQUIRED_PKGS = CSWpmiocompressbase CSWpmcompressrawzlib + +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + +CONFIGURE_ARGS = + include gar/category.mk Modified: csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/checksums 2009-05-07 13:55:21 UTC (rev 4726) +++ csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/checksums 2009-05-07 14:05:31 UTC (rev 4727) @@ -1,3 +1,2 @@ -f407a1d6f9685e58a969b1d78f841e7a download/CSWpmiocompzlib.gspec -87a3bb4498b9a6aa82c4400364c6f31c download/CSWpmiocompzlib.prototype -a4c3a1501558d832a62907ae4e08c9d8 download/IO-Compress-Zlib-2.004.tar.gz +f3f53ce3a53b4a71d94574bdde1364de download/COPYING +22f3b677a6f1782713c8451966598d3f download/IO-Compress-Zlib-2.015.tar.gz Added: csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/COPYING 2009-05-07 14:05:31 UTC (rev 4727) @@ -0,0 +1,3 @@ +Copyright (c) 2005-2007 Paul Marquess. All rights reserved. +This program is free software; you can redistribute it +and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/CSWpmiocompzlib.gspec =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/CSWpmiocompzlib.gspec 2009-05-07 13:55:21 UTC (rev 4726) +++ csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/CSWpmiocompzlib.gspec 2009-05-07 14:05:31 UTC (rev 4727) @@ -1,8 +0,0 @@ -%var bitname pm_iocompzlib -%var pkgname CSWpmiocompzlib -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2005-2007 Paul Marquess. All rights reserved. -This program is free software; you can redistribute it -and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/CSWpmiocompzlib.prototype =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/CSWpmiocompzlib.prototype 2009-05-07 13:55:21 UTC (rev 4726) +++ csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/CSWpmiocompzlib.prototype 2009-05-07 14:05:31 UTC (rev 4727) @@ -1,45 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/IO/Compress 0755 root bin -d none /opt/csw/lib/perl/csw/auto/IO/Compress/Zlib 0755 root bin -f none /opt/csw/lib/perl/csw/auto/IO/Compress/Zlib/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/IO::Compress::Deflate.3perl 0444 root bin -f none /opt/csw/share/man/man3/IO::Compress::Gzip.3perl 0444 root bin -f none /opt/csw/share/man/man3/IO::Compress::RawDeflate.3perl 0444 root bin -f none /opt/csw/share/man/man3/IO::Compress::Zip.3perl 0444 root bin -f none /opt/csw/share/man/man3/IO::Uncompress::AnyInflate.3perl 0444 root bin -f none /opt/csw/share/man/man3/IO::Uncompress::Gunzip.3perl 0444 root bin -f none /opt/csw/share/man/man3/IO::Uncompress::Inflate.3perl 0444 root bin -f none /opt/csw/share/man/man3/IO::Uncompress::RawInflate.3perl 0444 root bin -f none /opt/csw/share/man/man3/IO::Uncompress::Unzip.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/IO/Compress 0755 root bin -d none /opt/csw/share/perl/csw/IO/Compress/Adapter 0755 root bin -f none /opt/csw/share/perl/csw/IO/Compress/Adapter/Deflate.pm 0444 root bin -f none /opt/csw/share/perl/csw/IO/Compress/Adapter/Identity.pm 0444 root bin -f none /opt/csw/share/perl/csw/IO/Compress/Deflate.pm 0444 root bin -d none /opt/csw/share/perl/csw/IO/Compress/Gzip 0755 root bin -f none /opt/csw/share/perl/csw/IO/Compress/Gzip.pm 0444 root bin -f none /opt/csw/share/perl/csw/IO/Compress/Gzip/Constants.pm 0444 root bin -f none /opt/csw/share/perl/csw/IO/Compress/RawDeflate.pm 0444 root bin -d none /opt/csw/share/perl/csw/IO/Compress/Zip 0755 root bin -f none /opt/csw/share/perl/csw/IO/Compress/Zip.pm 0444 root bin -f none /opt/csw/share/perl/csw/IO/Compress/Zip/Constants.pm 0444 root bin -d none /opt/csw/share/perl/csw/IO/Compress/Zlib 0755 root bin -f none /opt/csw/share/perl/csw/IO/Compress/Zlib/Constants.pm 0444 root bin -f none /opt/csw/share/perl/csw/IO/Compress/Zlib/Extra.pm 0444 root bin -d none /opt/csw/share/perl/csw/IO/Uncompress 0755 root bin -d none /opt/csw/share/perl/csw/IO/Uncompress/Adapter 0755 root bin -f none /opt/csw/share/perl/csw/IO/Uncompress/Adapter/Identity.pm 0555 root bin -f none /opt/csw/share/perl/csw/IO/Uncompress/Adapter/Inflate.pm 0444 root bin -f none /opt/csw/share/perl/csw/IO/Uncompress/AnyInflate.pm 0444 root bin -f none /opt/csw/share/perl/csw/IO/Uncompress/Gunzip.pm 0444 root bin -f none /opt/csw/share/perl/csw/IO/Uncompress/Inflate.pm 0444 root bin -f none /opt/csw/share/perl/csw/IO/Uncompress/RawInflate.pm 0555 root bin -f none /opt/csw/share/perl/csw/IO/Uncompress/Unzip.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu May 7 16:09:31 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 May 2009 14:09:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[4728] csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk Message-ID: Revision: 4728 http://gar.svn.sourceforge.net/gar/?rev=4728&view=rev Author: bonivart Date: 2009-05-07 14:09:31 +0000 (Thu, 07 May 2009) Log Message: ----------- IO-Compress-Zlib: fix license and skip test Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile 2009-05-07 14:05:31 UTC (rev 4727) +++ csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile 2009-05-07 14:09:31 UTC (rev 4728) @@ -21,4 +21,6 @@ CONFIGURE_ARGS = +SKIPTEST = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/COPYING 2009-05-07 14:05:31 UTC (rev 4727) +++ csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/files/COPYING 2009-05-07 14:09:31 UTC (rev 4728) @@ -1,3 +1,3 @@ -Copyright (c) 2005-2007 Paul Marquess. All rights reserved. +Copyright (c) 2005-2008 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu May 7 16:10:37 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 May 2009 14:10:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[4729] csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/checksums Message-ID: Revision: 4729 http://gar.svn.sourceforge.net/gar/?rev=4729&view=rev Author: bonivart Date: 2009-05-07 14:10:36 +0000 (Thu, 07 May 2009) Log Message: ----------- IO-Compress-Zlib: checksums updated Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/checksums Modified: csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/checksums 2009-05-07 14:09:31 UTC (rev 4728) +++ csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/checksums 2009-05-07 14:10:36 UTC (rev 4729) @@ -1,2 +1,2 @@ -f3f53ce3a53b4a71d94574bdde1364de download/COPYING +44d05b992e7d98c44fd96b5a6b38d596 download/COPYING 22f3b677a6f1782713c8451966598d3f download/IO-Compress-Zlib-2.015.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu May 7 16:14:30 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 May 2009 14:14:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[4730] csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/ COPYING Message-ID: Revision: 4730 http://gar.svn.sourceforge.net/gar/?rev=4730&view=rev Author: bonivart Date: 2009-05-07 14:14:30 +0000 (Thu, 07 May 2009) Log Message: ----------- IO-Compress-Base: update license Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/COPYING 2009-05-07 14:10:36 UTC (rev 4729) +++ csw/mgar/pkg/cpan/IO-Compress-Base/trunk/files/COPYING 2009-05-07 14:14:30 UTC (rev 4730) @@ -1,3 +1,3 @@ -Copyright (c) 2005-2007 Paul Marquess. All rights reserved. +Copyright (c) 2005-2008 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu May 7 16:15:33 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 May 2009 14:15:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[4731] csw/mgar/pkg/cpan/IO-Compress-Base/trunk/checksums Message-ID: Revision: 4731 http://gar.svn.sourceforge.net/gar/?rev=4731&view=rev Author: bonivart Date: 2009-05-07 14:15:33 +0000 (Thu, 07 May 2009) Log Message: ----------- IO-Compress-Base: update checksums Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/checksums Modified: csw/mgar/pkg/cpan/IO-Compress-Base/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IO-Compress-Base/trunk/checksums 2009-05-07 14:14:30 UTC (rev 4730) +++ csw/mgar/pkg/cpan/IO-Compress-Base/trunk/checksums 2009-05-07 14:15:33 UTC (rev 4731) @@ -1,2 +1,2 @@ -f3f53ce3a53b4a71d94574bdde1364de download/COPYING +44d05b992e7d98c44fd96b5a6b38d596 download/COPYING 009813067e40c73c28c23fde8d9abfd5 download/IO-Compress-Base-2.015.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu May 7 16:20:26 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 May 2009 14:20:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[4732] csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk Message-ID: Revision: 4732 http://gar.svn.sourceforge.net/gar/?rev=4732&view=rev Author: bonivart Date: 2009-05-07 14:20:26 +0000 (Thu, 07 May 2009) Log Message: ----------- Compress-Raw-Zlib: update license Modified Paths: -------------- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2009-05-07 14:15:33 UTC (rev 4731) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2009-05-07 14:20:26 UTC (rev 4732) @@ -13,7 +13,6 @@ CATALOGNAME = pm_compressrawzlib PACKAGES = CSWpmcompressrawzlib -ARCHALL = 1 REQUIRED_PKGS = CSWzlib @@ -26,6 +25,4 @@ # Use CSWzlib instead of the dist version #PATCHFILES += cswzlib.diff -DEPEND += lib/zlib - include gar/category.mk Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums 2009-05-07 14:15:33 UTC (rev 4731) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums 2009-05-07 14:20:26 UTC (rev 4732) @@ -1,2 +1,2 @@ -f3f53ce3a53b4a71d94574bdde1364de download/COPYING +500d953c61746ed6c06968b31681c0db download/COPYING cb87f8cfc7c1c032da97c8118cc073be download/Compress-Raw-Zlib-2.019.tar.gz Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/COPYING 2009-05-07 14:15:33 UTC (rev 4731) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/files/COPYING 2009-05-07 14:20:26 UTC (rev 4732) @@ -1,3 +1,3 @@ -Copyright (c) 2005-2007 Paul Marquess. All rights reserved. +Copyright (c) 2005-2009 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu May 7 16:23:34 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 May 2009 14:23:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[4733] csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile Message-ID: Revision: 4733 http://gar.svn.sourceforge.net/gar/?rev=4733&view=rev Author: bonivart Date: 2009-05-07 14:23:34 +0000 (Thu, 07 May 2009) Log Message: ----------- Compress-Zlib: clean up Makefile Modified Paths: -------------- csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile Modified: csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile 2009-05-07 14:20:26 UTC (rev 4732) +++ csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile 2009-05-07 14:23:34 UTC (rev 4733) @@ -10,9 +10,7 @@ functionality provided by zlib is available in Compress::Zlib. endef -#DISTFILES += $(call admfiles,CSWpmlibwww,) DISTFILES += COPYING -#DISTFILES = $(call admfiles,CSWpmcompresszlib,depend prototype) CATALOGNAME = pm_compresszlib PACKAGES = CSWpmcompresszlib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 18:38:17 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 16:38:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[4734] csw/mgar/pkg/x11/inputproto/trunk/Makefile Message-ID: Revision: 4734 http://gar.svn.sourceforge.net/gar/?rev=4734&view=rev Author: dmichelsen Date: 2009-05-07 16:38:16 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/inputproto: Add 64 bit pkgconfig Modified Paths: -------------- csw/mgar/pkg/x11/inputproto/trunk/Makefile Modified: csw/mgar/pkg/x11/inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/Makefile 2009-05-07 14:23:34 UTC (rev 4733) +++ csw/mgar/pkg/x11/inputproto/trunk/Makefile 2009-05-07 16:38:16 UTC (rev 4734) @@ -14,7 +14,9 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -ARCHALL = 1 +REQUIRED_PKGS = CSWx11common + +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 18:40:50 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 16:40:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[4735] csw/mgar/pkg/x11 Message-ID: Revision: 4735 http://gar.svn.sourceforge.net/gar/?rev=4735&view=rev Author: dmichelsen Date: 2009-05-07 16:40:50 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/x11common: Initial commit Added Paths: ----------- csw/mgar/pkg/x11/x11common/ csw/mgar/pkg/x11/x11common/branches/ csw/mgar/pkg/x11/x11common/tags/ csw/mgar/pkg/x11/x11common/trunk/ csw/mgar/pkg/x11/x11common/trunk/Makefile csw/mgar/pkg/x11/x11common/trunk/files/ Property changes on: csw/mgar/pkg/x11/x11common/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/x11/x11common/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/x11common/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/x11common/trunk/Makefile 2009-05-07 16:40:50 UTC (rev 4735) @@ -0,0 +1,19 @@ +GARNAME = x11common +GARVERSION = 1.0 +CATEGORIES = x11 + +DESCRIPTION = X11 common directories +define BLURB +endef + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(libdir) + gln -s . $(DESTDIR)$(libdir)/32 + gln -s $(ISA_DEFAULT64) $(DESTDIR)$(libdir)/64 + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 18:57:30 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 16:57:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[4736] csw/mgar/pkg/x11/kbproto/trunk/Makefile Message-ID: Revision: 4736 http://gar.svn.sourceforge.net/gar/?rev=4736&view=rev Author: dmichelsen Date: 2009-05-07 16:57:30 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/kbproto: Add 64 bit pkgconfig Modified Paths: -------------- csw/mgar/pkg/x11/kbproto/trunk/Makefile Modified: csw/mgar/pkg/x11/kbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/kbproto/trunk/Makefile 2009-05-07 16:40:50 UTC (rev 4735) +++ csw/mgar/pkg/x11/kbproto/trunk/Makefile 2009-05-07 16:57:30 UTC (rev 4736) @@ -14,7 +14,9 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -ARCHALL = 1 +REQUIRED_PKGS = CSWx11common + +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 18:58:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 16:58:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[4737] csw/mgar/pkg/x11/renderproto/trunk/Makefile Message-ID: Revision: 4737 http://gar.svn.sourceforge.net/gar/?rev=4737&view=rev Author: dmichelsen Date: 2009-05-07 16:58:59 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/renderproto: Add x11common Modified Paths: -------------- csw/mgar/pkg/x11/renderproto/trunk/Makefile Modified: csw/mgar/pkg/x11/renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-05-07 16:57:30 UTC (rev 4736) +++ csw/mgar/pkg/x11/renderproto/trunk/Makefile 2009-05-07 16:58:59 UTC (rev 4737) @@ -14,6 +14,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWx11common + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 19:00:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 17:00:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[4738] csw/mgar/pkg/x11/xcb-proto/trunk/Makefile Message-ID: Revision: 4738 http://gar.svn.sourceforge.net/gar/?rev=4738&view=rev Author: dmichelsen Date: 2009-05-07 17:00:27 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/xcb-proto: Add 64 bit pkgconfig Modified Paths: -------------- csw/mgar/pkg/x11/xcb-proto/trunk/Makefile Modified: csw/mgar/pkg/x11/xcb-proto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2009-05-07 16:58:59 UTC (rev 4737) +++ csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2009-05-07 17:00:27 UTC (rev 4738) @@ -29,12 +29,14 @@ PACKAGES = CSWxcbproto +PREREQUISITE_PKGS = CSWpython REQUIRED_PKGS = CSWpython +REQUIRED_PKGS += CSWx11common # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -ARCHALL = 1 +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 19:19:17 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 17:19:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[4739] csw/mgar/gar/v2/bin/mkpackage Message-ID: Revision: 4739 http://gar.svn.sourceforge.net/gar/?rev=4739&view=rev Author: dmichelsen Date: 2009-05-07 17:19:15 +0000 (Thu, 07 May 2009) Log Message: ----------- mGAR v2: Remove pkgspool forcably, as there may be files with perms 444 causing errors Modified Paths: -------------- csw/mgar/gar/v2/bin/mkpackage Modified: csw/mgar/gar/v2/bin/mkpackage =================================================================== --- csw/mgar/gar/v2/bin/mkpackage 2009-05-07 17:00:27 UTC (rev 4738) +++ csw/mgar/gar/v2/bin/mkpackage 2009-05-07 17:19:15 UTC (rev 4739) @@ -856,7 +856,7 @@ my $specname = $config{specname}; my $existing_pkgspool = catfile $spooldir, $specname; - vexec( "rm -r $existing_pkgspool", "Failed to remove $existing_pkgspool" ) + vexec( "rm -rf $existing_pkgspool", "Failed to remove $existing_pkgspool" ) if -d $existing_pkgspool; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 19:33:39 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 17:33:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[4740] csw/mgar/pkg/cpan Message-ID: Revision: 4740 http://gar.svn.sourceforge.net/gar/?rev=4740&view=rev Author: dmichelsen Date: 2009-05-07 17:33:38 +0000 (Thu, 07 May 2009) Log Message: ----------- cpan/Text-DoubleMetaphone: Initial checkin Added Paths: ----------- csw/mgar/pkg/cpan/Text-DoubleMetaphone/ csw/mgar/pkg/cpan/Text-DoubleMetaphone/branches/ csw/mgar/pkg/cpan/Text-DoubleMetaphone/tags/ csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/ csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/Makefile csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/checksums csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Text-DoubleMetaphone/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/cpan/Text-DoubleMetaphone/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/Makefile 2009-05-07 17:33:38 UTC (rev 4740) @@ -0,0 +1,13 @@ +GARNAME = Text-DoubleMetaphone +GARVERSION = 0.07 +CATEGORIES = cpan +AUTHOR = MAURICE + +DESCRIPTION = Phonetic encoding of words +define BLURB +endef + +PACKAGES = CSWpmtextdblmetaphon +CATALOGNAME = pm_textdblmetaphone + +include gar/category.mk Added: csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/checksums 2009-05-07 17:33:38 UTC (rev 4740) @@ -0,0 +1 @@ +f242744aa1c1af4a1662fefbb01804f1 download/Text-DoubleMetaphone-0.07.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 19:45:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 17:45:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[4741] csw/mgar/pkg/cpan Message-ID: Revision: 4741 http://gar.svn.sourceforge.net/gar/?rev=4741&view=rev Author: dmichelsen Date: 2009-05-07 17:45:27 +0000 (Thu, 07 May 2009) Log Message: ----------- cpan/Text-GenderFromName: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Text-GenderFromName/ csw/mgar/pkg/cpan/Text-GenderFromName/branches/ csw/mgar/pkg/cpan/Text-GenderFromName/tags/ csw/mgar/pkg/cpan/Text-GenderFromName/trunk/ csw/mgar/pkg/cpan/Text-GenderFromName/trunk/Makefile csw/mgar/pkg/cpan/Text-GenderFromName/trunk/checksums csw/mgar/pkg/cpan/Text-GenderFromName/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Text-GenderFromName/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/cpan/Text-GenderFromName/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-GenderFromName/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Text-GenderFromName/trunk/Makefile 2009-05-07 17:45:27 UTC (rev 4741) @@ -0,0 +1,18 @@ +GARNAME = Text-GenderFromName +GARVERSION = 0.32 +CATEGORIES = cpan +AUTHOR = EDALY + +DESCRIPTION = Guess the gender of an American first name +define BLURB +endef + +REQUIRED_PKGS = CSWpmtextdblmetaphon + +PACKAGES = CSWpmtextgendername +CATALOGNAME = pm_textgendername + +ARCHALL = 1 + +include gar/category.mk + Added: csw/mgar/pkg/cpan/Text-GenderFromName/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-GenderFromName/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Text-GenderFromName/trunk/checksums 2009-05-07 17:45:27 UTC (rev 4741) @@ -0,0 +1 @@ +29d8a682dc72151b8c8da35ffbe4cf2a download/Text-GenderFromName-0.32.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 20:20:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 18:20:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[4742] csw/mgar/pkg/x11/xextproto/trunk/Makefile Message-ID: Revision: 4742 http://gar.svn.sourceforge.net/gar/?rev=4742&view=rev Author: dmichelsen Date: 2009-05-07 18:20:15 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/xextproto: Use 64 bit pkgconfig Modified Paths: -------------- csw/mgar/pkg/x11/xextproto/trunk/Makefile Modified: csw/mgar/pkg/x11/xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-05-07 17:45:27 UTC (rev 4741) +++ csw/mgar/pkg/x11/xextproto/trunk/Makefile 2009-05-07 18:20:15 UTC (rev 4742) @@ -14,7 +14,9 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -ARCHALL = 1 +REQUIRED_PKGS = CSWx11common + +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 20:55:55 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 18:55:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[4743] csw/mgar/pkg/x11/xproto/trunk/Makefile Message-ID: Revision: 4743 http://gar.svn.sourceforge.net/gar/?rev=4743&view=rev Author: dmichelsen Date: 2009-05-07 18:55:55 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/xproto: Use 64 bit pkgconfig Modified Paths: -------------- csw/mgar/pkg/x11/xproto/trunk/Makefile Modified: csw/mgar/pkg/x11/xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xproto/trunk/Makefile 2009-05-07 18:20:15 UTC (rev 4742) +++ csw/mgar/pkg/x11/xproto/trunk/Makefile 2009-05-07 18:55:55 UTC (rev 4743) @@ -13,7 +13,9 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -ARCHALL = 1 +REQUIRED_PKGS = CSWx11common + +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 21:05:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 19:05:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[4744] csw/mgar/pkg/x11/xtrans/trunk/Makefile Message-ID: Revision: 4744 http://gar.svn.sourceforge.net/gar/?rev=4744&view=rev Author: dmichelsen Date: 2009-05-07 19:05:34 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/xtrans: Use 64 bit pkgconfig Modified Paths: -------------- csw/mgar/pkg/x11/xtrans/trunk/Makefile Modified: csw/mgar/pkg/x11/xtrans/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xtrans/trunk/Makefile 2009-05-07 18:55:55 UTC (rev 4743) +++ csw/mgar/pkg/x11/xtrans/trunk/Makefile 2009-05-07 19:05:34 UTC (rev 4744) @@ -14,7 +14,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -ARCHALL = 1 +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 7 21:25:50 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 07 May 2009 19:25:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[4745] csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk Message-ID: Revision: 4745 http://gar.svn.sourceforge.net/gar/?rev=4745&view=rev Author: valholla Date: 2009-05-07 19:25:50 +0000 (Thu, 07 May 2009) Log Message: ----------- fix missing links in /opt/csw/gcc4/lib Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-05-07 19:05:34 UTC (rev 4744) +++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-05-07 19:25:50 UTC (rev 4745) @@ -60,6 +60,7 @@ $(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/share $(PKGROOT)) $(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/lib $(PKGROOT)) $(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/libexec $(PKGROOT)) + $(_DBG)(cd $(PPREFIX)/lib; gln . 32) $(_DBG)$(MAKECOOKIE) merge-amd64-files: @@ -69,6 +70,7 @@ /usr/bin/pax -rw -v $$dir $(PKGROOT); done ) $(_DBG)(cd $(AMD_BASE); /usr/bin/pax -rw -v $(MPREFIX)/lib/amd64 $(PKGROOT)) $(_DBG)(cd $(APREFIX)/bin; /usr/bin/pax -rw -v * $(PPREFIX)/bin/amd64) + $(_DBG)(cd $(PPREFIX)/lib; gln amd64 64) $(_DBG)$(MAKECOOKIE) ifeq ($(shell uname -p), i386) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 7 21:37:48 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 07 May 2009 19:37:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[4746] csw/mgar/pkg/gcc4/trunk/files Message-ID: Revision: 4746 http://gar.svn.sourceforge.net/gar/?rev=4746&view=rev Author: valholla Date: 2009-05-07 19:37:48 +0000 (Thu, 07 May 2009) Log Message: ----------- fix missing links in lib, both sparc and x86 Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-05-07 19:25:50 UTC (rev 4745) +++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-05-07 19:37:48 UTC (rev 4746) @@ -60,7 +60,6 @@ $(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/share $(PKGROOT)) $(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/lib $(PKGROOT)) $(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/libexec $(PKGROOT)) - $(_DBG)(cd $(PPREFIX)/lib; gln . 32) $(_DBG)$(MAKECOOKIE) merge-amd64-files: @@ -70,7 +69,6 @@ /usr/bin/pax -rw -v $$dir $(PKGROOT); done ) $(_DBG)(cd $(AMD_BASE); /usr/bin/pax -rw -v $(MPREFIX)/lib/amd64 $(PKGROOT)) $(_DBG)(cd $(APREFIX)/bin; /usr/bin/pax -rw -v * $(PPREFIX)/bin/amd64) - $(_DBG)(cd $(PPREFIX)/lib; gln amd64 64) $(_DBG)$(MAKECOOKIE) ifeq ($(shell uname -p), i386) Modified: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2009-05-07 19:25:50 UTC (rev 4745) +++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2009-05-07 19:37:48 UTC (rev 4746) @@ -31,6 +31,12 @@ $(_DBG)( gmv $(PKGROOT)/opt/csw/gcc4/lib/gcc/*/*/adalib/*.so* \ $(PKGROOT)/opt/csw/gcc4/lib/ ) $(_DBG)( gfind $(PKGROOT) -name \*~ -exec grm -f {} \; ) + $(_DBG)( cd $(PKGROOT)/opt/csw/gcc4/lib; gln -s . 32 ) + $(_DBG)(if [ "`uname -p`" = "sparc" ]; then \ + cd $(PKGROOT)/opt/csw/gcc4/lib; gln -s sparcv9 64; \ + else \ + cd $(PKGROOT)/opt/csw/gcc4/lib; gln -s amd64 64; \ + fi ) $(_DBG)$(MAKECOOKIE) test-skip: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 21:44:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 19:44:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[4747] csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile Message-ID: Revision: 4747 http://gar.svn.sourceforge.net/gar/?rev=4747&view=rev Author: dmichelsen Date: 2009-05-07 19:44:33 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/libpthreads-stubs: Make 64 bit arch-specific Modified Paths: -------------- csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile Modified: csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile 2009-05-07 19:37:48 UTC (rev 4746) +++ csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile 2009-05-07 19:44:33 UTC (rev 4747) @@ -16,7 +16,6 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz BUILD64 = 1 -ARCHALL = 1 CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 22:20:41 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 20:20:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[4748] csw/mgar/pkg/x11/libX11/trunk/Makefile Message-ID: Revision: 4748 http://gar.svn.sourceforge.net/gar/?rev=4748&view=rev Author: dmichelsen Date: 2009-05-07 20:20:40 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/libX11: Add prerequisites Modified Paths: -------------- csw/mgar/pkg/x11/libX11/trunk/Makefile Modified: csw/mgar/pkg/x11/libX11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-05-07 19:44:33 UTC (rev 4747) +++ csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-05-07 20:20:40 UTC (rev 4748) @@ -18,7 +18,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWxextproto CSWxtrans CSWkbproto CSWinputproto +PREREQUISITE_PKGS = CSWxcbproto CSWxextproto CSWxtrans CSWkbproto CSWinputproto CSWlibpthreadstubs PACKAGES = CSWlibx11 CSWlibx11devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 22:30:34 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 20:30:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[4749] csw/mgar/pkg/x11/xrender/trunk/Makefile Message-ID: Revision: 4749 http://gar.svn.sourceforge.net/gar/?rev=4749&view=rev Author: dmichelsen Date: 2009-05-07 20:30:33 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/xrender: Fix NOISALIST Modified Paths: -------------- csw/mgar/pkg/x11/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xrender/trunk/Makefile 2009-05-07 20:20:40 UTC (rev 4748) +++ csw/mgar/pkg/x11/xrender/trunk/Makefile 2009-05-07 20:30:33 UTC (rev 4749) @@ -29,7 +29,7 @@ PKGFILES_CSWrenderdev = $(PKGFILES_DEVEL) BUILD64 = 1 -NOARCHLIST = 1 +NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 22:32:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 20:32:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[4750] csw/mgar/pkg/x11/xtrans/trunk/Makefile Message-ID: Revision: 4750 http://gar.svn.sourceforge.net/gar/?rev=4750&view=rev Author: dmichelsen Date: 2009-05-07 20:32:59 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/xtrans: Add dependency to x11common Modified Paths: -------------- csw/mgar/pkg/x11/xtrans/trunk/Makefile Modified: csw/mgar/pkg/x11/xtrans/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xtrans/trunk/Makefile 2009-05-07 20:30:33 UTC (rev 4749) +++ csw/mgar/pkg/x11/xtrans/trunk/Makefile 2009-05-07 20:32:59 UTC (rev 4750) @@ -14,6 +14,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWx11common + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 22:34:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 20:34:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[4751] csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile Message-ID: Revision: 4751 http://gar.svn.sourceforge.net/gar/?rev=4751&view=rev Author: dmichelsen Date: 2009-05-07 20:34:05 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/libpthread-stubs: Add dependency to x11common Modified Paths: -------------- csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile Modified: csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile 2009-05-07 20:32:59 UTC (rev 4750) +++ csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile 2009-05-07 20:34:05 UTC (rev 4751) @@ -15,6 +15,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWx11common + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 22:35:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 20:35:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[4752] csw/mgar/pkg/x11/libXau/trunk/Makefile Message-ID: Revision: 4752 http://gar.svn.sourceforge.net/gar/?rev=4752&view=rev Author: dmichelsen Date: 2009-05-07 20:35:59 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/libXau: Add dependency to x11common Modified Paths: -------------- csw/mgar/pkg/x11/libXau/trunk/Makefile Modified: csw/mgar/pkg/x11/libXau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/Makefile 2009-05-07 20:34:05 UTC (rev 4751) +++ csw/mgar/pkg/x11/libXau/trunk/Makefile 2009-05-07 20:35:59 UTC (rev 4752) @@ -16,6 +16,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS_CSWlibxau = CSWx11common + CATALOGNAME_CSWlibxau = libxau CATALOGNAME_CSWlibxaudevel = libxau_devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 22:37:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 20:37:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[4753] csw/mgar/pkg/x11/libxcb/trunk/Makefile Message-ID: Revision: 4753 http://gar.svn.sourceforge.net/gar/?rev=4753&view=rev Author: dmichelsen Date: 2009-05-07 20:37:47 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/libxcb: Add dependency to x11common Modified Paths: -------------- csw/mgar/pkg/x11/libxcb/trunk/Makefile Modified: csw/mgar/pkg/x11/libxcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-05-07 20:35:59 UTC (rev 4752) +++ csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-05-07 20:37:47 UTC (rev 4753) @@ -30,7 +30,7 @@ PKGFILES_CSWlibxcbdoc = $(PKGFILES_DOC) REQUIRED_PKGS_CSWlibxcbdevel = CSWlibxcb -REQUIRED_PKGS_CSWlibxcb = CSWlibxau +REQUIRED_PKGS_CSWlibxcb = CSWx11common CSWlibxau BUILD64 = 1 NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 22:39:42 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 20:39:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[4754] csw/mgar/pkg/x11/libX11/trunk/Makefile Message-ID: Revision: 4754 http://gar.svn.sourceforge.net/gar/?rev=4754&view=rev Author: dmichelsen Date: 2009-05-07 20:39:42 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/libx11: Add dependency to x11common Modified Paths: -------------- csw/mgar/pkg/x11/libX11/trunk/Makefile Modified: csw/mgar/pkg/x11/libX11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-05-07 20:37:47 UTC (rev 4753) +++ csw/mgar/pkg/x11/libX11/trunk/Makefile 2009-05-07 20:39:42 UTC (rev 4754) @@ -30,7 +30,7 @@ PKGFILES_CSWlibx11devel = $(PKGFILES_DEVEL) -REQUIRED_PKGS_CSWlibx11 = CSWlibxcb +REQUIRED_PKGS_CSWlibx11 = CSWx11common CSWlibxcb REQUIRED_PKGS_CSWlibx11devel = CSWlibx11 BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 22:41:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 20:41:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[4755] csw/mgar/pkg/x11/xrender/trunk/Makefile Message-ID: Revision: 4755 http://gar.svn.sourceforge.net/gar/?rev=4755&view=rev Author: dmichelsen Date: 2009-05-07 20:41:24 +0000 (Thu, 07 May 2009) Log Message: ----------- x11/xrender: Add dependency to x11common Modified Paths: -------------- csw/mgar/pkg/x11/xrender/trunk/Makefile Modified: csw/mgar/pkg/x11/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xrender/trunk/Makefile 2009-05-07 20:39:42 UTC (rev 4754) +++ csw/mgar/pkg/x11/xrender/trunk/Makefile 2009-05-07 20:41:24 UTC (rev 4755) @@ -21,7 +21,7 @@ PREREQUISITE_PKGS = CSWrenderproto REQUIRED_PKGS_CSWrenderdev = CSWlibxrender -REQUIRED_PKGS_CSWlibxrender = CSWlibx11 +REQUIRED_PKGS_CSWlibxrender = CSWx11common CSWlibx11 SPKG_DESC_CSWlibxrender = $(DESCRIPTION) SPKG_DESC_CSWrenderdev = $(DESCRIPTION) development package This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 23:09:57 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 21:09:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[4756] csw/mgar/pkg/cpan/Makefile Message-ID: Revision: 4756 http://gar.svn.sourceforge.net/gar/?rev=4756&view=rev Author: dmichelsen Date: 2009-05-07 21:09:57 +0000 (Thu, 07 May 2009) Log Message: ----------- cpan/Makefile: Update newpkg-% template Modified Paths: -------------- csw/mgar/pkg/cpan/Makefile Modified: csw/mgar/pkg/cpan/Makefile =================================================================== --- csw/mgar/pkg/cpan/Makefile 2009-05-07 20:41:24 UTC (rev 4755) +++ csw/mgar/pkg/cpan/Makefile 2009-05-07 21:09:57 UTC (rev 4756) @@ -24,39 +24,29 @@ newpkg-%: @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files - @(echo "GARNAME = package"; \ + @(echo "GARNAME = Type-Package"; \ echo "GARVERSION = 1.0"; \ - echo "CATEGORIES = category"; \ + echo "CATEGORIES = cpan"; \ + echo "AUTHOR = MYSELF"; \ echo ""; \ echo "DESCRIPTION = Brief description"; \ echo "define BLURB"; \ echo " Long description"; \ echo "endef"; \ echo ""; \ - echo "MASTER_SITES = "; \ - echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ - echo "DISTFILES += $$(call admfiles,CSWpackage,)"; \ - echo ""; \ - echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ - echo "UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ - echo ""; \ - echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ - echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ - echo "# UPSTREAM_MASTER_SITES = "; \ - echo ""; \ - echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ - echo ""; \ + echo "PACKAGES = CSWpmmymodule"; \ + echo "CATALOGNAME = pm_mymodule"; \ echo "include gar/category.mk"; \ ) > $*/trunk/Makefile - @svn add $*/trunk/Makefile - @(echo "%var bitname package"; \ - echo "%var pkgname CSWpackage"; \ - echo "%include url file://%{PKGLIB}/csw_dyndepend.gspec";\ - echo "%copyright url file://%{WORKSRC}/LICENSE"; \ - ) > $*/trunk/files/CSWpackage.gspec + @touch $*/trunk/checksums + @svn add $*/trunk/Makefile $*/trunk/checksums @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk - @svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar + @if [ -d ../../gar/v2 ]; then \ + ln -s ../../../../gar/v2 $*/trunk/gar; \ + else \ + svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \ + fi @echo @echo "Your package is set up for editing at $*/trunk" @echo "Please don't forget to add the gspec-file!" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 23:23:08 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 21:23:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[4757] csw/mgar/pkg/Makefile Message-ID: Revision: 4757 http://gar.svn.sourceforge.net/gar/?rev=4757&view=rev Author: dmichelsen Date: 2009-05-07 21:23:07 +0000 (Thu, 07 May 2009) Log Message: ----------- mGAR v2: Update template for newpkg-% to dynamic gspec and linked gar Modified Paths: -------------- csw/mgar/pkg/Makefile Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2009-05-07 21:09:57 UTC (rev 4756) +++ csw/mgar/pkg/Makefile 2009-05-07 21:23:07 UTC (rev 4757) @@ -64,10 +64,9 @@ echo ""; \ echo "MASTER_SITES = "; \ echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ - echo "DISTFILES += $$(call admfiles,CSWpackage,)"; \ echo ""; \ echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ - echo "UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo "UFILES_REGEX = $$(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ echo ""; \ echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ @@ -77,15 +76,15 @@ echo ""; \ echo "include gar/category.mk"; \ ) > $*/trunk/Makefile - @svn add $*/trunk/Makefile - @(echo "%var bitname package"; \ - echo "%var pkgname CSWpackage"; \ - echo "%include url file://%{PKGLIB}/csw_dyndepend.gspec"; \ - echo "%copyright url file://%{WORKSRC}/LICENSE"; \ - ) > $*/trunk/files/CSWpackage.gspec + @touch $*/trunk/checksums + @svn add $*/trunk/Makefile $*/trunk/checksums @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk - @svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar + @if [ -d ../gar/v2 ]; then \ + ln -s ../../../gar/v2 $*/trunk/gar; \ + else \ + svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \ + fi @echo @echo "Your package is set up for editing at $*/trunk" @echo "Please don't forget to add the gspec-file!" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 23:28:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 21:28:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[4758] csw/mgar/pkg Message-ID: Revision: 4758 http://gar.svn.sourceforge.net/gar/?rev=4758&view=rev Author: dmichelsen Date: 2009-05-07 21:28:46 +0000 (Thu, 07 May 2009) Log Message: ----------- openjpeg: Initial commit Added Paths: ----------- csw/mgar/pkg/openjpeg/ csw/mgar/pkg/openjpeg/branches/ csw/mgar/pkg/openjpeg/tags/ csw/mgar/pkg/openjpeg/trunk/ csw/mgar/pkg/openjpeg/trunk/Makefile csw/mgar/pkg/openjpeg/trunk/checksums csw/mgar/pkg/openjpeg/trunk/files/ Property changes on: csw/mgar/pkg/openjpeg/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/openjpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/openjpeg/trunk/Makefile (rev 0) +++ csw/mgar/pkg/openjpeg/trunk/Makefile 2009-05-07 21:28:46 UTC (rev 4758) @@ -0,0 +1,23 @@ +GARNAME = openjpeg +GARVERSION = 1.3 +CATEGORIES = lib + +DESCRIPTION = Open-source JPEG 2000 codec written in C +define BLURB +endef + +MASTER_SITES = http://www.openjpeg.org/ +DISTFILES = $(GARNAME)_v1_3.tar.gz + +# 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 = + +BUILD64 = 1 +NORUNPATH = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/openjpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/openjpeg/trunk/checksums (rev 0) +++ csw/mgar/pkg/openjpeg/trunk/checksums 2009-05-07 21:28:46 UTC (rev 4758) @@ -0,0 +1 @@ +f9a3ccfa91ac34b589e9bf7577ce8ff9 download/openjpeg_v1_3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 7 23:37:48 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 May 2009 21:37:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[4759] csw/mgar/pkg Message-ID: Revision: 4759 http://gar.svn.sourceforge.net/gar/?rev=4759&view=rev Author: dmichelsen Date: 2009-05-07 21:37:48 +0000 (Thu, 07 May 2009) Log Message: ----------- poppler: Initial commit, unfinished Added Paths: ----------- csw/mgar/pkg/poppler/ csw/mgar/pkg/poppler/branches/ csw/mgar/pkg/poppler/tags/ csw/mgar/pkg/poppler/trunk/ csw/mgar/pkg/poppler/trunk/Makefile csw/mgar/pkg/poppler/trunk/checksums csw/mgar/pkg/poppler/trunk/files/ Property changes on: csw/mgar/pkg/poppler/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/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile (rev 0) +++ csw/mgar/pkg/poppler/trunk/Makefile 2009-05-07 21:37:48 UTC (rev 4759) @@ -0,0 +1,28 @@ +GARNAME = poppler +GARVERSION = 0.10.6 +CATEGORIES = lib + +DESCRIPTION = Poppler is a PDF rendering library based on the xpdf-3.0 code base +define BLURB +endef + +MASTER_SITES = http://poppler.freedesktop.org/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# 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 = + +BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +REQUIRED_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 +REQUIRED_PKGS += CSWjpeg CSWlibxml2 CSWzlib + +SPKG_SOURCEURL = http://poppler.freedesktop.org/ + +include gar/category.mk Added: csw/mgar/pkg/poppler/trunk/checksums =================================================================== --- csw/mgar/pkg/poppler/trunk/checksums (rev 0) +++ csw/mgar/pkg/poppler/trunk/checksums 2009-05-07 21:37:48 UTC (rev 4759) @@ -0,0 +1 @@ +e1a2d98ba5a4199f20d7637a7d79a829 download/poppler-0.10.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 8 03:53:46 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 08 May 2009 01:53:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[4760] csw/mgar/pkg/gcc4/trunk/files/package_def.mk Message-ID: Revision: 4760 http://gar.svn.sourceforge.net/gar/?rev=4760&view=rev Author: valholla Date: 2009-05-08 01:53:46 +0000 (Fri, 08 May 2009) Log Message: ----------- last check of required packages Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/files/package_def.mk Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-05-07 21:37:48 UTC (rev 4759) +++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-05-08 01:53:46 UTC (rev 4760) @@ -60,25 +60,20 @@ SPKG_DESC_CSWgcc4objcrt = GNU Objective C Compiler Run Time ## Define Dependencies -COMMON_REQUIRE = CSWiconv CSWlibgmp CSWlibmpfr CSWggettextrt -REQUIRED_PKGS_CSWgcc4adart = CSWgcc4corert $(COMMON_REQUIRE) -REQUIRED_PKGS_CSWgcc4ada = CSWgcc4core CSWgcc4corert -REQUIRED_PKGS_CSWgcc4ada += CSWgcc4adart $(COMMON_REQUIRE) -REQUIRED_PKGS_CSWgcc4corert = $(COMMON_REQUIRE) -REQUIRED_PKGS_CSWgcc4core = CSWgcc4corert CSWbinutils $(COMMON_REQUIRE) -REQUIRED_PKGS_CSWgcc4g++rt = CSWgcc4corert $(COMMON_REQUIRE) -REQUIRED_PKGS_CSWgcc4g++ = CSWgcc4core CSWgcc4corert -REQUIRED_PKGS_CSWgcc4g++ += CSWgcc4g++rt $(COMMON_REQUIRE) -REQUIRED_PKGS_CSWgcc4gfortranrt = CSWgcc4corert $(COMMON_REQUIRE) -REQUIRED_PKGS_CSWgcc4gfortran = CSWgcc4core CSWgcc4corert -REQUIRED_PKGS_CSWgcc4gfortran += CSWgcc4gfortranrt $(COMMON_REQUIRE) -REQUIRED_PKGS_CSWgcc4javart = CSWgcc4corert CSWgcc4g++rt $(COMMON_REQUIRE) -REQUIRED_PKGS_CSWgcc4java = CSWgcc4core CSWgcc4corert -REQUIRED_PKGS_CSWgcc4java += CSWgcc4javart CSWzlib -REQUIRED_PKGS_CSWgcc4java += CSWgcc4g++ CSWgcc4g++rt $(COMMON_REQUIRE) -REQUIRED_PKGS_CSWgcc4objcrt = CSWgcc4corert $(COMMON_REQUIRE) -REQUIRED_PKGS_CSWgcc4objc = CSWgcc4core CSWgcc4corert -REQUIRED_PKGS_CSWgcc4objc += CSWgcc4objcrt $(COMMON_REQUIRE) +REQUIRED_PKGS_CSWgcc4adart = CSWgcc4corert +REQUIRED_PKGS_CSWgcc4ada = CSWgcc4adart CSWiconv CSWlibgmp CSWlibmpfr +REQUIRED_PKGS_CSWgcc4core = CSWgcc4corert CSWbinutils CSWiconv +REQUIRED_PKGS_CSWgcc4core += CSWlibgmp CSWlibmpfr +REQUIRED_PKGS_CSWgcc4g++rt = CSWgcc4corert +REQUIRED_PKGS_CSWgcc4g++ = CSWgcc4g++rt CSWiconv CSWlibgmp CSWlibmpfr +REQUIRED_PKGS_CSWgcc4gfortranrt = CSWgcc4corert +REQUIRED_PKGS_CSWgcc4gfortran = CSWgcc4gfortranrt CSWiconv CSWlibgmp +REQUIRED_PKGS_CSWgcc4gfortran += CSWlibmpfr +REQUIRED_PKGS_CSWgcc4javart = CSWgcc4corert CSWgcc4g++rt +REQUIRED_PKGS_CSWgcc4java = CSWgcc4corert CSWgcc4javart +REQUIRED_PKGS_CSWgcc4java += CSWzlib CSWiconv CSWlibgmp CSWlibmpfr +REQUIRED_PKGS_CSWgcc4objcrt = CSWgcc4corert +REQUIRED_PKGS_CSWgcc4objc = CSWgcc4objcrt CSWiconv CSWlibgmp CSWlibmpfr DISTFILES += CSWgcc4core.space This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 8 11:12:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 May 2009 09:12:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4761] csw/mgar/pkg/libcairo/trunk/Makefile Message-ID: Revision: 4761 http://gar.svn.sourceforge.net/gar/?rev=4761&view=rev Author: dmichelsen Date: 2009-05-08 09:12:24 +0000 (Fri, 08 May 2009) Log Message: ----------- libcairo: Add additional required packages Modified Paths: -------------- csw/mgar/pkg/libcairo/trunk/Makefile Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2009-05-08 01:53:46 UTC (rev 4760) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2009-05-08 09:12:24 UTC (rev 4761) @@ -28,12 +28,15 @@ PKGFILES_CSWlibcairodoc = $(sharedstatedir)/gtk-doc.* PKGFILES_CSWlibcairodoc += $(docdir)/libcairo_doc/.* +PREREQUISITE_PKGS = CSWrenderdev + REQUIRED_PKGS_CSWlibcairo = CSWfconfig REQUIRED_PKGS_CSWlibcairo += CSWftype2 REQUIRED_PKGS_CSWlibcairo += CSWlibxrender REQUIRED_PKGS_CSWlibcairo += CSWpixman REQUIRED_PKGS_CSWlibcairo += CSWpng REQUIRED_PKGS_CSWlibcairo += CSWzlib +REQUIRED_PKGS_CSWlibcairo += CSWlibrsvg REQUIRED_PKGS_CSWlibcairodevel = CSWlibcairo REQUIRED_PKGS_CSWlibcairodoc = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri May 8 17:18:47 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 08 May 2009 15:18:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[4762] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 4762 http://gar.svn.sourceforge.net/gar/?rev=4762&view=rev Author: chninkel Date: 2009-05-08 15:18:47 +0000 (Fri, 08 May 2009) Log Message: ----------- lftp: updated to 3.7.13 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/Makefile 2009-05-08 09:12:24 UTC (rev 4761) +++ csw/mgar/pkg/lftp/trunk/Makefile 2009-05-08 15:18:47 UTC (rev 4762) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = lftp -GARVERSION = 3.7.11 +GARVERSION = 3.7.13 CATEGORIES = net DESCRIPTION = sophisticated command-line ftp/http client Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2009-05-08 09:12:24 UTC (rev 4761) +++ csw/mgar/pkg/lftp/trunk/checksums 2009-05-08 15:18:47 UTC (rev 4762) @@ -1,3 +1,3 @@ -6fe8793f3ccde1d2f8446d599d8a69a9 download/lftp-3.7.11.tar.gz +960f466cde7b6c4db0612808def9b5d1 download/lftp-3.7.13.tar.gz 5bc881a13c106b1c97f2137ff1755817 download/CSWlftp.prototype -98a4a42313ffba56431306ea49ea0600 download/changelog.CSW +5d17c8ca01bfb9d6cbc280347d11a998 download/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-05-08 09:12:24 UTC (rev 4761) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-05-08 15:18:47 UTC (rev 4762) @@ -1,3 +1,9 @@ +lftp (3.7.13,REV=2009.05.08) unstable + + * New upstream release. + + -- Yann Rouillard Fri, 08 May 2009 17:17:30 +0200 + lftp (3.7.11,REV=2009.03.29) unstable * Now uses cswpreserveconf class from cswclassutils to handle lftp.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 8 18:18:36 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 08 May 2009 16:18:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[4763] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4763 http://gar.svn.sourceforge.net/gar/?rev=4763&view=rev Author: valholla Date: 2009-05-08 16:18:33 +0000 (Fri, 08 May 2009) Log Message: ----------- add fast-cgi and fix post-install bug 3660 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-05-08 15:18:47 UTC (rev 4762) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-05-08 16:18:33 UTC (rev 4763) @@ -73,7 +73,6 @@ CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin CONFIGURE_ARGS += --enable-cli CONFIGURE_ARGS += --enable-fastcgi -CONFIGURE_ARGS += --enable-force-cgi-redirect CONFIGURE_ARGS += --enable-pcntl=shared CONFIGURE_ARGS += --enable-pdo=shared CONFIGURE_ARGS += --with-mm=$(prefix) @@ -93,6 +92,7 @@ # Copy over template config files and utility scripts PI_SCRIPTS = install-extras +PI_SCRIPTS += install-sapi-cgi PI_SCRIPTS += install-ap2modphp5 PI_SCRIPTS += install-modphp5 @@ -139,6 +139,17 @@ -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr ) @$(MAKECOOKIE) +install-sapi-cgi: + @( echo " ==> Now Building php-cgi <==" ) + @( if [ -f $(WORKSRC)/Makefile ]; then \ + $(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi ) + @( cd $(WORKSRC) && $(BUILD_ENV) \ + ./configure $(CONFIGURE_ARGS) --enable-force-cgi-redirect) + @( $(GARBIN)/fixlibtool $(WORKSRC) ) + @( $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi ) + @( strip $(DESTDIR)$(prefix)/php5/bin/php-cgi ) + @$(MAKECOOKIE) + EXTFILES = $(shell find extensions/*/files/* -prune -type f) pre-fetch: $(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR))) Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-08 15:18:47 UTC (rev 4762) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-08 16:18:33 UTC (rev 4763) @@ -1,7 +1,9 @@ #!/bin/sh +PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} PHP_LIB=$PKG_INSTALL_ROOT/opt/csw/php5/lib +PHP_BIN=$PKG_INSTALL_ROOT/opt/csw/php5/bin PHP_INI=$PHP_LIB/php.ini if [ ! -f $PHP_INI ]; then @@ -9,7 +11,8 @@ else echo "php.ini already exists" - extdir=`ls -d $PHP_LIB/php/extensions/no-debug-non-zts-* | xargs basename` + extdir_ext=`${PHP_BIN}/php -i |grep 'PHP Extension' |awk '{print $NF}'` + extdir="${PHP_LIB}/php/extensions/no-debug-non-zts-${extdir_ext}" curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' $PHP_INI` if [ "$extdir" != "$curextdir" ]; then @@ -123,6 +126,16 @@ _EOT_ fi fi +if [ ! -d ${extdir} ]; then + mkdir -p ${extdir} + for dir in `${PHP_BIN}/php -i |grep extension_dir |\ + awk -F'/' '{print $(NF-1), $NF}'`; do + chown -R root:bin ${dir} + chmod -R 0755 ${dir} + installf ${PKGINST} ${dir} + done + installf -f ${PKGINST} +fi echo "PHP5 configuration: $PHP_INI" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 8 19:56:19 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 08 May 2009 17:56:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[4764] csw/mgar/pkg/libffi/trunk Message-ID: Revision: 4764 http://gar.svn.sourceforge.net/gar/?rev=4764&view=rev Author: valholla Date: 2009-05-08 17:56:19 +0000 (Fri, 08 May 2009) Log Message: ----------- add requirements Modified Paths: -------------- csw/mgar/pkg/libffi/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/libffi/trunk/ Property changes on: csw/mgar/pkg/libffi/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Modified: csw/mgar/pkg/libffi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libffi/trunk/Makefile 2009-05-08 16:18:33 UTC (rev 4763) +++ csw/mgar/pkg/libffi/trunk/Makefile 2009-05-08 17:56:19 UTC (rev 4764) @@ -22,14 +22,16 @@ SPKG_DESC_CSWlibffi = $(DESCRIPTION) -#REQUIRED_PKGS_CSWlibffi += +REQUIRED_PKGS_CSWlibffi = CSWgcc4corert # We define upstream file regex so we can be notifed of # new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -GARCOMPILER = GNU +GARCOMPILER = GCC4 +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = TEST_TARGET = check include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 8 20:32:52 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 May 2009 18:32:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[4765] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 4765 http://gar.svn.sourceforge.net/gar/?rev=4765&view=rev Author: dmichelsen Date: 2009-05-08 18:32:52 +0000 (Fri, 08 May 2009) Log Message: ----------- mGAR v2: Fix redundant pathes for runtime linker and pkgconfig 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-08 17:56:19 UTC (rev 4764) +++ csw/mgar/gar/v2/gar.conf.mk 2009-05-08 18:32:52 UTC (rev 4765) @@ -448,15 +448,18 @@ # without expansion and needs to be differentiated between 32 and 64 bit, therefore # the links 32 and 64. +# NORUNPATH=1 means do not add any runpath +# NOISALIST=1 means add only direct pathes, no $ISALIST expansions + ifndef NORUNPATH # If we use $ISALIST it is a good idea to also add $MM_LIBDIR as there # may not be a subdirectory for the 32-bit standard case (this would normally # be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .). This is most likely -# the case for libraries in $(EXTRA_LIBS) for which no links generated in CSWcommon. -RUNPATH_DIRS ?= $(libpath_install) $(libdir_install) $(EXTRA_LIB) $(EXTRA_RUNPATH_DIRS) +# the case for libraries in $(EXTRA_LIB) for which no links generated in CSWcommon. +RUNPATH_DIRS ?= $(libpath_install) $(filter-out $(libpath_install),$(libdir_install)) $(EXTRA_LIB) $(EXTRA_RUNPATH_DIRS) ifndef NOISALIST -RUNPATH_ISALIST ?= $(libpath_install) $(libdir_install) $(EXTRA_LIB) $(EXTRA_RUNPATH_ISALIST) +RUNPATH_ISALIST ?= $(libpath_install) $(filter-out $(libpath_install),$(libdir_install)) $(EXTRA_LIB) $(EXTRA_RUNPATH_ISALIST) endif # Iterate over all directories in RUNPATH_DIRS, prefix each directory with one @@ -476,21 +479,13 @@ ASFLAGS ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(_CATEGORY_ASFLAGS) $(EXTRA_ASFLAGS)) OPTFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_OPTFLAGS) $(EXTRA_OPTFLAGS)) -GCC3_LD_OPTIONS = -R$(GCC3_CC_HOME)/lib $(EXTRA_GCC3_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) $(EXTRA_LD_OPTIONS) -GCC4_LD_OPTIONS = -R$(GCC4_CC_HOME)/lib $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) $(EXTRA_LD_OPTIONS) -SOS11_LD_OPTIONS = $(strip $(EXTRA_SOS11_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) $(EXTRA_LD_OPTIONS)) -SOS12_LD_OPTIONS = $(strip $(EXTRA_SOS12_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) $(EXTRA_LD_OPTIONS)) +GCC3_LD_OPTIONS = -R$(GCC3_CC_HOME)/lib $(EXTRA_GCC3_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) +GCC4_LD_OPTIONS = -R$(GCC4_CC_HOME)/lib $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) +SOS11_LD_OPTIONS = $(EXTRA_SOS11_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) +SOS12_LD_OPTIONS = $(EXTRA_SOS12_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) -LD_OPTIONS ?= $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) +LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) $(EXTRA_LD_OPTIONS)) -# LD_OPTIONS considered harmful. Disable for the moment. -#LDOPT_LIBS ?= $(libdir) -#ifdef NOISALIST -#LD_OPTIONS += $(foreach ELIB,$(addsuffix /$(MM_LIBDIR),$(LDOPT_LIBS)) $(EXTRA_LIB),-R$(abspath $(ELIB)/$(MM_LIBDIR))) -#else -#LD_OPTIONS += $(foreach ELIB,$(LDOPT_LIBS) $(EXTRA_LIB),-R$(ELIB)/\$$ISALIST -R$(ELIB)/$(MM_LIBDIR)) -#endif - # 1. Make sure everything works fine for SOS12 # 2. Allow us to use programs we just built. This is a bit complicated, # but we want PATH to be a recursive variable, or 'gmake isaenv' won't work @@ -498,7 +493,7 @@ PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(binpath_install)/$(MM_BINDIR)):$(DESTDIR)$(binpath_install):$(abspath $(DESTDIR)$(sbinpath_install)/$(MM_BINDIR)):$(DESTDIR)$(sbinpath_install):)$(abspath $(binpath_install)/$(MM_BINDIR)):$(binpath_install):$(abspath $(sbinpath_install)/$(MM_BINDIR)):$(sbinpath_install):$(CC_HOME)/bin:$(abspath $(GARBIN)):/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin:/usr/openwin/bin # This is for foo-config chaos -PKG_CONFIG_DIRS ?= $(libpath_install) $(libdir_install) $(EXTRA_PKG_CONFIG_DIRS) +PKG_CONFIG_DIRS ?= $(libpath_install) $(filter-out $(libpath_install),$(libdir_install)) $(EXTRA_PKG_CONFIG_DIRS) ifneq (,$(findstring $(origin PKG_CONFIG_PATH),undefined environment)) PKG_CONFIG_PATH = $(call MAKEPATH,$(foreach D,$(PKG_CONFIG_DIRS),$(abspath $D/$(MM_LIBDIR)/pkgconfig)) $(_CATEGORY_PKG_CONFIG_PATH) $(EXTRA_PKG_CONFIG_PATH)) endif @@ -566,7 +561,6 @@ COMMON_EXPORTS ?= $(DIRECTORY_EXPORTS) $(COMPILER_EXPORTS) $(GARPKG_EXPORTS) $(EXTRA_COMMON_EXPORTS) $(_CATEGORY_COMMON_EXPORTS) -# LD_OPTIONS = $(LINKER_FLAGS) ifneq ($(LD_OPTIONS),) COMMON_EXPORTS += LD_OPTIONS endif @@ -655,5 +649,6 @@ echo " CXXFLAGS = $(CXXFLAGS)"; \ echo " CPPFLAGS = $(CPPFLAGS)"; \ echo " LDFLAGS = $(LDFLAGS)"; \ + echo " LD_OPTIONS = $(LD_OPTIONS)"; \ echo " ASFLAGS = $(ASFLAGS)"; \ echo " OPTFLAGS = $(OPTFLAGS)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 8 22:42:23 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 08 May 2009 20:42:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[4766] csw/mgar/pkg/php5/trunk/files/CSWphp5.space Message-ID: Revision: 4766 http://gar.svn.sourceforge.net/gar/?rev=4766&view=rev Author: valholla Date: 2009-05-08 20:42:23 +0000 (Fri, 08 May 2009) Log Message: ----------- add space file Added Paths: ----------- csw/mgar/pkg/php5/trunk/files/CSWphp5.space Added: csw/mgar/pkg/php5/trunk/files/CSWphp5.space =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.space (rev 0) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.space 2009-05-08 20:42:23 UTC (rev 4766) @@ -0,0 +1 @@ +php 32 2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 8 22:56:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 May 2009 20:56:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[4767] csw/mgar/pkg Message-ID: Revision: 4767 http://gar.svn.sourceforge.net/gar/?rev=4767&view=rev Author: dmichelsen Date: 2009-05-08 20:56:05 +0000 (Fri, 08 May 2009) Log Message: ----------- xft: Prepare move to libxft2 Added Paths: ----------- csw/mgar/pkg/xft/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/libxft2/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 8 23:13:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 May 2009 21:13:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[4768] csw/mgar/pkg/libxft2/ Message-ID: Revision: 4768 http://gar.svn.sourceforge.net/gar/?rev=4768&view=rev Author: dmichelsen Date: 2009-05-08 21:13:34 +0000 (Fri, 08 May 2009) Log Message: ----------- xft: Prepare move to libxft2 Removed Paths: ------------- csw/mgar/pkg/libxft2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 8 23:18:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 May 2009 21:18:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[4769] csw/mgar/pkg Message-ID: Revision: 4769 http://gar.svn.sourceforge.net/gar/?rev=4769&view=rev Author: dmichelsen Date: 2009-05-08 21:18:27 +0000 (Fri, 08 May 2009) Log Message: ----------- xft: Move to libxft2 Added Paths: ----------- csw/mgar/pkg/libxft2/ Removed Paths: ------------- csw/mgar/pkg/xft/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 8 23:37:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 May 2009 21:37:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[4770] csw/mgar/pkg/libxft2/trunk Message-ID: Revision: 4770 http://gar.svn.sourceforge.net/gar/?rev=4770&view=rev Author: dmichelsen Date: 2009-05-08 21:37:31 +0000 (Fri, 08 May 2009) Log Message: ----------- libxft2: Update to dynamic gspec and 64 bit Modified Paths: -------------- csw/mgar/pkg/libxft2/trunk/Makefile csw/mgar/pkg/libxft2/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2.depend csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2.gspec csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2.prototype csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2dev.depend csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2dev.gspec csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2dev.prototype Property Changed: ---------------- csw/mgar/pkg/libxft2/trunk/ Property changes on: csw/mgar/pkg/libxft2/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libxft2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxft2/trunk/Makefile 2009-05-08 21:18:27 UTC (rev 4769) +++ csw/mgar/pkg/libxft2/trunk/Makefile 2009-05-08 21:37:31 UTC (rev 4770) @@ -4,40 +4,38 @@ DESCRIPTION = FreeType-based font drawing library for X define BLURB -Xft provides a client-side font API for X applications, making the FreeType font rasterizer available to X clients. Fontconfig is used for font specification resolution. Where available, the RENDER extension handles glyph drawing; otherwise, the core X protocol is used. + Xft provides a client-side font API for X applications, making the + FreeType font rasterizer available to X clients. Fontconfig is used + for font specification resolution. Where available, the RENDER + extension handles glyph drawing; otherwise, the core X protocol is used. endef -MASTER_SITES =http://xorg.freedesktop.org/releases/individual/lib/ -DISTFILES = libXft-$(GARVERSION).tar.gz -PKGDIST = libXft-$(GARVERSION).tar.gz +MASTER_SITES = http://xorg.freedesktop.org/releases/individual/lib/ +DISTNAME = libXft-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = libXft-(\d+(?:\.\d+)*).tar.gz -DISTFILES += CSWlibxft2.gspec CSWlibxft2.prototype CSWlibxft2.depend -DISTFILES += CSWlibxft2dev.gspec CSWlibxft2dev.prototype CSWlibxft2dev.depend -# DISTFILES += $(call admfiles,CSWlibxft2, depend) +PACKAGES = CSWlibxft2 CSWlibxft2dev -CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION -CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib +REQUIRED_PKGS_CSWlibxft2 = CSWfconfig CSWftype2 CSWlibxrender CSWzlib CSWlibx11 +REQUIRED_PKGS_CSWlibxft2dev = CSWlibxft2 -export CFLAGS CXXFLAGS LDFLAGS +EXTRA_CFLAGS = -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION +EXTRA_CXXFLAGS = -xlibmil -xlibmopt -features=tmplife -norunpath -TEST_SCRIPTS = none +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib GREP = ggrep -include gar/category.mk +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man +TEST_SCRIPTS = -test-none: - @$(MAKECOOKIE) +PKGFILES_CSWlibxft2dev = $(PKGFILES_DEVEL) -post-extract: - ( mv $(WORKDIR)/libXft-$(GARVERSION) $(WORKDIR)/$(GARNAME)-$(GARVERSION) ) - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) +include gar/category.mk Modified: csw/mgar/pkg/libxft2/trunk/checksums =================================================================== --- csw/mgar/pkg/libxft2/trunk/checksums 2009-05-08 21:18:27 UTC (rev 4769) +++ csw/mgar/pkg/libxft2/trunk/checksums 2009-05-08 21:37:31 UTC (rev 4770) @@ -1,7 +1 @@ 40ebc53da7efd520e528fa7a564863db download/libXft-2.1.13.tar.gz -8818f7c43dffaddf917728416ea3b14f download/CSWlibxft2.gspec -edc5cb1c814f69932be25bf79f6bce0c download/CSWlibxft2.prototype -1736d41103dc842a69fc4698807b058e download/CSWlibxft2.depend -f0f12695f657e87f2e1bb3b37204da15 download/CSWlibxft2dev.gspec -8cfe3fbf184539b7e0bbe94b9f8a44ea download/CSWlibxft2dev.prototype -7e1f39b438aa74669c8607148de92805 download/CSWlibxft2dev.depend Deleted: csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2.depend =================================================================== --- csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2.depend 2009-05-08 21:18:27 UTC (rev 4769) +++ csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2.depend 2009-05-08 21:37:31 UTC (rev 4770) @@ -1,4 +0,0 @@ -P CSWfconfig -P CSWftype2 -P CSWlibxrender -P CSWzlib Deleted: csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2.gspec =================================================================== --- csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2.gspec 2009-05-08 21:18:27 UTC (rev 4769) +++ csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2.gspec 2009-05-08 21:37:31 UTC (rev 4770) @@ -1,4 +0,0 @@ -%var bitname libxft2 -%var pkgname CSWlibxft2 -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2.prototype =================================================================== --- csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2.prototype 2009-05-08 21:18:27 UTC (rev 4769) +++ csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2.prototype 2009-05-08 21:37:31 UTC (rev 4770) @@ -1,16 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/xft-config 0755 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libXft.la 0755 root bin -f none /opt/csw/lib/libXft.so.2.1.13 0755 root bin -s none /opt/csw/lib/libXft.so.2=libXft.so.2.1.13 -s none /opt/csw/lib/libXft.so=libXft.so.2.1.13 -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/xft-config.1 0644 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Xft.3 0644 root bin -i copyright=CSWlibxft2.copyright -i depend=CSWlibxft2.depend -i pkginfo=CSWlibxft2.pkginfo Deleted: csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2dev.depend =================================================================== --- csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2dev.depend 2009-05-08 21:18:27 UTC (rev 4769) +++ csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2dev.depend 2009-05-08 21:37:31 UTC (rev 4770) @@ -1 +0,0 @@ -P CSWlibxft2 Deleted: csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2dev.gspec =================================================================== --- csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2dev.gspec 2009-05-08 21:18:27 UTC (rev 4769) +++ csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2dev.gspec 2009-05-08 21:37:31 UTC (rev 4770) @@ -1,4 +0,0 @@ -%var bitname libxft2dev -%var pkgname CSWlibxft2dev -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2dev.prototype =================================================================== --- csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2dev.prototype 2009-05-08 21:18:27 UTC (rev 4769) +++ csw/mgar/pkg/libxft2/trunk/files/CSWlibxft2dev.prototype 2009-05-08 21:37:31 UTC (rev 4770) @@ -1,11 +0,0 @@ -d none /opt/csw/include/X11 0755 root bin -d none /opt/csw/include/X11/Xft 0755 root bin -f none /opt/csw/include/X11/Xft/Xft.h 0644 root bin -f none /opt/csw/include/X11/Xft/XftCompat.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libXft.a 0644 root bin -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/xft.pc 0644 root bin -i copyright=CSWlibxft2dev.copyright -i depend=CSWlibxft2dev.depend -i pkginfo=CSWlibxft2dev.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat May 9 00:08:54 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 08 May 2009 22:08:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[4771] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 4771 http://gar.svn.sourceforge.net/gar/?rev=4771&view=rev Author: chninkel Date: 2009-05-08 22:08:54 +0000 (Fri, 08 May 2009) Log Message: ----------- lftp: updated changelog Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2009-05-08 21:37:31 UTC (rev 4770) +++ csw/mgar/pkg/lftp/trunk/checksums 2009-05-08 22:08:54 UTC (rev 4771) @@ -1,3 +1,3 @@ 960f466cde7b6c4db0612808def9b5d1 download/lftp-3.7.13.tar.gz 5bc881a13c106b1c97f2137ff1755817 download/CSWlftp.prototype -5d17c8ca01bfb9d6cbc280347d11a998 download/changelog.CSW +31bb98215099006b0142b3d9b5e373d1 download/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-05-08 21:37:31 UTC (rev 4770) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2009-05-08 22:08:54 UTC (rev 4771) @@ -1,8 +1,8 @@ -lftp (3.7.13,REV=2009.05.08) unstable +lftp (3.7.13,REV=2009.05.09) unstable * New upstream release. - -- Yann Rouillard Fri, 08 May 2009 17:17:30 +0200 + -- Yann Rouillard Fri, 09 May 2009 17:17:30 +0200 lftp (3.7.11,REV=2009.03.29) unstable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat May 9 00:47:31 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 May 2009 22:47:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[4772] csw/mgar/pkg/x11 Message-ID: Revision: 4772 http://gar.svn.sourceforge.net/gar/?rev=4772&view=rev Author: dmichelsen Date: 2009-05-08 22:47:31 +0000 (Fri, 08 May 2009) Log Message: ----------- x11/xcb-util: Initial checkin Added Paths: ----------- csw/mgar/pkg/x11/xcb-util/ csw/mgar/pkg/x11/xcb-util/branches/ csw/mgar/pkg/x11/xcb-util/tags/ csw/mgar/pkg/x11/xcb-util/trunk/ csw/mgar/pkg/x11/xcb-util/trunk/Makefile csw/mgar/pkg/x11/xcb-util/trunk/checksums csw/mgar/pkg/x11/xcb-util/trunk/files/ Property changes on: csw/mgar/pkg/x11/xcb-util/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/x11/xcb-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb-util/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/xcb-util/trunk/Makefile 2009-05-08 22:47:31 UTC (rev 4772) @@ -0,0 +1,30 @@ +GARNAME = xcb-util +GARVERSION = 0.3.4 +CATEGORIES = x11 + +DESCRIPTION = The XCB utility library +define BLURB +endef + +MASTER_SITES = http://xcb.freedesktop.org/dist/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PREREQUISITE_PKGS = CSWgnulinks +REQUIRED_PKGS = CSWlibxcb +PACKAGES = CSWxcbutil + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CATALOGNAME = xcbutil + +BUILD64 = 1 +NOISALIST = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +#EXTRA_CFLAGS = -D__solaris__ + +include gar/category.mk + +# We need GNU gm4 as m4 +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/x11/xcb-util/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xcb-util/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/xcb-util/trunk/checksums 2009-05-08 22:47:31 UTC (rev 4772) @@ -0,0 +1 @@ +47000719ed2a25b8d8a270a59ddaafe6 download/xcb-util-0.3.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat May 9 01:09:30 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 May 2009 23:09:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[4773] csw/mgar/pkg/libcairo/trunk/Makefile Message-ID: Revision: 4773 http://gar.svn.sourceforge.net/gar/?rev=4773&view=rev Author: dmichelsen Date: 2009-05-08 23:09:30 +0000 (Fri, 08 May 2009) Log Message: ----------- libcairo: Add xcb Modified Paths: -------------- csw/mgar/pkg/libcairo/trunk/Makefile Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2009-05-08 22:47:31 UTC (rev 4772) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2009-05-08 23:09:30 UTC (rev 4773) @@ -37,12 +37,16 @@ REQUIRED_PKGS_CSWlibcairo += CSWpng REQUIRED_PKGS_CSWlibcairo += CSWzlib REQUIRED_PKGS_CSWlibcairo += CSWlibrsvg +REQUIRED_PKGS_CSWlibcairo += CSWexpat +REQUIRED_PKGS_CSWlibcairo += CSWiconv +REQUIRED_PKGS_CSWlibcairo += CSWlibxcb +REQUIRED_PKGS_CSWlibcairo += CSWxcbutil + REQUIRED_PKGS_CSWlibcairodevel = CSWlibcairo REQUIRED_PKGS_CSWlibcairodoc = ARCHALL_CSWlibcairodoc = 1 -# Wait for libpixman, libfontconfig and libXrender to be 64 bit BUILD64 = 1 EXTRA_INC = $(prefix)/X11/include @@ -51,9 +55,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-tests --enable-xlib=yes --enable-xlib-xrender=yes --enable-ft=yes --with-x -CONFIGURE_ARGS += --enable-png=yes --enable-ps=yes --enable-pdf=yes --enable-svg=yes +CONFIGURE_ARGS += --enable-png=yes --enable-ps=yes --enable-pdf=yes --enable-svg=yes --enable-xcb=yes CONFIGURE_ARGS += --enable-gtk-doc --enable-test-surfaces=yes include gar/category.mk - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat May 9 01:10:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 May 2009 23:10:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[4774] csw/mgar/pkg/libcairo/trunk/Makefile Message-ID: Revision: 4774 http://gar.svn.sourceforge.net/gar/?rev=4774&view=rev Author: dmichelsen Date: 2009-05-08 23:10:50 +0000 (Fri, 08 May 2009) Log Message: ----------- libcairo: Add missing dependency Modified Paths: -------------- csw/mgar/pkg/libcairo/trunk/Makefile Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2009-05-08 23:09:30 UTC (rev 4773) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2009-05-08 23:10:50 UTC (rev 4774) @@ -39,6 +39,7 @@ REQUIRED_PKGS_CSWlibcairo += CSWlibrsvg REQUIRED_PKGS_CSWlibcairo += CSWexpat REQUIRED_PKGS_CSWlibcairo += CSWiconv +REQUIRED_PKGS_CSWlibcairo += CSWlibx11 REQUIRED_PKGS_CSWlibcairo += CSWlibxcb REQUIRED_PKGS_CSWlibcairo += CSWxcbutil This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat May 9 01:25:15 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 May 2009 23:25:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[4775] csw/mgar/pkg/pango/trunk/Makefile Message-ID: Revision: 4775 http://gar.svn.sourceforge.net/gar/?rev=4775&view=rev Author: dmichelsen Date: 2009-05-08 23:25:15 +0000 (Fri, 08 May 2009) Log Message: ----------- pango: Fix 64 bit x11 libs Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2009-05-08 23:10:50 UTC (rev 4774) +++ csw/mgar/pkg/pango/trunk/Makefile 2009-05-08 23:25:15 UTC (rev 4775) @@ -20,6 +20,11 @@ CATALOGNAME_CSWpangodevel = libpango_devel CATALOGNAME_CSWpangodoc = libpango_doc +PREREQUISITE_PKGS = CSWgtk-doc CSWlibxslt CSWglib2devel +REQUIRED_PKGS_CSWpango = CSWggettextrt CSWglib2 CSWfconfig CSWftype2 +REQUIRED_PKGS_CSWpango += CSWlibcairo CSWlibxft2 CSWlibxrender CSWzlib CSWlibx11 +REQUIRED_PKGS_CSWpangodevel = CSWpango + SPKG_SOURCEURL = http://www.pango.org/ # We define upstream file regex so we can be notifed of new upstream software release @@ -31,16 +36,13 @@ EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib BUILD64 = 1 -NO_ISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-x --enable-gtk-doc -# CONFIGURE_ARGS += --with-included-modules +NOISALIST = 1 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-x --enable-gtk-doc +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +# CONFIGURE_ARGS += --with-included-modules -PREREQUISITE_PKGS = CSWgtk-doc CSWlibxslt -REQUIRED_PKGS_CSWpango = CSWggettextrt CSWglib2 CSWfconfig CSWftype2 -REQUIRED_PKGS_CSWpango += CSWlibcairo CSWlibxft2 CSWlibxrender CSWzlib CSWlibx11 -REQUIRED_PKGS_CSWpangodevel = CSWpango - # Dynamic prototype PKGFILES_CSWpangodevel = $(PKGFILES_DEVEL) PKGFILES_CSWpangodoc = $(sharedstatedir)/gtk-doc/.* @@ -48,6 +50,8 @@ # Do not execute make test step TEST_SCRIPTS = +EXTRA_MERGE_EXCLUDE_FILES = .*/preload\.1\.gz + include gar/category.mk post-configure-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat May 9 01:27:27 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 May 2009 23:27:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[4776] csw/mgar/pkg/gtk2/trunk Message-ID: Revision: 4776 http://gar.svn.sourceforge.net/gar/?rev=4776&view=rev Author: dmichelsen Date: 2009-05-08 23:27:27 +0000 (Fri, 08 May 2009) Log Message: ----------- gtk2: Fix 64 bit build Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile csw/mgar/pkg/gtk2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gtk2/trunk/files/ csw/mgar/pkg/gtk2/trunk/files/fixme.sh Property Changed: ---------------- csw/mgar/pkg/gtk2/trunk/ Property changes on: csw/mgar/pkg/gtk2/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2009-05-08 23:25:15 UTC (rev 4775) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2009-05-08 23:27:27 UTC (rev 4776) @@ -1,8 +1,8 @@ GARNAME = gtk2 -GARVERSION = 2.4.3 +GARVERSION = 2.16.1 CATEGORIES = lib -DESCRIPTION = A library for creating graphical user interfaces. +DESCRIPTION = GTK+, the multiplatform X11 toolkit for GUI development define BLURB GTK, which stands for the Gimp ToolKit, is a library for creating graphical user interfaces. It is designed to be small and efficient, but still flexible @@ -16,23 +16,36 @@ # # #if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) -MASTER_SITES = ftp://ftp.gtk.org/pub/gtk/v2.4/ +MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.16/ DISTFILES = gtk+-$(GARVERSION).tar.bz2 +DISTFILES += fixme.sh + WORKSRC = $(WORKDIR)/gtk+-$(GARVERSION) -LIBDEPS += lib/atk -LIBDEPS += lib/pango -LIBDEPS += lib/xcursor -LIBDEPS += xtra/hicolor-icon-theme +PREREQUISITE_PKGS = CSWbash +SPKG_SOURCEURL = http://www.gtk.org/ + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-debug=yes -TEST_TARGET = check +#TEST_TARGET = check +# There is a test failing on Xvfb which may or may not be harmful. Disable for now. +TEST_TARGET = +TEST_OVERRIDE_DIRS = SHELL +SHELL = /opt/csw/bin/bash + include gar/category.mk -CFLAGS := -g $(CFLAGS) -CXXFLAGS := -g $(CXXFLAGS) -export CFLAGS CXXFLAGS +post-configure-modulated: + @echo " ==> Fixing libtool files" + @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/gtk2/trunk/checksums =================================================================== --- csw/mgar/pkg/gtk2/trunk/checksums 2009-05-08 23:25:15 UTC (rev 4775) +++ csw/mgar/pkg/gtk2/trunk/checksums 2009-05-08 23:27:27 UTC (rev 4776) @@ -1 +1,2 @@ -debfd0fcef08683c0761f13e1ba2dced download/gtk+-2.4.3.tar.bz2 +34f5b20f6caf282b2533784fbb1b4395 download/fixme.sh +74e35ff3e6e02c960fe2117a4b6b102f download/gtk+-2.16.1.tar.bz2 Copied: csw/mgar/pkg/gtk2/trunk/files/fixme.sh (from rev 4636, csw/mgar/pkg/fixme/trunk/fixme.sh) =================================================================== --- csw/mgar/pkg/gtk2/trunk/files/fixme.sh (rev 0) +++ csw/mgar/pkg/gtk2/trunk/files/fixme.sh 2009-05-08 23:27:27 UTC (rev 4776) @@ -0,0 +1,51 @@ +#!/bin/bash +#################################################### +# +# fixme.sh +# Intended to remove the use of libtool's +# pseudo-libraries for opencsw builds. +# +# Author: Mike Watters mwatters_at_opencsw.org +# Initial Version: 0.1 +# +#################################################### + +umask 0022 +PATH=/opt/csw/bin + +if [ $# -ne 1 ]; then + gecho "USAGE: $(basename $0) WORKSRC" + exit 1 +fi +BASEPATH=$1 + +## Fix Makefiles +for mk in $(gfind ${BASEPATH} -name Makefile -print); do + LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ + gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") + + for file in ${LT_FILES}; do + LIB_NAME=$(ggrep 'dlname=' ${file} | \ + gsed -e "s/.*'\(.*\)'/\1/" \ + -e "s/^lib//" \ + -e "s/\.so.*$//") + fixpath=$(gecho $file |gsed 's/\//\\\//g') + gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new + gmv Makefile.new ${mk} + gchmod +x ${mk} + done +done + +## Fix libtool Script +for lt in $(gfind ${BASEPATH} -name libtool -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new + gmv ${lt}.new ${lt} + gchmod +x ${lt} +done + +for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new + gmv ${LTMAIN}.new ${LTMAIN} + gchmod +x ${LTMAIN} +done + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat May 9 02:08:11 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 May 2009 00:08:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[4777] csw/mgar/pkg/libatk/trunk/ Message-ID: Revision: 4777 http://gar.svn.sourceforge.net/gar/?rev=4777&view=rev Author: dmichelsen Date: 2009-05-09 00:08:11 +0000 (Sat, 09 May 2009) Log Message: ----------- libatk: Move to mGAR v2 Property Changed: ---------------- csw/mgar/pkg/libatk/trunk/ Property changes on: csw/mgar/pkg/libatk/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.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. From dmichelsen at users.sourceforge.net Sat May 9 02:26:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 May 2009 00:26:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[4778] csw/mgar/pkg/gtk2/trunk/Makefile Message-ID: Revision: 4778 http://gar.svn.sourceforge.net/gar/?rev=4778&view=rev Author: dmichelsen Date: 2009-05-09 00:26:13 +0000 (Sat, 09 May 2009) Log Message: ----------- gtk2: Fix x11 pathes Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2009-05-09 00:08:11 UTC (rev 4777) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2009-05-09 00:26:13 UTC (rev 4778) @@ -24,6 +24,7 @@ WORKSRC = $(WORKDIR)/gtk+-$(GARVERSION) PREREQUISITE_PKGS = CSWbash +REQUIRED_PKGS = CSWjasper SPKG_SOURCEURL = http://www.gtk.org/ @@ -34,7 +35,8 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-debug=yes +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) #TEST_TARGET = check # There is a test failing on Xvfb which may or may not be harmful. Disable for now. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat May 9 02:30:13 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 May 2009 00:30:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[4779] csw/mgar/pkg/gtk2/trunk/Makefile Message-ID: Revision: 4779 http://gar.svn.sourceforge.net/gar/?rev=4779&view=rev Author: dmichelsen Date: 2009-05-09 00:30:13 +0000 (Sat, 09 May 2009) Log Message: ----------- gtk2 Add required packages Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2009-05-09 00:26:13 UTC (rev 4778) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2009-05-09 00:30:13 UTC (rev 4779) @@ -24,7 +24,8 @@ WORKSRC = $(WORKDIR)/gtk+-$(GARVERSION) PREREQUISITE_PKGS = CSWbash -REQUIRED_PKGS = CSWjasper +REQUIRED_PKGS = CSWjasper CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWjpeg CSWlibatk +REQUIRED_PKGS += CSWlibcairo CSWlibx11 CSWlibxrender CSWpango CSWpng CSWtiff CSWzlib SPKG_SOURCEURL = http://www.gtk.org/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sat May 9 04:16:13 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 09 May 2009 02:16:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[4780] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 4780 http://gar.svn.sourceforge.net/gar/?rev=4780&view=rev Author: valholla Date: 2009-05-09 02:16:13 +0000 (Sat, 09 May 2009) Log Message: ----------- fix fast-cgi Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-05-09 00:30:13 UTC (rev 4779) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-05-09 02:16:13 UTC (rev 4780) @@ -73,6 +73,7 @@ CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin CONFIGURE_ARGS += --enable-cli CONFIGURE_ARGS += --enable-fastcgi +CONFIGURE_ARGS += --enable-force-cgi-redirect CONFIGURE_ARGS += --enable-pcntl=shared CONFIGURE_ARGS += --enable-pdo=shared CONFIGURE_ARGS += --with-mm=$(prefix) @@ -92,7 +93,6 @@ # Copy over template config files and utility scripts PI_SCRIPTS = install-extras -PI_SCRIPTS += install-sapi-cgi PI_SCRIPTS += install-ap2modphp5 PI_SCRIPTS += install-modphp5 @@ -139,17 +139,6 @@ -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr ) @$(MAKECOOKIE) -install-sapi-cgi: - @( echo " ==> Now Building php-cgi <==" ) - @( if [ -f $(WORKSRC)/Makefile ]; then \ - $(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi ) - @( cd $(WORKSRC) && $(BUILD_ENV) \ - ./configure $(CONFIGURE_ARGS) --enable-force-cgi-redirect) - @( $(GARBIN)/fixlibtool $(WORKSRC) ) - @( $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi ) - @( strip $(DESTDIR)$(prefix)/php5/bin/php-cgi ) - @$(MAKECOOKIE) - EXTFILES = $(shell find extensions/*/files/* -prune -type f) pre-fetch: $(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR))) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sat May 9 04:28:45 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 09 May 2009 02:28:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[4781] csw/mgar/pkg/php5/trunk/checksums Message-ID: Revision: 4781 http://gar.svn.sourceforge.net/gar/?rev=4781&view=rev Author: valholla Date: 2009-05-09 02:28:44 +0000 (Sat, 09 May 2009) Log Message: ----------- fix checksums Modified Paths: -------------- csw/mgar/pkg/php5/trunk/checksums Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-05-09 02:16:13 UTC (rev 4780) +++ csw/mgar/pkg/php5/trunk/checksums 2009-05-09 02:28:44 UTC (rev 4781) @@ -4,11 +4,10 @@ 5f0046fe1b3f8e2228fdb165bdbbe73a download/CSWmodphp5.postinstall 2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space -41ce1e71884ec05db2ac678c48721a82 download/CSWphp5.postinstall +f82303f581e2e4bf11fe3bf10f332163 download/CSWphp5.postinstall 89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh de56d3571f4484284d106af158bffc38 download/CSWphp5_ext_enable.sh ab08e2ba62667bf13fa236099e433e84 download/configure.diff -41ec540885de7c34625768aa1fb9682b download/fixme.sh a71677d80f5cfd1aeb03547dfdeb705a download/httpd-php5.conf.CSW 2206431e47c2075c0b9c4a12de5cf791 download/odbc.diff 230126f76ee6400ccf225bb6a8243532 download/pdopgsql.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat May 9 10:19:16 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 May 2009 08:19:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[4782] csw/mgar/pkg/gtk2/trunk/Makefile Message-ID: Revision: 4782 http://gar.svn.sourceforge.net/gar/?rev=4782&view=rev Author: dmichelsen Date: 2009-05-09 08:19:16 +0000 (Sat, 09 May 2009) Log Message: ----------- gtk2: Split off devel and doc Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2009-05-09 02:28:44 UTC (rev 4781) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2009-05-09 08:19:16 UTC (rev 4782) @@ -23,9 +23,16 @@ WORKSRC = $(WORKDIR)/gtk+-$(GARVERSION) +PACKAGES = CSWgtk2 CSWgtk2devel CSWgtk2doc + +CATALOGNAME_CSWgtk2 = gtk2 +CATALOGNAME_CSWgtk2devel = gtk2_devel +CATALOGNAME_CSWgtk2doc = gtk2_doc + PREREQUISITE_PKGS = CSWbash -REQUIRED_PKGS = CSWjasper CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWjpeg CSWlibatk -REQUIRED_PKGS += CSWlibcairo CSWlibx11 CSWlibxrender CSWpango CSWpng CSWtiff CSWzlib +REQUIRED_PKGS_CSWgtk2 = CSWjasper CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWjpeg CSWlibatk +REQUIRED_PKGS_CSWgtk2 += CSWlibcairo CSWlibx11 CSWlibxrender CSWpango CSWpng CSWtiff CSWzlib +REQUIRED_PKGS_CSWgtk2devel = CSWgtk2 SPKG_SOURCEURL = http://www.gtk.org/ @@ -33,6 +40,8 @@ EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +NO_ISAEXEC = 1 +NOISALIST = 1 BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -46,6 +55,10 @@ TEST_OVERRIDE_DIRS = SHELL SHELL = /opt/csw/bin/bash +PKGFILES_CSWgtk2devel = $(PKGFILES_DEVEL) +PKGFILES_CSWgtk2devel += $(sharedstatedir)/gtk-2.0/demo/.* +PKGFILES_CSWgtk2doc = $(sharedstatedir)/gtk-doc/.* + include gar/category.mk post-configure-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat May 9 11:32:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 May 2009 09:32:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[4783] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 4783 http://gar.svn.sourceforge.net/gar/?rev=4783&view=rev Author: dmichelsen Date: 2009-05-09 09:32:24 +0000 (Sat, 09 May 2009) Log Message: ----------- mGAR v2: Fix typo in revision calculation 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-05-09 08:19:16 UTC (rev 4782) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-05-09 09:32:24 UTC (rev 4783) @@ -352,7 +352,7 @@ # URL: https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/pcre/trunk define _URL -$(if $(shell if test -x $(SVN); then echo yes; fi),$(shell $(SVN) info . 2>/dev/null | $(GAWK) '$$1 == "URL:" { print $$2 })) +$(if $(shell if test -x $(SVN); then echo yes; fi),$(shell $(SVN) info . 2>/dev/null | $(GAWK) '$$1 == "URL:" { print $$2 }')) endef # XXX: It is possible that a package is flagged as /isaexec, even This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat May 9 11:56:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 May 2009 09:56:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[4784] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 4784 http://gar.svn.sourceforge.net/gar/?rev=4784&view=rev Author: dmichelsen Date: 2009-05-09 09:56:33 +0000 (Sat, 09 May 2009) Log Message: ----------- mGAR v2: Simplify STRIP_LIBTOOL Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-05-09 09:32:24 UTC (rev 4783) +++ csw/mgar/gar/v2/gar.mk 2009-05-09 09:56:33 UTC (rev 4784) @@ -381,28 +381,18 @@ #CONFIGURE_BUILDDEPS = $(addprefix $(GARDIR)/,$(addsuffix /$(COOKIEROOTDIR)/build.d/install,$(BUILDDEPS))) endif -ifneq ($(STRIP_LIBTOOL),1) configure: pre-configure $(addprefix configure-,$(MODULATIONS)) post-configure @$(DONADA) configure-modulated: verify-isa patch-modulated $(CONFIGURE_IMGDEPS) $(CONFIGURE_BUILDDEPS) $(CONFIGURE_DEPS) \ $(addprefix srcdep-$(GARDIR)/,$(SOURCEDEPS)) \ - pre-configure-modulated pre-configure-$(MODULATION) $(CONFIGURE_TARGETS) post-configure-$(MODULATION) post-configure-modulated + pre-configure-modulated pre-configure-$(MODULATION) $(CONFIGURE_TARGETS) post-configure-$(MODULATION) post-configure-modulated $(if $(STRIP_LIBTOOL),strip-libtool) @$(DONADA) -else -configure: pre-configure $(addprefix configure-,$(MODULATIONS)) post-configure strip-libtool - @$(DONADA) -configure-modulated: verify-isa patch-modulated $(CONFIGURE_IMGDEPS) $(CONFIGURE_BUILDDEPS) $(CONFIGURE_DEPS) \ - $(addprefix srcdep-$(GARDIR)/,$(SOURCEDEPS)) \ - pre-configure-modulated pre-configure-$(MODULATION) $(CONFIGURE_TARGETS) post-configure-$(MODULATION) post-configure-modulated strip-libtool - @$(DONADA) -endif - strip-libtool: @echo '[===== Stripping Libtool =====]' fixlibtool $(WORKSRC) - @$(DONADA) + @$(MAKECOOKIE) .PHONY: reset-configure reset-configure-modulated reconfigure: reset-configure configure This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat May 9 17:22:10 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 May 2009 15:22:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[4785] csw/mgar/pkg/x11/Makefile Message-ID: Revision: 4785 http://gar.svn.sourceforge.net/gar/?rev=4785&view=rev Author: dmichelsen Date: 2009-05-09 15:22:09 +0000 (Sat, 09 May 2009) Log Message: ----------- mGAR v2: Enhance newpkg-% in x11-category Modified Paths: -------------- csw/mgar/pkg/x11/Makefile Modified: csw/mgar/pkg/x11/Makefile =================================================================== --- csw/mgar/pkg/x11/Makefile 2009-05-09 09:56:33 UTC (rev 4784) +++ csw/mgar/pkg/x11/Makefile 2009-05-09 15:22:09 UTC (rev 4785) @@ -35,10 +35,9 @@ echo ""; \ echo "MASTER_SITES = "; \ echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ - echo "DISTFILES += $$(call admfiles,CSWpackage,)"; \ echo ""; \ echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ - echo "UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo "UFILES_REGEX = $$(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ echo ""; \ echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ @@ -48,15 +47,15 @@ echo ""; \ echo "include gar/category.mk"; \ ) > $*/trunk/Makefile - @svn add $*/trunk/Makefile - @(echo "%var bitname package"; \ - echo "%var pkgname CSWpackage"; \ - echo "%include url file://%{PKGLIB}/csw_dyndepend.gspec";\ - echo "%copyright url file://%{WORKSRC}/LICENSE"; \ - ) > $*/trunk/files/CSWpackage.gspec + @touch $*/trunk/checksums + @svn add $*/trunk/Makefile $*/trunk/checksums @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk - @svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar + @if [ -d ../../gar/v2 ]; then \ + ln -s ../../../../gar/v2 $*/trunk/gar; \ + else \ + svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \ + fi @echo @echo "Your package is set up for editing at $*/trunk" @echo "Please don't forget to add the gspec-file!" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat May 9 17:30:18 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 May 2009 15:30:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[4786] csw/mgar/pkg/pango/trunk Message-ID: Revision: 4786 http://gar.svn.sourceforge.net/gar/?rev=4786&view=rev Author: dmichelsen Date: 2009-05-09 15:30:18 +0000 (Sat, 09 May 2009) Log Message: ----------- pango: Use STRIP_LIBTOOL Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile csw/mgar/pkg/pango/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/pango/trunk/files/fixme.sh Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2009-05-09 15:22:09 UTC (rev 4785) +++ csw/mgar/pkg/pango/trunk/Makefile 2009-05-09 15:30:18 UTC (rev 4786) @@ -12,8 +12,7 @@ MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/pango/1.24/ DISTNAME = pango-$(GARVERSION) -DISTFILES = $(DISTNAME).tar.bz2 -DISTFILES += fixme.sh +DISTFILES = $(DISTNAME).tar.bz2 PACKAGES = CSWpango CSWpangodevel CSWpangodoc CATALOGNAME_CSWpango = libpango @@ -43,6 +42,8 @@ CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) # CONFIGURE_ARGS += --with-included-modules +STRIP_LIBTOOL = 1 + # Dynamic prototype PKGFILES_CSWpangodevel = $(PKGFILES_DEVEL) PKGFILES_CSWpangodoc = $(sharedstatedir)/gtk-doc/.* @@ -54,9 +55,3 @@ include gar/category.mk -post-configure-modulated: - @echo " ==> Fixing libtool files" - @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) - @$(MAKECOOKIE) - - Modified: csw/mgar/pkg/pango/trunk/checksums =================================================================== --- csw/mgar/pkg/pango/trunk/checksums 2009-05-09 15:22:09 UTC (rev 4785) +++ csw/mgar/pkg/pango/trunk/checksums 2009-05-09 15:30:18 UTC (rev 4786) @@ -1,2 +1 @@ -34f5b20f6caf282b2533784fbb1b4395 download/fixme.sh 7bc6c884d847cabc613e4c6d663771f5 download/pango-1.24.2.tar.bz2 Deleted: csw/mgar/pkg/pango/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/pango/trunk/files/fixme.sh 2009-05-09 15:22:09 UTC (rev 4785) +++ csw/mgar/pkg/pango/trunk/files/fixme.sh 2009-05-09 15:30:18 UTC (rev 4786) @@ -1,51 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} - gchmod +x ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} - gchmod +x ${lt} -done - -for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} - gchmod +x ${LTMAIN} -done - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun May 10 12:09:56 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 May 2009 10:09:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[4787] csw/mgar/pkg/socat/trunk Message-ID: Revision: 4787 http://gar.svn.sourceforge.net/gar/?rev=4787&view=rev Author: skayser Date: 2009-05-10 10:09:55 +0000 (Sun, 10 May 2009) Log Message: ----------- socat: removed gcc flags from configure.in to enable AC_TRY_COMPILEs Modified Paths: -------------- csw/mgar/pkg/socat/trunk/checksums csw/mgar/pkg/socat/trunk/files/cc_compile.patch Modified: csw/mgar/pkg/socat/trunk/checksums =================================================================== --- csw/mgar/pkg/socat/trunk/checksums 2009-05-09 15:30:18 UTC (rev 4786) +++ csw/mgar/pkg/socat/trunk/checksums 2009-05-10 10:09:55 UTC (rev 4787) @@ -1,3 +1,2 @@ -82967132b5a8ca4d07e54370fdcb2662 download/socat-1.7.0.0.tar.gz -06fac9e8c6e979e163630163238296d8 download/cc_compile.patch -0f34e654b9a652278fa2fd1b36d51469 download/patch-test.diff +a3a68cabdfd9145aa6570fc4777be45c download/cc_compile.patch +52b0216607e35bdfba247560fb85dd82 download/socat-1.7.1.1.tar.gz Modified: csw/mgar/pkg/socat/trunk/files/cc_compile.patch =================================================================== --- csw/mgar/pkg/socat/trunk/files/cc_compile.patch 2009-05-09 15:30:18 UTC (rev 4786) +++ csw/mgar/pkg/socat/trunk/files/cc_compile.patch 2009-05-10 10:09:55 UTC (rev 4787) @@ -22,3 +22,32 @@ fi export CFLAGS +--- socat-1.7.1.1.orig/configure.in 2009-05-10 11:44:36.045547843 +0200 ++++ socat-1.7.1.1/configure.in 2009-05-10 11:38:07.477274940 +0200 +@@ -84,7 +84,7 @@ + dnl Check for hstrerror prototype + AC_MSG_CHECKING(for hstrerror prototype) + AC_CACHE_VAL(sc_cv_have_prototype_hstrerror, +-[CFLAGS1="$CFLAGS"; CFLAGS="-Werror -O0 $CFLAGS1"; ++[CFLAGS1="$CFLAGS"; CFLAGS="-errwarn $CFLAGS1"; + AC_TRY_COMPILE([#include ],[hstrerror();], + [sc_cv_have_prototype_hstrerror=no], + [sc_cv_have_prototype_hstrerror=yes]); +@@ -1296,7 +1296,7 @@ + dnl 5..long, 6..u-long; others not yet supported + define(AC_BASIC_TYPE,[ + AC_CACHE_CHECK(for equivalent simple type of $2, $4, +-[CFLAGS1="$CFLAGS"; CFLAGS="-Werror -O0 $CFLAGS1" ++[CFLAGS1="$CFLAGS"; CFLAGS="-errwarn $CFLAGS1" + AC_TRY_COMPILE([$1],[$2 u; short v; &u==&v;], + [$4="1 /* short */"], + [AC_TRY_COMPILE([$1],[$2 u; unsigned short v; &u==&v;], +@@ -1328,7 +1328,7 @@ + dnl arg5: cache variable (might be constructed automatically) + define(AC_TYPEOF_COMPONENT,[ + AC_CACHE_CHECK(for basic type of $2.$3, $5, +-[CFLAGS1="$CFLAGS"; CFLAGS="-Werror -O0 $CFLAGS1" ++[CFLAGS1="$CFLAGS"; CFLAGS="-errwarn $CFLAGS1" + AC_TRY_COMPILE([$1],[$2 u;short v; &u.$3==&v;], + [$5="1 /* short */"], + [AC_TRY_COMPILE([$1],[$2 u; unsigned short v; &u.$3==&v;], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sun May 10 12:57:50 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sun, 10 May 2009 10:57:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[4788] csw/mgar/pkg/nginx/trunk/checksums Message-ID: Revision: 4788 http://gar.svn.sourceforge.net/gar/?rev=4788&view=rev Author: aigoshin Date: 2009-05-10 10:57:50 +0000 (Sun, 10 May 2009) Log Message: ----------- nginx: milestone 3.0 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2009-05-10 10:09:55 UTC (rev 4787) +++ csw/mgar/pkg/nginx/trunk/checksums 2009-05-10 10:57:50 UTC (rev 4788) @@ -4,4 +4,4 @@ e9178dc33f2d38aab8f118a8f0550ac7 download/CSWnginx.preremove 5c832758a62ee319ea9dfd1829d736eb download/cswnginx.xml 15cce6102a2efcf4d4acde9bb71ea6d3 download/nginx-0.6.36.tar.gz -02b720d1ff091b7d2ab005b4db223345 download/svc-cswnginx +c5b3babbd1261bcb3f3e17494822bb9f download/svc-cswnginx This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sun May 10 13:36:24 2009 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sun, 10 May 2009 11:36:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[4789] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 4789 http://gar.svn.sourceforge.net/gar/?rev=4789&view=rev Author: aigoshin Date: 2009-05-10 11:36:24 +0000 (Sun, 10 May 2009) Log Message: ----------- nginx: milestone 3.0 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 2009-05-10 10:57:50 UTC (rev 4788) +++ csw/mgar/pkg/nginx/trunk/Makefile 2009-05-10 11:36:24 UTC (rev 4789) @@ -1,5 +1,5 @@ GARNAME = nginx -GARVERSION = $(NGINX_VERSION) +GARVERSION = 0.7.55 CATEGORIES = server DESCRIPTION = HTTP server and mail proxy server @@ -16,7 +16,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWosslrt CSWpcrert CSWzlib +REQUIRED_PKGS = CSWosslrt CSWpcrert CSWzlib EXTRA_BUILD_ISAS_i386 = pentium_pro EXTRA_BUILD_ISAS_sparc = sparcv9 Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2009-05-10 10:57:50 UTC (rev 4788) +++ csw/mgar/pkg/nginx/trunk/checksums 2009-05-10 11:36:24 UTC (rev 4789) @@ -3,5 +3,5 @@ bb404771e330fe98f93cb2d12a808121 download/CSWnginx.postinstall e9178dc33f2d38aab8f118a8f0550ac7 download/CSWnginx.preremove 5c832758a62ee319ea9dfd1829d736eb download/cswnginx.xml -15cce6102a2efcf4d4acde9bb71ea6d3 download/nginx-0.6.36.tar.gz +2064dc7a1ef082eb584e3a75857853f1 download/nginx-0.7.55.tar.gz c5b3babbd1261bcb3f3e17494822bb9f download/svc-cswnginx This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun May 10 13:58:31 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 May 2009 11:58:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[4790] csw/mgar/pkg/socat/trunk Message-ID: Revision: 4790 http://gar.svn.sourceforge.net/gar/?rev=4790&view=rev Author: skayser Date: 2009-05-10 11:58:31 +0000 (Sun, 10 May 2009) Log Message: ----------- socat: version bump, fixed autoconf tests for netinet/ip.h Modified Paths: -------------- csw/mgar/pkg/socat/trunk/Makefile csw/mgar/pkg/socat/trunk/checksums Added Paths: ----------- csw/mgar/pkg/socat/trunk/files/patch-configure-netinetip.diff Modified: csw/mgar/pkg/socat/trunk/Makefile =================================================================== --- csw/mgar/pkg/socat/trunk/Makefile 2009-05-10 11:36:24 UTC (rev 4789) +++ csw/mgar/pkg/socat/trunk/Makefile 2009-05-10 11:58:31 UTC (rev 4790) @@ -1,5 +1,5 @@ GARNAME = socat -GARVERSION = 1.7.0.0 +GARVERSION = 1.7.1.1 CATEGORIES = net DESCRIPTION = Multipurpose relay for bidirectional data transfer @@ -22,9 +22,10 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# Disable gcc specific options +# Delete or substitute gcc specific options (-Wall, -Werror, -O0) PATCHFILES = cc_compile.patch - +# Amend AC_CHECK_HEADERS check on netinet/ip.h with req. system headers +PATCHFILES += patch-configure-netinetip.diff # Fix some broken tests (pending to push some of it upstream) PATCHFILES += patch-test.diff Modified: csw/mgar/pkg/socat/trunk/checksums =================================================================== --- csw/mgar/pkg/socat/trunk/checksums 2009-05-10 11:36:24 UTC (rev 4789) +++ csw/mgar/pkg/socat/trunk/checksums 2009-05-10 11:58:31 UTC (rev 4790) @@ -1,2 +1,4 @@ a3a68cabdfd9145aa6570fc4777be45c download/cc_compile.patch +76ce5e07c1b8925b33e664accefa1923 download/patch-configure-netinetip.diff +0f34e654b9a652278fa2fd1b36d51469 download/patch-test.diff 52b0216607e35bdfba247560fb85dd82 download/socat-1.7.1.1.tar.gz Added: csw/mgar/pkg/socat/trunk/files/patch-configure-netinetip.diff =================================================================== --- csw/mgar/pkg/socat/trunk/files/patch-configure-netinetip.diff (rev 0) +++ csw/mgar/pkg/socat/trunk/files/patch-configure-netinetip.diff 2009-05-10 11:58:31 UTC (rev 4790) @@ -0,0 +1,17 @@ +--- socat-1.7.1.1/configure.in.orig 2009-05-10 12:24:59.504739652 +0200 ++++ socat-1.7.1.1/configure.in 2009-05-10 12:25:36.909419428 +0200 +@@ -53,7 +53,13 @@ + AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/param.h sys/ioctl.h sys/time.h syslog.h unistd.h) + AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h) + AC_CHECK_HEADERS(pty.h) +-AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h netinet/ip.h netinet/tcp.h) ++AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h) ++AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT ++ #if HAVE_NETINET_IN_H && HAVE_NETINET_IN_SYSTM_H ++ #include ++ #include ++ #endif]) # Solaris prerequisites for netinet/ip.h ++AC_CHECK_HEADERS(netinet/tcp.h) + AC_CHECK_HEADERS(netinet6/in6.h) # found on OpenBSD, used for IPV6_* + AC_CHECK_HEADERS(net/if.h, [], [], [AC_INCLUDES_DEFAULT + #if HAVE_SYS_SOCKET_H This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun May 10 17:07:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 10 May 2009 15:07:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[4791] csw/mgar/pkg/x11/libxcb/trunk/Makefile Message-ID: Revision: 4791 http://gar.svn.sourceforge.net/gar/?rev=4791&view=rev Author: dmichelsen Date: 2009-05-10 15:07:05 +0000 (Sun, 10 May 2009) Log Message: ----------- x11/libxcb: Add package for documentation Modified Paths: -------------- csw/mgar/pkg/x11/libxcb/trunk/Makefile Modified: csw/mgar/pkg/x11/libxcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-05-10 11:58:31 UTC (rev 4790) +++ csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-05-10 15:07:05 UTC (rev 4791) @@ -11,7 +11,7 @@ MASTER_SITES = http://xcb.freedesktop.org/dist/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PREREQUISITE_PKGS = CSWlibxaudevel CSWlibpthreadstubs CSWdoxygen CSWpython CSWxcbproto +PREREQUISITE_PKGS = CSWlibxaudevel CSWlibpthreadstubs CSWdoxygen CSWpython CSWxcbproto CSWgraphviz2 REQUIRED_PKGS_CSWlibxcb = CSWlibxau PACKAGES = CSWlibxcb CSWlibxcbdevel CSWlibxcbdoc @@ -40,3 +40,5 @@ include gar/category.mk +PATH := $(PATH):/opt/csw/graphviz2/bin + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun May 10 17:31:54 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 May 2009 15:31:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[4792] csw/mgar/pkg/socat/trunk Message-ID: Revision: 4792 http://gar.svn.sourceforge.net/gar/?rev=4792&view=rev Author: skayser Date: 2009-05-10 15:31:54 +0000 (Sun, 10 May 2009) Log Message: ----------- socat: adjustments to test.sh for IPv6 tests on non-IPv6 systems Modified Paths: -------------- csw/mgar/pkg/socat/trunk/Makefile csw/mgar/pkg/socat/trunk/checksums csw/mgar/pkg/socat/trunk/files/patch-test.diff Added Paths: ----------- csw/mgar/pkg/socat/trunk/files/patch-sycls-utils.diff Modified: csw/mgar/pkg/socat/trunk/Makefile =================================================================== --- csw/mgar/pkg/socat/trunk/Makefile 2009-05-10 15:07:05 UTC (rev 4791) +++ csw/mgar/pkg/socat/trunk/Makefile 2009-05-10 15:31:54 UTC (rev 4792) @@ -4,13 +4,13 @@ DESCRIPTION = Multipurpose relay for bidirectional data transfer define BLURB - socat is a relay for bidirectional data transfer between two independent - data channels. Each of these data channels may be a file, pipe, device - (serial line etc. or a pseudo terminal), a socket (UNIX, IP4, IP6 - raw, - UDP, TCP), an SSL socket, proxy CONNECT connection, a file descriptor - (stdin etc.), the GNU line editor (readline), a program, or a - combination of two of these. These modes include generation of - "listening" sockets, named pipes, and pseudo terminals. + socat is a relay for bidirectional data transfer between two independent + data channels. Each of these data channels may be a file, pipe, device + (serial line etc. or a pseudo terminal), a socket (UNIX, IP4, IP6 - raw, + UDP, TCP), an SSL socket, proxy CONNECT connection, a file descriptor + (stdin etc.), the GNU line editor (readline), a program, or a + combination of two of these. These modes include generation of + "listening" sockets, named pipes, and pseudo terminals. endef MASTER_SITES = http://www.dest-unreach.org/socat/download/ @@ -28,51 +28,44 @@ PATCHFILES += patch-configure-netinetip.diff # Fix some broken tests (pending to push some of it upstream) PATCHFILES += patch-test.diff +# Include utils.h in sycls.c so that setenv() is declared +PATCHFILES += patch-sycls-utils.diff CONFIGURE_ARGS = $(DIRPATHS) -# 250+ tests take a while. Run them manually when packaging a new version +# 250+ tests take a while. Run them manually when packaging a new version. +# To do so, change to $(WORKSRC) after building and execute ./test.sh TEST_SCRIPTS = # When you run the tests on a non IPV6 system you can set HAVENOT_IP6 # to shortcut some tests #TEST_ENV="HAVENOT_IP6=1" +# socat 1.7.1.1: +# -------------- # Running test.sh on a non IPV6 system as root i get: # -# summary: 276 tests; 149 ok, 19 failed, 107 could not be performed +# summary: 282 tests; 145 ok, 8 failed, 129 could not be performed # -# The 19 FAILED ones are +# The 8 FAILED ones are # -# test 123 PTMXWAITSLAVE: test if master pty (ptmx) waits for slave connection -# test 208 UDP4SCM_IP_OPTIONS: UDP4 log ancillary message IP_OPTIONS options -# test 210 UDP4SCM_IP_TTL: UDP4 log ancillary message IP_TTL ttl -# test 215 UDP4SCM_IP_RECVIF: UDP4 log ancillary message IP_RECVIF if -# test 216 UDP4SCM_IP_RECVDSTADDR: UDP4 log ancillary message IP_RECVDSTADDR dstaddr -# test 217 IP4SCM_IP_OPTIONS: IP4 log ancillary message IP_OPTIONS options -# test 219 IP4SCM_IP_TTL: IP4 log ancillary message IP_TTL ttl -# test 224 IP4SCM_IP_RECVIF: IP4 log ancillary message IP_RECVIF if -# test 225 IP4SCM_IP_RECVDSTADDR: IP4 log ancillary message IP_RECVDSTADDR dstaddr +# 126 PTMXWAITSLAVE: test if master pty (ptmx) waits for slave connection +# 214 UDP4SCM_IP_OPTIONS: UDP4 log ancillary message IP_OPTIONS options +# 221 UDP4SCM_IP_RECVIF: UDP4 log ancillary message IP_RECVIF if +# 222 UDP4SCM_IP_RECVDSTADDR: UDP4 log ancillary message IP_RECVDSTADDR dstaddr +# 246 UDP4ENV_IP_OPTIONS: UDP4 ancillary message brings IP_OPTIONS into env +# 248 UDP4ENV_IP_TTL: UDP4 ancillary message brings IP_TTL into environment +# 253 UDP4ENV_IP_IF: UDP4 ancillary message brings IP_IF into environment +# 254 UDP4ENV_IP_DSTADDR: UDP4 ancillary message brings IP_DSTADDR into env # -# test 234 TCP4LISTENENV: TCP4-LISTEN fills environment variables with socket addresses -# test 239 UNIXLISTENENV: UNIX-LISTEN fills environment variables with socket addresses +# Most of them (all of them?) relate to ancillary data. Seems as if there are +# two competing socket libraries on Solaris: 3SOCKET and 3XNET, where only the +# latter handles ancillary data. # -# test 240 UDP4ENV_IP_OPTIONS: UDP4 ancillary message brings IP_OPTIONS into environment -# test 242 UDP4ENV_IP_TTL: UDP4 ancillary message brings IP_TTL into environment -# test 247 UDP4ENV_IP_IF: UDP4 ancillary message brings IP_IF into environment -# test 248 UDP4ENV_IP_DSTADDR: UDP4 ancillary message brings IP_DSTADDR into environment -# test 249 IP4ENV_IP_OPTIONS: IP4 ancillary message brings IP_OPTIONS into environment -# test 251 IP4ENV_IP_TTL: IP4 ancillary message brings IP_TTL into environment -# test 256 IP4ENV_IP_IF: IP4 ancillary message brings IP_IF into environment -# test 257 IP4ENV_IP_DSTADDR: IP4 ancillary message brings IP_DSTADDR into environment -# -# Most of them (all of them?) relate to ancillary data. Seems as if there are two -# competing socket libraries on Solaris: 3SOCKET and 3XNET, where only the latter -# handles ancillary data. -# # http://www.mail-archive.com/networking-discuss at opensolaris.org/msg01146.html # -# 3XNET is only defined when using SUS/XPG4v2 feature macros. socat README suggests +# 3XNET is only defined when using SUS/XPG4v2 feature macros. socat README +# suggests # # EXTRA_CFLAGS = -D_XPG4_2 -D__EXTENSIONS__ # @@ -92,8 +85,8 @@ # # ./test.sh # -# where TESTNAME is one of the uppercase testnames from above (for example PTMXWAITSLAVE). -# +# where TESTNAME is one of the uppercase testnames from above +# (for example PTMXWAITSLAVE). include gar/category.mk Modified: csw/mgar/pkg/socat/trunk/checksums =================================================================== --- csw/mgar/pkg/socat/trunk/checksums 2009-05-10 15:07:05 UTC (rev 4791) +++ csw/mgar/pkg/socat/trunk/checksums 2009-05-10 15:31:54 UTC (rev 4792) @@ -1,4 +1,5 @@ a3a68cabdfd9145aa6570fc4777be45c download/cc_compile.patch 76ce5e07c1b8925b33e664accefa1923 download/patch-configure-netinetip.diff -0f34e654b9a652278fa2fd1b36d51469 download/patch-test.diff +b6863876e1e8deac45015662f04cb683 download/patch-sycls-utils.diff +f8d2e302f66b98b5e2236dee155d32be download/patch-test.diff 52b0216607e35bdfba247560fb85dd82 download/socat-1.7.1.1.tar.gz Added: csw/mgar/pkg/socat/trunk/files/patch-sycls-utils.diff =================================================================== --- csw/mgar/pkg/socat/trunk/files/patch-sycls-utils.diff (rev 0) +++ csw/mgar/pkg/socat/trunk/files/patch-sycls-utils.diff 2009-05-10 15:31:54 UTC (rev 4792) @@ -0,0 +1,10 @@ +--- socat-1.7.1.1.orig/sycls.c 2009-05-10 16:55:51.012555282 +0200 ++++ socat-1.7.1.1/sycls.c 2009-05-10 16:56:21.819201100 +0200 +@@ -18,6 +18,7 @@ + + #include "error.h" + #include "filan.h" ++#include "utils.h" + #include "sysutils.h" + #include "sycls.h" + Modified: csw/mgar/pkg/socat/trunk/files/patch-test.diff =================================================================== --- csw/mgar/pkg/socat/trunk/files/patch-test.diff 2009-05-10 15:07:05 UTC (rev 4791) +++ csw/mgar/pkg/socat/trunk/files/patch-test.diff 2009-05-10 15:31:54 UTC (rev 4792) @@ -1,33 +1,34 @@ -diff --speed-large-files --minimal -Nru socat-1.7.0.0.orig/readline-test.sh socat-1.7.0.0/readline-test.sh ---- socat-1.7.0.0.orig/readline-test.sh 2008-09-22 22:33:30.000000000 +0200 -+++ socat-1.7.0.0/readline-test.sh 2009-03-19 20:57:41.847390097 +0100 +diff -ur socat-1.7.1.1.orig/readline-test.sh socat-1.7.1.1/readline-test.sh +--- socat-1.7.1.1.orig/readline-test.sh 2009-04-02 09:32:48.000000000 +0200 ++++ socat-1.7.1.1/readline-test.sh 2009-05-10 16:36:54.125213675 +0200 @@ -1,4 +1,4 @@ -#! /bin/bash +#! /opt/csw/bin/bash # source: readline-test.sh # Copyright Gerhard Rieger 2003-2008 # Published under the GNU General Public License V.2, see file COPYING -diff --speed-large-files --minimal -Nru socat-1.7.0.0.orig/test.sh socat-1.7.0.0/test.sh ---- socat-1.7.0.0.orig/test.sh 2008-10-14 19:16:32.000000000 +0200 -+++ socat-1.7.0.0/test.sh 2009-03-19 20:57:29.843380940 +0100 +diff -ur socat-1.7.1.1.orig/test.sh socat-1.7.1.1/test.sh +--- socat-1.7.1.1.orig/test.sh 2009-04-02 17:11:28.000000000 +0200 ++++ socat-1.7.1.1/test.sh 2009-05-10 16:36:54.011852555 +0200 @@ -1,4 +1,4 @@ -#! /bin/bash +#! /opt/csw/bin/bash # source: test.sh - # Copyright Gerhard Rieger 2001-2008 + # Copyright Gerhard Rieger 2001-2009 # Published under the GNU General Public License V.2, see file COPYING -@@ -11,6 +11,10 @@ - - #set -vx - -+# /usr/bin/tr doesn't handle the a-z range syntax (needs [a-z]) which -+# is used throughout this script -+alias tr=/usr/xpg4/bin/tr -+ - val_t=0.1 - NUMCOND=true - #NUMCOND="test \$N -gt 70" -@@ -8931,6 +8935,9 @@ +@@ -97,6 +97,11 @@ + chmod a+x cat.sh + CAT=./cat.sh + ;; ++SunOS) ++ # /usr/bin/tr doesn't handle the a-z range syntax (needs [a-z]), use ++ # /usr/xpg4/bin/tr instead ++ alias tr=/usr/xpg4/bin/tr ++ ;; + *) + CAT=cat + ;; +@@ -9059,6 +9064,9 @@ elif [ "$ROOT" = root -a $(id -u) -ne 0 -a "$withroot" -eq 0 ]; then $PRINTF "test $F_n $TEST... ${YELLOW}must be root${NORMAL}\n" $N numCANT=$((numCANT+1)) @@ -37,19 +38,18 @@ else tf="$td/test$N.stdout" te="$td/test$N.stderr" -@@ -9051,6 +9058,11 @@ +@@ -9179,6 +9187,10 @@ elif ! feat=$(testaddrs $FEAT); then - $PRINTF "test $F_n $TEST... ${YELLOW}$(echo $feat |tr a-z A-Z) not available${NORMAL}\n" $N + $PRINTF "test $F_n $TEST... ${YELLOW}$(echo "$feat" |tr a-z A-Z) not available${NORMAL}\n" $N numCANT=$((numCANT+1)) -+ +elif [ "$KEYW" = "TCP6" -o "$KEYW" = "UDP6" -o "$KEYW" = "SCTP6" ] && \ -+ ( ! feat=$(testaddrs ip6) || ! runsip6 >/dev/null ); then ++ ! runsip6 >/dev/null; then + $PRINTF "test $F_n $TEST... ${YELLOW}IP6 not available${NORMAL}\n" $N + numCANT=$((numCANT+1)) else tf="$td/test$N.stdout" te="$td/test$N.stderr" -@@ -9146,6 +9158,9 @@ +@@ -9274,6 +9286,9 @@ elif [ "$ROOT" = root -a $(id -u) -ne 0 -a "$withroot" -eq 0 ]; then $PRINTF "test $F_n $TEST... ${YELLOW}must be root${NORMAL}\n" $N numCANT=$((numCANT+1)) @@ -59,3 +59,16 @@ else tf="$td/test$N.stdout" te="$td/test$N.stderr" +@@ -9427,7 +9442,11 @@ + case "$TESTS" in + *%functions%*|*%generic%*|*%tcp6%*|*%socket%*|*%$NAME%*) + TEST="$NAME: socket connect with TCP/IPv6" +-if ! eval $NUMCOND; then :; else ++if ! eval $NUMCOND; then :; ++elif ! testaddrs tcp ip6 >/dev/null || ! runsip6 >/dev/null; then ++ $PRINTF "test $F_n $TEST... ${YELLOW}TCP6 not available${NORMAL}\n" $N ++ numCANT=$((numCANT+1)) ++else + # start a TCP6-LISTEN process that echoes data, and send test data using + # SOCKET-CONNECT, selecting TCP/IPv6. The sent data should be returned. + tf="$td/test$N.stdout" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun May 10 17:55:13 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 May 2009 15:55:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[4793] csw/mgar/pkg/socat/trunk/files/changelog.CSW Message-ID: Revision: 4793 http://gar.svn.sourceforge.net/gar/?rev=4793&view=rev Author: skayser Date: 2009-05-10 15:55:13 +0000 (Sun, 10 May 2009) Log Message: ----------- socat: updated changelog Modified Paths: -------------- csw/mgar/pkg/socat/trunk/files/changelog.CSW Modified: csw/mgar/pkg/socat/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/socat/trunk/files/changelog.CSW 2009-05-10 15:31:54 UTC (rev 4792) +++ csw/mgar/pkg/socat/trunk/files/changelog.CSW 2009-05-10 15:55:13 UTC (rev 4793) @@ -1,5 +1,11 @@ -socat (1.7.0.0,REV=20090320) +socat (1.7.1.1,REV=2009.05.10) + * Updated to 1.7.1.1 (Closes: #3594). + + -- Sebastian Kayser Sun, 10 May 2009 17:47:39 +0200 + +socat (1.7.0.0,REV=2009.03.20) + * Initial package. -- Sebastian Kayser Fri, 20 Mar 2009 11:38:48 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun May 10 18:06:44 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 10 May 2009 16:06:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[4794] csw/mgar/pkg/x11/libxcb/trunk/Makefile Message-ID: Revision: 4794 http://gar.svn.sourceforge.net/gar/?rev=4794&view=rev Author: dmichelsen Date: 2009-05-10 16:06:44 +0000 (Sun, 10 May 2009) Log Message: ----------- X11/libxcb: Add necessary define for xcb.h or stdint.h will be included Modified Paths: -------------- csw/mgar/pkg/x11/libxcb/trunk/Makefile Modified: csw/mgar/pkg/x11/libxcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-05-10 15:55:13 UTC (rev 4793) +++ csw/mgar/pkg/x11/libxcb/trunk/Makefile 2009-05-10 16:06:44 UTC (rev 4794) @@ -42,3 +42,6 @@ PATH := $(PATH):/opt/csw/graphviz2/bin +post-install-modulated: + perl -pi -e 's/^(Cflags:.*)/\1 $(EXTRA_CFLAGS)/' $(DESTDIR)$(libdir)/pkgconfig/xcb.pc + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun May 10 18:07:30 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 May 2009 16:07:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[4795] csw/mgar/pkg/watch/trunk/files/changelog.CSW Message-ID: Revision: 4795 http://gar.svn.sourceforge.net/gar/?rev=4795&view=rev Author: skayser Date: 2009-05-10 16:07:30 +0000 (Sun, 10 May 2009) Log Message: ----------- watch: added changelog.CSW Added Paths: ----------- csw/mgar/pkg/watch/trunk/files/changelog.CSW Added: csw/mgar/pkg/watch/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/watch/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/watch/trunk/files/changelog.CSW 2009-05-10 16:07:30 UTC (rev 4795) @@ -0,0 +1,5 @@ +watch (0.2.0,REV=2009.05.10) + + * Recompiled with adjusted GAR build system (Closes: #3603). + + -- Sebastian Kayser Sun, 10 May 2009 18:04:57 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun May 10 18:14:07 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 May 2009 16:14:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[4796] csw/mgar/pkg/watch/trunk/Makefile Message-ID: Revision: 4796 http://gar.svn.sourceforge.net/gar/?rev=4796&view=rev Author: skayser Date: 2009-05-10 16:14:07 +0000 (Sun, 10 May 2009) Log Message: ----------- watch: added changelog.CSW Modified Paths: -------------- csw/mgar/pkg/watch/trunk/Makefile Modified: csw/mgar/pkg/watch/trunk/Makefile =================================================================== --- csw/mgar/pkg/watch/trunk/Makefile 2009-05-10 16:07:30 UTC (rev 4795) +++ csw/mgar/pkg/watch/trunk/Makefile 2009-05-10 16:14:07 UTC (rev 4796) @@ -67,9 +67,12 @@ ALL_LDFLAGS="$(LDFLAGS)" watch $(MAKECOOKIE) +install-custom: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) install-custom: @ginstall -d $(DESTDIR)$(bindir) @ginstall -d $(DESTDIR)$(mandir)/man1 + @ginstall -d $(DOCDEST) @ginstall -m 755 $(WORKSRC)/watch $(DESTDIR)$(bindir) - @ginstall -m 644 $(WORKSRC)/watch.1 $(DESTDIR)$(mandir)/man1 + @cp $(WORKSRC)/watch.1 $(DESTDIR)$(mandir)/man1 + @cp $(FILEDIR)/changelog.CSW $(DOCDEST) $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun May 10 18:25:59 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 May 2009 16:25:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[4797] csw/mgar/pkg/pv/trunk Message-ID: Revision: 4797 http://gar.svn.sourceforge.net/gar/?rev=4797&view=rev Author: skayser Date: 2009-05-10 16:25:59 +0000 (Sun, 10 May 2009) Log Message: ----------- pv: added changelog Modified Paths: -------------- csw/mgar/pkg/pv/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/pv/trunk/files/changelog.CSW Modified: csw/mgar/pkg/pv/trunk/Makefile =================================================================== --- csw/mgar/pkg/pv/trunk/Makefile 2009-05-10 16:14:07 UTC (rev 4796) +++ csw/mgar/pkg/pv/trunk/Makefile 2009-05-10 16:25:59 UTC (rev 4797) @@ -35,9 +35,8 @@ include gar/category.mk +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: @gunzip $(DESTDIR)$(mandir)/man1/pv.1.gz - @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 \ - $(WORKSRC)/doc/NEWS \ - $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -d -m 755 $(DOCDEST) + @cp $(WORKSRC)/doc/NEWS $(FILEDIR)/changelog.CSW $(DOCDEST) Added: csw/mgar/pkg/pv/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pv/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/pv/trunk/files/changelog.CSW 2009-05-10 16:25:59 UTC (rev 4797) @@ -0,0 +1,5 @@ +pv (1.1.4,REV=2009.05.10) + + * Recompiled with adjusted GAR build system (Closes: #3573). + + -- Sebastian Kayser Sun, 10 May 2009 18:18:49 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun May 10 18:36:59 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 May 2009 16:36:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[4798] csw/mgar/pkg/proxytunnel/trunk Message-ID: Revision: 4798 http://gar.svn.sourceforge.net/gar/?rev=4798&view=rev Author: skayser Date: 2009-05-10 16:36:58 +0000 (Sun, 10 May 2009) Log Message: ----------- proxytunnel: added changelog.CSW Modified Paths: -------------- csw/mgar/pkg/proxytunnel/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/proxytunnel/trunk/files/changelog.CSW Modified: csw/mgar/pkg/proxytunnel/trunk/Makefile =================================================================== --- csw/mgar/pkg/proxytunnel/trunk/Makefile 2009-05-10 16:25:59 UTC (rev 4797) +++ csw/mgar/pkg/proxytunnel/trunk/Makefile 2009-05-10 16:36:58 UTC (rev 4798) @@ -28,3 +28,9 @@ CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: + @ginstall -d $(DOCDEST) + @cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/proxytunnel/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/proxytunnel/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/proxytunnel/trunk/files/changelog.CSW 2009-05-10 16:36:58 UTC (rev 4798) @@ -0,0 +1,5 @@ +proxytunnel (1.9.0,REV=2009.05.10) + + * Recompiled with updated GAR build system (Closes: #3572). + + -- Sebastian Kayser Sun, 10 May 2009 18:34:45 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun May 10 20:20:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 10 May 2009 18:20:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[4799] csw/mgar/pkg/gtk2/trunk/Makefile Message-ID: Revision: 4799 http://gar.svn.sourceforge.net/gar/?rev=4799&view=rev Author: dmichelsen Date: 2009-05-10 18:20:20 +0000 (Sun, 10 May 2009) Log Message: ----------- gtk+: Disable cups for now until 64 bit libs are provided Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2009-05-10 16:36:58 UTC (rev 4798) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2009-05-10 18:20:20 UTC (rev 4799) @@ -47,6 +47,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --x-include=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS += --disable-cups #TEST_TARGET = check # There is a test failing on Xvfb which may or may not be harmful. Disable for now. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun May 10 20:50:35 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 May 2009 18:50:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[4800] csw/mgar/pkg/ncdu/trunk Message-ID: Revision: 4800 http://gar.svn.sourceforge.net/gar/?rev=4800&view=rev Author: skayser Date: 2009-05-10 18:50:35 +0000 (Sun, 10 May 2009) Log Message: ----------- ncdu: version bump + related patches, added changelog Modified Paths: -------------- csw/mgar/pkg/ncdu/trunk/Makefile csw/mgar/pkg/ncdu/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ncdu/trunk/files/changelog.CSW csw/mgar/pkg/ncdu/trunk/files/gar-base.diff Modified: csw/mgar/pkg/ncdu/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncdu/trunk/Makefile 2009-05-10 18:20:20 UTC (rev 4799) +++ csw/mgar/pkg/ncdu/trunk/Makefile 2009-05-10 18:50:35 UTC (rev 4800) @@ -1,5 +1,5 @@ GARNAME = ncdu -GARVERSION = 1.4 +GARVERSION = 1.5 CATEGORIES = utils DESCRIPTION = Ncurses version of the famous old 'du' unix @@ -19,8 +19,24 @@ TEST_SCRIPTS = -EXTRA_INC = /opt/csw/include/ncurses +EXTRA_INC = /opt/csw/include/ncursesw CONFIGURE_ARGS = $(DIRPATHS) +# - Autoconf check and replacement for non-POSIX dirfd() +# See http://sf.net/tracker/?func=detail&aid=2789779&group_id=200175&atid=972449 +# - Fix for non-void return in src/delete.c:void delete_process() +# See http://sf.net/tracker/?func=detail&aid=2789781&group_id=200175&atid=972449 +PATCHFILES=gar-base.diff + include gar/category.mk + +pre-configure-modulated: + @cd $(WORKSRC) && autoconf + @$(MAKECOOKIE) + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: + @ginstall -d $(DOCDEST) + @cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/ncdu/trunk/checksums =================================================================== --- csw/mgar/pkg/ncdu/trunk/checksums 2009-05-10 18:20:20 UTC (rev 4799) +++ csw/mgar/pkg/ncdu/trunk/checksums 2009-05-10 18:50:35 UTC (rev 4800) @@ -1 +1,2 @@ -07f01579f7c9852033139ae9fa2414c9 download/ncdu-1.4.tar.gz +6596993c949abab8e579c401dbe50089 download/gar-base.diff +90a69cc3b2e9f0324eb14e6ce1df0f22 download/ncdu-1.5.tar.gz Added: csw/mgar/pkg/ncdu/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/ncdu/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/ncdu/trunk/files/changelog.CSW 2009-05-10 18:50:35 UTC (rev 4800) @@ -0,0 +1,5 @@ +ncdu (1.5,REV=2009.05.10) + + * Updated to 1.5 (Closes: #3565). + + -- Sebastian Kayser Sun, 10 May 2009 18:42:27 +0200 Added: csw/mgar/pkg/ncdu/trunk/files/gar-base.diff =================================================================== --- csw/mgar/pkg/ncdu/trunk/files/gar-base.diff (rev 0) +++ csw/mgar/pkg/ncdu/trunk/files/gar-base.diff 2009-05-10 18:50:35 UTC (rev 4800) @@ -0,0 +1,43 @@ +diff --speed-large-files --minimal -Nru ncdu-1.5.orig/src/delete.c ncdu-1.5/src/delete.c +--- ncdu-1.5.orig/src/delete.c 2009-05-02 10:42:17.000000000 +0200 ++++ ncdu-1.5/src/delete.c 2009-05-10 18:57:49.873038400 +0200 +@@ -213,8 +213,10 @@ + /* confirm */ + seloption = 1; + while(state == DS_CONFIRM && !noconfirm) +- if(input_handle(0)) +- return browse_init(root); ++ if(input_handle(0)) { ++ browse_init(root); ++ return; ++ } + + /* chdir */ + if(path_chdir(getpath(root->parent)) < 0) { +diff -ur ncdu-1.5.orig/configure.in ncdu-1.5/configure.in +--- ncdu-1.5.orig/configure.in 2009-05-10 19:38:59.182413272 +0200 ++++ ncdu-1.5/configure.in 2009-05-02 13:09:18.000000000 +0200 +@@ -27,6 +27,9 @@ + [getcwd gettimeofday memset fnmatch chdir rmdir unlink lstat getcwd],[], + AC_MSG_ERROR([required function missing])) + ++# dirfd is a glibc extension and available on Solaris ++AC_CHECK_FUNCS([dirfd]) ++ + AC_OUTPUT([Makefile src/Makefile doc/Makefile]) + + echo "" +diff -ur ncdu-1.5.orig/src/path.h ncdu-1.5/src/path.h +--- ncdu-1.5.orig/src/path.h 2009-05-10 19:38:59.209594590 +0200 ++++ ncdu-1.5/src/path.h 2009-05-02 10:42:17.000000000 +0200 +@@ -44,4 +44,10 @@ + /* works exactly the same as chdir() */ + extern int path_chdir(const char *); + ++#ifndef HAVE_DIRFD ++#if defined(__sun__) || defined(__sun) ++#define dirfd(a) ((a)->dd_fd) ++#endif ++#endif ++ + #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun May 10 21:15:07 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 May 2009 19:15:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[4801] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 4801 http://gar.svn.sourceforge.net/gar/?rev=4801&view=rev Author: skayser Date: 2009-05-10 19:15:07 +0000 (Sun, 10 May 2009) Log Message: ----------- mbuffer: added changelog Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2009-05-10 18:50:35 UTC (rev 4800) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2009-05-10 19:15:07 UTC (rev 4801) @@ -71,5 +71,6 @@ post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: @ginstall -d $(DOCDEST) - @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) + @$(foreach DOC,$(DOCS),cp $(WORKSRC)/$(DOC) $(DOCDEST);) + @cp $(FILEDIR)/changelog.CSW $(DOCDEST) @$(MAKECOOKIE) Added: csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW 2009-05-10 19:15:07 UTC (rev 4801) @@ -0,0 +1,5 @@ +mbuffer (20090215,REV=2009.05.10) + + * Recompiled with updated GAR build system (Closes: #3561). + + -- Sebastian Kayser Sun, 10 May 2009 21:07:00 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon May 11 00:30:37 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 May 2009 22:30:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[4802] csw/mgar/pkg Message-ID: Revision: 4802 http://gar.svn.sourceforge.net/gar/?rev=4802&view=rev Author: skayser Date: 2009-05-10 22:30:36 +0000 (Sun, 10 May 2009) Log Message: ----------- stunnel: initial commit Added Paths: ----------- csw/mgar/pkg/stunnel/ csw/mgar/pkg/stunnel/branches/ csw/mgar/pkg/stunnel/tags/ csw/mgar/pkg/stunnel/trunk/ csw/mgar/pkg/stunnel/trunk/Makefile csw/mgar/pkg/stunnel/trunk/checksums csw/mgar/pkg/stunnel/trunk/files/ csw/mgar/pkg/stunnel/trunk/files/changelog.CSW csw/mgar/pkg/stunnel/trunk/files/postinstall Property changes on: csw/mgar/pkg/stunnel/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/stunnel/trunk/Makefile =================================================================== --- csw/mgar/pkg/stunnel/trunk/Makefile (rev 0) +++ csw/mgar/pkg/stunnel/trunk/Makefile 2009-05-10 22:30:36 UTC (rev 4802) @@ -0,0 +1,53 @@ +# TODO +# - Remove excessive files from $(docdir) +# - Adjust paths in $(sysconfdir)/stunnel.conf-sample +# - Verify /var/opt/csw/lib/stunnel/dev/zero creation in postinstall +GARNAME = stunnel +GARVERSION = 4.27 +CATEGORIES = net + +DESCRIPTION = Universal SSL Wrapper +define BLURB + Stunnel is a program that allows you to encrypt arbitrary TCP connections + inside SSL (Secure Sockets Layer) available on both Unix and Windows. Stunnel + can allow you to secure non-SSL aware daemons and protocols (like POP, IMAP, + LDAP, etc) by having Stunnel provide the encryption, requiring no changes to + the daemon's code. +endef + +MASTER_SITES = http://www.stunnel.org/download/stunnel/src/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += postinstall + +SPKG_SOURCEURL = http://www.stunnel.org + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-ssl=/opt/csw +#CONFIGURE_ARGS += --with-cert-dir=/opt/csw/ssl/certs/ +CONFIGURE_ARGS += --enable-ipv6 +CONFIGURE_ARGS += --enable-dh +CONFIGURE_ARGS += --localstatedir=/var/opt/csw + +# No test target available +TEST_SCRIPTS = + +include gar/category.mk + +# 1) Suppress prompts for openssl sample cert generation (-batch) +# 2) Disable creation of /dev/zero (needs root privs, moved to postinstall) +pre-build-modulated: + perl -pi -e '\ + s|/bin/openssl|/bin/openssl -batch|; \ + s|^|#| if (m|/dev/zero|);' \ + $(WORKSRC)/tools/Makefile + @$(MAKECOOKIE) + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: + @ginstall -d $(DOCDEST) + @cp $(WORKSRC)/BUGS $(WORKSRC)/ChangeLog $(DOCDEST) + @cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/stunnel/trunk/checksums =================================================================== --- csw/mgar/pkg/stunnel/trunk/checksums (rev 0) +++ csw/mgar/pkg/stunnel/trunk/checksums 2009-05-10 22:30:36 UTC (rev 4802) @@ -0,0 +1 @@ +3c655d815576f50046a1c28744b88681 download/stunnel-4.27.tar.gz Added: csw/mgar/pkg/stunnel/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/stunnel/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/stunnel/trunk/files/changelog.CSW 2009-05-10 22:30:36 UTC (rev 4802) @@ -0,0 +1,6 @@ +stunnel (4,27,REV=2009.05.10) + + * Package adopted and updated to 4.27. + * Built with --localstatedir=/var/opt/csw. (Closes: #3029) + + -- Sebastian Kayser Sun, 10 May 2009 22:33:14 +0200 Added: csw/mgar/pkg/stunnel/trunk/files/postinstall =================================================================== --- csw/mgar/pkg/stunnel/trunk/files/postinstall (rev 0) +++ csw/mgar/pkg/stunnel/trunk/files/postinstall 2009-05-10 22:30:36 UTC (rev 4802) @@ -0,0 +1,10 @@ +#!/bin/bash +# +# Create required /dev/zero in chroot directory +# +# Taken from stunnel Makefile. mknod can only be run as root and thus needs +# to be run from postinstall (packaging is done as non-root user). +# +mkdir -p /var/opt/csw/lib/stunnel/dev +mknod /var/opt/csw/lib/stunnel/dev/zero c 13 12 +chmod 666 /var/opt/csw/lib/stunnel/dev/zero This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon May 11 02:42:19 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 May 2009 00:42:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[4803] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 4803 http://gar.svn.sourceforge.net/gar/?rev=4803&view=rev Author: bdwalton Date: 2009-05-11 00:42:19 +0000 (Mon, 11 May 2009) Log Message: ----------- 1.6.3 released, drop rc from version; all systems go sparc and x86 Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-05-10 22:30:36 UTC (rev 4802) +++ csw/mgar/pkg/git/trunk/Makefile 2009-05-11 00:42:19 UTC (rev 4803) @@ -1,6 +1,6 @@ GARNAME = git GARVERSION = 1.6.3 -PATCHLEVEL = rc3 +#xPATCHLEVEL = rc3 CATEGORIES = devel # disable tests until next version bump (at the top so it stands out) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon May 11 02:56:47 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 May 2009 00:56:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[4804] csw/mgar/pkg/mysql5/trunk/Makefile Message-ID: Revision: 4804 http://gar.svn.sourceforge.net/gar/?rev=4804&view=rev Author: bdwalton Date: 2009-05-11 00:56:47 +0000 (Mon, 11 May 2009) Log Message: ----------- - Switch to sun compiler after determining correct flags. - Enable 64-bit build. - all tests pass in 32-bit. 64-bit still has issues. Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-05-11 00:42:19 UTC (rev 4803) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-05-11 00:56:47 UTC (rev 4804) @@ -2,8 +2,6 @@ GARVERSION = 5.1.33 CATEGORIES = server -GARCOMPILER = GCC4 - DISTNAME = mysql-$(GARVERSION) DESCRIPTION = Multithreaded SQL database @@ -34,6 +32,9 @@ # because we alter the prefix. this gets us proper linking as well as # LD_OPTIONS (RPATH) EXTRA_LIB = /opt/csw/lib +EXTRA_INC = /opt/csw/include +EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) @@ -48,7 +49,9 @@ CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-plugins=max-no-ndb +#TEST_ARGS = test-force + # Enable 64 bits build -# BUILD64 = 1 +BUILD64 = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 11 05:05:39 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 11 May 2009 03:05:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[4805] csw/mgar/pkg/php4/trunk Message-ID: Revision: 4805 http://gar.svn.sourceforge.net/gar/?rev=4805&view=rev Author: valholla Date: 2009-05-11 03:05:39 +0000 (Mon, 11 May 2009) Log Message: ----------- add legacy dir Added Paths: ----------- csw/mgar/pkg/php4/trunk/legacy/ Property Changed: ---------------- csw/mgar/pkg/php4/trunk/ Property changes on: csw/mgar/pkg/php4/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + 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. From valholla at users.sourceforge.net Mon May 11 05:07:03 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 11 May 2009 03:07:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[4806] csw/mgar/pkg/php4/trunk Message-ID: Revision: 4806 http://gar.svn.sourceforge.net/gar/?rev=4806&view=rev Author: valholla Date: 2009-05-11 03:07:02 +0000 (Mon, 11 May 2009) Log Message: ----------- move old recipe to legacy Added Paths: ----------- csw/mgar/pkg/php4/trunk/legacy/Makefile csw/mgar/pkg/php4/trunk/legacy/files/ Removed Paths: ------------- csw/mgar/pkg/php4/trunk/Makefile csw/mgar/pkg/php4/trunk/files/ Deleted: csw/mgar/pkg/php4/trunk/Makefile =================================================================== --- csw/mgar/pkg/php4/trunk/Makefile 2009-05-11 03:05:39 UTC (rev 4805) +++ csw/mgar/pkg/php4/trunk/Makefile 2009-05-11 03:07:02 UTC (rev 4806) @@ -1,55 +0,0 @@ -GARNAME = php -GARVERSION = 4.4.2 -CATEGORIES = lang - -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 - -#DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 - -DEPENDS += server/apache2 server/mysql4 - -# Some tests fail (3 of 300) -TEST_SCRIPTS = - -# Configuration -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs -CONFIGURE_ARGS += --with-config-file-path=$(prefix)/apache2/etc -CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql4 -CONFIGURE_ARGS += --with-db4=$(prefix)/bdb4 -CONFIGURE_ARGS += --with-gdbm=$(prefix) -CONFIGURE_ARGS += --with-expat-dir=$(prefix) -CONFIGURE_ARGS += --with-gd=$(prefix) -CONFIGURE_ARGS += --with-jpeg-dir=$(prefix) -CONFIGURE_ARGS += --with-png-dir=$(prefix) -CONFIGURE_ARGS += --with-gmp=$(prefix) -CONFIGURE_ARGS += --with-ncurses=$(prefix) -CONFIGURE_ARGS += --disable-static -CONFIGURE_ARGS += --with-ldap -CONFIGURE_ARGS += --enable-sockets -CONFIGURE_ARGS += --with-zlib -CONFIGURE_ARGS += --with-bz2 -CONFIGURE_ARGS += --enable-dba -CONFIGURE_ARGS += --with-dom -CONFIGURE_ARGS += --with-dom-xslt -CONFIGURE_ARGS += --with-dom-exslt -CONFIGURE_ARGS += --with-xmlrpc -CONFIGURE_ARGS += --enable-gd-native-ttf -CONFIGURE_ARGS += --enable-exif - -include gar/category.mk - -post-install: - @cp -f $(WORKSRC)/php.ini-recommended $(sysconfdir)/php.ini - Copied: csw/mgar/pkg/php4/trunk/legacy/Makefile (from rev 4804, csw/mgar/pkg/php4/trunk/Makefile) =================================================================== --- csw/mgar/pkg/php4/trunk/legacy/Makefile (rev 0) +++ csw/mgar/pkg/php4/trunk/legacy/Makefile 2009-05-11 03:07:02 UTC (rev 4806) @@ -0,0 +1,55 @@ +GARNAME = php +GARVERSION = 4.4.2 +CATEGORIES = lang + +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 + +#DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +DEPENDS += server/apache2 server/mysql4 + +# Some tests fail (3 of 300) +TEST_SCRIPTS = + +# Configuration +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs +CONFIGURE_ARGS += --with-config-file-path=$(prefix)/apache2/etc +CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql4 +CONFIGURE_ARGS += --with-db4=$(prefix)/bdb4 +CONFIGURE_ARGS += --with-gdbm=$(prefix) +CONFIGURE_ARGS += --with-expat-dir=$(prefix) +CONFIGURE_ARGS += --with-gd=$(prefix) +CONFIGURE_ARGS += --with-jpeg-dir=$(prefix) +CONFIGURE_ARGS += --with-png-dir=$(prefix) +CONFIGURE_ARGS += --with-gmp=$(prefix) +CONFIGURE_ARGS += --with-ncurses=$(prefix) +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --with-ldap +CONFIGURE_ARGS += --enable-sockets +CONFIGURE_ARGS += --with-zlib +CONFIGURE_ARGS += --with-bz2 +CONFIGURE_ARGS += --enable-dba +CONFIGURE_ARGS += --with-dom +CONFIGURE_ARGS += --with-dom-xslt +CONFIGURE_ARGS += --with-dom-exslt +CONFIGURE_ARGS += --with-xmlrpc +CONFIGURE_ARGS += --enable-gd-native-ttf +CONFIGURE_ARGS += --enable-exif + +include gar/category.mk + +post-install: + @cp -f $(WORKSRC)/php.ini-recommended $(sysconfdir)/php.ini + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon May 11 13:46:37 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 11 May 2009 11:46:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[4807] csw/mgar/pkg/rrdtool/trunk/Makefile Message-ID: Revision: 4807 http://gar.svn.sourceforge.net/gar/?rev=4807&view=rev Author: idogan23 Date: 2009-05-11 11:46:37 +0000 (Mon, 11 May 2009) Log Message: ----------- rrdtool: small changes to make it work with new pango & cairo Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2009-05-11 03:07:02 UTC (rev 4806) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2009-05-11 11:46:37 UTC (rev 4807) @@ -27,6 +27,14 @@ REQUIRED_PKGS += CSWsunmath REQUIRED_PKGS += CSWzlib +EXTRA_INC = $(prefix)/include/cairo +EXTRA_INC += $(prefix)/include/libxml2/libxml +EXTRA_INC += $(prefix)/X11/include + +EXTRA_LIB = $(prefix)/X11/lib + +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-docdir=$(sharedstatedir)/doc/$(GARNAME) CONFIGURE_ARGS += --disable-python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon May 11 13:47:37 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 11 May 2009 11:47:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[4808] csw/mgar/pkg/rrdtool/trunk/Makefile Message-ID: Revision: 4808 http://gar.svn.sourceforge.net/gar/?rev=4808&view=rev Author: idogan23 Date: 2009-05-11 11:47:36 +0000 (Mon, 11 May 2009) Log Message: ----------- rrdtool: added dependency to Perl Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2009-05-11 11:46:37 UTC (rev 4807) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2009-05-11 11:47:36 UTC (rev 4808) @@ -26,6 +26,7 @@ REQUIRED_PKGS += CSWpng REQUIRED_PKGS += CSWsunmath REQUIRED_PKGS += CSWzlib +REQUIRED_PKGS += CSWperl EXTRA_INC = $(prefix)/include/cairo EXTRA_INC += $(prefix)/include/libxml2/libxml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon May 11 13:58:07 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 11 May 2009 11:58:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[4809] csw/mgar/pkg/rrdtool/trunk Message-ID: Revision: 4809 http://gar.svn.sourceforge.net/gar/?rev=4809&view=rev Author: idogan23 Date: 2009-05-11 11:58:07 +0000 (Mon, 11 May 2009) Log Message: ----------- rrdtool: changed libtool handling Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/rrdtool/trunk/files/fixme.sh Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2009-05-11 11:47:36 UTC (rev 4808) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2009-05-11 11:58:07 UTC (rev 4809) @@ -12,7 +12,6 @@ MASTER_SITES = http://oss.oetiker.ch/$(GARNAME)/pub/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWrrdtool) -DISTFILES += fixme.sh # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -50,10 +49,7 @@ #BUILD64 = 1 -post-configure-$(MODULATION): - @echo " ==> Fixing Libtool" - @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) - $(DONADA) +STRIP_LIBTOOL = 1 # ugly fix to fix doc path post-install-modulated: Deleted: csw/mgar/pkg/rrdtool/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/rrdtool/trunk/files/fixme.sh 2009-05-11 11:47:36 UTC (rev 4808) +++ csw/mgar/pkg/rrdtool/trunk/files/fixme.sh 2009-05-11 11:58:07 UTC (rev 4809) @@ -1,52 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} - gchmod +x ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} - gchmod +x ${lt} -done - -LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print) -if [ -f ${LTMAIN} ]; then - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} - gchmod +x ${LTMAIN} -fi - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon May 11 15:49:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 11 May 2009 13:49:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[4810] csw/mgar/pkg/pango/trunk/files/CSWpango.postinstall Message-ID: Revision: 4810 http://gar.svn.sourceforge.net/gar/?rev=4810&view=rev Author: wbonnet Date: 2009-05-11 13:49:50 +0000 (Mon, 11 May 2009) Log Message: ----------- Add postinstall script Added Paths: ----------- csw/mgar/pkg/pango/trunk/files/CSWpango.postinstall Added: csw/mgar/pkg/pango/trunk/files/CSWpango.postinstall =================================================================== --- csw/mgar/pkg/pango/trunk/files/CSWpango.postinstall (rev 0) +++ csw/mgar/pkg/pango/trunk/files/CSWpango.postinstall 2009-05-11 13:49:50 UTC (rev 4810) @@ -0,0 +1,6 @@ +#!/bin/sh +# + +/opt/csw/bin/pango-querymodules > /opt/csw/etc/pango/pango.modules + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon May 11 22:43:21 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 11 May 2009 20:43:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[4811] csw/mgar/pkg/firefox/trunk/Makefile Message-ID: Revision: 4811 http://gar.svn.sourceforge.net/gar/?rev=4811&view=rev Author: wbonnet Date: 2009-05-11 20:43:21 +0000 (Mon, 11 May 2009) Log Message: ----------- Update Makefile for 2.0.0.20 Modified Paths: -------------- csw/mgar/pkg/firefox/trunk/Makefile Modified: csw/mgar/pkg/firefox/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox/trunk/Makefile 2009-05-11 13:49:50 UTC (rev 4810) +++ csw/mgar/pkg/firefox/trunk/Makefile 2009-05-11 20:43:21 UTC (rev 4811) @@ -12,8 +12,9 @@ DISTFILES += $(call admfiles,CSWfirefox, postinstall postremove ) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = (\d+(?:\.\d+)*) MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(GARVERSION)/source/ +UPSTREAM_MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/ PERL="/opt/csw/bin/perl" CFLAGS=-xlibmil This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon May 11 23:01:44 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 11 May 2009 21:01:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[4812] csw/mgar/pkg/firefox/trunk/checksums Message-ID: Revision: 4812 http://gar.svn.sourceforge.net/gar/?rev=4812&view=rev Author: wbonnet Date: 2009-05-11 21:01:44 +0000 (Mon, 11 May 2009) Log Message: ----------- Modified Paths: -------------- csw/mgar/pkg/firefox/trunk/checksums Modified: csw/mgar/pkg/firefox/trunk/checksums =================================================================== --- csw/mgar/pkg/firefox/trunk/checksums 2009-05-11 20:43:21 UTC (rev 4811) +++ csw/mgar/pkg/firefox/trunk/checksums 2009-05-11 21:01:44 UTC (rev 4812) @@ -1,6 +1,5 @@ -f3718fefd01c8edc007ec0b416a8a7b8 download/firefox-2.0.0.20-source.tar.bz2 35b08b743fae892fc69aed10cdb3a7cf download/CSWfirefox.gspec -e6a5bb96973bba048d61f64c14a6bbc4 download/CSWfirefox.depend f9c7fb69080051172bd7357370731ba3 download/CSWfirefox.postinstall 6ede39c29b3672fb1fc1d8fe397a7863 download/CSWfirefox.postremove ffec5571cbae2a9fae89ba6a3d3f81c5 download/autoconf.mk.in.diff +f3718fefd01c8edc007ec0b416a8a7b8 download/firefox-2.0.0.20-source.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue May 12 00:28:26 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 11 May 2009 22:28:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[4813] csw/mgar/pkg/gengetopt/trunk Message-ID: Revision: 4813 http://gar.svn.sourceforge.net/gar/?rev=4813&view=rev Author: hson Date: 2009-05-11 22:28:26 +0000 (Mon, 11 May 2009) Log Message: ----------- gengetopt: Update to 2.22.1 Modified Paths: -------------- csw/mgar/pkg/gengetopt/trunk/Makefile csw/mgar/pkg/gengetopt/trunk/checksums Modified: csw/mgar/pkg/gengetopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/gengetopt/trunk/Makefile 2009-05-11 21:01:44 UTC (rev 4812) +++ csw/mgar/pkg/gengetopt/trunk/Makefile 2009-05-11 22:28:26 UTC (rev 4813) @@ -1,5 +1,5 @@ GARNAME = gengetopt -GARVERSION = 2.22 +GARVERSION = 2.22.1 CATEGORIES = utils DESCRIPTION = parses the command line options Modified: csw/mgar/pkg/gengetopt/trunk/checksums =================================================================== --- csw/mgar/pkg/gengetopt/trunk/checksums 2009-05-11 21:01:44 UTC (rev 4812) +++ csw/mgar/pkg/gengetopt/trunk/checksums 2009-05-11 22:28:26 UTC (rev 4813) @@ -1 +1 @@ -346f35c9e0607733b26dcbba9fbbfa8c download/gengetopt-2.22.tar.gz +3877433c69902a26887ad65c1a2d60eb download/gengetopt-2.22.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue May 12 03:10:09 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 12 May 2009 01:10:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[4814] csw/mgar/pkg/exiftool/trunk Message-ID: Revision: 4814 http://gar.svn.sourceforge.net/gar/?rev=4814&view=rev Author: hson Date: 2009-05-12 01:10:09 +0000 (Tue, 12 May 2009) Log Message: ----------- exiftool: Update to 7.75 Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile csw/mgar/pkg/exiftool/trunk/checksums Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2009-05-11 22:28:26 UTC (rev 4813) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2009-05-12 01:10:09 UTC (rev 4814) @@ -1,5 +1,5 @@ GARNAME = exiftool -GARVERSION = 7.73 +GARVERSION = 7.75 CATEGORIES = cpan DESCRIPTION = Read, Write and Edit Image File Meta Information Modified: csw/mgar/pkg/exiftool/trunk/checksums =================================================================== --- csw/mgar/pkg/exiftool/trunk/checksums 2009-05-11 22:28:26 UTC (rev 4813) +++ csw/mgar/pkg/exiftool/trunk/checksums 2009-05-12 01:10:09 UTC (rev 4814) @@ -1,2 +1,2 @@ -427d0107f6b40b0110757aaefd7cd8c8 download/Image-ExifTool-7.73.tar.gz 13f9aae615a5de5e3c145b374950a75c download/CSWexiftool.gspec +19c85c2619bbf88a1f45bec734a29988 download/Image-ExifTool-7.75.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue May 12 03:28:15 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 12 May 2009 01:28:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[4815] csw/mgar/pkg/librsvg/trunk Message-ID: Revision: 4815 http://gar.svn.sourceforge.net/gar/?rev=4815&view=rev Author: hson Date: 2009-05-12 01:28:12 +0000 (Tue, 12 May 2009) Log Message: ----------- librsvg: Update to 2.26 Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile csw/mgar/pkg/librsvg/trunk/checksums Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2009-05-12 01:10:09 UTC (rev 4814) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2009-05-12 01:28:12 UTC (rev 4815) @@ -1,6 +1,6 @@ GARNAME = librsvg -GARVERSION = 2.22 -GARSUBREV = 3 +GARVERSION = 2.26 +GARSUBREV = 0 CATEGORIES = lib DESCRIPTION = Scalable Vector Graphics library @@ -43,18 +43,17 @@ # gtkdoc-rebase doesn't exist PATCHFILES += doc_makefile.patch +LIBS=-lm +EXTRA_COMMON_EXPORTS = LIBS CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared=yes --enable-static=no +STRIP_LIBTOOL=1 + TEST_TARGET = check include gar/category.mk -post-configure-modulated: - @(echo "~~~ Fixing Libtool ~~~") - @$(FILEDIR)/fixme.sh $(WORKSRC) - $(DONADA) - post-install-isa-sparcv8: @cp $(FILEDIR)/librsvg-2.so.2.15.90.s $(INSTALLISADIR)/opt/csw/lib/librsvg-2.so.2.15.90 Modified: csw/mgar/pkg/librsvg/trunk/checksums =================================================================== --- csw/mgar/pkg/librsvg/trunk/checksums 2009-05-12 01:10:09 UTC (rev 4814) +++ csw/mgar/pkg/librsvg/trunk/checksums 2009-05-12 01:28:12 UTC (rev 4815) @@ -1,5 +1,5 @@ -c4ec4fdb2b1842e221ca39127e85682d download/librsvg-2.22.3.tar.bz2 +5eddcc7be3ee182c94ee21691720c6aa download/doc_makefile.patch +65dbd726a514fe8b797d26254b8efc1e download/librsvg-2.26.0.tar.bz2 5b0c0387946c3b7ca7feb913de436936 download/pdiff.patch 8a26f6d0d0cf1cfce1a1e0365c6624ce download/perceptualdiff.patch 803a5d10e3e9c9a561b397aade043024 download/test_makefiles.patch -5eddcc7be3ee182c94ee21691720c6aa download/doc_makefile.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue May 12 06:14:16 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 12 May 2009 04:14:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[4816] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 4816 http://gar.svn.sourceforge.net/gar/?rev=4816&view=rev Author: hson Date: 2009-05-12 04:14:16 +0000 (Tue, 12 May 2009) Log Message: ----------- imagemagick: Update to 6.5.2-4, disable us of openmp Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-05-12 01:28:12 UTC (rev 4815) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-05-12 04:14:16 UTC (rev 4816) @@ -1,6 +1,6 @@ GARNAME = imagemagick -GARVERSION = 6.5.1 -GARSUBREV = 1 +GARVERSION = 6.5.2 +GARSUBREV = 4 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -37,10 +37,11 @@ CONFIGURE_ARGS += --with-dps=yes --with-gslib=yes CONFIGURE_ARGS += --x-includes=/usr/openwin/include CONFIGURE_ARGS += --x-libraries=/usr/openwin/lib +CONFIGURE_ARGS += --disable-openmp PATCHFILES += Makefile.patch # Temporary patch until upstream make a more permenent fix -PATCHFILES += djvu.c.diff +#PATCHFILES += djvu.c.diff # Test has to be run *after* install TEST_SCRIPTS = @@ -49,13 +50,10 @@ MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod +STRIP_LIBTOOL=1 + include gar/category.mk -post-configure-$(MODULATION): - @(echo "~~~ Fixing Libtool ~~~") - @$(FILEDIR)/fixme.sh $(WORKSRC) - @$(MAKECOOKIE) - post-install-isa-sparcv8: @cp $(FILEDIR)/libMagick.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 @cp $(FILEDIR)/libWand.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2009-05-12 01:28:12 UTC (rev 4815) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2009-05-12 04:14:16 UTC (rev 4816) @@ -1,3 +1,2 @@ -2e5f775ac599ff2548395706fcc7eba0 download/ImageMagick-6.5.1-1.tar.bz2 +ddaa6abdb4a323558382046946beece2 download/ImageMagick-6.5.2-4.tar.bz2 6bd361fe352c7d497d60d8d2cbe7cfd4 download/Makefile.patch -de358462d89bfceb050888cf6b564257 download/djvu.c.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue May 12 10:59:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 12 May 2009 08:59:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[4817] csw/mgar/pkg/patch/trunk Message-ID: Revision: 4817 http://gar.svn.sourceforge.net/gar/?rev=4817&view=rev Author: dmichelsen Date: 2009-05-12 08:59:22 +0000 (Tue, 12 May 2009) Log Message: ----------- patch: Update to 2.5.9 Modified Paths: -------------- csw/mgar/pkg/patch/trunk/Makefile csw/mgar/pkg/patch/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/patch/trunk/ Property changes on: csw/mgar/pkg/patch/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/patch/trunk/Makefile =================================================================== --- csw/mgar/pkg/patch/trunk/Makefile 2009-05-12 04:14:16 UTC (rev 4816) +++ csw/mgar/pkg/patch/trunk/Makefile 2009-05-12 08:59:22 UTC (rev 4817) @@ -1,19 +1,22 @@ GARNAME = patch -GARVERSION = 2.5.4 +GARVERSION = 2.5.9 CATEGORIES = utils DESCRIPTION = GNU patch utility define BLURB - The GNU patch utility. + The GNU patch utility. endef MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PACKAGES = CSWgpatch + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --program-prefix=g INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir mandir Modified: csw/mgar/pkg/patch/trunk/checksums =================================================================== --- csw/mgar/pkg/patch/trunk/checksums 2009-05-12 04:14:16 UTC (rev 4816) +++ csw/mgar/pkg/patch/trunk/checksums 2009-05-12 08:59:22 UTC (rev 4817) @@ -1 +1 @@ -ee5ae84d115f051d87fcaaef3b4ae782 download/patch-2.5.4.tar.gz +dacfb618082f8d3a2194601193cf8716 download/patch-2.5.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue May 12 12:34:38 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 12 May 2009 10:34:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[4818] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: Revision: 4818 http://gar.svn.sourceforge.net/gar/?rev=4818&view=rev Author: idogan23 Date: 2009-05-12 10:34:38 +0000 (Tue, 12 May 2009) Log Message: ----------- unbound: fixed path for the cswusergroup file Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2009-05-12 08:59:22 UTC (rev 4817) +++ csw/mgar/pkg/unbound/trunk/Makefile 2009-05-12 10:34:38 UTC (rev 4818) @@ -18,7 +18,7 @@ GARCOMPILER = GCC4 SPKG_CLASSES = none cswusergroup cswcpsampleconf cswinitsmf -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswunbound$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/unbound\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } $$$$3 ~ /\/unbound\/unbound.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswunbound$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/CSWunbound\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } $$$$3 ~ /\/unbound\/unbound.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -38,7 +38,8 @@ post-install-modulated: @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/cswunbound $(DESTDIR)/etc/opt/csw/init.d/cswunbound - @ginstall -m 755 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/unbound/cswusergroup + @ginstall -m 755 $(DESTDIR)/etc/opt/csw/pkg/CSWunbound + @ginstall -m 755 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWunbound/cswusergroup @mv $(DESTDIR)/etc/opt/csw/unbound/unbound.conf $(DESTDIR)/etc/opt/csw/unbound/unbound.conf.CSW @chmod 444 $(DESTDIR)/etc/opt/csw/unbound/unbound.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue May 12 14:27:07 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 12 May 2009 12:27:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[4819] csw/mgar/pkg/transmission/trunk Message-ID: Revision: 4819 http://gar.svn.sourceforge.net/gar/?rev=4819&view=rev Author: idogan23 Date: 2009-05-12 12:27:07 +0000 (Tue, 12 May 2009) Log Message: ----------- transmission: update to 1.60 Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile csw/mgar/pkg/transmission/trunk/checksums Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2009-05-12 10:34:38 UTC (rev 4818) +++ csw/mgar/pkg/transmission/trunk/Makefile 2009-05-12 12:27:07 UTC (rev 4819) @@ -1,5 +1,5 @@ GARNAME = transmission -GARVERSION = 1.42 +GARVERSION = 1.60 CATEGORIES = net DESCRIPTION = Fast, easy, and free multi-platform BitTorrent client @@ -14,8 +14,11 @@ UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 GARCOMPILER = GNU +EXTRA_CFLAGS = -DNO_SYS_QUEUE_H CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/transmission/trunk/checksums =================================================================== --- csw/mgar/pkg/transmission/trunk/checksums 2009-05-12 10:34:38 UTC (rev 4818) +++ csw/mgar/pkg/transmission/trunk/checksums 2009-05-12 12:27:07 UTC (rev 4819) @@ -1,2 +1,2 @@ -c083bdcb01426466e80ee339bccd9351 download/transmission-1.42.tar.bz2 0b6395df62da35201f8663ceea204f51 download/CSWtransmission.gspec +8b30cf189240f0c50ccd11c618a6906a download/transmission-1.60.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue May 12 14:52:01 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 12 May 2009 12:52:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[4820] csw/mgar/pkg Message-ID: Revision: 4820 http://gar.svn.sourceforge.net/gar/?rev=4820&view=rev Author: idogan23 Date: 2009-05-12 12:52:01 +0000 (Tue, 12 May 2009) Log Message: ----------- ldns: initial commit Added Paths: ----------- csw/mgar/pkg/ldns/ csw/mgar/pkg/ldns/branches/ csw/mgar/pkg/ldns/tags/ csw/mgar/pkg/ldns/trunk/ csw/mgar/pkg/ldns/trunk/Makefile csw/mgar/pkg/ldns/trunk/checksums csw/mgar/pkg/ldns/trunk/files/ csw/mgar/pkg/ldns/trunk/files/doxyparse.diff Property changes on: csw/mgar/pkg/ldns/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/ldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ldns/trunk/Makefile 2009-05-12 12:52:01 UTC (rev 4820) @@ -0,0 +1,38 @@ +GARNAME = ldns +GARVERSION = 1.5.1 +CATEGORIES = lib + +DESCRIPTION = A library for programs conforming to DNS RFCs and drafts +define BLURB + Ldns is a library to simplify implementation of recent DNS RFCs. The goal + is to allow depelopers to easily create software conforming to current RFCs + and experimental software for current Internet drafts. + Because ldns is written in C it should be a lot faster than Perl or other + scripting languages. +endef + +MASTER_SITES = http://www.nlnetlabs.nl/projects/ldns/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += doxyparse.diff + +# 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 = http://www.nlnetlabs.nl/downloads/ldns\ + +REGUIRED_PKGS = CSWosslrt +REQUIRED_PKGS += CSWgcc4corert + +PATCHFILES = doxyparse.diff + +GARCOMPILER = GCC4 +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-ssl=/opt/csw +CONFIGURE_ARGS += --enable-sha2 + +TEST_TARGET = + +include gar/category.mk Added: csw/mgar/pkg/ldns/trunk/checksums =================================================================== --- csw/mgar/pkg/ldns/trunk/checksums (rev 0) +++ csw/mgar/pkg/ldns/trunk/checksums 2009-05-12 12:52:01 UTC (rev 4820) @@ -0,0 +1,2 @@ +b5516aacfa819947cbfb6d0c34f0c546 download/doxyparse.diff +17f73def98711e1475409d9a8d5d9dcd download/ldns-1.5.1.tar.gz Added: csw/mgar/pkg/ldns/trunk/files/doxyparse.diff =================================================================== --- csw/mgar/pkg/ldns/trunk/files/doxyparse.diff (rev 0) +++ csw/mgar/pkg/ldns/trunk/files/doxyparse.diff 2009-05-12 12:52:01 UTC (rev 4820) @@ -0,0 +1,9 @@ +diff --speed-large-files --minimal -Nru ldns-1.5.1.orig/doc/doxyparse.pl ldns-1.5.1/doc/doxyparse.pl +--- ldns-1.5.1.orig/doc/doxyparse.pl 2008-05-28 10:28:39.000000000 +0200 ++++ ldns-1.5.1/doc/doxyparse.pl 2009-05-12 13:41:55.220351895 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/opt/csw/bin/perl + + # Doxygen is usefull for html documentation, but sucks + # in making manual pages. Still tool also parses the .h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue May 12 16:59:03 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 12 May 2009 14:59:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[4821] csw/mgar/pkg/bison/trunk Message-ID: Revision: 4821 http://gar.svn.sourceforge.net/gar/?rev=4821&view=rev Author: dmichelsen Date: 2009-05-12 14:59:03 +0000 (Tue, 12 May 2009) Log Message: ----------- bison: Update to 2.4.1 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/bison/trunk/Makefile csw/mgar/pkg/bison/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/bison/trunk/files/CSWbison.depend csw/mgar/pkg/bison/trunk/files/CSWbison.gspec csw/mgar/pkg/bison/trunk/files/CSWbison.prototype Property Changed: ---------------- csw/mgar/pkg/bison/trunk/ Property changes on: csw/mgar/pkg/bison/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/bison/trunk/Makefile =================================================================== --- csw/mgar/pkg/bison/trunk/Makefile 2009-05-12 12:52:01 UTC (rev 4820) +++ csw/mgar/pkg/bison/trunk/Makefile 2009-05-12 14:59:03 UTC (rev 4821) @@ -1,5 +1,5 @@ GARNAME = bison -GARVERSION = 2.3 +GARVERSION = 2.4.1 CATEGORIES = devel DESCRIPTION = GNU Project parser generator (yacc replacement) @@ -10,19 +10,26 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWbison,depend prototype) +REQUIRED_PKGS = CSWggettextrt CSWiconv CSWgm4 + +SPKG_SOURCEURL = http://www.gnu.org/software/bison/ + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 TAR_ARGS = +OPT_FLAGS_SOS = -xO1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check include gar/category.mk -post-install: +# Must use GNU grep during test +PATH := /opt/csw/gnu:$(PATH) + +post-install-modulated: (cd $(DESTDIR)$(prefix)/bin; \ /usr/ccs/bin/strip bison; \ /usr/ccs/bin/mcs -d bison; \ Modified: csw/mgar/pkg/bison/trunk/checksums =================================================================== --- csw/mgar/pkg/bison/trunk/checksums 2009-05-12 12:52:01 UTC (rev 4820) +++ csw/mgar/pkg/bison/trunk/checksums 2009-05-12 14:59:03 UTC (rev 4821) @@ -1,4 +1 @@ -c18640c6ec31a169d351e3117ecce3ec download/bison-2.3.tar.bz2 -7b97259996330c378c0e6b020fb38094 download/CSWbison.gspec -37e50f9c7a915990ea402e26f48a92eb download/CSWbison.depend -de4fdac31f53df1d06cbc328fbb24b7d download/CSWbison.prototype +84e80a2a192c1a4c02d43fbf2bcc4ca4 download/bison-2.4.1.tar.bz2 Deleted: csw/mgar/pkg/bison/trunk/files/CSWbison.depend =================================================================== --- csw/mgar/pkg/bison/trunk/files/CSWbison.depend 2009-05-12 12:52:01 UTC (rev 4820) +++ csw/mgar/pkg/bison/trunk/files/CSWbison.depend 2009-05-12 14:59:03 UTC (rev 4821) @@ -1,3 +0,0 @@ -P CSWggettext -P CSWiconv -P CSWgm4 Deleted: csw/mgar/pkg/bison/trunk/files/CSWbison.gspec =================================================================== --- csw/mgar/pkg/bison/trunk/files/CSWbison.gspec 2009-05-12 12:52:01 UTC (rev 4820) +++ csw/mgar/pkg/bison/trunk/files/CSWbison.gspec 2009-05-12 14:59:03 UTC (rev 4821) @@ -1,4 +0,0 @@ -%var bitname bison -%var pkgname CSWbison -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{GARDIR}/net/tin/files/LICENSE Deleted: csw/mgar/pkg/bison/trunk/files/CSWbison.prototype =================================================================== --- csw/mgar/pkg/bison/trunk/files/CSWbison.prototype 2009-05-12 12:52:01 UTC (rev 4820) +++ csw/mgar/pkg/bison/trunk/files/CSWbison.prototype 2009-05-12 14:59:03 UTC (rev 4821) @@ -1,118 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/bison 0755 root bin -f none /opt/csw/bin/gyacc 0755 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/liby.a 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/aclocal 0755 root bin -f none /opt/csw/share/aclocal/bison-i18n.m4 0644 root bin -d none /opt/csw/share/bison 0755 root bin -f none /opt/csw/share/bison/README 0644 root bin -f none /opt/csw/share/bison/c++.m4 0644 root bin -f none /opt/csw/share/bison/c.m4 0644 root bin -f none /opt/csw/share/bison/glr.c 0644 root bin -f none /opt/csw/share/bison/glr.cc 0644 root bin -f none /opt/csw/share/bison/lalr1.cc 0644 root bin -f none /opt/csw/share/bison/location.cc 0644 root bin -d none /opt/csw/share/bison/m4sugar 0755 root bin -f none /opt/csw/share/bison/m4sugar/m4sugar.m4 0644 root bin -f none /opt/csw/share/bison/yacc.c 0644 root bin -d none /opt/csw/share/info 0755 root bin -f none /opt/csw/share/info/bison.info 0644 root bin -d none /opt/csw/share/locale 0755 root bin -d none /opt/csw/share/locale/da 0755 root bin -d none /opt/csw/share/locale/da/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/da/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/da/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/de 0755 root bin -d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/de/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/de/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/es 0755 root bin -d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/es/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/es/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/et 0755 root bin -d none /opt/csw/share/locale/et/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/et/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/et/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/fr 0755 root bin -d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/fr/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/fr/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/ga 0755 root bin -d none /opt/csw/share/locale/ga/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/ga/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/ga/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/hr 0755 root bin -d none /opt/csw/share/locale/hr/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/hr/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/hr/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/id 0755 root bin -d none /opt/csw/share/locale/id/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/id/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/id/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/it 0755 root bin -d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/it/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/it/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/ja 0755 root bin -d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/ja/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/ja/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/ms 0755 root bin -d none /opt/csw/share/locale/ms/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/ms/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/ms/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/nb 0755 root bin -d none /opt/csw/share/locale/nb/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/nb/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/nb/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/nl 0755 root bin -d none /opt/csw/share/locale/nl/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/nl/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/nl/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/pl 0755 root bin -d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/pl/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/pl/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/pt_BR 0755 root bin -d none /opt/csw/share/locale/pt_BR/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/pt_BR/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/ro 0755 root bin -d none /opt/csw/share/locale/ro/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/ro/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/ro/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/ru 0755 root bin -d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/ru/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/ru/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/rw 0755 root bin -d none /opt/csw/share/locale/rw/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/rw/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/rw/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/sl 0755 root bin -d none /opt/csw/share/locale/sl/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/sl/LC_MESSAGES/bison-runtime.mo 0644 root bin -d none /opt/csw/share/locale/sv 0755 root bin -d none /opt/csw/share/locale/sv/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/sv/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/sv/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/tr 0755 root bin -d none /opt/csw/share/locale/tr/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/tr/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/tr/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/vi 0755 root bin -d none /opt/csw/share/locale/vi/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/vi/LC_MESSAGES/bison-runtime.mo 0644 root bin -f none /opt/csw/share/locale/vi/LC_MESSAGES/bison.mo 0644 root bin -d none /opt/csw/share/locale/zh_TW 0755 root bin -d none /opt/csw/share/locale/zh_TW/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo 0644 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/bison.1 0644 root bin -i copyright=CSWbison.copyright -i depend=CSWbison.depend -i pkginfo=CSWbison.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue May 12 17:09:18 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 12 May 2009 15:09:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[4822] csw/mgar/pkg/rrdtool/trunk/checksums Message-ID: Revision: 4822 http://gar.svn.sourceforge.net/gar/?rev=4822&view=rev Author: idogan23 Date: 2009-05-12 15:09:18 +0000 (Tue, 12 May 2009) Log Message: ----------- rrdtool: includes a fix for a linker issue on Solaris Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/checksums Modified: csw/mgar/pkg/rrdtool/trunk/checksums =================================================================== --- csw/mgar/pkg/rrdtool/trunk/checksums 2009-05-12 14:59:03 UTC (rev 4821) +++ csw/mgar/pkg/rrdtool/trunk/checksums 2009-05-12 15:09:18 UTC (rev 4822) @@ -1,3 +1,2 @@ -e2e0da2a83e58ba2fcefba932a3cbb72 download/rrdtool-1.3.7.tar.gz 48a9b258cf8b4b943dbaf30ea939c315 download/CSWrrdtool.gspec -1c2f1efd982f4f4a1c9d5abd1f8b6501 download/fixme.sh +2d29d1595aecb31838279c17d06da3a4 download/rrdtool-1.3.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue May 12 20:45:00 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 12 May 2009 18:45:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[4823] csw/mgar/pkg/ldns/trunk/Makefile Message-ID: Revision: 4823 http://gar.svn.sourceforge.net/gar/?rev=4823&view=rev Author: idogan23 Date: 2009-05-12 18:45:00 +0000 (Tue, 12 May 2009) Log Message: ----------- ldns: fixed typo Modified Paths: -------------- csw/mgar/pkg/ldns/trunk/Makefile Modified: csw/mgar/pkg/ldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns/trunk/Makefile 2009-05-12 15:09:18 UTC (rev 4822) +++ csw/mgar/pkg/ldns/trunk/Makefile 2009-05-12 18:45:00 UTC (rev 4823) @@ -22,7 +22,7 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES UPSTREAM_MASTER_SITES = http://www.nlnetlabs.nl/downloads/ldns\ -REGUIRED_PKGS = CSWosslrt +REQUIRED_PKGS = CSWosslrt REQUIRED_PKGS += CSWgcc4corert PATCHFILES = doxyparse.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue May 12 21:44:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 12 May 2009 19:44:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[4824] csw/mgar/pkg/bison/trunk/Makefile Message-ID: Revision: 4824 http://gar.svn.sourceforge.net/gar/?rev=4824&view=rev Author: dmichelsen Date: 2009-05-12 19:44:21 +0000 (Tue, 12 May 2009) Log Message: ----------- bison: Add extra dependencies Modified Paths: -------------- csw/mgar/pkg/bison/trunk/Makefile Modified: csw/mgar/pkg/bison/trunk/Makefile =================================================================== --- csw/mgar/pkg/bison/trunk/Makefile 2009-05-12 18:45:00 UTC (rev 4823) +++ csw/mgar/pkg/bison/trunk/Makefile 2009-05-12 19:44:21 UTC (rev 4824) @@ -11,6 +11,7 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PREREQUISITE_PKGS = CSWgnulinks REQUIRED_PKGS = CSWggettextrt CSWiconv CSWgm4 SPKG_SOURCEURL = http://www.gnu.org/software/bison/ @@ -24,6 +25,8 @@ TEST_TARGET = check +EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset\.alias + include gar/category.mk # Must use GNU grep during test @@ -34,3 +37,4 @@ /usr/ccs/bin/strip bison; \ /usr/ccs/bin/mcs -d bison; \ mv yacc gyacc) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue May 12 22:41:51 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 12 May 2009 20:41:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[4825] csw/mgar/pkg Message-ID: Revision: 4825 http://gar.svn.sourceforge.net/gar/?rev=4825&view=rev Author: idogan23 Date: 2009-05-12 20:41:51 +0000 (Tue, 12 May 2009) Log Message: ----------- drill: initial commit Added Paths: ----------- csw/mgar/pkg/drill/ csw/mgar/pkg/drill/branches/ csw/mgar/pkg/drill/tags/ csw/mgar/pkg/drill/trunk/ csw/mgar/pkg/drill/trunk/Makefile csw/mgar/pkg/drill/trunk/checksums csw/mgar/pkg/drill/trunk/files/ Property changes on: csw/mgar/pkg/drill/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/drill/trunk/Makefile =================================================================== --- csw/mgar/pkg/drill/trunk/Makefile (rev 0) +++ csw/mgar/pkg/drill/trunk/Makefile 2009-05-12 20:41:51 UTC (rev 4825) @@ -0,0 +1,32 @@ +GARNAME = drill +GARVERSION = 1.5.1 +CATEGORIES = utils + +DESCRIPTION = A dig style dnssec aware dns debugging tool +define BLURB + Drill is a tool a la dig from BIND. It was designed with DNSSEC in + mind and should be a useful debugging/query tool for DNSSEC. +endef + +MASTER_SITES = http://www.nlnetlabs.nl/projects/ldns/ +DISTFILES = ldns-$(GARVERSION).tar.gz + +# 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 = http://www.nlnetlabs.nl/downloads/ldns/ + +DISTNAME = ldns-$(GARVERSION) +WORKSRC = $(WORKDIR)/$(DISTNAME)/drill + +REQUIRED_PKGS = CSWldns +REQUIRED_PKGS += CSWosslrt + +GARCOMPILER = GCC4 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-ssl=/opt/csw +CONFIGURE_ARGS += --with-ldns=/opt/csw + +include gar/category.mk Added: csw/mgar/pkg/drill/trunk/checksums =================================================================== --- csw/mgar/pkg/drill/trunk/checksums (rev 0) +++ csw/mgar/pkg/drill/trunk/checksums 2009-05-12 20:41:51 UTC (rev 4825) @@ -0,0 +1 @@ +17f73def98711e1475409d9a8d5d9dcd download/ldns-1.5.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue May 12 23:13:48 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 12 May 2009 21:13:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[4826] csw/mgar/pkg/thunderbird/trunk Message-ID: Revision: 4826 http://gar.svn.sourceforge.net/gar/?rev=4826&view=rev Author: wbonnet Date: 2009-05-12 21:13:48 +0000 (Tue, 12 May 2009) Log Message: ----------- Makefile update Remaining work : . Remove version from path Modified Paths: -------------- csw/mgar/pkg/thunderbird/trunk/Makefile csw/mgar/pkg/thunderbird/trunk/checksums Modified: csw/mgar/pkg/thunderbird/trunk/Makefile =================================================================== --- csw/mgar/pkg/thunderbird/trunk/Makefile 2009-05-12 20:41:51 UTC (rev 4825) +++ csw/mgar/pkg/thunderbird/trunk/Makefile 2009-05-12 21:13:48 UTC (rev 4826) @@ -8,14 +8,17 @@ Thunderbird 2 is the next generation release of the award-winning Thunderbird email client from Mozilla. endef -MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/$(GARVERSION)/source/ DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.bz2 -DISTFILES += $(call admfiles,CSWthunderbird, ) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*) +MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/$(GARVERSION)/source/ UPSTREAM_MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/ +PACKAGES = CSWthunderbird +CATALOGNAME_CSWthunderbird = thunderbird +SPKG_DESC_CSWthunderbird = $(DESCRIPTION) + CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/thunderbird CFLAGS+= -DG_HAVE_ISO_VARARGS @@ -24,14 +27,40 @@ export PERL CFLAGS CXXFLAGS LDFLAGS -PKGS_REQUIRED_CSWthunderbird = CSWbonobo2 CSWfconfig CSWftype2 CSWgconf2 CSWggettextrt CSWglib2 CSWgnomekeyring CSWgnomevfs2 -PKGS_REQUIRED_CSWthunderbird += CSWgtk2 CSWlibart CSWlibatk CSWlibbonoboui CSWlibcairo CSWlibgnome CSWlibgnomecanvas -PKGS_REQUIRED_CSWthunderbird += CSWlibgnomeui CSWlibidl CSWlibpopt CSWlibxft2 CSWlibxrender CSWorbit2 CSWpango CSWzlib +REQUIRED_PKGS_CSWthunderbird = CSWbonobo2 +REQUIRED_PKGS_CSWthunderbird += CSWfconfig +REQUIRED_PKGS_CSWthunderbird += CSWftype2 +REQUIRED_PKGS_CSWthunderbird += CSWgconf2 +REQUIRED_PKGS_CSWthunderbird += CSWggettextrt +REQUIRED_PKGS_CSWthunderbird += CSWglib2 +REQUIRED_PKGS_CSWthunderbird += CSWgnomekeyring +REQUIRED_PKGS_CSWthunderbird += CSWgnomevfs2 +REQUIRED_PKGS_CSWthunderbird += CSWgtk2 +REQUIRED_PKGS_CSWthunderbird += CSWlibart +REQUIRED_PKGS_CSWthunderbird += CSWlibatk +REQUIRED_PKGS_CSWthunderbird += CSWlibbonoboui +REQUIRED_PKGS_CSWthunderbird += CSWlibcairo +REQUIRED_PKGS_CSWthunderbird += CSWlibgnome +REQUIRED_PKGS_CSWthunderbird += CSWlibgnomecanvas +REQUIRED_PKGS_CSWthunderbird += CSWlibgnomeui +REQUIRED_PKGS_CSWthunderbird += CSWlibidl +REQUIRED_PKGS_CSWthunderbird += CSWlibpopt +REQUIRED_PKGS_CSWthunderbird += CSWlibxft2 +REQUIRED_PKGS_CSWthunderbird += CSWlibxrender +REQUIRED_PKGS_CSWthunderbird += CSWorbit2 +REQUIRED_PKGS_CSWthunderbird += CSWpango +REQUIRED_PKGS_CSWthunderbird += CSWzlib #PATCHFILES = autoconf.mk.in.diff TEST_SCRIPTS = +LICENSE = LICENSE + +# Variable for direct access to working dir +WORK_BUILD = $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME) +WORK_INSTALL = $(WORKROOTDIR)/install-$(firstword $(MODULATIONS)) + post-extract: @mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME) @$(MAKECOOKIE) @@ -40,20 +69,22 @@ @cp $(FILEDIR)/.mozconfig $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME)/.mozconfig pre-install: - ( if [ ! -d $(DESTDIR)/opt/csw/bin ] ; then mkdir -p $(DESTDIR)/opt/csw/bin ; fi ) - ( cd $(DESTDIR)/opt/csw/bin && rm -f thunderbird && ln -s ../mozilla/thunderbird/bin/thunderbird . ) - ( mkdir -p $(DESTDIR)/opt/csw/share/pixmaps ) -# ( cp $(WORKDIR)/$(DISTNAME)/other-licenses/branding/thunderbird/mozicon128.png $(DESTDIR)/opt/csw/share/pixmaps/thunderbird.png ) - ( mkdir -p $(DESTDIR)/opt/csw/share/applications ) - ( cp $(FILEDIR)/thunderbird.desktop $(DESTDIR)/opt/csw/share/applications/thunderbird.desktop ) - ( mkdir -p $(DESTDIR)/opt/csw/share/gnome/mime-info ) - ( cp $(FILEDIR)/thunderbird.keys $(DESTDIR)/opt/csw/share/gnome/mime-info/thunderbird.keys ) + ( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi ) + ( cd $(WORK_INSTALL)/opt/csw/bin && if [ -L $(GARNAME) ] ; then rm $(GARNAME) ; fi && ln -s ../mozilla/$(GARNAME)/bin/$(GARNAME) . ) + ( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps ) + ( cp $(WORK_BUILD)/other-licenses/branding/thunderbird/content/icon64.png $(WORK_INSTALL)/opt/csw/share/pixmaps/thunderbird.png ) + ( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications ) + ( cp $(FILEDIR)/thunderbird.desktop $(WORK_INSTALL)/opt/csw/share/applications/thunderbird.desktop ) + ( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info ) + ( cp $(FILEDIR)/thunderbird.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/thunderbird.keys ) post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) -# ( gfind $(DESTDIR)/opt/csw -name chromelist.txt -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORKDIR)/$(DISTNAME)/\_\_g {}.temp > {} && rm {}.temp" \; ) -# ( gfind $(DESTDIR)/opt/csw/mozilla/thunderbird -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORKDIR)/$(DISTNAME)/\_\_g {}.temp > {} && rm {}.temp" \; ) -# ( gfind $(DESTDIR)/opt/csw/mozilla/thunderbird -name "*.jar" -exec bash -c "`pwd`/removeBuildPathFromJar.sh {} `pwd` $(WORKDIR) $(DISTNAME)" \; ) + ( gfind $(WORK_INSTALL)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) + ( mv $(WORK_INSTALL)/opt/csw/mozilla/thunderbird/lib/pkgconfig/thunderbird-nspr.pc $(WORK_INSTALL)/opt/csw/mozilla/thunderbird/lib/pkgconfig/thunderbird-nspr.pc.temp && gsed -e s\_-L$(WORK_INSTALL)/opt/csw/lib\_\_g $(WORK_INSTALL)/opt/csw/mozilla/thunderbird/lib/pkgconfig/thunderbird-nspr.pc.temp > $(WORK_INSTALL)/opt/csw/mozilla/thunderbird/lib/pkgconfig/thunderbird-nspr.pc && rm $(WORK_INSTALL)/opt/csw/mozilla/thunderbird/lib/pkgconfig/thunderbird-nspr.pc.temp ) + ( gfind $(WORK_INSTALL)/opt/csw -name chromelist.txt -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp" \; ) + ( gfind $(WORK_INSTALL)/opt/csw/mozilla/thunderbird -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp" \; ) + ( gfind $(WORK_INSTALL)/opt/csw/mozilla/thunderbird -name "*.jar" -exec bash -c "`pwd`/removeBuildPathFromJar.sh {} `pwd` $(WORKDIR) $(DISTNAME)" \; ) +# include the rest of GAR include gar/category.mk Modified: csw/mgar/pkg/thunderbird/trunk/checksums =================================================================== --- csw/mgar/pkg/thunderbird/trunk/checksums 2009-05-12 20:41:51 UTC (rev 4825) +++ csw/mgar/pkg/thunderbird/trunk/checksums 2009-05-12 21:13:48 UTC (rev 4826) @@ -1,2 +1,2 @@ +3a6b0245afd9c4e8b624f2455767574e download/CSWthunderbird.gspec 55e24753a7ccf2fbf0272987dd4bb086 download/thunderbird-2.0.0.21-source.tar.bz2 -3a6b0245afd9c4e8b624f2455767574e download/CSWthunderbird.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue May 12 23:28:54 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 12 May 2009 21:28:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[4827] csw/mgar/pkg/thunderbird/trunk Message-ID: Revision: 4827 http://gar.svn.sourceforge.net/gar/?rev=4827&view=rev Author: wbonnet Date: 2009-05-12 21:28:53 +0000 (Tue, 12 May 2009) Log Message: ----------- Remove version from path Modified Paths: -------------- csw/mgar/pkg/thunderbird/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/thunderbird/trunk/files/autoconf.mk.in.diff Modified: csw/mgar/pkg/thunderbird/trunk/Makefile =================================================================== --- csw/mgar/pkg/thunderbird/trunk/Makefile 2009-05-12 21:13:48 UTC (rev 4826) +++ csw/mgar/pkg/thunderbird/trunk/Makefile 2009-05-12 21:28:53 UTC (rev 4827) @@ -51,7 +51,7 @@ REQUIRED_PKGS_CSWthunderbird += CSWpango REQUIRED_PKGS_CSWthunderbird += CSWzlib -#PATCHFILES = autoconf.mk.in.diff +PATCHFILES = autoconf.mk.in.diff TEST_SCRIPTS = Added: csw/mgar/pkg/thunderbird/trunk/files/autoconf.mk.in.diff =================================================================== --- csw/mgar/pkg/thunderbird/trunk/files/autoconf.mk.in.diff (rev 0) +++ csw/mgar/pkg/thunderbird/trunk/files/autoconf.mk.in.diff 2009-05-12 21:28:53 UTC (rev 4827) @@ -0,0 +1,22 @@ +diff --speed-large-files --minimal -Nru thunderbird.orig/config/autoconf.mk.in thunderbird/config/autoconf.mk.in +--- thunderbird.orig/config/autoconf.mk.in 2006-09-14 14:07:03.000000000 -0400 ++++ thunderbird/config/autoconf.mk.in 2007-02-25 07:21:36.245899000 -0500 +@@ -57,14 +57,14 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@ + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ +-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++idldir = @datadir@/idl + +-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) ++mozappdir = $(libdir) ++mredir = $(libdir)/mre + mrelibdir = $(mredir)/lib + + DIST = $(DEPTH)/dist This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue May 12 23:36:51 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 12 May 2009 21:36:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[4828] csw/mgar/pkg/thunderbird/trunk Message-ID: Revision: 4828 http://gar.svn.sourceforge.net/gar/?rev=4828&view=rev Author: wbonnet Date: 2009-05-12 21:36:50 +0000 (Tue, 12 May 2009) Log Message: ----------- Fix patch file Modified Paths: -------------- csw/mgar/pkg/thunderbird/trunk/checksums csw/mgar/pkg/thunderbird/trunk/files/autoconf.mk.in.diff Modified: csw/mgar/pkg/thunderbird/trunk/checksums =================================================================== --- csw/mgar/pkg/thunderbird/trunk/checksums 2009-05-12 21:28:53 UTC (rev 4827) +++ csw/mgar/pkg/thunderbird/trunk/checksums 2009-05-12 21:36:50 UTC (rev 4828) @@ -1,2 +1,2 @@ -3a6b0245afd9c4e8b624f2455767574e download/CSWthunderbird.gspec +73a73d79047dea6be2d222d5b9eeb5f7 download/autoconf.mk.in.diff 55e24753a7ccf2fbf0272987dd4bb086 download/thunderbird-2.0.0.21-source.tar.bz2 Modified: csw/mgar/pkg/thunderbird/trunk/files/autoconf.mk.in.diff =================================================================== --- csw/mgar/pkg/thunderbird/trunk/files/autoconf.mk.in.diff 2009-05-12 21:28:53 UTC (rev 4827) +++ csw/mgar/pkg/thunderbird/trunk/files/autoconf.mk.in.diff 2009-05-12 21:36:50 UTC (rev 4828) @@ -2,21 +2,21 @@ --- thunderbird.orig/config/autoconf.mk.in 2006-09-14 14:07:03.000000000 -0400 +++ thunderbird/config/autoconf.mk.in 2007-02-25 07:21:36.245899000 -0500 @@ -57,14 +57,14 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@ - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = @datadir@/idl + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@ + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ +-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++idldir = @datadir@/idl --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) -+mozappdir = $(libdir) -+mredir = $(libdir)/mre - mrelibdir = $(mredir)/lib +-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) ++mozappdir = $(libdir) ++mredir = $(libdir)/mre + mrelibdir = $(mredir)/lib - DIST = $(DEPTH)/dist + DIST = $(DEPTH)/dist This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Wed May 13 11:31:59 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Wed, 13 May 2009 09:31:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[4829] csw/mgar/pkg/pnp/trunk Message-ID: Revision: 4829 http://gar.svn.sourceforge.net/gar/?rev=4829&view=rev Author: j_arndt Date: 2009-05-13 09:31:59 +0000 (Wed, 13 May 2009) Log Message: ----------- pnp: update to 0.4.14, added some patches, corrected start script Modified Paths: -------------- csw/mgar/pkg/pnp/trunk/Makefile csw/mgar/pkg/pnp/trunk/checksums csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype csw/mgar/pkg/pnp/trunk/files/cswpnp csw/mgar/pkg/pnp/trunk/files/makefile.diff Added Paths: ----------- csw/mgar/pkg/pnp/trunk/files/npcd.c.diff csw/mgar/pkg/pnp/trunk/files/npcd.cfg-sample.in.diff csw/mgar/pkg/pnp/trunk/files/npcdmod.c.diff csw/mgar/pkg/pnp/trunk/files/npcdmod.h.diff Removed Paths: ------------- csw/mgar/pkg/pnp/trunk/files/npcd.diff Modified: csw/mgar/pkg/pnp/trunk/Makefile =================================================================== --- csw/mgar/pkg/pnp/trunk/Makefile 2009-05-12 21:36:50 UTC (rev 4828) +++ csw/mgar/pkg/pnp/trunk/Makefile 2009-05-13 09:31:59 UTC (rev 4829) @@ -1,8 +1,8 @@ GARNAME = pnp -GARVERSION = 0.4.13 +GARVERSION = 0.4.14 CATEGORIES = apps -DESCRIPTION = analyzing nagios performance data with RRD databases. +DESCRIPTION = visualization of nagios performance data using RRD databases define BLURB PNP is an addon to nagios which analyzes performance data provided by plugins and stores them automatically into RRD-databases endef @@ -12,10 +12,12 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpnp, prototype ) DISTFILES += cswpnp -#DISTFILES += cswpnp cswpnp.xml svc-cswpnp PATCHFILES += makefile.diff -PATCHFILES += npcd.diff +PATCHFILES += npcd.c.diff +PATCHFILES += npcdmod.h.diff +PATCHFILES += npcdmod.c.diff +PATCHFILES += npcd.cfg-sample.in.diff # We define upstream file regex so we can be notifed of new upstream software release #UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -24,17 +26,15 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -LDFLAGS += -L/usr/ucblib -LIBS += -lucb +NOISALIST = 1 datadir = /opt/csw/nagios/share/pnp sysconfdir = $(prefix)/nagios/pnp/etc -bindir = $(prefix)/nagios/bin +bindir = $(prefix)/nagios/pnp/bin libexecdir = $(prefix)/libexec/nagios-plugins +localstatedir =$(prefix)/nagios/pnp/var -REQUIRED_PKGS_sparc = SUNWscpux -REQUIRED_PKGS_i386 = SUNWscpu -REQUIRED_PKGS = CSWphp5 CSWphp5gd CSWap2modphp5 CSWrrd $(REQUIRED_PKGS_$(GARCH)) CSWcswclassutils +REQUIRED_PKGS += CSWphp5 CSWphp5gd CSWap2modphp5 CSWrrd CSWcswclassutils SPKG_CLASSES = none cswpreserveconf cswinitsmf #PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswpnp$$$$/ { $$$$2 = "cswinitsmf" } { print }' Modified: csw/mgar/pkg/pnp/trunk/checksums =================================================================== --- csw/mgar/pkg/pnp/trunk/checksums 2009-05-12 21:36:50 UTC (rev 4828) +++ csw/mgar/pkg/pnp/trunk/checksums 2009-05-13 09:31:59 UTC (rev 4829) @@ -1,6 +1,9 @@ -20a96f81edba29dcd21215bde4af8b57 download/pnp-0.4.13.tar.gz +9dbbf08191a258f6798c9516b3821ff0 download/pnp-0.4.14.tar.gz 216b8ed50919642c3fae2a6520724dd3 download/CSWpnp.gspec -c3cee9b1ce8286d553735d2bbde151e0 download/CSWpnp.prototype -40b1d1489a41475ff6cddf441b18316a download/cswpnp -30e8699531bb0249542b3012a00a73b1 download/makefile.diff -b1229d599c2ce12c3aacf0a44e1588d6 download/npcd.diff +fc763dd71049d4c06f10b8898fa3c1bb download/CSWpnp.prototype +fec420cb27af9cbd0daba28f04500f8c download/cswpnp +80c06e6426497ed3fa96c0e77aff613d download/makefile.diff +db6af87968e9b29272d387033f09acba download/npcd.c.diff +65d971cd9983aef7f069c7976424eb99 download/npcdmod.h.diff +8380996936f96669d8abe25dd8faf392 download/npcdmod.c.diff +01c0965ea1bdd26e4f0fdbc51640dfce download/npcd.cfg-sample.in.diff Modified: csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype =================================================================== --- csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype 2009-05-12 21:36:50 UTC (rev 4828) +++ csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype 2009-05-13 09:31:59 UTC (rev 4829) @@ -4,9 +4,9 @@ d none /opt/csw/libexec/nagios-plugins 0755 root bin f none /opt/csw/libexec/nagios-plugins/process_perfdata.pl 0755 root bin d none /opt/csw/nagios 0755 root bin -d none /opt/csw/nagios/bin 0755 nagios nagios -f none /opt/csw/nagios/bin/npcd 0754 nagios nagios -f none /opt/csw/nagios/bin/npcdmod 0754 nagios nagios +d none /opt/csw/nagios/pnp/bin 0755 nagios nagios +f none /opt/csw/nagios/pnp/bin/npcd 0754 nagios nagios +f none /opt/csw/nagios/pnp/bin/npcdmod 0754 nagios nagios d none /opt/csw/nagios/pnp 0755 nagios nagios d none /opt/csw/nagios/pnp/etc 0755 nagios nagios f none /opt/csw/nagios/pnp/etc/background.pdf 0644 nagios nagios Modified: csw/mgar/pkg/pnp/trunk/files/cswpnp =================================================================== --- csw/mgar/pkg/pnp/trunk/files/cswpnp 2009-05-12 21:36:50 UTC (rev 4828) +++ csw/mgar/pkg/pnp/trunk/files/cswpnp 2009-05-13 09:31:59 UTC (rev 4829) @@ -26,7 +26,7 @@ exit $SMF_EXIT_ERR_CONFIG fi -BIN_FILE="/opt/csw/nagios/bin/npcd" +BIN_FILE="/opt/csw/nagios/pnp/bin/npcd" pidfile=`grep '^pid_file' $CONFIG_FILE |awk '{ FS = "=" } {print $2;}'` PNP_USER=`awk '/^user/ { print $NF }' $CONFIG_FILE` @@ -45,7 +45,7 @@ 'start') if [ -f $CONFIG_FILE ]; then - $BIN_FILE -c $CONFIG_FILE -d + $BIN_FILE -d -f $CONFIG_FILE fi ;; Modified: csw/mgar/pkg/pnp/trunk/files/makefile.diff =================================================================== --- csw/mgar/pkg/pnp/trunk/files/makefile.diff 2009-05-12 21:36:50 UTC (rev 4828) +++ csw/mgar/pkg/pnp/trunk/files/makefile.diff 2009-05-13 09:31:59 UTC (rev 4829) @@ -1,15 +1,6 @@ diff --speed-large-files --minimal -Nru pnp-0.4.13.orig/src/Makefile.in pnp-0.4.13/src/Makefile.in --- pnp-0.4.13.orig/src/Makefile.in 2009-02-19 18:28:41.000000000 +0100 +++ pnp-0.4.13/src/Makefile.in 2009-03-04 20:55:35.296449068 +0100 -@@ -9,7 +9,7 @@ - SRC_INCLUDE=../include - - CC=@CC@ --CFLAGS=@CFLAGS@ @DEFS@ -DNSCORE -+CFLAGS=@CFLAGS@ @DEFS@ -DNSCORE -L/usr/ucblib -R/usr/ucblib -lucb - - # Compiler flags for use with Valgrind - #CFLAGS=-O0 -g -DHAVE_CONFIG_H -DNSCORE @@ -52,7 +52,7 @@ OBJDEPS= @@ -26,7 +17,7 @@ -npcdmod.o: npcdmod.c - $(CC) $(MOD_CFLAGS) $(CFLAGS) -o npcdmod.o npcdmod.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) -fPIC +npcdmod: npcdmod.c -+ $(CC) $(MOD_CFLAGS) $(CFLAGS) -o npcdmod npcdmod.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) -fPIC ++ $(CC) $(MOD_CFLAGS) $(CFLAGS) -o npcdmod npcdmod.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) ############################### # Added: csw/mgar/pkg/pnp/trunk/files/npcd.c.diff =================================================================== --- csw/mgar/pkg/pnp/trunk/files/npcd.c.diff (rev 0) +++ csw/mgar/pkg/pnp/trunk/files/npcd.c.diff 2009-05-13 09:31:59 UTC (rev 4829) @@ -0,0 +1,103 @@ +diff --speed-large-files --minimal -Nru pnp-0.4.14.orig/src/npcd.c pnp-0.4.14/src/npcd.c +--- pnp-0.4.14.orig/src/npcd.c 2009-05-02 11:25:23.000000000 +0200 ++++ pnp-0.4.14/src/npcd.c 2009-05-10 20:57:26.766575641 +0200 +@@ -56,6 +56,99 @@ + const char *directory = NULL; + const char progname[5] = "npcd"; + ++int ++scandir(const char *dirname, struct dirent *(*namelist[]), ++ int (*select)(const struct dirent *), ++ int (*dcomp)(const struct dirent **, const struct dirent **)) ++{ ++ struct dirent *d, *p, **names = NULL; ++ size_t nitems = 0; ++ size_t arraysz, entlen; ++ struct stat64 stb; ++ DIR *dirp; ++ u_longlong_t tmp_arraysz; ++ ++ if ((dirp = opendir(dirname)) == NULL) ++ return (-1); ++ if (fstat64(dirp->dd_fd, &stb) < 0) ++ goto fail; ++ ++ /* ++ * * estimate the array size by taking the size of the directory file ++ * * and dividing it by a multiple of the minimum size entry. ++ * */ ++ tmp_arraysz = stb.st_size / 24; /* 24 bytes on a 64-bit system */ ++ if (tmp_arraysz > INT_MAX) ++ arraysz = INT_MAX; ++ else ++ arraysz = (size_t)tmp_arraysz; ++ names = malloc(arraysz * sizeof (struct dirent *)); ++ if (names == NULL) ++ goto fail; ++ ++ while ((d = readdir(dirp)) != NULL) { ++ if (select != NULL && !(*select)(d)) ++ continue; /* just selected names */ ++ ++ entlen = d->d_reclen; ++ /* ++ * * Make a minimum size copy of the data ++ * */ ++ p = malloc(entlen); ++ if (p == NULL) ++ goto fail; ++ (void) memcpy(p, d, entlen); ++ /* ++ * * Check to make sure the array has space left and ++ * * realloc the maximum size. ++ * */ ++ if (nitems >= arraysz) { ++ struct dirent **tmp; ++ if (nitems == INT_MAX) { ++ /* overflow */ ++ free(p); ++ errno = EOVERFLOW; ++ goto fail; ++ } ++ arraysz += 512; /* no science here */ ++ tmp = realloc(names, ++ arraysz * sizeof (struct dirent *)); ++ if (tmp == NULL) { ++ free(p); ++ goto fail; ++ } ++ names = tmp; ++ } ++ names[nitems++] = p; ++ } ++ (void) closedir(dirp); ++ if (nitems && dcomp != NULL) ++ qsort(names, nitems, sizeof (struct dirent *), ++ (int(*)(const void *, const void *))dcomp); ++ *namelist = names; ++ ++ return ((int)nitems); ++ ++fail: ++ while (nitems != 0) { ++ free(names[--nitems]); ++ } ++ if (names) ++ free(names); ++ (void) closedir(dirp); ++ return (-1); ++} ++ ++/* ++ * * Alphabetic order comparison routine for those who want it. ++ * */ ++int ++alphasort(const struct dirent **d1, const struct dirent **d2) ++{ ++ return (strcoll((*d1)->d_name, ++ (*d2)->d_name)); ++} ++ + static void start_daemon(const char *log_name, int facility) { + int i; + pid_t pid; Added: csw/mgar/pkg/pnp/trunk/files/npcd.cfg-sample.in.diff =================================================================== --- csw/mgar/pkg/pnp/trunk/files/npcd.cfg-sample.in.diff (rev 0) +++ csw/mgar/pkg/pnp/trunk/files/npcd.cfg-sample.in.diff 2009-05-13 09:31:59 UTC (rev 4829) @@ -0,0 +1,14 @@ +diff --speed-large-files --minimal -Nru pnp-0.4.14.orig/sample-config/pnp/npcd.cfg-sample.in pnp-0.4.14/sample-config/pnp/npcd.cfg-sample.in +--- pnp-0.4.14.orig/sample-config/pnp/npcd.cfg-sample.in 2009-05-02 11:25:23.000000000 +0200 ++++ pnp-0.4.14/sample-config/pnp/npcd.cfg-sample.in 2009-05-12 18:38:17.625341221 +0200 +@@ -32,8 +32,8 @@ + # log_type = + # + +-#log_type = file +-log_type = syslog ++log_type = file ++#log_type = syslog + + + # log_file - define a path to your logfile Deleted: csw/mgar/pkg/pnp/trunk/files/npcd.diff =================================================================== --- csw/mgar/pkg/pnp/trunk/files/npcd.diff 2009-05-12 21:36:50 UTC (rev 4828) +++ csw/mgar/pkg/pnp/trunk/files/npcd.diff 2009-05-13 09:31:59 UTC (rev 4829) @@ -1,15 +0,0 @@ -diff --speed-large-files --minimal -Nru pnp-0.4.13.orig/src/npcd.c pnp-0.4.13/src/npcd.c ---- pnp-0.4.13.orig/src/npcd.c 2009-02-19 18:28:41.000000000 +0100 -+++ pnp-0.4.13/src/npcd.c 2009-03-04 20:39:15.803376720 +0100 -@@ -56,6 +56,11 @@ - const char *directory = NULL; - const char progname[5] = "npcd"; - -+int alphasort(const struct dirent **a, const struct dirent **b) -+{ -+ return(strcmp((*a)->d_name, (*b)->d_name)); -+} -+ - static void start_daemon(const char *log_name, int facility) { - int i; - pid_t pid; Added: csw/mgar/pkg/pnp/trunk/files/npcdmod.c.diff =================================================================== --- csw/mgar/pkg/pnp/trunk/files/npcdmod.c.diff (rev 0) +++ csw/mgar/pkg/pnp/trunk/files/npcdmod.c.diff 2009-05-13 09:31:59 UTC (rev 4829) @@ -0,0 +1,12 @@ +diff --speed-large-files --minimal -Nru pnp-0.4.14.orig/src/npcdmod.c pnp-0.4.14/src/npcdmod.c +--- pnp-0.4.14.orig/src/npcdmod.c 2009-05-02 11:25:23.000000000 +0200 ++++ pnp-0.4.14/src/npcdmod.c 2009-05-11 08:08:15.406159492 +0200 +@@ -53,6 +53,8 @@ + + void npcdmod_file_roller(); + int npcdmod_handle_data(int, void *); ++int npcdmod_process_module_args(char *); ++int npcdmod_process_config_var(char *); + + /* this function gets called when the module is loaded by the event broker */ + int nebmodule_init(int flags, char *args, nebmodule *handle) { Added: csw/mgar/pkg/pnp/trunk/files/npcdmod.h.diff =================================================================== --- csw/mgar/pkg/pnp/trunk/files/npcdmod.h.diff (rev 0) +++ csw/mgar/pkg/pnp/trunk/files/npcdmod.h.diff 2009-05-13 09:31:59 UTC (rev 4829) @@ -0,0 +1,9 @@ +diff --speed-large-files --minimal -Nru pnp-0.4.14.orig/include/npcdmod.h pnp-0.4.14/include/npcdmod.h +--- pnp-0.4.14.orig/include/npcdmod.h 2009-05-02 11:25:23.000000000 +0200 ++++ pnp-0.4.14/include/npcdmod.h 2009-05-10 19:54:45.629418467 +0200 +@@ -38,4 +38,4 @@ + char *pnp_mmap_fgets(pnp_mmapfile *); + char *pnp_mmap_fgets_multiline(pnp_mmapfile *); + +-extern pnp_strip(char *); ++extern void pnp_strip(char *); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 13 13:20:07 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 May 2009 11:20:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[4830] csw/mgar/pkg Message-ID: Revision: 4830 http://gar.svn.sourceforge.net/gar/?rev=4830&view=rev Author: dmichelsen Date: 2009-05-13 11:20:07 +0000 (Wed, 13 May 2009) Log Message: ----------- glib: Initial checkin Modified Paths: -------------- csw/mgar/pkg/glib/trunk/Makefile csw/mgar/pkg/glib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/glib/ Modified: csw/mgar/pkg/glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2009-05-11 13:49:50 UTC (rev 4810) +++ csw/mgar/pkg/glib/trunk/Makefile 2009-05-13 11:20:07 UTC (rev 4830) @@ -1,17 +1,16 @@ GARNAME = glib -GARVERSION = 2.20.0 +GARVERSION = 1.3.15 CATEGORIES = lib -DESCRIPTION = The GLib library of C routines. +DESCRIPTION = The GLib library of C routines define BLURB GLib is a library containing many useful C routines for things such as trees, - hashes, and lists. GLib was previously distributed with the GTK toolkit, but - has been split off as of the developers' version 1.1.0. + hashes, and lists. endef -PACKAGES = CSWglib2 CSWglib2devel -CATALOGNAME_CSWglib2 = glib2 -CATALOGNAME_CSWglib2devel = glib2_devel +PACKAGES = CSWglib CSWglibdevel +CATALOGNAME_CSWglib2 = glib +CATALOGNAME_CSWglib2devel = glib2devel SPKG_DESC_CSWglib2 = Low level core compatibility library for GTK+ and GNOME SPKG_DESC_CSWglib2devel = Low level core compatibility library for GTK+ and GNOME development @@ -19,28 +18,28 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PATCHFILES = glib-typedetect.patch -PATCHFILES += checksum-test.patch -PATCHFILES += gsize.patch +#PATCHFILES = glib-typedetect.patch +#PATCHFILES += checksum-test.patch +#PATCHFILES += gsize.patch CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-libiconv=gnu -CONFIGURE_ARGS += --enable-static +CONFIGURE_ARGS += --with-libiconv +#CONFIGURE_ARGS += --enable-static UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 BUILD64 = 1 NO_ISAEXEC = 1 -REQUIRED_PKGS_CSWglib2 = CSWggettextrt CSWiconv -REQUIRED_PKGS_CSWglib2devel = CSWglib2 CSWggettextrt CSWiconv +#REQUIRED_PKGS_CSWglib2 = CSWggettextrt CSWiconv +#REQUIRED_PKGS_CSWglib2devel = CSWglib2 CSWggettextrt CSWiconv TEST_TARGET = check #provided by iconv -MERGE_EXCLUDE_FILES = .*/charset.alias +#MERGE_EXCLUDE_FILES = .*/charset.alias -PKGFILES_CSWglib2 = $(PKGFILES_RT) -PKGFILES_CSWglib2 += /opt/csw/share/locale/.* +#PKGFILES_CSWglib2 = $(PKGFILES_RT) +#PKGFILES_CSWglib2 += /opt/csw/share/locale/.* include gar/category.mk Modified: csw/mgar/pkg/glib/trunk/checksums =================================================================== --- csw/mgar/pkg/glib2/trunk/checksums 2009-05-11 13:49:50 UTC (rev 4810) +++ csw/mgar/pkg/glib/trunk/checksums 2009-05-13 11:20:07 UTC (rev 4830) @@ -1,4 +1 @@ -05188e560dbd8bddd568e24ce10dd003 download/glib-2.20.0.tar.bz2 -8f683820d9ecab1abd9dbe81997ab9eb download/glib-typedetect.patch -f1f3c182f64be06ab57d8b01016af074 download/checksum-test.patch -bb2fb8eef43c995fea6c08563487ace6 download/gsize.patch +a74e88fde5a3d8a47cfe71d8f4f291f2 download/glib-1.3.15.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed May 13 13:37:45 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 13 May 2009 11:37:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[4831] csw/mgar/pkg/drill/trunk/Makefile Message-ID: Revision: 4831 http://gar.svn.sourceforge.net/gar/?rev=4831&view=rev Author: idogan23 Date: 2009-05-13 11:37:45 +0000 (Wed, 13 May 2009) Log Message: ----------- drill: make check/test not supported Modified Paths: -------------- csw/mgar/pkg/drill/trunk/Makefile Modified: csw/mgar/pkg/drill/trunk/Makefile =================================================================== --- csw/mgar/pkg/drill/trunk/Makefile 2009-05-13 11:20:07 UTC (rev 4830) +++ csw/mgar/pkg/drill/trunk/Makefile 2009-05-13 11:37:45 UTC (rev 4831) @@ -29,4 +29,6 @@ CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-ldns=/opt/csw +TEST_TARGET = + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 13 13:56:52 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 May 2009 11:56:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[4832] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 4832 http://gar.svn.sourceforge.net/gar/?rev=4832&view=rev Author: dmichelsen Date: 2009-05-13 11:56:52 +0000 (Wed, 13 May 2009) Log Message: ----------- unbound: Add checksums and fix post-install Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/unbound/trunk/checksums Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2009-05-13 11:37:45 UTC (rev 4831) +++ csw/mgar/pkg/unbound/trunk/Makefile 2009-05-13 11:56:52 UTC (rev 4832) @@ -38,9 +38,10 @@ post-install-modulated: @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/cswunbound $(DESTDIR)/etc/opt/csw/init.d/cswunbound - @ginstall -m 755 $(DESTDIR)/etc/opt/csw/pkg/CSWunbound + @ginstall -d 755 $(DESTDIR)/etc/opt/csw/pkg/CSWunbound @ginstall -m 755 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWunbound/cswusergroup @mv $(DESTDIR)/etc/opt/csw/unbound/unbound.conf $(DESTDIR)/etc/opt/csw/unbound/unbound.conf.CSW @chmod 444 $(DESTDIR)/etc/opt/csw/unbound/unbound.conf.CSW + @$(MAKECOOKIE) include gar/category.mk Added: csw/mgar/pkg/unbound/trunk/checksums =================================================================== --- csw/mgar/pkg/unbound/trunk/checksums (rev 0) +++ csw/mgar/pkg/unbound/trunk/checksums 2009-05-13 11:56:52 UTC (rev 4832) @@ -0,0 +1,4 @@ +90405f880273db5036c2ebf2e881b998 download/CSWunbound.gspec +75867432e238f5afd48dfe5d138097e9 download/cswunbound +8496de3efbbda65b6145b421e6d1f076 download/cswusergroup +5437f2a1e698d8aa73ba19a60662a654 download/unbound-1.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed May 13 15:40:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 May 2009 13:40:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[4833] csw/mgar/pkg/glib/trunk Message-ID: Revision: 4833 http://gar.svn.sourceforge.net/gar/?rev=4833&view=rev Author: dmichelsen Date: 2009-05-13 13:40:09 +0000 (Wed, 13 May 2009) Log Message: ----------- glib: Downgrade to 1.2.x because all packages depend on the specific shared libs Modified Paths: -------------- csw/mgar/pkg/glib/trunk/Makefile csw/mgar/pkg/glib/trunk/checksums Modified: csw/mgar/pkg/glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib/trunk/Makefile 2009-05-13 11:56:52 UTC (rev 4832) +++ csw/mgar/pkg/glib/trunk/Makefile 2009-05-13 13:40:09 UTC (rev 4833) @@ -1,5 +1,7 @@ GARNAME = glib -GARVERSION = 1.3.15 +# Most applications bind to libglib-1.2.so.0, so stick to 1.2.x for the moment +GARVERSION = 1.2.10 +#GARVERSION = 1.3.15 CATEGORIES = lib DESCRIPTION = The GLib library of C routines @@ -8,38 +10,30 @@ hashes, and lists. endef -PACKAGES = CSWglib CSWglibdevel -CATALOGNAME_CSWglib2 = glib -CATALOGNAME_CSWglib2devel = glib2devel -SPKG_DESC_CSWglib2 = Low level core compatibility library for GTK+ and GNOME -SPKG_DESC_CSWglib2devel = Low level core compatibility library for GTK+ and GNOME development +SPKG_DESC_CSWglib2 = Utility library commonly associated with GNOME programs +REQUIRED_PKGS = CSWggettextrt CSWiconv + MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -#PATCHFILES = glib-typedetect.patch -#PATCHFILES += checksum-test.patch -#PATCHFILES += gsize.patch +# glib 1.x doesn't seem to be 64 bit clean +#BUILD64 = 1 +#NO_ISAEXEC = 1 +# Only needed for 1.3.x +#EXTRA_BUILD_EXPORTS = SGML_CATALOG_FILES +#SGML_CATALOG_FILES = $(sysconfdir)/sgml/catalog + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv -#CONFIGURE_ARGS += --enable-static UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -BUILD64 = 1 -NO_ISAEXEC = 1 - -#REQUIRED_PKGS_CSWglib2 = CSWggettextrt CSWiconv -#REQUIRED_PKGS_CSWglib2devel = CSWglib2 CSWggettextrt CSWiconv - TEST_TARGET = check #provided by iconv -#MERGE_EXCLUDE_FILES = .*/charset.alias +MERGE_EXCLUDE_FILES = .*/charset.alias -#PKGFILES_CSWglib2 = $(PKGFILES_RT) -#PKGFILES_CSWglib2 += /opt/csw/share/locale/.* - include gar/category.mk Modified: csw/mgar/pkg/glib/trunk/checksums =================================================================== --- csw/mgar/pkg/glib/trunk/checksums 2009-05-13 11:56:52 UTC (rev 4832) +++ csw/mgar/pkg/glib/trunk/checksums 2009-05-13 13:40:09 UTC (rev 4833) @@ -1 +1 @@ -a74e88fde5a3d8a47cfe71d8f4f291f2 download/glib-1.3.15.tar.bz2 +6fe30dad87c77b91b632def29dd69ef9 download/glib-1.2.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 13 16:59:41 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 13 May 2009 14:59:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[4834] csw/mgar/pkg/php4/trunk Message-ID: Revision: 4834 http://gar.svn.sourceforge.net/gar/?rev=4834&view=rev Author: valholla Date: 2009-05-13 14:59:41 +0000 (Wed, 13 May 2009) Log Message: ----------- work so far Modified Paths: -------------- csw/mgar/pkg/php4/trunk/checksums Added Paths: ----------- csw/mgar/pkg/php4/trunk/Makefile csw/mgar/pkg/php4/trunk/files/ csw/mgar/pkg/php4/trunk/files/CSWphp4.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4.space csw/mgar/pkg/php4/trunk/files/CSWphp4_ext_disable.sh csw/mgar/pkg/php4/trunk/files/CSWphp4_ext_enable.sh csw/mgar/pkg/php4/trunk/files/pear.conf.CSW csw/mgar/pkg/php4/trunk/files/pgsql.diff csw/mgar/pkg/php4/trunk/files/php.ini.CSW csw/mgar/pkg/php4/trunk/files/phpext Added: csw/mgar/pkg/php4/trunk/Makefile =================================================================== --- csw/mgar/pkg/php4/trunk/Makefile (rev 0) +++ csw/mgar/pkg/php4/trunk/Makefile 2009-05-13 14:59:41 UTC (rev 4834) @@ -0,0 +1,91 @@ +GARNAME = php +GARVERSION = 4.4.9 +CATEGORIES = lang + +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 +DISTFILES += $(GARNAME)-$(GARVERSION).tar.bz2 + +INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) +PHP4ROOT = $(DESTDIR)$(prefix)/php4 + +STRIP_DIRS += $(PHP4ROOT)/lib/php/extensions/*/ +STRIP_DIRS += $(PHP4ROOT)/bin + +PACKAGES = CSWphp4 +CATALOGNAME_CSWphp4 = php4 +SPKG_DESC_CSWphp4 = A High-Level Scripting Languages +REQUIRED_PKGS_CSWphp4 = + +PATCHFILES = pgsql.diff + +EXTRA_LIB += $(prefix)/bdb44/lib +EXTRA_INC += $(prefix)/bdb44/include +EXTRA_CFLAGS = -I$(prefix)/include/ncursesw +CONFIGURE_ARGS += --prefix=$(prefix)/php4 +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php4/bin + +CONFIGURE_ARGS += --enable-bcmath=shared +CONFIGURE_ARGS += --enable-calendar=shared +CONFIGURE_ARGS += --enable-cgi +CONFIGURE_ARGS += --enable-cli +CONFIGURE_ARGS += --with-curl=shared,$(prefix) +CONFIGURE_ARGS += --with-curlwrappers +CONFIGURE_ARGS += --enable-dba=shared +CONFIGURE_ARGS += --enable-exif +CONFIGURE_ARGS += --enable-fastcgi +CONFIGURE_ARGS += --enable-force-cgi-redirect +CONFIGURE_ARGS += --enable-gd-native-ttf +CONFIGURE_ARGS += --enable-mbregex=shared +CONFIGURE_ARGS += --enable-mbstring=shared +CONFIGURE_ARGS += --enable-mcal=shared +CONFIGURE_ARGS += --enable-sockets +CONFIGURE_ARGS += --with-bz2=shared,$(prefix) +CONFIGURE_ARGS += --with-db4=$(prefix)/bdb44 +CONFIGURE_ARGS += --with-dom-exslt=$(prefix) +CONFIGURE_ARGS += --with-dom-xslt=$(prefix) +CONFIGURE_ARGS += --with-dom=shared,$(prefix) +CONFIGURE_ARGS += --with-expat-dir=$(prefix) +CONFIGURE_ARGS += --with-gd=shared,$(prefix) +CONFIGURE_ARGS += --with-gdbm=$(prefix) +CONFIGURE_ARGS += --with-gettext=shared,$(prefix) +CONFIGURE_ARGS += --with-gmp=shared,$(prefix) +CONFIGURE_ARGS += --with-iconv=shared +CONFIGURE_ARGS += --with-imap-ssl=$(prefix) +CONFIGURE_ARGS += --with-imap=shared,$(prefix) +CONFIGURE_ARGS += --with-jpeg-dir=$(prefix) +CONFIGURE_ARGS += --with-kerberos=$(prefix) +CONFIGURE_ARGS += --with-ldap=shared,$(prefix) +CONFIGURE_ARGS += --with-ldap-sasl=$(prefix) +CONFIGURE_ARGS += --with-mssql=shared,$(prefix) +CONFIGURE_ARGS += --with-mysql=shared,$(prefix) +CONFIGURE_ARGS += --with-ncurses=shared,$(prefix) +CONFIGURE_ARGS += --with-openssl=shared,$(prefix) +CONFIGURE_ARGS += --with-pgsql=shared,$(prefix)/postgresql +CONFIGURE_ARGS += --with-png-dir=$(prefix) +CONFIGURE_ARGS += --with-unixODBC=shared,$(prefix) +CONFIGURE_ARGS += --with-xmlrpc=shared,$(prefix) +CONFIGURE_ARGS += --with-zlib=shared + + +# Disable Tests (report submitted to PHP QA) +SKIPTEST = 1 +ENABLE_CHECK = 0 + +# System Rules/Configuration +include gar/category.mk Modified: csw/mgar/pkg/php4/trunk/checksums =================================================================== --- csw/mgar/pkg/php4/trunk/checksums 2009-05-13 13:40:09 UTC (rev 4833) +++ csw/mgar/pkg/php4/trunk/checksums 2009-05-13 14:59:41 UTC (rev 4834) @@ -1 +1,2 @@ -39013 7731 download/php-4.3.6.tar.bz2 +c7fe7ddb9ff68f6cc47cbdc334e3df62 download/pgsql.diff +2e3b2a0e27f10cb84fd00e5ecd7a1880 download/php-4.4.9.tar.bz2 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4.postinstall 2009-05-13 14:59:41 UTC (rev 4834) @@ -0,0 +1,142 @@ +#!/bin/sh + +PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} +PHP_LIB=$PKG_INSTALL_ROOT/opt/csw/php4/lib +PHP_BIN=$PKG_INSTALL_ROOT/opt/csw/php4/bin +PHP_INI=$PHP_LIB/php.ini + +if [ ! -f $PHP_INI ]; then + cp -p $PHP_INI.CSW $PHP_INI +else + echo "php.ini already exists" + + extdir_ext=`${PHP_BIN}/php -i |grep 'PHP Extension' |awk '{print $NF}'` + extdir="${PHP_LIB}/php/extensions/no-debug-non-zts-${extdir_ext}" + curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' $PHP_INI` + + if [ "$extdir" != "$curextdir" ]; then + echo "updating extension_dir..." + perl -i.bak -plne "s,no-debug-non-zts-[0-9]+,$extdir," $PHP_INI + + old_list="`sed -ne 's/^extension=\(.*\)\.so/\1/p' $PHP_INI`" + new_pkgs='' + non_pkgs='' + for ext in `echo ${old_list}`; do + if grep "extension=$ext" $PHP_INI.CSW; then + new_pkgs="${new_pkgs} php4_${ext}" + else + non_pkgs="${non_pkgs} ${ext}" + fi + done + + cat << _EOT_ + +****************************************************************************** +* NOTICE: The existing php.ini file is from an older version of PHP4. +* +* ************* PLEASE READ ************* +* +* Starting with php4-5.2.9,REV=2009.04.29 the CSW php5 suite has been +* broken out into seperate packages for the modules. +* +_EOT_ +if [ -n "${new_pkgs}" ]; then + cat << _EOT_ +* ************* PLEASE READ ************* +* +* Your existing config contains the following extensions +* that now have become external packages: +* +_EOT_ +cnt=1 +for name in `echo ${new_pkgs}`; do + if [ ${cnt} -eq 1 ]; then + echo "* \c" + fi + if [ `expr ${cnt} % 4` -ne 0 ]; then + echo "${name} \c" + cnt=`expr ${cnt} + 1` + else + echo "${name}" + cnt=1 + fi +done +if [ ${cnt} -ne 1 ]; then + echo +fi +cat << _EOT_ +* +* to keep the same functionality as the original install +* you will need to install them using pkg-get +* +* If you have issues with missing extensions, Please check +* the catalog for the missing extension before filing a bug report +* +_EOT_ +else + cat << _EOT_ +* ************* PLEASE READ ************* +* +* Your existing config does not contain any shared extensions +* that are now packages. If you have issues with missing extensions, +* Please Check the catalog for the missing extension before +* filing a bug report. +* +_EOT_ +fi +if [ -n "${non_pkgs}" ]; then + cat << _EOT_ +* ************* PLEASE READ ************* +* +* Your existing config contains the following extensions +* that are not part of CSW build: +* +_EOT_ +cnt=1 +for name in `echo ${non_pkgs}`; do + if [ ${cnt} -eq 1 ]; then + echo "* \c" + fi + if [ `expr ${cnt} % 4` -ne 0 ]; then + echo "${name} \c" + cnt=`expr ${cnt} + 1` + else + echo "${name}" + cnt=1 + fi +done +if [ ${cnt} -ne 1 ]; then + echo +fi +cat << _EOT_ +* +* Please verify they are still working after this upgrade. +* +_EOT_ +fi +cat << _EOT_ +****************************************************************************** + +****************************************************************************** +* WARNING: Short open tag support in this release of CSWphp4 is DISABLED by +* default. If you rely on short open tag ( tags are recognized. +; NOTE: Using short tags should be avoided when developing applications or +; libraries that are meant for redistribution, or deployment on PHP +; servers which are not under your control, because short tags may not +; be supported on the target server. For portable, redistributable code, +; be sure not to use short tags. +short_open_tag = Off + +; Allow ASP-style <% %> tags. +asp_tags = Off + +; The number of significant digits displayed in floating point numbers. +precision = 14 + +; Enforce year 2000 compliance (will cause problems with non-compliant browsers) +y2k_compliance = On + +; Output buffering allows you to send header lines (including cookies) even +; after you send body content, at the price of slowing PHP's output layer a +; bit. You can enable output buffering during runtime by calling the output +; buffering functions. You can also enable output buffering for all files by +; setting this directive to On. If you wish to limit the size of the buffer +; to a certain size - you can use a maximum number of bytes instead of 'On', as +; a value for this directive (e.g., output_buffering=4096). +output_buffering = 4096 + +; You can redirect all of the output of your scripts to a function. For +; example, if you set output_handler to "mb_output_handler", character +; encoding will be transparently converted to the specified encoding. +; Setting any output handler automatically turns on output buffering. +; Note: People who wrote portable scripts should not depend on this ini +; directive. Instead, explicitly set the output handler using ob_start(). +; Using this ini directive may cause problems unless you know what script +; is doing. +; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler" +; and you cannot use both "ob_gzhandler" and "zlib.output_compression". +; Note: output_handler must be empty if this is set 'On' !!!! +; Instead you must use zlib.output_handler. +;output_handler = + +; Transparent output compression using the zlib library +; Valid values for this option are 'off', 'on', or a specific buffer size +; to be used for compression (default is 4KB) +; Note: Resulting chunk size may vary due to nature of compression. PHP +; outputs chunks that are few hundreds bytes each as a result of +; compression. If you prefer a larger chunk size for better +; performance, enable output_buffering in addition. +; Note: You need to use zlib.output_handler instead of the standard +; output_handler, or otherwise the output will be corrupted. +zlib.output_compression = Off +;zlib.output_compression_level = -1 + +; You cannot specify additional output handlers if zlib.output_compression +; is activated here. This setting does the same as output_handler but in +; a different order. +;zlib.output_handler = + +; Implicit flush tells PHP to tell the output layer to flush itself +; automatically after every output block. This is equivalent to calling the +; PHP function flush() after each and every call to print() or echo() and each +; and every HTML block. Turning this option on has serious performance +; implications and is generally recommended for debugging purposes only. +implicit_flush = Off + +; The unserialize callback function will be called (with the undefined class' +; name as parameter), if the unserializer finds an undefined class +; which should be instantiated. +; A warning appears if the specified function is not defined, or if the +; function doesn't include/implement the missing class. +; So only set this entry, if you really want to implement such a +; callback-function. +unserialize_callback_func= + +; When floats & doubles are serialized store serialize_precision significant +; digits after the floating point. The default value ensures that when floats +; are decoded with unserialize, the data will remain the same. +serialize_precision = 100 + +; Whether to enable the ability to force arguments to be passed by reference +; at function call time. This method is deprecated and is likely to be +; unsupported in future versions of PHP/Zend. The encouraged method of +; specifying which arguments should be passed by reference is in the function +; declaration. You're encouraged to try and turn this option Off and make +; sure your scripts work properly with it in order to ensure they will work +; with future versions of the language (you will receive a warning each time +; you use this feature, and the argument will be passed by value instead of by +; reference). +allow_call_time_pass_reference = Off + +; +; Safe Mode +; +safe_mode = Off + +; By default, Safe Mode does a UID compare check when +; opening files. If you want to relax this to a GID compare, +; then turn on safe_mode_gid. +safe_mode_gid = Off + +; When safe_mode is on, UID/GID checks are bypassed when +; including files from this directory and its subdirectories. +; (directory must also be in include_path or full path must +; be used when including) +safe_mode_include_dir = + +; When safe_mode is on, only executables located in the safe_mode_exec_dir +; will be allowed to be executed via the exec family of functions. +safe_mode_exec_dir = + +; Setting certain environment variables may be a potential security breach. +; This directive contains a comma-delimited list of prefixes. In Safe Mode, +; the user may only alter environment variables whose names begin with the +; prefixes supplied here. By default, users will only be able to set +; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR). +; +; Note: If this directive is empty, PHP will let the user modify ANY +; environment variable! +safe_mode_allowed_env_vars = PHP_ + +; This directive contains a comma-delimited list of environment variables that +; the end user won't be able to change using putenv(). These variables will be +; protected even if safe_mode_allowed_env_vars is set to allow to change them. +safe_mode_protected_env_vars = LD_LIBRARY_PATH + +; open_basedir, if set, limits all file operations to the defined directory +; and below. This directive makes most sense if used in a per-directory +; or per-virtualhost web server configuration file. This directive is +; *NOT* affected by whether Safe Mode is turned On or Off. +;open_basedir = + +; This directive allows you to disable certain functions for security reasons. +; It receives a comma-delimited list of function names. This directive is +; *NOT* affected by whether Safe Mode is turned On or Off. +disable_functions = + +; This directive allows you to disable certain classes for security reasons. +; It receives a comma-delimited list of class names. This directive is +; *NOT* affected by whether Safe Mode is turned On or Off. +disable_classes = + +; Colors for Syntax Highlighting mode. Anything that's acceptable in +; would work. +;highlight.string = #DD0000 +;highlight.comment = #FF9900 +;highlight.keyword = #007700 +;highlight.bg = #FFFFFF +;highlight.default = #0000BB +;highlight.html = #000000 + +; If enabled, the request will be allowed to complete even if the user aborts +; the request. Consider enabling it if executing long request, which may end up +; being interrupted by the user or a browser timing out. +; ignore_user_abort = On + +; Determines the size of the realpath cache to be used by PHP. This value should +; be increased on systems where PHP opens many files to reflect the quantity of +; the file operations performed. +; realpath_cache_size=16k + +; Duration of time, in seconds for which to cache realpath information for a given +; file or directory. For systems with rarely changing files, consider increasing this +; value. +; realpath_cache_ttl=120 + +; +; Misc +; +; Decides whether PHP may expose the fact that it is installed on the server +; (e.g. by adding its signature to the Web server header). It is no security +; threat in any way, but it makes it possible to determine whether you use PHP +; on your server or not. +expose_php = On + + +;;;;;;;;;;;;;;;;;;; +; Resource Limits ; +;;;;;;;;;;;;;;;;;;; + +max_execution_time = 30 ; Maximum execution time of each script, in seconds +max_input_time = 60 ; Maximum amount of time each script may spend parsing request data +memory_limit = 128M ; Maximum amount of memory a script may consume (128MB) + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Error handling and logging ; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +; error_reporting is a bit-field. Or each number up to get desired error +; reporting level +; E_ALL - All errors and warnings (doesn't include E_STRICT) +; E_ERROR - fatal run-time errors +; E_RECOVERABLE_ERROR - almost fatal run-time errors +; E_WARNING - run-time warnings (non-fatal errors) +; E_PARSE - compile-time parse errors +; E_NOTICE - run-time notices (these are warnings which often result +; from a bug in your code, but it's possible that it was +; intentional (e.g., using an uninitialized variable and +; relying on the fact it's automatically initialized to an +; empty string) +; E_STRICT - run-time notices, enable to have PHP suggest changes +; to your code which will ensure the best interoperability +; and forward compatibility of your code +; E_CORE_ERROR - fatal errors that occur during PHP's initial startup +; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's +; initial startup +; E_COMPILE_ERROR - fatal compile-time errors +; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) +; E_USER_ERROR - user-generated error message +; E_USER_WARNING - user-generated warning message +; E_USER_NOTICE - user-generated notice message +; +; Examples: +; +; - Show all errors, except for notices and coding standards warnings +; +;error_reporting = E_ALL & ~E_NOTICE +; +; - Show all errors, except for notices +; +;error_reporting = E_ALL & ~E_NOTICE | E_STRICT +; +; - Show only errors +; +;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR +; +; - Show all errors, except coding standards warnings +; +error_reporting = E_ALL + +; Print out errors (as a part of the output). For production web sites, +; you're strongly encouraged to turn this feature off, and use error logging +; instead (see below). Keeping display_errors enabled on a production web site +; may reveal security information to end users, such as file paths on your Web +; server, your database schema or other information. +display_errors = Off + +; Even when display_errors is on, errors that occur during PHP's startup +; sequence are not displayed. It's strongly recommended to keep +; display_startup_errors off, except for when debugging. +display_startup_errors = Off + +; Log errors into a log file (server-specific log, stderr, or error_log (below)) +; As stated above, you're strongly advised to use error logging in place of +; error displaying on production web sites. +log_errors = On + +; Set maximum length of log_errors. In error_log information about the source is +; added. The default is 1024 and 0 allows to not apply any maximum length at all. +log_errors_max_len = 1024 + +; Do not log repeated messages. Repeated errors must occur in same file on same +; line until ignore_repeated_source is set true. +ignore_repeated_errors = Off + +; Ignore source of message when ignoring repeated messages. When this setting +; is On you will not log errors with repeated messages from different files or +; source lines. +ignore_repeated_source = Off + +; If this parameter is set to Off, then memory leaks will not be shown (on +; stdout or in the log). This has only effect in a debug compile, and if +; error reporting includes E_WARNING in the allowed list +report_memleaks = On + +;report_zend_debug = 0 + +; Store the last error/warning message in $php_errormsg (boolean). +track_errors = Off + +; Disable the inclusion of HTML tags in error messages. +; Note: Never use this feature for production boxes. +;html_errors = Off + +; If html_errors is set On PHP produces clickable error messages that direct +; to a page describing the error or function causing the error in detail. +; You can download a copy of the PHP manual from http://www.php.net/docs.php +; and change docref_root to the base URL of your local copy including the +; leading '/'. You must also specify the file extension being used including +; the dot. +; Note: Never use this feature for production boxes. +;docref_root = "/phpmanual/" +;docref_ext = .html + +; String to output before an error message. +;error_prepend_string = "" + +; String to output after an error message. +;error_append_string = "" + +; Log errors to specified file. +;error_log = filename + +; Log errors to syslog (Event Log on NT, not valid in Windows 95). +;error_log = syslog + + +;;;;;;;;;;;;;;;;; +; Data Handling ; +;;;;;;;;;;;;;;;;; +; +; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 + +; The separator used in PHP generated URLs to separate arguments. +; Default is "&". +;arg_separator.output = "&" + +; List of separator(s) used by PHP to parse input URLs into variables. +; Default is "&". +; NOTE: Every character in this directive is considered as separator! +;arg_separator.input = ";&" + +; This directive describes the order in which PHP registers GET, POST, Cookie, +; Environment and Built-in variables (G, P, C, E & S respectively, often +; referred to as EGPCS or GPC). Registration is done from left to right, newer +; values override older values. +variables_order = "GPCS" + +; Whether or not to register the EGPCS variables as global variables. You may +; want to turn this off if you don't want to clutter your scripts' global scope +; with user data. This makes most sense when coupled with track_vars - in which +; case you can access all of the GPC variables through the $HTTP_*_VARS[], +; variables. +; +; You should do your best to write your scripts so that they do not require +; register_globals to be on; Using form variables as globals can easily lead +; to possible security problems, if the code is not very well thought of. +register_globals = Off + +; Whether or not to register the old-style input arrays, HTTP_GET_VARS +; and friends. If you're not using them, it's recommended to turn them off, +; for performance reasons. +register_long_arrays = Off + +; This directive tells PHP whether to declare the argv&argc variables (that +; would contain the GET information). If you don't use these variables, you +; should turn it off for increased performance. +register_argc_argv = Off + +; When enabled, the SERVER and ENV variables are created when they're first +; used (Just In Time) instead of when the script starts. If these variables +; are not used within a script, having this directive on will result in a +; performance gain. The PHP directives register_globals, register_long_arrays, +; and register_argc_argv must be disabled for this directive to have any affect. +auto_globals_jit = On + +; Maximum size of POST data that PHP will accept. +post_max_size = 8M + +; Magic quotes +; + +; Magic quotes for incoming GET/POST/Cookie data. +magic_quotes_gpc = Off + +; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. +magic_quotes_runtime = Off + +; Use Sybase-style magic quotes (escape ' with '' instead of \'). +magic_quotes_sybase = Off + +; Automatically add files before or after any PHP document. +auto_prepend_file = +auto_append_file = + +; As of 4.0b4, PHP always outputs a character encoding by default in +; the Content-type: header. To disable sending of the charset, simply +; set it to be empty. +; +; PHP's built-in default is text/html +default_mimetype = "text/html" +;default_charset = "iso-8859-1" + +; Always populate the $HTTP_RAW_POST_DATA variable. +;always_populate_raw_post_data = On + + +;;;;;;;;;;;;;;;;;;;;;;;;; +; Paths and Directories ; +;;;;;;;;;;;;;;;;;;;;;;;;; + +; UNIX: "/path1:/path2" +;include_path = ".:/php/includes" +; +; Windows: "\path1;\path2" +;include_path = ".;c:\php\includes" + +; The root of the PHP pages, used only if nonempty. +; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root +; if you are running php as a CGI under any web server (other than IIS) +; see documentation for security issues. The alternate is to use the +; cgi.force_redirect configuration below +doc_root = + +; The directory under which PHP opens the script using /~username used only +; if nonempty. +user_dir = + +; Directory in which the loadable extensions (modules) reside. +extension_dir = "PHPEXTDIR" + +; 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 +; disabled on them. +enable_dl = On + +; cgi.force_redirect is necessary to provide security running PHP as a CGI under +; most web servers. Left undefined, PHP turns this on by default. You can +; turn it off here AT YOUR OWN RISK +; **You CAN safely turn this off for IIS, in fact, you MUST.** +; cgi.force_redirect = 1 + +; if cgi.nph is enabled it will force cgi to always sent Status: 200 with +; every request. +; cgi.nph = 1 + +; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape +; (iPlanet) web servers, you MAY need to set an environment variable name that PHP +; will look for to know it is OK to continue execution. Setting this variable MAY +; cause security issues, KNOW WHAT YOU ARE DOING FIRST. +; cgi.redirect_status_env = ; + +; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate +; security tokens of the calling client. This allows IIS to define the +; security context that the request runs under. mod_fastcgi under Apache +; does not currently support this feature (03/17/2002) +; Set to 1 if running under IIS. Default is zero. +; fastcgi.impersonate = 1; + +; Disable logging through FastCGI connection +; fastcgi.log = 0 + +; cgi.rfc2616_headers configuration option tells PHP what type of headers to +; use when sending HTTP response code. If it's set 0 PHP sends Status: header that +; is supported by Apache. When this option is set to 1 PHP will send +; RFC2616 compliant header. +; Default is zero. +;cgi.rfc2616_headers = 0 + + +;;;;;;;;;;;;;;;; +; File Uploads ; +;;;;;;;;;;;;;;;; + +; Whether to allow HTTP file uploads. +file_uploads = On + +; Temporary directory for HTTP uploaded files (will use system default if not +; specified). +;upload_tmp_dir = + +; Maximum allowed size for uploaded files. +upload_max_filesize = 2M + + +;;;;;;;;;;;;;;;;;; +; Fopen wrappers ; +;;;;;;;;;;;;;;;;;; + +; Whether to allow the treatment of URLs (like http:// or ftp://) as files. +allow_url_fopen = On + +; Whether to allow include/require to open URLs (like http:// or ftp://) as files. +allow_url_include = Off + +; Define the anonymous ftp password (your email address) +;from="john at doe.com" + +; Define the User-Agent string +; user_agent="PHP" + +; Default timeout for socket based streams (seconds) +default_socket_timeout = 60 + +; If your scripts have to deal with files from Macintosh systems, +; or you are running on a Mac and need to deal with files from +; unix or win32 systems, setting this flag will cause PHP to +; automatically detect the EOL character in those files so that +; fgets() and file() will work regardless of the source of the file. +; auto_detect_line_endings = Off + + +;;;;;;;;;;;;;;;;;;;;;; +; Dynamic Extensions ; +;;;;;;;;;;;;;;;;;;;;;; +; +; If you wish to have an extension loaded automatically, use the following +; syntax: +; +; extension=modulename.extension +; +; For example, on Windows: +; +; extension=msql.dll +; +; ... or under UNIX: +; +; extension=msql.so +; +; Note that it should be the name of the module only; no directory information +; needs to go here. Specify the location of the extension with the +; extension_dir directive above. + +; CSW Extensions +;extension=bcmath.so +;extension=bz2.so +;extension=calendar.so +;extension=ctype.so +;extension=curl.so +;extension=dba.so +;extension=dbase.so +;extension=dom.so +;extension=exif.so +;extension=ftp.so +;extension=gd.so +;extension=gettext.so +;extension=gmp.so +;extension=hash.so +;extension=iconv.so +;extension=imap.so +;extension=json.so +;extension=ldap.so +;extension=mbstring.so +;extension=mcrypt.so +;extension=mhash.so +;extension=mime_magic.so +;extension=mssql.so +;extension=mysql.so +;extension=mysqli.so +;extension=ncurses.so +;extension=odbc.so +;extension=openssl.so +;extension=pcntl.so +;extension=pdo.so +;extension=pdo_mysql.so +;extension=pdo_odbc.so +;extension=pdo_pgsql.so +;extension=pdo_sqlite.so +;extension=pgsql.so +;extension=posix.so +;extension=pspell.so +;extension=readline.so +;extension=session.so +;extension=shmop.so +;extension=snmp.so +;extension=soap.so +;extension=sockets.so +;extension=sqlite.so +;extension=sysvsem.so +;extension=sysvmsg.so +;extension=sysvshm.so +;extension=tidy.so +;extension=tokenizer.so +;extension=wddx.so +;extension=xmlreader.so +;extension=xmlrpc.so +;extension=xmlwriter.so +;extension=xsl.so +;extension=zip.so + +; Windows Extensions +; Note that ODBC support is built in, so no dll is needed for it. +; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +; extension folders as well as the separate PECL DLL download (PHP 5). +; Be sure to appropriately set the extension_dir directive. + +;extension=php_bz2.dll +;extension=php_curl.dll +;extension=php_dba.dll +;extension=php_dbase.dll +;extension=php_exif.dll +;extension=php_fdf.dll +;extension=php_gd2.dll +;extension=php_gettext.dll +;extension=php_gmp.dll +;extension=php_ifx.dll +;extension=php_imap.dll +;extension=php_interbase.dll +;extension=php_ldap.dll +;extension=php_mbstring.dll +;extension=php_mcrypt.dll +;extension=php_mhash.dll +;extension=php_mime_magic.dll +;extension=php_ming.dll +;extension=php_msql.dll +;extension=php_mssql.dll +;extension=php_mysql.dll +;extension=php_mysqli.dll +;extension=php_oci8.dll +;extension=php_openssl.dll +;extension=php_pdo.dll +;extension=php_pdo_firebird.dll +;extension=php_pdo_mssql.dll +;extension=php_pdo_mysql.dll +;extension=php_pdo_oci.dll +;extension=php_pdo_oci8.dll +;extension=php_pdo_odbc.dll +;extension=php_pdo_pgsql.dll +;extension=php_pdo_sqlite.dll +;extension=php_pgsql.dll +;extension=php_pspell.dll +;extension=php_shmop.dll +;extension=php_snmp.dll +;extension=php_soap.dll +;extension=php_sockets.dll +;extension=php_sqlite.dll +;extension=php_sybase_ct.dll +;extension=php_tidy.dll +;extension=php_xmlrpc.dll +;extension=php_xsl.dll +;extension=php_zip.dll + +;;;;;;;;;;;;;;;;;;; +; Module Settings ; +;;;;;;;;;;;;;;;;;;; + +[Date] +; Defines the default timezone used by the date functions +;date.timezone = + +;date.default_latitude = 31.7667 +;date.default_longitude = 35.2333 + +;date.sunrise_zenith = 90.583333 +;date.sunset_zenith = 90.583333 + +[filter] +;filter.default = unsafe_raw +;filter.default_flags = + +[iconv] +;iconv.input_encoding = ISO-8859-1 +;iconv.internal_encoding = ISO-8859-1 +;iconv.output_encoding = ISO-8859-1 + +[sqlite] +;sqlite.assoc_case = 0 + +[xmlrpc] +;xmlrpc_error_number = 0 +;xmlrpc_errors = 0 + +[Pcre] +;pcre.recursion_limit=100000 +;pcre.backtrack_limit=100000 + +[Syslog] +; Whether or not to define the various syslog variables (e.g. $LOG_PID, +; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In +; runtime, you can define these variables by calling define_syslog_variables(). +define_syslog_variables = Off + +[mail function] +; For Win32 only. +SMTP = localhost +smtp_port = 25 + +; For Win32 only. +;sendmail_from = me at example.com + +; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). +sendmail_path = /usr/lib/sendmail -t -i + +; Force the addition of the specified parameters to be passed as extra parameters +; to the sendmail binary. These parameters will always replace the value of +; the 5th parameter to mail(), even in safe mode. +;mail.force_extra_parameters = + +[SQL] +sql.safe_mode = Off + +[ODBC] +;odbc.default_db = Not yet implemented +;odbc.default_user = Not yet implemented +;odbc.default_pw = Not yet implemented + +; Allow or prevent persistent links. +odbc.allow_persistent = On + +; Check that a connection is still valid before reuse. +odbc.check_persistent = On + +; Maximum number of persistent links. -1 means no limit. +odbc.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +odbc.max_links = -1 + +; Handling of LONG fields. Returns number of bytes to variables. 0 means +; passthru. +odbc.defaultlrl = 4096 + +; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char. +; See the documentation on odbc_binmode and odbc_longreadlen for an explanation +; of uodbc.defaultlrl and uodbc.defaultbinmode +odbc.defaultbinmode = 1 + +[MySQL] +; Allow or prevent persistent links. +mysql.allow_persistent = On + +; Maximum number of persistent links. -1 means no limit. +mysql.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +mysql.max_links = -1 + +; Default port number for mysql_connect(). If unset, mysql_connect() will use +; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the +; compile-time value defined MYSQL_PORT (in that order). Win32 will only look +; at MYSQL_PORT. +mysql.default_port = + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +mysql.default_socket = + +; Default host for mysql_connect() (doesn't apply in safe mode). +mysql.default_host = + +; Default user for mysql_connect() (doesn't apply in safe mode). +mysql.default_user = + +; Default password for mysql_connect() (doesn't apply in safe mode). +; Note that this is generally a *bad* idea to store passwords in this file. +; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password") +; and reveal this password! And of course, any users with read access to this +; file will be able to reveal the password as well. +mysql.default_password = + +; Maximum time (in seconds) for connect timeout. -1 means no limit +mysql.connect_timeout = 60 + +; Trace mode. When trace_mode is active (=On), warnings for table/index scans and +; SQL-Errors will be displayed. +mysql.trace_mode = Off + +[MySQLi] + +; Maximum number of links. -1 means no limit. +mysqli.max_links = -1 + +; Default port number for mysqli_connect(). If unset, mysqli_connect() will use +; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the +; compile-time value defined MYSQL_PORT (in that order). Win32 will only look +; at MYSQL_PORT. +mysqli.default_port = 3306 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +mysqli.default_socket = + +; Default host for mysql_connect() (doesn't apply in safe mode). +mysqli.default_host = + +; Default user for mysql_connect() (doesn't apply in safe mode). +mysqli.default_user = + +; Default password for mysqli_connect() (doesn't apply in safe mode). +; Note that this is generally a *bad* idea to store passwords in this file. +; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") +; and reveal this password! And of course, any users with read access to this +; file will be able to reveal the password as well. +mysqli.default_pw = + +; Allow or prevent reconnect +mysqli.reconnect = Off + +[mSQL] +; Allow or prevent persistent links. +msql.allow_persistent = On + +; Maximum number of persistent links. -1 means no limit. +msql.max_persistent = -1 + +; Maximum number of links (persistent+non persistent). -1 means no limit. +msql.max_links = -1 + +[OCI8] +; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA) +;oci8.privileged_connect = Off + +; Connection: The maximum number of persistent OCI8 connections per +; process. Using -1 means no limit. +;oci8.max_persistent = -1 + +; Connection: The maximum number of seconds a process is allowed to +; maintain an idle persistent connection. Using -1 means idle +; persistent connections will be maintained forever. +;oci8.persistent_timeout = -1 + +; Connection: The number of seconds that must pass before issuing a +; ping during oci_pconnect() to check the connection validity. When +; set to 0, each oci_pconnect() will cause a ping. Using -1 disables +; pings completely. +;oci8.ping_interval = 60 + +; Tuning: This option enables statement caching, and specifies how +; many statements to cache. Using 0 disables statement caching. +;oci8.statement_cache_size = 20 + +; Tuning: Enables statement prefetching and sets the default number of +; rows that will be fetched automatically after statement execution. +;oci8.default_prefetch = 10 + +; Compatibility. Using On means oci_close() will not close +; oci_connect() and oci_new_connect() connections. +;oci8.old_oci_close_semantics = Off + +[PostgresSQL] +; Allow or prevent persistent links. +pgsql.allow_persistent = On + +; Detect broken persistent links always with pg_pconnect(). +; Auto reset feature requires a little overheads. +pgsql.auto_reset_persistent = Off + +; Maximum number of persistent links. -1 means no limit. +pgsql.max_persistent = -1 + +; Maximum number of links (persistent+non persistent). -1 means no limit. +pgsql.max_links = -1 + +; Ignore PostgreSQL backends Notice message or not. +; Notice message logging require a little overheads. +pgsql.ignore_notice = 0 + +; Log PostgreSQL backends Noitce message or not. +; Unless pgsql.ignore_notice=0, module cannot log notice message. +pgsql.log_notice = 0 + +[Sybase] +; Allow or prevent persistent links. +sybase.allow_persistent = On + +; Maximum number of persistent links. -1 means no limit. +sybase.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +sybase.max_links = -1 + +;sybase.interface_file = "/usr/sybase/interfaces" + +; Minimum error severity to display. +sybase.min_error_severity = 10 + +; Minimum message severity to display. +sybase.min_message_severity = 10 + +; Compatibility mode with old versions of PHP 3.0. +; If on, this will cause PHP to automatically assign types to results according +; to their Sybase type, instead of treating them all as strings. This +; compatibility mode will probably not stay around forever, so try applying +; whatever necessary changes to your code, and turn it off. +sybase.compatability_mode = Off + +[Sybase-CT] +; Allow or prevent persistent links. +sybct.allow_persistent = On + +; Maximum number of persistent links. -1 means no limit. +sybct.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +sybct.max_links = -1 + +; Minimum server message severity to display. +sybct.min_server_severity = 10 + +; Minimum client message severity to display. +sybct.min_client_severity = 10 + +[bcmath] +; Number of decimal digits for all bcmath functions. +bcmath.scale = 0 + +[browscap] +;browscap = extra/browscap.ini + +[Informix] +; Default host for ifx_connect() (doesn't apply in safe mode). +ifx.default_host = + +; Default user for ifx_connect() (doesn't apply in safe mode). +ifx.default_user = + +; Default password for ifx_connect() (doesn't apply in safe mode). +ifx.default_password = + +; Allow or prevent persistent links. +ifx.allow_persistent = On + +; Maximum number of persistent links. -1 means no limit. +ifx.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +ifx.max_links = -1 + +; If on, select statements return the contents of a text blob instead of its id. +ifx.textasvarchar = 0 + +; If on, select statements return the contents of a byte blob instead of its id. +ifx.byteasvarchar = 0 + +; Trailing blanks are stripped from fixed-length char columns. May help the +; life of Informix SE users. +ifx.charasvarchar = 0 + +; If on, the contents of text and byte blobs are dumped to a file instead of +; keeping them in memory. +ifx.blobinfile = 0 + +; NULL's are returned as empty strings, unless this is set to 1. In that case, +; NULL's are returned as string 'NULL'. +ifx.nullformat = 0 + +[Session] +; Handler used to store/retrieve data. +session.save_handler = files + +; Argument passed to save_handler. In the case of files, this is the path +; where data files are stored. Note: Windows users have to change this +; variable in order to use PHP's session functions. +; +; As of PHP 4.0.1, you can define the path as: +; +; session.save_path = "N;/path" +; +; where N is an integer. Instead of storing all the session files in +; /path, what this will do is use subdirectories N-levels deep, and +; store the session data in those directories. This is useful if you +; or your OS have problems with lots of files in one directory, and is +; a more efficient layout for servers that handle lots of sessions. +; +; NOTE 1: PHP will not create this directory structure automatically. +; You can use the script in the ext/session dir for that purpose. +; NOTE 2: See the section on garbage collection below if you choose to +; use subdirectories for session storage +; +; The file storage module creates files using mode 600 by default. +; You can change that by using +; +; session.save_path = "N;MODE;/path" +; +; where MODE is the octal representation of the mode. Note that this +; does not overwrite the process's umask. +session.save_path = "/tmp" + +; Whether to use cookies. +session.use_cookies = 1 + +;session.cookie_secure = + +; This option enables administrators to make their users invulnerable to +; attacks which involve passing session ids in URLs; defaults to 0. +; session.use_only_cookies = 1 + +; Name of the session (used as cookie name). +session.name = PHPSESSID + +; Initialize session on request startup. +session.auto_start = 0 + +; Lifetime in seconds of cookie or, if 0, until browser is restarted. +session.cookie_lifetime = 0 + +; The path for which the cookie is valid. +session.cookie_path = / + +; The domain for which the cookie is valid. +session.cookie_domain = + +; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. +session.cookie_httponly = + +; Handler used to serialize data. php is the standard serializer of PHP. +session.serialize_handler = php + +; Define the probability that the 'garbage collection' process is started +; on every session initialization. +; The probability is calculated by using gc_probability/gc_divisor, +; e.g. 1/100 means there is a 1% chance that the GC process starts +; on each request. + +session.gc_probability = 1 +session.gc_divisor = 1000 + +; After this number of seconds, stored data will be seen as 'garbage' and +; cleaned up by the garbage collection process. +session.gc_maxlifetime = 1440 + +; NOTE: If you are using the subdirectory option for storing session files +; (see session.save_path above), then garbage collection does *not* +; happen automatically. You will need to do your own garbage +; collection through a shell script, cron entry, or some other method. +; For example, the following script would is the equivalent of +; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): +; cd /path/to/sessions; find -cmin +24 | xargs rm + +; PHP 4.2 and less have an undocumented feature/bug that allows you to +; to initialize a session variable in the global scope, albeit register_globals +; is disabled. PHP 4.3 and later will warn you, if this feature is used. +; You can disable the feature and the warning separately. At this time, +; the warning is only displayed, if bug_compat_42 is enabled. + +session.bug_compat_42 = 0 +session.bug_compat_warn = 1 + +; Check HTTP Referer to invalidate externally stored URLs containing ids. +; HTTP_REFERER has to contain this substring for the session to be +; considered as valid. +session.referer_check = + +; How many bytes to read from the file. +session.entropy_length = 0 + +; Specified here to create the session id. +session.entropy_file = + +;session.entropy_length = 16 + +;session.entropy_file = /dev/urandom + +; Set to {nocache,private,public,} to determine HTTP caching aspects +; or leave this empty to avoid sending anti-caching headers. +session.cache_limiter = nocache + +; Document expires after n minutes. +session.cache_expire = 180 + +; trans sid support is disabled by default. +; Use of trans sid may risk your users security. +; Use this option with caution. +; - User may send URL contains active session ID +; to other person via. email/irc/etc. +; - URL that contains active session ID may be stored +; in publically accessible computer. +; - User may access your site with the same session ID +; always using URL stored in browser's history or bookmarks. +session.use_trans_sid = 0 + +; Select a hash function +; 0: MD5 (128 bits) +; 1: SHA-1 (160 bits) +session.hash_function = 0 + +; Define how many bits are stored in each character when converting +; the binary hash data to something readable. +; +; 4 bits: 0-9, a-f +; 5 bits: 0-9, a-v +; 6 bits: 0-9, a-z, A-Z, "-", "," +session.hash_bits_per_character = 5 + +; The URL rewriter will look for URLs in a defined set of HTML tags. +; form/fieldset are special; if you include them here, the rewriter will +; add a hidden field with the info which is otherwise appended +; to URLs. If you want XHTML conformity, remove the form entry. +; Note that all valid entries require a "=", even if no value follows. +url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" + +[MSSQL] +; Allow or prevent persistent links. +mssql.allow_persistent = On + +; Maximum number of persistent links. -1 means no limit. +mssql.max_persistent = -1 + +; Maximum number of links (persistent+non persistent). -1 means no limit. +mssql.max_links = -1 + +; Minimum error severity to display. +mssql.min_error_severity = 10 + +; Minimum message severity to display. +mssql.min_message_severity = 10 + +; Compatibility mode with old versions of PHP 3.0. +mssql.compatability_mode = Off + +; Connect timeout +;mssql.connect_timeout = 5 + +; Query timeout +;mssql.timeout = 60 + +; Valid range 0 - 2147483647. Default = 4096. +;mssql.textlimit = 4096 + +; Valid range 0 - 2147483647. Default = 4096. +;mssql.textsize = 4096 + +; Limits the number of records in each batch. 0 = all records in one batch. +;mssql.batchsize = 0 + +; Specify how datetime and datetim4 columns are returned +; On => Returns data converted to SQL server settings +; Off => Returns values as YYYY-MM-DD hh:mm:ss +;mssql.datetimeconvert = On + +; Use NT authentication when connecting to the server +mssql.secure_connection = Off + +; Specify max number of processes. -1 = library default +; msdlib defaults to 25 +; FreeTDS defaults to 4096 +;mssql.max_procs = -1 + +; Specify client character set. +; If empty or not set the client charset from freetds.comf is used +; This is only used when compiled with FreeTDS +;mssql.charset = "ISO-8859-1" + +[Assertion] +; Assert(expr); active by default. +;assert.active = On + +; Issue a PHP warning for each failed assertion. +;assert.warning = On + +; Don't bail out by default. +;assert.bail = Off + +; User-function to be called if an assertion fails. +;assert.callback = 0 + +; Eval the expression with current error_reporting(). Set to true if you want +; error_reporting(0) around the eval(). +;assert.quiet_eval = 0 + +[COM] +; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs +;com.typelib_file = +; allow Distributed-COM calls +;com.allow_dcom = true +; autoregister constants of a components typlib on com_load() +;com.autoregister_typelib = true +; register constants casesensitive +;com.autoregister_casesensitive = false +; show warnings on duplicate constant registrations +;com.autoregister_verbose = true + +[mbstring] +; language for internal character representation. +;mbstring.language = Japanese + +; internal/script encoding. +; Some encoding cannot work as internal encoding. +; (e.g. SJIS, BIG5, ISO-2022-*) +;mbstring.internal_encoding = EUC-JP + +; http input encoding. +;mbstring.http_input = auto + +; http output encoding. mb_output_handler must be +; registered as output buffer to function +;mbstring.http_output = SJIS + +; enable automatic encoding translation according to +; mbstring.internal_encoding setting. Input chars are +; converted to internal encoding by setting this to On. +; Note: Do _not_ use automatic encoding translation for +; portable libs/applications. +;mbstring.encoding_translation = Off + +; automatic encoding detection order. +; auto means +;mbstring.detect_order = auto + +; substitute_character used when character cannot be converted +; one from another +;mbstring.substitute_character = none; + +; overload(replace) single byte functions by mbstring functions. +; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(), +; etc. Possible values are 0,1,2,4 or combination of them. +; For example, 7 for overload everything. +; 0: No overload +; 1: Overload mail() function +; 2: Overload str*() functions +; 4: Overload ereg*() functions +;mbstring.func_overload = 0 + +; enable strict encoding detection. +;mbstring.strict_encoding = Off + +[FrontBase] +;fbsql.allow_persistent = On +;fbsql.autocommit = On +;fbsql.show_timestamp_decimals = Off +;fbsql.default_database = +;fbsql.default_database_password = +;fbsql.default_host = +;fbsql.default_password = +;fbsql.default_user = "_SYSTEM" +;fbsql.generate_warnings = Off +;fbsql.max_connections = 128 +;fbsql.max_links = 128 +;fbsql.max_persistent = -1 +;fbsql.max_results = 128 + +[gd] +; Tell the jpeg decode to libjpeg warnings and try to create +; a gd image. The warning will then be displayed as notices +; disabled by default +;gd.jpeg_ignore_warning = 0 + +[exif] +; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. +; With mbstring support this will automatically be converted into the encoding +; given by corresponding encode setting. When empty mbstring.internal_encoding +; is used. For the decode settings you can distinguish between motorola and +; intel byte order. A decode setting cannot be empty. +;exif.encode_unicode = ISO-8859-15 +;exif.decode_unicode_motorola = UCS-2BE +;exif.decode_unicode_intel = UCS-2LE +;exif.encode_jis = +;exif.decode_jis_motorola = JIS +;exif.decode_jis_intel = JIS + +[Tidy] +; The path to a default tidy configuration file to use when using tidy +;tidy.default_config = /usr/local/lib/php/default.tcfg + +; Should tidy clean and repair output automatically? +; WARNING: Do not use this option if you are generating non-html content +; such as dynamic images +tidy.clean_output = Off + +[soap] +; Enables or disables WSDL caching feature. +soap.wsdl_cache_enabled=1 +; Sets the directory name where SOAP extension will put cache files. +soap.wsdl_cache_dir="/tmp" +; (time to live) Sets the number of second while cached file will be used +; instead of original one. +soap.wsdl_cache_ttl=86400 + +; Local Variables: +; tab-width: 4 +; End: Added: csw/mgar/pkg/php4/trunk/files/phpext =================================================================== --- csw/mgar/pkg/php4/trunk/files/phpext (rev 0) +++ csw/mgar/pkg/php4/trunk/files/phpext 2009-05-13 14:59:41 UTC (rev 4834) @@ -0,0 +1,106 @@ +#!/bin/ksh +# +# phpext - PHP extension manager. +# + +program=${0##*/} + +# Default path to php.ini +php_ini=/opt/csw/php4/lib/php.ini + +# Usage printer +function do_usage { + + # Print short usage + cat << EOT +Usage: $program [-h] [-e|-d|-q] [-i ] ... +EOT + + # Print long usage + if [ "$1" = "long" ]; then + cat << EOT + +Options: + + -e Enable extensions + -d Disable extensions + -q Query mode + -i Path to php.ini (default: $php_ini) + -h Display usage information + extN Extension names + +Examples: + + # Enable the exif and wddx extensions + $program -e exif wddx + + # Disable xsl + $program -d xsl + + # Check whether mbstring is enabled + $program -q mbstring + mbstring_enabled=true + + # Query all extensions from a different php.ini + $program -i /path/to/php.ini -q + +EOT + fi + + exit 1 +} + +# Process command line options +typeset op +while getopts ":hedqi:" opts +do + case ${opts} in + e) op=enable ;; + d) op=disable ;; + i) php_ini=$OPTARG ;; + q) op=query ;; + h) do_usage "long" ;; + \?) do_usage "long" ;; + esac +done + +shift $((${OPTIND} - 1 )) + +if [ "$op" = "enable" ] || [ "$op" = "disable" ] && [ -z "$@" ]; then + print "Error: No extensions specified for action $op" + do_usage +fi + +if [ ! -f $php_ini ]; then + print "Error: Cannot access $php_ini" + do_usage +fi + +# In modes other than query, stream edit the file +typeset perlswitches php_extensions php_op +perlswitches="-lne" +if [ "$op" != "query" ]; then + perlswitches="-i.bak -p $perlswitches" +fi + +# Spawn perl to do the dirty work +export php_extensions="$@" +export php_op=$op +exec perl $perlswitches ' + BEGIN { + use Config; + use vars qw/$grabext $php_op/; + $exts = $ENV{php_extensions} + ? join("|", split(/\s+/, $ENV{php_extensions})) : qr{\S+}; + + $grabext = qr{^(;)?extension=($exts)\.$Config{dlext}\s*$}; + $php_op = $ENV{php_op}; + } + if (my ($disabled, $extname) = $_ =~ $grabext) { + if ($php_op eq "query") { + printf "%s_enabled=%s\n", $extname, ($disabled ? "false" : "true"); + } + elsif ($php_op eq "enable") { s/^;// if $disabled } + elsif ($php_op eq "disable") { s/^/;/ unless $disabled } + }' $php_ini + Property changes on: csw/mgar/pkg/php4/trunk/files/phpext ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 13 18:00:41 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 13 May 2009 16:00:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[4835] csw/mgar/pkg Message-ID: Revision: 4835 http://gar.svn.sourceforge.net/gar/?rev=4835&view=rev Author: valholla Date: 2009-05-13 16:00:40 +0000 (Wed, 13 May 2009) Log Message: ----------- initial checkin Added Paths: ----------- csw/mgar/pkg/libmcal/ csw/mgar/pkg/libmcal/Makefile csw/mgar/pkg/libmcal/branches/ csw/mgar/pkg/libmcal/tags/ csw/mgar/pkg/libmcal/trunk/ csw/mgar/pkg/libmcal/trunk/Makefile csw/mgar/pkg/libmcal/trunk/files/ Added: csw/mgar/pkg/libmcal/Makefile =================================================================== --- csw/mgar/pkg/libmcal/Makefile (rev 0) +++ csw/mgar/pkg/libmcal/Makefile 2009-05-13 16:00:40 UTC (rev 4835) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/libmcal/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmcal/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmcal/trunk/Makefile 2009-05-13 16:00:40 UTC (rev 4835) @@ -0,0 +1,40 @@ +GARNAME = libmcal +GARVERSION = 0.7 +CATEGORIES = lib + +DESCRIPTION = Modular Calendar Access Library +define BLURB + mcal stands for Modular Calendar Access Library. + libmcal is a C library for accessing calendars. + It's written to be very modular, with pluggable drivers. + One of the main drivers it handles is ICAP. +endef + +SF_PROJ = $(call TOLOWER,$(GARNAME)) +MASTER_SITES = $(SF_MIRRORS) + +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +PACKAGES = CSWlibmcal +CATALOGNAME_CSWlibmcal = libmcal +SPKG_DESC_CSWlibmcal = $(DESCRIPTION) + + +REQUIRED_PKGS_CSWlibmcal = CSWexpat CSWfconfig CSWftype2 CSWiconv + +# We define upstream file regex so we can be notifed of +# new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +BUILD64 = 1 +NO_ISAEXEC = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +## There are no tests for this +TEST_SCRIPTS = skip + +test-skip: + $(DONADA) + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 13 18:01:26 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 13 May 2009 16:01:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[4836] csw/mgar/pkg/libmcal/trunk/ Message-ID: Revision: 4836 http://gar.svn.sourceforge.net/gar/?rev=4836&view=rev Author: valholla Date: 2009-05-13 16:01:26 +0000 (Wed, 13 May 2009) Log Message: ----------- externals Property Changed: ---------------- csw/mgar/pkg/libmcal/trunk/ Property changes on: csw/mgar/pkg/libmcal/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. From valholla at users.sourceforge.net Wed May 13 22:20:15 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 13 May 2009 20:20:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[4837] csw/mgar/pkg/libmcal/trunk Message-ID: Revision: 4837 http://gar.svn.sourceforge.net/gar/?rev=4837&view=rev Author: valholla Date: 2009-05-13 20:20:15 +0000 (Wed, 13 May 2009) Log Message: ----------- checkin for package Modified Paths: -------------- csw/mgar/pkg/libmcal/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libmcal/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/libmcal/trunk/ Property changes on: csw/mgar/pkg/libmcal/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Modified: csw/mgar/pkg/libmcal/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmcal/trunk/Makefile 2009-05-13 16:01:26 UTC (rev 4836) +++ csw/mgar/pkg/libmcal/trunk/Makefile 2009-05-13 20:20:15 UTC (rev 4837) @@ -1,6 +1,8 @@ GARNAME = libmcal GARVERSION = 0.7 CATEGORIES = lib +DRIVERNAME = mcaldrivers +DRIVERVERSION = 0.9 DESCRIPTION = Modular Calendar Access Library define BLURB @@ -10,26 +12,28 @@ One of the main drivers it handles is ICAP. endef -SF_PROJ = $(call TOLOWER,$(GARNAME)) MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +BUILD64 = 1 +NO_ISAEXEC = 1 +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(DRIVERNAME)-$(DRIVERVERSION).tar.gz +DISTNAME = $(GARNAME) PACKAGES = CSWlibmcal CATALOGNAME_CSWlibmcal = libmcal SPKG_DESC_CSWlibmcal = $(DESCRIPTION) +#REQUIRED_PKGS_CSWlibmcal = -REQUIRED_PKGS_CSWlibmcal = CSWexpat CSWfconfig CSWftype2 CSWiconv - # We define upstream file regex so we can be notifed of # new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -BUILD64 = 1 -NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-mstore +CONFIGURE_ARGS += --with-icap ## There are no tests for this TEST_SCRIPTS = skip @@ -37,4 +41,26 @@ test-skip: $(DONADA) +post-extract-modulated: + perl -i -pe 's|CC=gcc|CC=$(CC)|' $(WORKSRC)/Makefile.in + perl -i -pe 's|CFLAGS=.*|CFLAGS=$$\\$$(INCLUDE) $(CFLAGS) -xcode=pic32 |' $(WORKSRC)/Makefile.in + perl -i -pne 's|gcc|$$\\$$(CC)|' $(WORKSRC)/Makefile.in + perl -i -pne 's|-shared|-G -xcode=pic32 |' $(WORKSRC)/Makefile.in + perl -i -pne 's|install -m 755 -o 0 -g 0|ginstall -m 0755|' $(WORKSRC)/Makefile.in + perl -i -pne 's|install -m 644 -o 0 -g 0|ginstall -m 0644|' $(WORKSRC)/Makefile.in + perl -i -pne 's|\@prefix\@/lib|\@libdir\@|' $(WORKSRC)/Makefile.in + perl -i -pne 's|\@prefix\@/include|\@includedir\@|' $(WORKSRC)/Makefile.in + # + cd $(WORKDIR); gzip -dc $(abspath $(DOWNLOADDIR)/$(DRIVERNAME)-$(DRIVERVERSION).tar.gz) |tar xf - + cd $(WORKDIR)/mcal-drivers; cp -R * $(abspath $(WORKSRC)) + perl -i -pe 's|CC=gcc|CC=$(CC)|' $(WORKSRC)/mstore/Makefile + perl -i -pe 's|CFLAGS=.*|CFLAGS=$$\\$$(INCLUDE) $(CFLAGS) -xcode=pic32 |' $(WORKSRC)/mstore/Makefile + perl -i -pe 's|ld -r|$$\\$$(CC) $$\\$$(CFLAGS) -G -xcode=pic32 |' $(WORKSRC)/mstore/Makefile + gmake -C $(WORKSRC)/mstore + perl -i -pe 's|CC=gcc|CC=$(CC)|' $(WORKSRC)/icap/Makefile + perl -i -pe 's|CFLAGS=.*|CFLAGS=$$\\$$(INCLUDE) $(CFLAGS) -xcode=pic32 |' $(WORKSRC)/icap/Makefile + perl -i -pe 's|ld -r|$$\\$$(CC) $$\\$$(CFLAGS) -G -xcode=pic32 |' $(WORKSRC)/icap/Makefile + gmake -C $(WORKSRC)/icap + @$(MAKECOOKIE) + include gar/category.mk Added: csw/mgar/pkg/libmcal/trunk/checksums =================================================================== --- csw/mgar/pkg/libmcal/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmcal/trunk/checksums 2009-05-13 20:20:15 UTC (rev 4837) @@ -0,0 +1,2 @@ +8d8f16e59a7e859c1407df3d72052825 download/libmcal-0.7.tar.gz +c8c96f6cd574139b88a13f6084164cfa download/mcaldrivers-0.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 13 22:35:25 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 13 May 2009 20:35:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4838] csw/mgar/pkg/libmcal/trunk/Makefile Message-ID: Revision: 4838 http://gar.svn.sourceforge.net/gar/?rev=4838&view=rev Author: valholla Date: 2009-05-13 20:35:25 +0000 (Wed, 13 May 2009) Log Message: ----------- tweak post-extract-modulated Modified Paths: -------------- csw/mgar/pkg/libmcal/trunk/Makefile Modified: csw/mgar/pkg/libmcal/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmcal/trunk/Makefile 2009-05-13 20:20:15 UTC (rev 4837) +++ csw/mgar/pkg/libmcal/trunk/Makefile 2009-05-13 20:35:25 UTC (rev 4838) @@ -55,11 +55,9 @@ cd $(WORKDIR)/mcal-drivers; cp -R * $(abspath $(WORKSRC)) perl -i -pe 's|CC=gcc|CC=$(CC)|' $(WORKSRC)/mstore/Makefile perl -i -pe 's|CFLAGS=.*|CFLAGS=$$\\$$(INCLUDE) $(CFLAGS) -xcode=pic32 |' $(WORKSRC)/mstore/Makefile - perl -i -pe 's|ld -r|$$\\$$(CC) $$\\$$(CFLAGS) -G -xcode=pic32 |' $(WORKSRC)/mstore/Makefile gmake -C $(WORKSRC)/mstore perl -i -pe 's|CC=gcc|CC=$(CC)|' $(WORKSRC)/icap/Makefile perl -i -pe 's|CFLAGS=.*|CFLAGS=$$\\$$(INCLUDE) $(CFLAGS) -xcode=pic32 |' $(WORKSRC)/icap/Makefile - perl -i -pe 's|ld -r|$$\\$$(CC) $$\\$$(CFLAGS) -G -xcode=pic32 |' $(WORKSRC)/icap/Makefile gmake -C $(WORKSRC)/icap @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed May 13 23:09:54 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 13 May 2009 21:09:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[4839] csw/mgar/pkg/php4/trunk Message-ID: Revision: 4839 http://gar.svn.sourceforge.net/gar/?rev=4839&view=rev Author: valholla Date: 2009-05-13 21:09:54 +0000 (Wed, 13 May 2009) Log Message: ----------- checkin Modified Paths: -------------- csw/mgar/pkg/php4/trunk/Makefile csw/mgar/pkg/php4/trunk/checksums csw/mgar/pkg/php4/trunk/files/pgsql.diff Modified: csw/mgar/pkg/php4/trunk/Makefile =================================================================== --- csw/mgar/pkg/php4/trunk/Makefile 2009-05-13 20:35:25 UTC (rev 4838) +++ csw/mgar/pkg/php4/trunk/Makefile 2009-05-13 21:09:54 UTC (rev 4839) @@ -53,7 +53,7 @@ CONFIGURE_ARGS += --enable-gd-native-ttf CONFIGURE_ARGS += --enable-mbregex=shared CONFIGURE_ARGS += --enable-mbstring=shared -CONFIGURE_ARGS += --enable-mcal=shared +CONFIGURE_ARGS += --enable-mcal=shared,$(prefix) CONFIGURE_ARGS += --enable-sockets CONFIGURE_ARGS += --with-bz2=shared,$(prefix) CONFIGURE_ARGS += --with-db4=$(prefix)/bdb44 Modified: csw/mgar/pkg/php4/trunk/checksums =================================================================== --- csw/mgar/pkg/php4/trunk/checksums 2009-05-13 20:35:25 UTC (rev 4838) +++ csw/mgar/pkg/php4/trunk/checksums 2009-05-13 21:09:54 UTC (rev 4839) @@ -1,2 +1,2 @@ -c7fe7ddb9ff68f6cc47cbdc334e3df62 download/pgsql.diff +3870a95f52c9637798294243694fdd47 download/pgsql.diff 2e3b2a0e27f10cb84fd00e5ecd7a1880 download/php-4.4.9.tar.bz2 Modified: csw/mgar/pkg/php4/trunk/files/pgsql.diff =================================================================== --- csw/mgar/pkg/php4/trunk/files/pgsql.diff 2009-05-13 20:35:25 UTC (rev 4838) +++ csw/mgar/pkg/php4/trunk/files/pgsql.diff 2009-05-13 21:09:54 UTC (rev 4839) @@ -11,3 +11,16 @@ break; fi done +--- php-4.4.9/configure.o 2009-05-13 10:19:30.843906388 -0500 ++++ php-4.4.9/configure 2009-05-13 10:19:57.853444779 -0500 +@@ -76431,8 +76431,8 @@ + echo $ac_n "checking for pg_config""... $ac_c" 1>&6 + echo "configure:76433: checking for pg_config" >&5 + for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do +- if test -x $i/pg_config; then +- PG_CONFIG="$i/pg_config" ++ if test -x $i/pg_config32; then ++ PG_CONFIG="$i/pg_config32" + break; + fi + done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 14 03:34:39 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 14 May 2009 01:34:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[4840] csw/mgar/pkg/php4/trunk Message-ID: Revision: 4840 http://gar.svn.sourceforge.net/gar/?rev=4840&view=rev Author: valholla Date: 2009-05-14 01:34:37 +0000 (Thu, 14 May 2009) Log Message: ----------- compiling cgi Modified Paths: -------------- csw/mgar/pkg/php4/trunk/Makefile csw/mgar/pkg/php4/trunk/files/php.ini.CSW Removed Paths: ------------- csw/mgar/pkg/php4/trunk/files/CSWphp4_ext_disable.sh csw/mgar/pkg/php4/trunk/files/CSWphp4_ext_enable.sh csw/mgar/pkg/php4/trunk/files/pear.conf.CSW csw/mgar/pkg/php4/trunk/files/phpext Modified: csw/mgar/pkg/php4/trunk/Makefile =================================================================== --- csw/mgar/pkg/php4/trunk/Makefile 2009-05-13 21:09:54 UTC (rev 4839) +++ csw/mgar/pkg/php4/trunk/Makefile 2009-05-14 01:34:37 UTC (rev 4840) @@ -53,7 +53,6 @@ CONFIGURE_ARGS += --enable-gd-native-ttf CONFIGURE_ARGS += --enable-mbregex=shared CONFIGURE_ARGS += --enable-mbstring=shared -CONFIGURE_ARGS += --enable-mcal=shared,$(prefix) CONFIGURE_ARGS += --enable-sockets CONFIGURE_ARGS += --with-bz2=shared,$(prefix) CONFIGURE_ARGS += --with-db4=$(prefix)/bdb44 @@ -72,6 +71,7 @@ CONFIGURE_ARGS += --with-kerberos=$(prefix) CONFIGURE_ARGS += --with-ldap=shared,$(prefix) CONFIGURE_ARGS += --with-ldap-sasl=$(prefix) +CONFIGURE_ARGS += --with-mcal=shared,$(prefix) CONFIGURE_ARGS += --with-mssql=shared,$(prefix) CONFIGURE_ARGS += --with-mysql=shared,$(prefix) CONFIGURE_ARGS += --with-ncurses=shared,$(prefix) Deleted: csw/mgar/pkg/php4/trunk/files/CSWphp4_ext_disable.sh =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4_ext_disable.sh 2009-05-13 21:09:54 UTC (rev 4839) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4_ext_disable.sh 2009-05-14 01:34:37 UTC (rev 4840) @@ -1,39 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=/opt/csw -if [ -n "$PKG_INSTALL_ROOT" ]; then - CSW_PREFIX=${PKG_INSTALL_ROOT}${CSW_PREFIX} -fi - -PHP_INI=$CSW_PREFIX/php4/lib/php.ini -PHP_BIN=$CSW_PREFIX/php4/bin -PHP_EXTMGR=$PHP_BIN/phpext - -if [ -z "$PHPEXT" ]; then - PHPEXT=`echo $PKGINST | sed -e 's,CSWphp4,,' -e 's,\..*,,'` - PHPEXT=${PHPEXT:-${PKGINST}} -fi - -# Bail if php.ini does not exist -if [ ! -f $PHP_INI ]; then - cat << END -Cannot locate $PHP_INI -- Please disable $PHPEXT.so manually -in the appropriate php.ini file using $PHP_EXTMGR - -END - - exit 0 -fi - -$PHP_EXTMGR -i $PHP_INI -d $PHPEXT -if [ $? -ne 0 ]; then - cat << END -Failed to disable $PHPEXT support -- please examine -$PHP_INI and disable the extension manually. -END -else - echo "PHP extension $PHPEXT.so is disabled in $PHP_INI." -fi - -exit 0 - Deleted: csw/mgar/pkg/php4/trunk/files/CSWphp4_ext_enable.sh =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4_ext_enable.sh 2009-05-13 21:09:54 UTC (rev 4839) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4_ext_enable.sh 2009-05-14 01:34:37 UTC (rev 4840) @@ -1,39 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=/opt/csw -if [ -n "$PKG_INSTALL_ROOT" ]; then - CSW_PREFIX=${PKG_INSTALL_ROOT}${CSW_PREFIX} -fi - -PHP_INI=$CSW_PREFIX/php4/lib/php.ini -PHP_BIN=$CSW_PREFIX/php4/bin -PHP_EXTMGR=$PHP_BIN/phpext - -if [ -z "$PHPEXT" ]; then - PHPEXT=`echo $PKGINST | sed -e 's,CSWphp4,,' -e 's,\..*,,'` - PHPEXT=${PHPEXT:-${PKGINST}} -fi - -# Bail if php.ini does not exist -if [ ! -f $PHP_INI ]; then - cat << END -Cannot locate $PHP_INI -- Please enable $PHPEXT.so manually -in the appropriate php.ini file using $PHP_EXTMGR - -END - - exit 0 -fi - -$PHP_EXTMGR -i $PHP_INI -e $PHPEXT -if [ $? -ne 0 ]; then - cat << END -Failed to enable $PHPEXT support -- please examine -$PHP_INI and enable the extension manually. -END -else - echo "PHP extension $PHPEXT.so is enabled in $PHP_INI." -fi - -exit 0 - Deleted: csw/mgar/pkg/php4/trunk/files/pear.conf.CSW =================================================================== --- csw/mgar/pkg/php4/trunk/files/pear.conf.CSW 2009-05-13 21:09:54 UTC (rev 4839) +++ csw/mgar/pkg/php4/trunk/files/pear.conf.CSW 2009-05-14 01:34:37 UTC (rev 4840) @@ -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/php4/lib/php";s:7:"ext_dir";s:58:"/opt/csw/php4/lib/php/extensions/no-debug-non-zts-20060613";s:7:"doc_dir";s:25:"/opt/csw/php4/lib/php/doc";s:7:"bin_dir";s:17:"/opt/csw/php4/bin";s:8:"data_dir";s:26:"/opt/csw/php4/lib/php/data";s:7:"cfg_dir";s:25:"/opt/csw/php4/lib/php/cfg";s:7:"www_dir";s:28:"/opt/csw/php4/lib/php/htdocs";s:8:"test_dir";s:26:"/opt/csw/php4/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/php4/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:"sig_keydir";s:26:"/opt/csw/php4/etc/pearkeys";} Modified: csw/mgar/pkg/php4/trunk/files/php.ini.CSW =================================================================== --- csw/mgar/pkg/php4/trunk/files/php.ini.CSW 2009-05-13 21:09:54 UTC (rev 4839) +++ csw/mgar/pkg/php4/trunk/files/php.ini.CSW 2009-05-14 01:34:37 UTC (rev 4840) @@ -1,7 +1,18 @@ [PHP] +;;;;;;;;;;; +; WARNING ; +;;;;;;;;;;; +; This is the default settings file for new PHP installations. +; By default, PHP installs itself with a configuration suitable for +; development purposes, and *NOT* for production purposes. +; For several security-oriented considerations that should be taken +; before going online with your site, please consult php.ini-recommended +; and http://php.net/manual/en/security.php. + + ;;;;;;;;;;;;;;;;;;; -; About php.ini ; +; About this file ; ;;;;;;;;;;;;;;;;;;; ; This file controls many aspects of PHP's behavior. In order for PHP to ; read it, it must be named 'php.ini'. PHP looks for it in the current @@ -43,72 +54,12 @@ ; If you use constants in your value, and these constants belong to a ; dynamically loaded extension (either a PHP extension or a Zend extension), ; you may only use these constants *after* the line that loads the extension. -; ; -;;;;;;;;;;;;;;;;;;; -; About this file ; -;;;;;;;;;;;;;;;;;;; -; This is the recommended, PHP 5-style version of the php.ini-dist file. It -; sets some non standard settings, that make PHP more efficient, more secure, -; and encourage cleaner coding. -; -; The price is that with these settings, PHP may be incompatible with some -; applications, and sometimes, more difficult to develop with. Using this -; file is warmly recommended for production sites. As all of the changes from -; the standard settings are thoroughly documented, you can go over each one, -; and decide whether you want to use it or not. -; -; For general information about the php.ini file, please consult the php.ini-dist -; file, included in your PHP distribution. -; -; This file is different from the php.ini-dist file in the fact that it features -; different values for several directives, in order to improve performance, while -; possibly breaking compatibility with the standard out-of-the-box behavior of -; PHP. Please make sure you read what's different, and modify your scripts -; accordingly, if you decide to use this file instead. -; -; - register_long_arrays = Off [Performance] -; Disables registration of the older (and deprecated) long predefined array -; variables ($HTTP_*_VARS). Instead, use the superglobals that were -; introduced in PHP 4.1.0 -; - display_errors = Off [Security] -; With this directive set to off, errors that occur during the execution of -; scripts will no longer be displayed as a part of the script output, and thus, -; will no longer be exposed to remote users. With some errors, the error message -; content may expose information about your script, web server, or database -; server that may be exploitable for hacking. Production sites should have this -; directive set to off. -; - log_errors = On [Security] -; This directive complements the above one. Any errors that occur during the -; execution of your script will be logged (typically, to your server's error log, -; but can be configured in several ways). Along with setting display_errors to off, -; this setup gives you the ability to fully understand what may have gone wrong, -; without exposing any sensitive information to remote users. -; - output_buffering = 4096 [Performance] -; Set a 4KB output buffer. Enabling output buffering typically results in less -; writes, and sometimes less packets sent on the wire, which can often lead to -; better performance. The gain this directive actually yields greatly depends -; on which Web server you're working with, and what kind of scripts you're using. -; - register_argc_argv = Off [Performance] -; Disables registration of the somewhat redundant $argv and $argc global -; variables. -; - magic_quotes_gpc = Off [Performance] -; Input data is no longer escaped with slashes so that it can be sent into -; SQL databases without further manipulation. Instead, you should use the -; function addslashes() on each input element you wish to send to a database. -; - variables_order = "GPCS" [Performance] -; The environment variables are not hashed into the $_ENV. To access -; environment variables, you can use getenv() instead. -; - error_reporting = E_ALL [Code Cleanliness, Security(?)] -; By default, PHP suppresses errors of type E_NOTICE. These error messages -; are emitted for non-critical errors, but that could be a symptom of a bigger -; problem. Most notably, this will cause error messages about the use -; of uninitialized variables to be displayed. -; - allow_call_time_pass_reference = Off [Code cleanliness] -; It's not possible to decide to force a variable to be passed by reference -; when calling a function. The PHP 4 style to do this is by making the -; function require the relevant argument by reference. +; All the values in the php.ini-dist file correspond to the builtin +; defaults (that is, if no php.ini is used, or if you delete these lines, +; the builtin defaults will be identical). + ;;;;;;;;;;;;;;;;;;;; ; Language Options ; ;;;;;;;;;;;;;;;;;;;; @@ -116,22 +67,19 @@ ; Enable the PHP scripting language engine under Apache. engine = On -; Enable compatibility mode with Zend Engine 1 (PHP 4.x) -zend.ze1_compatibility_mode = Off - -; Allow the tags are recognized. +; Allow the tags are recognized. ; NOTE: Using short tags should be avoided when developing applications or ; libraries that are meant for redistribution, or deployment on PHP ; servers which are not under your control, because short tags may not ; be supported on the target server. For portable, redistributable code, ; be sure not to use short tags. -short_open_tag = Off +short_open_tag = On ; Allow ASP-style <% %> tags. asp_tags = Off ; The number of significant digits displayed in floating point numbers. -precision = 14 +precision = 12 ; Enforce year 2000 compliance (will cause problems with non-compliant browsers) y2k_compliance = On @@ -143,7 +91,7 @@ ; setting this directive to On. If you wish to limit the size of the buffer ; to a certain size - you can use a maximum number of bytes instead of 'On', as ; a value for this directive (e.g., output_buffering=4096). -output_buffering = 4096 +output_buffering = Off ; You can redirect all of the output of your scripts to a function. For ; example, if you set output_handler to "mb_output_handler", character @@ -151,25 +99,22 @@ ; Setting any output handler automatically turns on output buffering. ; Note: People who wrote portable scripts should not depend on this ini ; directive. Instead, explicitly set the output handler using ob_start(). -; Using this ini directive may cause problems unless you know what script +; Using this ini directive may cause problems unless you know what script ; is doing. ; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler" -; and you cannot use both "ob_gzhandler" and "zlib.output_compression". -; Note: output_handler must be empty if this is set 'On' !!!! -; Instead you must use zlib.output_handler. +; and you cannot use both "ob_gzhandler" and "zlib.output_compression". ;output_handler = ; Transparent output compression using the zlib library ; Valid values for this option are 'off', 'on', or a specific buffer size ; to be used for compression (default is 4KB) -; Note: Resulting chunk size may vary due to nature of compression. PHP -; outputs chunks that are few hundreds bytes each as a result of -; compression. If you prefer a larger chunk size for better +; Note: Resulting chunk size may vary due to nature of compression. PHP +; outputs chunks that are few hundreds bytes each as a result of +; compression. If you prefer a larger chunk size for better ; performance, enable output_buffering in addition. ; Note: You need to use zlib.output_handler instead of the standard ; output_handler, or otherwise the output will be corrupted. zlib.output_compression = Off -;zlib.output_compression_level = -1 ; You cannot specify additional output handlers if zlib.output_compression ; is activated here. This setting does the same as output_handler but in @@ -188,7 +133,7 @@ ; which should be instantiated. ; A warning appears if the specified function is not defined, or if the ; function doesn't include/implement the missing class. -; So only set this entry, if you really want to implement such a +; So only set this entry, if you really want to implement such a ; callback-function. unserialize_callback_func= @@ -206,9 +151,8 @@ ; with future versions of the language (you will receive a warning each time ; you use this feature, and the argument will be passed by value instead of by ; reference). -allow_call_time_pass_reference = Off +allow_call_time_pass_reference = On -; ; Safe Mode ; safe_mode = Off @@ -222,7 +166,7 @@ ; including files from this directory and its subdirectories. ; (directory must also be in include_path or full path must ; be used when including) -safe_mode_include_dir = +safe_mode_include_dir = ; When safe_mode is on, only executables located in the safe_mode_exec_dir ; will be allowed to be executed via the exec family of functions. @@ -260,7 +204,7 @@ disable_classes = ; Colors for Syntax Highlighting mode. Anything that's acceptable in -; would work. +; would work. ;highlight.string = #DD0000 ;highlight.comment = #FF9900 ;highlight.keyword = #007700 @@ -268,21 +212,7 @@ ;highlight.default = #0000BB ;highlight.html = #000000 -; If enabled, the request will be allowed to complete even if the user aborts -; the request. Consider enabling it if executing long request, which may end up -; being interrupted by the user or a browser timing out. -; ignore_user_abort = On -; Determines the size of the realpath cache to be used by PHP. This value should -; be increased on systems where PHP opens many files to reflect the quantity of -; the file operations performed. -; realpath_cache_size=16k - -; Duration of time, in seconds for which to cache realpath information for a given -; file or directory. For systems with rarely changing files, consider increasing this -; value. -; realpath_cache_ttl=120 - ; ; Misc ; @@ -299,18 +229,17 @@ max_execution_time = 30 ; Maximum execution time of each script, in seconds max_input_time = 60 ; Maximum amount of time each script may spend parsing request data -memory_limit = 128M ; Maximum amount of memory a script may consume (128MB) +;max_input_nesting_level = 500 ; Maximum input variable nesting level +memory_limit = 8M ; Maximum amount of memory a script may consume (8MB) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Error handling and logging ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; error_reporting is a bit-field. Or each number up to get desired error ; reporting level -; E_ALL - All errors and warnings (doesn't include E_STRICT) +; E_ALL - All errors and warnings ; E_ERROR - fatal run-time errors -; E_RECOVERABLE_ERROR - almost fatal run-time errors ; E_WARNING - run-time warnings (non-fatal errors) ; E_PARSE - compile-time parse errors ; E_NOTICE - run-time notices (these are warnings which often result @@ -318,9 +247,6 @@ ; intentional (e.g., using an uninitialized variable and ; relying on the fact it's automatically initialized to an ; empty string) -; E_STRICT - run-time notices, enable to have PHP suggest changes -; to your code which will ensure the best interoperability -; and forward compatibility of your code ; E_CORE_ERROR - fatal errors that occur during PHP's initial startup ; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's ; initial startup @@ -332,28 +258,24 @@ ; ; Examples: ; -; - Show all errors, except for notices and coding standards warnings +; - Show all errors, except for notices ; ;error_reporting = E_ALL & ~E_NOTICE ; -; - Show all errors, except for notices -; -;error_reporting = E_ALL & ~E_NOTICE | E_STRICT -; ; - Show only errors ; -;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR +;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR ; -; - Show all errors, except coding standards warnings +; - Show all errors except for notices ; -error_reporting = E_ALL +error_reporting = E_ALL & ~E_NOTICE ; Print out errors (as a part of the output). For production web sites, ; you're strongly encouraged to turn this feature off, and use error logging ; instead (see below). Keeping display_errors enabled on a production web site ; may reveal security information to end users, such as file paths on your Web ; server, your database schema or other information. -display_errors = Off +display_errors = On ; Even when display_errors is on, errors that occur during PHP's startup ; sequence are not displayed. It's strongly recommended to keep @@ -363,7 +285,7 @@ ; Log errors into a log file (server-specific log, stderr, or error_log (below)) ; As stated above, you're strongly advised to use error logging in place of ; error displaying on production web sites. -log_errors = On +log_errors = Off ; Set maximum length of log_errors. In error_log information about the source is ; added. The default is 1024 and 0 allows to not apply any maximum length at all. @@ -373,35 +295,31 @@ ; line until ignore_repeated_source is set true. ignore_repeated_errors = Off -; Ignore source of message when ignoring repeated messages. When this setting +; Ignore source of message when ignoring repeated messages. When this setting ; is On you will not log errors with repeated messages from different files or -; source lines. +; sourcelines. ignore_repeated_source = Off ; If this parameter is set to Off, then memory leaks will not be shown (on -; stdout or in the log). This has only effect in a debug compile, and if +; stdout or in the log). This has only effect in a debug compile, and if ; error reporting includes E_WARNING in the allowed list report_memleaks = On -;report_zend_debug = 0 - ; Store the last error/warning message in $php_errormsg (boolean). track_errors = Off ; Disable the inclusion of HTML tags in error messages. -; Note: Never use this feature for production boxes. ;html_errors = Off - -; If html_errors is set On PHP produces clickable error messages that direct + +; If html_errors is set On PHP produces clickable error messages that direct ; to a page describing the error or function causing the error in detail. -; You can download a copy of the PHP manual from http://www.php.net/docs.php +; You can download a copy of the PHP manual from http://www.php.net/docs.php ; and change docref_root to the base URL of your local copy including the -; leading '/'. You must also specify the file extension being used including +; leading '/'. You must also specify the file extension being used including ; the dot. -; Note: Never use this feature for production boxes. ;docref_root = "/phpmanual/" ;docref_ext = .html - + ; String to output before an error message. ;error_prepend_string = "" @@ -422,11 +340,11 @@ ; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 ; The separator used in PHP generated URLs to separate arguments. -; Default is "&". +; Default is "&". ;arg_separator.output = "&" ; List of separator(s) used by PHP to parse input URLs into variables. -; Default is "&". +; Default is "&". ; NOTE: Every character in this directive is considered as separator! ;arg_separator.input = ";&" @@ -434,7 +352,7 @@ ; Environment and Built-in variables (G, P, C, E & S respectively, often ; referred to as EGPCS or GPC). Registration is done from left to right, newer ; values override older values. -variables_order = "GPCS" +variables_order = "EGPCS" ; Whether or not to register the EGPCS variables as global variables. You may ; want to turn this off if you don't want to clutter your scripts' global scope @@ -447,34 +365,25 @@ ; to possible security problems, if the code is not very well thought of. register_globals = Off -; Whether or not to register the old-style input arrays, HTTP_GET_VARS -; and friends. If you're not using them, it's recommended to turn them off, -; for performance reasons. -register_long_arrays = Off - ; This directive tells PHP whether to declare the argv&argc variables (that ; would contain the GET information). If you don't use these variables, you ; should turn it off for increased performance. -register_argc_argv = Off +register_argc_argv = On -; When enabled, the SERVER and ENV variables are created when they're first -; used (Just In Time) instead of when the script starts. If these variables -; are not used within a script, having this directive on will result in a -; performance gain. The PHP directives register_globals, register_long_arrays, -; and register_argc_argv must be disabled for this directive to have any affect. -auto_globals_jit = On - ; Maximum size of POST data that PHP will accept. post_max_size = 8M +; This directive is deprecated. Use variables_order instead. +gpc_order = "GPC" + ; Magic quotes ; ; Magic quotes for incoming GET/POST/Cookie data. -magic_quotes_gpc = Off +magic_quotes_gpc = On ; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. -magic_quotes_runtime = Off +magic_quotes_runtime = Off ; Use Sybase-style magic quotes (escape ' with '' instead of \'). magic_quotes_sybase = Off @@ -499,7 +408,7 @@ ; Paths and Directories ; ;;;;;;;;;;;;;;;;;;;;;;;;; -; UNIX: "/path1:/path2" +; UNIX: "/path1:/path2" ;include_path = ".:/php/includes" ; ; Windows: "\path1;\path2" @@ -517,7 +426,7 @@ user_dir = ; Directory in which the loadable extensions (modules) reside. -extension_dir = "PHPEXTDIR" +extension_dir = "./" ; 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 @@ -534,12 +443,20 @@ ; every request. ; cgi.nph = 1 -; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape +; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape ; (iPlanet) web servers, you MAY need to set an environment variable name that PHP ; will look for to know it is OK to continue execution. Setting this variable MAY ; cause security issues, KNOW WHAT YOU ARE DOING FIRST. ; cgi.redirect_status_env = ; +; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's +; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok +; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting +; this to 1 will cause PHP CGI to fix it's paths to conform to the spec. A setting +; of zero causes PHP to behave as before. Default is zero. You should fix your scripts +; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. +; cgi.fix_pathinfo=0 + ; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate ; security tokens of the calling client. This allows IIS to define the ; security context that the request runs under. mod_fastcgi under Apache @@ -555,9 +472,9 @@ ; is supported by Apache. When this option is set to 1 PHP will send ; RFC2616 compliant header. ; Default is zero. -;cgi.rfc2616_headers = 0 +;cgi.rfc2616_headers = 0 + - ;;;;;;;;;;;;;;;; ; File Uploads ; ;;;;;;;;;;;;;;;; @@ -580,9 +497,6 @@ ; Whether to allow the treatment of URLs (like http:// or ftp://) as files. allow_url_fopen = On -; Whether to allow include/require to open URLs (like http:// or ftp://) as files. -allow_url_include = Off - ; Define the anonymous ftp password (your email address) ;from="john at doe.com" @@ -617,153 +531,64 @@ ; ; extension=msql.so ; -; Note that it should be the name of the module only; no directory information +; Note that it should be the name of the module only; no directory information ; needs to go here. Specify the location of the extension with the ; extension_dir directive above. -; CSW Extensions -;extension=bcmath.so -;extension=bz2.so -;extension=calendar.so -;extension=ctype.so -;extension=curl.so -;extension=dba.so -;extension=dbase.so -;extension=dom.so -;extension=exif.so -;extension=ftp.so -;extension=gd.so -;extension=gettext.so -;extension=gmp.so -;extension=hash.so -;extension=iconv.so -;extension=imap.so -;extension=json.so -;extension=ldap.so -;extension=mbstring.so -;extension=mcrypt.so -;extension=mhash.so -;extension=mime_magic.so -;extension=mssql.so -;extension=mysql.so -;extension=mysqli.so -;extension=ncurses.so -;extension=odbc.so -;extension=openssl.so -;extension=pcntl.so -;extension=pdo.so -;extension=pdo_mysql.so -;extension=pdo_odbc.so -;extension=pdo_pgsql.so -;extension=pdo_sqlite.so -;extension=pgsql.so -;extension=posix.so -;extension=pspell.so -;extension=readline.so -;extension=session.so -;extension=shmop.so -;extension=snmp.so -;extension=soap.so -;extension=sockets.so -;extension=sqlite.so -;extension=sysvsem.so -;extension=sysvmsg.so -;extension=sysvshm.so -;extension=tidy.so -;extension=tokenizer.so -;extension=wddx.so -;extension=xmlreader.so -;extension=xmlrpc.so -;extension=xmlwriter.so -;extension=xsl.so -;extension=zip.so -; Windows Extensions -; Note that ODBC support is built in, so no dll is needed for it. -; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) -; extension folders as well as the separate PECL DLL download (PHP 5). -; Be sure to appropriately set the extension_dir directive. - +;Windows Extensions +;Note that MySQL and ODBC support is now built in, so no dll is needed for it. +; +;extension=php_mbstring.dll ;extension=php_bz2.dll +;extension=php_cpdf.dll +;extension=php_crack.dll ;extension=php_curl.dll +;extension=php_db.dll ;extension=php_dba.dll ;extension=php_dbase.dll +;extension=php_dbx.dll +;extension=php_domxml.dll ;extension=php_exif.dll ;extension=php_fdf.dll +;extension=php_filepro.dll ;extension=php_gd2.dll ;extension=php_gettext.dll -;extension=php_gmp.dll +;extension=php_hyperwave.dll +;extension=php_iconv.dll ;extension=php_ifx.dll +;extension=php_iisfunc.dll ;extension=php_imap.dll ;extension=php_interbase.dll +;extension=php_java.dll ;extension=php_ldap.dll -;extension=php_mbstring.dll ;extension=php_mcrypt.dll ;extension=php_mhash.dll ;extension=php_mime_magic.dll ;extension=php_ming.dll -;extension=php_msql.dll ;extension=php_mssql.dll -;extension=php_mysql.dll -;extension=php_mysqli.dll +;extension=php_msql.dll ;extension=php_oci8.dll ;extension=php_openssl.dll -;extension=php_pdo.dll -;extension=php_pdo_firebird.dll -;extension=php_pdo_mssql.dll -;extension=php_pdo_mysql.dll -;extension=php_pdo_oci.dll -;extension=php_pdo_oci8.dll -;extension=php_pdo_odbc.dll -;extension=php_pdo_pgsql.dll -;extension=php_pdo_sqlite.dll +;extension=php_oracle.dll +;extension=php_pdf.dll ;extension=php_pgsql.dll -;extension=php_pspell.dll +;extension=php_printer.dll ;extension=php_shmop.dll ;extension=php_snmp.dll -;extension=php_soap.dll ;extension=php_sockets.dll -;extension=php_sqlite.dll ;extension=php_sybase_ct.dll -;extension=php_tidy.dll +;extension=php_w32api.dll ;extension=php_xmlrpc.dll -;extension=php_xsl.dll +;extension=php_xslt.dll +;extension=php_yaz.dll ;extension=php_zip.dll + ;;;;;;;;;;;;;;;;;;; ; Module Settings ; ;;;;;;;;;;;;;;;;;;; -[Date] -; Defines the default timezone used by the date functions -;date.timezone = - -;date.default_latitude = 31.7667 -;date.default_longitude = 35.2333 - -;date.sunrise_zenith = 90.583333 -;date.sunset_zenith = 90.583333 - -[filter] -;filter.default = unsafe_raw -;filter.default_flags = - -[iconv] -;iconv.input_encoding = ISO-8859-1 -;iconv.internal_encoding = ISO-8859-1 -;iconv.output_encoding = ISO-8859-1 - -[sqlite] -;sqlite.assoc_case = 0 - -[xmlrpc] -;xmlrpc_error_number = 0 -;xmlrpc_errors = 0 - -[Pcre] -;pcre.recursion_limit=100000 -;pcre.backtrack_limit=100000 - [Syslog] ; Whether or not to define the various syslog variables (e.g. $LOG_PID, ; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In @@ -779,12 +604,13 @@ ;sendmail_from = me at example.com ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). -sendmail_path = /usr/lib/sendmail -t -i +;sendmail_path = -; Force the addition of the specified parameters to be passed as extra parameters -; to the sendmail binary. These parameters will always replace the value of -; the 5th parameter to mail(), even in safe mode. -;mail.force_extra_parameters = +[Java] +;java.class.path = .\php_java.jar +;java.home = c:\jdk +;java.library = c:\jdk\jre\bin\hotspot\jvm.dll +;java.library.path = .\ [SQL] sql.safe_mode = Off @@ -804,16 +630,16 @@ odbc.max_persistent = -1 ; Maximum number of links (persistent + non-persistent). -1 means no limit. -odbc.max_links = -1 +odbc.max_links = -1 ; Handling of LONG fields. Returns number of bytes to variables. 0 means ; passthru. -odbc.defaultlrl = 4096 +odbc.defaultlrl = 4096 ; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char. ; See the documentation on odbc_binmode and odbc_longreadlen for an explanation ; of uodbc.defaultlrl and uodbc.defaultbinmode -odbc.defaultbinmode = 1 +odbc.defaultbinmode = 1 [MySQL] ; Allow or prevent persistent links. @@ -855,37 +681,6 @@ ; SQL-Errors will be displayed. mysql.trace_mode = Off -[MySQLi] - -; Maximum number of links. -1 means no limit. -mysqli.max_links = -1 - -; Default port number for mysqli_connect(). If unset, mysqli_connect() will use -; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the -; compile-time value defined MYSQL_PORT (in that order). Win32 will only look -; at MYSQL_PORT. -mysqli.default_port = 3306 - -; Default socket name for local MySQL connects. If empty, uses the built-in -; MySQL defaults. -mysqli.default_socket = - -; Default host for mysql_connect() (doesn't apply in safe mode). -mysqli.default_host = - -; Default user for mysql_connect() (doesn't apply in safe mode). -mysqli.default_user = - -; Default password for mysqli_connect() (doesn't apply in safe mode). -; Note that this is generally a *bad* idea to store passwords in this file. -; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") -; and reveal this password! And of course, any users with read access to this -; file will be able to reveal the password as well. -mysqli.default_pw = - -; Allow or prevent reconnect -mysqli.reconnect = Off - [mSQL] ; Allow or prevent persistent links. msql.allow_persistent = On @@ -896,44 +691,12 @@ ; Maximum number of links (persistent+non persistent). -1 means no limit. msql.max_links = -1 -[OCI8] -; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA) -;oci8.privileged_connect = Off - -; Connection: The maximum number of persistent OCI8 connections per -; process. Using -1 means no limit. -;oci8.max_persistent = -1 - -; Connection: The maximum number of seconds a process is allowed to -; maintain an idle persistent connection. Using -1 means idle -; persistent connections will be maintained forever. -;oci8.persistent_timeout = -1 - -; Connection: The number of seconds that must pass before issuing a -; ping during oci_pconnect() to check the connection validity. When -; set to 0, each oci_pconnect() will cause a ping. Using -1 disables -; pings completely. -;oci8.ping_interval = 60 - -; Tuning: This option enables statement caching, and specifies how -; many statements to cache. Using 0 disables statement caching. -;oci8.statement_cache_size = 20 - -; Tuning: Enables statement prefetching and sets the default number of -; rows that will be fetched automatically after statement execution. -;oci8.default_prefetch = 10 - -; Compatibility. Using On means oci_close() will not close -; oci_connect() and oci_new_connect() connections. -;oci8.old_oci_close_semantics = Off - [PostgresSQL] ; Allow or prevent persistent links. pgsql.allow_persistent = On -; Detect broken persistent links always with pg_pconnect(). -; Auto reset feature requires a little overheads. -pgsql.auto_reset_persistent = Off +; Detect broken persistent links always with pg_pconnect(). Need a little overhead. +pgsql.auto_reset_persistent = Off ; Maximum number of persistent links. -1 means no limit. pgsql.max_persistent = -1 @@ -942,7 +705,6 @@ pgsql.max_links = -1 ; Ignore PostgreSQL backends Notice message or not. -; Notice message logging require a little overheads. pgsql.ignore_notice = 0 ; Log PostgreSQL backends Noitce message or not. @@ -967,7 +729,7 @@ ; Minimum message severity to display. sybase.min_message_severity = 10 -; Compatibility mode with old versions of PHP 3.0. +; Compatability mode with old versions of PHP 3.0. ; If on, this will cause PHP to automatically assign types to results according ; to their Sybase type, instead of treating them all as strings. This ; compatibility mode will probably not stay around forever, so try applying @@ -990,6 +752,16 @@ ; Minimum client message severity to display. sybct.min_client_severity = 10 +[dbx] +; returned column names can be converted for compatibility reasons +; possible values for dbx.colnames_case are +; "unchanged" (default, if not set) +; "lowercase" +; "uppercase" +; the recommended default is either upper- or lowercase, but +; unchanged is currently set for backwards compatibility +dbx.colnames_case = "unchanged" + [bcmath] ; Number of decimal digits for all bcmath functions. bcmath.scale = 0 @@ -1039,38 +811,24 @@ session.save_handler = files ; Argument passed to save_handler. In the case of files, this is the path -; where data files are stored. Note: Windows users have to change this +; where data files are stored. Note: Windows users have to change this ; variable in order to use PHP's session functions. -; ; As of PHP 4.0.1, you can define the path as: -; ; session.save_path = "N;/path" -; -; where N is an integer. Instead of storing all the session files in -; /path, what this will do is use subdirectories N-levels deep, and -; store the session data in those directories. This is useful if you -; or your OS have problems with lots of files in one directory, and is +; where N is an integer. Instead of storing all the session files in +; /path, what this will do is use subdirectories N-levels deep, and +; store the session data in those directories. This is useful if you +; or your OS have problems with lots of files in one directory, and is ; a more efficient layout for servers that handle lots of sessions. -; ; NOTE 1: PHP will not create this directory structure automatically. ; You can use the script in the ext/session dir for that purpose. ; NOTE 2: See the section on garbage collection below if you choose to ; use subdirectories for session storage -; -; The file storage module creates files using mode 600 by default. -; You can change that by using -; -; session.save_path = "N;MODE;/path" -; -; where MODE is the octal representation of the mode. Note that this -; does not overwrite the process's umask. -session.save_path = "/tmp" +;session.save_path = /tmp ; Whether to use cookies. session.use_cookies = 1 -;session.cookie_secure = - ; This option enables administrators to make their users invulnerable to ; attacks which involve passing session ids in URLs; defaults to 0. ; session.use_only_cookies = 1 @@ -1090,9 +848,6 @@ ; The domain for which the cookie is valid. session.cookie_domain = -; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. -session.cookie_httponly = - ; Handler used to serialize data. php is the standard serializer of PHP. session.serialize_handler = php @@ -1103,7 +858,7 @@ ; on each request. session.gc_probability = 1 -session.gc_divisor = 1000 +session.gc_divisor = 100 ; After this number of seconds, stored data will be seen as 'garbage' and ; cleaned up by the garbage collection process. @@ -1111,8 +866,8 @@ ; NOTE: If you are using the subdirectory option for storing session files ; (see session.save_path above), then garbage collection does *not* -; happen automatically. You will need to do your own garbage -; collection through a shell script, cron entry, or some other method. +; happen automatically. You will need to do your own garbage +; collection through a shell script, cron entry, or some other method. ; For example, the following script would is the equivalent of ; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): ; cd /path/to/sessions; find -cmin +24 | xargs rm @@ -1123,7 +878,7 @@ ; You can disable the feature and the warning separately. At this time, ; the warning is only displayed, if bug_compat_42 is enabled. -session.bug_compat_42 = 0 +session.bug_compat_42 = 1 session.bug_compat_warn = 1 ; Check HTTP Referer to invalidate externally stored URLs containing ids. @@ -1149,7 +904,7 @@ session.cache_expire = 180 ; trans sid support is disabled by default. -; Use of trans sid may risk your users security. +; Use of trans sid may risk your users security. ; Use this option with caution. ; - User may send URL contains active session ID ; to other person via. email/irc/etc. @@ -1159,25 +914,12 @@ ; always using URL stored in browser's history or bookmarks. session.use_trans_sid = 0 -; Select a hash function -; 0: MD5 (128 bits) -; 1: SHA-1 (160 bits) -session.hash_function = 0 - -; Define how many bits are stored in each character when converting -; the binary hash data to something readable. -; -; 4 bits: 0-9, a-f -; 5 bits: 0-9, a-v -; 6 bits: 0-9, a-z, A-Z, "-", "," -session.hash_bits_per_character = 5 - ; The URL rewriter will look for URLs in a defined set of HTML tags. ; form/fieldset are special; if you include them here, the rewriter will ; add a hidden field with the info which is otherwise appended ; to URLs. If you want XHTML conformity, remove the form entry. ; Note that all valid entries require a "=", even if no value follows. -url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" +url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=,fieldset=" [MSSQL] ; Allow or prevent persistent links. @@ -1195,7 +937,7 @@ ; Minimum message severity to display. mssql.min_message_severity = 10 -; Compatibility mode with old versions of PHP 3.0. +; Compatability mode with old versions of PHP 3.0. mssql.compatability_mode = Off ; Connect timeout @@ -1226,11 +968,6 @@ ; FreeTDS defaults to 4096 ;mssql.max_procs = -1 -; Specify client character set. -; If empty or not set the client charset from freetds.comf is used -; This is only used when compiled with FreeTDS -;mssql.charset = "ISO-8859-1" - [Assertion] ; Assert(expr); active by default. ;assert.active = On @@ -1248,18 +985,62 @@ ; error_reporting(0) around the eval(). ;assert.quiet_eval = 0 -[COM] +[Ingres II] +; Allow or prevent persistent links. +ingres.allow_persistent = On + +; Maximum number of persistent links. -1 means no limit. +ingres.max_persistent = -1 + +; Maximum number of links, including persistents. -1 means no limit. +ingres.max_links = -1 + +; Default database (format: [node_id::]dbname[/srv_class]). +ingres.default_database = + +; Default user. +ingres.default_user = + +; Default password. +ingres.default_password = + +[Verisign Payflow Pro] +; Default Payflow Pro server. +pfpro.defaulthost = "test-payflow.verisign.com" + +; Default port to connect to. +pfpro.defaultport = 443 + +; Default timeout in seconds. +pfpro.defaulttimeout = 30 + +; Default proxy IP address (if required). +;pfpro.proxyaddress = + +; Default proxy port. +;pfpro.proxyport = + +; Default proxy logon. +;pfpro.proxylogon = + +; Default proxy password. +;pfpro.proxypassword = + +[com] ; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs -;com.typelib_file = +;com.typelib_file = ; allow Distributed-COM calls ;com.allow_dcom = true ; autoregister constants of a components typlib on com_load() ;com.autoregister_typelib = true ; register constants casesensitive ;com.autoregister_casesensitive = false -; show warnings on duplicate constant registrations +; show warnings on duplicate constat registrations ;com.autoregister_verbose = true +[Printer] +;printer.default_printer = "" + [mbstring] ; language for internal character representation. ;mbstring.language = Japanese @@ -1276,7 +1057,7 @@ ; registered as output buffer to function ;mbstring.http_output = SJIS -; enable automatic encoding translation according to +; enable automatic encoding translation according to ; mbstring.internal_encoding setting. Input chars are ; converted to internal encoding by setting this to On. ; Note: Do _not_ use automatic encoding translation for @@ -1284,7 +1065,7 @@ ;mbstring.encoding_translation = Off ; automatic encoding detection order. -; auto means +; auto means ;mbstring.detect_order = auto ; substitute_character used when character cannot be converted @@ -1301,14 +1082,10 @@ ; 4: Overload ereg*() functions ;mbstring.func_overload = 0 -; enable strict encoding detection. -;mbstring.strict_encoding = Off - [FrontBase] ;fbsql.allow_persistent = On ;fbsql.autocommit = On -;fbsql.show_timestamp_decimals = Off -;fbsql.default_database = +;fbsql.default_database = ;fbsql.default_database_password = ;fbsql.default_host = ;fbsql.default_password = @@ -1318,44 +1095,26 @@ ;fbsql.max_links = 128 ;fbsql.max_persistent = -1 ;fbsql.max_results = 128 +;fbsql.batchSize = 1000 -[gd] -; Tell the jpeg decode to libjpeg warnings and try to create -; a gd image. The warning will then be displayed as notices -; disabled by default -;gd.jpeg_ignore_warning = 0 +[Crack] +; Modify the setting below to match the directory location of the cracklib +; dictionary files. Include the base filename, but not the file extension. +; crack.default_dictionary = "c:\php\lib\cracklib_dict" [exif] -; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. +; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. ; With mbstring support this will automatically be converted into the encoding -; given by corresponding encode setting. When empty mbstring.internal_encoding -; is used. For the decode settings you can distinguish between motorola and +; given by corresponding encode setting. When empty mbstring.internal_encoding +; is used. For the decode settings you can distinguish between motorola and ; intel byte order. A decode setting cannot be empty. ;exif.encode_unicode = ISO-8859-15 ;exif.decode_unicode_motorola = UCS-2BE ;exif.decode_unicode_intel = UCS-2LE -;exif.encode_jis = +;exif.encode_jis = ;exif.decode_jis_motorola = JIS ;exif.decode_jis_intel = JIS -[Tidy] -; The path to a default tidy configuration file to use when using tidy -;tidy.default_config = /usr/local/lib/php/default.tcfg - -; Should tidy clean and repair output automatically? -; WARNING: Do not use this option if you are generating non-html content -; such as dynamic images -tidy.clean_output = Off - -[soap] -; Enables or disables WSDL caching feature. -soap.wsdl_cache_enabled=1 -; Sets the directory name where SOAP extension will put cache files. -soap.wsdl_cache_dir="/tmp" -; (time to live) Sets the number of second while cached file will be used -; instead of original one. -soap.wsdl_cache_ttl=86400 - ; Local Variables: ; tab-width: 4 ; End: Deleted: csw/mgar/pkg/php4/trunk/files/phpext =================================================================== --- csw/mgar/pkg/php4/trunk/files/phpext 2009-05-13 21:09:54 UTC (rev 4839) +++ csw/mgar/pkg/php4/trunk/files/phpext 2009-05-14 01:34:37 UTC (rev 4840) @@ -1,106 +0,0 @@ -#!/bin/ksh -# -# phpext - PHP extension manager. -# - -program=${0##*/} - -# Default path to php.ini -php_ini=/opt/csw/php4/lib/php.ini - -# Usage printer -function do_usage { - - # Print short usage - cat << EOT -Usage: $program [-h] [-e|-d|-q] [-i ] ... -EOT - - # Print long usage - if [ "$1" = "long" ]; then - cat << EOT - -Options: - - -e Enable extensions - -d Disable extensions - -q Query mode - -i Path to php.ini (default: $php_ini) - -h Display usage information - extN Extension names - -Examples: - - # Enable the exif and wddx extensions - $program -e exif wddx - - # Disable xsl - $program -d xsl - - # Check whether mbstring is enabled - $program -q mbstring - mbstring_enabled=true - - # Query all extensions from a different php.ini - $program -i /path/to/php.ini -q - -EOT - fi - - exit 1 -} - -# Process command line options -typeset op -while getopts ":hedqi:" opts -do - case ${opts} in - e) op=enable ;; - d) op=disable ;; - i) php_ini=$OPTARG ;; - q) op=query ;; - h) do_usage "long" ;; - \?) do_usage "long" ;; - esac -done - -shift $((${OPTIND} - 1 )) - -if [ "$op" = "enable" ] || [ "$op" = "disable" ] && [ -z "$@" ]; then - print "Error: No extensions specified for action $op" - do_usage -fi - -if [ ! -f $php_ini ]; then - print "Error: Cannot access $php_ini" - do_usage -fi - -# In modes other than query, stream edit the file -typeset perlswitches php_extensions php_op -perlswitches="-lne" -if [ "$op" != "query" ]; then - perlswitches="-i.bak -p $perlswitches" -fi - -# Spawn perl to do the dirty work -export php_extensions="$@" -export php_op=$op -exec perl $perlswitches ' - BEGIN { - use Config; - use vars qw/$grabext $php_op/; - $exts = $ENV{php_extensions} - ? join("|", split(/\s+/, $ENV{php_extensions})) : qr{\S+}; - - $grabext = qr{^(;)?extension=($exts)\.$Config{dlext}\s*$}; - $php_op = $ENV{php_op}; - } - if (my ($disabled, $extname) = $_ =~ $grabext) { - if ($php_op eq "query") { - printf "%s_enabled=%s\n", $extname, ($disabled ? "false" : "true"); - } - elsif ($php_op eq "enable") { s/^;// if $disabled } - elsif ($php_op eq "disable") { s/^/;/ unless $disabled } - }' $php_ini - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 14 06:01:52 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 14 May 2009 04:01:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[4841] csw/mgar/pkg/php4/trunk Message-ID: Revision: 4841 http://gar.svn.sourceforge.net/gar/?rev=4841&view=rev Author: valholla Date: 2009-05-14 04:01:52 +0000 (Thu, 14 May 2009) Log Message: ----------- working merge Modified Paths: -------------- csw/mgar/pkg/php4/trunk/Makefile csw/mgar/pkg/php4/trunk/checksums csw/mgar/pkg/php4/trunk/files/php.ini.CSW Added Paths: ----------- csw/mgar/pkg/php4/trunk/files/dummy-httpd.conf csw/mgar/pkg/php4/trunk/files/httpd-php4.conf.CSW csw/mgar/pkg/php4/trunk/files/pkgdef.mk Modified: csw/mgar/pkg/php4/trunk/Makefile =================================================================== --- csw/mgar/pkg/php4/trunk/Makefile 2009-05-14 01:34:37 UTC (rev 4840) +++ csw/mgar/pkg/php4/trunk/Makefile 2009-05-14 04:01:52 UTC (rev 4841) @@ -19,6 +19,9 @@ MASTER_SITES = http://us.php.net/distributions/ SPKG_SOURCEURL = http://www.php.net/downloads.php DISTFILES += $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += dummy-httpd.conf +DISTFILES += httpd-php4.conf.CSW +DISTFILES += php.ini.CSW INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) PHP4ROOT = $(DESTDIR)$(prefix)/php4 @@ -82,10 +85,63 @@ CONFIGURE_ARGS += --with-xmlrpc=shared,$(prefix) CONFIGURE_ARGS += --with-zlib=shared - # Disable Tests (report submitted to PHP QA) SKIPTEST = 1 ENABLE_CHECK = 0 -# System Rules/Configuration +PI_SCRIPTS = install-extra +PI_SCRIPTS += install-ap2modphp4 +PI_SCRIPTS += install-modphp4 +PI_SCRIPTS += install-cleanup + +post-install-modulated: $(PI_SCRIPTS) + @$(MAKECOOKIE) + +install-ap2modphp4: + @echo " ==> Now Building ap2_modphp4 <==" + @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/libphp4.so + @$(MAKECOOKIE) + +install-modphp4: + @echo " ==> Now Building modphp4 <==" + @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/libphp4.so + @$(MAKECOOKIE) + +install-extra: + @gmv $(DESTDIR)$(prefix)/php4/etc/pear.conf \ + $(DESTDIR)$(prefix)/php4/etc/pear.conf.CSW + @gsed -i -e s,PHPEXTDIR,$(shell $(PHP4ROOT)/bin/php-config --extension-dir),\ + $(WORKDIR)/php.ini.CSW + @ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra + @ginstall -d $(DESTDIR)$(prefix)/apache/conf + @ginstall -d $(DESTDIR)$(prefix)/php4/lib + @ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(prefix)/php4/lib + @ginstall -m 0644 $(WORKDIR)/httpd-php4.conf.CSW \ + $(DESTDIR)$(prefix)/apache2/etc/extra + @gcp $(DOWNLOADDIR)/dummy-httpd.conf $(DESTDIR)$(prefix)/apache2/etc/httpd.conf + @gcp $(DOWNLOADDIR)/dummy-httpd.conf $(DESTDIR)$(prefix)/apache/conf/httpd.conf + @$(MAKECOOKIE) + +install-cleanup: + @grm -fr $(DESTDIR)/.[a-z]* + @gfind $(DESTDIR) -name \*.a -exec grm -f {} \; + @gfind $(DESTDIR)$(prefix)/apache* \ + -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr + @grm $(DESTDIR)$(prefix)/apache2/etc/httpd.conf* + @$(MAKECOOKIE) + + +include files/pkgdef.mk include gar/category.mk Modified: csw/mgar/pkg/php4/trunk/checksums =================================================================== --- csw/mgar/pkg/php4/trunk/checksums 2009-05-14 01:34:37 UTC (rev 4840) +++ csw/mgar/pkg/php4/trunk/checksums 2009-05-14 04:01:52 UTC (rev 4841) @@ -1,2 +1,5 @@ +93db60a388952ec3b40bb3bb005ff06b download/dummy-httpd.conf +ec1d86518d8b6d5a320ce058f03d9eef download/httpd-php4.conf.CSW 3870a95f52c9637798294243694fdd47 download/pgsql.diff 2e3b2a0e27f10cb84fd00e5ecd7a1880 download/php-4.4.9.tar.bz2 +4450995841c11c22e4369dc425307a4a download/php.ini.CSW Added: csw/mgar/pkg/php4/trunk/files/dummy-httpd.conf =================================================================== --- csw/mgar/pkg/php4/trunk/files/dummy-httpd.conf (rev 0) +++ csw/mgar/pkg/php4/trunk/files/dummy-httpd.conf 2009-05-14 04:01:52 UTC (rev 4841) @@ -0,0 +1,2 @@ + +LoadModule dummy_module libexec/libdummy.so Added: csw/mgar/pkg/php4/trunk/files/httpd-php4.conf.CSW =================================================================== --- csw/mgar/pkg/php4/trunk/files/httpd-php4.conf.CSW (rev 0) +++ csw/mgar/pkg/php4/trunk/files/httpd-php4.conf.CSW 2009-05-14 04:01:52 UTC (rev 4841) @@ -0,0 +1,8 @@ + + + + AddType application/x-httpd-php .php + AddType application/x-httpd-php-source .phps + + + Modified: csw/mgar/pkg/php4/trunk/files/php.ini.CSW =================================================================== --- csw/mgar/pkg/php4/trunk/files/php.ini.CSW 2009-05-14 01:34:37 UTC (rev 4840) +++ csw/mgar/pkg/php4/trunk/files/php.ini.CSW 2009-05-14 04:01:52 UTC (rev 4841) @@ -426,7 +426,7 @@ user_dir = ; Directory in which the loadable extensions (modules) reside. -extension_dir = "./" +extension_dir = PHPEXTDIR ; 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 Added: csw/mgar/pkg/php4/trunk/files/pkgdef.mk =================================================================== --- csw/mgar/pkg/php4/trunk/files/pkgdef.mk (rev 0) +++ csw/mgar/pkg/php4/trunk/files/pkgdef.mk 2009-05-14 04:01:52 UTC (rev 4841) @@ -0,0 +1,2 @@ + +# Package Definition File This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu May 14 10:10:38 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 14 May 2009 08:10:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[4842] csw/mgar/pkg/irssi/trunk Message-ID: Revision: 4842 http://gar.svn.sourceforge.net/gar/?rev=4842&view=rev Author: idogan23 Date: 2009-05-14 08:10:38 +0000 (Thu, 14 May 2009) Log Message: ----------- irssi: put /opt/csw/gnu into the PATH variable Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile csw/mgar/pkg/irssi/trunk/checksums csw/mgar/pkg/irssi/trunk/files/CSWirssi.gspec Removed Paths: ------------- csw/mgar/pkg/irssi/trunk/files/CSWirssi.depend csw/mgar/pkg/irssi/trunk/files/CSWirssi.postinstall Property Changed: ---------------- csw/mgar/pkg/irssi/trunk/ Property changes on: csw/mgar/pkg/irssi/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2009-05-14 04:01:52 UTC (rev 4841) +++ csw/mgar/pkg/irssi/trunk/Makefile 2009-05-14 08:10:38 UTC (rev 4842) @@ -1,5 +1,5 @@ GARNAME = irssi -GARVERSION = 0.8.12 +GARVERSION = 0.8.13 CATEGORIES = apps DESCRIPTION = IRC client with IPv6, proxy, bot, socks and Perl support @@ -13,11 +13,15 @@ MASTER_SITES = http://www.irssi.org/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWirssi, postinstall depend) +DISTFILES += $(call admfiles,CSWirssi) +#DISTFILES += $(call admfiles,CSWirssi, postinstall depend) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_CLASSES = none cswcpsampleconf +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/irssi.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS += --with-socks @@ -26,7 +30,9 @@ CONFIGURE_ARGS += --with-perl=module CONFIGURE_ARGS += --with-perl-lib=vendor -GARCOMPILER = SUN +REQUIRED_PKGS = CSWglib2 CSWiconv CSWosslrt CSWperl CSWsunmath CSWggettextrt + +GARCOMPILER = GCC4 TEST_TARGET = check # moving configuration file @@ -41,3 +47,4 @@ include gar/category.mk +PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/irssi/trunk/checksums =================================================================== --- csw/mgar/pkg/irssi/trunk/checksums 2009-05-14 04:01:52 UTC (rev 4841) +++ csw/mgar/pkg/irssi/trunk/checksums 2009-05-14 08:10:38 UTC (rev 4842) @@ -1,4 +1,2 @@ -ddf717a430e1c13a272f528c4f529430 download/irssi-0.8.12.tar.gz -9e9bc28744147cae728641badb8b48bc download/CSWirssi.gspec -0adc5863c083931c1014600385c4c4ab download/CSWirssi.postinstall -93f2d39a91f3798000f265fafd1e8954 download/CSWirssi.depend +226f194576895ff3075c164523806d06 download/irssi-0.8.13.tar.gz +981f1b2ee1c132d0f0330724bfe601c3 download/CSWirssi.gspec Deleted: csw/mgar/pkg/irssi/trunk/files/CSWirssi.depend =================================================================== --- csw/mgar/pkg/irssi/trunk/files/CSWirssi.depend 2009-05-14 04:01:52 UTC (rev 4841) +++ csw/mgar/pkg/irssi/trunk/files/CSWirssi.depend 2009-05-14 08:10:38 UTC (rev 4842) @@ -1,7 +0,0 @@ -P CSWcommon -P CSWglib2 -P CSWiconv -P CSWosslrt -P CSWperl -P CSWsunmath -P CSWggettextrt Modified: csw/mgar/pkg/irssi/trunk/files/CSWirssi.gspec =================================================================== --- csw/mgar/pkg/irssi/trunk/files/CSWirssi.gspec 2009-05-14 04:01:52 UTC (rev 4841) +++ csw/mgar/pkg/irssi/trunk/files/CSWirssi.gspec 2009-05-14 08:10:38 UTC (rev 4842) @@ -1,4 +1,4 @@ %var bitname irssi %var pkgname CSWirssi %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKSRC\xAD_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/irssi/trunk/files/CSWirssi.postinstall =================================================================== --- csw/mgar/pkg/irssi/trunk/files/CSWirssi.postinstall 2009-05-14 04:01:52 UTC (rev 4841) +++ csw/mgar/pkg/irssi/trunk/files/CSWirssi.postinstall 2009-05-14 08:10:38 UTC (rev 4842) @@ -1,3 +0,0 @@ -if [ ! -f $BASEDIR/opt/csw/etc/irssi.conf ] ; then - cp $BASEDIR/opt/csw/etc/irssi.conf.CSW $BASEDIR/opt/csw/etc/irssi.conf -fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu May 14 10:12:02 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 14 May 2009 08:12:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[4843] csw/mgar/pkg/irssi/trunk/ Message-ID: Revision: 4843 http://gar.svn.sourceforge.net/gar/?rev=4843&view=rev Author: idogan23 Date: 2009-05-14 08:12:02 +0000 (Thu, 14 May 2009) Log Message: ----------- irssi: switched to mGar v2 Property Changed: ---------------- csw/mgar/pkg/irssi/trunk/ Property changes on: csw/mgar/pkg/irssi/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.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. From idogan23 at users.sourceforge.net Thu May 14 11:48:45 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 14 May 2009 09:48:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[4844] csw/mgar/pkg/irssi/trunk Message-ID: Revision: 4844 http://gar.svn.sourceforge.net/gar/?rev=4844&view=rev Author: idogan23 Date: 2009-05-14 09:48:45 +0000 (Thu, 14 May 2009) Log Message: ----------- irssi: various cleanups Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/irssi/trunk/files/CSWirssi.gspec Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2009-05-14 08:12:02 UTC (rev 4843) +++ csw/mgar/pkg/irssi/trunk/Makefile 2009-05-14 09:48:45 UTC (rev 4844) @@ -13,8 +13,7 @@ MASTER_SITES = http://www.irssi.org/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWirssi) -#DISTFILES += $(call admfiles,CSWirssi, postinstall depend) +#DISTFILES += $(call admfiles,CSWirssi) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -30,13 +29,20 @@ CONFIGURE_ARGS += --with-perl=module CONFIGURE_ARGS += --with-perl-lib=vendor -REQUIRED_PKGS = CSWglib2 CSWiconv CSWosslrt CSWperl CSWsunmath CSWggettextrt +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod -GARCOMPILER = GCC4 +REQUIRED_PKGS = CSWglib2 +REQUIRED_PKGS += CSWiconv +REQUIRED_PKGS += CSWosslrt +REQUIRED_PKGS += CSWperl +REQUIRED_PKGS += CSWsunmath +REQUIRED_PKGS += CSWggettextrt +REQUIRED_PKGS += CSWcswclassutils + TEST_TARGET = check # moving configuration file -post-install: +post-install-modulated: (cd $(DESTDIR)$(prefix)/etc; \ for i in irssi.conf; do \ if [ -r "$$i" ]; then \ @@ -45,6 +51,5 @@ fi \ done) - include gar/category.mk PATH := /opt/csw/gnu:$(PATH) Deleted: csw/mgar/pkg/irssi/trunk/files/CSWirssi.gspec =================================================================== --- csw/mgar/pkg/irssi/trunk/files/CSWirssi.gspec 2009-05-14 08:12:02 UTC (rev 4843) +++ csw/mgar/pkg/irssi/trunk/files/CSWirssi.gspec 2009-05-14 09:48:45 UTC (rev 4844) @@ -1,4 +0,0 @@ -%var bitname irssi -%var pkgname CSWirssi -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC\xAD_FIRSTMOD}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 14 18:57:30 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 14 May 2009 16:57:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[4845] csw/mgar/pkg/php4/trunk Message-ID: Revision: 4845 http://gar.svn.sourceforge.net/gar/?rev=4845&view=rev Author: valholla Date: 2009-05-14 16:57:30 +0000 (Thu, 14 May 2009) Log Message: ----------- define dependencies for packages Modified Paths: -------------- csw/mgar/pkg/php4/trunk/Makefile csw/mgar/pkg/php4/trunk/files/pkgdef.mk Added Paths: ----------- csw/mgar/pkg/php4/trunk/files/README-mod_php4_core csw/mgar/pkg/php4/trunk/files/depend.mk csw/mgar/pkg/php4/trunk/files/pkgfiles.mk Modified: csw/mgar/pkg/php4/trunk/Makefile =================================================================== --- csw/mgar/pkg/php4/trunk/Makefile 2009-05-14 09:48:45 UTC (rev 4844) +++ csw/mgar/pkg/php4/trunk/Makefile 2009-05-14 16:57:30 UTC (rev 4845) @@ -29,11 +29,6 @@ STRIP_DIRS += $(PHP4ROOT)/lib/php/extensions/*/ STRIP_DIRS += $(PHP4ROOT)/bin -PACKAGES = CSWphp4 -CATALOGNAME_CSWphp4 = php4 -SPKG_DESC_CSWphp4 = A High-Level Scripting Languages -REQUIRED_PKGS_CSWphp4 = - PATCHFILES = pgsql.diff EXTRA_LIB += $(prefix)/bdb44/lib @@ -127,7 +122,9 @@ @ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra @ginstall -d $(DESTDIR)$(prefix)/apache/conf @ginstall -d $(DESTDIR)$(prefix)/php4/lib + @ginstall -m 0644 $(WORKDIR)/README-mod_php4_core $(DESTDIR)$(prefix)/php4 @ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(prefix)/php4/lib + @ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(prefix)/php4/lib @ginstall -m 0644 $(WORKDIR)/httpd-php4.conf.CSW \ $(DESTDIR)$(prefix)/apache2/etc/extra @gcp $(DOWNLOADDIR)/dummy-httpd.conf $(DESTDIR)$(prefix)/apache2/etc/httpd.conf @@ -144,4 +141,5 @@ include files/pkgdef.mk +include files/pkgfiles.mk include gar/category.mk Added: csw/mgar/pkg/php4/trunk/files/README-mod_php4_core =================================================================== --- csw/mgar/pkg/php4/trunk/files/README-mod_php4_core (rev 0) +++ csw/mgar/pkg/php4/trunk/files/README-mod_php4_core 2009-05-14 16:57:30 UTC (rev 4845) @@ -0,0 +1,13 @@ +***************************************************************************** +* DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED +* DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED +* DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED +* DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED +***************************************************************************** + +This package has been Depricated and no longer contains any files. + +If you are running Apache 1.3.x please pkg-get -i mod_php4 +If you are running Apache 2.2.x please pkg-get -i ap2_modphp4 + +Thank You! Added: csw/mgar/pkg/php4/trunk/files/depend.mk =================================================================== --- csw/mgar/pkg/php4/trunk/files/depend.mk (rev 0) +++ csw/mgar/pkg/php4/trunk/files/depend.mk 2009-05-14 16:57:30 UTC (rev 4845) @@ -0,0 +1,29 @@ +# +# Define Package Dependencies +# + +REQUIRED_PKGS_CSWphp4bcmath = CSWphp4cgi +REQUIRED_PKGS_CSWphp4bz2 = CSWphp4cgi CSWbzip2 +REQUIRED_PKGS_CSWphp4calendar = CSWphp4cgi +REQUIRED_PKGS_CSWphp4cgi = CSWbdb44 CSWexpat +REQUIRED_PKGS_CSWphp4curl = CSWphp4cgi CSWcurlrt CSWlibidn CSWoldaprt CSWosslrt CSWzlib +REQUIRED_PKGS_CSWphp4dba = CSWphp4cgi CSWbdb44 CSWgdbm +REQUIRED_PKGS_CSWphp4domxml = CSWphp4cgi CSWiconv CSWlibxml2 CSWlibxslt CSWzlib +REQUIRED_PKGS_CSWphp4gd = CSWphp4cgi CSWgd CSWjpeg CSWpng CSWzlib +REQUIRED_PKGS_CSWphp4gettext = CSWphp4cgi CSWggettextrt +REQUIRED_PKGS_CSWphp4gmp = CSWphp4cgi CSWlibgmp +REQUIRED_PKGS_CSWphp4iconv = CSWphp4cgi +REQUIRED_PKGS_CSWphp4imap = CSWphp4cgi CSWimaprt CSWkrb5lib CSWosslrt +REQUIRED_PKGS_CSWphp4ldap = CSWphp4cgi CSWoldaprt +REQUIRED_PKGS_CSWphp4mbstring = CSWphp4cgi +REQUIRED_PKGS_CSWphp4mcal = CSWphp4cgi +REQUIRED_PKGS_CSWphp4mssql = CSWphp4cgi CSWfreetds +REQUIRED_PKGS_CSWphp4mysql = CSWphp4cgi CSWmysql5rt +REQUIRED_PKGS_CSWphp4ncurses = CSWphp4cgi CSWncurses +REQUIRED_PKGS_CSWphp4odbc = CSWphp4cgi CSWunixodbc +REQUIRED_PKGS_CSWphp4openssl = CSWphp4cgi CSWkrb5lib CSWosslrt +REQUIRED_PKGS_CSWphp4pgsql = CSWphp4cgi CSWlibpq +REQUIRED_PKGS_CSWphp4zlib = CSWphp4cgi CSWzlib +REQUIRED_PKGS_CSWap2modphp4 = CSWphp4cgi CSWbdb44 CSWexpat CSWap2prefork +REQUIRED_PKGS_CSWmodphp4 = CSWphp4cgi CSWbdb44 CSWexpat CSWapache +REQUIRED_PKGS_CSWmodphp4core = CSWphp4cgi Modified: csw/mgar/pkg/php4/trunk/files/pkgdef.mk =================================================================== --- csw/mgar/pkg/php4/trunk/files/pkgdef.mk 2009-05-14 09:48:45 UTC (rev 4844) +++ csw/mgar/pkg/php4/trunk/files/pkgdef.mk 2009-05-14 16:57:30 UTC (rev 4845) @@ -1,2 +1,60 @@ # Package Definition File +PACKAGES = CSWphp4bcmath CSWphp4bz2 CSWphp4calendar CSWphp4cgi CSWphp4curl +PACKAGES += CSWphp4dba CSWphp4domxml CSWphp4gd CSWphp4gettext CSWphp4gmp +PACKAGES += CSWphp4iconv CSWphp4imap CSWphp4ldap CSWphp4mbstring +PACKAGES += CSWphp4mcal CSWphp4mssql CSWphp4mysql CSWphp4ncurses CSWphp4odbc +PACKAGES += CSWphp4openssl CSWphp4pgsql CSWphp4zlib CSWap2modphp4 +PACKAGES += CSWmodphp4 CSWphp + +CATALOGNAME_CSWphp4bcmath = php4_bcmath +SPKG_DESC_CSWphp4bcmath = bcmath extension for php4 +CATALOGNAME_CSWphp4bz2 = php4_bz2 +SPKG_DESC_CSWphp4bz2 = bzip2 extension for php4 +CATALOGNAME_CSWphp4calendar = php4_calendar +SPKG_DESC_CSWphp4calendar = calendar extension for php4 +CATALOGNAME_CSWphp4cgi = php4_cgi +SPKG_DESC_CSWphp4cgi = command line interpreter for the PHP language +CATALOGNAME_CSWphp4curl = php4_curl +SPKG_DESC_CSWphp4curl = curl extension for php4 +CATALOGNAME_CSWphp4dba = php4_dba +SPKG_DESC_CSWphp4dba = dba extension for php4 +CATALOGNAME_CSWphp4domxml = php4_domxml +SPKG_DESC_CSWphp4domxml = domxml extension for php4 +CATALOGNAME_CSWphp4gd = php4_gd +SPKG_DESC_CSWphp4gd = gd extension for php4 +CATALOGNAME_CSWphp4gettext = php4_gettext +SPKG_DESC_CSWphp4gettext = gettext extension for php4 +CATALOGNAME_CSWphp4gmp = php4_gmp +SPKG_DESC_CSWphp4gmp = gmp extension for php4 +CATALOGNAME_CSWphp4iconv = php4_iconv +SPKG_DESC_CSWphp4iconv = iconv extension for php4 +CATALOGNAME_CSWphp4imap = php4_imap +SPKG_DESC_CSWphp4imap = imap extension for php4 +CATALOGNAME_CSWphp4ldap = php4_ldap +SPKG_DESC_CSWphp4ldap = ldap extension for php4 +CATALOGNAME_CSWphp4mbstring = php4_mbstring +SPKG_DESC_CSWphp4mbstring = mbstring extension for php4 +CATALOGNAME_CSWphp4mcal = php4_mcal +SPKG_DESC_CSWphp4mcal = modular calendar extension for php4 +CATALOGNAME_CSWphp4mssql = php4_mssql +SPKG_DESC_CSWphp4mssql = mssql extension for php4 +CATALOGNAME_CSWphp4mysql = php4_mysql +SPKG_DESC_CSWphp4mysql = mysql extension for php4 +CATALOGNAME_CSWphp4ncurses = php4_ncurses +SPKG_DESC_CSWphp4ncurses = ncurses extension for php4 +CATALOGNAME_CSWphp4odbc = php4_odbc +SPKG_DESC_CSWphp4odbc = odbc extension for php4 +CATALOGNAME_CSWphp4openssl = php4_openssl +SPKG_DESC_CSWphp4openssl = openssl extension for php4 +CATALOGNAME_CSWphp4pgsql = php4_pgsql +SPKG_DESC_CSWphp4pgsql = postgresql extension for php4 +CATALOGNAME_CSWphp4zlib = php4_zlib +SPKG_DESC_CSWphp4zlib = zlib extension for php4 +CATALOGNAME_CSWap2modphp4 = ap2_modphp4 +SPKG_DESC_CSWap2modphp4 = PHP 4 - Apache 2.2.x Module +CATALOGNAME_CSWmodphp4 = mod_php4 +SPKG_DESC_CSWmodphp4 = PHP 4 - Apache 1.3.x Module +CATALOGNAME_CSWmodphp4core = mod_php4_core +SPKG_DESC_CSWmodphp4core = Deprecated use mod_php4 or ap2_modphp4 + Added: csw/mgar/pkg/php4/trunk/files/pkgfiles.mk =================================================================== --- csw/mgar/pkg/php4/trunk/files/pkgfiles.mk (rev 0) +++ csw/mgar/pkg/php4/trunk/files/pkgfiles.mk 2009-05-14 16:57:30 UTC (rev 4845) @@ -0,0 +1,32 @@ +# +# define the files in each Package +# + +PKGFILES_CSWphp4bcmath = .*/extensions/.*/bcmath.* +PKGFILES_CSWphp4bz2 = .*/extensions/.*/bz2.* +PKGFILES_CSWphp4calendar = .*/extensions/.*/calendar.* +PKGFILES_CSWphp4curl = .*/extensions/.*/curl.* +PKGFILES_CSWphp4dba = .*/extensions/.*/dba.* +PKGFILES_CSWphp4domxml = .*/extensions/.*/domxml.* +PKGFILES_CSWphp4gd = .*/extensions/.*/gd.* +PKGFILES_CSWphp4gettext = .*/extensions/.*/gettext.* +PKGFILES_CSWphp4gmp = .*/extensions/.*/gmp.* +PKGFILES_CSWphp4iconv = .*/extensions/.*/iconv.* +PKGFILES_CSWphp4iconv += .*/include/php/ext/iconv.* +PKGFILES_CSWphp4imap = .*/extensions/.*/imap.* +PKGFILES_CSWphp4ldap = .*/extensions/.*/ldap.* +PKGFILES_CSWphp4mbstring = .*/extensions/.*/mbstring.* +PKGFILES_CSWphp4mbstring += .*/include/php/ext/mbstring.* +PKGFILES_CSWphp4mcal = .*/extensions/.*/mcal.* +PKGFILES_CSWphp4mssql = .*/extensions/.*/mssql.* +PKGFILES_CSWphp4mysql = .*/extensions/.*/mysql.* +PKGFILES_CSWphp4ncurses = .*/extensions/.*/ncurses.* +PKGFILES_CSWphp4odbc = .*/extensions/.*/odbc.* +PKGFILES_CSWphp4openssl = .*/extensions/.*/openssl.* +PKGFILES_CSWphp4pgsql = .*/extensions/.*/pgsql.* +PKGFILES_CSWphp4pgsql += .*/include/php/ext/pgsql.* +PKGFILES_CSWphp4zlib = .*/extensions/.*/zlib.* +PKGFILES_CSWap2modphp4 = .*/apache2/.* +PKGFILES_CSWmodphp4 = .*/apache/.* +PKGFILES_CSWmodphp4core = /opt/csw/php4/README-mod_php4_core +#PKGFILES_CSWphp4cgi catchall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 14 19:11:32 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 14 May 2009 17:11:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[4846] csw/mgar/pkg/php4/trunk/files/php.ini.CSW Message-ID: Revision: 4846 http://gar.svn.sourceforge.net/gar/?rev=4846&view=rev Author: valholla Date: 2009-05-14 17:11:32 +0000 (Thu, 14 May 2009) Log Message: ----------- CSWize php.ini-recommended Modified Paths: -------------- csw/mgar/pkg/php4/trunk/files/php.ini.CSW Modified: csw/mgar/pkg/php4/trunk/files/php.ini.CSW =================================================================== --- csw/mgar/pkg/php4/trunk/files/php.ini.CSW 2009-05-14 16:57:30 UTC (rev 4845) +++ csw/mgar/pkg/php4/trunk/files/php.ini.CSW 2009-05-14 17:11:32 UTC (rev 4846) @@ -1,63 +1,76 @@ [PHP] -;;;;;;;;;;; -; WARNING ; -;;;;;;;;;;; -; This is the default settings file for new PHP installations. -; By default, PHP installs itself with a configuration suitable for -; development purposes, and *NOT* for production purposes. -; For several security-oriented considerations that should be taken -; before going online with your site, please consult php.ini-recommended -; and http://php.net/manual/en/security.php. - - ;;;;;;;;;;;;;;;;;;; ; About this file ; ;;;;;;;;;;;;;;;;;;; -; This file controls many aspects of PHP's behavior. In order for PHP to -; read it, it must be named 'php.ini'. PHP looks for it in the current -; working directory, in the path designated by the environment variable -; PHPRC, and in the path that was defined in compile time (in that order). -; Under Windows, the compile-time path is the Windows directory. The -; path in which the php.ini file is looked for can be overridden using -; the -c argument in command line mode. ; -; The syntax of the file is extremely simple. Whitespace and Lines -; beginning with a semicolon are silently ignored (as you probably guessed). -; Section headers (e.g. [Foo]) are also silently ignored, even though -; they might mean something in the future. +; This is the recommended, PHP 4-style version of the php.ini-dist file. It +; sets some non standard settings, that make PHP more efficient, more secure, +; and encourage cleaner coding. +; The price is that with these settings, PHP may be incompatible with some +; applications, and sometimes, more difficult to develop with. Using this +; file is warmly recommended for production sites. As all of the changes from +; the standard settings are thoroughly documented, you can go over each one, +; and decide whether you want to use it or not. ; -; Directives are specified using the following syntax: -; directive = value -; Directive names are *case sensitive* - foo=bar is different from FOO=bar. +; For general information about the php.ini file, please consult the php.ini-dist +; file, included in your PHP distribution. ; -; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one -; of the INI constants (On, Off, True, False, Yes, No and None) or an expression -; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo"). +; This file is different from the php.ini-dist file in the fact that it features +; different values for several directives, in order to improve performance, while +; possibly breaking compatibility with the standard out-of-the-box behavior of +; PHP 3. Please make sure you read what's different, and modify your scripts +; accordingly, if you decide to use this file instead. ; -; Expressions in the INI file are limited to bitwise operators and parentheses: -; | bitwise OR -; & bitwise AND -; ~ bitwise NOT -; ! boolean NOT -; -; Boolean flags can be turned on using the values 1, On, True or Yes. -; They can be turned off using the values 0, Off, False or No. -; -; An empty string can be denoted by simply not writing anything after the equal -; sign, or by using the None keyword: -; -; foo = ; sets foo to an empty string -; foo = none ; sets foo to an empty string -; foo = "none" ; sets foo to the string 'none' -; -; If you use constants in your value, and these constants belong to a -; dynamically loaded extension (either a PHP extension or a Zend extension), -; you may only use these constants *after* the line that loads the extension. -; -; All the values in the php.ini-dist file correspond to the builtin -; defaults (that is, if no php.ini is used, or if you delete these lines, -; the builtin defaults will be identical). +; - register_globals = Off [Security, Performance] +; Global variables are no longer registered for input data (POST, GET, cookies, +; environment and other server variables). Instead of using $foo, you must use +; you can use $_REQUEST["foo"] (includes any variable that arrives through the +; request, namely, POST, GET and cookie variables), or use one of the specific +; $_GET["foo"], $_POST["foo"], $_COOKIE["foo"] or $_FILES["foo"], depending +; on where the input originates. Also, you can look at the +; import_request_variables() function. +; Note that register_globals is going to be depracated (i.e., turned off by +; default) in the next version of PHP, because it often leads to security bugs. +; Read http://php.net/manual/en/security.registerglobals.php for further +; information. +; - display_errors = Off [Security] +; With this directive set to off, errors that occur during the execution of +; scripts will no longer be displayed as a part of the script output, and thus, +; will no longer be exposed to remote users. With some errors, the error message +; content may expose information about your script, web server, or database +; server that may be exploitable for hacking. Production sites should have this +; directive set to off. +; - log_errors = On [Security] +; This directive complements the above one. Any errors that occur during the +; execution of your script will be logged (typically, to your server's error log, +; but can be configured in several ways). Along with setting display_errors to off, +; this setup gives you the ability to fully understand what may have gone wrong, +; without exposing any sensitive information to remote users. +; - output_buffering = 4096 [Performance] +; Set a 4KB output buffer. Enabling output buffering typically results in less +; writes, and sometimes less packets sent on the wire, which can often lead to +; better performance. The gain this directive actually yields greatly depends +; on which Web server you're working with, and what kind of scripts you're using. +; - register_argc_argv = Off [Performance] +; Disables registration of the somewhat redundant $argv and $argc global +; variables. +; - magic_quotes_gpc = Off [Performance] +; Input data is no longer escaped with slashes so that it can be sent into +; SQL databases without further manipulation. Instead, you should use the +; function addslashes() on each input element you wish to send to a database. +; - variables_order = "GPCS" [Performance] +; The environment variables are not hashed into the $HTTP_ENV_VARS[]. To access +; environment variables, you can use getenv() instead. +; - error_reporting = E_ALL [Code Cleanliness, Security(?)] +; By default, PHP surpresses errors of type E_NOTICE. These error messages +; are emitted for non-critical errors, but that could be a symptom of a bigger +; problem. Most notably, this will cause error messages about the use +; of uninitialized variables to be displayed. +; - allow_call_time_pass_reference = Off [Code cleanliness] +; It's not possible to decide to force a variable to be passed by reference +; when calling a function. The PHP 4 style to do this is by making the +; function require the relevant argument by reference. ;;;;;;;;;;;;;;;;;;;; @@ -79,7 +92,7 @@ asp_tags = Off ; The number of significant digits displayed in floating point numbers. -precision = 12 +precision = 14 ; Enforce year 2000 compliance (will cause problems with non-compliant browsers) y2k_compliance = On @@ -91,7 +104,7 @@ ; setting this directive to On. If you wish to limit the size of the buffer ; to a certain size - you can use a maximum number of bytes instead of 'On', as ; a value for this directive (e.g., output_buffering=4096). -output_buffering = Off +output_buffering = 4096 ; You can redirect all of the output of your scripts to a function. For ; example, if you set output_handler to "mb_output_handler", character @@ -109,11 +122,11 @@ ; Valid values for this option are 'off', 'on', or a specific buffer size ; to be used for compression (default is 4KB) ; Note: Resulting chunk size may vary due to nature of compression. PHP -; outputs chunks that are few hundreds bytes each as a result of -; compression. If you prefer a larger chunk size for better -; performance, enable output_buffering in addition. -; Note: You need to use zlib.output_handler instead of the standard -; output_handler, or otherwise the output will be corrupted. +; outputs chunks that are few handreds bytes each as a result of compression. +; If you want larger chunk size for better performence, enable output_buffering +; also. +; Note: output_handler must be empty if this is set 'On' !!!! +; Instead you must use zlib.output_handler. zlib.output_compression = Off ; You cannot specify additional output handlers if zlib.output_compression @@ -151,8 +164,9 @@ ; with future versions of the language (you will receive a warning each time ; you use this feature, and the argument will be passed by value instead of by ; reference). -allow_call_time_pass_reference = On +allow_call_time_pass_reference = Off +; ; Safe Mode ; safe_mode = Off @@ -232,6 +246,7 @@ ;max_input_nesting_level = 500 ; Maximum input variable nesting level memory_limit = 8M ; Maximum amount of memory a script may consume (8MB) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Error handling and logging ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -266,16 +281,16 @@ ; ;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR ; -; - Show all errors except for notices +; - Show all errors ; -error_reporting = E_ALL & ~E_NOTICE +error_reporting = E_ALL ; Print out errors (as a part of the output). For production web sites, ; you're strongly encouraged to turn this feature off, and use error logging ; instead (see below). Keeping display_errors enabled on a production web site ; may reveal security information to end users, such as file paths on your Web ; server, your database schema or other information. -display_errors = On +display_errors = Off ; Even when display_errors is on, errors that occur during PHP's startup ; sequence are not displayed. It's strongly recommended to keep @@ -285,7 +300,7 @@ ; Log errors into a log file (server-specific log, stderr, or error_log (below)) ; As stated above, you're strongly advised to use error logging in place of ; error displaying on production web sites. -log_errors = Off +log_errors = On ; Set maximum length of log_errors. In error_log information about the source is ; added. The default is 1024 and 0 allows to not apply any maximum length at all. @@ -310,7 +325,7 @@ ; Disable the inclusion of HTML tags in error messages. ;html_errors = Off - + ; If html_errors is set On PHP produces clickable error messages that direct ; to a page describing the error or function causing the error in detail. ; You can download a copy of the PHP manual from http://www.php.net/docs.php @@ -352,7 +367,7 @@ ; Environment and Built-in variables (G, P, C, E & S respectively, often ; referred to as EGPCS or GPC). Registration is done from left to right, newer ; values override older values. -variables_order = "EGPCS" +variables_order = "GPCS" ; Whether or not to register the EGPCS variables as global variables. You may ; want to turn this off if you don't want to clutter your scripts' global scope @@ -368,7 +383,7 @@ ; This directive tells PHP whether to declare the argv&argc variables (that ; would contain the GET information). If you don't use these variables, you ; should turn it off for increased performance. -register_argc_argv = On +register_argc_argv = Off ; Maximum size of POST data that PHP will accept. post_max_size = 8M @@ -380,7 +395,7 @@ ; ; Magic quotes for incoming GET/POST/Cookie data. -magic_quotes_gpc = On +magic_quotes_gpc = Off ; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. magic_quotes_runtime = Off @@ -400,7 +415,7 @@ default_mimetype = "text/html" ;default_charset = "iso-8859-1" -; Always populate the $HTTP_RAW_POST_DATA variable. +; Always populate the $HTTP_RAW_POST_DATA variable. ;always_populate_raw_post_data = On @@ -421,12 +436,12 @@ ; cgi.force_redirect configuration below doc_root = -; The directory under which PHP opens the script using /~username used only +; The directory under which PHP opens the script using /~usernamem used only ; if nonempty. user_dir = ; Directory in which the loadable extensions (modules) reside. -extension_dir = PHPEXTDIR +extension_dir = "PHPEXTDIR" ; 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 @@ -455,7 +470,7 @@ ; this to 1 will cause PHP CGI to fix it's paths to conform to the spec. A setting ; of zero causes PHP to behave as before. Default is zero. You should fix your scripts ; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. -; cgi.fix_pathinfo=0 +; cgi.fix_pathinfo=1 ; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate ; security tokens of the calling client. This allows IIS to define the @@ -473,8 +488,8 @@ ; RFC2616 compliant header. ; Default is zero. ;cgi.rfc2616_headers = 0 - + ;;;;;;;;;;;;;;;; ; File Uploads ; ;;;;;;;;;;;;;;;; @@ -500,8 +515,8 @@ ; Define the anonymous ftp password (your email address) ;from="john at doe.com" -; Define the User-Agent string -; user_agent="PHP" +; Define the user agent for php to send +;user_agent="PHP" ; Default timeout for socket based streams (seconds) default_socket_timeout = 60 @@ -535,56 +550,29 @@ ; needs to go here. Specify the location of the extension with the ; extension_dir directive above. +; CSW Extensions +;extension=bcmath.so +;extension=bz2.so +;extension=calendar.so +;extension=curl.so +;extension=dba.so +;extension=domxml.so +;extension=gd.so +;extension=gettext.so +;extension=gmp.so +;extension=iconv.so +;extension=imap.so +;extension=ldap.so +;extension=mbstring.so +;extension=mcal.so +;extension=mssql.so +;extension=mysql.so +;extension=ncurses.so +;extension=odbc.so +;extension=openssl.so +;extension=pgsql.so +;extension=zlib.so -;Windows Extensions -;Note that MySQL and ODBC support is now built in, so no dll is needed for it. -; -;extension=php_mbstring.dll -;extension=php_bz2.dll -;extension=php_cpdf.dll -;extension=php_crack.dll -;extension=php_curl.dll -;extension=php_db.dll -;extension=php_dba.dll -;extension=php_dbase.dll -;extension=php_dbx.dll -;extension=php_domxml.dll -;extension=php_exif.dll -;extension=php_fdf.dll -;extension=php_filepro.dll -;extension=php_gd2.dll -;extension=php_gettext.dll -;extension=php_hyperwave.dll -;extension=php_iconv.dll -;extension=php_ifx.dll -;extension=php_iisfunc.dll -;extension=php_imap.dll -;extension=php_interbase.dll -;extension=php_java.dll -;extension=php_ldap.dll -;extension=php_mcrypt.dll -;extension=php_mhash.dll -;extension=php_mime_magic.dll -;extension=php_ming.dll -;extension=php_mssql.dll -;extension=php_msql.dll -;extension=php_oci8.dll -;extension=php_openssl.dll -;extension=php_oracle.dll -;extension=php_pdf.dll -;extension=php_pgsql.dll -;extension=php_printer.dll -;extension=php_shmop.dll -;extension=php_snmp.dll -;extension=php_sockets.dll -;extension=php_sybase_ct.dll -;extension=php_w32api.dll -;extension=php_xmlrpc.dll -;extension=php_xslt.dll -;extension=php_yaz.dll -;extension=php_zip.dll - - ;;;;;;;;;;;;;;;;;;; ; Module Settings ; ;;;;;;;;;;;;;;;;;;; @@ -695,8 +683,9 @@ ; Allow or prevent persistent links. pgsql.allow_persistent = On -; Detect broken persistent links always with pg_pconnect(). Need a little overhead. -pgsql.auto_reset_persistent = Off +; Detect broken persistent links always with pg_pconnect(). +; Auto reset feature requires a little overheads. +pgsql.auto_reset_persistent = Off ; Maximum number of persistent links. -1 means no limit. pgsql.max_persistent = -1 @@ -705,6 +694,7 @@ pgsql.max_links = -1 ; Ignore PostgreSQL backends Notice message or not. +; Notice message logging require a little overheads. pgsql.ignore_notice = 0 ; Log PostgreSQL backends Noitce message or not. @@ -760,7 +750,7 @@ ; "uppercase" ; the recommended default is either upper- or lowercase, but ; unchanged is currently set for backwards compatibility -dbx.colnames_case = "unchanged" +dbx.colnames_case = "lowercase" [bcmath] ; Number of decimal digits for all bcmath functions. @@ -813,23 +803,12 @@ ; Argument passed to save_handler. In the case of files, this is the path ; where data files are stored. Note: Windows users have to change this ; variable in order to use PHP's session functions. -; As of PHP 4.0.1, you can define the path as: -; session.save_path = "N;/path" -; where N is an integer. Instead of storing all the session files in -; /path, what this will do is use subdirectories N-levels deep, and -; store the session data in those directories. This is useful if you -; or your OS have problems with lots of files in one directory, and is -; a more efficient layout for servers that handle lots of sessions. -; NOTE 1: PHP will not create this directory structure automatically. -; You can use the script in the ext/session dir for that purpose. -; NOTE 2: See the section on garbage collection below if you choose to -; use subdirectories for session storage ;session.save_path = /tmp ; Whether to use cookies. session.use_cookies = 1 -; This option enables administrators to make their users invulnerable to +; This option enables administrators to make their users invulnerable to ; attacks which involve passing session ids in URLs; defaults to 0. ; session.use_only_cookies = 1 @@ -858,27 +837,19 @@ ; on each request. session.gc_probability = 1 -session.gc_divisor = 100 +session.gc_divisor = 1000 ; After this number of seconds, stored data will be seen as 'garbage' and ; cleaned up by the garbage collection process. session.gc_maxlifetime = 1440 -; NOTE: If you are using the subdirectory option for storing session files -; (see session.save_path above), then garbage collection does *not* -; happen automatically. You will need to do your own garbage -; collection through a shell script, cron entry, or some other method. -; For example, the following script would is the equivalent of -; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): -; cd /path/to/sessions; find -cmin +24 | xargs rm - ; PHP 4.2 and less have an undocumented feature/bug that allows you to ; to initialize a session variable in the global scope, albeit register_globals ; is disabled. PHP 4.3 and later will warn you, if this feature is used. ; You can disable the feature and the warning separately. At this time, ; the warning is only displayed, if bug_compat_42 is enabled. -session.bug_compat_42 = 1 +session.bug_compat_42 = 0 session.bug_compat_warn = 1 ; Check HTTP Referer to invalidate externally stored URLs containing ids. @@ -896,7 +867,7 @@ ;session.entropy_file = /dev/urandom -; Set to {nocache,private,public,} to determine HTTP caching aspects +; Set to {nocache,private,public,} to determine HTTP caching aspects. ; or leave this empty to avoid sending anti-caching headers. session.cache_limiter = nocache @@ -904,12 +875,12 @@ session.cache_expire = 180 ; trans sid support is disabled by default. -; Use of trans sid may risk your users security. +; Use of trans sid may risk your users security. ; Use this option with caution. ; - User may send URL contains active session ID ; to other person via. email/irc/etc. ; - URL that contains active session ID may be stored -; in publically accessible computer. +; in publically accessible computer. ; - User may access your site with the same session ID ; always using URL stored in browser's history or bookmarks. session.use_trans_sid = 0 @@ -919,7 +890,7 @@ ; add a hidden field with the info which is otherwise appended ; to URLs. If you want XHTML conformity, remove the form entry. ; Note that all valid entries require a "=", even if no value follows. -url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=,fieldset=" +url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" [MSSQL] ; Allow or prevent persistent links. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 14 20:26:56 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 14 May 2009 18:26:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[4847] csw/mgar/pkg/php4/trunk/files Message-ID: Revision: 4847 http://gar.svn.sourceforge.net/gar/?rev=4847&view=rev Author: valholla Date: 2009-05-14 18:26:56 +0000 (Thu, 14 May 2009) Log Message: ----------- admin scripts Modified Paths: -------------- csw/mgar/pkg/php4/trunk/files/CSWphp4.postinstall Added Paths: ----------- csw/mgar/pkg/php4/trunk/files/CSWap2modphp4.postinstall csw/mgar/pkg/php4/trunk/files/CSWap2modphp4.preremove csw/mgar/pkg/php4/trunk/files/CSWap2modphp4.space csw/mgar/pkg/php4/trunk/files/CSWmodphp4.postinstall csw/mgar/pkg/php4/trunk/files/CSWmodphp4.preremove csw/mgar/pkg/php4/trunk/files/CSWmodphp4.space csw/mgar/pkg/php4/trunk/files/CSWphp4bcmath.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4bcmath.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4bz2.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4bz2.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4calendar.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4calendar.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4curl.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4curl.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4dba.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4dba.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4domxml.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4domxml.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4gd.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4gd.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4gettext.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4gettext.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4gmp.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4gmp.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4iconv.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4iconv.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4imap.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4imap.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4ldap.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4ldap.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4mbstring.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4mbstring.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4mcal.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4mcal.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4mssql.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4mssql.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4mysql.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4mysql.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4ncurses.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4ncurses.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4odbc.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4odbc.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4openssl.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4openssl.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4pgsql.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4pgsql.preremove csw/mgar/pkg/php4/trunk/files/CSWphp4zlib.postinstall csw/mgar/pkg/php4/trunk/files/CSWphp4zlib.preremove Added: csw/mgar/pkg/php4/trunk/files/CSWap2modphp4.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWap2modphp4.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWap2modphp4.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,50 @@ +#!/bin/sh + +CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +AP2_PREFIX=$CSW_PREFIX/apache2 +AP2_BINDIR=$AP2_PREFIX/sbin +AP2_LIBEXEC=$AP2_PREFIX/libexec +AP2_CONFDIR=$AP2_PREFIX/etc +AP2_EXTRADIR=$AP2_CONFDIR/extra +AP2_CONFIG=$AP2_CONFDIR/httpd.conf + +# Enable the PHP module +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} +chroot $PKG_INSTALL_ROOT \ + $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n php4 libphp4.so + +# Configure mod_php4 in httpd.conf +if [ -n "`egrep 'IfModule (mod_php|php_module)' $AP2_CONFIG`" ] +then + echo "Existing mod_php4 configuration detected" +elif [ -n "`egrep '#Include etc/extra/httpd-php4.conf' $AP2_CONFIG`" ]; then + echo "Re-enabling existing config" + perl -i -plne 's,^#(Include etc/extra/httpd-php4.conf),$1,' $AP2_CONFIG +else + echo "Adding Include for extra/http-php4.conf to httpd.conf" + cat << END >> $AP2_CONFIG + +Include etc/extra/httpd-php4.conf +END +fi + +# Copy templates +for file in $AP2_EXTRADIR/httpd-php4.conf +do + if [ ! -f $file ]; then + echo "Creating $file" + cp $file.CSW $file + else + echo "Preserving existing $file" + fi +done + +# Finito +cat <> $AP_CONFIG + +# For PHP support. added by $PKGINST + + + + AddType application/x-httpd-php .php + AddType application/x-httpd-php-source .phps + + + +# If you want "index.php" to be an acceptible directory index, adjust +# DirectoryIndex index.html +# to be +# DirectoryIndex index.html index.php + +CONFIG + +fi + +# Finito +cat < Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4bcmath.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4bcmath.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4bcmath.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=bcmath +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4bz2.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4bz2.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4bz2.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=bz2 +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4bz2.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4bz2.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4bz2.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=bz2 +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4calendar.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4calendar.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4calendar.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=calendar +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4calendar.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4calendar.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4calendar.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=calendar +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4curl.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4curl.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4curl.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=curl +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4curl.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4curl.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4curl.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=curl +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4dba.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4dba.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4dba.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=dba +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4dba.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4dba.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4dba.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=dba +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4domxml.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4domxml.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4domxml.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=domxml +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4domxml.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4domxml.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4domxml.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=domxml +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4gd.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4gd.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4gd.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=gd +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4gd.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4gd.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4gd.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=gd +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4gettext.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4gettext.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4gettext.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=gettext +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4gettext.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4gettext.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4gettext.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=gettext +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4gmp.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4gmp.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4gmp.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=gmp +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4gmp.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4gmp.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4gmp.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=gmp +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4iconv.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4iconv.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4iconv.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=iconv +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4iconv.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4iconv.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4iconv.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=iconv +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4imap.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4imap.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4imap.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=imap +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4imap.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4imap.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4imap.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=imap +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4ldap.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4ldap.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4ldap.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=ldap +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4ldap.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4ldap.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4ldap.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=ldap +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4mbstring.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4mbstring.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4mbstring.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=mbstring +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4mbstring.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4mbstring.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4mbstring.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=mbstring +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4mcal.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4mcal.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4mcal.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=mcal +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4mcal.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4mcal.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4mcal.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=mcal +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4mssql.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4mssql.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4mssql.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=mssql +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4mssql.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4mssql.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4mssql.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=mssql +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4mysql.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4mysql.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4mysql.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=mysql +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4mysql.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4mysql.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4mysql.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=mysql +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4ncurses.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4ncurses.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4ncurses.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=ncurses +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4ncurses.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4ncurses.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4ncurses.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=ncurses +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4odbc.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4odbc.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4odbc.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=odbc +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4odbc.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4odbc.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4odbc.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=odbc +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4openssl.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4openssl.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4openssl.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=openssl +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4openssl.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4openssl.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4openssl.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=openssl +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4pgsql.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4pgsql.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4pgsql.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=pgsql +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4pgsql.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4pgsql.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4pgsql.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=pgsql +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4zlib.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4zlib.postinstall (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4zlib.postinstall 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,35 @@ +#!/bin/sh +MODULE_NAME=zlib +PHP_INI=/opt/csw/php4/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ${MODULE_NAME} extension" +if grep 'CSW Extensions' ${PHP_INI} >/dev/null 2>&1; then +/bin/true +else +cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "${MODULE_NAME}" +* You will need to enable it by hand as follows: +* +* open ${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=${MODULE_NAME}.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep "extension=${MODULE_NAME}.so" ${PHP_INI} >/dev/null 2>&1; then +perl -i -plne "s|;extension=${MODULE_NAME}.so|extension=${MODULE_NAME}.so|" ${PHP_INI} +else +perl -i -pe "s|.*CSW Extensions|; CSW Extensions\nextension=${MODULE_NAME}.so|" ${PHP_INI} +fi +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ +exit 0 Added: csw/mgar/pkg/php4/trunk/files/CSWphp4zlib.preremove =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4zlib.preremove (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4zlib.preremove 2009-05-14 18:26:56 UTC (rev 4847) @@ -0,0 +1,16 @@ +#!/bin/sh +MODULE_NAME=zlib +#PHP_INI=/opt/csw/php4/lib/php.ini +PHP_INI=php.ini +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ${MODULE_NAME} extension" +perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "${MODULE_NAME}" +* in ${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Thu May 14 20:28:46 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Thu, 14 May 2009 18:28:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[4848] csw/mgar/pkg/pnp/trunk Message-ID: Revision: 4848 http://gar.svn.sourceforge.net/gar/?rev=4848&view=rev Author: j_arndt Date: 2009-05-14 18:28:45 +0000 (Thu, 14 May 2009) Log Message: ----------- pnp: configuration example added, paths corrected Modified Paths: -------------- csw/mgar/pkg/pnp/trunk/Makefile csw/mgar/pkg/pnp/trunk/checksums csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype Added Paths: ----------- csw/mgar/pkg/pnp/trunk/files/nagios_commands.cfg-sample.diff Modified: csw/mgar/pkg/pnp/trunk/Makefile =================================================================== --- csw/mgar/pkg/pnp/trunk/Makefile 2009-05-14 18:26:56 UTC (rev 4847) +++ csw/mgar/pkg/pnp/trunk/Makefile 2009-05-14 18:28:45 UTC (rev 4848) @@ -18,6 +18,7 @@ PATCHFILES += npcdmod.h.diff PATCHFILES += npcdmod.c.diff PATCHFILES += npcd.cfg-sample.in.diff +PATCHFILES += nagios_commands.cfg-sample.diff # We define upstream file regex so we can be notifed of new upstream software release #UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -58,7 +59,7 @@ include gar/category.mk DATAROOTDIR = $(datadir) -CONTRIBDIR = $(DATAROOTDIR)/contrib +CONTRIBDIR = /opt/csw/nagios/pnp/contrib SYSCONFDIR = $(sysconfdir) LIBEXECDIR = $(libexecdir) BINDIR = $(bindir) @@ -132,6 +133,7 @@ @ginstall -m 644 $(WORKSRC)/sample-config/pnp/check_commands/check_nwstat.cfg-sample $(DESTDIR)$(SYSCONFDIR)/check_commands/check_nwstat.cfg.CSW @ginstall -m 644 $(WORKSRC)/sample-config/pnp/pages/web_traffic.cfg-sample $(DESTDIR)$(SYSCONFDIR)/pages/web_traffic.cfg.CSW @ginstall -m 644 $(WORKSRC)/sample-config/pnp/npcd.cfg-sample $(DESTDIR)$(SYSCONFDIR)/npcd.cfg.CSW + @ginstall -m 644 $(WORKSRC)/sample-config/pnp/nagios_commands.cfg-sample $(DESTDIR)$(SYSCONFDIR)/nagios_commands.cfg-sample @$(MAKECOOKIE) install-contrib-custom: Modified: csw/mgar/pkg/pnp/trunk/checksums =================================================================== --- csw/mgar/pkg/pnp/trunk/checksums 2009-05-14 18:26:56 UTC (rev 4847) +++ csw/mgar/pkg/pnp/trunk/checksums 2009-05-14 18:28:45 UTC (rev 4848) @@ -1,9 +1,10 @@ 9dbbf08191a258f6798c9516b3821ff0 download/pnp-0.4.14.tar.gz 216b8ed50919642c3fae2a6520724dd3 download/CSWpnp.gspec -fc763dd71049d4c06f10b8898fa3c1bb download/CSWpnp.prototype +6e75bd501030cb04740160165f8b9ed8 download/CSWpnp.prototype fec420cb27af9cbd0daba28f04500f8c download/cswpnp 80c06e6426497ed3fa96c0e77aff613d download/makefile.diff db6af87968e9b29272d387033f09acba download/npcd.c.diff 65d971cd9983aef7f069c7976424eb99 download/npcdmod.h.diff 8380996936f96669d8abe25dd8faf392 download/npcdmod.c.diff 01c0965ea1bdd26e4f0fdbc51640dfce download/npcd.cfg-sample.in.diff +8458b6df4844588d578344d97a26dd5e download/nagios_commands.cfg-sample.diff Modified: csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype =================================================================== --- csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype 2009-05-14 18:26:56 UTC (rev 4847) +++ csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype 2009-05-14 18:28:45 UTC (rev 4848) @@ -17,6 +17,7 @@ d none /opt/csw/nagios/pnp/etc/pages 0755 nagios nagios f cswpreserveconf /opt/csw/nagios/pnp/etc/pages/web_traffic.cfg.CSW 0644 nagios nagios f none /opt/csw/nagios/pnp/etc/pnp4nagios_release 0644 nagios nagios +f none /opt/csw/nagios/pnp/etc/nagios_commands.cfg-sample 0644 nagios nagios f cswpreserveconf /opt/csw/nagios/pnp/etc/process_perfdata.cfg.CSW 0644 nagios nagios f cswpreserveconf /opt/csw/nagios/pnp/etc/rra.cfg.CSW 0644 nagios nagios d none /opt/csw/nagios/pnp/share 0755 nagios nagios @@ -28,12 +29,12 @@ d none /opt/csw/nagios/share/pnp 0755 nagios nagios s none /opt/csw/nagios/pnp/share/html=/opt/csw/nagios/share/pnp f none /opt/csw/nagios/share/pnp/ajax.php 0644 nagios nagios -d none /opt/csw/nagios/share/pnp/contrib 0755 nagios nagios -f none /opt/csw/nagios/share/pnp/contrib/makeserviceextinfo.pl 0644 nagios nagios -d none /opt/csw/nagios/share/pnp/contrib/ssi 0755 nagios nagios -f none /opt/csw/nagios/share/pnp/contrib/ssi/status-header.ssi 0644 nagios nagios -f none /opt/csw/nagios/share/pnp/contrib/verify_pnp_config 0644 nagios nagios -f none /opt/csw/nagios/share/pnp/contrib/verify_pnp_config.txt 0644 nagios nagios +d none /opt/csw/nagios/pnp/contrib 0755 nagios nagios +f none /opt/csw/nagios/pnp/contrib/makeserviceextinfo.pl 0644 nagios nagios +d none /opt/csw/nagios/pnp/contrib/ssi 0755 nagios nagios +f none /opt/csw/nagios/pnp/contrib/ssi/status-header.ssi 0644 nagios nagios +f none /opt/csw/nagios/pnp/contrib/verify_pnp_config 0644 nagios nagios +f none /opt/csw/nagios/pnp/contrib/verify_pnp_config.txt 0644 nagios nagios d none /opt/csw/nagios/share/pnp/images 0755 nagios nagios f none /opt/csw/nagios/share/pnp/images/ack.png 0644 nagios nagios f none /opt/csw/nagios/share/pnp/images/action.gif 0644 nagios nagios Added: csw/mgar/pkg/pnp/trunk/files/nagios_commands.cfg-sample.diff =================================================================== --- csw/mgar/pkg/pnp/trunk/files/nagios_commands.cfg-sample.diff (rev 0) +++ csw/mgar/pkg/pnp/trunk/files/nagios_commands.cfg-sample.diff 2009-05-14 18:28:45 UTC (rev 4848) @@ -0,0 +1,53 @@ +diff --speed-large-files --minimal -Nru pnp-0.4.14.orig/sample-config/pnp/nagios_commands.cfg-sample pnp-0.4.14/sample-config/pnp/nagios_commands.cfg-sample +--- pnp-0.4.14.orig/sample-config/pnp/nagios_commands.cfg-sample 1970-01-01 01:00:00.000000000 +0100 ++++ pnp-0.4.14/sample-config/pnp/nagios_commands.cfg-sample 2009-05-13 20:15:50.819746793 +0200 +@@ -0,0 +1,49 @@ ++# ++# You can append these commands to your commands.cfg and ++# uncomment the lines for the mode, which fits your environment. ++# ++# Please note, that you need to edit your nagios.cfg too, ++# see http://www.pnp4nagios.org/ for more information. ++# ++ ++# ++# default mode ++# ++ ++#define command { ++# command_name process-service-perfdata ++# command_line /opt/csw/bin/perl /opt/csw/libexec/nagios-plugins/process_perfdata.pl ++#} ++ ++#define command { ++# command_name process-host-perfdata ++# command_line /opt/csw/bin/perl /opt/csw/libexec/nagios-plugins/process_perfdata.pl -d HOSTPERFDATA ++#} ++ ++# ++# bulk mode ++# ++ ++#define command{ ++# command_name process-service-perfdata-file ++# command_line /opt/csw/libexec/nagios-plugins/process_perfdata.pl --bulk=/opt/csw/nagios/pnp/var/service-perfdata ++#} ++ ++#define command{ ++# command_name process-host-perfdata-file ++# command_line /opt/csw/libexec/nagios-plugins/process_perfdata.pl --bulk=/opt/csw/nagios/pnp/var/host-perfdata ++# } ++ ++# ++# bulk mode with npcd ++# ++ ++#define command{ ++# command_name process-service-perfdata-file ++# command_line /bin/mv /opt/csw/nagios/pnp/var/service-perfdata /opt/csw/nagios/pnp/var/spool/perfdata/service-perfdata.$TIMET$ ++# } ++ ++#define command{ ++# command_name process-host-perfdata-file ++# command_line /bin/mv /opt/csw/nagios/pnp/var/host-perfdata /opt/csw/nagios/pnp/var/spool/perfdata/host-perfdata.$TIMET$ ++# } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 14 20:32:25 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 14 May 2009 18:32:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4849] csw/mgar/pkg/php4/trunk/files/pkgfiles.mk Message-ID: Revision: 4849 http://gar.svn.sourceforge.net/gar/?rev=4849&view=rev Author: valholla Date: 2009-05-14 18:32:25 +0000 (Thu, 14 May 2009) Log Message: ----------- minor change Modified Paths: -------------- csw/mgar/pkg/php4/trunk/files/pkgfiles.mk Modified: csw/mgar/pkg/php4/trunk/files/pkgfiles.mk =================================================================== --- csw/mgar/pkg/php4/trunk/files/pkgfiles.mk 2009-05-14 18:28:45 UTC (rev 4848) +++ csw/mgar/pkg/php4/trunk/files/pkgfiles.mk 2009-05-14 18:32:25 UTC (rev 4849) @@ -29,4 +29,5 @@ PKGFILES_CSWap2modphp4 = .*/apache2/.* PKGFILES_CSWmodphp4 = .*/apache/.* PKGFILES_CSWmodphp4core = /opt/csw/php4/README-mod_php4_core +PKGFILES_CSWphp4 = /opt/csw/php4/README-mod_php #PKGFILES_CSWphp4cgi catchall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 14 20:41:08 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 14 May 2009 18:41:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[4850] csw/mgar/pkg/php4/trunk/Makefile Message-ID: Revision: 4850 http://gar.svn.sourceforge.net/gar/?rev=4850&view=rev Author: valholla Date: 2009-05-14 18:41:08 +0000 (Thu, 14 May 2009) Log Message: ----------- move garname to php4 Modified Paths: -------------- csw/mgar/pkg/php4/trunk/Makefile Modified: csw/mgar/pkg/php4/trunk/Makefile =================================================================== --- csw/mgar/pkg/php4/trunk/Makefile 2009-05-14 18:32:25 UTC (rev 4849) +++ csw/mgar/pkg/php4/trunk/Makefile 2009-05-14 18:41:08 UTC (rev 4850) @@ -1,6 +1,7 @@ -GARNAME = php +GARNAME = php4 GARVERSION = 4.4.9 CATEGORIES = lang +SF_PROJ = $(shell echo $(GARNAME) | sed -e 's/[0-9]//g') DESCRIPTION = A high-level scripting language. define BLURB @@ -18,7 +19,7 @@ MASTER_SITES = http://us.php.net/distributions/ SPKG_SOURCEURL = http://www.php.net/downloads.php -DISTFILES += $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += $(SF_PROJ)-$(GARVERSION).tar.bz2 DISTFILES += dummy-httpd.conf DISTFILES += httpd-php4.conf.CSW DISTFILES += php.ini.CSW @@ -123,6 +124,7 @@ @ginstall -d $(DESTDIR)$(prefix)/apache/conf @ginstall -d $(DESTDIR)$(prefix)/php4/lib @ginstall -m 0644 $(WORKDIR)/README-mod_php4_core $(DESTDIR)$(prefix)/php4 + @ginstall -m 0644 $(WORKDIR)/README-mod_php $(DESTDIR)$(prefix)/php4 @ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(prefix)/php4/lib @ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(prefix)/php4/lib @ginstall -m 0644 $(WORKDIR)/httpd-php4.conf.CSW \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 14 20:41:38 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 14 May 2009 18:41:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[4851] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4851 http://gar.svn.sourceforge.net/gar/?rev=4851&view=rev Author: valholla Date: 2009-05-14 18:41:38 +0000 (Thu, 14 May 2009) Log Message: ----------- cleanup old files and rename GARNAME to php5 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/php5/trunk/files/config.diff csw/mgar/pkg/php5/trunk/files/extensions.mk Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-05-14 18:41:08 UTC (rev 4850) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-05-14 18:41:38 UTC (rev 4851) @@ -1,6 +1,7 @@ -GARNAME = php +GARNAME = php5 GARVERSION = 5.2.9 CATEGORIES = lang +SF_PROJ = $(shell echo $(GARNAME) | sed -e 's/[0-9]//g') DESCRIPTION = A high-level scripting language. define BLURB @@ -22,7 +23,7 @@ MASTER_SITES = http://us.php.net/distributions/ SPKG_SOURCEURL = http://www.php.net/downloads.php -DISTFILES += $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += $(SF_PROJ)-$(GARVERSION).tar.bz2 INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) PHP5ROOT = $(DESTDIR)$(prefix)/php5 Deleted: csw/mgar/pkg/php5/trunk/files/config.diff =================================================================== --- csw/mgar/pkg/php5/trunk/files/config.diff 2009-05-14 18:41:08 UTC (rev 4850) +++ csw/mgar/pkg/php5/trunk/files/config.diff 2009-05-14 18:41:38 UTC (rev 4851) @@ -1,132 +0,0 @@ ---- php-5.2.6/configure.orig 2009-03-02 19:48:06.545907523 -0600 -+++ php-5.2.6/configure 2009-03-02 19:44:49.225016959 -0600 -@@ -4714,7 +4714,7 @@ - $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1 - - if test "$?" != "0"; then -- APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option -+ APACHE_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option - else - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` - if test -z `$APXS -q SYSCONFDIR`; then -@@ -4727,7 +4727,7 @@ - \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -S SYSCONFDIR='$APXS_SYSCONFDIR' \ -- -i -a -n php5 $SAPI_SHARED" -+ -i -n php5 $SAPI_SHARED" - fi - fi - -@@ -5875,7 +5875,7 @@ - \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -S SYSCONFDIR='$APXS_SYSCONFDIR' \ -- -i -a -n php5" -+ -i -n php5" - fi - - case $host_alias in -@@ -6723,7 +6723,7 @@ - \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -S SYSCONFDIR='$APXS_SYSCONFDIR' \ -- -i -a -n php5" -+ -i -n php5" - fi - - case $host_alias in -@@ -7740,7 +7740,7 @@ - $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1 - - if test "$?" != "0"; then -- APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option -+ APACHE_HOOKS_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option - else - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` - if test -z `$APXS -q SYSCONFDIR`; then -@@ -7753,7 +7753,7 @@ - \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -S SYSCONFDIR='$APXS_SYSCONFDIR' \ -- -i -a -n php5 $SAPI_SHARED" -+ -i -n php5 $SAPI_SHARED" - fi - fi - -@@ -19871,7 +19871,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - -- for i in $PHP_LIBXML_DIR /usr/local /usr; do -+ for i in $PHP_LIBXML_DIR /opt/csw /usr/local /usr; do - if test -x "$i/bin/xml2-config"; then - ac_cv_php_xml2_config_path="$i/bin/xml2-config" - break -@@ -45789,7 +45789,7 @@ - - if test "$found_iconv" = "no"; then - -- for i in $PHP_ICONV /usr/local /usr; do -+ for i in $PHP_ICONV /opt/csw /usr/local /usr; do - if test -r $i/include/giconv.h; then - cat >> confdefs.h <<\EOF - #define HAVE_GICONV_H 1 -@@ -46270,7 +46270,7 @@ - - if test "$iconv_avail" != "no"; then - if test -z "$ICONV_DIR"; then -- for i in /usr/local /usr; do -+ for i in /opt/csw /usr/local /usr; do - if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then - PHP_ICONV_PREFIX="$i" - break -@@ -68070,7 +68070,7 @@ - echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6 - echo "configure:68072: checking for unixODBC support" >&5 - if test "$PHP_UNIXODBC" = "yes"; then -- PHP_UNIXODBC=/usr/local -+ PHP_UNIXODBC=/opt/csw - fi - ODBC_INCDIR=$PHP_UNIXODBC/include - ODBC_LIBDIR=$PHP_UNIXODBC/$PHP_LIBDIR -@@ -76646,8 +76646,8 @@ - echo $ac_n "checking for pg_config""... $ac_c" 1>&6 - echo "configure:76648: checking for pg_config" >&5 - for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do -- if test -x $i/pg_config; then -- PG_CONFIG="$i/pg_config" -+ if test -x $i/pg_config32; then -+ PG_CONFIG="$i/pg_config32" - break; - fi - done -@@ -79427,8 +79427,8 @@ - echo $ac_n "checking for pg_config""... $ac_c" 1>&6 - echo "configure:79429: checking for pg_config" >&5 - for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do -- if test -x $i/pg_config; then -- PG_CONFIG="$i/pg_config" -+ if test -x $i/pg_config32; then -+ PG_CONFIG="$i/pg_config32" - break; - fi - done -@@ -82574,7 +82574,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lreadline $LIBS" -+LIBS="-lreadline -lcurses $LIBS" - cat > conftest.$ac_ext <&6 - echo "configure:102617: checking for XMLRPC-EPI in default path" >&5 -- for i in /usr/local /usr; do -+ for i in /opt/csw /usr/local /usr; do - if test -r $i/include/xmlrpc.h; then - XMLRPC_DIR=$i/include - echo "$ac_t""found in $i" 1>&6 Deleted: csw/mgar/pkg/php5/trunk/files/extensions.mk =================================================================== --- csw/mgar/pkg/php5/trunk/files/extensions.mk 2009-05-14 18:41:08 UTC (rev 4850) +++ csw/mgar/pkg/php5/trunk/files/extensions.mk 2009-05-14 18:41:38 UTC (rev 4851) @@ -1,31 +0,0 @@ - -# PHP Extensions -XLIST = bz2 -XLIST += curl -XLIST += dba -XLIST += ftp -XLIST += gd -XLIST += gettext -XLIST += gmp -XLIST += imap -XLIST += ldap -XLIST += mcrypt -XLIST += mhash -XLIST += mssql -XLIST += mysql -XLIST += mysqli -XLIST += odbc -XLIST += pdomysql -XLIST += pdoodbc -XLIST += pdopgsql -XLIST += pdosqlite -XLIST += pgsql -XLIST += pspell -XLIST += readline -XLIST += snmp -XLIST += sqlite -XLIST += wddx -XLIST += xsl - -DISTFILES += $(foreach N,$(XLIST),$(call admfiles,CSWphp5$(N),prototype)) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 14 20:42:22 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 14 May 2009 18:42:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[4852] csw/mgar/pkg/php4/trunk/files/README-mod_php Message-ID: Revision: 4852 http://gar.svn.sourceforge.net/gar/?rev=4852&view=rev Author: valholla Date: 2009-05-14 18:42:22 +0000 (Thu, 14 May 2009) Log Message: ----------- minor change Added Paths: ----------- csw/mgar/pkg/php4/trunk/files/README-mod_php Added: csw/mgar/pkg/php4/trunk/files/README-mod_php =================================================================== --- csw/mgar/pkg/php4/trunk/files/README-mod_php (rev 0) +++ csw/mgar/pkg/php4/trunk/files/README-mod_php 2009-05-14 18:42:22 UTC (rev 4852) @@ -0,0 +1,9 @@ +***************************************************************************** +* DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED +* PHP4 is Depricated, Please consider upgrading to PHP5 +***************************************************************************** + +This is a Meta-Package it only contains this file. +This package depends on all other packages for php4. + +Thank You! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 14 20:54:31 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 14 May 2009 18:54:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[4853] csw/mgar/pkg/php4/trunk Message-ID: Revision: 4853 http://gar.svn.sourceforge.net/gar/?rev=4853&view=rev Author: valholla Date: 2009-05-14 18:54:31 +0000 (Thu, 14 May 2009) Log Message: ----------- checksum and admin files Modified Paths: -------------- csw/mgar/pkg/php4/trunk/Makefile csw/mgar/pkg/php4/trunk/checksums Added Paths: ----------- csw/mgar/pkg/php4/trunk/files/admfiles.mk Modified: csw/mgar/pkg/php4/trunk/Makefile =================================================================== --- csw/mgar/pkg/php4/trunk/Makefile 2009-05-14 18:42:22 UTC (rev 4852) +++ csw/mgar/pkg/php4/trunk/Makefile 2009-05-14 18:54:31 UTC (rev 4853) @@ -19,26 +19,21 @@ MASTER_SITES = http://us.php.net/distributions/ SPKG_SOURCEURL = http://www.php.net/downloads.php -DISTFILES += $(SF_PROJ)-$(GARVERSION).tar.bz2 -DISTFILES += dummy-httpd.conf -DISTFILES += httpd-php4.conf.CSW -DISTFILES += php.ini.CSW +DISTFILES = $(SF_PROJ)-$(GARVERSION).tar.bz2 INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) PHP4ROOT = $(DESTDIR)$(prefix)/php4 - STRIP_DIRS += $(PHP4ROOT)/lib/php/extensions/*/ STRIP_DIRS += $(PHP4ROOT)/bin PATCHFILES = pgsql.diff - EXTRA_LIB += $(prefix)/bdb44/lib EXTRA_INC += $(prefix)/bdb44/include EXTRA_CFLAGS = -I$(prefix)/include/ncursesw + CONFIGURE_ARGS += --prefix=$(prefix)/php4 CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php4/bin - CONFIGURE_ARGS += --enable-bcmath=shared CONFIGURE_ARGS += --enable-calendar=shared CONFIGURE_ARGS += --enable-cgi @@ -141,7 +136,7 @@ @grm $(DESTDIR)$(prefix)/apache2/etc/httpd.conf* @$(MAKECOOKIE) - include files/pkgdef.mk include files/pkgfiles.mk +include files/admfiles.mk include gar/category.mk Modified: csw/mgar/pkg/php4/trunk/checksums =================================================================== --- csw/mgar/pkg/php4/trunk/checksums 2009-05-14 18:42:22 UTC (rev 4852) +++ csw/mgar/pkg/php4/trunk/checksums 2009-05-14 18:54:31 UTC (rev 4853) @@ -1,3 +1,55 @@ +2f2d6b1a009304c95d735255dba530b0 download/CSWap2modphp4.postinstall +2d6d0b03dd17b8ca03e666e99f331322 download/CSWap2modphp4.preremove +0dd379f20ceb32fc77bb3a9bf045097f download/CSWap2modphp4.space +4b39ed880dc873c0008eef302e5f9467 download/CSWmodphp4.postinstall +8924c197b7915385734a765dab961e68 download/CSWmodphp4.preremove +0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp4.space +d4b85eb982eb4a593bacf6024db706a9 download/CSWphp4.postinstall +97d253d03e6aee4df218c0b94f44a175 download/CSWphp4.space +3119c7fb6c454da9e483a54453b39548 download/CSWphp4bcmath.postinstall +a28367bcf2f1dc5513271b4fd5f7db2b download/CSWphp4bcmath.preremove +a5baa2f0261f9d4f45240e32aa931dab download/CSWphp4bz2.postinstall +ed0922061d8b95e2f8cc6604381cc57f download/CSWphp4bz2.preremove +82b8586235f637d239c07eb3bead372e download/CSWphp4calendar.postinstall +0bbeea841afc4d2ea98b641b9f09624a download/CSWphp4calendar.preremove +84aa3d42197c8fb1c6eb000c8684e904 download/CSWphp4curl.postinstall +99f1ea3f414aa4e63e94d9e34069ac7d download/CSWphp4curl.preremove +beb44563abab6725128a796e2507883b download/CSWphp4dba.postinstall +4f3c0524060deba68760c8cd4b101482 download/CSWphp4dba.preremove +391a9204a7b99911207762c29b094a22 download/CSWphp4domxml.postinstall +55a167a6d4d478856423b5f064958e64 download/CSWphp4domxml.preremove +7517719ac38440cb7584b582652fa1fa download/CSWphp4gd.postinstall +926d9b58d6a2d352cf23a5755471e1f0 download/CSWphp4gd.preremove +ba1e62dfb832cd2e369226afc9b759ce download/CSWphp4gettext.postinstall +cb589a4ca4a3311d1ec916eaa53cec5f download/CSWphp4gettext.preremove +1b3cbc1feb3f94e466f149d38857e96d download/CSWphp4gmp.postinstall +153a8bd51ad9019cff0ad77b163e7bd9 download/CSWphp4gmp.preremove +d103fd359ebb421d0a8a41e59394fc8a download/CSWphp4iconv.postinstall +7437f8f082c95420aaee704a3b4f42d0 download/CSWphp4iconv.preremove +b9540869abf433e623d4d6be0e34152a download/CSWphp4imap.postinstall +5db399a3e1bceff000369b4c77727d7b download/CSWphp4imap.preremove +682b390bb4027ca5b9a6554671841c22 download/CSWphp4ldap.postinstall +fba32bef8deaefa3ab7dae5d688144bf download/CSWphp4ldap.preremove +b61dc20076329f48210de4dd31572f6f download/CSWphp4mbstring.postinstall +6359a3754ae562eb9bc1105d7ad2cf82 download/CSWphp4mbstring.preremove +c3074edb714074ca94bb7a222387374c download/CSWphp4mcal.postinstall +2a0014460d320b93fc227acac591d6a0 download/CSWphp4mcal.preremove +ebfe95b3aa54d9eb59d9de54ed71958f download/CSWphp4mssql.postinstall +197ce3cd2bf5316034aaf026b45ae306 download/CSWphp4mssql.preremove +18e7fa4375bcae7cd8df3d40417c5e54 download/CSWphp4mysql.postinstall +c749d159edf7f57bb2271bc6d32e8b34 download/CSWphp4mysql.preremove +61563764c3e8ea86250d60a414c2a08a download/CSWphp4ncurses.postinstall +bd689819276a2c462a32e2c187bb28a2 download/CSWphp4ncurses.preremove +c552f04399c41b8092c2e2874eed5997 download/CSWphp4odbc.postinstall +fd9c43fffd24083e3c665dd066724f44 download/CSWphp4odbc.preremove +76d8e3c627a5185bae8d23b467f0b7e0 download/CSWphp4openssl.postinstall +f8d282b9d62c6d543057c6d8137a6250 download/CSWphp4openssl.preremove +1ac2fda1017a05618aab7b0b6e8f6b45 download/CSWphp4pgsql.postinstall +008f9fe669a5699c40c4415f95d0148a download/CSWphp4pgsql.preremove +7340bac8a1bb91821f664f32e6cc4920 download/CSWphp4zlib.postinstall +77ec27892ad5659e22789dc97c6d5472 download/CSWphp4zlib.preremove +86e8561c50e7272b06336dcdb03f7bea download/README-mod_php +76492b303e12d8d0d8d6c6e1e91d7850 download/README-mod_php4_core 93db60a388952ec3b40bb3bb005ff06b download/dummy-httpd.conf ec1d86518d8b6d5a320ce058f03d9eef download/httpd-php4.conf.CSW 3870a95f52c9637798294243694fdd47 download/pgsql.diff @@ -2,2 +54,2 @@ 2e3b2a0e27f10cb84fd00e5ecd7a1880 download/php-4.4.9.tar.bz2 -4450995841c11c22e4369dc425307a4a download/php.ini.CSW +dfbb642e8600052261b85775d86f82c7 download/php.ini.CSW Added: csw/mgar/pkg/php4/trunk/files/admfiles.mk =================================================================== --- csw/mgar/pkg/php4/trunk/files/admfiles.mk (rev 0) +++ csw/mgar/pkg/php4/trunk/files/admfiles.mk 2009-05-14 18:54:31 UTC (rev 4853) @@ -0,0 +1,59 @@ +# +# Define Extra Files for Packages +# + +DISTFILES += CSWap2modphp4.postinstall +DISTFILES += CSWap2modphp4.preremove +DISTFILES += CSWap2modphp4.space +DISTFILES += CSWmodphp4.postinstall +DISTFILES += CSWmodphp4.preremove +DISTFILES += CSWmodphp4.space +DISTFILES += CSWphp4.postinstall +DISTFILES += CSWphp4.space +DISTFILES += CSWphp4bcmath.postinstall +DISTFILES += CSWphp4bcmath.preremove +DISTFILES += CSWphp4bz2.postinstall +DISTFILES += CSWphp4bz2.preremove +DISTFILES += CSWphp4calendar.postinstall +DISTFILES += CSWphp4calendar.preremove +DISTFILES += CSWphp4curl.postinstall +DISTFILES += CSWphp4curl.preremove +DISTFILES += CSWphp4dba.postinstall +DISTFILES += CSWphp4dba.preremove +DISTFILES += CSWphp4domxml.postinstall +DISTFILES += CSWphp4domxml.preremove +DISTFILES += CSWphp4gd.postinstall +DISTFILES += CSWphp4gd.preremove +DISTFILES += CSWphp4gettext.postinstall +DISTFILES += CSWphp4gettext.preremove +DISTFILES += CSWphp4gmp.postinstall +DISTFILES += CSWphp4gmp.preremove +DISTFILES += CSWphp4iconv.postinstall +DISTFILES += CSWphp4iconv.preremove +DISTFILES += CSWphp4imap.postinstall +DISTFILES += CSWphp4imap.preremove +DISTFILES += CSWphp4ldap.postinstall +DISTFILES += CSWphp4ldap.preremove +DISTFILES += CSWphp4mbstring.postinstall +DISTFILES += CSWphp4mbstring.preremove +DISTFILES += CSWphp4mcal.postinstall +DISTFILES += CSWphp4mcal.preremove +DISTFILES += CSWphp4mssql.postinstall +DISTFILES += CSWphp4mssql.preremove +DISTFILES += CSWphp4mysql.postinstall +DISTFILES += CSWphp4mysql.preremove +DISTFILES += CSWphp4ncurses.postinstall +DISTFILES += CSWphp4ncurses.preremove +DISTFILES += CSWphp4odbc.postinstall +DISTFILES += CSWphp4odbc.preremove +DISTFILES += CSWphp4openssl.postinstall +DISTFILES += CSWphp4openssl.preremove +DISTFILES += CSWphp4pgsql.postinstall +DISTFILES += CSWphp4pgsql.preremove +DISTFILES += CSWphp4zlib.postinstall +DISTFILES += CSWphp4zlib.preremove +DISTFILES += README-mod_php +DISTFILES += README-mod_php4_core +DISTFILES += dummy-httpd.conf +DISTFILES += httpd-php4.conf.CSW +DISTFILES += php.ini.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 14 21:22:37 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 14 May 2009 19:22:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[4854] csw/mgar/pkg/php4/trunk/Makefile Message-ID: Revision: 4854 http://gar.svn.sourceforge.net/gar/?rev=4854&view=rev Author: valholla Date: 2009-05-14 19:22:37 +0000 (Thu, 14 May 2009) Log Message: ----------- minor tweak Modified Paths: -------------- csw/mgar/pkg/php4/trunk/Makefile Modified: csw/mgar/pkg/php4/trunk/Makefile =================================================================== --- csw/mgar/pkg/php4/trunk/Makefile 2009-05-14 18:54:31 UTC (rev 4853) +++ csw/mgar/pkg/php4/trunk/Makefile 2009-05-14 19:22:37 UTC (rev 4854) @@ -2,6 +2,7 @@ GARVERSION = 4.4.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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 14 21:41:00 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 14 May 2009 19:41:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[4855] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4855 http://gar.svn.sourceforge.net/gar/?rev=4855&view=rev Author: valholla Date: 2009-05-14 19:41:00 +0000 (Thu, 14 May 2009) Log Message: ----------- move to default location Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh csw/mgar/pkg/php5/trunk/files/pear.conf.CSW Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -2,6 +2,7 @@ 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 @@ -17,19 +18,13 @@ available. endef -php5_root = $(DESTDIR)$(prefix)/php5 -php5_bin = $(php5_root)/bin -php5_lib = $(php5_root)/lib - MASTER_SITES = http://us.php.net/distributions/ SPKG_SOURCEURL = http://www.php.net/downloads.php DISTFILES += $(SF_PROJ)-$(GARVERSION).tar.bz2 INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP5ROOT = $(DESTDIR)$(prefix)/php5 -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin +STRIP_DIRS += $(prefix)/lib/php/extensions/*/ # Auxilliary files DISTFILES += php.ini.CSW phpext pear.conf.CSW @@ -46,12 +41,12 @@ REQUIRED_PKGS_CSWphp5 += CSWlibxml2 CSWzlib CSWmysql5rt REQUIRED_PKGS_CSWphp5devel = CSWphp5 -PKGFILES_CSWphp5devel = $(prefix)/php5/bin/php-config -PKGFILES_CSWphp5devel += $(prefix)/php5/bin/phpize -PKGFILES_CSWphp5devel += $(prefix)/php5/bin/peardev -PKGFILES_CSWphp5devel += $(prefix)/php5/include.* -PKGFILES_CSWphp5devel += $(prefix)/php5/lib/php/build/.* -PKGFILES_CSWphp5devel += $(prefix)/php5/man/.* +PKGFILES_CSWphp5devel = $(bindir)/php-config +PKGFILES_CSWphp5devel += $(bindir)/phpize +PKGFILES_CSWphp5devel += $(bindir)/peardev +PKGFILES_CSWphp5devel += $(includedir)/.* +PKGFILES_CSWphp5devel += $(libdir)/php/build/.* +PKGFILES_CSWphp5devel += $(mandir)/.* PATCHFILES += configure.diff PATCHFILES += php-bug-45557-fix.diff @@ -69,9 +64,8 @@ STRIP_LIBTOOL = 1 -CONFIGURE_ARGS += --prefix=$(prefix)/php5 +CONFIGURE_ARGS = $(DIRPATHS) 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 @@ -101,17 +95,17 @@ @$(MAKECOOKIE) install-extras: - ginstall -m 0755 $(WORKDIR)/phpext $(DESTDIR)$(prefix)/php5/bin - gsed -i -e s,PHPEXTDIR,$(shell $(PHP5ROOT)/bin/php-config --extension-dir),\ + ginstall -m 0755 $(WORKDIR)/phpext $(DESTDIR)$(bindir) + gsed -i -e s,PHPEXTDIR,$(shell $(bindir)/php-config --extension-dir),\ $(WORKDIR)/php.ini.CSW - ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(prefix)/php5/lib - ginstall -m 0644 $(WORKDIR)/pear.conf.CSW $(DESTDIR)$(prefix)/php5/etc + ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(libdir) + ginstall -m 0644 $(WORKDIR)/pear.conf.CSW $(DESTDIR)$(sysconfdir) ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra ginstall -m 0644 $(WORKDIR)/httpd-php5.conf.CSW \ $(DESTDIR)$(prefix)/apache2/etc/extra @(grm -fr $(DESTDIR)/.[a-z]*) - @(gfind $(PHP5ROOT)/lib -name "*.a" -exec grm {} \;) - @(grm -f $(DESTDIR)$(prefix)/php5/etc/pear.conf) + @(gfind $(libdir) -name "*.a" -exec grm {} \;) + @(grm -f $(DESTDIR)$(sysconfdir)/pear.conf) @$(MAKECOOKIE) install-ap2modphp5: Modified: csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5bcmath_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling bcmath extension" @@ -56,7 +56,7 @@ define CSWphp5bcmath_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling bcmath extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5bz2_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling bz2 extension" @@ -56,7 +56,7 @@ define CSWphp5bz2_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling bz2 extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5calendar_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling calendar extension" @@ -56,7 +56,7 @@ define CSWphp5calendar_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling calendar extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5ctype_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling ctype extension" @@ -56,7 +56,7 @@ define CSWphp5ctype_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling ctype extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -15,7 +15,7 @@ define CSWphp5curl_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling curl extension" @@ -58,7 +58,7 @@ define CSWphp5curl_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling curl extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -17,7 +17,7 @@ define CSWphp5dba_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling dba extension" @@ -60,7 +60,7 @@ define CSWphp5dba_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling dba extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5dbase_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling dbase extension" @@ -56,7 +56,7 @@ define CSWphp5dbase_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling dbase extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -14,7 +14,7 @@ define CSWphp5dom_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling dom extension" @@ -57,7 +57,7 @@ define CSWphp5dom_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling dom extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -16,7 +16,7 @@ define CSWphp5exif_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling exif extension" @@ -59,7 +59,7 @@ define CSWphp5exif_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling exif extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5ftp_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling ftp extension" @@ -56,7 +56,7 @@ define CSWphp5ftp_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling ftp extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -24,7 +24,7 @@ define CSWphp5gd_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling gd extension" @@ -67,7 +67,7 @@ define CSWphp5gd_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling gd extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5gettext_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling gettext extension" @@ -56,7 +56,7 @@ define CSWphp5gettext_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling gettext extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5gmp_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling gmp extension" @@ -56,7 +56,7 @@ define CSWphp5gmp_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling gmp extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5hash_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling hash extension" @@ -56,7 +56,7 @@ define CSWphp5hash_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling hash extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -20,7 +20,7 @@ define CSWphp5iconv_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling iconv extension" @@ -63,7 +63,7 @@ define CSWphp5iconv_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling iconv extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -15,7 +15,7 @@ define CSWphp5imap_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling imap extension" @@ -58,7 +58,7 @@ define CSWphp5imap_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling imap extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5json_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling json extension" @@ -56,7 +56,7 @@ define CSWphp5json_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling json extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -15,7 +15,7 @@ define CSWphp5ldap_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling ldap extension" @@ -58,7 +58,7 @@ define CSWphp5ldap_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling ldap extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -15,7 +15,7 @@ define CSWphp5mbstring_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling mbstring extension" @@ -58,7 +58,7 @@ define CSWphp5mbstring_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling mbstring extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5mcrypt_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling mcrypt extension" @@ -56,7 +56,7 @@ define CSWphp5mcrypt_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling mcrypt extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5mhash_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling mhash extension" @@ -56,7 +56,7 @@ define CSWphp5mhash_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling mhash extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5mimemagic_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling mime_magic extension" @@ -56,7 +56,7 @@ define CSWphp5mimemagic_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling mime_magic extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5mssql_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling mssql extension" @@ -56,7 +56,7 @@ define CSWphp5mssql_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling mssql extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5mysql_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling mysql extension" @@ -56,7 +56,7 @@ define CSWphp5mysql_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling mysql extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5mysqli_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling mysqli extension" @@ -56,7 +56,7 @@ define CSWphp5mysqli_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling mysqli extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5ncurses_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling ncurses extension" @@ -56,7 +56,7 @@ define CSWphp5ncurses_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling ncurses extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -15,7 +15,7 @@ define CSWphp5odbc_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling odbc extension" @@ -58,7 +58,7 @@ define CSWphp5odbc_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling odbc extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5openssl_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling openssl extension" @@ -56,7 +56,7 @@ define CSWphp5openssl_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling openssl extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5pcntl_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling pcntl extension" @@ -56,7 +56,7 @@ define CSWphp5pcntl_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling pcntl extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -11,7 +11,7 @@ define CSWphp5pdo_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling pdo extension" @@ -54,7 +54,7 @@ define CSWphp5pdo_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling pdo extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -14,7 +14,7 @@ define CSWphp5pdomysql_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling pdo_mysql extension" @@ -57,7 +57,7 @@ define CSWphp5pdomysql_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling pdo_mysql extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5pdoodbc_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling pdo_odbc extension" @@ -56,7 +56,7 @@ define CSWphp5pdoodbc_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling pdo_odbc extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -15,7 +15,7 @@ define CSWphp5pdopgsql_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling pdo_pgsql extension" @@ -58,7 +58,7 @@ define CSWphp5pdopgsql_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling pdo_pgsql extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5pdosqlite_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling pdo_sqlite extension" @@ -56,7 +56,7 @@ define CSWphp5pdosqlite_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling pdo_sqlite extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -15,7 +15,7 @@ define CSWphp5pgsql_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling pgsql extension" @@ -58,7 +58,7 @@ define CSWphp5pgsql_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling pgsql extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5posix_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling posix extension" @@ -56,7 +56,7 @@ define CSWphp5posix_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling posix extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5pspell_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling pspell extension" @@ -56,7 +56,7 @@ define CSWphp5pspell_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling pspell extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -14,7 +14,7 @@ define CSWphp5readline_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling readline extension" @@ -57,7 +57,7 @@ define CSWphp5readline_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling readline extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5session_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling session extension" @@ -56,7 +56,7 @@ define CSWphp5session_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling session extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5shmop_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling shmop extension" @@ -56,7 +56,7 @@ define CSWphp5shmop_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling shmop extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -9,7 +9,7 @@ define CSWphp5simplexml_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling simplexml extension" @@ -52,7 +52,7 @@ define CSWphp5simplexml_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling simplexml extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5snmp_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling snmp extension" @@ -56,7 +56,7 @@ define CSWphp5snmp_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling snmp extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -14,7 +14,7 @@ define CSWphp5soap_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling soap extension" @@ -57,7 +57,7 @@ define CSWphp5soap_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling soap extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5sockets_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling sockets extension" @@ -56,7 +56,7 @@ define CSWphp5sockets_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling sockets extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -14,7 +14,7 @@ define CSWphp5sqlite_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling sqlite extension" @@ -57,7 +57,7 @@ define CSWphp5sqlite_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling sqlite extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5sysvmsg_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling sysvmsg extension" @@ -56,7 +56,7 @@ define CSWphp5sysvmsg_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling sysvmsg extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5sysvsem_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling sysvsem extension" @@ -56,7 +56,7 @@ define CSWphp5sysvsem_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling sysvsem extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5sysvshm_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling sysvshm extension" @@ -56,7 +56,7 @@ define CSWphp5sysvshm_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling sysvshm extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5tidy_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling tidy extension" @@ -56,7 +56,7 @@ define CSWphp5tidy_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling tidy extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -13,7 +13,7 @@ define CSWphp5tokenizer_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling tokenizer extension" @@ -56,7 +56,7 @@ define CSWphp5tokenizer_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling tokenizer extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -15,7 +15,7 @@ define CSWphp5wddx_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling wddx extension" @@ -58,7 +58,7 @@ define CSWphp5wddx_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling wddx extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -7,7 +7,7 @@ define CSWphp5xml_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling xml extension" @@ -50,7 +50,7 @@ define CSWphp5xml_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling xml extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -14,7 +14,7 @@ define CSWphp5xmlreader_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling xmlreader extension" @@ -57,7 +57,7 @@ define CSWphp5xmlreader_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling xmlreader extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -16,7 +16,7 @@ define CSWphp5xmlrpc_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling xmlrpc extension" @@ -59,7 +59,7 @@ define CSWphp5xmlrpc_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling xmlrpc extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -14,7 +14,7 @@ define CSWphp5xmlwriter_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling xmlwriter extension" @@ -57,7 +57,7 @@ define CSWphp5xmlwriter_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling xmlwriter extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -14,7 +14,7 @@ define CSWphp5xsl_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling xsl extension" @@ -57,7 +57,7 @@ define CSWphp5xsl_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling xsl extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -14,7 +14,7 @@ define CSWphp5zip_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling zip extension" @@ -57,7 +57,7 @@ define CSWphp5zip_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling zip extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile 2009-05-14 19:41:00 UTC (rev 4855) @@ -6,7 +6,7 @@ define CSWphp5zlib_postinstall #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Post Install <===]" echo " ===> Enabling zlib extension" @@ -49,7 +49,7 @@ define CSWphp5zlib_preremove #!/bin/sh -PHP_INI=/opt/csw/php5/lib/php.ini +PHP_INI=/opt/csw/lib/php.ini echo "[===> Running Pre Remove <===]" echo " ===> Disabling zlib extension" Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-14 19:41:00 UTC (rev 4855) @@ -2,8 +2,8 @@ PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} -PHP_LIB=$PKG_INSTALL_ROOT/opt/csw/php5/lib -PHP_BIN=$PKG_INSTALL_ROOT/opt/csw/php5/bin +PHP_LIB=$PKG_INSTALL_ROOT/opt/csw/lib +PHP_BIN=$PKG_INSTALL_ROOT/opt/csw/bin PHP_INI=$PHP_LIB/php.ini if [ ! -f $PHP_INI ]; then Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh 2009-05-14 19:41:00 UTC (rev 4855) @@ -5,8 +5,8 @@ CSW_PREFIX=${PKG_INSTALL_ROOT}${CSW_PREFIX} fi -PHP_INI=$CSW_PREFIX/php5/lib/php.ini -PHP_BIN=$CSW_PREFIX/php5/bin +PHP_INI=$CSW_PREFIX/lib/php.ini +PHP_BIN=$CSW_PREFIX/bin PHP_EXTMGR=$PHP_BIN/phpext if [ -z "$PHPEXT" ]; then Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh 2009-05-14 19:41:00 UTC (rev 4855) @@ -5,8 +5,8 @@ CSW_PREFIX=${PKG_INSTALL_ROOT}${CSW_PREFIX} fi -PHP_INI=$CSW_PREFIX/php5/lib/php.ini -PHP_BIN=$CSW_PREFIX/php5/bin +PHP_INI=$CSW_PREFIX/lib/php.ini +PHP_BIN=$CSW_PREFIX/bin PHP_EXTMGR=$PHP_BIN/phpext if [ -z "$PHPEXT" ]; then Modified: csw/mgar/pkg/php5/trunk/files/pear.conf.CSW =================================================================== --- csw/mgar/pkg/php5/trunk/files/pear.conf.CSW 2009-05-14 19:22:37 UTC (rev 4854) +++ csw/mgar/pkg/php5/trunk/files/pear.conf.CSW 2009-05-14 19:41:00 UTC (rev 4855) @@ -1,2 +1,2 @@ #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/php5/lib/php";s:7:"ext_dir";s:58:"/opt/csw/php5/lib/php/extensions/no-debug-non-zts-20060613";s:7:"doc_dir";s:25:"/opt/csw/php5/lib/php/doc";s:7:"bin_dir";s:17:"/opt/csw/php5/bin";s:8:"data_dir";s:26:"/opt/csw/php5/lib/php/data";s:7:"cfg_dir";s:25:"/opt/csw/php5/lib/php/cfg";s:7:"www_dir";s:28:"/opt/csw/php5/lib/php/htdocs";s:8:"test_dir";s:26:"/opt/csw/php5/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/php5/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:"sig_keydir";s:26:"/opt/csw/php5/etc/pearkeys";} \ No newline at end of file +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";} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 14 22:17:27 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 14 May 2009 20:17:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[4856] csw/mgar/pkg/php4/trunk Message-ID: Revision: 4856 http://gar.svn.sourceforge.net/gar/?rev=4856&view=rev Author: valholla Date: 2009-05-14 20:17:27 +0000 (Thu, 14 May 2009) Log Message: ----------- fix depend file and include in Makefile Modified Paths: -------------- csw/mgar/pkg/php4/trunk/Makefile csw/mgar/pkg/php4/trunk/files/depend.mk Modified: csw/mgar/pkg/php4/trunk/Makefile =================================================================== --- csw/mgar/pkg/php4/trunk/Makefile 2009-05-14 19:41:00 UTC (rev 4855) +++ csw/mgar/pkg/php4/trunk/Makefile 2009-05-14 20:17:27 UTC (rev 4856) @@ -140,4 +140,5 @@ include files/pkgdef.mk include files/pkgfiles.mk include files/admfiles.mk +include files/depend.mk include gar/category.mk Modified: csw/mgar/pkg/php4/trunk/files/depend.mk =================================================================== --- csw/mgar/pkg/php4/trunk/files/depend.mk 2009-05-14 19:41:00 UTC (rev 4855) +++ csw/mgar/pkg/php4/trunk/files/depend.mk 2009-05-14 20:17:27 UTC (rev 4856) @@ -6,7 +6,8 @@ REQUIRED_PKGS_CSWphp4bz2 = CSWphp4cgi CSWbzip2 REQUIRED_PKGS_CSWphp4calendar = CSWphp4cgi REQUIRED_PKGS_CSWphp4cgi = CSWbdb44 CSWexpat -REQUIRED_PKGS_CSWphp4curl = CSWphp4cgi CSWcurlrt CSWlibidn CSWoldaprt CSWosslrt CSWzlib +REQUIRED_PKGS_CSWphp4curl = CSWphp4cgi CSWcurlrt CSWlibidn +REQUIRED_PKGS_CSWphp4curl += CSWoldaprt CSWosslrt CSWzlib REQUIRED_PKGS_CSWphp4dba = CSWphp4cgi CSWbdb44 CSWgdbm REQUIRED_PKGS_CSWphp4domxml = CSWphp4cgi CSWiconv CSWlibxml2 CSWlibxslt CSWzlib REQUIRED_PKGS_CSWphp4gd = CSWphp4cgi CSWgd CSWjpeg CSWpng CSWzlib @@ -26,4 +27,10 @@ REQUIRED_PKGS_CSWphp4zlib = CSWphp4cgi CSWzlib REQUIRED_PKGS_CSWap2modphp4 = CSWphp4cgi CSWbdb44 CSWexpat CSWap2prefork REQUIRED_PKGS_CSWmodphp4 = CSWphp4cgi CSWbdb44 CSWexpat CSWapache -REQUIRED_PKGS_CSWmodphp4core = CSWphp4cgi +REQUIRED_PKGS_CSWmodphp4core = +REQUIRED_PKGS_CSWphp = CSWphp4cgi CSWphp4bcmath CSWphp4bz2 CSWphp4calendar +REQUIRED_PKGS_CSWphp += CSWphp4curl CSWphp4dba CSWphp4domxml CSWphp4gd +REQUIRED_PKGS_CSWphp += CSWphp4gettext CSWphp4gmp CSWphp4iconv CSWphp4imap +REQUIRED_PKGS_CSWphp += CSWphp4ldap CSWphp4mbstring CSWphp4mcal CSWphp4mssql +REQUIRED_PKGS_CSWphp += CSWphp4mysql CSWphp4ncurses CSWphp4odbc CSWphp4openssl +REQUIRED_PKGS_CSWphp += CSWphp4pgsql CSWphp4zlib CSWmodphp4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu May 14 22:36:00 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 14 May 2009 20:36:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[4857] csw/mgar/pkg/php4/trunk/files/pkgdef.mk Message-ID: Revision: 4857 http://gar.svn.sourceforge.net/gar/?rev=4857&view=rev Author: valholla Date: 2009-05-14 20:36:00 +0000 (Thu, 14 May 2009) Log Message: ----------- fix typos Modified Paths: -------------- csw/mgar/pkg/php4/trunk/files/pkgdef.mk Modified: csw/mgar/pkg/php4/trunk/files/pkgdef.mk =================================================================== --- csw/mgar/pkg/php4/trunk/files/pkgdef.mk 2009-05-14 20:17:27 UTC (rev 4856) +++ csw/mgar/pkg/php4/trunk/files/pkgdef.mk 2009-05-14 20:36:00 UTC (rev 4857) @@ -5,7 +5,7 @@ PACKAGES += CSWphp4iconv CSWphp4imap CSWphp4ldap CSWphp4mbstring PACKAGES += CSWphp4mcal CSWphp4mssql CSWphp4mysql CSWphp4ncurses CSWphp4odbc PACKAGES += CSWphp4openssl CSWphp4pgsql CSWphp4zlib CSWap2modphp4 -PACKAGES += CSWmodphp4 CSWphp +PACKAGES += CSWmodphp4 CSWphp4 CATALOGNAME_CSWphp4bcmath = php4_bcmath SPKG_DESC_CSWphp4bcmath = bcmath extension for php4 @@ -57,4 +57,5 @@ SPKG_DESC_CSWmodphp4 = PHP 4 - Apache 1.3.x Module CATALOGNAME_CSWmodphp4core = mod_php4_core SPKG_DESC_CSWmodphp4core = Deprecated use mod_php4 or ap2_modphp4 - +CATALOGNAME_CSWphp4 = mod_php +SPKG_DESC_CSWphp4 = Both an apache module and command line interpreter for the PHP language This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu May 14 22:40:01 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 14 May 2009 20:40:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[4858] csw/mgar/pkg Message-ID: Revision: 4858 http://gar.svn.sourceforge.net/gar/?rev=4858&view=rev Author: dmichelsen Date: 2009-05-14 20:40:01 +0000 (Thu, 14 May 2009) Log Message: ----------- cswutils: Initial commit Added Paths: ----------- csw/mgar/pkg/cswutils/ csw/mgar/pkg/cswutils/branches/ csw/mgar/pkg/cswutils/tags/ csw/mgar/pkg/cswutils/trunk/ csw/mgar/pkg/cswutils/trunk/Makefile csw/mgar/pkg/cswutils/trunk/checksums csw/mgar/pkg/cswutils/trunk/files/ csw/mgar/pkg/cswutils/trunk/files/COPYING csw/mgar/pkg/cswutils/trunk/files/checkpkg csw/mgar/pkg/cswutils/trunk/files/checkpkg.8 csw/mgar/pkg/cswutils/trunk/files/cpan2pkg csw/mgar/pkg/cswutils/trunk/files/createpkg csw/mgar/pkg/cswutils/trunk/files/createpkg.8 csw/mgar/pkg/cswutils/trunk/files/stagepkg csw/mgar/pkg/cswutils/trunk/files/stagepkg.8 Property changes on: csw/mgar/pkg/cswutils/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/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-05-14 20:40:01 UTC (rev 4858) @@ -0,0 +1,47 @@ +GARNAME = cswutils +GARVERSION = 1.14.0 +CATEGORIES = utils + +DESCRIPTION = Utilities for CSW maintainers +define BLURB +endef + +MASTER_SITES = +DISTFILES = COPYING +DISTFILES += checkpkg checkpkg.8 +DISTFILES += cpan2pkg +DISTFILES += createpkg createpkg.8 +DISTFILES += stagepkg stagepkg.8 + +REQUIRED_PKGS = CSWtextutils CSWfakeroot CSWperl + +WORKSRC = $(WORKDIR) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +SPKG_SOURCEURL = http://www.opencsw.org/ + +ARCHALL = 1 + +# The package contains 'checkpkg', which checks for bad pathes. Of +# course the bad pathes are inside the package, because it is checked +# for them. So disable the test. +ENABLE_CHECK = 0 + +include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(bindir) + @ginstall $(WORKSRC)/checkpkg $(DESTDIR)$(bindir) + @ginstall $(WORKSRC)/cpan2pkg $(DESTDIR)$(bindir) + @ginstall $(WORKSRC)/createpkg $(DESTDIR)$(bindir) + @ginstall $(WORKSRC)/stagepkg $(DESTDIR)$(bindir) + @ginstall $(GARDIR)/bin/fixlibtool $(DESTDIR)$(bindir) + @ginstall -d $(DESTDIR)$(mandir)/man8 + @ginstall $(WORKSRC)/checkpkg.8 $(DESTDIR)$(mandir)/man8/ + @ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/ + @ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/ + @$(MAKECOOKIE) Added: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums (rev 0) +++ csw/mgar/pkg/cswutils/trunk/checksums 2009-05-14 20:40:01 UTC (rev 4858) @@ -0,0 +1,8 @@ +091b12575ebc0e45cf8c3d8b43d8b638 download/COPYING +7e5a50f1db3b6688c58da693f9ac408e download/checkpkg +6ec3b6597e04714430987ccc199db3c4 download/checkpkg.8 +9a637f6546cc50974159a987302d91c0 download/cpan2pkg +2349d876bada6ee1bf025e576ec2c465 download/createpkg +a605598f30195f9ab1b29fc3944d3b31 download/createpkg.8 +cd4496ee27bf86d5c8bc656c9c5974be download/stagepkg +8908a0a898aa07a7a928b2b8bd8384f0 download/stagepkg.8 Added: csw/mgar/pkg/cswutils/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cswutils/trunk/files/COPYING 2009-05-14 20:40:01 UTC (rev 4858) @@ -0,0 +1,4 @@ +These script(s) are utility scripts used by people who package software +for opencsw.org's Solaris "Community SoftWare" (CSW) effort. +The scripts may be copied free of charge, but may be of limited use +to other folks. Added: csw/mgar/pkg/cswutils/trunk/files/checkpkg =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/checkpkg (rev 0) +++ csw/mgar/pkg/cswutils/trunk/files/checkpkg 2009-05-14 20:40:01 UTC (rev 4858) @@ -0,0 +1,586 @@ +#!/bin/ksh -p + +# checkpkg 2.6 +# This script examines a package that has been put together +# for submittal to the CSW archive at opencsw.org +# +# It examines it for compliance with the packaging standards at +# http://www.opencsw.org/standards/ +# It DOES NOT CATCH EVERYTHING. However, the package will be +# tested with this script before acceptance, so you may as well +# save yourself some time, and run the script yourself! +# +# Be sure to occasionally do a "pkg-get update cswutils" so that +# you know you are tracking the most current version. +# + + +PATH=$PATH:/usr/sbin + +LOCAL_ARCH=`uname -p` + + +# always print out a warning message. (to stderr) +# exit script, if quit_on_warn set + + +cleanup(){ + if [[ -d "$EXTRACTDIR" ]] ; then + rm -rf $EXTRACTDIR + fi + if [[ "$TMPARCHIVE" != "" ]] ; then + rm $TMPARCHIVE + fi +} + +warnmsg(){ + print WARNING: $* >/dev/fd/2 + if [[ "$quit_on_warn" != "" ]] ; then + cleanup + exit 1 + fi +} + +# Print error message, and quit program. +errmsg(){ + print ERROR: $* >/dev/fd/2 + cleanup + exit 1 +} + +if [[ "$1" == "-e" ]] ; then + quit_on_warn=1; + shift +fi +if [[ "$1" == "-h" ]] ; then + print 'Usage: checkpkg [-e] pkg1 [pkg2 ....]' + print ' -e = "exit on warnings"' + shift +fi + +for f in "$@" +do + + + +if [[ ! -f $f ]] ; then + print ERROR: $f does not exist + exit 1 +fi + + +case $f in + cswutils-*) + : + ;; + *) + print Examining $f + + print Looking for bad strings... + + # XPG4 grep has some kind of magical "ignore ELF header" power. + # but... not on sol8, just sol10? + # and so does /bin/grep. but NOT /bin/egrep??? + # + # Need to rewrite this whole thing to also + # check for badly set RUNPATHs. sigh. + # + for badpath in /export/medusa /opt/build ; do + GREP=/bin/grep gzgrep "$badpath" $f + if [[ $? -eq 0 ]] ; then + print "" + print ERROR: build-machine paths found in file $f + print '($badpath)' + exit 1 + fi + done +esac + +print Extracting files for more detailed inspection... + +file $f |sed 's/^.*://' |grep gzip >/dev/null +if [ $? -eq 0 ] ; then + TMPARCHIVE=/tmp/`basename $f` + if [[ -f $TMPARCHIVE ]] ; then + print ERROR: $TMPARCHIVE already exists + + fi + gzcat $f >$TMPARCHIVE || exit 1 + f=$TMPARCHIVE +fi + +pkgname=`nawk 'NR == 2 {print $1; exit;}' $f` + +EXTRACTDIR=/tmp/checkpkg.$$ + +if [ -d $EXTRACTDIR ] ; then + print ERROR: $EXTRACTDIR already exists + exit 1 +fi + +mkdir $EXTRACTDIR + +TMPFILE=$EXTRACTDIR/pkginfo + + + +dd if=$f skip=1 | (cd $EXTRACTDIR; cpio -ivd $pkgname/pkginfo) +if [[ $? -ne 0 ]] ; then + print ERROR: could not extract $f + rm -rf $EXTRACTDIR $TMPARCHIVE + exit 1 +fi + +mv $EXTRACTDIR/$pkgname/pkginfo $EXTRACTDIR ; rmdir $EXTRACTDIR/$pkgname + +software=`sed -n 's/^NAME=\([^ -]*\) -.*$/\1/p' $TMPFILE` +version=`sed -n 's/^VERSION=//p' $TMPFILE` +desc=`sed -n 's/^DESC=//p' $TMPFILE` +email=`sed -n 's/^EMAIL=//p' $TMPFILE` +maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE` +hotline=`sed -n 's/^HOTLINE=//p' $TMPFILE` +basedir=`sed -n 's/^BASEDIR=//p' $TMPFILE` +pkgarch=`sed -n 's/^ARCH=//p' $TMPFILE|head -1` + +case $software in + *[A-Z]*) + echo ERROR: $software must be all lowercase + exit 1 + ;; +esac + +case `basename $f` in + ${software}-${version}-*) + # file name looks okay + ;; + ${software}-*) + print ERROR: filename missing full version field $version + rm -rf $EXTRACTDIR $TMPARCHIVE + exit 1 + ;; + *) + print ERROR: filename should start with $software-$version- + rm -rf $EXTRACTDIR $TMPARCHIVE + exit 1 +esac + + + +if [ "$maintname" = "" ] ; then + # the old format, in the DESC field + maintname=`sed -n 's/^DESC=.*for CSW by //p' $TMPFILE` + + # Since the DESC field has been coopted, take + # description from second half of NAME field now. + desc=`sed -n 's/^NAME=[^ -]* - //p' $TMPFILE` +else + if [ "$desc" = "" ] ; then + desc=`sed -n 's/^NAME=[^ -]* - //p' $TMPFILE` + fi +fi + +rm $TMPFILE + +# strip out '' chars, because it interferes with mysql +desc=`print $desc | sed "s/'//g"` + + +print Info for pkg $pkgname + +print software= "'$software'" +print arch= "'$pkgarch'" +print desc="'$desc'" +print pkgname="'$pkgname'" +print version="'$version'" +print maintainer name="'$maintname'" +print maint email="'$email'" +print hotline="'$hotline'" +if [ "$basedir" != "" ] ; then + print basedir="'$basedir'" +fi + +if [[ ${#software} -gt 20 ]] ; then errmsg $f: software name greater than 20 chars ; fi +if [[ ${#pkgname} -gt 20 ]] ; then errmsg $f: pkg name greater than 20 chars; fi + +if [ "$software" = "" ] ; then errmsg $f: software field not set properly in NAME ; fi +if [ "$pkgname" = "" ] ; then errmsg $f: pkgname field blank ; fi +if [ "$desc" = "" ] ; then errmsg $f: no description in either NAME or DESC field ; fi +if [ ${#desc} -gt 100 ] ; then errmsg $f: description greater than 100 chars ; fi +if [ "$version" = "" ] ; then errmsg $f: VERSION field blank ; fi +if [ "$maintname" = "" ] ; then errmsg $f: maintainer name not detected. Fill out VENDOR field properly ; fi +if [ "$email" = "" ] ; then errmsg $f: EMAIL field blank ; fi +if [ "$hotline" = "" ] ; then errmsg $f: HOTLINE field blank ; fi + + +case $version in + *-*) + print ERROR: VERSION field not allowed to have '"-"' in it + exit 1 + ;; + *,REV=20[01][0-9].[0-9][0-9].[0-9][0-9]*) + : + ;; + *) + print ERROR: no REV=YYYY.MM.DD field in VERSION + exit 1 + ;; +esac + +case $pkgarch in + sparc|i386|all) + ;; + sparc.*|i386.*) + ;; + + *) + print ERROR: non-standard ARCH def in package: $pkgarch + rm -rf $EXTRACTDIR $TMPARCHIVE + exit 1 +esac + +goodarch=yes +case $f in + *${LOCAL_ARCH}*) + + ;; + *) + print NOTE: pkg must be for arch $LOCAL_ARCH to check dynamic libs + goodarch=no + ;; +esac + + +#if [ "$goodarch" = "no" ] ; then +# # neutral architechture. cant check libraries for it. +# print "" +# rm -rf $EXTRACTDIR $TMPARCHIVE +# exit 0 +#fi + + +# This function exists, because pkgtrans is BROKEN!! +# It leaves a directory in /var/tmp/aaXXXXXXX, even after clean quit +# SO, emulate pkgtrans behaviour, for "pkgtrans src destdir pkgname" +# Except that we ignore pkgname arg, and just do first one we find. +# and we are a bit hacky about how we do things. +pkgtrans(){ + if [[ ! -d $2 ]] ; then + print ERROR: $2 is not a directory >/dev/fd/2 + return 1 + fi + hdrblks=`(dd if=$1 skip=1 2>/dev/null| cpio -i -t >/dev/null) 2>&1 | + nawk '{print $1; exit;}'` + + ## print initial hdrblks=$hdrblks + + hdrblks=$(($hdrblks + 1)) + mkdir $2/$3 || return 1 + + dd if=$1 skip=$hdrblks 2>/dev/null | (cd $2/$3 ; cpio -ivdm) + # on fail, SOMETIMES cpio returns 1, but sometimes it returns 0!! + if [[ ! -d $2/$3/install ]] ; then + print retrying extract with different archive offset... + # no, I cant tell in advance why/when the prev fails + hdrblks=$(($hdrblks + 1)) + dd if=$1 skip=$hdrblks 2>/dev/null| (cd $2/$3 ; cpio -ivdm) + fi +} + +print "" +print Extracing pkg for examination of files... +pkgtrans $f $EXTRACTDIR $pkgname + + +############################################################# +# We now have the package expanded, in "directory" form, in +# $EXTRACTDIR/$pkgname +# Now do some extended error checking on it. +# This is similar to Debians "Lintian" phase for packages. + +/usr/sbin/pkgchk -d $EXTRACTDIR $pkgname || errmsg "Package failed integrity check" + +print "/usr/sbin/pkgchk passed." + + +######################################## +# Check for some common errors +if [[ $pkgname != "CSWcommon" ]] ; then + + if [[ $LOGNAME != "root" ]] ; then + nawk '$6 == "'$LOGNAME'" {print; exit 1}' $EXTRACTDIR/$pkgname/pkgmap + if [[ $? -eq 1 ]] ; then + print ERROR: files owned by $LOGNAME in prototype file + rm -rf $EXTRACTDIR $TMPARCHIVE + exit 1 + fi + fi + + egrep 'd none /opt ' $EXTRACTDIR/$pkgname/pkgmap + if [[ $? -eq 0 ]] ; then + errmsg You should not have an entry for /opt in your prototype file + fi + egrep 'd none [^ ]* 06' $EXTRACTDIR/$pkgname/pkgmap + if [[ $? -eq 0 ]] ; then + errmsg You must have execute permission set on directories + fi + egrep '/opt/csw/man|d none man' $EXTRACTDIR/$pkgname/pkgmap + if [[ $? -eq 0 ]] ; then + errmsg /opt/csw/man should not have a directory entry in prototype + fi + egrep '/opt/csw/doc|d none doc' $EXTRACTDIR/$pkgname/pkgmap + if [[ $? -eq 0 ]] ; then + errmsg /opt/csw/doc should not have a directory entry in prototype + fi + egrep '/opt/csw/info|d none info' $EXTRACTDIR/$pkgname/pkgmap + if [[ $? -eq 0 ]] ; then + errmsg /opt/csw/info should not have a directory entry in prototype + fi + egrep 'lib/charset.alias' $EXTRACTDIR/$pkgname/pkgmap + if [[ $? -eq 0 ]] ; then + warnmsg Only CSWiconv should have lib/charset.alias in it + fi + egrep 'share/locale/locale.alias' $EXTRACTDIR/$pkgname/pkgmap + if [[ $? -eq 0 ]] ; then + warnmsg Only CSWcommon should have share/locale/locale.alias in it + fi + fgrep '? ? ?' $EXTRACTDIR/$pkgname/pkgmap | + egrep '[/]opt[/]csw' + if [[ $? -eq 0 ]] ; then + errmsg "You should only use '? ? ?' for non-csw paths. Use appropriate explicit perms/ownership instead" + fi + # this is like "installed package info". It is acceptible + # to update it in a postinstall script, but not have it + # directly in the pkgmap. A "e" entry might be acceptible though. + egrep ' f .*/perllocal.pod' $EXTRACTDIR/$pkgname/pkgmap + if [[ $? -eq 0 ]] ; then + errmsg perllocal.pod should be removed from prototype file + fi +fi +# special case. sigh. +if [[ $pkgname != "CSWtexinfo" ]] ; then + egrep '/opt/csw/share/info/dir[ ]|none share/info/dir[ ]' $EXTRACTDIR/$pkgname/pkgmap + if [[ $? -eq 0 ]] ; then + errmsg /opt/csw/share/info/dir should only be in CSWtexinfo + rm -rf $EXTRACTDIR $TMPARCHIVE + exit 1 + fi +fi +######################################### +# find all executables and dynamic libs,and list their filenames. +listbinaries() { + if [ ! -d $1 ] ; then + print errmsg $1 not a directory + rm -rf $EXTRACTDIR + exit 1 + fi + + find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' +} + +# Kinda a hardcode for one special package that cant be +# detected by normal lib dependancies. +checkforclasses () { + typeset local=no + classlist=`sed -n 's/CLASSES=//p' $EXTRACTDIR/$pkgname/pkginfo` + for c in $classlist ; do + case $c in + csw*) + local=yes + ;; + esac + done + if [[ "$local" != "yes" ]] ; then + return 0; + fi + if grep CSWcswclassutils $EXTRACTDIR/$pkgname/install/depend >/dev/null + then + return 0; + fi + echo ERROR: package uses a csw CLASS but missing dependancy on CSWcswclassutils + return 1 +} + + +# pass in name of dynamic object, and specific catalog file. +# Will attempt "best match" heuristics appropriate for CSW dependancy file +# and print out result. +# We will always print out either ONE package, or NOTHING +findlibincat() { + # important to use same grep as we did looking through pkgmap + grep "[/=]$1[ =]" $2 | + nawk ' + $2 == "f" || $2 == "l" {pkg=$NF;next} + # Give 'real' files priority over symlinks + {if(pkg==""){pkg=$NF}; + next } + END {print pkg} + ' + + #old simple (inadequate) way: + # grep /$1 $2 | + # nawk '{print $NF}' |sort -u +} + +#################################################################### +# Auto-dependancy checking section.... +# strategy currently: identify all ELF object files to elflist. +# Then identify all dependancies to "liblist" +# THEEEN go searching through SVR4 pkg "contents" file for PKG matches +# to those libraries. +# (but give priority to lib dependancies satisfied by current PKG itself) +# Final output is saved to file "libpkgs" +###################################################################### +sparccheck=""; sparcwarning="" +if [[ "$pkgarch" = "sparc" ]] ; then + if [[ -d $EXTRACTDIR/$pkgname/root/opt/csw/bin ]] ; then + sparccheck=$EXTRACTDIR/$pkgname/root/opt/csw/bin + elif [[ -d $EXTRACTDIR/$pkgname/reloc/bin ]] ; then + sparccheck=$EXTRACTDIR/$pkgname/reloc/bin + fi + if [[ "$sparccheck" != "" ]] ; then + (cd $sparccheck && file *) | grep 'ELF.*V8+' + if [[ $? = 0 ]] ; then + sparcwarning="WARNING: found binaries in normal bin dir that are V8+" + fi + fi +fi +if [[ "$goodarch" = "yes" ]] ; then + # man ld.so.1 for more info on this hack + export LD_NOAUXFLTR=1 + + listbinaries $EXTRACTDIR/$pkgname >$EXTRACTDIR/elflist + # have to do this for ldd to work. arrg. + if [ -s "$EXTRACTDIR/elflist" ] ; then + chmod 0755 `cat $EXTRACTDIR/elflist` + + #cat $EXTRACTDIR/elflist| xargs ldd 2>/dev/null |fgrep '.so' | + # sed 's:^.*=>[^/]*::' | nawk '{print $1}' |sort -u >$EXTRACTDIR/liblist + + cat $EXTRACTDIR/elflist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | + sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist + + print libraries used are: + cat $EXTRACTDIR/liblist + else + print No dynamic libraries in the package + fi +fi + +#If these dont exist, it is Bad. +touch $EXTRACTDIR/liblist $EXTRACTDIR/libpkgs + +if [[ -f $EXTRACTDIR/$pkgname/install/depend ]] ; then + print + print "Examining 'depend' file" + cat $EXTRACTDIR/$pkgname/install/depend + print "" +else + # They may have forgotten to create/add in a depend file + # Remind people what the package depends on + # print "Analysing dynamic dependancies, if any" + touch $EXTRACTDIR/$pkgname/install/depend +fi + +# sanity check against "depends on self" +nawk '$2=="'$pkgname'" {exit 1}' $EXTRACTDIR/$pkgname/install/depend +if [[ $? -ne 0 ]] ; then + print ERROR: $pkgname references self in depend file + exit 1 +fi + +nawk '$1=="P" {print $2}' $EXTRACTDIR/$pkgname/install/depend | + sort >$EXTRACTDIR/deppkgs +for dep in `cat $EXTRACTDIR/deppkgs` +do + pkginfo $dep || errmsg Invalid package $dep specified. Check of $f fails +done + + #strategy update: poorly grep for all possible matches against our liblist, + # and save in "shortcswcatalog". and now "shortsuncatalog" too. + # in theory, slower for small pkgs, but should be faster for pkgs + # with lots of shared libs. + # + + +if test -s $EXTRACTDIR/liblist ; then + print Building index from SVR4 installed packages database... + print '(May take a while)' + #It's noticably faster (30%) this way, than the second way, at least on a + # multiproc box. + grep CSW /var/sadm/install/contents |nawk '$2 ~ /^[fsl]$/ {print}' | + fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcswcatalog + grep SUNW /var/sadm/install/contents |nawk '$2 ~ /^[fsl]$/ {print}' | + egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' | + fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortsuncatalog + + #nawk '$2 ~ /^[fsl]$/ && $NF ~ /^CSW/ {print}' /var/sadm/install/contents | + # fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcswcatalog + #nawk '$2 ~ /^[fsl]$/ && $NF ~ /^SUNW/ {print}' /var/sadm/install/contents | + # egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' | + # fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortsuncatalog + + + print Cross-referencing indexes... +fi + + +# DEBUG: should we weed out libs already covered by pkg dependancy list? +# that would be to handle things like libgcc_s.so.1 that are in both +# CSWgcc3rt and CSWgcc4rt but in different dirs + +for lib in `cat $EXTRACTDIR/liblist` ; do + grep "[/=]$lib[ =]" $EXTRACTDIR/$pkgname/pkgmap + if [[ $? -eq 0 ]] ; then + echo $lib provided by package itself + continue + fi + + # We want to give priority to CSW packages. + # This is one way; force ONLY parsing CSW pkgs first. + # Then search SUNW pkgs only if nothing else + libpkg=`findlibincat $lib $EXTRACTDIR/shortcswcatalog` + + if [[ -z "$libpkg" ]] ; then + libpkg=`findlibincat $lib $EXTRACTDIR/shortsuncatalog` + fi + if [[ -z "$libpkg" ]] ; then + errmsg cannot find package for $lib + else + print $libpkg >>$EXTRACTDIR/libpkgs + print " found $libpkg for $lib" + fi +done + +sort -u $EXTRACTDIR/libpkgs >$EXTRACTDIR/libpkgs.x +mv $EXTRACTDIR/libpkgs.x $EXTRACTDIR/libpkgs + +diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs >/dev/null +if [[ $? -ne 0 ]] ; then + print SUGGESTION: you may want to add some or all of the following as depends: + print ' (Feel free to ignore SUNW or SPRO packages)' + diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs | fgrep '>' +fi + +checkforclasses + +if [[ "$basedir" != "" ]] ; then + print + if [[ -f $EXTRACTDIR/elflist ]] ; then + print "Checking relocation ability..." + xargs strings < $EXTRACTDIR/elflist| grep /opt/csw + if [[ $? -eq 0 ]] ; then + errmsg package build as relocatable, but binaries have hardcoded /opt/csw paths in them + else + print trivial check passed + fi + else + echo No relocation check done for non-binary relocatable package. + fi +fi + +cleanup + + +print "$sparcwarning" + +done Property changes on: csw/mgar/pkg/cswutils/trunk/files/checkpkg ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/cswutils/trunk/files/checkpkg.8 =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/checkpkg.8 (rev 0) +++ csw/mgar/pkg/cswutils/trunk/files/checkpkg.8 2009-05-14 20:40:01 UTC (rev 4858) @@ -0,0 +1,20 @@ +.TH checkpkg 8 "Jan 9, 2002" "CSW maintainers" +.SH NAME +\fBcheckpkg\fP +\- CSW utility program to check a package for standards compliance +.SH SYNOPSIS +.br +\fBcheckpkg pkg-file-name\fP + +.SH DESCRIPTION +\fBcheckpkg\fP +should always be used by CSW package maintainers to check a package +before submitting it. You may call it either on a plain .pkg file, or a + .pkg.gz file + +.SH SEE ALSO +\fBstagepkg\fP(8),\fBcreatepkg\fP(8) +.SH AUTHORS +Philip Brown +.SH BUGS +Cannot cover every possible standards issue Added: csw/mgar/pkg/cswutils/trunk/files/cpan2pkg =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/cpan2pkg (rev 0) +++ csw/mgar/pkg/cswutils/trunk/files/cpan2pkg 2009-05-14 20:40:01 UTC (rev 4858) @@ -0,0 +1,780 @@ +#!/opt/csw/bin/perl +# Version 1.11 10/14/07 +# +# Depends on gmake, csutils, pm_yaml, pm_htmltree, and pm_libwww +# +# This script will take a CPAN module as an argument and convert it into a +# SysV package sutable for opencsw.org. It will do this by downloading the +# module from CPAN, examining the modules's listed dependancies, and +# recursivelly build them. If a dependacy is a perl core module, or already +# has a package on opencsw of the same or higer version, it will not be +# rebuilt. If a package file (e.g. -,REV=*.tar.gz) exists +# in the directory wher you run this script, it is assumed that the package +# is already built and it will not be re-built. +# + +use strict; +use warnings; + +use CPAN; +use File::Copy; +use File::Spec; +use YAML qw(LoadFile); +use Cwd; +use LWP::UserAgent; +use HTTP::Request::Common; +use HTML::TreeBuilder; +use File::Path; +use File::Temp qw(:POSIX); +use Getopt::Long; + +# +# Global constants. +# +our $pgm = $0; +our $cswdir = '/opt/csw'; +our $makecmd = "$cswdir/bin/gmake"; +our $maxsoftnmlen = 20; +our $bwurl = 'http://www.opencsw.org'; +our $bwfsearch = '/filesearch.php'; +our @msearchpath = ( # Perl module search path + "/opt/csw/lib/perl/csw", + "/opt/csw/share/perl/csw", + "/opt/csw/lib/perl/site_perl", + "/opt/csw/share/perl/site_perl" +); +our $cwd = getcwd(); +our $verbose; +our $email; +our $owner; +our $logfile; + +our $http_proxy; +our $ftp_proxy; + +our $version = "1.11"; + +sub usage { + + print STDERR "$pgm: Error, @_\n" if( @_ ); + print STDERR <<_UEND; + Usage: $pgm ... + Required options: + -o|--owner - Package maintainer name + -e|--email
- Package maintainer E-mail address + Optional options: + -h|--help - Prints this message. + -v|--verbose - do not redirect output from commands + -V|--version - Prints the version number ($version) + -H|--http_proxy - HTTP Proxy to use (e.g. http://proxy:8080) + -F|--ftp_proxy - FTP Proxy to use (e.g. http://proxy:8080) + -n|--nooverwrite [] + Do not overwrite the build directory, but do + everything else. If no module is specified, do not + overwrite any build directories. Can be specified as + many times as necessary. Allows you to modify the + build directory and re-build. + -F|--nooverwritefile + Same as --nooverwrite, but reads the module names from + a file. Can only be specified once. + + Where is a standard CPAN module name with an + optional comma seperated version number. For example: + + Email::Send + + and + + Email::Send,2.185 + + are both valid command line arguments. +_UEND + exit 1; +} + + +# +# These three routines are used to capture the output of sub processes and +# perl routines (such as CPAN::Module::get) into a log file. If the command +# completes successfuly, the log file is thrown away. If the command fails, +# the log file is printed along with an error message by calling fail. +# +sub logoutput { + + if( ! $verbose ) { + + $logfile = tmpnam(); + open( OLDOUT, '>&STDOUT' ); + open( OLDERR, '>&STDERR' ); + open( STDOUT, "> $logfile" ); + open( STDERR, "> $logfile" ); + + } + + +} + +sub endlog { + + if( ! $verbose ) { + + # Reference fh to silence warning + select( OLDERR ); select( OLDOUT ); + + # Restore output. + select( STDOUT); + close( STDOUT ); + open( STDOUT, ">&OLDOUT" ); + close( STDERR ); + open( STDERR, ">&OLDERR" ); + + rmtree( $logfile ); + + } + +} + +sub fail { + + if( ! $verbose ) { + + close( STDOUT ); + open( STDOUT, ">&OLDOUT" ); + close( STDERR ); + open( STDERR, ">&OLDERR" ); + open( LOG, "< $logfile" ) or + die "$pgm: Error, @_ - can't open log\n"; + print foreach ; + close( LOG ); + rmtree( $logfile ); + + } + + die "\n$pgm: Error, @_\n"; + +} + + +# +# See if a given perl module is contained in a package. If the +# module is on opencsw and it's version is as good or better than requested, +# return the opencsw package name. +# +# We have to be carefull because some of the data is corrupt. Some package +# links reutned when searching by file point to no-existant packages. Make +# sure the package is valid before returning. +# +# Takes three strings as argument: +# modname - the perl module name as in "Package::Module". +# ver - the required module version number. +# bver - the version number found at the CPAN site. This may be the +# version of a CPAN bundle which may not match the module version. +# +sub findBWpkg ( $$$ ) { + + my ($modname, $ver, $bver) = @_; + + my $ua = LWP::UserAgent->new; + $ua->proxy( 'http' => $http_proxy ) if $http_proxy; + $ua->proxy( 'ftp' => $ftp_proxy ) if $ftp_proxy; + + # + # Query for the module in each of the locations in which it might be + # installed. + # + my $tbl; + foreach my $path (@msearchpath) { + + # + # Find all packages containing our module by querying the BW + # site. + # + my $file = $modname; + $file =~ s'::'/'g; + $file = $path . "/" . $file . '.pm'; # Anchor query string. + my $res = $ua->request( POST $bwurl . $bwfsearch, + [ + filename => $file, + matchtype => 'exact', + searchfiles => 'Search Files' + ] + ); + die "can not query opencsw.org" unless $res->is_success; + + # + # Now parse the returned HTML page. + # + my $tree = HTML::TreeBuilder->new; + $tree->parse( $res->as_string ); + $tree->eof(); + + # + # Get the first table and extract the links to package info + # pages. We must make sure these are links to vaild packages. + # + my $tbltree = $tree->find( 'table' ) or next; + foreach my $link (@{$tbltree->extract_links()}) { + + # + # Follow the link and make sure it conatains a table. + # + $res = $ua->request( GET $bwurl . $link->[0] ); + die "can not query opencsw.org" + unless $res->is_success; + $tree->delete; + + $tree = HTML::TreeBuilder->new; + $tree->parse( $res->as_string ); + $tree->eof(); + + $tbl = ($tree->look_down('_tag','table'))[0] and last; + + } + + last if( defined($tbl) ); # Found a good package table! + + } + return unless $tbl; # No table with package info found. + + # + # The pakage name and version are in the first table. Extract + # them by position. + # + my @rows = $tbl->look_down( '_tag', 'tr' ); + + # package name is in fifth row + my $name = (($rows[4]->look_down('_tag', 'td'))[1]->content_list)[0]; + $name =~ s/\s//g; # Strip white space + + # version is in second row + my $bwver = (($rows[1]->look_down('_tag', 'td'))[1]->content_list)[0]; + $bwver =~ s/,REV=.*$//; + $bwver =~ s/\s//g; # Strip white space + + # + # If the BW version is less than the module version and CPAN version + # (bundle version), return failure. + # + if( ($bwver lt $ver) and ($bwver lt $bver) ) { + print "WARNNING: opencsw package $name is out of date\n"; + return; + } + + print "Found existing opencsw package $name for $modname module\n"; + return $name; # Success! + +} + +# +# See if a module is a perl core module by looking where it is installed. +# Takes a CPAN::Module reference as argument. +# +sub is_perl_core( $ ) { + my( $mod ) = @_; + + my $instfile = $mod->inst_file() or return; + return unless( $instfile =~ m'^/opt/csw/(lib|share)/perl/[0-9\.]+/' ); + return 1; + +} + +# +# See if a given BW package name is uniq. This routine will try to query for +# the package name on the BW web site. +# +# Takes a single string as argument. This can be either the software name +# (e.g. pm_expect) or the package name (e.g. CSWpmexpect). +# +sub is_uniq ( $ ) { + + my ($pkgname) = @_; + + + my $ua = LWP::UserAgent->new; + $ua->proxy( 'http' => $http_proxy ) if $http_proxy; + $ua->proxy( 'ftp' => $ftp_proxy ) if $ftp_proxy; + + # + # See if the "show all files" query returns anything for our package. + # + my $res = $ua->request( POST $bwurl . $bwfsearch, + [ + pkgname => $pkgname, + showfiles => 'Show Files' + ] + ); + die "could not query opencsw packages" unless $res->is_success; + + # + # Now parse the returned HTML page. + # + my $tree = HTML::TreeBuilder->new; + $tree->parse( $res->as_string ); + $tree->eof(); + $tree->objectify_text(); + + # + # If we do not find a match, return success, otherwise failure. + # + $tree->look_down( 'text', qr/NO MATCH/ ) and return 1; + return; + +} + +# +# This routine will build a SysV pakage including a dependancy file. It will +# take care that the package name meets the restrictions imposed by checkpkg. +# If the output file that would have been generated for this package already +# exists in the working directory, the package is assumed to be already built +# and nothing is done. This routine assumes that the source has already been +# downloaded and unpacked into the working directory (the directory where the +# script was launched). +# +# This routine takes five arguments: +# modname - the perl module name as in "Package::Module". +# moddir - the directory where the source code was unpacked. +# uid - the authors uid as returned by CPAN::Module->userid() +# bwdeps - an array reference to a list of BW package names on which +# the given module depends. +# pkgver - a string with the version number of the package. +# +sub bldpkg ( $$$\@$ ) { + my ($modname, $moddir, $uid, $bwdeps, $pkgver) = @_; + + # Construct software and package names. + my $pkgname = "pm_" . lc( $modname ); $pkgname =~ s/:://g; + my $pkgfile = "CSWpm" . lc( $modname ); $pkgfile =~ s/:://g; + + # + # If the package/software names are too long, truncate them and make + # sure they are still uniq. + # + if( length($pkgname) > $maxsoftnmlen ) { + + $pkgname = substr( $pkgname, 0, $maxsoftnmlen ); + die "can not make uniq name for $modname" + unless is_uniq( $pkgname ); + } + if( length($pkgfile) > $maxsoftnmlen ) { + + $pkgfile = substr( $pkgfile, 0, $maxsoftnmlen ); + die "can not make uniq name for $modname" + unless is_uniq( $pkgfile ); + } + + + # + # Do not rebuild the package if one already exists. + # + my @found = <$cwd/$pkgname-$pkgver,REV=*.pkg.gz>; + if( @found ge 1 ) { + print "Package for $modname already built, skipping\n"; + return $pkgfile; + } + + # + # Create the make file. + # + chdir( $moddir ) or die "Can not find module directory $moddir\n"; + if( -f "Makefile.PL" ) { + logoutput(); + system( "perl Makefile.PL INSTALLDIRS=vendor" ) == 0 + or fail "Can not create Makefile for $modname"; + endlog(); + } else { + logoutput(); + system( "perl Build.PL installdirs=vendor" ) == 0 + or fail "Can not create Makefile for $modname"; + endlog(); + } + + # + # Build everything but do not install yet. + # + logoutput(); + system( "$makecmd" ) == 0 or fail "Can not build $modname"; + + # + # Stage the products. + # + my $stage = $moddir . "/cswstage"; + my $stagecmd = "MAKE=$makecmd $cswdir/bin/stagepkg -a" . + " DESTDIR=$stage" . + " install" + ; + system( $stagecmd ) == 0 or fail "Could not stage $modname"; + endlog(); + + # + # Fix up the .packlist file (strip out the stageing directory). + # + my $pkfile = $stage . "$cswdir/lib/perl/csw/auto/" . $modname + . "/.packlist"; + $pkfile =~ s'::'/'g; + open( PKFILE, "< $pkfile" ) or die "can not find $pkfile"; + my @pklist = map {s/$stage//; $_} ; + close( PKFILE ); + open( PKFILE, "> $pkfile" ) or die "can not update $pkfile"; + print PKFILE @pklist; + close( PKFILE ); + + # + # Copy in the license if one is present. + # + if( -f 'LICENSE' ) { + copy( 'LICENSE', $stage . '/copyright' ); + } else { + open( COPY, "> $stage/copyright" ) and close COPY; + } + + chdir( $stage ); + + # + # Generate a prototype file. + # + my $filter = qr/( opt| var|perllocal.pod| copyright| prototype) /; + my @proto = map {s'none 'none /'; s' [^ ]+ [^ ]+$' root bin'; $_ . "\n"} + grep {!/$filter/} + `find . | /usr/bin/pkgproto` + ; + die "Can not run pkgproto" if( $? != 0 ); + open( PROTO, '> prototype' ); + print PROTO "i copyright\n"; + print PROTO "i depend\n"; + print PROTO "i pkginfo\n"; + print PROTO @proto; + close PROTO; + + # + # Generate dependancy file. + # + open( DEPFILE, '> depend' ); + print DEPFILE "P\t" . $_ . "\n" foreach( @$bwdeps ); + print DEPFILE "P\tCSWperl\n"; # Perl modules depend on perl! + close DEPFILE; + + # + # Generate pkginfo file. + # + my $url = "http://search.cpan.org/~$uid/$modname-$pkgver"; + $url =~ s/::/-/g; + my ($sec,$min,$hour,$mday,$mon,$year) = localtime; + my $verstr = $pkgver . ",REV=" . (1900 + $year) . "." . $mon . "." + . $mday; + open( INFO, '> pkginfo' ); + print INFO "PKG=$pkgfile\n"; + print INFO "NAME=$pkgname - perl $modname module\n"; + print INFO "VERSION=" . $verstr . "\n"; + print INFO "CATEGORY=application\n"; + print INFO "VENDOR=$url packaged for CSW by $owner\n"; + print INFO "HOTLINE=http://www.opencsw.org/bugtrack/\n"; + print INFO "EMAIL=$email\n"; + close INFO; + + # + # Create package and copy it to the working directory. + # + my $arch = `uname -p`; chomp( $arch ); + my $osver = `uname -r`; chomp( $osver ); + my $outfile = $pkgname . "-" . $verstr . "-SunOS" . $osver . + "-" . $arch . "-CSW.pkg"; + + # + # Build the package file. We can not use createpkg because it calls + # checkpkg which requires the depenencies to already be installed. + # + my $spooldir = "$cwd" . "/" . $pkgfile; + rmtree( $spooldir ) if( -f $spooldir ); + logoutput(); + system( "pkgmk -o -r . -a $arch -f prototype -d $cwd" ) == 0 + or fail "could not create package for $modname"; + system( "pkgtrans $cwd $cwd/$outfile $pkgfile" ) == 0 + or fail "could not convert $modname package to stream format"; + system( "gzip -f $cwd/$outfile" ) == 0 + or fail "could not gzip $modname package"; + endlog(); + rmtree( $spooldir ); + + return $pkgfile; #Sucess! +} + +# +# This routine queries the CPAN site fore a given perl module, downloads +# it's source code, builds it, and creates a package. This routine will also +# recursively build packages for all the module's listed dependancies. All +# this is accomplished by calling the previous routines. +# +# If a module is a core perl module and it is not out of date, the module is +# skipped. If a moulde is already packaged and listed on the BW site and is +# up to date, it will not be rebuilt (though it will be used for dependancies). +# The source code and build directory for the module will be placed in the +# working directory (the directory where this script was invoked) as will the +# final package file. +# +# This routine takes five paramates: +# ndldall - a flag to indicate no CPAN source files are to be downloaded +# and more importantly, the previous build directory is not to +# be overwritten. +# ndld - a hash containing the names of modules that should not be +# downloaded as above. +# modname - the perl module name as in "Package::Module". +# ver - a string with the minimum acceptable version number for the +# given module. +# deptree - a hash in which the module disposition and dependacy hash +# will be written. This can be used to print a summary of +# what happend. +# +sub pmtopkg ( $\%$$\% ); # Avoid warning because of recursive call. +sub pmtopkg ( $\%$$\% ) { + + my ($ndldall, $nodnld, $modname, $ver, $deptree) = @_; + + $ver = "" if( !defined $ver ); + + # + # If the module is perl, check the running perl version. + # + if( $modname eq "perl" ) { + die "$modname requires perl version $ver" if( $^V < $ver ); + $deptree->{$modname}{$ver} = ["perl OK",{}]; + return; + } + + # + # Look up the CPAN module. + # + my $mod = (CPAN::Shell->expand("Module", ($modname)))[0]; + die "can not locate CPAN module $modname" unless( $mod ); + logoutput(); + my $instver = $mod->inst_version(); + my $fname = $mod->cpan_file(); + endlog(); + + # + # If CPAN substituted a bundle for our module, we need to use the + # bundle version number when searching for the module on BW. + # Extract the (possibly new) version number from the CPAN file name. + # + $fname =~ m'.*/[^/]+-([0-9\.]+)\.tar\.gz'; + my $bver = $1; + + # + # If this is a perl core module and it is not out of date, skip it. + # + if( is_perl_core($mod) && defined($ver) && defined($instver) && + ($ver le $instver) + ) { + print "Skiping core module $modname\n"; + $deptree->{$modname}{$ver} = ["core module OK",{}]; + return; + } + + # + # If a BW package is found and it is not a core package, return it. + # + my $bwpkg = findBWpkg( $modname, $ver, $bver ); + if( $bwpkg ) { + $deptree->{$modname}{$ver} = ["Existing BW package $bwpkg OK",{}]; + return $bwpkg; + } + + # + # Download the source from CPAN and unpack it in the CPAN build dir. + # + logoutput(); + if( $ndldall || $nodnld->{$modname} ) { + print OLDOUT "Skipping download of $modname\n"; + } else { + $mod->get(); + } + my $cfile = $CPAN::Config->{keep_source_where} . + "/authors/id/" . + $fname; + ; + fail( "can not download $modname from CPAN" ) if( ! -f $cfile ); + if( !($ndldall || $nodnld->{$modname}) ) { + system( "cd $cwd; gunzip -c $cfile | tar -xvf -" ) == 0 + or fail "can not unpack $cfile"; + } + endlog(); + + # + # If we picked up a bundle, change to the bundle name. Extract the + # (possibly new) module name from the CPAN file name. + # + $fname =~ m'.*/([^/]+)-[0-9\.]+\.tar\.gz'; + my $nmodname = $1; + $nmodname =~ s/-/::/g; + + # + # Get the directory name where the source was unpacked. + # + my $chome = $CPAN::Config->{cpan_home}; + $fname =~ m'.*/([^/]+-[0-9\.]+)\.tar\.gz'; + my $moddir = $cwd . "/" . $1; + + # + # Get the modules $nmodname requires from the YAML meta data. Get it + # as a reference to a hash of module => "version". + # + my $metafile = $moddir . "/META.yml"; + my $meta_data; + $meta_data = LoadFile( $metafile ) + or die "Can not load dependancies for $nmodname"; + my $req = $meta_data->{requires}; + + # + # Recursively make (or look up) pakages for each dependancy and save + # them for when we build the package. + # + my ($bwdep, @deps); + foreach( keys %$req ) { + $bwdep = pmtopkg($ndldall, %$nodnld, $_, $req->{$_}, %$deptree) + and push @deps, $bwdep; + } + + # + # Build the package. + # + my $depname = bldpkg( $nmodname, $moddir, $mod->userid(), @deps, $meta_data->{version} ) + or die "can not build package for $nmodname\n"; + + # + # Copy the original source file to our orginal working directory. + # + my ($vol, $dir, $file); + ($vol, $dir, $file) = File::Spec->splitpath( $cfile ); + $file = $cwd . '/' . $file; + copy( $cfile , $file ) or die "Could not copy $cfile to $file: $!"; + + chdir( $cwd ); # Go back to where we were. + + $deptree->{$modname}{$ver} = ["New BW package for $nmodname!",$req]; + + # Return our new package name + return $depname +} + +# +# A little routine to print out a summary of what was done. This routine will +# recursively traverse the deptree structure built up in pmtopkg. At each node +# it will print out the disposition message, and recursively decend each listed +# dependacy tree. +# +# This routien takes four parameters: +# modname - the perl module name as in "Package::Module". +# ver - a string with the minimum version number for the given module. +# indent - a string of spaces used to do indentation at each level. +# deptree - a referecne to the hash built up in pmtopkg. Each entry +# in the hash is an array containing a disposition string, and +# a reference to a hash of dependancies (mod::name => version). +# +sub disposition ( $$$\% ); +sub disposition ( $$$\% ) { + my ($modname, $ver, $indent, $deptree) = @_; + + $ver = "" if( !defined $ver ); + + my $dispo = $deptree->{$modname}{$ver}[0]; + print "$indent$modname $ver - $dispo\n" if( $dispo ); + my $deps = $deptree->{$modname}{$ver}[1]; + + $indent = sprintf( "%s ", $indent ); + foreach( keys %$deps ) { + disposition( $_, $deps->{$_}, $indent, %$deptree ); + } +} + +my $ndldfile; +my @ndld; +my $ndldall; +my $help; +my $vflag; +my %deptree; + +# +# Parse the command line options. +# +Getopt::Long::Configure( 'prefix_pattern=(--|-)' ); +Getopt::Long::Configure( 'no_auto_abbrev' ); +Getopt::Long::Configure( 'no_ignore_case_always' ); +GetOptions( + "verbose|v" => \$verbose, + "version|V" => \$vflag, + "help|h" => \$help, + "owner|o=s" => \$owner, + "email|e=s" => \$email, + "http_proxy|H=s" => \$http_proxy, + "ftp_proxy|F=s" => \$ftp_proxy, + "nooverwritefile|f=s" => \$ndldfile, + "nooverwrite|n:s" => sub { if($_[1]){push @ndld, $_[1]} else {$ndldall = 1} } +); + +usage if( $help ); +if( $vflag ) { + print "Version: $version\n"; + exit 0; +} + +# +# Verify sanity of options. +# +usage "must specify module names " unless( @ARGV ); +usage "maintainer E-mail address required" unless( $email ); +usage "maintainer name required" unless( $owner ); + +if( $ndldfile ) { + + usage "bad no download file name $ndldfile" unless( -f $ndldfile ); + open( NDLD, "< $ndldfile" ); + push @ndld, map {chomp($_); $_} ; + close( NDLD ); + +} + +my %ndldmods; +$ndldmods{$_} = 1 foreach( @ndld ); + +# +# Pick up proxies from /etc/opt/csw/pkg-get.conf if it exists. +# +my $cfgfile = "$cswdir/etc/pkg-get.conf"; +if( -f $cfgfile ) { + + open( CFG, "< $cfgfile" ); + my %vars = + map { m/([^=]+)=(.*)/; ($1, $2) } + grep { /=/ } map { s/#.*//; $_ } + ; + + # + # Only pick up proxies if they were not already specified. + # + if( !defined($http_proxy) && defined($vars{http_proxy}) ) { + $http_proxy = $vars{http_proxy}; + } + if( !defined($ftp_proxy) && defined($vars{ftp_proxy}) ) { + $ftp_proxy = $vars{ftp_proxy}; + } + +} + +# +# Build the packages for each module. +# +my @modlist = @ARGV; +foreach( @modlist ) { + + $_ =~ /^([^,]+),?(.*)/; #Extract mod name and version number + pmtopkg( $ndldall, %ndldmods, $1, $2, %deptree ); + +} +print "\nModule Disposition Summary:\n\n"; +foreach( @modlist ) { + + $_ =~ /^([^,]+),?(.*)/; #Extract mod name and version number + disposition( $1, $2, "", %deptree ); + +} + +exit 0; Property changes on: csw/mgar/pkg/cswutils/trunk/files/cpan2pkg ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/cswutils/trunk/files/createpkg =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/createpkg (rev 0) +++ csw/mgar/pkg/cswutils/trunk/files/createpkg 2009-05-14 20:40:01 UTC (rev 4858) @@ -0,0 +1,134 @@ +#!/bin/ksh -p + +# createpkg 1.6 +# This script actually builds the package.. once you have already +# put together the pkginfo and prototype file. +# See the makeproto script for a way to make a prototype file. + + +if [[ "$FAKEROOTKEY" != "" ]] ; then + print ERROR: do not run createpkg under a fakeroot shell + # This is mainly because we unset LD_LIBRARY_PATH lower down, + # which would break fakeroot anyway + exit 1 +fi + +#This is only relevant for an absolute-path package +ROOTDIR=/ +if [[ "$1" = "-r" ]] ; then + ROOTDIR="$2" + mode=absolute + shift + shift +fi + +#This is only relevant for a relative-path package +INSTALLBASEDIR=/opt/csw +if [[ "$1" = "-b" ]] ; then + INSTALLBASEDIR="$2" + mode=relative + shift + shift +fi + +if [[ $# -ne 0 ]] ; then + case $1 in + *=*) + print Taking "'extra'" args, as variable assignments for pkgmk + ;; + *) + print ERROR: unrecognized args: $* + print read the manpage + exit 1 + ;; + esac + +fi + +ARCH=`sed -n 's/^ARCH=//p' pkginfo` +if [[ "$ARCH" != "all" ]] ; then + ARCH=`uname -p` +fi + +die() +{ + print ERROR: $* + exit 1 +} + +# check if we have multiple prototype files, vs a single unified prototype file +if [[ -f prototype.$ARCH ]] ; then + PROTO=prototype.$ARCH +else + PROTO=prototype +fi + +grep 'i copyright' $PROTO || die need copyright in $PROTO +grep 'root other' $PROTO && die fix $PROTO file +grep 'csw/man' $PROTO && die fix csw/man entry in $PROTO file +grep 'none man' $PROTO && die fix csw/man entry in $PROTO file +grep 'csw/info' $PROTO && die fix csw/info entry in $PROTO file +grep 'none info' $PROTO && die fix csw/info entry in $PROTO file +grep 'csw/doc' $PROTO && die fix csw/doc entry in $PROTO file +grep 'none doc' $PROTO && die fix csw/doc entry in $PROTO file + +grep 'Replace this file' copyright && die fix copyright file + +if [[ "$mode" = "" ]] ; then + grep /opt/csw $PROTO >/dev/null + if [[ $? -eq 0 ]] ; then + mode=absolute + else + mode=relative + fi +fi + +PKG=`sed -n 's/^PKG=//p' pkginfo` +PKGREV=`sed -n 's/^VERSION=//p' pkginfo` +SOFTNAME=`sed -n 's/^NAME=//p' pkginfo|awk '{print $1}'` + +case $SOFTNAME in + *[A-Z]*) + echo ERROR: $SOFTNAME must be all lowercase + exit 1 + ;; +esac + +PKGFILE=$SOFTNAME-$PKGREV-SunOS`uname -r`-$ARCH-CSW.pkg + +if [ "$PKGREV" = "" -o "$SOFTNAME" = "" ] ; then + echo ERROR: need VERSION and NAME defined properly in pkginfo + exit 1 +fi + +if [[ "$mode" = "absolute" ]] ; then + pkgmk -r $ROOTDIR -a $ARCH -f $PROTO "$@" +else + pkgmk -b $INSTALLBASEDIR -a $ARCH -f $PROTO BASEDIR=/opt/csw "$@" +fi + +if [[ $? -ne 0 ]] ; then die package creation failed ; fi + +pkgtrans -s /var/spool/pkg `pwd`/$PKGFILE $PKG + +print Conversion complete. Cleaning up in /var/spool/pkg + +rm -r /var/spool/pkg/$PKG + +print "" +print Running checkpkg on pkgfile +LD_LIBRARY_PATH='' checkpkg $PKGFILE +if [[ $? -ne 0 ]] ; then + print ERROR: failed check. + exit 1 +fi + +if [[ "$mode" = "absolute" ]] ; then + print packaging of files under $ROOTDIR complete +else + print packaging of files under $INSTALLBASEDIR complete +fi + +echo gzipping pkgfile +gzip $PKGFILE + Property changes on: csw/mgar/pkg/cswutils/trunk/files/createpkg ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/cswutils/trunk/files/createpkg.8 =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/createpkg.8 (rev 0) +++ csw/mgar/pkg/cswutils/trunk/files/createpkg.8 2009-05-14 20:40:01 UTC (rev 4858) @@ -0,0 +1,50 @@ +.TH createpkg 8 "Jan 9, 2002" "CSW maintainers" +.SH NAME +\fBcreatepkg\fP +\- CSW utility to put together a pkg file +.SH SYNOPSIS +.br +\fBcreatepkg [-r rootdir] [-b basedir]\fP + +.SH DESCRIPTION +\fBcreatepkg\fP +is a convenience tool to automate the final steps needed to create +a pkg file. It assumes you have done all compiling, and "staging", for the +contents of the package already. +It will convert the binaries into a single .pkg.gz file, and +run checkpkg on it to check for common errors in packaging. + +You must have already created a prototype file, a copyright file, +and a pkginfo file. If you need one, you must also have created a depend file, +and added an entry into pkginfo for it. + +It is assumed that you will follow a proceedure similar to the +following: + + [untar software.tar.gz for building] + [configure and build the software] + stagepkg + mkdir $HOME/pkg/software + cp COPYING $HOME/pkg/software/copyright + cp cswstage/prototype $HOME/pkg/software/prototype + cd $HOME/pkg/software + [create pkginfo file] + [create depend file, if neccessary, and adjust prototype] + createpkg -b {/full/path/to/builddir}/cswstage/opt/csw + +If you need to make an absolute-path package, you would instead use + + createpkg -r {/full/path/to/builddir}/cswstage + +.SH ADVANCED TECHNIQUES + +createpkg (and pkgmk) normally assume you have a 'prototype' file +in the current directory. However, if you need to have slightly different +contents for sparc vs x86, createpkg will check for a prototype.{sparc|i386} +file, and use the ARCH specific version, if present. + +.SH SEE ALSO +\fBcheckpkg\fP(8) +\fBstagepkg\fP(8) +.SH AUTHORS +Philip Brown Added: csw/mgar/pkg/cswutils/trunk/files/stagepkg =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/stagepkg (rev 0) +++ csw/mgar/pkg/cswutils/trunk/files/stagepkg 2009-05-14 20:40:01 UTC (rev 4858) @@ -0,0 +1,191 @@ +#!/bin/ksh -p + +# stagepkg 1.13 + +# This script is for CSW maintainers to be able to more easily +# do builds of a package, on the build machines, without +# having root privileges. +# It does some very generic package prototype generation. +# For more custom jobs, you are encouraged to either copy this +# script to your own location, with tweaks, +# or ask a sysadmin to chown the target directories to you, +# for purposes of doing a tweak/build/install/test cycle more easily. +# + +MAKE=${MAKE:-make} +# Note: This MUST BE AN ABSOLUTE PATH!!! +DESTTOP=$PWD/cswstage + + + + +PATH=$PATH:/usr/ccs/bin # paranoia is always good + + +setupstage(){ + # We make a bunch of softlinks, so that programs that + # normally install to top-level directories, instead + # install to where WE want them to install, + # without having to modify their makefiles. + mkdir -p $DESTTOP/opt/csw/share $DESTTOP/opt/csw/lib + mkdir -p $DESTTOP/opt/csw/bin $DESTTOP/opt/csw/sbin + mkdir $DESTTOP/opt/csw/share/doc + mkdir $DESTTOP/opt/csw/share/info + mkdir $DESTTOP/opt/csw/share/locale + mkdir $DESTTOP/opt/csw/share/man + ln -s share/man $DESTTOP/opt/csw/man + ln -s share/doc $DESTTOP/opt/csw/doc + ln -s share/info $DESTTOP/opt/csw/info + ln -s ../share/locale $DESTTOP/opt/csw/lib/locale +} + + +# Assume we are in top-level of source tree. +# Create virtual csw tree +# Do the "make install" to tree +# Clean up unneeded directories after install +# Generate prototype file +install_and_proto(){ + + SHELL=ksh + + echo $MAKE + echo $S_MAKEARGS + echo $DESTTOP + echo $FAKEROOT + + # look up primary group name + PGROUP=`/usr/xpg4/bin/id -n -g` + + + cat >build_script.$$</dev/null + rmdir share bin sbin lib 2>/dev/null + + (print 'i pkginfo'; print 'i copyright' ;print 'i depend' ; pkgproto . )>/tmp/proto.$$ + cd ../.. + # this sed works around bug in fakeroot on x86 + # It forces root.bin owner/group for files that default to normal user + sed "s/${LOGNAME} ${PGROUP}$/root bin/" /tmp/proto.$$ >prototype + rm /tmp/proto.$$ + cd .. +EOF + $FAKEROOT ksh ./build_script.$$ + #echo take a look at ./build_script.$$ + rm build_script.$$ + +} + +if [[ "$1" = "-a" ]] ; then + print Option -a detected + print Will create absolute-path package + absolute=1 + shift +fi + +if [[ "$1" = "-m" ]] ; then + print Option -m detected + print Will run as '"me"', $(/usr/xpg4/bin/id -n -u) + nofakeroot=1 + shift +fi + +if [[ -d $DESTTOP ]] ; then + print removing old staging area + rm -fr $DESTTOP +fi + +print creating staging area $DESTTOP +setupstage + +if [[ $# -gt 0 ]] ; then + S_MAKEARGS="$@" +else + S_MAKEARGS="DESTDIR=$DESTTOP install" +fi +print using make arguments of "$S_MAKEARGS" + +export S_MAKEARGS + + +if [[ $USER != "root" ]] && [[ $nofakeroot -ne 1 ]] ; then + FAKEROOT=fakeroot + print will use fakeroot to do install +fi + +install_and_proto + +### Now need to figure out if package is REAALLY relocatable. +# If there is anything with a hardcoded 'csw' in it, then it +# cannot be relocatable + +print "" +print Checking for relocatable capability... + +if [[ $absolute -eq 0 ]] ; then + find $DESTTOP -type f | xargs strings | grep csw + if [[ $? -eq 0 ]] ; then + print WARNING: MUST make an absolute package + absolute=1 + fi +fi + +if [[ $absolute -ne 0 ]] ; then + cd $DESTTOP + sed 's: none : none /opt/csw/:' prototype >prototype.new + mv prototype.new prototype + print Updated prototype file to use absolute paths + cd .. +fi + +print "" +print Stripping executables... + + +find $DESTTOP | xargs file | grep 'not stripped' | + awk -F: '{print $1}' |xargs /usr/ccs/bin/strip + + + +print prototype file is now in $DESTTOP/prototype + +if [[ $absolute -eq 0 ]] ; then + print If you dont already have a prototype file, you should copy + print $DESTTOP/prototype + print to where you keep your pkginfo file, and edit it as appropriate. Next, + print ' cd ~/pkgs/[software] ' + print You should then do EITHER + print " createpkg -b $DESTTOP/opt/csw" + print OR if you want to do things the hard way + print " pkgmk -b $DESTTOP/opt/csw \ " + print " -f $DESTTOP/prototype \ " + print " BASEDIR=/opt/csw" + print " [and then all the other cleanup type stuff by hand]" +else + print If you dont already have a prototype file, you should copy + print $DESTTOP/prototype + print to where you keep your pkginfo file, and edit it as appropriate. Next, + print ' cd ~/pkgs/[software] ' + print You should then do EITHER + print " createpkg -r $DESTTOP" + print OR if you want to do things the hard way + print " pkgmk -r $DESTTOP \ " + print " -f $DESTTOP/prototype " + print " [and then all the other cleanup type stuff by hand]" +fi Property changes on: csw/mgar/pkg/cswutils/trunk/files/stagepkg ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/cswutils/trunk/files/stagepkg.8 =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/stagepkg.8 (rev 0) +++ csw/mgar/pkg/cswutils/trunk/files/stagepkg.8 2009-05-14 20:40:01 UTC (rev 4858) @@ -0,0 +1,85 @@ +.TH stagepkg 8 "Feb 8, 2003" "CSW maintainers" +.SH NAME +\fBstagepkg\fP +\- CSW utility program to 'make install' to a staging area +.SH SYNOPSIS +.br +\fBstagepkg [-a] [-m] [make flags] \fP + +.SH OPTIONS +-a Absolute package + +-m Run as "me". Do not try to use fakeroot or chown + +.SH DESCRIPTION +\fBstagepkg\fP +is used to create a virtual layout of /opt/csw, under +$PWD/cswstage, +for purposes of installing software, before making a package out of it. +\fBstagepkg\fP will automatically create certain links like man -> share/man +to ensure that software gets installed to the proper place. + +After installing the binaries to the staging tree, \fBstagepkg\fP will +then attempt to determine if a package can be a relocatable one, or whether +it needs to be an absolute-path one. You can force an absolute-path package +with the -a option. + +It is then up to you to look over the generated prototype file, fix it up +as neccessary, and then call pkgmk with the appropriate options. +(Or use \fBcreatepkg\fP(8) instead of pkgmk) + +\fBstagepkg\fP will transparently use \fBfakeroot\fP to do the install, +unless you already are root, or use the -m option. + +Note that this script \fBis not suitable\fP for multiarchitecture packages. +That is to say, if you wish to provide binaries for sparcv8, sparcv8+, +and sparcv9, you will have to script something yourself. +However, it may still be useful to run the script once for the "base" package, +and then manually tweak the staging area and prototype file to match. + +By default, \fBstagepkg\fP will use standard Solaris make. If you wish +to use gnu make, set your MAKE environment variable. For example, + +.LP +MAKE=gmake stagepkg + + +By default, \fBstagepkg\fP assumes that the target software Makefiles respect +DESTDIR=/some/path to alter the virtual root destination. If you need to +specify some other make varible, call stagepkg as if it were the make command +directly. EG: + +.LP +stagepkg BUILD_TOP=$PWD/cswstage install + + +Since it is common to need to remake the package due to minor pkginfo changes, +or dependancy changes, without any changes to the actual binaries, +you are encouraged to keep your cswstage directory around, until you +put together the next update for the software you maintain. + +.SH DUMMY RUN + +Even if you can't, or don't want to, use stagepkg to do the "make install" +stage, it is still advisable for you to use it in a dummy run, so that it +makes the normal directory tree with special symbolic links for you, +under cswstage. You will then have to create and fix up your own prototype file. + +To do a dummy run, you can call it with any variable that would be passed to +"make". For example: + +.LP +stagepkg FAKEVAR=dummy + + +.SH SEE ALSO +\fBcheckpkg\fP(8), +\fBcreatepkg\fP(8), +\fBfakeroot\fP(1) +.br +http://www.opencsw.org/standards/ + +.SH AUTHORS +Philip Brown +.SH BUGS +Cannot cover every possible package configuration issue automatically This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 15 02:19:30 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 15 May 2009 00:19:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[4859] csw/mgar/pkg/php4/trunk Message-ID: Revision: 4859 http://gar.svn.sourceforge.net/gar/?rev=4859&view=rev Author: valholla Date: 2009-05-15 00:19:30 +0000 (Fri, 15 May 2009) Log Message: ----------- make 2 pkgs archall Modified Paths: -------------- csw/mgar/pkg/php4/trunk/Makefile csw/mgar/pkg/php4/trunk/files/pkgdef.mk Modified: csw/mgar/pkg/php4/trunk/Makefile =================================================================== --- csw/mgar/pkg/php4/trunk/Makefile 2009-05-14 20:40:01 UTC (rev 4858) +++ csw/mgar/pkg/php4/trunk/Makefile 2009-05-15 00:19:30 UTC (rev 4859) @@ -20,7 +20,7 @@ MASTER_SITES = http://us.php.net/distributions/ SPKG_SOURCEURL = http://www.php.net/downloads.php -DISTFILES = $(SF_PROJ)-$(GARVERSION).tar.bz2 +DISTFILES = $(DISTNAME).tar.bz2 INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) PHP4ROOT = $(DESTDIR)$(prefix)/php4 Modified: csw/mgar/pkg/php4/trunk/files/pkgdef.mk =================================================================== --- csw/mgar/pkg/php4/trunk/files/pkgdef.mk 2009-05-14 20:40:01 UTC (rev 4858) +++ csw/mgar/pkg/php4/trunk/files/pkgdef.mk 2009-05-15 00:19:30 UTC (rev 4859) @@ -5,7 +5,7 @@ PACKAGES += CSWphp4iconv CSWphp4imap CSWphp4ldap CSWphp4mbstring PACKAGES += CSWphp4mcal CSWphp4mssql CSWphp4mysql CSWphp4ncurses CSWphp4odbc PACKAGES += CSWphp4openssl CSWphp4pgsql CSWphp4zlib CSWap2modphp4 -PACKAGES += CSWmodphp4 CSWphp4 +PACKAGES += CSWmodphp4 CSWmodphp4core CSWphp4 CATALOGNAME_CSWphp4bcmath = php4_bcmath SPKG_DESC_CSWphp4bcmath = bcmath extension for php4 @@ -59,3 +59,5 @@ SPKG_DESC_CSWmodphp4core = Deprecated use mod_php4 or ap2_modphp4 CATALOGNAME_CSWphp4 = mod_php SPKG_DESC_CSWphp4 = Both an apache module and command line interpreter for the PHP language +ARCHALL_CSWphp4 = 1 +ARCHALL_CSWmodphp4core = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 15 05:30:23 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 15 May 2009 03:30:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[4860] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4860 http://gar.svn.sourceforge.net/gar/?rev=4860&view=rev Author: valholla Date: 2009-05-15 03:30:22 +0000 (Fri, 15 May 2009) Log Message: ----------- checkins Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/checksums csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile Added Paths: ----------- csw/mgar/pkg/php5/trunk/Makefile.Orig csw/mgar/pkg/php5/trunk/Makefile.default-dirs Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-05-15 00:19:30 UTC (rev 4859) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-05-15 03:30:22 UTC (rev 4860) @@ -1,8 +1,8 @@ -GARNAME = php5 -GARVERSION = 5.2.9 -CATEGORIES = lang -SF_PROJ = $(shell echo $(GARNAME) | sed -e 's/[0-9]//g') -DISTNAME = $(SF_PROJ)-$(GARVERSION) +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 @@ -21,9 +21,7 @@ MASTER_SITES = http://us.php.net/distributions/ SPKG_SOURCEURL = http://www.php.net/downloads.php DISTFILES += $(SF_PROJ)-$(GARVERSION).tar.bz2 - INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) - STRIP_DIRS += $(prefix)/lib/php/extensions/*/ # Auxilliary files @@ -31,7 +29,6 @@ DISTFILES += CSWphp5_ext_enable.sh CSWphp5_ext_disable.sh PACKAGES = CSWphp5 CSWphp5devel - CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Languages DISTFILES += CSWphp5.postinstall @@ -64,13 +61,13 @@ STRIP_LIBTOOL = 1 -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += --with-exec-dir=$(prefix)/bin CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-cli CONFIGURE_ARGS += --enable-fastcgi CONFIGURE_ARGS += --enable-force-cgi-redirect CONFIGURE_ARGS += --enable-pcntl=shared -CONFIGURE_ARGS += --enable-pdo=shared CONFIGURE_ARGS += --with-mm=$(prefix) CONFIGURE_ARGS += --enable-magic-quotes CONFIGURE_ARGS += --enable-spl=shared @@ -96,15 +93,15 @@ install-extras: ginstall -m 0755 $(WORKDIR)/phpext $(DESTDIR)$(bindir) - gsed -i -e s,PHPEXTDIR,$(shell $(bindir)/php-config --extension-dir),\ + gsed -i -e s,PHPEXTDIR,$(shell $(DESTDIR)$(bindir)/php-config --extension-dir),\ $(WORKDIR)/php.ini.CSW ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(libdir) ginstall -m 0644 $(WORKDIR)/pear.conf.CSW $(DESTDIR)$(sysconfdir) ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra ginstall -m 0644 $(WORKDIR)/httpd-php5.conf.CSW \ $(DESTDIR)$(prefix)/apache2/etc/extra - @(grm -fr $(DESTDIR)/.[a-z]*) - @(gfind $(libdir) -name "*.a" -exec grm {} \;) + #@(grm -fr $(DESTDIR)/.[a-z]*) + @(gfind $(DESTDIR)/$(libdir) -name "*.a" -exec grm {} \;) @(grm -f $(DESTDIR)$(sysconfdir)/pear.conf) @$(MAKECOOKIE) Added: csw/mgar/pkg/php5/trunk/Makefile.Orig =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.Orig (rev 0) +++ csw/mgar/pkg/php5/trunk/Makefile.Orig 2009-05-15 03:30:22 UTC (rev 4860) @@ -0,0 +1,148 @@ +GARNAME = php5 +GARVERSION = 5.2.9 +CATEGORIES = lang +SF_PROJ = $(shell echo $(GARNAME) | sed -e 's/[0-9]//g') + +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 + +php5_root = $(DESTDIR)$(prefix)/php5 +php5_bin = $(php5_root)/bin +php5_lib = $(php5_root)/lib + +MASTER_SITES = http://us.php.net/distributions/ +SPKG_SOURCEURL = http://www.php.net/downloads.php +DISTFILES += $(SF_PROJ)-$(GARVERSION).tar.bz2 + +INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) +PHP5ROOT = $(DESTDIR)$(prefix)/php5 + +STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ +STRIP_DIRS += $(PHP5ROOT)/bin + +# Auxilliary files +DISTFILES += php.ini.CSW phpext pear.conf.CSW +DISTFILES += CSWphp5_ext_enable.sh CSWphp5_ext_disable.sh + +PACKAGES = CSWphp5 CSWphp5devel + +CATALOGNAME_CSWphp5 = php5 +SPKG_DESC_CSWphp5 = A High-Level Scripting Languages +DISTFILES += CSWphp5.postinstall +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 = $(prefix)/php5/bin/php-config +PKGFILES_CSWphp5devel += $(prefix)/php5/bin/phpize +PKGFILES_CSWphp5devel += $(prefix)/php5/bin/peardev +PKGFILES_CSWphp5devel += $(prefix)/php5/include.* +PKGFILES_CSWphp5devel += $(prefix)/php5/lib/php/build/.* +PKGFILES_CSWphp5devel += $(prefix)/php5/man/.* + +PATCHFILES += configure.diff +PATCHFILES += php-bug-45557-fix.diff + +# PHP Extensions +EXTDIRLIST = $(shell ls -d extensions/*) +include $(foreach X,$(EXTDIRLIST),$(X)/Makefile) + +# BerkeleyDB +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 += --enable-pcntl=shared +CONFIGURE_ARGS += --enable-pdo=shared +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 + +# Rebuild Configure Args to build mod_php5 +NEW_CONFIGURE_ARGS = $(shell echo $(CONFIGURE_ARGS) |sed -e 's/apxs2/apxs/' \ + -e 's/apache2\/sbin\/apxs/apache\/bin\/apxs/') + +# Copy over template config files and utility scripts + +PI_SCRIPTS = install-extras +PI_SCRIPTS += install-ap2modphp5 +PI_SCRIPTS += install-modphp5 + +post-install-modulated: $(PI_SCRIPTS) + @$(MAKECOOKIE) + +install-extras: + ginstall -m 0755 $(WORKDIR)/phpext $(DESTDIR)$(prefix)/php5/bin + gsed -i -e s,PHPEXTDIR,$(shell $(PHP5ROOT)/bin/php-config --extension-dir),\ + $(WORKDIR)/php.ini.CSW + ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(prefix)/php5/lib + ginstall -m 0644 $(WORKDIR)/pear.conf.CSW $(DESTDIR)$(prefix)/php5/etc + ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra + ginstall -m 0644 $(WORKDIR)/httpd-php5.conf.CSW \ + $(DESTDIR)$(prefix)/apache2/etc/extra + @(grm -fr $(DESTDIR)/.[a-z]*) + @(gfind $(PHP5ROOT)/lib -name "*.a" -exec grm {} \;) + @(grm -f $(DESTDIR)$(prefix)/php5/etc/pear.conf) + @$(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 ) + @( gfind $(DESTDIR)$(prefix)/apache* \ + -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr ) + @$(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 ) + @( 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 gar/category.mk Added: csw/mgar/pkg/php5/trunk/Makefile.default-dirs =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.default-dirs (rev 0) +++ csw/mgar/pkg/php5/trunk/Makefile.default-dirs 2009-05-15 03:30:22 UTC (rev 4860) @@ -0,0 +1,139 @@ +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 +DISTFILES += $(SF_PROJ)-$(GARVERSION).tar.bz2 +INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) +STRIP_DIRS += $(prefix)/lib/php/extensions/*/ + +# Auxilliary files +DISTFILES += php.ini.CSW phpext pear.conf.CSW +DISTFILES += CSWphp5_ext_enable.sh CSWphp5_ext_disable.sh + +PACKAGES = CSWphp5 CSWphp5devel +CATALOGNAME_CSWphp5 = php5 +SPKG_DESC_CSWphp5 = A High-Level Scripting Languages +DISTFILES += CSWphp5.postinstall +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 += $(includedir)/.* +PKGFILES_CSWphp5devel += $(libdir)/php/build/.* +PKGFILES_CSWphp5devel += $(mandir)/.* + +PATCHFILES += configure.diff +PATCHFILES += php-bug-45557-fix.diff + +# PHP Extensions +EXTDIRLIST = $(shell ls -d extensions/*) +include $(foreach X,$(EXTDIRLIST),$(X)/Makefile) + +# BerkeleyDB +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) +CONFIGURE_ARGS += --with-exec-dir=$(prefix)/bin +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --enable-cli +CONFIGURE_ARGS += --enable-fastcgi +CONFIGURE_ARGS += --enable-force-cgi-redirect +CONFIGURE_ARGS += --enable-pcntl=shared +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 + +# Rebuild Configure Args to build mod_php5 +NEW_CONFIGURE_ARGS = $(shell echo $(CONFIGURE_ARGS) |sed -e 's/apxs2/apxs/' \ + -e 's/apache2\/sbin\/apxs/apache\/bin\/apxs/') + +# Copy over template config files and utility scripts + +PI_SCRIPTS = install-extras +PI_SCRIPTS += install-ap2modphp5 +PI_SCRIPTS += install-modphp5 + +post-install-modulated: $(PI_SCRIPTS) + @$(MAKECOOKIE) + +install-extras: + ginstall -m 0755 $(WORKDIR)/phpext $(DESTDIR)$(bindir) + gsed -i -e s,PHPEXTDIR,$(shell $(DESTDIR)$(bindir)/php-config --extension-dir),\ + $(WORKDIR)/php.ini.CSW + ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(libdir) + ginstall -m 0644 $(WORKDIR)/pear.conf.CSW $(DESTDIR)$(sysconfdir) + ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra + ginstall -m 0644 $(WORKDIR)/httpd-php5.conf.CSW \ + $(DESTDIR)$(prefix)/apache2/etc/extra + #@(grm -fr $(DESTDIR)/.[a-z]*) + @(gfind $(DESTDIR)/$(libdir) -name "*.a" -exec grm {} \;) + @(grm -f $(DESTDIR)$(sysconfdir)/pear.conf) + @$(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 ) + @( gfind $(DESTDIR)$(prefix)/apache* \ + -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr ) + @$(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 ) + @( 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 gar/category.mk Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-05-15 00:19:30 UTC (rev 4859) +++ csw/mgar/pkg/php5/trunk/checksums 2009-05-15 03:30:22 UTC (rev 4860) @@ -4,14 +4,14 @@ 5f0046fe1b3f8e2228fdb165bdbbe73a download/CSWmodphp5.postinstall 2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space -f82303f581e2e4bf11fe3bf10f332163 download/CSWphp5.postinstall -89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh -de56d3571f4484284d106af158bffc38 download/CSWphp5_ext_enable.sh +09fe57944fadf7cf5769d1070cf9cc90 download/CSWphp5.postinstall +4265ed6459d99f5cbe8eae29bf5c0b71 download/CSWphp5_ext_disable.sh +139abbf5e4b843dba93b1c51978038ba download/CSWphp5_ext_enable.sh ab08e2ba62667bf13fa236099e433e84 download/configure.diff a71677d80f5cfd1aeb03547dfdeb705a download/httpd-php5.conf.CSW 2206431e47c2075c0b9c4a12de5cf791 download/odbc.diff 230126f76ee6400ccf225bb6a8243532 download/pdopgsql.diff -d4c93751890b989c5a7b04acb5845fd9 download/pear.conf.CSW +04b5f14d8e02b59105e8dad2ead08995 download/pear.conf.CSW 13db46097c9686302bebf160e2d26ed2 download/pgsql.diff 280d6cda7f72a4fc6de42fda21ac2db7 download/php-5.2.9.tar.bz2 a450a46ce0ea9fd0c0abe432e750a873 download/php-bug-45557-fix.diff Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile 2009-05-15 00:19:30 UTC (rev 4859) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile 2009-05-15 03:30:22 UTC (rev 4860) @@ -6,6 +6,8 @@ SPKG_DESC_CSWphp5pdo = A database access abstraction module for PHP applications REQUIRED_PKGS_CSWphp5pdo = CSWphp5 +CONFIGURE_ARGS += --enable-pdo=shared + PKGFILES_CSWphp5pdo = .*/lib/php/extensions/.*/pdo\.so* define CSWphp5pdo_postinstall Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-05-15 00:19:30 UTC (rev 4859) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-05-15 03:30:22 UTC (rev 4860) @@ -6,7 +6,7 @@ SPKG_DESC_CSWphp5pdosqlite = A Sqlite specific database access abstraction module for PHP applications REQUIRED_PKGS_CSWphp5pdosqlite = CSWphp5 CSWphp5pdo -CONFIGURE_ARGS += --with-pdo-sqlite=shared +CONFIGURE_ARGS += --with-pdo-sqlite=shared,$(prefix) PKGFILES_CSWphp5pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 15 05:38:55 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 15 May 2009 03:38:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[4861] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4861 http://gar.svn.sourceforge.net/gar/?rev=4861&view=rev Author: valholla Date: 2009-05-15 03:38:55 +0000 (Fri, 15 May 2009) Log Message: ----------- tweak distname Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/Makefile.Orig Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-05-15 03:30:22 UTC (rev 4860) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-05-15 03:38:55 UTC (rev 4861) @@ -20,7 +20,7 @@ MASTER_SITES = http://us.php.net/distributions/ SPKG_SOURCEURL = http://www.php.net/downloads.php -DISTFILES += $(SF_PROJ)-$(GARVERSION).tar.bz2 +DISTFILES += $(DISTNAME).tar.bz2 INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) STRIP_DIRS += $(prefix)/lib/php/extensions/*/ Modified: csw/mgar/pkg/php5/trunk/Makefile.Orig =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.Orig 2009-05-15 03:30:22 UTC (rev 4860) +++ csw/mgar/pkg/php5/trunk/Makefile.Orig 2009-05-15 03:38:55 UTC (rev 4861) @@ -2,6 +2,7 @@ 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 @@ -23,7 +24,7 @@ MASTER_SITES = http://us.php.net/distributions/ SPKG_SOURCEURL = http://www.php.net/downloads.php -DISTFILES += $(SF_PROJ)-$(GARVERSION).tar.bz2 +DISTFILES += $(DISTNAME).tar.bz2 INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) PHP5ROOT = $(DESTDIR)$(prefix)/php5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri May 15 06:00:11 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 15 May 2009 04:00:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[4862] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 4862 http://gar.svn.sourceforge.net/gar/?rev=4862&view=rev Author: rthurner Date: 2009-05-15 04:00:10 +0000 (Fri, 15 May 2009) Log Message: ----------- upgrade to svn-1.6.2 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-05-15 03:38:55 UTC (rev 4861) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-05-15 04:00:10 UTC (rev 4862) @@ -1,5 +1,5 @@ GARNAME = subversion -DISTVERSION = 1.6.1 +DISTVERSION = 1.6.2 GARVERSION = $(subst -,,$(DISTVERSION)) CATEGORIES = utils Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2009-05-15 03:38:55 UTC (rev 4861) +++ csw/mgar/pkg/subversion/trunk/checksums 2009-05-15 04:00:10 UTC (rev 4862) @@ -4,6 +4,6 @@ 41ec540885de7c34625768aa1fb9682b download/fixme.sh f107831ad0c702ff32e51df6a207237b download/httpd-svn.conf.CSW f0aa58c145ae99f8e4d72499ab826169 download/javahl_headers_for_nested_classes.diff -95708b96b920faeffca017f43ec96777 download/subversion-1.6.1.tar.bz2 +ebb1cecd313533ca0876f9bfc86bd5d9 download/subversion-1.6.2.tar.bz2 f7d05c59656dcf01fb844295c9912f78 download/subversion161.diff 1b532d3055708a97771f5cd959983628 download/svn_access.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 15 08:59:20 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 May 2009 06:59:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[4863] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 4863 http://gar.svn.sourceforge.net/gar/?rev=4863&view=rev Author: dmichelsen Date: 2009-05-15 06:59:19 +0000 (Fri, 15 May 2009) Log Message: ----------- cswutils: Add dependencies to needed Perl modules, fixes #2730 Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2009-05-15 04:00:10 UTC (rev 4862) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2009-05-15 06:59:19 UTC (rev 4863) @@ -14,6 +14,7 @@ DISTFILES += stagepkg stagepkg.8 REQUIRED_PKGS = CSWtextutils CSWfakeroot CSWperl +REQUIRED_PKGS += CSWpmyaml CSWpmlibwww CSWpmhtmltree WORKSRC = $(WORKDIR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri May 15 11:25:51 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 May 2009 09:25:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[4864] csw/mgar/pkg/cpan Message-ID: Revision: 4864 http://gar.svn.sourceforge.net/gar/?rev=4864&view=rev Author: skayser Date: 2009-05-15 09:25:50 +0000 (Fri, 15 May 2009) Log Message: ----------- cpan/Time-Format: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Time-Format/ csw/mgar/pkg/cpan/Time-Format/branches/ csw/mgar/pkg/cpan/Time-Format/tags/ csw/mgar/pkg/cpan/Time-Format/trunk/ csw/mgar/pkg/cpan/Time-Format/trunk/Makefile csw/mgar/pkg/cpan/Time-Format/trunk/checksums csw/mgar/pkg/cpan/Time-Format/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Time-Format/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/cpan/Time-Format/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Time-Format/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Time-Format/trunk/Makefile 2009-05-15 09:25:50 UTC (rev 4864) @@ -0,0 +1,16 @@ +GARNAME = Time-Format +GARVERSION = 1.09 +CATEGORIES = cpan +AUTHOR = ROODE + +DESCRIPTION = Easy-to-use date/time formatting +define BLURB + Time::Format provides a very easy way to format dates and times. The + formatting functions are tied to hash variables, so they can be used inside + strings as well as in ordinary expressions. The formatting codes used are + meant to be easy to remember, use, and read. +endef + +PACKAGES = CSWpmtimeformat +CATALOGNAME = pm_timeformat +include gar/category.mk Added: csw/mgar/pkg/cpan/Time-Format/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Time-Format/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Time-Format/trunk/checksums 2009-05-15 09:25:50 UTC (rev 4864) @@ -0,0 +1 @@ +c0edfd94d8f4cb814dee7bdf7e9ed61f download/Time-Format-1.09.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri May 15 12:10:22 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 May 2009 10:10:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[4865] csw/mgar/pkg/cpan/List-MoreUtils/trunk/ Message-ID: Revision: 4865 http://gar.svn.sourceforge.net/gar/?rev=4865&view=rev Author: skayser Date: 2009-05-15 10:10:21 +0000 (Fri, 15 May 2009) Log Message: ----------- cpan/List-MoreUtils: switch to mgar v2 Property Changed: ---------------- csw/mgar/pkg/cpan/List-MoreUtils/trunk/ Property changes on: csw/mgar/pkg/cpan/List-MoreUtils/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.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. From dmichelsen at users.sourceforge.net Fri May 15 12:37:47 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 May 2009 10:37:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[4866] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 4866 http://gar.svn.sourceforge.net/gar/?rev=4866&view=rev Author: dmichelsen Date: 2009-05-15 10:37:46 +0000 (Fri, 15 May 2009) Log Message: ----------- mGAR v2: Add support for CSW classutils 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-05-15 10:10:21 UTC (rev 4865) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-05-15 10:37:46 UTC (rev 4866) @@ -116,10 +116,16 @@ # Handle cswclassutils # - prepend cswpreserveconf if it is not already in SPKG_CLASSES -SPKG_CLASSES := $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf)) $(SPKG_CLASSES) +SPKG_CLASSES += $(if $(SAMPLECONF),$(if $(filter cswsampleconf,$(SPKG_CLASSES)),,cswsampleconf)) +SPKG_CLASSES += $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf)) +SPKG_CLASSES += $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf)) # - set class for all config files -ifneq ($(PRESERVECONF),) -_CSWCLASS_FILTER = | perl -ane '$(foreach CONF,$(PRESERVECONF),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(CONF)$$) );)print join(" ", at F),"\n";' +ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF),) +_CSWCLASS_FILTER = | perl -ane '\ + $(foreach FILE,$(SAMPLECONF),$$F[1] = "cswsampleconf" if ( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(PRESERVECONF),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(INITMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ + print join(" ", at F),"\n";' _EXTRA_GAR_PKGS += CSWcswclassutils endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri May 15 13:16:05 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 May 2009 11:16:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[4867] csw/mgar/pkg/cpan/List-MoreUtils/trunk Message-ID: Revision: 4867 http://gar.svn.sourceforge.net/gar/?rev=4867&view=rev Author: skayser Date: 2009-05-15 11:16:05 +0000 (Fri, 15 May 2009) Log Message: ----------- cpan/List-MoreUtils: completed switch to mgar v2 Modified Paths: -------------- csw/mgar/pkg/cpan/List-MoreUtils/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/cpan/List-MoreUtils/trunk/files/CSWpmlistmoreut.gspec csw/mgar/pkg/cpan/List-MoreUtils/trunk/files/CSWpmlistmoreut.prototype Modified: csw/mgar/pkg/cpan/List-MoreUtils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/List-MoreUtils/trunk/Makefile 2009-05-15 10:37:46 UTC (rev 4866) +++ csw/mgar/pkg/cpan/List-MoreUtils/trunk/Makefile 2009-05-15 11:16:05 UTC (rev 4867) @@ -9,7 +9,11 @@ lists which is not going to go into List::Util. endef -DISTFILES += $(call admfiles,CSWpmlistmoreut,prototype) +PACKAGES = CSWpmlistmoreutils +CATALOGNAME = pm_listmoreutils include gar/category.mk +pre-merge-modulated: + @cd $(WORKSRC) && sed -n '/^Copyright/,$$p' README > COPYING + @$(MAKECOOKIE) Deleted: csw/mgar/pkg/cpan/List-MoreUtils/trunk/files/CSWpmlistmoreut.gspec =================================================================== --- csw/mgar/pkg/cpan/List-MoreUtils/trunk/files/CSWpmlistmoreut.gspec 2009-05-15 10:37:46 UTC (rev 4866) +++ csw/mgar/pkg/cpan/List-MoreUtils/trunk/files/CSWpmlistmoreut.gspec 2009-05-15 11:16:05 UTC (rev 4867) @@ -1,9 +0,0 @@ -%var bitname pm_listmoreut -%var pkgname CSWpmlistmoreut -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (C) 2004-2006 by Tassilo von Parseval - -This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself, either Perl version 5.8.4 or, -at your option, any later version of Perl 5 you may have available. Deleted: csw/mgar/pkg/cpan/List-MoreUtils/trunk/files/CSWpmlistmoreut.prototype =================================================================== --- csw/mgar/pkg/cpan/List-MoreUtils/trunk/files/CSWpmlistmoreut.prototype 2009-05-15 10:37:46 UTC (rev 4866) +++ csw/mgar/pkg/cpan/List-MoreUtils/trunk/files/CSWpmlistmoreut.prototype 2009-05-15 11:16:05 UTC (rev 4867) @@ -1,15 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/List 0755 root bin -f none /opt/csw/lib/perl/csw/List/MoreUtils.pm 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/List 0755 root bin -d none /opt/csw/lib/perl/csw/auto/List/MoreUtils 0755 root bin -f none /opt/csw/lib/perl/csw/auto/List/MoreUtils/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/List/MoreUtils/MoreUtils.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/List/MoreUtils/MoreUtils.so 0555 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/List::MoreUtils.3perl 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 15 13:35:32 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 May 2009 11:35:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[4868] csw/mgar/pkg/gar/trunk Message-ID: Revision: 4868 http://gar.svn.sourceforge.net/gar/?rev=4868&view=rev Author: dmichelsen Date: 2009-05-15 11:35:32 +0000 (Fri, 15 May 2009) Log Message: ----------- gar: Use dynamic gspec Modified Paths: -------------- csw/mgar/pkg/gar/trunk/Makefile csw/mgar/pkg/gar/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/gar/trunk/files/CSWgar-v1.gspec csw/mgar/pkg/gar/trunk/files/CSWgar-v2.gspec csw/mgar/pkg/gar/trunk/files/CSWgar.gspec Property Changed: ---------------- csw/mgar/pkg/gar/trunk/ Property changes on: csw/mgar/pkg/gar/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 gar-base https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 gar-base https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar Modified: csw/mgar/pkg/gar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gar/trunk/Makefile 2009-05-15 11:16:05 UTC (rev 4867) +++ csw/mgar/pkg/gar/trunk/Makefile 2009-05-15 11:35:32 UTC (rev 4868) @@ -8,15 +8,14 @@ # No master sites, we already have GAR in the repository MASTER_SITES = -DISTFILES = $(call admfiles,CSWgar,) -DISTFILES += $(call admfiles,CSWgar-v1,) -DISTFILES += $(call admfiles,CSWgar-v2,) -DISTFILES += garit +DISTFILES = garit WORKSRC = $(WORKDIR) SPKG_SOURCEURL = http://gar.sourceforge.net +PACKAGES = CSWgar CSWgar-v1 CSWgar-v2 + SPKG_DESC_CSWgar = The mGAR package build system SPKG_DESC_CSWgar-v1 = The mGAR v1 system files SPKG_DESC_CSWgar-v2 = The mGAR v2 system files @@ -25,10 +24,14 @@ REQUIRED_PKGS_CSWgar-v1 = CSWgar REQUIRED_PKGS_CSWgar-v2 = CSWgar +SPKG_VERSION_CSWgar = $(shell svnversion) +SPKG_VERSION_CSWgar-v1 = $(shell svnversion $(CURDIR)/gar-base/v1) +SPKG_VERSION_CSWgar-v2 = $(shell svnversion $(CURDIR)/gar-base/v2) + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = -INSTALL_SCRIPTS = custom +INSTALL_SCRIPTS = gar PKGFILES_CSWgar-v1 = $(prefix)/src/gar/v1/.* PKGFILES_CSWgar-v2 = $(prefix)/src/gar/v2/.* @@ -38,7 +41,7 @@ include gar/category.mk -install-custom: +install-gar: @echo " ==> Installing $(GARNAME)" rm -f $(DESTIR)$(bindir)/garit Modified: csw/mgar/pkg/gar/trunk/checksums =================================================================== --- csw/mgar/pkg/gar/trunk/checksums 2009-05-15 11:16:05 UTC (rev 4867) +++ csw/mgar/pkg/gar/trunk/checksums 2009-05-15 11:35:32 UTC (rev 4868) @@ -1,4 +1,4 @@ ce15d9d2f3f7c2807b385142097446f6 download/CSWgar.gspec 972eef3a1dd23345e20df9d7b34ccf85 download/CSWgar-v1.gspec 8d0f9e54dfd9dc49147343ab5eef546d download/CSWgar-v2.gspec -3505c7f06c435fd0b34e9addd5b4da2a download/garit +43510d4dec1534ee26db599597b53668 download/garit Deleted: csw/mgar/pkg/gar/trunk/files/CSWgar-v1.gspec =================================================================== --- csw/mgar/pkg/gar/trunk/files/CSWgar-v1.gspec 2009-05-15 11:16:05 UTC (rev 4867) +++ csw/mgar/pkg/gar/trunk/files/CSWgar-v1.gspec 2009-05-15 11:35:32 UTC (rev 4868) @@ -1,5 +0,0 @@ -%var bitname gar_v1 -%var pkgname CSWgar-v1 -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright -This software is released under GPL. Deleted: csw/mgar/pkg/gar/trunk/files/CSWgar-v2.gspec =================================================================== --- csw/mgar/pkg/gar/trunk/files/CSWgar-v2.gspec 2009-05-15 11:16:05 UTC (rev 4867) +++ csw/mgar/pkg/gar/trunk/files/CSWgar-v2.gspec 2009-05-15 11:35:32 UTC (rev 4868) @@ -1,5 +0,0 @@ -%var bitname gar_v2 -%var pkgname CSWgar-v2 -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright -This software is released under GPL. Deleted: csw/mgar/pkg/gar/trunk/files/CSWgar.gspec =================================================================== --- csw/mgar/pkg/gar/trunk/files/CSWgar.gspec 2009-05-15 11:16:05 UTC (rev 4867) +++ csw/mgar/pkg/gar/trunk/files/CSWgar.gspec 2009-05-15 11:35:32 UTC (rev 4868) @@ -1,5 +0,0 @@ -%var bitname gar -%var pkgname CSWgar -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright -This software is released under GPL. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri May 15 13:59:36 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 May 2009 11:59:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[4869] csw/mgar/pkg/cpan Message-ID: Revision: 4869 http://gar.svn.sourceforge.net/gar/?rev=4869&view=rev Author: skayser Date: 2009-05-15 11:59:36 +0000 (Fri, 15 May 2009) Log Message: ----------- cpan/DateTime-Locale: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/DateTime-Locale/ csw/mgar/pkg/cpan/DateTime-Locale/branches/ csw/mgar/pkg/cpan/DateTime-Locale/tags/ csw/mgar/pkg/cpan/DateTime-Locale/trunk/ csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile csw/mgar/pkg/cpan/DateTime-Locale/trunk/checksums csw/mgar/pkg/cpan/DateTime-Locale/trunk/files/ Property changes on: csw/mgar/pkg/cpan/DateTime-Locale/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/cpan/DateTime-Locale/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile 2009-05-15 11:59:36 UTC (rev 4869) @@ -0,0 +1,19 @@ +GARNAME = DateTime-Locale +GARVERSION = 0.42 +CATEGORIES = cpan +AUTHOR = DROLSKY + +DESCRIPTION = Localization support for DateTime.pm +define BLURB + DateTime::Locale is primarily a factory for the various locale subclasses. + It also provides some functions for getting information on all the available + locales. +endef + +PACKAGES = CSWpmdatetimelocale +CATALOGNAME = pm_datetimelocale + +include gar/category.mk + +LICENSE = LICENSE + Added: csw/mgar/pkg/cpan/DateTime-Locale/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DateTime-Locale/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/DateTime-Locale/trunk/checksums 2009-05-15 11:59:36 UTC (rev 4869) @@ -0,0 +1 @@ +2f40350ef1c697f1bc402220824f6a7a download/DateTime-Locale-0.42.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 15 13:59:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 May 2009 11:59:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[4870] csw/mgar/pkg/gar/trunk Message-ID: Revision: 4870 http://gar.svn.sourceforge.net/gar/?rev=4870&view=rev Author: dmichelsen Date: 2009-05-15 11:59:46 +0000 (Fri, 15 May 2009) Log Message: ----------- gar: Use regular svn checkout instead special links to make package more regular Modified Paths: -------------- csw/mgar/pkg/gar/trunk/Makefile csw/mgar/pkg/gar/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/gar/trunk/ Property changes on: csw/mgar/pkg/gar/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 gar-base https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/gar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gar/trunk/Makefile 2009-05-15 11:59:36 UTC (rev 4869) +++ csw/mgar/pkg/gar/trunk/Makefile 2009-05-15 11:59:46 UTC (rev 4870) @@ -7,15 +7,23 @@ endef # No master sites, we already have GAR in the repository -MASTER_SITES = -DISTFILES = garit +MASTER_SITES = svn-http://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/ +SVNHTTP_CO_ARGS = --no-auth-cache +DISTFILES = v1 v2 +NOCHECKSUM = v1 v2 +DISTFILES += garit + WORKSRC = $(WORKDIR) -SPKG_SOURCEURL = http://gar.sourceforge.net +SPKG_SOURCEURL = http://gar.opencsw.org PACKAGES = CSWgar CSWgar-v1 CSWgar-v2 +CATALOGNAME_CSWgar = gar +CATALOGNAME_CSWgar-v1 = gar_v1 +CATALOGNAME_CSWgar-v2 = gar_v2 + SPKG_DESC_CSWgar = The mGAR package build system SPKG_DESC_CSWgar-v1 = The mGAR v1 system files SPKG_DESC_CSWgar-v2 = The mGAR v2 system files @@ -25,8 +33,8 @@ REQUIRED_PKGS_CSWgar-v2 = CSWgar SPKG_VERSION_CSWgar = $(shell svnversion) -SPKG_VERSION_CSWgar-v1 = $(shell svnversion $(CURDIR)/gar-base/v1) -SPKG_VERSION_CSWgar-v2 = $(shell svnversion $(CURDIR)/gar-base/v2) +SPKG_VERSION_CSWgar-v1 = $(shell svnversion $(WORKSRC)/v1) +SPKG_VERSION_CSWgar-v2 = $(shell svnversion $(WORKSRC)/v2) CONFIGURE_SCRIPTS = BUILD_SCRIPTS = @@ -48,4 +56,4 @@ ginstall -d $(DESTDIR)$(bindir) ginstall $(WORKSRC)/garit $(DESTDIR)$(bindir)/garit ginstall -d $(DESTDIR)$(prefix)/src/gar - cd $(CURDIR)/gar-base && pax -r -w -v -s ,.*/\.svn.*,, . $(DESTDIR)$(prefix)/src/gar + cd $(WORKSRC) && pax -r -w -v -s ,.*/\.svn.*,, v1 v2 $(DESTDIR)$(prefix)/src/gar Modified: csw/mgar/pkg/gar/trunk/checksums =================================================================== --- csw/mgar/pkg/gar/trunk/checksums 2009-05-15 11:59:36 UTC (rev 4869) +++ csw/mgar/pkg/gar/trunk/checksums 2009-05-15 11:59:46 UTC (rev 4870) @@ -1,4 +1 @@ -ce15d9d2f3f7c2807b385142097446f6 download/CSWgar.gspec -972eef3a1dd23345e20df9d7b34ccf85 download/CSWgar-v1.gspec -8d0f9e54dfd9dc49147343ab5eef546d download/CSWgar-v2.gspec 43510d4dec1534ee26db599597b53668 download/garit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri May 15 14:23:13 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 May 2009 12:23:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[4871] csw/mgar/pkg/cpan Message-ID: Revision: 4871 http://gar.svn.sourceforge.net/gar/?rev=4871&view=rev Author: skayser Date: 2009-05-15 12:23:13 +0000 (Fri, 15 May 2009) Log Message: ----------- cpan/Class-Singleton: inital commit Added Paths: ----------- csw/mgar/pkg/cpan/Class-Singleton/ csw/mgar/pkg/cpan/Class-Singleton/branches/ csw/mgar/pkg/cpan/Class-Singleton/tags/ csw/mgar/pkg/cpan/Class-Singleton/trunk/ csw/mgar/pkg/cpan/Class-Singleton/trunk/Makefile csw/mgar/pkg/cpan/Class-Singleton/trunk/checksums csw/mgar/pkg/cpan/Class-Singleton/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Class-Singleton/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/cpan/Class-Singleton/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Singleton/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Class-Singleton/trunk/Makefile 2009-05-15 12:23:13 UTC (rev 4871) @@ -0,0 +1,28 @@ +GARNAME = Class-Singleton +GARVERSION = 1.4 +CATEGORIES = cpan +AUTHOR = ABW + +DESCRIPTION = Implementation of a "Singleton" class +define BLURB + This is the Class::Singleton module. A Singleton describes an object + class that can have only one instance in any system. An example of a + Singleton might be a print spooler or system registry. This module + implements a Singleton class from which other classes can be derived. By + itself, the Class::Singleton module does very little other than manage + the instantiation of a single object. In deriving a class from + Class::Singleton, your module will inherit the Singleton instantiation + method and can implement whatever specific functionality is + required. +endef + +PACKAGES = CSWpmclasssingleton +CATALOGNAME = pm_classsingleton + +ARCHALL = 1 + +include gar/category.mk + +pre-merge-modulated: + @cd $(WORKSRC) && sed -n '/^Copyright/,$$p' README > COPYING + @$(MAKECOOKIE) Added: csw/mgar/pkg/cpan/Class-Singleton/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Class-Singleton/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Class-Singleton/trunk/checksums 2009-05-15 12:23:13 UTC (rev 4871) @@ -0,0 +1 @@ +a18b108ab97e2107cbbe816d2b3e2ee3 download/Class-Singleton-1.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri May 15 14:32:33 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 May 2009 12:32:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[4872] csw/mgar/pkg/cpan/Params-Validate/trunk Message-ID: Revision: 4872 http://gar.svn.sourceforge.net/gar/?rev=4872&view=rev Author: skayser Date: 2009-05-15 12:32:33 +0000 (Fri, 15 May 2009) Log Message: ----------- cpan/Params-Validate: switched to mgar v2 Modified Paths: -------------- csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/cpan/Params-Validate/trunk/files/CSWpmprmsvldt.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Params-Validate/trunk/ Property changes on: csw/mgar/pkg/cpan/Params-Validate/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile 2009-05-15 12:23:13 UTC (rev 4871) +++ csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile 2009-05-15 12:32:33 UTC (rev 4872) @@ -11,6 +11,9 @@ unspecified additional parameters were passed in. endef -DISTFILES += $(call admfiles,CSWpmprmsvldt,) +PACKAGES = CSWpmparamsvalidate +CATALOGNAME = pm_paramsvalidate include gar/category.mk + +LICENSE = LICENSE Deleted: csw/mgar/pkg/cpan/Params-Validate/trunk/files/CSWpmprmsvldt.gspec =================================================================== --- csw/mgar/pkg/cpan/Params-Validate/trunk/files/CSWpmprmsvldt.gspec 2009-05-15 12:23:13 UTC (rev 4871) +++ csw/mgar/pkg/cpan/Params-Validate/trunk/files/CSWpmprmsvldt.gspec 2009-05-15 12:32:33 UTC (rev 4872) @@ -1,4 +0,0 @@ -%var bitname pm_prmsvldt -%var pkgname CSWpmprmsvldt -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri May 15 14:34:37 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 May 2009 12:34:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[4873] csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile Message-ID: Revision: 4873 http://gar.svn.sourceforge.net/gar/?rev=4873&view=rev Author: skayser Date: 2009-05-15 12:34:33 +0000 (Fri, 15 May 2009) Log Message: ----------- cpan/DateTime-Locale: updated dependencies Modified Paths: -------------- csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile Modified: csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile 2009-05-15 12:32:33 UTC (rev 4872) +++ csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile 2009-05-15 12:34:33 UTC (rev 4873) @@ -13,6 +13,8 @@ PACKAGES = CSWpmdatetimelocale CATALOGNAME = pm_datetimelocale +REQUIRED_PKGS = CSWpmlistmoreutils + include gar/category.mk LICENSE = LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri May 15 14:40:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 May 2009 12:40:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[4874] csw/mgar/pkg/gar/trunk/Makefile Message-ID: Revision: 4874 http://gar.svn.sourceforge.net/gar/?rev=4874&view=rev Author: dmichelsen Date: 2009-05-15 12:40:05 +0000 (Fri, 15 May 2009) Log Message: ----------- gar: Fix branch versioning Modified Paths: -------------- csw/mgar/pkg/gar/trunk/Makefile Modified: csw/mgar/pkg/gar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gar/trunk/Makefile 2009-05-15 12:34:33 UTC (rev 4873) +++ csw/mgar/pkg/gar/trunk/Makefile 2009-05-15 12:40:05 UTC (rev 4874) @@ -24,18 +24,18 @@ CATALOGNAME_CSWgar-v1 = gar_v1 CATALOGNAME_CSWgar-v2 = gar_v2 +REQUIRED_PKGS_CSWgar = $(PREREQUISITE_BASE_PKGS) CSWsvn +REQUIRED_PKGS_CSWgar-v1 = CSWgar +REQUIRED_PKGS_CSWgar-v2 = CSWgar + SPKG_DESC_CSWgar = The mGAR package build system SPKG_DESC_CSWgar-v1 = The mGAR v1 system files SPKG_DESC_CSWgar-v2 = The mGAR v2 system files -REQUIRED_PKGS_CSWgar = $(PREREQUISITE_BASE_PKGS) CSWsvn -REQUIRED_PKGS_CSWgar-v1 = CSWgar -REQUIRED_PKGS_CSWgar-v2 = CSWgar +SPKG_VERSION_CSWgar = $(call _REVISION) +SPKG_VERSION_CSWgar-v1 = $(shell svnversion $(DOWNLOADDIR)/v1) +SPKG_VERSION_CSWgar-v2 = $(shell svnversion $(DOWNLOADDIR)/v2) -SPKG_VERSION_CSWgar = $(shell svnversion) -SPKG_VERSION_CSWgar-v1 = $(shell svnversion $(WORKSRC)/v1) -SPKG_VERSION_CSWgar-v2 = $(shell svnversion $(WORKSRC)/v2) - CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri May 15 14:44:53 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 May 2009 12:44:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[4875] csw/mgar/pkg/cpan Message-ID: Revision: 4875 http://gar.svn.sourceforge.net/gar/?rev=4875&view=rev Author: skayser Date: 2009-05-15 12:44:49 +0000 (Fri, 15 May 2009) Log Message: ----------- cpan/DateTime-TimeZone: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/DateTime-TimeZone/ csw/mgar/pkg/cpan/DateTime-TimeZone/branches/ csw/mgar/pkg/cpan/DateTime-TimeZone/tags/ csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/ csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/checksums csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/files/ Property changes on: csw/mgar/pkg/cpan/DateTime-TimeZone/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/cpan/DateTime-TimeZone/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile 2009-05-15 12:44:49 UTC (rev 4875) @@ -0,0 +1,24 @@ +GARNAME = DateTime-TimeZone +GARVERSION = 0.90 +CATEGORIES = cpan +AUTHOR = DROLSKY + +DESCRIPTION = Time zone object base class and factory +define BLURB + This class is the base class for all time zone objects. A time zone is + represented internally as a set of observances, each of which describes + the offset from GMT for a given time period. Note that without the + DateTime.pm module, this module does not do much. It's primary interface + is through a DateTime object, and most users will not need to directly + use DateTime::TimeZone methods. +endef + +PACKAGES = CSWpmdatetimetimezone +CATALOGNAME = pm_datetimetimezone + +REQUIRED_PKGS = CSWpmclasssingleton +REQUIRED_PKGS += CSWpmparamsvalidate + +include gar/category.mk + +LICENSE = LICENSE Added: csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/checksums 2009-05-15 12:44:49 UTC (rev 4875) @@ -0,0 +1 @@ +d0efeaf9d52e51b727fbd927e3348e58 download/DateTime-TimeZone-0.90.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri May 15 14:51:11 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 May 2009 12:51:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[4876] csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile Message-ID: Revision: 4876 http://gar.svn.sourceforge.net/gar/?rev=4876&view=rev Author: skayser Date: 2009-05-15 12:51:11 +0000 (Fri, 15 May 2009) Log Message: ----------- cpan/DateTime-TimeZone: ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile Modified: csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile 2009-05-15 12:44:49 UTC (rev 4875) +++ csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile 2009-05-15 12:51:11 UTC (rev 4876) @@ -15,6 +15,7 @@ PACKAGES = CSWpmdatetimetimezone CATALOGNAME = pm_datetimetimezone +ARCHALL = 1 REQUIRED_PKGS = CSWpmclasssingleton REQUIRED_PKGS += CSWpmparamsvalidate This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri May 15 14:52:39 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 May 2009 12:52:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[4877] csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile Message-ID: Revision: 4877 http://gar.svn.sourceforge.net/gar/?rev=4877&view=rev Author: skayser Date: 2009-05-15 12:52:39 +0000 (Fri, 15 May 2009) Log Message: ----------- cpan/DateTime-Locale: ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile Modified: csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile 2009-05-15 12:51:11 UTC (rev 4876) +++ csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile 2009-05-15 12:52:39 UTC (rev 4877) @@ -12,6 +12,7 @@ PACKAGES = CSWpmdatetimelocale CATALOGNAME = pm_datetimelocale +ARCHALL = 1 REQUIRED_PKGS = CSWpmlistmoreutils This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri May 15 15:06:44 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 May 2009 13:06:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[4878] csw/mgar/pkg/cpan Message-ID: Revision: 4878 http://gar.svn.sourceforge.net/gar/?rev=4878&view=rev Author: skayser Date: 2009-05-15 13:06:43 +0000 (Fri, 15 May 2009) Log Message: ----------- cpan/DateTime: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/DateTime/ csw/mgar/pkg/cpan/DateTime/branches/ csw/mgar/pkg/cpan/DateTime/tags/ csw/mgar/pkg/cpan/DateTime/trunk/ csw/mgar/pkg/cpan/DateTime/trunk/Makefile csw/mgar/pkg/cpan/DateTime/trunk/checksums csw/mgar/pkg/cpan/DateTime/trunk/files/ Property changes on: csw/mgar/pkg/cpan/DateTime/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/cpan/DateTime/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/DateTime/trunk/Makefile 2009-05-15 13:06:43 UTC (rev 4878) @@ -0,0 +1,23 @@ +GARNAME = DateTime +GARVERSION = 0.50 +CATEGORIES = cpan +AUTHOR = DROLSKY + +DESCRIPTION = A date and time object +define BLURB + DateTime is a class for the representation of date/time combinations, and is + part of the Perl DateTime project. For details on this project please see + http://datetime.perl.org/. The DateTime site has a FAQ which may help answer + many "how do I do X?" questions. The FAQ is at http://datetime.perl.org/?FAQ. +endef + +PACKAGES = CSWpmdatetime +CATALOGNAME = pm_datetime +ARCHALL = 1 + +REQUIRED_PKGS = CSWpmdatetimetimezone +REQUIRED_PKGS += CSWpmdatetimelocale + +include gar/category.mk + +LICENSE = LICENSE Added: csw/mgar/pkg/cpan/DateTime/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DateTime/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/DateTime/trunk/checksums 2009-05-15 13:06:43 UTC (rev 4878) @@ -0,0 +1 @@ +d7cf8bdbb3e55dda31f8bbea6cafad2f download/DateTime-0.50.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 15 16:11:31 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 15 May 2009 14:11:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[4879] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4879 http://gar.svn.sourceforge.net/gar/?rev=4879&view=rev Author: valholla Date: 2009-05-15 14:11:26 +0000 (Fri, 15 May 2009) Log Message: ----------- adminfiles pkgroot independent 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/extensions/php5_bcmath/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh csw/mgar/pkg/php5/trunk/files/phpext Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -20,18 +20,17 @@ MASTER_SITES = http://us.php.net/distributions/ SPKG_SOURCEURL = http://www.php.net/downloads.php -DISTFILES += $(DISTNAME).tar.bz2 INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -STRIP_DIRS += $(prefix)/lib/php/extensions/*/ +STRIP_DIRS += $(DESTDIR)$(prefix)/lib/php/extensions/*/ -# Auxilliary files +DISTFILES += $(DISTNAME).tar.bz2 DISTFILES += php.ini.CSW phpext pear.conf.CSW DISTFILES += CSWphp5_ext_enable.sh CSWphp5_ext_disable.sh +DISTFILES += CSWphp5.postinstall PACKAGES = CSWphp5 CSWphp5devel CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Languages -DISTFILES += CSWphp5.postinstall CATALOGNAME_CSWphp5devel = php5_devel SPKG_DESC_CSWphp5devel = Development files for php5 REQUIRED_PKGS_CSWphp5 = CSWexpat CSWggettextrt CSWiconv @@ -52,22 +51,19 @@ EXTDIRLIST = $(shell ls -d extensions/*) include $(foreach X,$(EXTDIRLIST),$(X)/Makefile) -# BerkeleyDB 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) +CONFIGURE_ARGS += --prefix=$(prefix) +CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --with-exec-dir=$(prefix)/bin -CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-cli CONFIGURE_ARGS += --enable-fastcgi CONFIGURE_ARGS += --enable-force-cgi-redirect -CONFIGURE_ARGS += --enable-pcntl=shared CONFIGURE_ARGS += --with-mm=$(prefix) CONFIGURE_ARGS += --enable-magic-quotes CONFIGURE_ARGS += --enable-spl=shared @@ -78,15 +74,10 @@ SKIPTEST = 1 ENABLE_CHECK = 0 -# Rebuild Configure Args to build mod_php5 -NEW_CONFIGURE_ARGS = $(shell echo $(CONFIGURE_ARGS) |sed -e 's/apxs2/apxs/' \ - -e 's/apache2\/sbin\/apxs/apache\/bin\/apxs/') - -# Copy over template config files and utility scripts - PI_SCRIPTS = install-extras PI_SCRIPTS += install-ap2modphp5 PI_SCRIPTS += install-modphp5 +PI_SCRIPTS += install-cleanup post-install-modulated: $(PI_SCRIPTS) @$(MAKECOOKIE) @@ -100,40 +91,49 @@ ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra ginstall -m 0644 $(WORKDIR)/httpd-php5.conf.CSW \ $(DESTDIR)$(prefix)/apache2/etc/extra - #@(grm -fr $(DESTDIR)/.[a-z]*) - @(gfind $(DESTDIR)/$(libdir) -name "*.a" -exec grm {} \;) - @(grm -f $(DESTDIR)$(sysconfdir)/pear.conf) @$(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 ) - @( gfind $(DESTDIR)$(prefix)/apache* \ - -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr ) + @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 @$(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 ) - @( gfind $(DESTDIR)$(prefix)/apache* \ - -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr ) + @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: + @gfind $(DESTDIR) -name \.[a-z]\* -exec grm -fr {} \; + @gfind $(DESTDIR)/$(libdir) -name "*.a" -exec grm -f {} \; + @grm -f $(DESTDIR)$(sysconfdir)/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))) +post-merge-modulated: + @echo "[====> Fixing Admin Scripts <====]" + PHP_INI_FILE=`$(PKGROOT)$(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` + #@$(MAKECOOKIE) + # System Rules/Configuration include gar/category.mk Modified: csw/mgar/pkg/php5/trunk/Makefile.Orig =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.Orig 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/Makefile.Orig 2009-05-15 14:11:26 UTC (rev 4879) @@ -24,7 +24,6 @@ MASTER_SITES = http://us.php.net/distributions/ SPKG_SOURCEURL = http://www.php.net/downloads.php -DISTFILES += $(DISTNAME).tar.bz2 INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) PHP5ROOT = $(DESTDIR)$(prefix)/php5 @@ -32,15 +31,15 @@ STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ STRIP_DIRS += $(PHP5ROOT)/bin -# Auxilliary files +DISTFILES += $(DISTNAME).tar.bz2 DISTFILES += php.ini.CSW phpext pear.conf.CSW DISTFILES += CSWphp5_ext_enable.sh CSWphp5_ext_disable.sh +DISTFILES += CSWphp5.postinstall PACKAGES = CSWphp5 CSWphp5devel CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Languages -DISTFILES += CSWphp5.postinstall CATALOGNAME_CSWphp5devel = php5_devel SPKG_DESC_CSWphp5devel = Development files for php5 REQUIRED_PKGS_CSWphp5 = CSWexpat CSWggettextrt CSWiconv @@ -61,13 +60,11 @@ EXTDIRLIST = $(shell ls -d extensions/*) include $(foreach X,$(EXTDIRLIST),$(X)/Makefile) -# BerkeleyDB EXTRA_LIB += $(prefix)/bdb44/lib EXTRA_INC += $(prefix)/bdb44/include EXTRA_CFLAGS = -I$(prefix)/include/ncursesw -NOISALIST = 1 - +NOISALIST = 1 STRIP_LIBTOOL = 1 CONFIGURE_ARGS += --prefix=$(prefix)/php5 @@ -85,18 +82,13 @@ CONFIGURE_ARGS += --with-pear=shared # Disable Tests (report submitted to PHP QA) -SKIPTEST = 1 +SKIPTEST = 1 ENABLE_CHECK = 0 -# Rebuild Configure Args to build mod_php5 -NEW_CONFIGURE_ARGS = $(shell echo $(CONFIGURE_ARGS) |sed -e 's/apxs2/apxs/' \ - -e 's/apache2\/sbin\/apxs/apache\/bin\/apxs/') - -# Copy over template config files and utility scripts - PI_SCRIPTS = install-extras PI_SCRIPTS += install-ap2modphp5 PI_SCRIPTS += install-modphp5 +PI_SCRIPTS += install-cleanup post-install-modulated: $(PI_SCRIPTS) @$(MAKECOOKIE) @@ -110,9 +102,6 @@ ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra ginstall -m 0644 $(WORKDIR)/httpd-php5.conf.CSW \ $(DESTDIR)$(prefix)/apache2/etc/extra - @(grm -fr $(DESTDIR)/.[a-z]*) - @(gfind $(PHP5ROOT)/lib -name "*.a" -exec grm {} \;) - @(grm -f $(DESTDIR)$(prefix)/php5/etc/pear.conf) @$(MAKECOOKIE) install-ap2modphp5: @@ -124,8 +113,6 @@ @( $(GARBIN)/fixlibtool $(WORKSRC) ) @( $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi ) @( strip $(DESTDIR)$(prefix)/apache2/libexec/libphp5.so ) - @( gfind $(DESTDIR)$(prefix)/apache* \ - -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr ) @$(MAKECOOKIE) install-modphp5: @@ -137,10 +124,16 @@ @( $(GARBIN)/fixlibtool $(WORKSRC) ) @( $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi ) @( strip $(DESTDIR)$(prefix)/apache/libexec/libphp5.so ) - @( gfind $(DESTDIR)$(prefix)/apache* \ - -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr ) @$(MAKECOOKIE) +install-cleanup: + @gfind $(DESTDIR) -name \.[a-z]\* -exec grm -fr {} \; + @gfind $(DESTDIR)/$(libdir) -name "*.a" -exec grm -f {} \; + @grm -f $(DESTDIR)$(sysconfdir)/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))) Modified: csw/mgar/pkg/php5/trunk/Makefile.default-dirs =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.default-dirs 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/Makefile.default-dirs 2009-05-15 14:11:26 UTC (rev 4879) @@ -20,18 +20,17 @@ MASTER_SITES = http://us.php.net/distributions/ SPKG_SOURCEURL = http://www.php.net/downloads.php -DISTFILES += $(SF_PROJ)-$(GARVERSION).tar.bz2 INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -STRIP_DIRS += $(prefix)/lib/php/extensions/*/ +STRIP_DIRS += $(DESTDIR)$(prefix)/lib/php/extensions/*/ -# Auxilliary files +DISTFILES += $(DISTNAME).tar.bz2 DISTFILES += php.ini.CSW phpext pear.conf.CSW DISTFILES += CSWphp5_ext_enable.sh CSWphp5_ext_disable.sh +DISTFILES += CSWphp5.postinstall PACKAGES = CSWphp5 CSWphp5devel CATALOGNAME_CSWphp5 = php5 SPKG_DESC_CSWphp5 = A High-Level Scripting Languages -DISTFILES += CSWphp5.postinstall CATALOGNAME_CSWphp5devel = php5_devel SPKG_DESC_CSWphp5devel = Development files for php5 REQUIRED_PKGS_CSWphp5 = CSWexpat CSWggettextrt CSWiconv @@ -50,24 +49,22 @@ # PHP Extensions EXTDIRLIST = $(shell ls -d extensions/*) -include $(foreach X,$(EXTDIRLIST),$(X)/Makefile) +INCLUDE_MK = $(foreach X,$(EXTDIRLIST),$(X)/Makefile) +include $(INCLUDE_MK) -# BerkeleyDB 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) +CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --with-exec-dir=$(prefix)/bin -CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-cli CONFIGURE_ARGS += --enable-fastcgi CONFIGURE_ARGS += --enable-force-cgi-redirect -CONFIGURE_ARGS += --enable-pcntl=shared CONFIGURE_ARGS += --with-mm=$(prefix) CONFIGURE_ARGS += --enable-magic-quotes CONFIGURE_ARGS += --enable-spl=shared @@ -78,15 +75,10 @@ SKIPTEST = 1 ENABLE_CHECK = 0 -# Rebuild Configure Args to build mod_php5 -NEW_CONFIGURE_ARGS = $(shell echo $(CONFIGURE_ARGS) |sed -e 's/apxs2/apxs/' \ - -e 's/apache2\/sbin\/apxs/apache\/bin\/apxs/') - -# Copy over template config files and utility scripts - PI_SCRIPTS = install-extras PI_SCRIPTS += install-ap2modphp5 PI_SCRIPTS += install-modphp5 +PI_SCRIPTS += install-cleanup post-install-modulated: $(PI_SCRIPTS) @$(MAKECOOKIE) @@ -100,40 +92,48 @@ ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra ginstall -m 0644 $(WORKDIR)/httpd-php5.conf.CSW \ $(DESTDIR)$(prefix)/apache2/etc/extra - #@(grm -fr $(DESTDIR)/.[a-z]*) - @(gfind $(DESTDIR)/$(libdir) -name "*.a" -exec grm {} \;) - @(grm -f $(DESTDIR)$(sysconfdir)/pear.conf) @$(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 ) - @( gfind $(DESTDIR)$(prefix)/apache* \ - -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr ) + @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 @$(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 ) - @( gfind $(DESTDIR)$(prefix)/apache* \ - -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr ) + @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: + @gfind $(DESTDIR) -name \.[a-z]\* -exec grm -fr {} \; + @gfind $(DESTDIR)/$(libdir) -name "*.a" -exec grm -f {} \; + @grm -f $(DESTDIR)$(sysconfdir)/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))) +post-merge-modulated: + @echo "[====> Fixing Admin Scripts <====]" + @perl -i -plne "s|PHP_INI=_PHPINIFILE_|PHP_INI=`$(PKGROOT)$(bindir)/php -i | \ + grep "Loaded Configuration File" | awk '{print $$NF}'`|" \ + gfind $(DOWNLOADDIR) -type f -print` + @$(MAKECOOKIE) + # System Rules/Configuration include gar/category.mk Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/checksums 2009-05-15 14:11:26 UTC (rev 4879) @@ -4,9 +4,9 @@ 5f0046fe1b3f8e2228fdb165bdbbe73a download/CSWmodphp5.postinstall 2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space -09fe57944fadf7cf5769d1070cf9cc90 download/CSWphp5.postinstall -4265ed6459d99f5cbe8eae29bf5c0b71 download/CSWphp5_ext_disable.sh -139abbf5e4b843dba93b1c51978038ba download/CSWphp5_ext_enable.sh +0914febc951a55cd2bc587a2f9c30652 download/CSWphp5.postinstall +d79cb3f8be515265504865f65bfa60a3 download/CSWphp5_ext_disable.sh +594f0f37900e44cebcad55072893f880 download/CSWphp5_ext_enable.sh ab08e2ba62667bf13fa236099e433e84 download/configure.diff a71677d80f5cfd1aeb03547dfdeb705a download/httpd-php5.conf.CSW 2206431e47c2075c0b9c4a12de5cf791 download/odbc.diff @@ -16,4 +16,4 @@ 280d6cda7f72a4fc6de42fda21ac2db7 download/php-5.2.9.tar.bz2 a450a46ce0ea9fd0c0abe432e750a873 download/php-bug-45557-fix.diff 160963de6006c558963e5bc37584bf15 download/php.ini.CSW -90ae3cef3692d7e566c47d89fe39c43d download/phpext +6251f3adcefc6ffa61d6339ac6b2d1eb download/phpext Modified: csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5bcmath_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling bcmath extension" @@ -56,7 +56,7 @@ define CSWphp5bcmath_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling bcmath extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5bz2_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling bz2 extension" @@ -56,7 +56,7 @@ define CSWphp5bz2_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling bz2 extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5calendar_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling calendar extension" @@ -56,7 +56,7 @@ define CSWphp5calendar_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling calendar extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5ctype_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling ctype extension" @@ -56,7 +56,7 @@ define CSWphp5ctype_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling ctype extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -15,7 +15,7 @@ define CSWphp5curl_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling curl extension" @@ -58,7 +58,7 @@ define CSWphp5curl_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling curl extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -17,7 +17,7 @@ define CSWphp5dba_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling dba extension" @@ -60,7 +60,7 @@ define CSWphp5dba_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling dba extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5dbase_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling dbase extension" @@ -56,7 +56,7 @@ define CSWphp5dbase_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling dbase extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -14,7 +14,7 @@ define CSWphp5dom_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling dom extension" @@ -57,7 +57,7 @@ define CSWphp5dom_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling dom extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -16,7 +16,7 @@ define CSWphp5exif_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling exif extension" @@ -59,7 +59,7 @@ define CSWphp5exif_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling exif extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5ftp_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling ftp extension" @@ -56,7 +56,7 @@ define CSWphp5ftp_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling ftp extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -24,7 +24,7 @@ define CSWphp5gd_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling gd extension" @@ -67,7 +67,7 @@ define CSWphp5gd_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling gd extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5gettext_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling gettext extension" @@ -56,7 +56,7 @@ define CSWphp5gettext_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling gettext extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5gmp_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling gmp extension" @@ -56,7 +56,7 @@ define CSWphp5gmp_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling gmp extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5hash_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling hash extension" @@ -56,7 +56,7 @@ define CSWphp5hash_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling hash extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -20,7 +20,7 @@ define CSWphp5iconv_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling iconv extension" @@ -63,7 +63,7 @@ define CSWphp5iconv_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling iconv extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -15,7 +15,7 @@ define CSWphp5imap_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling imap extension" @@ -58,7 +58,7 @@ define CSWphp5imap_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling imap extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5json_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling json extension" @@ -56,7 +56,7 @@ define CSWphp5json_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling json extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -15,7 +15,7 @@ define CSWphp5ldap_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling ldap extension" @@ -58,7 +58,7 @@ define CSWphp5ldap_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling ldap extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -15,7 +15,7 @@ define CSWphp5mbstring_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling mbstring extension" @@ -58,7 +58,7 @@ define CSWphp5mbstring_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling mbstring extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5mcrypt_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling mcrypt extension" @@ -56,7 +56,7 @@ define CSWphp5mcrypt_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling mcrypt extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5mhash_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling mhash extension" @@ -56,7 +56,7 @@ define CSWphp5mhash_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling mhash extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5mimemagic_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling mime_magic extension" @@ -56,7 +56,7 @@ define CSWphp5mimemagic_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling mime_magic extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5mssql_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling mssql extension" @@ -56,7 +56,7 @@ define CSWphp5mssql_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling mssql extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5mysql_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling mysql extension" @@ -56,7 +56,7 @@ define CSWphp5mysql_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling mysql extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5mysqli_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling mysqli extension" @@ -56,7 +56,7 @@ define CSWphp5mysqli_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling mysqli extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5ncurses_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling ncurses extension" @@ -56,7 +56,7 @@ define CSWphp5ncurses_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling ncurses extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -15,7 +15,7 @@ define CSWphp5odbc_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling odbc extension" @@ -58,7 +58,7 @@ define CSWphp5odbc_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling odbc extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5openssl_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling openssl extension" @@ -56,7 +56,7 @@ define CSWphp5openssl_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling openssl extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5pcntl_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling pcntl extension" @@ -56,7 +56,7 @@ define CSWphp5pcntl_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling pcntl extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5pdo_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling pdo extension" @@ -56,7 +56,7 @@ define CSWphp5pdo_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling pdo extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -14,7 +14,7 @@ define CSWphp5pdomysql_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling pdo_mysql extension" @@ -57,7 +57,7 @@ define CSWphp5pdomysql_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling pdo_mysql extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5pdoodbc_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling pdo_odbc extension" @@ -56,7 +56,7 @@ define CSWphp5pdoodbc_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling pdo_odbc extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -15,7 +15,7 @@ define CSWphp5pdopgsql_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling pdo_pgsql extension" @@ -58,7 +58,7 @@ define CSWphp5pdopgsql_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling pdo_pgsql extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5pdosqlite_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling pdo_sqlite extension" @@ -56,7 +56,7 @@ define CSWphp5pdosqlite_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling pdo_sqlite extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -15,7 +15,7 @@ define CSWphp5pgsql_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling pgsql extension" @@ -58,7 +58,7 @@ define CSWphp5pgsql_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling pgsql extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5posix_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling posix extension" @@ -56,7 +56,7 @@ define CSWphp5posix_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling posix extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5pspell_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling pspell extension" @@ -56,7 +56,7 @@ define CSWphp5pspell_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling pspell extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -14,7 +14,7 @@ define CSWphp5readline_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling readline extension" @@ -57,7 +57,7 @@ define CSWphp5readline_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling readline extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5session_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling session extension" @@ -56,7 +56,7 @@ define CSWphp5session_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling session extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5shmop_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling shmop extension" @@ -56,7 +56,7 @@ define CSWphp5shmop_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling shmop extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -9,7 +9,7 @@ define CSWphp5simplexml_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling simplexml extension" @@ -52,7 +52,7 @@ define CSWphp5simplexml_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling simplexml extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5snmp_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling snmp extension" @@ -56,7 +56,7 @@ define CSWphp5snmp_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling snmp extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -14,7 +14,7 @@ define CSWphp5soap_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling soap extension" @@ -57,7 +57,7 @@ define CSWphp5soap_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling soap extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5sockets_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling sockets extension" @@ -56,7 +56,7 @@ define CSWphp5sockets_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling sockets extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -14,7 +14,7 @@ define CSWphp5sqlite_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling sqlite extension" @@ -57,7 +57,7 @@ define CSWphp5sqlite_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling sqlite extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5sysvmsg_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling sysvmsg extension" @@ -56,7 +56,7 @@ define CSWphp5sysvmsg_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling sysvmsg extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5sysvsem_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling sysvsem extension" @@ -56,7 +56,7 @@ define CSWphp5sysvsem_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling sysvsem extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5sysvshm_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling sysvshm extension" @@ -56,7 +56,7 @@ define CSWphp5sysvshm_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling sysvshm extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5tidy_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling tidy extension" @@ -56,7 +56,7 @@ define CSWphp5tidy_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling tidy extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -13,7 +13,7 @@ define CSWphp5tokenizer_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling tokenizer extension" @@ -56,7 +56,7 @@ define CSWphp5tokenizer_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling tokenizer extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -15,7 +15,7 @@ define CSWphp5wddx_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling wddx extension" @@ -58,7 +58,7 @@ define CSWphp5wddx_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling wddx extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -7,7 +7,7 @@ define CSWphp5xml_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling xml extension" @@ -50,7 +50,7 @@ define CSWphp5xml_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling xml extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -14,7 +14,7 @@ define CSWphp5xmlreader_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling xmlreader extension" @@ -57,7 +57,7 @@ define CSWphp5xmlreader_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling xmlreader extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -16,7 +16,7 @@ define CSWphp5xmlrpc_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling xmlrpc extension" @@ -59,7 +59,7 @@ define CSWphp5xmlrpc_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling xmlrpc extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -14,7 +14,7 @@ define CSWphp5xmlwriter_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling xmlwriter extension" @@ -57,7 +57,7 @@ define CSWphp5xmlwriter_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling xmlwriter extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -14,7 +14,7 @@ define CSWphp5xsl_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling xsl extension" @@ -57,7 +57,7 @@ define CSWphp5xsl_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling xsl extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -14,7 +14,7 @@ define CSWphp5zip_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling zip extension" @@ -57,7 +57,7 @@ define CSWphp5zip_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling zip extension" Modified: csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile 2009-05-15 14:11:26 UTC (rev 4879) @@ -6,7 +6,7 @@ define CSWphp5zlib_postinstall #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Post Install <===]" echo " ===> Enabling zlib extension" @@ -49,7 +49,7 @@ define CSWphp5zlib_preremove #!/bin/sh -PHP_INI=/opt/csw/lib/php.ini +PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ echo "[===> Running Pre Remove <===]" echo " ===> Disabling zlib extension" Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-15 13:06:43 UTC (rev 4878) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-15 14:11:26 UTC (rev 4879) @@ -1,15 +1,14 @@ #!/bin/sh PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin -PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} -PHP_LIB=$PKG_INSTALL_ROOT/opt/csw/lib -PHP_BIN=$PKG_INSTALL_ROOT/opt/csw/bin -PHP_INI=$PHP_LIB/php.ini +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 else - echo "php.ini already exists" + echo "$PHP_INI already exists" extdir_ext=`${PHP_BIN}/php -i |grep 'PHP Extension' |awk '{print $NF}'` extdir="${PHP_LIB}/php/extensions/no-debug-non-zts-${extdir_ext}" @@ -33,7 +32,7 @@ cat << _EOT_ ****************************************************************************** -* NOTICE: The existing php.ini file is from an older version of PHP5. +* NOTICE: The existing $PHP_INI file is from an older version of PHP5. * * ************* PLEASE READ ************* * @@ -121,7 +120,7 @@ ****************************************************************************** * WARNING: Short open tag support in this release of CSWphp5 is DISABLED by * default. If you rely on short open tag ( Revision: 4880 http://gar.svn.sourceforge.net/gar/?rev=4880&view=rev Author: skayser Date: 2009-05-15 14:14:36 +0000 (Fri, 15 May 2009) Log Message: ----------- cpan/DateTime: removed ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/cpan/DateTime/trunk/Makefile Modified: csw/mgar/pkg/cpan/DateTime/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime/trunk/Makefile 2009-05-15 14:11:26 UTC (rev 4879) +++ csw/mgar/pkg/cpan/DateTime/trunk/Makefile 2009-05-15 14:14:36 UTC (rev 4880) @@ -13,7 +13,6 @@ PACKAGES = CSWpmdatetime CATALOGNAME = pm_datetime -ARCHALL = 1 REQUIRED_PKGS = CSWpmdatetimetimezone REQUIRED_PKGS += CSWpmdatetimelocale This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri May 15 16:39:25 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 May 2009 14:39:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4881] csw/mgar/pkg/cpan/Time-Format/trunk/Makefile Message-ID: Revision: 4881 http://gar.svn.sourceforge.net/gar/?rev=4881&view=rev Author: skayser Date: 2009-05-15 14:39:24 +0000 (Fri, 15 May 2009) Log Message: ----------- cpan/Time-Format: added license Modified Paths: -------------- csw/mgar/pkg/cpan/Time-Format/trunk/Makefile Modified: csw/mgar/pkg/cpan/Time-Format/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Time-Format/trunk/Makefile 2009-05-15 14:14:36 UTC (rev 4880) +++ csw/mgar/pkg/cpan/Time-Format/trunk/Makefile 2009-05-15 14:39:24 UTC (rev 4881) @@ -13,4 +13,9 @@ PACKAGES = CSWpmtimeformat CATALOGNAME = pm_timeformat + include gar/category.mk + +pre-merge-modulated: + @cd $(WORKSRC) && sed -n '/^Copyright/,/^$$/p' README > COPYING + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri May 15 16:40:09 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 May 2009 14:40:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[4882] csw/mgar/pkg/cpan/Time-Format/trunk/Makefile Message-ID: Revision: 4882 http://gar.svn.sourceforge.net/gar/?rev=4882&view=rev Author: skayser Date: 2009-05-15 14:40:09 +0000 (Fri, 15 May 2009) Log Message: ----------- cpan/Time-Format: ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/cpan/Time-Format/trunk/Makefile Modified: csw/mgar/pkg/cpan/Time-Format/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Time-Format/trunk/Makefile 2009-05-15 14:39:24 UTC (rev 4881) +++ csw/mgar/pkg/cpan/Time-Format/trunk/Makefile 2009-05-15 14:40:09 UTC (rev 4882) @@ -13,6 +13,7 @@ PACKAGES = CSWpmtimeformat CATALOGNAME = pm_timeformat +ARCHALL = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 15 19:32:16 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 15 May 2009 17:32:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[4883] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4883 http://gar.svn.sourceforge.net/gar/?rev=4883&view=rev Author: valholla Date: 2009-05-15 17:32:15 +0000 (Fri, 15 May 2009) Log Message: ----------- tweak to post* scripts Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/checksums csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-05-15 14:40:09 UTC (rev 4882) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-05-15 17:32:15 UTC (rev 4883) @@ -40,9 +40,21 @@ PKGFILES_CSWphp5devel = $(bindir)/php-config PKGFILES_CSWphp5devel += $(bindir)/phpize PKGFILES_CSWphp5devel += $(bindir)/peardev -PKGFILES_CSWphp5devel += $(includedir)/.* PKGFILES_CSWphp5devel += $(libdir)/php/build/.* -PKGFILES_CSWphp5devel += $(mandir)/.* +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 @@ -94,7 +106,7 @@ @$(MAKECOOKIE) install-ap2modphp5: - @echo " ==> Now Building ap2_modphp5 <==" + @echo "[====> Now Building ap2_modphp5 <====]" @if [ -f $(WORKSRC)/Makefile ]; then \ $(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi cd $(WORKSRC) && $(BUILD_ENV) \ @@ -105,7 +117,7 @@ @$(MAKECOOKIE) install-modphp5: - @echo " ==> Now Building mod_php5 <==" + @echo "[====> Now Building mod_php5 <====]" @if [ -f $(WORKSRC)/Makefile ]; then \ $(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi cd $(WORKSRC) && $(BUILD_ENV) \ @@ -116,8 +128,7 @@ @$(MAKECOOKIE) install-cleanup: - @gfind $(DESTDIR) -name \.[a-z]\* -exec grm -fr {} \; - @gfind $(DESTDIR)/$(libdir) -name "*.a" -exec grm -f {} \; + @gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr @grm -f $(DESTDIR)$(sysconfdir)/pear.conf @gfind $(DESTDIR)$(prefix)/apache* \ -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr @@ -133,7 +144,7 @@ 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` - #@$(MAKECOOKIE) + @$(MAKECOOKIE) # System Rules/Configuration include gar/category.mk Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-05-15 14:40:09 UTC (rev 4882) +++ csw/mgar/pkg/php5/trunk/checksums 2009-05-15 17:32:15 UTC (rev 4883) @@ -5,8 +5,8 @@ 2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space 0914febc951a55cd2bc587a2f9c30652 download/CSWphp5.postinstall -d79cb3f8be515265504865f65bfa60a3 download/CSWphp5_ext_disable.sh -594f0f37900e44cebcad55072893f880 download/CSWphp5_ext_enable.sh +55b520081d24e992e04265b3d8de8bf5 download/CSWphp5_ext_disable.sh +f4f08ba7e83cc4ae6e1c485b42cfb965 download/CSWphp5_ext_enable.sh ab08e2ba62667bf13fa236099e433e84 download/configure.diff a71677d80f5cfd1aeb03547dfdeb705a download/httpd-php5.conf.CSW 2206431e47c2075c0b9c4a12de5cf791 download/odbc.diff Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-05-15 14:40:09 UTC (rev 4882) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-05-15 17:32:15 UTC (rev 4883) @@ -10,6 +10,7 @@ CONFIGURE_ARGS += --with-libxml-dir=$(prefix) PKGFILES_CSWphp5dom = .*/lib/php/extensions/.*/dom.* +PKGFILES_CSWphp5dom = .*/include/php/ext/dom.* define CSWphp5dom_postinstall #!/bin/sh Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-05-15 14:40:09 UTC (rev 4882) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-05-15 17:32:15 UTC (rev 4883) @@ -20,6 +20,7 @@ CONFIGURE_ARGS += --enable-gd-jis-conv PKGFILES_CSWphp5gd = .*/lib/php/extensions/.*/gd.* +PKGFILES_CSWphp5gd = .*/include/php/ext/gd.* define CSWphp5gd_postinstall #!/bin/sh Modified: csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-05-15 14:40:09 UTC (rev 4882) +++ csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-05-15 17:32:15 UTC (rev 4883) @@ -9,6 +9,7 @@ CONFIGURE_ARGS += --enable-hash=shared PKGFILES_CSWphp5hash = .*/lib/php/extensions/.*/hash.* +PKGFILES_CSWphp5hash = .*/include/php/ext/hash.* define CSWphp5hash_postinstall #!/bin/sh Modified: csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-05-15 14:40:09 UTC (rev 4882) +++ csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-05-15 17:32:15 UTC (rev 4883) @@ -16,6 +16,7 @@ #PATCHFILES += iconv.diff PKGFILES_CSWphp5iconv = .*/lib/php/extensions/.*/iconv.* +PKGFILES_CSWphp5iconv = .*/include/php/ext/iconv.* define CSWphp5iconv_postinstall #!/bin/sh Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-05-15 14:40:09 UTC (rev 4882) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-05-15 17:32:15 UTC (rev 4883) @@ -11,6 +11,7 @@ CONFIGURE_ARGS += --enable-mbregex=shared PKGFILES_CSWphp5mbstring = .*/lib/php/extensions/.*/mbstring.* +PKGFILES_CSWphp5mbstring = .*/include/php/ext/mbstring.* define CSWphp5mbstring_postinstall #!/bin/sh Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile 2009-05-15 14:40:09 UTC (rev 4882) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile 2009-05-15 17:32:15 UTC (rev 4883) @@ -9,6 +9,7 @@ CONFIGURE_ARGS += --enable-pdo=shared PKGFILES_CSWphp5pdo = .*/lib/php/extensions/.*/pdo\.so* +PKGFILES_CSWphp5pdo = .*/include/php/ext/pdo.* define CSWphp5pdo_postinstall #!/bin/sh Modified: csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-05-15 14:40:09 UTC (rev 4882) +++ csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-05-15 17:32:15 UTC (rev 4883) @@ -9,6 +9,7 @@ CONFIGURE_ARGS += --enable-session=shared PKGFILES_CSWphp5session = .*/lib/php/extensions/.*/session.* +PKGFILES_CSWphp5session = .*/include/php/ext/session.* define CSWphp5session_postinstall #!/bin/sh Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-05-15 14:40:09 UTC (rev 4882) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-05-15 17:32:15 UTC (rev 4883) @@ -10,6 +10,7 @@ CONFIGURE_ARGS += --enable-sqlite-utf8 PKGFILES_CSWphp5sqlite = .*/lib/php/extensions/.*/sqlite.* +PKGFILES_CSWphp5sqlite = .*/include/php/ext/sqlite.* define CSWphp5sqlite_postinstall #!/bin/sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri May 15 19:39:47 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 15 May 2009 17:39:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[4884] csw/mgar/pkg/php5/trunk/checksums Message-ID: Revision: 4884 http://gar.svn.sourceforge.net/gar/?rev=4884&view=rev Author: valholla Date: 2009-05-15 17:39:47 +0000 (Fri, 15 May 2009) Log Message: ----------- checksums checkin Modified Paths: -------------- csw/mgar/pkg/php5/trunk/checksums Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-05-15 17:32:15 UTC (rev 4883) +++ csw/mgar/pkg/php5/trunk/checksums 2009-05-15 17:39:47 UTC (rev 4884) @@ -15,5 +15,5 @@ 13db46097c9686302bebf160e2d26ed2 download/pgsql.diff 280d6cda7f72a4fc6de42fda21ac2db7 download/php-5.2.9.tar.bz2 a450a46ce0ea9fd0c0abe432e750a873 download/php-bug-45557-fix.diff -160963de6006c558963e5bc37584bf15 download/php.ini.CSW +d3d68f5b6d71f13e5d9750dc14043287 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. From valholla at users.sourceforge.net Sat May 16 02:12:25 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 00:12:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4885] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4885 http://gar.svn.sourceforge.net/gar/?rev=4885&view=rev Author: valholla Date: 2009-05-16 00:12:25 +0000 (Sat, 16 May 2009) Log Message: ----------- remove extra files and tweak post* 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/php.ini.CSW Removed Paths: ------------- csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-05-15 17:39:47 UTC (rev 4884) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-05-16 00:12:25 UTC (rev 4885) @@ -24,9 +24,7 @@ STRIP_DIRS += $(DESTDIR)$(prefix)/lib/php/extensions/*/ DISTFILES += $(DISTNAME).tar.bz2 -DISTFILES += php.ini.CSW phpext pear.conf.CSW -DISTFILES += CSWphp5_ext_enable.sh CSWphp5_ext_disable.sh -DISTFILES += CSWphp5.postinstall +DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall PACKAGES = CSWphp5 CSWphp5devel CATALOGNAME_CSWphp5 = php5 @@ -95,13 +93,22 @@ @$(MAKECOOKIE) install-extras: - ginstall -m 0755 $(WORKDIR)/phpext $(DESTDIR)$(bindir) - gsed -i -e s,PHPEXTDIR,$(shell $(DESTDIR)$(bindir)/php-config --extension-dir),\ - $(WORKDIR)/php.ini.CSW - ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(libdir) - ginstall -m 0644 $(WORKDIR)/pear.conf.CSW $(DESTDIR)$(sysconfdir) + @echo "[====> Fixing Admin Scripts <====]" + PHP_INI_FILE=`$(PKGROOT)$(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` + 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 $(WORKDIR)/httpd-php5.conf.CSW \ + ginstall -m 0644 $(DOWNLOADDIR)/httpd-php5.conf.CSW \ $(DESTDIR)$(prefix)/apache2/etc/extra @$(MAKECOOKIE) @@ -138,13 +145,5 @@ pre-fetch: $(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR))) -post-merge-modulated: - @echo "[====> Fixing Admin Scripts <====]" - PHP_INI_FILE=`$(PKGROOT)$(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` - @$(MAKECOOKIE) - # System Rules/Configuration include gar/category.mk Modified: csw/mgar/pkg/php5/trunk/Makefile.Orig =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.Orig 2009-05-15 17:39:47 UTC (rev 4884) +++ csw/mgar/pkg/php5/trunk/Makefile.Orig 2009-05-16 00:12:25 UTC (rev 4885) @@ -32,9 +32,7 @@ STRIP_DIRS += $(PHP5ROOT)/bin DISTFILES += $(DISTNAME).tar.bz2 -DISTFILES += php.ini.CSW phpext pear.conf.CSW -DISTFILES += CSWphp5_ext_enable.sh CSWphp5_ext_disable.sh -DISTFILES += CSWphp5.postinstall +DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall PACKAGES = CSWphp5 CSWphp5devel Modified: csw/mgar/pkg/php5/trunk/Makefile.default-dirs =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.default-dirs 2009-05-15 17:39:47 UTC (rev 4884) +++ csw/mgar/pkg/php5/trunk/Makefile.default-dirs 2009-05-16 00:12:25 UTC (rev 4885) @@ -24,9 +24,7 @@ STRIP_DIRS += $(DESTDIR)$(prefix)/lib/php/extensions/*/ DISTFILES += $(DISTNAME).tar.bz2 -DISTFILES += php.ini.CSW phpext pear.conf.CSW -DISTFILES += CSWphp5_ext_enable.sh CSWphp5_ext_disable.sh -DISTFILES += CSWphp5.postinstall +DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall PACKAGES = CSWphp5 CSWphp5devel CATALOGNAME_CSWphp5 = php5 Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-05-15 17:39:47 UTC (rev 4884) +++ csw/mgar/pkg/php5/trunk/checksums 2009-05-16 00:12:25 UTC (rev 4885) @@ -5,8 +5,6 @@ 2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space 0914febc951a55cd2bc587a2f9c30652 download/CSWphp5.postinstall -55b520081d24e992e04265b3d8de8bf5 download/CSWphp5_ext_disable.sh -f4f08ba7e83cc4ae6e1c485b42cfb965 download/CSWphp5_ext_enable.sh ab08e2ba62667bf13fa236099e433e84 download/configure.diff a71677d80f5cfd1aeb03547dfdeb705a download/httpd-php5.conf.CSW 2206431e47c2075c0b9c4a12de5cf791 download/odbc.diff @@ -15,5 +13,5 @@ 13db46097c9686302bebf160e2d26ed2 download/pgsql.diff 280d6cda7f72a4fc6de42fda21ac2db7 download/php-5.2.9.tar.bz2 a450a46ce0ea9fd0c0abe432e750a873 download/php-bug-45557-fix.diff -d3d68f5b6d71f13e5d9750dc14043287 download/php.ini.CSW +550ae718308582e8eec40452190cae50 download/php.ini.CSW 6251f3adcefc6ffa61d6339ac6b2d1eb download/phpext Deleted: csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh 2009-05-15 17:39:47 UTC (rev 4884) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_disable.sh 2009-05-16 00:12:25 UTC (rev 4885) @@ -1,35 +0,0 @@ -#!/bin/sh - -PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ -PHP_LIB=${PKG_INSTALL_ROOT}_PHPLIBDIR_ -PHP_BIN=${PKG_INSTALL_ROOT}_PHPBINDIR_ -PHP_EXTMGR=$PHP_BIN/phpext - -if [ -z "$PHPEXT" ]; then - PHPEXT=`echo $PKGINST | sed -e 's,CSWphp5,,' -e 's,\..*,,'` - PHPEXT=${PHPEXT:-${PKGINST}} -fi - -# Bail if php.ini does not exist -if [ ! -f $PHP_INI ]; then - cat << END -Cannot locate $PHP_INI -- Please disable $PHPEXT.so manually -in the appropriate php.ini file using $PHP_EXTMGR - -END - - exit 0 -fi - -$PHP_EXTMGR -i $PHP_INI -d $PHPEXT -if [ $? -ne 0 ]; then - cat << END -Failed to disable $PHPEXT support -- please examine -$PHP_INI and disable the extension manually. -END -else - echo "PHP extension $PHPEXT.so is disabled in $PHP_INI." -fi - -exit 0 - Deleted: csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh 2009-05-15 17:39:47 UTC (rev 4884) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5_ext_enable.sh 2009-05-16 00:12:25 UTC (rev 4885) @@ -1,35 +0,0 @@ -#!/bin/sh - -PHP_INI=${PKG_INSTALL_ROOT}_PHPINIFILE_ -PHP_LIB=${PKG_INSTALL_ROOT}_PHPLIBFILE_ -PHP_BIN=${PKG_INSTALL_ROOT}_PHPBINFILE_ -PHP_EXTMGR=$PHP_BIN/phpext - -if [ -z "$PHPEXT" ]; then - PHPEXT=`echo $PKGINST | sed -e 's,CSWphp5,,' -e 's,\..*,,'` - PHPEXT=${PHPEXT:-${PKGINST}} -fi - -# Bail if php.ini does not exist -if [ ! -f $PHP_INI ]; then - cat << END -Cannot locate $PHP_INI -- Please enable $PHPEXT.so manually -in the appropriate php.ini file using $PHP_EXTMGR - -END - - exit 0 -fi - -$PHP_EXTMGR -i $PHP_INI -e $PHPEXT -if [ $? -ne 0 ]; then - cat << END -Failed to enable $PHPEXT support -- please examine -$PHP_INI and enable the extension manually. -END -else - echo "PHP extension $PHPEXT.so is enabled in $PHP_INI." -fi - -exit 0 - Modified: csw/mgar/pkg/php5/trunk/files/php.ini.CSW =================================================================== --- csw/mgar/pkg/php5/trunk/files/php.ini.CSW 2009-05-15 17:39:47 UTC (rev 4884) +++ csw/mgar/pkg/php5/trunk/files/php.ini.CSW 2009-05-16 00:12:25 UTC (rev 4885) @@ -678,58 +678,6 @@ ;extension=xsl.so ;extension=zip.so -; Windows Extensions -; Note that ODBC support is built in, so no dll is needed for it. -; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) -; extension folders as well as the separate PECL DLL download (PHP 5). -; Be sure to appropriately set the extension_dir directive. - -;extension=php_bz2.dll -;extension=php_curl.dll -;extension=php_dba.dll -;extension=php_dbase.dll -;extension=php_exif.dll -;extension=php_fdf.dll -;extension=php_gd2.dll -;extension=php_gettext.dll -;extension=php_gmp.dll -;extension=php_ifx.dll -;extension=php_imap.dll -;extension=php_interbase.dll -;extension=php_ldap.dll -;extension=php_mbstring.dll -;extension=php_mcrypt.dll -;extension=php_mhash.dll -;extension=php_mime_magic.dll -;extension=php_ming.dll -;extension=php_msql.dll -;extension=php_mssql.dll -;extension=php_mysql.dll -;extension=php_mysqli.dll -;extension=php_oci8.dll -;extension=php_openssl.dll -;extension=php_pdo.dll -;extension=php_pdo_firebird.dll -;extension=php_pdo_mssql.dll -;extension=php_pdo_mysql.dll -;extension=php_pdo_oci.dll -;extension=php_pdo_oci8.dll -;extension=php_pdo_odbc.dll -;extension=php_pdo_pgsql.dll -;extension=php_pdo_sqlite.dll -;extension=php_pgsql.dll -;extension=php_pspell.dll -;extension=php_shmop.dll -;extension=php_snmp.dll -;extension=php_soap.dll -;extension=php_sockets.dll -;extension=php_sqlite.dll -;extension=php_sybase_ct.dll -;extension=php_tidy.dll -;extension=php_xmlrpc.dll -;extension=php_xsl.dll -;extension=php_zip.dll - ;;;;;;;;;;;;;;;;;;; ; Module Settings ; ;;;;;;;;;;;;;;;;;;; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sat May 16 03:17:29 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 01:17:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[4886] csw/mgar/pkg/php4/trunk/files Message-ID: Revision: 4886 http://gar.svn.sourceforge.net/gar/?rev=4886&view=rev Author: valholla Date: 2009-05-16 01:17:29 +0000 (Sat, 16 May 2009) Log Message: ----------- postinstall on wrong package Added Paths: ----------- csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall Removed Paths: ------------- csw/mgar/pkg/php4/trunk/files/CSWphp4.postinstall Deleted: csw/mgar/pkg/php4/trunk/files/CSWphp4.postinstall =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4.postinstall 2009-05-16 00:12:25 UTC (rev 4885) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4.postinstall 2009-05-16 01:17:29 UTC (rev 4886) @@ -1,46 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin -PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} -PHP_LIB=$PKG_INSTALL_ROOT/opt/csw/php4/lib -PHP_BIN=$PKG_INSTALL_ROOT/opt/csw/php4/bin -PHP_INI=$PHP_LIB/php.ini - -if [ ! -f $PHP_INI ]; then - cp -p $PHP_INI.CSW $PHP_INI -else - echo "php.ini already exists" - - extdir_ext=`${PHP_BIN}/php -i |grep 'PHP Extension' |awk '{print $NF}'` - extdir="${PHP_LIB}/php/extensions/no-debug-non-zts-${extdir_ext}" - curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' $PHP_INI` - - if [ "$extdir" != "$curextdir" ]; then - echo "updating extension_dir..." - perl -i.bak -plne "s,no-debug-non-zts-[0-9]+,$extdir," $PHP_INI - fi - -cat << _EOT_ - -****************************************************************************** -* WARNING: Short open tag support in this release of php4 is DISABLED by -* default. If you rely on short open tag ( Revision: 4887 http://gar.svn.sourceforge.net/gar/?rev=4887&view=rev Author: valholla Date: 2009-05-16 01:32:59 +0000 (Sat, 16 May 2009) Log Message: ----------- correct admin files Modified Paths: -------------- csw/mgar/pkg/php4/trunk/checksums csw/mgar/pkg/php4/trunk/files/admfiles.mk Modified: csw/mgar/pkg/php4/trunk/checksums =================================================================== --- csw/mgar/pkg/php4/trunk/checksums 2009-05-16 01:17:29 UTC (rev 4886) +++ csw/mgar/pkg/php4/trunk/checksums 2009-05-16 01:32:59 UTC (rev 4887) @@ -4,7 +4,6 @@ 4b39ed880dc873c0008eef302e5f9467 download/CSWmodphp4.postinstall 8924c197b7915385734a765dab961e68 download/CSWmodphp4.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp4.space -d4b85eb982eb4a593bacf6024db706a9 download/CSWphp4.postinstall 97d253d03e6aee4df218c0b94f44a175 download/CSWphp4.space 3119c7fb6c454da9e483a54453b39548 download/CSWphp4bcmath.postinstall a28367bcf2f1dc5513271b4fd5f7db2b download/CSWphp4bcmath.preremove @@ -12,6 +11,7 @@ ed0922061d8b95e2f8cc6604381cc57f download/CSWphp4bz2.preremove 82b8586235f637d239c07eb3bead372e download/CSWphp4calendar.postinstall 0bbeea841afc4d2ea98b641b9f09624a download/CSWphp4calendar.preremove +d4b85eb982eb4a593bacf6024db706a9 download/CSWphp4cgi.postinstall 84aa3d42197c8fb1c6eb000c8684e904 download/CSWphp4curl.postinstall 99f1ea3f414aa4e63e94d9e34069ac7d download/CSWphp4curl.preremove beb44563abab6725128a796e2507883b download/CSWphp4dba.postinstall Modified: csw/mgar/pkg/php4/trunk/files/admfiles.mk =================================================================== --- csw/mgar/pkg/php4/trunk/files/admfiles.mk 2009-05-16 01:17:29 UTC (rev 4886) +++ csw/mgar/pkg/php4/trunk/files/admfiles.mk 2009-05-16 01:32:59 UTC (rev 4887) @@ -8,8 +8,8 @@ DISTFILES += CSWmodphp4.postinstall DISTFILES += CSWmodphp4.preremove DISTFILES += CSWmodphp4.space -DISTFILES += CSWphp4.postinstall -DISTFILES += CSWphp4.space +DISTFILES += CSWphp4cgi.postinstall +DISTFILES += CSWphp4cgi.space DISTFILES += CSWphp4bcmath.postinstall DISTFILES += CSWphp4bcmath.preremove DISTFILES += CSWphp4bz2.postinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sat May 16 03:34:56 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 01:34:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[4888] csw/mgar/pkg/php4/trunk Message-ID: Revision: 4888 http://gar.svn.sourceforge.net/gar/?rev=4888&view=rev Author: valholla Date: 2009-05-16 01:34:55 +0000 (Sat, 16 May 2009) Log Message: ----------- correct admin files Modified Paths: -------------- csw/mgar/pkg/php4/trunk/checksums Added Paths: ----------- csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.space Removed Paths: ------------- csw/mgar/pkg/php4/trunk/files/CSWphp4.space Modified: csw/mgar/pkg/php4/trunk/checksums =================================================================== --- csw/mgar/pkg/php4/trunk/checksums 2009-05-16 01:32:59 UTC (rev 4887) +++ csw/mgar/pkg/php4/trunk/checksums 2009-05-16 01:34:55 UTC (rev 4888) @@ -4,7 +4,6 @@ 4b39ed880dc873c0008eef302e5f9467 download/CSWmodphp4.postinstall 8924c197b7915385734a765dab961e68 download/CSWmodphp4.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp4.space -97d253d03e6aee4df218c0b94f44a175 download/CSWphp4.space 3119c7fb6c454da9e483a54453b39548 download/CSWphp4bcmath.postinstall a28367bcf2f1dc5513271b4fd5f7db2b download/CSWphp4bcmath.preremove a5baa2f0261f9d4f45240e32aa931dab download/CSWphp4bz2.postinstall @@ -12,6 +11,7 @@ 82b8586235f637d239c07eb3bead372e download/CSWphp4calendar.postinstall 0bbeea841afc4d2ea98b641b9f09624a download/CSWphp4calendar.preremove d4b85eb982eb4a593bacf6024db706a9 download/CSWphp4cgi.postinstall +97d253d03e6aee4df218c0b94f44a175 download/CSWphp4cgi.space 84aa3d42197c8fb1c6eb000c8684e904 download/CSWphp4curl.postinstall 99f1ea3f414aa4e63e94d9e34069ac7d download/CSWphp4curl.preremove beb44563abab6725128a796e2507883b download/CSWphp4dba.postinstall Deleted: csw/mgar/pkg/php4/trunk/files/CSWphp4.space =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4.space 2009-05-16 01:32:59 UTC (rev 4887) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4.space 2009-05-16 01:34:55 UTC (rev 4888) @@ -1 +0,0 @@ -php 32 2 Copied: csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.space (from rev 4834, csw/mgar/pkg/php4/trunk/files/CSWphp4.space) =================================================================== --- csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.space (rev 0) +++ csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.space 2009-05-16 01:34:55 UTC (rev 4888) @@ -0,0 +1 @@ +php 32 2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sat May 16 04:11:27 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 02:11:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[4889] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 4889 http://gar.svn.sourceforge.net/gar/?rev=4889&view=rev Author: valholla Date: 2009-05-16 02:11:27 +0000 (Sat, 16 May 2009) Log Message: ----------- typo in fixadmin Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-05-16 01:34:55 UTC (rev 4888) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-05-16 02:11:27 UTC (rev 4889) @@ -94,7 +94,7 @@ install-extras: @echo "[====> Fixing Admin Scripts <====]" - PHP_INI_FILE=`$(PKGROOT)$(bindir)/php -i | + 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` @@ -102,6 +102,7 @@ `gfind $(DOWNLOADDIR) -type f -print` perl -i -pne "s|_PHPBINDIR_|$(bindir)|" \ `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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat May 16 12:51:17 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 16 May 2009 10:51:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[4890] csw/mgar/pkg/rrdtool/trunk/Makefile Message-ID: Revision: 4890 http://gar.svn.sourceforge.net/gar/?rev=4890&view=rev Author: idogan23 Date: 2009-05-16 10:51:17 +0000 (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. From valholla at users.sourceforge.net Sat May 16 13:04:22 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 11:04:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[4891] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4891 http://gar.svn.sourceforge.net/gar/?rev=4891&view=rev Author: valholla Date: 2009-05-16 11:04:22 +0000 (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/Makefile 2009-05-16 10:51:17 UTC (rev 4890) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-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 $(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 + 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: - @gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr - @grm -f $(DESTDIR)$(sysconfdir)/pear.conf - @gfind $(DESTDIR)$(prefix)/apache* \ - -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr - @$(MAKECOOKIE) + @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: Modified: csw/mgar/pkg/php5/trunk/Makefile.Orig =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.Orig 2009-05-16 10:51:17 UTC (rev 4890) +++ csw/mgar/pkg/php5/trunk/Makefile.Orig 2009-05-16 11:04:22 UTC (rev 4891) @@ -1,8 +1,8 @@ -GARNAME = php5 -GARVERSION = 5.2.9 -CATEGORIES = lang -SF_PROJ = $(shell echo $(GARNAME) | sed -e 's/[0-9]//g') -DISTNAME = $(SF_PROJ)-$(GARVERSION) +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 @@ -18,19 +18,11 @@ available. endef -php5_root = $(DESTDIR)$(prefix)/php5 -php5_bin = $(php5_root)/bin -php5_lib = $(php5_root)/lib - MASTER_SITES = http://us.php.net/distributions/ SPKG_SOURCEURL = http://www.php.net/downloads.php - INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP5ROOT = $(DESTDIR)$(prefix)/php5 +STRIP_DIRS += $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)/*/ -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin - DISTFILES += $(DISTNAME).tar.bz2 DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall @@ -44,12 +36,24 @@ REQUIRED_PKGS_CSWphp5 += CSWlibxml2 CSWzlib CSWmysql5rt REQUIRED_PKGS_CSWphp5devel = CSWphp5 -PKGFILES_CSWphp5devel = $(prefix)/php5/bin/php-config -PKGFILES_CSWphp5devel += $(prefix)/php5/bin/phpize -PKGFILES_CSWphp5devel += $(prefix)/php5/bin/peardev -PKGFILES_CSWphp5devel += $(prefix)/php5/include.* -PKGFILES_CSWphp5devel += $(prefix)/php5/lib/php/build/.* -PKGFILES_CSWphp5devel += $(prefix)/php5/man/.* +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 @@ -62,7 +66,7 @@ EXTRA_INC += $(prefix)/bdb44/include EXTRA_CFLAGS = -I$(prefix)/include/ncursesw -NOISALIST = 1 +NOISALIST = 1 STRIP_LIBTOOL = 1 CONFIGURE_ARGS += --prefix=$(prefix)/php5 @@ -71,8 +75,6 @@ CONFIGURE_ARGS += --enable-cli CONFIGURE_ARGS += --enable-fastcgi CONFIGURE_ARGS += --enable-force-cgi-redirect -CONFIGURE_ARGS += --enable-pcntl=shared -CONFIGURE_ARGS += --enable-pdo=shared CONFIGURE_ARGS += --with-mm=$(prefix) CONFIGURE_ARGS += --enable-magic-quotes CONFIGURE_ARGS += --enable-spl=shared @@ -80,9 +82,21 @@ CONFIGURE_ARGS += --with-pear=shared # Disable Tests (report submitted to PHP QA) -SKIPTEST = 1 +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 @@ -92,45 +106,45 @@ @$(MAKECOOKIE) install-extras: - ginstall -m 0755 $(WORKDIR)/phpext $(DESTDIR)$(prefix)/php5/bin - gsed -i -e s,PHPEXTDIR,$(shell $(PHP5ROOT)/bin/php-config --extension-dir),\ - $(WORKDIR)/php.ini.CSW - ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(prefix)/php5/lib - ginstall -m 0644 $(WORKDIR)/pear.conf.CSW $(DESTDIR)$(prefix)/php5/etc - ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra - ginstall -m 0644 $(WORKDIR)/httpd-php5.conf.CSW \ - $(DESTDIR)$(prefix)/apache2/etc/extra + @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 ) + @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 ) + @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: - @gfind $(DESTDIR) -name \.[a-z]\* -exec grm -fr {} \; - @gfind $(DESTDIR)/$(libdir) -name "*.a" -exec grm -f {} \; - @grm -f $(DESTDIR)$(sysconfdir)/pear.conf - @gfind $(DESTDIR)$(prefix)/apache* \ - -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr - @$(MAKECOOKIE) + @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: Modified: csw/mgar/pkg/php5/trunk/Makefile.default-dirs =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.default-dirs 2009-05-16 10:51:17 UTC (rev 4890) +++ csw/mgar/pkg/php5/trunk/Makefile.default-dirs 2009-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 @@ -38,17 +39,28 @@ PKGFILES_CSWphp5devel = $(bindir)/php-config PKGFILES_CSWphp5devel += $(bindir)/phpize PKGFILES_CSWphp5devel += $(bindir)/peardev -PKGFILES_CSWphp5devel += $(includedir)/.* PKGFILES_CSWphp5devel += $(libdir)/php/build/.* -PKGFILES_CSWphp5devel += $(mandir)/.* +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_MK = $(foreach X,$(EXTDIRLIST),$(X)/Makefile) -include $(INCLUDE_MK) +include $(foreach X,$(EXTDIRLIST),$(X)/Makefile) EXTRA_LIB += $(prefix)/bdb44/lib EXTRA_INC += $(prefix)/bdb44/include @@ -57,7 +69,7 @@ NOISALIST = 1 STRIP_LIBTOOL = 1 -CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += --prefix=$(prefix) CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --with-exec-dir=$(prefix)/bin CONFIGURE_ARGS += --enable-cli @@ -73,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 @@ -81,57 +105,51 @@ post-install-modulated: $(PI_SCRIPTS) @$(MAKECOOKIE) + install-extras: - ginstall -m 0755 $(WORKDIR)/phpext $(DESTDIR)$(bindir) - gsed -i -e s,PHPEXTDIR,$(shell $(DESTDIR)$(bindir)/php-config --extension-dir),\ - $(WORKDIR)/php.ini.CSW - ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(libdir) - ginstall -m 0644 $(WORKDIR)/pear.conf.CSW $(DESTDIR)$(sysconfdir) - ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra - ginstall -m 0644 $(WORKDIR)/httpd-php5.conf.CSW \ - $(DESTDIR)$(prefix)/apache2/etc/extra + @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 \ + @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 + $(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 + @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: - @gfind $(DESTDIR) -name \.[a-z]\* -exec grm -fr {} \; - @gfind $(DESTDIR)/$(libdir) -name "*.a" -exec grm -f {} \; - @grm -f $(DESTDIR)$(sysconfdir)/pear.conf - @gfind $(DESTDIR)$(prefix)/apache* \ - -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr - @$(MAKECOOKIE) + @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))) -post-merge-modulated: - @echo "[====> Fixing Admin Scripts <====]" - @perl -i -plne "s|PHP_INI=_PHPINIFILE_|PHP_INI=`$(PKGROOT)$(bindir)/php -i | \ - grep "Loaded Configuration File" | awk '{print $$NF}'`|" \ - gfind $(DOWNLOADDIR) -type f -print` - @$(MAKECOOKIE) - # System Rules/Configuration include gar/category.mk Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-05-16 10:51:17 UTC (rev 4890) +++ csw/mgar/pkg/php5/trunk/checksums 2009-05-16 11:04:22 UTC (rev 4891) @@ -4,7 +4,7 @@ 5f0046fe1b3f8e2228fdb165bdbbe73a download/CSWmodphp5.postinstall 2e5dbed2c9dd5e24c331753984946822 download/CSWmodphp5.preremove 0dd379f20ceb32fc77bb3a9bf045097f download/CSWmodphp5.space -0914febc951a55cd2bc587a2f9c30652 download/CSWphp5.postinstall +61b5c51492268af9e9afc22759c63a6b 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 -550ae718308582e8eec40452190cae50 download/php.ini.CSW -6251f3adcefc6ffa61d6339ac6b2d1eb download/phpext +dfd4f19799c8f1e827402f40eda74fad download/php.ini.CSW +90ae3cef3692d7e566c47d89fe39c43d download/phpext Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-16 10:51:17 UTC (rev 4890) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2009-05-16 11:04:22 UTC (rev 4891) @@ -10,8 +10,7 @@ else echo "$PHP_INI already exists" - extdir_ext=`${PHP_BIN}/php -i |grep 'PHP Extension' |awk '{print $NF}'` - extdir="${PHP_LIB}/php/extensions/no-debug-non-zts-${extdir_ext}" + extdir="_PHPEXTDIR_" curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' $PHP_INI` if [ "$extdir" != "$curextdir" ]; then Modified: csw/mgar/pkg/php5/trunk/files/php.ini.CSW =================================================================== --- csw/mgar/pkg/php5/trunk/files/php.ini.CSW 2009-05-16 10:51:17 UTC (rev 4890) +++ csw/mgar/pkg/php5/trunk/files/php.ini.CSW 2009-05-16 11:04:22 UTC (rev 4891) @@ -517,7 +517,7 @@ user_dir = ; Directory in which the loadable extensions (modules) reside. -extension_dir = "PHPEXTDIR" +extension_dir = "_PHPEXTDIR_" ; 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sat May 16 13:07:16 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 11:07:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[4892] csw/mgar/pkg/php5/trunk/checksums Message-ID: Revision: 4892 http://gar.svn.sourceforge.net/gar/?rev=4892&view=rev Author: valholla Date: 2009-05-16 11:07:16 +0000 (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 +831a08d2844440929be816d45bf5ae4f 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. From valholla at users.sourceforge.net Sat May 16 13:25:46 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 11:25:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[4893] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4893 http://gar.svn.sourceforge.net/gar/?rev=4893&view=rev Author: valholla Date: 2009-05-16 11:25:46 +0000 (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/Makefile 2009-05-16 11:07:16 UTC (rev 4892) +++ csw/mgar/pkg/php5/trunk/Makefile 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_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_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.default-dirs =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.default-dirs 2009-05-16 11:07:16 UTC (rev 4892) +++ csw/mgar/pkg/php5/trunk/Makefile.default-dirs 2009-05-16 11:25:46 UTC (rev 4893) @@ -85,71 +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 Added: csw/mgar/pkg/php5/trunk/files/scripts.mk =================================================================== --- csw/mgar/pkg/php5/trunk/files/scripts.mk (rev 0) +++ csw/mgar/pkg/php5/trunk/files/scripts.mk 2009-05-16 11:25:46 UTC (rev 4893) @@ -0,0 +1,69 @@ +# +# funcion Definitions and mGar Extra Scripts +# + +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))) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sat May 16 13:27:29 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 11:27:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[4894] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4894 http://gar.svn.sourceforge.net/gar/?rev=4894&view=rev Author: valholla Date: 2009-05-16 11:27:29 +0000 (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 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) +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --with-exec-dir=$(prefix)/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 Deleted: csw/mgar/pkg/php5/trunk/Makefile.default-dirs =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.default-dirs 2009-05-16 11:25:46 UTC (rev 4893) +++ csw/mgar/pkg/php5/trunk/Makefile.default-dirs 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) -CONFIGURE_ARGS += --disable-static -CONFIGURE_ARGS += --with-exec-dir=$(prefix)/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.php5dir (from rev 4893, csw/mgar/pkg/php5/trunk/Makefile.Orig) =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile.php5dir (rev 0) +++ csw/mgar/pkg/php5/trunk/Makefile.php5dir 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 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat May 16 15:41:31 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 16 May 2009 13:41:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[4895] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 4895 http://gar.svn.sourceforge.net/gar/?rev=4895&view=rev Author: chninkel Date: 2009-05-16 13:41:31 +0000 (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/Makefile 2009-05-16 11:27:29 UTC (rev 4894) +++ csw/mgar/pkg/lftp/trunk/Makefile 2009-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. From valholla at users.sourceforge.net Sat May 16 15:52:02 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 13:52:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[4896] csw/mgar/pkg/php5/trunk/files Message-ID: Revision: 4896 http://gar.svn.sourceforge.net/gar/?rev=4896&view=rev Author: valholla Date: 2009-05-16 13:52:02 +0000 (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.mk 2009-05-16 13:41:31 UTC (rev 4895) +++ csw/mgar/pkg/php5/trunk/files/scripts.mk 2009-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. From rthurner at users.sourceforge.net Sat May 16 16:05:22 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 16 May 2009 14:05:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[4897] csw/mgar/pkg/mod_wsgi/trunk Message-ID: Revision: 4897 http://gar.svn.sourceforge.net/gar/?rev=4897&view=rev Author: rthurner Date: 2009-05-16 14:05:22 +0000 (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/Makefile 2009-05-16 13:52:02 UTC (rev 4896) +++ csw/mgar/pkg/mod_wsgi/trunk/Makefile 2009-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. From rthurner at users.sourceforge.net Sat May 16 16:23:55 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 16 May 2009 14:23:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[4898] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 4898 http://gar.svn.sourceforge.net/gar/?rev=4898&view=rev Author: rthurner Date: 2009-05-16 14:23:55 +0000 (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. From valholla at users.sourceforge.net Sat May 16 16:25:17 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 14:25:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[4899] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4899 http://gar.svn.sourceforge.net/gar/?rev=4899&view=rev Author: valholla Date: 2009-05-16 14:25:17 +0000 (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/Makefile 2009-05-16 14:23:55 UTC (rev 4898) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-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. From valholla at users.sourceforge.net Sat May 16 16:29:18 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 14:29:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[4900] csw/mgar/pkg/php5/trunk/checksums Message-ID: Revision: 4900 http://gar.svn.sourceforge.net/gar/?rev=4900&view=rev Author: valholla Date: 2009-05-16 14:29:17 +0000 (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. From valholla at users.sourceforge.net Sat May 16 16:38:21 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 14:38:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[4901] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4901 http://gar.svn.sourceforge.net/gar/?rev=4901&view=rev Author: valholla Date: 2009-05-16 14:38:21 +0000 (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 -831a08d2844440929be816d45bf5ae4f 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.mk 2009-05-16 14:29:17 UTC (rev 4900) +++ csw/mgar/pkg/php5/trunk/files/scripts.mk 2009-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. From valholla at users.sourceforge.net Sat May 16 17:04:59 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 15:04:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[4902] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4902 http://gar.svn.sourceforge.net/gar/?rev=4902&view=rev Author: valholla Date: 2009-05-16 15:04:59 +0000 (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/Makefile 2009-05-16 14:38:21 UTC (rev 4901) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-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.mk 2009-05-16 14:38:21 UTC (rev 4901) +++ csw/mgar/pkg/php5/trunk/files/scripts.mk 2009-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. From valholla at users.sourceforge.net Sat May 16 17:08:27 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 15:08:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[4903] csw/mgar/pkg/php5/trunk/files/scripts.mk Message-ID: Revision: 4903 http://gar.svn.sourceforge.net/gar/?rev=4903&view=rev Author: valholla Date: 2009-05-16 15:08:26 +0000 (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.mk 2009-05-16 15:04:59 UTC (rev 4902) +++ csw/mgar/pkg/php5/trunk/files/scripts.mk 2009-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. From valholla at users.sourceforge.net Sat May 16 17:54:01 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 15:54:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[4904] csw/mgar/pkg/python/trunk Message-ID: Revision: 4904 http://gar.svn.sourceforge.net/gar/?rev=4904&view=rev Author: valholla Date: 2009-05-16 15:54:00 +0000 (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.py 2009-02-23 15:20:00.516392336 -0600 -@@ -268,7 +268,21 @@ +--- Python-2.6.2/Lib/site.py.o 2009-05-16 10:26:13.235499624 -0500 ++++ Python-2.6.2/Lib/site.py 2009-05-16 10:29:16.772710013 -0500 +@@ -266,9 +266,10 @@ + sitedirs.append(os.path.join(prefix, "Lib", "site-packages")) + elif os.sep == '/': sitedirs.append(os.path.join(prefix, "lib", - "python" + sys.version[:3], +- "python" + sys.version[:3], ++ "python", "site-packages")) -- sitedirs.append(os.path.join(prefix, "lib", "site-python")) -+ sitedirs.append(os.path.join(prefix, "lib", -+ "python", -+ "site-packages")) -+ sitedirs.append(os.path.join(prefix, "lib", -+ "python2.5", -+ "site-packages")) -+ sitedirs.append(os.path.join(prefix, "lib", -+ "python2.3", -+ "site-packages")) -+ sitedirs.append(os.path.join(prefix, "lib", -+ "python2.1", -+ "site-packages")) -+ sitedirs.append(os.path.join(prefix, "lib", -+ "python", -+ "site-packages")) + sitedirs.append(os.path.join(prefix, "lib", "site-python")) ++ sitedirs.append("/opt/csw/lib/python2.3/site-packages") else: sitedirs.append(prefix) sitedirs.append(os.path.join(prefix, "lib", "site-packages")) +--- Python-2.6.2/Lib/distutils/command/install.py.o 2009-05-16 10:29:46.625564211 -0500 ++++ Python-2.6.2/Lib/distutils/command/install.py 2009-05-16 10:31:26.296866583 -0500 +@@ -41,8 +41,8 @@ + + INSTALL_SCHEMES = { + 'unix_prefix': { +- 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/lib/python$py_version_short/site-packages', ++ 'purelib': '$base/lib/python/site-packages', ++ 'platlib': '$platbase/lib/python/site-packages', + 'headers': '$base/include/python$py_version_short/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +--- Python-2.6.2/Makefile.pre.in.o 2009-05-16 10:35:14.566752156 -0500 ++++ Python-2.6.2/Makefile.pre.in 2009-05-16 10:35:55.162080324 -0500 +@@ -94,11 +94,11 @@ + SCRIPTDIR= $(prefix)/lib + + # Detailed destination directories +-BINLIBDEST= $(LIBDIR)/python$(VERSION) +-LIBDEST= $(SCRIPTDIR)/python$(VERSION) ++BINLIBDEST= $(LIBDIR)/python ++LIBDEST= $(SCRIPTDIR)/python + INCLUDEPY= $(INCLUDEDIR)/python$(VERSION) + CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION) +-LIBP= $(LIBDIR)/python$(VERSION) ++LIBP= $(LIBDIR)/python + + # Symbols used for using shared libraries + SO= @SO@ +--- Python-2.6.2/Modules/getpath.c.o 2009-05-16 10:44:29.756720713 -0500 ++++ Python-2.6.2/Modules/getpath.c 2009-05-16 10:45:33.735370122 -0500 +@@ -117,8 +117,8 @@ + #endif + + #ifndef PYTHONPATH +-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ +- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" ++#define PYTHONPATH PREFIX "/lib/python:" \ ++ EXEC_PREFIX "/lib/python/lib-dynload" + #endif + + #ifndef LANDMARK +@@ -129,7 +129,7 @@ + static char exec_prefix[MAXPATHLEN+1]; + static char progpath[MAXPATHLEN+1]; + static char *module_search_path = NULL; +-static char lib_python[] = "lib/python" VERSION; ++static char lib_python[] = "lib/python"; + + static void + reduce(char *dir) +--- Python-2.6.2/Lib/distutils/sysconfig.py.o 2009-05-16 10:48:24.271739485 -0500 ++++ Python-2.6.2/Lib/distutils/sysconfig.py 2009-05-16 10:49:21.413202445 -0500 +@@ -116,7 +116,7 @@ + + if os.name == "posix": + libpython = os.path.join(prefix, +- "lib", "python" + get_python_version()) ++ "lib", "python") + if standard_lib: + return libpython + else: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat May 16 20:38:49 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 16 May 2009 18:38:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[4905] csw/mgar/pkg Message-ID: Revision: 4905 http://gar.svn.sourceforge.net/gar/?rev=4905&view=rev Author: rthurner Date: 2009-05-16 18:38:49 +0000 (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/checksums 2009-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. From valholla at users.sourceforge.net Sat May 16 21:50:17 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 16 May 2009 19:50:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[4906] csw/mgar/pkg/php5/trunk/files/scripts.mk Message-ID: Revision: 4906 http://gar.svn.sourceforge.net/gar/?rev=4906&view=rev Author: valholla Date: 2009-05-16 19:50:17 +0000 (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.mk 2009-05-16 18:38:49 UTC (rev 4905) +++ csw/mgar/pkg/php5/trunk/files/scripts.mk 2009-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. From bdwalton at users.sourceforge.net Sun May 17 03:40:00 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 May 2009 01:40:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[4907] csw/mgar/pkg Message-ID: Revision: 4907 http://gar.svn.sourceforge.net/gar/?rev=4907&view=rev Author: bdwalton Date: 2009-05-17 01:39:59 +0000 (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. From bdwalton at users.sourceforge.net Sun May 17 04:17:05 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 May 2009 02:17:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[4908] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 4908 http://gar.svn.sourceforge.net/gar/?rev=4908&view=rev Author: bdwalton Date: 2009-05-17 02:17:05 +0000 (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. From valholla at users.sourceforge.net Sun May 17 04:53:34 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 17 May 2009 02:53:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[4909] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 4909 http://gar.svn.sourceforge.net/gar/?rev=4909&view=rev Author: valholla Date: 2009-05-17 02:53:34 +0000 (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. From valholla at users.sourceforge.net Sun May 17 06:43:28 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 17 May 2009 04:43:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[4910] csw/mgar/gar/v2/bin/fixlibtool Message-ID: Revision: 4910 http://gar.svn.sourceforge.net/gar/?rev=4910&view=rev Author: valholla Date: 2009-05-17 04:43:28 +0000 (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. From rthurner at users.sourceforge.net Sun May 17 09:36:09 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 17 May 2009 07:36:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[4911] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 4911 http://gar.svn.sourceforge.net/gar/?rev=4911&view=rev Author: rthurner Date: 2009-05-17 07:36:09 +0000 (Sun, 17 May 2009) Log Message: ----------- depend on apache2rt, include test target, include strip_libtool Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2009-05-17 04:43:28 UTC (rev 4910) +++ csw/mgar/pkg/libserf/trunk/Makefile 2009-05-17 07:36:09 UTC (rev 4911) @@ -21,7 +21,8 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -DEPENDS = server/apache2 +DEPENDS = server/apache2rt +STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-apr=$(prefix)/apache2 @@ -29,5 +30,5 @@ #CONFIGURE_ARGS += --with-apr=$(prefix)/apache2/bin/apr-config #CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2/bin/apu-config - +TEST_TARGET = check include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 17 10:57:31 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 17 May 2009 08:57:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[4912] csw/mgar/pkg/libcairo/trunk/Makefile Message-ID: Revision: 4912 http://gar.svn.sourceforge.net/gar/?rev=4912&view=rev Author: rthurner Date: 2009-05-17 08:57:30 +0000 (Sun, 17 May 2009) Log Message: ----------- typo Modified Paths: -------------- csw/mgar/pkg/libcairo/trunk/Makefile Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2009-05-17 07:36:09 UTC (rev 4911) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2009-05-17 08:57:30 UTC (rev 4912) @@ -21,7 +21,7 @@ SPKG_DESC_CSWlibcairo = $(DESCRIPTION) SPKG_DESC_CSWlibcairodevel = $(DESCRIPTION) development package -SPKG_DESC_CSWlibcairodoc = $(DESCRIPTION) documentaiton +SPKG_DESC_CSWlibcairodoc = $(DESCRIPTION) documentation PKGFILES_CSWlibcairodevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibcairodevel += $(docdir)/libcairo_devel/.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun May 17 11:30:58 2009 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 17 May 2009 09:30:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[4913] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 4913 http://gar.svn.sourceforge.net/gar/?rev=4913&view=rev Author: rthurner Date: 2009-05-17 09:30:58 +0000 (Sun, 17 May 2009) Log Message: ----------- rename from serf to libserf Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2009-05-17 08:57:30 UTC (rev 4912) +++ csw/mgar/pkg/libserf/trunk/Makefile 2009-05-17 09:30:58 UTC (rev 4913) @@ -1,5 +1,6 @@ -GARNAME = serf +GARNAME = libserf GARVERSION = 0.3.0 +DISTNAME = serf-$(GARVERSION) CATEGORIES = lib DESCRIPTION = HTTP client library built on APR, multiplexes connections. @@ -12,10 +13,10 @@ endef MASTER_SITES = http://serf.googlecode.com/files/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES = $(DISTNAME).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = $(DISTNAME)-(\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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun May 17 14:46:10 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 17 May 2009 12:46:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[4914] csw/mgar/pkg/bash/trunk Message-ID: Revision: 4914 http://gar.svn.sourceforge.net/gar/?rev=4914&view=rev Author: chninkel Date: 2009-05-17 12:46:10 +0000 (Sun, 17 May 2009) Log Message: ----------- bash: updated to patch level 24 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2009-05-17 09:30:58 UTC (rev 4913) +++ csw/mgar/pkg/bash/trunk/Makefile 2009-05-17 12:46:10 UTC (rev 4914) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = bash -GARVERSION = 4.0.17 +GARVERSION = 4.0.24 CATEGORIES = devel DESCRIPTION = A sh-compatible command language interpreter Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2009-05-17 09:30:58 UTC (rev 4913) +++ csw/mgar/pkg/bash/trunk/checksums 2009-05-17 12:46:10 UTC (rev 4914) @@ -17,6 +17,13 @@ bb41963d030bc61a20e8185367b337c5 download/bash40-015 f75455048a086528971252fd979b8755 download/bash40-016 34b2cd57271a452f4a26b39d77ff908f download/bash40-017 -e3a631b0798de159e48cdb8701dad334 download/changelog.CSW +99318eed8dcc05e10a14ae27043f175d download/bash40-018 +af3b9aaeadc71a5007bec2b98c751cde download/bash40-019 +eb7c7ddeb7e8451eb59228dca3329696 download/bash40-020 +585d701b978ceb63967dc020db3a2234 download/bash40-021 +7a70f2608f90f6ac0c2051e5f1c6c414 download/bash40-022 +7a23aa41630dd4fe8d30108a200e2d96 download/bash40-023 +82ba5fc9eb780eb57d8b7628a17b7d74 download/bash40-024 +bdb3a155736820d6e77667173062e904 download/changelog.CSW 60956e6be20f69dafbb06fcc83bab88e download/shells 29607316cff22f7427322d8f190cbadf download/use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-05-17 09:30:58 UTC (rev 4913) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-05-17 12:46:10 UTC (rev 4914) @@ -1,3 +1,9 @@ +bash (4.0.24,REV=2009.05.17) unstable + + * Added bash patches bash40-018 to bash40-024. + + -- Yann Rouillard Sun, 17 May 2009 13:50:28 +0200 + bash (4.0.17,REV=2009.04.11) unstable * Added bash patches bash40-011 to bash40-017. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun May 17 17:22:50 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 May 2009 15:22:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[4915] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 4915 http://gar.svn.sourceforge.net/gar/?rev=4915&view=rev Author: dmichelsen Date: 2009-05-17 15:22:50 +0000 (Sun, 17 May 2009) Log Message: ----------- mGAR v2: Interim-commit for hardlink reordeing matching package dependencies 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-05-17 12:46:10 UTC (rev 4914) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-05-17 15:22:50 UTC (rev 4915) @@ -218,6 +218,27 @@ ) endef +# This function takes a full path to a filename and returns the package it belongs to. +# The package may be generated during this build or already installed on the system. +# /etc/crypto/certs/SUNWObjectCA=../../../etc/certs/SUNWObjectCA l none SUNWcsr +#perl -ane '$$f=quotemeta("$1");if($$F[0]=~/^$$f(=.*)?$$/){print join(" ",$$F[3..$$#F]),"\n";exit}'/dev/null | awk '/^Current/ {p=0} p==1 {print} /^Referenced/ {p=1}' | perl -ane 'print join("\n", at F)') +# 'pkchk -l -p' doesn't work as it concatenates package names with more than 14 characters, +# e. g. SUNWgnome-base-libs-develSUNWgnome-calculatorSUNWgnome-freedb-libsSUNWgnome-cd-burnerSUNWgnome-character-map +define file2pkg +$(shell perl -ane '@l{"s","l","d","b","c","f","x","v","e"}=(3,3,6,8,8,9,6,9,9);$$f=quotemeta("$1");if($$F[0]=~/^$$f(=.*)?$$/){s/^\*// foreach @F;print join(" ", at F[$$l{$$F[1]}..$$#F]),"\n";exit}' Revision: 4916 http://gar.svn.sourceforge.net/gar/?rev=4916&view=rev Author: j_arndt Date: 2009-05-17 16:07:25 +0000 (Sun, 17 May 2009) Log Message: ----------- pnp: fixed typo, added dependency to CSWnagios Modified Paths: -------------- csw/mgar/pkg/pnp/trunk/Makefile Modified: csw/mgar/pkg/pnp/trunk/Makefile =================================================================== --- csw/mgar/pkg/pnp/trunk/Makefile 2009-05-17 15:22:50 UTC (rev 4915) +++ csw/mgar/pkg/pnp/trunk/Makefile 2009-05-17 16:07:25 UTC (rev 4916) @@ -2,7 +2,7 @@ GARVERSION = 0.4.14 CATEGORIES = apps -DESCRIPTION = visualization of nagios performance data using RRD databases +DESCRIPTION = visualization of nagios performance data using RRD databases define BLURB PNP is an addon to nagios which analyzes performance data provided by plugins and stores them automatically into RRD-databases endef @@ -35,9 +35,11 @@ libexecdir = $(prefix)/libexec/nagios-plugins localstatedir =$(prefix)/nagios/pnp/var -REQUIRED_PKGS += CSWphp5 CSWphp5gd CSWap2modphp5 CSWrrd CSWcswclassutils +REQUIRED_PKGS += CSWphp5 CSWphp5gd CSWap2modphp5 CSWrrd CSWnagios CSWcswclassutils SPKG_CLASSES = none cswpreserveconf cswinitsmf +ENABLE_CHECK=0 + #PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswpnp$$$$/ { $$$$2 = "cswinitsmf" } { print }' CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun May 17 18:29:04 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 17 May 2009 16:29:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[4917] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 4917 http://gar.svn.sourceforge.net/gar/?rev=4917&view=rev Author: valholla Date: 2009-05-17 16:29:04 +0000 (Sun, 17 May 2009) Log Message: ----------- update checksum Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/checksums csw/mgar/pkg/subversion/trunk/files/CSWap2svn.postinstall Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2009-05-17 16:07:25 UTC (rev 4916) +++ csw/mgar/pkg/subversion/trunk/checksums 2009-05-17 16:29:04 UTC (rev 4917) @@ -1,4 +1,4 @@ -1e19681e6d988d35cfc6d708883ab7aa download/CSWap2svn.postinstall +32b2cc8a237404d160a5617ea2da53d8 download/CSWap2svn.postinstall 586b9c9924c1547d44451a84d2aca702 download/CSWap2svn.preremove 395ec6d1bfe07efadc1c0aa8816673fa download/CSWsvn.checkinstall 41ec540885de7c34625768aa1fb9682b download/fixme.sh Modified: csw/mgar/pkg/subversion/trunk/files/CSWap2svn.postinstall =================================================================== --- csw/mgar/pkg/subversion/trunk/files/CSWap2svn.postinstall 2009-05-17 16:07:25 UTC (rev 4916) +++ csw/mgar/pkg/subversion/trunk/files/CSWap2svn.postinstall 2009-05-17 16:29:04 UTC (rev 4917) @@ -11,7 +11,7 @@ # Enable modules PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} -for mod in dav dav_fs dav_svn authz_svn +for mod in dav dav_fs dav_svn dav_lock authz_svn do perl -i -lne "print unless /^#?LoadModule.*mod_$mod.so/" $AP2_CONFIG chroot $PKG_INSTALL_ROOT \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun May 17 19:55:27 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 17 May 2009 17:55:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[4918] csw/mgar/pkg/pysqlite2/trunk Message-ID: Revision: 4918 http://gar.svn.sourceforge.net/gar/?rev=4918&view=rev Author: valholla Date: 2009-05-17 17:55:27 +0000 (Sun, 17 May 2009) Log Message: ----------- update 2.5.5 Modified Paths: -------------- csw/mgar/pkg/pysqlite2/trunk/Makefile csw/mgar/pkg/pysqlite2/trunk/checksums Modified: csw/mgar/pkg/pysqlite2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite2/trunk/Makefile 2009-05-17 16:29:04 UTC (rev 4917) +++ csw/mgar/pkg/pysqlite2/trunk/Makefile 2009-05-17 17:55:27 UTC (rev 4918) @@ -1,5 +1,5 @@ GARNAME = pysqlite -GARVERSION = 2.4.0 +GARVERSION = 2.5.5 CATEGORIES = lang RELVER = $(shell echo $(GARVERSION) |gsed 's/\(^[0-9].*\)\.[0-9]*/\1/') @@ -9,7 +9,7 @@ SQLite support for Python endef -MASTER_SITES = http://initd.org/pub/software/pysqlite/releases/$(RELVER)/$(GARVERSION)/ +MASTER_SITES = http://oss.itsystementwicklung.de/download/pysqlite/$(RELVER)/$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWpysqlite2 Modified: csw/mgar/pkg/pysqlite2/trunk/checksums =================================================================== --- csw/mgar/pkg/pysqlite2/trunk/checksums 2009-05-17 16:29:04 UTC (rev 4917) +++ csw/mgar/pkg/pysqlite2/trunk/checksums 2009-05-17 17:55:27 UTC (rev 4918) @@ -1 +1 @@ -46b4590c51b9fb62cd0be1439646549e download/pysqlite-2.4.0.tar.gz +4f9fcd12a4860160b1f332066c64ee58 download/pysqlite-2.5.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun May 17 22:03:09 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 17 May 2009 20:03:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[4919] csw/mgar/pkg/stunnel/trunk Message-ID: Revision: 4919 http://gar.svn.sourceforge.net/gar/?rev=4919&view=rev Author: skayser Date: 2009-05-17 20:03:09 +0000 (Sun, 17 May 2009) Log Message: ----------- stunnel: several packaging cleanups, mostly path fixes Modified Paths: -------------- csw/mgar/pkg/stunnel/trunk/Makefile csw/mgar/pkg/stunnel/trunk/checksums Added Paths: ----------- csw/mgar/pkg/stunnel/trunk/files/CSWstunnel.postinstall csw/mgar/pkg/stunnel/trunk/files/gar-base.diff Removed Paths: ------------- csw/mgar/pkg/stunnel/trunk/files/postinstall Modified: csw/mgar/pkg/stunnel/trunk/Makefile =================================================================== --- csw/mgar/pkg/stunnel/trunk/Makefile 2009-05-17 17:55:27 UTC (rev 4918) +++ csw/mgar/pkg/stunnel/trunk/Makefile 2009-05-17 20:03:09 UTC (rev 4919) @@ -1,7 +1,3 @@ -# TODO -# - Remove excessive files from $(docdir) -# - Adjust paths in $(sysconfdir)/stunnel.conf-sample -# - Verify /var/opt/csw/lib/stunnel/dev/zero creation in postinstall GARNAME = stunnel GARVERSION = 4.27 CATEGORIES = net @@ -17,16 +13,20 @@ MASTER_SITES = http://www.stunnel.org/download/stunnel/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += postinstall +DISTFILES += CSWstunnel.postinstall SPKG_SOURCEURL = http://www.stunnel.org +REQUIRED_PKGS = CSWzlib CSWosslrt CSWtcpwrap + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# Make stunnel.conf-sample.in honor $localstatedir adjustments +PATCHFILES = gar-base.diff + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl=/opt/csw -#CONFIGURE_ARGS += --with-cert-dir=/opt/csw/ssl/certs/ CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS += --enable-dh CONFIGURE_ARGS += --localstatedir=/var/opt/csw @@ -40,14 +40,22 @@ # 2) Disable creation of /dev/zero (needs root privs, moved to postinstall) pre-build-modulated: perl -pi -e '\ - s|/bin/openssl|/bin/openssl -batch|; \ + s|\$$\(openssl\) req|\$$\(openssl\) req -batch|; \ s|^|#| if (m|/dev/zero|);' \ $(WORKSRC)/tools/Makefile @$(MAKECOOKIE) post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: DOCS=AUTHORS BUGS CREDITS ChangeLog TODO +post-install-modulated: DOCS+= doc/stunnel.*html post-install-modulated: - @ginstall -d $(DOCDEST) - @cp $(WORKSRC)/BUGS $(WORKSRC)/ChangeLog $(DOCDEST) + # create pidfile directory + @ginstall -d $(DESTDIR)/var/opt/csw/run/stunnel + + # stunnel installs several random sample scripts, cgi scripts, and + # a .spec file with unadjusted paths. Leave them out for now and + # only include specific files + @rm -rf $(DOCDEST)/* + @$(foreach D,$(DOCS),cp $(WORKSRC)/$(D) $(DOCDEST);) @cp $(FILEDIR)/changelog.CSW $(DOCDEST) @$(MAKECOOKIE) Modified: csw/mgar/pkg/stunnel/trunk/checksums =================================================================== --- csw/mgar/pkg/stunnel/trunk/checksums 2009-05-17 17:55:27 UTC (rev 4918) +++ csw/mgar/pkg/stunnel/trunk/checksums 2009-05-17 20:03:09 UTC (rev 4919) @@ -1 +1,3 @@ +b3f085499896129ad6813b1bda46113c download/CSWstunnel.postinstall +b73143a6ffa7d55f4dffcd3d6fa0544a download/gar-base.diff 3c655d815576f50046a1c28744b88681 download/stunnel-4.27.tar.gz Copied: csw/mgar/pkg/stunnel/trunk/files/CSWstunnel.postinstall (from rev 4802, csw/mgar/pkg/stunnel/trunk/files/postinstall) =================================================================== --- csw/mgar/pkg/stunnel/trunk/files/CSWstunnel.postinstall (rev 0) +++ csw/mgar/pkg/stunnel/trunk/files/CSWstunnel.postinstall 2009-05-17 20:03:09 UTC (rev 4919) @@ -0,0 +1,9 @@ +#!/bin/sh +# +# Create required /dev/zero in stunnel chroot directory +# +# Taken from stunnel Makefile. mknod can only be run as root and thus needs +# to be run from postinstall (packaging is done as non-root user). +# +/usr/sbin/mknod /var/opt/csw/lib/stunnel/dev/zero c 13 12 +chmod 666 /var/opt/csw/lib/stunnel/dev/zero Added: csw/mgar/pkg/stunnel/trunk/files/gar-base.diff =================================================================== --- csw/mgar/pkg/stunnel/trunk/files/gar-base.diff (rev 0) +++ csw/mgar/pkg/stunnel/trunk/files/gar-base.diff 2009-05-17 20:03:09 UTC (rev 4919) @@ -0,0 +1,52 @@ +diff --speed-large-files --minimal -Nru stunnel-4.27.orig/tools/stunnel.conf-sample.in stunnel-4.27/tools/stunnel.conf-sample.in +--- stunnel-4.27.orig/tools/stunnel.conf-sample.in 2009-04-16 11:10:09.000000000 +0200 ++++ stunnel-4.27/tools/stunnel.conf-sample.in 2009-05-17 12:19:56.297735281 +0200 +@@ -3,14 +3,14 @@ + ; Please make sure you understand them (especially the effect of the chroot jail) + + ; Certificate/key is needed in server mode and optional in client mode +-cert = @prefix@/etc/stunnel/mail.pem +-;key = @prefix@/etc/stunnel/mail.pem ++cert = @sysconfdir@/stunnel/mail.pem ++;key = @sysconfdir@/stunnel/mail.pem + + ; Protocol version (all, SSLv2, SSLv3, TLSv1) + sslVersion = SSLv3 + + ; Some security enhancements for UNIX systems - comment them out on Win32 +-chroot = @prefix@/var/lib/stunnel/ ++chroot = @localstatedir@/lib/stunnel/ + setuid = nobody + setgid = @DEFAULT_GROUP@ + ; PID is created inside the chroot jail +@@ -30,12 +30,12 @@ + ; CApath is located inside chroot jail + ;CApath = /certs + ; It's often easier to use CAfile +-;CAfile = @prefix@/etc/stunnel/certs.pem ++;CAfile = @sysconfdir/stunnel/certs.pem + ; Don't forget to c_rehash CRLpath + ; CRLpath is located inside chroot jail + ;CRLpath = /crls + ; Alternatively you can use CRLfile +-;CRLfile = @prefix@/etc/stunnel/crls.pem ++;CRLfile = @sysconfdir@/stunnel/crls.pem + + ; Some debugging stuff useful for troubleshooting + ;debug = 7 +diff --speed-large-files --minimal -Nru stunnel-4.27.orig/tools/stunnel.init.in stunnel-4.27/tools/stunnel.init.in +--- stunnel-4.27.orig/tools/stunnel.init.in 2008-09-17 20:53:46.000000000 +0200 ++++ stunnel-4.27/tools/stunnel.init.in 2009-05-17 12:21:18.360927513 +0200 +@@ -2,9 +2,9 @@ + # Sample stunnel SysV startup file + # Copyright by Michal Trojnara 2002,2007,2008 + +-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +-DAEMON=@prefix@/bin/stunnel +-PIDFILE=@prefix@/var/run/stunnel/stunnel.pid ++PATH=@sbindir@:@bindir@:/sbin:/bin:/usr/sbin:/usr/bin ++DAEMON=@bindir@/stunnel ++PIDFILE=@localstatedir@/run/stunnel/stunnel.pid + + test -f $DAEMON || exit 0 + Deleted: csw/mgar/pkg/stunnel/trunk/files/postinstall =================================================================== --- csw/mgar/pkg/stunnel/trunk/files/postinstall 2009-05-17 17:55:27 UTC (rev 4918) +++ csw/mgar/pkg/stunnel/trunk/files/postinstall 2009-05-17 20:03:09 UTC (rev 4919) @@ -1,10 +0,0 @@ -#!/bin/bash -# -# Create required /dev/zero in chroot directory -# -# Taken from stunnel Makefile. mknod can only be run as root and thus needs -# to be run from postinstall (packaging is done as non-root user). -# -mkdir -p /var/opt/csw/lib/stunnel/dev -mknod /var/opt/csw/lib/stunnel/dev/zero c 13 12 -chmod 666 /var/opt/csw/lib/stunnel/dev/zero This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun May 17 22:22:22 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 17 May 2009 20:22:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[4920] csw/mgar/pkg/dovecot/trunk/Makefile Message-ID: Revision: 4920 http://gar.svn.sourceforge.net/gar/?rev=4920&view=rev Author: skayser Date: 2009-05-17 20:22:22 +0000 (Sun, 17 May 2009) Log Message: ----------- dovecot: Explicitly add some /opt/csw/var subdirs to ensure standardized ownership Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2009-05-17 20:03:09 UTC (rev 4919) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2009-05-17 20:22:22 UTC (rev 4920) @@ -144,6 +144,10 @@ @ginstall -d $(SSLDIR)/certs @ginstall -d $(SSLDIR)/private + # Include these in the pkg. dovecot will create them otherwise + # with root:root ownership, which conflicts with other pkg's + @ginstall -d $(localstatedir)/run $(localstatedir)/lib + @cp $(DESTDIR)$(sysconfdir)/dovecot-example.conf \ $(DESTDIR)$(sysconfdir)/dovecot.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun May 17 22:28:37 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 17 May 2009 20:28:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[4921] csw/mgar/pkg/stunnel/trunk/Makefile Message-ID: Revision: 4921 http://gar.svn.sourceforge.net/gar/?rev=4921&view=rev Author: skayser Date: 2009-05-17 20:28:37 +0000 (Sun, 17 May 2009) Log Message: ----------- stunnel: updated TODO Modified Paths: -------------- csw/mgar/pkg/stunnel/trunk/Makefile Modified: csw/mgar/pkg/stunnel/trunk/Makefile =================================================================== --- csw/mgar/pkg/stunnel/trunk/Makefile 2009-05-17 20:22:22 UTC (rev 4920) +++ csw/mgar/pkg/stunnel/trunk/Makefile 2009-05-17 20:28:37 UTC (rev 4921) @@ -1,3 +1,6 @@ +# Todo: +# * postinstall mknod not possible within zone (mknod fails with "not owner") +# Work around this or provide README.CSW with instructions for chroot GARNAME = stunnel GARVERSION = 4.27 CATEGORIES = net This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun May 17 22:42:06 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 17 May 2009 20:42:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[4922] csw/mgar/pkg/gd/trunk Message-ID: Revision: 4922 http://gar.svn.sourceforge.net/gar/?rev=4922&view=rev Author: valholla Date: 2009-05-17 20:42:05 +0000 (Sun, 17 May 2009) Log Message: ----------- update for latest gar Modified Paths: -------------- csw/mgar/pkg/gd/trunk/Makefile csw/mgar/pkg/gd/trunk/checksums csw/mgar/pkg/gd/trunk/files/fixme.sh Modified: csw/mgar/pkg/gd/trunk/Makefile =================================================================== --- csw/mgar/pkg/gd/trunk/Makefile 2009-05-17 20:28:37 UTC (rev 4921) +++ csw/mgar/pkg/gd/trunk/Makefile 2009-05-17 20:42:05 UTC (rev 4922) @@ -14,13 +14,12 @@ MASTER_SITES = http://www.libgd.org/releases/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += fixme.sh PACKAGES = CSWgd CATALOGNAME_CSWgd = gd SPKG_DESC_CSWgd = $(DESCRIPTION) -PATCHFILES = Makefile.diff +#PATCHFILES = Makefile.diff REQUIRED_PKGS_CSWgd = CSWexpat CSWfconfig CSWftype2 CSWiconv REQUIRED_PKGS_CSWgd += CSWjpeg CSWpng CSWxpm CSWzlib @@ -30,7 +29,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 BUILD64 = 1 -NO_ISAEXEC = 0 +STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) @@ -41,15 +40,16 @@ CONFIGURE_ARGS += --with-xpm=$(prefix) CONFIGURE_ARGS += --disable-fast-install -post-configure-modulated: - @(echo "~~~ Fixing Libtool ~~~") - @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) - $(DONADA) - ## There are no tests for this TEST_SCRIPTS = skip test-skip: $(DONADA) +post-extract-modulated: + grm -f $(WORKSRC)/config/ltmain.sh + gcp /opt/csw/share/libtool/config/ltmain.sh $(WORKSRC)/config/ltmain.sh + cd $(WORKSRC); aclocal + cd $(WORKSRC); automake + include gar/category.mk Modified: csw/mgar/pkg/gd/trunk/checksums =================================================================== --- csw/mgar/pkg/gd/trunk/checksums 2009-05-17 20:28:37 UTC (rev 4921) +++ csw/mgar/pkg/gd/trunk/checksums 2009-05-17 20:42:05 UTC (rev 4922) @@ -1,3 +1,3 @@ +88e69d03742a55f979e2822d97c525c1 download/Makefile.diff +c9a4f9ee0fdef233a2ab0f5394672f2c download/fixme.sh 6c6c3dbb7bf079e0bb5fbbfd3bb8a71c download/gd-2.0.35.tar.bz2 -41ec540885de7c34625768aa1fb9682b download/fixme.sh -88e69d03742a55f979e2822d97c525c1 download/Makefile.diff Modified: csw/mgar/pkg/gd/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/gd/trunk/files/fixme.sh 2009-05-17 20:28:37 UTC (rev 4921) +++ csw/mgar/pkg/gd/trunk/files/fixme.sh 2009-05-17 20:42:05 UTC (rev 4922) @@ -21,6 +21,7 @@ ## 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/") @@ -37,11 +38,13 @@ ## Fix libtool Script for lt in $(gfind ${BASEPATH} -name libtool -print); do + gcp ${lt} ${lt}.orig gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new gmv ${lt}.new ${lt} done LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print) +gcp ${LTMAIN} ${LTMAIN}.orig if [ -f ${LTMAIN} ]; then gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new gmv ${LTMAIN}.new ${LTMAIN} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 18 00:27:25 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 17 May 2009 22:27:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4923] csw/mgar/pkg/python/trunk Message-ID: Revision: 4923 http://gar.svn.sourceforge.net/gar/?rev=4923&view=rev Author: valholla Date: 2009-05-17 22:27:25 +0000 (Sun, 17 May 2009) Log Message: ----------- fixes Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile csw/mgar/pkg/python/trunk/checksums Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-05-17 20:42:05 UTC (rev 4922) +++ csw/mgar/pkg/python/trunk/Makefile 2009-05-17 22:27:25 UTC (rev 4923) @@ -54,6 +54,8 @@ CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS += --enable-unicode=ucs4 +CONFIGURE_ARGS += --without-gcc +CONFIGURE_ARGS += --with-signal-module CONFIGURE_ARGS += --with-fpectl CONFIGURE_ARGS += --with-system-ffi CONFIGURE_ARGS += LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib' Modified: csw/mgar/pkg/python/trunk/checksums =================================================================== --- csw/mgar/pkg/python/trunk/checksums 2009-05-17 20:42:05 UTC (rev 4922) +++ csw/mgar/pkg/python/trunk/checksums 2009-05-17 22:27:25 UTC (rev 4923) @@ -1,5 +1,5 @@ 245db9f1e0f09ab7e0faaa0cf7301011 download/Python-2.6.2.tar.bz2 -9b45df21739387380ba2f5737a443170 download/configure.diff +0aced7195afe6eae5030804f484d9056 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 @@ -7,6 +7,6 @@ b389061e5a556feab6b20a08dad7ea23 download/modules.diff 369c5593c0c0edda03f3c1844788dbee download/multiprocess.diff 05724da367b025ce525de2bb704af6e3 download/pyport.diff -60ffb8b1ad45d337f57b94c5a703e62a download/python-config-in.diff +a1d114e8a20870675649aeef007a9cac download/python-config-in.diff 48577bbc43b912a4df66d09b54bd61ae download/setup.diff -0c552473ba31916ca04d05af04b9f110 download/site.diff +d6c86beae46033be70c44c8e0e4c1908 download/site.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 18 02:16:05 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 18 May 2009 00:16:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[4924] csw/mgar/pkg/python/trunk/Makefile Message-ID: Revision: 4924 http://gar.svn.sourceforge.net/gar/?rev=4924&view=rev Author: valholla Date: 2009-05-18 00:16:05 +0000 (Mon, 18 May 2009) Log Message: ----------- change dependency from sqlite to sqlitert Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-05-17 22:27:25 UTC (rev 4923) +++ csw/mgar/pkg/python/trunk/Makefile 2009-05-18 00:16:05 UTC (rev 4924) @@ -67,7 +67,7 @@ REQUIRED_PKGS_CSWpython = CSWbdb44 CSWbzip2 CSWgdbm CSWggettextrt REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWreadline CSWzlib -REQUIRED_PKGS_CSWpython += CSWsqlite3 CSWtcl CSWtk +REQUIRED_PKGS_CSWpython += CSWsqlite3rt CSWtcl CSWtk REQUIRED_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk REQUIRED_PKGS_CSWidle = CSWpython CSWpython-tk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon May 18 04:06:38 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 18 May 2009 02:06:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[4925] csw/mgar/pkg/python/trunk Message-ID: Revision: 4925 http://gar.svn.sourceforge.net/gar/?rev=4925&view=rev Author: valholla Date: 2009-05-18 02:06:37 +0000 (Mon, 18 May 2009) Log Message: ----------- remove patch and handle with gar Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/python/trunk/files/configure.diff Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-05-18 00:16:05 UTC (rev 4924) +++ csw/mgar/pkg/python/trunk/Makefile 2009-05-18 02:06:37 UTC (rev 4925) @@ -36,7 +36,7 @@ PATCHFILES += pyport.diff PATCHFILES += setup.diff PATCHFILES += site.diff -PATCHFILES += configure.diff +#PATCHFILES += configure.diff PATCHFILES += python-config-in.diff # Test for sunaudiodev fails. @@ -47,6 +47,22 @@ DEPENDS += lib/db DEPENDS += lib/gdbm +ifeq ($(shell uname -p), i386) + ifeq ($(shell uname -r),5.10) + BASECFLAGS = -xO3 -xarch=amd64 + else + BASECFLAGS = -xO3 -xarch=386 + endif +else + ifeq ($(shell uname -r),5.10) + BASECFLAGS = -xO3 -xarch=v9 + else + BASECFLAGS = -xO3 -xarch=v8 + endif +endif + +COMPILER_EXPORTS += BASECFLAGS + NOISALIST = 1 LD_OPTIONS = -R/opt/csw/lib export LD_OPTIONS Deleted: csw/mgar/pkg/python/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/python/trunk/files/configure.diff 2009-05-18 00:16:05 UTC (rev 4924) +++ csw/mgar/pkg/python/trunk/files/configure.diff 2009-05-18 02:06:37 UTC (rev 4925) @@ -1,12 +0,0 @@ ---- Python-2.6.1/configure.orig 2009-03-01 22:10:31.322676775 -0600 -+++ Python-2.6.1/configure 2009-03-01 22:11:19.595609202 -0600 -@@ -13131,8 +13131,7 @@ - SunOS*) if test "$GCC" = yes; - then CCSHARED="-fPIC"; - elif test `uname -p` = sparc; -- then CCSHARED="-xcode=pic32"; -- else CCSHARED="-Kpic"; -+ then CCSHARED="-xO3"; - fi;; - hp*|HP*) if test "$GCC" = yes; - then CCSHARED="-fPIC"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon May 18 11:37:22 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 18 May 2009 09:37:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[4926] csw/mgar/pkg Message-ID: Revision: 4926 http://gar.svn.sourceforge.net/gar/?rev=4926&view=rev Author: skayser Date: 2009-05-18 09:37:21 +0000 (Mon, 18 May 2009) Log Message: ----------- multitail: Initial commit Added Paths: ----------- csw/mgar/pkg/multitail/ csw/mgar/pkg/multitail/branches/ csw/mgar/pkg/multitail/tags/ csw/mgar/pkg/multitail/trunk/ csw/mgar/pkg/multitail/trunk/Makefile csw/mgar/pkg/multitail/trunk/checksums csw/mgar/pkg/multitail/trunk/files/ csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff Property changes on: csw/mgar/pkg/multitail/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/multitail/trunk/Makefile =================================================================== --- csw/mgar/pkg/multitail/trunk/Makefile (rev 0) +++ csw/mgar/pkg/multitail/trunk/Makefile 2009-05-18 09:37:21 UTC (rev 4926) @@ -0,0 +1,55 @@ +GARNAME = multitail +GARVERSION = 5.2.2 +CATEGORIES = utils + +DESCRIPTION = View one or multiple files like the original tail program +define BLURB + MultiTail lets you view one or multiple files like the original tail program. + The difference is that it creates multiple windows on your console (with + ncurses). It can also use colors while displaying the logfiles (through + regular expressions), for faster recognition of what is important and what + not. It can also filter lines (again with regular expressions). It has + interactive menus for editing given regular expressions and deleting and + adding windows. One can also have windows with the output of shell scripts + and other software. When viewing the output of external software, MultiTail + can mimic the functionality of tools like 'watch' and such. +endef + +MASTER_SITES = http://www.vanheusden.com/multitail/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +LICENSE = license.txt + +REQUIRED_PKGS = CSWncurses + +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +# Adjust path to configuration file and compiler options +PATCHFILES = patch-CSW.diff + +# Use provided Solaris Makefile +BUILD_ARGS = -f makefile.solaris_sunwspro + +PROTOTYPE_FILTER = awk '\ + $$$$3 ~ /multitail.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ + { print }' + +include gar/category.mk + +install-custom: EXTRA_DOCS = readme.txt thanks.txt manual.html +install-custom: EXTRA_DATA = convert-geoip.pl convert-simple.pl +install-custom: EXTRA_DATA += colors-example.pl colors-example.sh +install-custom: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) +install-custom: DATADEST = $(DESTDIR)$(datadir)/$(GARNAME) +install-custom: + @ginstall -d $(DESTDIR)$(bindir) + @ginstall -d $(DESTDIR)$(mandir)/man1 + @ginstall -d $(DESTDIR)$(sysconfdir) + @ginstall -m 755 $(WORKSRC)/multitail $(DESTDIR)$(bindir) + @ginstall -m 644 $(WORKSRC)/multitail.1 $(DESTDIR)$(mandir)/man1 + @ginstall -m 644 $(WORKSRC)/multitail.conf \ + $(DESTDIR)$(sysconfdir)/multitail.conf.CSW + @ginstall -d $(DATADEST) $(DOCDEST) + @(cd $(WORKSRC); ginstall -m 644 $(EXTRA_DATA) $(DATADEST)) + @(cd $(WORKSRC); ginstall -m 644 $(EXTRA_DOCS) $(DOCDEST)) Added: csw/mgar/pkg/multitail/trunk/checksums =================================================================== --- csw/mgar/pkg/multitail/trunk/checksums (rev 0) +++ csw/mgar/pkg/multitail/trunk/checksums 2009-05-18 09:37:21 UTC (rev 4926) @@ -0,0 +1,2 @@ +ab2c198381e9ff6271ce56bdcb06f963 download/multitail-5.2.2.tgz +6aed798703781c95a917699f9968f454 download/patch-CSW.diff Added: csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff =================================================================== --- csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff (rev 0) +++ csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff 2009-05-18 09:37:21 UTC (rev 4926) @@ -0,0 +1,77 @@ +diff -ur multitail-5.2.2.orig/help.c multitail-5.2.2/help.c +--- multitail-5.2.2.orig/help.c 2009-03-07 13:52:50.561809407 +0100 ++++ multitail-5.2.2/help.c 2009-03-07 13:54:21.839770461 +0100 +@@ -104,8 +104,8 @@ + char *help_list_keybindings[] = { + "This screen lists the keybindings you defined in", + "the MultiTail configurationfile which is located", +- "in /etc/multitail.conf. The keybindings only", +- "work in the main screen.", ++ "in /opt/csw/etc/multitail.conf. The keybindings", ++ "only work in the main screen.", + "In this screen, you can press the followking", + "keys:", + " ^UP^ (cursor key UP) scroll up", +diff -ur multitail-5.2.2.orig/makefile.solaris_sunwspro multitail-5.2.2/makefile.solaris_sunwspro +--- multitail-5.2.2.orig/makefile.solaris_sunwspro 2009-03-07 13:52:50.277658365 +0100 ++++ multitail-5.2.2/makefile.solaris_sunwspro 2009-03-07 14:07:17.458014674 +0100 +@@ -1,11 +1,9 @@ + include version + +-DESTDIR=/ +-CONFIG_FILE=$(DESTDIR)/etc/multitail.conf ++CONFIG_FILE=$(prefix)/etc/multitail.conf + +-DEBUG=#-g -D_DEBUG #-pg #-fprofile-arcs +-CFLAGS=${EXTRA_CFLAGS} -O2 -I/usr/local/include/ -D_STDC_C99 -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\" +-LDFLAGS=${EXTRA_LDFLAGS} -L/usr/local/lib/ -lsocket -lpanel -lncurses -lnsl -lm $(DEBUG) ++CFLAGS +=${EXTRA_CFLAGS} -D_STDC_C99 -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" ++LDFLAGS+=${EXTRA_LDFLAGS} -lsocket -lpanel -lncurses -lnsl -lm + + OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o color.o stripstring.o selbox.o misc.o ui.o exec.o diff.o config.o cmdline.o globals.o history.o + +diff -ur multitail-5.2.2.orig/manual.html multitail-5.2.2/manual.html +--- multitail-5.2.2.orig/manual.html 2009-03-07 13:52:50.332585127 +0100 ++++ multitail-5.2.2/manual.html 2009-03-07 14:00:28.008940908 +0100 +@@ -140,7 +140,7 @@ + parameter it needs the name of a colorscheme. The colorschemes are read + from multitail.conf. In multitail.conf you set by entering regular + expressions what color to use for what "patterns". By default, MultiTail +-looks for multitail.conf in the current directory and in the /etc directory. ++looks for multitail.conf in the /opt/csw/etc directory. + With the '-z' parameter you can explicitly define what file it should use.
+ An example: + 
+diff -ur multitail-5.2.2.orig/mt.c multitail-5.2.2/mt.c
+--- multitail-5.2.2.orig/mt.c	2009-03-07 13:52:49.901909226 +0100
++++ multitail-5.2.2/mt.c	2009-03-07 13:57:53.016591255 +0100
+@@ -2328,7 +2328,7 @@
+ 			printf("Could not determine size of file '%s' (which is supposed to be ", mail_spool_file);
+ 			printf("your mailfile): mail-check is disabled.\n");
+ 			printf("You can prevent this message by adding the line 'check_mail:0' ");
+-			printf("in /etc/multitail.conf or in .multitailrc in your home-directory.\n\n");
++			printf("in /opt/csw/etc/multitail.conf or in .multitailrc in your home-directory.\n\n");
+ 			printf("Press enter to continue...");
+ 			fflush(NULL);
+ 			getchar();
+diff -ur multitail-5.2.2.orig/multitail.conf multitail-5.2.2/multitail.conf
+--- multitail-5.2.2.orig/multitail.conf	2009-03-07 13:52:49.490040359 +0100
++++ multitail-5.2.2/multitail.conf	2009-03-07 13:56:34.117143611 +0100
+@@ -868,7 +868,7 @@
+ #              end offset: the position AFTER the last character for which the attributes are
+ #              valid
+ #              do NOT use spaces in each line!
+-colorscript:cscriptexample:/etc/multitail/colors-example.pl:this is a barely functional example script
++colorscript:cscriptexample:/opt/csw/share/multitail/colors-example.pl:this is a barely functional example script
+ #
+ #
+ # default colorschemes:
+@@ -1009,7 +1009,7 @@
+ convert:asterisk:epochtodate:^([0-9]*).([0-9]*)
+ convert:nagios.log:epochtodate:^.([0-9]*). 
+ convert:qmailtimestr:tai64todate:^(@[^ ]*)
+-convert:geoip:script:/etc/multitail/convert-geoip.pl:([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})
++convert:geoip:script:/opt/csw/share/multitail/convert-geoip.pl:([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})
+ #
+ # shell to invoke
+ shell:/bin/sh


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

From dmichelsen at users.sourceforge.net  Mon May 18 15:11:34 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 18 May 2009 13:11:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[4927] csw/mgar/pkg/multitail/trunk/
Message-ID: 

Revision: 4927
          http://gar.svn.sourceforge.net/gar/?rev=4927&view=rev
Author:   dmichelsen
Date:     2009-05-18 13:11:33 +0000 (Mon, 18 May 2009)

Log Message:
-----------
multitail: Fix reference to GAR to FQDN

Property Changed:
----------------
    csw/mgar/pkg/multitail/trunk/


Property changes on: csw/mgar/pkg/multitail/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

   + gar https://gar.svn.sourceforge.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.

From valholla at users.sourceforge.net  Mon May 18 17:50:19 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Mon, 18 May 2009 15:50:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[4928]
	csw/mgar/pkg/python/trunk/files/modules.diff
Message-ID: 

Revision: 4928
          http://gar.svn.sourceforge.net/gar/?rev=4928&view=rev
Author:   valholla
Date:     2009-05-18 15:50:18 +0000 (Mon, 18 May 2009)

Log Message:
-----------
fix curses module

Modified Paths:
--------------
    csw/mgar/pkg/python/trunk/files/modules.diff

Modified: csw/mgar/pkg/python/trunk/files/modules.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/modules.diff	2009-05-18 13:11:33 UTC (rev 4927)
+++ csw/mgar/pkg/python/trunk/files/modules.diff	2009-05-18 15:50:18 UTC (rev 4928)
@@ -6,10 +6,10 @@
  
 -#_curses _cursesmodule.c -lcurses -ltermcap
 +*shared*
-+_curses _cursesmodule.c -R/opt/csw/lib -L/opt/csw/lib -lncursesw -lxtermcap
++_curses _cursesmodule.c -R/opt/csw/lib -L/opt/csw/lib -lcurses -lncursesw -lxtermcap
  # Wrapper for the panel library that's part of ncurses and SYSV curses.
 -#_curses_panel _curses_panel.c -lpanel -lncurses 
-+_curses_panel _curses_panel.c -R/opt/csw/lib -L/opt/csw/lib -lpanel -lncursesw -lxtermcap 
++_curses_panel _curses_panel.c -R/opt/csw/lib -L/opt/csw/lib -lcurses -lpanel -lncursesw -lxtermcap 
  
  
  # Generic (SunOS / SVR4) dynamic loading module.


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

From valholla at users.sourceforge.net  Mon May 18 17:52:41 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Mon, 18 May 2009 15:52:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[4929]
	csw/mgar/pkg/python/trunk/checksums
Message-ID: 

Revision: 4929
          http://gar.svn.sourceforge.net/gar/?rev=4929&view=rev
Author:   valholla
Date:     2009-05-18 15:52:41 +0000 (Mon, 18 May 2009)

Log Message:
-----------
fix curses module

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

Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums	2009-05-18 15:50:18 UTC (rev 4928)
+++ csw/mgar/pkg/python/trunk/checksums	2009-05-18 15:52:41 UTC (rev 4929)
@@ -1,10 +1,9 @@
 245db9f1e0f09ab7e0faaa0cf7301011  download/Python-2.6.2.tar.bz2
-0aced7195afe6eae5030804f484d9056  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
 33f4094ee46ce865d3973a197f3fb4a0  download/makesetup.diff
-b389061e5a556feab6b20a08dad7ea23  download/modules.diff
+22c5f741b1744213eaef0818ab280ad5  download/modules.diff
 369c5593c0c0edda03f3c1844788dbee  download/multiprocess.diff
 05724da367b025ce525de2bb704af6e3  download/pyport.diff
 a1d114e8a20870675649aeef007a9cac  download/python-config-in.diff


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

From valholla at users.sourceforge.net  Mon May 18 18:27:44 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Mon, 18 May 2009 16:27:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[4930]
	csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall
Message-ID: 

Revision: 4930
          http://gar.svn.sourceforge.net/gar/?rev=4930&view=rev
Author:   valholla
Date:     2009-05-18 16:27:44 +0000 (Mon, 18 May 2009)

Log Message:
-----------
fix missing fi

Modified Paths:
--------------
    csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall	2009-05-18 15:52:41 UTC (rev 4929)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall	2009-05-18 16:27:44 UTC (rev 4930)
@@ -19,6 +19,7 @@
         echo "updating extension_dir..."
         perl -i.bak -plne "s,no-debug-non-zts-[0-9]+,$extdir," $PHP_INI
     fi
+fi
 
 cat << _EOT_
 


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

From valholla at users.sourceforge.net  Mon May 18 18:29:23 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Mon, 18 May 2009 16:29:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[4931] csw/mgar/pkg/php4/trunk/checksums
Message-ID: 

Revision: 4931
          http://gar.svn.sourceforge.net/gar/?rev=4931&view=rev
Author:   valholla
Date:     2009-05-18 16:29:23 +0000 (Mon, 18 May 2009)

Log Message:
-----------
fix checksum

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

Modified: csw/mgar/pkg/php4/trunk/checksums
===================================================================
--- csw/mgar/pkg/php4/trunk/checksums	2009-05-18 16:27:44 UTC (rev 4930)
+++ csw/mgar/pkg/php4/trunk/checksums	2009-05-18 16:29:23 UTC (rev 4931)
@@ -10,7 +10,7 @@
 ed0922061d8b95e2f8cc6604381cc57f  download/CSWphp4bz2.preremove
 82b8586235f637d239c07eb3bead372e  download/CSWphp4calendar.postinstall
 0bbeea841afc4d2ea98b641b9f09624a  download/CSWphp4calendar.preremove
-d4b85eb982eb4a593bacf6024db706a9  download/CSWphp4cgi.postinstall
+d790b3cd61cf2fb2ea88209a326423d8  download/CSWphp4cgi.postinstall
 97d253d03e6aee4df218c0b94f44a175  download/CSWphp4cgi.space
 84aa3d42197c8fb1c6eb000c8684e904  download/CSWphp4curl.postinstall
 99f1ea3f414aa4e63e94d9e34069ac7d  download/CSWphp4curl.preremove


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

From dmichelsen at users.sourceforge.net  Mon May 18 19:04:29 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 18 May 2009 17:04:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[4932] csw/mgar/gar/v2
Message-ID: 

Revision: 4932
          http://gar.svn.sourceforge.net/gar/?rev=4932&view=rev
Author:   dmichelsen
Date:     2009-05-18 17:04:29 +0000 (Mon, 18 May 2009)

Log Message:
-----------
mGAR v2: Source Packages

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

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2009-05-18 16:29:23 UTC (rev 4931)
+++ csw/mgar/gar/v2/gar.conf.mk	2009-05-18 17:04:29 UTC (rev 4932)
@@ -108,7 +108,7 @@
 includedir         ?= $(prefix)/include
 mandir             ?= $(sharedstatedir)/man
 docdir             ?= $(sharedstatedir)/doc
-sourcedir          ?= $(prefix)/src
+sourcedir          ?= $(BUILD_PREFIX)/src
 sharedperl         ?= $(sharedstatedir)/perl
 perllib            ?= $(libdir)/perl
 perlcswlib         ?= $(perllib)/csw
@@ -572,6 +572,8 @@
 TEST_ENV      ?= $(foreach TTT,$(TEST_EXPORTS),$(TTT)="$($(TTT))")
 INSTALL_ENV   ?= $(foreach TTT,$(INSTALL_EXPORTS),$(TTT)="$($(TTT))")
 
+# For now don't build source packages until there is some more testing
+NOSOURCEPACKAGE ?= 1
 
 # Standard Scripts
 CONFIGURE_SCRIPTS ?= $(WORKSRC)/configure

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2009-05-18 16:29:23 UTC (rev 4931)
+++ csw/mgar/gar/v2/gar.mk	2009-05-18 17:04:29 UTC (rev 4932)
@@ -598,7 +598,7 @@
 _PAX_ARGS = $(_INC_EXT_RULE) $(EXTRA_PAX_ARGS)
 
 # The basic merge merges the compiles for all ISAs on the current architecture
-merge: checksum pre-merge $(addprefix merge-,$(MODULATIONS)) merge-license post-merge
+merge: checksum pre-merge $(addprefix merge-,$(MODULATIONS)) merge-license $(if $(NOSOURCEPACKAGE),,merge-src) post-merge
 	@$(DONADA)
 
 # This merges the 
@@ -648,9 +648,10 @@
 .PHONY: remerge reset-merge reset-merge-modulated
 remerge: reset-merge merge
 
-reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license
+reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-src
 	@rm -f $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge
 	@rm -rf $(PKGROOT)
+	@$(DONADA)
 
 reset-merge-modulated:
 	@$(call _pmod,Reset merge state)

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-05-18 16:29:23 UTC (rev 4931)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-05-18 17:04:29 UTC (rev 4932)
@@ -31,8 +31,23 @@
 else
 SPKG_SPECS     ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES))
 endif
-_PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
 
+# The is the name of the package containing the sourcefiles for all packages generated from this GAR recipe.
+# It defaults to the first defined package name or gspec. SRCPACKAGE_BASE is guaranteed
+# to be one of the real packages built.
+SRCPACKAGE_BASE = $(if $(PACKAGES),$(firstword $(PACKAGES)),$(firstword $(SPKG_SPECS)))
+
+SRCPACKAGE                  ?= $(SRCPACKAGE_BASE)-src
+CATALOGNAME_$(SRCPACKAGE)   ?= $(patsubst CSW%,%,$(SRCPACKAGE_BASE))_src
+SPKG_DESC_$(SRCPACKAGE)     ?= $(SPKG_DESC_$(SRCPACKAGE_BASE)) Source Package
+ARCHALL_$(SRCPACKAGE)       ?= 1
+GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}')
+GARPKG_v1 = CSWgar-v1
+GARPKG_v2 = CSWgar-v2
+REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
+
+_PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE)))
+
 # pkgname - Get the name of a package from a gspec-name or package-name
 #
 # This is a safety function. In sane settings it should return the name
@@ -59,17 +74,17 @@
 #
 define catalogname
 $(strip 
-  $(if $(filter $(1),$(PACKAGES)),
-    $(if $(CATALOGNAME_$(1)),
-      $(CATALOGNAME_$(1)),
-      $(if $(CATALOGNAME),
-        $(CATALOGNAME),
-        $(patsubst CSW%,%,$(1))
+  $(if $(CATALOGNAME_$(1)),
+    $(CATALOGNAME_$(1)),
+    $(if $(CATALOGNAME),
+      $(CATALOGNAME),
+      $(if $(filter $(1),$(PACKAGES)),
+        $(patsubst CSW%,%,$(1)),
+        $(if $(realpath files/$(1).gspec),
+          $(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "bitname")' files/$(1).gspec),
+          $(error The catalog name for the package '$1' could not be determined, because it was neither in PACKAGES nor was there a gspec-file)
+        )
       )
-    ),
-    $(if $(realpath files/$(1).gspec),
-      $(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "bitname")' files/$(1).gspec),
-      $(error The catalog name for the package '$1' could not be determined, because it was neither in PACKAGES nor was there a gspec-file)
     )
   )
 )
@@ -198,6 +213,11 @@
 # PKGFILES_DOC selects files beloging to a documentation package
 PKGFILES_DOC  = $(docdir)/.*
 
+# PKGFILES_SRC selects the source archives for building the package
+PKGFILES_SRC = $(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE))/.*
+
+PKGFILES_$(SRCPACKAGE) ?= $(PKGFILES_SRC)
+
 # This function computes the files to be excluded from the package specified
 # as argument
 define _pkgfiles_exclude
@@ -459,7 +479,19 @@
 
 reset-merge-license:
 	@rm -f $(COOKIEDIR)/merge-license $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC))
+	@$(DONADA)
 
+
+merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE))
+merge-src: fetch
+	@$(_DBG)mkdir -p $(_SRCDIR)
+	$(_DBG)(cd $(DOWNLOADDIR); pax -r -w -v $(foreach F,$(DISTFILES) $(PATCHFILES),$F) $(_SRCDIR))
+	@$(MAKECOOKIE)
+
+reset-merge-src:
+	@rm -f $(COOKIEDIR)/merge-src
+	@$(DONADA)
+
 # package - Use the mkpackage utility to create Solaris packages
 #
 


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

From dmichelsen at users.sourceforge.net  Mon May 18 19:08:07 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 18 May 2009 17:08:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[4933] csw/mgar/pkg/gar/trunk/Makefile
Message-ID: 

Revision: 4933
          http://gar.svn.sourceforge.net/gar/?rev=4933&view=rev
Author:   dmichelsen
Date:     2009-05-18 17:08:07 +0000 (Mon, 18 May 2009)

Log Message:
-----------
gar: Remove .svn dirs

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

Modified: csw/mgar/pkg/gar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gar/trunk/Makefile	2009-05-18 17:04:29 UTC (rev 4932)
+++ csw/mgar/pkg/gar/trunk/Makefile	2009-05-18 17:08:07 UTC (rev 4933)
@@ -19,6 +19,7 @@
 SPKG_SOURCEURL = http://gar.opencsw.org
 
 PACKAGES = CSWgar CSWgar-v1 CSWgar-v2
+NOSOURCEPACKAGE = 1
 
 CATALOGNAME_CSWgar = gar
 CATALOGNAME_CSWgar-v1 = gar_v1
@@ -41,6 +42,8 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = gar
 
+EXTRA_MERGE_EXCLUDE_FILES = .*/\.svn/.*
+
 PKGFILES_CSWgar-v1 = $(prefix)/src/gar/v1/.*
 PKGFILES_CSWgar-v2 = $(prefix)/src/gar/v2/.*
 


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

From ellson at users.sourceforge.net  Mon May 18 19:09:59 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Mon, 18 May 2009 17:09:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[4934] csw/mgar/pkg
Message-ID: 

Revision: 4934
          http://gar.svn.sourceforge.net/gar/?rev=4934&view=rev
Author:   ellson
Date:     2009-05-18 17:09:56 +0000 (Mon, 18 May 2009)

Log Message:
-----------
gts: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/gts/
    csw/mgar/pkg/gts/branches/
    csw/mgar/pkg/gts/tags/
    csw/mgar/pkg/gts/trunk/
    csw/mgar/pkg/gts/trunk/Makefile
    csw/mgar/pkg/gts/trunk/checksums
    csw/mgar/pkg/gts/trunk/files/
    csw/mgar/pkg/gts/trunk/files/CSWgts.depend
    csw/mgar/pkg/gts/trunk/files/CSWgts.gspec
    csw/mgar/pkg/gts/trunk/files/gts-fabsf.diff


Property changes on: csw/mgar/pkg/gts/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/gts/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gts/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/gts/trunk/Makefile	2009-05-18 17:09:56 UTC (rev 4934)
@@ -0,0 +1,37 @@
+GARNAME = gts
+GARVERSION = 0.7.6
+CATEGORIES = lib
+
+DESCRIPTION = GNU Triangulated Surface Library
+define BLURB
+  This is the GTS library. GTS stands for the GNU Triangulated
+  Surface Library. It includes a number of useful functions to deal with
+  triangulated surfaces including, but not limited to, multi-resolution
+  models, Delaunay and Constrained Delaunay triangulations, set operations on
+  surfaces (intersection, union etc ...), bounding-boxes trees for efficient
+  collision and intersection detection, triangle strips generation for fast
+  rendering.
+endef
+
+MASTER_SITES = http://downloads.sourceforge.net/gts/
+DISTFILES    = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES   += $(call admfiles,CSWgts,depend)
+
+# 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 =  http://gts.sourceforge.net/
+
+CONFIGURE_ARGS = $(DIRPATHS) --disable-glibtest
+
+PATCHFILES = gts-fabsf.diff
+
+BUILD64 = 1
+
+NO_ISAEXEC = 1
+MERGE_EXCLUDE_FILES = .*\.la
+
+
+include gar/category.mk

Added: csw/mgar/pkg/gts/trunk/checksums
===================================================================
--- csw/mgar/pkg/gts/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/gts/trunk/checksums	2009-05-18 17:09:56 UTC (rev 4934)
@@ -0,0 +1,4 @@
+d41d8cd98f00b204e9800998ecf8427e  download/CSWgts.depend
+50ce35b206d8e90818979611d5565771  download/CSWgts.gspec
+9f710aefd2ed9b3cc1b1216171fc5a8a  download/gts-0.7.6.tar.gz
+ca517f230f97cec42b980489ab4f24fa  download/gts-fabsf.diff

Added: csw/mgar/pkg/gts/trunk/files/CSWgts.gspec
===================================================================
--- csw/mgar/pkg/gts/trunk/files/CSWgts.gspec	                        (rev 0)
+++ csw/mgar/pkg/gts/trunk/files/CSWgts.gspec	2009-05-18 17:09:56 UTC (rev 4934)
@@ -0,0 +1,4 @@
+%var            bitname gts
+%var            pkgname CSWgts
+%include        url file://%{PKGLIB}/csw_dyndepend.gspec
+%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING

Added: csw/mgar/pkg/gts/trunk/files/gts-fabsf.diff
===================================================================
--- csw/mgar/pkg/gts/trunk/files/gts-fabsf.diff	                        (rev 0)
+++ csw/mgar/pkg/gts/trunk/files/gts-fabsf.diff	2009-05-18 17:09:56 UTC (rev 4934)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru gts-0.7.6.orig/src/tribox3.c gts-0.7.6/src/tribox3.c
+--- gts-0.7.6.orig/src/tribox3.c	2005-01-19 05:48:22.000000000 +0100
++++ gts-0.7.6/src/tribox3.c	2009-05-18 17:42:33.086787517 +0200
+@@ -19,6 +19,8 @@
+ #include 
+ #include 
+ 
++#define fabsf(fv) (float)fabs((double)(fv))
++
+ #define X 0
+ #define Y 1
+ #define Z 2


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

From dmichelsen at users.sourceforge.net  Mon May 18 19:24:50 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 18 May 2009 17:24:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[4935] csw/mgar/pkg/gar/trunk/Makefile
Message-ID: 

Revision: 4935
          http://gar.svn.sourceforge.net/gar/?rev=4935&view=rev
Author:   dmichelsen
Date:     2009-05-18 17:24:50 +0000 (Mon, 18 May 2009)

Log Message:
-----------
gar: Add ARCHALL

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

Modified: csw/mgar/pkg/gar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gar/trunk/Makefile	2009-05-18 17:09:56 UTC (rev 4934)
+++ csw/mgar/pkg/gar/trunk/Makefile	2009-05-18 17:24:50 UTC (rev 4935)
@@ -44,6 +44,7 @@
 
 EXTRA_MERGE_EXCLUDE_FILES = .*/\.svn/.*
 
+ARCHALL = 1
 PKGFILES_CSWgar-v1 = $(prefix)/src/gar/v1/.*
 PKGFILES_CSWgar-v2 = $(prefix)/src/gar/v2/.*
 


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

From dmichelsen at users.sourceforge.net  Mon May 18 19:41:02 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 18 May 2009 17:41:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[4936] csw/mgar/gar/v2/gar.pkg.mk
Message-ID: 

Revision: 4936
          http://gar.svn.sourceforge.net/gar/?rev=4936&view=rev
Author:   dmichelsen
Date:     2009-05-18 17:41:02 +0000 (Mon, 18 May 2009)

Log Message:
-----------
mGAR v2: Fixes for source packages

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-05-18 17:24:50 UTC (rev 4935)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-05-18 17:41:02 UTC (rev 4936)
@@ -25,13 +25,34 @@
 # Do "PACKAGES = CSWmypkg" when you build a package whose GARNAME is not the package name.
 # If no explicit gspec-files have been defined the default name for the package is CSW$(GARNAME).
 # The whole processing is done from _PKG_SPECS, which includes all packages to be build.
+
+# SRCPACKAGE_BASE is the name of the package containing the sourcefiles for all packages
+# generated from this GAR recipe. It defaults to the first defined package name or gspec.
+# SRCPACKAGE is the name of the package containing the sources
+
 ifeq ($(origin PACKAGES), undefined)
 PACKAGES        = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(GARNAME))
-SPKG_SPECS     ?= $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES)
+SRCPACKAGE_BASE = $(firstword $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES))
+SRCPACKAGE     ?= $(SRCPACKAGE_BASE)-src
+SPKG_SPECS     ?= $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(SRCPACKAGE)
 else
-SPKG_SPECS     ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES))
+SRCPACKAGE_BASE = $(firstword $(PACKAGES))
+SRCPACKAGE     ?= $(SRCPACKAGE_BASE)-src
+SPKG_SPECS     ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(SRCPACKAGE))
 endif
 
+# Automatic definitions for source package
+CATALOGNAME_$(SRCPACKAGE)   ?= $(patsubst CSW%,%,$(SRCPACKAGE_BASE))_src
+SPKG_DESC_$(SRCPACKAGE)     ?= $(SPKG_DESC_$(SRCPACKAGE_BASE)) Source Package
+ARCHALL_$(SRCPACKAGE)       ?= 1
+# XXX: Use Repository Root instead of fixed URL as base
+GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}')
+GARPKG_v1 = CSWgar-v1
+GARPKG_v2 = CSWgar-v2
+REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
+
+_PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
+
 # The is the name of the package containing the sourcefiles for all packages generated from this GAR recipe.
 # It defaults to the first defined package name or gspec. SRCPACKAGE_BASE is guaranteed
 # to be one of the real packages built.
@@ -484,14 +505,17 @@
 
 merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE))
 merge-src: fetch
-	@$(_DBG)mkdir -p $(_SRCDIR)
-	$(_DBG)(cd $(DOWNLOADDIR); pax -r -w -v $(foreach F,$(DISTFILES) $(PATCHFILES),$F) $(_SRCDIR))
+	$(_DBG)mkdir -p $(_SRCDIR)/files
+	$(_DBG)(cd $(DOWNLOADDIR); pax -rH -w -v $(foreach F,$(DISTFILES) $(PATCHFILES),$F) $(_SRCDIR)/files)
+	$(_DBG)(cd $(CURDIR); pax -rH -w -v Makefile checksums $(_SRCDIR))
+	$(_DBG)ln -s ../gar/$(GARSYSTEMVERSION) $(_SRCDIR)/gar
 	@$(MAKECOOKIE)
 
 reset-merge-src:
 	@rm -f $(COOKIEDIR)/merge-src
 	@$(DONADA)
 
+
 # package - Use the mkpackage utility to create Solaris packages
 #
 


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

From dmichelsen at users.sourceforge.net  Mon May 18 19:50:25 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 18 May 2009 17:50:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[4937] csw/mgar/gar/v2/gar.pkg.mk
Message-ID: 

Revision: 4937
          http://gar.svn.sourceforge.net/gar/?rev=4937&view=rev
Author:   dmichelsen
Date:     2009-05-18 17:50:25 +0000 (Mon, 18 May 2009)

Log Message:
-----------
mGAR v2: Build only source package when requested

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-05-18 17:41:02 UTC (rev 4936)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-05-18 17:50:25 UTC (rev 4937)
@@ -34,11 +34,11 @@
 PACKAGES        = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(GARNAME))
 SRCPACKAGE_BASE = $(firstword $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES))
 SRCPACKAGE     ?= $(SRCPACKAGE_BASE)-src
-SPKG_SPECS     ?= $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(SRCPACKAGE)
+SPKG_SPECS     ?= $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE))
 else
 SRCPACKAGE_BASE = $(firstword $(PACKAGES))
 SRCPACKAGE     ?= $(SRCPACKAGE_BASE)-src
-SPKG_SPECS     ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(SRCPACKAGE))
+SPKG_SPECS     ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE)))
 endif
 
 # Automatic definitions for source package
@@ -67,7 +67,7 @@
 GARPKG_v2 = CSWgar-v2
 REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
 
-_PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE)))
+_PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
 
 # pkgname - Get the name of a package from a gspec-name or package-name
 #
@@ -509,11 +509,10 @@
 	$(_DBG)(cd $(DOWNLOADDIR); pax -rH -w -v $(foreach F,$(DISTFILES) $(PATCHFILES),$F) $(_SRCDIR)/files)
 	$(_DBG)(cd $(CURDIR); pax -rH -w -v Makefile checksums $(_SRCDIR))
 	$(_DBG)ln -s ../gar/$(GARSYSTEMVERSION) $(_SRCDIR)/gar
-	@$(MAKECOOKIE)
+	$(MAKECOOKIE)
 
 reset-merge-src:
 	@rm -f $(COOKIEDIR)/merge-src
-	@$(DONADA)
 
 
 # package - Use the mkpackage utility to create Solaris packages
@@ -574,7 +573,6 @@
 pkgreset: $(addprefix pkgreset-,$(SPKG_SPECS))
 	@rm -f $(COOKIEDIR)/extract
 	@rm -f $(COOKIEDIR)/extract-archive-*
-	$(DONADA)
 
 reset-package: pkgreset
 


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

From dmichelsen at users.sourceforge.net  Mon May 18 19:58:46 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 18 May 2009 17:58:46 +0000
Subject: [csw-devel] SF.net SVN: gar:[4938]
	csw/mgar/pkg/figlet/trunk/checksums
Message-ID: 

Revision: 4938
          http://gar.svn.sourceforge.net/gar/?rev=4938&view=rev
Author:   dmichelsen
Date:     2009-05-18 17:58:46 +0000 (Mon, 18 May 2009)

Log Message:
-----------
figlet: Adjust checksum as upstream seems to have changed without changing the version :-(

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

Modified: csw/mgar/pkg/figlet/trunk/checksums
===================================================================
--- csw/mgar/pkg/figlet/trunk/checksums	2009-05-18 17:50:25 UTC (rev 4937)
+++ csw/mgar/pkg/figlet/trunk/checksums	2009-05-18 17:58:46 UTC (rev 4938)
@@ -1,4 +1,4 @@
-5f84ad52d092d5db4ad5916df767646b  download/figlet222.tar.gz
 6e2dec4499f7a7fe178522e02e0b6cd1  download/contributed.tar.gz
+9fcf4f1651b8e6d3f56f1ef665285b2e  download/figlet222.tar.gz
 b2d53f7e251014adcdb4d407c47f90ef  download/international.tar.gz
 49aa57ab989e8d952be037414b0bbbe4  download/ms-dos.tar.gz


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

From dmichelsen at users.sourceforge.net  Mon May 18 20:18:16 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 18 May 2009 18:18:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[4939] csw/mgar/gar/v2/gar.pkg.mk
Message-ID: 

Revision: 4939
          http://gar.svn.sourceforge.net/gar/?rev=4939&view=rev
Author:   dmichelsen
Date:     2009-05-18 18:18:16 +0000 (Mon, 18 May 2009)

Log Message:
-----------
mGAR v2: Fix cswclassutils

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-05-18 17:58:46 UTC (rev 4938)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-05-18 18:18:16 UTC (rev 4939)
@@ -152,9 +152,9 @@
 
 # Handle cswclassutils
 # - prepend cswpreserveconf if it is not already in SPKG_CLASSES
-SPKG_CLASSES += $(if $(SAMPLECONF),$(if $(filter cswsampleconf,$(SPKG_CLASSES)),,cswsampleconf))
-SPKG_CLASSES += $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf))
-SPKG_CLASSES += $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf))
+SPKG_CLASSES := $(SPKG_CLASSES) $(if $(SAMPLECONF),$(if $(filter cswsampleconf,$(SPKG_CLASSES)),,cswsampleconf))
+SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf))
+SPKG_CLASSES := $(SPKG_CLASSES) $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf))
 # - set class for all config files
 ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF),)
 _CSWCLASS_FILTER = | perl -ane '\


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

From ellson at users.sourceforge.net  Mon May 18 20:40:18 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Mon, 18 May 2009 18:40:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[4940] csw/mgar/pkg/gts/trunk/Makefile
Message-ID: 

Revision: 4940
          http://gar.svn.sourceforge.net/gar/?rev=4940&view=rev
Author:   ellson
Date:     2009-05-18 18:40:18 +0000 (Mon, 18 May 2009)

Log Message:
-----------
add REQUIRED_PKGS

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

Modified: csw/mgar/pkg/gts/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gts/trunk/Makefile	2009-05-18 18:18:16 UTC (rev 4939)
+++ csw/mgar/pkg/gts/trunk/Makefile	2009-05-18 18:40:18 UTC (rev 4940)
@@ -24,11 +24,13 @@
 # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
 UPSTREAM_MASTER_SITES =  http://gts.sourceforge.net/
 
+REQUIRED_PKGS = CSWggettextrt CSWglib2
+
 CONFIGURE_ARGS = $(DIRPATHS) --disable-glibtest
 
 PATCHFILES = gts-fabsf.diff
 
-BUILD64 = 1
+#BUILD64 = 1
 
 NO_ISAEXEC = 1
 MERGE_EXCLUDE_FILES = .*\.la


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

From idogan23 at users.sourceforge.net  Mon May 18 21:17:37 2009
From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net)
Date: Mon, 18 May 2009 19:17:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[4941] csw/mgar/pkg/nsd/trunk
Message-ID: 

Revision: 4941
          http://gar.svn.sourceforge.net/gar/?rev=4941&view=rev
Author:   idogan23
Date:     2009-05-18 19:17:37 +0000 (Mon, 18 May 2009)

Log Message:
-----------
nsd: update to 3.2.2

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

Modified: csw/mgar/pkg/nsd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nsd/trunk/Makefile	2009-05-18 18:40:18 UTC (rev 4940)
+++ csw/mgar/pkg/nsd/trunk/Makefile	2009-05-18 19:17:37 UTC (rev 4941)
@@ -1,5 +1,5 @@
 GARNAME = nsd
-GARVERSION = 3.2.1
+GARVERSION = 3.2.2
 CATEGORIES = server
 
 DESCRIPTION = An authoritative only non-recursive name server

Modified: csw/mgar/pkg/nsd/trunk/checksums
===================================================================
--- csw/mgar/pkg/nsd/trunk/checksums	2009-05-18 18:40:18 UTC (rev 4940)
+++ csw/mgar/pkg/nsd/trunk/checksums	2009-05-18 19:17:37 UTC (rev 4941)
@@ -1,4 +1,3 @@
-193710012704d807e85445886c72aca8  download/CSWnsd.gspec
 0eece57abde9d1cef8a962461b453d03  download/cswnsd
 7a7560acb5d56847ea16fb8cd77b6ca5  download/cswusergroup
-66b602a793b851ad109403d3d2654fad  download/nsd-3.2.1.tar.gz
+a0dcb0a3b3c1a8d386125eeafe403f58  download/nsd-3.2.2.tar.gz


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

From valholla at users.sourceforge.net  Mon May 18 22:50:44 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Mon, 18 May 2009 20:50:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[4942]
	csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall
Message-ID: 

Revision: 4942
          http://gar.svn.sourceforge.net/gar/?rev=4942&view=rev
Author:   valholla
Date:     2009-05-18 20:50:42 +0000 (Mon, 18 May 2009)

Log Message:
-----------
fix postinstall

Modified Paths:
--------------
    csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall	2009-05-18 19:17:37 UTC (rev 4941)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall	2009-05-18 20:50:42 UTC (rev 4942)
@@ -31,7 +31,7 @@
 
 _EOT_
 
-if [ ! -d ${extdir} ]; then
+if [ ! -d "${extdir}" ]; then
     mkdir -p ${extdir}
     for dir in `${PHP_BIN}/php -i |grep extension_dir |\
                  awk -F'/' '{print $(NF-1), $NF}'`; do


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

From valholla at users.sourceforge.net  Mon May 18 22:52:40 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Mon, 18 May 2009 20:52:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[4943] csw/mgar/pkg/php4/trunk/checksums
Message-ID: 

Revision: 4943
          http://gar.svn.sourceforge.net/gar/?rev=4943&view=rev
Author:   valholla
Date:     2009-05-18 20:52:40 +0000 (Mon, 18 May 2009)

Log Message:
-----------
fix checksum

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

Modified: csw/mgar/pkg/php4/trunk/checksums
===================================================================
--- csw/mgar/pkg/php4/trunk/checksums	2009-05-18 20:50:42 UTC (rev 4942)
+++ csw/mgar/pkg/php4/trunk/checksums	2009-05-18 20:52:40 UTC (rev 4943)
@@ -10,7 +10,7 @@
 ed0922061d8b95e2f8cc6604381cc57f  download/CSWphp4bz2.preremove
 82b8586235f637d239c07eb3bead372e  download/CSWphp4calendar.postinstall
 0bbeea841afc4d2ea98b641b9f09624a  download/CSWphp4calendar.preremove
-d790b3cd61cf2fb2ea88209a326423d8  download/CSWphp4cgi.postinstall
+6fac0b1ac9c5b3ff834345744c658ce6  download/CSWphp4cgi.postinstall
 97d253d03e6aee4df218c0b94f44a175  download/CSWphp4cgi.space
 84aa3d42197c8fb1c6eb000c8684e904  download/CSWphp4curl.postinstall
 99f1ea3f414aa4e63e94d9e34069ac7d  download/CSWphp4curl.preremove


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

From valholla at users.sourceforge.net  Mon May 18 23:39:26 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Mon, 18 May 2009 21:39:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[4944] csw/mgar/pkg/php4/trunk
Message-ID: 

Revision: 4944
          http://gar.svn.sourceforge.net/gar/?rev=4944&view=rev
Author:   valholla
Date:     2009-05-18 21:39:26 +0000 (Mon, 18 May 2009)

Log Message:
-----------
post install fix

Modified Paths:
--------------
    csw/mgar/pkg/php4/trunk/checksums
    csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall

Modified: csw/mgar/pkg/php4/trunk/checksums
===================================================================
--- csw/mgar/pkg/php4/trunk/checksums	2009-05-18 20:52:40 UTC (rev 4943)
+++ csw/mgar/pkg/php4/trunk/checksums	2009-05-18 21:39:26 UTC (rev 4944)
@@ -10,7 +10,7 @@
 ed0922061d8b95e2f8cc6604381cc57f  download/CSWphp4bz2.preremove
 82b8586235f637d239c07eb3bead372e  download/CSWphp4calendar.postinstall
 0bbeea841afc4d2ea98b641b9f09624a  download/CSWphp4calendar.preremove
-6fac0b1ac9c5b3ff834345744c658ce6  download/CSWphp4cgi.postinstall
+204ac17a0518b74d2f6fed014b4abdf4  download/CSWphp4cgi.postinstall
 97d253d03e6aee4df218c0b94f44a175  download/CSWphp4cgi.space
 84aa3d42197c8fb1c6eb000c8684e904  download/CSWphp4curl.postinstall
 99f1ea3f414aa4e63e94d9e34069ac7d  download/CSWphp4curl.preremove

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall	2009-05-18 20:52:40 UTC (rev 4943)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall	2009-05-18 21:39:26 UTC (rev 4944)
@@ -11,8 +11,7 @@
 else
     echo "php.ini already exists"
 
-    extdir_ext=`${PHP_BIN}/php -i |grep 'PHP Extension' |awk '{print $NF}'`
-    extdir="${PHP_LIB}/php/extensions/no-debug-non-zts-${extdir_ext}"
+    extdir=`${PHP_BIN}/php-config --extension-dir`
     curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' $PHP_INI`
 
     if [ "$extdir" != "$curextdir" ]; then
@@ -33,7 +32,7 @@
 
 if [ ! -d "${extdir}" ]; then
     mkdir -p ${extdir}
-    for dir in `${PHP_BIN}/php -i |grep extension_dir |\
+    for dir in `${PHP_BIN}/php-config --extension_dir |\
                  awk -F'/' '{print $(NF-1), $NF}'`; do
         chown -R root:bin ${dir}
         chmod -R 0755 ${dir}


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

From ellson at users.sourceforge.net  Mon May 18 23:49:05 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Mon, 18 May 2009 21:49:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[4945] csw/mgar/pkg/gts/trunk
Message-ID: 

Revision: 4945
          http://gar.svn.sourceforge.net/gar/?rev=4945&view=rev
Author:   ellson
Date:     2009-05-18 21:49:05 +0000 (Mon, 18 May 2009)

Log Message:
-----------
Update according to feedback from maintainers@
	- drop explic depends and spec
	- use automatic sourceforge macros

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

Modified: csw/mgar/pkg/gts/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gts/trunk/Makefile	2009-05-18 21:39:26 UTC (rev 4944)
+++ csw/mgar/pkg/gts/trunk/Makefile	2009-05-18 21:49:05 UTC (rev 4945)
@@ -13,16 +13,16 @@
   rendering.
 endef
 
-MASTER_SITES = http://downloads.sourceforge.net/gts/
+MASTER_SITES = $(SF_MIRRORS) 
 DISTFILES    = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES   += $(call admfiles,CSWgts,depend)
 
 # 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 =  http://gts.sourceforge.net/
+UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE) = 3788
+UPSTREAM_USE_SF = 1
 
 REQUIRED_PKGS = CSWggettextrt CSWglib2
 
@@ -30,10 +30,4 @@
 
 PATCHFILES = gts-fabsf.diff
 
-#BUILD64 = 1
-
-NO_ISAEXEC = 1
-MERGE_EXCLUDE_FILES = .*\.la
-
-
 include gar/category.mk

Modified: csw/mgar/pkg/gts/trunk/checksums
===================================================================
--- csw/mgar/pkg/gts/trunk/checksums	2009-05-18 21:39:26 UTC (rev 4944)
+++ csw/mgar/pkg/gts/trunk/checksums	2009-05-18 21:49:05 UTC (rev 4945)
@@ -1,4 +1,2 @@
-d41d8cd98f00b204e9800998ecf8427e  download/CSWgts.depend
-50ce35b206d8e90818979611d5565771  download/CSWgts.gspec
 9f710aefd2ed9b3cc1b1216171fc5a8a  download/gts-0.7.6.tar.gz
 ca517f230f97cec42b980489ab4f24fa  download/gts-fabsf.diff


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

From valholla at users.sourceforge.net  Tue May 19 00:28:26 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Mon, 18 May 2009 22:28:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[4946] csw/mgar/pkg/php4/trunk
Message-ID: 

Revision: 4946
          http://gar.svn.sourceforge.net/gar/?rev=4946&view=rev
Author:   valholla
Date:     2009-05-18 22:28:25 +0000 (Mon, 18 May 2009)

Log Message:
-----------
postinstall fix

Modified Paths:
--------------
    csw/mgar/pkg/php4/trunk/checksums
    csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall

Modified: csw/mgar/pkg/php4/trunk/checksums
===================================================================
--- csw/mgar/pkg/php4/trunk/checksums	2009-05-18 21:49:05 UTC (rev 4945)
+++ csw/mgar/pkg/php4/trunk/checksums	2009-05-18 22:28:25 UTC (rev 4946)
@@ -10,7 +10,7 @@
 ed0922061d8b95e2f8cc6604381cc57f  download/CSWphp4bz2.preremove
 82b8586235f637d239c07eb3bead372e  download/CSWphp4calendar.postinstall
 0bbeea841afc4d2ea98b641b9f09624a  download/CSWphp4calendar.preremove
-204ac17a0518b74d2f6fed014b4abdf4  download/CSWphp4cgi.postinstall
+68f680b24100f2a7a4e1d3fdafd1c3ba  download/CSWphp4cgi.postinstall
 97d253d03e6aee4df218c0b94f44a175  download/CSWphp4cgi.space
 84aa3d42197c8fb1c6eb000c8684e904  download/CSWphp4curl.postinstall
 99f1ea3f414aa4e63e94d9e34069ac7d  download/CSWphp4curl.preremove

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall	2009-05-18 21:49:05 UTC (rev 4945)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall	2009-05-18 22:28:25 UTC (rev 4946)
@@ -32,11 +32,12 @@
 
 if [ ! -d "${extdir}" ]; then
     mkdir -p ${extdir}
-    for dir in `${PHP_BIN}/php-config --extension_dir |\
+    for dir in `${PHP_BIN}/php-config --extension-dir |\
                  awk -F'/' '{print $(NF-1), $NF}'`; do
-        chown -R root:bin ${dir}
-        chmod -R 0755 ${dir}
-        installf ${PKGINST} ${dir}
+        idir=`echo ${extdir} |sed "s,\(.*/$dir\).*,\1,"`
+        chown -R root:bin ${idir}
+        chmod -R 0755 ${idir}
+        installf ${PKGINST} ${idir}
     done
     installf -f ${PKGINST}
 fi


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

From ellson at users.sourceforge.net  Tue May 19 00:33:39 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Mon, 18 May 2009 22:33:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[4947] csw/mgar/pkg/gts/trunk/files
Message-ID: 

Revision: 4947
          http://gar.svn.sourceforge.net/gar/?rev=4947&view=rev
Author:   ellson
Date:     2009-05-18 22:33:39 +0000 (Mon, 18 May 2009)

Log Message:
-----------
delete unneeded files from svn

Removed Paths:
-------------
    csw/mgar/pkg/gts/trunk/files/CSWgts.depend
    csw/mgar/pkg/gts/trunk/files/CSWgts.gspec

Deleted: csw/mgar/pkg/gts/trunk/files/CSWgts.gspec
===================================================================
--- csw/mgar/pkg/gts/trunk/files/CSWgts.gspec	2009-05-18 22:28:25 UTC (rev 4946)
+++ csw/mgar/pkg/gts/trunk/files/CSWgts.gspec	2009-05-18 22:33:39 UTC (rev 4947)
@@ -1,4 +0,0 @@
-%var            bitname gts
-%var            pkgname CSWgts
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING


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

From ellson at users.sourceforge.net  Tue May 19 01:31:43 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Mon, 18 May 2009 23:31:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[4948] csw/mgar/pkg/gts/trunk/Makefile
Message-ID: 

Revision: 4948
          http://gar.svn.sourceforge.net/gar/?rev=4948&view=rev
Author:   ellson
Date:     2009-05-18 23:31:42 +0000 (Mon, 18 May 2009)

Log Message:
-----------
correct group_id for gts on sourceforge

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

Modified: csw/mgar/pkg/gts/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gts/trunk/Makefile	2009-05-18 22:33:39 UTC (rev 4947)
+++ csw/mgar/pkg/gts/trunk/Makefile	2009-05-18 23:31:42 UTC (rev 4948)
@@ -21,7 +21,8 @@
 
 # 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 = $(SF_PROJECT_SHOWFILE) = 3788
+# 1343 is the group_id for the gts project on sourceforge
+UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE) = 1343
 UPSTREAM_USE_SF = 1
 
 REQUIRED_PKGS = CSWggettextrt CSWglib2


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

From hson at users.sourceforge.net  Tue May 19 04:19:46 2009
From: hson at users.sourceforge.net (hson at users.sourceforge.net)
Date: Tue, 19 May 2009 02:19:46 +0000
Subject: [csw-devel] SF.net SVN: gar:[4949]
	csw/mgar/pkg/ImageMagick/trunk/Makefile
Message-ID: 

Revision: 4949
          http://gar.svn.sourceforge.net/gar/?rev=4949&view=rev
Author:   hson
Date:     2009-05-19 02:19:46 +0000 (Tue, 19 May 2009)

Log Message:
-----------
imagemagick: Update to 6.5.2-6

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

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2009-05-18 23:31:42 UTC (rev 4948)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2009-05-19 02:19:46 UTC (rev 4949)
@@ -1,6 +1,6 @@
 GARNAME = imagemagick
 GARVERSION = 6.5.2
-GARSUBREV = 4
+GARSUBREV = 6
 CATEGORIES = lib
 
 DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images


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

From hson at users.sourceforge.net  Tue May 19 06:13:58 2009
From: hson at users.sourceforge.net (hson at users.sourceforge.net)
Date: Tue, 19 May 2009 04:13:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[4950]
	csw/mgar/pkg/ImageMagick/trunk/checksums
Message-ID: 

Revision: 4950
          http://gar.svn.sourceforge.net/gar/?rev=4950&view=rev
Author:   hson
Date:     2009-05-19 04:13:57 +0000 (Tue, 19 May 2009)

Log Message:
-----------
imagemagick: updated checksums file

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

Modified: csw/mgar/pkg/ImageMagick/trunk/checksums
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/checksums	2009-05-19 02:19:46 UTC (rev 4949)
+++ csw/mgar/pkg/ImageMagick/trunk/checksums	2009-05-19 04:13:57 UTC (rev 4950)
@@ -1,2 +1,2 @@
-ddaa6abdb4a323558382046946beece2  download/ImageMagick-6.5.2-4.tar.bz2
+d7f20ba81b8b3851e310ff57a0e1ee64  download/ImageMagick-6.5.2-6.tar.bz2
 6bd361fe352c7d497d60d8d2cbe7cfd4  download/Makefile.patch


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

From idogan23 at users.sourceforge.net  Tue May 19 12:27:11 2009
From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net)
Date: Tue, 19 May 2009 10:27:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[4951] csw/mgar/pkg/nsd/trunk
Message-ID: 

Revision: 4951
          http://gar.svn.sourceforge.net/gar/?rev=4951&view=rev
Author:   idogan23
Date:     2009-05-19 10:27:11 +0000 (Tue, 19 May 2009)

Log Message:
-----------
nsd: fix to to prevent the rundir from being created twice

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

Added Paths:
-----------
    csw/mgar/pkg/nsd/trunk/files/Makefile.in.diff

Modified: csw/mgar/pkg/nsd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nsd/trunk/Makefile	2009-05-19 04:13:57 UTC (rev 4950)
+++ csw/mgar/pkg/nsd/trunk/Makefile	2009-05-19 10:27:11 UTC (rev 4951)
@@ -25,10 +25,13 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 DISTFILES += cswusergroup
 DISTFILES += cswnsd
+DISTFILES += Makefile.in.diff
 
 SPKG_CLASSES = none cswusergroup ugfiles cswcpsampleconf cswinitsmf
 PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswnsd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/CSWnsd\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } $$$$3 ~ /\/nsd\/nsd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/var\/opt\/csw\/nsd/ { $$$$2 = "ugfiles" }  $$$$3 ~ /\/var\/opt\/csw\/nsd/ { $$$$5 = "nsd" } $$$$3 ~ /\/var\/opt\/csw\/nsd/ { $$$$6 = "nsd" } { print }'
 
+PATCHFILES = Makefile.in.diff
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-ssl=/opt/csw
 CONFIGURE_ARGS += --with-pidfile=/var/run/nsd.pid

Modified: csw/mgar/pkg/nsd/trunk/checksums
===================================================================
--- csw/mgar/pkg/nsd/trunk/checksums	2009-05-19 04:13:57 UTC (rev 4950)
+++ csw/mgar/pkg/nsd/trunk/checksums	2009-05-19 10:27:11 UTC (rev 4951)
@@ -1,3 +1,4 @@
+f6712cc1882e9138cc8ab8caf6947e8c  download/Makefile.in.diff
 0eece57abde9d1cef8a962461b453d03  download/cswnsd
 7a7560acb5d56847ea16fb8cd77b6ca5  download/cswusergroup
 a0dcb0a3b3c1a8d386125eeafe403f58  download/nsd-3.2.2.tar.gz

Added: csw/mgar/pkg/nsd/trunk/files/Makefile.in.diff
===================================================================
--- csw/mgar/pkg/nsd/trunk/files/Makefile.in.diff	                        (rev 0)
+++ csw/mgar/pkg/nsd/trunk/files/Makefile.in.diff	2009-05-19 10:27:11 UTC (rev 4951)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru nsd-3.2.2.orig/Makefile.in nsd-3.2.2/Makefile.in
+--- nsd-3.2.2.orig/Makefile.in	2009-04-03 13:56:43.000000000 +0200
++++ nsd-3.2.2/Makefile.in	2009-05-19 12:20:51.924377514 +0200
+@@ -318,7 +318,7 @@
+ install: all
+ 	$(INSTALL) -d $(DESTDIR)$(sbindir)
+ 	$(INSTALL) -d $(DESTDIR)$(configdir)
+-	$(INSTALL) -d $(DESTDIR)$(piddir)
++#	$(INSTALL) -d $(DESTDIR)$(piddir)
+ 	$(INSTALL) -d $(DESTDIR)$(dbdir)
+ 	$(INSTALL) -d $(DESTDIR)$(mandir)
+ 	$(INSTALL) -d $(DESTDIR)$(mandir)/man8


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

From idogan23 at users.sourceforge.net  Tue May 19 17:06:25 2009
From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net)
Date: Tue, 19 May 2009 15:06:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[4952] csw/mgar/pkg/rrdtool/trunk
Message-ID: 

Revision: 4952
          http://gar.svn.sourceforge.net/gar/?rev=4952&view=rev
Author:   idogan23
Date:     2009-05-19 15:06:25 +0000 (Tue, 19 May 2009)

Log Message:
-----------
rrdtool: bump verison to 1.3.8

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

Modified: csw/mgar/pkg/rrdtool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/Makefile	2009-05-19 10:27:11 UTC (rev 4951)
+++ csw/mgar/pkg/rrdtool/trunk/Makefile	2009-05-19 15:06:25 UTC (rev 4952)
@@ -1,5 +1,5 @@
 GARNAME = rrdtool
-GARVERSION = 1.3.7
+GARVERSION = 1.3.8
 CATEGORIES = utils
 
 DESCRIPTION = time-series data logging and graphing.

Modified: csw/mgar/pkg/rrdtool/trunk/checksums
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/checksums	2009-05-19 10:27:11 UTC (rev 4951)
+++ csw/mgar/pkg/rrdtool/trunk/checksums	2009-05-19 15:06:25 UTC (rev 4952)
@@ -1,2 +1,2 @@
 48a9b258cf8b4b943dbaf30ea939c315  download/CSWrrdtool.gspec
-2d29d1595aecb31838279c17d06da3a4  download/rrdtool-1.3.7.tar.gz
+0de79494ab969cebfbfae3d237de18fe  download/rrdtool-1.3.8.tar.gz


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

From valholla at users.sourceforge.net  Tue May 19 18:51:16 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 19 May 2009 16:51:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[4953]
	csw/mgar/pkg/python/trunk/Makefile
Message-ID: 

Revision: 4953
          http://gar.svn.sourceforge.net/gar/?rev=4953&view=rev
Author:   valholla
Date:     2009-05-19 16:51:15 +0000 (Tue, 19 May 2009)

Log Message:
-----------
split packages further

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

Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile	2009-05-19 15:06:25 UTC (rev 4952)
+++ csw/mgar/pkg/python/trunk/Makefile	2009-05-19 16:51:15 UTC (rev 4953)
@@ -1,7 +1,6 @@
 GARNAME = Python
 GARVERSION = 2.6.2
 CATEGORIES = lang
-PACKAGES = CSWpython CSWpython-tk CSWidle
 
 SPKG_SOURCEURL = http://www.python.org/download/releases/$(GARVERSION)
 
@@ -76,11 +75,17 @@
 CONFIGURE_ARGS += --with-system-ffi
 CONFIGURE_ARGS += LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib'
 
-PKGFILES_CSWidle  = $(libdir)/python(\d+(?:\.\d+)*)/idlelib/.*
+PACKAGES  = CSWpython CSWpython-tk CSWidle CSWpython-rt CSWpython-devel
+
+PKGFILES_CSWidle  = $(libdir)/.*/idlelib/.*
 PKGFILES_CSWidle += $(bindir)/idle
-PKGFILES_CSWpython-tk  = $(libdir)/python(\d+(?:\.\d+)*)/lib-tk/.*
-PKGFILES_CSWpython-tk += $(libdir)/python(\d+(?:\.\d+)*)/lib-dynload/_tkinter.so.*
+PKGFILES_CSWpython-tk  = $(libdir)/.*/lib-tk/.*
+PKGFILES_CSWpython-tk += $(libdir)/.*/lib-dynload/_tkinter.so.*
+PKGFILES_CSWpython-devel  = $(includedir)/.*
+PKGFILES_CSWpython-devel += $(libdir)/.*/config/.*
+PKGFILES_CSWpython-rt += $(libdir)/.*libpython.*
 
+
 REQUIRED_PKGS_CSWpython  = CSWbdb44 CSWbzip2 CSWgdbm CSWggettextrt 
 REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWreadline CSWzlib
 REQUIRED_PKGS_CSWpython += CSWsqlite3rt CSWtcl CSWtk
@@ -98,16 +103,24 @@
 include gar/category.mk
 
 POST_INST_SCR  = add-depricated-libs
-POST_INST_SCR += fix-config-makefile
+#POST_INST_SCR += fix-config-makefile
+POST_INST_SCR += remove-compiled-py
+
 post-install-modulated: $(POST_INST_SCR)
+	@$(MAKECOOKIE)
 
 add-depricated-libs:
 	echo "===> Adding Depricated Libs"
 	cp $(DOWNLOADDIR)/libpython2.5.so.1.0-$(MODULATION) \
 		$(DESTDIR)$(libdir)/libpython2.5.so.1.0
 	cd $(DESTDIR)$(libdir);ln -s libpython2.5.so.1.0 libpython2.5.so
-	$(DONADA)
+	@$(MAKECOOKIE)
 
+remove-compiled-py:
+	@echo "Cleaning up pyc and pyo files"
+	@gfind $(DESTDIR)$(libdir) -name "*.py[co]" -exec grm -f {} \;
+	@$(MAKECOOKIE)
+
 fix-config-makefile:
 	perl -i -plne 's/^CCSHARED=.*/CCSHARED=/' \
 		$(DESTDIR)$(libdir)/python/config/Makefile


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

From valholla at users.sourceforge.net  Tue May 19 18:52:40 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 19 May 2009 16:52:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[4954] csw/mgar/pkg/python/trunk
Message-ID: 

Revision: 4954
          http://gar.svn.sourceforge.net/gar/?rev=4954&view=rev
Author:   valholla
Date:     2009-05-19 16:52:40 +0000 (Tue, 19 May 2009)

Log Message:
-----------
add postinstall to compile modules

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

Added Paths:
-----------
    csw/mgar/pkg/python/trunk/files/CSWpython.postinstall

Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile	2009-05-19 16:51:15 UTC (rev 4953)
+++ csw/mgar/pkg/python/trunk/Makefile	2009-05-19 16:52:40 UTC (rev 4954)
@@ -23,6 +23,7 @@
 # Previous Library for compatability
 DISTFILES += libpython2.5.so.1.0-isa-sparcv8
 DISTFILES += libpython2.5.so.1.0-isa-i386
+DISTFILES += CSWpython.postinstall
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2

Added: csw/mgar/pkg/python/trunk/files/CSWpython.postinstall
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython.postinstall	                        (rev 0)
+++ csw/mgar/pkg/python/trunk/files/CSWpython.postinstall	2009-05-19 16:52:40 UTC (rev 4954)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+PATH=/usr/bin:/usr/sbin
+PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+PY_BINDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/bin
+PY_LIBDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/lib/python
+
+find ${PY_LIBDIR} -name "*.py[co]" -exec rm -f {} \;
+# Compile .py libraries to .pyc files
+${PY_BINDIR}/python -Wi -tt ${PY_LIBDIR}/compileall.py \
+    -d ${PY_LIBDIR} -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}
+# Compile .py libraries to .pyo files
+${PY_BINDIR}/python -Wi -tt -O ${PY_LIBDIR}/compileall.py \
+    -d ${PY_LIBDIR} -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}
+
+for file in `find ${PY_LIBDIR} -name "*.py[co]" -print`
+do
+    installf ${PKGINST} ${file}
+done
+installf -f ${PKGINST}
+
+exit 0


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

From valholla at users.sourceforge.net  Tue May 19 18:53:10 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 19 May 2009 16:53:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[4955]
	csw/mgar/pkg/python/trunk/checksums
Message-ID: 

Revision: 4955
          http://gar.svn.sourceforge.net/gar/?rev=4955&view=rev
Author:   valholla
Date:     2009-05-19 16:53:10 +0000 (Tue, 19 May 2009)

Log Message:
-----------
fix checksum

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

Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums	2009-05-19 16:52:40 UTC (rev 4954)
+++ csw/mgar/pkg/python/trunk/checksums	2009-05-19 16:53:10 UTC (rev 4955)
@@ -1,3 +1,4 @@
+e0237a9a045cb20211b1ef0f6cc5ac59  download/CSWpython.postinstall
 245db9f1e0f09ab7e0faaa0cf7301011  download/Python-2.6.2.tar.bz2
 42dd6523beb94a805d5764ae1276091c  download/faqwiz.diff
 5664b3970307d7d39d8d4061e7dccbb0  download/libpython2.5.so.1.0-isa-i386


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

From valholla at users.sourceforge.net  Tue May 19 20:08:34 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 19 May 2009 18:08:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[4956] csw/mgar/pkg/python/trunk
Message-ID: 

Revision: 4956
          http://gar.svn.sourceforge.net/gar/?rev=4956&view=rev
Author:   valholla
Date:     2009-05-19 18:08:34 +0000 (Tue, 19 May 2009)

Log Message:
-----------
tweaks

Modified Paths:
--------------
    csw/mgar/pkg/python/trunk/Makefile
    csw/mgar/pkg/python/trunk/checksums
    csw/mgar/pkg/python/trunk/files/CSWpython.postinstall

Added Paths:
-----------
    csw/mgar/pkg/python/trunk/files/CSWidle.postinstall
    csw/mgar/pkg/python/trunk/files/CSWidle.space
    csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall
    csw/mgar/pkg/python/trunk/files/CSWpython-tk.space
    csw/mgar/pkg/python/trunk/files/CSWpython.space

Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile	2009-05-19 16:53:10 UTC (rev 4955)
+++ csw/mgar/pkg/python/trunk/Makefile	2009-05-19 18:08:34 UTC (rev 4956)
@@ -23,7 +23,8 @@
 # Previous Library for compatability
 DISTFILES += libpython2.5.so.1.0-isa-sparcv8
 DISTFILES += libpython2.5.so.1.0-isa-i386
-DISTFILES += CSWpython.postinstall
+DISTFILES += CSWpython.postinstall CSWpython-tk.postinstall CSWidle.postinstall
+DISTFILES += CSWpython.space CSWpython-tk.space CSWidle.space
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
@@ -76,35 +77,39 @@
 CONFIGURE_ARGS += --with-system-ffi
 CONFIGURE_ARGS += LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib'
 
-PACKAGES  = CSWpython CSWpython-tk CSWidle CSWpython-rt CSWpython-devel
+PACKAGES  = CSWidle CSWpython CSWpython-devel CSWpython-rt CSWpython-tk
 
 PKGFILES_CSWidle  = $(libdir)/.*/idlelib/.*
 PKGFILES_CSWidle += $(bindir)/idle
-PKGFILES_CSWpython-tk  = $(libdir)/.*/lib-tk/.*
-PKGFILES_CSWpython-tk += $(libdir)/.*/lib-dynload/_tkinter.so.*
 PKGFILES_CSWpython-devel  = $(includedir)/.*
 PKGFILES_CSWpython-devel += $(libdir)/.*/config/.*
 PKGFILES_CSWpython-rt += $(libdir)/.*libpython.*
+PKGFILES_CSWpython-tk  = $(libdir)/.*/lib-tk/.*
+PKGFILES_CSWpython-tk += $(libdir)/.*/lib-dynload/_tkinter.so.*
 
+ENABLE_CHECK = 0
 
-REQUIRED_PKGS_CSWpython  = CSWbdb44 CSWbzip2 CSWgdbm CSWggettextrt 
-REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWreadline CSWzlib
-REQUIRED_PKGS_CSWpython += CSWsqlite3rt CSWtcl CSWtk
-REQUIRED_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk
 REQUIRED_PKGS_CSWidle = CSWpython CSWpython-tk
+REQUIRED_PKGS_CSWpython  = CSWbdb44 CSWbzip2 CSWgdbm CSWggettextrt 
+REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWpython-rt CSWreadline 
+REQUIRED_PKGS_CSWpython += CSWsqlite3rt CSWzlib
+REQUIRED_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk CSWpython-rt
 
+CATALOGNAME_CSWidle = idle
 CATALOGNAME_CSWpython = python
+CATALOGNAME_CSWpython-devel = python_devel
+CATALOGNAME_CSWpython-rt = python_rt
 CATALOGNAME_CSWpython-tk = python_tk
-CATALOGNAME_CSWidle = idle
 
+SPKG_DESC_CSWidle = Python IDE
 SPKG_DESC_CSWpython = A high-level scripting language.
+SPKG_DESC_CSWpython-devel = Development Files for Python
+SPKG_DESC_CSWpython-rt = Python Runtime Libraries
 SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter)
-SPKG_DESC_CSWidle = Python IDE
 
 include gar/category.mk
 
 POST_INST_SCR  = add-depricated-libs
-#POST_INST_SCR += fix-config-makefile
 POST_INST_SCR += remove-compiled-py
 
 post-install-modulated: $(POST_INST_SCR)
@@ -122,9 +127,3 @@
 	@gfind $(DESTDIR)$(libdir) -name "*.py[co]" -exec grm -f {} \;
 	@$(MAKECOOKIE)
 
-fix-config-makefile:
-	perl -i -plne 's/^CCSHARED=.*/CCSHARED=/' \
-		$(DESTDIR)$(libdir)/python/config/Makefile
-	$(MAKECOOKIE)
-
-

Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums	2009-05-19 16:53:10 UTC (rev 4955)
+++ csw/mgar/pkg/python/trunk/checksums	2009-05-19 18:08:34 UTC (rev 4956)
@@ -1,4 +1,9 @@
-e0237a9a045cb20211b1ef0f6cc5ac59  download/CSWpython.postinstall
+e5296fef0bda7ca6f4c06463cd67c63e  download/CSWidle.postinstall
+4d9594d707b7bd25113f8162274e74d4  download/CSWidle.space
+821c153022ec0b2aebc6dfbe9c8b9bd5  download/CSWpython-tk.postinstall
+4d9594d707b7bd25113f8162274e74d4  download/CSWpython-tk.space
+a2f72d6ecf55735c910c5e5d01f44968  download/CSWpython.postinstall
+4d9594d707b7bd25113f8162274e74d4  download/CSWpython.space
 245db9f1e0f09ab7e0faaa0cf7301011  download/Python-2.6.2.tar.bz2
 42dd6523beb94a805d5764ae1276091c  download/faqwiz.diff
 5664b3970307d7d39d8d4061e7dccbb0  download/libpython2.5.so.1.0-isa-i386

Added: csw/mgar/pkg/python/trunk/files/CSWidle.postinstall
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWidle.postinstall	                        (rev 0)
+++ csw/mgar/pkg/python/trunk/files/CSWidle.postinstall	2009-05-19 18:08:34 UTC (rev 4956)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+PATH=/usr/bin:/usr/sbin
+PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+PY_BINDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/bin
+PY_LIBDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/lib/python
+
+# Compile .py libraries to .pyc files
+${PY_BINDIR}/python -Wi -tt ${PY_LIBDIR}/compileall.py \
+    -d ${PY_LIBDIR}/idlelib -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}/idlelib
+# Compile .py libraries to .pyo files
+${PY_BINDIR}/python -Wi -tt -O ${PY_LIBDIR}/compileall.py \
+    -d ${PY_LIBDIR}/idlelib -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}/idlelib
+
+for file in `find ${PY_LIBDIR}/idlelib -name "*.py[co]" -print`
+do
+    installf ${PKGINST} ${file}
+done
+installf -f ${PKGINST}
+
+exit 0

Added: csw/mgar/pkg/python/trunk/files/CSWidle.space
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWidle.space	                        (rev 0)
+++ csw/mgar/pkg/python/trunk/files/CSWidle.space	2009-05-19 18:08:34 UTC (rev 4956)
@@ -0,0 +1 @@
+$BASEDIR

Added: csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall	                        (rev 0)
+++ csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall	2009-05-19 18:08:34 UTC (rev 4956)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+PATH=/usr/bin:/usr/sbin
+PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+PY_BINDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/bin
+PY_LIBDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/lib/python
+
+# Compile .py libraries to .pyc files
+${PY_BINDIR}/python -Wi -tt ${PY_LIBDIR}/compileall.py \
+    -d ${PY_LIBDIR}/lib-tk -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}/lib-tk
+# Compile .py libraries to .pyo files
+${PY_BINDIR}/python -Wi -tt -O ${PY_LIBDIR}/compileall.py \
+    -d ${PY_LIBDIR}/lib-tk -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}/lib-tk
+
+for file in `find ${PY_LIBDIR}/lib-tk -name "*.py[co]" -print`
+do
+    installf ${PKGINST} ${file}
+done
+installf -f ${PKGINST}
+
+exit 0

Added: csw/mgar/pkg/python/trunk/files/CSWpython-tk.space
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython-tk.space	                        (rev 0)
+++ csw/mgar/pkg/python/trunk/files/CSWpython-tk.space	2009-05-19 18:08:34 UTC (rev 4956)
@@ -0,0 +1 @@
+$BASEDIR

Modified: csw/mgar/pkg/python/trunk/files/CSWpython.postinstall
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython.postinstall	2009-05-19 16:53:10 UTC (rev 4955)
+++ csw/mgar/pkg/python/trunk/files/CSWpython.postinstall	2009-05-19 18:08:34 UTC (rev 4956)
@@ -13,7 +13,7 @@
 ${PY_BINDIR}/python -Wi -tt -O ${PY_LIBDIR}/compileall.py \
     -d ${PY_LIBDIR} -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}
 
-for file in `find ${PY_LIBDIR} -name "*.py[co]" -print`
+for file in `find ${PY_LIBDIR} -name idlelib -prune -o -name lib-tk -prune -o -name site-packages -prune -o -name "*.py[co]" -print`
 do
     installf ${PKGINST} ${file}
 done

Added: csw/mgar/pkg/python/trunk/files/CSWpython.space
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython.space	                        (rev 0)
+++ csw/mgar/pkg/python/trunk/files/CSWpython.space	2009-05-19 18:08:34 UTC (rev 4956)
@@ -0,0 +1 @@
+$BASEDIR


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

From dmichelsen at users.sourceforge.net  Tue May 19 20:20:04 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 19 May 2009 18:20:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[4957] csw/mgar/gar
Message-ID: 

Revision: 4957
          http://gar.svn.sourceforge.net/gar/?rev=4957&view=rev
Author:   dmichelsen
Date:     2009-05-19 18:20:04 +0000 (Tue, 19 May 2009)

Log Message:
-----------
mGAR v2-pbuild: Initial commit

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

Added Paths:
-----------
    csw/mgar/gar/v2-pbuild/
    csw/mgar/gar/v2-pbuild/gar.pkg.mk

Removed Paths:
-------------
    csw/mgar/gar/v2-pbuild/gar.pkg.mk

Modified: csw/mgar/gar/v2-pbuild/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2009-05-18 17:24:50 UTC (rev 4935)
+++ csw/mgar/gar/v2-pbuild/gar.conf.mk	2009-05-19 18:20:04 UTC (rev 4957)
@@ -11,8 +11,9 @@
 
 # Pick up user information
 -include $(HOME)/.garrc
+-include /opt/csw/etc/garrc
 
-MODULATION ?= global
+MODULATION ?= global-$(GARCH)
 FILEDIR ?= files
 DOWNLOADDIR ?= download
 PARTIALDIR ?= $(DOWNLOADDIR)/partial

Modified: csw/mgar/gar/v2-pbuild/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2009-05-18 17:24:50 UTC (rev 4935)
+++ csw/mgar/gar/v2-pbuild/gar.mk	2009-05-19 18:20:04 UTC (rev 4957)
@@ -598,9 +598,18 @@
 _PAX_ARGS = $(_INC_EXT_RULE) $(EXTRA_PAX_ARGS)
 
 # The basic merge merges the compiles for all ISAs on the current architecture
-merge: checksum pre-merge $(addprefix merge-,$(MODULATIONS)) merge-license $(if $(NOSOURCEPACKAGE),,merge-src) post-merge
+merge: checksum pre-merge $(if $(shell tty >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo TERMINAL; fi),merge-parallel,merge-sequential) merge-license $(if $(NOSOURCEPACKAGE),,merge-src) post-merge
 	@$(DONADA)
 
+merge-sequential: $(foreach M,$(MODULATIONS),merge-$M)
+
+merge-parallel: merge-watch
+	@$(foreach M,$(MODULATIONS),$(MAKE) merge-$M >$(WORKROOTDIR)/build-$M/build.log 2>&1 &) wait
+	@kill `cat $(WORKROOTDIR)/build-global-$(GARCH)/multitail.pid` && stty sane
+
+merge-watch:
+	@multitail --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global-$(GARCH)/multitail.pid
+
 # This merges the 
 merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated
 	@$(MAKECOOKIE)

Deleted: csw/mgar/gar/v2-pbuild/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-05-18 17:24:50 UTC (rev 4935)
+++ csw/mgar/gar/v2-pbuild/gar.pkg.mk	2009-05-19 18:20:04 UTC (rev 4957)
@@ -1,587 +0,0 @@
-# vim: ft=make ts=4 sw=4 noet
-#
-# $Id$
-#
-# Copyright 2006 Cory Omand
-#
-# Redistribution and/or use, with or without modification, is
-# permitted.  This software is without warranty of any kind.  The
-# author(s) shall not be liable in the event that use of the
-# software causes damage.
-#
-# gar.pkg.mk - Build Solaris packages
-#
-#
-
-ifeq ($(DEBUG_PACKAGING),)
-_DBG=@
-else
-_DBG=
-endif
-
-PKGINFO ?= /usr/bin/pkginfo
-
-# You can use either PACKAGES with dynamic gspec-files or explicitly add gspec-files to DISTFILES.
-# Do "PACKAGES = CSWmypkg" when you build a package whose GARNAME is not the package name.
-# If no explicit gspec-files have been defined the default name for the package is CSW$(GARNAME).
-# The whole processing is done from _PKG_SPECS, which includes all packages to be build.
-ifeq ($(origin PACKAGES), undefined)
-PACKAGES        = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(GARNAME))
-SPKG_SPECS     ?= $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES)
-else
-SPKG_SPECS     ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES))
-endif
-
-# The is the name of the package containing the sourcefiles for all packages generated from this GAR recipe.
-# It defaults to the first defined package name or gspec. SRCPACKAGE_BASE is guaranteed
-# to be one of the real packages built.
-SRCPACKAGE_BASE = $(if $(PACKAGES),$(firstword $(PACKAGES)),$(firstword $(SPKG_SPECS)))
-
-SRCPACKAGE                  ?= $(SRCPACKAGE_BASE)-src
-CATALOGNAME_$(SRCPACKAGE)   ?= $(patsubst CSW%,%,$(SRCPACKAGE_BASE))_src
-SPKG_DESC_$(SRCPACKAGE)     ?= $(SPKG_DESC_$(SRCPACKAGE_BASE)) Source Package
-ARCHALL_$(SRCPACKAGE)       ?= 1
-GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}')
-GARPKG_v1 = CSWgar-v1
-GARPKG_v2 = CSWgar-v2
-REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
-
-_PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE)))
-
-# pkgname - Get the name of a package from a gspec-name or package-name
-#
-# This is a safety function. In sane settings it should return the name
-# of the package given as argument. However, when gspec-files are in DISTFILES
-# it is possible to name the gspec-file differently from the package. This is
-# a very bad idea, but we can handle it!
-#
-# In: arg1 - name of gspec-file or package
-# Out: name of package
-#
-define pkgname
-$(strip 
-  $(if $(filter $(1),$(PACKAGES)),
-    $(1),
-    $(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "pkgname")' files/$(1).gspec)
-  )
-)
-endef
-
-# catalogname - Get the catalog-name for a package
-#
-# In: arg1 - name of package
-# Out: catalog-name for the package
-#
-define catalogname
-$(strip 
-  $(if $(CATALOGNAME_$(1)),
-    $(CATALOGNAME_$(1)),
-    $(if $(CATALOGNAME),
-      $(CATALOGNAME),
-      $(if $(filter $(1),$(PACKAGES)),
-        $(patsubst CSW%,%,$(1)),
-        $(if $(realpath files/$(1).gspec),
-          $(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "bitname")' files/$(1).gspec),
-          $(error The catalog name for the package '$1' could not be determined, because it was neither in PACKAGES nor was there a gspec-file)
-        )
-      )
-    )
-  )
-)
-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
-$(BUILD_PREFIX)/share/doc/$(call catalogname,$(1))
-endef
-
-# Set this to your svn binary
-SVN  ?= /opt/csw/bin/svn
-GAWK ?= /opt/csw/bin/gawk
-
-# We have to deal with four cases here:
-# 1. There is no svn binary -> NOSVN
-# 2. There is a svn binary, but the directory does not belong to a repository -> NOTVERSIONED
-# 3. There is a svn binary, but not everything was committed properly -> UNCOMMITTED
-# 4. There is a svn binary and everything was committed -> r
-
-SPKG_DESC      ?= $(DESCRIPTION)
-SPKG_VERSION   ?= $(GARVERSION)
-SPKG_CATEGORY  ?= application
-SPKG_SOURCEURL ?= $(firstword $(MASTER_SITES))
-SPKG_PACKAGER  ?= Unknown
-SPKG_VENDOR    ?= $(SPKG_SOURCEURL) packaged for CSW by $(SPKG_PACKAGER)
-SPKG_EMAIL     ?= Unknown
-SPKG_PSTAMP    ?= $(LOGNAME)@$(shell hostname)-$(call _REVISION)-$(shell date '+%Y%m%d%H%M%S')
-SPKG_BASEDIR   ?= $(prefix)
-SPKG_CLASSES   ?= none
-SPKG_OSNAME    ?= $(shell uname -s)$(shell uname -r)
-
-SPKG_SPOOLROOT ?= $(DESTROOT)
-SPKG_SPOOLDIR  ?= $(SPKG_SPOOLROOT)/spool.$(GAROSREL)-$(GARCH)
-SPKG_EXPORT    ?= $(WORKDIR)
-SPKG_PKGROOT   ?= $(PKGROOT)
-SPKG_PKGBASE   ?= $(PKGROOT)
-SPKG_WORKDIR   ?= $(CURDIR)/$(WORKDIR)
-
-SPKG_DEPEND_DB  = $(GARDIR)/csw/depend.db
-
-SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg
-
-# Handle cswclassutils
-# - prepend cswpreserveconf if it is not already in SPKG_CLASSES
-SPKG_CLASSES += $(if $(SAMPLECONF),$(if $(filter cswsampleconf,$(SPKG_CLASSES)),,cswsampleconf))
-SPKG_CLASSES += $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf))
-SPKG_CLASSES += $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf))
-# - set class for all config files
-ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF),)
-_CSWCLASS_FILTER = | perl -ane '\
-		$(foreach FILE,$(SAMPLECONF),$$F[1] = "cswsampleconf" if ( $$F[2] =~ m(^$(FILE)$$) );)\
-		$(foreach FILE,$(PRESERVECONF),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)$$) );)\
-		$(foreach FILE,$(INITMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\
-		print join(" ", at F),"\n";'
-_EXTRA_GAR_PKGS += CSWcswclassutils
-endif
-
-PKGGET_DESTDIR ?=
-
-DEPMAKER_EXTRA_ARGS = --noscript --nodep SUNW
-
-# Construct a revision stamp
-ifeq ($(GARFLAVOR),DBG)
-SPKG_FULL_REVSTAMP=1
-endif
-
-ifeq ($(SPKG_FULL_REVSTAMP),1)
-SPKG_REVSTAMP  ?= ,REV=$(shell date '+%Y.%m.%d.%H.%M')
-else
-SPKG_REVSTAMP  ?= ,REV=$(shell date '+%Y.%m.%d')
-endif
-
-# Where we find our mkpackage global templates
-PKGLIB = $(CURDIR)/$(GARDIR)/pkglib
-
-PKG_EXPORTS  = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN
-PKG_EXPORTS += CURDIR WORKDIR WORKDIR_FIRSTMOD WORKSRC WORKSRC_FIRSTMOD PKGROOT
-PKG_EXPORTS += SPKG_REVSTAMP SPKG_PKGNAME SPKG_DESC SPKG_VERSION SPKG_CATEGORY
-PKG_EXPORTS += SPKG_VENDOR SPKG_EMAIL SPKG_PSTAMP SPKG_BASEDIR SPKG_CLASSES
-PKG_EXPORTS += SPKG_OSNAME SPKG_SOURCEURL SPKG_PACKAGER SPKG_PKGFILE TIMESTAMP
-PKG_EXPORTS += DEPMAKER_EXTRA_ARGS PKGLIB DESTDIR
-
-define _PKG_ENV
-$(BUILD_ENV) $(foreach EXP,$(PKG_EXPORTS),$(EXP)="$(if $($(EXP)_$1),$($(EXP)_$1),$($(EXP)))")
-endef
-
-# Canned command for generating admin file names
-# Usage: $(call admfiles,SUNWpackage,depend copyright)
-# pkg.gspec is added by default.
-admfiles = $(1).gspec $(foreach PKG,$(1),$(foreach ADM,$(2),$(PKG).$(ADM)))
-
-# Standard sets of admin files for use with admfiles
-ADMSTANDARD = prototype depend
-ADMISCRIPTS = preinstall postinstall
-ADMUSCRIPTS = preremove postremove
-ADMSCRIPTS  = $(ADMISCRIPTS) $(ADMUSCRIPTS)
-ADMFULLSTD  = $(ADMSTANDARD) $(ADMSCRIPTS) space
-ADMADDON    = $(ADMSTANDARD) postinstall preremove
-
-# This is a helper function which inserts subdirectories for each ISA
-# between the prefix and the suffix.
-# usage: $(call isadirs,,)
-# expands to // // ...
-isadirs = $(foreach ISA,$(ISALIST),$(1)/$(ISA)/$(2))
-
-# This is a helper function just like isadirs, but also contains the
-# prefix and suffix without an ISA subdirectories inserted.
-# usage: $(call isadirs,,)
-# expands to / // // ...
-baseisadirs = $(1)/$(2) $(call isadirs,$(1),$(2))
-
-# PKGFILES_RT selects files belonging to a runtime package
-PKGFILES_RT += $(call baseisadirs,$(libdir),[^/]*\.so(\.\d+)*)
-
-# PKGFILES_DEVEL selects files belonging to a developer package
-PKGFILES_DEVEL += $(call baseisadirs,$(bindir),[^/]*-config)
-PKGFILES_DEVEL += $(call baseisadirs,$(libdir),[^/]*\.(a|la))
-PKGFILES_DEVEL += $(call baseisadirs,$(libdir),pkgconfig(/.*)?)
-PKGFILES_DEVEL += $(includedir)/.*
-PKGFILES_DEVEL += $(sharedstatedir)/aclocal/.*
-PKGFILES_DEVEL += $(mandir)/man1/.*-config\.1.*
-PKGFILES_DEVEL += $(mandir)/man3/.*
-
-# PKGFILES_DOC selects files beloging to a documentation package
-PKGFILES_DOC  = $(docdir)/.*
-
-# PKGFILES_SRC selects the source archives for building the package
-PKGFILES_SRC = $(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE))/.*
-
-PKGFILES_$(SRCPACKAGE) ?= $(PKGFILES_SRC)
-
-# This function computes the files to be excluded from the package specified
-# as argument
-define _pkgfiles_exclude
-$(strip 
-  $(foreach S,$(filter-out $(1),$(_PKG_SPECS)), 
-    $(PKGFILES_$(S)) 
-    $(EXTRA_PKGFILES_EXCLUDED) 
-    $(EXTRA_PKGFILES_EXCLUDED_$(1)) 
-    $(_EXTRA_PKGFILES_EXCLUDED) 
-  ) 
-)
-endef
-
-define _pkgfiles_include
-$(strip 
-  $(PKGFILES_$(1)_SHARED) 
-  $(PKGFILES_$(1)) 
-)
-endef
-
-# This function takes a full path to a filename and returns the package it belongs to.
-# The package may be generated during this build or already installed on the system.
-# /etc/crypto/certs/SUNWObjectCA=../../../etc/certs/SUNWObjectCA l none SUNWcsr
-#perl -ane '$$f=quotemeta("$1");if($$F[0]=~/^$$f(=.*)?$$/){print join(" ",$$F[3..$$#F]),"\n";exit}'/dev/null | awk '/^Current/ {p=0} p==1 {print} /^Referenced/ {p=1}' | perl -ane 'print join("\n", at F)')
-# 'pkchk -l -p' doesn't work as it concatenates package names with more than 14 characters,
-# e. g. SUNWgnome-base-libs-develSUNWgnome-calculatorSUNWgnome-freedb-libsSUNWgnome-cd-burnerSUNWgnome-character-map
-define file2pkg
-$(shell perl -ane '@l{"s","l","d","b","c","f","x","v","e"}=(3,3,6,8,8,9,6,9,9);$$f=quotemeta("$1");if($$F[0]=~/^$$f(=.*)?$$/){s/^\*// foreach @F;print join(" ", at F[$$l{$$F[1]}..$$#F]),"\n";exit}'$@
-
-# The pathfilter rules are as follows:
-# - include license for current package
-# - exclude licenses for all other packages
-# - if other includes are given, only include these files
-# - if no include is given ("catch all packages") include everything except what
-#   is put in other packages
-.PRECIOUS: $(WORKDIR)/%.prototype $(WORKDIR)/%.prototype-$(GARCH)
-$(WORKDIR)/%.prototype: _PKGFILES_EXCLUDE=$(call _pkgfiles_exclude,$*)
-$(WORKDIR)/%.prototype: _PKGFILES_INCLUDE=$(call _pkgfiles_include,$*)
-$(WORKDIR)/%.prototype: | $(PROTOTYPE)
-	$(_DBG)if [ -n "$(PKGFILES_$*_SHARED)" -o \
-	      -n "$(PKGFILES_$*)" -o \
-	      -n "$(_PKGFILES_EXCLUDE)" -o \
-	      -n "$(ISAEXEC_FILES_$*)" -o \
-	      -n "$(ISAEXEC_FILES)" ]; then \
-	  (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license) \
-		      $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license) \
-		      $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \
-		      $(if $(_PKGFILES_INCLUDE),-x '.*',$(foreach FILE,$(_PKGFILES_EXCLUDE),-x '$(FILE)')) \
-	              $(foreach IE,$(abspath $(ISAEXEC_FILES_$*) $(ISAEXEC_FILES)), \
-	                  -e '$(IE)=$(dir $(IE))$(ISA_DEFAULT)/$(notdir $(IE))' \
-	               ) \
-	              <$(PROTOTYPE); \
-	   if [ -n "$(EXTRA_PKGFILES_$*)" ]; then echo "$(EXTRA_PKGFILES_$*)"; fi \
-	  ) $(_CSWCLASS_FILTER) $(_PROTOTYPE_FILTER_$*) >$@; \
-	else \
-	  cat $(PROTOTYPE) $(_CSWCLASS_FILTER) $(_PROTOTYPE_FILTER_$*) >$@; \
-	fi
-
-$(WORKDIR)/%.prototype-$(GARCH): | $(WORKDIR)/%.prototype
-	$(_DBG)cat $(WORKDIR)/$*.prototype $(_PROTOTYPE_FILTER_$*) >$@
-
-# Dynamic depends are constructed as follows:
-# - Packages the currently constructed one depends on can be specified with
-#   REQUIRED_PKGS_ specifically, or REQUIRED_PKGS for all packages build.
-#   These are flagged as 'P' in the depend file.
-# - If multiple packages are build at the same time it is valid to have
-#   dependencies between them. In this case it is necessary to define the package
-#   desciption for each package with SPKG_DESC_, setting it in the gspec-file
-#   does not work.
-# - Packages that are imcompatible to the currently constructed one can be specified
-#   with INCOMPATIBLE_PKGS_ specifically or with INCOMPATIBLE_PKGS for all
-#   packages build.
-# - A depend-file from DISTFILES takes precedence, it is not overwritten or
-#   appended with dynamic depends.
-
-# $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils)
-.PRECIOUS: $(WORKDIR)/%.depend
-$(WORKDIR)/%.depend: $(WORKDIR)
-	$(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \
-		($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\
-			echo "I $(PKG)";\
-		)\
-		$(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\
-			$(if $(SPKG_DESC_$(PKG)), \
-				echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \
-				echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | awk '{ $$1 = "P"; print } ')"; \
-			) \
-		)) >$@)
-
-# Dynamic gspec-files are constructed as follows:
-# - Packages using dynamic gspec-files must be listed in PACKAGES
-# - There is a default of PACKAGES containing one packages named CSW
-#   followed by the GARNAME. It can be changed by setting PACKAGES explicitly.
-# - The name of the generated package is always the same as listed in PACKAGES
-# - The catalog name defaults to the suffix following CSW of the package name,
-#   but can be customized by setting CATALOGNAME_ = 
-# - If only one package is build it is sufficient to set CATALOGNAME = 
-#   It is an error to set CATALOGNAME if more than one package is build.
-# - If the package is suitable for all architectures (sparc and x86) this can be
-#   flagged with ARCHALL_ = 1 for a specific package or with ARCHALL = 1
-#   for all packages.
-
-_CATEGORY_GSPEC_INCLUDE ?= csw_dyngspec.gspec
-
-# This rule dynamically generates gspec-files
-.PRECIOUS: $(WORKDIR)/%.gspec
-$(WORKDIR)/%.gspec:
-	$(_DBG)$(if $(filter $*.gspec,$(DISTFILES)),,\
-		(echo "%var            bitname $(call catalogname,$*)"; \
-		echo "%var            pkgname $*"; \
-		$(if $(or $(ARCHALL),$(ARCHALL_$*)),echo "%var            arch all";) \
-		$(if $(_CATEGORY_GSPEC_INCLUDE),echo "%include        url file://%{PKGLIB}/$(_CATEGORY_GSPEC_INCLUDE)")) >$@\
-	)
-
-
-# Dynamic licenses are selected in the following way:
-# - Dynamic licenses are only activated for packages listed in PACKAGES or
-#   packages which don't have %copyright in their gspec-file. This way the
-#   behaviour on existing gspec-files is preserved.
-# - The default name for the license is COPYING and it will not be fully printed
-# - If no license is explicitly specified in the Makefile and the default can not
-#   be found no license will be included
-# - If a license is specified it must be found or an error is issued
-# - Either LICENSE_ or LICENSE_FULL_ may be specified, it is an error
-#   to specify both.
-# - There is an automatic rule to include only the license for each package that
-#   belongs to it.
-# - Package-specific defines have precedence over general defines (CATALOGNAME_
-#   before CATALOGNAME etc.)
-
-# LICENSE may be a path starting with $(WORKROOTDIR) or a filename inside $(WORKSRC)
-ifeq ($(origin LICENSE_FULL), undefined)
-ifeq ($(origin LICENSE), undefined)
-LICENSE = COPYING
-_LICENSE_IS_DEFAULT = 1
-endif
-endif
-
-# Dynamic pkginfo 
-
-# Calculating the revision can be time consuming, so we do this on demand
-define _REVISION
-$(if $(shell if test -x $(SVN); then echo yes; fi),$(if $(shell $(SVN) info >/dev/null 2>&1; if test $$? -eq 0; then echo YES; fi),$(if $(shell $(SVN) status --ignore-externals 2>/dev/null | grep -v '^X'),UNCOMMITTED,$(shell $(SVN) info --recursive 2>/dev/null | $(GAWK) '$$1 == "Revision:" && MAX < $$2 { MAX = $$2 } END {print MAX }')),NOTVERSIONED),NOSVN)
-endef
-
-# URL: https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/pcre/trunk
-define _URL
-$(if $(shell if test -x $(SVN); then echo yes; fi),$(shell $(SVN) info . 2>/dev/null | $(GAWK) '$$1 == "URL:" { print $$2 }'))
-endef
-
-# XXX: It is possible that a package is flagged as /isaexec, even
-# if the isaexec'ed files are in another package created from the Makefile.
-# There should be a warning issued if there is more than one package build and
-# it has not explicitly been set.
-define mode64
-$(shell echo 
-  $(if $(MODE64_$(1)),$(MODE64_$(1)), 
-    $(if $(filter 32,$(foreach I,$(NEEDED_ISAS),$(MEMORYMODEL_$I))),32) 
-    $(if $(filter 64,$(foreach I,$(NEEDED_ISAS),$(MEMORYMODEL_$I))),64) 
-    $(if $(abspath $(ISAEXEC_FILES_$*) $(ISAEXEC_FILES)),isaexec) 
-  ) | perl -lne 'print join("/", split)'
-)
-endef
-
-define pkgvar
-$(if $($(1)_$(2)),$($(1)_$(2)),$($(1)))
-endef
-
-.PRECIOUS: $(WORKDIR)/%.pkginfo
-$(WORKDIR)/%.pkginfo: $(WORKDIR)
-	$(_DBG)(echo "PKG=$*"; \
-	echo "NAME=$(call catalogname,$*) - $(call pkgvar,SPKG_DESC,$*)"; \
-	echo "ARCH=$(if $(or $(ARCHALL),$(ARCHALL_$*)),all,$(call pkgvar,GARCH,$*))"; \
-	echo "VERSION=$(call pkgvar,SPKG_VERSION,$*)$(call pkgvar,SPKG_REVSTAMP,$*)"; \
-	echo "CATEGORY=$(call pkgvar,SPKG_CATEGORY,$*)"; \
-	echo "VENDOR=$(call pkgvar,SPKG_VENDOR,$*)"; \
-	echo "EMAIL=$(call pkgvar,SPKG_EMAIL,$*)"; \
-	echo "PSTAMP=$(LOGNAME)@$(shell hostname)-$(shell date '+%Y%m%d%H%M%S')"; \
-	echo "CLASSES=$(call pkgvar,SPKG_CLASSES,$*)"; \
-	echo "HOTLINE=http://www.opencsw.org/bugtrack/"; \
-	echo "OPENCSW_REPOSITORY=$(call _URL)@$(call _REVISION)"; \
-	echo "OPENCSW_MODE64=$(call mode64,$*)"; \
-	) >$@
-
-
-# findlicensefile - Find an existing file for a given license name
-#
-define findlicensefile
-$(strip 
-  $(if $(1),$(firstword $(realpath 
-    $(1) $(WORKDIR)/$(1) 
-    $(foreach M,global $(MODULATIONS),$(WORKROOTDIR)/build-$M/$(1) $(WORKROOTDIR)/build-$M/$(DISTNAME)/$(1)) 
-  ))) 
-)
-endef
-
-define licensefile
-$(strip 
-  $(or 
-    $(call findlicensefile,$(or $(LICENSE_$(1)),$(LICENSE_FULL_$(1)))) 
-    $(call findlicensefile,$(or $(LICENSE),$(LICENSE_FULL))), 
-  ) 
-)
-endef
-
-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 $*,$(_PKG_SPECS)),$(or $(LICENSE),$(LICENSE_FULL),$(LICENSE_$*),$(LICENSE_FULL_$*))), \
-		LICENSEFILE=$(or $(call licensefile,$*),$(if $(_LICENSE_IS_DEFAULT),,$(error Cannot find license file for package $*))); \
-		LICENSEDIR=$(call licensedir,$*); \
-		if [ -n "$$LICENSEFILE" ]; then \
-		$(if $(or $(LICENSE_FULL),$(LICENSE_FULL_$*)), \
-		    if [ -f "$$LICENSEFILE" ]; then cp $$LICENSEFILE $(WORKDIR)/$*.copyright; fi;, \
-		    echo "Please see $$LICENSEDIR/license for license information." > $(WORKDIR)/$*.copyright; \
-		) \
-		  mkdir -p $(PKGROOT)$$LICENSEDIR && \
-		  rm -f $(PKGROOT)$$LICENSEDIR/license && \
-		  cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license; \
-		fi \
-	)
-	@$(MAKECOOKIE)
-
-merge-license: $(foreach SPEC,$(_PKG_SPECS),merge-license-$(SPEC))
-	@$(DONADA)
-
-reset-merge-license:
-	@rm -f $(COOKIEDIR)/merge-license $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC))
-	@$(DONADA)
-
-
-merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE))
-merge-src: fetch
-	@$(_DBG)mkdir -p $(_SRCDIR)
-	$(_DBG)(cd $(DOWNLOADDIR); pax -r -w -v $(foreach F,$(DISTFILES) $(PATCHFILES),$F) $(_SRCDIR))
-	@$(MAKECOOKIE)
-
-reset-merge-src:
-	@rm -f $(COOKIEDIR)/merge-src
-	@$(DONADA)
-
-# package - Use the mkpackage utility to create Solaris packages
-#
-
-ifneq ($(ENABLE_CHECK),0)
-PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC) pkgcheck-$(SPEC))
-else
-PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC))
-endif
-
-SPKG_DESTDIRS = $(SPKG_SPOOLDIR) $(SPKG_EXPORT)
-
-$(SPKG_DESTDIRS):
-	ginstall -d $@
-
-# This is a target used to generate all prototypes for debugging purposes.
-# On a normal packaging workflow this is not used.
-prototypes: extract merge $(SPKG_DESTDIRS) pre-package $(foreach SPEC,$(_PKG_SPECS),$(WORKDIR)/$(SPEC).prototype-$(GARCH))
-
-# We depend on extract as the additional package files (like .gspec) must be
-# unpacked to global/ for packaging. E. g. 'merge' depends only on the specific
-# modulations and does not fill global/.
-package: extract merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package
-	$(DONADA)
-
-# The dynamic pkginfo is only generated for dynamic gspec-files
-package-%: $(WORKDIR)/%.gspec $(if $(filter %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend
-	@echo " ==> Processing $*.gspec"
-	$(_DBG)( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \
-						 --spooldir $(SPKG_SPOOLDIR) \
-						 --destdir  $(SPKG_EXPORT) \
-						 --workdir  $(SPKG_WORKDIR) \
-						 --pkgbase  $(SPKG_PKGBASE) \
-						 --pkgroot  $(SPKG_PKGROOT) \
-						-v WORKDIR_FIRSTMOD=../build-$(firstword $(MODULATIONS)) \
-						 --compress \
-						 $(MKPACKAGE_ARGS) ) || exit 2
-	@$(MAKECOOKIE)
-
-package-p:
-	@$(foreach COOKIEFILE,$(PACKAGE_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;)
-
-# pkgcheck - check if the package is compliant
-#
-pkgcheck: $(addprefix pkgcheck-,$(_PKG_SPECS))
-	$(DONADA)
-
-pkgcheck-%:
-	@echo " ==> Checking compliance: $*"
-	@( LC_ALL=C checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2
-
-pkgcheck-p:
-	@$(foreach COOKIEFILE,$(PKGCHECK_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;)
-
-# pkgreset - reset working directory for repackaging
-#
-pkgreset: $(addprefix pkgreset-,$(SPKG_SPECS))
-	@rm -f $(COOKIEDIR)/extract
-	@rm -f $(COOKIEDIR)/extract-archive-*
-	$(DONADA)
-
-reset-package: pkgreset
-
-pkgreset-%:
-	@echo " ==> Reset packaging state for $* ($(DESTIMG))"
-	@rm -rf $(foreach T,extract checksum package pkgcheck,$(COOKIEDIR)/*$(T)-$**)
-	@rm -rf $(COOKIEDIR)/pre-package $(COOKIEDIR)/post-package
-	@rm -rf $(WORKDIR)/$*.* $(WORKDIR)/prototype
-	@rm -f $(WORKDIR)/copyright $(WORKDIR)/*.copyright
-
-repackage: pkgreset package
-
-# dependb - update the dependency database
-#
-dependb:
-	@dependb --db $(SPKG_DEPEND_DB) \
-             --parent $(CATEGORIES)/$(GARNAME) \
-             --add $(DEPENDS)
-
-# pkgenv - dump the packaging environment
-#
-pkgenv:
-	@$(foreach SPEC,$(_PKG_SPECS),echo "$(SPEC)";echo;$(call _PKG_ENV,$(SPEC)) env;)
-
-
-# pkglist - list the packages to be built with GAR pathname, catalog name and package name
-#
-
-define _pkglist_one
-$(shell /usr/bin/echo "$(shell pwd)\t$(call catalogname,$(1))\t$(call pkgname,$(1))")
-endef
-
-pkglist:
-	@$(foreach SPEC,$(SPKG_SPECS),echo "$(call _pkglist_one,$(SPEC))";)

Copied: csw/mgar/gar/v2-pbuild/gar.pkg.mk (from rev 4937, csw/mgar/gar/v2/gar.pkg.mk)
===================================================================
--- csw/mgar/gar/v2-pbuild/gar.pkg.mk	                        (rev 0)
+++ csw/mgar/gar/v2-pbuild/gar.pkg.mk	2009-05-19 18:20:04 UTC (rev 4957)
@@ -0,0 +1,609 @@
+# vim: ft=make ts=4 sw=4 noet
+#
+# $Id$
+#
+# Copyright 2006 Cory Omand
+#
+# Redistribution and/or use, with or without modification, is
+# permitted.  This software is without warranty of any kind.  The
+# author(s) shall not be liable in the event that use of the
+# software causes damage.
+#
+# gar.pkg.mk - Build Solaris packages
+#
+#
+
+ifeq ($(DEBUG_PACKAGING),)
+_DBG=@
+else
+_DBG=
+endif
+
+PKGINFO ?= /usr/bin/pkginfo
+
+# You can use either PACKAGES with dynamic gspec-files or explicitly add gspec-files to DISTFILES.
+# Do "PACKAGES = CSWmypkg" when you build a package whose GARNAME is not the package name.
+# If no explicit gspec-files have been defined the default name for the package is CSW$(GARNAME).
+# The whole processing is done from _PKG_SPECS, which includes all packages to be build.
+
+# SRCPACKAGE_BASE is the name of the package containing the sourcefiles for all packages
+# generated from this GAR recipe. It defaults to the first defined package name or gspec.
+# SRCPACKAGE is the name of the package containing the sources
+
+ifeq ($(origin PACKAGES), undefined)
+PACKAGES        = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(GARNAME))
+SRCPACKAGE_BASE = $(firstword $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES))
+SRCPACKAGE     ?= $(SRCPACKAGE_BASE)-src
+SPKG_SPECS     ?= $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE))
+else
+SRCPACKAGE_BASE = $(firstword $(PACKAGES))
+SRCPACKAGE     ?= $(SRCPACKAGE_BASE)-src
+SPKG_SPECS     ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE)))
+endif
+
+# Automatic definitions for source package
+CATALOGNAME_$(SRCPACKAGE)   ?= $(patsubst CSW%,%,$(SRCPACKAGE_BASE))_src
+SPKG_DESC_$(SRCPACKAGE)     ?= $(SPKG_DESC_$(SRCPACKAGE_BASE)) Source Package
+ARCHALL_$(SRCPACKAGE)       ?= 1
+# XXX: Use Repository Root instead of fixed URL as base
+GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}')
+GARPKG_v1 = CSWgar-v1
+GARPKG_v2 = CSWgar-v2
+REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
+
+_PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
+
+# The is the name of the package containing the sourcefiles for all packages generated from this GAR recipe.
+# It defaults to the first defined package name or gspec. SRCPACKAGE_BASE is guaranteed
+# to be one of the real packages built.
+SRCPACKAGE_BASE = $(if $(PACKAGES),$(firstword $(PACKAGES)),$(firstword $(SPKG_SPECS)))
+
+SRCPACKAGE                  ?= $(SRCPACKAGE_BASE)-src
+CATALOGNAME_$(SRCPACKAGE)   ?= $(patsubst CSW%,%,$(SRCPACKAGE_BASE))_src
+SPKG_DESC_$(SRCPACKAGE)     ?= $(SPKG_DESC_$(SRCPACKAGE_BASE)) Source Package
+ARCHALL_$(SRCPACKAGE)       ?= 1
+GARSYSTEMVERSION ?= $(shell $(SVN) propget svn:externals $(CURDIR) | perl -ane 'if($$F[0] eq "gar") { print ($$F[1]=~m(https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/(.*))),"\n";}')
+GARPKG_v1 = CSWgar-v1
+GARPKG_v2 = CSWgar-v2
+REQUIRED_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown))
+
+_PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
+
+# pkgname - Get the name of a package from a gspec-name or package-name
+#
+# This is a safety function. In sane settings it should return the name
+# of the package given as argument. However, when gspec-files are in DISTFILES
+# it is possible to name the gspec-file differently from the package. This is
+# a very bad idea, but we can handle it!
+#
+# In: arg1 - name of gspec-file or package
+# Out: name of package
+#
+define pkgname
+$(strip 
+  $(if $(filter $(1),$(PACKAGES)),
+    $(1),
+    $(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "pkgname")' files/$(1).gspec)
+  )
+)
+endef
+
+# catalogname - Get the catalog-name for a package
+#
+# In: arg1 - name of package
+# Out: catalog-name for the package
+#
+define catalogname
+$(strip 
+  $(if $(CATALOGNAME_$(1)),
+    $(CATALOGNAME_$(1)),
+    $(if $(CATALOGNAME),
+      $(CATALOGNAME),
+      $(if $(filter $(1),$(PACKAGES)),
+        $(patsubst CSW%,%,$(1)),
+        $(if $(realpath files/$(1).gspec),
+          $(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "bitname")' files/$(1).gspec),
+          $(error The catalog name for the package '$1' could not be determined, because it was neither in PACKAGES nor was there a gspec-file)
+        )
+      )
+    )
+  )
+)
+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
+$(BUILD_PREFIX)/share/doc/$(call catalogname,$(1))
+endef
+
+# Set this to your svn binary
+SVN  ?= /opt/csw/bin/svn
+GAWK ?= /opt/csw/bin/gawk
+
+# We have to deal with four cases here:
+# 1. There is no svn binary -> NOSVN
+# 2. There is a svn binary, but the directory does not belong to a repository -> NOTVERSIONED
+# 3. There is a svn binary, but not everything was committed properly -> UNCOMMITTED
+# 4. There is a svn binary and everything was committed -> r
+
+SPKG_DESC      ?= $(DESCRIPTION)
+SPKG_VERSION   ?= $(GARVERSION)
+SPKG_CATEGORY  ?= application
+SPKG_SOURCEURL ?= $(firstword $(MASTER_SITES))
+SPKG_PACKAGER  ?= Unknown
+SPKG_VENDOR    ?= $(SPKG_SOURCEURL) packaged for CSW by $(SPKG_PACKAGER)
+SPKG_EMAIL     ?= Unknown
+SPKG_PSTAMP    ?= $(LOGNAME)@$(shell hostname)-$(call _REVISION)-$(shell date '+%Y%m%d%H%M%S')
+SPKG_BASEDIR   ?= $(prefix)
+SPKG_CLASSES   ?= none
+SPKG_OSNAME    ?= $(shell uname -s)$(shell uname -r)
+
+SPKG_SPOOLROOT ?= $(DESTROOT)
+SPKG_SPOOLDIR  ?= $(SPKG_SPOOLROOT)/spool.$(GAROSREL)-$(GARCH)
+SPKG_EXPORT    ?= $(WORKDIR)
+SPKG_PKGROOT   ?= $(PKGROOT)
+SPKG_PKGBASE   ?= $(PKGROOT)
+SPKG_WORKDIR   ?= $(CURDIR)/$(WORKDIR)
+
+SPKG_DEPEND_DB  = $(GARDIR)/csw/depend.db
+
+SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg
+
+# Handle cswclassutils
+# - prepend cswpreserveconf if it is not already in SPKG_CLASSES
+SPKG_CLASSES += $(if $(SAMPLECONF),$(if $(filter cswsampleconf,$(SPKG_CLASSES)),,cswsampleconf))
+SPKG_CLASSES += $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf))
+SPKG_CLASSES += $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf))
+# - set class for all config files
+ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF),)
+_CSWCLASS_FILTER = | perl -ane '\
+		$(foreach FILE,$(SAMPLECONF),$$F[1] = "cswsampleconf" if ( $$F[2] =~ m(^$(FILE)$$) );)\
+		$(foreach FILE,$(PRESERVECONF),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)$$) );)\
+		$(foreach FILE,$(INITMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\
+		print join(" ", at F),"\n";'
+_EXTRA_GAR_PKGS += CSWcswclassutils
+endif
+
+PKGGET_DESTDIR ?=
+
+DEPMAKER_EXTRA_ARGS = --noscript --nodep SUNW
+
+# Construct a revision stamp
+ifeq ($(GARFLAVOR),DBG)
+SPKG_FULL_REVSTAMP=1
+endif
+
+ifeq ($(SPKG_FULL_REVSTAMP),1)
+SPKG_REVSTAMP  ?= ,REV=$(shell date '+%Y.%m.%d.%H.%M')
+else
+SPKG_REVSTAMP  ?= ,REV=$(shell date '+%Y.%m.%d')
+endif
+
+# Where we find our mkpackage global templates
+PKGLIB = $(CURDIR)/$(GARDIR)/pkglib
+
+PKG_EXPORTS  = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN
+PKG_EXPORTS += CURDIR WORKDIR WORKDIR_FIRSTMOD WORKSRC WORKSRC_FIRSTMOD PKGROOT
+PKG_EXPORTS += SPKG_REVSTAMP SPKG_PKGNAME SPKG_DESC SPKG_VERSION SPKG_CATEGORY
+PKG_EXPORTS += SPKG_VENDOR SPKG_EMAIL SPKG_PSTAMP SPKG_BASEDIR SPKG_CLASSES
+PKG_EXPORTS += SPKG_OSNAME SPKG_SOURCEURL SPKG_PACKAGER SPKG_PKGFILE TIMESTAMP
+PKG_EXPORTS += DEPMAKER_EXTRA_ARGS PKGLIB DESTDIR
+
+define _PKG_ENV
+$(BUILD_ENV) $(foreach EXP,$(PKG_EXPORTS),$(EXP)="$(if $($(EXP)_$1),$($(EXP)_$1),$($(EXP)))")
+endef
+
+# Canned command for generating admin file names
+# Usage: $(call admfiles,SUNWpackage,depend copyright)
+# pkg.gspec is added by default.
+admfiles = $(1).gspec $(foreach PKG,$(1),$(foreach ADM,$(2),$(PKG).$(ADM)))
+
+# Standard sets of admin files for use with admfiles
+ADMSTANDARD = prototype depend
+ADMISCRIPTS = preinstall postinstall
+ADMUSCRIPTS = preremove postremove
+ADMSCRIPTS  = $(ADMISCRIPTS) $(ADMUSCRIPTS)
+ADMFULLSTD  = $(ADMSTANDARD) $(ADMSCRIPTS) space
+ADMADDON    = $(ADMSTANDARD) postinstall preremove
+
+# This is a helper function which inserts subdirectories for each ISA
+# between the prefix and the suffix.
+# usage: $(call isadirs,,)
+# expands to // // ...
+isadirs = $(foreach ISA,$(ISALIST),$(1)/$(ISA)/$(2))
+
+# This is a helper function just like isadirs, but also contains the
+# prefix and suffix without an ISA subdirectories inserted.
+# usage: $(call isadirs,,)
+# expands to / // // ...
+baseisadirs = $(1)/$(2) $(call isadirs,$(1),$(2))
+
+# PKGFILES_RT selects files belonging to a runtime package
+PKGFILES_RT += $(call baseisadirs,$(libdir),[^/]*\.so(\.\d+)*)
+
+# PKGFILES_DEVEL selects files belonging to a developer package
+PKGFILES_DEVEL += $(call baseisadirs,$(bindir),[^/]*-config)
+PKGFILES_DEVEL += $(call baseisadirs,$(libdir),[^/]*\.(a|la))
+PKGFILES_DEVEL += $(call baseisadirs,$(libdir),pkgconfig(/.*)?)
+PKGFILES_DEVEL += $(includedir)/.*
+PKGFILES_DEVEL += $(sharedstatedir)/aclocal/.*
+PKGFILES_DEVEL += $(mandir)/man1/.*-config\.1.*
+PKGFILES_DEVEL += $(mandir)/man3/.*
+
+# PKGFILES_DOC selects files beloging to a documentation package
+PKGFILES_DOC  = $(docdir)/.*
+
+# PKGFILES_SRC selects the source archives for building the package
+PKGFILES_SRC = $(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE))/.*
+
+PKGFILES_$(SRCPACKAGE) ?= $(PKGFILES_SRC)
+
+# This function computes the files to be excluded from the package specified
+# as argument
+define _pkgfiles_exclude
+$(strip 
+  $(foreach S,$(filter-out $(1),$(_PKG_SPECS)), 
+    $(PKGFILES_$(S)) 
+    $(EXTRA_PKGFILES_EXCLUDED) 
+    $(EXTRA_PKGFILES_EXCLUDED_$(1)) 
+    $(_EXTRA_PKGFILES_EXCLUDED) 
+  ) 
+)
+endef
+
+define _pkgfiles_include
+$(strip 
+  $(PKGFILES_$(1)_SHARED) 
+  $(PKGFILES_$(1)) 
+)
+endef
+
+# This function takes a full path to a filename and returns the package it belongs to.
+# The package may be generated during this build or already installed on the system.
+# /etc/crypto/certs/SUNWObjectCA=../../../etc/certs/SUNWObjectCA l none SUNWcsr
+#perl -ane '$$f=quotemeta("$1");if($$F[0]=~/^$$f(=.*)?$$/){print join(" ",$$F[3..$$#F]),"\n";exit}'/dev/null | awk '/^Current/ {p=0} p==1 {print} /^Referenced/ {p=1}' | perl -ane 'print join("\n", at F)')
+# 'pkchk -l -p' doesn't work as it concatenates package names with more than 14 characters,
+# e. g. SUNWgnome-base-libs-develSUNWgnome-calculatorSUNWgnome-freedb-libsSUNWgnome-cd-burnerSUNWgnome-character-map
+define file2pkg
+$(shell perl -ane '@l{"s","l","d","b","c","f","x","v","e"}=(3,3,6,8,8,9,6,9,9);$$f=quotemeta("$1");if($$F[0]=~/^$$f(=.*)?$$/){s/^\*// foreach @F;print join(" ", at F[$$l{$$F[1]}..$$#F]),"\n";exit}'$@
+
+# The pathfilter rules are as follows:
+# - include license for current package
+# - exclude licenses for all other packages
+# - if other includes are given, only include these files
+# - if no include is given ("catch all packages") include everything except what
+#   is put in other packages
+.PRECIOUS: $(WORKDIR)/%.prototype $(WORKDIR)/%.prototype-$(GARCH)
+$(WORKDIR)/%.prototype: _PKGFILES_EXCLUDE=$(call _pkgfiles_exclude,$*)
+$(WORKDIR)/%.prototype: _PKGFILES_INCLUDE=$(call _pkgfiles_include,$*)
+$(WORKDIR)/%.prototype: | $(PROTOTYPE)
+	$(_DBG)if [ -n "$(PKGFILES_$*_SHARED)" -o \
+	      -n "$(PKGFILES_$*)" -o \
+	      -n "$(_PKGFILES_EXCLUDE)" -o \
+	      -n "$(ISAEXEC_FILES_$*)" -o \
+	      -n "$(ISAEXEC_FILES)" ]; then \
+	  (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license) \
+		      $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license) \
+		      $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \
+		      $(if $(_PKGFILES_INCLUDE),-x '.*',$(foreach FILE,$(_PKGFILES_EXCLUDE),-x '$(FILE)')) \
+	              $(foreach IE,$(abspath $(ISAEXEC_FILES_$*) $(ISAEXEC_FILES)), \
+	                  -e '$(IE)=$(dir $(IE))$(ISA_DEFAULT)/$(notdir $(IE))' \
+	               ) \
+	              <$(PROTOTYPE); \
+	   if [ -n "$(EXTRA_PKGFILES_$*)" ]; then echo "$(EXTRA_PKGFILES_$*)"; fi \
+	  ) $(_CSWCLASS_FILTER) $(_PROTOTYPE_FILTER_$*) >$@; \
+	else \
+	  cat $(PROTOTYPE) $(_CSWCLASS_FILTER) $(_PROTOTYPE_FILTER_$*) >$@; \
+	fi
+
+$(WORKDIR)/%.prototype-$(GARCH): | $(WORKDIR)/%.prototype
+	$(_DBG)cat $(WORKDIR)/$*.prototype $(_PROTOTYPE_FILTER_$*) >$@
+
+# Dynamic depends are constructed as follows:
+# - Packages the currently constructed one depends on can be specified with
+#   REQUIRED_PKGS_ specifically, or REQUIRED_PKGS for all packages build.
+#   These are flagged as 'P' in the depend file.
+# - If multiple packages are build at the same time it is valid to have
+#   dependencies between them. In this case it is necessary to define the package
+#   desciption for each package with SPKG_DESC_, setting it in the gspec-file
+#   does not work.
+# - Packages that are imcompatible to the currently constructed one can be specified
+#   with INCOMPATIBLE_PKGS_ specifically or with INCOMPATIBLE_PKGS for all
+#   packages build.
+# - A depend-file from DISTFILES takes precedence, it is not overwritten or
+#   appended with dynamic depends.
+
+# $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils)
+.PRECIOUS: $(WORKDIR)/%.depend
+$(WORKDIR)/%.depend: $(WORKDIR)
+	$(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \
+		($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\
+			echo "I $(PKG)";\
+		)\
+		$(foreach PKG,$(sort $(_EXTRA_GAR_PKGS)) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\
+			$(if $(SPKG_DESC_$(PKG)), \
+				echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \
+				echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | awk '{ $$1 = "P"; print } ')"; \
+			) \
+		)) >$@)
+
+# Dynamic gspec-files are constructed as follows:
+# - Packages using dynamic gspec-files must be listed in PACKAGES
+# - There is a default of PACKAGES containing one packages named CSW
+#   followed by the GARNAME. It can be changed by setting PACKAGES explicitly.
+# - The name of the generated package is always the same as listed in PACKAGES
+# - The catalog name defaults to the suffix following CSW of the package name,
+#   but can be customized by setting CATALOGNAME_ = 
+# - If only one package is build it is sufficient to set CATALOGNAME = 
+#   It is an error to set CATALOGNAME if more than one package is build.
+# - If the package is suitable for all architectures (sparc and x86) this can be
+#   flagged with ARCHALL_ = 1 for a specific package or with ARCHALL = 1
+#   for all packages.
+
+_CATEGORY_GSPEC_INCLUDE ?= csw_dyngspec.gspec
+
+# This rule dynamically generates gspec-files
+.PRECIOUS: $(WORKDIR)/%.gspec
+$(WORKDIR)/%.gspec:
+	$(_DBG)$(if $(filter $*.gspec,$(DISTFILES)),,\
+		(echo "%var            bitname $(call catalogname,$*)"; \
+		echo "%var            pkgname $*"; \
+		$(if $(or $(ARCHALL),$(ARCHALL_$*)),echo "%var            arch all";) \
+		$(if $(_CATEGORY_GSPEC_INCLUDE),echo "%include        url file://%{PKGLIB}/$(_CATEGORY_GSPEC_INCLUDE)")) >$@\
+	)
+
+
+# Dynamic licenses are selected in the following way:
+# - Dynamic licenses are only activated for packages listed in PACKAGES or
+#   packages which don't have %copyright in their gspec-file. This way the
+#   behaviour on existing gspec-files is preserved.
+# - The default name for the license is COPYING and it will not be fully printed
+# - If no license is explicitly specified in the Makefile and the default can not
+#   be found no license will be included
+# - If a license is specified it must be found or an error is issued
+# - Either LICENSE_ or LICENSE_FULL_ may be specified, it is an error
+#   to specify both.
+# - There is an automatic rule to include only the license for each package that
+#   belongs to it.
+# - Package-specific defines have precedence over general defines (CATALOGNAME_
+#   before CATALOGNAME etc.)
+
+# LICENSE may be a path starting with $(WORKROOTDIR) or a filename inside $(WORKSRC)
+ifeq ($(origin LICENSE_FULL), undefined)
+ifeq ($(origin LICENSE), undefined)
+LICENSE = COPYING
+_LICENSE_IS_DEFAULT = 1
+endif
+endif
+
+# Dynamic pkginfo 
+
+# Calculating the revision can be time consuming, so we do this on demand
+define _REVISION
+$(if $(shell if test -x $(SVN); then echo yes; fi),$(if $(shell $(SVN) info >/dev/null 2>&1; if test $$? -eq 0; then echo YES; fi),$(if $(shell $(SVN) status --ignore-externals 2>/dev/null | grep -v '^X'),UNCOMMITTED,$(shell $(SVN) info --recursive 2>/dev/null | $(GAWK) '$$1 == "Revision:" && MAX < $$2 { MAX = $$2 } END {print MAX }')),NOTVERSIONED),NOSVN)
+endef
+
+# URL: https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/pcre/trunk
+define _URL
+$(if $(shell if test -x $(SVN); then echo yes; fi),$(shell $(SVN) info . 2>/dev/null | $(GAWK) '$$1 == "URL:" { print $$2 }'))
+endef
+
+# XXX: It is possible that a package is flagged as /isaexec, even
+# if the isaexec'ed files are in another package created from the Makefile.
+# There should be a warning issued if there is more than one package build and
+# it has not explicitly been set.
+define mode64
+$(shell echo 
+  $(if $(MODE64_$(1)),$(MODE64_$(1)), 
+    $(if $(filter 32,$(foreach I,$(NEEDED_ISAS),$(MEMORYMODEL_$I))),32) 
+    $(if $(filter 64,$(foreach I,$(NEEDED_ISAS),$(MEMORYMODEL_$I))),64) 
+    $(if $(abspath $(ISAEXEC_FILES_$*) $(ISAEXEC_FILES)),isaexec) 
+  ) | perl -lne 'print join("/", split)'
+)
+endef
+
+define pkgvar
+$(if $($(1)_$(2)),$($(1)_$(2)),$($(1)))
+endef
+
+.PRECIOUS: $(WORKDIR)/%.pkginfo
+$(WORKDIR)/%.pkginfo: $(WORKDIR)
+	$(_DBG)(echo "PKG=$*"; \
+	echo "NAME=$(call catalogname,$*) - $(call pkgvar,SPKG_DESC,$*)"; \
+	echo "ARCH=$(if $(or $(ARCHALL),$(ARCHALL_$*)),all,$(call pkgvar,GARCH,$*))"; \
+	echo "VERSION=$(call pkgvar,SPKG_VERSION,$*)$(call pkgvar,SPKG_REVSTAMP,$*)"; \
+	echo "CATEGORY=$(call pkgvar,SPKG_CATEGORY,$*)"; \
+	echo "VENDOR=$(call pkgvar,SPKG_VENDOR,$*)"; \
+	echo "EMAIL=$(call pkgvar,SPKG_EMAIL,$*)"; \
+	echo "PSTAMP=$(LOGNAME)@$(shell hostname)-$(shell date '+%Y%m%d%H%M%S')"; \
+	echo "CLASSES=$(call pkgvar,SPKG_CLASSES,$*)"; \
+	echo "HOTLINE=http://www.opencsw.org/bugtrack/"; \
+	echo "OPENCSW_REPOSITORY=$(call _URL)@$(call _REVISION)"; \
+	echo "OPENCSW_MODE64=$(call mode64,$*)"; \
+	) >$@
+
+
+# findlicensefile - Find an existing file for a given license name
+#
+define findlicensefile
+$(strip 
+  $(if $(1),$(firstword $(realpath 
+    $(1) $(WORKDIR)/$(1) 
+    $(foreach M,global $(MODULATIONS),$(WORKROOTDIR)/build-$M/$(1) $(WORKROOTDIR)/build-$M/$(DISTNAME)/$(1)) 
+  ))) 
+)
+endef
+
+define licensefile
+$(strip 
+  $(or 
+    $(call findlicensefile,$(or $(LICENSE_$(1)),$(LICENSE_FULL_$(1)))) 
+    $(call findlicensefile,$(or $(LICENSE),$(LICENSE_FULL))), 
+  ) 
+)
+endef
+
+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 $*,$(_PKG_SPECS)),$(or $(LICENSE),$(LICENSE_FULL),$(LICENSE_$*),$(LICENSE_FULL_$*))), \
+		LICENSEFILE=$(or $(call licensefile,$*),$(if $(_LICENSE_IS_DEFAULT),,$(error Cannot find license file for package $*))); \
+		LICENSEDIR=$(call licensedir,$*); \
+		if [ -n "$$LICENSEFILE" ]; then \
+		$(if $(or $(LICENSE_FULL),$(LICENSE_FULL_$*)), \
+		    if [ -f "$$LICENSEFILE" ]; then cp $$LICENSEFILE $(WORKDIR)/$*.copyright; fi;, \
+		    echo "Please see $$LICENSEDIR/license for license information." > $(WORKDIR)/$*.copyright; \
+		) \
+		  mkdir -p $(PKGROOT)$$LICENSEDIR && \
+		  rm -f $(PKGROOT)$$LICENSEDIR/license && \
+		  cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license; \
+		fi \
+	)
+	@$(MAKECOOKIE)
+
+merge-license: $(foreach SPEC,$(_PKG_SPECS),merge-license-$(SPEC))
+	@$(DONADA)
+
+reset-merge-license:
+	@rm -f $(COOKIEDIR)/merge-license $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC))
+	@$(DONADA)
+
+
+merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE))
+merge-src: fetch
+	$(_DBG)mkdir -p $(_SRCDIR)/files
+	$(_DBG)(cd $(DOWNLOADDIR); pax -rH -w -v $(foreach F,$(DISTFILES) $(PATCHFILES),$F) $(_SRCDIR)/files)
+	$(_DBG)(cd $(CURDIR); pax -rH -w -v Makefile checksums $(_SRCDIR))
+	$(_DBG)ln -s ../gar/$(GARSYSTEMVERSION) $(_SRCDIR)/gar
+	$(MAKECOOKIE)
+
+reset-merge-src:
+	@rm -f $(COOKIEDIR)/merge-src
+
+
+# package - Use the mkpackage utility to create Solaris packages
+#
+
+ifneq ($(ENABLE_CHECK),0)
+PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC) pkgcheck-$(SPEC))
+else
+PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC))
+endif
+
+SPKG_DESTDIRS = $(SPKG_SPOOLDIR) $(SPKG_EXPORT)
+
+$(SPKG_DESTDIRS):
+	ginstall -d $@
+
+# This is a target used to generate all prototypes for debugging purposes.
+# On a normal packaging workflow this is not used.
+prototypes: extract merge $(SPKG_DESTDIRS) pre-package $(foreach SPEC,$(_PKG_SPECS),$(WORKDIR)/$(SPEC).prototype-$(GARCH))
+
+# We depend on extract as the additional package files (like .gspec) must be
+# unpacked to global/ for packaging. E. g. 'merge' depends only on the specific
+# modulations and does not fill global/.
+package: extract merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package
+	$(DONADA)
+
+# The dynamic pkginfo is only generated for dynamic gspec-files
+package-%: $(WORKDIR)/%.gspec $(if $(filter %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend
+	@echo " ==> Processing $*.gspec"
+	$(_DBG)( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \
+						 --spooldir $(SPKG_SPOOLDIR) \
+						 --destdir  $(SPKG_EXPORT) \
+						 --workdir  $(SPKG_WORKDIR) \
+						 --pkgbase  $(SPKG_PKGBASE) \
+						 --pkgroot  $(SPKG_PKGROOT) \
+						-v WORKDIR_FIRSTMOD=../build-$(firstword $(MODULATIONS)) \
+						 --compress \
+						 $(MKPACKAGE_ARGS) ) || exit 2
+	@$(MAKECOOKIE)
+
+package-p:
+	@$(foreach COOKIEFILE,$(PACKAGE_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;)
+
+# pkgcheck - check if the package is compliant
+#
+pkgcheck: $(addprefix pkgcheck-,$(_PKG_SPECS))
+	$(DONADA)
+
+pkgcheck-%:
+	@echo " ==> Checking compliance: $*"
+	@( LC_ALL=C checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2
+
+pkgcheck-p:
+	@$(foreach COOKIEFILE,$(PKGCHECK_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;)
+
+# pkgreset - reset working directory for repackaging
+#
+pkgreset: $(addprefix pkgreset-,$(SPKG_SPECS))
+	@rm -f $(COOKIEDIR)/extract
+	@rm -f $(COOKIEDIR)/extract-archive-*
+
+reset-package: pkgreset
+
+pkgreset-%:
+	@echo " ==> Reset packaging state for $* ($(DESTIMG))"
+	@rm -rf $(foreach T,extract checksum package pkgcheck,$(COOKIEDIR)/*$(T)-$**)
+	@rm -rf $(COOKIEDIR)/pre-package $(COOKIEDIR)/post-package
+	@rm -rf $(WORKDIR)/$*.* $(WORKDIR)/prototype
+	@rm -f $(WORKDIR)/copyright $(WORKDIR)/*.copyright
+
+repackage: pkgreset package
+
+# dependb - update the dependency database
+#
+dependb:
+	@dependb --db $(SPKG_DEPEND_DB) \
+             --parent $(CATEGORIES)/$(GARNAME) \
+             --add $(DEPENDS)
+
+# pkgenv - dump the packaging environment
+#
+pkgenv:
+	@$(foreach SPEC,$(_PKG_SPECS),echo "$(SPEC)";echo;$(call _PKG_ENV,$(SPEC)) env;)
+
+
+# pkglist - list the packages to be built with GAR pathname, catalog name and package name
+#
+
+define _pkglist_one
+$(shell /usr/bin/echo "$(shell pwd)\t$(call catalogname,$(1))\t$(call pkgname,$(1))")
+endef
+
+pkglist:
+	@$(foreach SPEC,$(SPKG_SPECS),echo "$(call _pkglist_one,$(SPEC))";)


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

From dmichelsen at users.sourceforge.net  Tue May 19 20:28:43 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 19 May 2009 18:28:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[4958] csw/mgar/pkg
Message-ID: 

Revision: 4958
          http://gar.svn.sourceforge.net/gar/?rev=4958&view=rev
Author:   dmichelsen
Date:     2009-05-19 18:28:43 +0000 (Tue, 19 May 2009)

Log Message:
-----------
mGAR v2: Remove gspec-comment on newpkg-%

Modified Paths:
--------------
    csw/mgar/pkg/Makefile
    csw/mgar/pkg/cpan/Makefile
    csw/mgar/pkg/x11/Makefile

Modified: csw/mgar/pkg/Makefile
===================================================================
--- csw/mgar/pkg/Makefile	2009-05-19 18:20:04 UTC (rev 4957)
+++ csw/mgar/pkg/Makefile	2009-05-19 18:28:43 UTC (rev 4958)
@@ -87,5 +87,4 @@
 	fi
 	@echo
 	@echo "Your package is set up for editing at $*/trunk"
-	@echo "Please don't forget to add the gspec-file!"
 

Modified: csw/mgar/pkg/cpan/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Makefile	2009-05-19 18:20:04 UTC (rev 4957)
+++ csw/mgar/pkg/cpan/Makefile	2009-05-19 18:28:43 UTC (rev 4958)
@@ -49,5 +49,4 @@
 	fi
 	@echo
 	@echo "Your package is set up for editing at $*/trunk"
-	@echo "Please don't forget to add the gspec-file!"
 

Modified: csw/mgar/pkg/x11/Makefile
===================================================================
--- csw/mgar/pkg/x11/Makefile	2009-05-19 18:20:04 UTC (rev 4957)
+++ csw/mgar/pkg/x11/Makefile	2009-05-19 18:28:43 UTC (rev 4958)
@@ -58,5 +58,4 @@
 	fi
 	@echo
 	@echo "Your package is set up for editing at $*/trunk"
-	@echo "Please don't forget to add the gspec-file!"
 


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

From valholla at users.sourceforge.net  Tue May 19 20:57:38 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 19 May 2009 18:57:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[4959] csw/mgar/pkg/php4/trunk/files
Message-ID: 

Revision: 4959
          http://gar.svn.sourceforge.net/gar/?rev=4959&view=rev
Author:   valholla
Date:     2009-05-19 18:57:38 +0000 (Tue, 19 May 2009)

Log Message:
-----------
fix postinstall on modules

Modified Paths:
--------------
    csw/mgar/pkg/php4/trunk/files/CSWphp4bcmath.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4bz2.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4calendar.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4curl.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4dba.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4domxml.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4gd.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4gettext.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4gmp.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4iconv.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4imap.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4ldap.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4mbstring.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4mcal.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4mssql.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4mysql.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4ncurses.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4odbc.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4openssl.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4pgsql.preremove
    csw/mgar/pkg/php4/trunk/files/CSWphp4zlib.preremove

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4bcmath.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4bcmath.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4bcmath.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,6 @@
 #!/bin/sh
 MODULE_NAME=bcmath
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4bz2.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4bz2.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4bz2.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=bz2
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4calendar.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4calendar.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4calendar.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=calendar
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4curl.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4curl.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4curl.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=curl
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4dba.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4dba.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4dba.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=dba
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4domxml.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4domxml.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4domxml.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=domxml
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4gd.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4gd.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4gd.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=gd
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4gettext.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4gettext.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4gettext.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=gettext
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4gmp.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4gmp.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4gmp.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=gmp
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4iconv.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4iconv.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4iconv.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=iconv
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4imap.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4imap.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4imap.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=imap
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4ldap.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4ldap.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4ldap.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=ldap
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4mbstring.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4mbstring.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4mbstring.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=mbstring
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4mcal.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4mcal.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4mcal.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=mcal
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4mssql.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4mssql.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4mssql.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=mssql
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4mysql.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4mysql.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4mysql.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=mysql
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4ncurses.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4ncurses.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4ncurses.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=ncurses
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4odbc.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4odbc.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4odbc.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=odbc
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4openssl.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4openssl.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4openssl.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=openssl
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4pgsql.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4pgsql.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4pgsql.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=pgsql
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4zlib.preremove
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4zlib.preremove	2009-05-19 18:28:43 UTC (rev 4958)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4zlib.preremove	2009-05-19 18:57:38 UTC (rev 4959)
@@ -1,7 +1,7 @@
 #!/bin/sh
 MODULE_NAME=zlib
-#PHP_INI=/opt/csw/php4/lib/php.ini
-PHP_INI=php.ini
+PHP_INI=/opt/csw/php4/lib/php.ini
+
 echo "[===> Running Pre Remove <===]"
 echo "   ===> Disabling ${MODULE_NAME} extension"
 perl -i -plne "s|extension=${MODULE_NAME}.so|;extension=${MODULE_NAME}.so|" ${PHP_INI}


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

From j_arndt at users.sourceforge.net  Tue May 19 21:20:43 2009
From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net)
Date: Tue, 19 May 2009 19:20:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[4960] csw/mgar/pkg/pnp/trunk
Message-ID: 

Revision: 4960
          http://gar.svn.sourceforge.net/gar/?rev=4960&view=rev
Author:   j_arndt
Date:     2009-05-19 19:20:43 +0000 (Tue, 19 May 2009)

Log Message:
-----------
pnp: changed paths to match OpenCSW layout standards, added sample configuration

Modified Paths:
--------------
    csw/mgar/pkg/pnp/trunk/Makefile
    csw/mgar/pkg/pnp/trunk/checksums
    csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype

Added Paths:
-----------
    csw/mgar/pkg/pnp/trunk/files/commands.cfg-sample.diff
    csw/mgar/pkg/pnp/trunk/files/nagios.cfg-sample.diff

Removed Paths:
-------------
    csw/mgar/pkg/pnp/trunk/files/nagios_commands.cfg-sample.diff

Modified: csw/mgar/pkg/pnp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pnp/trunk/Makefile	2009-05-19 18:57:38 UTC (rev 4959)
+++ csw/mgar/pkg/pnp/trunk/Makefile	2009-05-19 19:20:43 UTC (rev 4960)
@@ -18,7 +18,8 @@
 PATCHFILES += npcdmod.h.diff
 PATCHFILES += npcdmod.c.diff
 PATCHFILES += npcd.cfg-sample.in.diff
-PATCHFILES += nagios_commands.cfg-sample.diff
+PATCHFILES += commands.cfg-sample.diff
+PATCHFILES += nagios.cfg-sample.diff
 
 # We define upstream file regex so we can be notifed of new upstream software release
 #UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
@@ -33,7 +34,8 @@
 sysconfdir = $(prefix)/nagios/pnp/etc
 bindir = $(prefix)/nagios/pnp/bin
 libexecdir = $(prefix)/libexec/nagios-plugins
-localstatedir =$(prefix)/nagios/pnp/var
+localstatedir = /var/opt/csw/pnp
+#localstatedir =$(prefix)/nagios/pnp/var
 
 REQUIRED_PKGS += CSWphp5 CSWphp5gd CSWap2modphp5 CSWrrd CSWnagios CSWcswclassutils
 SPKG_CLASSES = none cswpreserveconf cswinitsmf
@@ -44,9 +46,11 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-perl_lib_path=/opt/csw/lib/perl/csw
-CONFIGURE_ARGS += --with-perfdata-logfile=/opt/csw/nagios/pnp/var/perfdata.log
+#CONFIGURE_ARGS += --with-perfdata-logfile=/opt/csw/nagios/pnp/var/perfdata.log
+CONFIGURE_ARGS += --with-perfdata-logfile=/var/opt/csw/pnp/perfdata.log
 CONFIGURE_ARGS += --with-perfdata-dir=/opt/csw/nagios/pnp/share/perfdata
-CONFIGURE_ARGS += --with-perfdata-spool-dir=/opt/csw/nagios/pnp/var/spool/perfdata
+#CONFIGURE_ARGS += --with-perfdata-spool-dir=/opt/csw/nagios/pnp/var/spool/perfdata
+CONFIGURE_ARGS += --with-perfdata-spool-dir=/var/opt/csw/pnp/spool/perfdata
 CONFIGURE_ARGS += --htmldir=/opt/csw/nagios/share/pnp
 
 BUILD_ARGS = all
@@ -65,7 +69,8 @@
 SYSCONFDIR = $(sysconfdir)
 LIBEXECDIR = $(libexecdir)
 BINDIR = $(bindir)
-PERFDATA_SPOOL_DIR=/opt/csw/nagios/pnp/var/spool/perfdata/
+#PERFDATA_SPOOL_DIR=/opt/csw/nagios/pnp/var/spool/perfdata/
+PERFDATA_SPOOL_DIR=/var/opt/csw/pnp/spool/perfdata/
 PERFDATADIR = /opt/csw/nagios/pnp/share/perfdata
 
 install-base-custom:
@@ -135,7 +140,8 @@
 	@ginstall -m 644   $(WORKSRC)/sample-config/pnp/check_commands/check_nwstat.cfg-sample $(DESTDIR)$(SYSCONFDIR)/check_commands/check_nwstat.cfg.CSW
 	@ginstall -m 644   $(WORKSRC)/sample-config/pnp/pages/web_traffic.cfg-sample $(DESTDIR)$(SYSCONFDIR)/pages/web_traffic.cfg.CSW
 	@ginstall -m 644   $(WORKSRC)/sample-config/pnp/npcd.cfg-sample $(DESTDIR)$(SYSCONFDIR)/npcd.cfg.CSW
-	@ginstall -m 644 $(WORKSRC)/sample-config/pnp/nagios_commands.cfg-sample $(DESTDIR)$(SYSCONFDIR)/nagios_commands.cfg-sample
+	@ginstall -m 644 $(WORKSRC)/sample-config/pnp/commands.cfg-sample $(DESTDIR)$(SYSCONFDIR)/commands.cfg-sample
+	@ginstall -m 644 $(WORKSRC)/sample-config/pnp/nagios.cfg-sample $(DESTDIR)$(SYSCONFDIR)/nagios.cfg-sample
 	@$(MAKECOOKIE)
 
 install-contrib-custom:

Modified: csw/mgar/pkg/pnp/trunk/checksums
===================================================================
--- csw/mgar/pkg/pnp/trunk/checksums	2009-05-19 18:57:38 UTC (rev 4959)
+++ csw/mgar/pkg/pnp/trunk/checksums	2009-05-19 19:20:43 UTC (rev 4960)
@@ -1,10 +1,11 @@
 9dbbf08191a258f6798c9516b3821ff0  download/pnp-0.4.14.tar.gz
 216b8ed50919642c3fae2a6520724dd3  download/CSWpnp.gspec
-6e75bd501030cb04740160165f8b9ed8  download/CSWpnp.prototype
+cc9e90ad08302f4a60abcc273a8e4f20  download/CSWpnp.prototype
 fec420cb27af9cbd0daba28f04500f8c  download/cswpnp
 80c06e6426497ed3fa96c0e77aff613d  download/makefile.diff
 db6af87968e9b29272d387033f09acba  download/npcd.c.diff
 65d971cd9983aef7f069c7976424eb99  download/npcdmod.h.diff
 8380996936f96669d8abe25dd8faf392  download/npcdmod.c.diff
 01c0965ea1bdd26e4f0fdbc51640dfce  download/npcd.cfg-sample.in.diff
-8458b6df4844588d578344d97a26dd5e  download/nagios_commands.cfg-sample.diff
+c10bfd9230f04d1c4c1e9479901f0db6  download/commands.cfg-sample.diff
+3e55b518ec5192557da59b17e806d0f1  download/nagios.cfg-sample.diff

Modified: csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype
===================================================================
--- csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype	2009-05-19 18:57:38 UTC (rev 4959)
+++ csw/mgar/pkg/pnp/trunk/files/CSWpnp.prototype	2009-05-19 19:20:43 UTC (rev 4960)
@@ -17,14 +17,15 @@
 d none /opt/csw/nagios/pnp/etc/pages 0755 nagios nagios
 f cswpreserveconf /opt/csw/nagios/pnp/etc/pages/web_traffic.cfg.CSW 0644 nagios nagios
 f none /opt/csw/nagios/pnp/etc/pnp4nagios_release 0644 nagios nagios
-f none /opt/csw/nagios/pnp/etc/nagios_commands.cfg-sample 0644 nagios nagios
+f none /opt/csw/nagios/pnp/etc/commands.cfg-sample 0644 nagios nagios
+f none /opt/csw/nagios/pnp/etc/nagios.cfg-sample 0644 nagios nagios
 f cswpreserveconf /opt/csw/nagios/pnp/etc/process_perfdata.cfg.CSW 0644 nagios nagios
 f cswpreserveconf /opt/csw/nagios/pnp/etc/rra.cfg.CSW 0644 nagios nagios
 d none /opt/csw/nagios/pnp/share 0755 nagios nagios
 d none /opt/csw/nagios/pnp/share/perfdata 0755 nagios nagios
-d none /opt/csw/nagios/pnp/var 0755 nagios nagios
-d none /opt/csw/nagios/pnp/var/spool 0755 nagios nagios
-d none /opt/csw/nagios/pnp/var/spool/perfdata 0755 nagios nagios
+d none /var/opt/csw/pnp 0755 nagios nagios
+d none /var/opt/csw/pnp/spool 0755 nagios nagios
+d none /var/opt/csw/pnp/spool/perfdata 0755 nagios nagios
 d none /opt/csw/nagios/share 0755 nagios nagios
 d none /opt/csw/nagios/share/pnp 0755 nagios nagios
 s none /opt/csw/nagios/pnp/share/html=/opt/csw/nagios/share/pnp

Added: csw/mgar/pkg/pnp/trunk/files/commands.cfg-sample.diff
===================================================================
--- csw/mgar/pkg/pnp/trunk/files/commands.cfg-sample.diff	                        (rev 0)
+++ csw/mgar/pkg/pnp/trunk/files/commands.cfg-sample.diff	2009-05-19 19:20:43 UTC (rev 4960)
@@ -0,0 +1,53 @@
+diff --speed-large-files --minimal -Nru pnp-0.4.14.orig/sample-config/pnp/commands.cfg-sample pnp-0.4.14/sample-config/pnp/nagios_commands.cfg-sample
+--- pnp-0.4.14.orig/sample-config/pnp/commands.cfg-sample	1970-01-01 01:00:00.000000000 +0100
++++ pnp-0.4.14/sample-config/pnp/commands.cfg-sample	2009-05-13 20:15:50.819746793 +0200
+@@ -0,0 +1,49 @@
++#
++# You can append these commands to the commands.cfg of your Nagios and 
++# uncomment the lines for the mode, which fits your environment.
++#
++# Please note, that you need to edit your nagios.cfg too,
++# see http://www.pnp4nagios.org/ for more information.
++#
++
++#
++# default mode
++#
++
++#define command {
++#        command_name    process-service-perfdata
++#        command_line    /opt/csw/bin/perl /opt/csw/libexec/nagios-plugins/process_perfdata.pl
++#}
++
++#define command {
++#        command_name    process-host-perfdata
++#        command_line    /opt/csw/bin/perl /opt/csw/libexec/nagios-plugins/process_perfdata.pl -d HOSTPERFDATA
++#}
++
++#
++# bulk mode
++#
++
++#define command{
++#        command_name    process-service-perfdata-file
++#        command_line    /opt/csw/libexec/nagios-plugins/process_perfdata.pl --bulk=/var/opt/csw/pnp/service-perfdata
++#}
++
++#define command{
++#        command_name    process-host-perfdata-file
++#        command_line    /opt/csw/libexec/nagios-plugins/process_perfdata.pl --bulk=/var/opt/csw/pnp/host-perfdata
++# }
++
++#
++# bulk mode with npcd
++#
++
++#define command{
++#        command_name    process-service-perfdata-file
++#        command_line    /bin/mv /var/opt/csw/pnp/service-perfdata /opt/csw/nagios/pnp/var/spool/perfdata/service-perfdata.$TIMET$
++# }
++
++#define command{
++#        command_name    process-host-perfdata-file
++#        command_line    /bin/mv /var/opt/csw/pnp/host-perfdata /opt/csw/nagios/pnp/var/spool/perfdata/host-perfdata.$TIMET$
++# }

Added: csw/mgar/pkg/pnp/trunk/files/nagios.cfg-sample.diff
===================================================================
--- csw/mgar/pkg/pnp/trunk/files/nagios.cfg-sample.diff	                        (rev 0)
+++ csw/mgar/pkg/pnp/trunk/files/nagios.cfg-sample.diff	2009-05-19 19:20:43 UTC (rev 4960)
@@ -0,0 +1,42 @@
+diff --speed-large-files --minimal -Nru pnp-0.4.14.orig/sample-config/pnp/nagios.cfg-sample pnp-0.4.14/sample-config/pnp/nagios.cfg-sample
+--- pnp-0.4.14.orig/sample-config/pnp/nagios.cfg-sample	1970-01-01 01:00:00.000000000 +0100
++++ pnp-0.4.14/sample-config/pnp/nagios.cfg-sample	2009-05-19 20:46:35.753095929 +0200
+@@ -0,0 +1,38 @@
++#
++# You can copy and uncomment the lines which fits your environment
++# to your nagios.cfg
++#
++# Proper process commands you can find in commands.cfg-sample
++#
++
++#
++# Default Mode
++#
++
++#process_performance_data=1
++#enable_environment_macros = 1
++#service_perfdata_command=process-service-perfdata
++#host_perfdata_command=process-host-perfdata
++
++#
++# Bulk Mode
++#
++
++#process_performance_data=1
++#service_perfdata_file=/var/opt/csw/pnp/service-perfdata
++#service_perfdata_file_template=DATATYPE::SERVICEPERFDATA\tTIMET::$TIMET$\tHOSTNAME::$HOSTNAME$\tSERVICEDESC::$SERVICEDESC$\tSERVICEPERFDATA::$SERVICEPERFDATA$\tSERVICECHECKCOMMAND::$SERVICECHECKCOMMAND$\tHOSTSTATE::$HOSTSTATE$\tHOSTSTATETYPE::$HOSTSTATETYPE$\tSERVICESTATE::$SERVICESTATE$\tSERVICESTATETYPE::$SERVICESTATETYPE$
++#service_perfdata_file_mode=a
++#service_perfdata_file_processing_interval=15
++#service_perfdata_file_processing_command=process-service-perfdata-file
++
++#host_perfdata_file=/var/opt/csw/pnp/host-perfdata
++#host_perfdata_file_template=DATATYPE::HOSTPERFDATA\tTIMET::$TIMET$\tHOSTNAME::$HOSTNAME$\tHOSTPERFDATA::$HOSTPERFDATA$\tHOSTCHECKCOMMAND::$HOSTCHECKCOMMAND$\tHOSTSTATE::$HOSTSTATE$\tHOSTSTATETYPE::$HOSTSTATETYPE$
++#host_perfdata_file_mode=a
++#host_perfdata_file_processing_interval=15
++#host_perfdata_file_processing_command=process-host-perfdata-file
++
++#
++# NPCD with Bulk Mode
++#
++
++# You need to change your nagios.cfg identically as with the Bulk Mode

Deleted: csw/mgar/pkg/pnp/trunk/files/nagios_commands.cfg-sample.diff
===================================================================
--- csw/mgar/pkg/pnp/trunk/files/nagios_commands.cfg-sample.diff	2009-05-19 18:57:38 UTC (rev 4959)
+++ csw/mgar/pkg/pnp/trunk/files/nagios_commands.cfg-sample.diff	2009-05-19 19:20:43 UTC (rev 4960)
@@ -1,53 +0,0 @@
-diff --speed-large-files --minimal -Nru pnp-0.4.14.orig/sample-config/pnp/nagios_commands.cfg-sample pnp-0.4.14/sample-config/pnp/nagios_commands.cfg-sample
---- pnp-0.4.14.orig/sample-config/pnp/nagios_commands.cfg-sample	1970-01-01 01:00:00.000000000 +0100
-+++ pnp-0.4.14/sample-config/pnp/nagios_commands.cfg-sample	2009-05-13 20:15:50.819746793 +0200
-@@ -0,0 +1,49 @@
-+#
-+# You can append these commands to your commands.cfg and 
-+# uncomment the lines for the mode, which fits your environment.
-+#
-+# Please note, that you need to edit your nagios.cfg too,
-+# see http://www.pnp4nagios.org/ for more information.
-+#
-+
-+#
-+# default mode
-+#
-+
-+#define command {
-+#        command_name    process-service-perfdata
-+#        command_line    /opt/csw/bin/perl /opt/csw/libexec/nagios-plugins/process_perfdata.pl
-+#}
-+
-+#define command {
-+#        command_name    process-host-perfdata
-+#        command_line    /opt/csw/bin/perl /opt/csw/libexec/nagios-plugins/process_perfdata.pl -d HOSTPERFDATA
-+#}
-+
-+#
-+# bulk mode
-+#
-+
-+#define command{
-+#        command_name    process-service-perfdata-file
-+#        command_line    /opt/csw/libexec/nagios-plugins/process_perfdata.pl --bulk=/opt/csw/nagios/pnp/var/service-perfdata
-+#}
-+
-+#define command{
-+#        command_name    process-host-perfdata-file
-+#        command_line    /opt/csw/libexec/nagios-plugins/process_perfdata.pl --bulk=/opt/csw/nagios/pnp/var/host-perfdata
-+# }
-+
-+#
-+# bulk mode with npcd
-+#
-+
-+#define command{
-+#        command_name    process-service-perfdata-file
-+#        command_line    /bin/mv /opt/csw/nagios/pnp/var/service-perfdata /opt/csw/nagios/pnp/var/spool/perfdata/service-perfdata.$TIMET$
-+# }
-+
-+#define command{
-+#        command_name    process-host-perfdata-file
-+#        command_line    /bin/mv /opt/csw/nagios/pnp/var/host-perfdata /opt/csw/nagios/pnp/var/spool/perfdata/host-perfdata.$TIMET$
-+# }


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

From valholla at users.sourceforge.net  Tue May 19 21:27:01 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 19 May 2009 19:27:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[4961]
	csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall
Message-ID: 

Revision: 4961
          http://gar.svn.sourceforge.net/gar/?rev=4961&view=rev
Author:   valholla
Date:     2009-05-19 19:27:01 +0000 (Tue, 19 May 2009)

Log Message:
-----------
last tweak

Modified Paths:
--------------
    csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall	2009-05-19 19:20:43 UTC (rev 4960)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall	2009-05-19 19:27:01 UTC (rev 4961)
@@ -1,7 +1,6 @@
 #!/bin/sh
-
+PKGINST=CSWphp4cgi
 PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin
-PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
 PHP_LIB=$PKG_INSTALL_ROOT/opt/csw/php4/lib
 PHP_BIN=$PKG_INSTALL_ROOT/opt/csw/php4/bin
 PHP_INI=$PHP_LIB/php.ini


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

From valholla at users.sourceforge.net  Tue May 19 21:27:41 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 19 May 2009 19:27:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[4962] csw/mgar/pkg/php4/trunk/checksums
Message-ID: 

Revision: 4962
          http://gar.svn.sourceforge.net/gar/?rev=4962&view=rev
Author:   valholla
Date:     2009-05-19 19:27:40 +0000 (Tue, 19 May 2009)

Log Message:
-----------
fix checksum

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

Modified: csw/mgar/pkg/php4/trunk/checksums
===================================================================
--- csw/mgar/pkg/php4/trunk/checksums	2009-05-19 19:27:01 UTC (rev 4961)
+++ csw/mgar/pkg/php4/trunk/checksums	2009-05-19 19:27:40 UTC (rev 4962)
@@ -5,49 +5,49 @@
 8924c197b7915385734a765dab961e68  download/CSWmodphp4.preremove
 0dd379f20ceb32fc77bb3a9bf045097f  download/CSWmodphp4.space
 3119c7fb6c454da9e483a54453b39548  download/CSWphp4bcmath.postinstall
-a28367bcf2f1dc5513271b4fd5f7db2b  download/CSWphp4bcmath.preremove
+fa17d31586bab6dd5d4ae6c73a4f0e65  download/CSWphp4bcmath.preremove
 a5baa2f0261f9d4f45240e32aa931dab  download/CSWphp4bz2.postinstall
-ed0922061d8b95e2f8cc6604381cc57f  download/CSWphp4bz2.preremove
+f2d09b85c01bc08324e28eae67147c12  download/CSWphp4bz2.preremove
 82b8586235f637d239c07eb3bead372e  download/CSWphp4calendar.postinstall
-0bbeea841afc4d2ea98b641b9f09624a  download/CSWphp4calendar.preremove
-68f680b24100f2a7a4e1d3fdafd1c3ba  download/CSWphp4cgi.postinstall
+9785577861fc25123bed85038ba0067d  download/CSWphp4calendar.preremove
+ac420d6d81f6c110a2d9f53dde29eefc  download/CSWphp4cgi.postinstall
 97d253d03e6aee4df218c0b94f44a175  download/CSWphp4cgi.space
 84aa3d42197c8fb1c6eb000c8684e904  download/CSWphp4curl.postinstall
-99f1ea3f414aa4e63e94d9e34069ac7d  download/CSWphp4curl.preremove
+7dfaad65432c031aa0dd1e3426c40a6c  download/CSWphp4curl.preremove
 beb44563abab6725128a796e2507883b  download/CSWphp4dba.postinstall
-4f3c0524060deba68760c8cd4b101482  download/CSWphp4dba.preremove
+c2691ced2aacb5c956ffa3c9295bac6c  download/CSWphp4dba.preremove
 391a9204a7b99911207762c29b094a22  download/CSWphp4domxml.postinstall
-55a167a6d4d478856423b5f064958e64  download/CSWphp4domxml.preremove
+111ac9f616d42e03a2fcbf199805b23e  download/CSWphp4domxml.preremove
 7517719ac38440cb7584b582652fa1fa  download/CSWphp4gd.postinstall
-926d9b58d6a2d352cf23a5755471e1f0  download/CSWphp4gd.preremove
+70439f427084e5a2fc2e8a764711a180  download/CSWphp4gd.preremove
 ba1e62dfb832cd2e369226afc9b759ce  download/CSWphp4gettext.postinstall
-cb589a4ca4a3311d1ec916eaa53cec5f  download/CSWphp4gettext.preremove
+488268d7690b44ceb25df2e69829232d  download/CSWphp4gettext.preremove
 1b3cbc1feb3f94e466f149d38857e96d  download/CSWphp4gmp.postinstall
-153a8bd51ad9019cff0ad77b163e7bd9  download/CSWphp4gmp.preremove
+eea4ea898f0a3752a5c9ca4fa00a8e0f  download/CSWphp4gmp.preremove
 d103fd359ebb421d0a8a41e59394fc8a  download/CSWphp4iconv.postinstall
-7437f8f082c95420aaee704a3b4f42d0  download/CSWphp4iconv.preremove
+661333f2c7e1d3397d18568a3880b0d7  download/CSWphp4iconv.preremove
 b9540869abf433e623d4d6be0e34152a  download/CSWphp4imap.postinstall
-5db399a3e1bceff000369b4c77727d7b  download/CSWphp4imap.preremove
+df65c788d18d68e4831a64ee9388f870  download/CSWphp4imap.preremove
 682b390bb4027ca5b9a6554671841c22  download/CSWphp4ldap.postinstall
-fba32bef8deaefa3ab7dae5d688144bf  download/CSWphp4ldap.preremove
+b5d9f804973a8f0bc90a919d163f0ee4  download/CSWphp4ldap.preremove
 b61dc20076329f48210de4dd31572f6f  download/CSWphp4mbstring.postinstall
-6359a3754ae562eb9bc1105d7ad2cf82  download/CSWphp4mbstring.preremove
+551bfd5df0afd09475081d6a0ab634e7  download/CSWphp4mbstring.preremove
 c3074edb714074ca94bb7a222387374c  download/CSWphp4mcal.postinstall
-2a0014460d320b93fc227acac591d6a0  download/CSWphp4mcal.preremove
+9c9a73094195f0eb5295ae222b2ff47d  download/CSWphp4mcal.preremove
 ebfe95b3aa54d9eb59d9de54ed71958f  download/CSWphp4mssql.postinstall
-197ce3cd2bf5316034aaf026b45ae306  download/CSWphp4mssql.preremove
+53c7395f75279c1db0f288f518801c79  download/CSWphp4mssql.preremove
 18e7fa4375bcae7cd8df3d40417c5e54  download/CSWphp4mysql.postinstall
-c749d159edf7f57bb2271bc6d32e8b34  download/CSWphp4mysql.preremove
+fdee2f981a1d121c3c1664964998585f  download/CSWphp4mysql.preremove
 61563764c3e8ea86250d60a414c2a08a  download/CSWphp4ncurses.postinstall
-bd689819276a2c462a32e2c187bb28a2  download/CSWphp4ncurses.preremove
+f3550f0fa97887b1a61471321f438617  download/CSWphp4ncurses.preremove
 c552f04399c41b8092c2e2874eed5997  download/CSWphp4odbc.postinstall
-fd9c43fffd24083e3c665dd066724f44  download/CSWphp4odbc.preremove
+5a4d4678c05919ffe9e9e4f885da363e  download/CSWphp4odbc.preremove
 76d8e3c627a5185bae8d23b467f0b7e0  download/CSWphp4openssl.postinstall
-f8d282b9d62c6d543057c6d8137a6250  download/CSWphp4openssl.preremove
+1a1aafd3b6ed678025a6aeb9e8fdf6c9  download/CSWphp4openssl.preremove
 1ac2fda1017a05618aab7b0b6e8f6b45  download/CSWphp4pgsql.postinstall
-008f9fe669a5699c40c4415f95d0148a  download/CSWphp4pgsql.preremove
+02cf32728126d7c4df6d04c0127f736b  download/CSWphp4pgsql.preremove
 7340bac8a1bb91821f664f32e6cc4920  download/CSWphp4zlib.postinstall
-77ec27892ad5659e22789dc97c6d5472  download/CSWphp4zlib.preremove
+326a1dad1aff6399a5e3c9031b6085da  download/CSWphp4zlib.preremove
 86e8561c50e7272b06336dcdb03f7bea  download/README-mod_php
 76492b303e12d8d0d8d6c6e1e91d7850  download/README-mod_php4_core
 93db60a388952ec3b40bb3bb005ff06b  download/dummy-httpd.conf


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

From valholla at users.sourceforge.net  Tue May 19 21:50:08 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 19 May 2009 19:50:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[4963] csw/mgar/pkg/python/trunk/files
Message-ID: 

Revision: 4963
          http://gar.svn.sourceforge.net/gar/?rev=4963&view=rev
Author:   valholla
Date:     2009-05-19 19:50:08 +0000 (Tue, 19 May 2009)

Log Message:
-----------
tweak to let user know it is not frozen

Modified Paths:
--------------
    csw/mgar/pkg/python/trunk/files/CSWidle.postinstall
    csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall
    csw/mgar/pkg/python/trunk/files/CSWpython.postinstall

Modified: csw/mgar/pkg/python/trunk/files/CSWidle.postinstall
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWidle.postinstall	2009-05-19 19:27:40 UTC (rev 4962)
+++ csw/mgar/pkg/python/trunk/files/CSWidle.postinstall	2009-05-19 19:50:08 UTC (rev 4963)
@@ -14,6 +14,7 @@
 
 for file in `find ${PY_LIBDIR}/idlelib -name "*.py[co]" -print`
 do
+    echo "Updating Package DB with ${file} ..."
     installf ${PKGINST} ${file}
 done
 installf -f ${PKGINST}

Modified: csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall	2009-05-19 19:27:40 UTC (rev 4962)
+++ csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall	2009-05-19 19:50:08 UTC (rev 4963)
@@ -14,6 +14,7 @@
 
 for file in `find ${PY_LIBDIR}/lib-tk -name "*.py[co]" -print`
 do
+    echo "Updating Package DB with ${file} ..."
     installf ${PKGINST} ${file}
 done
 installf -f ${PKGINST}

Modified: csw/mgar/pkg/python/trunk/files/CSWpython.postinstall
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython.postinstall	2009-05-19 19:27:40 UTC (rev 4962)
+++ csw/mgar/pkg/python/trunk/files/CSWpython.postinstall	2009-05-19 19:50:08 UTC (rev 4963)
@@ -15,6 +15,7 @@
 
 for file in `find ${PY_LIBDIR} -name idlelib -prune -o -name lib-tk -prune -o -name site-packages -prune -o -name "*.py[co]" -print`
 do
+    echo "Updating Package DB with ${file} ..."
     installf ${PKGINST} ${file}
 done
 installf -f ${PKGINST}


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

From ellson at users.sourceforge.net  Tue May 19 22:08:45 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Tue, 19 May 2009 20:08:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[4964] csw/mgar/pkg/swig/trunk
Message-ID: 

Revision: 4964
          http://gar.svn.sourceforge.net/gar/?rev=4964&view=rev
Author:   ellson
Date:     2009-05-19 20:08:45 +0000 (Tue, 19 May 2009)

Log Message:
-----------
New maintainer.  Convert to mgar v2.   Upgrade to sig-1.3.39

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

Property Changed:
----------------
    csw/mgar/pkg/swig/trunk/


Property changes on: csw/mgar/pkg/swig/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/swig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/swig/trunk/Makefile	2009-05-19 19:50:08 UTC (rev 4963)
+++ csw/mgar/pkg/swig/trunk/Makefile	2009-05-19 20:08:45 UTC (rev 4964)
@@ -1,5 +1,5 @@
 GARNAME = swig
-GARVERSION = 1.3.29
+GARVERSION = 1.3.39
 CATEGORIES = devel
 
 DESCRIPTION = A scripting interface generator for C/C++ code.
@@ -16,18 +16,23 @@
   s-expressions.
 endef
 
-MASTER_SITES = $(SF_MIRROR)/$(GARNAME)/
+MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWswig,depend prototype)
+#DISTFILES += $(call admfiles,CSWswig,depend prototype)
 
 # We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
+# 1645 is the group_id for the swig project on sourceforge
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=1645
 UPSTREAM_USE_SF = 1
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)
 
 # Prevent automake from attempting to regenerate everything
-PATCHFILES += am.diff
+#PATCHFILES += am.diff
 
+REQUIRED_PKGS = CSWzlib
+
 # Languages we *do* have
 #DEPEND += lang/tcl lang/python lang/perl lang/guile
 #DEPEND += lang/ruby lang/php4 lang/ocaml
@@ -50,12 +55,12 @@
 
 include gar/category.mk
 
-post-install: install-swig-doc
+#post-install: install-swig-doc
+#
+#install-swig-doc:
+#	@mkdir -p $(DESTDIR)$(docdir)/$(GARNAME)
+#	@cp -R $(WORKSRC)/Doc $(DESTDIR)$(docdir)/$(GARNAME)
+#	@cp -R $(WORKSRC)/Examples $(DESTDIR)$(docdir)/$(GARNAME)
+#	@$(MAKECOOKIE)
+#	$(DONADA)
 
-install-swig-doc:
-	@mkdir -p $(DESTDIR)$(docdir)/$(GARNAME)
-	@cp -R $(WORKSRC)/Doc $(DESTDIR)$(docdir)/$(GARNAME)
-	@cp -R $(WORKSRC)/Examples $(DESTDIR)$(docdir)/$(GARNAME)
-	@$(MAKECOOKIE)
-	$(DONADA)
-

Modified: csw/mgar/pkg/swig/trunk/checksums
===================================================================
--- csw/mgar/pkg/swig/trunk/checksums	2009-05-19 19:50:08 UTC (rev 4963)
+++ csw/mgar/pkg/swig/trunk/checksums	2009-05-19 20:08:45 UTC (rev 4964)
@@ -1,5 +1 @@
-44c6f6d8d724cf7fa4a5109e6f63c9b1  download/swig-1.3.29.tar.gz
-947ebb719cb19caaee9ff72523966d5e  download/CSWswig.gspec
-8af682c68556bb527ce633b66ca49a42  download/CSWswig.depend
-a037e4cf82b9c00c5d5776db2955c82f  download/CSWswig.prototype
-a96291be6e762e9b5dad6725880eab75  download/am.diff
+ac201d1b87f8659584534f9540d7ad24  download/swig-1.3.39.tar.gz


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

From valholla at users.sourceforge.net  Tue May 19 22:10:53 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 19 May 2009 20:10:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[4965] csw/mgar/pkg/python/trunk/files
Message-ID: 

Revision: 4965
          http://gar.svn.sourceforge.net/gar/?rev=4965&view=rev
Author:   valholla
Date:     2009-05-19 20:10:53 +0000 (Tue, 19 May 2009)

Log Message:
-----------
space file 

Modified Paths:
--------------
    csw/mgar/pkg/python/trunk/files/CSWidle.space
    csw/mgar/pkg/python/trunk/files/CSWpython-tk.space
    csw/mgar/pkg/python/trunk/files/CSWpython.space

Modified: csw/mgar/pkg/python/trunk/files/CSWidle.space
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWidle.space	2009-05-19 20:08:45 UTC (rev 4964)
+++ csw/mgar/pkg/python/trunk/files/CSWidle.space	2009-05-19 20:10:53 UTC (rev 4965)
@@ -1 +1 @@
-$BASEDIR
+$BASEDIR 100

Modified: csw/mgar/pkg/python/trunk/files/CSWpython-tk.space
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython-tk.space	2009-05-19 20:08:45 UTC (rev 4964)
+++ csw/mgar/pkg/python/trunk/files/CSWpython-tk.space	2009-05-19 20:10:53 UTC (rev 4965)
@@ -1 +1 @@
-$BASEDIR
+$BASEDIR 20

Modified: csw/mgar/pkg/python/trunk/files/CSWpython.space
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython.space	2009-05-19 20:08:45 UTC (rev 4964)
+++ csw/mgar/pkg/python/trunk/files/CSWpython.space	2009-05-19 20:10:53 UTC (rev 4965)
@@ -1 +1 @@
-$BASEDIR
+$BASEDIR 1600


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

From valholla at users.sourceforge.net  Tue May 19 22:11:09 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 19 May 2009 20:11:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[4966]
	csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall
Message-ID: 

Revision: 4966
          http://gar.svn.sourceforge.net/gar/?rev=4966&view=rev
Author:   valholla
Date:     2009-05-19 20:11:09 +0000 (Tue, 19 May 2009)

Log Message:
-----------
fix

Modified Paths:
--------------
    csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall

Modified: csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall
===================================================================
--- csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall	2009-05-19 20:10:53 UTC (rev 4965)
+++ csw/mgar/pkg/php4/trunk/files/CSWphp4cgi.postinstall	2009-05-19 20:11:09 UTC (rev 4966)
@@ -1,21 +1,20 @@
 #!/bin/sh
-PKGINST=CSWphp4cgi
+
 PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin
 PHP_LIB=$PKG_INSTALL_ROOT/opt/csw/php4/lib
 PHP_BIN=$PKG_INSTALL_ROOT/opt/csw/php4/bin
 PHP_INI=$PHP_LIB/php.ini
 
+extdir=`${PHP_BIN}/php-config --extension-dir`
 if [ ! -f $PHP_INI ]; then
     cp -p $PHP_INI.CSW $PHP_INI
 else
     echo "php.ini already exists"
+    curextdir=`perl -ne 's|extension_dir = "(.*no-debug-non-zts-[0-9]+)"|$1| && print'  $PHP_INI`
 
-    extdir=`${PHP_BIN}/php-config --extension-dir`
-    curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' $PHP_INI`
-
     if [ "$extdir" != "$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|extension_dir = .*|extension_dir = $extdir|" $PHP_INI
     fi
 fi
 
@@ -29,7 +28,7 @@
 
 _EOT_
 
-if [ ! -d "${extdir}" ]; then
+if [ ! -d ${extdir} ]; then
     mkdir -p ${extdir}
     for dir in `${PHP_BIN}/php-config --extension-dir |\
                  awk -F'/' '{print $(NF-1), $NF}'`; do


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

From valholla at users.sourceforge.net  Tue May 19 22:12:12 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 19 May 2009 20:12:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[4967]
	csw/mgar/pkg/python/trunk/checksums
Message-ID: 

Revision: 4967
          http://gar.svn.sourceforge.net/gar/?rev=4967&view=rev
Author:   valholla
Date:     2009-05-19 20:12:12 +0000 (Tue, 19 May 2009)

Log Message:
-----------
fix checksum

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

Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums	2009-05-19 20:11:09 UTC (rev 4966)
+++ csw/mgar/pkg/python/trunk/checksums	2009-05-19 20:12:12 UTC (rev 4967)
@@ -1,9 +1,9 @@
-e5296fef0bda7ca6f4c06463cd67c63e  download/CSWidle.postinstall
-4d9594d707b7bd25113f8162274e74d4  download/CSWidle.space
-821c153022ec0b2aebc6dfbe9c8b9bd5  download/CSWpython-tk.postinstall
-4d9594d707b7bd25113f8162274e74d4  download/CSWpython-tk.space
-a2f72d6ecf55735c910c5e5d01f44968  download/CSWpython.postinstall
-4d9594d707b7bd25113f8162274e74d4  download/CSWpython.space
+33ef7d7fe10ced75ff7237209af408b4  download/CSWidle.postinstall
+ba513e374930332ec5a6718284dcc4f7  download/CSWidle.space
+b9cf44860b4099a6d32bc93d7c84c1cf  download/CSWpython-tk.postinstall
+b35b36d4ff220bb06104e74ed458f63a  download/CSWpython-tk.space
+efedcfaee9ef2d326a0ba9f97e67316a  download/CSWpython.postinstall
+a4a6f9fa28abc37922eca4dbfdbdd964  download/CSWpython.space
 245db9f1e0f09ab7e0faaa0cf7301011  download/Python-2.6.2.tar.bz2
 42dd6523beb94a805d5764ae1276091c  download/faqwiz.diff
 5664b3970307d7d39d8d4061e7dccbb0  download/libpython2.5.so.1.0-isa-i386


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

From valholla at users.sourceforge.net  Tue May 19 22:12:17 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 19 May 2009 20:12:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[4968] csw/mgar/pkg/php4/trunk/checksums
Message-ID: 

Revision: 4968
          http://gar.svn.sourceforge.net/gar/?rev=4968&view=rev
Author:   valholla
Date:     2009-05-19 20:12:17 +0000 (Tue, 19 May 2009)

Log Message:
-----------
checksum fix

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

Modified: csw/mgar/pkg/php4/trunk/checksums
===================================================================
--- csw/mgar/pkg/php4/trunk/checksums	2009-05-19 20:12:12 UTC (rev 4967)
+++ csw/mgar/pkg/php4/trunk/checksums	2009-05-19 20:12:17 UTC (rev 4968)
@@ -10,7 +10,7 @@
 f2d09b85c01bc08324e28eae67147c12  download/CSWphp4bz2.preremove
 82b8586235f637d239c07eb3bead372e  download/CSWphp4calendar.postinstall
 9785577861fc25123bed85038ba0067d  download/CSWphp4calendar.preremove
-ac420d6d81f6c110a2d9f53dde29eefc  download/CSWphp4cgi.postinstall
+d88b6bb3fbd0b7596806d1efbcda35ed  download/CSWphp4cgi.postinstall
 97d253d03e6aee4df218c0b94f44a175  download/CSWphp4cgi.space
 84aa3d42197c8fb1c6eb000c8684e904  download/CSWphp4curl.postinstall
 7dfaad65432c031aa0dd1e3426c40a6c  download/CSWphp4curl.preremove


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

From valholla at users.sourceforge.net  Tue May 19 22:14:45 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 19 May 2009 20:14:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[4969] csw/mgar/pkg/python/trunk/files
Message-ID: 

Revision: 4969
          http://gar.svn.sourceforge.net/gar/?rev=4969&view=rev
Author:   valholla
Date:     2009-05-19 20:14:44 +0000 (Tue, 19 May 2009)

Log Message:
-----------
number files in space

Modified Paths:
--------------
    csw/mgar/pkg/python/trunk/files/CSWidle.space
    csw/mgar/pkg/python/trunk/files/CSWpython-tk.space
    csw/mgar/pkg/python/trunk/files/CSWpython.space

Modified: csw/mgar/pkg/python/trunk/files/CSWidle.space
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWidle.space	2009-05-19 20:12:17 UTC (rev 4968)
+++ csw/mgar/pkg/python/trunk/files/CSWidle.space	2009-05-19 20:14:44 UTC (rev 4969)
@@ -1 +1 @@
-$BASEDIR 100
+$BASEDIR 200

Modified: csw/mgar/pkg/python/trunk/files/CSWpython-tk.space
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython-tk.space	2009-05-19 20:12:17 UTC (rev 4968)
+++ csw/mgar/pkg/python/trunk/files/CSWpython-tk.space	2009-05-19 20:14:44 UTC (rev 4969)
@@ -1 +1 @@
-$BASEDIR 20
+$BASEDIR 50

Modified: csw/mgar/pkg/python/trunk/files/CSWpython.space
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython.space	2009-05-19 20:12:17 UTC (rev 4968)
+++ csw/mgar/pkg/python/trunk/files/CSWpython.space	2009-05-19 20:14:44 UTC (rev 4969)
@@ -1 +1 @@
-$BASEDIR 1600
+$BASEDIR 3600


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

From valholla at users.sourceforge.net  Tue May 19 22:15:28 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 19 May 2009 20:15:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[4970]
	csw/mgar/pkg/python/trunk/checksums
Message-ID: 

Revision: 4970
          http://gar.svn.sourceforge.net/gar/?rev=4970&view=rev
Author:   valholla
Date:     2009-05-19 20:15:28 +0000 (Tue, 19 May 2009)

Log Message:
-----------
fix checksum

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

Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums	2009-05-19 20:14:44 UTC (rev 4969)
+++ csw/mgar/pkg/python/trunk/checksums	2009-05-19 20:15:28 UTC (rev 4970)
@@ -1,9 +1,9 @@
 33ef7d7fe10ced75ff7237209af408b4  download/CSWidle.postinstall
-ba513e374930332ec5a6718284dcc4f7  download/CSWidle.space
+e510b1d6436f7688050253c924e72c2d  download/CSWidle.space
 b9cf44860b4099a6d32bc93d7c84c1cf  download/CSWpython-tk.postinstall
-b35b36d4ff220bb06104e74ed458f63a  download/CSWpython-tk.space
+e889a5cfdbf807b253df2dce3d852429  download/CSWpython-tk.space
 efedcfaee9ef2d326a0ba9f97e67316a  download/CSWpython.postinstall
-a4a6f9fa28abc37922eca4dbfdbdd964  download/CSWpython.space
+35d3380fc79c53da3580dc4ac60aa501  download/CSWpython.space
 245db9f1e0f09ab7e0faaa0cf7301011  download/Python-2.6.2.tar.bz2
 42dd6523beb94a805d5764ae1276091c  download/faqwiz.diff
 5664b3970307d7d39d8d4061e7dccbb0  download/libpython2.5.so.1.0-isa-i386


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

From valholla at users.sourceforge.net  Wed May 20 03:09:15 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 20 May 2009 01:09:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[4971]
	csw/mgar/pkg/php4/trunk/files/pkgdef.mk
Message-ID: 

Revision: 4971
          http://gar.svn.sourceforge.net/gar/?rev=4971&view=rev
Author:   valholla
Date:     2009-05-20 01:09:15 +0000 (Wed, 20 May 2009)

Log Message:
-----------
fix typo pkgname should be CSWphp not CSWphp4

Modified Paths:
--------------
    csw/mgar/pkg/php4/trunk/files/pkgdef.mk

Modified: csw/mgar/pkg/php4/trunk/files/pkgdef.mk
===================================================================
--- csw/mgar/pkg/php4/trunk/files/pkgdef.mk	2009-05-19 20:15:28 UTC (rev 4970)
+++ csw/mgar/pkg/php4/trunk/files/pkgdef.mk	2009-05-20 01:09:15 UTC (rev 4971)
@@ -5,7 +5,7 @@
 PACKAGES += CSWphp4iconv CSWphp4imap CSWphp4ldap CSWphp4mbstring
 PACKAGES += CSWphp4mcal CSWphp4mssql CSWphp4mysql CSWphp4ncurses CSWphp4odbc
 PACKAGES += CSWphp4openssl CSWphp4pgsql CSWphp4zlib CSWap2modphp4
-PACKAGES += CSWmodphp4 CSWmodphp4core CSWphp4
+PACKAGES += CSWmodphp4 CSWmodphp4core CSWphp
 
 CATALOGNAME_CSWphp4bcmath = php4_bcmath
 SPKG_DESC_CSWphp4bcmath = bcmath extension for php4
@@ -57,7 +57,7 @@
 SPKG_DESC_CSWmodphp4 = PHP 4 - Apache 1.3.x Module
 CATALOGNAME_CSWmodphp4core = mod_php4_core
 SPKG_DESC_CSWmodphp4core = Deprecated use mod_php4 or ap2_modphp4
-CATALOGNAME_CSWphp4 = mod_php
-SPKG_DESC_CSWphp4 = Both an apache module and command line interpreter for the PHP language
-ARCHALL_CSWphp4 =  1
+CATALOGNAME_CSWphp = mod_php
+SPKG_DESC_CSWphp = Both an apache module and command line interpreter for the PHP language
+ARCHALL_CSWphp =  1
 ARCHALL_CSWmodphp4core = 1


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

From valholla at users.sourceforge.net  Wed May 20 03:31:16 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 20 May 2009 01:31:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[4972] csw/mgar/pkg/php4/trunk
Message-ID: 

Revision: 4972
          http://gar.svn.sourceforge.net/gar/?rev=4972&view=rev
Author:   valholla
Date:     2009-05-20 01:31:16 +0000 (Wed, 20 May 2009)

Log Message:
-----------
fix pkg names

Modified Paths:
--------------
    csw/mgar/pkg/php4/trunk/Makefile
    csw/mgar/pkg/php4/trunk/checksums
    csw/mgar/pkg/php4/trunk/files/pkgdef.mk
    csw/mgar/pkg/php4/trunk/files/pkgfiles.mk

Removed Paths:
-------------
    csw/mgar/pkg/php4/trunk/files/README-mod_php4_core

Modified: csw/mgar/pkg/php4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php4/trunk/Makefile	2009-05-20 01:09:15 UTC (rev 4971)
+++ csw/mgar/pkg/php4/trunk/Makefile	2009-05-20 01:31:16 UTC (rev 4972)
@@ -119,7 +119,6 @@
 	@ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
 	@ginstall -d $(DESTDIR)$(prefix)/apache/conf
 	@ginstall -d $(DESTDIR)$(prefix)/php4/lib
-	@ginstall -m 0644 $(WORKDIR)/README-mod_php4_core $(DESTDIR)$(prefix)/php4
 	@ginstall -m 0644 $(WORKDIR)/README-mod_php $(DESTDIR)$(prefix)/php4
 	@ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(prefix)/php4/lib
 	@ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(prefix)/php4/lib

Modified: csw/mgar/pkg/php4/trunk/checksums
===================================================================
--- csw/mgar/pkg/php4/trunk/checksums	2009-05-20 01:09:15 UTC (rev 4971)
+++ csw/mgar/pkg/php4/trunk/checksums	2009-05-20 01:31:16 UTC (rev 4972)
@@ -49,7 +49,6 @@
 7340bac8a1bb91821f664f32e6cc4920  download/CSWphp4zlib.postinstall
 326a1dad1aff6399a5e3c9031b6085da  download/CSWphp4zlib.preremove
 86e8561c50e7272b06336dcdb03f7bea  download/README-mod_php
-76492b303e12d8d0d8d6c6e1e91d7850  download/README-mod_php4_core
 93db60a388952ec3b40bb3bb005ff06b  download/dummy-httpd.conf
 ec1d86518d8b6d5a320ce058f03d9eef  download/httpd-php4.conf.CSW
 3870a95f52c9637798294243694fdd47  download/pgsql.diff

Deleted: csw/mgar/pkg/php4/trunk/files/README-mod_php4_core
===================================================================
--- csw/mgar/pkg/php4/trunk/files/README-mod_php4_core	2009-05-20 01:09:15 UTC (rev 4971)
+++ csw/mgar/pkg/php4/trunk/files/README-mod_php4_core	2009-05-20 01:31:16 UTC (rev 4972)
@@ -1,13 +0,0 @@
-*****************************************************************************
-* DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED
-* DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED
-* DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED
-* DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED, DEPRICATED
-*****************************************************************************
-
-This package has been Depricated and no longer contains any files.
-
-If you are running Apache 1.3.x please pkg-get -i mod_php4
-If you are running Apache 2.2.x please pkg-get -i ap2_modphp4
-
-Thank You!

Modified: csw/mgar/pkg/php4/trunk/files/pkgdef.mk
===================================================================
--- csw/mgar/pkg/php4/trunk/files/pkgdef.mk	2009-05-20 01:09:15 UTC (rev 4971)
+++ csw/mgar/pkg/php4/trunk/files/pkgdef.mk	2009-05-20 01:31:16 UTC (rev 4972)
@@ -5,7 +5,7 @@
 PACKAGES += CSWphp4iconv CSWphp4imap CSWphp4ldap CSWphp4mbstring
 PACKAGES += CSWphp4mcal CSWphp4mssql CSWphp4mysql CSWphp4ncurses CSWphp4odbc
 PACKAGES += CSWphp4openssl CSWphp4pgsql CSWphp4zlib CSWap2modphp4
-PACKAGES += CSWmodphp4 CSWmodphp4core CSWphp
+PACKAGES += CSWmodphp4 CSWphp
 
 CATALOGNAME_CSWphp4bcmath = php4_bcmath
 SPKG_DESC_CSWphp4bcmath = bcmath extension for php4
@@ -53,11 +53,8 @@
 SPKG_DESC_CSWphp4zlib = zlib extension for php4
 CATALOGNAME_CSWap2modphp4 = ap2_modphp4
 SPKG_DESC_CSWap2modphp4 = PHP 4 - Apache 2.2.x Module
-CATALOGNAME_CSWmodphp4 = mod_php4
+CATALOGNAME_CSWmodphp4 = mod_php4_core
 SPKG_DESC_CSWmodphp4 = PHP 4 - Apache 1.3.x Module
-CATALOGNAME_CSWmodphp4core = mod_php4_core
-SPKG_DESC_CSWmodphp4core = Deprecated use mod_php4 or ap2_modphp4
 CATALOGNAME_CSWphp = mod_php
 SPKG_DESC_CSWphp = Both an apache module and command line interpreter for the PHP language
 ARCHALL_CSWphp =  1
-ARCHALL_CSWmodphp4core = 1

Modified: csw/mgar/pkg/php4/trunk/files/pkgfiles.mk
===================================================================
--- csw/mgar/pkg/php4/trunk/files/pkgfiles.mk	2009-05-20 01:09:15 UTC (rev 4971)
+++ csw/mgar/pkg/php4/trunk/files/pkgfiles.mk	2009-05-20 01:31:16 UTC (rev 4972)
@@ -28,6 +28,5 @@
 PKGFILES_CSWphp4zlib = .*/extensions/.*/zlib.*
 PKGFILES_CSWap2modphp4 = .*/apache2/.*
 PKGFILES_CSWmodphp4 = .*/apache/.*
-PKGFILES_CSWmodphp4core = /opt/csw/php4/README-mod_php4_core
 PKGFILES_CSWphp4 = /opt/csw/php4/README-mod_php
 #PKGFILES_CSWphp4cgi catchall


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

From valholla at users.sourceforge.net  Wed May 20 03:34:39 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 20 May 2009 01:34:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[4973]
	csw/mgar/pkg/php4/trunk/files/admfiles.mk
Message-ID: 

Revision: 4973
          http://gar.svn.sourceforge.net/gar/?rev=4973&view=rev
Author:   valholla
Date:     2009-05-20 01:34:38 +0000 (Wed, 20 May 2009)

Log Message:
-----------
fix pkg names

Modified Paths:
--------------
    csw/mgar/pkg/php4/trunk/files/admfiles.mk

Modified: csw/mgar/pkg/php4/trunk/files/admfiles.mk
===================================================================
--- csw/mgar/pkg/php4/trunk/files/admfiles.mk	2009-05-20 01:31:16 UTC (rev 4972)
+++ csw/mgar/pkg/php4/trunk/files/admfiles.mk	2009-05-20 01:34:38 UTC (rev 4973)
@@ -53,7 +53,6 @@
 DISTFILES += CSWphp4zlib.postinstall
 DISTFILES += CSWphp4zlib.preremove
 DISTFILES += README-mod_php
-DISTFILES += README-mod_php4_core
 DISTFILES += dummy-httpd.conf
 DISTFILES += httpd-php4.conf.CSW
 DISTFILES += php.ini.CSW


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

From valholla at users.sourceforge.net  Wed May 20 03:51:54 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 20 May 2009 01:51:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[4974] csw/mgar/pkg/python/trunk
Message-ID: 

Revision: 4974
          http://gar.svn.sourceforge.net/gar/?rev=4974&view=rev
Author:   valholla
Date:     2009-05-20 01:51:53 +0000 (Wed, 20 May 2009)

Log Message:
-----------
add pre-remove

Modified Paths:
--------------
    csw/mgar/pkg/python/trunk/Makefile
    csw/mgar/pkg/python/trunk/files/CSWidle.postinstall
    csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall
    csw/mgar/pkg/python/trunk/files/CSWpython.postinstall

Added Paths:
-----------
    csw/mgar/pkg/python/trunk/files/CSWidle.preremove
    csw/mgar/pkg/python/trunk/files/CSWpython-tk.preremove
    csw/mgar/pkg/python/trunk/files/CSWpython.preremove

Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile	2009-05-20 01:34:38 UTC (rev 4973)
+++ csw/mgar/pkg/python/trunk/Makefile	2009-05-20 01:51:53 UTC (rev 4974)
@@ -83,6 +83,7 @@
 PKGFILES_CSWidle += $(bindir)/idle
 PKGFILES_CSWpython-devel  = $(includedir)/.*
 PKGFILES_CSWpython-devel += $(libdir)/.*/config/.*
+PKGFILES_CSWpython-devel += $(libdir)/.*/distutils/.*
 PKGFILES_CSWpython-rt += $(libdir)/.*libpython.*
 PKGFILES_CSWpython-tk  = $(libdir)/.*/lib-tk/.*
 PKGFILES_CSWpython-tk += $(libdir)/.*/lib-dynload/_tkinter.so.*

Modified: csw/mgar/pkg/python/trunk/files/CSWidle.postinstall
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWidle.postinstall	2009-05-20 01:34:38 UTC (rev 4973)
+++ csw/mgar/pkg/python/trunk/files/CSWidle.postinstall	2009-05-20 01:51:53 UTC (rev 4974)
@@ -12,11 +12,4 @@
 ${PY_BINDIR}/python -Wi -tt -O ${PY_LIBDIR}/compileall.py \
     -d ${PY_LIBDIR}/idlelib -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}/idlelib
 
-for file in `find ${PY_LIBDIR}/idlelib -name "*.py[co]" -print`
-do
-    echo "Updating Package DB with ${file} ..."
-    installf ${PKGINST} ${file}
-done
-installf -f ${PKGINST}
-
 exit 0

Added: csw/mgar/pkg/python/trunk/files/CSWidle.preremove
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWidle.preremove	                        (rev 0)
+++ csw/mgar/pkg/python/trunk/files/CSWidle.preremove	2009-05-20 01:51:53 UTC (rev 4974)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+PATH=/usr/bin:/usr/sbin
+PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+PY_BINDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/bin
+PY_LIBDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/lib/python
+
+# Cleanup .pyc and .pyo files
+pkgchk -v $PKGINST 2>&1 |grep \.py$ | xargs -i rm -f {}c {}o
+
+exit 0

Modified: csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall	2009-05-20 01:34:38 UTC (rev 4973)
+++ csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall	2009-05-20 01:51:53 UTC (rev 4974)
@@ -12,11 +12,4 @@
 ${PY_BINDIR}/python -Wi -tt -O ${PY_LIBDIR}/compileall.py \
     -d ${PY_LIBDIR}/lib-tk -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}/lib-tk
 
-for file in `find ${PY_LIBDIR}/lib-tk -name "*.py[co]" -print`
-do
-    echo "Updating Package DB with ${file} ..."
-    installf ${PKGINST} ${file}
-done
-installf -f ${PKGINST}
-
 exit 0

Added: csw/mgar/pkg/python/trunk/files/CSWpython-tk.preremove
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython-tk.preremove	                        (rev 0)
+++ csw/mgar/pkg/python/trunk/files/CSWpython-tk.preremove	2009-05-20 01:51:53 UTC (rev 4974)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+PATH=/usr/bin:/usr/sbin
+PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+PY_BINDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/bin
+PY_LIBDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/lib/python
+
+# Cleanup .pyc and .pyo files
+pkgchk -v $PKGINST 2>&1 |grep \.py$ | xargs -i rm -f {}c {}o
+
+exit 0

Modified: csw/mgar/pkg/python/trunk/files/CSWpython.postinstall
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython.postinstall	2009-05-20 01:34:38 UTC (rev 4973)
+++ csw/mgar/pkg/python/trunk/files/CSWpython.postinstall	2009-05-20 01:51:53 UTC (rev 4974)
@@ -13,11 +13,4 @@
 ${PY_BINDIR}/python -Wi -tt -O ${PY_LIBDIR}/compileall.py \
     -d ${PY_LIBDIR} -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}
 
-for file in `find ${PY_LIBDIR} -name idlelib -prune -o -name lib-tk -prune -o -name site-packages -prune -o -name "*.py[co]" -print`
-do
-    echo "Updating Package DB with ${file} ..."
-    installf ${PKGINST} ${file}
-done
-installf -f ${PKGINST}
-
 exit 0

Added: csw/mgar/pkg/python/trunk/files/CSWpython.preremove
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython.preremove	                        (rev 0)
+++ csw/mgar/pkg/python/trunk/files/CSWpython.preremove	2009-05-20 01:51:53 UTC (rev 4974)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+PATH=/usr/bin:/usr/sbin
+PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+PY_BINDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/bin
+PY_LIBDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/lib/python
+
+# Cleanup .pyc and .pyo files
+pkgchk -v $PKGINST 2>&1 |grep \.py$ | xargs -i rm -f {}c {}o
+
+exit 0


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

From valholla at users.sourceforge.net  Wed May 20 03:55:18 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 20 May 2009 01:55:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[4975]
	csw/mgar/pkg/python/trunk/checksums
Message-ID: 

Revision: 4975
          http://gar.svn.sourceforge.net/gar/?rev=4975&view=rev
Author:   valholla
Date:     2009-05-20 01:55:18 +0000 (Wed, 20 May 2009)

Log Message:
-----------
fix checksum

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

Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums	2009-05-20 01:51:53 UTC (rev 4974)
+++ csw/mgar/pkg/python/trunk/checksums	2009-05-20 01:55:18 UTC (rev 4975)
@@ -1,8 +1,8 @@
-33ef7d7fe10ced75ff7237209af408b4  download/CSWidle.postinstall
+4dbb004a4e26def221444577363146e3  download/CSWidle.postinstall
 e510b1d6436f7688050253c924e72c2d  download/CSWidle.space
-b9cf44860b4099a6d32bc93d7c84c1cf  download/CSWpython-tk.postinstall
+31f5596f66235a8641b25c3b6e3fc28f  download/CSWpython-tk.postinstall
 e889a5cfdbf807b253df2dce3d852429  download/CSWpython-tk.space
-efedcfaee9ef2d326a0ba9f97e67316a  download/CSWpython.postinstall
+55e25e8ec22e043715306ea03e6eed26  download/CSWpython.postinstall
 35d3380fc79c53da3580dc4ac60aa501  download/CSWpython.space
 245db9f1e0f09ab7e0faaa0cf7301011  download/Python-2.6.2.tar.bz2
 42dd6523beb94a805d5764ae1276091c  download/faqwiz.diff


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

From bdwalton at users.sourceforge.net  Wed May 20 05:20:57 2009
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 20 May 2009 03:20:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[4976]
	csw/mgar/pkg/openjade/trunk/Makefile
Message-ID: 

Revision: 4976
          http://gar.svn.sourceforge.net/gar/?rev=4976&view=rev
Author:   bdwalton
Date:     2009-05-20 03:20:57 +0000 (Wed, 20 May 2009)

Log Message:
-----------
Work around libtool that can't be short circuited with fixlibtool.
Now that opensp doesn't provide .la files, special handling is required
to build.

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

Modified: csw/mgar/pkg/openjade/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openjade/trunk/Makefile	2009-05-20 01:55:18 UTC (rev 4975)
+++ csw/mgar/pkg/openjade/trunk/Makefile	2009-05-20 03:20:57 UTC (rev 4976)
@@ -35,6 +35,8 @@
 CONFIGURE_ARGS = $(DIRPATHS) --disable-static
 CONFIGURE_ARGS += --datadir=$(datadir)/sgml/$(GARNAME)
 CONFIGURE_ARGS += --enable-splibdir=$(libdir)
+CONFIGURE_ARGS += --enable-default-catalog=/opt/csw/etc/sgml/catalog
+CONFIGURE_ARGS += --disable-static
 
 TEST_SCRIPTS = 
 
@@ -42,15 +44,22 @@
 
 include gar/category.mk
 
-#squish the pesky post strip la files...
-MERGE_EXCLUDE_DEFAULT += $(libdir)/.*\.la\~
-
 sgmldir = $(DESTDIR)/$(datadir)/sgml/$(GARNAME)
 sgmldoc = $(DESTDIR)/$(docdir)/$(GARNAME)
 INSTALL = /opt/csw/bin/ginstall -c
 INSTALL_DATA = $(INSTALL) -m 0644
 INSTALL_DIR = $(INSTALL) -m 0755 -d
 
+post-configure-modulated:
+	@(cd $(WORKSRC); \
+		mv libtool libtool.orig; \
+		echo 'ARGS=`echo "$$@" | gsed "s#/opt/csw/lib/libosp.la#/opt/csw/lib/libosp.so#g"`' >> libtool; \
+		echo $$PWD/$(WORKSRC)'/libtool.orig $$ARGS' >> libtool; \
+		chmod 755 libtool; \
+	 	echo '/opt/csw/lib/libosp.la:' > jade/Makefile.dep; \
+		echo '	/bin/true' >> jade/Makefile.dep )
+	@$(MAKECOOKIE)
+
 post-install-modulated:
 	@echo Installing catalog files.
 	@( cd $(WORKSRC); \


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

From valholla at users.sourceforge.net  Wed May 20 14:28:18 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 20 May 2009 12:28:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[4977] csw/mgar/pkg
Message-ID: 

Revision: 4977
          http://gar.svn.sourceforge.net/gar/?rev=4977&view=rev
Author:   valholla
Date:     2009-05-20 12:28:18 +0000 (Wed, 20 May 2009)

Log Message:
-----------
initial checkin

Added Paths:
-----------
    csw/mgar/pkg/genshi/
    csw/mgar/pkg/genshi/Makefile
    csw/mgar/pkg/genshi/branches/
    csw/mgar/pkg/genshi/tags/
    csw/mgar/pkg/genshi/trunk/
    csw/mgar/pkg/genshi/trunk/Makefile
    csw/mgar/pkg/genshi/trunk/checksums
    csw/mgar/pkg/genshi/trunk/cookies/
    csw/mgar/pkg/genshi/trunk/cookies/global/
    csw/mgar/pkg/genshi/trunk/cookies/global/fetch
    csw/mgar/pkg/genshi/trunk/cookies/global/prerequisite
    csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWbzip2
    csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWdiffutils
    csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWfindutils
    csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgawk
    csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgfile
    csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWggrep
    csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgmake
    csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgsed
    csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgtar
    csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWtextutils
    csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWwget
    csw/mgar/pkg/genshi/trunk/download/
    csw/mgar/pkg/genshi/trunk/download/Genshi-0.5.1.tar.bz2
    csw/mgar/pkg/genshi/trunk/download/partial/
    csw/mgar/pkg/genshi/trunk/files/

Added: csw/mgar/pkg/genshi/Makefile
===================================================================
--- csw/mgar/pkg/genshi/Makefile	                        (rev 0)
+++ csw/mgar/pkg/genshi/Makefile	2009-05-20 12:28:18 UTC (rev 4977)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+	@echo "You are in the pkg/ directory."
+
+%:
+	$(MAKE) -C trunk $* 
+
+paranoid-%:
+	$(MAKE) -C trunk $* || exit 2 
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+	$(MAKE) -C trunk $* || echo "	*** make $* in $$i failed ***" >> $(BUILDLOG) 

Added: csw/mgar/pkg/genshi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/genshi/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/genshi/trunk/Makefile	2009-05-20 12:28:18 UTC (rev 4977)
@@ -0,0 +1,31 @@
+GARNAME = genshi
+GARVERSION = 0.5.1
+CATEGORIES = utils
+DISTNAME = Genshi
+DESCRIPTION = 
+define BLURB
+endef
+
+MASTER_SITES = http://ftp.edgewall.com/pub/genshi/
+DISTFILES  = $(DISTNAME)-$(GARVERSION).tar.bz2
+
+PACKAGES = CSWgenshi
+
+REQUIRED_PKGS_CSWgenshi = 
+CATALOGNAME_CSWgenshi = $(GARNAME)
+SPKG_DESC_CSWgenshi   = $(DESCRIPTION)
+
+# We define upstream file regex so we can be notifed of 
+# new upstream software release
+UFILES_REGEX = $(DISTNAME)-(\d+(?:\.\d+)*)
+
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+#ENABLE_CHECK = 0
+
+# No test target
+TEST_SCRIPTS =
+
+include gar/category.mk
+

Added: csw/mgar/pkg/genshi/trunk/checksums
===================================================================
--- csw/mgar/pkg/genshi/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/genshi/trunk/checksums	2009-05-20 12:28:18 UTC (rev 4977)
@@ -0,0 +1 @@
+822942bbc3109da9f6b472eb8ea4e3a4  download/Genshi-0.5.1.tar.bz2

Added: csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWbzip2
===================================================================
--- csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWbzip2	                        (rev 0)
+++ csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWbzip2	2009-05-20 12:28:18 UTC (rev 4977)
@@ -0,0 +1 @@
+Wed May 20 07:26:50 CDT 2009

Added: csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWdiffutils
===================================================================
--- csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWdiffutils	                        (rev 0)
+++ csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWdiffutils	2009-05-20 12:28:18 UTC (rev 4977)
@@ -0,0 +1 @@
+Wed May 20 07:26:49 CDT 2009

Added: csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWfindutils
===================================================================
--- csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWfindutils	                        (rev 0)
+++ csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWfindutils	2009-05-20 12:28:18 UTC (rev 4977)
@@ -0,0 +1 @@
+Wed May 20 07:26:49 CDT 2009

Added: csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgawk
===================================================================
--- csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgawk	                        (rev 0)
+++ csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgawk	2009-05-20 12:28:18 UTC (rev 4977)
@@ -0,0 +1 @@
+Wed May 20 07:26:50 CDT 2009

Added: csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgfile
===================================================================
--- csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgfile	                        (rev 0)
+++ csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgfile	2009-05-20 12:28:18 UTC (rev 4977)
@@ -0,0 +1 @@
+Wed May 20 07:26:49 CDT 2009

Added: csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWggrep
===================================================================
--- csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWggrep	                        (rev 0)
+++ csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWggrep	2009-05-20 12:28:18 UTC (rev 4977)
@@ -0,0 +1 @@
+Wed May 20 07:26:49 CDT 2009

Added: csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgmake
===================================================================
--- csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgmake	                        (rev 0)
+++ csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgmake	2009-05-20 12:28:18 UTC (rev 4977)
@@ -0,0 +1 @@
+Wed May 20 07:26:48 CDT 2009

Added: csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgsed
===================================================================
--- csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgsed	                        (rev 0)
+++ csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgsed	2009-05-20 12:28:18 UTC (rev 4977)
@@ -0,0 +1 @@
+Wed May 20 07:26:50 CDT 2009

Added: csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgtar
===================================================================
--- csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgtar	                        (rev 0)
+++ csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWgtar	2009-05-20 12:28:18 UTC (rev 4977)
@@ -0,0 +1 @@
+Wed May 20 07:26:49 CDT 2009

Added: csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWtextutils
===================================================================
--- csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWtextutils	                        (rev 0)
+++ csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWtextutils	2009-05-20 12:28:18 UTC (rev 4977)
@@ -0,0 +1 @@
+Wed May 20 07:26:49 CDT 2009

Added: csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWwget
===================================================================
--- csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWwget	                        (rev 0)
+++ csw/mgar/pkg/genshi/trunk/cookies/global/prerequisitepkg-CSWwget	2009-05-20 12:28:18 UTC (rev 4977)
@@ -0,0 +1 @@
+Wed May 20 07:26:49 CDT 2009

Added: csw/mgar/pkg/genshi/trunk/download/Genshi-0.5.1.tar.bz2
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/genshi/trunk/download/Genshi-0.5.1.tar.bz2
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


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

From valholla at users.sourceforge.net  Wed May 20 14:29:20 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 20 May 2009 12:29:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[4978] csw/mgar/pkg/genshi/trunk
Message-ID: 

Revision: 4978
          http://gar.svn.sourceforge.net/gar/?rev=4978&view=rev
Author:   valholla
Date:     2009-05-20 12:29:20 +0000 (Wed, 20 May 2009)

Log Message:
-----------
externals

Removed Paths:
-------------
    csw/mgar/pkg/genshi/trunk/cookies/
    csw/mgar/pkg/genshi/trunk/download/

Property Changed:
----------------
    csw/mgar/pkg/genshi/trunk/


Property changes on: csw/mgar/pkg/genshi/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.

From valholla at users.sourceforge.net  Wed May 20 14:44:39 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 20 May 2009 12:44:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[4979]
	csw/mgar/pkg/genshi/trunk/Makefile
Message-ID: 

Revision: 4979
          http://gar.svn.sourceforge.net/gar/?rev=4979&view=rev
Author:   valholla
Date:     2009-05-20 12:44:39 +0000 (Wed, 20 May 2009)

Log Message:
-----------
commit

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

Modified: csw/mgar/pkg/genshi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/genshi/trunk/Makefile	2009-05-20 12:29:20 UTC (rev 4978)
+++ csw/mgar/pkg/genshi/trunk/Makefile	2009-05-20 12:44:39 UTC (rev 4979)
@@ -1,31 +1,33 @@
-GARNAME = genshi
+GARNAME    = Genshi
 GARVERSION = 0.5.1
 CATEGORIES = utils
-DISTNAME = Genshi
-DESCRIPTION = 
+
+DESCRIPTION = Python toolkit for generation of output for the web
 define BLURB
+	Genshi is a Python library that provides an integrated set of 
+	components for parsing, generating, and processing HTML, XML 
+	or other textual content for output generation on the web
 endef
 
 MASTER_SITES = http://ftp.edgewall.com/pub/genshi/
-DISTFILES  = $(DISTNAME)-$(GARVERSION).tar.bz2
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
 
 PACKAGES = CSWgenshi
 
-REQUIRED_PKGS_CSWgenshi = 
-CATALOGNAME_CSWgenshi = $(GARNAME)
+REQUIRED_PKGS_CSWgenshi = CSWpython-rt
+CATALOGNAME_CSWgenshi = genshi
 SPKG_DESC_CSWgenshi   = $(DESCRIPTION)
 
 # We define upstream file regex so we can be notifed of 
 # new upstream software release
-UFILES_REGEX = $(DISTNAME)-(\d+(?:\.\d+)*)
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)
 
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS   = $(WORKSRC)/setup.py
+TEST_SCRIPTS    = $(WORKSRC)/setup.py
+INSTALL_SCRIPTS = $(WORKSRC)/setup.py
 
-CONFIGURE_ARGS = $(DIRPATHS)
+INSTALL_ARGS += --root=$(DESTDIR)
 
-#ENABLE_CHECK = 0
-
-# No test target
-TEST_SCRIPTS =
-
 include gar/category.mk
 


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

From ellson at users.sourceforge.net  Wed May 20 14:54:43 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Wed, 20 May 2009 12:54:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[4980] csw/mgar/pkg/swig/trunk
Message-ID: 

Revision: 4980
          http://gar.svn.sourceforge.net/gar/?rev=4980&view=rev
Author:   ellson
Date:     2009-05-20 12:54:43 +0000 (Wed, 20 May 2009)

Log Message:
-----------
remove some commented old code, and remove some unused files

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

Removed Paths:
-------------
    csw/mgar/pkg/swig/trunk/files/CSWswig.depend
    csw/mgar/pkg/swig/trunk/files/CSWswig.gspec
    csw/mgar/pkg/swig/trunk/files/CSWswig.prototype
    csw/mgar/pkg/swig/trunk/files/am.diff

Modified: csw/mgar/pkg/swig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/swig/trunk/Makefile	2009-05-20 12:44:39 UTC (rev 4979)
+++ csw/mgar/pkg/swig/trunk/Makefile	2009-05-20 12:54:43 UTC (rev 4980)
@@ -18,7 +18,6 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-#DISTFILES += $(call admfiles,CSWswig,depend prototype)
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -28,17 +27,15 @@
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=1645
 UPSTREAM_USE_SF = 1
 
-# Prevent automake from attempting to regenerate everything
-#PATCHFILES += am.diff
-
 REQUIRED_PKGS = CSWzlib
 
-# Languages we *do* have
+#SWIG doesn't DEPEND on the languages it supports being instaalled
+# but, for the record, languages we *do* have:
 #DEPEND += lang/tcl lang/python lang/perl lang/guile
 #DEPEND += lang/ruby lang/php4 lang/ocaml
 #DEPEND += lang/lua
 
-# Languages we don't have yet
+# and languages we don't have, yet:
 #DEPEND += lang/pike lang/chicken lang/mono lang/mzscheme 
 
 CONFIGURE_ARGS  = $(DIRPATHS)

Deleted: csw/mgar/pkg/swig/trunk/files/CSWswig.depend
===================================================================
--- csw/mgar/pkg/swig/trunk/files/CSWswig.depend	2009-05-20 12:44:39 UTC (rev 4979)
+++ csw/mgar/pkg/swig/trunk/files/CSWswig.depend	2009-05-20 12:54:43 UTC (rev 4980)
@@ -1,4 +0,0 @@
-I CSWswigguilert
-I CSWswigphp4rt
-I CSWswigplrt
-I CSWswigpyrt

Deleted: csw/mgar/pkg/swig/trunk/files/CSWswig.gspec
===================================================================
--- csw/mgar/pkg/swig/trunk/files/CSWswig.gspec	2009-05-20 12:44:39 UTC (rev 4979)
+++ csw/mgar/pkg/swig/trunk/files/CSWswig.gspec	2009-05-20 12:54:43 UTC (rev 4980)
@@ -1,4 +0,0 @@
-%var            bitname swig
-%var            pkgname CSWswig
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/LICENSE

Deleted: csw/mgar/pkg/swig/trunk/files/CSWswig.prototype
===================================================================
--- csw/mgar/pkg/swig/trunk/files/CSWswig.prototype	2009-05-20 12:44:39 UTC (rev 4979)
+++ csw/mgar/pkg/swig/trunk/files/CSWswig.prototype	2009-05-20 12:54:43 UTC (rev 4980)
@@ -1,2956 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/swig 0755 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/doc 0755 root bin
-d none /opt/csw/share/doc/swig 0755 root bin
-d none /opt/csw/share/doc/swig/Doc 0755 root bin
-d none /opt/csw/share/doc/swig/Doc/Devel 0755 root bin
-f none /opt/csw/share/doc/swig/Doc/Devel/engineering.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Devel/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Devel/internals.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Devel/migrate.txt 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Devel/runtime.txt 0644 root bin
-d none /opt/csw/share/doc/swig/Doc/Manual 0755 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Allegrocl.html 0755 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Arguments.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/CSharp.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Chicken.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Contents.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Contract.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Customization.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Extending.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Guile.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Introduction.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Java.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Library.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Lisp.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Lua.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Modula3.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Modules.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Mzscheme.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Ocaml.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Perl5.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Php.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Pike.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Preface.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Preprocessor.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Python.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/README 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Ruby.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/SWIG.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/SWIGDocumentation.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/SWIGDocumentation.pdf 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/SWIGPlus.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Scripting.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Sections.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Tcl.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Typemaps.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Varargs.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Warnings.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/Windows.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/ch11.1.png 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/ch11.2.png 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/ch11.3.png 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/ch12.1.png 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/ch2.1.png 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/ch9.table.2.png 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/chapters 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/fixstyle.py 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/makechap.py 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/maketoc.py 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/margin-left.patch 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/style.css 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/swig16.png 0755 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/swightml.book 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/Manual/swigpdf.book 0644 root bin
-f none /opt/csw/share/doc/swig/Doc/README 0644 root bin
-d none /opt/csw/share/doc/swig/Examples 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Chicken 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Chicken/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Chicken/full 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Chicken/full/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Chicken/full/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Chicken/full/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Chicken/full/gifplot.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Chicken/full/test-gifplot.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Chicken/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Chicken/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Chicken/simple/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Chicken/simple/simple.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Chicken/simple/test-simple.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Common-Lisp 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Common-Lisp/full 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Common-Lisp/full/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Common-Lisp/full/gifplot.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Common-Lisp/full/runme.lisp 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Guile 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Guile/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Guile/full 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Guile/full/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Guile/full/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Guile/full/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Guile/full/gifplot.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Guile/full/runme.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Guile/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Guile/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Guile/simple/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Guile/simple/runme.scm 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Guile/simple/simple.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Include 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Include/gifplot.h 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Interface 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Interface/gifplot.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Java 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/full 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/full/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/full/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/full/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/full/gifplot.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/full/main.java 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/shadow 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/shadow/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/shadow/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/shadow/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/shadow/main.java 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/simple/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/simple/main.java 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Java/simple/simple.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Lib 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Lib/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Lib/Makefile.in 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Lib/color.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Lib/font.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Lib/frame.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Lib/gif.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Lib/matrix.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Lib/pixmap.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Lib/plot2d.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Lib/plot3d.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Makefile.in 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Ocaml 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ocaml/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Ocaml/full 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ocaml/full/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ocaml/full/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ocaml/full/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ocaml/full/gifplot.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ocaml/full/runme.ml 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Ocaml/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ocaml/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ocaml/simple/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ocaml/simple/runme.ml 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ocaml/simple/simple.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/full 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/full/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/full/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/full/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/full/gifplot.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/full/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/shadow 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/shadow/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/shadow/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/shadow/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/shadow/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/simple/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/simple/runme.pl 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Perl5/simple/simple.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/full 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/full/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/full/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/full/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/full/gifplot.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/full/runme.php4 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/shadow 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/shadow/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/shadow/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/shadow/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/shadow/runme.php4 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/simple/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/simple/runme.php4 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Php4/simple/simple.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Pike 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Pike/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Pike/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Pike/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Pike/simple/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Pike/simple/runme.pike 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Pike/simple/simple.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Python 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/full 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/full/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/full/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/full/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/full/gifplot.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/full/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/shadow 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/shadow/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/shadow/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/shadow/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/shadow/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/simple/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/simple/runme.py 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Python/simple/simple.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/README 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/full 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/full/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/full/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/full/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/full/gifplot.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/full/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/shadow 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/shadow/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/shadow/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/shadow/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/shadow/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/simple/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/simple/runme.rb 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Ruby/simple/simple.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/full 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/full/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/full/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/full/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/full/gifplot.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/full/runme.tcl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/mandel 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/mandel/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/mandel/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/mandel/cmap 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/mandel/display.tcl 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/mandel/mandel.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/mandel/mandel.tcl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/simple/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/simple/runme.tcl 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/GIFPlot/Tcl/simple/simple.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/Makefile.in 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/README 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/chicken 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/chicken/class 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/class/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/class/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/class/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/class/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/class/test-lowlevel-class.scm 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/class/test-tinyclos-class.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/chicken/constants 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/constants/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/constants/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/constants/test-constants.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/chicken/egg 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/egg/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/egg/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/egg/mod1.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/egg/mod2.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/egg/multi.setup 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/egg/multi_init.scm 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/egg/single.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/egg/single.setup 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/egg/test.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/chicken/multimap 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/multimap/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/multimap/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/multimap/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/multimap/test-multimap.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/chicken/overload 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/overload/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/overload/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/overload/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/overload/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/overload/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/overload/test-overload.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/chicken/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/simple/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/simple/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/simple/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/simple/test-simple.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/chicken/zlib 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/zlib/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/zlib/README.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/zlib/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/chicken/zlib/test-zlib.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/contract 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/contract/simple_c 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/contract/simple_c/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/contract/simple_c/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/contract/simple_c/runme1.py 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/contract/simple_c/runme2.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/contract/simple_cxx 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/contract/simple_cxx/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/contract/simple_cxx/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/contract/simple_cxx/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/contract/simple_cxx/runme1.py 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/contract/simple_cxx/runme2.py 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/contract/simple_cxx/runme3.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/csharp 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/csharp/class 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/class/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/class/example-cs.csproj 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/class/example-vc.vcproj 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/class/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/class/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/class/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/class/example.sln 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/class/runme.cs 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/csharp/enum 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/enum/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/enum/example-cs.csproj 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/enum/example-vc.vcproj 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/enum/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/enum/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/enum/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/enum/example.sln 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/enum/runme.cs 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/csharp/funcptr 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/funcptr/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/funcptr/example-cs.csproj 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/funcptr/example-vc.vcproj 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/funcptr/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/funcptr/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/funcptr/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/funcptr/example.sln 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/funcptr/runme.cs 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/csharp/reference 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/reference/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/reference/example-cs.csproj 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/reference/example-vc.vcproj 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/reference/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/reference/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/reference/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/reference/example.sln 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/reference/runme.cs 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/csharp/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/simple/example-cs.csproj 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/simple/example-vc.vcproj 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/simple/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/simple/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/simple/example.sln 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/simple/runme.cs 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/csharp/template 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/template/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/template/example-cs.csproj 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/template/example-vc.vcproj 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/template/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/template/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/template/example.sln 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/template/runme.cs 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/csharp/variables 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/variables/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/variables/example-cs.csproj 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/variables/example-vc.vcproj 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/variables/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/variables/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/variables/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/variables/example.sln 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/csharp/variables/runme.cs 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/guile 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/Makefile.in 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/guile/constants 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/constants/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/constants/constants.scm 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/constants/example.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/guile/matrix 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/matrix/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/matrix/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/matrix/main.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/matrix/matrix.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/matrix/matrix.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/matrix/matrix.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/matrix/matrix.scm 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/matrix/package.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/matrix/vector.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/matrix/vector.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/matrix/vector.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/guile/multimap 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/multimap/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/multimap/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/multimap/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/multimap/runme.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/guile/multivalue 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/multivalue/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/multivalue/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/multivalue/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/multivalue/runme.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/guile/port 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/port/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/port/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/port/port.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/port/port.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/port/port.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/guile/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/simple/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/simple/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/simple/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/simple/example.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/guile/std_vector 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/std_vector/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/std_vector/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/std_vector/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/guile/std_vector/runme.scm 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/index.html 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/java 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/java/callback 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/java/callback/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/callback/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/callback/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/callback/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/callback/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/callback/main.java 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/java/class 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/java/class/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/class/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/class/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/class/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/class/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/class/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/class/main.java 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/java/constants 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/java/constants/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/constants/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/constants/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/constants/main.java 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/java/enum 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/java/enum/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/enum/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/enum/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/enum/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/enum/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/enum/main.java 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/java/extend 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/java/extend/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/extend/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/extend/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/extend/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/extend/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/extend/main.java 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/java/funcptr 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/java/funcptr/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/funcptr/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/funcptr/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/funcptr/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/funcptr/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/funcptr/main.java 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/index.html 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/java/mpointer 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/java/mpointer/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/mpointer/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/mpointer/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/mpointer/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/mpointer/main.java 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/java/multimap 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/java/multimap/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/multimap/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/multimap/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/multimap/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/multimap/main.java 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/java/native 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/java/native/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/native/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/native/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/native/main.java 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/java/pointer 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/java/pointer/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/pointer/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/pointer/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/pointer/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/pointer/main.java 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/java/reference 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/java/reference/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/reference/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/reference/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/reference/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/reference/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/reference/main.java 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/java/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/java/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/simple/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/simple/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/simple/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/simple/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/simple/main.java 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/java/template 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/java/template/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/template/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/template/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/template/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/template/main.java 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/java/typemap 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/java/typemap/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/typemap/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/typemap/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/typemap/main.java 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/java/variables 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/java/variables/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/variables/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/variables/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/variables/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/variables/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/java/variables/main.java 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/lua 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/lua/class 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/class/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/class/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/class/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/class/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/class/runme.lua 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/lua/constants 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/constants/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/constants/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/constants/runme.lua 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/lua/functest 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/functest/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/functest/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/functest/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/functest/runme.lua 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/import.lua 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/lua.c 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/lua/pointer 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/pointer/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/pointer/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/pointer/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/pointer/runme.lua 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/lua/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/simple/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/simple/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/simple/runme.lua 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/lua/variables 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/variables/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/variables/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/variables/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/variables/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/lua/variables/runme.lua 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/modula3 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/modula3/class 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/class/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/class/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/class/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/class/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/class/swig.tmpl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/modula3/enum 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/enum/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/enum/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/enum/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/enum/example.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/modula3/exception 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/exception/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/exception/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/exception/example.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/modula3/reference 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/reference/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/reference/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/reference/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/reference/example.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/modula3/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/simple/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/simple/example.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/modula3/typemap 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/typemap/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/modula3/typemap/example.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/mzscheme 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/mzscheme/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/mzscheme/multimap 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/mzscheme/multimap/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/mzscheme/multimap/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/mzscheme/multimap/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/mzscheme/multimap/example.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/mzscheme/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/mzscheme/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/mzscheme/simple/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/mzscheme/simple/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/mzscheme/simple/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/mzscheme/simple/example.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/mzscheme/std_vector 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/mzscheme/std_vector/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/mzscheme/std_vector/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/mzscheme/std_vector/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/mzscheme/std_vector/example.scm 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ocaml 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/ocaml/argout_ref 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/argout_ref/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/argout_ref/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/argout_ref/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/argout_ref/example_prog.ml 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ocaml/contract 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/contract/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/contract/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/contract/example_prog.ml 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ocaml/scoped_enum 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/scoped_enum/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/scoped_enum/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/scoped_enum/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/scoped_enum/example_prog.ml 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/scoped_enum/foo.h 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ocaml/shapes 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/shapes/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/shapes/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/shapes/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/shapes/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/shapes/example_prog.ml 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ocaml/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/simple/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/simple/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/simple/example_prog.ml 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/simple/index.html 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ocaml/std_string 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/std_string/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/std_string/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/std_string/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/std_string/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/std_string/runme.ml 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ocaml/std_vector 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/std_vector/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/std_vector/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/std_vector/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/std_vector/runme.ml 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ocaml/stl 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/stl/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/stl/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/stl/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/stl/runme.ml 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ocaml/string_from_ptr 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/string_from_ptr/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/string_from_ptr/example_prog.ml 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/string_from_ptr/foolib.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ocaml/strings_test 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/strings_test/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/strings_test/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/strings_test/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ocaml/strings_test/runme.ml 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/class 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/class/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/class/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/class/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/class/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/class/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/class/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/class/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/constants 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/constants/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/constants/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/constants/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/constants/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/constants2 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/constants2/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/constants2/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/constants2/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/funcptr 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/funcptr/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/funcptr/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/funcptr/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/funcptr/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/funcptr/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/funcptr/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/import 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/bar.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/bar.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/bar.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/base.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/base.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/base.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/example.dsw 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/foo.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/foo.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/foo.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/runme.pl 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/spam.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/spam.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/import/spam.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/index.html 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/inline 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/inline/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/inline/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/inline/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/java 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/java/Example.java 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/java/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/java/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/java/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/mpointer 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/mpointer/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/mpointer/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/mpointer/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/mpointer/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/mpointer/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/multimap 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/multimap/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/multimap/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/multimap/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/multimap/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/multimap/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/multiple_inheritance 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/multiple_inheritance/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/multiple_inheritance/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/multiple_inheritance/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/multiple_inheritance/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/pointer 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/pointer/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/pointer/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/pointer/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/pointer/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/pointer/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/reference 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/reference/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/reference/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/reference/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/reference/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/reference/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/reference/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/simple/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/simple/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/simple/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/simple/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/simple/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/value 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/value/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/value/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/value/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/value/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/value/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/value/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/variables 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/variables/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/variables/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/variables/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/variables/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/variables/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/variables/runme.pl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/perl5/xmlstring 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/xmlstring/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/xmlstring/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/xmlstring/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/xmlstring/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/xmlstring/runme.pl 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/perl5/xmlstring/xmlstring.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/php4 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/php4/class 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/class/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/class/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/class/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/class/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/class/runme.php4 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/php4/constants 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/constants/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/constants/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/constants/runme.php4 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/php4/cpointer 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/cpointer/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/cpointer/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/cpointer/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/cpointer/runme.php4 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/php4/disown 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/disown/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/disown/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/disown/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/disown/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/disown/runme.php4 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/php4/enum 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/enum/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/enum/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/enum/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/enum/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/enum/runme.php4 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/php4/funcptr 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/funcptr/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/funcptr/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/funcptr/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/funcptr/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/funcptr/runme.php4 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/php4/overloading 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/overloading/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/overloading/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/overloading/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/overloading/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/overloading/runme.php4 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/php4/pointer 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/pointer/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/pointer/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/pointer/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/pointer/runme.php4 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/php4/pragmas 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/pragmas/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/pragmas/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/pragmas/include.php 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/pragmas/runme.php4 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/php4/reference 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/reference/BUILD-proxy.sh 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/reference/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/reference/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/reference/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/reference/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/reference/runme-proxy.php4 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/reference/runme.php4 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/php4/shadow 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/shadow/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/shadow/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/shadow/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/shadow/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/shadow/runme.php4 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/php4/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/simple/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/simple/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/simple/runme.php4 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/php4/sync 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/sync/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/sync/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/sync/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/sync/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/sync/runme.php4 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/php4/value 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/value/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/value/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/value/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/value/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/value/runme.php4 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/php4/variables 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/variables/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/variables/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/variables/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/variables/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/variables/runme.php4 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/php4/variables/runme.php4.old 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/pike 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/pike/class 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/class/Makefile 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/class/example.cxx 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/class/example.h 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/class/example.i 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/class/runme.pike 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/pike/constants 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/constants/Makefile 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/constants/example.i 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/constants/runme.pike 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/pike/enum 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/enum/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/enum/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/enum/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/enum/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/enum/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/enum/runme.pike 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/pike/overload 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/overload/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/overload/example.cxx 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/overload/example.h 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/overload/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/overload/runme.pike 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/pike/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/simple/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/simple/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/simple/runme.pike 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/pike/template 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/template/Makefile 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/template/example.h 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/template/example.i 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/pike/template/runme.pike 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/python 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/python/callback 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/callback/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/callback/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/callback/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/callback/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/callback/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/callback/runme.py 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/class 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/class/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/class/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/class/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/class/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/class/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/class/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/class/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/constants 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/constants/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/constants/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/constants/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/constants/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/contract 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/contract/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/contract/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/contract/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/contract/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/contract/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/enum 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/enum/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/enum/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/enum/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/enum/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/enum/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/enum/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/exception 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/exception/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/exception/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/exception/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/exception/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/exceptshadow 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/exceptshadow/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/exceptshadow/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/exceptshadow/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/exceptshadow/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/extend 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/extend/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/extend/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/extend/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/extend/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/extend/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/extend/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/funcptr 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/funcptr/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/funcptr/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/funcptr/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/funcptr/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/funcptr/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/funcptr/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/funcptr2 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/funcptr2/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/funcptr2/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/funcptr2/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/funcptr2/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/funcptr2/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/functor 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/functor/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/functor/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/functor/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/import 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/bar.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/bar.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/bar.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/base.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/base.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/base.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/example.dsw 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/foo.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/foo.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/foo.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/runme.py 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/spam.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/spam.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import/spam.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/import_template 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import_template/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import_template/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import_template/bar.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import_template/bar.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import_template/base.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import_template/base.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import_template/foo.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import_template/foo.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import_template/runme.py 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import_template/spam.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/import_template/spam.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/index.html 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/java 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/java/Example.java 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/java/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/java/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/java/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/libffi 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/libffi/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/libffi/example.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/mpointer 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/mpointer/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/mpointer/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/mpointer/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/mpointer/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/mpointer/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/multimap 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/multimap/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/multimap/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/multimap/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/multimap/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/multimap/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/operator 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/operator/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/operator/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/operator/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/operator/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/pointer 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/pointer/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/pointer/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/pointer/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/pointer/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/pointer/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/reference 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/reference/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/reference/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/reference/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/reference/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/reference/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/reference/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/shadow 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/shadow/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/shadow/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/shadow/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/shadow/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/shadow/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/shadow/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/simple/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/simple/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/simple/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/simple/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/simple/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/smartptr 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/smartptr/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/smartptr/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/smartptr/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/smartptr/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/smartptr/runme.py 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/smartptr/smartptr.h 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/std_map 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/std_map/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/std_map/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/std_map/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/std_map/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/std_vector 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/std_vector/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/std_vector/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/std_vector/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/std_vector/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/swigrun 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/swigrun/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/swigrun/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/swigrun/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/swigrun/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/swigrun/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/template 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/template/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/template/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/template/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/template/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/varargs 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/varargs/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/varargs/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/varargs/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/variables 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/variables/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/variables/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/variables/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/variables/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/variables/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/variables/runme.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/python/weave 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/python/weave/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/weave/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/weave/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/weave/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/weave/runme.py 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/python/weave/swigptr2.py 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/class 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/class/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/class/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/class/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/class/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/class/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/class/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/class/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/constants 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/constants/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/constants/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/constants/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/constants/runme.rb 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/enum 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/enum/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/enum/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/enum/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/enum/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/enum/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/enum/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/exception_class 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/exception_class/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/exception_class/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/exception_class/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/exception_class/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/free_function 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/free_function/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/free_function/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/free_function/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/free_function/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/free_function/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/free_function/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/funcptr 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/funcptr/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/funcptr/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/funcptr/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/funcptr/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/funcptr/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/funcptr/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/funcptr2 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/funcptr2/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/funcptr2/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/funcptr2/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/funcptr2/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/funcptr2/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/functor 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/functor/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/functor/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/functor/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/hashargs 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/hashargs/Makefile 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/hashargs/example.i 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/hashargs/runme.rb 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/import 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/bar.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/bar.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/bar.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/base.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/base.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/base.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/example.dsw 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/foo.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/foo.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/foo.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/runme.rb 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/spam.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/spam.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import/spam.i 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/import_template 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import_template/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import_template/README 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import_template/bar.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import_template/bar.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import_template/base.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import_template/base.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import_template/foo.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import_template/foo.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import_template/runme.rb 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import_template/spam.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/import_template/spam.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/index.html 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/java 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/java/Example.java 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/java/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/java/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/java/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/mark_function 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/mark_function/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/mark_function/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/mark_function/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/mark_function/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/mark_function/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/mark_function/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/mpointer 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/mpointer/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/mpointer/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/mpointer/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/mpointer/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/mpointer/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/multimap 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/multimap/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/multimap/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/multimap/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/multimap/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/multimap/runme.rb 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/operator 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/operator/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/operator/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/operator/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/operator/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/overloading 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/overloading/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/overloading/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/overloading/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/overloading/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/overloading/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/pointer 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/pointer/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/pointer/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/pointer/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/pointer/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/pointer/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/reference 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/reference/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/reference/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/reference/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/reference/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/reference/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/reference/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/simple 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/simple/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/simple/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/simple/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/simple/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/simple/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/simple/runme.rb 0755 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/std_vector 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/std_vector/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/std_vector/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/std_vector/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/std_vector/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/template 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/template/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/template/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/template/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/template/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/value 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/value/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/value/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/value/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/value/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/value/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/value/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/ruby/variables 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/variables/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/variables/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/variables/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/variables/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/variables/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/ruby/variables/runme.rb 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/s-exp 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/s-exp/uffi.lisp 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/tcl 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/check.list 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/tcl/class 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/class/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/class/example.cxx 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/class/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/class/example.h 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/class/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/class/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/class/runme.tcl 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/class/runme2.tcl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/tcl/constants 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/constants/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/constants/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/constants/index.html 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/constants/runme.tcl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/tcl/contract 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/contract/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/contract/example.c 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/contract/example.dsp 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/contract/example.i 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/contract/runme.tcl 0644 root bin
-d none /opt/csw/share/doc/swig/Examples/tcl/enum 0755 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/enum/Makefile 0644 root bin
-f none /opt/csw/share/doc/swig/Examples/tcl/enum/example.cxx 0644 root bin

@@ Diff output truncated at 100000 characters. @@

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

From ellson at users.sourceforge.net  Wed May 20 20:08:28 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Wed, 20 May 2009 18:08:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[4981] csw/mgar/pkg/swig/trunk/Makefile
Message-ID: 

Revision: 4981
          http://gar.svn.sourceforge.net/gar/?rev=4981&view=rev
Author:   ellson
Date:     2009-05-20 18:08:28 +0000 (Wed, 20 May 2009)

Log Message:
-----------
add swig docs to package

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

Modified: csw/mgar/pkg/swig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/swig/trunk/Makefile	2009-05-20 12:54:43 UTC (rev 4980)
+++ csw/mgar/pkg/swig/trunk/Makefile	2009-05-20 18:08:28 UTC (rev 4981)
@@ -46,18 +46,17 @@
 CONFIGURE_ARGS += --with-javac=/usr/j2se/bin/javac
 CONFIGURE_ARGS += --with-javaincl=/usr/j2se/include
 
+MAKE_ARGS += docs
+
 # Not sure if this was meant to run by non-developers
 TEST_TARGET = check
 TEST_SCRIPTS =
 
 include gar/category.mk
 
-#post-install: install-swig-doc
-#
-#install-swig-doc:
-#	@mkdir -p $(DESTDIR)$(docdir)/$(GARNAME)
-#	@cp -R $(WORKSRC)/Doc $(DESTDIR)$(docdir)/$(GARNAME)
-#	@cp -R $(WORKSRC)/Examples $(DESTDIR)$(docdir)/$(GARNAME)
-#	@$(MAKECOOKIE)
-#	$(DONADA)
+post-install-modulated: install-swig-doc
 
+install-swig-doc:
+	@mkdir -p $(DESTDIR)$(docdir)/$(GARNAME)
+	@cp -R $(WORKSRC)/Doc $(DESTDIR)$(docdir)/$(GARNAME)
+	@cp -R $(WORKSRC)/Examples $(DESTDIR)$(docdir)/$(GARNAME)


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

From skayser at users.sourceforge.net  Wed May 20 21:28:12 2009
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Wed, 20 May 2009 19:28:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[4982] csw/mgar/pkg/multitail/trunk
Message-ID: 

Revision: 4982
          http://gar.svn.sourceforge.net/gar/?rev=4982&view=rev
Author:   skayser
Date:     2009-05-20 19:28:12 +0000 (Wed, 20 May 2009)

Log Message:
-----------
multitail: added changelog

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

Added Paths:
-----------
    csw/mgar/pkg/multitail/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/multitail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/multitail/trunk/Makefile	2009-05-20 18:08:28 UTC (rev 4981)
+++ csw/mgar/pkg/multitail/trunk/Makefile	2009-05-20 19:28:12 UTC (rev 4982)
@@ -53,3 +53,5 @@
 	@ginstall -d $(DATADEST) $(DOCDEST)
 	@(cd $(WORKSRC); ginstall -m 644 $(EXTRA_DATA) $(DATADEST))
 	@(cd $(WORKSRC); ginstall -m 644 $(EXTRA_DOCS) $(DOCDEST))
+	@cp $(FILEDIR)/changelog.CSW $(DOCDEST)
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/multitail/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/multitail/trunk/files/changelog.CSW	                        (rev 0)
+++ csw/mgar/pkg/multitail/trunk/files/changelog.CSW	2009-05-20 19:28:12 UTC (rev 4982)
@@ -0,0 +1,5 @@
+multitail (5.2.2,REV=2009.05.20)
+
+  * Initial release.
+
+ -- Sebastian Kayser   Wed, 20 May 2009 21:19:56 +0200


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

From skayser at users.sourceforge.net  Wed May 20 21:45:26 2009
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Wed, 20 May 2009 19:45:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[4983]
	csw/mgar/pkg/multitail/trunk/Makefile
Message-ID: 

Revision: 4983
          http://gar.svn.sourceforge.net/gar/?rev=4983&view=rev
Author:   skayser
Date:     2009-05-20 19:45:26 +0000 (Wed, 20 May 2009)

Log Message:
-----------
multitail: updated deps

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

Modified: csw/mgar/pkg/multitail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/multitail/trunk/Makefile	2009-05-20 19:28:12 UTC (rev 4982)
+++ csw/mgar/pkg/multitail/trunk/Makefile	2009-05-20 19:45:26 UTC (rev 4983)
@@ -19,8 +19,10 @@
 DISTFILES = $(GARNAME)-$(GARVERSION).tgz
 LICENSE = license.txt
 
-REQUIRED_PKGS = CSWncurses
+SPKG_CLASSES = none cswcpsampleconf
 
+REQUIRED_PKGS = CSWncurses CSWcswclassutils
+
 CONFIGURE_SCRIPTS = 
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom


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

From valholla at users.sourceforge.net  Wed May 20 22:04:06 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 20 May 2009 20:04:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[4984] csw/mgar/pkg
Message-ID: 

Revision: 4984
          http://gar.svn.sourceforge.net/gar/?rev=4984&view=rev
Author:   valholla
Date:     2009-05-20 20:04:06 +0000 (Wed, 20 May 2009)

Log Message:
-----------
initial checkin

Modified Paths:
--------------
    csw/mgar/pkg/mod_python/trunk/Makefile
    csw/mgar/pkg/php4/trunk/files/depend.mk
    csw/mgar/pkg/php4/trunk/files/pkgdef.mk
    csw/mgar/pkg/php4/trunk/files/pkgfiles.mk

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

Added: csw/mgar/pkg/drupal/Makefile
===================================================================
--- csw/mgar/pkg/drupal/Makefile	                        (rev 0)
+++ csw/mgar/pkg/drupal/Makefile	2009-05-20 20:04:06 UTC (rev 4984)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+	@echo "You are in the pkg/ directory."
+
+%:
+	$(MAKE) -C trunk $* 
+
+paranoid-%:
+	$(MAKE) -C trunk $* || exit 2 
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+	$(MAKE) -C trunk $* || echo "	*** make $* in $$i failed ***" >> $(BUILDLOG) 

Added: csw/mgar/pkg/drupal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/drupal/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/drupal/trunk/Makefile	2009-05-20 20:04:06 UTC (rev 4984)
@@ -0,0 +1,46 @@
+GARNAME = drupal
+GARVERSION = 6.12
+CATEGORIES = apps
+
+DESCRIPTION = An open source content management platform
+define BLURB
+	GD is an open source code library for the dynamic creation of 
+	images by programmers. GD creates PNG, JPEG and GIF images, 
+	among other formats. GD is commonly used to generate charts, 
+	graphics, thumbnails, and most anything else, on the fly. 
+	While not restricted to use on the web, the most common 
+	applications of GD involve web site development.
+endef
+
+MASTER_SITES = http://drupal.org/project/drupal/
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+
+PACKAGES = CSWdrupal
+CATALOGNAME_CSWdrupal = drupal
+SPKG_DESC_CSWdrupal = $(DESCRIPTION)
+
+
+# We define upstream file regex so we can be notifed of 
+# new upstream software release
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+ARCHALL_CSWdrupal = 1
+
+CONFIGURE_SCRIPTS = 
+BUILD_SCRIPTS     = 
+INSTALL_SCRIPTS   = custom
+
+REQUIRED_PKGS_CSWdrupal = CSWapache2c CSWphp5 CSWphp5gd 
+
+## There are no tests for this
+TEST_SCRIPTS = skip
+
+test-skip:
+	@$(MAKECOOKIE)
+
+install-custom:
+	ginstall -d $(DESTDIR)/$(GARNAME)/$(GARVERSION)
+	cd $(WORKSRC); /usr/bin/pax -rw -v $(WORKSRC)/ $(DESTDIR)/$(GARNAME)/$(GARVERSION)
+	@$(MAKECOOKIE)
+
+include gar/category.mk

Added: csw/mgar/pkg/drupal/trunk/checksums
===================================================================
--- csw/mgar/pkg/drupal/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/drupal/trunk/checksums	2009-05-20 20:04:06 UTC (rev 4984)
@@ -0,0 +1 @@
+8c83fdadf081d2a4fb271469ee7d757b  download/drupal-6.12.tar.gz

Modified: csw/mgar/pkg/mod_python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_python/trunk/Makefile	2009-05-20 19:45:26 UTC (rev 4983)
+++ csw/mgar/pkg/mod_python/trunk/Makefile	2009-05-20 20:04:06 UTC (rev 4984)
@@ -18,7 +18,8 @@
 REQUIRED_PKGS_CSWap2modpython = CSWap2prefork CSWpython
 CATALOGNAME_CSWap2modpython   = ap2_modpython
 SPKG_DESC_CSWap2modpython     = an Apache/Python integration module
-DISTFILES += fixme.sh
+#DISTFILES += fixme.sh
+#STRIP_LIBTOOL = 1
 
 PATCHFILES += connobject.diff
 
@@ -36,10 +37,10 @@
 DESTDOC = $(DESTDIR)$(docdir)/ap2_modpython
 
 
-post-configure-modulated:
-	@echo " ==> Fixing libtool files"
-	@$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
-	@$(MAKECOOKIE)
+#post-configure-modulated:
+#	@echo " ==> Fixing libtool files"
+#	@$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
+#	@$(MAKECOOKIE)
 
 
 post-install-modulated:

Modified: csw/mgar/pkg/php4/trunk/files/depend.mk
===================================================================
--- csw/mgar/pkg/php4/trunk/files/depend.mk	2009-05-20 19:45:26 UTC (rev 4983)
+++ csw/mgar/pkg/php4/trunk/files/depend.mk	2009-05-20 20:04:06 UTC (rev 4984)
@@ -2,35 +2,35 @@
 # Define Package Dependencies
 #
 
-REQUIRED_PKGS_CSWphp4bcmath = CSWphp4cgi
-REQUIRED_PKGS_CSWphp4bz2 = CSWphp4cgi CSWbzip2
+REQUIRED_PKGS_CSWphp4bcmath   = CSWphp4cgi
+REQUIRED_PKGS_CSWphp4bz2      = CSWphp4cgi CSWbzip2
 REQUIRED_PKGS_CSWphp4calendar = CSWphp4cgi 
-REQUIRED_PKGS_CSWphp4cgi = CSWbdb44 CSWexpat
-REQUIRED_PKGS_CSWphp4curl  = CSWphp4cgi CSWcurlrt CSWlibidn 
-REQUIRED_PKGS_CSWphp4curl += CSWoldaprt CSWosslrt CSWzlib
-REQUIRED_PKGS_CSWphp4dba = CSWphp4cgi CSWbdb44 CSWgdbm
-REQUIRED_PKGS_CSWphp4domxml = CSWphp4cgi CSWiconv CSWlibxml2 CSWlibxslt CSWzlib
-REQUIRED_PKGS_CSWphp4gd = CSWphp4cgi CSWgd CSWjpeg CSWpng CSWzlib
-REQUIRED_PKGS_CSWphp4gettext = CSWphp4cgi CSWggettextrt
-REQUIRED_PKGS_CSWphp4gmp = CSWphp4cgi CSWlibgmp
-REQUIRED_PKGS_CSWphp4iconv = CSWphp4cgi 
-REQUIRED_PKGS_CSWphp4imap = CSWphp4cgi CSWimaprt CSWkrb5lib CSWosslrt
-REQUIRED_PKGS_CSWphp4ldap = CSWphp4cgi CSWoldaprt
+REQUIRED_PKGS_CSWphp4cgi      = CSWbdb44 CSWexpat
+REQUIRED_PKGS_CSWphp4curl     = CSWphp4cgi CSWcurlrt CSWlibidn 
+REQUIRED_PKGS_CSWphp4curl    += CSWoldaprt CSWosslrt CSWzlib
+REQUIRED_PKGS_CSWphp4dba      = CSWphp4cgi CSWbdb44 CSWgdbm
+REQUIRED_PKGS_CSWphp4domxml   = CSWphp4cgi CSWiconv CSWlibxml2 
+REQUIRED_PKGS_CSWphp4domxml  += CSWlibxslt CSWzlib
+REQUIRED_PKGS_CSWphp4gd       = CSWphp4cgi CSWgd CSWjpeg CSWpng CSWzlib
+REQUIRED_PKGS_CSWphp4gettext  = CSWphp4cgi CSWggettextrt
+REQUIRED_PKGS_CSWphp4gmp      = CSWphp4cgi CSWlibgmp
+REQUIRED_PKGS_CSWphp4iconv    = CSWphp4cgi 
+REQUIRED_PKGS_CSWphp4imap     = CSWphp4cgi CSWimaprt CSWkrb5lib CSWosslrt
+REQUIRED_PKGS_CSWphp4ldap     = CSWphp4cgi CSWoldaprt
 REQUIRED_PKGS_CSWphp4mbstring = CSWphp4cgi 
-REQUIRED_PKGS_CSWphp4mcal = CSWphp4cgi
-REQUIRED_PKGS_CSWphp4mssql = CSWphp4cgi CSWfreetds
-REQUIRED_PKGS_CSWphp4mysql = CSWphp4cgi CSWmysql5rt
-REQUIRED_PKGS_CSWphp4ncurses = CSWphp4cgi CSWncurses
-REQUIRED_PKGS_CSWphp4odbc = CSWphp4cgi CSWunixodbc
-REQUIRED_PKGS_CSWphp4openssl = CSWphp4cgi CSWkrb5lib CSWosslrt
-REQUIRED_PKGS_CSWphp4pgsql = CSWphp4cgi CSWlibpq
-REQUIRED_PKGS_CSWphp4zlib = CSWphp4cgi CSWzlib
-REQUIRED_PKGS_CSWap2modphp4 = CSWphp4cgi CSWbdb44 CSWexpat CSWap2prefork
-REQUIRED_PKGS_CSWmodphp4 = CSWphp4cgi CSWbdb44 CSWexpat CSWapache
-REQUIRED_PKGS_CSWmodphp4core = 
+REQUIRED_PKGS_CSWphp4mcal     = CSWphp4cgi
+REQUIRED_PKGS_CSWphp4mssql    = CSWphp4cgi CSWfreetds
+REQUIRED_PKGS_CSWphp4mysql    = CSWphp4cgi CSWmysql5rt
+REQUIRED_PKGS_CSWphp4ncurses  = CSWphp4cgi CSWncurses
+REQUIRED_PKGS_CSWphp4odbc     = CSWphp4cgi CSWunixodbc
+REQUIRED_PKGS_CSWphp4openssl  = CSWphp4cgi CSWkrb5lib CSWosslrt
+REQUIRED_PKGS_CSWphp4pgsql    = CSWphp4cgi CSWlibpq
+REQUIRED_PKGS_CSWphp4zlib     = CSWphp4cgi CSWzlib
+REQUIRED_PKGS_CSWap2modphp4   = CSWphp4cgi CSWbdb44 CSWexpat CSWap2prefork
+REQUIRED_PKGS_CSWmodphp4core  = CSWphp4cgi CSWbdb44 CSWexpat CSWapache
 REQUIRED_PKGS_CSWphp  = CSWphp4cgi CSWphp4bcmath CSWphp4bz2 CSWphp4calendar
 REQUIRED_PKGS_CSWphp += CSWphp4curl CSWphp4dba CSWphp4domxml CSWphp4gd
 REQUIRED_PKGS_CSWphp += CSWphp4gettext CSWphp4gmp CSWphp4iconv CSWphp4imap
 REQUIRED_PKGS_CSWphp += CSWphp4ldap CSWphp4mbstring CSWphp4mcal CSWphp4mssql
 REQUIRED_PKGS_CSWphp += CSWphp4mysql CSWphp4ncurses CSWphp4odbc CSWphp4openssl
-REQUIRED_PKGS_CSWphp += CSWphp4pgsql CSWphp4zlib CSWmodphp4
+REQUIRED_PKGS_CSWphp += CSWphp4pgsql CSWphp4zlib CSWmodphp4core

Modified: csw/mgar/pkg/php4/trunk/files/pkgdef.mk
===================================================================
--- csw/mgar/pkg/php4/trunk/files/pkgdef.mk	2009-05-20 19:45:26 UTC (rev 4983)
+++ csw/mgar/pkg/php4/trunk/files/pkgdef.mk	2009-05-20 20:04:06 UTC (rev 4984)
@@ -7,54 +7,54 @@
 PACKAGES += CSWphp4openssl CSWphp4pgsql CSWphp4zlib CSWap2modphp4
 PACKAGES += CSWmodphp4 CSWphp
 
-CATALOGNAME_CSWphp4bcmath = php4_bcmath
-SPKG_DESC_CSWphp4bcmath = bcmath extension for php4
-CATALOGNAME_CSWphp4bz2 = php4_bz2
-SPKG_DESC_CSWphp4bz2 = bzip2 extension for php4
+CATALOGNAME_CSWphp4bcmath   = php4_bcmath
+SPKG_DESC_CSWphp4bcmath     = bcmath extension for php4
+CATALOGNAME_CSWphp4bz2      = php4_bz2
+SPKG_DESC_CSWphp4bz2        = bzip2 extension for php4
 CATALOGNAME_CSWphp4calendar = php4_calendar
-SPKG_DESC_CSWphp4calendar = calendar extension for php4
-CATALOGNAME_CSWphp4cgi = php4_cgi
-SPKG_DESC_CSWphp4cgi = command line interpreter for the PHP language
-CATALOGNAME_CSWphp4curl = php4_curl
-SPKG_DESC_CSWphp4curl = curl extension for php4
-CATALOGNAME_CSWphp4dba = php4_dba
-SPKG_DESC_CSWphp4dba = dba extension for php4
-CATALOGNAME_CSWphp4domxml = php4_domxml
-SPKG_DESC_CSWphp4domxml = domxml extension for php4
-CATALOGNAME_CSWphp4gd = php4_gd
-SPKG_DESC_CSWphp4gd = gd extension for php4
-CATALOGNAME_CSWphp4gettext = php4_gettext
-SPKG_DESC_CSWphp4gettext = gettext extension for php4
-CATALOGNAME_CSWphp4gmp = php4_gmp
-SPKG_DESC_CSWphp4gmp = gmp extension for php4
-CATALOGNAME_CSWphp4iconv = php4_iconv
-SPKG_DESC_CSWphp4iconv = iconv extension for php4
-CATALOGNAME_CSWphp4imap = php4_imap
-SPKG_DESC_CSWphp4imap = imap extension for php4
-CATALOGNAME_CSWphp4ldap = php4_ldap
-SPKG_DESC_CSWphp4ldap = ldap extension for php4
+SPKG_DESC_CSWphp4calendar   = calendar extension for php4
+CATALOGNAME_CSWphp4cgi      = php4_cgi
+SPKG_DESC_CSWphp4cgi        = command line interpreter for the PHP language
+CATALOGNAME_CSWphp4curl     = php4_curl
+SPKG_DESC_CSWphp4curl       = curl extension for php4
+CATALOGNAME_CSWphp4dba      = php4_dba
+SPKG_DESC_CSWphp4dba        = dba extension for php4
+CATALOGNAME_CSWphp4domxml   = php4_domxml
+SPKG_DESC_CSWphp4domxml     = domxml extension for php4
+CATALOGNAME_CSWphp4gd       = php4_gd
+SPKG_DESC_CSWphp4gd         = gd extension for php4
+CATALOGNAME_CSWphp4gettext  = php4_gettext
+SPKG_DESC_CSWphp4gettext    = gettext extension for php4
+CATALOGNAME_CSWphp4gmp      = php4_gmp
+SPKG_DESC_CSWphp4gmp        = gmp extension for php4
+CATALOGNAME_CSWphp4iconv    = php4_iconv
+SPKG_DESC_CSWphp4iconv      = iconv extension for php4
+CATALOGNAME_CSWphp4imap     = php4_imap
+SPKG_DESC_CSWphp4imap       = imap extension for php4
+CATALOGNAME_CSWphp4ldap     = php4_ldap
+SPKG_DESC_CSWphp4ldap       = ldap extension for php4
 CATALOGNAME_CSWphp4mbstring = php4_mbstring
-SPKG_DESC_CSWphp4mbstring = mbstring extension for php4
-CATALOGNAME_CSWphp4mcal = php4_mcal
-SPKG_DESC_CSWphp4mcal = modular calendar extension for php4
-CATALOGNAME_CSWphp4mssql = php4_mssql
-SPKG_DESC_CSWphp4mssql = mssql extension for php4
-CATALOGNAME_CSWphp4mysql = php4_mysql
-SPKG_DESC_CSWphp4mysql = mysql extension for php4
-CATALOGNAME_CSWphp4ncurses = php4_ncurses
-SPKG_DESC_CSWphp4ncurses = ncurses extension for php4
-CATALOGNAME_CSWphp4odbc = php4_odbc
-SPKG_DESC_CSWphp4odbc = odbc extension for php4
-CATALOGNAME_CSWphp4openssl = php4_openssl
-SPKG_DESC_CSWphp4openssl = openssl extension for php4
-CATALOGNAME_CSWphp4pgsql = php4_pgsql
-SPKG_DESC_CSWphp4pgsql = postgresql extension for php4
-CATALOGNAME_CSWphp4zlib = php4_zlib
-SPKG_DESC_CSWphp4zlib = zlib extension for php4
-CATALOGNAME_CSWap2modphp4 = ap2_modphp4
-SPKG_DESC_CSWap2modphp4 = PHP 4 - Apache 2.2.x Module
-CATALOGNAME_CSWmodphp4 = mod_php4_core
-SPKG_DESC_CSWmodphp4 = PHP 4 - Apache 1.3.x Module
-CATALOGNAME_CSWphp = mod_php
-SPKG_DESC_CSWphp = Both an apache module and command line interpreter for the PHP language
+SPKG_DESC_CSWphp4mbstring   = mbstring extension for php4
+CATALOGNAME_CSWphp4mcal     = php4_mcal
+SPKG_DESC_CSWphp4mcal       = modular calendar extension for php4
+CATALOGNAME_CSWphp4mssql    = php4_mssql
+SPKG_DESC_CSWphp4mssql      = mssql extension for php4
+CATALOGNAME_CSWphp4mysql    = php4_mysql
+SPKG_DESC_CSWphp4mysql      = mysql extension for php4
+CATALOGNAME_CSWphp4ncurses  = php4_ncurses
+SPKG_DESC_CSWphp4ncurses    = ncurses extension for php4
+CATALOGNAME_CSWphp4odbc     = php4_odbc
+SPKG_DESC_CSWphp4odbc       = odbc extension for php4
+CATALOGNAME_CSWphp4openssl  = php4_openssl
+SPKG_DESC_CSWphp4openssl    = openssl extension for php4
+CATALOGNAME_CSWphp4pgsql    = php4_pgsql
+SPKG_DESC_CSWphp4pgsql      = postgresql extension for php4
+CATALOGNAME_CSWphp4zlib     = php4_zlib
+SPKG_DESC_CSWphp4zlib       = zlib extension for php4
+CATALOGNAME_CSWap2modphp4   = ap2_modphp4
+SPKG_DESC_CSWap2modphp4     = PHP 4 - Apache 2.2.x Module
+CATALOGNAME_CSWmodphp4      = mod_php4_core
+SPKG_DESC_CSWmodphp4        = PHP 4 - Apache 1.3.x Module
+CATALOGNAME_CSWphp          = mod_php
+SPKG_DESC_CSWphp            = Both an apache module and command line interpreter for the PHP language
 ARCHALL_CSWphp =  1

Modified: csw/mgar/pkg/php4/trunk/files/pkgfiles.mk
===================================================================
--- csw/mgar/pkg/php4/trunk/files/pkgfiles.mk	2009-05-20 19:45:26 UTC (rev 4983)
+++ csw/mgar/pkg/php4/trunk/files/pkgfiles.mk	2009-05-20 20:04:06 UTC (rev 4984)
@@ -2,31 +2,31 @@
 # define the files in each Package
 #
 
-PKGFILES_CSWphp4bcmath = .*/extensions/.*/bcmath.*
-PKGFILES_CSWphp4bz2 = .*/extensions/.*/bz2.*
-PKGFILES_CSWphp4calendar = .*/extensions/.*/calendar.*
-PKGFILES_CSWphp4curl = .*/extensions/.*/curl.*
-PKGFILES_CSWphp4dba = .*/extensions/.*/dba.*
-PKGFILES_CSWphp4domxml = .*/extensions/.*/domxml.*
-PKGFILES_CSWphp4gd = .*/extensions/.*/gd.*
-PKGFILES_CSWphp4gettext = .*/extensions/.*/gettext.*
-PKGFILES_CSWphp4gmp = .*/extensions/.*/gmp.*
-PKGFILES_CSWphp4iconv  = .*/extensions/.*/iconv.*
-PKGFILES_CSWphp4iconv += .*/include/php/ext/iconv.*
-PKGFILES_CSWphp4imap = .*/extensions/.*/imap.*
-PKGFILES_CSWphp4ldap = .*/extensions/.*/ldap.*
+PKGFILES_CSWphp4bcmath    = .*/extensions/.*/bcmath.*
+PKGFILES_CSWphp4bz2       = .*/extensions/.*/bz2.*
+PKGFILES_CSWphp4calendar  = .*/extensions/.*/calendar.*
+PKGFILES_CSWphp4curl      = .*/extensions/.*/curl.*
+PKGFILES_CSWphp4dba       = .*/extensions/.*/dba.*
+PKGFILES_CSWphp4domxml    = .*/extensions/.*/domxml.*
+PKGFILES_CSWphp4gd        = .*/extensions/.*/gd.*
+PKGFILES_CSWphp4gettext   = .*/extensions/.*/gettext.*
+PKGFILES_CSWphp4gmp       = .*/extensions/.*/gmp.*
+PKGFILES_CSWphp4iconv     = .*/extensions/.*/iconv.*
+PKGFILES_CSWphp4iconv    += .*/include/php/ext/iconv.*
+PKGFILES_CSWphp4imap      = .*/extensions/.*/imap.*
+PKGFILES_CSWphp4ldap      = .*/extensions/.*/ldap.*
 PKGFILES_CSWphp4mbstring  = .*/extensions/.*/mbstring.*
 PKGFILES_CSWphp4mbstring += .*/include/php/ext/mbstring.*
-PKGFILES_CSWphp4mcal = .*/extensions/.*/mcal.*
-PKGFILES_CSWphp4mssql = .*/extensions/.*/mssql.*
-PKGFILES_CSWphp4mysql = .*/extensions/.*/mysql.*
-PKGFILES_CSWphp4ncurses = .*/extensions/.*/ncurses.*
-PKGFILES_CSWphp4odbc = .*/extensions/.*/odbc.*
-PKGFILES_CSWphp4openssl = .*/extensions/.*/openssl.*
-PKGFILES_CSWphp4pgsql  = .*/extensions/.*/pgsql.*
-PKGFILES_CSWphp4pgsql += .*/include/php/ext/pgsql.*
-PKGFILES_CSWphp4zlib = .*/extensions/.*/zlib.*
-PKGFILES_CSWap2modphp4 = .*/apache2/.*
-PKGFILES_CSWmodphp4 = .*/apache/.*
-PKGFILES_CSWphp4 = /opt/csw/php4/README-mod_php
+PKGFILES_CSWphp4mcal      = .*/extensions/.*/mcal.*
+PKGFILES_CSWphp4mssql     = .*/extensions/.*/mssql.*
+PKGFILES_CSWphp4mysql     = .*/extensions/.*/mysql.*
+PKGFILES_CSWphp4ncurses   = .*/extensions/.*/ncurses.*
+PKGFILES_CSWphp4odbc      = .*/extensions/.*/odbc.*
+PKGFILES_CSWphp4openssl   = .*/extensions/.*/openssl.*
+PKGFILES_CSWphp4pgsql     = .*/extensions/.*/pgsql.*
+PKGFILES_CSWphp4pgsql    += .*/include/php/ext/pgsql.*
+PKGFILES_CSWphp4zlib      = .*/extensions/.*/zlib.*
+PKGFILES_CSWap2modphp4    = .*/apache2/.*
+PKGFILES_CSWmodphp4       = .*/apache/.*
+PKGFILES_CSWphp           = /opt/csw/php4/README-mod_php
 #PKGFILES_CSWphp4cgi catchall


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

From valholla at users.sourceforge.net  Wed May 20 22:04:38 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 20 May 2009 20:04:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[4985] csw/mgar/pkg/drupal/trunk/
Message-ID: 

Revision: 4985
          http://gar.svn.sourceforge.net/gar/?rev=4985&view=rev
Author:   valholla
Date:     2009-05-20 20:04:37 +0000 (Wed, 20 May 2009)

Log Message:
-----------
propset

Property Changed:
----------------
    csw/mgar/pkg/drupal/trunk/


Property changes on: csw/mgar/pkg/drupal/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.

From valholla at users.sourceforge.net  Wed May 20 22:16:54 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 20 May 2009 20:16:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[4986] csw/mgar/pkg/drupal/trunk
Message-ID: 

Revision: 4986
          http://gar.svn.sourceforge.net/gar/?rev=4986&view=rev
Author:   valholla
Date:     2009-05-20 20:16:54 +0000 (Wed, 20 May 2009)

Log Message:
-----------
commit

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

Modified: csw/mgar/pkg/drupal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/drupal/trunk/Makefile	2009-05-20 20:04:37 UTC (rev 4985)
+++ csw/mgar/pkg/drupal/trunk/Makefile	2009-05-20 20:16:54 UTC (rev 4986)
@@ -12,11 +12,12 @@
 	applications of GD involve web site development.
 endef
 
-MASTER_SITES = http://drupal.org/project/drupal/
+MASTER_SITES = http://ftp.drupal.org/files/projects/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 
 PACKAGES = CSWdrupal
 CATALOGNAME_CSWdrupal = drupal
+SPKG_SOURCEURL = http://drupal.org/
 SPKG_DESC_CSWdrupal = $(DESCRIPTION)
 
 
@@ -39,8 +40,8 @@
 	@$(MAKECOOKIE)
 
 install-custom:
-	ginstall -d $(DESTDIR)/$(GARNAME)/$(GARVERSION)
-	cd $(WORKSRC); /usr/bin/pax -rw -v $(WORKSRC)/ $(DESTDIR)/$(GARNAME)/$(GARVERSION)
+	ginstall -d $(DESTDIR)$(prefix)/$(GARNAME)/$(GARVERSION)
+	cd $(WORKSRC); /usr/bin/pax -rw -v * $(DESTDIR)$(prefix)/$(GARNAME)/$(GARVERSION)
 	@$(MAKECOOKIE)
 
 include gar/category.mk

Modified: csw/mgar/pkg/drupal/trunk/checksums
===================================================================
--- csw/mgar/pkg/drupal/trunk/checksums	2009-05-20 20:04:37 UTC (rev 4985)
+++ csw/mgar/pkg/drupal/trunk/checksums	2009-05-20 20:16:54 UTC (rev 4986)
@@ -1 +1 @@
-8c83fdadf081d2a4fb271469ee7d757b  download/drupal-6.12.tar.gz
+82e2517f175320cffe20997333b3a33a  download/drupal-6.12.tar.gz


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

From valholla at users.sourceforge.net  Wed May 20 22:28:24 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 20 May 2009 20:28:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[4987] csw/mgar/pkg/drupal/trunk/
Message-ID: 

Revision: 4987
          http://gar.svn.sourceforge.net/gar/?rev=4987&view=rev
Author:   valholla
Date:     2009-05-20 20:28:23 +0000 (Wed, 20 May 2009)

Log Message:
-----------
commit for package

Property Changed:
----------------
    csw/mgar/pkg/drupal/trunk/


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



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

From bdwalton at users.sourceforge.net  Thu May 21 02:59:09 2009
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 21 May 2009 00:59:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[4988]
	csw/mgar/pkg/openjade/trunk/Makefile
Message-ID: 

Revision: 4988
          http://gar.svn.sourceforge.net/gar/?rev=4988&view=rev
Author:   bdwalton
Date:     2009-05-21 00:59:09 +0000 (Thu, 21 May 2009)

Log Message:
-----------
clean up dependencies.

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

Modified: csw/mgar/pkg/openjade/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openjade/trunk/Makefile	2009-05-20 20:28:23 UTC (rev 4987)
+++ csw/mgar/pkg/openjade/trunk/Makefile	2009-05-21 00:59:09 UTC (rev 4988)
@@ -2,9 +2,9 @@
 GARVERSION = 1.3.2
 CATEGORIES = apps
 
-PREREQUISITE_PKGS = CSWopensp
+PREREQUISITE_PKGS = CSWopenspdevel
 REQUIRED_PKGS = CSWgcc3corert CSWgcc3g++rt
-REQUIRED_PKGS += CSWggettextrt CSWiconv CSWopensp CSWsgmlcommon
+REQUIRED_PKGS += CSWggettextrt CSWiconv CSWopensprt CSWsgmlcommon
 REQUIRED_PKGS += CSWxmlcommon
 
 PACKAGES = CSWopenjade


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

From bdwalton at users.sourceforge.net  Thu May 21 03:05:40 2009
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 21 May 2009 01:05:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[4989]
	csw/mgar/pkg/openjade/trunk/Makefile
Message-ID: 

Revision: 4989
          http://gar.svn.sourceforge.net/gar/?rev=4989&view=rev
Author:   bdwalton
Date:     2009-05-21 01:05:40 +0000 (Thu, 21 May 2009)

Log Message:
-----------
remove redundant gcc3corert

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

Modified: csw/mgar/pkg/openjade/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openjade/trunk/Makefile	2009-05-21 00:59:09 UTC (rev 4988)
+++ csw/mgar/pkg/openjade/trunk/Makefile	2009-05-21 01:05:40 UTC (rev 4989)
@@ -3,7 +3,7 @@
 CATEGORIES = apps
 
 PREREQUISITE_PKGS = CSWopenspdevel
-REQUIRED_PKGS = CSWgcc3corert CSWgcc3g++rt
+REQUIRED_PKGS = CSWgcc3g++rt
 REQUIRED_PKGS += CSWggettextrt CSWiconv CSWopensprt CSWsgmlcommon
 REQUIRED_PKGS += CSWxmlcommon
 


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

From skayser at users.sourceforge.net  Thu May 21 13:10:30 2009
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Thu, 21 May 2009 11:10:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[4990] csw/mgar/pkg
Message-ID: 

Revision: 4990
          http://gar.svn.sourceforge.net/gar/?rev=4990&view=rev
Author:   skayser
Date:     2009-05-21 11:10:29 +0000 (Thu, 21 May 2009)

Log Message:
-----------
httping: initial commit (closes #3458, #2391)

Added Paths:
-----------
    csw/mgar/pkg/httping/
    csw/mgar/pkg/httping/branches/
    csw/mgar/pkg/httping/tags/
    csw/mgar/pkg/httping/trunk/
    csw/mgar/pkg/httping/trunk/Makefile
    csw/mgar/pkg/httping/trunk/checksums
    csw/mgar/pkg/httping/trunk/files/
    csw/mgar/pkg/httping/trunk/files/changelog.CSW
    csw/mgar/pkg/httping/trunk/files/gar-base.diff


Property changes on: csw/mgar/pkg/httping/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/httping/trunk/Makefile
===================================================================
--- csw/mgar/pkg/httping/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/httping/trunk/Makefile	2009-05-21 11:10:29 UTC (rev 4990)
@@ -0,0 +1,34 @@
+GARNAME = httping
+GARVERSION = 1.3.0
+CATEGORIES = net
+
+DESCRIPTION = Httping is like 'ping' but for http-requests.
+define BLURB
+  Httping is like 'ping' but for http-requests.  Give it an url, and it'll
+  show you how long it takes to connect, send a request and retrieve the
+  reply (only the headers). Be aware that the transmission across the
+  network also takes time! 
+endef
+
+MASTER_SITES = http://www.vanheusden.com/httping/
+DISTFILES  = $(GARNAME)-$(GARVERSION).tgz
+
+REQUIRED_PKGS = CSWosslrt
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz
+
+PATCHFILES = gar-base.diff
+
+CONFIGURE_SCRIPTS =
+TEST_SCRIPTS =
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+LICENSE = license.txt
+
+include gar/category.mk
+
+post-install-modulated:
+	@ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)
+	@cp $(FILEDIR)/changelog.CSW $(DESTDIR)$(docdir)/$(GARNAME)

Added: csw/mgar/pkg/httping/trunk/checksums
===================================================================
--- csw/mgar/pkg/httping/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/httping/trunk/checksums	2009-05-21 11:10:29 UTC (rev 4990)
@@ -0,0 +1,2 @@
+9f75ad45daa91e67c6677c9959165f89  download/gar-base.diff
+41c912a9ecc904e51d7260053fc2195c  download/httping-1.3.0.tgz

Added: csw/mgar/pkg/httping/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/httping/trunk/files/changelog.CSW	                        (rev 0)
+++ csw/mgar/pkg/httping/trunk/files/changelog.CSW	2009-05-21 11:10:29 UTC (rev 4990)
@@ -0,0 +1,5 @@
+httping (1.3.0,REV=2009.05.21)
+
+  * Adopted and updated to 1.3.0 (Closes: #3458, #2391).
+
+ -- Sebastian Kayser   Thu, 21 May 2009 13:04:48 +0200

Added: csw/mgar/pkg/httping/trunk/files/gar-base.diff
===================================================================
--- csw/mgar/pkg/httping/trunk/files/gar-base.diff	                        (rev 0)
+++ csw/mgar/pkg/httping/trunk/files/gar-base.diff	2009-05-21 11:10:29 UTC (rev 4990)
@@ -0,0 +1,33 @@
+diff --speed-large-files --minimal -Nru httping-1.3.0.orig/Makefile httping-1.3.0/Makefile
+--- httping-1.3.0.orig/Makefile	2009-02-18 16:32:43.000000000 +0100
++++ httping-1.3.0/Makefile	2009-05-21 12:43:55.083896462 +0200
+@@ -14,22 +14,23 @@
+ 
+ include version
+ 
+-DEBUG=-g # -D_DEBUG
+-LDFLAGS+=-lssl -lcrypto $(DEBUG)
+-CFLAGS+=-O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
++LDFLAGS+=-lssl -lcrypto -lsocket -lnsl -lresolv
++CFLAGS+=-DVERSION=\"$(VERSION)\"
+ 
+ OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o mssl.o res.o
+ 
+ all: httping
+ 
+ httping: $(OBJS)
+-	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o httping
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o httping
+ 	#
+ 	# Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html
+ 
+ install: httping
+-	cp httping $(DESTDIR)/usr/bin
+-	cp httping.1 $(DESTDIR)/usr/share/man/man1/
++	ginstall -d $(DESTDIR)$(bindir)
++	ginstall -d $(DESTDIR)$(mandir)/man1
++	cp httping $(DESTDIR)$(bindir)
++	cp httping.1 $(DESTDIR)$(mandir)/man1
+ 
+ clean:
+ 	rm -f $(OBJS) core httping


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

From skayser at users.sourceforge.net  Thu May 21 14:04:03 2009
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Thu, 21 May 2009 12:04:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[4991] csw/mgar/pkg
Message-ID: 

Revision: 4991
          http://gar.svn.sourceforge.net/gar/?rev=4991&view=rev
Author:   skayser
Date:     2009-05-21 12:04:03 +0000 (Thu, 21 May 2009)

Log Message:
-----------
convmv: initial commit

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


Property changes on: csw/mgar/pkg/convmv/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/convmv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/convmv/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/convmv/trunk/Makefile	2009-05-21 12:04:03 UTC (rev 4991)
@@ -0,0 +1,47 @@
+GARNAME = convmv
+GARVERSION = 1.14
+CATEGORIES = utils
+
+DESCRIPTION = Converts filenames from one encoding to another
+define BLURB
+  convmv is meant to help convert a single filename, a directory tree
+  and the contained files or a whole filesystem into a different encoding.
+  It just converts the filenames, not the content of the files. A special
+  feature of convmv is that it also takes care of symlinks, also converts
+  the symlink target pointer in case the symlink target is being
+  converted, too.
+  
+  All this comes in very handy when one wants to switch over from old
+  8-bit locales to UTF-8 locales. It is also possible to convert
+  directories to UTF-8 which are already partly UTF-8 encoded. convmv is
+  able to detect if certain files are UTF-8 encoded and will skip them by
+  default. To turn this smartness off use the --nosmart switch.
+endef
+
+MASTER_SITES = http://www.j3e.de/linux/convmv/
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+LICENSE = GPL2
+ARCHALL = 1
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+CONFIGURE_SCRIPTS = 
+BUILD_SCRIPTS = 
+
+INSTALL_ARGS = MANDIR=$(mandir) PREFIX=$(prefix)
+TEST_ARGS = TAR=gtar
+
+include gar/category.mk
+
+post-extract-modulated:
+	@perl -pi -e 's|/usr/bin/perl|/opt/csw/bin/perl|' $(WORKSRC)/convmv
+	@perl -pi -e 's|\tinstall|ginstall|' $(WORKSRC)/Makefile
+	@$(MAKECOOKIE)
+
+post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME)
+post-install-modulated:
+	@ginstall -d $(DOCDEST)
+	@(cd $(WORKSRC); cp CREDITS Changes TODO $(DOCDEST))
+	@cp $(FILEDIR)/changelog.CSW $(DOCDEST)
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/convmv/trunk/checksums
===================================================================
--- csw/mgar/pkg/convmv/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/convmv/trunk/checksums	2009-05-21 12:04:03 UTC (rev 4991)
@@ -0,0 +1 @@
+d41238051c13b2e6c0cc2310a8f69d68  download/convmv-1.14.tar.gz


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

From skayser at users.sourceforge.net  Thu May 21 14:04:23 2009
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Thu, 21 May 2009 12:04:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[4992]
	csw/mgar/pkg/convmv/trunk/files/changelog.CSW
Message-ID: 

Revision: 4992
          http://gar.svn.sourceforge.net/gar/?rev=4992&view=rev
Author:   skayser
Date:     2009-05-21 12:04:23 +0000 (Thu, 21 May 2009)

Log Message:
-----------
convmv: added changelog

Added Paths:
-----------
    csw/mgar/pkg/convmv/trunk/files/changelog.CSW

Added: csw/mgar/pkg/convmv/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/convmv/trunk/files/changelog.CSW	                        (rev 0)
+++ csw/mgar/pkg/convmv/trunk/files/changelog.CSW	2009-05-21 12:04:23 UTC (rev 4992)
@@ -0,0 +1,5 @@
+convmv (1.14,REV=2009.05.21)
+
+  * Initial release.
+
+ -- Sebastian Kayser   Thu, 21 May 2009 14:00:13 +0200


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

From skayser at users.sourceforge.net  Thu May 21 14:04:57 2009
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Thu, 21 May 2009 12:04:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[4993]
	csw/mgar/pkg/httping/trunk/Makefile
Message-ID: 

Revision: 4993
          http://gar.svn.sourceforge.net/gar/?rev=4993&view=rev
Author:   skayser
Date:     2009-05-21 12:04:57 +0000 (Thu, 21 May 2009)

Log Message:
-----------
httping: added missing MAKECOOKIE

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

Modified: csw/mgar/pkg/httping/trunk/Makefile
===================================================================
--- csw/mgar/pkg/httping/trunk/Makefile	2009-05-21 12:04:23 UTC (rev 4992)
+++ csw/mgar/pkg/httping/trunk/Makefile	2009-05-21 12:04:57 UTC (rev 4993)
@@ -32,3 +32,4 @@
 post-install-modulated:
 	@ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)
 	@cp $(FILEDIR)/changelog.CSW $(DESTDIR)$(docdir)/$(GARNAME)
+	@$(MAKECOOKIE)


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

From skayser at users.sourceforge.net  Thu May 21 17:14:27 2009
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Thu, 21 May 2009 15:14:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[4994] csw/mgar/pkg/iperf/trunk
Message-ID: 

Revision: 4994
          http://gar.svn.sourceforge.net/gar/?rev=4994&view=rev
Author:   skayser
Date:     2009-05-21 15:14:27 +0000 (Thu, 21 May 2009)

Log Message:
-----------
iperf: created GAR build description

Added Paths:
-----------
    csw/mgar/pkg/iperf/trunk/Makefile
    csw/mgar/pkg/iperf/trunk/checksums
    csw/mgar/pkg/iperf/trunk/files/
    csw/mgar/pkg/iperf/trunk/files/gar-base.diff

Removed Paths:
-------------
    csw/mgar/pkg/iperf/trunk/legacy/

Property Changed:
----------------
    csw/mgar/pkg/iperf/trunk/


Property changes on: csw/mgar/pkg/iperf/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/iperf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/iperf/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/iperf/trunk/Makefile	2009-05-21 15:14:27 UTC (rev 4994)
@@ -0,0 +1,71 @@
+# Todo:
+#
+# * Check sf project page for patches and threads related to CPU saturation
+# * Run some real world performance tests
+# * Submit feedback upstream: 
+#   - Add AC_CHECK_FUNC or AC_SEARCH_LIBS for sched_yield() so that we get -lrt
+#   - Use PTHREAD_{LIBS,CFLAGS} to amend CFLAGS so that we get -lpthreads
+#   - Submit language linkage declarations patch for review
+# * Add changelog.CSW
+#
+GARNAME = iperf
+GARVERSION = 2.0.4
+CATEGORIES = net
+
+DESCRIPTION = Internet Protocol bandwidth measuring tool 
+define BLURB
+  Iperf was developed by NLANR/DAST as a modern alternative for measuring
+  maximum TCP and UDP bandwidth performance. Iperf allows the tuning of
+  various parameters and UDP characteristics. Iperf reports bandwidth,
+  delay jitter, datagram loss. 
+endef
+
+MASTER_SITES = $(SF_MIRRORS)
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+
+# Add some explicit language linkage declarations. 
+#
+# See C++ Migration Guide, 3.11.1 "Language Linkage"
+# http://dlc.sun.com/pdf/819-3689-10/819-3689-10.pdf
+#
+# "In compatibility mode, the compiler implements the ARM rule that the 
+# language linkage is not part of the function type. In particular, you can
+# declare a pointer to a function without regard to the linkage of the pointer 
+# or a function assigned to it. 
+# In standard mode, the compiler implements the new rule that the language 
+# linkage is part of its type, and is part of the type of a pointer to 
+# function. The linkages must therefore match."
+PATCHFILES = gar-base.diff
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=128336
+UPSTREAM_USE_SF = 1
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+TEST_SCRIPTS = 
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+# Tell CC not to include additional directories in R*PATH, otherwise we end
+# up with something like
+# [11]    RUNPATH         /opt/csw/lib/$ISALIST:/opt/csw/lib:/opt/studio/SOS11/SUNWspro/lib/rw7:/opt/studio/SOS11/SUNWspro/lib:/opt/SUNWspro/lib:/usr/ccs/lib:/lib:/usr/lib
+# [12]    RPATH           /opt/csw/lib/$ISALIST:/opt/csw/lib:/opt/studio/SOS11/SUNWspro/lib/rw7:/opt/studio/SOS11/SUNWspro/lib:/opt/SUNWspro/lib:/usr/ccs/lib:/lib:/usr/lib
+EXTRA_CXX_FLAGS = -norunpath
+
+include gar/category.mk
+
+# * Get rid of gcc -Walls 
+# * LIBS: Append -lrt for sched_yield()
+# * LIBS: Append -lpthread (upstream should use $PTHREAD_{LIBS,CFLAGS} instead
+pre-configure-modulated:
+	@perl -pi -e 's|-Wall||; s|\@LIBS\@|\@LIBS\@ -lrt -lpthread|' \
+		$(WORKSRC)/Makefile.in \
+		$(WORKSRC)/compat/Makefile.in \
+		$(WORKSRC)/src/Makefile.in
+	@$(MAKECOOKIE)
+
+post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME)
+post-install-modulated:
+	@ginstall -d $(DOCDEST)
+	@(cd $(WORKSRC) && cp Changelog AUTHORS $(DOCDEST))
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/iperf/trunk/checksums
===================================================================
--- csw/mgar/pkg/iperf/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/iperf/trunk/checksums	2009-05-21 15:14:27 UTC (rev 4994)
@@ -0,0 +1,2 @@
+3bb101038d372642f1fa7e83c7c93e46  download/gar-base.diff
+8c5bc14cc2ea55f18f22afe3c23e3dcb  download/iperf-2.0.4.tar.gz

Added: csw/mgar/pkg/iperf/trunk/files/gar-base.diff
===================================================================
--- csw/mgar/pkg/iperf/trunk/files/gar-base.diff	                        (rev 0)
+++ csw/mgar/pkg/iperf/trunk/files/gar-base.diff	2009-05-21 15:14:27 UTC (rev 4994)
@@ -0,0 +1,48 @@
+diff --speed-large-files --minimal -Nru iperf-2.0.4.orig/include/PerfSocket.hpp iperf-2.0.4/include/PerfSocket.hpp
+--- iperf-2.0.4.orig/include/PerfSocket.hpp	2007-08-30 00:06:19.000000000 +0200
++++ iperf-2.0.4/include/PerfSocket.hpp	2009-05-21 16:04:35.263120435 +0200
+@@ -61,12 +61,11 @@
+ 
+     void SetSocketOptions( thread_Settings *inSettings );
+ 
+-    // handle interupts
+-    void Sig_Interupt( int inSigno );
+-
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
++    // handle interupts
++    void Sig_Interupt( int inSigno );
+     extern int sInterupted;
+     extern int groupID;
+     extern Mutex groupCond;
+diff --speed-large-files --minimal -Nru iperf-2.0.4.orig/src/main.cpp iperf-2.0.4/src/main.cpp
+--- iperf-2.0.4.orig/src/main.cpp	2008-04-08 04:37:54.000000000 +0200
++++ iperf-2.0.4/src/main.cpp	2009-05-21 16:04:03.840031595 +0200
+@@ -79,7 +79,7 @@
+  * prototypes
+  * ------------------------------------------------------------------- */
+ // Function called at exit to clean up as much as possible
+-void cleanup( void );
++extern "C" void cleanup( void );
+ 
+ /* -------------------------------------------------------------------
+  * global variables
+@@ -247,7 +247,7 @@
+  * respond appropriately.. [static]
+  * ------------------------------------------------------------------- */
+ 
+-void Sig_Interupt( int inSigno ) {
++extern "C" void Sig_Interupt( int inSigno ) {
+ #ifdef HAVE_THREAD
+     // We try to not allow a single interrupt handled by multiple threads
+     // to completely kill the app so we save off the first thread ID
+@@ -276,7 +276,7 @@
+  * either by exit() or terminating main().
+  * ------------------------------------------------------------------- */
+ 
+-void cleanup( void ) {
++extern "C" void cleanup( void ) {
+ #ifdef WIN32
+     // Shutdown Winsock
+     WSACleanup();


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

From valholla at users.sourceforge.net  Thu May 21 17:32:18 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Thu, 21 May 2009 15:32:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[4995] csw/mgar/pkg/drupal/trunk
Message-ID: 

Revision: 4995
          http://gar.svn.sourceforge.net/gar/?rev=4995&view=rev
Author:   valholla
Date:     2009-05-21 15:32:17 +0000 (Thu, 21 May 2009)

Log Message:
-----------
package checkin

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

Added Paths:
-----------
    csw/mgar/pkg/drupal/trunk/files/httpd-drupal.conf.CSW

Modified: csw/mgar/pkg/drupal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/drupal/trunk/Makefile	2009-05-21 15:14:27 UTC (rev 4994)
+++ csw/mgar/pkg/drupal/trunk/Makefile	2009-05-21 15:32:17 UTC (rev 4995)
@@ -14,6 +14,7 @@
 
 MASTER_SITES = http://ftp.drupal.org/files/projects/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES += httpd-drupal.conf.CSW
 
 PACKAGES = CSWdrupal
 CATALOGNAME_CSWdrupal = drupal
@@ -39,9 +40,94 @@
 test-skip:
 	@$(MAKECOOKIE)
 
+DRUPAL_BASE_INSTDIR = $(prefix)
+DRUPAL_INST_DIR = $(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)
+SETTINGS_DIR=$(DRUPAL_INST_DIR)/sites/default
+
 install-custom:
-	ginstall -d $(DESTDIR)$(prefix)/$(GARNAME)/$(GARVERSION)
-	cd $(WORKSRC); /usr/bin/pax -rw -v * $(DESTDIR)$(prefix)/$(GARNAME)/$(GARVERSION)
+	ginstall -d $(DESTDIR)$(DRUPAL_INST_DIR)
+	ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
+	cd $(WORKSRC); /usr/bin/pax -rw -v * $(DESTDIR)$(DRUPAL_INST_DIR)
+	gmv $(DESTDIR)$(SETTINGS_DIR)/default.settings.php $(DESTDIR)$(SETTINGS_DIR)/settings.php.CSW
+	gcp $(DOWNLOADDIR)/httpd-drupal.conf.CSW $(DESTDIR)$(prefix)/apache2/etc/extra
 	@$(MAKECOOKIE)
 
+
+define CSWdrupal_postinstall
+#!/bin/sh
+
+PATH=/usr/bin:/usr/sbin
+
+AP2CONF=/opt/csw/apache2/etc/httpd.conf
+AP2EXTRADIR=/opt/csw/apache2/etc/extra
+AP2USR="`sed -ne 's/^User \(.*\)/\1/p' $${AP2CONF}`"
+AP2GRP="`sed -ne 's/^Group \(.*\)/\1/p' $${AP2CONF}`"
+
+if [ -z $${AP2USR} ]; then
+	AP2USR=nobody
+fi
+if [ -z $${AP2GRP} ]; then
+	AP2GRP=nobody
+fi
+chown -R $${AP2USR}:$${AP2GRP} $(DRUPAL_BASE_INSTDIR)/$(GARNAME)
+
+if [ -f $(SETTINGS_DIR)/settings.php ]; then
+    echo "***** $(SETTINGS_DIR)/settings.php Found ***** "
+	echo "***** Preserving Existing Config ***** "
+else
+	cp $(SETTINGS_DIR)/settings.php.CSW $(SETTINGS_DIR)/settings.php
+	chmod o+w $(SETTINGS_DIR)/settings.php
+	chmod o+w $(SETTINGS_DIR)
+fi
+
+perl -i -pne 's|_DRUPALDIR_|$(DRUPAL_INST_DIR)|' $${AP2EXTRADIR}/httpd-drupal.conf.CSW
+
+if [ -f $${AP2EXTRADIR}/httpd-drupal.conf ]; then
+	echo "***** $${AP2EXTRADIR}/httpd-drupal.conf Found *****"
+	echo "***** Preserving Existing Config *****"
+else
+	cp $${AP2EXTRADIR}/httpd-drupal.conf.CSW $${AP2EXTRADIR}/httpd-drupal.conf
+fi
+
+if [ -n "`grep 'Include etc/extra/httpd-drupal.conf' $${AP2CONF}`" ]; then
+	perl -i -pne 's|#(Include etc/extra/httpd-drupal.conf)|$$1|' $${AP2CONF}
+else
+	cat << END >>$${AP2CONF}
+	
+Include etc/extra/httpd-drupal.conf
+END
+fi
+cat << _EOM_
+
+*********************************************************************
+*    NOTICE:
+*          drupal has been enabled in $${AP2CONF}
+*          You will need to restart your web server
+*          To finish the install.
+*********************************************************************
+
+_EOM_
+endef
+
+define CSWdrupal_preremove
+#!/bin/sh
+
+PATH=/usr/bin:/usr/sbin
+
+AP2CONF=/opt/csw/apache2/etc/httpd.conf
+
+perl -i -pne 's|(?
+    AllowOverride None
+    
+        Order allow,deny
+        Allow from all
+    
+    
+        Order deny,allow
+        Deny from all
+    
+
+


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

From valholla at users.sourceforge.net  Thu May 21 17:41:42 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Thu, 21 May 2009 15:41:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[4996]
	csw/mgar/pkg/drupal/trunk/Makefile
Message-ID: 

Revision: 4996
          http://gar.svn.sourceforge.net/gar/?rev=4996&view=rev
Author:   valholla
Date:     2009-05-21 15:41:42 +0000 (Thu, 21 May 2009)

Log Message:
-----------
package checkin

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

Modified: csw/mgar/pkg/drupal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/drupal/trunk/Makefile	2009-05-21 15:32:17 UTC (rev 4995)
+++ csw/mgar/pkg/drupal/trunk/Makefile	2009-05-21 15:41:42 UTC (rev 4996)
@@ -32,7 +32,7 @@
 BUILD_SCRIPTS     = 
 INSTALL_SCRIPTS   = custom
 
-REQUIRED_PKGS_CSWdrupal = CSWapache2c CSWphp5 CSWphp5gd 
+REQUIRED_PKGS_CSWdrupal = CSWapache2c CSWphp5 CSWphp5gd CSWap2modphp5
 
 ## There are no tests for this
 TEST_SCRIPTS = skip


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

From skayser at users.sourceforge.net  Thu May 21 18:21:57 2009
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Thu, 21 May 2009 16:21:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[4997] csw/mgar/pkg
Message-ID: 

Revision: 4997
          http://gar.svn.sourceforge.net/gar/?rev=4997&view=rev
Author:   skayser
Date:     2009-05-21 16:21:57 +0000 (Thu, 21 May 2009)

Log Message:
-----------
mailx: initial commit

Added Paths:
-----------
    csw/mgar/pkg/mailx/
    csw/mgar/pkg/mailx/branches/
    csw/mgar/pkg/mailx/tags/
    csw/mgar/pkg/mailx/trunk/
    csw/mgar/pkg/mailx/trunk/Makefile
    csw/mgar/pkg/mailx/trunk/checksums
    csw/mgar/pkg/mailx/trunk/files/
    csw/mgar/pkg/mailx/trunk/files/changelog.CSW


Property changes on: csw/mgar/pkg/mailx/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/mailx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mailx/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/mailx/trunk/Makefile	2009-05-21 16:21:57 UTC (rev 4997)
@@ -0,0 +1,58 @@
+GARNAME = mailx
+GARVERSION = 12.4
+CATEGORIES = apps
+
+DESCRIPTION = Simple mail user agent, formerly known as nail
+define BLURB
+  Mailx is derived from Berkeley Mail and is intended provide the
+  functionality of the POSIX mailx command with additional support
+  for MIME, IMAP, POP3, SMTP, and S/MIME. It provides enhanced
+  features for interactive use, such as caching and disconnected
+  operation for IMAP, message threading, scoring, and filtering.
+  It is also usable as a mail batch language, both for sending
+  and receiving mail.
+endef
+
+MASTER_SITES = $(SF_MIRRORS)
+SF_PROJ = heirloom
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
+
+SPKG_CLASSES = none cswcpsampleconf
+
+REQUIRED_PKGS = CSWcswclassutils CSWosslrt CSWiconv
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=106236
+UPSTREAM_USE_SF = 1
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+CONFIGURE_SCRIPTS =
+TEST_SCRIPTS =
+
+PROTOTYPE_FILTER  = awk '\
+	$$$$3 ~ /nail.rc.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
+	 { print }'
+
+include gar/category.mk
+
+MAKE_ARGS = \
+	PREFIX=$(prefix) \
+	BINDIR=$(bindir) \
+	MANDIR=$(mandir) \
+	SYSCONFDIR=$(sysconfdir)/$(GARNAME) \
+	MAILSPOOL=/var/mail \
+	SENDMAIL=/usr/lib/sendmail \
+ 	UCBINSTALL=/usr/ucb/install
+
+BUILD_ARGS = $(MAKE_ARGS)
+INSTALL_ARGS = $(MAKE_ARGS)
+
+post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME)
+post-install-modulated: DOCS = README TODO AUTHORS ChangeLog
+post-install-modulated:
+	@ginstall -d $(DOCDEST)
+	@$(foreach DOC,$(DOCS),cp $(WORKSRC)/$(DOC) $(DOCDEST);)
+	@cp $(FILEDIR)/changelog.CSW $(DOCDEST)
+	@mv $(DESTDIR)$(sysconfdir)/$(GARNAME)/nail.rc \
+		$(DESTDIR)$(sysconfdir)/$(GARNAME)/nail.rc.CSW
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/mailx/trunk/checksums
===================================================================
--- csw/mgar/pkg/mailx/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/mailx/trunk/checksums	2009-05-21 16:21:57 UTC (rev 4997)
@@ -0,0 +1 @@
+0c93759e34200eb56a0e7c464680a54a  download/mailx-12.4.tar.bz2

Added: csw/mgar/pkg/mailx/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/mailx/trunk/files/changelog.CSW	                        (rev 0)
+++ csw/mgar/pkg/mailx/trunk/files/changelog.CSW	2009-05-21 16:21:57 UTC (rev 4997)
@@ -0,0 +1,6 @@
+mailx (12.4,REV=2009.05.21)
+
+  * Package name change, was formerly known as nail.
+  * Adopted and updated to 12.4 (Closes #2633, #2462, #2324).
+
+ -- Sebastian Kayser   Thu, 21 May 2009 18:05:39 +0200


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

From skayser at users.sourceforge.net  Thu May 21 18:26:41 2009
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Thu, 21 May 2009 16:26:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[4998] csw/mgar/pkg/mailx/trunk/Makefile
Message-ID: 

Revision: 4998
          http://gar.svn.sourceforge.net/gar/?rev=4998&view=rev
Author:   skayser
Date:     2009-05-21 16:26:41 +0000 (Thu, 21 May 2009)

Log Message:
-----------
mailx: added html manual

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

Modified: csw/mgar/pkg/mailx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mailx/trunk/Makefile	2009-05-21 16:21:57 UTC (rev 4997)
+++ csw/mgar/pkg/mailx/trunk/Makefile	2009-05-21 16:26:41 UTC (rev 4998)
@@ -48,7 +48,7 @@
 INSTALL_ARGS = $(MAKE_ARGS)
 
 post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME)
-post-install-modulated: DOCS = README TODO AUTHORS ChangeLog
+post-install-modulated: DOCS = README TODO AUTHORS ChangeLog mailx.1.html
 post-install-modulated:
 	@ginstall -d $(DOCDEST)
 	@$(foreach DOC,$(DOCS),cp $(WORKSRC)/$(DOC) $(DOCDEST);)


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

From valholla at users.sourceforge.net  Thu May 21 19:17:52 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Thu, 21 May 2009 17:17:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[4999] csw/mgar/pkg/drupal/trunk
Message-ID: 

Revision: 4999
          http://gar.svn.sourceforge.net/gar/?rev=4999&view=rev
Author:   valholla
Date:     2009-05-21 17:17:52 +0000 (Thu, 21 May 2009)

Log Message:
-----------
tweaks

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

Modified: csw/mgar/pkg/drupal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/drupal/trunk/Makefile	2009-05-21 16:26:41 UTC (rev 4998)
+++ csw/mgar/pkg/drupal/trunk/Makefile	2009-05-21 17:17:52 UTC (rev 4999)
@@ -15,6 +15,7 @@
 MASTER_SITES = http://ftp.drupal.org/files/projects/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 DISTFILES += httpd-drupal.conf.CSW
+DISTFILES += README.CSW
 
 PACKAGES = CSWdrupal
 CATALOGNAME_CSWdrupal = drupal
@@ -32,7 +33,8 @@
 BUILD_SCRIPTS     = 
 INSTALL_SCRIPTS   = custom
 
-REQUIRED_PKGS_CSWdrupal = CSWapache2c CSWphp5 CSWphp5gd CSWap2modphp5
+REQUIRED_PKGS_CSWdrupal  = CSWapache2c CSWphp5 CSWphp5gd CSWphp5mbstring
+REQUIRED_PKGS_CSWdrupal += CSWphp5session CSWap2modphp5
 
 ## There are no tests for this
 TEST_SCRIPTS = skip
@@ -47,9 +49,19 @@
 install-custom:
 	ginstall -d $(DESTDIR)$(DRUPAL_INST_DIR)
 	ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
+	ginstall -d $(DESTDIR)$(docdir)/drupal
 	cd $(WORKSRC); /usr/bin/pax -rw -v * $(DESTDIR)$(DRUPAL_INST_DIR)
 	gmv $(DESTDIR)$(SETTINGS_DIR)/default.settings.php $(DESTDIR)$(SETTINGS_DIR)/settings.php.CSW
 	gcp $(DOWNLOADDIR)/httpd-drupal.conf.CSW $(DESTDIR)$(prefix)/apache2/etc/extra
+	gcp $(DOWNLOADDIR)/README.CSW $(DESTDIR)$(docdir)/drupal/license
+	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/LICENSE.txt $(DESTDIR)$(docdir)/drupal/license
+	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/COPYRIGHT.txt $(DESTDIR)$(docdir)/drupal/
+	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/CHANGELOG.txt $(DESTDIR)$(docdir)/drupal/
+	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/INSTALL.mysql.txt $(DESTDIR)$(docdir)/drupal/
+	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/INSTALL.pgsql.txt $(DESTDIR)$(docdir)/drupal/
+	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/INSTALL.txt $(DESTDIR)$(docdir)/drupal/
+	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/MAINTAINERS.txt $(DESTDIR)$(docdir)/drupal/
+	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/UPGRADE.txt $(DESTDIR)$(docdir)/drupal/
 	@$(MAKECOOKIE)
 
 
@@ -106,6 +118,16 @@
 *          To finish the install.
 *********************************************************************
 
+*********************************************************************
+*	You need to install and or configure either
+*   PostgreSQL: pkg-get -i postgresql
+*   MySQL: pkg-get -i mysql5rt mysql5client mysql5
+*	
+*	For instructions on configuring Please Read
+*   $$PKG_INST_ROOT/opt/csw/share/doc/drupal/README.CSW
+*
+*********************************************************************
+
 _EOM_
 endef
 

Modified: csw/mgar/pkg/drupal/trunk/checksums
===================================================================
--- csw/mgar/pkg/drupal/trunk/checksums	2009-05-21 16:26:41 UTC (rev 4998)
+++ csw/mgar/pkg/drupal/trunk/checksums	2009-05-21 17:17:52 UTC (rev 4999)
@@ -1,2 +1,3 @@
+426d94c1783287c1ebe94980570c34be  download/README.CSW
 82e2517f175320cffe20997333b3a33a  download/drupal-6.12.tar.gz
 6f0b81503fb622b33f27a1ba63e66560  download/httpd-drupal.conf.CSW


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

From valholla at users.sourceforge.net  Thu May 21 19:18:55 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Thu, 21 May 2009 17:18:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[5000]
	csw/mgar/pkg/drupal/trunk/Makefile
Message-ID: 

Revision: 5000
          http://gar.svn.sourceforge.net/gar/?rev=5000&view=rev
Author:   valholla
Date:     2009-05-21 17:18:54 +0000 (Thu, 21 May 2009)

Log Message:
-----------
tweaks

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

Modified: csw/mgar/pkg/drupal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/drupal/trunk/Makefile	2009-05-21 17:17:52 UTC (rev 4999)
+++ csw/mgar/pkg/drupal/trunk/Makefile	2009-05-21 17:18:54 UTC (rev 5000)
@@ -53,7 +53,7 @@
 	cd $(WORKSRC); /usr/bin/pax -rw -v * $(DESTDIR)$(DRUPAL_INST_DIR)
 	gmv $(DESTDIR)$(SETTINGS_DIR)/default.settings.php $(DESTDIR)$(SETTINGS_DIR)/settings.php.CSW
 	gcp $(DOWNLOADDIR)/httpd-drupal.conf.CSW $(DESTDIR)$(prefix)/apache2/etc/extra
-	gcp $(DOWNLOADDIR)/README.CSW $(DESTDIR)$(docdir)/drupal/license
+	gcp $(DOWNLOADDIR)/README.CSW $(DESTDIR)$(docdir)/drupal/
 	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/LICENSE.txt $(DESTDIR)$(docdir)/drupal/license
 	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/COPYRIGHT.txt $(DESTDIR)$(docdir)/drupal/
 	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/CHANGELOG.txt $(DESTDIR)$(docdir)/drupal/


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

From valholla at users.sourceforge.net  Thu May 21 19:24:53 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Thu, 21 May 2009 17:24:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[5001]
	csw/mgar/pkg/drupal/trunk/files/README.CSW
Message-ID: 

Revision: 5001
          http://gar.svn.sourceforge.net/gar/?rev=5001&view=rev
Author:   valholla
Date:     2009-05-21 17:24:53 +0000 (Thu, 21 May 2009)

Log Message:
-----------
add README.CSW

Added Paths:
-----------
    csw/mgar/pkg/drupal/trunk/files/README.CSW

Added: csw/mgar/pkg/drupal/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/drupal/trunk/files/README.CSW	                        (rev 0)
+++ csw/mgar/pkg/drupal/trunk/files/README.CSW	2009-05-21 17:24:53 UTC (rev 5001)
@@ -0,0 +1,45 @@
+README.CSW
+==========
+
+Configuration
+=============
+1) Setup the Drupal Database
+2) Point Your Web browser to
+   http://mydomain/drupal/install.php
+and follow the instructions
+
+
+
+Setup the Drupal Database
+=========================
+Drupal Requires either:
+     * MySQL (http://www.mysql.com)
+     * PostgreSQL (http://www.postgresql.org/)
+
+Using MySQL
+===========
+1) if you have not done so, install mysql
+# pkg-get -i mysql5rt mysql5client mysql5
+2) configure and start mysql
+3) Add /opt/csw/mysql5/bin to your PATH
+4) Create the Database
+# mysqladmin -u drupal -p password create drupal
+  ** replace password above with one of your choosing
+5) Set Permissions on the new DB
+# mysql -u drupal -p   
+  ** this will prompt for the password you used in 4)
+At the mysql prompt enter the following command:
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER
+ON drupal.* TO drupal at localhost IDENTIFIED BY password;
+  ** where password is the password from 4)
+
+Using PostgreSQL
+================
+1) if you have not done so, install postgresql
+# pkg-get -i postgresql
+2) Create DB User
+# createuser --pwprompt --encrypted --no-adduser --no-createdb drupal
+  ** this will prompt you for a password for the new drupal user
+3) createdb --encoding=UNICODE --owner=drupal drupal
+
+


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

From valholla at users.sourceforge.net  Thu May 21 20:19:10 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Thu, 21 May 2009 18:19:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[5002] csw/mgar/pkg/drupal/trunk
Message-ID: 

Revision: 5002
          http://gar.svn.sourceforge.net/gar/?rev=5002&view=rev
Author:   valholla
Date:     2009-05-21 18:19:09 +0000 (Thu, 21 May 2009)

Log Message:
-----------
post install tweaks

Modified Paths:
--------------
    csw/mgar/pkg/drupal/trunk/Makefile
    csw/mgar/pkg/drupal/trunk/files/README.CSW

Modified: csw/mgar/pkg/drupal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/drupal/trunk/Makefile	2009-05-21 17:24:53 UTC (rev 5001)
+++ csw/mgar/pkg/drupal/trunk/Makefile	2009-05-21 18:19:09 UTC (rev 5002)
@@ -51,7 +51,7 @@
 	ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
 	ginstall -d $(DESTDIR)$(docdir)/drupal
 	cd $(WORKSRC); /usr/bin/pax -rw -v * $(DESTDIR)$(DRUPAL_INST_DIR)
-	gmv $(DESTDIR)$(SETTINGS_DIR)/default.settings.php $(DESTDIR)$(SETTINGS_DIR)/settings.php.CSW
+	gcp $(DESTDIR)$(SETTINGS_DIR)/default.settings.php $(DESTDIR)$(SETTINGS_DIR)/settings.php.CSW
 	gcp $(DOWNLOADDIR)/httpd-drupal.conf.CSW $(DESTDIR)$(prefix)/apache2/etc/extra
 	gcp $(DOWNLOADDIR)/README.CSW $(DESTDIR)$(docdir)/drupal/
 	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/LICENSE.txt $(DESTDIR)$(docdir)/drupal/license
@@ -81,7 +81,6 @@
 if [ -z $${AP2GRP} ]; then
 	AP2GRP=nobody
 fi
-chown -R $${AP2USR}:$${AP2GRP} $(DRUPAL_BASE_INSTDIR)/$(GARNAME)
 
 if [ -f $(SETTINGS_DIR)/settings.php ]; then
     echo "***** $(SETTINGS_DIR)/settings.php Found ***** "
@@ -109,6 +108,7 @@
 Include etc/extra/httpd-drupal.conf
 END
 fi
+chown -R $${AP2USR}:$${AP2GRP} $(DRUPAL_BASE_INSTDIR)/$(GARNAME)
 cat << _EOM_
 
 *********************************************************************

Modified: csw/mgar/pkg/drupal/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/drupal/trunk/files/README.CSW	2009-05-21 17:24:53 UTC (rev 5001)
+++ csw/mgar/pkg/drupal/trunk/files/README.CSW	2009-05-21 18:19:09 UTC (rev 5002)
@@ -19,24 +19,22 @@
 Using MySQL
 ===========
 1) if you have not done so, install mysql
-# pkg-get -i mysql5rt mysql5client mysql5
+# pkg-get -i mysql5rt mysql5client mysql5 php5_mysqli
 2) configure and start mysql
 3) Add /opt/csw/mysql5/bin to your PATH
-4) Create the Database
-# mysqladmin -u drupal -p password create drupal
-  ** replace password above with one of your choosing
-5) Set Permissions on the new DB
-# mysql -u drupal -p   
-  ** this will prompt for the password you used in 4)
-At the mysql prompt enter the following command:
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER
-ON drupal.* TO drupal at localhost IDENTIFIED BY password;
+4) Set Permissions on the new DB
+# mysql -u root -p   
+  ** root can be any user that has superuser priv for MySQL
+At the mysql prompt enter the following commands:
+CREATE DATABASE drupal ;
+USE drupal;
+GRANT ALL ON drupal.* TO drupal at localhost IDENTIFIED BY 'PASSWORD_CHANGE_ME';
   ** where password is the password from 4)
 
 Using PostgreSQL
 ================
 1) if you have not done so, install postgresql
-# pkg-get -i postgresql
+# pkg-get -i postgresql php5_pgsql
 2) Create DB User
 # createuser --pwprompt --encrypted --no-adduser --no-createdb drupal
   ** this will prompt you for a password for the new drupal user


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

From valholla at users.sourceforge.net  Thu May 21 20:27:08 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Thu, 21 May 2009 18:27:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[5003]
	csw/mgar/pkg/drupal/trunk/checksums
Message-ID: 

Revision: 5003
          http://gar.svn.sourceforge.net/gar/?rev=5003&view=rev
Author:   valholla
Date:     2009-05-21 18:27:08 +0000 (Thu, 21 May 2009)

Log Message:
-----------
checksum fix

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

Modified: csw/mgar/pkg/drupal/trunk/checksums
===================================================================
--- csw/mgar/pkg/drupal/trunk/checksums	2009-05-21 18:19:09 UTC (rev 5002)
+++ csw/mgar/pkg/drupal/trunk/checksums	2009-05-21 18:27:08 UTC (rev 5003)
@@ -1,3 +1,3 @@
-426d94c1783287c1ebe94980570c34be  download/README.CSW
+50393aa311a5d0d92522e7215439119e  download/README.CSW
 82e2517f175320cffe20997333b3a33a  download/drupal-6.12.tar.gz
 6f0b81503fb622b33f27a1ba63e66560  download/httpd-drupal.conf.CSW


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

From valholla at users.sourceforge.net  Thu May 21 20:58:04 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Thu, 21 May 2009 18:58:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[5004]
 csw/mgar/pkg/drupal/trunk/files/httpd-drupal.conf. CSW
Message-ID: 

Revision: 5004
          http://gar.svn.sourceforge.net/gar/?rev=5004&view=rev
Author:   valholla
Date:     2009-05-21 18:58:04 +0000 (Thu, 21 May 2009)

Log Message:
-----------
tweak httpd file

Modified Paths:
--------------
    csw/mgar/pkg/drupal/trunk/files/httpd-drupal.conf.CSW

Modified: csw/mgar/pkg/drupal/trunk/files/httpd-drupal.conf.CSW
===================================================================
--- csw/mgar/pkg/drupal/trunk/files/httpd-drupal.conf.CSW	2009-05-21 18:27:08 UTC (rev 5003)
+++ csw/mgar/pkg/drupal/trunk/files/httpd-drupal.conf.CSW	2009-05-21 18:58:04 UTC (rev 5004)
@@ -1,7 +1,17 @@
-
 Alias /drupal "_DRUPALDIR_"
 
 
+
+  # Rewrite current-style URLs of the form 'index.php?q=x'.
+  RewriteEngine on
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule ^(.*)$ /drupal/index.php?q=$1 [L,QSA]
+  RewriteCond  %{REQUEST_FILENAME} !^/$
+  RewriteCond  %{REQUEST_FILENAME} !^/(files|misc|uploads)(/.*)?
+  RewriteCond  %{REQUEST_FILENAME} !\.(php|ico|png|jpg|gif|css|js|html?)(\W.*)?
+  RewriteRule ^(.*)$ /drupal/index.php?q=$1 [L,QSA]
+
     AllowOverride None
     
         Order allow,deny


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

From valholla at users.sourceforge.net  Thu May 21 21:04:38 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Thu, 21 May 2009 19:04:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[5005]
	csw/mgar/pkg/drupal/trunk/checksums
Message-ID: 

Revision: 5005
          http://gar.svn.sourceforge.net/gar/?rev=5005&view=rev
Author:   valholla
Date:     2009-05-21 19:04:38 +0000 (Thu, 21 May 2009)

Log Message:
-----------
checksum fix

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

Modified: csw/mgar/pkg/drupal/trunk/checksums
===================================================================
--- csw/mgar/pkg/drupal/trunk/checksums	2009-05-21 18:58:04 UTC (rev 5004)
+++ csw/mgar/pkg/drupal/trunk/checksums	2009-05-21 19:04:38 UTC (rev 5005)
@@ -1,3 +1,3 @@
 50393aa311a5d0d92522e7215439119e  download/README.CSW
 82e2517f175320cffe20997333b3a33a  download/drupal-6.12.tar.gz
-6f0b81503fb622b33f27a1ba63e66560  download/httpd-drupal.conf.CSW
+26a7b490bfe0b52a9ff85880dd3aede1  download/httpd-drupal.conf.CSW


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

From skayser at users.sourceforge.net  Thu May 21 23:54:46 2009
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Thu, 21 May 2009 21:54:46 +0000
Subject: [csw-devel] SF.net SVN: gar:[5006] csw/mgar/pkg/mailx/trunk/Makefile
Message-ID: 

Revision: 5006
          http://gar.svn.sourceforge.net/gar/?rev=5006&view=rev
Author:   skayser
Date:     2009-05-21 21:54:46 +0000 (Thu, 21 May 2009)

Log Message:
-----------
mailx: added incompatibility to CSWnail and nail symlink

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

Modified: csw/mgar/pkg/mailx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mailx/trunk/Makefile	2009-05-21 19:04:38 UTC (rev 5005)
+++ csw/mgar/pkg/mailx/trunk/Makefile	2009-05-21 21:54:46 UTC (rev 5006)
@@ -21,6 +21,9 @@
 
 REQUIRED_PKGS = CSWcswclassutils CSWosslrt CSWiconv
 
+# nail _is_ mailx now
+INCOMPATIBLE_PKGS = CSWnail
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=106236
 UPSTREAM_USE_SF = 1
@@ -55,4 +58,5 @@
 	@cp $(FILEDIR)/changelog.CSW $(DOCDEST)
 	@mv $(DESTDIR)$(sysconfdir)/$(GARNAME)/nail.rc \
 		$(DESTDIR)$(sysconfdir)/$(GARNAME)/nail.rc.CSW
+	@cd $(DESTDIR)$(bindir) && ln -s mailx nail
 	@$(MAKECOOKIE)


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

From valholla at users.sourceforge.net  Fri May 22 06:40:51 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Fri, 22 May 2009 04:40:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[5007] csw/mgar/pkg/drupal/trunk
Message-ID: 

Revision: 5007
          http://gar.svn.sourceforge.net/gar/?rev=5007&view=rev
Author:   valholla
Date:     2009-05-22 04:40:51 +0000 (Fri, 22 May 2009)

Log Message:
-----------
various fixes

Modified Paths:
--------------
    csw/mgar/pkg/drupal/trunk/Makefile
    csw/mgar/pkg/drupal/trunk/files/README.CSW

Added Paths:
-----------
    csw/mgar/pkg/drupal/trunk/files/uploaddir.diff

Modified: csw/mgar/pkg/drupal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/drupal/trunk/Makefile	2009-05-21 21:54:46 UTC (rev 5006)
+++ csw/mgar/pkg/drupal/trunk/Makefile	2009-05-22 04:40:51 UTC (rev 5007)
@@ -16,6 +16,7 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 DISTFILES += httpd-drupal.conf.CSW
 DISTFILES += README.CSW
+PATCHFILES = uploaddir.diff
 
 PACKAGES = CSWdrupal
 CATALOGNAME_CSWdrupal = drupal
@@ -32,36 +33,24 @@
 CONFIGURE_SCRIPTS = 
 BUILD_SCRIPTS     = 
 INSTALL_SCRIPTS   = custom
+TEST_SCRIPTS = 
 
 REQUIRED_PKGS_CSWdrupal  = CSWapache2c CSWphp5 CSWphp5gd CSWphp5mbstring
 REQUIRED_PKGS_CSWdrupal += CSWphp5session CSWap2modphp5
 
-## There are no tests for this
-TEST_SCRIPTS = skip
+DRUPAL_INST_DIR = $(DESTDIR)$(datadir)/$(GARNAME)/$(GARVERSION)
+DRUPAL_DOCFILES  = CHANGELOG.txt COPYRIGHT.txt INSTALL.mysql.txt
+DRUPAL_DOCFILES += INSTALL.pgsql.txt INSTALL.txt LICENSE.txt
+DRUPAL_DOCFILES += MAINTAINERS.txt UPGRADE.txt
 
-test-skip:
-	@$(MAKECOOKIE)
-
-DRUPAL_BASE_INSTDIR = $(prefix)
-DRUPAL_INST_DIR = $(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)
-SETTINGS_DIR=$(DRUPAL_INST_DIR)/sites/default
-
 install-custom:
-	ginstall -d $(DESTDIR)$(DRUPAL_INST_DIR)
-	ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
-	ginstall -d $(DESTDIR)$(docdir)/drupal
-	cd $(WORKSRC); /usr/bin/pax -rw -v * $(DESTDIR)$(DRUPAL_INST_DIR)
-	gcp $(DESTDIR)$(SETTINGS_DIR)/default.settings.php $(DESTDIR)$(SETTINGS_DIR)/settings.php.CSW
-	gcp $(DOWNLOADDIR)/httpd-drupal.conf.CSW $(DESTDIR)$(prefix)/apache2/etc/extra
-	gcp $(DOWNLOADDIR)/README.CSW $(DESTDIR)$(docdir)/drupal/
-	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/LICENSE.txt $(DESTDIR)$(docdir)/drupal/license
-	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/COPYRIGHT.txt $(DESTDIR)$(docdir)/drupal/
-	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/CHANGELOG.txt $(DESTDIR)$(docdir)/drupal/
-	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/INSTALL.mysql.txt $(DESTDIR)$(docdir)/drupal/
-	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/INSTALL.pgsql.txt $(DESTDIR)$(docdir)/drupal/
-	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/INSTALL.txt $(DESTDIR)$(docdir)/drupal/
-	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/MAINTAINERS.txt $(DESTDIR)$(docdir)/drupal/
-	gmv $(DESTDIR)$(DRUPAL_BASE_INSTDIR)/$(GARNAME)/$(GARVERSION)/UPGRADE.txt $(DESTDIR)$(docdir)/drupal/
+	ginstall -d $(DRUPAL_INST_DIR)/documentation
+	ginstall -d $(DRUPAL_INST_DIR)/contrib
+	cd $(WORKSRC); /usr/bin/pax -rw -v * $(DRUPAL_INST_DIR)
+	gcp $(DOWNLOADDIR)/httpd-drupal.conf.CSW $(DRUPAL_INST_DIR)/contrib
+	gcp $(DOWNLOADDIR)/README.CSW $(DRUPAL_INST_DIR)/documentation
+	for file in $(DRUPAL_DOCFILES); do \
+		gmv $(DRUPAL_INST_DIR)/$${file} $(DRUPAL_INST_DIR)/documentation/; done
 	@$(MAKECOOKIE)
 
 
@@ -70,86 +59,21 @@
 
 PATH=/usr/bin:/usr/sbin
 
-AP2CONF=/opt/csw/apache2/etc/httpd.conf
-AP2EXTRADIR=/opt/csw/apache2/etc/extra
-AP2USR="`sed -ne 's/^User \(.*\)/\1/p' $${AP2CONF}`"
-AP2GRP="`sed -ne 's/^Group \(.*\)/\1/p' $${AP2CONF}`"
+mkdir -p /var/opt/csw/drupal/upload
+chmod o+w /var/opt/csw/drupal/upload
 
-if [ -z $${AP2USR} ]; then
-	AP2USR=nobody
-fi
-if [ -z $${AP2GRP} ]; then
-	AP2GRP=nobody
-fi
-
-if [ -f $(SETTINGS_DIR)/settings.php ]; then
-    echo "***** $(SETTINGS_DIR)/settings.php Found ***** "
-	echo "***** Preserving Existing Config ***** "
-else
-	cp $(SETTINGS_DIR)/settings.php.CSW $(SETTINGS_DIR)/settings.php
-	chmod o+w $(SETTINGS_DIR)/settings.php
-	chmod o+w $(SETTINGS_DIR)
-fi
-
-perl -i -pne 's|_DRUPALDIR_|$(DRUPAL_INST_DIR)|' $${AP2EXTRADIR}/httpd-drupal.conf.CSW
-
-if [ -f $${AP2EXTRADIR}/httpd-drupal.conf ]; then
-	echo "***** $${AP2EXTRADIR}/httpd-drupal.conf Found *****"
-	echo "***** Preserving Existing Config *****"
-else
-	cp $${AP2EXTRADIR}/httpd-drupal.conf.CSW $${AP2EXTRADIR}/httpd-drupal.conf
-fi
-
-if [ -n "`grep 'Include etc/extra/httpd-drupal.conf' $${AP2CONF}`" ]; then
-	perl -i -pne 's|#(Include etc/extra/httpd-drupal.conf)|$$1|' $${AP2CONF}
-else
-	cat << END >>$${AP2CONF}
-	
-Include etc/extra/httpd-drupal.conf
-END
-fi
-chown -R $${AP2USR}:$${AP2GRP} $(DRUPAL_BASE_INSTDIR)/$(GARNAME)
 cat << _EOM_
 
 *********************************************************************
 *    NOTICE:
-*          drupal has been enabled in $${AP2CONF}
-*          You will need to restart your web server
-*          To finish the install.
-*********************************************************************
-
-*********************************************************************
-*	You need to install and or configure either
-*   PostgreSQL: pkg-get -i postgresql
-*   MySQL: pkg-get -i mysql5rt mysql5client mysql5
+*	Before you can use druppal you need to configure it.
 *	
 *	For instructions on configuring Please Read
-*   $$PKG_INST_ROOT/opt/csw/share/doc/drupal/README.CSW
+*   $$PKG_INST_ROOT/drupal/documentation/README.CSW
 *
 *********************************************************************
 
 _EOM_
 endef
 
-define CSWdrupal_preremove
-#!/bin/sh
-
-PATH=/usr/bin:/usr/sbin
-
-AP2CONF=/opt/csw/apache2/etc/httpd.conf
-
-perl -i -pne 's|(?

Revision: 5008
          http://gar.svn.sourceforge.net/gar/?rev=5008&view=rev
Author:   bonivart
Date:     2009-05-22 12:54:33 +0000 (Fri, 22 May 2009)

Log Message:
-----------
MIME-Base64: move to GAR and remove man pages (duplicate in perldoc pkg)

Added Paths:
-----------
    csw/mgar/pkg/cpan/MIME-Base64/
    csw/mgar/pkg/cpan/MIME-Base64/branches/
    csw/mgar/pkg/cpan/MIME-Base64/tags/
    csw/mgar/pkg/cpan/MIME-Base64/trunk/
    csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile
    csw/mgar/pkg/cpan/MIME-Base64/trunk/checksums
    csw/mgar/pkg/cpan/MIME-Base64/trunk/files/
    csw/mgar/pkg/cpan/MIME-Base64/trunk/files/COPYING


Property changes on: csw/mgar/pkg/cpan/MIME-Base64/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/cpan/MIME-Base64/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile	2009-05-22 12:54:33 UTC (rev 5008)
@@ -0,0 +1,23 @@
+GARNAME = MIME-Base64
+GARVERSION = 3.07
+CATEGORIES = cpan
+AUTHOR = GAAS
+
+DESCRIPTION = Encoding and decoding of base64 strings
+define BLURB
+  Encoding and decoding of base64 strings
+endef
+
+DISTFILES += COPYING
+
+CATALOGNAME = pm_mimebase64
+PACKAGES = CSWpmmimebase64
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
+
+EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*\/man\/.*
+
+CONFIGURE_ARGS = 
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/MIME-Base64/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/MIME-Base64/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/MIME-Base64/trunk/checksums	2009-05-22 12:54:33 UTC (rev 5008)
@@ -0,0 +1,2 @@
+aa9873abcfbf59300a1e7a088eab4fb0  download/COPYING
+f466b62afc4fec7f262b0910913293b3  download/MIME-Base64-3.07.tar.gz

Added: csw/mgar/pkg/cpan/MIME-Base64/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/MIME-Base64/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/MIME-Base64/trunk/files/COPYING	2009-05-22 12:54:33 UTC (rev 5008)
@@ -0,0 +1,4 @@
+Copyright 1995-1999,2001-2004 Gisle Aas 
+
+This library is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.


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

From ellson at users.sourceforge.net  Fri May 22 19:08:34 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Fri, 22 May 2009 17:08:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[5009] csw/mgar/pkg
Message-ID: 

Revision: 5009
          http://gar.svn.sourceforge.net/gar/?rev=5009&view=rev
Author:   ellson
Date:     2009-05-22 17:08:33 +0000 (Fri, 22 May 2009)

Log Message:
-----------
initial commit of libLASi

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


Property changes on: csw/mgar/pkg/libLASi/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/libLASi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libLASi/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/libLASi/trunk/Makefile	2009-05-22 17:08:33 UTC (rev 5009)
@@ -0,0 +1,44 @@
+GARNAME = libLASi
+GARVERSION = 1.1.0
+CATEGORIES = lib
+
+DESCRIPTION = C++ library for PostSript generation with full Unicode support
+define BLURB
+  libLASi is a library written by Larry Siden  that provides a C++ stream
+  output interface ( with operator << ) for creating Postscript documents
+  that can contain characters from any of the scripts and symbol blocks
+  supported in Unicode  and by Owen Taylor's Pango layout engine. The
+  library accomodates right-to-left scripts such as Arabic and Hebrew
+  as easily as left-to-right scripts. Indic and Indic-derived Complex
+  Text Layout (CTL) scripts, such as Devanagari, Thai, Lao, and Tibetan
+  are supported to the extent provided by Pango and by the OpenType fonts
+  installed on your system. All of this is provided without need for any
+  special configuration or layout calculation on the programmer's part. 
+endef
+
+MASTER_SITES = $(SF_MIRRORS) 
+DISTFILES    = $(GARNAME)-$(GARVERSION).tar.gz
+
+# 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
+# 187113 is the group_id for the libLASi project on sourceforge
+UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE) = 187113
+UPSTREAM_USE_SF = 1
+
+REQUIRED_PKGS = CSWggettextrt CSWglib2 CSWpango
+
+CONFIGURE_SCRIPTS = custom
+
+include gar/category.mk
+
+WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)
+
+configure-custom:
+	@echo " ==> Configuring $(GARNAME) (custom)"
+	@( cd $(WORKSRC) ; \
+		cmake -DCMAKE_INSTALL_PREFIX=/opt/csw -DCMAKE_VERBOSE_MAKEFILE=ON . )
+	@$(MAKECOOKIE)
+

Added: csw/mgar/pkg/libLASi/trunk/checksums
===================================================================
--- csw/mgar/pkg/libLASi/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/libLASi/trunk/checksums	2009-05-22 17:08:33 UTC (rev 5009)
@@ -0,0 +1 @@
+f18091569ed4fface75453b097c67459  download/libLASi-1.1.0.tar.gz


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

From valholla at users.sourceforge.net  Fri May 22 19:19:59 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Fri, 22 May 2009 17:19:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[5010] csw/mgar/pkg/drupal/trunk
Message-ID: 

Revision: 5010
          http://gar.svn.sourceforge.net/gar/?rev=5010&view=rev
Author:   valholla
Date:     2009-05-22 17:19:58 +0000 (Fri, 22 May 2009)

Log Message:
-----------
make relocatable

Modified Paths:
--------------
    csw/mgar/pkg/drupal/trunk/Makefile
    csw/mgar/pkg/drupal/trunk/checksums
    csw/mgar/pkg/drupal/trunk/files/README.CSW

Modified: csw/mgar/pkg/drupal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/drupal/trunk/Makefile	2009-05-22 17:08:33 UTC (rev 5009)
+++ csw/mgar/pkg/drupal/trunk/Makefile	2009-05-22 17:19:58 UTC (rev 5010)
@@ -23,6 +23,7 @@
 SPKG_SOURCEURL = http://drupal.org/
 SPKG_DESC_CSWdrupal = $(DESCRIPTION)
 
+ALLOW_RELOCATE = 1
 
 # We define upstream file regex so we can be notifed of 
 # new upstream software release

Modified: csw/mgar/pkg/drupal/trunk/checksums
===================================================================
--- csw/mgar/pkg/drupal/trunk/checksums	2009-05-22 17:08:33 UTC (rev 5009)
+++ csw/mgar/pkg/drupal/trunk/checksums	2009-05-22 17:19:58 UTC (rev 5010)
@@ -1,3 +1,4 @@
-50393aa311a5d0d92522e7215439119e  download/README.CSW
+35825d0cc6e5c7792baa295d73b2ec19  download/README.CSW
 82e2517f175320cffe20997333b3a33a  download/drupal-6.12.tar.gz
 26a7b490bfe0b52a9ff85880dd3aede1  download/httpd-drupal.conf.CSW
+827f7d5f390a53577fc11ac17ad66651  download/uploaddir.diff

Modified: csw/mgar/pkg/drupal/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/drupal/trunk/files/README.CSW	2009-05-22 17:08:33 UTC (rev 5009)
+++ csw/mgar/pkg/drupal/trunk/files/README.CSW	2009-05-22 17:19:58 UTC (rev 5010)
@@ -13,11 +13,20 @@
     e) chown -R nobody:nobody /var/opt/csw/drupal
 
 2) Setup the Drupal Database
+    See Below
 
-3) Point Your Web browser to
+3) Setup your webserver
+    a) cp drupal/6.12/contrib/httpd-drupal.conf.CSW \
+            /opt/csw/apache2/etc/extra/httpd-drupal.conf
+    b) echo 'Include etc/extra/httpd-drupal.conf' \
+            >>/opt/csw/apache2/etc/httpd.conf
+    c) restart your webserver
+
+4) Point Your Web browser to
    http://mydomain/drupal/index.php
-and follow the instructions
 
+and follow the onscreen instructions
+
 Setup the Drupal Database
 =========================
 Drupal Requires either:
@@ -27,13 +36,13 @@
 Using MySQL
 ===========
 1) if you have not done so, install mysql
-# pkg-get -i mysql5rt mysql5client mysql5 php5_mysqli
+    a) pkg-get -i mysql5rt mysql5client mysql5 php5_mysqli
 2) configure and start mysql
 3) Add /opt/csw/mysql5/bin to your PATH
 4) Set Permissions on the new DB
-# mysql -u root -p   
-  ** root can be any user that has superuser priv for MySQL
-At the mysql prompt enter the following commands:
+    a) mysql -u root -p   
+        ** root can be any user that has superuser priv for MySQL
+    b) At the mysql prompt enter the following commands:
 CREATE DATABASE drupal ;
 USE drupal;
 GRANT ALL ON drupal.* TO drupal at localhost IDENTIFIED BY 'PASSWORD_CHANGE_ME';
@@ -42,10 +51,10 @@
 Using PostgreSQL
 ================
 1) if you have not done so, install postgresql
-# pkg-get -i postgresql php5_pgsql
+    a) pkg-get -i postgresql php5_pgsql
 2) Create DB User
-# createuser --pwprompt --encrypted --no-adduser --no-createdb drupal
-  ** this will prompt you for a password for the new drupal user
+    a) createuser --pwprompt --encrypted --no-adduser --no-createdb drupal
+        ** this will prompt you for a password for the new drupal user
 3) createdb --encoding=UNICODE --owner=drupal drupal
 
 


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

From ellson at users.sourceforge.net  Fri May 22 19:47:10 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Fri, 22 May 2009 17:47:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[5011] csw/mgar/pkg
Message-ID: 

Revision: 5011
          http://gar.svn.sourceforge.net/gar/?rev=5011&view=rev
Author:   ellson
Date:     2009-05-22 17:47:10 +0000 (Fri, 22 May 2009)

Log Message:
-----------
rename libLASi -> liblasi

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


Property changes on: csw/mgar/pkg/liblasi/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/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-22 17:47:10 UTC (rev 5011)
@@ -0,0 +1,36 @@
+GARNAME = libLASi
+GARVERSION = 1.1.0
+CATEGORIES = lib
+
+DESCRIPTION = C++ Unicode support for PostScript
+define BLURB
+  libLASi is a library written by Larry Siden that provides a C++ stream output
+  interface ( with operator << ) for creating Postscript documents that can contain
+  characters from any of the scripts and symbol blocks supported in Unicode and
+  by Owen Taylor's Pango layout engine. The library accomodates right-to-left
+  scripts such as Arabic and Hebrew as easily as left-to-right scripts. Indic and
+  Indic-derived Complex Text Layout (CTL) scripts, such as Devanagari, Thai, Lao,
+  and Tibetan are supported to the extent provided by Pango and by the OpenType
+  fonts installed on your system. All of this is provided without need for any
+  special configuration or layout calculation on the programmer's part.
+
+  Although the capability to produce Unicode-based multilingual Postscript
+  documents exists in large Open Source application framework libraries such
+  as GTK+, QT, and KDE, libLASi was designed for projects which require the
+  ability to produce Postscript independent of any one application framework. 
+endef
+
+MASTER_SITES = $(SF_MIRRORS)
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+
+# 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
+# 187113 is the group_id for the liblasi project on sourceforge
+UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE) = 187113
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk


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

From valholla at users.sourceforge.net  Fri May 22 19:49:09 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Fri, 22 May 2009 17:49:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[5012]
	csw/mgar/pkg/drupal/trunk/Makefile
Message-ID: 

Revision: 5012
          http://gar.svn.sourceforge.net/gar/?rev=5012&view=rev
Author:   valholla
Date:     2009-05-22 17:49:09 +0000 (Fri, 22 May 2009)

Log Message:
-----------
add RELOCATE_PREFIX

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

Modified: csw/mgar/pkg/drupal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/drupal/trunk/Makefile	2009-05-22 17:47:10 UTC (rev 5011)
+++ csw/mgar/pkg/drupal/trunk/Makefile	2009-05-22 17:49:09 UTC (rev 5012)
@@ -24,6 +24,7 @@
 SPKG_DESC_CSWdrupal = $(DESCRIPTION)
 
 ALLOW_RELOCATE = 1
+RELOCATE_PREFIX = /opt/csw/share
 
 # We define upstream file regex so we can be notifed of 
 # new upstream software release
@@ -39,7 +40,7 @@
 REQUIRED_PKGS_CSWdrupal  = CSWapache2c CSWphp5 CSWphp5gd CSWphp5mbstring
 REQUIRED_PKGS_CSWdrupal += CSWphp5session CSWap2modphp5
 
-DRUPAL_INST_DIR = $(DESTDIR)$(datadir)/$(GARNAME)/$(GARVERSION)
+DRUPAL_INST_DIR = $(DESTDIR)$(prefix)/$(GARNAME)/$(GARVERSION)
 DRUPAL_DOCFILES  = CHANGELOG.txt COPYRIGHT.txt INSTALL.mysql.txt
 DRUPAL_DOCFILES += INSTALL.pgsql.txt INSTALL.txt LICENSE.txt
 DRUPAL_DOCFILES += MAINTAINERS.txt UPGRADE.txt
@@ -70,7 +71,7 @@
 *	Before you can use druppal you need to configure it.
 *	
 *	For instructions on configuring Please Read
-*   $$PKG_INST_ROOT/drupal/documentation/README.CSW
+*   $${PKG_INST_ROOT}$${BASEDIR}/$(GARNAME)/$(GARVERSION)/documentation/README.CSW
 *
 *********************************************************************
 


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

From ellson at users.sourceforge.net  Fri May 22 19:58:22 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Fri, 22 May 2009 17:58:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[5013] csw/mgar/pkg/libLASi/
Message-ID: 

Revision: 5013
          http://gar.svn.sourceforge.net/gar/?rev=5013&view=rev
Author:   ellson
Date:     2009-05-22 17:58:19 +0000 (Fri, 22 May 2009)

Log Message:
-----------
need to rename libLASi because of uppercase

Removed Paths:
-------------
    csw/mgar/pkg/libLASi/


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

From ellson at users.sourceforge.net  Fri May 22 20:32:07 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Fri, 22 May 2009 18:32:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[5014] csw/mgar/pkg/liblasi/trunk
Message-ID: 

Revision: 5014
          http://gar.svn.sourceforge.net/gar/?rev=5014&view=rev
Author:   ellson
Date:     2009-05-22 18:32:06 +0000 (Fri, 22 May 2009)

Log Message:
-----------
first working Makefile

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

Modified: csw/mgar/pkg/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-22 17:58:19 UTC (rev 5013)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-22 18:32:06 UTC (rev 5014)
@@ -1,7 +1,9 @@
-GARNAME = libLASi
+GARNAME = liblasi
 GARVERSION = 1.1.0
 CATEGORIES = lib
 
+SOURCENAME = libLASi
+
 DESCRIPTION = C++ Unicode support for PostScript
 define BLURB
   libLASi is a library written by Larry Siden that provides a C++ stream output
@@ -21,16 +23,47 @@
 endef
 
 MASTER_SITES = $(SF_MIRRORS)
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES  = $(SOURCENAME)-$(GARVERSION).tar.gz
 
+REQUIRED_PKGS = CSWftype2 CSWgcc3corert CSWgcc3g++ CSWggettextrt CSWglib2 CSWpango CSWzlib
+
+CONFIGURE_SCRIPTS = custom
+BUILD_SCRIPTS = custom
+TEST_SCRIPTS = custom
+INSTALL_SCRIPTS = custom
+
 # We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+UFILES_REGEX = $(SOURCENAME)-(\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
 # 187113 is the group_id for the liblasi project on sourceforge
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE) = 187113
 
-CONFIGURE_ARGS = $(DIRPATHS)
+include gar/category.mk
 
-include gar/category.mk
+WORKSRC = $(WORKDIR)/$(SOURCENAME)-$(GARVERSION)
+
+configure-custom:
+	@echo " ==> Configuring $(GARNAME) (custom)"
+	@( cd $(WORKSRC) ; \
+		CXX=/opt/csw/gcc4/bin/g++ \
+		cmake	-DCMAKE_INSTALL_PREFIX=/opt/csw \
+			-DCMAKE_VERBOSE_MAKEFILE=ON \
+			. )
+	@$(MAKECOOKIE)
+
+build-custom:
+	@echo " ==> Building $(GARNAME) (custom)"
+	@( cd $(WORKSRC) ; gmake )
+	@$(MAKECOOKIE)
+
+test-custom:
+	@echo " ==> Testing $(GARNAME) (custom)"
+	@( cd $(WORKSRC) ; gmake  test)
+	@$(MAKECOOKIE)
+
+install-custom:
+	@echo " ==> Installing $(GARNAME) (custom)"
+	@( cd $(WORKSRC) ; gmake install DESTDIR=$(DESTDIR) )
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/liblasi/trunk/checksums
===================================================================
--- csw/mgar/pkg/liblasi/trunk/checksums	2009-05-22 17:58:19 UTC (rev 5013)
+++ csw/mgar/pkg/liblasi/trunk/checksums	2009-05-22 18:32:06 UTC (rev 5014)
@@ -0,0 +1 @@
+f18091569ed4fface75453b097c67459  download/libLASi-1.1.0.tar.gz


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

From valholla at users.sourceforge.net  Fri May 22 20:37:36 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Fri, 22 May 2009 18:37:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[5015] csw/mgar/pkg/drupal/trunk
Message-ID: 

Revision: 5015
          http://gar.svn.sourceforge.net/gar/?rev=5015&view=rev
Author:   valholla
Date:     2009-05-22 18:37:36 +0000 (Fri, 22 May 2009)

Log Message:
-----------
release ready checkin

Modified Paths:
--------------
    csw/mgar/pkg/drupal/trunk/Makefile
    csw/mgar/pkg/drupal/trunk/checksums
    csw/mgar/pkg/drupal/trunk/files/README.CSW

Modified: csw/mgar/pkg/drupal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/drupal/trunk/Makefile	2009-05-22 18:32:06 UTC (rev 5014)
+++ csw/mgar/pkg/drupal/trunk/Makefile	2009-05-22 18:37:36 UTC (rev 5015)
@@ -61,21 +61,91 @@
 
 PATH=/usr/bin:/usr/sbin
 
+DRUPAL_DIR=$${PKG_INST_ROOT}$${BASEDIR}/$(GARNAME)/$(GARVERSION)
+SETTINGS_DIR=$${DRUPAL_DIR}/sites/default
+CONTRIB_DIR=$${DRUPAL_DIR}/contrib
+AP2CONF=/opt/csw/apache2/etc/httpd.conf
+AP2EXTRADIR=/opt/csw/apache2/etc/extra
+AP2USR="`sed -ne 's/^User \(.*\)/\1/p' $${AP2CONF}`"
+AP2GRP="`sed -ne 's/^Group \(.*\)/\1/p' $${AP2CONF}`"
+if [ -z $${AP2USR} ]; then
+	AP2USR=nobody
+fi
+if [ -z $${AP2GRP} ]; then
+	AP2GRP=nobody
+fi
+
+if [ -f $${SETTINGS_DIR}/settings.php ]; then
+	echo "***** $${SETTINGS_DIR}/settings.php Found ***** "
+	echo "***** Preserving Existing Config ***** "
+else
+	cp $${SETTINGS_DIR}/default.settings.php $${SETTINGS_DIR}/settings.php
+	chmod o+w $${SETTINGS_DIR}/settings.php
+	chmod o+w $${SETTINGS_DIR}
+fi
+perl -i -pne "s|_DRUPALDIR_|$${DRUPAL_DIR}|" $${CONTRIB_DIR}/httpd-drupal.conf.CSW
+cp $${CONTRIB_DIR}/httpd-drupal.conf.CSW $${AP2EXTRADIR}/httpd-drupal.conf.CSW
+
+if [ -f $${AP2EXTRADIR}/httpd-drupal.conf ]; then
+	echo "***** $${AP2EXTRADIR}/httpd-drupal.conf Found *****"
+	echo "***** Preserving Existing Config *****"
+else
+	cp $${AP2EXTRADIR}/httpd-drupal.conf.CSW $${AP2EXTRADIR}/httpd-drupal.conf
+fi
+
+if [ -n "`grep 'Include etc/extra/httpd-drupal.conf' $${AP2CONF}`" ]; then
+      perl -i -pne 's|#(Include etc/extra/httpd-drupal.conf)|$$1|' $${AP2CONF}
+else
+      cat << END >>$${AP2CONF}
+
+Include etc/extra/httpd-drupal.conf
+
+END
+fi
 mkdir -p /var/opt/csw/drupal/upload
 chmod o+w /var/opt/csw/drupal/upload
+chown -R $${AP2USR}:$${AP2GRP} /var/opt/csw/drupal/upload
+chown -R $${AP2USR}:$${AP2GRP} $${DRUPAL_DIR}
 
 cat << _EOM_
+*********************************************************************
+*    NOTICE:
+*          drupal has been enabled in $${AP2CONF}
+*          You will need to restart your web server
+*          To finish the install.
+*********************************************************************
 
 *********************************************************************
-*    NOTICE:
-*	Before you can use druppal you need to configure it.
-*	
-*	For instructions on configuring Please Read
-*   $${PKG_INST_ROOT}$${BASEDIR}/$(GARNAME)/$(GARVERSION)/documentation/README.CSW
+*   NOTICE:
+*         Before you can use druppal you need to configure it.
 *
+*         For instructions on configuring Please Read
+*         $${PKG_INST_ROOT}$${BASEDIR}/$(GARNAME)/$(GARVERSION)/documentation/README.CSW
+*
 *********************************************************************
 
 _EOM_
 endef
 
+define CSWdrupal_preremove
+#!/bin/sh
+
+PATH=/usr/bin:/usr/sbin
+
+AP2CONF=/opt/csw/apache2/etc/httpd.conf
+
+perl -i -pne 's|(?>/opt/csw/apache2/etc/httpd.conf
-    c) restart your webserver
-
-4) Point Your Web browser to
+2) Point Your Web browser to
    http://mydomain/drupal/index.php
 
 and follow the onscreen instructions


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

From valholla at users.sourceforge.net  Fri May 22 20:49:27 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Fri, 22 May 2009 18:49:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[5016]
	csw/mgar/pkg/drupal/trunk/Makefile
Message-ID: 

Revision: 5016
          http://gar.svn.sourceforge.net/gar/?rev=5016&view=rev
Author:   valholla
Date:     2009-05-22 18:49:27 +0000 (Fri, 22 May 2009)

Log Message:
-----------
quick fix

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

Modified: csw/mgar/pkg/drupal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/drupal/trunk/Makefile	2009-05-22 18:37:36 UTC (rev 5015)
+++ csw/mgar/pkg/drupal/trunk/Makefile	2009-05-22 18:49:27 UTC (rev 5016)
@@ -40,7 +40,7 @@
 REQUIRED_PKGS_CSWdrupal  = CSWapache2c CSWphp5 CSWphp5gd CSWphp5mbstring
 REQUIRED_PKGS_CSWdrupal += CSWphp5session CSWap2modphp5
 
-DRUPAL_INST_DIR = $(DESTDIR)$(prefix)/$(GARNAME)/$(GARVERSION)
+DRUPAL_INST_DIR = $(DESTDIR)$(docdir)/$(GARNAME)/$(GARVERSION)
 DRUPAL_DOCFILES  = CHANGELOG.txt COPYRIGHT.txt INSTALL.mysql.txt
 DRUPAL_DOCFILES += INSTALL.pgsql.txt INSTALL.txt LICENSE.txt
 DRUPAL_DOCFILES += MAINTAINERS.txt UPGRADE.txt


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

From dmichelsen at users.sourceforge.net  Fri May 22 21:21:35 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 22 May 2009 19:21:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[5017]
 csw/mgar/pkg/timidity/trunk/legacy/sources/ timidity-patches_0.1-5.tar.gz
Message-ID: 

Revision: 5017
          http://gar.svn.sourceforge.net/gar/?rev=5017&view=rev
Author:   dmichelsen
Date:     2009-05-22 19:21:35 +0000 (Fri, 22 May 2009)

Log Message:
-----------
timidity: Add legacy patches

Added Paths:
-----------
    csw/mgar/pkg/timidity/trunk/legacy/sources/timidity-patches_0.1-5.tar.gz

Added: csw/mgar/pkg/timidity/trunk/legacy/sources/timidity-patches_0.1-5.tar.gz
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/timidity/trunk/legacy/sources/timidity-patches_0.1-5.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


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

From j_arndt at users.sourceforge.net  Fri May 22 23:50:48 2009
From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net)
Date: Fri, 22 May 2009 21:50:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[5018] csw/mgar/pkg
Message-ID: 

Revision: 5018
          http://gar.svn.sourceforge.net/gar/?rev=5018&view=rev
Author:   j_arndt
Date:     2009-05-22 21:50:47 +0000 (Fri, 22 May 2009)

Log Message:
-----------
icinga: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/icinga/
    csw/mgar/pkg/icinga/branches/
    csw/mgar/pkg/icinga/tags/
    csw/mgar/pkg/icinga/trunk/
    csw/mgar/pkg/icinga/trunk/Makefile
    csw/mgar/pkg/icinga/trunk/checksums
    csw/mgar/pkg/icinga/trunk/files/
    csw/mgar/pkg/icinga/trunk/files/CSWicinga.gspec
    csw/mgar/pkg/icinga/trunk/files/CSWicinga.prototype
    csw/mgar/pkg/icinga/trunk/files/cmd.c.diff
    csw/mgar/pkg/icinga/trunk/files/cswicinga
    csw/mgar/pkg/icinga/trunk/files/cswusergroup
    csw/mgar/pkg/icinga/trunk/files/install-opts.diff
    csw/mgar/pkg/icinga/trunk/files/patch.diff


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


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


Added: csw/mgar/pkg/icinga/trunk/Makefile
===================================================================
--- csw/mgar/pkg/icinga/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/icinga/trunk/Makefile	2009-05-22 21:50:47 UTC (rev 5018)
@@ -0,0 +1,96 @@
+GARNAME = icinga
+GARVERSION = 0.8
+CATEGORIES = apps
+
+DESCRIPTION = icinga network monitoring base package (no plugins)
+define BLURB
+endef
+
+SF_PROJ = icinga
+MASTER_SITES = $(SF_MIRRORS)
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES += $(call admfiles,CSWicinga, prototype)
+DISTFILES += cswicinga
+DISTFILES += cswusergroup
+
+PATCHFILES = cmd.c.diff		# cgi/cmd.c - GNU macro __attribute__ unknown to compiler
+
+PATCHFILES += patch.diff	# http://article.gmane.org/gmane.network.nagios.devel/4726
+				# (Error 2)
+#PATCHFILES += configure.diff	# configure.in
+				# http://unix.derkeiler.com/Mailing-Lists/SunManagers/2004-11/0424.html
+				# -lsunmath is needed in configure for checking of libgd
+PATCHFILES += install-opts.diff	# sets in every Makefile.in "INSTALL_OPT="" (empty)
+				# necessary, so ginstall doesn't get -o and -g options
+
+REQUIRED_PKGS = CSWgd CSWggettextrt CSWglib2 CSWiconv CSWjpeg CSWperl CSWpng CSWzlib CSWcswclassutils
+
+SPKG_CLASSES = none cswusergroup ugfiles cswpreserveconf cswinitsmf
+
+NOISALIST = 1
+
+prefix = $(BUILD_PREFIX)/icinga
+libexecdir = $(BUILD_PREFIX)/libexec/nagios-plugins
+localstatedir = /var/opt/csw/icinga
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --prefix=$(prefix)
+CONFIGURE_ARGS += --exec-prefix=$(exec_prefix)
+CONFIGURE_ARGS += --with-command-user=icinga
+CONFIGURE_ARGS += --with-command-group=icinga
+CONFIGURE_ARGS += --with-httpd-conf=/opt/csw/apache2/etc
+CONFIGURE_ARGS += --enable-embedded-perl
+#CONFIGURE_ARGS += --enable-idoutils # requires libdbi.so
+CONFIGURE_ARGS += --with-checkresult-dir=/var/opt/csw/icinga/spool/checkresults
+CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/icinga/icinga.lock
+
+EXTRA_LIB = $(BUILD_PREFIX)/lib
+
+BUILD_ARGS = all
+
+#ENABLE_CHECK = 0
+
+TEST_TARGET = none
+
+INSTALL_ARGS += install-init
+#INSTALL_ARGS += install-config
+INSTALL_ARGS += install-commandmode
+
+LD_OPTIONS += -R/opt/csw/lib
+LD_OPTIONS -= -R/opt/csw/nagios/lib
+
+include gar/category.mk
+
+DOCS = Changelog INSTALLING README UPGRADING
+DOCDEST = $(DESTDIR)$(BUILD_PREFIX)/share/doc/icinga
+HTTPD_CONF = $(DESTDIR)/opt/csw/apache2/etc
+CFGDIR = $(prefix)/etc
+
+post-install-modulated:
+	@ginstall -m 755 -d $(DOCDEST)
+	@ginstall -m 755 -d $(HTTPD_CONF)
+	@$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);)
+	@ginstall -m 644 $(WORKSRC)/LICENSE $(DOCDEST)
+#	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+#	@ginstall -m 755 $(FILEDIR)/cswnagios $(DESTDIR)/etc/opt/csw/init.d/cswnagios
+	@ginstall -m 775 -d $(DESTDIR)$(CFGDIR)
+	@ginstall -m 775 -d $(DESTDIR)$(CFGDIR)/objects
+	@ginstall -b -m 664 $(WORKSRC)/sample-config/README $(DESTDIR)$(CFGDIR)/README
+	@ginstall -b -m 664 $(WORKSRC)/sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg.CSW
+	@ginstall -m 644 $(WORKSRC)/sample-config/httpd.conf $(DESTDIR)$(CFGDIR)/httpd-nagios.conf
+	@ginstall -b -m 664 $(WORKSRC)/sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg.CSW
+	@ginstall -b -m 660 $(WORKSRC)/sample-config/mrtg.cfg $(DESTDIR)$(CFGDIR)/mrtg.cfg.CSW
+	@ginstall -b -m 660 $(WORKSRC)/sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.CSW
+	@ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg.CSW
+	@ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg.CSW
+	@ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg.CSW
+	@ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg.CSW
+	@ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg.CSW
+	@ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg.CSW
+	@ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg.CSW
+	@ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg.CSW
+	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+	@ginstall -m 755 $(FILEDIR)/cswicinga $(DESTDIR)/etc/opt/csw/init.d/cswicinga
+	@ginstall -d $(DESTDIR)/opt/csw/etc/pkg/CSWicinga
+	@ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWicinga/cswusergroup
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/icinga/trunk/checksums
===================================================================
--- csw/mgar/pkg/icinga/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/icinga/trunk/checksums	2009-05-22 21:50:47 UTC (rev 5018)
@@ -0,0 +1,8 @@
+7921a4794699ca9ef28b91e1104cafca  download/CSWicinga.gspec
+a1dd58825fefe2a8b2b3e8cfddd33abd  download/CSWicinga.prototype
+db1163a029a4ff61787f8be18b056c5d  download/cmd.c.diff
+a2c4c937bd3d0c7f2ff5361fb8424ed5  download/cswicinga
+9497da9af448701fef1e8ef4c24515e3  download/cswusergroup
+b3b5d8be92f2c7eb313a5832fb732e47  download/icinga-0.8.tar.gz
+d0acc20a35c59cb643b7d66963b789c5  download/install-opts.diff
+f777e837efcfd649c36a1dcef013580c  download/patch.diff

Added: csw/mgar/pkg/icinga/trunk/files/CSWicinga.gspec
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/CSWicinga.gspec	                        (rev 0)
+++ csw/mgar/pkg/icinga/trunk/files/CSWicinga.gspec	2009-05-22 21:50:47 UTC (rev 5018)
@@ -0,0 +1,3 @@
+%var            bitname icinga
+%var            pkgname CSWicinga
+%include        url file://%{PKGLIB}/csw_dyndepend.gspec

Added: csw/mgar/pkg/icinga/trunk/files/CSWicinga.prototype
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/CSWicinga.prototype	                        (rev 0)
+++ csw/mgar/pkg/icinga/trunk/files/CSWicinga.prototype	2009-05-22 21:50:47 UTC (rev 5018)
@@ -0,0 +1,250 @@
+d ugfiles /opt/csw/icinga 0755 root bin
+d ugfiles /opt/csw/icinga/bin 0755 icinga icinga
+f ugfiles /opt/csw/icinga/bin/icinga 0754 icinga icinga
+f ugfiles /opt/csw/icinga/bin/icingastats 0754 icinga icinga
+f ugfiles /opt/csw/icinga/bin/p1.pl 0644 icinga icinga
+d ugfiles /opt/csw/icinga/etc 0755 icinga icinga
+f ugfiles /opt/csw/icinga/etc/README 0644 icinga icinga
+f cswpreserveconf /opt/csw/icinga/etc/cgi.cfg.CSW 0644 icinga icinga
+f ugfiles /opt/csw/icinga/etc/httpd-nagios.conf 0644 icinga icinga
+f cswpreserveconf /opt/csw/icinga/etc/icinga.cfg.CSW 0644 icinga icinga
+f cswpreserveconf /opt/csw/icinga/etc/mrtg.cfg.CSW 0640 icinga icinga
+f cswpreserveconf /opt/csw/icinga/etc/resource.cfg.CSW 0640 icinga icinga
+d ugfiles /opt/csw/icinga/etc/objects 0755 icinga icinga
+f cswpreserveconf /opt/csw/icinga/etc/objects/commands.cfg.CSW 0644 icinga icinga
+f cswpreserveconf /opt/csw/icinga/etc/objects/contacts.cfg.CSW 0644 icinga icinga
+f cswpreserveconf /opt/csw/icinga/etc/objects/localhost.cfg.CSW 0644 icinga icinga
+f cswpreserveconf /opt/csw/icinga/etc/objects/printer.cfg.CSW 0644 icinga icinga
+f cswpreserveconf /opt/csw/icinga/etc/objects/switch.cfg.CSW 0644 icinga icinga
+f cswpreserveconf /opt/csw/icinga/etc/objects/templates.cfg.CSW 0644 icinga icinga
+f cswpreserveconf /opt/csw/icinga/etc/objects/timeperiods.cfg.CSW 0644 icinga icinga
+f cswpreserveconf /opt/csw/icinga/etc/objects/windows.cfg.CSW 0644 icinga icinga
+d ugfiles /opt/csw/icinga/sbin 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/avail.cgi 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/cmd.cgi 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/config.cgi 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/extinfo.cgi 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/histogram.cgi 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/history.cgi 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/notifications.cgi 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/outages.cgi 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/showlog.cgi 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/status.cgi 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/statusmap.cgi 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/statuswml.cgi 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/statuswrl.cgi 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/summary.cgi 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/tac.cgi 0755 icinga icinga
+f ugfiles /opt/csw/icinga/sbin/trends.cgi 0755 icinga icinga
+d ugfiles /opt/csw/icinga/share 0755 icinga icinga
+d ugfiles /opt/csw/icinga/share/contexthelp 0755 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/A1.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/A2.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/A3.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/A4.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/A5.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/A6.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/A7.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/B1.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/C1.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/D1.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/E1.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/F1.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/G1.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/G2.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/G3.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/G4.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/G5.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/G6.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/H1.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/H2.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/H3.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/H4.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/H5.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/H6.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/H7.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/H8.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/I1.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/I2.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/I3.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/I4.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/I5.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/I6.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/I7.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/I8.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/I9.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/J1.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/K1.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/L1.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/L10.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/L11.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/L12.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/L13.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/L2.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/L3.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/L4.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/L5.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/L6.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/L7.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/L8.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/L9.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/M1.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/M2.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/M3.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/M4.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/M5.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/M6.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/N1.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/N2.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/N3.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/N4.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/N5.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/N6.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/contexthelp/N7.html 0644 icinga icinga
+d ugfiles /opt/csw/icinga/share/docs 0755 icinga icinga
+f ugfiles /opt/csw/icinga/share/docs/ch-getstarted.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/docs/ch-running_icinga.html 0644 icinga icinga
+d ugfiles /opt/csw/icinga/share/docs/images 0755 icinga icinga
+f ugfiles /opt/csw/icinga/share/docs/images/logofullsize.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/docs/index.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/docs/relnotes.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/docs/robots.txt 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/docs/wb_quickstart-icinga.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/docs/wb_quickstart-idoutils.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/docs/wb_quickstart.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/docs/wb_startstop.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/docs/wb_verifyconfig.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/docs/wb_whatsnew.html 0644 icinga icinga
+d ugfiles /opt/csw/icinga/share/images 0755 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/NagiosEnterprises-whitebg-112x46.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/ack.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/action.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/arrow-menu.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/command.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/comment.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/contexthelp1.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/contexthelp2.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/critical.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/delay.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/delete.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/detail.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/disabled.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/down.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/downtime.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/empty.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/enabled.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/extinfo.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/favicon.ico 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/flapping.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/globe-support-150x150.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/greendot.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/histogram.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/history.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/hostevent.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/icinga-logo.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/info.png 0644 icinga icinga
+d ugfiles /opt/csw/icinga/share/images/interface 0755 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/interface/bar.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/interface/menu_body.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/interface/menu_less.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/interface/menu_li1.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/interface/menu_li2.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/interface/menu_more.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/left.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/logofullsize.png 0644 icinga icinga
+d ugfiles /opt/csw/icinga/share/images/logos 0755 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/logos/nagios.gd2 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/logos/nagios.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/logos/nagiosvrml.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/logos/unknown.gd2 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/logos/unknown.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/logrotate.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/ndisabled.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/noack.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/notes.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/notify.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/orangedot.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/passiveonly.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/recovery.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/redudancy.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/redundancy.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/restart.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/right.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/sblogo.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/serviceevent.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/sflogo.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/splunk1.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/splunk2.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/start.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/status.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/status2.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/status3.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/status4.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/stop.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/tacdisabled.jpg 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/tacdisabled.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/tacenabled.jpg 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/tacenabled.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/thermcrit.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/thermok.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/thermwarn.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/trends.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/trendshost.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/trendssvc.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/unknown.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/up.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/warning.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/weblogo1.png 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/zoom1.gif 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/images/zoom2.gif 0644 icinga icinga
+d ugfiles /opt/csw/icinga/share/includes 0755 icinga icinga
+f ugfiles /opt/csw/icinga/share/includes/utils.inc.php 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/index.html 0644 icinga icinga
+d ugfiles /opt/csw/icinga/share/js 0755 icinga icinga
+f ugfiles /opt/csw/icinga/share/js/menu.js 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/js/mootools.js 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/main.html 0644 icinga icinga
+d ugfiles /opt/csw/icinga/share/media 0755 icinga icinga
+f ugfiles /opt/csw/icinga/share/menu.html 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/robots.txt 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/sidebar.html 0644 icinga icinga
+d ugfiles /opt/csw/icinga/share/ssi 0755 icinga icinga
+d ugfiles /opt/csw/icinga/share/stylesheets 0755 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/avail.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/checksanity.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/cmd.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/common.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/config.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/extinfo.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/histogram.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/history.css 0644 icinga icinga
+d ugfiles /opt/csw/icinga/share/stylesheets/interface 0755 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/interface/common.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/interface/menu.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/ministatus.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/notifications.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/outages.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/showlog.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/status.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/statusmap.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/summary.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/tac.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/stylesheets/trends.css 0644 icinga icinga
+f ugfiles /opt/csw/icinga/share/top.html 0644 icinga icinga
+d ugfiles /var/opt/csw/icinga 0755 icinga icinga
+d ugfiles /var/opt/csw/icinga/archives 0755 icinga icinga
+d ugfiles /var/opt/csw/icinga/rw 0755 icinga icinga
+d none /opt/csw/libexec 0755 root bin
+d none /opt/csw/libexec/nagios-plugins 0755 root bin
+d none /opt/csw/share/doc/icinga 0755 root bin
+f none /opt/csw/share/doc/icinga/Changelog 0644 root bin
+f none /opt/csw/share/doc/icinga/INSTALLING 0644 root bin
+f none /opt/csw/share/doc/icinga/LICENSE 0644 root bin
+f none /opt/csw/share/doc/icinga/README 0644 root bin
+f none /opt/csw/share/doc/icinga/UPGRADING 0644 root bin
+d ugfiles /var/opt/csw/icinga/spool 0755 icinga icinga
+d ugfiles /var/opt/csw/icinga/spool/checkresults 0755 icinga icinga
+f cswinitsmf /etc/opt/csw/init.d/cswicinga 0755 root bin
+d none	/opt/csw/etc/pkg 0755 root bin
+d none	/opt/csw/etc/pkg/CSWicinga 0755 root bin
+f cswusergroup /opt/csw/etc/pkg/CSWicinga/cswusergroup 0644 root bin

Added: csw/mgar/pkg/icinga/trunk/files/cmd.c.diff
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/cmd.c.diff	                        (rev 0)
+++ csw/mgar/pkg/icinga/trunk/files/cmd.c.diff	2009-05-22 21:50:47 UTC (rev 5018)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru icinga-0.8.orig/cgi/cmd.c icinga-0.8/cgi/cmd.c
+--- icinga-0.8.orig/cgi/cmd.c	2009-05-19 23:01:43.000000000 +0200
++++ icinga-0.8/cgi/cmd.c	2009-05-22 11:58:30.329840462 +0200
+@@ -1886,7 +1886,7 @@
+ 	return;
+         }
+ 
+-__attribute__((format(printf, 2, 3)))
++/* __attribute__((format(printf, 2, 3))) */
+ static int cmd_submitf(int id, const char *fmt, ...)
+ {
+ 	char cmd[MAX_EXTERNAL_COMMAND_LENGTH];

Added: csw/mgar/pkg/icinga/trunk/files/cswicinga
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/cswicinga	                        (rev 0)
+++ csw/mgar/pkg/icinga/trunk/files/cswicinga	2009-05-22 21:50:47 UTC (rev 5018)
@@ -0,0 +1,235 @@
+#!/bin/sh
+# 
+# chkconfig: 345 99 01
+# description: Icinga network monitor
+#
+# File : icinga
+#
+# Author : Jorge Sanchez Aymar (jsanchez at lanchile.cl)
+# 
+# Changelog :
+#
+# 1999-07-09 Karl DeBisschop 
+#  - setup for autoconf
+#  - add reload function
+# 1999-08-06 Ethan Galstad 
+#  - Added configuration info for use with RedHat's chkconfig tool
+#    per Fran Boon's suggestion
+# 1999-08-13 Jim Popovitch 
+#  - added variable for icinga/var directory
+#  - cd into icinga/var directory before creating tmp files on startup
+# 1999-08-16 Ethan Galstad 
+#  - Added test for rc.d directory as suggested by Karl DeBisschop
+# 2000-07-23 Karl DeBisschop 
+#  - Clean out redhat macros and other dependencies
+# 2003-01-11 Ethan Galstad 
+#  - Updated su syntax (Gary Miller)
+#
+# Description: Starts and stops the Icinga monitor
+#              used to provide network services status.
+#
+# Modified for OpenCSW by Juergen Arndt, 2009-05-22
+#
+
+#FMRI application       # FMRI path for service, see http://wiki.opencsw.org/cswclassutils-package#toc0
+
+status_icinga ()
+{
+
+	if test -x $IcingaCGI/daemonchk.cgi; then
+		if $IcingaCGI/daemonchk.cgi -l $IcingaRunFile; then
+		        return 0
+		else
+			return 1
+		fi
+	else
+		if ps -p $IcingaPID > /dev/null 2>&1; then
+		        return 0
+		else
+			return 1
+		fi
+	fi
+
+	return 1
+}
+
+
+printstatus_icinga()
+{
+
+	if status_icinga $1 $2; then
+		echo "icinga (pid $IcingaPID) is running..."
+	else
+		echo "icinga is not running"
+	fi
+}
+
+
+killproc_icinga ()
+{
+
+	kill $2 $IcingaPID
+
+}
+
+
+pid_icinga ()
+{
+
+	if test ! -f $IcingaRunFile; then
+		echo "No lock file found in $IcingaRunFile"
+		exit 1
+	fi
+
+	IcingaPID=`head -n 1 $IcingaRunFile`
+}
+
+
+# Source function library
+# Solaris doesn't have an rc.d directory, so do a test first
+if [ -f /etc/rc.d/init.d/functions ]; then
+	. /etc/rc.d/init.d/functions
+elif [ -f /etc/init.d/functions ]; then
+	. /etc/init.d/functions
+fi
+
+prefix=/opt/csw/icinga
+exec_prefix=/opt/csw/icinga
+IcingaBin=/opt/csw/icinga/bin/icinga
+IcingaCfgFile=/opt/csw/icinga/etc/icinga.cfg
+IcingaStatusFile=/opt/csw/icinga/var/status.dat
+IcingaRetentionFile=/opt/csw/icinga/var/retention.dat
+IcingaCommandFile=/opt/csw/icinga/var/rw/icinga.cmd
+IcingaVarDir=/opt/csw/icinga/var
+IcingaRunFile=/var/opt/csw/icinga/icinga.lock
+IcingaLockDir=/var/lock/subsys
+IcingaLockFile=icinga
+IcingaCGIDir=/opt/csw/icinga/sbin
+IcingaUser=icinga
+IcingaGroup=icinga
+          
+
+# Check that icinga exists.
+if [ ! -f $IcingaBin ]; then
+    echo "Executable file $IcingaBin not found.  Exiting."
+    exit 1
+fi
+
+# Check that icinga.cfg exists.
+if [ ! -f $IcingaCfgFile ]; then
+    echo "Configuration file $IcingaCfgFile not found.  Exiting."
+    exit 1
+fi
+          
+# See how we were called.
+case "$1" in
+
+	start)
+		echo -n "Starting icinga:"
+		$IcingaBin -v $IcingaCfgFile > /dev/null 2>&1;
+		if [ $? -eq 0 ]; then
+			su - $IcingaUser -c "touch $IcingaVarDir/icinga.log $IcingaRetentionFile"
+			rm -f $IcingaCommandFile
+			touch $IcingaRunFile
+			chown $IcingaUser:$IcingaGroup $IcingaRunFile
+			$IcingaBin -d $IcingaCfgFile
+			if [ -d $IcingaLockDir ]; then touch $IcingaLockDir/$IcingaLockFile; fi
+			echo " done."
+			exit 0
+		else
+			echo "CONFIG ERROR!  Start aborted.  Check your Icinga configuration."
+			exit 1
+		fi
+		;;
+
+	stop)
+		echo -n "Stopping icinga: "
+
+		pid_icinga
+		killproc_icinga icinga
+
+ 		# now we have to wait for icinga to exit and remove its
+ 		# own IcingaRunFile, otherwise a following "start" could
+ 		# happen, and then the exiting icinga will remove the
+ 		# new IcingaRunFile, allowing multiple icinga daemons
+ 		# to (sooner or later) run - John Sellens
+		#echo -n 'Waiting for icinga to exit .'
+ 		for i in 1 2 3 4 5 6 7 8 9 10 ; do
+ 		    if status_icinga > /dev/null; then
+ 			echo -n '.'
+ 			sleep 1
+ 		    else
+ 			break
+ 		    fi
+ 		done
+ 		if status_icinga > /dev/null; then
+ 		    echo ''
+ 		    echo 'Warning - icinga did not exit in a timely manner'
+ 		else
+ 		    echo 'done.'
+ 		fi
+
+		rm -f $IcingaStatusFile $IcingaRunFile $IcingaLockDir/$IcingaLockFile $IcingaCommandFile
+		;;
+
+	status)
+		pid_icinga
+		printstatus_icinga icinga
+		;;
+
+	checkconfig)
+		printf "Running configuration check..."
+		$IcingaBin -v $IcingaCfgFile > /dev/null 2>&1;
+		if [ $? -eq 0 ]; then
+			echo " OK."
+		else
+			echo " CONFIG ERROR!  Check your Icinga configuration."
+			exit 1
+		fi
+		;;
+
+	restart)
+		printf "Running configuration check..."
+		$IcingaBin -v $IcingaCfgFile > /dev/null 2>&1;
+		if [ $? -eq 0 ]; then
+			echo "done."
+			$0 stop
+			$0 start
+		else
+			echo " CONFIG ERROR!  Restart aborted.  Check your Icinga configuration."
+			exit 1
+		fi
+		;;
+
+	reload|force-reload)
+		printf "Running configuration check..."
+		$IcingaBin -v $IcingaCfgFile > /dev/null 2>&1;
+		if [ $? -eq 0 ]; then
+			echo "done."
+			if test ! -f $IcingaRunFile; then
+				$0 start
+			else
+				pid_icinga
+				if status_icinga > /dev/null; then
+					printf "Reloading icinga configuration..."
+					killproc_icinga icinga -HUP
+					echo "done"
+				else
+					$0 stop
+					$0 start
+				fi
+			fi
+		else
+			echo " CONFIG ERROR!  Reload aborted.  Check your Icinga configuration."
+			exit 1
+		fi
+		;;
+
+	*)
+		echo "Usage: icinga {start|stop|restart|reload|force-reload|status|checkconfig}"
+		exit 1
+		;;
+
+esac
+  
+# End of this script

Added: csw/mgar/pkg/icinga/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/cswusergroup	                        (rev 0)
+++ csw/mgar/pkg/icinga/trunk/files/cswusergroup	2009-05-22 21:50:47 UTC (rev 5018)
@@ -0,0 +1 @@
+icinga:icinga:Icinga User:/opt/csw/icinga:/bin/false:::

Added: csw/mgar/pkg/icinga/trunk/files/install-opts.diff
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/install-opts.diff	                        (rev 0)
+++ csw/mgar/pkg/icinga/trunk/files/install-opts.diff	2009-05-22 21:50:47 UTC (rev 5018)
@@ -0,0 +1,90 @@
+diff --speed-large-files --minimal -Nru icinga-0.8.orig/Makefile.in icinga-0.8/Makefile.in
+--- icinga-0.8.orig/Makefile.in	2009-05-19 23:01:43.000000000 +0200
++++ icinga-0.8/Makefile.in	2009-05-22 12:57:00.973528770 +0200
+@@ -30,11 +30,11 @@
+ LIBEXECDIR=@libexecdir@
+ HTMLDIR=@datarootdir@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
+-COMMAND_OPTS=@COMMAND_OPTS@
++INSTALL_OPTS=
++COMMAND_OPTS=
+ HTTPD_CONF=@HTTPD_CONF@
+ INIT_DIR=@init_dir@
+-INIT_OPTS=-o root -g root
++INIT_OPTS=
+ CGICFGDIR=$(CGIDIR)
+ PERLDIR=@PERLDIR@
+ 
+diff --speed-large-files --minimal -Nru icinga-0.8.orig/base/Makefile.in icinga-0.8/base/Makefile.in
+--- icinga-0.8.orig/base/Makefile.in	2009-05-19 23:01:43.000000000 +0200
++++ icinga-0.8/base/Makefile.in	2009-05-22 12:54:39.811066523 +0200
+@@ -39,7 +39,7 @@
+ CGIDIR=@sbindir@
+ HTMLDIR=@datarootdir@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
++INSTALL_OPTS=
+ COMMAND_OPTS=@COMMAND_OPTS@
+ STRIP=@STRIP@
+ 
+diff --speed-large-files --minimal -Nru icinga-0.8.orig/cgi/Makefile.in icinga-0.8/cgi/Makefile.in
+--- icinga-0.8.orig/cgi/Makefile.in	2009-05-19 23:01:43.000000000 +0200
++++ icinga-0.8/cgi/Makefile.in	2009-05-22 12:55:03.790961065 +0200
+@@ -18,7 +18,7 @@
+ CGIDIR=@sbindir@
+ HTMLDIR=@datarootdir@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
++INSTALL_OPTS=
+ COMMAND_OPTS=@COMMAND_OPTS@
+ STRIP=@STRIP@
+ 
+diff --speed-large-files --minimal -Nru icinga-0.8.orig/common/Makefile.in icinga-0.8/common/Makefile.in
+--- icinga-0.8.orig/common/Makefile.in	2009-05-19 23:01:43.000000000 +0200
++++ icinga-0.8/common/Makefile.in	2009-05-22 12:55:23.192592201 +0200
+@@ -20,7 +20,7 @@
+ CGIDIR=@sbindir@
+ HTMLDIR=@datarootdir@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
++INSTALL_OPTS=
+ COMMAND_OPTS=@COMMAND_OPTS@
+ 
+ CP=@CP@
+diff --speed-large-files --minimal -Nru icinga-0.8.orig/contrib/Makefile.in icinga-0.8/contrib/Makefile.in
+--- icinga-0.8.orig/contrib/Makefile.in	2009-05-19 23:01:43.000000000 +0200
++++ icinga-0.8/contrib/Makefile.in	2009-05-22 12:55:40.861094735 +0200
+@@ -15,7 +15,7 @@
+ # Generated automatically from configure script
+ SNPRINTF_O=@SNPRINTF_O@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
++INSTALL_OPTS=
+ 
+ 
+ prefix=@prefix@
+diff --speed-large-files --minimal -Nru icinga-0.8.orig/html/Makefile.in icinga-0.8/html/Makefile.in
+--- icinga-0.8.orig/html/Makefile.in	2009-05-19 23:01:43.000000000 +0200
++++ icinga-0.8/html/Makefile.in	2009-05-22 12:56:26.447629708 +0200
+@@ -10,7 +10,7 @@
+ CGIDIR=@sbindir@
+ HTMLDIR=@datarootdir@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
++INSTALL_OPTS=
+ COMMAND_OPTS=@COMMAND_OPTS@
+ 
+ CP=@CP@
+diff --speed-large-files --minimal -Nru icinga-0.8.orig/module/Makefile.in icinga-0.8/module/Makefile.in
+--- icinga-0.8.orig/module/Makefile.in	2009-05-19 23:01:43.000000000 +0200
++++ icinga-0.8/module/Makefile.in	2009-05-22 12:57:18.719328688 +0200
+@@ -19,7 +19,7 @@
+ exec_prefix=@exec_prefix@
+ BINDIR=@bindir@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
++INSTALL_OPTS=
+ COMMAND_OPTS=@COMMAND_OPTS@
+ STRIP=@STRIP@
+ 

Added: csw/mgar/pkg/icinga/trunk/files/patch.diff
===================================================================
--- csw/mgar/pkg/icinga/trunk/files/patch.diff	                        (rev 0)
+++ csw/mgar/pkg/icinga/trunk/files/patch.diff	2009-05-22 21:50:47 UTC (rev 5018)
@@ -0,0 +1,33 @@
+diff --speed-large-files --minimal -Nru icinga-0.8.orig/include/nebmodules.h icinga-0.8/include/nebmodules.h
+--- icinga-0.8.orig/include/nebmodules.h	2009-05-19 23:01:43.000000000 +0200
++++ icinga-0.8/include/nebmodules.h	2009-05-22 12:13:24.195253042 +0200
+@@ -31,7 +31,7 @@
+ 
+ /***** MODULE VERSION INFORMATION *****/
+ 
+-#define NEB_API_VERSION(x) int __neb_api_version = x;
++#define NEB_API_VERSION(x) int __neb_api_version = x
+ #define CURRENT_NEB_API_VERSION    3
+ 
+ 
+diff --speed-large-files --minimal -Nru icinga-0.8.orig/module/Makefile.in icinga-0.8/module/Makefile.in
+--- icinga-0.8.orig/module/Makefile.in	2009-05-19 23:01:43.000000000 +0200
++++ icinga-0.8/module/Makefile.in	2009-05-22 12:16:03.078812414 +0200
+@@ -25,13 +25,13 @@
+ 
+ CP=@CP@
+ 
+-all:	helloworld.o
++all:	helloworld
+ 
+-helloworld.o: helloworld.c
+-	$(CC) $(MOD_CFLAGS) $(CFLAGS) -o helloworld.o helloworld.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS)
++helloworld: helloworld.c
++	$(CC) $(MOD_CFLAGS) $(CFLAGS) -o helloworld helloworld.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS)
+ 
+ clean:
+-	rm -f helloworld.o
++	rm -f helloworld
+ 	rm -f core *.o
+ 	rm -f *~ *.*~
+ 


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

From valholla at users.sourceforge.net  Sat May 23 06:00:12 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Sat, 23 May 2009 04:00:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[5019] csw/mgar/pkg/python/trunk/files
Message-ID: 

Revision: 5019
          http://gar.svn.sourceforge.net/gar/?rev=5019&view=rev
Author:   valholla
Date:     2009-05-23 04:00:12 +0000 (Sat, 23 May 2009)

Log Message:
-----------
classfile to replace post/pre scripts

Added Paths:
-----------
    csw/mgar/pkg/python/trunk/files/i.pycompile
    csw/mgar/pkg/python/trunk/files/r.pycompile

Removed Paths:
-------------
    csw/mgar/pkg/python/trunk/files/CSWidle.postinstall
    csw/mgar/pkg/python/trunk/files/CSWidle.preremove
    csw/mgar/pkg/python/trunk/files/CSWidle.space
    csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall
    csw/mgar/pkg/python/trunk/files/CSWpython-tk.preremove
    csw/mgar/pkg/python/trunk/files/CSWpython-tk.space
    csw/mgar/pkg/python/trunk/files/CSWpython.postinstall
    csw/mgar/pkg/python/trunk/files/CSWpython.preremove
    csw/mgar/pkg/python/trunk/files/CSWpython.space

Deleted: csw/mgar/pkg/python/trunk/files/CSWidle.postinstall
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWidle.postinstall	2009-05-22 21:50:47 UTC (rev 5018)
+++ csw/mgar/pkg/python/trunk/files/CSWidle.postinstall	2009-05-23 04:00:12 UTC (rev 5019)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-PATH=/usr/bin:/usr/sbin
-PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-PY_BINDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/bin
-PY_LIBDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/lib/python
-
-# Compile .py libraries to .pyc files
-${PY_BINDIR}/python -Wi -tt ${PY_LIBDIR}/compileall.py \
-    -d ${PY_LIBDIR}/idlelib -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}/idlelib
-# Compile .py libraries to .pyo files
-${PY_BINDIR}/python -Wi -tt -O ${PY_LIBDIR}/compileall.py \
-    -d ${PY_LIBDIR}/idlelib -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}/idlelib
-
-exit 0

Deleted: csw/mgar/pkg/python/trunk/files/CSWidle.preremove
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWidle.preremove	2009-05-22 21:50:47 UTC (rev 5018)
+++ csw/mgar/pkg/python/trunk/files/CSWidle.preremove	2009-05-23 04:00:12 UTC (rev 5019)
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-PATH=/usr/bin:/usr/sbin
-PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-PY_BINDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/bin
-PY_LIBDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/lib/python
-
-# Cleanup .pyc and .pyo files
-pkgchk -v $PKGINST 2>&1 |grep \.py$ | xargs -i rm -f {}c {}o
-
-exit 0

Deleted: csw/mgar/pkg/python/trunk/files/CSWidle.space
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWidle.space	2009-05-22 21:50:47 UTC (rev 5018)
+++ csw/mgar/pkg/python/trunk/files/CSWidle.space	2009-05-23 04:00:12 UTC (rev 5019)
@@ -1 +0,0 @@
-$BASEDIR 200

Deleted: csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall	2009-05-22 21:50:47 UTC (rev 5018)
+++ csw/mgar/pkg/python/trunk/files/CSWpython-tk.postinstall	2009-05-23 04:00:12 UTC (rev 5019)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-PATH=/usr/bin:/usr/sbin
-PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-PY_BINDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/bin
-PY_LIBDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/lib/python
-
-# Compile .py libraries to .pyc files
-${PY_BINDIR}/python -Wi -tt ${PY_LIBDIR}/compileall.py \
-    -d ${PY_LIBDIR}/lib-tk -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}/lib-tk
-# Compile .py libraries to .pyo files
-${PY_BINDIR}/python -Wi -tt -O ${PY_LIBDIR}/compileall.py \
-    -d ${PY_LIBDIR}/lib-tk -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}/lib-tk
-
-exit 0

Deleted: csw/mgar/pkg/python/trunk/files/CSWpython-tk.preremove
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython-tk.preremove	2009-05-22 21:50:47 UTC (rev 5018)
+++ csw/mgar/pkg/python/trunk/files/CSWpython-tk.preremove	2009-05-23 04:00:12 UTC (rev 5019)
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-PATH=/usr/bin:/usr/sbin
-PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-PY_BINDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/bin
-PY_LIBDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/lib/python
-
-# Cleanup .pyc and .pyo files
-pkgchk -v $PKGINST 2>&1 |grep \.py$ | xargs -i rm -f {}c {}o
-
-exit 0

Deleted: csw/mgar/pkg/python/trunk/files/CSWpython-tk.space
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython-tk.space	2009-05-22 21:50:47 UTC (rev 5018)
+++ csw/mgar/pkg/python/trunk/files/CSWpython-tk.space	2009-05-23 04:00:12 UTC (rev 5019)
@@ -1 +0,0 @@
-$BASEDIR 50

Deleted: csw/mgar/pkg/python/trunk/files/CSWpython.postinstall
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython.postinstall	2009-05-22 21:50:47 UTC (rev 5018)
+++ csw/mgar/pkg/python/trunk/files/CSWpython.postinstall	2009-05-23 04:00:12 UTC (rev 5019)
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-PATH=/usr/bin:/usr/sbin
-PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-PY_BINDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/bin
-PY_LIBDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/lib/python
-
-find ${PY_LIBDIR} -name "*.py[co]" -exec rm -f {} \;
-# Compile .py libraries to .pyc files
-${PY_BINDIR}/python -Wi -tt ${PY_LIBDIR}/compileall.py \
-    -d ${PY_LIBDIR} -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}
-# Compile .py libraries to .pyo files
-${PY_BINDIR}/python -Wi -tt -O ${PY_LIBDIR}/compileall.py \
-    -d ${PY_LIBDIR} -f -x 'bad_coding|badsyntax' ${PY_LIBDIR}
-
-exit 0

Deleted: csw/mgar/pkg/python/trunk/files/CSWpython.preremove
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython.preremove	2009-05-22 21:50:47 UTC (rev 5018)
+++ csw/mgar/pkg/python/trunk/files/CSWpython.preremove	2009-05-23 04:00:12 UTC (rev 5019)
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-PATH=/usr/bin:/usr/sbin
-PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-PY_BINDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/bin
-PY_LIBDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/lib/python
-
-# Cleanup .pyc and .pyo files
-pkgchk -v $PKGINST 2>&1 |grep \.py$ | xargs -i rm -f {}c {}o
-
-exit 0

Deleted: csw/mgar/pkg/python/trunk/files/CSWpython.space
===================================================================
--- csw/mgar/pkg/python/trunk/files/CSWpython.space	2009-05-22 21:50:47 UTC (rev 5018)
+++ csw/mgar/pkg/python/trunk/files/CSWpython.space	2009-05-23 04:00:12 UTC (rev 5019)
@@ -1 +0,0 @@
-$BASEDIR 3600

Added: csw/mgar/pkg/python/trunk/files/i.pycompile
===================================================================
--- csw/mgar/pkg/python/trunk/files/i.pycompile	                        (rev 0)
+++ csw/mgar/pkg/python/trunk/files/i.pycompile	2009-05-23 04:00:12 UTC (rev 5019)
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# i.pycompile - Class action script for compiling pyo and pyc files
+#
+# $Id$
+#
+# Written by Mike Watters
+#
+# 2009-05-25 First Release
+#
+
+# Force Path for the script to use
+PATH=/usr/bin:/usr/sbin:/opt/csw/bin
+PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+PY_BINDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/bin
+PY_LIBDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/lib/python
+
+if [ "${DEBUG}" ]; then
+    echo PACKAGE: $PKGINST
+fi
+
+if [ -f ${PY_BINDIR}/python -a -x ${PY_BINDIR}/python ]; then
+    echo "Could not find or execute ${PY_BINDIR}/python"
+    echo "Check your Python installation."
+    exit 2
+fi
+    
+if [ -f ${PY_LIBDIR}/compileall.py ]; then
+    echo "Could not find ${PY_LIBDIR}/compileall.py"
+    echo "Check your Python installation."
+    exit 2
+fi
+
+echo "Compiling py files to normal bytecode ..."
+# Compile .py libraries to .pyc files
+${PY_BINDIR}/python -Wi -tt ${PY_LIBDIR}/compileall.py \
+    -d ${PY_LIBDIR} -x 'bad_coding|badsyntax' ${PY_LIBDIR}
+
+echo "Compiling py files to optimized bytecode ..."
+# Compile .py libraries to .pyo files
+${PY_BINDIR}/python -Wi -tt -O ${PY_LIBDIR}/compileall.py \
+    -d ${PY_LIBDIR} -x 'bad_coding|badsyntax' ${PY_LIBDIR}
+ 
+exit 0


Property changes on: csw/mgar/pkg/python/trunk/files/i.pycompile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/python/trunk/files/r.pycompile
===================================================================
--- csw/mgar/pkg/python/trunk/files/r.pycompile	                        (rev 0)
+++ csw/mgar/pkg/python/trunk/files/r.pycompile	2009-05-23 04:00:12 UTC (rev 5019)
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# r.pycompile - Class action script for removing pyo and pyc files
+#
+# $Id$
+#
+# Written by Mike Watters
+#
+#   2009-05-25 First Release
+#
+
+# Force Path for the script to use
+PATH=/usr/bin:/usr/sbin:/opt/csw/bin
+DEBUG=      # clear to disable debug, set to anything to enable
+
+if [ "${DEBUG}" ]; then
+    echo PACKAGE: $PKGINST
+fi
+
+echo "Removing pyo and pyc files for package <$PKGINST> ..."
+pkgchk -v $PKGINST 2>&1 |grep \.py$ | xargs -i rm -f {}c {}o
+
+exit 0


Property changes on: csw/mgar/pkg/python/trunk/files/r.pycompile
___________________________________________________________________
Added: svn:keywords
   + Id


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

From chninkel at users.sourceforge.net  Sat May 23 16:15:37 2009
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 23 May 2009 14:15:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[5020] csw/mgar/pkg
Message-ID: 

Revision: 5020
          http://gar.svn.sourceforge.net/gar/?rev=5020&view=rev
Author:   chninkel
Date:     2009-05-23 14:15:36 +0000 (Sat, 23 May 2009)

Log Message:
-----------
openssl1: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/openssl1/
    csw/mgar/pkg/openssl1/branches/
    csw/mgar/pkg/openssl1/tags/
    csw/mgar/pkg/openssl1/trunk/
    csw/mgar/pkg/openssl1/trunk/Makefile
    csw/mgar/pkg/openssl1/trunk/files/
    csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.checkinstall
    csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.postinstall
    csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.preinstall
    csw/mgar/pkg/openssl1/trunk/files/README.CSW
    csw/mgar/pkg/openssl1/trunk/files/changelog.CSW
    csw/mgar/pkg/openssl1/trunk/files/i.conf
    csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch
    csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8h.patch.2008-07-29
    csw/mgar/pkg/openssl1/trunk/files/r.conf


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


Added: svn:externals
   + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1


Added: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2009-05-23 14:15:36 UTC (rev 5020)
@@ -0,0 +1,156 @@
+#####################################################################
+# OpenCSW build recipe for openssl 1.x
+#
+# Copyright 2009 Yann Rouillard 
+# All rights reserved.  Use is subject to license terms.
+#
+# Redistribution and/or use, with or without modification, is
+# permitted.  This software is without warranty of any kind.  The
+# author(s) shall not be liable in the event that use of the
+# software causes damage.
+#####################################################################
+
+###### Package information #######
+
+GARNAME = openssl
+GARVERSION = 1.0.0-beta2
+CATEGORIES = lib
+
+OPENSSL_VERSION := $(shell echo $(GARVERSION) | cut -d- -f1)
+OPENSSL_RELEASE := $(shell echo $(GARVERSION) | cut -d- -f2)
+
+DESCRIPTION = The Open Source toolkit for SSL and TLS
+define BLURB
+  The OpenSSL Project is a collaborative effort to develop a robust,
+  commercial-grade, fully featured, and Open Source toolkit implementing the
+  Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) as well
+  as a full-strength general-purpose cryptography library.
+endef
+
+PACKAGES = CSWossl1rt CSWossl1devel CSWossl1utils
+
+CATALOGNAME_CSWossl1rt = openssl1_rt
+REQUIRED_PKGS_CSWossl1rt = CSWcacertificates
+SPKG_DESC_CSWossl1rt = Openssl 1.0 runtime libraries
+PKGFILES_CSWossl1rt = $(PKGFILES_RT)
+
+CATALOGNAME_CSWossl1devel = openssl1_devel
+REQUIRED_PKGS_CSWossl1devel = CSWossl1rt
+SPKG_DESC_CSWossl1devel = Openssl 1.0 development support files
+PKGFILES_CSWossl1devel = $(PKGFILES_DEVEL)
+
+CATALOGNAME_CSWossl1utils = openssl1_utils
+REQUIRED_PKGS_CSWossl1utils = CSWossl1rt
+SPKG_DESC_CSWossl1utils = Openssl 1.0 binaries and related tools
+
+SPKG_CLASSES = none conf
+
+
+###### Upstream and opencsw files information #######
+
+MASTER_SITES = http://www.openssl.org/source/ http://openssl.org/news/
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*[a-z]?).tar.gz
+
+DISTNAME   = $(GARNAME)-$(GARVERSION)
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz 
+DISTFILES += CSWossl1rt.checkinstall CSWossl1rt.preinstall CSWossl1rt.postinstall 
+DISTFILES += changelog.CSW README.CSW
+DISTFILES += i.conf r.conf
+
+DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE
+
+# add ...
+PATCHFILES += more_configure_targets.patch
+
+
+##### Build and installation information #####
+
+ENABLE_CHECK = 0
+
+# The list of instructions set for which we will 
+# provide optimized libraries and binaries
+EXTRA_BUILD_ISAS_i386 = pentium_pro amd64
+EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9
+
+# we don't yet use isaexec support so we disable
+# isa relocation for default isa
+NO_ISAEXEC = 1
+# GAR wants and puts sparcv9 in lib/64 but openssl build system
+# isn't the standard autoconf/automake one so we disable this
+# relocation for now
+ISALIBDIR_sparcv9 = .
+libdir = /opt/csw/lib
+
+# we redefine the default merge exclude so *.a files are not excluded
+MERGE_EXCLUDE_DEFAULT = $(MERGE_EXCLUDE_INFODIR)
+
+# The corresponding os/compiler to pass to the
+# openssl Configure script
+i386_OS_COMPILER 	= solaris-x86-cc
+pentium_pro_OS_COMPILER	= solaris-pentium_pro-cc
+amd64_OS_COMPILER 	= solaris64-x86_64-cc
+
+sparcv8_OS_COMPILER 		= solaris-sparcv8-cc
+sparcv8plus_OS_COMPILER		= solaris-sparcv9-cc
+sparcv8plus+vis_OS_COMPILER	= solaris-sparcv9+vis-cc
+sparcv9_OS_COMPILER		= solaris64-sparcv9-cc
+
+CONFIGURE_ARGS = --prefix=$(prefix) shared $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR)
+
+# We want the csw perl to be used
+#CONFIGURE_ENV += PERL="/opt/csw/bin/perl"
+# For now we want the sun perl to be used
+CONFIGURE_ENV += PERL="/usr/bin/perl"
+
+# Some optimization
+EXT_CFLAGS   += -mt -xstrconst
+EXT_CXXFLAGS += -noex -mt
+
+# By default, the install target put man pages under
+# /opt/csw/ssl/man, but we want them under /opt/csw/share/man
+INSTALL_ARGS += MANDIR=$(mandir)
+
+SKIPTEST = 1
+
+
+include gar/category.mk
+
+# we redefine the timestamp to fulfill opencsw standard
+SPKG_VERSION := $(OPENSSL_VERSION)
+SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(OPENSSL_RELEASE)
+
+
+pre-configure-modulated: 
+	echo " ==> Creating configure script"
+	cd $(WORKSRC) && ln -nf Configure configure
+	@$(MAKECOOKIE)
+
+# we remove every debug information except symbol table
+# (should rather be done in the gar scripts)
+post-install-modulated:
+	echo " ==> Stripping libraries"
+	chmod -R u+w $(DESTDIR)$(libdir)
+	find $(DESTDIR)$(libdir) -name "*.so*" -exec strip -x '{}' ';'
+
+install-changelog:
+	for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \
+		ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$$CATALOGNAME/changelog.CSW; \
+	done	
+	@$(MAKECOOKIE)
+
+install-doc:
+	for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \
+		ginstall -d $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME; \
+		(cd $(WORKSRC_FIRSTMOD)/ && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/$$CATALOGNAME/); \
+		ginstall -D $(WORKDIR_FIRSTMOD)/README.CSW $(PKGROOT)/$(docdir)/$$CATALOGNAME/README.CSW; \
+	done
+	@$(MAKECOOKIE)
+
+install-certs: 
+	[ -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] && \
+		ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf
+
+post-merge: install-certs install-changelog install-doc
+

Added: csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.checkinstall
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.checkinstall	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.checkinstall	2009-05-23 14:15:36 UTC (rev 5020)
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+PLATFORM=`/usr/bin/uname -p`
+VERSION=`/usr/bin/uname -r`
+
+# Solaris 8 requires patches to have /dev/random and /dev/urandom.
+if [ $VERSION -eq "5.8" ]; then
+
+	if [ ! -c $PKG_ROOT_DIR/dev/random ] && [ ! -p $PKG_ROOT_DIR/dev/random ]; then
+		echo "ERROR: /dev/random must exist."
+		err=1
+	fi
+
+	if [ ! -c $PKG_ROOT_DIR/dev/urandom ] && [ ! -p $PKG_ROOT_DIR/dev/urandom ]; then
+		echo "ERROR: /dev/urandom must exist."
+		err=1
+	fi
+
+	if [ "$err" = "1" ]; then
+		if [ $PLATFORM -eq "sparc" ]; then
+			echo "Please install patch 112438."
+		elif [ $PLATFORM -eq "i386" ]; then
+			echo "Please install patch 112439."
+		fi
+		exit 1
+	fi
+fi
+
+# Certification Authority have been moved under /opt/csw/etc/ssl/certs
+# under the ca_certificates package control
+# and /opt/csw/ssl/certs is now a symbolic links 
+
+# we test if certificates were manually installed in this directory
+if [ ! -h "/opt/csw/ssl/certs" ] &&  [ -d "/opt/csw/ssl/certs" ] && [ -n "`ls -1 /opt/csw/ssl/certs/`" ]; then
+
+	echo "Custom certificates have been installed in /opt/csw/ssl/certs/."
+	echo "They will be moved under /opt/csw/etc/ssl/certs."
+	echo "see /opt/csw/share/doc/openssl_rt/README.CSW for more information"
+        echo "about CA."
+
+	# we define the MOVE_CERTS variable so preinstall and postinstall scripts
+	# will now they have to do something about theses certificates
+	cat >>$1 <  Wed, 25 Mar 2009 22:57:40 +0100
+
+openssl (0.9.8,rev=2009.01.28_rev=j) unstable
+
+  * Fixed checkinstall bug, -h should be used instead of -L to 
+  test symlink because old sh doesn't know -L.
+
+   -- Yann Rouillard   Wed, 28 Jan 2009 10:37:43 +0100
+
+openssl (0.9.8,rev=2009.01.07_rev=j) unstable
+
+  * New upstream version.
+  * Made the private directory local by symlinking it to
+  /etc/opt/csw/ssl/private
+
+   -- Yann Rouillard   Wed, 07 Jan 2009 19:07:01 +0100
+
+openssl (0.9.8,rev=2009.01.01_rev=i) unstable
+
+  * Removed CA and added dependancy on ca_certificates.
+  * Added openssl documentation files.
+  * checkinstall script now accepts that /dev/random and 
+  /dev/random are pipes (Closes: #2687)
+
+ -- Yann Rouillard   Sat, 13 Dec 2008 14:28:14 +0100
+
+openssl (0.9.8,rev=2008.10.05_rev=i) unstable
+
+ * New upstream version.
+ * Added ca certs that were removed in 0.9.8h.
+ * Fixed arch in openssl meta-package.
+
+ -- Yann Rouillard   Fri, 05 oct 2008 21:25:09 +0200
+
+openssl (0.9.8,REV=2007.12.26_rev=g) unstable
+
+ * Fixed inconsistency between headers and libraries.
+
+ -- Yann Rouillard    Wed, 26 Dec 2007 12:30:22 +0100
+
+openssl (0.9.8,REV=2007.11.02_rev=g) unstable
+
+ * New upstream version.
+
+ -- Yann Rouillard    Fri, 02 Nov 2007 17:28:41 +0100
+
+openssl (0.9.8,REV=2007.10.27_rev=f) unstable
+
+ * New upstream version.
+
+ -- Yann Rouillard    Sat, 27 Oct 2007 21:02:17 +0200
+
+openssl (0.9.8,REV=2007.10.27_rev=e) unstable
+
+ * Fixed CVE-2007-4995: DTLS Heap Buffer Overflow Vulnerability.
+
+ -- Yann Rouillard    Sat, 27 Oct 2007 14:38:55 +0200
+
+openssl (0.9.8,REV=2007.10.11_rev=e) unstable
+
+ * Fixed CVE-2007-5135: Fix off by one error in SSL_get_shared_ciphers().
+ * Fixed CVE-2007-3108: RSA side-channel attack.
+
+ -- Yann Rouillard    Tue, 02 Oct 2007 23:57:35 +0200
+
+openssl (0.9.8,REV=2007.08.21_rev=e) unstable
+
+ * Replaced "? ? ?" with "0755 root bin" in the prototype.
+
+ -- Yann Rouillard    Tue, 17 Jul 2007 23:26:37 +0200
+
+openssl (0.9.8,REV=2007.07.22_rev=e) unstable
+
+ * Added amd64 libraries symlinks (libssl.so -> libssl.so.0.9.8, ...).
+
+ -- Yann Rouillard    Tue, 17 Jul 2007 23:26:37 +0200
+
+openssl (0.9.8,REV=2007.06.02_rev=e) UNRELEASED
+
+ * manpages are now under /opt/csw/share/man instead of /opt/csw/ssl/man.
+ * package split in openssl_rt (runtime libraries), openssl_devel.
+ (development files) and openssl_utils (binaries and related files).
+
+ -- Yann Rouillard    Sat,  2 Jun 2007 17:29:01 +0200
+
+openssl (0.9.8,REV=2007.05.10_rev=e) unstable
+
+ * New upstream version.
+ * Static libraries removed.
+ * Old 0.9.6 libraries removed.
+ * amd64 optimized libraries added.
+
+ -- Yann Rouillard    Thu, 10 May 2007 14:54:17 +0200
+
+

Added: csw/mgar/pkg/openssl1/trunk/files/i.conf
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/i.conf	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/i.conf	2009-05-23 14:15:36 UTC (rev 5020)
@@ -0,0 +1,54 @@
+#
+# Copyright 2006 Yann Rouillard 
+# All rights reserved.  Use is subject to license terms.
+#
+# Redistribution and/or use, with or without modification, is
+# permitted.  This code is without warranty of any kind.  The
+# author(s) shall not be liable in the event that use of the
+# software causes damage.
+#
+# i.conf - class script which install configuration files
+#
+# If the configuration file already exists on the filesystem,
+# this script will let the existing file intact and will 
+# install a copy of the file provided in the package suffixed 
+# with .CSW
+# except for service configuration files which are always installed
+# CSW suffixed under Solaris 9 as they are used to enable/disable 
+# a service according to opencsw standards.
+#
+umask 0022
+
+if [ -z "$PKG_INSTALL_ROOT" ]; then 
+	PKG_INSTALL_ROOT=/
+fi
+	
+while read SRC DEST; do
+	if [ -f "${PKG_INSTALL_ROOT}/$DEST" ]; then
+		cp "$SRC" "${PKG_INSTALL_ROOT}/$DEST.CSW"
+	else
+		cp "$SRC" "${PKG_INSTALL_ROOT}/$DEST"
+	fi
+done
+
+# Unfortunately pkgadd doesn't backup the source file if the destination file is identical.
+# It's a problem with zones installation where pkgadd try to find the backup files, so
+# we do the backup manually
+awk '{ if ( $3 == "conf" ) print $2,$3,$4,$5,$6,$7  }' $INST_DATADIR/$PKG/pkgmap | \
+    while read FTYPE CLASS FPATH MODE OWNER GROUP; do
+        if echo $FPATH | grep "^/" >/dev/null; then
+            INST_PATH="$INST_DATADIR/$PKG/root/$FPATH"
+            SAVE_PATH="$PKGSAV/pspool/$PKG/root/$FPATH"
+        else
+            INST_PATH="$INST_DATADIR/$PKG/reloc/$FPATH"
+            SAVE_PATH="$PKGSAV/pspool/$PKG/reloc/$FPATH"
+        fi
+
+        if [ ! -f "$SAVE_PATH" ]; then
+            mkdir -p "`LANG=C dirname $SAVE_PATH`"
+            cp "$INST_PATH" "$SAVE_PATH"
+        fi
+     done
+
+exit 0
+

Added: csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch	2009-05-23 14:15:36 UTC (rev 5020)
@@ -0,0 +1,18 @@
+--- openssl-1.0.0-beta1/Configure	2009-02-19 10:43:18.000000000 +0100
++++ openssl-1.0.0-beta1/Configure.new	2009-04-04 15:31:55.700403043 +0200
+@@ -213,6 +213,7 @@
+  
+ #### Solaris x86 with Sun C setups
+ "solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"solaris-pentium_pro-cc","cc:-fast -xarch=pentium_pro -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
+ 
+ #### SPARC Solaris with GNU C setups
+@@ -232,6 +233,7 @@
+ "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"solaris-sparcv9+vis-cc","cc:-xtarget=ultra -xarch=v8plusa -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs::/64",
+ ####
+ "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

Added: csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8h.patch.2008-07-29
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8h.patch.2008-07-29	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/pkcs11_engine-0.9.8h.patch.2008-07-29	2009-05-23 14:15:36 UTC (rev 5020)
@@ -0,0 +1,10168 @@
+diff -urN openssl-0.9.8j/Configure openssl-0.9.8j.new/Configure
+--- openssl-0.9.8j/Configure	2008-12-29 01:18:23.000000000 +0100
++++ openssl-0.9.8j.new/Configure	2009-02-15 22:26:02.669766669 +0100
+@@ -21,6 +21,9 @@
+ # --prefix      prefix for the OpenSSL include, lib and bin directories
+ #               (Default: the OPENSSLDIR directory)
+ #
++# --pk11-libname  PKCS#11 library name.
++#               (Default: none)
++#
+ # --install_prefix  Additional prefix for package builders (empty by
+ #               default).  This needn't be set in advance, you can
+ #               just as well use "make INSTALL_PREFIX=/whatever install".
+@@ -575,6 +578,8 @@
+ my $idx_ranlib = $idx++;
+ my $idx_arflags = $idx++;
+ 
++my $pk11_libname="";
++
+ my $prefix="";
+ my $openssldir="";
+ my $exe_ext="";
+@@ -807,6 +812,10 @@
+ 				{
+ 				$flags.=$_." ";
+ 				}
++                        elsif (/^--pk11-libname=(.*)$/)
++                                {
++                                $pk11_libname=$1;
++                                }
+ 			elsif (/^--prefix=(.*)$/)
+ 				{
+ 				$prefix=$1;
+@@ -938,6 +947,13 @@
+ 	exit 0;
+ }
+ 
++if (! $pk11_libname)
++        {
++        print STDERR "You must set --pk11-libname for PKCS#11 library.\n";
++        print STDERR "See README.pkcs11 for more information.\n";
++        exit 1;
++        }
++
+ if ($target =~ m/^CygWin32(-.*)$/) {
+ 	$target = "Cygwin".$1;
+ }
+@@ -1095,6 +1111,8 @@
+ if ($flags ne "")	{ $cflags="$flags$cflags"; }
+ else			{ $no_user_cflags=1;       }
+ 
++$cflags="-DPK11_LIB_LOCATION=\"$pk11_libname\" $cflags";
++
+ # Kerberos settings.  The flavor must be provided from outside, either through
+ # the script "config" or manually.
+ if (!$no_krb5)
+@@ -1446,6 +1464,7 @@
+ 	s/^VERSION=.*/VERSION=$version/;
+ 	s/^MAJOR=.*/MAJOR=$major/;
+ 	s/^MINOR=.*/MINOR=$minor/;
++	s/^PK11_LIB_LOCATION=.*/PK11_LIB_LOCATION=$pk11_libname/;
+ 	s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=$shlib_version_number/;
+ 	s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$shlib_version_history/;
+ 	s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/;
+diff -urN openssl-0.9.8j/Makefile.org openssl-0.9.8j.new/Makefile.org
+--- openssl-0.9.8j/Makefile.org	2008-12-30 14:26:26.000000000 +0100
++++ openssl-0.9.8j.new/Makefile.org	2009-02-15 22:26:02.673236044 +0100
+@@ -26,6 +26,9 @@
+ INSTALL_PREFIX=
+ INSTALLTOP=/usr/local/ssl
+ 
++# You must set this through --pk11-libname configure option.
++PK11_LIB_LOCATION=
++
+ # Do not edit this manually. Use Configure --openssldir=DIR do change this!
+ OPENSSLDIR=/usr/local/ssl
+ 
+diff -urN openssl-0.9.8j/README.pkcs11 openssl-0.9.8j.new/README.pkcs11
+--- openssl-0.9.8j/README.pkcs11	1970-01-01 01:00:00.000000000 +0100
++++ openssl-0.9.8j.new/README.pkcs11	2009-02-15 22:26:02.675891756 +0100
+@@ -0,0 +1,159 @@
++PKCS#11 engine support for OpenSSL 0.9.8h
++=========================================
++
++[July 29, 2008]
++
++This patch containing code available in OpenSolaris adds support for PKCS#11
++engine into OpenSSL and implements PKCS#11 v2.20. It is to be applied against
++OpenSSL 0.9.8h source code distribution as shipped by OpenSSL.Org. Your system
++must provide PKCS#11 backend otherwise the patch is useless. You provide the
++PKCS#11 library name during the build configuration phase, see below.
++
++Patch can be applied like this:
++
++	# NOTE: use gtar if on Solaris
++	tar xfzv openssl-0.9.8h.tar.gz
++	# now download the patch to the current directory
++	# ...
++	cd openssl-0.9.8h
++	# NOTE: use gpatch if on Solaris	
++	patch -p1 < ../pkcs11_engine-0.9.8h.patch.2008-07-29
++
++It is designed to support pure acceleration for RSA, DSA, DH and all the
++symetric ciphers and message digest algorithms that PKCS#11 and OpenSSL share
++except for missing support for patented algorithms MDC2, RC3, RC5 and IDEA.
++
++According to the PKCS#11 providers installed on your machine, it can support
++following mechanisms:
++
++	RSA, DSA, DH, RAND, DES-CBC, DES-EDE3-CBC, DES-ECB, DES-EDE3, RC4,
++	AES-128-CBC, AES-192-CBC, AES-256-CBC, AES-128-ECB, AES-192-ECB,
++	AES-256-ECB, AES-128-CTR, AES-192-CTR, AES-256-CTR, MD5, SHA1, SHA224,
++	SHA256, SHA384, SHA512
++
++Note that for AES counter mode the application must provide their own EVP
++functions since OpenSSL doesn't support counter mode through EVP yet. You may
++see OpenSSH source code (cipher.c) to get the idea how to do that.
++
+++------------------------------------------------------------------------------+
++| NOTE: this patch version does NOT contain experimental code for accessing    |
++| RSA keys stored in pkcs#11 key stores by reference. Some problems were found |
++| (thanks to all who wrote me!) and due to my ENOTIME problem I'll address     |
++| those issues in the next version of the patch that will have that code back, |
++| hopefully fixed.                                                             |
+++------------------------------------------------------------------------------+
++
++You must provide the location of PKCS#11 library in your system to the
++configure script. You will be instructed to do that when you try to run the
++config script:
++
++	$ ./config 
++	Operating system: i86pc-whatever-solaris2
++	Configuring for solaris-x86-cc
++	You must set --pk11-libname for PKCS#11 library.
++	See README.pkcs11 for more information.
++
++Taking openCryptoki project on Linux AMD64 box as an example, you would run
++configure like this:
++
++	./config --pk11-libname=/usr/lib64/pkcs11/PKCS11_API.so
++
++To check whether newly built openssl really supports PKCS#11 it's enough to
++run "apps/openssl engine" and look for "(pkcs11) PKCS #11 engine support" in
++the output.
++
++This patch was tested on Solaris against PKCS#11 engine available from Solaris
++Cryptographic Framework (Solaris 10 and OpenSolaris) and also on Linux using
++PKCS#11 libraries from openCryptoki project (see openCryptoki website
++http://sourceforge.net/projects/opencryptoki for more information). Some Linux
++distributions even ship those libraries with the system. The patch should work
++on any system that is supported by OpenSSL itself and has functional PKCS#11
++library.
++
++The patch contains "RSA Security Inc. PKCS #11 Cryptographic Token Interface
++(Cryptoki)" - files cryptoki.h, pkcs11.h, pkcs11f.h and pkcs11t.h which are
++copyrighted by RSA Security Inc., see pkcs11.h for more information.
++
++Other added/modified code in this patch is copyrighted by Sun Microsystems,
++Inc. and is released under the OpenSSL license (see LICENSE file for more
++information).
++
++Revisions of patch for 0.9.8 branch
++===================================
++
++2008-07-29
++- update the patch to OpenSSL 0.9.8h version
++- pkcs11t.h updated to the latest version:
++
++	6545665 make CKM_AES_CTR available to non-kernel users
++
++- fixed bugs in the engine code:
++
++	6602801 PK11_SESSION cache has to employ reference counting scheme for
++		asymmetric key operations
++	6605538 pkcs11 functions C_FindObjects[{Init,Final}]() not called
++		atomically
++	6607307 pkcs#11 engine can't read RSA private keys
++	6652362 pk11_RSA_finish() is cutting corners
++	6662112 pk11_destroy_{rsa,dsa,dh}_key_objects() use locking in
++		suboptimal way
++	6666625 pk11_destroy_{rsa,dsa,dh}_key_objects() should be more
++		resilient to destroy failures
++	6667273 OpenSSL engine should not use free() but OPENSSL_free()
++	6670363 PKCS#11 engine fails to reuse existing symmetric keys
++	6678135 memory corruption in pk11_DH_generate_key() in pkcs#11 engine
++	6678503 DSA signature conversion in pk11_dsa_do_verify() ignores size
++		of big numbers leading to failures
++	6706562 pk11_DH_compute_key() returns 0 in case of failure instead of
++		-1
++	6706622 pk11_load_{pub,priv}key create corrupted RSA key references
++	6707129 return values from BN_new() in pk11_DH_generate_key() are not
++		checked
++	6707274 DSA/RSA/DH PKCS#11 engine operations need to be resistant to
++		structure reuse
++	6707782 OpenSSL PKCS#11 engine pretends to be aware of
++		OPENSSL_NO_{RSA,DSA,DH}
++	defines but fails miserably
++	6709966 make check_new_*() to return values to indicate cache hit/miss
++	6705200 pk11_dh struct initialization in PKCS#11 engine is missing
++		generate_params parameter
++	6709513 PKCS#11 engine sets IV length even for ECB modes
++	6728296 buffer length not initialized for C_(En|De)crypt_Final() in the
++		PKCS#11 engine
++	6728871 PKCS#11 engine must reset global_session in pk11_finish()
++
++- new features and enhancements:
++
++	6562155 OpenSSL pkcs#11 engine needs support for SHA224/256/384/512
++	6685012 OpenSSL pkcs#11 engine needs support for new cipher modes
++	6725903 OpenSSL PKCS#11 engine shouldn't use soft token for symmetric
++		ciphers and digests
++
++2007-10-15
++- update for 0.9.8f version
++- update for "6607670 teach pkcs#11 engine how to use keys be reference"
++
++2007-10-02
++- draft for "6607670 teach pkcs#11 engine how to use keys be reference"
++- draft for "6607307 pkcs#11 engine can't read RSA private keys"
++
++2007-09-26
++- 6375348 Using pkcs11 as the SSLCryptoDevice with Apache/OpenSSL causes
++	  significant performance drop
++- 6573196 memory is leaked when OpenSSL is used with PKCS#11 engine
++
++2007-05-25
++- 6558630 race in OpenSSL pkcs11 engine when using symetric block ciphers
++
++2007-05-19
++- initial patch for 0.9.8e using latest OpenSolaris code
++
++
++Feedback
++========
++
++Please send feedback to security-discuss at opensolaris.org. The patch was
++created by Jan.Pechanec at Sun.COM from code available in OpenSolaris.
++
++Latest version should be always available on http://blogs.sun.com/janp.
++
+diff -urN openssl-0.9.8j/crypto/engine/Makefile openssl-0.9.8j.new/crypto/engine/Makefile
+--- openssl-0.9.8j/crypto/engine/Makefile	2008-09-17 19:10:59.000000000 +0200
++++ openssl-0.9.8j.new/crypto/engine/Makefile	2009-02-15 22:29:36.590747863 +0100
+@@ -21,12 +21,14 @@
+ 	eng_table.c eng_pkey.c eng_fat.c eng_all.c \
+ 	tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \
+ 	tb_cipher.c tb_digest.c \
+-	eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c eng_padlock.c
++	eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c eng_padlock.c \
++	hw_pk11.c hw_pk11_pub.c
+ LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \
+ 	eng_table.o eng_pkey.o eng_fat.o eng_all.o \
+ 	tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \
+ 	tb_cipher.o tb_digest.o \
+-	eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o eng_padlock.o
++	eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o eng_padlock.o \
++	hw_pk11.o hw_pk11_pub.o
+ 
+ SRC= $(LIBSRC)
+ 
+@@ -286,6 +288,54 @@
+ eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+ eng_table.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h
+ eng_table.o: eng_table.c
++hw_pk11.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
++hw_pk11.o: ../../include/openssl/engine.h ../../include/openssl/ossl_typ.h
++hw_pk11.o: ../../include/openssl/bn.h ../../include/openssl/rsa.h
++hw_pk11.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
++hw_pk11.o: ../../include/openssl/crypto.h ../../include/openssl/stack.h
++hw_pk11.o: ../../include/openssl/safestack.h ../../include/openssl/opensslv.h
++hw_pk11.o: ../../include/openssl/symhacks.h ../../include/openssl/dsa.h
++hw_pk11.o: ../../include/openssl/dh.h ../../include/openssl/rand.h
++hw_pk11.o: ../../include/openssl/ui.h ../../include/openssl/err.h
++hw_pk11.o: ../../include/openssl/lhash.h ../../include/openssl/dso.h
++hw_pk11.o: ../../include/openssl/pem.h ../../include/openssl/evp.h
++hw_pk11.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
++hw_pk11.o: ../../include/openssl/md5.h ../../include/openssl/sha.h
++hw_pk11.o: ../../include/openssl/ripemd.h ../../include/openssl/des.h
++hw_pk11.o: ../../include/openssl/des_old.h ../../include/openssl/ui_compat.h
++hw_pk11.o: ../../include/openssl/rc4.h ../../include/openssl/rc2.h
++hw_pk11.o: ../../crypto/rc5/rc5.h ../../include/openssl/blowfish.h
++hw_pk11.o: ../../include/openssl/cast.h ../../include/openssl/idea.h
++hw_pk11.o: ../../crypto/mdc2/mdc2.h ../../include/openssl/aes.h
++hw_pk11.o: ../../include/openssl/objects.h ../../include/openssl/obj_mac.h
++hw_pk11.o: ../../include/openssl/x509.h ../../include/openssl/buffer.h
++hw_pk11.o: ../../include/openssl/x509_vfy.h ../../include/openssl/pkcs7.h
++hw_pk11.o: ../../include/openssl/pem2.h ../cryptlib.h
++hw_pk11.o: ../../e_os.h hw_pk11_err.c hw_pk11_err.h hw_pk11.c
++hw_pk11_pub.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
++hw_pk11_pub.o: ../../include/openssl/engine.h ../../include/openssl/ossl_typ.h
++hw_pk11_pub.o: ../../include/openssl/bn.h ../../include/openssl/rsa.h
++hw_pk11_pub.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
++hw_pk11_pub.o: ../../include/openssl/crypto.h ../../include/openssl/stack.h
++hw_pk11_pub.o: ../../include/openssl/safestack.h ../../include/openssl/opensslv.h
++hw_pk11_pub.o: ../../include/openssl/symhacks.h ../../include/openssl/dsa.h
++hw_pk11_pub.o: ../../include/openssl/dh.h ../../include/openssl/rand.h
++hw_pk11_pub.o: ../../include/openssl/ui.h ../../include/openssl/err.h
++hw_pk11_pub.o: ../../include/openssl/lhash.h ../../include/openssl/dso.h
++hw_pk11_pub.o: ../../include/openssl/pem.h ../../include/openssl/evp.h
++hw_pk11_pub.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
++hw_pk11_pub.o: ../../include/openssl/md5.h ../../include/openssl/sha.h
++hw_pk11_pub.o: ../../include/openssl/ripemd.h ../../include/openssl/des.h
++hw_pk11_pub.o: ../../include/openssl/des_old.h ../../include/openssl/ui_compat.h
++hw_pk11_pub.o: ../../include/openssl/rc4.h ../../include/openssl/rc2.h
++hw_pk11_pub.o: ../../crypto/rc5/rc5.h ../../include/openssl/blowfish.h
++hw_pk11_pub.o: ../../include/openssl/cast.h ../../include/openssl/idea.h
++hw_pk11_pub.o: ../../crypto/mdc2/mdc2.h ../../include/openssl/aes.h
++hw_pk11_pub.o: ../../include/openssl/objects.h ../../include/openssl/obj_mac.h
++hw_pk11_pub.o: ../../include/openssl/x509.h ../../include/openssl/buffer.h
++hw_pk11_pub.o: ../../include/openssl/x509_vfy.h ../../include/openssl/pkcs7.h
++hw_pk11_pub.o: ../../include/openssl/pem2.h ../cryptlib.h
++hw_pk11_pub.o: ../../e_os.h hw_pk11_err.c hw_pk11_err.h hw_pk11_pub.c
+ tb_cipher.o: ../../e_os.h ../../include/openssl/asn1.h
+ tb_cipher.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+ tb_cipher.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+diff -urN openssl-0.9.8j/crypto/engine/cryptoki.h openssl-0.9.8j.new/crypto/engine/cryptoki.h
+--- openssl-0.9.8j/crypto/engine/cryptoki.h	1970-01-01 01:00:00.000000000 +0100
++++ openssl-0.9.8j.new/crypto/engine/cryptoki.h	2009-02-15 22:26:02.684405873 +0100
+@@ -0,0 +1,103 @@
++/*
++ * CDDL HEADER START
++ *
++ * The contents of this file are subject to the terms of the
++ * Common Development and Distribution License, Version 1.0 only
++ * (the "License").  You may not use this file except in compliance
++ * with the License.
++ *
++ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
++ * or http://www.opensolaris.org/os/licensing.
++ * See the License for the specific language governing permissions
++ * and limitations under the License.
++ *
++ * When distributing Covered Code, include this CDDL HEADER in each
++ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
++ * If applicable, add the following below this CDDL HEADER, with the
++ * fields enclosed by brackets "[]" replaced with your own identifying
++ * information: Portions Copyright [yyyy] [name of copyright owner]
++ *
++ * CDDL HEADER END
++ */
++/*
++ * Copyright 2003 Sun Microsystems, Inc.   All rights reserved.
++ * Use is subject to license terms.
++ */
++
++#ifndef	_CRYPTOKI_H
++#define	_CRYPTOKI_H
++
++#pragma ident	"@(#)cryptoki.h	1.2	05/06/08 SMI"
++
++#ifdef	__cplusplus
++extern "C" {
++#endif
++
++#ifndef	CK_PTR
++#define	CK_PTR *
++#endif
++
++#ifndef CK_DEFINE_FUNCTION
++#define	CK_DEFINE_FUNCTION(returnType, name) returnType name
++#endif
++
++#ifndef CK_DECLARE_FUNCTION
++#define	CK_DECLARE_FUNCTION(returnType, name) returnType name
++#endif
++
++#ifndef CK_DECLARE_FUNCTION_POINTER
++#define	CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType (* name)
++#endif
++
++#ifndef CK_CALLBACK_FUNCTION
++#define	CK_CALLBACK_FUNCTION(returnType, name) returnType (* name)
++#endif
++
++#ifndef NULL_PTR
++#include 	/* For NULL */
++#define	NULL_PTR NULL
++#endif
++
++/*
++ * pkcs11t.h defines TRUE and FALSE in a way that upsets lint
++ */
++#ifndef	CK_DISABLE_TRUE_FALSE
++#define	CK_DISABLE_TRUE_FALSE
++#ifndef	TRUE
++#define	TRUE	1
++#endif /* TRUE */
++#ifndef	FALSE
++#define	FALSE	0
++#endif /* FALSE */
++#endif /* CK_DISABLE_TRUE_FALSE */
++
++#undef CK_PKCS11_FUNCTION_INFO
++
++#include "pkcs11.h"
++
++/* Solaris specific functions */
++
++#include 
++
++/*
++ * SUNW_C_GetMechSession will initialize the framework and do all
++ * the necessary PKCS#11 calls to create a session capable of
++ * providing operations on the requested mechanism
++ */
++CK_RV SUNW_C_GetMechSession(CK_MECHANISM_TYPE mech,
++    CK_SESSION_HANDLE_PTR hSession);
++
++/*
++ * SUNW_C_KeyToObject will create a secret key object for the given
++ * mechanism from the rawkey data.
++ */
++CK_RV SUNW_C_KeyToObject(CK_SESSION_HANDLE hSession,
++    CK_MECHANISM_TYPE mech, const void *rawkey, size_t rawkey_len,
++    CK_OBJECT_HANDLE_PTR obj);
++
++
++#ifdef	__cplusplus
++}
++#endif
++
++#endif	/* _CRYPTOKI_H */
+diff -urN openssl-0.9.8j/crypto/engine/eng_all.c openssl-0.9.8j.new/crypto/engine/eng_all.c
+--- openssl-0.9.8j/crypto/engine/eng_all.c	2008-06-04 20:01:39.000000000 +0200
++++ openssl-0.9.8j.new/crypto/engine/eng_all.c	2009-02-15 22:26:02.687356494 +0100
+@@ -110,6 +110,9 @@
+ #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
+ 	ENGINE_load_capi();
+ #endif
++#ifndef OPENSSL_NO_HW_PKCS11
++	ENGINE_load_pk11();
++#endif
+ #endif
+ 	}
+ 
+diff -urN openssl-0.9.8j/crypto/engine/engine.h openssl-0.9.8j.new/crypto/engine/engine.h
+--- openssl-0.9.8j/crypto/engine/engine.h	2008-06-04 20:01:40.000000000 +0200
++++ openssl-0.9.8j.new/crypto/engine/engine.h	2009-02-15 22:26:02.691825491 +0100
+@@ -337,6 +337,7 @@
+ void ENGINE_load_ubsec(void);
+ #endif
+ void ENGINE_load_cryptodev(void);
++void ENGINE_load_pk11(void);
+ void ENGINE_load_padlock(void);
+ void ENGINE_load_builtin_engines(void);
+ #ifndef OPENSSL_NO_CAPIENG
+diff -urN openssl-0.9.8j/crypto/engine/hw_pk11.c openssl-0.9.8j.new/crypto/engine/hw_pk11.c
+--- openssl-0.9.8j/crypto/engine/hw_pk11.c	1970-01-01 01:00:00.000000000 +0100
++++ openssl-0.9.8j.new/crypto/engine/hw_pk11.c	2009-02-15 22:26:02.715171244 +0100
+@@ -0,0 +1,3382 @@
++/*
++ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
++ * Use is subject to license terms.
++ */
++
++#pragma ident	"@(#)hw_pk11.c	1.14	08/07/28 SMI"
++
++/* crypto/engine/hw_pk11.c */
++/* This product includes software developed by the OpenSSL Project for 
++ * use in the OpenSSL Toolkit (http://www.openssl.org/).
++ *
++ * This project also referenced hw_pkcs11-0.9.7b.patch written by 
++ * Afchine Madjlessi.
++ */
++/* ====================================================================
++ * Copyright (c) 2000-2001 The OpenSSL Project.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer. 
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. All advertising materials mentioning features or use of this
++ *    software must display the following acknowledgment:
++ *    "This product includes software developed by the OpenSSL Project
++ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
++ *
++ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
++ *    endorse or promote products derived from this software without
++ *    prior written permission. For written permission, please contact
++ *    licensing at OpenSSL.org.
++ *
++ * 5. Products derived from this software may not be called "OpenSSL"
++ *    nor may "OpenSSL" appear in their names without prior written
++ *    permission of the OpenSSL Project.
++ *
++ * 6. Redistributions of any form whatsoever must retain the following
++ *    acknowledgment:
++ *    "This product includes software developed by the OpenSSL Project
++ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
++ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
++ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
++ * OF THE POSSIBILITY OF SUCH DAMAGE.
++ * ====================================================================
++ *
++ * This product includes cryptographic software written by Eric Young
++ * (eay at cryptsoft.com).  This product includes software written by Tim
++ * Hudson (tjh at cryptsoft.com).
++ *
++ */
++
++#include 
++#include 
++#include 
++#include 
++#include 
++
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#ifndef OPENSSL_NO_RSA
++#include 
++#endif
++#ifndef OPENSSL_NO_DSA
++#include 
++#endif
++#ifndef OPENSSL_NO_DH
++#include 
++#endif
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++
++#ifndef OPENSSL_NO_HW
++#ifndef OPENSSL_NO_HW_PK11
++
++/* label for debug messages printed on stderr */
++#define	PK11_DBG	"PKCS#11 ENGINE DEBUG"
++/* prints a lot of debug messages on stderr about slot selection process */
++#undef	DEBUG_SLOT_SELECTION
++/*
++ * Solaris specific code. See comment at check_hw_mechanisms() for more
++ * information.
++ */
++#undef	SOLARIS_HW_SLOT_SELECTION
++
++/*
++ * AES counter mode is not supported in the OpenSSL EVP API yet and neither
++ * there are official OIDs for mechanisms based on this mode. With our changes,
++ * an application can define its own EVP calls for AES counter mode and then
++ * it can make use of hardware acceleration through this engine. However, it's
++ * better if we keep AES CTR support code under ifdef's.
++ */
++#define	SOLARIS_AES_CTR
++
++#include "cryptoki.h"
++#include "pkcs11.h"
++#include "hw_pk11_err.c"
++
++#ifdef	SOLARIS_AES_CTR
++/*
++ * NIDs for AES counter mode that will be defined during the engine
++ * initialization.
++ */
++int NID_aes_128_ctr = NID_undef;
++int NID_aes_192_ctr = NID_undef;
++int NID_aes_256_ctr = NID_undef;
++#endif	/* SOLARIS_AES_CTR */
++
++#ifdef	SOLARIS_HW_SLOT_SELECTION
++/*
++ * Tables for symmetric ciphers and digest mechs found in the pkcs11_kernel
++ * library. See comment at check_hw_mechanisms() for more information.
++ */
++int *hw_cnids;
++int *hw_dnids;
++#endif	/* SOLARIS_HW_SLOT_SELECTION */
++
++/*
++ * Heads of the free PK11 session lists. We have three groups of algorithms in
++ * the engine. Public key mechanisms, random operations, and symetric ciphers
++ * and digests. We can use a different slot for each group so we must keep a
++ * separate cache of sessions for them.
++ */
++static struct PK11_SESSION_st *pubkey_free_session = NULL;
++static struct PK11_SESSION_st *rand_free_session = NULL;
++static struct PK11_SESSION_st *free_session = NULL;
++
++/* Create all secret key objects in a global session so that they are available
++ * to use for other sessions. These other sessions may be opened or closed
++ * without losing the secret key objects */
++static CK_SESSION_HANDLE	global_session = CK_INVALID_HANDLE;
++
++/* ENGINE level stuff */
++static int pk11_init(ENGINE *e);
++static int pk11_library_init(ENGINE *e);
++static int pk11_finish(ENGINE *e);
++static int pk11_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
++static int pk11_destroy(ENGINE *e);
++
++/* RAND stuff */
++static void pk11_rand_seed(const void *buf, int num);
++static void pk11_rand_add(const void *buf, int num, double add_entropy);
++static void pk11_rand_cleanup(void);
++static int pk11_rand_bytes(unsigned char *buf, int num);
++static int pk11_rand_status(void);
++
++/* These functions are also used in other files */
++PK11_SESSION *pk11_get_session(PK11_OPTYPE optype);
++void pk11_return_session(PK11_SESSION *sp, PK11_OPTYPE optype);
++
++/* active list manipulation functions used here */
++int pk11_active_delete(CK_OBJECT_HANDLE h);
++
++#ifndef OPENSSL_NO_RSA
++int pk11_destroy_rsa_key_objects(PK11_SESSION *session);
++int pk11_destroy_rsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock);
++int pk11_destroy_rsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock);
++#endif
++#ifndef OPENSSL_NO_DSA
++int pk11_destroy_dsa_key_objects(PK11_SESSION *session);
++int pk11_destroy_dsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock);
++int pk11_destroy_dsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock);
++#endif
++#ifndef OPENSSL_NO_DH
++int pk11_destroy_dh_key_objects(PK11_SESSION *session);
++int pk11_destroy_dh_object(PK11_SESSION *session, CK_BBOOL uselock);
++#endif
++
++/* Local helper functions */
++static int pk11_free_all_sessions(void);
++static int pk11_free_session_list(PK11_SESSION **sp);
++static int pk11_setup_session(PK11_SESSION *sp, PK11_OPTYPE optype);
++static int pk11_destroy_cipher_key_objects(PK11_SESSION *session);
++static int pk11_destroy_object(CK_SESSION_HANDLE session,
++	CK_OBJECT_HANDLE oh);
++static const char *get_PK11_LIBNAME(void);
++static void free_PK11_LIBNAME(void);
++static long set_PK11_LIBNAME(const char *name);
++
++/* Symmetric cipher and digest support functions */
++static int cipher_nid_to_pk11(int nid);
++#ifdef	SOLARIS_AES_CTR
++static int pk11_add_NID(char *sn, char *ln);
++static int pk11_add_aes_ctr_NIDs(void);
++#endif	/* SOLARIS_AES_CTR */
++static int pk11_usable_ciphers(const int **nids);
++static int pk11_usable_digests(const int **nids);
++static int pk11_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
++	const unsigned char *iv, int enc);
++static int pk11_cipher_final(PK11_SESSION *sp);
++static int pk11_cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
++	const unsigned char *in, unsigned int inl);
++static int pk11_cipher_cleanup(EVP_CIPHER_CTX *ctx);
++static int pk11_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
++	const int **nids, int nid);
++static int pk11_engine_digests(ENGINE *e, const EVP_MD **digest,
++	const int **nids, int nid);
++static CK_OBJECT_HANDLE pk11_get_cipher_key(EVP_CIPHER_CTX *ctx, 
++	const unsigned char *key, CK_KEY_TYPE key_type, PK11_SESSION *sp);
++static int check_new_cipher_key(PK11_SESSION *sp, const unsigned char *key,
++	int key_len);
++static int md_nid_to_pk11(int nid);
++static int pk11_digest_init(EVP_MD_CTX *ctx);
++static int pk11_digest_update(EVP_MD_CTX *ctx,const void *data,
++	size_t count);
++static int pk11_digest_final(EVP_MD_CTX *ctx,unsigned char *md);
++static int pk11_digest_copy(EVP_MD_CTX *to,const EVP_MD_CTX *from);
++static int pk11_digest_cleanup(EVP_MD_CTX *ctx);
++
++static int pk11_choose_slots(int *any_slot_found);
++static void pk11_find_symmetric_ciphers(CK_FUNCTION_LIST_PTR pflist,
++    CK_SLOT_ID current_slot, int *current_slot_n_cipher,
++    int *local_cipher_nids);
++static void pk11_find_digests(CK_FUNCTION_LIST_PTR pflist,
++    CK_SLOT_ID current_slot, int *current_slot_n_digest,
++    int *local_digest_nids);
++static void pk11_get_symmetric_cipher(CK_FUNCTION_LIST_PTR, int slot_id,
++    CK_MECHANISM_TYPE mech, int *current_slot_n_cipher, int *local_cipher_nids,
++    int id);
++static void pk11_get_digest(CK_FUNCTION_LIST_PTR pflist, int slot_id,
++    CK_MECHANISM_TYPE mech, int *current_slot_n_digest, int *local_digest_nids,
++    int id);
++
++#ifdef	SOLARIS_HW_SLOT_SELECTION
++static int check_hw_mechanisms(void);
++static int nid_in_table(int nid, int *nid_table);
++#endif	/* SOLARIS_HW_SLOT_SELECTION */
++
++/* Index for the supported ciphers */
++enum pk11_cipher_id {
++	PK11_DES_CBC,
++	PK11_DES3_CBC,
++	PK11_DES_ECB,
++	PK11_DES3_ECB,
++	PK11_RC4,
++	PK11_AES_128_CBC,
++	PK11_AES_192_CBC,
++	PK11_AES_256_CBC,
++	PK11_AES_128_ECB,
++	PK11_AES_192_ECB,
++	PK11_AES_256_ECB,
++	PK11_BLOWFISH_CBC,
++#ifdef	SOLARIS_AES_CTR
++	PK11_AES_128_CTR,
++	PK11_AES_192_CTR,
++	PK11_AES_256_CTR,
++#endif	/* SOLARIS_AES_CTR */
++	PK11_CIPHER_MAX
++};
++
++/* Index for the supported digests */
++enum pk11_digest_id {
++	PK11_MD5,
++	PK11_SHA1,
++	PK11_SHA224,
++	PK11_SHA256,
++	PK11_SHA384,
++	PK11_SHA512,
++	PK11_DIGEST_MAX
++};
++
++#define	TRY_OBJ_DESTROY(sess_hdl, obj_hdl, retval, uselock)		\
++	{								\
++	if (uselock)							\
++		CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE);			\
++	if (pk11_active_delete(obj_hdl) == 1)				\
++		{							\
++		retval = pk11_destroy_object(sess_hdl, obj_hdl);	\
++		}							\
++	if (uselock)							\
++		CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE);		\
++	}
++
++static int cipher_nids[PK11_CIPHER_MAX];
++static int digest_nids[PK11_DIGEST_MAX];
++static int cipher_count		= 0;
++static int digest_count		= 0;
++static CK_BBOOL pk11_have_rsa	= CK_FALSE;
++static CK_BBOOL pk11_have_dsa	= CK_FALSE;
++static CK_BBOOL pk11_have_dh	= CK_FALSE;
++static CK_BBOOL pk11_have_random = CK_FALSE;
++
++typedef struct PK11_CIPHER_st 
++	{
++	enum pk11_cipher_id	id;
++	int			nid;
++	int			iv_len;
++	int			key_len;
++	CK_KEY_TYPE		key_type;
++	CK_MECHANISM_TYPE	mech_type;
++	} PK11_CIPHER;
++
++static PK11_CIPHER ciphers[] = 
++	{
++	{PK11_DES_CBC,	   NID_des_cbc,      8,  8, CKK_DES,      CKM_DES_CBC, },
++	{PK11_DES3_CBC,	   NID_des_ede3_cbc, 8, 24, CKK_DES3,     CKM_DES3_CBC, },
++	{PK11_DES_ECB,	   NID_des_ecb,      0,  8, CKK_DES,      CKM_DES_ECB, },
++	{PK11_DES3_ECB,	   NID_des_ede3_ecb, 0, 24, CKK_DES3,     CKM_DES3_ECB, },
++	{PK11_RC4,	   NID_rc4,          0, 16, CKK_RC4,      CKM_RC4, },
++	{PK11_AES_128_CBC, NID_aes_128_cbc, 16, 16, CKK_AES,      CKM_AES_CBC, },
++	{PK11_AES_192_CBC, NID_aes_192_cbc, 16, 24, CKK_AES,      CKM_AES_CBC, },
++	{PK11_AES_256_CBC, NID_aes_256_cbc, 16, 32, CKK_AES,      CKM_AES_CBC, },
++	{PK11_AES_128_ECB, NID_aes_128_ecb,  0, 16, CKK_AES,      CKM_AES_ECB, },
++	{PK11_AES_192_ECB, NID_aes_192_ecb,  0, 24, CKK_AES,      CKM_AES_ECB, },
++	{PK11_AES_256_ECB, NID_aes_256_ecb,  0, 32, CKK_AES,      CKM_AES_ECB, },
++	{PK11_BLOWFISH_CBC,NID_bf_cbc,       8, 16, CKK_BLOWFISH, CKM_BLOWFISH_CBC,},
++#ifdef	SOLARIS_AES_CTR
++	/* we don't know the correct NIDs until the engine is initialized */
++	{PK11_AES_128_CTR, NID_undef,	    16, 16, CKK_AES,      CKM_AES_CTR, },
++	{PK11_AES_192_CTR, NID_undef,	    16, 24, CKK_AES,      CKM_AES_CTR, },
++	{PK11_AES_256_CTR, NID_undef,	    16, 32, CKK_AES,      CKM_AES_CTR, },
++#endif	/* SOLARIS_AES_CTR */
++	};
++
++typedef struct PK11_DIGEST_st
++	{
++	enum pk11_digest_id	id;
++	int			nid;
++	CK_MECHANISM_TYPE	mech_type;
++	} PK11_DIGEST;
++
++static PK11_DIGEST digests[] = 
++	{
++	{PK11_MD5,	NID_md5,	CKM_MD5, },
++	{PK11_SHA1,	NID_sha1,	CKM_SHA_1, },
++	{PK11_SHA224,	NID_sha224,	CKM_SHA224, },
++	{PK11_SHA256,	NID_sha256,	CKM_SHA256, },
++	{PK11_SHA384,	NID_sha384,	CKM_SHA384, },
++	{PK11_SHA512,	NID_sha512,	CKM_SHA512, },
++	{0,		NID_undef,	0xFFFF, },
++	};
++
++/* Structure to be used for the cipher_data/md_data in 
++ * EVP_CIPHER_CTX/EVP_MD_CTX structures in order to use the same 
++ * pk11 session in multiple cipher_update calls
++ */
++typedef struct PK11_CIPHER_STATE_st
++	{
++	PK11_SESSION	*sp;
++	} PK11_CIPHER_STATE;
++
++
++/*
++ * libcrypto EVP stuff - this is how we get wired to EVP so the engine gets
++ * called when libcrypto requests a cipher NID.
++ *
++ * Note how the PK11_CIPHER_STATE is used here.
++ */
++
++/* DES CBC EVP */
++static const EVP_CIPHER pk11_des_cbc = 
++	{
++	NID_des_cbc,
++	8, 8, 8,
++	EVP_CIPH_CBC_MODE,
++	pk11_cipher_init,
++	pk11_cipher_do_cipher,
++	pk11_cipher_cleanup,
++	sizeof(PK11_CIPHER_STATE),
++	EVP_CIPHER_set_asn1_iv,
++	EVP_CIPHER_get_asn1_iv,
++	NULL
++	};
++
++/* 3DES CBC EVP */
++static const EVP_CIPHER pk11_3des_cbc = 
++	{
++	NID_des_ede3_cbc,
++	8, 24, 8,
++	EVP_CIPH_CBC_MODE,
++	pk11_cipher_init,
++	pk11_cipher_do_cipher,
++	pk11_cipher_cleanup,
++	sizeof(PK11_CIPHER_STATE),
++	EVP_CIPHER_set_asn1_iv,
++	EVP_CIPHER_get_asn1_iv,
++	NULL
++	};
++
++/*
++ * ECB modes don't use an Initial Vector so that's why set_asn1_parameters and
++ * get_asn1_parameters fields are set to NULL.
++ */
++static const EVP_CIPHER pk11_des_ecb = 
++	{
++	NID_des_ecb,
++	8, 8, 8,
++	EVP_CIPH_ECB_MODE,
++	pk11_cipher_init,
++	pk11_cipher_do_cipher,
++	pk11_cipher_cleanup,
++	sizeof(PK11_CIPHER_STATE),
++	NULL,
++	NULL,
++	NULL
++	};
++
++static const EVP_CIPHER pk11_3des_ecb = 
++	{
++	NID_des_ede3_ecb,
++	8, 24, 8,
++	EVP_CIPH_ECB_MODE,
++	pk11_cipher_init,
++	pk11_cipher_do_cipher,
++	pk11_cipher_cleanup,
++	sizeof(PK11_CIPHER_STATE),
++	NULL,
++	NULL,
++	NULL
++	};
++
++
++static const EVP_CIPHER pk11_aes_128_cbc = 
++	{
++	NID_aes_128_cbc,
++	16, 16, 16,
++	EVP_CIPH_CBC_MODE,
++	pk11_cipher_init,
++	pk11_cipher_do_cipher,
++	pk11_cipher_cleanup,
++	sizeof(PK11_CIPHER_STATE),
++	EVP_CIPHER_set_asn1_iv,
++	EVP_CIPHER_get_asn1_iv,
++	NULL
++	};
++
++static const EVP_CIPHER pk11_aes_192_cbc = 
++	{
++	NID_aes_192_cbc,
++	16, 24, 16,
++	EVP_CIPH_CBC_MODE,
++	pk11_cipher_init,
++	pk11_cipher_do_cipher,
++	pk11_cipher_cleanup,
++	sizeof(PK11_CIPHER_STATE),
++	EVP_CIPHER_set_asn1_iv,
++	EVP_CIPHER_get_asn1_iv,
++	NULL
++	};
++
++static const EVP_CIPHER pk11_aes_256_cbc = 
++	{
++	NID_aes_256_cbc,
++	16, 32, 16,
++	EVP_CIPH_CBC_MODE,
++	pk11_cipher_init,
++	pk11_cipher_do_cipher,
++	pk11_cipher_cleanup,
++	sizeof(PK11_CIPHER_STATE),
++	EVP_CIPHER_set_asn1_iv,
++	EVP_CIPHER_get_asn1_iv,
++	NULL
++	};
++
++/*
++ * ECB modes don't use IV so that's why set_asn1_parameters and
++ * get_asn1_parameters are set to NULL.
++ */
++static const EVP_CIPHER pk11_aes_128_ecb = 
++	{
++	NID_aes_128_ecb,
++	16, 16, 0,
++	EVP_CIPH_ECB_MODE,
++	pk11_cipher_init,
++	pk11_cipher_do_cipher,
++	pk11_cipher_cleanup,
++	sizeof(PK11_CIPHER_STATE),
++	NULL,
++	NULL,
++	NULL
++	};
++
++static const EVP_CIPHER pk11_aes_192_ecb = 
++	{
++	NID_aes_192_ecb,
++	16, 24, 0,
++	EVP_CIPH_ECB_MODE,
++	pk11_cipher_init,
++	pk11_cipher_do_cipher,
++	pk11_cipher_cleanup,
++	sizeof(PK11_CIPHER_STATE),
++	NULL,
++	NULL,
++	NULL
++	};
++
++static const EVP_CIPHER pk11_aes_256_ecb = 
++	{
++	NID_aes_256_ecb,
++	16, 32, 0,
++	EVP_CIPH_ECB_MODE,
++	pk11_cipher_init,
++	pk11_cipher_do_cipher,
++	pk11_cipher_cleanup,
++	sizeof(PK11_CIPHER_STATE),
++	NULL,
++	NULL,
++	NULL
++	};
++
++#ifdef	SOLARIS_AES_CTR
++/*
++ * NID_undef's will be changed to the AES counter mode NIDs as soon they are
++ * created in pk11_library_init(). Note that the need to change these structures
++ * is the reason why we don't define them with the const keyword.
++ */
++static EVP_CIPHER pk11_aes_128_ctr = 
++	{
++	NID_undef,
++	16, 16, 16,
++	EVP_CIPH_CBC_MODE,
++	pk11_cipher_init,
++	pk11_cipher_do_cipher,
++	pk11_cipher_cleanup,
++	sizeof(PK11_CIPHER_STATE),
++	EVP_CIPHER_set_asn1_iv,
++	EVP_CIPHER_get_asn1_iv,
++	NULL
++	};
++
++static EVP_CIPHER pk11_aes_192_ctr = 
++	{
++	NID_undef,
++	16, 24, 16,
++	EVP_CIPH_CBC_MODE,
++	pk11_cipher_init,
++	pk11_cipher_do_cipher,
++	pk11_cipher_cleanup,
++	sizeof(PK11_CIPHER_STATE),
++	EVP_CIPHER_set_asn1_iv,
++	EVP_CIPHER_get_asn1_iv,
++	NULL
++	};
++
++static EVP_CIPHER pk11_aes_256_ctr = 
++	{
++	NID_undef,
++	16, 32, 16,
++	EVP_CIPH_CBC_MODE,
++	pk11_cipher_init,
++	pk11_cipher_do_cipher,
++	pk11_cipher_cleanup,
++	sizeof(PK11_CIPHER_STATE),
++	EVP_CIPHER_set_asn1_iv,
++	EVP_CIPHER_get_asn1_iv,
++	NULL
++	};
++#endif	/* SOLARIS_AES_CTR */
++
++static const EVP_CIPHER pk11_bf_cbc = 
++	{
++	NID_bf_cbc,
++	8, 16, 8,
++	EVP_CIPH_VARIABLE_LENGTH,
++	pk11_cipher_init,
++	pk11_cipher_do_cipher,
++	pk11_cipher_cleanup,
++	sizeof(PK11_CIPHER_STATE),
++	EVP_CIPHER_set_asn1_iv,
++	EVP_CIPHER_get_asn1_iv,
++	NULL
++	};
++
++static const EVP_CIPHER pk11_rc4 =
++	{
++	NID_rc4,
++	1, 16, 0,
++	EVP_CIPH_VARIABLE_LENGTH,
++	pk11_cipher_init,
++	pk11_cipher_do_cipher,
++	pk11_cipher_cleanup,
++	sizeof(PK11_CIPHER_STATE),
++	NULL,
++	NULL,
++	NULL
++	};
++
++static const EVP_MD pk11_md5 =
++	{
++	NID_md5,
++	NID_md5WithRSAEncryption,
++	MD5_DIGEST_LENGTH,
++	0,
++	pk11_digest_init,
++	pk11_digest_update,
++	pk11_digest_final,
++	pk11_digest_copy,
++	pk11_digest_cleanup,
++	EVP_PKEY_RSA_method,
++	MD5_CBLOCK,
++	sizeof(PK11_CIPHER_STATE),
++	};
++
++static const EVP_MD pk11_sha1 =
++	{
++	NID_sha1,
++	NID_sha1WithRSAEncryption,
++	SHA_DIGEST_LENGTH,
++	0,
++	pk11_digest_init,
++	pk11_digest_update,
++	pk11_digest_final,
++	pk11_digest_copy,
++	pk11_digest_cleanup,
++	EVP_PKEY_RSA_method,
++	SHA_CBLOCK,
++	sizeof(PK11_CIPHER_STATE),
++	};
++
++static const EVP_MD pk11_sha224 =
++	{
++	NID_sha224,
++	NID_sha224WithRSAEncryption,
++	SHA224_DIGEST_LENGTH,
++	0,
++	pk11_digest_init,
++	pk11_digest_update,
++	pk11_digest_final,
++	pk11_digest_copy,
++	pk11_digest_cleanup,
++	EVP_PKEY_RSA_method,
++	/* SHA-224 uses the same cblock size as SHA-256 */
++	SHA256_CBLOCK,
++	sizeof(PK11_CIPHER_STATE),
++	};
++
++static const EVP_MD pk11_sha256 =
++	{
++	NID_sha256,
++	NID_sha256WithRSAEncryption,
++	SHA256_DIGEST_LENGTH,
++	0,
++	pk11_digest_init,
++	pk11_digest_update,
++	pk11_digest_final,
++	pk11_digest_copy,
++	pk11_digest_cleanup,
++	EVP_PKEY_RSA_method,
++	SHA256_CBLOCK,
++	sizeof(PK11_CIPHER_STATE),
++	};
++
++static const EVP_MD pk11_sha384 =
++	{
++	NID_sha384,
++	NID_sha384WithRSAEncryption,
++	SHA384_DIGEST_LENGTH,
++	0,
++	pk11_digest_init,
++	pk11_digest_update,
++	pk11_digest_final,
++	pk11_digest_copy,
++	pk11_digest_cleanup,
++	EVP_PKEY_RSA_method,
++	/* SHA-384 uses the same cblock size as SHA-512 */
++	SHA512_CBLOCK,
++	sizeof(PK11_CIPHER_STATE),
++	};
++
++static const EVP_MD pk11_sha512 =
++	{
++	NID_sha512,
++	NID_sha512WithRSAEncryption,
++	SHA512_DIGEST_LENGTH,
++	0,
++	pk11_digest_init,
++	pk11_digest_update,
++	pk11_digest_final,
++	pk11_digest_copy,
++	pk11_digest_cleanup,
++	EVP_PKEY_RSA_method,
++	SHA512_CBLOCK,
++	sizeof(PK11_CIPHER_STATE),
++	};
++
++/* Initialization function. Sets up various pk11 library components.
++ */
++/* The definitions for control commands specific to this engine
++ */
++#define PK11_CMD_SO_PATH		ENGINE_CMD_BASE
++static const ENGINE_CMD_DEFN pk11_cmd_defns[] =
++	{
++		{
++		PK11_CMD_SO_PATH,
++		"SO_PATH",
++		"Specifies the path to the 'pkcs#11' shared library",
++		ENGINE_CMD_FLAG_STRING
++		},
++		{0, NULL, NULL, 0}
++	};
++
++
++static RAND_METHOD pk11_random =
++	{
++	pk11_rand_seed,
++	pk11_rand_bytes,
++	pk11_rand_cleanup,
++	pk11_rand_add,
++	pk11_rand_bytes,
++	pk11_rand_status
++	};
++
++
++/* Constants used when creating the ENGINE
++ */
++static const char *engine_pk11_id = "pkcs11";
++static const char *engine_pk11_name = "PKCS #11 engine support";
++
++CK_FUNCTION_LIST_PTR pFuncList = NULL;
++static const char PK11_GET_FUNCTION_LIST[] = "C_GetFunctionList";
++
++/* Cryptoki library
++ */
++static const char def_PK11_LIBNAME[] = PK11_LIB_LOCATION;
++
++static CK_BBOOL true = TRUE;
++static CK_BBOOL false = FALSE;
++static CK_SLOT_ID pubkey_SLOTID = 0;
++static CK_SLOT_ID rand_SLOTID = 0;
++static CK_SLOT_ID SLOTID = 0;
++static int pk11_library_initialized = 0;
++static int pk11_pid = 0;
++
++static DSO *pk11_dso = NULL;
++
++/*
++ * This internal function is used by ENGINE_pk11() and "dynamic" ENGINE support.
++ */
++static int bind_pk11(ENGINE *e)
++	{
++#ifndef OPENSSL_NO_RSA
++	const RSA_METHOD *rsa = NULL;
++	RSA_METHOD *pk11_rsa = PK11_RSA();
++#endif	/* OPENSSL_NO_RSA */
++	if (!pk11_library_initialized)
++		pk11_library_init(e);
++
++	if(!ENGINE_set_id(e, engine_pk11_id) ||
++	   !ENGINE_set_name(e, engine_pk11_name) ||
++	   !ENGINE_set_ciphers(e, pk11_engine_ciphers) ||
++	   !ENGINE_set_digests(e, pk11_engine_digests))
++	   	return 0;
++#ifndef OPENSSL_NO_RSA
++	if(pk11_have_rsa == CK_TRUE)
++		{
++		if(!ENGINE_set_RSA(e, PK11_RSA()) ||
++	           !ENGINE_set_load_privkey_function(e, pk11_load_privkey) ||
++	           !ENGINE_set_load_pubkey_function(e, pk11_load_pubkey))
++			return 0;
++#ifdef	DEBUG_SLOT_SELECTION
++		fprintf(stderr, "%s: registered RSA\n", PK11_DBG);
++#endif	/* DEBUG_SLOT_SELECTION */
++		}
++#endif	/* OPENSSL_NO_RSA */
++#ifndef OPENSSL_NO_DSA
++	if(pk11_have_dsa == CK_TRUE)
++		{	
++	  	if (!ENGINE_set_DSA(e, PK11_DSA()))
++			return 0;
++#ifdef	DEBUG_SLOT_SELECTION
++		fprintf(stderr, "%s: registered DSA\n", PK11_DBG);
++#endif	/* DEBUG_SLOT_SELECTION */
++	    	}
++#endif	/* OPENSSL_NO_DSA */
++#ifndef OPENSSL_NO_DH
++	if(pk11_have_dh == CK_TRUE)
++		{
++	  	if (!ENGINE_set_DH(e, PK11_DH()))
++			return 0;
++#ifdef	DEBUG_SLOT_SELECTION
++		fprintf(stderr, "%s: registered DH\n", PK11_DBG);
++#endif	/* DEBUG_SLOT_SELECTION */
++	    	}
++#endif	/* OPENSSL_NO_DH */
++	if(pk11_have_random)
++		{
++		if(!ENGINE_set_RAND(e, &pk11_random))
++			return 0;
++#ifdef	DEBUG_SLOT_SELECTION
++		fprintf(stderr, "%s: registered random\n", PK11_DBG);
++#endif	/* DEBUG_SLOT_SELECTION */
++		}
++	if(!ENGINE_set_init_function(e, pk11_init) ||
++	   !ENGINE_set_destroy_function(e, pk11_destroy) ||
++	   !ENGINE_set_finish_function(e, pk11_finish) ||
++	   !ENGINE_set_ctrl_function(e, pk11_ctrl) ||
++	   !ENGINE_set_cmd_defns(e, pk11_cmd_defns))
++		return 0;
++
++/* Apache calls OpenSSL function RSA_blinding_on() once during startup
++ * which in turn calls bn_mod_exp. Since we do not implement bn_mod_exp
++ * here, we wire it back to the OpenSSL software implementation. 
++ * Since it is used only once, performance is not a concern. */
++#ifndef OPENSSL_NO_RSA
++        rsa = RSA_PKCS1_SSLeay();
++        pk11_rsa->rsa_mod_exp = rsa->rsa_mod_exp;
++        pk11_rsa->bn_mod_exp = rsa->bn_mod_exp;
++#endif	/* OPENSSL_NO_RSA */
++
++	/* Ensure the pk11 error handling is set up */
++	ERR_load_pk11_strings();
++	
++	return 1;
++	}
++
++/* Dynamic engine support is disabled at a higher level for Solaris
++ */
++#ifdef	ENGINE_DYNAMIC_SUPPORT
++static int bind_helper(ENGINE *e, const char *id)
++	{
++	if (id && (strcmp(id, engine_pk11_id) != 0))
++		return 0;
++
++	if (!bind_pk11(e))
++		return 0;
++
++	return 1;
++	}	   
++
++IMPLEMENT_DYNAMIC_CHECK_FN()
++IMPLEMENT_DYNAMIC_BIND_FN(bind_helper)
++
++#else
++static ENGINE *engine_pk11(void)
++	{
++	ENGINE *ret = ENGINE_new();
++
++	if (!ret)
++		return NULL;
++
++	if (!bind_pk11(ret))
++		{
++		ENGINE_free(ret);
++		return NULL;
++		}
++
++	return ret;
++	}
++
++void ENGINE_load_pk11(void)
++	{
++	ENGINE *e_pk11 = NULL;
++
++	/* Do not use dynamic PKCS#11 library on Solaris due to 
++	 * security reasons. We will link it in statically
++	 */
++	/* Attempt to load PKCS#11 library 
++	 */
++	if (!pk11_dso)
++		pk11_dso = DSO_load(NULL, get_PK11_LIBNAME(), NULL, 0);
++
++	if (pk11_dso == NULL)
++		{
++		PK11err(PK11_F_LOAD, PK11_R_DSO_FAILURE);
++		return;
++		}
++
++	e_pk11 = engine_pk11();
++	if (!e_pk11) 
++		{
++		DSO_free(pk11_dso);
++		pk11_dso = NULL;
++		return;
++		}
++
++	/* At this point, the pk11 shared library is either dynamically
++	 * loaded or statically linked in. So, initialize the pk11 
++	 * library before calling ENGINE_set_default since the latter 
++	 * needs cipher and digest algorithm information
++	 */
++	if (!pk11_library_init(e_pk11))
++		{
++		DSO_free(pk11_dso);
++		pk11_dso = NULL;
++		ENGINE_free(e_pk11);
++		return;
++		}
++
++	ENGINE_add(e_pk11);
++
++	ENGINE_free(e_pk11);
++	ERR_clear_error();
++	}
++#endif	/* ENGINE_DYNAMIC_SUPPORT */
++
++/* These are the static string constants for the DSO file name and 
++ * the function symbol names to bind to. 
++ */
++static const char *PK11_LIBNAME = NULL;
++
++static const char *get_PK11_LIBNAME(void)
++	{
++	if (PK11_LIBNAME)
++		return PK11_LIBNAME;
++
++	return def_PK11_LIBNAME;
++	}
++
++static void free_PK11_LIBNAME(void)
++	{
++	if (PK11_LIBNAME)
++		OPENSSL_free((void*)PK11_LIBNAME);
++
++	PK11_LIBNAME = NULL;
++	}
++
++static long set_PK11_LIBNAME(const char *name)
++	{
++	free_PK11_LIBNAME();
++
++	return ((PK11_LIBNAME = BUF_strdup(name)) != NULL ? 1 : 0);
++	}
++
++/* Initialization function for the pk11 engine */
++static int pk11_init(ENGINE *e)
++{
++	return pk11_library_init(e);
++}
++
++/* Initialization function. Sets up various pk11 library components.
++ * It selects a slot based on predefined critiera. In the process, it also
++ * count how many ciphers and digests to support. Since the cipher and
++ * digest information is needed when setting default engine, this function
++ * needs to be called before calling ENGINE_set_default.
++ */
++static int pk11_library_init(ENGINE *e)
++	{
++	CK_C_GetFunctionList p;
++	CK_RV rv = CKR_OK;
++	CK_INFO info;
++	CK_ULONG ul_state_len;
++	int any_slot_found;
++
++	/*
++	 * pk11_library_initialized is set to 0 in pk11_finish() which is called
++	 * from ENGINE_finish(). However, if there is still at least one
++	 * existing functional reference to the engine (see engine(3) for more
++	 * information), pk11_finish() is skipped. For example, this can happen
++	 * if an application forgets to clear one cipher context. In case of a
++	 * fork() when the application is finishing the engine so that it can be
++	 * reinitialized in the child, forgotten functional reference causes
++	 * pk11_library_initialized to stay 1. In that case we need the PID
++	 * check so that we properly initialize the engine again.
++	 */
++	if (pk11_library_initialized)
++		{
++		if (pk11_pid == getpid())
++			return 1;
++		else
++			global_session = CK_INVALID_HANDLE;
++		}
++	
++	if (pk11_dso == NULL)
++		{
++		PK11err(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE);
++		goto err;
++		}
++
++#ifdef	SOLARIS_AES_CTR
++	/*
++	 * We must do this before we start working with slots since we need all
++	 * NIDs there.
++	 */
++	if (pk11_add_aes_ctr_NIDs() == 0)
++		goto err;
++#endif	/* SOLARIS_AES_CTR */
++
++#ifdef	SOLARIS_HW_SLOT_SELECTION
++	if (check_hw_mechanisms() == 0)
++		goto err;
++#endif	/* SOLARIS_HW_SLOT_SELECTION */
++
++	/* get the C_GetFunctionList function from the loaded library
++	 */
++	p = (CK_C_GetFunctionList)DSO_bind_func(pk11_dso, 
++		PK11_GET_FUNCTION_LIST);
++	if ( !p )
++		{
++		PK11err(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE);
++		goto err;
++		}
++ 
++	/* get the full function list from the loaded library 
++	 */
++	rv = p(&pFuncList);
++	if (rv != CKR_OK)
++		{
++		PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_DSO_FAILURE, rv);
++		goto err;
++		}
++ 
++	rv = pFuncList->C_Initialize(NULL_PTR);
++	if ((rv != CKR_OK) && (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED))
++		{
++		PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_INITIALIZE, rv);
++		goto err;
++		}
++
++	rv = pFuncList->C_GetInfo(&info);
++	if (rv != CKR_OK) 
++		{
++		PK11err_add_data(PK11_F_LIBRARY_INIT, PK11_R_GETINFO, rv);
++		goto err;
++		}
++
++	if (pk11_choose_slots(&any_slot_found) == 0)
++		goto err;
++
++	/*
++	 * The library we use, set in def_PK11_LIBNAME, may not offer any
++	 * slot(s). In that case, we must not proceed but we must not return an
++	 * error. The reason is that applications that try to set up the PKCS#11
++	 * engine don't exit on error during the engine initialization just
++	 * because no slot was present.
++	 */
++	if (any_slot_found == 0)
++		return 1;
++
++	if (global_session == CK_INVALID_HANDLE)
++		{
++		/* Open the global_session for the new process */
++		rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION,
++			NULL_PTR, NULL_PTR, &global_session);
++		if (rv != CKR_OK)
++			{
++			PK11err_add_data(PK11_F_LIBRARY_INIT,
++			    PK11_R_OPENSESSION, rv);
++			goto err;
++			}
++		}
++
++	/* Disable digest if C_GetOperationState is not supported since
++	 * this function is required by OpenSSL digest copy function */
++	if (pFuncList->C_GetOperationState(global_session, NULL, &ul_state_len)
++			== CKR_FUNCTION_NOT_SUPPORTED) {
++#ifdef	DEBUG_SLOT_SELECTION
++		fprintf(stderr, "%s: C_GetOperationState() not supported, "
++		    "setting digest_count to 0\n", PK11_DBG);
++#endif	/* DEBUG_SLOT_SELECTION */
++		digest_count = 0;
++	}
++
++	pk11_library_initialized = 1;
++	pk11_pid = getpid();
++	return 1;
++
++err:
++	return 0;
++	}
++
++/* Destructor (complements the "ENGINE_pk11()" constructor)
++ */
++static int pk11_destroy(ENGINE *e)
++	{
++	free_PK11_LIBNAME();
++	ERR_unload_pk11_strings();
++	return 1;
++	}
++
++/* Termination function to clean up the session, the token, and 
++ * the pk11 library.
++ */
++static int pk11_finish(ENGINE *e)
++	{
++	if (pk11_dso == NULL)
++		{
++		PK11err(PK11_F_FINISH, PK11_R_NOT_LOADED);
++		goto err;
++		}
++
++	OPENSSL_assert(pFuncList != NULL);
++
++	if (pk11_free_all_sessions() == 0)
++		goto err;
++
++	pFuncList->C_CloseSession(global_session);
++	global_session = CK_INVALID_HANDLE;
++
++	/*
++	 * Since we are part of a library (libcrypto.so), calling this function
++	 * may have side-effects.
++	 */
++#if 0
++	pFuncList->C_Finalize(NULL);
++#endif
++
++	if (!DSO_free(pk11_dso))
++		{
++		PK11err(PK11_F_FINISH, PK11_R_DSO_FAILURE);
++		goto err;
++		}
++	pk11_dso = NULL;
++	pFuncList = NULL;
++	pk11_library_initialized = 0;
++	pk11_pid = 0;
++
++	return 1;
++
++err:
++	return 0;
++	}
++
++/* Standard engine interface function to set the dynamic library path */
++static int pk11_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
++	{
++	int initialized = ((pk11_dso == NULL) ? 0 : 1);
++
++	switch(cmd)
++		{
++	case PK11_CMD_SO_PATH:
++		if (p == NULL)
++			{
++			PK11err(PK11_F_CTRL, ERR_R_PASSED_NULL_PARAMETER);
++			return 0;
++			}
++
++		if (initialized)
++			{
++			PK11err(PK11_F_CTRL, PK11_R_ALREADY_LOADED);
++			return 0;
++			}
++
++		return set_PK11_LIBNAME((const char*)p);
++	default:
++		break;
++		}
++
++	PK11err(PK11_F_CTRL,PK11_R_CTRL_COMMAND_NOT_IMPLEMENTED);
++
++	return 0;
++	}
++
++
++/* Required function by the engine random interface. It does nothing here
++ */
++static void pk11_rand_cleanup(void)
++	{
++	return;
++	}
++
++static void pk11_rand_add(const void *buf, int num, double add)
++	{
++	PK11_SESSION *sp;
++
++	if ((sp = pk11_get_session(OP_RAND)) == NULL)
++		return;
++
++	/* Ignore any errors (e.g. CKR_RANDOM_SEED_NOT_SUPPORTED) since 
++	 * the calling functions do not care anyway
++	 */
++	pFuncList->C_SeedRandom(sp->session, (unsigned char *) buf, num);
++	pk11_return_session(sp, OP_RAND);
++
++	return;
++	}
++
++static void pk11_rand_seed(const void *buf, int num)
++	{
++	pk11_rand_add(buf, num, 0);
++	}
++
++static int pk11_rand_bytes(unsigned char *buf, int num)
++	{
++	CK_RV rv;
++	PK11_SESSION *sp;
++	
++	if ((sp = pk11_get_session(OP_RAND)) == NULL)
++		return 0;
++	
++	rv = pFuncList->C_GenerateRandom(sp->session, buf, num);
++	if (rv != CKR_OK)
++		{
++		PK11err_add_data(PK11_F_RAND_BYTES, PK11_R_GENERATERANDOM, rv);
++		pk11_return_session(sp, OP_RAND);
++		return 0;
++		}
++
++	pk11_return_session(sp, OP_RAND);
++	return 1;
++	}
++
++/* Required function by the engine random interface. It does nothing here
++ */
++static int pk11_rand_status(void)
++	{
++	return 1;
++	}
++
++/*
++ * Free all BIGNUM structures from PK11_SESSION.
++ */
++static void pk11_free_nums(PK11_SESSION *sp)
++	{
++#ifndef	OPENSSL_NO_RSA
++		if (sp->rsa_n_num != NULL)
++			BN_free(sp->rsa_n_num);
++		if (sp->rsa_e_num != NULL)
++			BN_free(sp->rsa_e_num);
++		if (sp->rsa_d_num != NULL)
++			BN_free(sp->rsa_d_num);
++#endif
++#ifndef	OPENSSL_NO_DSA
++		if (sp->dsa_pub_num != NULL)
++			BN_free(sp->dsa_pub_num);
++		if (sp->dsa_priv_num != NULL)
++			BN_free(sp->dsa_priv_num);
++#endif
++#ifndef	OPENSSL_NO_DH
++		if (sp->dh_priv_num != NULL)
++			BN_free(sp->dh_priv_num);
++#endif
++	}
++
++/*
++ * Get new PK11_SESSION structure ready for use. Every process must have
++ * its own freelist of PK11_SESSION structures so handle fork() here
++ * by destroying the old and creating new freelist.
++ * The returned PK11_SESSION structure is disconnected from the freelist.
++ */
++PK11_SESSION *pk11_get_session(PK11_OPTYPE optype)
++	{
++	PK11_SESSION *sp, *sp1, *freelist;
++	CK_RV rv;
++
++	CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE);
++	switch (optype)
++		{
++		case OP_PUBKEY:
++			freelist = pubkey_free_session;
++			break;
++		case OP_RAND:
++			freelist = rand_free_session;
++			break;
++		case OP_DIGEST:
++		case OP_CIPHER:
++			freelist = free_session;
++			break;
++		default:
++			PK11err(PK11_F_GET_SESSION, 
++				PK11_R_INVALID_OPERATION_TYPE);
++			goto err;
++		}
++	sp = freelist;
++
++	/*
++	 * If the free list is empty, allocate new unitialized (filled
++	 * with zeroes) PK11_SESSION structure otherwise return first
++	 * structure from the freelist.
++	 */
++	if (sp == NULL)
++		{
++		if ((sp = OPENSSL_malloc(sizeof(PK11_SESSION))) == NULL)
++			{
++			PK11err(PK11_F_GET_SESSION, 
++				PK11_R_MALLOC_FAILURE);
++			goto err;
++			}
++		memset(sp, 0, sizeof(PK11_SESSION));
++		}
++	else
++		{
++		freelist = sp->next;
++		}
++
++	if (sp->pid != 0 && sp->pid != getpid())
++		{
++		/*
++		 * We are a new process and thus need to free any inherited
++		 * PK11_SESSION objects.
++		 */
++		while ((sp1 = freelist) != NULL)
++			{
++			freelist = sp1->next;
++			/*
++			 * NOTE: we do not want to call pk11_free_all_sessions()
++			 * here because it would close underlying PKCS#11
++			 * sessions and destroy all objects.
++			 */
++			pk11_free_nums(sp1);
++			OPENSSL_free(sp1);
++			}
++
++		/* Initialize the process */
++		rv = pFuncList->C_Initialize(NULL_PTR);
++		if ((rv != CKR_OK) && (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED))
++			{
++			PK11err_add_data(PK11_F_GET_SESSION, PK11_R_INITIALIZE,
++			    rv);
++			OPENSSL_free(sp);
++			sp = NULL;
++			goto err;
++			}
++
++		/*
++		 * Choose slot here since the slot table is different on this
++		 * process. If we are here then we must have found at least one
++		 * usable slot before so we don't need to check any_slot_found.
++		 * See pk11_library_init()'s usage of this function for more
++		 * information.
++		 */
++#ifdef	SOLARIS_HW_SLOT_SELECTION
++		if (check_hw_mechanisms() == 0)
++			goto err;
++#endif	/* SOLARIS_HW_SLOT_SELECTION */
++		if (pk11_choose_slots(NULL) == 0)
++			goto err;
++
++		/* Open the global_session for the new process */
++		rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION,
++			NULL_PTR, NULL_PTR, &global_session);
++		if (rv != CKR_OK)
++			{
++			PK11err_add_data(PK11_F_GET_SESSION, PK11_R_OPENSESSION,
++			    rv);
++			OPENSSL_free(sp);
++			sp = NULL;
++			goto err;
++			}
++
++		/* It is an inherited session and needs re-initialization.
++		 */
++		if (pk11_setup_session(sp, optype) == 0)
++			{
++			OPENSSL_free(sp);
++			sp = NULL;
++			}
++		}
++	else if (sp->pid == 0)
++		{
++		/* It is a new session and needs initialization. */
++		if (pk11_setup_session(sp, optype) == 0)
++			{
++			OPENSSL_free(sp);
++			sp = NULL;
++			}
++		}
++
++	switch (optype)
++		{
++		case OP_PUBKEY:
++			pubkey_free_session = freelist;
++			break;
++		case OP_RAND:
++			rand_free_session = freelist;
++			break;
++		case OP_DIGEST:
++		case OP_CIPHER:
++			free_session = freelist;
++			break;
++		}
++
++err:
++	if (sp != NULL)
++		sp->next = NULL;
++
++	CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE);
++
++	return sp;
++	}
++
++
++void pk11_return_session(PK11_SESSION *sp, PK11_OPTYPE optype)
++	{
++	if (sp == NULL || sp->pid != getpid())
++		return;
++	
++	CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE);
++
++	switch (optype)
++		{
++		case OP_PUBKEY:
++			sp->next = pubkey_free_session;
++			pubkey_free_session = sp;
++			break;
++		case OP_RAND:
++			sp->next = rand_free_session;
++			rand_free_session = sp;
++			break;
++		case OP_DIGEST:
++		case OP_CIPHER:
++			sp->next = free_session;
++			free_session = sp;
++			break;
++		}
++
++	CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE);
++	}
++
++
++/* Destroy all objects. This function is called when the engine is finished
++ */
++static int pk11_free_all_sessions()
++	{
++	int ret = 1;
++
++#ifndef OPENSSL_NO_RSA
++	(void) pk11_destroy_rsa_key_objects(NULL);
++#endif	/* OPENSSL_NO_RSA */
++#ifndef OPENSSL_NO_DSA
++	(void) pk11_destroy_dsa_key_objects(NULL);
++#endif	/* OPENSSL_NO_DSA */
++#ifndef OPENSSL_NO_DH
++	(void) pk11_destroy_dh_key_objects(NULL);
++#endif	/* OPENSSL_NO_DH */
++	(void) pk11_destroy_cipher_key_objects(NULL);
++
++	/*
++	 * We try to release as much as we can but any error means that we will
++	 * return 0 on exit.
++	 */
++	if (pk11_free_session_list(&free_session) == 0)
++		ret = 0;
++	if (pk11_free_session_list(&pubkey_free_session) == 0)
++		ret = 0;
++	if (pk11_free_session_list(&rand_free_session) == 0)
++		ret = 0;
++
++	return ret;
++	}
++	
++/*
++ * Destroy session structures from the specified linked list. Free as many
++ * sessions as possible but any failure in C_CloseSession() means that we return
++ * an error on return.
++ */
++static int pk11_free_session_list(PK11_SESSION **sessions)
++	{
++	CK_RV rv;
++	PK11_SESSION *sp = NULL;
++	pid_t mypid = getpid();
++	int ret = 1;
++
++	CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE);
++	while ((sp = *sessions) != NULL)
++		{
++		if (sp->session != CK_INVALID_HANDLE && sp->pid == mypid)
++			{
++			rv = pFuncList->C_CloseSession(sp->session);
++			if (rv != CKR_OK)
++				{
++				PK11err_add_data(PK11_F_FREE_ALL_SESSIONS, 
++					PK11_R_CLOSESESSION, rv);
++				ret = 0;
++				}
++			}
++		if (sp->session_cipher != CK_INVALID_HANDLE && sp->pid == mypid)
++			{
++			rv = pFuncList->C_CloseSession(sp->session_cipher);
++			if (rv != CKR_OK)
++				{
++				PK11err_add_data(PK11_F_FREE_ALL_SESSIONS, 
++					PK11_R_CLOSESESSION, rv);
++				ret = 0;
++				}
++			}
++		*sessions = sp->next;
++		pk11_free_nums(sp);
++		OPENSSL_free(sp);
++		}
++
++	CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE);
++	return ret;
++	}
++
++
++static int pk11_setup_session(PK11_SESSION *sp, PK11_OPTYPE optype)
++	{
++	CK_RV rv;
++	CK_SLOT_ID myslot;
++
++	switch (optype)
++		{
++		case OP_PUBKEY:
++			myslot = pubkey_SLOTID;
++			break;
++		case OP_RAND:
++			myslot = rand_SLOTID;
++			break;
++		case OP_DIGEST:
++		case OP_CIPHER:
++			myslot = SLOTID;
++			break;
++		default:
++			PK11err(PK11_F_SETUP_SESSION,
++			    PK11_R_INVALID_OPERATION_TYPE);
++			return 0;
++		}
++
++	sp->session = CK_INVALID_HANDLE;
++#ifdef	DEBUG_SLOT_SELECTION
++	fprintf(stderr, "%s: myslot=%d optype=%d\n", PK11_DBG, myslot, optype);
++#endif	/* DEBUG_SLOT_SELECTION */
++	rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION,
++		NULL_PTR, NULL_PTR, &sp->session);
++	if (rv == CKR_CRYPTOKI_NOT_INITIALIZED)
++		{
++		/*
++		 * We are probably a child process so force the
++		 * reinitialize of the session
++		 */
++		pk11_library_initialized = 0;
++		(void) pk11_library_init(NULL);
++		rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION,
++			NULL_PTR, NULL_PTR, &sp->session);
++		}
++	if (rv != CKR_OK)
++		{
++		PK11err_add_data(PK11_F_SETUP_SESSION, PK11_R_OPENSESSION, rv);
++		return 0;
++		}
++
++	sp->session_cipher = CK_INVALID_HANDLE;
++	rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION,
++		NULL_PTR, NULL_PTR, &sp->session_cipher);
++	if (rv != CKR_OK)
++		{
++		(void) pFuncList->C_CloseSession(sp->session);
++		sp->session = CK_INVALID_HANDLE;
++
++		PK11err_add_data(PK11_F_SETUP_SESSION, PK11_R_OPENSESSION, rv);
++		return 0;
++		}
++
++	sp->pid = getpid();
++	sp->rsa_pub_key = CK_INVALID_HANDLE;
++	sp->rsa_priv_key = CK_INVALID_HANDLE;
++	sp->dsa_pub_key = CK_INVALID_HANDLE;
++	sp->dsa_priv_key = CK_INVALID_HANDLE;
++	sp->dh_key = CK_INVALID_HANDLE;
++	sp->cipher_key = CK_INVALID_HANDLE;
++#ifndef OPENSSL_NO_RSA
++	sp->rsa_pub = NULL;
++	sp->rsa_n_num = NULL;
++	sp->rsa_e_num = NULL;
++	sp->rsa_priv = NULL;
++	sp->rsa_d_num = NULL;
++#endif	/* OPENSSL_NO_RSA */
++#ifndef OPENSSL_NO_DSA
++	sp->dsa_pub = NULL;
++	sp->dsa_pub_num = NULL;
++	sp->dsa_priv = NULL;
++	sp->dsa_priv_num = NULL;
++#endif	/* OPENSSL_NO_DSA */
++#ifndef OPENSSL_NO_DH
++	sp->dh = NULL;
++	sp->dh_priv_num = NULL;
++#endif	/* OPENSSL_NO_DH */
++	sp->encrypt = -1;
++
++	return 1;
++	}
++
++#ifndef OPENSSL_NO_RSA
++/* Destroy RSA public key from single session. */
++int pk11_destroy_rsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock)
++	{
++	int ret = 0;
++
++	if (sp->rsa_pub_key != CK_INVALID_HANDLE)
++		{
++		TRY_OBJ_DESTROY(sp->session, sp->rsa_pub_key, ret, uselock);
++		sp->rsa_pub_key = CK_INVALID_HANDLE;
++		sp->rsa_pub = NULL;
++		if (sp->rsa_n_num != NULL)
++			BN_free(sp->rsa_n_num);
++		sp->rsa_n_num = NULL;
++		if (sp->rsa_e_num != NULL)
++			BN_free(sp->rsa_e_num);
++		sp->rsa_e_num = NULL;
++		}
++
++	return (ret);
++	}
++
++/* Destroy RSA private key from single session. */
++int pk11_destroy_rsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock)
++	{
++	int ret = 0;
++
++	if (sp->rsa_priv_key != CK_INVALID_HANDLE)
++		{
++		TRY_OBJ_DESTROY(sp->session, sp->rsa_priv_key, ret, uselock);
++		sp->rsa_priv_key = CK_INVALID_HANDLE;
++		sp->rsa_priv = NULL;
++		if (sp->rsa_d_num != NULL)
++			BN_free(sp->rsa_d_num);
++		sp->rsa_d_num = NULL;
++		}
++
++	return (ret);
++	}
++
++/*
++ * Destroy RSA key object wrapper. If session is NULL, try to destroy all
++ * objects in the free list.
++ */
++int pk11_destroy_rsa_key_objects(PK11_SESSION *session)
++	{
++	int ret = 1;
++	PK11_SESSION *sp = NULL;
++	PK11_SESSION *local_free_session;
++	CK_BBOOL uselock = TRUE;
++
++	if (session != NULL)
++		local_free_session = session;
++	else
++		{
++		CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE);
++		local_free_session = pubkey_free_session;
++		uselock = FALSE;
++		}
++
++	/*
++	 * go through the list of sessions and delete key objects
++	 */
++	while ((sp = local_free_session) != NULL)
++		{
++		local_free_session = sp->next;
++
++		/*
++		 * Do not terminate list traversal if one of the
++		 * destroy operations fails.
++		 */
++		if (pk11_destroy_rsa_object_pub(sp, uselock) == 0)
++			{
++			ret = 0;
++			continue;
++			}
++		if (pk11_destroy_rsa_object_priv(sp, uselock) == 0)
++			{
++			ret = 0;
++			continue;
++			}
++		}
++
++	if (session == NULL)
++		CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE);
++
++	return ret;
++	}
++#endif	/* OPENSSL_NO_RSA */
++
++#ifndef OPENSSL_NO_DSA
++/* Destroy DSA public key from single session. */
++int pk11_destroy_dsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock)
++	{
++	int ret = 0;
++
++	if (sp->dsa_pub_key != CK_INVALID_HANDLE)
++		{
++		TRY_OBJ_DESTROY(sp->session, sp->dsa_pub_key, ret, uselock);
++		sp->dsa_pub_key = CK_INVALID_HANDLE;
++		sp->dsa_pub = NULL;
++		if (sp->dsa_pub_num != NULL)
++			BN_free(sp->dsa_pub_num);
++		sp->dsa_pub_num = NULL;
++		}
++
++	return (ret);
++	}
++
++/* Destroy DSA private key from single session. */
++int pk11_destroy_dsa_object_priv(PK11_SESSION *sp, CK_BBOOL uselock)
++	{
++	int ret = 0;
++
++	if (sp->dsa_priv_key != CK_INVALID_HANDLE)
++		{
++		TRY_OBJ_DESTROY(sp->session, sp->dsa_priv_key, ret, uselock);
++		sp->dsa_priv_key = CK_INVALID_HANDLE;
++		sp->dsa_priv = NULL;
++		if (sp->dsa_priv_num != NULL)
++			BN_free(sp->dsa_priv_num);
++		sp->dsa_priv_num = NULL;
++		}
++
++	return (ret);
++	}
++
++/*
++ * Destroy DSA key object wrapper. If session is NULL, try to destroy all
++ * objects in the free list.
++ */
++int pk11_destroy_dsa_key_objects(PK11_SESSION *session)
++	{
++	int ret = 1;
++	PK11_SESSION *sp = NULL;
++	PK11_SESSION *local_free_session;
++	CK_BBOOL uselock = TRUE;
++
++	if (session != NULL)
++		local_free_session = session;
++	else
++		{
++		CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE);
++		local_free_session = pubkey_free_session;
++		uselock = FALSE;
++		}
++
++	/*
++	 * go through the list of sessions and delete key objects
++	 */
++	while ((sp = local_free_session) != NULL)
++		{
++		local_free_session = sp->next;
++
++		/*
++		 * Do not terminate list traversal if one of the
++		 * destroy operations fails.
++		 */
++		if (pk11_destroy_dsa_object_pub(sp, uselock) == 0)
++			{
++			ret = 0;
++			continue;
++			}
++		if (pk11_destroy_dsa_object_priv(sp, uselock) == 0)
++			{
++			ret = 0;
++			continue;
++			}
++		}
++
++	if (session == NULL)
++		CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE);
++
++	return ret;
++	}
++#endif	/* OPENSSL_NO_DSA */
++
++#ifndef OPENSSL_NO_DH
++/* Destroy DH key from single session. */
++int pk11_destroy_dh_object(PK11_SESSION *sp, CK_BBOOL uselock)
++	{
++	int ret = 0;
++
++	if (sp->dh_key != CK_INVALID_HANDLE)
++		{
++		TRY_OBJ_DESTROY(sp->session, sp->dh_key, ret, uselock);
++		sp->dh_key = CK_INVALID_HANDLE;
++		sp->dh = NULL;
++		if (sp->dh_priv_num != NULL)
++			BN_free(sp->dh_priv_num);
++		sp->dh_priv_num = NULL;
++		}
++
++	return (ret);
++	}
++
++/*
++ * Destroy DH key object wrapper.
++ *
++ * arg0: pointer to PKCS#11 engine session structure
++ *       if session is NULL, try to destroy all objects in the free list
++ */
++int pk11_destroy_dh_key_objects(PK11_SESSION *session)
++	{
++	int ret = 1;
++	PK11_SESSION *sp = NULL;
++	PK11_SESSION *local_free_session;
++	CK_BBOOL uselock = TRUE;
++
++	if (session != NULL)
++		local_free_session = session;
++	else
++		{
++		CRYPTO_w_lock(CRYPTO_LOCK_PK11_ENGINE);
++		local_free_session = pubkey_free_session;
++		uselock = FALSE;
++		}
++
++	while ((sp = local_free_session) != NULL)
++		{
++		local_free_session = sp->next;
++
++		/*
++		 * Do not terminate list traversal if one of the
++		 * destroy operations fails.
++		 */
++		if (pk11_destroy_dh_object(sp, uselock) == 0)
++			{
++			ret = 0;
++			continue;
++			}
++		}
++err:
++	if (session == NULL)
++		CRYPTO_w_unlock(CRYPTO_LOCK_PK11_ENGINE);
++
++	return ret;
++	}
++#endif	/* OPENSSL_NO_DH */
++
++static int pk11_destroy_object(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE oh)
++	{
++	CK_RV rv;
++	rv = pFuncList->C_DestroyObject(session, oh);
++	if (rv != CKR_OK)
++		{
++		PK11err_add_data(PK11_F_DESTROY_OBJECT, PK11_R_DESTROYOBJECT,
++		    rv);
++		return 0;
++		}
++
++	return 1;
++	}
++
++
++/* Symmetric ciphers and digests support functions
++ */
++
++static int
++cipher_nid_to_pk11(int nid)
++	{
++	int i;
++
++	for (i = 0; i < PK11_CIPHER_MAX; i++)
++		if (ciphers[i].nid == nid)
++			return (ciphers[i].id);
++	return (-1);
++	}
++
++static int
++pk11_usable_ciphers(const int **nids)
++	{
++	if (cipher_count > 0)
++		*nids = cipher_nids;
++	else
++		*nids = NULL;
++	return (cipher_count);
++	}
++
++static int
++pk11_usable_digests(const int **nids)
++	{
++	if (digest_count > 0)
++		*nids = digest_nids;
++	else
++		*nids = NULL;
++	return (digest_count);
++	}
++
++/*
++ * Init context for encryption or decryption using a symmetric key.
++ */
++static int pk11_init_symmetric(EVP_CIPHER_CTX *ctx, PK11_CIPHER *pcipher,
++	PK11_SESSION *sp, CK_MECHANISM_PTR pmech)
++	{
++	CK_RV rv;
++#ifdef	SOLARIS_AES_CTR
++	CK_AES_CTR_PARAMS ctr_params;
++#endif	/* SOLARIS_AES_CTR */
++	
++	/*
++	 * We expect pmech->mechanism to be already set and
++	 * pParameter/ulParameterLen initialized to NULL/0 before
++	 * pk11_init_symetric() is called.
++	 */
++	OPENSSL_assert(pmech->mechanism != NULL);
++	OPENSSL_assert(pmech->pParameter == NULL);
++	OPENSSL_assert(pmech->ulParameterLen == 0);
++
++#ifdef	SOLARIS_AES_CTR
++	if (ctx->cipher->nid == NID_aes_128_ctr ||
++	    ctx->cipher->nid == NID_aes_192_ctr ||
++	    ctx->cipher->nid == NID_aes_256_ctr)
++		{
++		pmech->pParameter = (void *)(&ctr_params);
++		pmech->ulParameterLen = sizeof(ctr_params);
++		/*
++		 * For now, we are limited to the fixed length of the counter,
++		 * it covers the whole counter block. That's what RFC 4344
++		 * needs. For more information on internal structure of the
++		 * counter block, see RFC 3686. If needed in the future, we can
++		 * add code so that the counter length can be set via
++		 * ENGINE_ctrl() function.
++		 */
++		ctr_params.ulCounterBits = AES_BLOCK_SIZE * 8;
++		OPENSSL_assert(pcipher->iv_len == AES_BLOCK_SIZE);
++		memcpy(ctr_params.cb, ctx->iv, AES_BLOCK_SIZE);
++		}
++	else
++#endif	/* SOLARIS_AES_CTR */
++		{
++		if (pcipher->iv_len > 0)
++			{
++			pmech->pParameter = (void *)ctx->iv;
++			pmech->ulParameterLen = pcipher->iv_len;
++			}
++		}
++
++	/* if we get here, the encryption needs to be reinitialized */
++	if (ctx->encrypt)
++		rv = pFuncList->C_EncryptInit(sp->session_cipher, pmech,
++			sp->cipher_key);
++	else
++		rv = pFuncList->C_DecryptInit(sp->session_cipher, pmech,
++			sp->cipher_key);
++
++	if (rv != CKR_OK)
++		{
++		PK11err_add_data(PK11_F_CIPHER_INIT, ctx->encrypt ?
++		    PK11_R_ENCRYPTINIT : PK11_R_DECRYPTINIT, rv);
++		pk11_return_session(sp, OP_CIPHER);
++		return (0);
++		}
++
++	return (1);
++	}
++
++static int
++pk11_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
++    const unsigned char *iv, int enc)
++	{
++	CK_MECHANISM mech;
++	int index;
++	PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->cipher_data;
++	PK11_SESSION *sp;
++	PK11_CIPHER *p_ciph_table_row;
++	
++	state->sp = NULL;
++
++	index = cipher_nid_to_pk11(ctx->cipher->nid);
++	if (index < 0 || index >= PK11_CIPHER_MAX)
++		return 0;
++
++	p_ciph_table_row = &ciphers[index];
++	/*
++	 * iv_len in the ctx->cipher structure is the maximum IV length for the
++	 * current cipher and it must be less or equal to the IV length in our
++	 * ciphers table. The key length must match precisely. Every application
++	 * can define its own EVP functions so this code serves as a sanity
++	 * check.
++	 *
++	 * Note that the reason why the IV length in ctx->cipher might be
++	 * greater than the actual length is that OpenSSL uses BLOCK_CIPHER_defs
++	 * macro to define functions that return EVP structures for all DES
++	 * modes. So, even ECB modes get 8 byte IV.
++	 */
++	if (ctx->cipher->iv_len < p_ciph_table_row->iv_len ||
++	    ctx->key_len != p_ciph_table_row->key_len)
++		{
++		PK11err(PK11_F_CIPHER_INIT, PK11_R_KEY_OR_IV_LEN_PROBLEM);
++		return 0;
++		}
++
++	if ((sp = pk11_get_session(OP_CIPHER)) == NULL)
++		return 0;
++
++	/* if applicable, the mechanism parameter is used for IV */
++	mech.mechanism = p_ciph_table_row->mech_type;
++	mech.pParameter = NULL;
++	mech.ulParameterLen = 0;
++
++	/* The key object is destroyed here if it is not the current key
++	 */
++	(void) check_new_cipher_key(sp, key, p_ciph_table_row->key_len);
++	
++	/* If the key is the same and the encryption is also the same,
++	 * then just reuse it. However, we must not forget to reinitialize the
++	 * context that was finalized in pk11_cipher_cleanup().
++	 */
++	if (sp->cipher_key != CK_INVALID_HANDLE && sp->encrypt == ctx->encrypt)
++		{
++		state->sp = sp;
++		if (pk11_init_symmetric(ctx, p_ciph_table_row, sp, &mech) == 0)
++			return (0);
++
++		return (1);
++		}
++
++	/* Check if the key has been invalidated. If so, a new key object
++	 * needs to be created.
++	 */
++	if (sp->cipher_key == CK_INVALID_HANDLE)
++		{
++		sp->cipher_key = pk11_get_cipher_key(
++			ctx, key, p_ciph_table_row->key_type, sp);
++		}
++
++	if (sp->encrypt != ctx->encrypt && sp->encrypt != -1)
++		{
++		/* The previous encryption/decryption
++		 * is different. Need to terminate the previous
++		 * active encryption/decryption here
++		 */
++		if (!pk11_cipher_final(sp))
++			{
++			pk11_return_session(sp, OP_CIPHER);
++			return 0;
++			}
++		}
++
++	if (sp->cipher_key == CK_INVALID_HANDLE)
++		{
++		pk11_return_session(sp, OP_CIPHER);
++		return 0;
++		}
++
++	/* now initialize the context with a new key */
++	if (pk11_init_symmetric(ctx, p_ciph_table_row, sp, &mech) == 0)
++		return (0);
++
++	sp->encrypt = ctx->encrypt;
++	state->sp = sp;
++
++	return 1;
++	}
++
++/* When reusing the same key in an encryption/decryption session for a 
++ * decryption/encryption session, we need to close the active session
++ * and recreate a new one. Note that the key is in the global session so
++ * that it needs not be recreated.
++ *
++ * It is more appropriate to use C_En/DecryptFinish here. At the time of this
++ * development, these two functions in the PKCS#11 libraries used return
++ * unexpected errors when passing in 0 length output. It may be a good
++ * idea to try them again if performance is a problem here and fix
++ * C_En/DecryptFinial if there are bugs there causing the problem.
++ */
++static int
++pk11_cipher_final(PK11_SESSION *sp)
++	{
++	CK_RV rv;
++
++	rv = pFuncList->C_CloseSession(sp->session_cipher);
++	if (rv != CKR_OK)
++		{
++		PK11err_add_data(PK11_F_CIPHER_FINAL, PK11_R_CLOSESESSION, rv);
++		return 0;
++		}
++
++	rv = pFuncList->C_OpenSession(SLOTID, CKF_SERIAL_SESSION,
++		NULL_PTR, NULL_PTR, &sp->session_cipher);
++	if (rv != CKR_OK)
++		{
++		PK11err_add_data(PK11_F_CIPHER_FINAL, PK11_R_OPENSESSION, rv);
++		return 0;
++		}
++
++	return 1;
++	}
++
++/* An engine interface function. The calling function allocates sufficient
++ * memory for the output buffer "out" to hold the results */
++static int
++pk11_cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
++	const unsigned char *in, unsigned int inl)
++	{
++	PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->cipher_data;
++	PK11_SESSION *sp;
++	CK_RV rv;
++	unsigned long outl = inl;
++
++	if (state == NULL || state->sp == NULL)
++		return 0;
++
++	sp = (PK11_SESSION *) state->sp;
++
++	if (!inl)
++		return 1;
++
++	/* RC4 is the only stream cipher we support */
++	if (ctx->cipher->nid != NID_rc4 && (inl % ctx->cipher->block_size) != 0)
++		return 0;
++
++	if (ctx->encrypt)
++		{
++		rv = pFuncList->C_EncryptUpdate(sp->session_cipher, 
++			(unsigned char *)in, inl, out, &outl);
++
++		if (rv != CKR_OK)
++			{
++			PK11err_add_data(PK11_F_CIPHER_DO_CIPHER, 
++			    PK11_R_ENCRYPTUPDATE, rv);
++			return 0;
++			}
++		}
++	else
++		{
++		rv = pFuncList->C_DecryptUpdate(sp->session_cipher, 
++			(unsigned char *)in, inl, out, &outl);
++
++		if (rv != CKR_OK)
++			{
++			PK11err_add_data(PK11_F_CIPHER_DO_CIPHER,
++			    PK11_R_DECRYPTUPDATE, rv);
++			return 0;
++			}
++		}
++
++	/* for DES_CBC, DES3_CBC, AES_CBC, and RC4, the output size is always
++	 * the same size of input
++	 * The application has guaranteed to call the block ciphers with 
++	 * correctly aligned buffers.
++	 */
++	if (inl != outl)
++		return 0;
++
++	return 1;
++	}
++
++/*
++ * Return the session to the pool. Calling C_EncryptFinal() and C_DecryptFinal()
++ * here is the right thing because in EVP_DecryptFinal_ex(), engine's
++ * do_cipher() is not even called, and in EVP_EncryptFinal_ex() it is called but
++ * the engine can't find out that it's the finalizing call. We wouldn't
++ * necessarily have to finalize the context here since reinitializing it with
++ * C_(Encrypt|Decrypt)Init() should be fine but for the sake of correctness,
++ * let's do it. Some implementations might leak memory if the previously used
++ * context is initialized without finalizing it first.
++ */
++static int
++pk11_cipher_cleanup(EVP_CIPHER_CTX *ctx)
++	{
++	CK_RV rv;
++	CK_ULONG len = EVP_MAX_BLOCK_LENGTH;
++	CK_BYTE buf[EVP_MAX_BLOCK_LENGTH];
++	PK11_CIPHER_STATE *state = ctx->cipher_data;
++
++	if (state != NULL && state->sp != NULL)
++		{
++		/*
++		 * We are not interested in the data here, we just need to get
++		 * rid of the context.
++		 */
++		if (ctx->encrypt)
++			rv = pFuncList->C_EncryptFinal(
++			    state->sp->session_cipher, buf, &len);
++		else
++			rv = pFuncList->C_DecryptFinal(
++			    state->sp->session_cipher, buf, &len);
++
++		if (rv != CKR_OK)
++			{
++			PK11err_add_data(PK11_F_CIPHER_CLEANUP, ctx->encrypt ?
++			    PK11_R_ENCRYPTFINAL : PK11_R_DECRYPTFINAL, rv);
++			pk11_return_session(state->sp, OP_CIPHER);
++			return (0);
++			}
++
++		pk11_return_session(state->sp, OP_CIPHER);
++		state->sp = NULL;
++		}
++
++	return (1);
++	}
++
++/* Registered by the ENGINE when used to find out how to deal with
++ * a particular NID in the ENGINE. This says what we'll do at the
++ * top level - note, that list is restricted by what we answer with
++ */
++static int
++pk11_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
++	const int **nids, int nid)
++	{
++	if (!cipher)
++		return (pk11_usable_ciphers(nids));
++
++	switch (nid)
++		{
++		case NID_des_ede3_cbc:
++			*cipher = &pk11_3des_cbc;
++			break;
++		case NID_des_cbc:
++			*cipher = &pk11_des_cbc;
++			break;
++		case NID_des_ede3_ecb:
++			*cipher = &pk11_3des_ecb;
++			break;
++		case NID_des_ecb:
++			*cipher = &pk11_des_ecb;
++			break;
++		case NID_aes_128_cbc:
++			*cipher = &pk11_aes_128_cbc;
++			break;
++		case NID_aes_192_cbc:
++			*cipher = &pk11_aes_192_cbc;
++			break;
++		case NID_aes_256_cbc:
++			*cipher = &pk11_aes_256_cbc;
++			break;
++		case NID_aes_128_ecb:
++			*cipher = &pk11_aes_128_ecb;
++			break;
++		case NID_aes_192_ecb:
++			*cipher = &pk11_aes_192_ecb;
++			break;
++		case NID_aes_256_ecb:
++			*cipher = &pk11_aes_256_ecb;
++			break;
++		case NID_bf_cbc:
++			*cipher = &pk11_bf_cbc;
++			break;
++		case NID_rc4:
++			*cipher = &pk11_rc4;
++			break;
++		default:
++#ifdef	SOLARIS_AES_CTR
++			/*
++			 * These can't be in separated cases because the NIDs
++			 * here are not constants.
++			 */
++			if (nid == NID_aes_128_ctr)
++				*cipher = &pk11_aes_128_ctr;
++			else if (nid == NID_aes_192_ctr)
++				*cipher = &pk11_aes_192_ctr;
++			else if (nid == NID_aes_256_ctr)
++				*cipher = &pk11_aes_256_ctr;
++			else
++#endif	/* SOLARIS_AES_CTR */
++			*cipher = NULL;
++			break;
++		}
++	return (*cipher != NULL);
++	}
++
++static int
++pk11_engine_digests(ENGINE *e, const EVP_MD **digest,
++	const int **nids, int nid)
++	{
++	if (!digest)
++		return (pk11_usable_digests(nids));
++
++	switch (nid)
++		{
++		case NID_md5:
++			*digest = &pk11_md5; 
++			break;
++		case NID_sha1:
++			*digest = &pk11_sha1; 
++			break;
++		case NID_sha224:
++			*digest = &pk11_sha224; 
++			break;
++		case NID_sha256:
++			*digest = &pk11_sha256; 
++			break;
++		case NID_sha384:
++			*digest = &pk11_sha384; 
++			break;
++		case NID_sha512:
++			*digest = &pk11_sha512; 
++			break;
++		default:
++			*digest = NULL;
++			break;
++		}
++	return (*digest != NULL);
++	}
++
++
++/* Create a secret key object in a PKCS#11 session
++ */
++static CK_OBJECT_HANDLE pk11_get_cipher_key(EVP_CIPHER_CTX *ctx, 
++	const unsigned char *key, CK_KEY_TYPE key_type, PK11_SESSION *sp)
++	{
++	CK_RV rv;
++	CK_OBJECT_HANDLE h_key = CK_INVALID_HANDLE;
++	CK_OBJECT_CLASS obj_key = CKO_SECRET_KEY;
++	CK_ULONG ul_key_attr_count = 6;
++
++	CK_ATTRIBUTE  a_key_template[] =
++		{
++		{CKA_CLASS, (void*) NULL, sizeof(CK_OBJECT_CLASS)},
++		{CKA_KEY_TYPE, (void*) NULL, sizeof(CK_KEY_TYPE)},
++		{CKA_TOKEN, &false, sizeof(false)},
++		{CKA_ENCRYPT, &true, sizeof(true)},
++		{CKA_DECRYPT, &true, sizeof(true)},
++		{CKA_VALUE, (void*) NULL, 0},
++		};
++
++	/* Create secret key object in global_session. All other sessions
++	 * can use the key handles. Here is why:
++	 * OpenSSL will call EncryptInit and EncryptUpdate using a secret key.
++	 * It may then call DecryptInit and DecryptUpdate using the same key.
++	 * To use the same key object, we need to call EncryptFinal with
++	 * a 0 length message. Currently, this does not work for 3DES 
++	 * mechanism. To get around this problem, we close the session and
++	 * then create a new session to use the same key object. When a session
++	 * is closed, all the object handles will be invalid. Thus, create key 
++	 * objects in a global session, an individual session may be closed to
++	 * terminate the active operation.
++	 */
++	CK_SESSION_HANDLE session = global_session;
++	a_key_template[0].pValue = &obj_key;
++	a_key_template[1].pValue = &key_type;
++	a_key_template[5].pValue = (void *) key;
++	a_key_template[5].ulValueLen = (unsigned long) ctx->key_len;
++
++	rv = pFuncList->C_CreateObject(session, 
++		a_key_template, ul_key_attr_count, &h_key);
++	if (rv != CKR_OK)
++		{
++		PK11err_add_data(PK11_F_GET_CIPHER_KEY, PK11_R_CREATEOBJECT,
++		    rv);
++		goto err;
++		}
++
++	/* Save the key information used in this session.
++	 * The max can be saved is PK11_KEY_LEN_MAX.
++	 */
++	sp->key_len = ctx->key_len > PK11_KEY_LEN_MAX ? 
++		PK11_KEY_LEN_MAX : ctx->key_len;
++	memcpy(sp->key, key, sp->key_len);
++err:
++
++	return h_key;
++	}
++
++static int
++md_nid_to_pk11(int nid)
++	{
++	int i;
++
++	for (i = 0; i < PK11_DIGEST_MAX; i++)
++		if (digests[i].nid == nid)
++			return (digests[i].id);
++	return (-1);
++	}
++
++static int 
++pk11_digest_init(EVP_MD_CTX *ctx)
++        { 
++	CK_RV rv;
++	CK_MECHANISM mech;
++	int index;
++	PK11_SESSION *sp;
++	PK11_DIGEST *pdp;
++	PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data;
++	
++	state->sp = NULL;
++
++	index = md_nid_to_pk11(ctx->digest->type);
++	if (index < 0 || index >= PK11_DIGEST_MAX)
++		return 0;
++
++	pdp = &digests[index];
++	if ((sp = pk11_get_session(OP_DIGEST)) == NULL)
++		return 0;
++
++	/* at present, no parameter is needed for supported digests */
++	mech.mechanism = pdp->mech_type;
++	mech.pParameter = NULL;
++	mech.ulParameterLen = 0;
++
++	rv = pFuncList->C_DigestInit(sp->session, &mech);
++
++	if (rv != CKR_OK)
++		{
++		PK11err_add_data(PK11_F_DIGEST_INIT, PK11_R_DIGESTINIT, rv);
++		pk11_return_session(sp, OP_DIGEST);
++		return 0;
++		}
++
++	state->sp = sp;
++
++	return 1;
++	}
++
++static int 
++pk11_digest_update(EVP_MD_CTX *ctx,const void *data,size_t count)
++        { 
++	CK_RV rv;
++	PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data;
++	
++	/* 0 length message will cause a failure in C_DigestFinal */
++	if (count == 0)
++		return 1;
++
++	if (state == NULL || state->sp == NULL)
++		return 0;
++
++	rv = pFuncList->C_DigestUpdate(state->sp->session, (CK_BYTE *) data,
++		count);
++
++	if (rv != CKR_OK)
++		{
++		PK11err_add_data(PK11_F_DIGEST_UPDATE, PK11_R_DIGESTUPDATE, rv);
++		pk11_return_session(state->sp, OP_DIGEST);
++		state->sp = NULL;
++		return 0;
++		}
++
++	return 1;
++	}
++
++static int 
++pk11_digest_final(EVP_MD_CTX *ctx,unsigned char *md)
++        { 
++	CK_RV rv;
++	unsigned long len;
++	PK11_CIPHER_STATE *state = (PK11_CIPHER_STATE *) ctx->md_data;
++	len = ctx->digest->md_size;
++	
++	if (state == NULL || state->sp == NULL)
++		return 0;
++
++	rv = pFuncList->C_DigestFinal(state->sp->session, md, &len);
++
++	if (rv != CKR_OK)
++		{
++		PK11err_add_data(PK11_F_DIGEST_FINAL, PK11_R_DIGESTFINAL, rv);
++		pk11_return_session(state->sp, OP_DIGEST);
++		state->sp = NULL;
++		return 0;
++		}
++
++	if (ctx->digest->md_size != len)
++		return 0;
++
++	/* Final is called and digest is returned, so return the session
++	 * to the pool
++	 */
++	pk11_return_session(state->sp, OP_DIGEST);
++	state->sp = NULL;
++
++	return 1;
++	}
++
++static int 
++pk11_digest_copy(EVP_MD_CTX *to,const EVP_MD_CTX *from)
++        { 
++	CK_RV rv;
++	int ret = 0;

@@ Diff output truncated at 100000 characters. @@

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

From chninkel at users.sourceforge.net  Sat May 23 20:35:57 2009
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 23 May 2009 18:35:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[5021] csw/mgar/pkg/openssl1/trunk/
Message-ID: 

Revision: 5021
          http://gar.svn.sourceforge.net/gar/?rev=5021&view=rev
Author:   chninkel
Date:     2009-05-23 18:35:57 +0000 (Sat, 23 May 2009)

Log Message:
-----------
openssl1: changed to mGAR v2

Property Changed:
----------------
    csw/mgar/pkg/openssl1/trunk/


Property changes on: csw/mgar/pkg/openssl1/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.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.

From j_arndt at users.sourceforge.net  Sun May 24 11:18:56 2009
From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net)
Date: Sun, 24 May 2009 09:18:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[5022]
	csw/mgar/pkg/icinga/trunk/Makefile
Message-ID: 

Revision: 5022
          http://gar.svn.sourceforge.net/gar/?rev=5022&view=rev
Author:   j_arndt
Date:     2009-05-24 09:18:56 +0000 (Sun, 24 May 2009)

Log Message:
-----------
icinga: added dependency to CSWnagiosp

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

Modified: csw/mgar/pkg/icinga/trunk/Makefile
===================================================================
--- csw/mgar/pkg/icinga/trunk/Makefile	2009-05-23 18:35:57 UTC (rev 5021)
+++ csw/mgar/pkg/icinga/trunk/Makefile	2009-05-24 09:18:56 UTC (rev 5022)
@@ -23,12 +23,15 @@
 PATCHFILES += install-opts.diff	# sets in every Makefile.in "INSTALL_OPT="" (empty)
 				# necessary, so ginstall doesn't get -o and -g options
 
-REQUIRED_PKGS = CSWgd CSWggettextrt CSWglib2 CSWiconv CSWjpeg CSWperl CSWpng CSWzlib CSWcswclassutils
+REQUIRED_PKGS  = CSWgd CSWggettextrt CSWglib2 CSWiconv CSWjpeg CSWperl CSWpng CSWzlib
+REQUIRED_PKGS += CSWnagiosp CSWcswclassutils
 
 SPKG_CLASSES = none cswusergroup ugfiles cswpreserveconf cswinitsmf
 
 NOISALIST = 1
 
+ENABLE_CHECK = 0
+
 prefix = $(BUILD_PREFIX)/icinga
 libexecdir = $(BUILD_PREFIX)/libexec/nagios-plugins
 localstatedir = /var/opt/csw/icinga


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

From idogan23 at users.sourceforge.net  Sun May 24 14:21:04 2009
From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net)
Date: Sun, 24 May 2009 12:21:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[5023] csw/mgar/pkg/nsd/trunk
Message-ID: 

Revision: 5023
          http://gar.svn.sourceforge.net/gar/?rev=5023&view=rev
Author:   idogan23
Date:     2009-05-24 12:21:04 +0000 (Sun, 24 May 2009)

Log Message:
-----------
nsd: fix to to prevent the dbdir from being created twice

Modified Paths:
--------------
    csw/mgar/pkg/nsd/trunk/checksums
    csw/mgar/pkg/nsd/trunk/files/Makefile.in.diff

Modified: csw/mgar/pkg/nsd/trunk/checksums
===================================================================
--- csw/mgar/pkg/nsd/trunk/checksums	2009-05-24 09:18:56 UTC (rev 5022)
+++ csw/mgar/pkg/nsd/trunk/checksums	2009-05-24 12:21:04 UTC (rev 5023)
@@ -1,4 +1,4 @@
-f6712cc1882e9138cc8ab8caf6947e8c  download/Makefile.in.diff
+bc1f6a6a33f1204454cf013273f0521c  download/Makefile.in.diff
 0eece57abde9d1cef8a962461b453d03  download/cswnsd
 7a7560acb5d56847ea16fb8cd77b6ca5  download/cswusergroup
 a0dcb0a3b3c1a8d386125eeafe403f58  download/nsd-3.2.2.tar.gz

Modified: csw/mgar/pkg/nsd/trunk/files/Makefile.in.diff
===================================================================
--- csw/mgar/pkg/nsd/trunk/files/Makefile.in.diff	2009-05-24 09:18:56 UTC (rev 5022)
+++ csw/mgar/pkg/nsd/trunk/files/Makefile.in.diff	2009-05-24 12:21:04 UTC (rev 5023)
@@ -1,12 +1,14 @@
 diff --speed-large-files --minimal -Nru nsd-3.2.2.orig/Makefile.in nsd-3.2.2/Makefile.in
 --- nsd-3.2.2.orig/Makefile.in	2009-04-03 13:56:43.000000000 +0200
-+++ nsd-3.2.2/Makefile.in	2009-05-19 12:20:51.924377514 +0200
-@@ -318,7 +318,7 @@
++++ nsd-3.2.2/Makefile.in	2009-05-24 14:18:20.279730811 +0200
+@@ -318,8 +318,8 @@
  install: all
  	$(INSTALL) -d $(DESTDIR)$(sbindir)
  	$(INSTALL) -d $(DESTDIR)$(configdir)
 -	$(INSTALL) -d $(DESTDIR)$(piddir)
+-	$(INSTALL) -d $(DESTDIR)$(dbdir)
 +#	$(INSTALL) -d $(DESTDIR)$(piddir)
- 	$(INSTALL) -d $(DESTDIR)$(dbdir)
++#	$(INSTALL) -d $(DESTDIR)$(dbdir)
  	$(INSTALL) -d $(DESTDIR)$(mandir)
  	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
+ 	$(INSTALL) -d $(DESTDIR)$(mandir)/man5


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

From idogan23 at users.sourceforge.net  Sun May 24 14:52:36 2009
From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net)
Date: Sun, 24 May 2009 12:52:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[5024]
	csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile
Message-ID: 

Revision: 5024
          http://gar.svn.sourceforge.net/gar/?rev=5024&view=rev
Author:   idogan23
Date:     2009-05-24 12:52:36 +0000 (Sun, 24 May 2009)

Log Message:
-----------
Mail-DKIM: bump version to 0.35

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile	2009-05-24 12:21:04 UTC (rev 5023)
+++ csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile	2009-05-24 12:52:36 UTC (rev 5024)
@@ -1,5 +1,5 @@
 GARNAME = Mail-DKIM
-GARVERSION = 0.33
+GARVERSION = 0.35
 CATEGORIES = cpan
 AUTHOR = JASLONG
 


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

From dmichelsen at users.sourceforge.net  Sun May 24 17:20:47 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 24 May 2009 15:20:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[5025] csw/mgar/pkg/sysstat/trunk
Message-ID: 

Revision: 5025
          http://gar.svn.sourceforge.net/gar/?rev=5025&view=rev
Author:   dmichelsen
Date:     2009-05-24 15:20:47 +0000 (Sun, 24 May 2009)

Log Message:
-----------
sysstat: Updatr to 20090522

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

Modified: csw/mgar/pkg/sysstat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sysstat/trunk/Makefile	2009-05-24 12:52:36 UTC (rev 5024)
+++ csw/mgar/pkg/sysstat/trunk/Makefile	2009-05-24 15:20:47 UTC (rev 5025)
@@ -1,5 +1,5 @@
 GARNAME = sysstat
-GARVERSION = 20090405
+GARVERSION = 20090522
 CATEGORIES = utils
 
 DESCRIPTION = Key system statistics at a glance

Modified: csw/mgar/pkg/sysstat/trunk/checksums
===================================================================
--- csw/mgar/pkg/sysstat/trunk/checksums	2009-05-24 12:52:36 UTC (rev 5024)
+++ csw/mgar/pkg/sysstat/trunk/checksums	2009-05-24 15:20:47 UTC (rev 5025)
@@ -1,2 +1,2 @@
-847e0101576ae2a73a09c2b4af3da8f1  download/sysstat-20090405.tgz
 7a7f0f67bb68484b56375d4a922fb63f  download/patch-onlyisaexec-sysstatd.diff
+f3cd696724b9291265dd3d3216dcacf7  download/sysstat-20090522.tgz


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

From dmichelsen at users.sourceforge.net  Sun May 24 17:58:51 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 24 May 2009 15:58:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[5026]
	csw/mgar/pkg/x11/x11common/trunk/Makefile
Message-ID: 

Revision: 5026
          http://gar.svn.sourceforge.net/gar/?rev=5026&view=rev
Author:   dmichelsen
Date:     2009-05-24 15:58:51 +0000 (Sun, 24 May 2009)

Log Message:
-----------
x11common: Add directory for 64 bit libs

Modified Paths:
--------------
    csw/mgar/pkg/x11/x11common/trunk/Makefile

Modified: csw/mgar/pkg/x11/x11common/trunk/Makefile
===================================================================
--- csw/mgar/pkg/x11/x11common/trunk/Makefile	2009-05-24 15:20:47 UTC (rev 5025)
+++ csw/mgar/pkg/x11/x11common/trunk/Makefile	2009-05-24 15:58:51 UTC (rev 5026)
@@ -15,5 +15,6 @@
 install-custom:
 	ginstall -d $(DESTDIR)$(libdir)
 	gln -s . $(DESTDIR)$(libdir)/32
+	mkdir -p $(DESTDIR)$(libdir)/$(ISA_DEFAULT64)
 	gln -s $(ISA_DEFAULT64) $(DESTDIR)$(libdir)/64
 	@$(MAKECOOKIE)


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

From valholla at users.sourceforge.net  Sun May 24 19:17:52 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Sun, 24 May 2009 17:17:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[5027] csw/mgar/gar/v2-relocate/
Message-ID: 

Revision: 5027
          http://gar.svn.sourceforge.net/gar/?rev=5027&view=rev
Author:   valholla
Date:     2009-05-24 17:17:52 +0000 (Sun, 24 May 2009)

Log Message:
-----------
branch to v2-relocate

Added Paths:
-----------
    csw/mgar/gar/v2-relocate/


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

From valholla at users.sourceforge.net  Sun May 24 19:19:50 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Sun, 24 May 2009 17:19:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[5028] csw/mgar/gar/v2-relocate
Message-ID: 

Revision: 5028
          http://gar.svn.sourceforge.net/gar/?rev=5028&view=rev
Author:   valholla
Date:     2009-05-24 17:19:50 +0000 (Sun, 24 May 2009)

Log Message:
-----------
patch to relocate branch

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

Modified: csw/mgar/gar/v2-relocate/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2-relocate/gar.conf.mk	2009-05-24 17:17:52 UTC (rev 5027)
+++ csw/mgar/gar/v2-relocate/gar.conf.mk	2009-05-24 17:19:50 UTC (rev 5028)
@@ -114,6 +114,11 @@
 perlcswlib         ?= $(perllib)/csw
 perlpackroot       ?= $(perlcswlib)/auto
 
+# This Variable is only used if you make your package relocatable
+# using ALLOW_RELOCATE, it will allow you to change your default
+# directory for BASEDIR
+RELOCATE_PREFIX    ?= $(prefix)
+
 # These variables are used to construct pathes. If you temporarily reset the above
 # variables for special install locations (like /opt/csw/bin/bdb44/) the definitions
 # here make sure the binaries for the make process are still found.

Modified: csw/mgar/gar/v2-relocate/gar.mk
===================================================================
--- csw/mgar/gar/v2-relocate/gar.mk	2009-05-24 17:17:52 UTC (rev 5027)
+++ csw/mgar/gar/v2-relocate/gar.mk	2009-05-24 17:19:50 UTC (rev 5028)
@@ -607,14 +607,14 @@
 
 # Copy the whole tree verbatim
 merge-copy-all: $(PKGROOT) $(INSTALLISADIR)
-	$(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \
+	$(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); pax -r -w -v $(_PAX_ARGS) \
 		$(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") \
 		. $(PKGROOT))
 	@$(MAKECOOKIE)
 
 # Copy only the merge directories
 merge-copy-only: $(PKGROOT)
-	$(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \
+	$(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); pax -r -w -v $(_PAX_ARGS) \
 		$(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \
 		. $(PKGROOT) \
 	)
@@ -622,7 +622,7 @@
 
 # Copy the whole tree and relocate the directories in $(MERGE_DIRS)
 merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR)
-	$(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \
+	$(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); pax -r -w -v $(_PAX_ARGS) \
 		$(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \
 		. $(PKGROOT) \
 	)
@@ -630,7 +630,7 @@
 
 # Copy only the relocated directories
 merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR)
-	$(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \
+	$(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); pax -r -w -v $(_PAX_ARGS) \
 		$(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \
 		 . $(PKGROOT) \
 	)
@@ -638,7 +638,7 @@
 
 # Copy 
 merge-copy-config-only:
-	$(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \
+	$(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); pax -r -w -v $(_PAX_ARGS) \
 		-s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \
 		-s ",.*,," \
 		. $(PKGROOT) \

Modified: csw/mgar/gar/v2-relocate/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2-relocate/gar.pkg.mk	2009-05-24 17:17:52 UTC (rev 5027)
+++ csw/mgar/gar/v2-relocate/gar.pkg.mk	2009-05-24 17:19:50 UTC (rev 5028)
@@ -300,7 +300,7 @@
 
 # Pulled in from pkglib/csw_prototype.gspec
 $(PROTOTYPE): $(WORKDIR) merge
-	$(_DBG)cswproto -c $(GARDIR)/etc/commondirs-$(GARCH) -r $(PKGROOT) $(PKGROOT)=/ >$@
+	$(_DBG)cswproto -c $(GARDIR)/etc/commondirs-$(GARCH) -r $(PKGROOT) $(PKGROOT)=$(if $(ALLOW_RELOCATE),,'/') >$@ 
 
 # The pathfilter rules are as follows:
 # - include license for current package
@@ -456,6 +456,7 @@
 	echo "OPENCSW_REPOSITORY=$(call _URL)@$(call _REVISION)"; \
 	echo "OPENCSW_MODE64=$(call mode64,$*)"; \
 	) >$@
+	$(if $(ALLOW_RELOCATE),echo "BASEDIR=$(RELOCATE_PREFIX)" >>$@)
 
 
 # findlicensefile - Find an existing file for a given license name


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

From valholla at users.sourceforge.net  Sun May 24 19:41:40 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Sun, 24 May 2009 17:41:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[5029] csw/mgar/pkg/drupal/trunk/
Message-ID: 

Revision: 5029
          http://gar.svn.sourceforge.net/gar/?rev=5029&view=rev
Author:   valholla
Date:     2009-05-24 17:41:39 +0000 (Sun, 24 May 2009)

Log Message:
-----------
propset

Property Changed:
----------------
    csw/mgar/pkg/drupal/trunk/


Property changes on: csw/mgar/pkg/drupal/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

   + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2-relocate



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

From rthurner at users.sourceforge.net  Sun May 24 20:43:19 2009
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 24 May 2009 18:43:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[5030] csw/mgar/pkg
Message-ID: 

Revision: 5030
          http://gar.svn.sourceforge.net/gar/?rev=5030&view=rev
Author:   rthurner
Date:     2009-05-24 18:43:19 +0000 (Sun, 24 May 2009)

Log Message:
-----------
reportlab upgrade to 2.3, first try

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


Property changes on: csw/mgar/pkg/reportlab/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/reportlab/trunk/Makefile
===================================================================
--- csw/mgar/pkg/reportlab/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/reportlab/trunk/Makefile	2009-05-24 18:43:19 UTC (rev 5030)
@@ -0,0 +1,44 @@
+GARNAME = reportlab
+GARVERSION = 2.3
+CATEGORIES = lib
+DISTNAME = ReportLab_2_3
+
+DESCRIPTION = industry-strength PDF generating solution
+define BLURB
+  Free Open Source PDF library is suitable for web publishers, developers
+  or creative design professionals who need to quickly and easily create
+  or automate complex (even data-driven) documents. It lets you create
+  professional documents programmatically without being locked into one
+  special technology and/or platform. It has grown over years in response
+  to the real-world requirements of large financial institutions'
+  reporting needs, making it the trusted proven foundation of existing
+  enterprise solutions rather than a just a fancy gimmick or interesting
+  library.
+endef
+
+MASTER_SITES = http://www.reportlab.org/ftp/
+DISTFILES  = $(DISTNAME).tar.gz
+
+# 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 = custom
+INSTALL_ARGS = --root=$(DESTDIR)
+
+include gar/category.mk
+
+install-custom:
+	    @echo " ==> Installing $(GARNAME)"
+		    @( cd $(WORKSRC) ; $(INSTALL_ENV) python ./setup.py install $(INSTALL_ARGS) )
+			    $(DONADA)
+
+post-install: copy-docs
+	    $(DONADA)
+

Added: csw/mgar/pkg/reportlab/trunk/checksums
===================================================================
--- csw/mgar/pkg/reportlab/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/reportlab/trunk/checksums	2009-05-24 18:43:19 UTC (rev 5030)
@@ -0,0 +1 @@
+057b846bd3b7b2c3498bf14f6a523632  download/ReportLab_2_3.tar.gz


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

From rthurner at users.sourceforge.net  Sun May 24 21:40:38 2009
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 24 May 2009 19:40:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[5031]
	csw/mgar/pkg/reportlab/trunk/Makefile
Message-ID: 

Revision: 5031
          http://gar.svn.sourceforge.net/gar/?rev=5031&view=rev
Author:   rthurner
Date:     2009-05-24 19:40:38 +0000 (Sun, 24 May 2009)

Log Message:
-----------
add python as dependency

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

Modified: csw/mgar/pkg/reportlab/trunk/Makefile
===================================================================
--- csw/mgar/pkg/reportlab/trunk/Makefile	2009-05-24 18:43:19 UTC (rev 5030)
+++ csw/mgar/pkg/reportlab/trunk/Makefile	2009-05-24 19:40:38 UTC (rev 5031)
@@ -19,6 +19,8 @@
 MASTER_SITES = http://www.reportlab.org/ftp/
 DISTFILES  = $(DISTNAME).tar.gz
 
+REQUIRED_PKGS_CSWreportlab = CSWpython
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)_(\d+(?:\_\d+)*).tar.gz
 


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

From rthurner at users.sourceforge.net  Sun May 24 21:46:56 2009
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 24 May 2009 19:46:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[5032] csw/mgar/pkg/drupal/trunk/
Message-ID: 

Revision: 5032
          http://gar.svn.sourceforge.net/gar/?rev=5032&view=rev
Author:   rthurner
Date:     2009-05-24 19:46:55 +0000 (Sun, 24 May 2009)

Log Message:
-----------
replace sf with sourceforge

Property Changed:
----------------
    csw/mgar/pkg/drupal/trunk/


Property changes on: csw/mgar/pkg/drupal/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2-relocate

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-relocate



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

From rthurner at users.sourceforge.net  Sun May 24 21:53:22 2009
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 24 May 2009 19:53:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[5033]
	csw/mgar/pkg/reportlab/trunk/Makefile
Message-ID: 

Revision: 5033
          http://gar.svn.sourceforge.net/gar/?rev=5033&view=rev
Author:   rthurner
Date:     2009-05-24 19:53:21 +0000 (Sun, 24 May 2009)

Log Message:
-----------
depend on python image lib instead of python

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

Modified: csw/mgar/pkg/reportlab/trunk/Makefile
===================================================================
--- csw/mgar/pkg/reportlab/trunk/Makefile	2009-05-24 19:46:55 UTC (rev 5032)
+++ csw/mgar/pkg/reportlab/trunk/Makefile	2009-05-24 19:53:21 UTC (rev 5033)
@@ -19,7 +19,7 @@
 MASTER_SITES = http://www.reportlab.org/ftp/
 DISTFILES  = $(DISTNAME).tar.gz
 
-REQUIRED_PKGS_CSWreportlab = CSWpython
+REQUIRED_PKGS_CSWreportlab = CSWpil
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)_(\d+(?:\_\d+)*).tar.gz


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

From rthurner at users.sourceforge.net  Sun May 24 22:06:02 2009
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 24 May 2009 20:06:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[5034]
	csw/mgar/pkg/reportlab/trunk/Makefile
Message-ID: 

Revision: 5034
          http://gar.svn.sourceforge.net/gar/?rev=5034&view=rev
Author:   rthurner
Date:     2009-05-24 20:06:02 +0000 (Sun, 24 May 2009)

Log Message:
-----------
try to fix upgrade check

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

Modified: csw/mgar/pkg/reportlab/trunk/Makefile
===================================================================
--- csw/mgar/pkg/reportlab/trunk/Makefile	2009-05-24 19:53:21 UTC (rev 5033)
+++ csw/mgar/pkg/reportlab/trunk/Makefile	2009-05-24 20:06:02 UTC (rev 5034)
@@ -22,7 +22,7 @@
 REQUIRED_PKGS_CSWreportlab = CSWpil
 
 # We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)_(\d+(?:\_\d+)*).tar.gz
+UFILES_REGEX = ReportLab_(\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


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

From rthurner at users.sourceforge.net  Sun May 24 22:09:00 2009
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 24 May 2009 20:09:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[5035] csw/mgar/pkg
Message-ID: 

Revision: 5035
          http://gar.svn.sourceforge.net/gar/?rev=5035&view=rev
Author:   rthurner
Date:     2009-05-24 20:09:00 +0000 (Sun, 24 May 2009)

Log Message:
-----------
pil - python imaging library

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


Property changes on: csw/mgar/pkg/pil/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/pil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pil/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/pil/trunk/Makefile	2009-05-24 20:09:00 UTC (rev 5035)
@@ -0,0 +1,41 @@
+GARNAME = pil
+GARVERSION = 1.1.6
+CATEGORIES = lib
+DISTNAME = Imaging-$(GARVERSION)
+
+
+DESCRIPTION = Python Imaging Library
+define BLURB
+  Long description
+endef
+
+MASTER_SITES = http://effbot.org/downloads/
+DISTFILES  = $(DISTNAME).tar.gz
+
+REQUIRED_PKGS_CSWpil = CSWftype2 CSWjpeg CSWpython 
+
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = Imaging-(\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 = custom
+INSTALL_ARGS = --root=$(DESTDIR)
+
+include gar/category.mk
+
+install-custom:
+	        @echo " ==> Installing $(GARNAME)"
+			            @( cd $(WORKSRC) ; $(INSTALL_ENV) python ./setup.py install $(INSTALL_ARGS) )
+						                $(DONADA)
+
+post-install: copy-docs
+	        $(DONADA)
+
+

Added: csw/mgar/pkg/pil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pil/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/pil/trunk/checksums	2009-05-24 20:09:00 UTC (rev 5035)
@@ -0,0 +1 @@
+3a9b5c20ca52f0a9900512d2c7347622  download/Imaging-1.1.6.tar.gz


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

From rthurner at users.sourceforge.net  Sun May 24 23:02:31 2009
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 24 May 2009 21:02:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[5036] csw/mgar/pkg
Message-ID: 

Revision: 5036
          http://gar.svn.sourceforge.net/gar/?rev=5036&view=rev
Author:   rthurner
Date:     2009-05-24 21:02:30 +0000 (Sun, 24 May 2009)

Log Message:
-----------
propedit sf --> sourceforge for the remaining ones

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

Added Paths:
-----------
    csw/mgar/pkg/python-reportlab/
    csw/mgar/pkg/python-reportlab/branches/
    csw/mgar/pkg/python-reportlab/tags/
    csw/mgar/pkg/python-reportlab/trunk/
    csw/mgar/pkg/python-reportlab/trunk/Makefile
    csw/mgar/pkg/python-reportlab/trunk/files/

Property Changed:
----------------
    csw/mgar/pkg/chrpath/trunk/
    csw/mgar/pkg/cmake/trunk/
    csw/mgar/pkg/genshi/trunk/
    csw/mgar/pkg/icinga/trunk/
    csw/mgar/pkg/kawa/trunk/
    csw/mgar/pkg/libfaac/trunk/
    csw/mgar/pkg/libffi/trunk/
    csw/mgar/pkg/libgda/trunk/
    csw/mgar/pkg/libgnomedb/trunk/
    csw/mgar/pkg/libmcal/trunk/
    csw/mgar/pkg/mediawiki/trunk/
    csw/mgar/pkg/nagvis/trunk/
    csw/mgar/pkg/ndoutils/trunk/
    csw/mgar/pkg/php4/trunk/
    csw/mgar/pkg/python3/trunk/
    csw/mgar/pkg/squid/trunk/
    csw/mgar/pkg/squidclamav/trunk/
    csw/mgar/pkg/squirrelmail/trunk/
    csw/mgar/pkg/ss5/trunk/
    csw/mgar/pkg/sudo/trunk/
    csw/mgar/pkg/sudo_ldap/trunk/


Property changes on: csw/mgar/pkg/chrpath/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/cmake/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/genshi/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/icinga/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/kawa/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/libfaac/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/libffi/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/libgda/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/libgnomedb/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/libmcal/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/mediawiki/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/nagvis/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/ndoutils/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/php4/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/python-reportlab/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/python-reportlab/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python-reportlab/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/python-reportlab/trunk/Makefile	2009-05-24 21:02:30 UTC (rev 5036)
@@ -0,0 +1,23 @@
+GARNAME = package
+GARVERSION = 1.0
+CATEGORIES = category
+
+DESCRIPTION = Brief description
+define BLURB
+  Long description
+endef
+
+MASTER_SITES = 
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES += $(call admfiles,CSWpackage,)
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = -(\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_ARGS = $(DIRPATHS)
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/python3/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/squid/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/squidclamav/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/squirrelmail/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/ss5/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/sudo/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/sudo_ldap/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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


Modified: csw/mgar/pkg/trac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/trac/trunk/Makefile	2009-05-24 20:09:00 UTC (rev 5035)
+++ csw/mgar/pkg/trac/trunk/Makefile	2009-05-24 21:02:30 UTC (rev 5036)
@@ -11,7 +11,7 @@
 	established development process and policies.
 endef
 
-MASTER_SITES = http://ftp.edgewall.com/pub/$(GARNAME)/
+MASTER_SITES = http://ftp.edgewall.com/pub/trac/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 
 PACKAGES = CSWtrac


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

From rthurner at users.sourceforge.net  Sun May 24 23:06:08 2009
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 24 May 2009 21:06:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[5037] csw/mgar/pkg/python-reportlab/
Message-ID: 

Revision: 5037
          http://gar.svn.sourceforge.net/gar/?rev=5037&view=rev
Author:   rthurner
Date:     2009-05-24 21:06:08 +0000 (Sun, 24 May 2009)

Log Message:
-----------
remove unnecessary

Removed Paths:
-------------
    csw/mgar/pkg/python-reportlab/


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

From valholla at users.sourceforge.net  Mon May 25 04:24:34 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Mon, 25 May 2009 02:24:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[5038] csw/mgar/pkg/sudo/trunk
Message-ID: 

Revision: 5038
          http://gar.svn.sourceforge.net/gar/?rev=5038&view=rev
Author:   valholla
Date:     2009-05-25 02:24:33 +0000 (Mon, 25 May 2009)

Log Message:
-----------
update to 1.7.1

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2009-05-24 21:06:08 UTC (rev 5037)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2009-05-25 02:24:33 UTC (rev 5038)
@@ -1,5 +1,5 @@
 GARNAME = sudo
-GARVERSION = 1.7.0
+GARVERSION = 1.7.1
 CATEGORIES = utils
 
 DESCRIPTION = Provides limited super user privileges
@@ -20,6 +20,7 @@
 
 PACKAGES = CSWsudo CSWsudo-common
 
+BUILD64 = 1
 CATALOGNAME_CSWsudo = sudo
 SPKG_DESC_CSWsudo = $(DESCRIPTION)
 SPKG_SOURCEURL_CSWsudo = http://www.sudo.ws

Modified: csw/mgar/pkg/sudo/trunk/checksums
===================================================================
--- csw/mgar/pkg/sudo/trunk/checksums	2009-05-24 21:06:08 UTC (rev 5037)
+++ csw/mgar/pkg/sudo/trunk/checksums	2009-05-25 02:24:33 UTC (rev 5038)
@@ -1,5 +1,3 @@
 955d99eda1432c7b7e00d98b91e35a79  download/CSWsudo-common.postinstall
-ca867ca77bda965a44bcd665bae7dc6c  download/CSWsudo.postinstall
-880c6c8b92f9c3ef3b5014a0b29c0b02  download/CSWsudo.postremove
 157b2e5e38ca54eb36e0364706bd0292  download/install.diff
-5fd96bba35fe29b464f7aa6ad255f0a6  download/sudo-1.7.0.tar.gz
+af672524b2c854a67612bf4c743f58b8  download/sudo-1.7.1.tar.gz


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

From dmichelsen at users.sourceforge.net  Mon May 25 12:42:53 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 10:42:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[5039] csw/mgar/gar/v2-pbuild
Message-ID: 

Revision: 5039
          http://gar.svn.sourceforge.net/gar/?rev=5039&view=rev
Author:   dmichelsen
Date:     2009-05-25 10:42:53 +0000 (Mon, 25 May 2009)

Log Message:
-----------
mGAR v2-pbuild: Enhance multitail usage

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

Modified: csw/mgar/gar/v2-pbuild/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2-pbuild/gar.conf.mk	2009-05-25 02:24:33 UTC (rev 5038)
+++ csw/mgar/gar/v2-pbuild/gar.conf.mk	2009-05-25 10:42:53 UTC (rev 5039)
@@ -35,6 +35,11 @@
 GIT_PROXY_SCRIPT ?= $(abspath $(GARBIN))/gitproxy
 GIT_DEFAULT_TRACK = +refs/heads/master:refs/remotes/origin/master
 
+# For parallel builds
+PARALLELMODULATIONS ?= 
+MULTITAIL ?= /opt/csw/bin/multitail
+TTY ?= /usr/bin/tty
+
 # Outbound proxies
 http_proxy ?= 
 ftp_proxy  ?= 

Modified: csw/mgar/gar/v2-pbuild/gar.mk
===================================================================
--- csw/mgar/gar/v2-pbuild/gar.mk	2009-05-25 02:24:33 UTC (rev 5038)
+++ csw/mgar/gar/v2-pbuild/gar.mk	2009-05-25 10:42:53 UTC (rev 5039)
@@ -598,18 +598,26 @@
 _PAX_ARGS = $(_INC_EXT_RULE) $(EXTRA_PAX_ARGS)
 
 # The basic merge merges the compiles for all ISAs on the current architecture
-merge: checksum pre-merge $(if $(shell tty >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo TERMINAL; fi),merge-parallel,merge-sequential) merge-license $(if $(NOSOURCEPACKAGE),,merge-src) post-merge
+merge: checksum pre-merge merge-do merge-license $(if $(NOSOURCEPACKAGE),,merge-src) post-merge
 	@$(DONADA)
 
+merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential)
+
 merge-sequential: $(foreach M,$(MODULATIONS),merge-$M)
 
+merge-parallel: _PIDFILE=$(WORKROOTDIR)/build-global-$(GARCH)/multitail.pid
 merge-parallel: merge-watch
-	@$(foreach M,$(MODULATIONS),$(MAKE) merge-$M >$(WORKROOTDIR)/build-$M/build.log 2>&1 &) wait
-	@kill `cat $(WORKROOTDIR)/build-global-$(GARCH)/multitail.pid` && stty sane
+	$(_DBG_MERGE)$(foreach M,$(MODULATIONS),$(MAKE) merge-$M >$(WORKROOTDIR)/build-$M/build.log 2>&1 &) wait
+	$(_DBG_MERGE)if [ -f $(_PIDFILE) ]; then kill `cat $(_PIDFILE)` && stty sane; fi
 
+merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi)
 merge-watch:
-	@multitail --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global-$(GARCH)/multitail.pid
+	$(_DBG_MERGE)$(if $(_USEMULTITAIL),\
+		$(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -J & echo $$! > $(WORKROOTDIR)/build-global-$(GARCH)/multitail.pid,\
+		echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\
+	)
 
+
 # This merges the 
 merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated
 	@$(MAKECOOKIE)


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

From dmichelsen at users.sourceforge.net  Mon May 25 16:06:04 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 14:06:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[5040] csw/mgar/pkg/mantis/trunk
Message-ID: 

Revision: 5040
          http://gar.svn.sourceforge.net/gar/?rev=5040&view=rev
Author:   dmichelsen
Date:     2009-05-25 14:06:04 +0000 (Mon, 25 May 2009)

Log Message:
-----------
mantis: Update to mGAR v2, dynamic gspec and 1.1.7

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

Removed Paths:
-------------
    csw/mgar/pkg/mantis/trunk/files/CSWmantis.depend
    csw/mgar/pkg/mantis/trunk/files/CSWmantis.gspec

Property Changed:
----------------
    csw/mgar/pkg/mantis/trunk/


Property changes on: csw/mgar/pkg/mantis/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/mantis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mantis/trunk/Makefile	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/mantis/trunk/Makefile	2009-05-25 14:06:04 UTC (rev 5040)
@@ -1,5 +1,5 @@
 GARNAME = mantisbt
-GARVERSION = 1.1.6
+GARVERSION = 1.1.7
 CATEGORIES = apps
 
 DESCRIPTION = Mantis is a free popular web-based bugtracking system
@@ -14,11 +14,17 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWmantis,depend preinstall postinstall)
+DISTFILES += CSWmantis.preinstall CSWmantis.postinstall
 
+PACKAGES = mantis
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
+LICENSE = doc/LICENSE
+REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWphp5mysql
+ARCHALL = 1
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
 TEST_SCRIPTS =

Modified: csw/mgar/pkg/mantis/trunk/checksums
===================================================================
--- csw/mgar/pkg/mantis/trunk/checksums	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/mantis/trunk/checksums	2009-05-25 14:06:04 UTC (rev 5040)
@@ -1,5 +1,3 @@
-2e0c6d3dd9ca7d16258fc2d86363a675  download/mantisbt-1.1.6.tar.gz
-d1789df1b666c1fead9fc492dd196711  download/CSWmantis.gspec
-6342620e50a9c631c6fd46a86d6dc32b  download/CSWmantis.depend
-96401030529fc97656cf78d4f7b170e7  download/CSWmantis.preinstall
 bbef8a268863914e61226fec2b6569ae  download/CSWmantis.postinstall
+96401030529fc97656cf78d4f7b170e7  download/CSWmantis.preinstall
+df49eb04bf8fff7a6ed4845f9a09be3b  download/mantisbt-1.1.7.tar.gz

Deleted: csw/mgar/pkg/mantis/trunk/files/CSWmantis.depend
===================================================================
--- csw/mgar/pkg/mantis/trunk/files/CSWmantis.depend	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/mantis/trunk/files/CSWmantis.depend	2009-05-25 14:06:04 UTC (rev 5040)
@@ -1,3 +0,0 @@
-P CSWapache2    apache2 - Apache 2.2 web server
-P CSWap2modphp5 ap2_modphp5 - PHP 5 - Apache 2.2.x Module
-P CSWphp5mysql  php5_mysql - PHP 5 - MySQL Extension

Deleted: csw/mgar/pkg/mantis/trunk/files/CSWmantis.gspec
===================================================================
--- csw/mgar/pkg/mantis/trunk/files/CSWmantis.gspec	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/mantis/trunk/files/CSWmantis.gspec	2009-05-25 14:06:04 UTC (rev 5040)
@@ -1,5 +0,0 @@
-%var            bitname mantis
-%var            pkgname CSWmantis
-%var            arch all
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/doc/LICENSE


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

From dmichelsen at users.sourceforge.net  Mon May 25 16:19:52 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 14:19:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[5041] csw/mgar/pkg/gar/trunk/Makefile
Message-ID: 

Revision: 5041
          http://gar.svn.sourceforge.net/gar/?rev=5041&view=rev
Author:   dmichelsen
Date:     2009-05-25 14:19:52 +0000 (Mon, 25 May 2009)

Log Message:
-----------
gar: Make only one package

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

Modified: csw/mgar/pkg/gar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gar/trunk/Makefile	2009-05-25 14:06:04 UTC (rev 5040)
+++ csw/mgar/pkg/gar/trunk/Makefile	2009-05-25 14:19:52 UTC (rev 5041)
@@ -18,24 +18,13 @@
 
 SPKG_SOURCEURL = http://gar.opencsw.org
 
-PACKAGES = CSWgar CSWgar-v1 CSWgar-v2
 NOSOURCEPACKAGE = 1
 
-CATALOGNAME_CSWgar = gar
-CATALOGNAME_CSWgar-v1 = gar_v1
-CATALOGNAME_CSWgar-v2 = gar_v2
+REQUIRED_PKGS_CSWgar = $(PREREQUISITE_BASE_PKGS)
 
-REQUIRED_PKGS_CSWgar = $(PREREQUISITE_BASE_PKGS) CSWsvn
-REQUIRED_PKGS_CSWgar-v1 = CSWgar
-REQUIRED_PKGS_CSWgar-v2 = CSWgar
+SPKG_DESC_CSWgar = The GAR package build system
 
-SPKG_DESC_CSWgar = The mGAR package build system
-SPKG_DESC_CSWgar-v1 = The mGAR v1 system files
-SPKG_DESC_CSWgar-v2 = The mGAR v2 system files
-
 SPKG_VERSION_CSWgar = $(call _REVISION)
-SPKG_VERSION_CSWgar-v1 = $(shell svnversion $(DOWNLOADDIR)/v1)
-SPKG_VERSION_CSWgar-v2 = $(shell svnversion $(DOWNLOADDIR)/v2)
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
@@ -45,8 +34,6 @@
 EXTRA_MERGE_EXCLUDE_FILES = .*/\.svn/.*
 
 ARCHALL = 1
-PKGFILES_CSWgar-v1 = $(prefix)/src/gar/v1/.*
-PKGFILES_CSWgar-v2 = $(prefix)/src/gar/v2/.*
 
 # Because the bad pathes are in the bad pathes check we cannot check ourselves
 ENABLE_CHECK = 0
@@ -56,7 +43,7 @@
 install-gar:
 	@echo " ==> Installing $(GARNAME)"
 
-	rm -f $(DESTIR)$(bindir)/garit
+	rm -f $(DESTDIR)$(bindir)/garit
 	ginstall -d $(DESTDIR)$(bindir)
 	ginstall $(WORKSRC)/garit $(DESTDIR)$(bindir)/garit
 	ginstall -d $(DESTDIR)$(prefix)/src/gar


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

From bonivart at users.sourceforge.net  Mon May 25 18:06:02 2009
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 25 May 2009 16:06:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[5042] csw/mgar/pkg/pkgutil/trunk
Message-ID: 

Revision: 5042
          http://gar.svn.sourceforge.net/gar/?rev=5042&view=rev
Author:   bonivart
Date:     2009-05-25 16:06:02 +0000 (Mon, 25 May 2009)

Log Message:
-----------
pkgutil: 1.6 beta 1

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

Property Changed:
----------------
    csw/mgar/pkg/pkgutil/trunk/


Property changes on: csw/mgar/pkg/pkgutil/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/pkgutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/Makefile	2009-05-25 14:19:52 UTC (rev 5041)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2009-05-25 16:06:02 UTC (rev 5042)
@@ -1,5 +1,5 @@
 GARNAME = pkgutil
-GARVERSION = 1.5
+GARVERSION = 1.6b1
 CATEGORIES = utils
 
 DESCRIPTION = Installs Solaris packages easily

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2009-05-25 14:19:52 UTC (rev 5041)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2009-05-25 16:06:02 UTC (rev 5042)
@@ -1,5 +1,5 @@
-f9fdd7e5a2bf82ebabe1db387ef163a1  download/pkgutil-1.5.zip
 a16c6f81bc537d6172fd65d8da1aeecc  download/CSWpkgutil.gspec
-bbfa438bcc97cd709f8d1b6716485925  download/CSWpkgutil.prototype
 e1407c24d47306dbc4cea22dcb291f1d  download/CSWpkgutil.postinstall
 2fb6c94a2d212f08b71d462082a2d31a  download/CSWpkgutil.preremove
+bbfa438bcc97cd709f8d1b6716485925  download/CSWpkgutil.prototype
+8a70e1a7be17df436d4480814e2da5a6  download/pkgutil-1.6b1.zip


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

From dmichelsen at users.sourceforge.net  Mon May 25 18:13:17 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 16:13:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[5043] csw/mgar/pkg/cswutils/trunk
Message-ID: 

Revision: 5043
          http://gar.svn.sourceforge.net/gar/?rev=5043&view=rev
Author:   dmichelsen
Date:     2009-05-25 16:13:17 +0000 (Mon, 25 May 2009)

Log Message:
-----------
cswutils: Honor tmpdir. This fixes #3438

Modified Paths:
--------------
    csw/mgar/pkg/cswutils/trunk/checksums
    csw/mgar/pkg/cswutils/trunk/files/checkpkg

Modified: csw/mgar/pkg/cswutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswutils/trunk/checksums	2009-05-25 16:06:02 UTC (rev 5042)
+++ csw/mgar/pkg/cswutils/trunk/checksums	2009-05-25 16:13:17 UTC (rev 5043)
@@ -1,5 +1,5 @@
 091b12575ebc0e45cf8c3d8b43d8b638  download/COPYING
-7e5a50f1db3b6688c58da693f9ac408e  download/checkpkg
+0b9aeb7ab703b45e0961020bc4587f61  download/checkpkg
 6ec3b6597e04714430987ccc199db3c4  download/checkpkg.8
 9a637f6546cc50974159a987302d91c0  download/cpan2pkg
 2349d876bada6ee1bf025e576ec2c465  download/createpkg

Modified: csw/mgar/pkg/cswutils/trunk/files/checkpkg
===================================================================
--- csw/mgar/pkg/cswutils/trunk/files/checkpkg	2009-05-25 16:06:02 UTC (rev 5042)
+++ csw/mgar/pkg/cswutils/trunk/files/checkpkg	2009-05-25 16:13:17 UTC (rev 5043)
@@ -1,6 +1,6 @@
 #!/bin/ksh -p
 
-# checkpkg 2.6
+# checkpkg 2.7
 # This script examines a package that has been put together
 # for submittal to the CSW archive at opencsw.org
 #
@@ -17,6 +17,9 @@
 
 PATH=$PATH:/usr/sbin
 
+# this is actually a base for tmpfiles, not the full name
+TMPDIR=${TMPDIR:-/tmp}
+
 LOCAL_ARCH=`uname -p`
 
 
@@ -100,7 +103,7 @@
 
 file $f |sed 's/^.*://' |grep gzip >/dev/null
 if [ $? -eq 0 ] ; then
-	TMPARCHIVE=/tmp/`basename $f`
+	TMPARCHIVE=$TMPDIR/`basename $f`
 	if [[ -f $TMPARCHIVE ]] ; then
 		print ERROR: $TMPARCHIVE already exists
 		
@@ -111,7 +114,7 @@
 
 pkgname=`nawk 'NR == 2 {print $1; exit;}' $f`
 
-EXTRACTDIR=/tmp/checkpkg.$$
+EXTRACTDIR=$TMPDIR/checkpkg.$$
 
 if [ -d $EXTRACTDIR ] ; then
 	print ERROR: $EXTRACTDIR already exists


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

From dmichelsen at users.sourceforge.net  Mon May 25 18:14:36 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 16:14:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[5044]
	csw/mgar/pkg/cswutils/trunk/Makefile
Message-ID: 

Revision: 5044
          http://gar.svn.sourceforge.net/gar/?rev=5044&view=rev
Author:   dmichelsen
Date:     2009-05-25 16:14:35 +0000 (Mon, 25 May 2009)

Log Message:
-----------
cswutils: Bump to 1.14.1

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

Modified: csw/mgar/pkg/cswutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswutils/trunk/Makefile	2009-05-25 16:13:17 UTC (rev 5043)
+++ csw/mgar/pkg/cswutils/trunk/Makefile	2009-05-25 16:14:35 UTC (rev 5044)
@@ -1,5 +1,5 @@
 GARNAME = cswutils
-GARVERSION = 1.14.0
+GARVERSION = 1.14.1
 CATEGORIES = utils
 
 DESCRIPTION = Utilities for CSW maintainers


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

From dmichelsen at users.sourceforge.net  Mon May 25 18:31:58 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 16:31:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[5045] csw/mgar/pkg/phpldapadmin/trunk
Message-ID: 

Revision: 5045
          http://gar.svn.sourceforge.net/gar/?rev=5045&view=rev
Author:   dmichelsen
Date:     2009-05-25 16:31:57 +0000 (Mon, 25 May 2009)

Log Message:
-----------
phpldapadmin: New directory structure, mGAR v2

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

Added Paths:
-----------
    csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall

Removed Paths:
-------------
    csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.depend
    csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.gspec
    csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.postinstall
    csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preremove

Property Changed:
----------------
    csw/mgar/pkg/phpldapadmin/trunk/


Property changes on: csw/mgar/pkg/phpldapadmin/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/phpldapadmin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/Makefile	2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/Makefile	2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,5 +1,5 @@
 GARNAME = phpldapadmin
-GARVERSION = 1.1.0.6
+GARVERSION = 1.1.0.7
 CATEGORIES = apps
 
 DESCRIPTION = Web-based LDAP browser to manage your LDAP server
@@ -15,7 +15,7 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWphpldapadmin,depend postinstall preremove)
+DISTFILES += CSWphpldapadmin.preinstall
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=61828
@@ -27,15 +27,23 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+PRESERVECONF = $(sharedstatedir)/www/phpldapadmin/config/config.php.CSW
+
+LICENSE = LICENSE
+ARCHALL = 1
+
 include gar/category.mk
 
 install-custom:
 	@echo " ==> Installing $(GARNAME)"
+	@rm -rf $(DESTDIR)$(sharedstatedir)/www/phpldapadmin
+	@ginstall -d $(DESTDIR)$(sharedstatedir)/www
+	@cp -R $(WORKSRC) $(DESTDIR)$(sharedstatedir)/www/phpldapadmin
+	@(cd $(DESTDIR)$(sharedstatedir)/www/phpldapadmin/config; \
+		mv config.php.example config.php.CSW)
+	@find $(DESTDIR)$(sharedstatedir) -name .cvsignore -exec rm \{\} \;
 	@rm -rf $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin
 	@ginstall -d $(DESTDIR)$(prefix)/apache2/share/htdocs
-	@cp -R $(WORKSRC) $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin
-	@cp $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin/config/config.php.example \
-		$(DESTDIR)/$(prefix)/apache2/share/htdocs/phpldapadmin/config/config.php.CSW
-	@find $(DESTDIR)$(prefix) -name .cvsignore -exec rm \{\} \;
+	@ln -s $(sharedstatedir)/www/phpldapadmin/htdocs $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/phpldapadmin/trunk/checksums
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/checksums	2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/checksums	2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,5 +1,2 @@
-f763977c46d09c5801d9af4ebde07a4f  download/phpldapadmin-1.1.0.6.tar.gz
-45c8d22ee54b7ecf7a18b85de0777f28  download/CSWphpldapadmin.gspec
-0a5093f77c31ac9a30572e2ef9e2c57f  download/CSWphpldapadmin.depend
-640e8d4ce62a9d2d5508f68f4284cf1f  download/CSWphpldapadmin.postinstall
-aa80ac77696d9292018d0188350b49c5  download/CSWphpldapadmin.preremove
+13fec0afd8f7808698e2942da7ba3218  download/CSWphpldapadmin.preinstall
+a9129f81b347e98c2b31552d1adc4b51  download/phpldapadmin-1.1.0.7.tar.gz

Deleted: csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.depend
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.depend	2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.depend	2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,5 +0,0 @@
-P CSWapache2     apache2 - Apache 2.2 web server
-P CSWap2modphp5  ap2_modphp5 - PHP 5 - Apache 2.2.x Module
-P CSWphp5ldap    php5_ldap - PHP 5 - OpenLDAP Extension
-P CSWphp5gettext php5_gettext - PHP 5 - GNU gettext Extension
-P CSWphp5session php5_session - PHP 5 - Session Extension

Deleted: csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.gspec
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.gspec	2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.gspec	2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,5 +0,0 @@
-%var            bitname phpldapadmin
-%var            pkgname CSWphpldapadmin
-%var            arch all
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/LICENSE

Deleted: csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.postinstall
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.postinstall	2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.postinstall	2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-CONFDIR=${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin/config
-
-# Copy templates
-template_list="config.php"
-
-echo Copying CSW templates:
-for file in $template_list
-do
-    filepath=${CONFDIR}/$file
-    if [ ! -f "$filepath" ] && [ -f "$filepath.CSW" ]; then
-        echo "  creating $filepath"
-        cp $filepath.CSW $filepath
-    else
-        echo "  preserving $filepath"
-    fi
-done
-
-/usr/bin/cat <

Revision: 5046
          http://gar.svn.sourceforge.net/gar/?rev=5046&view=rev
Author:   bonivart
Date:     2009-05-25 16:42:05 +0000 (Mon, 25 May 2009)

Log Message:
-----------
pkgutil: add new man pages to package

Modified Paths:
--------------
    csw/mgar/pkg/pkgutil/trunk/Makefile
    csw/mgar/pkg/pkgutil/trunk/checksums
    csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype

Modified: csw/mgar/pkg/pkgutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/Makefile	2009-05-25 16:31:57 UTC (rev 5045)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2009-05-25 16:42:05 UTC (rev 5046)
@@ -51,4 +51,6 @@
 	@cp $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW
 	@cp $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget
 	@pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1
+	@pod2man --section=1 $(WORKSRC)/bldcat > $(DESTDIR)$(mandir)/man1/bldcat.1
+	@pod2man --section=1 $(WORKSRC)/chkcat > $(DESTDIR)$(mandir)/man1/chkcat.1
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2009-05-25 16:31:57 UTC (rev 5045)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2009-05-25 16:42:05 UTC (rev 5046)
@@ -1,5 +1,5 @@
 a16c6f81bc537d6172fd65d8da1aeecc  download/CSWpkgutil.gspec
 e1407c24d47306dbc4cea22dcb291f1d  download/CSWpkgutil.postinstall
 2fb6c94a2d212f08b71d462082a2d31a  download/CSWpkgutil.preremove
-bbfa438bcc97cd709f8d1b6716485925  download/CSWpkgutil.prototype
+4ef9d7ba62987112987311d96e249e3e  download/CSWpkgutil.prototype
 8a70e1a7be17df436d4480814e2da5a6  download/pkgutil-1.6b1.zip

Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype	2009-05-25 16:31:57 UTC (rev 5045)
+++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype	2009-05-25 16:42:05 UTC (rev 5046)
@@ -22,6 +22,8 @@
 d none /opt/csw/share/man 0755 root bin
 d none /opt/csw/share/man/man1 0755 root bin
 f none /opt/csw/share/man/man1/pkgutil.1 644 root bin
+f none /opt/csw/share/man/man1/bldcat.1 644 root bin
+f none /opt/csw/share/man/man1/chkcat.1 644 root bin
 d none /var/opt/csw 0755 root bin
 d none /var/opt/csw/pkgutil 0755 root bin
 f none /var/opt/csw/pkgutil/admin.CSW 644 root bin


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

From dmichelsen at users.sourceforge.net  Mon May 25 18:44:43 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 16:44:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[5047]
 csw/mgar/pkg/phpldapadmin/trunk/files/ CSWphpldapadmin.preinstall
Message-ID: 

Revision: 5047
          http://gar.svn.sourceforge.net/gar/?rev=5047&view=rev
Author:   dmichelsen
Date:     2009-05-25 16:44:43 +0000 (Mon, 25 May 2009)

Log Message:
-----------
phpldapadmin: Fix relocate destination

Modified Paths:
--------------
    csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall

Modified: csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall	2009-05-25 16:42:05 UTC (rev 5046)
+++ csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall	2009-05-25 16:44:43 UTC (rev 5047)
@@ -23,7 +23,7 @@
   echo
   mkdir -p ${CSW_PREFIX}/share/www/phpldapadmin/htdocs
   (cd ${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin; tar cf - .) | \
-	(cd ${CSW_PREFIX}/share/www/phpldapadmin/htdocs; tar xvf -)
+	(cd ${CSW_PREFIX}/share/www/phpldapadmin; tar xvf -)
   rm -rf ${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin
 fi
 


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

From dmichelsen at users.sourceforge.net  Mon May 25 18:44:56 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 16:44:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[5048]
	csw/mgar/pkg/phpldapadmin/trunk/checksums
Message-ID: 

Revision: 5048
          http://gar.svn.sourceforge.net/gar/?rev=5048&view=rev
Author:   dmichelsen
Date:     2009-05-25 16:44:56 +0000 (Mon, 25 May 2009)

Log Message:
-----------
phpldapadmin: Fix relocate destination

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

Modified: csw/mgar/pkg/phpldapadmin/trunk/checksums
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/checksums	2009-05-25 16:44:43 UTC (rev 5047)
+++ csw/mgar/pkg/phpldapadmin/trunk/checksums	2009-05-25 16:44:56 UTC (rev 5048)
@@ -1,2 +1,2 @@
-13fec0afd8f7808698e2942da7ba3218  download/CSWphpldapadmin.preinstall
+87983d70476a8a80332f0c3c188d9c2d  download/CSWphpldapadmin.preinstall
 a9129f81b347e98c2b31552d1adc4b51  download/phpldapadmin-1.1.0.7.tar.gz


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

From dmichelsen at users.sourceforge.net  Mon May 25 19:16:09 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 17:16:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[5049]
	csw/mgar/pkg/vorbistools/trunk/Makefile
Message-ID: 

Revision: 5049
          http://gar.svn.sourceforge.net/gar/?rev=5049&view=rev
Author:   dmichelsen
Date:     2009-05-25 17:16:09 +0000 (Mon, 25 May 2009)

Log Message:
-----------
vorbistools: Add dependency to curldevel

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

Modified: csw/mgar/pkg/vorbistools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vorbistools/trunk/Makefile	2009-05-25 16:44:56 UTC (rev 5048)
+++ csw/mgar/pkg/vorbistools/trunk/Makefile	2009-05-25 17:16:09 UTC (rev 5049)
@@ -20,6 +20,8 @@
 PACKAGES = CSWvtools
 CATALOGNAME = vorbistools
 
+PREREQUISITE_PKGS = CSWcurldevel
+
 REQUIRED_PKGS = CSWcurlrt CSWflac CSWggettextrt CSWiconv CSWlibao
 REQUIRED_PKGS += CSWlibogg CSWspeex CSWsunmath CSWvorbis
 


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

From dmichelsen at users.sourceforge.net  Mon May 25 21:35:13 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 19:35:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[5050] csw/mgar/pkg/gperf/trunk
Message-ID: 

Revision: 5050
          http://gar.svn.sourceforge.net/gar/?rev=5050&view=rev
Author:   dmichelsen
Date:     2009-05-25 19:35:13 +0000 (Mon, 25 May 2009)

Log Message:
-----------
gperf: Move to mGAR v2 and dynamic gspec

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

Removed Paths:
-------------
    csw/mgar/pkg/gperf/trunk/files/CSWgperf.gspec

Property Changed:
----------------
    csw/mgar/pkg/gperf/trunk/


Property changes on: csw/mgar/pkg/gperf/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/gperf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gperf/trunk/Makefile	2009-05-25 17:16:09 UTC (rev 5049)
+++ csw/mgar/pkg/gperf/trunk/Makefile	2009-05-25 19:35:13 UTC (rev 5050)
@@ -13,7 +13,6 @@
 
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES    = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES   += $(call admfiles,CSWgperf)
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/gperf/trunk/checksums
===================================================================
--- csw/mgar/pkg/gperf/trunk/checksums	2009-05-25 17:16:09 UTC (rev 5049)
+++ csw/mgar/pkg/gperf/trunk/checksums	2009-05-25 19:35:13 UTC (rev 5050)
@@ -1,2 +1 @@
 c1f1db32fb6598d6a93e6e88796a8632  download/gperf-3.0.4.tar.gz
-feeb293dedf6e49b1fe0b8bfcef06e99  download/CSWgperf.gspec

Deleted: csw/mgar/pkg/gperf/trunk/files/CSWgperf.gspec
===================================================================
--- csw/mgar/pkg/gperf/trunk/files/CSWgperf.gspec	2009-05-25 17:16:09 UTC (rev 5049)
+++ csw/mgar/pkg/gperf/trunk/files/CSWgperf.gspec	2009-05-25 19:35:13 UTC (rev 5050)
@@ -1,4 +0,0 @@
-%var            bitname gperf
-%var            pkgname CSWgperf
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING


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

From dmichelsen at users.sourceforge.net  Tue May 26 00:52:55 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 22:52:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[5051]
	csw/mgar/pkg/mantis/trunk/Makefile
Message-ID: 

Revision: 5051
          http://gar.svn.sourceforge.net/gar/?rev=5051&view=rev
Author:   dmichelsen
Date:     2009-05-25 22:52:55 +0000 (Mon, 25 May 2009)

Log Message:
-----------
mantis: Fix package name

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

Modified: csw/mgar/pkg/mantis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mantis/trunk/Makefile	2009-05-25 19:35:13 UTC (rev 5050)
+++ csw/mgar/pkg/mantis/trunk/Makefile	2009-05-25 22:52:55 UTC (rev 5051)
@@ -16,7 +16,7 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 DISTFILES += CSWmantis.preinstall CSWmantis.postinstall
 
-PACKAGES = mantis
+PACKAGES = CSWmantis
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz


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

From dmichelsen at users.sourceforge.net  Tue May 26 02:54:19 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 26 May 2009 00:54:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[5052]
	csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk
Message-ID: 

Revision: 5052
          http://gar.svn.sourceforge.net/gar/?rev=5052&view=rev
Author:   dmichelsen
Date:     2009-05-26 00:54:19 +0000 (Tue, 26 May 2009)

Log Message:
-----------
XML-Atom-SimpleFeed: Update to mGAR v2 and 0.83

Modified Paths:
--------------
    csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/files/CSWpmxmlatomsimplefd.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/


Property changes on: csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/Makefile	2009-05-25 22:52:55 UTC (rev 5051)
+++ csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/Makefile	2009-05-26 00:54:19 UTC (rev 5052)
@@ -1,5 +1,5 @@
 GARNAME = XML-Atom-SimpleFeed
-GARVERSION = 0.82
+GARVERSION = 0.83
 CATEGORIES = cpan
 AUTHOR = ARISTOTLE
 
@@ -10,6 +10,8 @@
   but has no provisions for generating feeds with extension elements.
 endef
 
-DISTFILES += $(call admfiles,CSWpmxmlatomsimplefd,)
+PACKAGES = CSWpmxmlatomsimplefd
+CATALOGNAME = pm_xmlatomsimplefeed
+ARCHALL = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/checksums	2009-05-25 22:52:55 UTC (rev 5051)
+++ csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/checksums	2009-05-26 00:54:19 UTC (rev 5052)
@@ -1,2 +1 @@
-6754bcccee811c0555e38eb4387e97f2  download/CSWpmxmlatomsimplefd.gspec
-2570500ec05b0d9fb9d21e19a52ce313  download/XML-Atom-SimpleFeed-0.82.tar.gz
+165a259760302eac1c6c5153004382ac  download/XML-Atom-SimpleFeed-0.83.tar.gz

Deleted: csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/files/CSWpmxmlatomsimplefd.gspec
===================================================================
--- csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/files/CSWpmxmlatomsimplefd.gspec	2009-05-25 22:52:55 UTC (rev 5051)
+++ csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/files/CSWpmxmlatomsimplefd.gspec	2009-05-26 00:54:19 UTC (rev 5052)
@@ -1,9 +0,0 @@
-%var            bitname pm_xmlatomsimplefeed
-%var            pkgname CSWpmxmlatomsimplefd
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright
-Copyright (C) 2005, Aristotle Pagaltzis
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.


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

From valholla at users.sourceforge.net  Tue May 26 16:42:57 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 14:42:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[5053] csw/mgar/pkg/sudo_ldap/trunk
Message-ID: 

Revision: 5053
          http://gar.svn.sourceforge.net/gar/?rev=5053&view=rev
Author:   valholla
Date:     2009-05-26 14:42:57 +0000 (Tue, 26 May 2009)

Log Message:
-----------
update to 1.7.1 and 64bit build

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

Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 00:54:19 UTC (rev 5052)
+++ csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 14:42:57 UTC (rev 5053)
@@ -1,5 +1,5 @@
 GARNAME = sudo
-GARVERSION = 1.7.0
+GARVERSION = 1.7.1
 CATEGORIES = utils
 
 DESCRIPTION = Provides limited super user privileges (LDAP Enabled)
@@ -25,6 +25,7 @@
 SPKG_SOURCEURL_CSWsudoldap = http://www.sudo.ws
 REQUIRED_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt
 
+BUILD64 = 1
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-pam
 CONFIGURE_ARGS += --with-logging=both
@@ -39,8 +40,8 @@
 
 PKGFILES_CSWsudoldap = .*$(bindir)/sudo.ldap
 
-post-merge-modulated:
-	@( cd $(PKGROOT)$(bindir) ; gmv sudo sudo.ldap )
-	@( cd $(PKGROOT)$(bindir) ; grm sudoedit )
-	@( cd $(PKGROOT)$(bindir) ; gchmod 4755 sudo.ldap )
+post-install-modulated:
+	@( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.ldap )
+	@( cd $(DESTDIR)$(bindir) ; grm sudoedit )
+	@( cd $(DESTDIR)$(bindir) ; gchmod 4755 sudo.ldap )
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/sudo_ldap/trunk/checksums
===================================================================
--- csw/mgar/pkg/sudo_ldap/trunk/checksums	2009-05-26 00:54:19 UTC (rev 5052)
+++ csw/mgar/pkg/sudo_ldap/trunk/checksums	2009-05-26 14:42:57 UTC (rev 5053)
@@ -1,4 +1,2 @@
-05fb6b46e36528fb889aca7f53106708  download/CSWsudoldap.postinstall
-4fcbbf0054c3d2e5f73f83a8730554f1  download/CSWsudoldap.postremove
 157b2e5e38ca54eb36e0364706bd0292  download/install.diff
-5fd96bba35fe29b464f7aa6ad255f0a6  download/sudo-1.7.0.tar.gz
+af672524b2c854a67612bf4c743f58b8  download/sudo-1.7.1.tar.gz


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

From valholla at users.sourceforge.net  Tue May 26 16:44:49 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 14:44:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[5054] csw/mgar/pkg/sudo/trunk/Makefile
Message-ID: 

Revision: 5054
          http://gar.svn.sourceforge.net/gar/?rev=5054&view=rev
Author:   valholla
Date:     2009-05-26 14:44:49 +0000 (Tue, 26 May 2009)

Log Message:
-----------
update to 1.7.1 and 64bit build

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 14:42:57 UTC (rev 5053)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 14:44:49 UTC (rev 5054)
@@ -44,10 +44,13 @@
 
 include gar/category.mk
 
-PKGFILES_CSWsudo  = .*$(bindir)/sudo.*
+PKGFILES_CSWsudo  = .*$(bindir)/sudo
+PKGFILES_CSWsudo  = .*$(bindir)/sudo.minimal
 
-post-merge-modulated:
-	@( cd $(PKGROOT)$(bindir) ; gln -f sudo sudo.minimal )
-	@( cd $(PKGROOT)$(sysconfdir) ; gmv sudoers sudoers.CSW )
-	@( cd $(PKGROOT)$(bindir) ; gchmod 4755 sudo* )
+post-install-modulated:
+	@( cd $(DESTDIR)$(bindir) ; gcp sudo sudo.minimal )
+	@( cd $(DESTDIR)$(bindir) ; grm -f sudoedit )
+	@( cd $(DESTDIR)$(bindir) ; gcp sudo sudoedit )
+	@( cd $(DESTDIR)$(sysconfdir) ; gmv sudoers sudoers.CSW )
+	@( cd $(DESTDIR)$(bindir) ; gchmod 4755 sudo* )
 	@$(MAKECOOKIE)


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

From valholla at users.sourceforge.net  Tue May 26 16:58:49 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 14:58:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[5055]
	csw/mgar/pkg/sudo_ldap/trunk/Makefile
Message-ID: 

Revision: 5055
          http://gar.svn.sourceforge.net/gar/?rev=5055&view=rev
Author:   valholla
Date:     2009-05-26 14:58:49 +0000 (Tue, 26 May 2009)

Log Message:
-----------
fix 64bit build

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

Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 14:44:49 UTC (rev 5054)
+++ csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 14:58:49 UTC (rev 5055)
@@ -38,7 +38,7 @@
 
 include gar/category.mk
 
-PKGFILES_CSWsudoldap = .*$(bindir)/sudo.ldap
+PKGFILES_CSWsudoldap = .*$(bindir).*/sudo.ldap
 
 post-install-modulated:
 	@( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.ldap )


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

From valholla at users.sourceforge.net  Tue May 26 17:05:09 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 15:05:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[5056]
	csw/mgar/pkg/sudo_ldap/trunk/Makefile
Message-ID: 

Revision: 5056
          http://gar.svn.sourceforge.net/gar/?rev=5056&view=rev
Author:   valholla
Date:     2009-05-26 15:05:09 +0000 (Tue, 26 May 2009)

Log Message:
-----------
need explicit isaexec require

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

Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 14:58:49 UTC (rev 5055)
+++ csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 15:05:09 UTC (rev 5056)
@@ -23,7 +23,7 @@
 CATALOGNAME_CSWsudoldap = sudo_ldap
 SPKG_DESC_CSWsudoldap = $(DESCRIPTION)
 SPKG_SOURCEURL_CSWsudoldap = http://www.sudo.ws
-REQUIRED_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt
+REQUIRED_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt CSWisaexec
 
 BUILD64 = 1
 CONFIGURE_ARGS  = $(DIRPATHS)


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

From valholla at users.sourceforge.net  Tue May 26 17:06:57 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 15:06:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[5057]
	csw/mgar/pkg/sudo_ldap/trunk/Makefile
Message-ID: 

Revision: 5057
          http://gar.svn.sourceforge.net/gar/?rev=5057&view=rev
Author:   valholla
Date:     2009-05-26 15:06:56 +0000 (Tue, 26 May 2009)

Log Message:
-----------
don't need explicit isaexec require

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

Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 15:05:09 UTC (rev 5056)
+++ csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 15:06:56 UTC (rev 5057)
@@ -23,7 +23,7 @@
 CATALOGNAME_CSWsudoldap = sudo_ldap
 SPKG_DESC_CSWsudoldap = $(DESCRIPTION)
 SPKG_SOURCEURL_CSWsudoldap = http://www.sudo.ws
-REQUIRED_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt CSWisaexec
+REQUIRED_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt 
 
 BUILD64 = 1
 CONFIGURE_ARGS  = $(DIRPATHS)


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

From valholla at users.sourceforge.net  Tue May 26 17:11:03 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 15:11:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[5058] csw/mgar/pkg/sudo/trunk/Makefile
Message-ID: 

Revision: 5058
          http://gar.svn.sourceforge.net/gar/?rev=5058&view=rev
Author:   valholla
Date:     2009-05-26 15:11:03 +0000 (Tue, 26 May 2009)

Log Message:
-----------
fix 64bit

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:06:56 UTC (rev 5057)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:11:03 UTC (rev 5058)
@@ -44,8 +44,8 @@
 
 include gar/category.mk
 
-PKGFILES_CSWsudo  = .*$(bindir)/sudo
-PKGFILES_CSWsudo  = .*$(bindir)/sudo.minimal
+PKGFILES_CSWsudo  = .*$(bindir).*/sudo
+PKGFILES_CSWsudo  = .*$(bindir).*/sudo.minimal
 
 post-install-modulated:
 	@( cd $(DESTDIR)$(bindir) ; gcp sudo sudo.minimal )


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

From valholla at users.sourceforge.net  Tue May 26 17:16:31 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 15:16:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[5059] csw/mgar/pkg/sudo/trunk/Makefile
Message-ID: 

Revision: 5059
          http://gar.svn.sourceforge.net/gar/?rev=5059&view=rev
Author:   valholla
Date:     2009-05-26 15:16:31 +0000 (Tue, 26 May 2009)

Log Message:
-----------
tweak

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:11:03 UTC (rev 5058)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:16:31 UTC (rev 5059)
@@ -52,5 +52,8 @@
 	@( cd $(DESTDIR)$(bindir) ; grm -f sudoedit )
 	@( cd $(DESTDIR)$(bindir) ; gcp sudo sudoedit )
 	@( cd $(DESTDIR)$(sysconfdir) ; gmv sudoers sudoers.CSW )
-	@( cd $(DESTDIR)$(bindir) ; gchmod 4755 sudo* )
 	@$(MAKECOOKIE)
+
+post-merge-modulated:
+	@( cd $(DESTDIR)$(bindir);gfind . -name sudo\* -exec gchmod 4755 {} \; )
+	@$(MAKECOOKIE)


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

From valholla at users.sourceforge.net  Tue May 26 17:22:13 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 15:22:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[5060] csw/mgar/pkg/sudo/trunk/Makefile
Message-ID: 

Revision: 5060
          http://gar.svn.sourceforge.net/gar/?rev=5060&view=rev
Author:   valholla
Date:     2009-05-26 15:22:13 +0000 (Tue, 26 May 2009)

Log Message:
-----------
fix 64bit

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:16:31 UTC (rev 5059)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:22:13 UTC (rev 5060)
@@ -55,5 +55,5 @@
 	@$(MAKECOOKIE)
 
 post-merge-modulated:
-	@( cd $(DESTDIR)$(bindir);gfind . -name sudo\* -exec gchmod 4755 {} \; )
+	@( cd $(PKGROOT)$(bindir);gfind . -name sudo\* -exec gchmod 4755 {} \; )
 	@$(MAKECOOKIE)


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

From valholla at users.sourceforge.net  Tue May 26 17:35:52 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 15:35:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[5061] csw/mgar/pkg/sudo/trunk/Makefile
Message-ID: 

Revision: 5061
          http://gar.svn.sourceforge.net/gar/?rev=5061&view=rev
Author:   valholla
Date:     2009-05-26 15:35:50 +0000 (Tue, 26 May 2009)

Log Message:
-----------
tweak

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:22:13 UTC (rev 5060)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:35:50 UTC (rev 5061)
@@ -44,16 +44,17 @@
 
 include gar/category.mk
 
-PKGFILES_CSWsudo  = .*$(bindir).*/sudo
 PKGFILES_CSWsudo  = .*$(bindir).*/sudo.minimal
 
 post-install-modulated:
-	@( cd $(DESTDIR)$(bindir) ; gcp sudo sudo.minimal )
+	@( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.minimal )
+	@( cd $(DESTDIR)$(bindir) ; gln -s sudo.minimal sudo )
 	@( cd $(DESTDIR)$(bindir) ; grm -f sudoedit )
-	@( cd $(DESTDIR)$(bindir) ; gcp sudo sudoedit )
+	@( cd $(DESTDIR)$(bindir) ; gcp sudo.minimal sudoedit )
 	@( cd $(DESTDIR)$(sysconfdir) ; gmv sudoers sudoers.CSW )
 	@$(MAKECOOKIE)
 
 post-merge-modulated:
-	@( cd $(PKGROOT)$(bindir);gfind . -name sudo\* -exec gchmod 4755 {} \; )
+	@( cd $(PKGROOT)$(bindir); \
+		gfind . -type f -name sudo\* -exec gchmod 4755 {} \; )
 	@$(MAKECOOKIE)


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

From dmichelsen at users.sourceforge.net  Tue May 26 19:58:10 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 26 May 2009 17:58:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[5063] csw/mgar/pkg/bdb44/trunk/Makefile
Message-ID: 

Revision: 5063
          http://gar.svn.sourceforge.net/gar/?rev=5063&view=rev
Author:   dmichelsen
Date:     2009-05-26 17:58:10 +0000 (Tue, 26 May 2009)

Log Message:
-----------
bdb44: Fix docdir

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

Modified: csw/mgar/pkg/bdb44/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb44/trunk/Makefile	2009-05-26 17:57:56 UTC (rev 5062)
+++ csw/mgar/pkg/bdb44/trunk/Makefile	2009-05-26 17:58:10 UTC (rev 5063)
@@ -34,6 +34,8 @@
 CONFIGURE_SCRIPTS = dist
 
 prefix = $(BUILD_PREFIX)/bdb44
+docdir = $(BUILD_PREFIX)/share/doc
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-cryptography
 CONFIGURE_ARGS += --enable-compat185
@@ -72,6 +74,11 @@
 
 LICENSE = LICENSE
 
+# Leave the docs where they are for now
+#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p"
+#EXTRA_PAX_ARGS_isa-i386    = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p"
+
+#PKGFILES_CSWbdb44-doc = $(PKGFILES_DOC)
 PKGFILES_CSWbdb44-doc = $(prefix)/docs/.*
 
 PKGFILES_CSWbdb44-devel = $(PKGFILES_DEVEL)


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

From dmichelsen at users.sourceforge.net  Tue May 26 19:57:56 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 26 May 2009 17:57:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[5062] csw/mgar/pkg
Message-ID: 

Revision: 5062
          http://gar.svn.sourceforge.net/gar/?rev=5062&view=rev
Author:   dmichelsen
Date:     2009-05-26 17:57:56 +0000 (Tue, 26 May 2009)

Log Message:
-----------
bdb47: Initial commit

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

Added Paths:
-----------
    csw/mgar/pkg/bdb47/

Removed Paths:
-------------
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.depend
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.gspec
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.prototype
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-doc.depend
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-doc.gspec
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-doc.prototype
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46.depend
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46.gspec
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46.prototype

Property Changed:
----------------
    csw/mgar/pkg/bdb47/trunk/


Property changes on: csw/mgar/pkg/bdb47/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/bdb47/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb46/trunk/Makefile	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/bdb47/trunk/Makefile	2009-05-26 17:57:56 UTC (rev 5062)
@@ -1,8 +1,8 @@
 GARNAME = db
-GARVERSION = 4.6.21
+GARVERSION = 4.7.25
 CATEGORIES = lib
 
-DESCRIPTION = embedded database libraries and utilities
+DESCRIPTION = Berkeley DB 4.7
 define BLURB
   Berkeley DB (libdb) is a programmatic toolkit that provides embedded database
   support for both traditional and client/server applications. It includes
@@ -15,9 +15,6 @@
 
 MASTER_SITES = http://download.oracle.com/berkeley-db/
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz 
-DISTFILES += $(call admfiles,CSWbdb46,depend prototype)
-DISTFILES += $(call admfiles,CSWbdb46-devel,depend prototype)
-DISTFILES += $(call admfiles,CSWbdb46-doc,depend prototype)
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -26,37 +23,69 @@
 
 WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix
 
-# No patches for the 4.6 series... yet.
+# No patches for the 4.7 series... yet.
 #PATCHDIR = $(WORKSRC)/..
 #PATCHDIRLEVEL = 0
 #PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*.diff))
 
+BUILD64 = 1
 CONFIGURE_SCRIPTS = dist
 
-CONFIGURE_ARGS  = --prefix=$(prefix)/bdb46
-CONFIGURE_ARGS += --disable-cryptography
+prefix = $(BUILD_PREFIX)/bdb47
+CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-compat185
 CONFIGURE_ARGS += --enable-o_direct
 CONFIGURE_ARGS += --enable-rpc
 CONFIGURE_ARGS += --enable-cxx
 CONFIGURE_ARGS += --enable-java
+
+# Exclude TCL support for 64 bit until we have a 64 bit TCL
+ifeq ($(MEMORYMODEL),32)
 CONFIGURE_ARGS += --enable-tcl
 CONFIGURE_ARGS += --with-tcl=$(libdir)
+endif
 
-FIXCONFIG_DIRS  = $(DESTDIR)$(prefix)/bdb46/lib
+FIXCONFIG_DIRS  = $(DESTDIR)$(prefix)/bdb47/lib
 
 # bdb tests are *very* time consuming
 TEST_SCRIPTS =
 
+NO_ISAEXEC = 1
+
+PACKAGES = CSWbdb47 CSWbdb47-devel CSWbdb47-doc
+
+CATALOGNAME_CSWbdb47       = berkeleydb47
+CATALOGNAME_CSWbdb47-devel = berkeleydb47_devel
+CATALOGNAME_CSWbdb47-doc   = berkeleydb47_doc
+
+ARCHALL_CSWbdb47-doc = 1
+
+SPKG_DESC_CSWbdb47       = BerkeleyDB 4.7 embedded database libraries and utilities
+SPKG_DESC_CSWbdb47-devel = BerkeleyDB 4.7 development support
+SPKG_DESC_CSWbdb47-doc   = BerkeleyDB 4.7 documentation
+
+REQUIRED_PKGS_CSWbdb47-devel = CSWbdb47
+
+LICENSE = LICENSE
+
+PKGFILES_CSWbdb47-doc = $(prefix)/docs/.*
+
+PKGFILES_CSWbdb47-devel = $(PKGFILES_DEVEL)
+
 include gar/category.mk
 
 LIBS += -lnsl
 export LIBS
 
-PATH := /usr/j2se/bin:$(PATH)
+PATH := /usr/jdk1.6.0_07/bin:$(PATH)
 export PATH
 
 configure-dist:
 	@( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) )
 	@$(MAKECOOKIE)
 
+post-merge:
+	gln -s . $(PKGROOT)$(libdir)/32
+	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64
+	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/bdb47/trunk/checksums
===================================================================
--- csw/mgar/pkg/bdb46/trunk/checksums	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/bdb47/trunk/checksums	2009-05-26 17:57:56 UTC (rev 5062)
@@ -1,10 +1 @@
-718082e7e35fc48478a2334b0bc4cd11  download/db-4.6.21.tar.gz
-aba0c466fce71fa800ff4458a8701500  download/CSWbdb46.gspec
-8093298b67861e241b0d2499c9f2ff89  download/CSWbdb46.depend
-a6db5a49695256610d79a0f562e0ec27  download/CSWbdb46.prototype
-3e067c8c8bb6752b43e57b36172413f5  download/CSWbdb46-devel.gspec
-b2084ee979fdcb4130e2c4cf96106731  download/CSWbdb46-devel.depend
-9dfce8d4a0b7db55bbc3f8c017afa95b  download/CSWbdb46-devel.prototype
-e7ccfc6fcb8b234e529f77a22b375819  download/CSWbdb46-doc.gspec
-8093298b67861e241b0d2499c9f2ff89  download/CSWbdb46-doc.depend
-fec8e74506f8e656bd4d24afdddadb94  download/CSWbdb46-doc.prototype
+ec2b87e833779681a0c3a814aa71359e  download/db-4.7.25.tar.gz

Deleted: csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.depend
===================================================================
--- csw/mgar/pkg/bdb46/trunk/files/CSWbdb46-devel.depend	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.depend	2009-05-26 17:57:56 UTC (rev 5062)
@@ -1 +0,0 @@
-P CSWbdb46 berkeleydb46 - BerkeleyDB 4.6 libraries and utilities

Deleted: csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.gspec
===================================================================
--- csw/mgar/pkg/bdb46/trunk/files/CSWbdb46-devel.gspec	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.gspec	2009-05-26 17:57:56 UTC (rev 5062)
@@ -1,5 +0,0 @@
-%var            bitname berkeleydb46_devel
-%var            pkgname CSWbdb46-devel
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%var            desc BerkeleyDB 4.6 development support
-%copyright      url file://%{WORKSRC}/../LICENSE

Deleted: csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.prototype
===================================================================
--- csw/mgar/pkg/bdb46/trunk/files/CSWbdb46-devel.prototype	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.prototype	2009-05-26 17:57:56 UTC (rev 5062)
@@ -1,10 +0,0 @@
-d none /opt/csw/bdb46 0755 root bin
-f none /opt/csw/bdb46/include/db_185.h 0444 root bin
-f none /opt/csw/bdb46/include/db_cxx.h 0444 root bin
-d none /opt/csw/bdb46/lib 0755 root bin
-f none /opt/csw/bdb46/lib/libdb-4.6.a 0644 root bin
-f none /opt/csw/bdb46/lib/libdb-4.6.la 0644 root bin
-f none /opt/csw/bdb46/lib/libdb.a 0644 root bin
-f none /opt/csw/bdb46/lib/libdb_cxx-4.6.a 0644 root bin
-f none /opt/csw/bdb46/lib/libdb_cxx-4.6.la 0644 root bin
-f none /opt/csw/bdb46/lib/libdb_cxx.a 0644 root bin

Deleted: csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-doc.gspec
===================================================================
--- csw/mgar/pkg/bdb46/trunk/files/CSWbdb46-doc.gspec	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-doc.gspec	2009-05-26 17:57:56 UTC (rev 5062)
@@ -1,6 +0,0 @@
-%var            bitname berkeleydb46_doc
-%var            pkgname CSWbdb46-doc
-%var            arch all
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%var            desc BerkeleyDB 4.6 documentation
-%copyright      url file://%{WORKSRC}/../LICENSE

Deleted: csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-doc.prototype
===================================================================
--- csw/mgar/pkg/bdb46/trunk/files/CSWbdb46-doc.prototype	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-doc.prototype	2009-05-26 17:57:56 UTC (rev 5062)
@@ -1,1764 +0,0 @@
-d none /opt/csw/bdb46 0755 root bin
-d none /opt/csw/bdb46/docs 0755 root bin
-d none /opt/csw/bdb46/docs/api_c 0755 root bin
-f none /opt/csw/bdb46/docs/api_c/api_core.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/c_pindex.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_associate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_compact.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_cursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_del.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_err.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_exists.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_fd.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_get_byteswapped.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_get_mpf.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_get_type.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_getenv.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_join.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_key_range.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_rename.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_alloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_append_recno.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_bt_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_bt_minkey.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_bt_prefix.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_dup_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_encrypt.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_errcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_errfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_errpfx.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_feedback.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_h_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_h_ffactor.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_h_hash.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_h_nelem.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_lorder.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_msgcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_msgfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_pagesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_q_extentsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_re_delim.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_re_len.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_re_pad.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_re_source.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_sync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_truncate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_upgrade.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_verify.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_count.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_del.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_dup.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_set_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbm.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbt_bulk.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbt_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbt_package.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_cdsgroup_begin.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_dbremove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_dbrename.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_err.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_event_notify.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_failchk.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_fileid_reset.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_lsn_reset.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_alloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_app_dispatch.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_cache_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_data_dir.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_encrypt.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_errcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_errfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_errpfx.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_feedback.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_isalive.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lg_bsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lg_dir.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lg_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lg_mode.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lg_regionmax.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lk_conflicts.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lk_detect.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lk_max_lockers.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lk_max_locks.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lk_max_objects.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_mp_mmapsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_msgcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_msgfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_rpc_server.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_shm_key.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_thread_count.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_thread_id.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_thread_id_string.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_timeout.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_tmp_dir.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_tx_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_tx_timestamp.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_verbose.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_strerror.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_version.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/hsearch.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_detect.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_id.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_id_free.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_vec.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_archive.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_cursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_file.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_flush.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_printf.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/logc_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/logc_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/logc_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lsn_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_fclose.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_fcreate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_fget.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_fopen.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_fput.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_fsync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_maxwrite.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_openfd.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_register.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_clear_len.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_fileid.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_ftype.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_lsn_offset.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_maxsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_pgcookie.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_sync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_trickle.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mempfile_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_alloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_free.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_lock.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_set_align.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_set_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_set_tas_spins.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_unlock.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/object.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/pindex.src 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_config.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_elect.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_limit.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_message.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_nsites.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_request.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_start.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_sync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_timeout.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_transport.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/repmgr_ack_policy.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/repmgr_local_site.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/repmgr_remote_site.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/repmgr_site_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/repmgr_start.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/repmgr_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_initial_value.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_set_cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_set_range.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_dirfree.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_dirlist.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_exists.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_free.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_fsync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_ftruncate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_ioinfo.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_malloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_map.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_pread.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_pwrite.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_read.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_realloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_rename.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_seek.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_sleep.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_unlink.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_unmap.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_write.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_yield.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_abort.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_begin.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_checkpoint.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_commit.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_discard.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_id.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_prepare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_recover.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_set_name.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_set_timeout.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_stat.html 0444 root bin
-d none /opt/csw/bdb46/docs/api_cxx 0755 root bin
-f none /opt/csw/bdb46/docs/api_cxx/api_core.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/cxx_pindex.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_associate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_compact.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_cursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_del.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_err.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_exists.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_fd.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_get_byteswapped.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_get_mpf.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_get_type.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_getenv.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_join.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_key_range.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_rename.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_alloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_append_recno.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_bt_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_bt_minkey.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_bt_prefix.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_dup_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_encrypt.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_errcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_errfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_error_stream.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_errpfx.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_feedback.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_h_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_h_ffactor.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_h_hash.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_h_nelem.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_lorder.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_msg_stream.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_msgcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_msgfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_pagesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_q_extentsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_re_delim.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_re_len.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_re_pad.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_re_source.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_sync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_truncate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_upgrade.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_verify.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_count.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_del.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_dup.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_set_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbt_bulk_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbt_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbt_package.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/deadlock_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_cdsgroup_begin.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_dbremove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_dbrename.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_err.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_event_notify.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_failchk.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_fileid_reset.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_lsn_reset.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_alloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_app_dispatch.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_cache_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_data_dir.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_encrypt.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_errcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_errfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_error_stream.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_errpfx.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_feedback.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_isalive.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lg_bsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lg_dir.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lg_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lg_mode.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lg_regionmax.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lk_conflicts.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lk_detect.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lk_max_lockers.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lk_max_locks.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lk_max_objects.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_mp_mmapsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_msg_stream.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_msgcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_msgfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_rpc_server.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_shm_key.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_thread_count.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_thread_id.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_thread_id_string.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_timeout.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_tmp_dir.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_tx_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_tx_timestamp.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_verbose.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_strerror.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_version.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/exc_package.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/except_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_detect.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_id.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_id_free.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_vec.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lockng_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_archive.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_cursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_file.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_flush.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_printf.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/logc_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/logc_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/logc_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lsn_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_fclose.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_fcreate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_fget.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_fopen.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_fput.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_fsync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_maxwrite.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_openfd.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_register.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_clear_len.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_fileid.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_ftype.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_lsn_offset.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_maxsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_pgcookie.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_sync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_trickle.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mempfile_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_alloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_free.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_lock.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_set_align.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_set_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_set_tas_spins.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_unlock.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/object.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/pindex.src 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_config.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_elect.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_limit.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_message.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_nsites.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_request.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_start.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_sync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_timeout.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_transport.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/repmgr_ack_policy.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/repmgr_local_site.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/repmgr_remote_site.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/repmgr_site_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/repmgr_start.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/repmgr_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/runrec_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_initial_value.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_set_cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_set_range.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_abort.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_begin.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_checkpoint.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_commit.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_discard.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_id.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_prepare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_recover.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_set_name.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_set_timeout.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_stat.html 0444 root bin
-d none /opt/csw/bdb46/docs/api_tcl 0755 root bin
-f none /opt/csw/bdb46/docs/api_tcl/api_tcl.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_count.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_cursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_del.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_get_join.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_get_type.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_is_byteswapped.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_join.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_rename.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_sync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_truncate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/dbc_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/dbc_del.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/dbc_dup.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/dbc_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/dbc_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/env_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/env_dbremove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/env_dbrename.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/env_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/env_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/txn.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/txn_abort.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/txn_checkpoint.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/txn_commit.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/version.html 0444 root bin
-d none /opt/csw/bdb46/docs/articles 0755 root bin
-d none /opt/csw/bdb46/docs/articles/inmemory 0755 root bin
-d none /opt/csw/bdb46/docs/articles/inmemory/C 0755 root bin
-f none /opt/csw/bdb46/docs/articles/inmemory/C/InMemoryDBApplication.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/articles/inmemory/C/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/articles/inmemory/C/index.html 0444 root bin
-d none /opt/csw/bdb46/docs/collections 0755 root bin
-d none /opt/csw/bdb46/docs/collections/tutorial 0755 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/BasicProgram.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/BerkeleyDB-Java-Collections.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/Entity.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/SerializableEntity.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/SerializedObjectStorage.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/Summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/Tuple.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/UsingCollectionsAPI.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/UsingSecondaries.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/UsingStoredCollections.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/addingdatabaseitems.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/collectionOverview.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/collectionswithentities.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/createbindingscollections.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/creatingentitybindings.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/developing.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/entitieswithcollections.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/handlingexceptions.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/implementingmain.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/indexedcollections.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/intro.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/moreinfo.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/openclasscatalog.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/opendatabases.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/opendbenvironment.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/openingforeignkeys.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/removingredundantvalueclasses.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/retrievingbyindexkey.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/retrievingdatabaseitems.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/sortedcollections.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/transientfieldsinbinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/tuple-serialentitybindings.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/tuplekeybindings.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/tupleswithkeycreators.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/tutorialintroduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/usingtransactions.html 0444 root bin
-d none /opt/csw/bdb46/docs/gsg 0755 root bin
-d none /opt/csw/bdb46/docs/gsg/C 0755 root bin
-f none /opt/csw/bdb46/docs/gsg/C/BerkeleyDB-Core-C-GSG.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/CoreCursorUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/CoreDBAdmin.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/CoreDbUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/CoreEnvUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/Cursors.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/DB.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/DBEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/DBOpenFlags.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/DbUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/DeleteEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/Positioning.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/PutEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/ReplacingEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/accessmethods.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/btree.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/concepts.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/coredbclose.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/coreindexusage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/cstructs.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/databaseLimits.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/dbErrorReporting.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/dbconfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/environments.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/gettingit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/indexes.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/joins.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/keyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/readSecondary.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/returns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/secondaryCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/secondaryDelete.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/usingDbt.html 0444 root bin
-d none /opt/csw/bdb46/docs/gsg/CXX 0755 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/BerkeleyDB-Core-Cxx-GSG.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/CoreCursorUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/CoreDBAdmin.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/CoreDbCXXUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/CoreEnvUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/Cursors.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/DB.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/DBEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/DBOpenFlags.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/DbCXXUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/DeleteEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/Positioning.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/PutEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/ReplacingEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/accessmethods.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/btree.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/concepts.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/coreExceptions.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/coredbclose.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/coreindexusage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/databaseLimits.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/dbErrorReporting.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/dbconfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/environments.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/gettingit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/indexes.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/joins.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/keyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/readSecondary.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/returns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/secondaryCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/secondaryDelete.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/usingDbt.html 0444 root bin
-d none /opt/csw/bdb46/docs/gsg/JAVA 0755 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/BerkeleyDB-Core-JAVA-GSG.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/CoreEnvUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/CoreJavaUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/Cursors.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/DB.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/DBAdmin.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/DBEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/DeleteEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/Positioning.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/PutEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/ReplacingEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/accessmethods.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/bindAPI.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/btree.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/concepts.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/coreExceptions.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/coredbclose.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/cursorJavaUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/databaseLimits.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/dbErrorReporting.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/db_config.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/dbconfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/dbtJavaUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/environments.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/gettingit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/indexes.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/javaindexusage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/joins.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/keyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/readSecondary.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/returns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/secondaryCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/secondaryDelete.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/secondaryProps.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/usingDbt.html 0444 root bin
-d none /opt/csw/bdb46/docs/gsg_db_rep 0755 root bin
-d none /opt/csw/bdb46/docs/gsg_db_rep/C 0755 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/Replication-C-GSG.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/addfeatures.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/apioverview.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/bulk.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/c2ctransfer.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/elections.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/electiontimes.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/exampledoloop.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/fmwrkconnectretry.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/fwrkmasterreplica.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/fwrkpermmessage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/manageblock.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/noautoinit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/permmessages.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/processingloop.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/repadvantage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/repapp.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/repmgr_init_example_c.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/simpleprogramlisting.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/txnapp.html 0444 root bin
-d none /opt/csw/bdb46/docs/gsg_db_rep/CXX 0755 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/Replication-CXX-GSG.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/addfeatures.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/apioverview.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/bulk.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/c2ctransfer.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/elections.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/electiontimes.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/exampledoloop.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/fmwrkconnectretry.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/fwrkmasterreplica.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/fwrkpermmessage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/manageblock.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/noautoinit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/permmessages.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/processingloop.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/repadvantage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/repapp.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/repmgr_init_example_c.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/simpleprogramlisting.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/txnapp.html 0444 root bin
-d none /opt/csw/bdb46/docs/gsg_db_rep/JAVA 0755 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/Replication-JAVA-GSG.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/addfeatures.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/apioverview.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/bulk.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/c2ctransfer.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/elections.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/electiontimes.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/exampledoloop.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/fmwrkconnectretry.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/fwrkmasterreplica.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/fwrkpermmessage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/manageblock.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/noautoinit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/permmessages.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/processingloop.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/repadvantage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/repapp.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/repmgr_init_example_c.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/simpleprogramlisting.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/txnapp.html 0444 root bin
-d none /opt/csw/bdb46/docs/gsg_txn 0755 root bin
-d none /opt/csw/bdb46/docs/gsg_txn/C 0755 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/BerkeleyDB-Core-C-Txn.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/abortresults.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/architectrecovery.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/autocommit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/backuprestore.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/blocking_deadlocks.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/deadlock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/enabletxn.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/envopen.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/filemanagement.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/hotfailover.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/inmem_txnexample_c.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/isolation.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/lockingsubsystem.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/logconfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/logfileremoval.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/maxtxns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/nestedtxn.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/perftune-intro.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/readblock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/readmodifywrite.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/recovery-intro.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/recovery.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/reversesplit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/rwlocks1.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/simplelock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/txn_ccursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/txnconcurrency.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/txncursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/txnexample_c.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/txnindices.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/txnnowait.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/usingtxns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/wrapup.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/writeblock.jpg 0444 root bin
-d none /opt/csw/bdb46/docs/gsg_txn/CXX 0755 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/BerkeleyDB-Core-Cxx-Txn.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/abortresults.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/architectrecovery.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/autocommit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/backuprestore.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/blocking_deadlocks.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/deadlock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/enabletxn.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/envopen.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/filemanagement.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/hotfailover.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/inmem_txnexample_c.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/isolation.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/lockingsubsystem.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/logconfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/logfileremoval.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/maxtxns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/nestedtxn.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/perftune-intro.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/readblock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/readmodifywrite.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/recovery-intro.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/recovery.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/reversesplit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/rwlocks1.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/simplelock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/txn_ccursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/txnconcurrency.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/txncursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/txnexample_c.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/txnindices.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/txnnowait.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/usingtxns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/wrapup.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/writeblock.jpg 0444 root bin
-d none /opt/csw/bdb46/docs/gsg_txn/JAVA 0755 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/BerkeleyDB-Core-JAVA-Txn.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/abortresults.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/architectrecovery.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/autocommit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/backuprestore.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/blocking_deadlocks.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/deadlock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/enabletxn.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/envopen.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/filemanagement.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/hotfailover.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/inmem_txnexample_java.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/isolation.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/lockingsubsystem.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/logconfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/logfileremoval.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/maxtxns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/nestedtxn.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/perftune-intro.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/readblock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/readmodifywrite.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/recovery-intro.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/recovery.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/reversesplit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/rwlocks1.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/simplelock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/txn_ccursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/txnconcurrency.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/txncursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/txnexample_java.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/txnindices.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/txnnowait.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/usingtxns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/wrapup.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/writeblock.jpg 0444 root bin
-d none /opt/csw/bdb46/docs/images 0755 root bin
-f none /opt/csw/bdb46/docs/images/api.gif 0444 root bin
-f none /opt/csw/bdb46/docs/images/next.gif 0444 root bin
-f none /opt/csw/bdb46/docs/images/prev.gif 0444 root bin
-f none /opt/csw/bdb46/docs/images/ps.gif 0444 root bin
-f none /opt/csw/bdb46/docs/images/ref.gif 0444 root bin
-f none /opt/csw/bdb46/docs/index.html 0444 root bin
-d none /opt/csw/bdb46/docs/java 0755 root bin
-f none /opt/csw/bdb46/docs/java/allclasses-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/allclasses-noframe.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com 0755 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat 0755 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/bind 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/ByteArrayBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/EntityBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/EntryBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/RecordNumberBinding.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/bind/class-use 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/class-use/ByteArrayBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/class-use/EntityBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/class-use/EntryBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/class-use/RecordNumberBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/package-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/package-summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/package-tree.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/package-use.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/ClassCatalog.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/SerialBase.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/SerialBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/SerialInput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/SerialOutput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/SerialSerialBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/SerialSerialKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/StoredClassCatalog.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/TupleSerialBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/TupleSerialKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/ClassCatalog.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/SerialBase.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/SerialBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/SerialInput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/SerialOutput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/SerialSerialBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/SerialSerialKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/StoredClassCatalog.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialMarshalledBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialMarshalledKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/package-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/package-summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/package-tree.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/package-use.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/BigIntegerBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/BooleanBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/ByteBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/CharacterBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/DoubleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/FloatBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/IntegerBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/LongBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/MarshalledTupleEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/ShortBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/SortedDoubleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/SortedFloatBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/StringBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleBase.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleInput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleInputBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleMarshalledBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleOutput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleTupleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleTupleKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/BigIntegerBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/BooleanBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/ByteBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/CharacterBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/DoubleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/FloatBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/IntegerBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/LongBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/MarshalledTupleEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/MarshalledTupleKeyEntity.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/ShortBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/SortedDoubleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/SortedFloatBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/StringBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleBase.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleInput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleInputBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleMarshalledBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleOutput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleMarshalledBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleMarshalledKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/package-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/package-summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/package-tree.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/package-use.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/collections 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/CurrentTransaction.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/MapEntryParameter.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/PrimaryKeyAssigner.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredCollection.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredCollections.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredContainer.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredEntrySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredIterator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredKeySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredList.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredMap.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredSortedEntrySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredSortedKeySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredSortedMap.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredSortedValueSet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredValueSet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/TransactionRunner.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/TransactionWorker.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/TupleSerialFactory.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/CurrentTransaction.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/MapEntryParameter.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/PrimaryKeyAssigner.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredCollection.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredCollections.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredContainer.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredEntrySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredIterator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredKeySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredList.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredMap.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredSortedEntrySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredSortedKeySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredSortedMap.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredSortedValueSet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredValueSet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/TransactionRunner.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/TransactionWorker.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/TupleSerialFactory.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/package-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/package-summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/package-tree.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/package-use.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/db 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/BtreePrefixCalculator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/BtreeStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CacheFile.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CacheFilePriority.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CacheFileStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CacheStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CheckpointConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CompactConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CompactStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/Cursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CursorConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/Database.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/DatabaseConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/DatabaseEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/DatabaseException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/DatabaseStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/DatabaseType.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/DeadlockException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/Environment.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/EnvironmentConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ErrorHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/EventHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/EventHandlerAdapter.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/FeedbackHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/HashStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/Hasher.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/JoinConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/JoinCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/KeyRange.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/Lock.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LockDetectMode.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LockMode.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LockNotGrantedException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LockOperation.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LockRequest.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LockRequestMode.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LockStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LogCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LogRecordHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LogSequenceNumber.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LogStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MemoryException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MessageHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MultipleDataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MultipleEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MultipleKeyDataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MultipleKeyNIODataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MultipleNIODataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MultipleRecnoDataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MultipleRecnoNIODataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MutexStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/OperationStatus.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/PanicHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/PreparedTransaction.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/QueueStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/RecordNumberAppender.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/RecoveryOperation.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationDuplicateMasterException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationHandleDeadException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationHoldElectionException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationHostAddress.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationJoinFailureException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationLeaseExpiredException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationLeaseTimeoutException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationLockoutException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationManagerAckPolicy.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationManagerStartPolicy.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationManagerStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationSiteUnavailableException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationStatus.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationTimeoutType.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationTransport.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/RunRecoveryException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/SecondaryConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/SecondaryCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/SecondaryDatabase.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/SecondaryKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/SecondaryMultiKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/Sequence.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/SequenceConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/SequenceStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/StatsConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/Transaction.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/TransactionConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/TransactionStats.Active.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/TransactionStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/VerboseConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/VerifyConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/VersionMismatchException.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/BtreePrefixCalculator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/BtreeStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CacheFile.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CacheFilePriority.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CacheFileStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CacheStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CheckpointConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CompactConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CompactStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/Cursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CursorConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/Database.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/DatabaseConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/DatabaseEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/DatabaseException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/DatabaseStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/DatabaseType.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/DeadlockException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/Environment.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/EnvironmentConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ErrorHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/EventHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/EventHandlerAdapter.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/FeedbackHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/HashStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/Hasher.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/JoinConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/JoinCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/KeyRange.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/Lock.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LockDetectMode.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LockMode.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LockNotGrantedException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LockOperation.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LockRequest.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LockRequestMode.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LockStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LogCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LogRecordHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LogSequenceNumber.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LogStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MemoryException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MessageHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MultipleDataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MultipleEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MultipleKeyDataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MultipleKeyNIODataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MultipleNIODataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MultipleRecnoDataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MultipleRecnoNIODataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MutexStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/OperationStatus.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/PanicHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/PreparedTransaction.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/QueueStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/RecordNumberAppender.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/RecoveryOperation.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationDuplicateMasterException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationHandleDeadException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationHoldElectionException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationHostAddress.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationJoinFailureException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationLeaseExpiredException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationLeaseTimeoutException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationLockoutException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationManagerAckPolicy.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationManagerStartPolicy.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationManagerStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationSiteUnavailableException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationStatus.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationTimeoutType.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationTransport.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/RunRecoveryException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/SecondaryConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/SecondaryCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/SecondaryDatabase.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/SecondaryKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/SecondaryMultiKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/Sequence.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/SequenceConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/SequenceStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/StatsConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/Transaction.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/TransactionConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/TransactionStats.Active.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/TransactionStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/VerboseConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/VerifyConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/VersionMismatchException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/package-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/package-summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/package-tree.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/package-use.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/util 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/ExceptionUnwrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/ExceptionWrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/FastInputStream.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/FastOutputStream.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/IOExceptionWrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/PackedInteger.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/RuntimeExceptionWrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/UtfOps.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/ExceptionUnwrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/ExceptionWrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/FastInputStream.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/FastOutputStream.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/IOExceptionWrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/PackedInteger.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/RuntimeExceptionWrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/UtfOps.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/package-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/package-summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/package-tree.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/package-use.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/constant-values.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/deprecated-list.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/help-doc.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/index-all.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/overview-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/overview-summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/overview-tree.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/package-list 0444 root bin
-d none /opt/csw/bdb46/docs/java/resources 0755 root bin
-f none /opt/csw/bdb46/docs/java/resources/inherit.gif 0444 root bin
-f none /opt/csw/bdb46/docs/java/serialized-form.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/style.css 0444 root bin
-d none /opt/csw/bdb46/docs/license 0755 root bin
-f none /opt/csw/bdb46/docs/license/license_db.html 0444 root bin
-d none /opt/csw/bdb46/docs/ref 0755 root bin
-d none /opt/csw/bdb46/docs/ref/am 0755 root bin
-f none /opt/csw/bdb46/docs/ref/am/close.html 0444 root bin
-f none /opt/csw/bdb46/docs/ref/am/count.html 0444 root bin
-f none /opt/csw/bdb46/docs/ref/am/curclose.html 0444 root bin

@@ Diff output truncated at 100000 characters. @@

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

From valholla at users.sourceforge.net  Tue May 26 20:36:09 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 18:36:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[5064]
 csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.4. 16-ntlm.diff
Message-ID: 

Revision: 5064
          http://gar.svn.sourceforge.net/gar/?rev=5064&view=rev
Author:   valholla
Date:     2009-05-26 18:36:09 +0000 (Tue, 26 May 2009)

Log Message:
-----------
patch for 2.4.16

Added Paths:
-----------
    csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.4.16-ntlm.diff

Added: csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.4.16-ntlm.diff
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.4.16-ntlm.diff	                        (rev 0)
+++ csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.4.16-ntlm.diff	2009-05-26 18:36:09 UTC (rev 5064)
@@ -0,0 +1,188 @@
+--- openldap-2.4.16/include/ldap.h.o	2009-05-26 13:22:52.647989500 -0500
++++ openldap-2.4.16/include/ldap.h	2009-05-26 13:25:07.020609500 -0500
+@@ -2478,5 +2478,25 @@
+ 	LDAPControl	**ctrls,
+ 	LDAPDerefRes	**drp ));
+ 
++/*
++ * hacks for NTLM
++ */
++#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
++#define LDAP_AUTH_NTLM_RESPONSE    ((ber_tag_t) 0x8bU)
++LDAP_F( int )
++ldap_ntlm_bind LDAP_P((
++   LDAP        *ld,
++   LDAP_CONST char *dn,
++   ber_tag_t   tag,
++   struct berval   *cred,
++   LDAPControl **sctrls,
++   LDAPControl **cctrls,
++   int     *msgidp ));
++LDAP_F( int )
++ldap_parse_ntlm_bind_result LDAP_P((
++   LDAP        *ld,
++   LDAPMessage *res,
++   struct berval   *challenge));
++
+ LDAP_END_DECL
+ #endif /* _LDAP_H */
+--- openldap-2.4.16/libraries/libldap/Makefile.in.o	2009-05-26 13:25:25.012445100 -0500
++++ openldap-2.4.16/libraries/libldap/Makefile.in	2009-05-26 13:26:22.377603200 -0500
+@@ -20,7 +20,7 @@
+ SRCS	= bind.c open.c result.c error.c compare.c search.c \
+ 	controls.c messages.c references.c extended.c cyrus.c \
+ 	modify.c add.c modrdn.c delete.c abandon.c \
+-	sasl.c gssapi.c sbind.c unbind.c cancel.c  \
++	sasl.c ntlm.c gssapi.c sbind.c unbind.c cancel.c  \
+ 	filter.c free.c sort.c passwd.c whoami.c \
+ 	getdn.c getentry.c getattr.c getvalues.c addentry.c \
+ 	request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \
+@@ -33,7 +33,7 @@
+ OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
+ 	controls.lo messages.lo references.lo extended.lo cyrus.lo \
+ 	modify.lo add.lo modrdn.lo delete.lo abandon.lo \
+-	sasl.lo gssapi.lo sbind.lo unbind.lo cancel.lo \
++	sasl.lo ntlm.lo gssapi.lo sbind.lo unbind.lo cancel.lo \
+ 	filter.lo free.lo sort.lo passwd.lo whoami.lo \
+ 	getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
+ 	request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
+--- /dev/null	2009-05-26 13:31:57.000000000 -0500
++++ openldap-2.4.16/libraries/libldap/ntlm.c	2009-05-26 13:28:07.845816300 -0500
+@@ -0,0 +1,137 @@
++/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
++/*
++ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
++ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
++ */
++
++/* Mostly copied from sasl.c */
++
++#include "portable.h"
++
++#include 
++#include 
++
++#include 
++#include 
++#include 
++#include 
++
++#include "ldap-int.h"
++
++int
++ldap_ntlm_bind(
++       LDAP            *ld,
++       LDAP_CONST char *dn,
++       ber_tag_t       tag,
++       struct berval   *cred,
++       LDAPControl     **sctrls,
++       LDAPControl     **cctrls,
++       int             *msgidp )
++{
++       BerElement      *ber;
++       int rc;
++       ber_int_t id;
++
++       Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
++
++       assert( ld != NULL );
++       assert( LDAP_VALID( ld ) );
++       assert( msgidp != NULL );
++
++       if( msgidp == NULL ) {
++               ld->ld_errno = LDAP_PARAM_ERROR;
++               return ld->ld_errno;
++       }
++
++       /* create a message to send */
++       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
++               ld->ld_errno = LDAP_NO_MEMORY;
++               return ld->ld_errno;
++       }
++
++       assert( LBER_VALID( ber ) );
++
++       LDAP_NEXT_MSGID( ld, id );
++       rc = ber_printf( ber, "{it{istON}" /*}*/,
++                        id, LDAP_REQ_BIND,
++                        ld->ld_version, dn, tag,
++                        cred );
++
++       /* Put Server Controls */
++       if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
++               ber_free( ber, 1 );
++               return ld->ld_errno;
++       }
++
++       if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
++               ld->ld_errno = LDAP_ENCODING_ERROR;
++               ber_free( ber, 1 );
++               return ld->ld_errno;
++       }
++
++       /* send the message */
++       *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
++
++       if(*msgidp < 0)
++               return ld->ld_errno;
++
++       return LDAP_SUCCESS;
++}
++
++int
++ldap_parse_ntlm_bind_result(
++       LDAP            *ld,
++       LDAPMessage     *res,
++       struct berval   *challenge)
++{
++       ber_int_t       errcode;
++       ber_tag_t       tag;
++       BerElement      *ber;
++       ber_len_t       len;
++
++       Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
++
++       assert( ld != NULL );
++       assert( LDAP_VALID( ld ) );
++       assert( res != NULL );
++
++       if ( ld == NULL || res == NULL ) {
++               return LDAP_PARAM_ERROR;
++       }
++
++       if( res->lm_msgtype != LDAP_RES_BIND ) {
++               ld->ld_errno = LDAP_PARAM_ERROR;
++               return ld->ld_errno;
++       }
++
++       if ( ld->ld_error ) {
++               LDAP_FREE( ld->ld_error );
++               ld->ld_error = NULL;
++       }
++       if ( ld->ld_matched ) {
++               LDAP_FREE( ld->ld_matched );
++               ld->ld_matched = NULL;
++       }
++
++       /* parse results */
++
++       ber = ber_dup( res->lm_ber );
++
++       if( ber == NULL ) {
++               ld->ld_errno = LDAP_NO_MEMORY;
++               return ld->ld_errno;
++       }
++
++       tag = ber_scanf( ber, "{ioa" /*}*/,
++                        &errcode, challenge, &ld->ld_error );
++       ber_free( ber, 0 );
++
++       if( tag == LBER_ERROR ) {
++               ld->ld_errno = LDAP_DECODING_ERROR;
++               return ld->ld_errno;
++       }
++
++       ld->ld_errno = errcode;
++
++       return( ld->ld_errno );
++}


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

From wbonnet at users.sourceforge.net  Tue May 26 21:56:55 2009
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Tue, 26 May 2009 19:56:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[5065] csw/mgar/pkg/pixman/trunk
Message-ID: 

Revision: 5065
          http://gar.svn.sourceforge.net/gar/?rev=5065&view=rev
Author:   wbonnet
Date:     2009-05-26 19:56:55 +0000 (Tue, 26 May 2009)

Log Message:
-----------
Upgrade to 0.15.6

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

Modified: csw/mgar/pkg/pixman/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pixman/trunk/Makefile	2009-05-26 18:36:09 UTC (rev 5064)
+++ csw/mgar/pkg/pixman/trunk/Makefile	2009-05-26 19:56:55 UTC (rev 5065)
@@ -1,5 +1,5 @@
 GARNAME      = pixman
-GARVERSION   = 0.15.2
+GARVERSION   = 0.15.6
 CATEGORIES   = lib
 
 DESCRIPTION = The pixel-manipulation library for X and cairo

Modified: csw/mgar/pkg/pixman/trunk/checksums
===================================================================
--- csw/mgar/pkg/pixman/trunk/checksums	2009-05-26 18:36:09 UTC (rev 5064)
+++ csw/mgar/pkg/pixman/trunk/checksums	2009-05-26 19:56:55 UTC (rev 5065)
@@ -1,3 +1 @@
-09e58b9e029eb63c896ad2ff70fc7915  download/CSWpixman.gspec
-89d81c718f669974964dd9c62217c191  download/license.txt
-ac7d687548f02b384d0cab1021d91ce5  download/pixman-0.15.2.tar.gz
+fe922698df46b21d7e19f28ded4ca100  download/pixman-0.15.6.tar.gz


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

From dmichelsen at users.sourceforge.net  Tue May 26 22:05:39 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 26 May 2009 20:05:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[5066] csw/mgar/pkg/openldap/trunk
Message-ID: 

Revision: 5066
          http://gar.svn.sourceforge.net/gar/?rev=5066&view=rev
Author:   dmichelsen
Date:     2009-05-26 20:05:35 +0000 (Tue, 26 May 2009)

Log Message:
-----------
openldap: Move to dynamic gspec, update to 2.4.16

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

Removed Paths:
-------------
    csw/mgar/pkg/openldap/trunk/files/CSWoldap.depend
    csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.depend
    csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.gspec
    csw/mgar/pkg/openldap/trunk/files/CSWoldapdevel.depend
    csw/mgar/pkg/openldap/trunk/files/CSWoldaprt.depend
    csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.3.24-ntlm.diff

Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,5 +1,5 @@
 GARNAME = openldap
-GARVERSION = 2.3.40
+GARVERSION = 2.4.16
 CATEGORIES = server
 
 DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol
@@ -13,23 +13,40 @@
 
 MASTER_SITES = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tgz
-DISTFILES += $(call admfiles,CSWoldap,depend)
+DISTFILES += $(call admfiles,CSWoldap)
 DISTFILES += cswopenldap openldap.xml svc-openldap
-DISTFILES += $(call admfiles,CSWoldapclient,depend)
-DISTFILES += $(call admfiles,CSWoldapdevel,depend)
-DISTFILES += $(call admfiles,CSWoldaprt,depend)
 DISTFILES += README.CSW openldaprc
 
+LICENSE = COPYRIGHT
+
+PACKAGES = CSWoldap CSWoldapclient CSWoldapdevel CSWoldaprt
+
+CATALOGNAME_CSWoldapclient = openldap_client
+CATALOGNAME_CSWoldapdevel  = openldap_devel
+CATALOGNAME_CSWoldaprt     = openldap_rt
+
+SPKG_DESC_CSWoldapclient = OpenLDAP client executables
+SPKG_DESC_CSWoldapdevel  = OpenLDAP development support
+SPKG_DESC_CSWoldaprt     = OpenLDAP runtime libraries
+
+REQUIRED_PKGS_CSWoldap       = CSWbdb4 CSWiconv CSWlibnet CSWlibtoolrt CSWoldaprt
+REQUIRED_PKGS_CSWoldap      += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc
+REQUIRED_PKGS_CSWoldapclient = CSWlibnet CSWoldaprt CSWosslrt CSWsasl
+REQUIRED_PKGS_CSWoldapdevel  = CSWoldaprt
+REQUIRED_PKGS_CSWoldaprt     = CSWlibnet CSWosslrt CSWsasl
+
+SPKG_SOURCEURL = http://www.openldap.org
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-PATCHFILES = patch-oldap-2.3.24-ntlm.diff
+PATCHFILES = patch-oldap-2.4.16-ntlm.diff
 DISTFILES += $(PATCHFILES)
 
 EXTRA_DOCS = README.CSW openldaprc $(PATCHFILES)
 
-EXTRA_LIB = $(prefix)/bdb4/lib 
-EXTRA_INC = $(prefix)/bdb4/include
+EXTRA_LIB = $(prefix)/bdb44/lib 
+EXTRA_INC = $(prefix)/bdb44/include
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
@@ -50,8 +67,11 @@
 PKGFILES_CSWoldaprt += $(sysconfdir)/ldap.conf
 PKGFILES_CSWoldaprt += $(mandir)/man5/ldap.conf.5
 
-include ../category.mk
+include gar/category.mk
 
+CFLAGS := $(filter-out -I%,$(CFLAGS))
+DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS))
+
 INSTALL_SCRIPTS += custom
 
 install-custom:

Modified: csw/mgar/pkg/openldap/trunk/checksums
===================================================================
--- csw/mgar/pkg/openldap/trunk/checksums	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/checksums	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,19 +1,8 @@
-728e95d806a3d47d9686481d72e62072  download/openldap-2.3.40.tgz
 2f6e6a8c9c3497f1c0c9d52ea2d1dafa  download/CSWoldap.gspec
-059b2c7ae6d2f181e9098a8afc852ce4  download/CSWoldap.depend
-bebf1c2805dfe126938a9631f9d7947f  download/CSWoldap.prototype
+892dba5f625755be024c30ea0055fd55  download/README.CSW
 d7e13ba31a8de786f7cdbe3d529a9728  download/cswopenldap
+ed5b86e9d2b372d10edfe3bb59fee165  download/openldap-2.4.16.tgz
 0e57547ad2b5fedca9f0bd4beaddfe39  download/openldap.xml
-e15c2020566e56f02118e75c89111f15  download/svc-openldap
-5eb9a4b33ac44dd218d508e17f827461  download/CSWoldapclient.gspec
-ff1e9fbbaf7b56927e297226ed429b0f  download/CSWoldapclient.depend
-14406b97a0e1587071f8598132f64bab  download/CSWoldapclient.prototype
-16a7768e2473edbbb3bdff1c64835f1c  download/CSWoldapdevel.gspec
-6d30b718d20705441b89353dae9e64b4  download/CSWoldapdevel.depend
-aa020153cf5ecfc19252d45e89708eda  download/CSWoldapdevel.prototype
-0cc22644bd37d23564afb7fba580d607  download/CSWoldaprt.gspec
-85d952cebd7d6cc954c08f8b446815ba  download/CSWoldaprt.depend
-755aef96cb0ab523b49e83504d37c107  download/CSWoldaprt.prototype
-892dba5f625755be024c30ea0055fd55  download/README.CSW
 ab2ac7519b092ce8d16124c5270bfec0  download/openldaprc
-2d8b0286819ffcb41761a6fdd735c5ae  download/patch-oldap-2.3.24-ntlm.diff
+d3dee9018137c39f357859b652e3a67c  download/patch-oldap-2.4.16-ntlm.diff
+e15c2020566e56f02118e75c89111f15  download/svc-openldap

Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldap.depend
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldap.depend	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldap.depend	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,9 +0,0 @@
-P CSWbdb4     berkeleydb4 - Embedded database libraries and utilities
-P CSWiconv    libiconv - GNU iconv library
-P CSWlibnet   libnet - the libnet packet construction library
-P CSWlibtool  libtool - Generic library support script
-P CSWoldaprt  openldap_rt - OpenLDAP runtime libraries (oldaprt)
-P CSWossl     openssl - Openssl meta package
-P CSWsasl     sasl - Simple Authentication and Security Layer
-P CSWtcpwrap  tcpwrappers - (ipv6.4 patched) lib and tools for pre-screening tcp connections
-P CSWunixodbc unixodbc - ODBC access to data sources

Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.depend
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.depend	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.depend	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,4 +0,0 @@
-P CSWlibnet  libnet - the libnet packet construction library
-P CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt)
-P CSWosslrt  openssl_rt - Openssl runtime libraries
-P CSWsasl    sasl - Simple Authentication and Security Layer

Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.gspec
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.gspec	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.gspec	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,5 +0,0 @@
-%var            bitname openldap_client
-%var            pkgname CSWoldapclient
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%var		desc OpenLDAP client executables (oldapclient)
-%copyright      url file://%{WORKSRC}/COPYRIGHT

Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldapdevel.depend
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldapdevel.depend	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldapdevel.depend	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1 +0,0 @@
-P CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt)

Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldaprt.depend
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldaprt.depend	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldaprt.depend	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,3 +0,0 @@
-P CSWlibnet libnet - the libnet packet construction library
-P CSWosslrt openssl_rt - Openssl runtime libraries
-P CSWsasl   sasl - Simple Authentication and Security Layer

Deleted: csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.3.24-ntlm.diff
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.3.24-ntlm.diff	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.3.24-ntlm.diff	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,199 +0,0 @@
-(Note that this patch is not useful on its own... it just adds some
-hooks to work with the LDAP authentication process at a lower level
-than the API otherwise allows. The code that calls these hooks and
-actually drives the NTLM authentication process is in
-lib/e2k-global-catalog.c, and the code that actually implements the
-NTLM algorithms is in xntlm/.)
-
-This is a patch against OpenLDAP 2.3.20. Apply with -p0
-
-
---- ./include/ldap.h~	2006-02-15 16:32:17.000000000 -0500
-+++ ./include/ldap.h	2006-03-08 20:29:49.092866000 -0500
-@@ -2115,5 +2115,26 @@
- ldap_passwordpolicy_err2txt LDAP_P(( LDAPPasswordPolicyError ));
- #endif /* LDAP_CONTROL_PASSWORDPOLICYREQUEST */
- 
-+/*
-+ * hacks for NTLM
-+ */
-+#define LDAP_AUTH_NTLM_REQUEST	((ber_tag_t) 0x8aU)
-+#define LDAP_AUTH_NTLM_RESPONSE	((ber_tag_t) 0x8bU)
-+LDAP_F( int )
-+ldap_ntlm_bind LDAP_P((
-+	LDAP		*ld,
-+	LDAP_CONST char	*dn,
-+	ber_tag_t	tag,
-+	struct berval	*cred,
-+	LDAPControl	**sctrls,
-+	LDAPControl	**cctrls,
-+	int		*msgidp ));
-+LDAP_F( int )
-+ldap_parse_ntlm_bind_result LDAP_P((
-+	LDAP		*ld,
-+	LDAPMessage	*res,
-+	struct berval	*challenge));
-+
-+
- LDAP_END_DECL
- #endif /* _LDAP_H */
---- ./libraries/libldap/Makefile.in~	2006-01-03 17:16:08.000000000 -0500
-+++ ./libraries/libldap/Makefile.in	2006-03-08 20:29:49.177284000 -0500
-@@ -20,7 +20,7 @@
- SRCS	= bind.c open.c result.c error.c compare.c search.c \
- 	controls.c messages.c references.c extended.c cyrus.c \
- 	modify.c add.c modrdn.c delete.c abandon.c \
--	sasl.c sbind.c kbind.c unbind.c cancel.c  \
-+	sasl.c ntlm.c sbind.c kbind.c unbind.c cancel.c  \
- 	filter.c free.c sort.c passwd.c whoami.c \
- 	getdn.c getentry.c getattr.c getvalues.c addentry.c \
- 	request.c os-ip.c url.c sortctrl.c vlvctrl.c \
-@@ -31,7 +31,7 @@
- OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
- 	controls.lo messages.lo references.lo extended.lo cyrus.lo \
- 	modify.lo add.lo modrdn.lo delete.lo abandon.lo \
--	sasl.lo sbind.lo kbind.lo unbind.lo cancel.lo \
-+	sasl.lo ntlm.lo sbind.lo kbind.lo unbind.lo cancel.lo \
- 	filter.lo free.lo sort.lo passwd.lo whoami.lo \
- 	getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
- 	request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \
---- /dev/null   2004-06-30 15:04:37.000000000 -0400
-+++ ./libraries/libldap/ntlm.c    2004-07-14 13:44:18.000000000 -0400
-@@ -0,0 +1,137 @@
-+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
-+/*
-+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+ */
-+
-+/* Mostly copied from sasl.c */
-+
-+#include "portable.h"
-+
-+#include 
-+#include 
-+
-+#include 
-+#include 
-+#include 
-+#include 
-+
-+#include "ldap-int.h"
-+
-+int
-+ldap_ntlm_bind(
-+       LDAP            *ld,
-+       LDAP_CONST char *dn,
-+       ber_tag_t       tag,
-+       struct berval   *cred,
-+       LDAPControl     **sctrls,
-+       LDAPControl     **cctrls,
-+       int             *msgidp )
-+{
-+       BerElement      *ber;
-+       int rc;
-+       ber_int_t id;
-+
-+       Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+
-+       assert( ld != NULL );
-+       assert( LDAP_VALID( ld ) );
-+       assert( msgidp != NULL );
-+
-+       if( msgidp == NULL ) {
-+               ld->ld_errno = LDAP_PARAM_ERROR;
-+               return ld->ld_errno;
-+       }
-+
-+       /* create a message to send */
-+       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+               ld->ld_errno = LDAP_NO_MEMORY;
-+               return ld->ld_errno;
-+       }
-+
-+       assert( LBER_VALID( ber ) );
-+
-+       LDAP_NEXT_MSGID( ld, id );
-+       rc = ber_printf( ber, "{it{istON}" /*}*/,
-+                        id, LDAP_REQ_BIND,
-+                        ld->ld_version, dn, tag,
-+                        cred );
-+
-+       /* Put Server Controls */
-+       if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+               ber_free( ber, 1 );
-+               return ld->ld_errno;
-+       }
-+
-+       if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+               ld->ld_errno = LDAP_ENCODING_ERROR;
-+               ber_free( ber, 1 );
-+               return ld->ld_errno;
-+       }
-+
-+       /* send the message */
-+       *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
-+
-+       if(*msgidp < 0)
-+               return ld->ld_errno;
-+
-+       return LDAP_SUCCESS;
-+}
-+
-+int
-+ldap_parse_ntlm_bind_result(
-+       LDAP            *ld,
-+       LDAPMessage     *res,
-+       struct berval   *challenge)
-+{
-+       ber_int_t       errcode;
-+       ber_tag_t       tag;
-+       BerElement      *ber;
-+       ber_len_t       len;
-+
-+       Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+
-+       assert( ld != NULL );
-+       assert( LDAP_VALID( ld ) );
-+       assert( res != NULL );
-+
-+       if ( ld == NULL || res == NULL ) {
-+               return LDAP_PARAM_ERROR;
-+       }
-+
-+       if( res->lm_msgtype != LDAP_RES_BIND ) {
-+               ld->ld_errno = LDAP_PARAM_ERROR;
-+               return ld->ld_errno;
-+       }
-+
-+       if ( ld->ld_error ) {
-+               LDAP_FREE( ld->ld_error );
-+               ld->ld_error = NULL;
-+       }
-+       if ( ld->ld_matched ) {
-+               LDAP_FREE( ld->ld_matched );
-+               ld->ld_matched = NULL;
-+       }
-+
-+       /* parse results */
-+
-+       ber = ber_dup( res->lm_ber );
-+
-+       if( ber == NULL ) {
-+               ld->ld_errno = LDAP_NO_MEMORY;
-+               return ld->ld_errno;
-+       }
-+
-+       tag = ber_scanf( ber, "{ioa" /*}*/,
-+                        &errcode, challenge, &ld->ld_error );
-+       ber_free( ber, 0 );
-+
-+       if( tag == LBER_ERROR ) {
-+               ld->ld_errno = LDAP_DECODING_ERROR;
-+               return ld->ld_errno;
-+       }
-+
-+       ld->ld_errno = errcode;
-+
-+       return( ld->ld_errno );
-+}


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

From dmichelsen at users.sourceforge.net  Wed May 27 13:53:04 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 27 May 2009 11:53:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[5067] csw/mgar/pkg/bdb47/trunk
Message-ID: 

Revision: 5067
          http://gar.svn.sourceforge.net/gar/?rev=5067&view=rev
Author:   dmichelsen
Date:     2009-05-27 11:53:04 +0000 (Wed, 27 May 2009)

Log Message:
-----------
bdb47: Add patches

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

Added Paths:
-----------
    csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1
    csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2
    csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3
    csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4

Modified: csw/mgar/pkg/bdb47/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb47/trunk/Makefile	2009-05-26 20:05:35 UTC (rev 5066)
+++ csw/mgar/pkg/bdb47/trunk/Makefile	2009-05-27 11:53:04 UTC (rev 5067)
@@ -23,10 +23,9 @@
 
 WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix
 
-# No patches for the 4.7 series... yet.
-#PATCHDIR = $(WORKSRC)/..
-#PATCHDIRLEVEL = 0
-#PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*.diff))
+PATCHDIR = $(WORKSRC)/..
+PATCHDIRLEVEL = 0
+PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*))
 
 BUILD64 = 1
 CONFIGURE_SCRIPTS = dist

Modified: csw/mgar/pkg/bdb47/trunk/checksums
===================================================================
--- csw/mgar/pkg/bdb47/trunk/checksums	2009-05-26 20:05:35 UTC (rev 5066)
+++ csw/mgar/pkg/bdb47/trunk/checksums	2009-05-27 11:53:04 UTC (rev 5067)
@@ -1 +1,5 @@
 ec2b87e833779681a0c3a814aa71359e  download/db-4.7.25.tar.gz
+5fdf101259e5164dea1c8c86214fde38  download/patch.4.7.25.1
+bd410a11c71fee52fddb6aa2d8d4f80c  download/patch.4.7.25.2
+6fcd69f64f5b34bfe8f0a63cc2e402c1  download/patch.4.7.25.3
+42c5d1a727e4a7f59b9dce12ff2f6b84  download/patch.4.7.25.4

Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1
===================================================================
--- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1	                        (rev 0)
+++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1	2009-05-27 11:53:04 UTC (rev 5067)
@@ -0,0 +1,75 @@
+*** sequence/sequence.c.orig	2008-05-05 13:25:09.000000000 -0700
+--- sequence/sequence.c	2008-08-15 09:58:46.000000000 -0700
+***************
+*** 187,193 ****
+  	if ((ret = __db_get_flags(dbp, &tflags)) != 0)
+  		goto err;
+  
+! 	if (DB_IS_READONLY(dbp)) {
+  		ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open");
+  		goto err;
+  	}
+--- 187,197 ----
+  	if ((ret = __db_get_flags(dbp, &tflags)) != 0)
+  		goto err;
+  
+! 	/*
+! 	 * We can let replication clients open sequences, but must
+! 	 * check later that they do not update them.
+! 	 */
+! 	if (F_ISSET(dbp, DB_AM_RDONLY)) {
+  		ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open");
+  		goto err;
+  	}
+***************
+*** 244,249 ****
+--- 248,258 ----
+  		if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) ||
+  		    !LF_ISSET(DB_CREATE))
+  			goto err;
++ 		if (IS_REP_CLIENT(env) &&
++ 		    !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
++ 			ret = __db_rdonly(env, "DB_SEQUENCE->open");
++ 			goto err;
++ 		}
+  		ret = 0;
+  
+  		rp = &seq->seq_record;
+***************
+*** 296,302 ****
+  	 */
+  	rp = seq->seq_data.data;
+  	if (rp->seq_version == DB_SEQUENCE_OLDVER) {
+! oldver:		rp->seq_version = DB_SEQUENCE_VERSION;
+  		if (!F_ISSET(env, ENV_LITTLEENDIAN)) {
+  			if (IS_DB_AUTO_COMMIT(dbp, txn)) {
+  				if ((ret =
+--- 305,316 ----
+  	 */
+  	rp = seq->seq_data.data;
+  	if (rp->seq_version == DB_SEQUENCE_OLDVER) {
+! oldver:		if (IS_REP_CLIENT(env) &&
+! 		    !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
+! 			ret = __db_rdonly(env, "DB_SEQUENCE->open");
+! 			goto err;
+! 		}
+! 		rp->seq_version = DB_SEQUENCE_VERSION;
+  		if (!F_ISSET(env, ENV_LITTLEENDIAN)) {
+  			if (IS_DB_AUTO_COMMIT(dbp, txn)) {
+  				if ((ret =
+***************
+*** 707,712 ****
+--- 721,733 ----
+  
+  	MUTEX_LOCK(env, seq->mtx_seq);
+  
++ 	if (handle_check && IS_REP_CLIENT(env) &&
++ 	    !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
++ 		ret = __db_rdonly(env, "DB_SEQUENCE->get");
++ 		goto err;
++ 	}
++ 
++ 
+  	if (rp->seq_min + delta > rp->seq_max) {
+  		__db_errx(env, "Sequence overflow");
+  		ret = EINVAL;

Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2
===================================================================
--- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2	                        (rev 0)
+++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2	2009-05-27 11:53:04 UTC (rev 5067)
@@ -0,0 +1,71 @@
+Index: lock/lock.c
+===================================================================
+RCS file: /a/CVSROOT/db/lock/lock.c,v
+retrieving revision 12.61
+diff -c -r12.61 lock.c
+*** lock/lock.c	22 Jul 2008 12:08:53 -0000	12.61
+--- lock/lock.c	19 Aug 2008 17:28:24 -0000
+***************
+*** 1278,1287 ****
+  		SH_TAILQ_REMOVE(
+  		    <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj);
+  		if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) {
+! 			LOCK_REGION_LOCK(env);
+  			__env_alloc_free(<->reginfo,
+  			    SH_DBT_PTR(&sh_obj->lockobj));
+! 			LOCK_REGION_UNLOCK(env);
+  		}
+  		SH_TAILQ_INSERT_HEAD(
+  		    &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj);
+--- 1278,1289 ----
+  		SH_TAILQ_REMOVE(
+  		    <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj);
+  		if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) {
+! 			if (region->part_t_size != 1)
+! 				LOCK_REGION_LOCK(env);
+  			__env_alloc_free(<->reginfo,
+  			    SH_DBT_PTR(&sh_obj->lockobj));
+! 			if (region->part_t_size != 1)
+! 				LOCK_REGION_UNLOCK(env);
+  		}
+  		SH_TAILQ_INSERT_HEAD(
+  		    &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj);
+***************
+*** 1470,1484 ****
+  		if (obj->size <= sizeof(sh_obj->objdata))
+  			p = sh_obj->objdata;
+  		else {
+! 			LOCK_REGION_LOCK(env);
+  			if ((ret =
+  			    __env_alloc(<->reginfo, obj->size, &p)) != 0) {
+  				__db_errx(env,
+  				    "No space for lock object storage");
+! 				LOCK_REGION_UNLOCK(env);
+  				goto err;
+  			}
+! 			LOCK_REGION_UNLOCK(env);
+  		}
+  
+  		memcpy(p, obj->data, obj->size);
+--- 1472,1492 ----
+  		if (obj->size <= sizeof(sh_obj->objdata))
+  			p = sh_obj->objdata;
+  		else {
+! 			/*
+! 			 * If we have only one partition, the region is locked.
+! 			 */
+! 			if (region->part_t_size != 1)
+! 				LOCK_REGION_LOCK(env);
+  			if ((ret =
+  			    __env_alloc(<->reginfo, obj->size, &p)) != 0) {
+  				__db_errx(env,
+  				    "No space for lock object storage");
+! 				if (region->part_t_size != 1)
+! 					LOCK_REGION_UNLOCK(env);
+  				goto err;
+  			}
+! 			if (region->part_t_size != 1)
+! 				LOCK_REGION_UNLOCK(env);
+  		}
+  
+  		memcpy(p, obj->data, obj->size);

Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3
===================================================================
--- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3	                        (rev 0)
+++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3	2009-05-27 11:53:04 UTC (rev 5067)
@@ -0,0 +1,314 @@
+*** lock/lock_deadlock.c	2008-03-11 00:31:33.000000000 +1100
+--- lock/lock_deadlock.c	2008-12-16 21:54:18.000000000 +1100
+***************
+*** 121,127 ****
+  	DB_LOCKTAB *lt;
+  	db_timespec now;
+  	locker_info *idmap;
+! 	u_int32_t *bitmap, *copymap, **deadp, **free_me, *tmpmap;
+  	u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers;
+  	u_int32_t lock_max, txn_max;
+  	int ret, status;
+--- 121,127 ----
+  	DB_LOCKTAB *lt;
+  	db_timespec now;
+  	locker_info *idmap;
+! 	u_int32_t *bitmap, *copymap, **deadp, **deadlist, *tmpmap;
+  	u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers;
+  	u_int32_t lock_max, txn_max;
+  	int ret, status;
+***************
+*** 133,139 ****
+  	if (IS_REP_CLIENT(env))
+  		atype = DB_LOCK_MINWRITE;
+  
+! 	free_me = NULL;
+  
+  	lt = env->lk_handle;
+  	if (rejectp != NULL)
+--- 133,140 ----
+  	if (IS_REP_CLIENT(env))
+  		atype = DB_LOCK_MINWRITE;
+  
+! 	copymap = tmpmap = NULL;
+! 	deadlist = NULL;
+  
+  	lt = env->lk_handle;
+  	if (rejectp != NULL)
+***************
+*** 179,189 ****
+  	memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc);
+  
+  	if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0)
+! 		goto err1;
+  
+  	/* Find a deadlock. */
+  	if ((ret =
+! 	    __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadp)) != 0)
+  		return (ret);
+  
+  	/*
+--- 180,190 ----
+  	memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc);
+  
+  	if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0)
+! 		goto err;
+  
+  	/* Find a deadlock. */
+  	if ((ret =
+! 	    __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadlist)) != 0)
+  		return (ret);
+  
+  	/*
+***************
+*** 204,211 ****
+  		txn_max = TXN_MAXIMUM;
+  
+  	killid = BAD_KILLID;
+! 	free_me = deadp;
+! 	for (; *deadp != NULL; deadp++) {
+  		if (rejectp != NULL)
+  			++*rejectp;
+  		killid = (u_int32_t)(*deadp - bitmap) / nalloc;
+--- 205,211 ----
+  		txn_max = TXN_MAXIMUM;
+  
+  	killid = BAD_KILLID;
+! 	for (deadp = deadlist; *deadp != NULL; deadp++) {
+  		if (rejectp != NULL)
+  			++*rejectp;
+  		killid = (u_int32_t)(*deadp - bitmap) / nalloc;
+***************
+*** 342,352 ****
+  			__db_msg(env,
+  			    "Aborting locker %lx", (u_long)idmap[killid].id);
+  	}
+! 	__os_free(env, tmpmap);
+! err1:	__os_free(env, copymap);
+! 
+! err:	if (free_me != NULL)
+! 		__os_free(env, free_me);
+  	__os_free(env, bitmap);
+  	__os_free(env, idmap);
+  
+--- 342,353 ----
+  			__db_msg(env,
+  			    "Aborting locker %lx", (u_long)idmap[killid].id);
+  	}
+! err:	if(copymap != NULL)
+! 		__os_free(env, copymap);
+! 	if (deadlist != NULL)
+! 		__os_free(env, deadlist);
+! 	if(tmpmap != NULL)
+! 		__os_free(env, tmpmap);
+  	__os_free(env, bitmap);
+  	__os_free(env, idmap);
+  
+***************
+*** 360,365 ****
+--- 361,377 ----
+  
+  #define	DD_INVALID_ID	((u_int32_t) -1)
+  
++ /*
++  * __dd_build --
++  *	Build the lock dependency bit maps.
++  * Notes on syncronization:  
++  *	LOCK_SYSTEM_LOCK is used to hold objects locked when we have
++  *		a single partition.
++  *	LOCK_LOCKERS is held while we are walking the lockers list and
++  *		to single thread the use of lockerp->dd_id.
++  *	LOCK_DD protects the DD list of objects.
++  */
++ 
+  static int
+  __dd_build(env, atype, bmp, nlockers, allocp, idmap, rejectp)
+  	ENV *env;
+***************
+*** 393,398 ****
+--- 405,411 ----
+  	 * In particular we do not build the conflict array and our caller
+  	 * needs to expect this.
+  	 */
++ 	LOCK_SYSTEM_LOCK(lt, region);
+  	if (atype == DB_LOCK_EXPIRE) {
+  skip:		LOCK_DD(env, region);
+  		op = SH_TAILQ_FIRST(®ion->dd_objs, __db_lockobj);
+***************
+*** 430,446 ****
+  			OBJECT_UNLOCK(lt, region, indx);
+  		}
+  		UNLOCK_DD(env, region);
+  		goto done;
+  	}
+  
+  	/*
+! 	 * We'll check how many lockers there are, add a few more in for
+! 	 * good measure and then allocate all the structures.  Then we'll
+! 	 * verify that we have enough room when we go back in and get the
+! 	 * mutex the second time.
+  	 */
+! retry:	count = region->stat.st_nlockers;
+  	if (count == 0) {
+  		*nlockers = 0;
+  		return (0);
+  	}
+--- 443,460 ----
+  			OBJECT_UNLOCK(lt, region, indx);
+  		}
+  		UNLOCK_DD(env, region);
++ 		LOCK_SYSTEM_UNLOCK(lt, region);
+  		goto done;
+  	}
+  
+  	/*
+! 	 * Allocate after locking the region
+! 	 * to make sure the structures are large enough.
+  	 */
+! 	LOCK_LOCKERS(env, region);
+! 	count = region->stat.st_nlockers;
+  	if (count == 0) {
++ 		UNLOCK_LOCKERS(env, region);
+  		*nlockers = 0;
+  		return (0);
+  	}
+***************
+*** 448,497 ****
+  	if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK))
+  		__db_msg(env, "%lu lockers", (u_long)count);
+  
+- 	count += 20;
+  	nentries = (u_int32_t)DB_ALIGN(count, 32) / 32;
+  
+! 	/*
+! 	 * Allocate enough space for a count by count bitmap matrix.
+! 	 *
+! 	 * XXX
+! 	 * We can probably save the malloc's between iterations just
+! 	 * reallocing if necessary because count grew by too much.
+! 	 */
+  	if ((ret = __os_calloc(env, (size_t)count,
+! 	    sizeof(u_int32_t) * nentries, &bitmap)) != 0)
+  		return (ret);
+  
+  	if ((ret = __os_calloc(env,
+  	    sizeof(u_int32_t), nentries, &tmpmap)) != 0) {
+  		__os_free(env, bitmap);
+  		return (ret);
+  	}
+  
+  	if ((ret = __os_calloc(env,
+  	    (size_t)count, sizeof(locker_info), &id_array)) != 0) {
+  		__os_free(env, bitmap);
+  		__os_free(env, tmpmap);
+  		return (ret);
+  	}
+  
+  	/*
+- 	 * Now go back in and actually fill in the matrix.
+- 	 */
+- 	if (region->stat.st_nlockers > count) {
+- 		__os_free(env, bitmap);
+- 		__os_free(env, tmpmap);
+- 		__os_free(env, id_array);
+- 		goto retry;
+- 	}
+- 
+- 	/*
+  	 * First we go through and assign each locker a deadlock detector id.
+  	 */
+  	id = 0;
+- 	LOCK_LOCKERS(env, region);
+  	SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) {
+  		if (lip->master_locker == INVALID_ROFF) {
+  			lip->dd_id = id++;
+  			id_array[lip->dd_id].id = lip->id;
+  			switch (atype) {
+--- 462,498 ----
+  	if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK))
+  		__db_msg(env, "%lu lockers", (u_long)count);
+  
+  	nentries = (u_int32_t)DB_ALIGN(count, 32) / 32;
+  
+! 	/* Allocate enough space for a count by count bitmap matrix. */
+  	if ((ret = __os_calloc(env, (size_t)count,
+! 	    sizeof(u_int32_t) * nentries, &bitmap)) != 0) {
+! 		UNLOCK_LOCKERS(env, region);
+  		return (ret);
++ 	}
+  
+  	if ((ret = __os_calloc(env,
+  	    sizeof(u_int32_t), nentries, &tmpmap)) != 0) {
++ 		UNLOCK_LOCKERS(env, region);
+  		__os_free(env, bitmap);
+  		return (ret);
+  	}
+  
+  	if ((ret = __os_calloc(env,
+  	    (size_t)count, sizeof(locker_info), &id_array)) != 0) {
++ 		UNLOCK_LOCKERS(env, region);
+  		__os_free(env, bitmap);
+  		__os_free(env, tmpmap);
+  		return (ret);
+  	}
+  
+  	/*
+  	 * First we go through and assign each locker a deadlock detector id.
+  	 */
+  	id = 0;
+  	SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) {
+  		if (lip->master_locker == INVALID_ROFF) {
++ 			DB_ASSERT(env, id < count);
+  			lip->dd_id = id++;
+  			id_array[lip->dd_id].id = lip->id;
+  			switch (atype) {
+***************
+*** 510,516 ****
+  			lip->dd_id = DD_INVALID_ID;
+  
+  	}
+- 	UNLOCK_LOCKERS(env, region);
+  
+  	/*
+  	 * We only need consider objects that have waiters, so we use
+--- 511,516 ----
+***************
+*** 669,675 ****
+  	 * status after building the bit maps so that we will not detect
+  	 * a blocked transaction without noting that it is already aborting.
+  	 */
+- 	LOCK_LOCKERS(env, region);
+  	for (id = 0; id < count; id++) {
+  		if (!id_array[id].valid)
+  			continue;
+--- 669,674 ----
+***************
+*** 738,743 ****
+--- 737,743 ----
+  			id_array[id].in_abort = 1;
+  	}
+  	UNLOCK_LOCKERS(env, region);
++ 	LOCK_SYSTEM_UNLOCK(lt, region);
+  
+  	/*
+  	 * Now we can release everything except the bitmap matrix that we
+***************
+*** 839,844 ****
+--- 839,845 ----
+  	ret = 0;
+  
+  	/* We must lock so this locker cannot go away while we abort it. */
++ 	LOCK_SYSTEM_LOCK(lt, region);
+  	LOCK_LOCKERS(env, region);
+  
+  	/*
+***************
+*** 895,900 ****
+--- 896,902 ----
+  done:	OBJECT_UNLOCK(lt, region, info->last_ndx);
+  err:
+  out:	UNLOCK_LOCKERS(env, region);
++ 	LOCK_SYSTEM_UNLOCK(lt, region);
+  	return (ret);
+  }
+  

Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4
===================================================================
--- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4	                        (rev 0)
+++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4	2009-05-27 11:53:04 UTC (rev 5067)
@@ -0,0 +1,183 @@
+*** dbinc/repmgr.h.orig	2009-05-04 10:33:55.000000000 -0400
+--- dbinc/repmgr.h	2009-05-04 10:27:26.000000000 -0400
+***************
+*** 374,379 ****
+--- 374,380 ----
+  #define	SITE_FROM_EID(eid)	(&db_rep->sites[eid])
+  #define	EID_FROM_SITE(s)	((int)((s) - (&db_rep->sites[0])))
+  #define	IS_VALID_EID(e)		((e) >= 0)
++ #define	IS_KNOWN_REMOTE_SITE(e)	((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt)
+  #define	SELF_EID		INT_MAX
+  
+  #define	IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS ||		\
+*** rep/rep_elect.c.orig	2009-05-04 10:35:50.000000000 -0400
+--- rep/rep_elect.c	2009-05-04 10:31:24.000000000 -0400
+***************
+*** 33,39 ****
+  static int __rep_fire_elected __P((ENV *, REP *, u_int32_t));
+  static void __rep_elect_master __P((ENV *, REP *));
+  static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t));
+! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t));
+  
+  /*
+   * __rep_elect --
+--- 33,39 ----
+  static int __rep_fire_elected __P((ENV *, REP *, u_int32_t));
+  static void __rep_elect_master __P((ENV *, REP *));
+  static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t));
+! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t));
+  
+  /*
+   * __rep_elect --
+***************
+*** 55,61 ****
+  	ENV *env;
+  	LOG *lp;
+  	REP *rep;
+! 	int done, eid, elected, full_elect, locked, in_progress, need_req;
+  	int ret, send_vote, t_ret;
+  	u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri;
+  	u_int32_t tiebreaker;
+--- 55,61 ----
+  	ENV *env;
+  	LOG *lp;
+  	REP *rep;
+! 	int done, elected, full_elect, locked, in_progress, need_req;
+  	int ret, send_vote, t_ret;
+  	u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri;
+  	u_int32_t tiebreaker;
+***************
+*** 181,188 ****
+  			REP_SYSTEM_UNLOCK(env);
+  			(void)__rep_send_message(env, DB_EID_BROADCAST,
+  			    REP_MASTER_REQ, NULL, NULL, 0, 0);
+! 			ret = __rep_wait(env, &to, &eid,
+! 			    0, REP_F_EPHASE0);
+  			REP_SYSTEM_LOCK(env);
+  			F_CLR(rep, REP_F_EPHASE0);
+  			switch (ret) {
+--- 181,187 ----
+  			REP_SYSTEM_UNLOCK(env);
+  			(void)__rep_send_message(env, DB_EID_BROADCAST,
+  			    REP_MASTER_REQ, NULL, NULL, 0, 0);
+! 			ret = __rep_wait(env, &to, 0, REP_F_EPHASE0);
+  			REP_SYSTEM_LOCK(env);
+  			F_CLR(rep, REP_F_EPHASE0);
+  			switch (ret) {
+***************
+*** 286,296 ****
+  		REP_SYSTEM_LOCK(env);
+  		goto vote;
+  	}
+! 	ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1);
+  	switch (ret) {
+  		case 0:
+  			/* Check if election complete or phase complete. */
+! 			if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) {
+  				RPRINT(env, DB_VERB_REP_ELECT,
+  				    (env, "Ended election phase 1"));
+  				goto edone;
+--- 285,295 ----
+  		REP_SYSTEM_LOCK(env);
+  		goto vote;
+  	}
+! 	ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1);
+  	switch (ret) {
+  		case 0:
+  			/* Check if election complete or phase complete. */
+! 			if (!IN_ELECTION(rep)) {
+  				RPRINT(env, DB_VERB_REP_ELECT,
+  				    (env, "Ended election phase 1"));
+  				goto edone;
+***************
+*** 398,412 ****
+  		REP_SYSTEM_LOCK(env);
+  		goto i_won;
+  	}
+! 	ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2);
+  	RPRINT(env, DB_VERB_REP_ELECT,
+  	    (env, "Ended election phase 2 %d", ret));
+  	switch (ret) {
+  		case 0:
+! 			if (eid != DB_EID_INVALID)
+! 				goto edone;
+! 			ret = DB_REP_UNAVAIL;
+! 			break;
+  		case DB_REP_EGENCHG:
+  			if (to > timeout)
+  				to = timeout;
+--- 397,408 ----
+  		REP_SYSTEM_LOCK(env);
+  		goto i_won;
+  	}
+! 	ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2);
+  	RPRINT(env, DB_VERB_REP_ELECT,
+  	    (env, "Ended election phase 2 %d", ret));
+  	switch (ret) {
+  		case 0:
+! 			goto edone;
+  		case DB_REP_EGENCHG:
+  			if (to > timeout)
+  				to = timeout;
+***************
+*** 1050,1062 ****
+  	ENV *env;
+  	REP *rep;
+  {
+- 	/*
+- 	 * We often come through here twice, sometimes even more.  We mustn't
+- 	 * let the redundant calls affect stats counting.  But rep_elect relies
+- 	 * on this first part for setting eidp.
+- 	 */
+- 	rep->master_id = rep->eid;
+- 
+  	if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) {
+  		/* We've been through here already; avoid double counting. */
+  		return;
+--- 1046,1051 ----
+***************
+*** 1093,1102 ****
+  	(timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1);
+  
+  static int
+! __rep_wait(env, timeoutp, eidp, full_elect, flags)
+  	ENV *env;
+  	db_timeout_t *timeoutp;
+! 	int *eidp, full_elect;
+  	u_int32_t flags;
+  {
+  	DB_REP *db_rep;
+--- 1082,1091 ----
+  	(timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1);
+  
+  static int
+! __rep_wait(env, timeoutp, full_elect, flags)
+  	ENV *env;
+  	db_timeout_t *timeoutp;
+! 	int full_elect;
+  	u_int32_t flags;
+  {
+  	DB_REP *db_rep;
+***************
+*** 1174,1180 ****
+  			F_CLR(rep, REP_F_EGENUPDATE);
+  			ret = DB_REP_EGENCHG;
+  		} else if (phase_over) {
+- 			*eidp = rep->master_id;
+  			done = 1;
+  			ret = 0;
+  		}
+--- 1163,1168 ----
+*** repmgr/repmgr_net.c.orig	2009-05-04 10:34:46.000000000 -0400
+--- repmgr/repmgr_net.c	2009-05-04 10:27:26.000000000 -0400
+***************
+*** 100,105 ****
+--- 100,107 ----
+  		    control, rec, &nsites_sent, &npeers_sent)) != 0)
+  			goto out;
+  	} else {
++ 		DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid));
++ 
+  		/*
+  		 * If this is a request that can be sent anywhere, then see if
+  		 * we can send it to our peer (to save load on the master), but


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

From wbonnet at users.sourceforge.net  Wed May 27 17:40:34 2009
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Wed, 27 May 2009 15:40:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[5068] csw/mgar/pkg/thunderbird/trunk
Message-ID: 

Revision: 5068
          http://gar.svn.sourceforge.net/gar/?rev=5068&view=rev
Author:   wbonnet
Date:     2009-05-27 15:40:34 +0000 (Wed, 27 May 2009)

Log Message:
-----------
Add patches for GAR build

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

Added Paths:
-----------
    csw/mgar/pkg/thunderbird/trunk/files/lber-int.h.diff
    csw/mgar/pkg/thunderbird/trunk/files/ldap-int.h.diff
    csw/mgar/pkg/thunderbird/trunk/files/ldappr-int.h.diff

Modified: csw/mgar/pkg/thunderbird/trunk/Makefile
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/Makefile	2009-05-27 11:53:04 UTC (rev 5067)
+++ csw/mgar/pkg/thunderbird/trunk/Makefile	2009-05-27 15:40:34 UTC (rev 5068)
@@ -51,7 +51,10 @@
 REQUIRED_PKGS_CSWthunderbird += CSWpango 
 REQUIRED_PKGS_CSWthunderbird += CSWzlib
 
-PATCHFILES = autoconf.mk.in.diff
+PATCHFILES  = autoconf.mk.in.diff 
+PATCHFILES += lber-int.h.diff 
+PATCHFILES += ldappr-int.h.diff
+PATCHFILES += ldap-int.h.diff
 
 TEST_SCRIPTS = 
 
@@ -70,7 +73,7 @@
 
 pre-install:
 	( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi )
-	( cd $(WORK_INSTALL)/opt/csw/bin && if [ -L $(GARNAME) ] ; then rm $(GARNAME) ; fi  && ln -s ../mozilla/$(GARNAME)/bin/$(GARNAME) . )
+	( cd $(WORK_INSTALL)/opt/csw/bin ; rm $(GARNAME) ; ln -s ../mozilla/$(GARNAME)/bin/$(GARNAME) . )
 	( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps )
 	( cp $(WORK_BUILD)/other-licenses/branding/thunderbird/content/icon64.png $(WORK_INSTALL)/opt/csw/share/pixmaps/thunderbird.png )
 	( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications )

Modified: csw/mgar/pkg/thunderbird/trunk/checksums
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/checksums	2009-05-27 11:53:04 UTC (rev 5067)
+++ csw/mgar/pkg/thunderbird/trunk/checksums	2009-05-27 15:40:34 UTC (rev 5068)
@@ -1,2 +1,5 @@
-73a73d79047dea6be2d222d5b9eeb5f7  download/autoconf.mk.in.diff
+7c53a5e8edb2b492d33f4f405b70c1a1  download/autoconf.mk.in.diff
+46527aded9c373b6095fea546d4d74f0  download/lber-int.h.diff
+46ef334e67dab2301b53b661494f9d58  download/ldap-int.h.diff
+e7054c1d1d6dc708805a6110ccfa7f70  download/ldappr-int.h.diff
 55e24753a7ccf2fbf0272987dd4bb086  download/thunderbird-2.0.0.21-source.tar.bz2

Added: csw/mgar/pkg/thunderbird/trunk/files/lber-int.h.diff
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/files/lber-int.h.diff	                        (rev 0)
+++ csw/mgar/pkg/thunderbird/trunk/files/lber-int.h.diff	2009-05-27 15:40:34 UTC (rev 5068)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru thunderbird.orig/directory/c-sdk/ldap/libraries/liblber/lber-int.h thunderbird/directory/c-sdk/ldap/libraries/liblber/lber-int.h
+--- thunderbird.orig/directory/c-sdk/ldap/libraries/liblber/lber-int.h	2009-05-27 09:58:02.216472168 +0200
++++ thunderbird/directory/c-sdk/ldap/libraries/liblber/lber-int.h	2009-05-27 09:58:25.484409572 +0200
+@@ -107,7 +107,7 @@
+ #define stderr NULL
+ #endif
+ 
+-#include "lber.h"
++#include "../../include/lber.h"
+ 
+ #ifdef macintosh
+ #define NSLDAPI_LBER_SOCKET_IS_PTR

Added: csw/mgar/pkg/thunderbird/trunk/files/ldap-int.h.diff
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/files/ldap-int.h.diff	                        (rev 0)
+++ csw/mgar/pkg/thunderbird/trunk/files/ldap-int.h.diff	2009-05-27 15:40:34 UTC (rev 5068)
@@ -0,0 +1,18 @@
+diff --speed-large-files --minimal -Nru thunderbird.orig/directory/c-sdk/ldap/libraries/libldap/ldap-int.h thunderbird/directory/c-sdk/ldap/libraries/libldap/ldap-int.h
+--- thunderbird.orig/directory/c-sdk/ldap/libraries/libldap/ldap-int.h	2009-05-27 09:59:24.939222864 +0200
++++ thunderbird/directory/c-sdk/ldap/libraries/libldap/ldap-int.h	2009-05-27 10:00:08.738847653 +0200
+@@ -82,10 +82,10 @@
+ #include "../liblber/lber-int.h"
+ #endif /* macintosh */
+ 
+-#include "ldap.h"
+-#include "ldaprot.h"
+-#include "ldaplog.h"
+-#include "portable.h"
++#include "../../include/ldap.h"
++#include "../../include/ldaprot.h"
++#include "../../include/ldaplog.h"
++#include "../../include/portable.h"
+ 
+ #ifdef LDAP_ASYNC_IO
+ #ifdef NEED_FILIO

Added: csw/mgar/pkg/thunderbird/trunk/files/ldappr-int.h.diff
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/files/ldappr-int.h.diff	                        (rev 0)
+++ csw/mgar/pkg/thunderbird/trunk/files/ldappr-int.h.diff	2009-05-27 15:40:34 UTC (rev 5068)
@@ -0,0 +1,15 @@
+diff --speed-large-files --minimal -Nru thunderbird.orig/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h thunderbird/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h
+--- thunderbird.orig/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h	2009-05-27 10:01:14.924882377 +0200
++++ thunderbird/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h	2009-05-27 10:02:26.014267148 +0200
+@@ -41,9 +41,9 @@
+  *
+  */
+ 
+-#include "ldap.h"
++#include "../../include/ldap.h"
+ #include "nspr.h"
+-#include "ldappr.h"
++#include "../../include/ldappr.h"
+ 
+ #include 
+ #include 


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

From valholla at users.sourceforge.net  Wed May 27 19:36:25 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 27 May 2009 17:36:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[5069] csw/mgar/pkg/python/trunk
Message-ID: 

Revision: 5069
          http://gar.svn.sourceforge.net/gar/?rev=5069&view=rev
Author:   valholla
Date:     2009-05-27 17:36:24 +0000 (Wed, 27 May 2009)

Log Message:
-----------
use new pycompile class

Modified Paths:
--------------
    csw/mgar/pkg/python/trunk/Makefile
    csw/mgar/pkg/python/trunk/checksums
    csw/mgar/pkg/python/trunk/files/i.pycompile

Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile	2009-05-27 15:40:34 UTC (rev 5068)
+++ csw/mgar/pkg/python/trunk/Makefile	2009-05-27 17:36:24 UTC (rev 5069)
@@ -3,6 +3,7 @@
 CATEGORIES = lang
 
 SPKG_SOURCEURL = http://www.python.org/download/releases/$(GARVERSION)
+SPKG_CLASSES = none pycompile
 
 DESCRIPTION = A high-level scripting language.
 define BLURB
@@ -23,8 +24,6 @@
 # Previous Library for compatability
 DISTFILES += libpython2.5.so.1.0-isa-sparcv8
 DISTFILES += libpython2.5.so.1.0-isa-i386
-DISTFILES += CSWpython.postinstall CSWpython-tk.postinstall CSWidle.postinstall
-DISTFILES += CSWpython.space CSWpython-tk.space CSWidle.space
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
@@ -37,7 +36,6 @@
 PATCHFILES += pyport.diff
 PATCHFILES += setup.diff
 PATCHFILES += site.diff
-#PATCHFILES += configure.diff
 PATCHFILES += python-config-in.diff
 
 # Test for sunaudiodev fails.
@@ -77,6 +75,9 @@
 CONFIGURE_ARGS += --with-system-ffi
 CONFIGURE_ARGS += LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib'
 
+# use prototype filters to set the class 
+PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "pycompile" } { print }'
+
 PACKAGES  = CSWidle CSWpython CSWpython-devel CSWpython-rt CSWpython-tk
 
 PKGFILES_CSWidle  = $(libdir)/.*/idlelib/.*
@@ -128,3 +129,9 @@
 	@gfind $(DESTDIR)$(libdir) -name "*.py[co]" -exec grm -f {} \;
 	@$(MAKECOOKIE)
 
+define CSWpython_postinstall
+#!/bin/sh
+echo "Cleaning up bytecode files..."
+find $(libdir)/python -name "*.py[co]" -exec grm -f {} \;
+exit 0
+endef

Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums	2009-05-27 15:40:34 UTC (rev 5068)
+++ csw/mgar/pkg/python/trunk/checksums	2009-05-27 17:36:24 UTC (rev 5069)
@@ -1,9 +1,3 @@
-4dbb004a4e26def221444577363146e3  download/CSWidle.postinstall
-e510b1d6436f7688050253c924e72c2d  download/CSWidle.space
-31f5596f66235a8641b25c3b6e3fc28f  download/CSWpython-tk.postinstall
-e889a5cfdbf807b253df2dce3d852429  download/CSWpython-tk.space
-55e25e8ec22e043715306ea03e6eed26  download/CSWpython.postinstall
-35d3380fc79c53da3580dc4ac60aa501  download/CSWpython.space
 245db9f1e0f09ab7e0faaa0cf7301011  download/Python-2.6.2.tar.bz2
 42dd6523beb94a805d5764ae1276091c  download/faqwiz.diff
 5664b3970307d7d39d8d4061e7dccbb0  download/libpython2.5.so.1.0-isa-i386

Modified: csw/mgar/pkg/python/trunk/files/i.pycompile
===================================================================
--- csw/mgar/pkg/python/trunk/files/i.pycompile	2009-05-27 15:40:34 UTC (rev 5068)
+++ csw/mgar/pkg/python/trunk/files/i.pycompile	2009-05-27 17:36:24 UTC (rev 5069)
@@ -11,21 +11,23 @@
 
 # Force Path for the script to use
 PATH=/usr/bin:/usr/sbin:/opt/csw/bin
+
 PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-PY_BINDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/bin
-PY_LIBDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/lib/python
+PY_BINDIR=${PY_PREFIX}/bin
+PY_LIBDIR=${PY_PREFIX}/lib/python
 
+#DEBUG = 1  # Uncomment to enable debug
 if [ "${DEBUG}" ]; then
     echo PACKAGE: $PKGINST
 fi
 
-if [ -f ${PY_BINDIR}/python -a -x ${PY_BINDIR}/python ]; then
+if [ ! -f ${PY_BINDIR}/python -a ! -x ${PY_BINDIR}/python ]; then
     echo "Could not find or execute ${PY_BINDIR}/python"
     echo "Check your Python installation."
     exit 2
 fi
     
-if [ -f ${PY_LIBDIR}/compileall.py ]; then
+if [ ! -f ${PY_LIBDIR}/compileall.py ]; then
     echo "Could not find ${PY_LIBDIR}/compileall.py"
     echo "Check your Python installation."
     exit 2


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

From ellson at users.sourceforge.net  Wed May 27 19:46:36 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Wed, 27 May 2009 17:46:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[5070]
	csw/mgar/pkg/liblasi/trunk/Makefile
Message-ID: 

Revision: 5070
          http://gar.svn.sourceforge.net/gar/?rev=5070&view=rev
Author:   ellson
Date:     2009-05-27 17:46:35 +0000 (Wed, 27 May 2009)

Log Message:
-----------
rename install directories:
	/opt/csw/share/doc/libLASi-1.1.0 ==> /opt/csw/share/doc/liblasi
	/opt/csw/share/liblasi ==> /opt/csw/share/liblasi

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

Modified: csw/mgar/pkg/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 17:36:24 UTC (rev 5069)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 17:46:35 UTC (rev 5070)
@@ -65,5 +65,8 @@
 
 install-custom:
 	@echo " ==> Installing $(GARNAME) (custom)"
-	@( cd $(WORKSRC) ; gmake install DESTDIR=$(DESTDIR) )
+	@( cd $(WORKSRC) ; \
+		gmake install DESTDIR=$(DESTDIR) ; \
+		mv $(DESTDIR)/opt/csw/share/doc/$(SOURCENAME)-$(GARVERSION) $(DESTDIR)/opt/csw/share/doc/$(GARNAME) ; \
+		mv $(DESTDIR)/opt/csw/share/lasi$(GARVERSION) $(DESTDIR)/opt/csw/share/$(GARNAME))
 	@$(MAKECOOKIE)


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

From valholla at users.sourceforge.net  Wed May 27 19:58:01 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 27 May 2009 17:58:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[5071]
	csw/mgar/pkg/python/trunk/Makefile
Message-ID: 

Revision: 5071
          http://gar.svn.sourceforge.net/gar/?rev=5071&view=rev
Author:   valholla
Date:     2009-05-27 17:58:01 +0000 (Wed, 27 May 2009)

Log Message:
-----------
CSWpython.preremove

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

Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile	2009-05-27 17:46:35 UTC (rev 5070)
+++ csw/mgar/pkg/python/trunk/Makefile	2009-05-27 17:58:01 UTC (rev 5071)
@@ -109,8 +109,6 @@
 SPKG_DESC_CSWpython-rt = Python Runtime Libraries
 SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter)
 
-include gar/category.mk
-
 POST_INST_SCR  = add-depricated-libs
 POST_INST_SCR += remove-compiled-py
 
@@ -129,9 +127,12 @@
 	@gfind $(DESTDIR)$(libdir) -name "*.py[co]" -exec grm -f {} \;
 	@$(MAKECOOKIE)
 
-define CSWpython_postinstall
+define CSWpython_preremove
 #!/bin/sh
 echo "Cleaning up bytecode files..."
 find $(libdir)/python -name "*.py[co]" -exec grm -f {} \;
 exit 0
 endef
+
+include gar/category.mk
+


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

From ellson at users.sourceforge.net  Wed May 27 20:06:27 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Wed, 27 May 2009 18:06:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[5072]
	csw/mgar/pkg/liblasi/trunk/Makefile
Message-ID: 

Revision: 5072
          http://gar.svn.sourceforge.net/gar/?rev=5072&view=rev
Author:   ellson
Date:     2009-05-27 18:06:26 +0000 (Wed, 27 May 2009)

Log Message:
-----------
rename /opt/csw/share/liblasi/examples ==> /opt/csw/share/doc/examples

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

Modified: csw/mgar/pkg/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 17:58:01 UTC (rev 5071)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 18:06:26 UTC (rev 5072)
@@ -68,5 +68,6 @@
 	@( cd $(WORKSRC) ; \
 		gmake install DESTDIR=$(DESTDIR) ; \
 		mv $(DESTDIR)/opt/csw/share/doc/$(SOURCENAME)-$(GARVERSION) $(DESTDIR)/opt/csw/share/doc/$(GARNAME) ; \
-		mv $(DESTDIR)/opt/csw/share/lasi$(GARVERSION) $(DESTDIR)/opt/csw/share/$(GARNAME))
+		mv $(DESTDIR)/opt/csw/share/lasi$(GARVERSION)/examples $(DESTDIR)/opt/csw/share/$(GARNAME)/ ; \
+		rmdir $(DESTDIR)/opt/csw/share/lasi$(GARVERSION) )
 	@$(MAKECOOKIE)


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

From ellson at users.sourceforge.net  Wed May 27 20:11:51 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Wed, 27 May 2009 18:11:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[5073]
	csw/mgar/pkg/liblasi/trunk/Makefile
Message-ID: 

Revision: 5073
          http://gar.svn.sourceforge.net/gar/?rev=5073&view=rev
Author:   ellson
Date:     2009-05-27 18:11:49 +0000 (Wed, 27 May 2009)

Log Message:
-----------
fix the directory renaming

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

Modified: csw/mgar/pkg/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 18:06:26 UTC (rev 5072)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 18:11:49 UTC (rev 5073)
@@ -68,6 +68,6 @@
 	@( cd $(WORKSRC) ; \
 		gmake install DESTDIR=$(DESTDIR) ; \
 		mv $(DESTDIR)/opt/csw/share/doc/$(SOURCENAME)-$(GARVERSION) $(DESTDIR)/opt/csw/share/doc/$(GARNAME) ; \
-		mv $(DESTDIR)/opt/csw/share/lasi$(GARVERSION)/examples $(DESTDIR)/opt/csw/share/$(GARNAME)/ ; \
+		mv $(DESTDIR)/opt/csw/share/lasi$(GARVERSION)/* $(DESTDIR)/opt/csw/share/doc/$(GARNAME)/ ; \
 		rmdir $(DESTDIR)/opt/csw/share/lasi$(GARVERSION) )
 	@$(MAKECOOKIE)


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

From valholla at users.sourceforge.net  Wed May 27 20:32:29 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 27 May 2009 18:32:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[5074]
	csw/mgar/pkg/python/trunk/Makefile
Message-ID: 

Revision: 5074
          http://gar.svn.sourceforge.net/gar/?rev=5074&view=rev
Author:   valholla
Date:     2009-05-27 18:32:28 +0000 (Wed, 27 May 2009)

Log Message:
-----------
fix depend

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

Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile	2009-05-27 18:11:49 UTC (rev 5073)
+++ csw/mgar/pkg/python/trunk/Makefile	2009-05-27 18:32:28 UTC (rev 5074)
@@ -91,11 +91,13 @@
 
 ENABLE_CHECK = 0
 
-REQUIRED_PKGS_CSWidle = CSWpython CSWpython-tk
-REQUIRED_PKGS_CSWpython  = CSWbdb44 CSWbzip2 CSWgdbm CSWggettextrt 
-REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWpython-rt CSWreadline 
-REQUIRED_PKGS_CSWpython += CSWsqlite3rt CSWzlib
-REQUIRED_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk CSWpython-rt
+REQUIRED_PKGS_CSWidle         = CSWpython CSWpython-tk CSWcswclassutils
+REQUIRED_PKGS_CSWpython       = CSWbdb44 CSWbzip2 CSWgdbm CSWggettextrt 
+REQUIRED_PKGS_CSWpython      += CSWncurses CSWosslrt CSWpython-rt CSWreadline 
+REQUIRED_PKGS_CSWpython      += CSWsqlite3rt CSWzlib CSWcswclassutils
+REQUIRED_PKGS_CSWpython-tk    = CSWpython CSWtcl CSWtk 
+REQUIRED_PKGS_CSWpython-tk   += CSWpython-rt CSWcswclassutils
+REQUIRED_PKGS_CSWpython-devel = CSWcswclassutils
 
 CATALOGNAME_CSWidle = idle
 CATALOGNAME_CSWpython = python


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

From valholla at users.sourceforge.net  Wed May 27 21:28:41 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 27 May 2009 19:28:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[5075]
	csw/mgar/pkg/squid/trunk/files/cswsquid
Message-ID: 

Revision: 5075
          http://gar.svn.sourceforge.net/gar/?rev=5075&view=rev
Author:   valholla
Date:     2009-05-27 19:28:41 +0000 (Wed, 27 May 2009)

Log Message:
-----------
include smf shares

Modified Paths:
--------------
    csw/mgar/pkg/squid/trunk/files/cswsquid

Modified: csw/mgar/pkg/squid/trunk/files/cswsquid
===================================================================
--- csw/mgar/pkg/squid/trunk/files/cswsquid	2009-05-27 18:32:28 UTC (rev 5074)
+++ csw/mgar/pkg/squid/trunk/files/cswsquid	2009-05-27 19:28:41 UTC (rev 5075)
@@ -7,6 +7,10 @@
 SQUID_DAEMON=${CSWSBIN}/squid
 SQUID_CONF=${CSWETC}/squid.conf
 
+if [ -f /lib/svc/share/smf_include.sh ]; then
+    . /lib/svc/share/smf_include.sh
+fi
+
 case "$1" in
     'start')
         if [ -x ${SQUID_DAEMON} -a -f ${SQUID_CONF} ]; then


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

From valholla at users.sourceforge.net  Wed May 27 21:43:48 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 27 May 2009 19:43:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[5076] csw/mgar/pkg/openldap/trunk
Message-ID: 

Revision: 5076
          http://gar.svn.sourceforge.net/gar/?rev=5076&view=rev
Author:   valholla
Date:     2009-05-27 19:43:48 +0000 (Wed, 27 May 2009)

Log Message:
-----------
smf support and start/stop script

Modified Paths:
--------------
    csw/mgar/pkg/openldap/trunk/Makefile
    csw/mgar/pkg/openldap/trunk/checksums
    csw/mgar/pkg/openldap/trunk/files/cswopenldap

Property Changed:
----------------
    csw/mgar/pkg/openldap/trunk/


Property changes on: csw/mgar/pkg/openldap/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2

   + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2009-05-27 19:28:41 UTC (rev 5075)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2009-05-27 19:43:48 UTC (rev 5076)
@@ -14,7 +14,6 @@
 MASTER_SITES = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tgz
 DISTFILES += $(call admfiles,CSWoldap)
-DISTFILES += cswopenldap openldap.xml svc-openldap
 DISTFILES += README.CSW openldaprc
 
 LICENSE = COPYRIGHT
@@ -54,9 +53,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-EXTRA_BUILD_ISAS_sparc = sparcv9
-EXTRA_BUILD_ISAS_i386  = pentium_pro amd64
-
 PKGFILES_CSWoldapclient  = $(bindir)/.*
 PKGFILES_CSWoldapclient += $(mandir)/man1/.*
 
@@ -67,6 +63,8 @@
 PKGFILES_CSWoldaprt += $(sysconfdir)/ldap.conf
 PKGFILES_CSWoldaprt += $(mandir)/man5/ldap.conf.5
 
+PROTOTYPE_FILTER = awk '$$$$3 ~/\/init.d\/cswopenldap$$$$/ { $$$$2 = "cswinitsmf" } { print }'
+
 include gar/category.mk
 
 CFLAGS := $(filter-out -I%,$(CFLAGS))
@@ -75,6 +73,8 @@
 INSTALL_SCRIPTS += custom
 
 install-custom:
+	ginstall -D $(DOWNLOADDIR)/cswopenldap \
+		$(DESTDIR)/etc/opt/csw/init.d/cswopenldap
 	@for file in $(EXTRA_DOCS); do \
 		ginstall -D $(WORKDIR)/$$file $(DESTDIR)$(docdir)/$(GARNAME)/$$file; \
 	done

Modified: csw/mgar/pkg/openldap/trunk/checksums
===================================================================
--- csw/mgar/pkg/openldap/trunk/checksums	2009-05-27 19:28:41 UTC (rev 5075)
+++ csw/mgar/pkg/openldap/trunk/checksums	2009-05-27 19:43:48 UTC (rev 5076)
@@ -3,6 +3,9 @@
 d7e13ba31a8de786f7cdbe3d529a9728  download/cswopenldap
 ed5b86e9d2b372d10edfe3bb59fee165  download/openldap-2.4.16.tgz
 0e57547ad2b5fedca9f0bd4beaddfe39  download/openldap.xml
+d7e13ba31a8de786f7cdbe3d529a9728  download/cswopenldap
+ed5b86e9d2b372d10edfe3bb59fee165  download/openldap-2.4.16.tgz
+0e57547ad2b5fedca9f0bd4beaddfe39  download/openldap.xml
 ab2ac7519b092ce8d16124c5270bfec0  download/openldaprc
 d3dee9018137c39f357859b652e3a67c  download/patch-oldap-2.4.16-ntlm.diff
 e15c2020566e56f02118e75c89111f15  download/svc-openldap

Modified: csw/mgar/pkg/openldap/trunk/files/cswopenldap
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/cswopenldap	2009-05-27 19:28:41 UTC (rev 5075)
+++ csw/mgar/pkg/openldap/trunk/files/cswopenldap	2009-05-27 19:43:48 UTC (rev 5076)
@@ -34,6 +34,7 @@
 SLURPD=/opt/csw/libexec/slurpd
 
 # Source startup options
+[ -r /lib/svc/share/smf_include.sh ] && . /lib/svc/share/smf_include.sh
 [ -r /opt/csw/etc/openldaprc ] && . /opt/csw/etc/openldaprc
 [ -r /etc/opt/csw/openldaprc ] && . /etc/opt/csw/openldaprc
 


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

From valholla at users.sourceforge.net  Wed May 27 21:47:28 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 27 May 2009 19:47:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[5077]
	csw/mgar/pkg/openldap/trunk/Makefile
Message-ID: 

Revision: 5077
          http://gar.svn.sourceforge.net/gar/?rev=5077&view=rev
Author:   valholla
Date:     2009-05-27 19:47:28 +0000 (Wed, 27 May 2009)

Log Message:
-----------
smf support

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

Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2009-05-27 19:43:48 UTC (rev 5076)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2009-05-27 19:47:28 UTC (rev 5077)
@@ -29,7 +29,7 @@
 SPKG_DESC_CSWoldaprt     = OpenLDAP runtime libraries
 
 REQUIRED_PKGS_CSWoldap       = CSWbdb4 CSWiconv CSWlibnet CSWlibtoolrt CSWoldaprt
-REQUIRED_PKGS_CSWoldap      += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc
+REQUIRED_PKGS_CSWoldap      += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc CSWcswclassutils
 REQUIRED_PKGS_CSWoldapclient = CSWlibnet CSWoldaprt CSWosslrt CSWsasl
 REQUIRED_PKGS_CSWoldapdevel  = CSWoldaprt
 REQUIRED_PKGS_CSWoldaprt     = CSWlibnet CSWosslrt CSWsasl


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

From ellson at users.sourceforge.net  Wed May 27 23:43:52 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Wed, 27 May 2009 21:43:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[5078]
	csw/mgar/pkg/liblasi/trunk/Makefile
Message-ID: 

Revision: 5078
          http://gar.svn.sourceforge.net/gar/?rev=5078&view=rev
Author:   ellson
Date:     2009-05-27 21:43:52 +0000 (Wed, 27 May 2009)

Log Message:
-----------
add a "SF_PROJ = lasi" becasue sf name != gar name ! = library name .....gah!

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

Modified: csw/mgar/pkg/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 19:47:28 UTC (rev 5077)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 21:43:52 UTC (rev 5078)
@@ -2,6 +2,7 @@
 GARVERSION = 1.1.0
 CATEGORIES = lib
 
+SF_PROJ      = lasi
 SOURCENAME = libLASi
 
 DESCRIPTION = C++ Unicode support for PostScript
@@ -44,10 +45,12 @@
 
 WORKSRC = $(WORKDIR)/$(SOURCENAME)-$(GARVERSION)
 
+#		CXX=/opt/csw/gcc4/bin/g++ \
+#
+
 configure-custom:
 	@echo " ==> Configuring $(GARNAME) (custom)"
 	@( cd $(WORKSRC) ; \
-		CXX=/opt/csw/gcc4/bin/g++ \
 		cmake	-DCMAKE_INSTALL_PREFIX=/opt/csw \
 			-DCMAKE_VERBOSE_MAKEFILE=ON \
 			. )


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

From ellson at users.sourceforge.net  Wed May 27 23:50:22 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Wed, 27 May 2009 21:50:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[5079]
	csw/mgar/pkg/liblasi/trunk/Makefile
Message-ID: 

Revision: 5079
          http://gar.svn.sourceforge.net/gar/?rev=5079&view=rev
Author:   ellson
Date:     2009-05-27 21:50:22 +0000 (Wed, 27 May 2009)

Log Message:
-----------
put back g++ for now

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

Modified: csw/mgar/pkg/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 21:43:52 UTC (rev 5078)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 21:50:22 UTC (rev 5079)
@@ -45,12 +45,11 @@
 
 WORKSRC = $(WORKDIR)/$(SOURCENAME)-$(GARVERSION)
 
-#		CXX=/opt/csw/gcc4/bin/g++ \
-#
 
 configure-custom:
 	@echo " ==> Configuring $(GARNAME) (custom)"
 	@( cd $(WORKSRC) ; \
+		CXX=/opt/csw/gcc4/bin/g++ \
 		cmake	-DCMAKE_INSTALL_PREFIX=/opt/csw \
 			-DCMAKE_VERBOSE_MAKEFILE=ON \
 			. )


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

From bonivart at users.sourceforge.net  Thu May 28 09:29:42 2009
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 28 May 2009 07:29:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[5080] csw/mgar/pkg/cswclassutils/trunk
Message-ID: 

Revision: 5080
          http://gar.svn.sourceforge.net/gar/?rev=5080&view=rev
Author:   bonivart
Date:     2009-05-28 07:29:42 +0000 (Thu, 28 May 2009)

Log Message:
-----------
cswclassutils: added cswpycompile

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/Makefile
    csw/mgar/pkg/cswclassutils/trunk/checksums
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype

Added Paths:
-----------
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpycompile

Property Changed:
----------------
    csw/mgar/pkg/cswclassutils/trunk/


Property changes on: csw/mgar/pkg/cswclassutils/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-27 21:50:22 UTC (rev 5079)
+++ csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-28 07:29:42 UTC (rev 5080)
@@ -1,5 +1,5 @@
 GARNAME = cswclassutils
-GARVERSION = 1.9
+GARVERSION = 1.10
 CATEGORIES = utils
 
 DESCRIPTION = CSW class action utilities
@@ -17,7 +17,7 @@
 WORKSRC = $(WORKDIR)
 SPKG_SOURCEURL = http://www.opencsw.org
 
-CASLIST = cswcpsampleconf cswpreserveconf cswinitsmf cswusergroup
+CASLIST = cswcpsampleconf cswpreserveconf cswinitsmf cswusergroup cswpycompile
 
 install-custom:
 	@echo " ==> Installing $(GARNAME) (custom)"

Modified: csw/mgar/pkg/cswclassutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/checksums	2009-05-27 21:50:22 UTC (rev 5079)
+++ csw/mgar/pkg/cswclassutils/trunk/checksums	2009-05-28 07:29:42 UTC (rev 5080)
@@ -1,2 +1,2 @@
 38e0bf6e204e003254ed246df2b4e1f9  download/CSWcswclassutils.gspec
-2779acb0e9549f5e3de16759f59d2e53  download/CSWcswclassutils.prototype
+854d77b21b177b15fd2aac39339a0c8c  download/CSWcswclassutils.prototype

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW	2009-05-27 21:50:22 UTC (rev 5079)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW	2009-05-28 07:29:42 UTC (rev 5080)
@@ -35,6 +35,14 @@
   users, groups, gcos, home directory and shell. You can also decide if you want
   the home directories to be created and/or removed during install/remove.
 
+- cswpycompile
+
+  This class takes care of creating/removing python's normal and optimized
+  bytecode files.  Set all *.py files' class = pycompile to activate.
+  Example:
+  # use prototype filters to set the class
+  PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "pycompile" } { print }'
+
 Read more on the wiki: http://wiki.opencsw.org/cswclassutils-package.
 
 -- 

Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile	                        (rev 0)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile	2009-05-28 07:29:42 UTC (rev 5080)
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# i.pycompile - Class action script for compiling pyo and pyc files
+#
+# $Id: i.pycompile 5069 2009-05-27 17:36:24Z valholla $
+#
+# Written by Mike Watters
+#
+# 2009-05-25 First Release
+#
+
+# Force Path for the script to use
+PATH=/usr/bin:/usr/sbin:/opt/csw/bin
+
+PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+PY_BINDIR=${PY_PREFIX}/bin
+PY_LIBDIR=${PY_PREFIX}/lib/python
+
+#DEBUG = 1  # Uncomment to enable debug
+if [ "${DEBUG}" ]; then
+    echo PACKAGE: $PKGINST
+fi
+
+if [ ! -f ${PY_BINDIR}/python -a ! -x ${PY_BINDIR}/python ]; then
+    echo "Could not find or execute ${PY_BINDIR}/python"
+    echo "Check your Python installation."
+    exit 2
+fi
+    
+if [ ! -f ${PY_LIBDIR}/compileall.py ]; then
+    echo "Could not find ${PY_LIBDIR}/compileall.py"
+    echo "Check your Python installation."
+    exit 2
+fi
+
+echo "Compiling py files to normal bytecode ..."
+# Compile .py libraries to .pyc files
+${PY_BINDIR}/python -Wi -tt ${PY_LIBDIR}/compileall.py \
+    -d ${PY_LIBDIR} -x 'bad_coding|badsyntax' ${PY_LIBDIR}
+
+echo "Compiling py files to optimized bytecode ..."
+# Compile .py libraries to .pyo files
+${PY_BINDIR}/python -Wi -tt -O ${PY_LIBDIR}/compileall.py \
+    -d ${PY_LIBDIR} -x 'bad_coding|badsyntax' ${PY_LIBDIR}
+ 
+exit 0

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype	2009-05-27 21:50:22 UTC (rev 5079)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype	2009-05-28 07:29:42 UTC (rev 5080)
@@ -15,6 +15,8 @@
 f none /usr/sadm/install/scripts/r.cswcpsampleconf 0555 root sys
 f none /usr/sadm/install/scripts/i.cswpreserveconf 0555 root sys
 f none /usr/sadm/install/scripts/r.cswpreserveconf 0555 root sys
+f none /usr/sadm/install/scripts/i.cswpycompile 0555 root sys
+f none /usr/sadm/install/scripts/r.cswpycompile 0555 root sys
 d none /opt/csw/share 0755 root bin
 d none /opt/csw/share/doc 0755 root bin
 d none /opt/csw/share/doc/cswclassutils 0755 root bin

Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpycompile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpycompile	                        (rev 0)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpycompile	2009-05-28 07:29:42 UTC (rev 5080)
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# r.pycompile - Class action script for removing pyo and pyc files
+#
+# $Id: r.pycompile 5019 2009-05-23 04:00:12Z valholla $
+#
+# Written by Mike Watters
+#
+#   2009-05-25 First Release
+#
+
+# Force Path for the script to use
+PATH=/usr/bin:/usr/sbin:/opt/csw/bin
+DEBUG=      # clear to disable debug, set to anything to enable
+
+if [ "${DEBUG}" ]; then
+    echo PACKAGE: $PKGINST
+fi
+
+echo "Removing pyo and pyc files for package <$PKGINST> ..."
+pkgchk -v $PKGINST 2>&1 |grep \.py$ | xargs -i rm -f {}c {}o
+
+exit 0


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

From wahwah at users.sourceforge.net  Thu May 28 11:09:53 2009
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 28 May 2009 09:09:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[5081] csw/mgar/pkg
Message-ID: 

Revision: 5081
          http://gar.svn.sourceforge.net/gar/?rev=5081&view=rev
Author:   wahwah
Date:     2009-05-28 09:09:51 +0000 (Thu, 28 May 2009)

Log Message:
-----------
minimalsmf, a package documenting and testing SMF support in mGAR.

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

Added Paths:
-----------
    csw/mgar/pkg/minimalsmf/
    csw/mgar/pkg/minimalsmf/trunk/files/CSWminimalsmf.gspec
    csw/mgar/pkg/minimalsmf/trunk/files/cswminimalsmf
    csw/mgar/pkg/minimalsmf/trunk/files/cswminimalsmf.xml
    csw/mgar/pkg/minimalsmf/trunk/files/sleeping-beauty
    csw/mgar/pkg/minimalsmf/trunk/files/svc-cswminimalsmf

Modified: csw/mgar/pkg/minimalsmf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/template/trunk/Makefile	2009-05-26 00:54:19 UTC (rev 5052)
+++ csw/mgar/pkg/minimalsmf/trunk/Makefile	2009-05-28 09:09:51 UTC (rev 5081)
@@ -1,24 +1,35 @@
-GARNAME = mypkg
-GARVERSION = 1.0
-CATEGORIES = lib
+GARNAME = minimalsmf
+GARVERSION = 0.1
+CATEGORIES = server
 
-DESCRIPTION = This is a useful library
+DESCRIPTION = A test of an SMF-enabled package and mGAR SMF support
 define BLURB
-  It does stuff with things
+  This package is a minimal build of a package with SMF support, for the
+  purposes of testing and documenting mGAR.
+
+  It should contain the least amount of code necessary to build a package,
+  which, upon installation, imports a manifest and starts the service in the
+  global zone as well as in the non-global zones (full and sparse).
 endef
 
-MASTER_SITES = 
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+ARCHALL = 1
+MASTER_SITES =
+DISTFILES  = sleeping-beauty
+DISTFILES += $(call admfiles,CSW$(GARNAME),)
+DISTFILES += csw$(GARNAME) csw$(GARNAME).xml svc-csw$(GARNAME)
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+INITSMF = /opt/csw/etc/init.d/csw$(GARNAME)
 
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = $(GARNAME)
 
-# Remove the following rules and uncomment the
-# include before building.
-all: .DEFAULT
-.DEFAULT:
-	@true
+install-$(GARNAME):
+	ginstall -d $(DESTDIR)
+	ginstall -d $(DESTDIR)$(bindir)
+	ginstall -m 755 files/sleeping-beauty $(DESTDIR)$(bindir)
+	ginstall -d $(DESTDIR)$(libdir)/svc/method
+	ginstall -m 755 files/svc-csw$(GARNAME) $(DESTDIR)$(libdir)/svc/method/csw$(GARNAME)
 
-#include gar/category.mk
+include gar/category.mk

Added: csw/mgar/pkg/minimalsmf/trunk/files/CSWminimalsmf.gspec
===================================================================
--- csw/mgar/pkg/minimalsmf/trunk/files/CSWminimalsmf.gspec	                        (rev 0)
+++ csw/mgar/pkg/minimalsmf/trunk/files/CSWminimalsmf.gspec	2009-05-28 09:09:51 UTC (rev 5081)
@@ -0,0 +1,6 @@
+%var		bitname minimalsmf
+%var		pkgname CSWminimalsmf
+%include        url file://%{PKGLIB}/csw_dyndepend.gspec
+%include	url file://%{PKGLIB}/smf_enabled.gspec
+%var		SERVICE_NAME cswminimalsmf
+%var            SERVICE_CONF_FILES /etc/foo

Added: csw/mgar/pkg/minimalsmf/trunk/files/cswminimalsmf.xml
===================================================================
--- csw/mgar/pkg/minimalsmf/trunk/files/cswminimalsmf.xml	                        (rev 0)
+++ csw/mgar/pkg/minimalsmf/trunk/files/cswminimalsmf.xml	2009-05-28 09:09:51 UTC (rev 5081)
@@ -0,0 +1,26 @@
+
+
+
+  
+    
+    
+    
+      
+    
+    
+      
+    
+    
+      
+    
+    
+    
+  
+

Added: csw/mgar/pkg/minimalsmf/trunk/files/sleeping-beauty
===================================================================
--- csw/mgar/pkg/minimalsmf/trunk/files/sleeping-beauty	                        (rev 0)
+++ csw/mgar/pkg/minimalsmf/trunk/files/sleeping-beauty	2009-05-28 09:09:51 UTC (rev 5081)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+while true
+do
+	sleep 10
+	logger user.info "Sleeping $(date)"
+done


Property changes on: csw/mgar/pkg/minimalsmf/trunk/files/sleeping-beauty
___________________________________________________________________
Added: svn:executable
   + *

Added: csw/mgar/pkg/minimalsmf/trunk/files/svc-cswminimalsmf
===================================================================
--- csw/mgar/pkg/minimalsmf/trunk/files/svc-cswminimalsmf	                        (rev 0)
+++ csw/mgar/pkg/minimalsmf/trunk/files/svc-cswminimalsmf	2009-05-28 09:09:51 UTC (rev 5081)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/opt/csw/bin/sleeping-beauty &


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

From bonivart at users.sourceforge.net  Thu May 28 11:21:43 2009
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 28 May 2009 09:21:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[5082] csw/mgar/pkg/cswclassutils/trunk
Message-ID: 

Revision: 5082
          http://gar.svn.sourceforge.net/gar/?rev=5082&view=rev
Author:   bonivart
Date:     2009-05-28 09:21:43 +0000 (Thu, 28 May 2009)

Log Message:
-----------
cswclassutils: re-enable persistent state code (cswinitsmf)

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/Makefile
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinitsmf

Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-28 09:09:51 UTC (rev 5081)
+++ csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-28 09:21:43 UTC (rev 5082)
@@ -1,5 +1,5 @@
 GARNAME = cswclassutils
-GARVERSION = 1.10
+GARVERSION = 1.11
 CATEGORIES = utils
 
 DESCRIPTION = CSW class action utilities

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2009-05-28 09:09:51 UTC (rev 5081)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2009-05-28 09:21:43 UTC (rev 5082)
@@ -18,22 +18,22 @@
 DEBUG=		# clear to disable debug, set to anything to enable
 SVCDIR=/var/opt/csw/svc
 
-#SMF_STATE_DIR="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG"
-#SMF_STATE_FILE="$SMF_STATE_DIR/smf.state"
+SMF_STATE_DIR="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG"
+SMF_STATE_FILE="$SMF_STATE_DIR/smf.state"
 
 # retrieve the previous state of a service identified by the given FRMI
-#load_smf_service_state ()
-#{
-#    SMF_STATE="disabled"
-#
-#    if [ -f "$SMF_STATE_FILE" ]; then
-#        set -- `/usr/bin/awk " \\\$1 == \"$1\" { print \\\$2 } " "$SMF_STATE_FILE"`
-#        if [ "$1" = "enabled" ]; then
-#            SMF_STATE="enabled"
-#        fi
-#    fi
-#}
+load_smf_service_state ()
+{
+    SMF_STATE="enabled"
 
+    if [ -f "$SMF_STATE_FILE" ]; then
+        set -- `/usr/bin/awk " \\\$1 == \"$1\" { print \\\$2 } " "$SMF_STATE_FILE"`
+        if [ "$1" = "disabled" ]; then
+            SMF_STATE="disabled"
+        fi
+    fi
+}
+
 # Source csw.conf, if it exists
 if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then
   . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf
@@ -204,11 +204,11 @@
 
     # Start service
     if [ "$daemon" = "yes" ]; then
-#      load_smf_service_state "$FMRI/$service"
-#      if [ "$SMF_STATE" = "enabled" ]; then
+      load_smf_service_state "$FMRI/$service"
+      if [ "$SMF_STATE" = "enabled" ]; then
         echo Enabling svc:/$FMRI/$service ...
         /usr/sbin/svcadm enable svc:/$FMRI/$service > /dev/null 2>&1
-#      fi
+      fi
     fi
   else
     # Copy the service script
@@ -279,7 +279,7 @@
 done
 
 # we delete the smf state file as we don't need it anymore
-#rm -f "$SMF_STATE_FILE"
+rm -f "$SMF_STATE_FILE"
 
 /usr/sbin/installf -f $PKGINST
 

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinitsmf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinitsmf	2009-05-28 09:09:51 UTC (rev 5081)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinitsmf	2009-05-28 09:21:43 UTC (rev 5082)
@@ -21,25 +21,25 @@
 # The following file is used to save the state of smf service upon
 # package removal
 # This allows to restore the service state across package upgrades.
-#SMF_STATE_DIR="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG"
-#SMF_STATE_FILE="$SMF_STATE_DIR/smf.state"
+SMF_STATE_DIR="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG"
+SMF_STATE_FILE="$SMF_STATE_DIR/smf.state"
 
 # The smf state file shouldn't be there at this time but we
 # delete it to be sure
-#rm -f "$SMF_STATE_FILE"
+rm -f "$SMF_STATE_FILE"
 
 # save the current service state for the given frmi
-#save_smf_state ()
-#{
-#    SMF_STATE=`/usr/sbin/svccfg -s "$1:default" listprop general/enabled | /usr/bin/awk '{ print $3 }'`
-#    if [ "$SMF_STATE" != "true" ]; then
-#        SMF_STATE="disabled"
-#    else
-#        SMF_STATE="enabled"
-#    fi
-#    [ -d "$SMF_STATE_DIR" ] || mkdir -p "$SMF_STATE_DIR"
-#    echo "$1 $SMF_STATE" >> "$SMF_STATE_FILE"
-#}
+save_smf_state ()
+{
+    SMF_STATE=`/usr/sbin/svccfg -s "$1:default" listprop general/enabled | /usr/bin/awk '{ print $3 }'`
+    if [ "$SMF_STATE" != "true" ]; then
+        SMF_STATE="disabled"
+    else
+        SMF_STATE="enabled"
+    fi
+    [ -d "$SMF_STATE_DIR" ] || mkdir -p "$SMF_STATE_DIR"
+    echo "$1 $SMF_STATE" >> "$SMF_STATE_FILE"
+}
 
 # Source csw.conf, if it exists
 if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then
@@ -70,7 +70,7 @@
   FMRI=`grep ${PKGINST}$ /var/sadm/install/contents | grep "^/var/opt/csw/svc/manifest" | egrep '\.xml ' | cut -d'/' -f7- | awk -F'.xml' '{print $1}'`
   for i in `echo $FMRI | tr '\n' ' '`
   do
-#    save_smf_state "$i"
+    save_smf_state "$i"
     echo "Disabling svc:/$i ..."
     /usr/sbin/svcadm disable -s svc:/$i
     # Unregister with SMF


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

From bonivart at users.sourceforge.net  Thu May 28 14:39:59 2009
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 28 May 2009 12:39:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[5083] csw/mgar/pkg/cswclassutils/trunk
Message-ID: 

Revision: 5083
          http://gar.svn.sourceforge.net/gar/?rev=5083&view=rev
Author:   bonivart
Date:     2009-05-28 12:39:59 +0000 (Thu, 28 May 2009)

Log Message:
-----------
cswclassutils: add AUTOENABLE tweak to cswinitsmf (#3635)

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/Makefile
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf

Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-28 09:21:43 UTC (rev 5082)
+++ csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-28 12:39:59 UTC (rev 5083)
@@ -1,5 +1,5 @@
 GARNAME = cswclassutils
-GARVERSION = 1.11
+GARVERSION = 1.12
 CATEGORIES = utils
 
 DESCRIPTION = CSW class action utilities

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample	2009-05-28 09:21:43 UTC (rev 5082)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample	2009-05-28 12:39:59 UTC (rev 5083)
@@ -8,6 +8,7 @@
 # Written by Peter Bonivart
 #
 # 2008-04-22 First release
+# 2009-05-28 Add AUTOENABLE
 #
 # Usage
 # -----
@@ -51,6 +52,9 @@
 ##RC_SLEV 3          # Run levels that should have a start script symlink
 ##FMRI network       # FMRI path for service (S10+), the example would give
 #                      an FMRI of "svc:/network/cswfoo:default"
+##AUTOENABLE no	     # Will not enable SMF service regardless of local csw.conf,
+#                      use when a package needs setup before being useful,
+#                      would otherwise leave service in maintainance mode
 
 case "$1" in
   start)

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2009-05-28 09:21:43 UTC (rev 5082)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2009-05-28 12:39:59 UTC (rev 5083)
@@ -14,6 +14,9 @@
 # 2009-04-22 Fix bug when starting packages with multiple services (Ihsan Dogan)
 # 2009-04-24 Temporarily disabled the "persistent state" code until it can be used
 #            per service, not just per package
+# 2009-05-28 Enabled persistent state code again after receiving patch from Yann.
+#            Support AUTOENABLE to force no start regardless of
+#            local csw.conf (Bug ID 0003635)
 
 DEBUG=		# clear to disable debug, set to anything to enable
 SVCDIR=/var/opt/csw/svc
@@ -203,7 +206,11 @@
     echo $PKGINST is using Service Management Facility. The FMRI is svc:/$FMRI/$service:default
 
     # Start service
-    if [ "$daemon" = "yes" ]; then
+    AUTOENABLE="yes"
+    if [ "`grep '^#AUTOENABLE' $dest`" ]; then
+      AUTOENABLE=`grep '^#AUTOENABLE' $dest | awk '{print $2}' | tr -s '[:upper:]' '[:lower:]'`
+    fi
+    if [ "$daemon" = "yes" -a "$AUTOENABLE" != "no" -a "$AUTOENABLE" != "false"]; then
       load_smf_service_state "$FMRI/$service"
       if [ "$SMF_STATE" = "enabled" ]; then
         echo Enabling svc:/$FMRI/$service ...


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

From bonivart at users.sourceforge.net  Thu May 28 15:14:11 2009
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 28 May 2009 13:14:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[5084] csw/mgar/pkg/cswclassutils/trunk
Message-ID: 

Revision: 5084
          http://gar.svn.sourceforge.net/gar/?rev=5084&view=rev
Author:   bonivart
Date:     2009-05-28 13:14:11 +0000 (Thu, 28 May 2009)

Log Message:
-----------
cswclassutils: add MANIFEST tweak to cswinitsmf (custom manifests) (#3636)

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/Makefile
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf

Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-28 12:39:59 UTC (rev 5083)
+++ csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-28 13:14:11 UTC (rev 5084)
@@ -1,5 +1,5 @@
 GARNAME = cswclassutils
-GARVERSION = 1.12
+GARVERSION = 1.13
 CATEGORIES = utils
 
 DESCRIPTION = CSW class action utilities

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample	2009-05-28 12:39:59 UTC (rev 5083)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample	2009-05-28 13:14:11 UTC (rev 5084)
@@ -8,7 +8,7 @@
 # Written by Peter Bonivart
 #
 # 2008-04-22 First release
-# 2009-05-28 Add AUTOENABLE
+# 2009-05-28 Add AUTOENABLE, MANIFEST
 #
 # Usage
 # -----
@@ -52,9 +52,12 @@
 ##RC_SLEV 3          # Run levels that should have a start script symlink
 ##FMRI network       # FMRI path for service (S10+), the example would give
 #                      an FMRI of "svc:/network/cswfoo:default"
-##AUTOENABLE no	     # Will not enable SMF service regardless of local csw.conf,
-#                      use when a package needs setup before being useful,
-#                      would otherwise leave service in maintainance mode
+##AUTOENABLE yes     # If set to no will not enable SMF service regardless of
+#                      local csw.conf, use when a package needs setup before
+#                      being useful, would otherwise leave service in
+#                      maintenance mode
+##MANIFEST /absolute/path/to/manifest   # If set, use this manifest instead
+#                      of autogenerating one (default)
 
 case "$1" in
   start)

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2009-05-28 12:39:59 UTC (rev 5083)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2009-05-28 13:14:11 UTC (rev 5084)
@@ -16,7 +16,8 @@
 #            per service, not just per package
 # 2009-05-28 Enabled persistent state code again after receiving patch from Yann.
 #            Support AUTOENABLE to force no start regardless of
-#            local csw.conf (Bug ID 0003635)
+#            local csw.conf (Bug ID 0003635).
+#            Support custom manifests (Bug ID 0003636)
 
 DEBUG=		# clear to disable debug, set to anything to enable
 SVCDIR=/var/opt/csw/svc
@@ -112,10 +113,16 @@
     /usr/bin/chmod 755 $SVCDIR/method/svc-$service
     /usr/bin/chown root:bin $SVCDIR/method/svc-$service
 
-    # Creating manifest
-    echo Creating manifest ...
-    # Add first part of manifest
-    cat > $SVCDIR/manifest/$FMRI/$service.xml << EOF
+    MANIFEST=
+    if [ "`grep '^#MANIFEST' $dest`" ]; then
+      MANIFEST=`grep '^#MANIFEST' $dest | awk '{print $2}'`
+    fi
+    if [ ! "$MANIFEST" ]; then
+      # Creating manifest
+      echo Creating manifest ...
+      # Add first part of manifest
+      MANIFEST=$SVCDIR/manifest/$FMRI/$service.xml
+      cat > $MANIFEST << EOF
 
 
  sourceforge for the remaining ones

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

Added Paths:
-----------
    csw/mgar/pkg/python-reportlab/
    csw/mgar/pkg/python-reportlab/branches/
    csw/mgar/pkg/python-reportlab/tags/
    csw/mgar/pkg/python-reportlab/trunk/
    csw/mgar/pkg/python-reportlab/trunk/Makefile
    csw/mgar/pkg/python-reportlab/trunk/files/

Property Changed:
----------------
    csw/mgar/pkg/chrpath/trunk/
    csw/mgar/pkg/cmake/trunk/
    csw/mgar/pkg/genshi/trunk/
    csw/mgar/pkg/icinga/trunk/
    csw/mgar/pkg/kawa/trunk/
    csw/mgar/pkg/libfaac/trunk/
    csw/mgar/pkg/libffi/trunk/
    csw/mgar/pkg/libgda/trunk/
    csw/mgar/pkg/libgnomedb/trunk/
    csw/mgar/pkg/libmcal/trunk/
    csw/mgar/pkg/mediawiki/trunk/
    csw/mgar/pkg/nagvis/trunk/
    csw/mgar/pkg/ndoutils/trunk/
    csw/mgar/pkg/php4/trunk/
    csw/mgar/pkg/python3/trunk/
    csw/mgar/pkg/squid/trunk/
    csw/mgar/pkg/squidclamav/trunk/
    csw/mgar/pkg/squirrelmail/trunk/
    csw/mgar/pkg/ss5/trunk/
    csw/mgar/pkg/sudo/trunk/
    csw/mgar/pkg/sudo_ldap/trunk/


Property changes on: csw/mgar/pkg/chrpath/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/cmake/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/genshi/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/icinga/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/kawa/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/libfaac/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/libffi/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/libgda/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/libgnomedb/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/libmcal/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/mediawiki/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/nagvis/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/ndoutils/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/php4/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/python-reportlab/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/python-reportlab/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python-reportlab/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/python-reportlab/trunk/Makefile	2009-05-24 21:02:30 UTC (rev 5036)
@@ -0,0 +1,23 @@
+GARNAME = package
+GARVERSION = 1.0
+CATEGORIES = category
+
+DESCRIPTION = Brief description
+define BLURB
+  Long description
+endef
+
+MASTER_SITES = 
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES += $(call admfiles,CSWpackage,)
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = -(\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_ARGS = $(DIRPATHS)
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/python3/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/squid/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/squidclamav/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/squirrelmail/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/ss5/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/sudo/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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



Property changes on: csw/mgar/pkg/sudo_ldap/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2

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


Modified: csw/mgar/pkg/trac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/trac/trunk/Makefile	2009-05-24 20:09:00 UTC (rev 5035)
+++ csw/mgar/pkg/trac/trunk/Makefile	2009-05-24 21:02:30 UTC (rev 5036)
@@ -11,7 +11,7 @@
 	established development process and policies.
 endef
 
-MASTER_SITES = http://ftp.edgewall.com/pub/$(GARNAME)/
+MASTER_SITES = http://ftp.edgewall.com/pub/trac/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 
 PACKAGES = CSWtrac


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


From rthurner at users.sourceforge.net  Sun May 24 23:06:08 2009
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 24 May 2009 21:06:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[5037] csw/mgar/pkg/python-reportlab/
Message-ID: 

Revision: 5037
          http://gar.svn.sourceforge.net/gar/?rev=5037&view=rev
Author:   rthurner
Date:     2009-05-24 21:06:08 +0000 (Sun, 24 May 2009)

Log Message:
-----------
remove unnecessary

Removed Paths:
-------------
    csw/mgar/pkg/python-reportlab/


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


From valholla at users.sourceforge.net  Mon May 25 04:24:34 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Mon, 25 May 2009 02:24:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[5038] csw/mgar/pkg/sudo/trunk
Message-ID: 

Revision: 5038
          http://gar.svn.sourceforge.net/gar/?rev=5038&view=rev
Author:   valholla
Date:     2009-05-25 02:24:33 +0000 (Mon, 25 May 2009)

Log Message:
-----------
update to 1.7.1

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2009-05-24 21:06:08 UTC (rev 5037)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2009-05-25 02:24:33 UTC (rev 5038)
@@ -1,5 +1,5 @@
 GARNAME = sudo
-GARVERSION = 1.7.0
+GARVERSION = 1.7.1
 CATEGORIES = utils
 
 DESCRIPTION = Provides limited super user privileges
@@ -20,6 +20,7 @@
 
 PACKAGES = CSWsudo CSWsudo-common
 
+BUILD64 = 1
 CATALOGNAME_CSWsudo = sudo
 SPKG_DESC_CSWsudo = $(DESCRIPTION)
 SPKG_SOURCEURL_CSWsudo = http://www.sudo.ws

Modified: csw/mgar/pkg/sudo/trunk/checksums
===================================================================
--- csw/mgar/pkg/sudo/trunk/checksums	2009-05-24 21:06:08 UTC (rev 5037)
+++ csw/mgar/pkg/sudo/trunk/checksums	2009-05-25 02:24:33 UTC (rev 5038)
@@ -1,5 +1,3 @@
 955d99eda1432c7b7e00d98b91e35a79  download/CSWsudo-common.postinstall
-ca867ca77bda965a44bcd665bae7dc6c  download/CSWsudo.postinstall
-880c6c8b92f9c3ef3b5014a0b29c0b02  download/CSWsudo.postremove
 157b2e5e38ca54eb36e0364706bd0292  download/install.diff
-5fd96bba35fe29b464f7aa6ad255f0a6  download/sudo-1.7.0.tar.gz
+af672524b2c854a67612bf4c743f58b8  download/sudo-1.7.1.tar.gz


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


From dmichelsen at users.sourceforge.net  Mon May 25 12:42:53 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 10:42:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[5039] csw/mgar/gar/v2-pbuild
Message-ID: 

Revision: 5039
          http://gar.svn.sourceforge.net/gar/?rev=5039&view=rev
Author:   dmichelsen
Date:     2009-05-25 10:42:53 +0000 (Mon, 25 May 2009)

Log Message:
-----------
mGAR v2-pbuild: Enhance multitail usage

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

Modified: csw/mgar/gar/v2-pbuild/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2-pbuild/gar.conf.mk	2009-05-25 02:24:33 UTC (rev 5038)
+++ csw/mgar/gar/v2-pbuild/gar.conf.mk	2009-05-25 10:42:53 UTC (rev 5039)
@@ -35,6 +35,11 @@
 GIT_PROXY_SCRIPT ?= $(abspath $(GARBIN))/gitproxy
 GIT_DEFAULT_TRACK = +refs/heads/master:refs/remotes/origin/master
 
+# For parallel builds
+PARALLELMODULATIONS ?= 
+MULTITAIL ?= /opt/csw/bin/multitail
+TTY ?= /usr/bin/tty
+
 # Outbound proxies
 http_proxy ?= 
 ftp_proxy  ?= 

Modified: csw/mgar/gar/v2-pbuild/gar.mk
===================================================================
--- csw/mgar/gar/v2-pbuild/gar.mk	2009-05-25 02:24:33 UTC (rev 5038)
+++ csw/mgar/gar/v2-pbuild/gar.mk	2009-05-25 10:42:53 UTC (rev 5039)
@@ -598,18 +598,26 @@
 _PAX_ARGS = $(_INC_EXT_RULE) $(EXTRA_PAX_ARGS)
 
 # The basic merge merges the compiles for all ISAs on the current architecture
-merge: checksum pre-merge $(if $(shell tty >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo TERMINAL; fi),merge-parallel,merge-sequential) merge-license $(if $(NOSOURCEPACKAGE),,merge-src) post-merge
+merge: checksum pre-merge merge-do merge-license $(if $(NOSOURCEPACKAGE),,merge-src) post-merge
 	@$(DONADA)
 
+merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential)
+
 merge-sequential: $(foreach M,$(MODULATIONS),merge-$M)
 
+merge-parallel: _PIDFILE=$(WORKROOTDIR)/build-global-$(GARCH)/multitail.pid
 merge-parallel: merge-watch
-	@$(foreach M,$(MODULATIONS),$(MAKE) merge-$M >$(WORKROOTDIR)/build-$M/build.log 2>&1 &) wait
-	@kill `cat $(WORKROOTDIR)/build-global-$(GARCH)/multitail.pid` && stty sane
+	$(_DBG_MERGE)$(foreach M,$(MODULATIONS),$(MAKE) merge-$M >$(WORKROOTDIR)/build-$M/build.log 2>&1 &) wait
+	$(_DBG_MERGE)if [ -f $(_PIDFILE) ]; then kill `cat $(_PIDFILE)` && stty sane; fi
 
+merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi)
 merge-watch:
-	@multitail --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -j & echo $$! > $(WORKROOTDIR)/build-global-$(GARCH)/multitail.pid
+	$(_DBG_MERGE)$(if $(_USEMULTITAIL),\
+		$(MULTITAIL) --retry-all $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.log) -J & echo $$! > $(WORKROOTDIR)/build-global-$(GARCH)/multitail.pid,\
+		echo "Building all ISAs in parallel. Please see the individual logfiles for details:";$(foreach M,$(MODULATIONS),echo "- $(WORKROOTDIR)/build-$M/build.log";)\
+	)
 
+
 # This merges the 
 merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated
 	@$(MAKECOOKIE)


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


From dmichelsen at users.sourceforge.net  Mon May 25 16:06:04 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 14:06:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[5040] csw/mgar/pkg/mantis/trunk
Message-ID: 

Revision: 5040
          http://gar.svn.sourceforge.net/gar/?rev=5040&view=rev
Author:   dmichelsen
Date:     2009-05-25 14:06:04 +0000 (Mon, 25 May 2009)

Log Message:
-----------
mantis: Update to mGAR v2, dynamic gspec and 1.1.7

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

Removed Paths:
-------------
    csw/mgar/pkg/mantis/trunk/files/CSWmantis.depend
    csw/mgar/pkg/mantis/trunk/files/CSWmantis.gspec

Property Changed:
----------------
    csw/mgar/pkg/mantis/trunk/


Property changes on: csw/mgar/pkg/mantis/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/mantis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mantis/trunk/Makefile	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/mantis/trunk/Makefile	2009-05-25 14:06:04 UTC (rev 5040)
@@ -1,5 +1,5 @@
 GARNAME = mantisbt
-GARVERSION = 1.1.6
+GARVERSION = 1.1.7
 CATEGORIES = apps
 
 DESCRIPTION = Mantis is a free popular web-based bugtracking system
@@ -14,11 +14,17 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWmantis,depend preinstall postinstall)
+DISTFILES += CSWmantis.preinstall CSWmantis.postinstall
 
+PACKAGES = mantis
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
+LICENSE = doc/LICENSE
+REQUIRED_PKGS = CSWapache2 CSWap2modphp5 CSWphp5mysql
+ARCHALL = 1
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
 TEST_SCRIPTS =

Modified: csw/mgar/pkg/mantis/trunk/checksums
===================================================================
--- csw/mgar/pkg/mantis/trunk/checksums	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/mantis/trunk/checksums	2009-05-25 14:06:04 UTC (rev 5040)
@@ -1,5 +1,3 @@
-2e0c6d3dd9ca7d16258fc2d86363a675  download/mantisbt-1.1.6.tar.gz
-d1789df1b666c1fead9fc492dd196711  download/CSWmantis.gspec
-6342620e50a9c631c6fd46a86d6dc32b  download/CSWmantis.depend
-96401030529fc97656cf78d4f7b170e7  download/CSWmantis.preinstall
 bbef8a268863914e61226fec2b6569ae  download/CSWmantis.postinstall
+96401030529fc97656cf78d4f7b170e7  download/CSWmantis.preinstall
+df49eb04bf8fff7a6ed4845f9a09be3b  download/mantisbt-1.1.7.tar.gz

Deleted: csw/mgar/pkg/mantis/trunk/files/CSWmantis.depend
===================================================================
--- csw/mgar/pkg/mantis/trunk/files/CSWmantis.depend	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/mantis/trunk/files/CSWmantis.depend	2009-05-25 14:06:04 UTC (rev 5040)
@@ -1,3 +0,0 @@
-P CSWapache2    apache2 - Apache 2.2 web server
-P CSWap2modphp5 ap2_modphp5 - PHP 5 - Apache 2.2.x Module
-P CSWphp5mysql  php5_mysql - PHP 5 - MySQL Extension

Deleted: csw/mgar/pkg/mantis/trunk/files/CSWmantis.gspec
===================================================================
--- csw/mgar/pkg/mantis/trunk/files/CSWmantis.gspec	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/mantis/trunk/files/CSWmantis.gspec	2009-05-25 14:06:04 UTC (rev 5040)
@@ -1,5 +0,0 @@
-%var            bitname mantis
-%var            pkgname CSWmantis
-%var            arch all
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/doc/LICENSE


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


From dmichelsen at users.sourceforge.net  Mon May 25 16:19:52 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 14:19:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[5041] csw/mgar/pkg/gar/trunk/Makefile
Message-ID: 

Revision: 5041
          http://gar.svn.sourceforge.net/gar/?rev=5041&view=rev
Author:   dmichelsen
Date:     2009-05-25 14:19:52 +0000 (Mon, 25 May 2009)

Log Message:
-----------
gar: Make only one package

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

Modified: csw/mgar/pkg/gar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gar/trunk/Makefile	2009-05-25 14:06:04 UTC (rev 5040)
+++ csw/mgar/pkg/gar/trunk/Makefile	2009-05-25 14:19:52 UTC (rev 5041)
@@ -18,24 +18,13 @@
 
 SPKG_SOURCEURL = http://gar.opencsw.org
 
-PACKAGES = CSWgar CSWgar-v1 CSWgar-v2
 NOSOURCEPACKAGE = 1
 
-CATALOGNAME_CSWgar = gar
-CATALOGNAME_CSWgar-v1 = gar_v1
-CATALOGNAME_CSWgar-v2 = gar_v2
+REQUIRED_PKGS_CSWgar = $(PREREQUISITE_BASE_PKGS)
 
-REQUIRED_PKGS_CSWgar = $(PREREQUISITE_BASE_PKGS) CSWsvn
-REQUIRED_PKGS_CSWgar-v1 = CSWgar
-REQUIRED_PKGS_CSWgar-v2 = CSWgar
+SPKG_DESC_CSWgar = The GAR package build system
 
-SPKG_DESC_CSWgar = The mGAR package build system
-SPKG_DESC_CSWgar-v1 = The mGAR v1 system files
-SPKG_DESC_CSWgar-v2 = The mGAR v2 system files
-
 SPKG_VERSION_CSWgar = $(call _REVISION)
-SPKG_VERSION_CSWgar-v1 = $(shell svnversion $(DOWNLOADDIR)/v1)
-SPKG_VERSION_CSWgar-v2 = $(shell svnversion $(DOWNLOADDIR)/v2)
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
@@ -45,8 +34,6 @@
 EXTRA_MERGE_EXCLUDE_FILES = .*/\.svn/.*
 
 ARCHALL = 1
-PKGFILES_CSWgar-v1 = $(prefix)/src/gar/v1/.*
-PKGFILES_CSWgar-v2 = $(prefix)/src/gar/v2/.*
 
 # Because the bad pathes are in the bad pathes check we cannot check ourselves
 ENABLE_CHECK = 0
@@ -56,7 +43,7 @@
 install-gar:
 	@echo " ==> Installing $(GARNAME)"
 
-	rm -f $(DESTIR)$(bindir)/garit
+	rm -f $(DESTDIR)$(bindir)/garit
 	ginstall -d $(DESTDIR)$(bindir)
 	ginstall $(WORKSRC)/garit $(DESTDIR)$(bindir)/garit
 	ginstall -d $(DESTDIR)$(prefix)/src/gar


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


From bonivart at users.sourceforge.net  Mon May 25 18:06:02 2009
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 25 May 2009 16:06:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[5042] csw/mgar/pkg/pkgutil/trunk
Message-ID: 

Revision: 5042
          http://gar.svn.sourceforge.net/gar/?rev=5042&view=rev
Author:   bonivart
Date:     2009-05-25 16:06:02 +0000 (Mon, 25 May 2009)

Log Message:
-----------
pkgutil: 1.6 beta 1

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

Property Changed:
----------------
    csw/mgar/pkg/pkgutil/trunk/


Property changes on: csw/mgar/pkg/pkgutil/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/pkgutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/Makefile	2009-05-25 14:19:52 UTC (rev 5041)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2009-05-25 16:06:02 UTC (rev 5042)
@@ -1,5 +1,5 @@
 GARNAME = pkgutil
-GARVERSION = 1.5
+GARVERSION = 1.6b1
 CATEGORIES = utils
 
 DESCRIPTION = Installs Solaris packages easily

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2009-05-25 14:19:52 UTC (rev 5041)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2009-05-25 16:06:02 UTC (rev 5042)
@@ -1,5 +1,5 @@
-f9fdd7e5a2bf82ebabe1db387ef163a1  download/pkgutil-1.5.zip
 a16c6f81bc537d6172fd65d8da1aeecc  download/CSWpkgutil.gspec
-bbfa438bcc97cd709f8d1b6716485925  download/CSWpkgutil.prototype
 e1407c24d47306dbc4cea22dcb291f1d  download/CSWpkgutil.postinstall
 2fb6c94a2d212f08b71d462082a2d31a  download/CSWpkgutil.preremove
+bbfa438bcc97cd709f8d1b6716485925  download/CSWpkgutil.prototype
+8a70e1a7be17df436d4480814e2da5a6  download/pkgutil-1.6b1.zip


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


From dmichelsen at users.sourceforge.net  Mon May 25 18:13:17 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 16:13:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[5043] csw/mgar/pkg/cswutils/trunk
Message-ID: 

Revision: 5043
          http://gar.svn.sourceforge.net/gar/?rev=5043&view=rev
Author:   dmichelsen
Date:     2009-05-25 16:13:17 +0000 (Mon, 25 May 2009)

Log Message:
-----------
cswutils: Honor tmpdir. This fixes #3438

Modified Paths:
--------------
    csw/mgar/pkg/cswutils/trunk/checksums
    csw/mgar/pkg/cswutils/trunk/files/checkpkg

Modified: csw/mgar/pkg/cswutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswutils/trunk/checksums	2009-05-25 16:06:02 UTC (rev 5042)
+++ csw/mgar/pkg/cswutils/trunk/checksums	2009-05-25 16:13:17 UTC (rev 5043)
@@ -1,5 +1,5 @@
 091b12575ebc0e45cf8c3d8b43d8b638  download/COPYING
-7e5a50f1db3b6688c58da693f9ac408e  download/checkpkg
+0b9aeb7ab703b45e0961020bc4587f61  download/checkpkg
 6ec3b6597e04714430987ccc199db3c4  download/checkpkg.8
 9a637f6546cc50974159a987302d91c0  download/cpan2pkg
 2349d876bada6ee1bf025e576ec2c465  download/createpkg

Modified: csw/mgar/pkg/cswutils/trunk/files/checkpkg
===================================================================
--- csw/mgar/pkg/cswutils/trunk/files/checkpkg	2009-05-25 16:06:02 UTC (rev 5042)
+++ csw/mgar/pkg/cswutils/trunk/files/checkpkg	2009-05-25 16:13:17 UTC (rev 5043)
@@ -1,6 +1,6 @@
 #!/bin/ksh -p
 
-# checkpkg 2.6
+# checkpkg 2.7
 # This script examines a package that has been put together
 # for submittal to the CSW archive at opencsw.org
 #
@@ -17,6 +17,9 @@
 
 PATH=$PATH:/usr/sbin
 
+# this is actually a base for tmpfiles, not the full name
+TMPDIR=${TMPDIR:-/tmp}
+
 LOCAL_ARCH=`uname -p`
 
 
@@ -100,7 +103,7 @@
 
 file $f |sed 's/^.*://' |grep gzip >/dev/null
 if [ $? -eq 0 ] ; then
-	TMPARCHIVE=/tmp/`basename $f`
+	TMPARCHIVE=$TMPDIR/`basename $f`
 	if [[ -f $TMPARCHIVE ]] ; then
 		print ERROR: $TMPARCHIVE already exists
 		
@@ -111,7 +114,7 @@
 
 pkgname=`nawk 'NR == 2 {print $1; exit;}' $f`
 
-EXTRACTDIR=/tmp/checkpkg.$$
+EXTRACTDIR=$TMPDIR/checkpkg.$$
 
 if [ -d $EXTRACTDIR ] ; then
 	print ERROR: $EXTRACTDIR already exists


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


From dmichelsen at users.sourceforge.net  Mon May 25 18:14:36 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 16:14:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[5044]
	csw/mgar/pkg/cswutils/trunk/Makefile
Message-ID: 

Revision: 5044
          http://gar.svn.sourceforge.net/gar/?rev=5044&view=rev
Author:   dmichelsen
Date:     2009-05-25 16:14:35 +0000 (Mon, 25 May 2009)

Log Message:
-----------
cswutils: Bump to 1.14.1

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

Modified: csw/mgar/pkg/cswutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswutils/trunk/Makefile	2009-05-25 16:13:17 UTC (rev 5043)
+++ csw/mgar/pkg/cswutils/trunk/Makefile	2009-05-25 16:14:35 UTC (rev 5044)
@@ -1,5 +1,5 @@
 GARNAME = cswutils
-GARVERSION = 1.14.0
+GARVERSION = 1.14.1
 CATEGORIES = utils
 
 DESCRIPTION = Utilities for CSW maintainers


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


From dmichelsen at users.sourceforge.net  Mon May 25 18:31:58 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 16:31:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[5045] csw/mgar/pkg/phpldapadmin/trunk
Message-ID: 

Revision: 5045
          http://gar.svn.sourceforge.net/gar/?rev=5045&view=rev
Author:   dmichelsen
Date:     2009-05-25 16:31:57 +0000 (Mon, 25 May 2009)

Log Message:
-----------
phpldapadmin: New directory structure, mGAR v2

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

Added Paths:
-----------
    csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall

Removed Paths:
-------------
    csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.depend
    csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.gspec
    csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.postinstall
    csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preremove

Property Changed:
----------------
    csw/mgar/pkg/phpldapadmin/trunk/


Property changes on: csw/mgar/pkg/phpldapadmin/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/phpldapadmin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/Makefile	2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/Makefile	2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,5 +1,5 @@
 GARNAME = phpldapadmin
-GARVERSION = 1.1.0.6
+GARVERSION = 1.1.0.7
 CATEGORIES = apps
 
 DESCRIPTION = Web-based LDAP browser to manage your LDAP server
@@ -15,7 +15,7 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWphpldapadmin,depend postinstall preremove)
+DISTFILES += CSWphpldapadmin.preinstall
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=61828
@@ -27,15 +27,23 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+PRESERVECONF = $(sharedstatedir)/www/phpldapadmin/config/config.php.CSW
+
+LICENSE = LICENSE
+ARCHALL = 1
+
 include gar/category.mk
 
 install-custom:
 	@echo " ==> Installing $(GARNAME)"
+	@rm -rf $(DESTDIR)$(sharedstatedir)/www/phpldapadmin
+	@ginstall -d $(DESTDIR)$(sharedstatedir)/www
+	@cp -R $(WORKSRC) $(DESTDIR)$(sharedstatedir)/www/phpldapadmin
+	@(cd $(DESTDIR)$(sharedstatedir)/www/phpldapadmin/config; \
+		mv config.php.example config.php.CSW)
+	@find $(DESTDIR)$(sharedstatedir) -name .cvsignore -exec rm \{\} \;
 	@rm -rf $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin
 	@ginstall -d $(DESTDIR)$(prefix)/apache2/share/htdocs
-	@cp -R $(WORKSRC) $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin
-	@cp $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin/config/config.php.example \
-		$(DESTDIR)/$(prefix)/apache2/share/htdocs/phpldapadmin/config/config.php.CSW
-	@find $(DESTDIR)$(prefix) -name .cvsignore -exec rm \{\} \;
+	@ln -s $(sharedstatedir)/www/phpldapadmin/htdocs $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/phpldapadmin/trunk/checksums
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/checksums	2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/checksums	2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,5 +1,2 @@
-f763977c46d09c5801d9af4ebde07a4f  download/phpldapadmin-1.1.0.6.tar.gz
-45c8d22ee54b7ecf7a18b85de0777f28  download/CSWphpldapadmin.gspec
-0a5093f77c31ac9a30572e2ef9e2c57f  download/CSWphpldapadmin.depend
-640e8d4ce62a9d2d5508f68f4284cf1f  download/CSWphpldapadmin.postinstall
-aa80ac77696d9292018d0188350b49c5  download/CSWphpldapadmin.preremove
+13fec0afd8f7808698e2942da7ba3218  download/CSWphpldapadmin.preinstall
+a9129f81b347e98c2b31552d1adc4b51  download/phpldapadmin-1.1.0.7.tar.gz

Deleted: csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.depend
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.depend	2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.depend	2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,5 +0,0 @@
-P CSWapache2     apache2 - Apache 2.2 web server
-P CSWap2modphp5  ap2_modphp5 - PHP 5 - Apache 2.2.x Module
-P CSWphp5ldap    php5_ldap - PHP 5 - OpenLDAP Extension
-P CSWphp5gettext php5_gettext - PHP 5 - GNU gettext Extension
-P CSWphp5session php5_session - PHP 5 - Session Extension

Deleted: csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.gspec
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.gspec	2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.gspec	2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,5 +0,0 @@
-%var            bitname phpldapadmin
-%var            pkgname CSWphpldapadmin
-%var            arch all
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/LICENSE

Deleted: csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.postinstall
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.postinstall	2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.postinstall	2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-CONFDIR=${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin/config
-
-# Copy templates
-template_list="config.php"
-
-echo Copying CSW templates:
-for file in $template_list
-do
-    filepath=${CONFDIR}/$file
-    if [ ! -f "$filepath" ] && [ -f "$filepath.CSW" ]; then
-        echo "  creating $filepath"
-        cp $filepath.CSW $filepath
-    else
-        echo "  preserving $filepath"
-    fi
-done
-
-/usr/bin/cat <

Revision: 5046
          http://gar.svn.sourceforge.net/gar/?rev=5046&view=rev
Author:   bonivart
Date:     2009-05-25 16:42:05 +0000 (Mon, 25 May 2009)

Log Message:
-----------
pkgutil: add new man pages to package

Modified Paths:
--------------
    csw/mgar/pkg/pkgutil/trunk/Makefile
    csw/mgar/pkg/pkgutil/trunk/checksums
    csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype

Modified: csw/mgar/pkg/pkgutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/Makefile	2009-05-25 16:31:57 UTC (rev 5045)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2009-05-25 16:42:05 UTC (rev 5046)
@@ -51,4 +51,6 @@
 	@cp $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW
 	@cp $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget
 	@pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1
+	@pod2man --section=1 $(WORKSRC)/bldcat > $(DESTDIR)$(mandir)/man1/bldcat.1
+	@pod2man --section=1 $(WORKSRC)/chkcat > $(DESTDIR)$(mandir)/man1/chkcat.1
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2009-05-25 16:31:57 UTC (rev 5045)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2009-05-25 16:42:05 UTC (rev 5046)
@@ -1,5 +1,5 @@
 a16c6f81bc537d6172fd65d8da1aeecc  download/CSWpkgutil.gspec
 e1407c24d47306dbc4cea22dcb291f1d  download/CSWpkgutil.postinstall
 2fb6c94a2d212f08b71d462082a2d31a  download/CSWpkgutil.preremove
-bbfa438bcc97cd709f8d1b6716485925  download/CSWpkgutil.prototype
+4ef9d7ba62987112987311d96e249e3e  download/CSWpkgutil.prototype
 8a70e1a7be17df436d4480814e2da5a6  download/pkgutil-1.6b1.zip

Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype	2009-05-25 16:31:57 UTC (rev 5045)
+++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype	2009-05-25 16:42:05 UTC (rev 5046)
@@ -22,6 +22,8 @@
 d none /opt/csw/share/man 0755 root bin
 d none /opt/csw/share/man/man1 0755 root bin
 f none /opt/csw/share/man/man1/pkgutil.1 644 root bin
+f none /opt/csw/share/man/man1/bldcat.1 644 root bin
+f none /opt/csw/share/man/man1/chkcat.1 644 root bin
 d none /var/opt/csw 0755 root bin
 d none /var/opt/csw/pkgutil 0755 root bin
 f none /var/opt/csw/pkgutil/admin.CSW 644 root bin


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


From dmichelsen at users.sourceforge.net  Mon May 25 18:44:43 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 16:44:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[5047]
 csw/mgar/pkg/phpldapadmin/trunk/files/ CSWphpldapadmin.preinstall
Message-ID: 

Revision: 5047
          http://gar.svn.sourceforge.net/gar/?rev=5047&view=rev
Author:   dmichelsen
Date:     2009-05-25 16:44:43 +0000 (Mon, 25 May 2009)

Log Message:
-----------
phpldapadmin: Fix relocate destination

Modified Paths:
--------------
    csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall

Modified: csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall	2009-05-25 16:42:05 UTC (rev 5046)
+++ csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall	2009-05-25 16:44:43 UTC (rev 5047)
@@ -23,7 +23,7 @@
   echo
   mkdir -p ${CSW_PREFIX}/share/www/phpldapadmin/htdocs
   (cd ${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin; tar cf - .) | \
-	(cd ${CSW_PREFIX}/share/www/phpldapadmin/htdocs; tar xvf -)
+	(cd ${CSW_PREFIX}/share/www/phpldapadmin; tar xvf -)
   rm -rf ${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin
 fi
 


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


From dmichelsen at users.sourceforge.net  Mon May 25 18:44:56 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 16:44:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[5048]
	csw/mgar/pkg/phpldapadmin/trunk/checksums
Message-ID: 

Revision: 5048
          http://gar.svn.sourceforge.net/gar/?rev=5048&view=rev
Author:   dmichelsen
Date:     2009-05-25 16:44:56 +0000 (Mon, 25 May 2009)

Log Message:
-----------
phpldapadmin: Fix relocate destination

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

Modified: csw/mgar/pkg/phpldapadmin/trunk/checksums
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/checksums	2009-05-25 16:44:43 UTC (rev 5047)
+++ csw/mgar/pkg/phpldapadmin/trunk/checksums	2009-05-25 16:44:56 UTC (rev 5048)
@@ -1,2 +1,2 @@
-13fec0afd8f7808698e2942da7ba3218  download/CSWphpldapadmin.preinstall
+87983d70476a8a80332f0c3c188d9c2d  download/CSWphpldapadmin.preinstall
 a9129f81b347e98c2b31552d1adc4b51  download/phpldapadmin-1.1.0.7.tar.gz


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


From dmichelsen at users.sourceforge.net  Mon May 25 19:16:09 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 17:16:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[5049]
	csw/mgar/pkg/vorbistools/trunk/Makefile
Message-ID: 

Revision: 5049
          http://gar.svn.sourceforge.net/gar/?rev=5049&view=rev
Author:   dmichelsen
Date:     2009-05-25 17:16:09 +0000 (Mon, 25 May 2009)

Log Message:
-----------
vorbistools: Add dependency to curldevel

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

Modified: csw/mgar/pkg/vorbistools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vorbistools/trunk/Makefile	2009-05-25 16:44:56 UTC (rev 5048)
+++ csw/mgar/pkg/vorbistools/trunk/Makefile	2009-05-25 17:16:09 UTC (rev 5049)
@@ -20,6 +20,8 @@
 PACKAGES = CSWvtools
 CATALOGNAME = vorbistools
 
+PREREQUISITE_PKGS = CSWcurldevel
+
 REQUIRED_PKGS = CSWcurlrt CSWflac CSWggettextrt CSWiconv CSWlibao
 REQUIRED_PKGS += CSWlibogg CSWspeex CSWsunmath CSWvorbis
 


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


From dmichelsen at users.sourceforge.net  Mon May 25 21:35:13 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 19:35:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[5050] csw/mgar/pkg/gperf/trunk
Message-ID: 

Revision: 5050
          http://gar.svn.sourceforge.net/gar/?rev=5050&view=rev
Author:   dmichelsen
Date:     2009-05-25 19:35:13 +0000 (Mon, 25 May 2009)

Log Message:
-----------
gperf: Move to mGAR v2 and dynamic gspec

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

Removed Paths:
-------------
    csw/mgar/pkg/gperf/trunk/files/CSWgperf.gspec

Property Changed:
----------------
    csw/mgar/pkg/gperf/trunk/


Property changes on: csw/mgar/pkg/gperf/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/gperf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gperf/trunk/Makefile	2009-05-25 17:16:09 UTC (rev 5049)
+++ csw/mgar/pkg/gperf/trunk/Makefile	2009-05-25 19:35:13 UTC (rev 5050)
@@ -13,7 +13,6 @@
 
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES    = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES   += $(call admfiles,CSWgperf)
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/gperf/trunk/checksums
===================================================================
--- csw/mgar/pkg/gperf/trunk/checksums	2009-05-25 17:16:09 UTC (rev 5049)
+++ csw/mgar/pkg/gperf/trunk/checksums	2009-05-25 19:35:13 UTC (rev 5050)
@@ -1,2 +1 @@
 c1f1db32fb6598d6a93e6e88796a8632  download/gperf-3.0.4.tar.gz
-feeb293dedf6e49b1fe0b8bfcef06e99  download/CSWgperf.gspec

Deleted: csw/mgar/pkg/gperf/trunk/files/CSWgperf.gspec
===================================================================
--- csw/mgar/pkg/gperf/trunk/files/CSWgperf.gspec	2009-05-25 17:16:09 UTC (rev 5049)
+++ csw/mgar/pkg/gperf/trunk/files/CSWgperf.gspec	2009-05-25 19:35:13 UTC (rev 5050)
@@ -1,4 +0,0 @@
-%var            bitname gperf
-%var            pkgname CSWgperf
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING


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


From dmichelsen at users.sourceforge.net  Tue May 26 00:52:55 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 25 May 2009 22:52:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[5051]
	csw/mgar/pkg/mantis/trunk/Makefile
Message-ID: 

Revision: 5051
          http://gar.svn.sourceforge.net/gar/?rev=5051&view=rev
Author:   dmichelsen
Date:     2009-05-25 22:52:55 +0000 (Mon, 25 May 2009)

Log Message:
-----------
mantis: Fix package name

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

Modified: csw/mgar/pkg/mantis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mantis/trunk/Makefile	2009-05-25 19:35:13 UTC (rev 5050)
+++ csw/mgar/pkg/mantis/trunk/Makefile	2009-05-25 22:52:55 UTC (rev 5051)
@@ -16,7 +16,7 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 DISTFILES += CSWmantis.preinstall CSWmantis.postinstall
 
-PACKAGES = mantis
+PACKAGES = CSWmantis
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz


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


From dmichelsen at users.sourceforge.net  Tue May 26 02:54:19 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 26 May 2009 00:54:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[5052]
	csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk
Message-ID: 

Revision: 5052
          http://gar.svn.sourceforge.net/gar/?rev=5052&view=rev
Author:   dmichelsen
Date:     2009-05-26 00:54:19 +0000 (Tue, 26 May 2009)

Log Message:
-----------
XML-Atom-SimpleFeed: Update to mGAR v2 and 0.83

Modified Paths:
--------------
    csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/files/CSWpmxmlatomsimplefd.gspec

Property Changed:
----------------
    csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/


Property changes on: csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/Makefile	2009-05-25 22:52:55 UTC (rev 5051)
+++ csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/Makefile	2009-05-26 00:54:19 UTC (rev 5052)
@@ -1,5 +1,5 @@
 GARNAME = XML-Atom-SimpleFeed
-GARVERSION = 0.82
+GARVERSION = 0.83
 CATEGORIES = cpan
 AUTHOR = ARISTOTLE
 
@@ -10,6 +10,8 @@
   but has no provisions for generating feeds with extension elements.
 endef
 
-DISTFILES += $(call admfiles,CSWpmxmlatomsimplefd,)
+PACKAGES = CSWpmxmlatomsimplefd
+CATALOGNAME = pm_xmlatomsimplefeed
+ARCHALL = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/checksums	2009-05-25 22:52:55 UTC (rev 5051)
+++ csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/checksums	2009-05-26 00:54:19 UTC (rev 5052)
@@ -1,2 +1 @@
-6754bcccee811c0555e38eb4387e97f2  download/CSWpmxmlatomsimplefd.gspec
-2570500ec05b0d9fb9d21e19a52ce313  download/XML-Atom-SimpleFeed-0.82.tar.gz
+165a259760302eac1c6c5153004382ac  download/XML-Atom-SimpleFeed-0.83.tar.gz

Deleted: csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/files/CSWpmxmlatomsimplefd.gspec
===================================================================
--- csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/files/CSWpmxmlatomsimplefd.gspec	2009-05-25 22:52:55 UTC (rev 5051)
+++ csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/files/CSWpmxmlatomsimplefd.gspec	2009-05-26 00:54:19 UTC (rev 5052)
@@ -1,9 +0,0 @@
-%var            bitname pm_xmlatomsimplefeed
-%var            pkgname CSWpmxmlatomsimplefd
-%var            arch all
-%include        url file://%{PKGLIB}/csw_cpan.gspec
-%copyright
-Copyright (C) 2005, Aristotle Pagaltzis
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.


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


From valholla at users.sourceforge.net  Tue May 26 16:42:57 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 14:42:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[5053] csw/mgar/pkg/sudo_ldap/trunk
Message-ID: 

Revision: 5053
          http://gar.svn.sourceforge.net/gar/?rev=5053&view=rev
Author:   valholla
Date:     2009-05-26 14:42:57 +0000 (Tue, 26 May 2009)

Log Message:
-----------
update to 1.7.1 and 64bit build

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

Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 00:54:19 UTC (rev 5052)
+++ csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 14:42:57 UTC (rev 5053)
@@ -1,5 +1,5 @@
 GARNAME = sudo
-GARVERSION = 1.7.0
+GARVERSION = 1.7.1
 CATEGORIES = utils
 
 DESCRIPTION = Provides limited super user privileges (LDAP Enabled)
@@ -25,6 +25,7 @@
 SPKG_SOURCEURL_CSWsudoldap = http://www.sudo.ws
 REQUIRED_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt
 
+BUILD64 = 1
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-pam
 CONFIGURE_ARGS += --with-logging=both
@@ -39,8 +40,8 @@
 
 PKGFILES_CSWsudoldap = .*$(bindir)/sudo.ldap
 
-post-merge-modulated:
-	@( cd $(PKGROOT)$(bindir) ; gmv sudo sudo.ldap )
-	@( cd $(PKGROOT)$(bindir) ; grm sudoedit )
-	@( cd $(PKGROOT)$(bindir) ; gchmod 4755 sudo.ldap )
+post-install-modulated:
+	@( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.ldap )
+	@( cd $(DESTDIR)$(bindir) ; grm sudoedit )
+	@( cd $(DESTDIR)$(bindir) ; gchmod 4755 sudo.ldap )
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/sudo_ldap/trunk/checksums
===================================================================
--- csw/mgar/pkg/sudo_ldap/trunk/checksums	2009-05-26 00:54:19 UTC (rev 5052)
+++ csw/mgar/pkg/sudo_ldap/trunk/checksums	2009-05-26 14:42:57 UTC (rev 5053)
@@ -1,4 +1,2 @@
-05fb6b46e36528fb889aca7f53106708  download/CSWsudoldap.postinstall
-4fcbbf0054c3d2e5f73f83a8730554f1  download/CSWsudoldap.postremove
 157b2e5e38ca54eb36e0364706bd0292  download/install.diff
-5fd96bba35fe29b464f7aa6ad255f0a6  download/sudo-1.7.0.tar.gz
+af672524b2c854a67612bf4c743f58b8  download/sudo-1.7.1.tar.gz


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


From valholla at users.sourceforge.net  Tue May 26 16:44:49 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 14:44:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[5054] csw/mgar/pkg/sudo/trunk/Makefile
Message-ID: 

Revision: 5054
          http://gar.svn.sourceforge.net/gar/?rev=5054&view=rev
Author:   valholla
Date:     2009-05-26 14:44:49 +0000 (Tue, 26 May 2009)

Log Message:
-----------
update to 1.7.1 and 64bit build

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 14:42:57 UTC (rev 5053)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 14:44:49 UTC (rev 5054)
@@ -44,10 +44,13 @@
 
 include gar/category.mk
 
-PKGFILES_CSWsudo  = .*$(bindir)/sudo.*
+PKGFILES_CSWsudo  = .*$(bindir)/sudo
+PKGFILES_CSWsudo  = .*$(bindir)/sudo.minimal
 
-post-merge-modulated:
-	@( cd $(PKGROOT)$(bindir) ; gln -f sudo sudo.minimal )
-	@( cd $(PKGROOT)$(sysconfdir) ; gmv sudoers sudoers.CSW )
-	@( cd $(PKGROOT)$(bindir) ; gchmod 4755 sudo* )
+post-install-modulated:
+	@( cd $(DESTDIR)$(bindir) ; gcp sudo sudo.minimal )
+	@( cd $(DESTDIR)$(bindir) ; grm -f sudoedit )
+	@( cd $(DESTDIR)$(bindir) ; gcp sudo sudoedit )
+	@( cd $(DESTDIR)$(sysconfdir) ; gmv sudoers sudoers.CSW )
+	@( cd $(DESTDIR)$(bindir) ; gchmod 4755 sudo* )
 	@$(MAKECOOKIE)


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


From valholla at users.sourceforge.net  Tue May 26 16:58:49 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 14:58:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[5055]
	csw/mgar/pkg/sudo_ldap/trunk/Makefile
Message-ID: 

Revision: 5055
          http://gar.svn.sourceforge.net/gar/?rev=5055&view=rev
Author:   valholla
Date:     2009-05-26 14:58:49 +0000 (Tue, 26 May 2009)

Log Message:
-----------
fix 64bit build

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

Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 14:44:49 UTC (rev 5054)
+++ csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 14:58:49 UTC (rev 5055)
@@ -38,7 +38,7 @@
 
 include gar/category.mk
 
-PKGFILES_CSWsudoldap = .*$(bindir)/sudo.ldap
+PKGFILES_CSWsudoldap = .*$(bindir).*/sudo.ldap
 
 post-install-modulated:
 	@( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.ldap )


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


From valholla at users.sourceforge.net  Tue May 26 17:05:09 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 15:05:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[5056]
	csw/mgar/pkg/sudo_ldap/trunk/Makefile
Message-ID: 

Revision: 5056
          http://gar.svn.sourceforge.net/gar/?rev=5056&view=rev
Author:   valholla
Date:     2009-05-26 15:05:09 +0000 (Tue, 26 May 2009)

Log Message:
-----------
need explicit isaexec require

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

Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 14:58:49 UTC (rev 5055)
+++ csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 15:05:09 UTC (rev 5056)
@@ -23,7 +23,7 @@
 CATALOGNAME_CSWsudoldap = sudo_ldap
 SPKG_DESC_CSWsudoldap = $(DESCRIPTION)
 SPKG_SOURCEURL_CSWsudoldap = http://www.sudo.ws
-REQUIRED_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt
+REQUIRED_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt CSWisaexec
 
 BUILD64 = 1
 CONFIGURE_ARGS  = $(DIRPATHS)


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


From valholla at users.sourceforge.net  Tue May 26 17:06:57 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 15:06:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[5057]
	csw/mgar/pkg/sudo_ldap/trunk/Makefile
Message-ID: 

Revision: 5057
          http://gar.svn.sourceforge.net/gar/?rev=5057&view=rev
Author:   valholla
Date:     2009-05-26 15:06:56 +0000 (Tue, 26 May 2009)

Log Message:
-----------
don't need explicit isaexec require

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

Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 15:05:09 UTC (rev 5056)
+++ csw/mgar/pkg/sudo_ldap/trunk/Makefile	2009-05-26 15:06:56 UTC (rev 5057)
@@ -23,7 +23,7 @@
 CATALOGNAME_CSWsudoldap = sudo_ldap
 SPKG_DESC_CSWsudoldap = $(DESCRIPTION)
 SPKG_SOURCEURL_CSWsudoldap = http://www.sudo.ws
-REQUIRED_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt CSWisaexec
+REQUIRED_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt 
 
 BUILD64 = 1
 CONFIGURE_ARGS  = $(DIRPATHS)


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


From valholla at users.sourceforge.net  Tue May 26 17:11:03 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 15:11:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[5058] csw/mgar/pkg/sudo/trunk/Makefile
Message-ID: 

Revision: 5058
          http://gar.svn.sourceforge.net/gar/?rev=5058&view=rev
Author:   valholla
Date:     2009-05-26 15:11:03 +0000 (Tue, 26 May 2009)

Log Message:
-----------
fix 64bit

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:06:56 UTC (rev 5057)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:11:03 UTC (rev 5058)
@@ -44,8 +44,8 @@
 
 include gar/category.mk
 
-PKGFILES_CSWsudo  = .*$(bindir)/sudo
-PKGFILES_CSWsudo  = .*$(bindir)/sudo.minimal
+PKGFILES_CSWsudo  = .*$(bindir).*/sudo
+PKGFILES_CSWsudo  = .*$(bindir).*/sudo.minimal
 
 post-install-modulated:
 	@( cd $(DESTDIR)$(bindir) ; gcp sudo sudo.minimal )


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


From valholla at users.sourceforge.net  Tue May 26 17:16:31 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 15:16:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[5059] csw/mgar/pkg/sudo/trunk/Makefile
Message-ID: 

Revision: 5059
          http://gar.svn.sourceforge.net/gar/?rev=5059&view=rev
Author:   valholla
Date:     2009-05-26 15:16:31 +0000 (Tue, 26 May 2009)

Log Message:
-----------
tweak

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:11:03 UTC (rev 5058)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:16:31 UTC (rev 5059)
@@ -52,5 +52,8 @@
 	@( cd $(DESTDIR)$(bindir) ; grm -f sudoedit )
 	@( cd $(DESTDIR)$(bindir) ; gcp sudo sudoedit )
 	@( cd $(DESTDIR)$(sysconfdir) ; gmv sudoers sudoers.CSW )
-	@( cd $(DESTDIR)$(bindir) ; gchmod 4755 sudo* )
 	@$(MAKECOOKIE)
+
+post-merge-modulated:
+	@( cd $(DESTDIR)$(bindir);gfind . -name sudo\* -exec gchmod 4755 {} \; )
+	@$(MAKECOOKIE)


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


From valholla at users.sourceforge.net  Tue May 26 17:22:13 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 15:22:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[5060] csw/mgar/pkg/sudo/trunk/Makefile
Message-ID: 

Revision: 5060
          http://gar.svn.sourceforge.net/gar/?rev=5060&view=rev
Author:   valholla
Date:     2009-05-26 15:22:13 +0000 (Tue, 26 May 2009)

Log Message:
-----------
fix 64bit

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:16:31 UTC (rev 5059)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:22:13 UTC (rev 5060)
@@ -55,5 +55,5 @@
 	@$(MAKECOOKIE)
 
 post-merge-modulated:
-	@( cd $(DESTDIR)$(bindir);gfind . -name sudo\* -exec gchmod 4755 {} \; )
+	@( cd $(PKGROOT)$(bindir);gfind . -name sudo\* -exec gchmod 4755 {} \; )
 	@$(MAKECOOKIE)


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


From valholla at users.sourceforge.net  Tue May 26 17:35:52 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 15:35:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[5061] csw/mgar/pkg/sudo/trunk/Makefile
Message-ID: 

Revision: 5061
          http://gar.svn.sourceforge.net/gar/?rev=5061&view=rev
Author:   valholla
Date:     2009-05-26 15:35:50 +0000 (Tue, 26 May 2009)

Log Message:
-----------
tweak

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:22:13 UTC (rev 5060)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2009-05-26 15:35:50 UTC (rev 5061)
@@ -44,16 +44,17 @@
 
 include gar/category.mk
 
-PKGFILES_CSWsudo  = .*$(bindir).*/sudo
 PKGFILES_CSWsudo  = .*$(bindir).*/sudo.minimal
 
 post-install-modulated:
-	@( cd $(DESTDIR)$(bindir) ; gcp sudo sudo.minimal )
+	@( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.minimal )
+	@( cd $(DESTDIR)$(bindir) ; gln -s sudo.minimal sudo )
 	@( cd $(DESTDIR)$(bindir) ; grm -f sudoedit )
-	@( cd $(DESTDIR)$(bindir) ; gcp sudo sudoedit )
+	@( cd $(DESTDIR)$(bindir) ; gcp sudo.minimal sudoedit )
 	@( cd $(DESTDIR)$(sysconfdir) ; gmv sudoers sudoers.CSW )
 	@$(MAKECOOKIE)
 
 post-merge-modulated:
-	@( cd $(PKGROOT)$(bindir);gfind . -name sudo\* -exec gchmod 4755 {} \; )
+	@( cd $(PKGROOT)$(bindir); \
+		gfind . -type f -name sudo\* -exec gchmod 4755 {} \; )
 	@$(MAKECOOKIE)


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


From dmichelsen at users.sourceforge.net  Tue May 26 19:58:10 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 26 May 2009 17:58:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[5063] csw/mgar/pkg/bdb44/trunk/Makefile
Message-ID: 

Revision: 5063
          http://gar.svn.sourceforge.net/gar/?rev=5063&view=rev
Author:   dmichelsen
Date:     2009-05-26 17:58:10 +0000 (Tue, 26 May 2009)

Log Message:
-----------
bdb44: Fix docdir

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

Modified: csw/mgar/pkg/bdb44/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb44/trunk/Makefile	2009-05-26 17:57:56 UTC (rev 5062)
+++ csw/mgar/pkg/bdb44/trunk/Makefile	2009-05-26 17:58:10 UTC (rev 5063)
@@ -34,6 +34,8 @@
 CONFIGURE_SCRIPTS = dist
 
 prefix = $(BUILD_PREFIX)/bdb44
+docdir = $(BUILD_PREFIX)/share/doc
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-cryptography
 CONFIGURE_ARGS += --enable-compat185
@@ -72,6 +74,11 @@
 
 LICENSE = LICENSE
 
+# Leave the docs where they are for now
+#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p"
+#EXTRA_PAX_ARGS_isa-i386    = -s ",^\.$(prefix)/docs/,$(docdir)/bdb44/,p"
+
+#PKGFILES_CSWbdb44-doc = $(PKGFILES_DOC)
 PKGFILES_CSWbdb44-doc = $(prefix)/docs/.*
 
 PKGFILES_CSWbdb44-devel = $(PKGFILES_DEVEL)


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


From dmichelsen at users.sourceforge.net  Tue May 26 19:57:56 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 26 May 2009 17:57:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[5062] csw/mgar/pkg
Message-ID: 

Revision: 5062
          http://gar.svn.sourceforge.net/gar/?rev=5062&view=rev
Author:   dmichelsen
Date:     2009-05-26 17:57:56 +0000 (Tue, 26 May 2009)

Log Message:
-----------
bdb47: Initial commit

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

Added Paths:
-----------
    csw/mgar/pkg/bdb47/

Removed Paths:
-------------
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.depend
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.gspec
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.prototype
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-doc.depend
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-doc.gspec
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-doc.prototype
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46.depend
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46.gspec
    csw/mgar/pkg/bdb47/trunk/files/CSWbdb46.prototype

Property Changed:
----------------
    csw/mgar/pkg/bdb47/trunk/


Property changes on: csw/mgar/pkg/bdb47/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/bdb47/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb46/trunk/Makefile	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/bdb47/trunk/Makefile	2009-05-26 17:57:56 UTC (rev 5062)
@@ -1,8 +1,8 @@
 GARNAME = db
-GARVERSION = 4.6.21
+GARVERSION = 4.7.25
 CATEGORIES = lib
 
-DESCRIPTION = embedded database libraries and utilities
+DESCRIPTION = Berkeley DB 4.7
 define BLURB
   Berkeley DB (libdb) is a programmatic toolkit that provides embedded database
   support for both traditional and client/server applications. It includes
@@ -15,9 +15,6 @@
 
 MASTER_SITES = http://download.oracle.com/berkeley-db/
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz 
-DISTFILES += $(call admfiles,CSWbdb46,depend prototype)
-DISTFILES += $(call admfiles,CSWbdb46-devel,depend prototype)
-DISTFILES += $(call admfiles,CSWbdb46-doc,depend prototype)
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -26,37 +23,69 @@
 
 WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix
 
-# No patches for the 4.6 series... yet.
+# No patches for the 4.7 series... yet.
 #PATCHDIR = $(WORKSRC)/..
 #PATCHDIRLEVEL = 0
 #PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*.diff))
 
+BUILD64 = 1
 CONFIGURE_SCRIPTS = dist
 
-CONFIGURE_ARGS  = --prefix=$(prefix)/bdb46
-CONFIGURE_ARGS += --disable-cryptography
+prefix = $(BUILD_PREFIX)/bdb47
+CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-compat185
 CONFIGURE_ARGS += --enable-o_direct
 CONFIGURE_ARGS += --enable-rpc
 CONFIGURE_ARGS += --enable-cxx
 CONFIGURE_ARGS += --enable-java
+
+# Exclude TCL support for 64 bit until we have a 64 bit TCL
+ifeq ($(MEMORYMODEL),32)
 CONFIGURE_ARGS += --enable-tcl
 CONFIGURE_ARGS += --with-tcl=$(libdir)
+endif
 
-FIXCONFIG_DIRS  = $(DESTDIR)$(prefix)/bdb46/lib
+FIXCONFIG_DIRS  = $(DESTDIR)$(prefix)/bdb47/lib
 
 # bdb tests are *very* time consuming
 TEST_SCRIPTS =
 
+NO_ISAEXEC = 1
+
+PACKAGES = CSWbdb47 CSWbdb47-devel CSWbdb47-doc
+
+CATALOGNAME_CSWbdb47       = berkeleydb47
+CATALOGNAME_CSWbdb47-devel = berkeleydb47_devel
+CATALOGNAME_CSWbdb47-doc   = berkeleydb47_doc
+
+ARCHALL_CSWbdb47-doc = 1
+
+SPKG_DESC_CSWbdb47       = BerkeleyDB 4.7 embedded database libraries and utilities
+SPKG_DESC_CSWbdb47-devel = BerkeleyDB 4.7 development support
+SPKG_DESC_CSWbdb47-doc   = BerkeleyDB 4.7 documentation
+
+REQUIRED_PKGS_CSWbdb47-devel = CSWbdb47
+
+LICENSE = LICENSE
+
+PKGFILES_CSWbdb47-doc = $(prefix)/docs/.*
+
+PKGFILES_CSWbdb47-devel = $(PKGFILES_DEVEL)
+
 include gar/category.mk
 
 LIBS += -lnsl
 export LIBS
 
-PATH := /usr/j2se/bin:$(PATH)
+PATH := /usr/jdk1.6.0_07/bin:$(PATH)
 export PATH
 
 configure-dist:
 	@( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) )
 	@$(MAKECOOKIE)
 
+post-merge:
+	gln -s . $(PKGROOT)$(libdir)/32
+	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64
+	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/bdb47/trunk/checksums
===================================================================
--- csw/mgar/pkg/bdb46/trunk/checksums	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/bdb47/trunk/checksums	2009-05-26 17:57:56 UTC (rev 5062)
@@ -1,10 +1 @@
-718082e7e35fc48478a2334b0bc4cd11  download/db-4.6.21.tar.gz
-aba0c466fce71fa800ff4458a8701500  download/CSWbdb46.gspec
-8093298b67861e241b0d2499c9f2ff89  download/CSWbdb46.depend
-a6db5a49695256610d79a0f562e0ec27  download/CSWbdb46.prototype
-3e067c8c8bb6752b43e57b36172413f5  download/CSWbdb46-devel.gspec
-b2084ee979fdcb4130e2c4cf96106731  download/CSWbdb46-devel.depend
-9dfce8d4a0b7db55bbc3f8c017afa95b  download/CSWbdb46-devel.prototype
-e7ccfc6fcb8b234e529f77a22b375819  download/CSWbdb46-doc.gspec
-8093298b67861e241b0d2499c9f2ff89  download/CSWbdb46-doc.depend
-fec8e74506f8e656bd4d24afdddadb94  download/CSWbdb46-doc.prototype
+ec2b87e833779681a0c3a814aa71359e  download/db-4.7.25.tar.gz

Deleted: csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.depend
===================================================================
--- csw/mgar/pkg/bdb46/trunk/files/CSWbdb46-devel.depend	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.depend	2009-05-26 17:57:56 UTC (rev 5062)
@@ -1 +0,0 @@
-P CSWbdb46 berkeleydb46 - BerkeleyDB 4.6 libraries and utilities

Deleted: csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.gspec
===================================================================
--- csw/mgar/pkg/bdb46/trunk/files/CSWbdb46-devel.gspec	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.gspec	2009-05-26 17:57:56 UTC (rev 5062)
@@ -1,5 +0,0 @@
-%var            bitname berkeleydb46_devel
-%var            pkgname CSWbdb46-devel
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%var            desc BerkeleyDB 4.6 development support
-%copyright      url file://%{WORKSRC}/../LICENSE

Deleted: csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.prototype
===================================================================
--- csw/mgar/pkg/bdb46/trunk/files/CSWbdb46-devel.prototype	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-devel.prototype	2009-05-26 17:57:56 UTC (rev 5062)
@@ -1,10 +0,0 @@
-d none /opt/csw/bdb46 0755 root bin
-f none /opt/csw/bdb46/include/db_185.h 0444 root bin
-f none /opt/csw/bdb46/include/db_cxx.h 0444 root bin
-d none /opt/csw/bdb46/lib 0755 root bin
-f none /opt/csw/bdb46/lib/libdb-4.6.a 0644 root bin
-f none /opt/csw/bdb46/lib/libdb-4.6.la 0644 root bin
-f none /opt/csw/bdb46/lib/libdb.a 0644 root bin
-f none /opt/csw/bdb46/lib/libdb_cxx-4.6.a 0644 root bin
-f none /opt/csw/bdb46/lib/libdb_cxx-4.6.la 0644 root bin
-f none /opt/csw/bdb46/lib/libdb_cxx.a 0644 root bin

Deleted: csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-doc.gspec
===================================================================
--- csw/mgar/pkg/bdb46/trunk/files/CSWbdb46-doc.gspec	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-doc.gspec	2009-05-26 17:57:56 UTC (rev 5062)
@@ -1,6 +0,0 @@
-%var            bitname berkeleydb46_doc
-%var            pkgname CSWbdb46-doc
-%var            arch all
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%var            desc BerkeleyDB 4.6 documentation
-%copyright      url file://%{WORKSRC}/../LICENSE

Deleted: csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-doc.prototype
===================================================================
--- csw/mgar/pkg/bdb46/trunk/files/CSWbdb46-doc.prototype	2009-05-25 10:42:53 UTC (rev 5039)
+++ csw/mgar/pkg/bdb47/trunk/files/CSWbdb46-doc.prototype	2009-05-26 17:57:56 UTC (rev 5062)
@@ -1,1764 +0,0 @@
-d none /opt/csw/bdb46 0755 root bin
-d none /opt/csw/bdb46/docs 0755 root bin
-d none /opt/csw/bdb46/docs/api_c 0755 root bin
-f none /opt/csw/bdb46/docs/api_c/api_core.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/c_pindex.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_associate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_compact.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_cursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_del.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_err.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_exists.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_fd.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_get_byteswapped.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_get_mpf.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_get_type.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_getenv.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_join.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_key_range.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_rename.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_alloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_append_recno.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_bt_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_bt_minkey.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_bt_prefix.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_dup_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_encrypt.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_errcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_errfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_errpfx.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_feedback.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_h_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_h_ffactor.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_h_hash.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_h_nelem.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_lorder.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_msgcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_msgfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_pagesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_q_extentsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_re_delim.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_re_len.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_re_pad.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_set_re_source.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_sync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_truncate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_upgrade.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/db_verify.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_count.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_del.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_dup.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbc_set_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbm.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbt_bulk.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbt_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/dbt_package.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_cdsgroup_begin.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_dbremove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_dbrename.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_err.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_event_notify.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_failchk.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_fileid_reset.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_lsn_reset.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_alloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_app_dispatch.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_cache_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_data_dir.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_encrypt.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_errcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_errfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_errpfx.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_feedback.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_isalive.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lg_bsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lg_dir.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lg_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lg_mode.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lg_regionmax.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lk_conflicts.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lk_detect.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lk_max_lockers.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lk_max_locks.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_lk_max_objects.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_mp_mmapsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_msgcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_msgfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_rpc_server.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_shm_key.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_thread_count.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_thread_id.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_thread_id_string.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_timeout.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_tmp_dir.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_tx_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_tx_timestamp.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_set_verbose.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_strerror.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/env_version.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/hsearch.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_detect.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_id.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_id_free.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lock_vec.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_archive.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_cursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_file.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_flush.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_printf.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/log_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/logc_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/logc_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/logc_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/lsn_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_fclose.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_fcreate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_fget.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_fopen.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_fput.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_fsync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_maxwrite.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_openfd.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_register.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_clear_len.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_fileid.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_ftype.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_lsn_offset.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_maxsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_pgcookie.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_set_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_sync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/memp_trickle.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mempfile_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_alloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_free.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_lock.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_set_align.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_set_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_set_tas_spins.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/mutex_unlock.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/object.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/pindex.src 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_config.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_elect.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_limit.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_message.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_nsites.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_request.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_start.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_sync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_timeout.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/rep_transport.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/repmgr_ack_policy.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/repmgr_local_site.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/repmgr_remote_site.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/repmgr_site_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/repmgr_start.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/repmgr_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_initial_value.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_set_cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_set_range.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/seq_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_dirfree.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_dirlist.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_exists.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_free.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_fsync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_ftruncate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_ioinfo.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_malloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_map.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_pread.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_pwrite.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_read.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_realloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_rename.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_seek.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_sleep.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_unlink.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_unmap.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_write.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/set_func_yield.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_abort.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_begin.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_checkpoint.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_commit.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_discard.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_id.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_prepare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_recover.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_set_name.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_set_timeout.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_c/txn_stat.html 0444 root bin
-d none /opt/csw/bdb46/docs/api_cxx 0755 root bin
-f none /opt/csw/bdb46/docs/api_cxx/api_core.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/cxx_pindex.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_associate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_compact.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_cursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_del.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_err.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_exists.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_fd.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_get_byteswapped.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_get_mpf.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_get_type.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_getenv.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_join.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_key_range.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_rename.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_alloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_append_recno.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_bt_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_bt_minkey.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_bt_prefix.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_dup_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_encrypt.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_errcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_errfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_error_stream.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_errpfx.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_feedback.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_h_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_h_ffactor.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_h_hash.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_h_nelem.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_lorder.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_msg_stream.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_msgcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_msgfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_pagesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_q_extentsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_re_delim.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_re_len.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_re_pad.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_set_re_source.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_sync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_truncate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_upgrade.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/db_verify.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_count.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_del.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_dup.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbc_set_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbt_bulk_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbt_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/dbt_package.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/deadlock_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_cdsgroup_begin.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_dbremove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_dbrename.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_err.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_event_notify.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_failchk.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_fileid_reset.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_lsn_reset.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_alloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_app_dispatch.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_cache_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_data_dir.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_encrypt.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_errcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_errfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_error_stream.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_errpfx.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_feedback.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_isalive.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lg_bsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lg_dir.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lg_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lg_mode.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lg_regionmax.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lk_conflicts.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lk_detect.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lk_max_lockers.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lk_max_locks.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_lk_max_objects.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_mp_mmapsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_msg_stream.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_msgcall.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_msgfile.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_rpc_server.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_shm_key.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_thread_count.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_thread_id.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_thread_id_string.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_timeout.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_tmp_dir.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_tx_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_tx_timestamp.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_set_verbose.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_strerror.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/env_version.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/exc_package.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/except_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_detect.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_id.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_id_free.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lock_vec.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lockng_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_archive.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_compare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_cursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_file.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_flush.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_printf.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/log_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/logc_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/logc_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/logc_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/lsn_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_fclose.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_fcreate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_fget.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_fopen.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_fput.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_fsync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_maxwrite.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_openfd.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_register.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_clear_len.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_fileid.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_ftype.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_lsn_offset.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_maxsize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_pgcookie.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_set_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_sync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/memp_trickle.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mempfile_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_alloc.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_free.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_lock.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_set_align.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_set_max.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_set_tas_spins.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/mutex_unlock.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/object.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/pindex.src 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_config.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_elect.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_limit.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_message.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_nsites.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_priority.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_request.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_start.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_sync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_timeout.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/rep_transport.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/repmgr_ack_policy.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/repmgr_local_site.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/repmgr_remote_site.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/repmgr_site_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/repmgr_start.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/repmgr_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/runrec_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_initial_value.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_set_cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_set_flags.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_set_range.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/seq_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_abort.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_begin.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_checkpoint.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_class.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_commit.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_discard.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_id.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_list.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_prepare.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_recover.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_set_name.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_set_timeout.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_cxx/txn_stat.html 0444 root bin
-d none /opt/csw/bdb46/docs/api_tcl 0755 root bin
-f none /opt/csw/bdb46/docs/api_tcl/api_tcl.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_count.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_cursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_del.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_get_join.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_get_type.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_is_byteswapped.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_join.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_rename.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_stat.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_sync.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/db_truncate.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/dbc_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/dbc_del.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/dbc_dup.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/dbc_get.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/dbc_put.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/env_close.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/env_dbremove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/env_dbrename.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/env_open.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/env_remove.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/txn.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/txn_abort.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/txn_checkpoint.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/txn_commit.html 0444 root bin
-f none /opt/csw/bdb46/docs/api_tcl/version.html 0444 root bin
-d none /opt/csw/bdb46/docs/articles 0755 root bin
-d none /opt/csw/bdb46/docs/articles/inmemory 0755 root bin
-d none /opt/csw/bdb46/docs/articles/inmemory/C 0755 root bin
-f none /opt/csw/bdb46/docs/articles/inmemory/C/InMemoryDBApplication.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/articles/inmemory/C/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/articles/inmemory/C/index.html 0444 root bin
-d none /opt/csw/bdb46/docs/collections 0755 root bin
-d none /opt/csw/bdb46/docs/collections/tutorial 0755 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/BasicProgram.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/BerkeleyDB-Java-Collections.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/Entity.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/SerializableEntity.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/SerializedObjectStorage.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/Summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/Tuple.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/UsingCollectionsAPI.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/UsingSecondaries.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/UsingStoredCollections.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/addingdatabaseitems.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/collectionOverview.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/collectionswithentities.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/createbindingscollections.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/creatingentitybindings.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/developing.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/entitieswithcollections.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/handlingexceptions.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/implementingmain.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/indexedcollections.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/intro.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/moreinfo.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/openclasscatalog.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/opendatabases.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/opendbenvironment.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/openingforeignkeys.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/removingredundantvalueclasses.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/retrievingbyindexkey.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/retrievingdatabaseitems.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/sortedcollections.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/transientfieldsinbinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/tuple-serialentitybindings.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/tuplekeybindings.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/tupleswithkeycreators.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/tutorialintroduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/collections/tutorial/usingtransactions.html 0444 root bin
-d none /opt/csw/bdb46/docs/gsg 0755 root bin
-d none /opt/csw/bdb46/docs/gsg/C 0755 root bin
-f none /opt/csw/bdb46/docs/gsg/C/BerkeleyDB-Core-C-GSG.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/CoreCursorUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/CoreDBAdmin.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/CoreDbUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/CoreEnvUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/Cursors.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/DB.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/DBEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/DBOpenFlags.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/DbUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/DeleteEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/Positioning.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/PutEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/ReplacingEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/accessmethods.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/btree.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/concepts.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/coredbclose.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/coreindexusage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/cstructs.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/databaseLimits.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/dbErrorReporting.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/dbconfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/environments.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/gettingit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/indexes.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/joins.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/keyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/readSecondary.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/returns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/secondaryCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/secondaryDelete.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/C/usingDbt.html 0444 root bin
-d none /opt/csw/bdb46/docs/gsg/CXX 0755 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/BerkeleyDB-Core-Cxx-GSG.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/CoreCursorUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/CoreDBAdmin.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/CoreDbCXXUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/CoreEnvUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/Cursors.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/DB.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/DBEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/DBOpenFlags.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/DbCXXUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/DeleteEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/Positioning.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/PutEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/ReplacingEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/accessmethods.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/btree.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/concepts.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/coreExceptions.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/coredbclose.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/coreindexusage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/databaseLimits.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/dbErrorReporting.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/dbconfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/environments.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/gettingit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/indexes.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/joins.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/keyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/readSecondary.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/returns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/secondaryCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/secondaryDelete.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/CXX/usingDbt.html 0444 root bin
-d none /opt/csw/bdb46/docs/gsg/JAVA 0755 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/BerkeleyDB-Core-JAVA-GSG.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/CoreEnvUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/CoreJavaUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/Cursors.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/DB.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/DBAdmin.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/DBEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/DeleteEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/Positioning.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/PutEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/ReplacingEntryWCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/accessmethods.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/bindAPI.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/btree.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/cachesize.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/concepts.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/coreExceptions.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/coredbclose.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/cursorJavaUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/databaseLimits.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/dbErrorReporting.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/db_config.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/dbconfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/dbtJavaUsage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/environments.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/gettingit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/indexes.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/javaindexusage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/joins.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/keyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/readSecondary.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/returns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/secondaryCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/secondaryDelete.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/secondaryProps.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg/JAVA/usingDbt.html 0444 root bin
-d none /opt/csw/bdb46/docs/gsg_db_rep 0755 root bin
-d none /opt/csw/bdb46/docs/gsg_db_rep/C 0755 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/Replication-C-GSG.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/addfeatures.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/apioverview.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/bulk.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/c2ctransfer.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/elections.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/electiontimes.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/exampledoloop.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/fmwrkconnectretry.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/fwrkmasterreplica.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/fwrkpermmessage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/manageblock.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/noautoinit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/permmessages.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/processingloop.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/repadvantage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/repapp.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/repmgr_init_example_c.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/simpleprogramlisting.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/C/txnapp.html 0444 root bin
-d none /opt/csw/bdb46/docs/gsg_db_rep/CXX 0755 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/Replication-CXX-GSG.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/addfeatures.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/apioverview.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/bulk.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/c2ctransfer.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/elections.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/electiontimes.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/exampledoloop.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/fmwrkconnectretry.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/fwrkmasterreplica.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/fwrkpermmessage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/manageblock.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/noautoinit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/permmessages.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/processingloop.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/repadvantage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/repapp.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/repmgr_init_example_c.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/simpleprogramlisting.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/CXX/txnapp.html 0444 root bin
-d none /opt/csw/bdb46/docs/gsg_db_rep/JAVA 0755 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/Replication-JAVA-GSG.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/addfeatures.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/apioverview.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/bulk.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/c2ctransfer.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/elections.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/electiontimes.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/exampledoloop.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/fmwrkconnectretry.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/fwrkmasterreplica.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/fwrkpermmessage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/manageblock.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/noautoinit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/permmessages.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/processingloop.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/repadvantage.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/repapp.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/repmgr_init_example_c.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/simpleprogramlisting.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_db_rep/JAVA/txnapp.html 0444 root bin
-d none /opt/csw/bdb46/docs/gsg_txn 0755 root bin
-d none /opt/csw/bdb46/docs/gsg_txn/C 0755 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/BerkeleyDB-Core-C-Txn.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/abortresults.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/architectrecovery.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/autocommit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/backuprestore.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/blocking_deadlocks.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/deadlock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/enabletxn.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/envopen.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/filemanagement.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/hotfailover.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/inmem_txnexample_c.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/isolation.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/lockingsubsystem.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/logconfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/logfileremoval.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/maxtxns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/nestedtxn.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/perftune-intro.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/readblock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/readmodifywrite.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/recovery-intro.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/recovery.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/reversesplit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/rwlocks1.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/simplelock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/txn_ccursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/txnconcurrency.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/txncursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/txnexample_c.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/txnindices.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/txnnowait.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/usingtxns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/wrapup.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/C/writeblock.jpg 0444 root bin
-d none /opt/csw/bdb46/docs/gsg_txn/CXX 0755 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/BerkeleyDB-Core-Cxx-Txn.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/abortresults.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/architectrecovery.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/autocommit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/backuprestore.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/blocking_deadlocks.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/deadlock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/enabletxn.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/envopen.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/filemanagement.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/hotfailover.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/inmem_txnexample_c.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/isolation.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/lockingsubsystem.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/logconfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/logfileremoval.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/maxtxns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/nestedtxn.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/perftune-intro.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/readblock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/readmodifywrite.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/recovery-intro.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/recovery.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/reversesplit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/rwlocks1.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/simplelock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/txn_ccursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/txnconcurrency.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/txncursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/txnexample_c.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/txnindices.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/txnnowait.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/usingtxns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/wrapup.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/CXX/writeblock.jpg 0444 root bin
-d none /opt/csw/bdb46/docs/gsg_txn/JAVA 0755 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/BerkeleyDB-Core-JAVA-Txn.pdf 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/abortresults.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/architectrecovery.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/autocommit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/backuprestore.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/blocking_deadlocks.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/deadlock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/enabletxn.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/envopen.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/filemanagement.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/gettingStarted.css 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/hotfailover.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/inmem_txnexample_java.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/introduction.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/isolation.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/lockingsubsystem.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/logconfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/logfileremoval.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/maxtxns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/nestedtxn.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/perftune-intro.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/preface.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/readblock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/readmodifywrite.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/recovery-intro.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/recovery.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/reversesplit.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/rwlocks1.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/simplelock.jpg 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/txn_ccursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/txnconcurrency.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/txncursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/txnexample_java.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/txnindices.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/txnnowait.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/usingtxns.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/wrapup.html 0444 root bin
-f none /opt/csw/bdb46/docs/gsg_txn/JAVA/writeblock.jpg 0444 root bin
-d none /opt/csw/bdb46/docs/images 0755 root bin
-f none /opt/csw/bdb46/docs/images/api.gif 0444 root bin
-f none /opt/csw/bdb46/docs/images/next.gif 0444 root bin
-f none /opt/csw/bdb46/docs/images/prev.gif 0444 root bin
-f none /opt/csw/bdb46/docs/images/ps.gif 0444 root bin
-f none /opt/csw/bdb46/docs/images/ref.gif 0444 root bin
-f none /opt/csw/bdb46/docs/index.html 0444 root bin
-d none /opt/csw/bdb46/docs/java 0755 root bin
-f none /opt/csw/bdb46/docs/java/allclasses-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/allclasses-noframe.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com 0755 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat 0755 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/bind 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/ByteArrayBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/EntityBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/EntryBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/RecordNumberBinding.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/bind/class-use 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/class-use/ByteArrayBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/class-use/EntityBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/class-use/EntryBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/class-use/RecordNumberBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/package-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/package-summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/package-tree.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/package-use.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/ClassCatalog.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/SerialBase.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/SerialBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/SerialInput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/SerialOutput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/SerialSerialBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/SerialSerialKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/StoredClassCatalog.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/TupleSerialBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/TupleSerialKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/ClassCatalog.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/SerialBase.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/SerialBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/SerialInput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/SerialOutput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/SerialSerialBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/SerialSerialKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/StoredClassCatalog.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialMarshalledBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/class-use/TupleSerialMarshalledKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/package-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/package-summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/package-tree.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/serial/package-use.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/BigIntegerBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/BooleanBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/ByteBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/CharacterBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/DoubleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/FloatBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/IntegerBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/LongBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/MarshalledTupleEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/ShortBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/SortedDoubleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/SortedFloatBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/StringBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleBase.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleInput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleInputBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleMarshalledBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleOutput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleTupleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleTupleKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/BigIntegerBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/BooleanBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/ByteBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/CharacterBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/DoubleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/FloatBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/IntegerBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/LongBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/MarshalledTupleEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/MarshalledTupleKeyEntity.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/ShortBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/SortedDoubleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/SortedFloatBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/StringBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleBase.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleInput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleInputBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleMarshalledBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleOutput.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleMarshalledBinding.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/class-use/TupleTupleMarshalledKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/package-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/package-summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/package-tree.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/bind/tuple/package-use.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/collections 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/CurrentTransaction.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/MapEntryParameter.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/PrimaryKeyAssigner.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredCollection.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredCollections.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredContainer.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredEntrySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredIterator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredKeySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredList.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredMap.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredSortedEntrySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredSortedKeySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredSortedMap.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredSortedValueSet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/StoredValueSet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/TransactionRunner.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/TransactionWorker.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/TupleSerialFactory.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/CurrentTransaction.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/MapEntryParameter.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/PrimaryKeyAssigner.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredCollection.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredCollections.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredContainer.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredEntrySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredIterator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredKeySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredList.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredMap.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredSortedEntrySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredSortedKeySet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredSortedMap.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredSortedValueSet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/StoredValueSet.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/TransactionRunner.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/TransactionWorker.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/class-use/TupleSerialFactory.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/package-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/package-summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/package-tree.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/collections/package-use.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/db 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/BtreePrefixCalculator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/BtreeStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CacheFile.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CacheFilePriority.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CacheFileStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CacheStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CheckpointConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CompactConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CompactStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/Cursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/CursorConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/Database.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/DatabaseConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/DatabaseEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/DatabaseException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/DatabaseStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/DatabaseType.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/DeadlockException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/Environment.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/EnvironmentConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ErrorHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/EventHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/EventHandlerAdapter.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/FeedbackHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/HashStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/Hasher.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/JoinConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/JoinCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/KeyRange.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/Lock.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LockDetectMode.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LockMode.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LockNotGrantedException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LockOperation.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LockRequest.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LockRequestMode.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LockStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LogCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LogRecordHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LogSequenceNumber.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/LogStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MemoryException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MessageHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MultipleDataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MultipleEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MultipleKeyDataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MultipleKeyNIODataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MultipleNIODataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MultipleRecnoDataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MultipleRecnoNIODataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/MutexStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/OperationStatus.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/PanicHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/PreparedTransaction.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/QueueStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/RecordNumberAppender.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/RecoveryOperation.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationDuplicateMasterException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationHandleDeadException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationHoldElectionException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationHostAddress.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationJoinFailureException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationLeaseExpiredException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationLeaseTimeoutException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationLockoutException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationManagerAckPolicy.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationManagerStartPolicy.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationManagerStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationSiteUnavailableException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationStatus.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationTimeoutType.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/ReplicationTransport.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/RunRecoveryException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/SecondaryConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/SecondaryCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/SecondaryDatabase.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/SecondaryKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/SecondaryMultiKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/Sequence.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/SequenceConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/SequenceStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/StatsConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/Transaction.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/TransactionConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/TransactionStats.Active.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/TransactionStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/VerboseConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/VerifyConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/VersionMismatchException.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/BtreePrefixCalculator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/BtreeStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CacheFile.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CacheFilePriority.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CacheFileStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CacheStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CheckpointConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CompactConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CompactStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/Cursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/CursorConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/Database.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/DatabaseConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/DatabaseEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/DatabaseException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/DatabaseStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/DatabaseType.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/DeadlockException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/Environment.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/EnvironmentConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ErrorHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/EventHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/EventHandlerAdapter.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/FeedbackHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/HashStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/Hasher.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/JoinConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/JoinCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/KeyRange.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/Lock.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LockDetectMode.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LockMode.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LockNotGrantedException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LockOperation.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LockRequest.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LockRequestMode.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LockStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LogCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LogRecordHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LogSequenceNumber.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/LogStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MemoryException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MessageHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MultipleDataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MultipleEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MultipleKeyDataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MultipleKeyNIODataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MultipleNIODataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MultipleRecnoDataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MultipleRecnoNIODataEntry.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/MutexStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/OperationStatus.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/PanicHandler.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/PreparedTransaction.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/QueueStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/RecordNumberAppender.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/RecoveryOperation.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationDuplicateMasterException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationHandleDeadException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationHoldElectionException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationHostAddress.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationJoinFailureException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationLeaseExpiredException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationLeaseTimeoutException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationLockoutException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationManagerAckPolicy.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationManagerStartPolicy.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationManagerStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationSiteUnavailableException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationStatus.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationTimeoutType.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/ReplicationTransport.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/RunRecoveryException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/SecondaryConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/SecondaryCursor.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/SecondaryDatabase.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/SecondaryKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/SecondaryMultiKeyCreator.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/Sequence.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/SequenceConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/SequenceStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/StatsConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/Transaction.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/TransactionConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/TransactionStats.Active.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/TransactionStats.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/VerboseConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/VerifyConfig.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/class-use/VersionMismatchException.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/package-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/package-summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/package-tree.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/db/package-use.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/util 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/ExceptionUnwrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/ExceptionWrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/FastInputStream.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/FastOutputStream.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/IOExceptionWrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/PackedInteger.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/RuntimeExceptionWrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/UtfOps.html 0444 root bin
-d none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use 0755 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/ExceptionUnwrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/ExceptionWrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/FastInputStream.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/FastOutputStream.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/IOExceptionWrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/PackedInteger.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/RuntimeExceptionWrapper.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/class-use/UtfOps.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/package-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/package-summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/package-tree.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/com/sleepycat/util/package-use.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/constant-values.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/deprecated-list.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/help-doc.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/index-all.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/index.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/overview-frame.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/overview-summary.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/overview-tree.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/package-list 0444 root bin
-d none /opt/csw/bdb46/docs/java/resources 0755 root bin
-f none /opt/csw/bdb46/docs/java/resources/inherit.gif 0444 root bin
-f none /opt/csw/bdb46/docs/java/serialized-form.html 0444 root bin
-f none /opt/csw/bdb46/docs/java/style.css 0444 root bin
-d none /opt/csw/bdb46/docs/license 0755 root bin
-f none /opt/csw/bdb46/docs/license/license_db.html 0444 root bin
-d none /opt/csw/bdb46/docs/ref 0755 root bin
-d none /opt/csw/bdb46/docs/ref/am 0755 root bin
-f none /opt/csw/bdb46/docs/ref/am/close.html 0444 root bin
-f none /opt/csw/bdb46/docs/ref/am/count.html 0444 root bin
-f none /opt/csw/bdb46/docs/ref/am/curclose.html 0444 root bin

@@ Diff output truncated at 100000 characters. @@

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


From valholla at users.sourceforge.net  Tue May 26 20:36:09 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Tue, 26 May 2009 18:36:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[5064]
 csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.4. 16-ntlm.diff
Message-ID: 

Revision: 5064
          http://gar.svn.sourceforge.net/gar/?rev=5064&view=rev
Author:   valholla
Date:     2009-05-26 18:36:09 +0000 (Tue, 26 May 2009)

Log Message:
-----------
patch for 2.4.16

Added Paths:
-----------
    csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.4.16-ntlm.diff

Added: csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.4.16-ntlm.diff
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.4.16-ntlm.diff	                        (rev 0)
+++ csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.4.16-ntlm.diff	2009-05-26 18:36:09 UTC (rev 5064)
@@ -0,0 +1,188 @@
+--- openldap-2.4.16/include/ldap.h.o	2009-05-26 13:22:52.647989500 -0500
++++ openldap-2.4.16/include/ldap.h	2009-05-26 13:25:07.020609500 -0500
+@@ -2478,5 +2478,25 @@
+ 	LDAPControl	**ctrls,
+ 	LDAPDerefRes	**drp ));
+ 
++/*
++ * hacks for NTLM
++ */
++#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
++#define LDAP_AUTH_NTLM_RESPONSE    ((ber_tag_t) 0x8bU)
++LDAP_F( int )
++ldap_ntlm_bind LDAP_P((
++   LDAP        *ld,
++   LDAP_CONST char *dn,
++   ber_tag_t   tag,
++   struct berval   *cred,
++   LDAPControl **sctrls,
++   LDAPControl **cctrls,
++   int     *msgidp ));
++LDAP_F( int )
++ldap_parse_ntlm_bind_result LDAP_P((
++   LDAP        *ld,
++   LDAPMessage *res,
++   struct berval   *challenge));
++
+ LDAP_END_DECL
+ #endif /* _LDAP_H */
+--- openldap-2.4.16/libraries/libldap/Makefile.in.o	2009-05-26 13:25:25.012445100 -0500
++++ openldap-2.4.16/libraries/libldap/Makefile.in	2009-05-26 13:26:22.377603200 -0500
+@@ -20,7 +20,7 @@
+ SRCS	= bind.c open.c result.c error.c compare.c search.c \
+ 	controls.c messages.c references.c extended.c cyrus.c \
+ 	modify.c add.c modrdn.c delete.c abandon.c \
+-	sasl.c gssapi.c sbind.c unbind.c cancel.c  \
++	sasl.c ntlm.c gssapi.c sbind.c unbind.c cancel.c  \
+ 	filter.c free.c sort.c passwd.c whoami.c \
+ 	getdn.c getentry.c getattr.c getvalues.c addentry.c \
+ 	request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \
+@@ -33,7 +33,7 @@
+ OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
+ 	controls.lo messages.lo references.lo extended.lo cyrus.lo \
+ 	modify.lo add.lo modrdn.lo delete.lo abandon.lo \
+-	sasl.lo gssapi.lo sbind.lo unbind.lo cancel.lo \
++	sasl.lo ntlm.lo gssapi.lo sbind.lo unbind.lo cancel.lo \
+ 	filter.lo free.lo sort.lo passwd.lo whoami.lo \
+ 	getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
+ 	request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
+--- /dev/null	2009-05-26 13:31:57.000000000 -0500
++++ openldap-2.4.16/libraries/libldap/ntlm.c	2009-05-26 13:28:07.845816300 -0500
+@@ -0,0 +1,137 @@
++/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
++/*
++ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
++ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
++ */
++
++/* Mostly copied from sasl.c */
++
++#include "portable.h"
++
++#include 
++#include 
++
++#include 
++#include 
++#include 
++#include 
++
++#include "ldap-int.h"
++
++int
++ldap_ntlm_bind(
++       LDAP            *ld,
++       LDAP_CONST char *dn,
++       ber_tag_t       tag,
++       struct berval   *cred,
++       LDAPControl     **sctrls,
++       LDAPControl     **cctrls,
++       int             *msgidp )
++{
++       BerElement      *ber;
++       int rc;
++       ber_int_t id;
++
++       Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
++
++       assert( ld != NULL );
++       assert( LDAP_VALID( ld ) );
++       assert( msgidp != NULL );
++
++       if( msgidp == NULL ) {
++               ld->ld_errno = LDAP_PARAM_ERROR;
++               return ld->ld_errno;
++       }
++
++       /* create a message to send */
++       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
++               ld->ld_errno = LDAP_NO_MEMORY;
++               return ld->ld_errno;
++       }
++
++       assert( LBER_VALID( ber ) );
++
++       LDAP_NEXT_MSGID( ld, id );
++       rc = ber_printf( ber, "{it{istON}" /*}*/,
++                        id, LDAP_REQ_BIND,
++                        ld->ld_version, dn, tag,
++                        cred );
++
++       /* Put Server Controls */
++       if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
++               ber_free( ber, 1 );
++               return ld->ld_errno;
++       }
++
++       if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
++               ld->ld_errno = LDAP_ENCODING_ERROR;
++               ber_free( ber, 1 );
++               return ld->ld_errno;
++       }
++
++       /* send the message */
++       *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
++
++       if(*msgidp < 0)
++               return ld->ld_errno;
++
++       return LDAP_SUCCESS;
++}
++
++int
++ldap_parse_ntlm_bind_result(
++       LDAP            *ld,
++       LDAPMessage     *res,
++       struct berval   *challenge)
++{
++       ber_int_t       errcode;
++       ber_tag_t       tag;
++       BerElement      *ber;
++       ber_len_t       len;
++
++       Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
++
++       assert( ld != NULL );
++       assert( LDAP_VALID( ld ) );
++       assert( res != NULL );
++
++       if ( ld == NULL || res == NULL ) {
++               return LDAP_PARAM_ERROR;
++       }
++
++       if( res->lm_msgtype != LDAP_RES_BIND ) {
++               ld->ld_errno = LDAP_PARAM_ERROR;
++               return ld->ld_errno;
++       }
++
++       if ( ld->ld_error ) {
++               LDAP_FREE( ld->ld_error );
++               ld->ld_error = NULL;
++       }
++       if ( ld->ld_matched ) {
++               LDAP_FREE( ld->ld_matched );
++               ld->ld_matched = NULL;
++       }
++
++       /* parse results */
++
++       ber = ber_dup( res->lm_ber );
++
++       if( ber == NULL ) {
++               ld->ld_errno = LDAP_NO_MEMORY;
++               return ld->ld_errno;
++       }
++
++       tag = ber_scanf( ber, "{ioa" /*}*/,
++                        &errcode, challenge, &ld->ld_error );
++       ber_free( ber, 0 );
++
++       if( tag == LBER_ERROR ) {
++               ld->ld_errno = LDAP_DECODING_ERROR;
++               return ld->ld_errno;
++       }
++
++       ld->ld_errno = errcode;
++
++       return( ld->ld_errno );
++}


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


From wbonnet at users.sourceforge.net  Tue May 26 21:56:55 2009
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Tue, 26 May 2009 19:56:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[5065] csw/mgar/pkg/pixman/trunk
Message-ID: 

Revision: 5065
          http://gar.svn.sourceforge.net/gar/?rev=5065&view=rev
Author:   wbonnet
Date:     2009-05-26 19:56:55 +0000 (Tue, 26 May 2009)

Log Message:
-----------
Upgrade to 0.15.6

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

Modified: csw/mgar/pkg/pixman/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pixman/trunk/Makefile	2009-05-26 18:36:09 UTC (rev 5064)
+++ csw/mgar/pkg/pixman/trunk/Makefile	2009-05-26 19:56:55 UTC (rev 5065)
@@ -1,5 +1,5 @@
 GARNAME      = pixman
-GARVERSION   = 0.15.2
+GARVERSION   = 0.15.6
 CATEGORIES   = lib
 
 DESCRIPTION = The pixel-manipulation library for X and cairo

Modified: csw/mgar/pkg/pixman/trunk/checksums
===================================================================
--- csw/mgar/pkg/pixman/trunk/checksums	2009-05-26 18:36:09 UTC (rev 5064)
+++ csw/mgar/pkg/pixman/trunk/checksums	2009-05-26 19:56:55 UTC (rev 5065)
@@ -1,3 +1 @@
-09e58b9e029eb63c896ad2ff70fc7915  download/CSWpixman.gspec
-89d81c718f669974964dd9c62217c191  download/license.txt
-ac7d687548f02b384d0cab1021d91ce5  download/pixman-0.15.2.tar.gz
+fe922698df46b21d7e19f28ded4ca100  download/pixman-0.15.6.tar.gz


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


From dmichelsen at users.sourceforge.net  Tue May 26 22:05:39 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 26 May 2009 20:05:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[5066] csw/mgar/pkg/openldap/trunk
Message-ID: 

Revision: 5066
          http://gar.svn.sourceforge.net/gar/?rev=5066&view=rev
Author:   dmichelsen
Date:     2009-05-26 20:05:35 +0000 (Tue, 26 May 2009)

Log Message:
-----------
openldap: Move to dynamic gspec, update to 2.4.16

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

Removed Paths:
-------------
    csw/mgar/pkg/openldap/trunk/files/CSWoldap.depend
    csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.depend
    csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.gspec
    csw/mgar/pkg/openldap/trunk/files/CSWoldapdevel.depend
    csw/mgar/pkg/openldap/trunk/files/CSWoldaprt.depend
    csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.3.24-ntlm.diff

Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,5 +1,5 @@
 GARNAME = openldap
-GARVERSION = 2.3.40
+GARVERSION = 2.4.16
 CATEGORIES = server
 
 DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol
@@ -13,23 +13,40 @@
 
 MASTER_SITES = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tgz
-DISTFILES += $(call admfiles,CSWoldap,depend)
+DISTFILES += $(call admfiles,CSWoldap)
 DISTFILES += cswopenldap openldap.xml svc-openldap
-DISTFILES += $(call admfiles,CSWoldapclient,depend)
-DISTFILES += $(call admfiles,CSWoldapdevel,depend)
-DISTFILES += $(call admfiles,CSWoldaprt,depend)
 DISTFILES += README.CSW openldaprc
 
+LICENSE = COPYRIGHT
+
+PACKAGES = CSWoldap CSWoldapclient CSWoldapdevel CSWoldaprt
+
+CATALOGNAME_CSWoldapclient = openldap_client
+CATALOGNAME_CSWoldapdevel  = openldap_devel
+CATALOGNAME_CSWoldaprt     = openldap_rt
+
+SPKG_DESC_CSWoldapclient = OpenLDAP client executables
+SPKG_DESC_CSWoldapdevel  = OpenLDAP development support
+SPKG_DESC_CSWoldaprt     = OpenLDAP runtime libraries
+
+REQUIRED_PKGS_CSWoldap       = CSWbdb4 CSWiconv CSWlibnet CSWlibtoolrt CSWoldaprt
+REQUIRED_PKGS_CSWoldap      += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc
+REQUIRED_PKGS_CSWoldapclient = CSWlibnet CSWoldaprt CSWosslrt CSWsasl
+REQUIRED_PKGS_CSWoldapdevel  = CSWoldaprt
+REQUIRED_PKGS_CSWoldaprt     = CSWlibnet CSWosslrt CSWsasl
+
+SPKG_SOURCEURL = http://www.openldap.org
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-PATCHFILES = patch-oldap-2.3.24-ntlm.diff
+PATCHFILES = patch-oldap-2.4.16-ntlm.diff
 DISTFILES += $(PATCHFILES)
 
 EXTRA_DOCS = README.CSW openldaprc $(PATCHFILES)
 
-EXTRA_LIB = $(prefix)/bdb4/lib 
-EXTRA_INC = $(prefix)/bdb4/include
+EXTRA_LIB = $(prefix)/bdb44/lib 
+EXTRA_INC = $(prefix)/bdb44/include
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
@@ -50,8 +67,11 @@
 PKGFILES_CSWoldaprt += $(sysconfdir)/ldap.conf
 PKGFILES_CSWoldaprt += $(mandir)/man5/ldap.conf.5
 
-include ../category.mk
+include gar/category.mk
 
+CFLAGS := $(filter-out -I%,$(CFLAGS))
+DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS))
+
 INSTALL_SCRIPTS += custom
 
 install-custom:

Modified: csw/mgar/pkg/openldap/trunk/checksums
===================================================================
--- csw/mgar/pkg/openldap/trunk/checksums	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/checksums	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,19 +1,8 @@
-728e95d806a3d47d9686481d72e62072  download/openldap-2.3.40.tgz
 2f6e6a8c9c3497f1c0c9d52ea2d1dafa  download/CSWoldap.gspec
-059b2c7ae6d2f181e9098a8afc852ce4  download/CSWoldap.depend
-bebf1c2805dfe126938a9631f9d7947f  download/CSWoldap.prototype
+892dba5f625755be024c30ea0055fd55  download/README.CSW
 d7e13ba31a8de786f7cdbe3d529a9728  download/cswopenldap
+ed5b86e9d2b372d10edfe3bb59fee165  download/openldap-2.4.16.tgz
 0e57547ad2b5fedca9f0bd4beaddfe39  download/openldap.xml
-e15c2020566e56f02118e75c89111f15  download/svc-openldap
-5eb9a4b33ac44dd218d508e17f827461  download/CSWoldapclient.gspec
-ff1e9fbbaf7b56927e297226ed429b0f  download/CSWoldapclient.depend
-14406b97a0e1587071f8598132f64bab  download/CSWoldapclient.prototype
-16a7768e2473edbbb3bdff1c64835f1c  download/CSWoldapdevel.gspec
-6d30b718d20705441b89353dae9e64b4  download/CSWoldapdevel.depend
-aa020153cf5ecfc19252d45e89708eda  download/CSWoldapdevel.prototype
-0cc22644bd37d23564afb7fba580d607  download/CSWoldaprt.gspec
-85d952cebd7d6cc954c08f8b446815ba  download/CSWoldaprt.depend
-755aef96cb0ab523b49e83504d37c107  download/CSWoldaprt.prototype
-892dba5f625755be024c30ea0055fd55  download/README.CSW
 ab2ac7519b092ce8d16124c5270bfec0  download/openldaprc
-2d8b0286819ffcb41761a6fdd735c5ae  download/patch-oldap-2.3.24-ntlm.diff
+d3dee9018137c39f357859b652e3a67c  download/patch-oldap-2.4.16-ntlm.diff
+e15c2020566e56f02118e75c89111f15  download/svc-openldap

Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldap.depend
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldap.depend	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldap.depend	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,9 +0,0 @@
-P CSWbdb4     berkeleydb4 - Embedded database libraries and utilities
-P CSWiconv    libiconv - GNU iconv library
-P CSWlibnet   libnet - the libnet packet construction library
-P CSWlibtool  libtool - Generic library support script
-P CSWoldaprt  openldap_rt - OpenLDAP runtime libraries (oldaprt)
-P CSWossl     openssl - Openssl meta package
-P CSWsasl     sasl - Simple Authentication and Security Layer
-P CSWtcpwrap  tcpwrappers - (ipv6.4 patched) lib and tools for pre-screening tcp connections
-P CSWunixodbc unixodbc - ODBC access to data sources

Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.depend
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.depend	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.depend	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,4 +0,0 @@
-P CSWlibnet  libnet - the libnet packet construction library
-P CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt)
-P CSWosslrt  openssl_rt - Openssl runtime libraries
-P CSWsasl    sasl - Simple Authentication and Security Layer

Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.gspec
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.gspec	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.gspec	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,5 +0,0 @@
-%var            bitname openldap_client
-%var            pkgname CSWoldapclient
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%var		desc OpenLDAP client executables (oldapclient)
-%copyright      url file://%{WORKSRC}/COPYRIGHT

Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldapdevel.depend
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldapdevel.depend	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldapdevel.depend	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1 +0,0 @@
-P CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt)

Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldaprt.depend
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldaprt.depend	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldaprt.depend	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,3 +0,0 @@
-P CSWlibnet libnet - the libnet packet construction library
-P CSWosslrt openssl_rt - Openssl runtime libraries
-P CSWsasl   sasl - Simple Authentication and Security Layer

Deleted: csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.3.24-ntlm.diff
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.3.24-ntlm.diff	2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.3.24-ntlm.diff	2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,199 +0,0 @@
-(Note that this patch is not useful on its own... it just adds some
-hooks to work with the LDAP authentication process at a lower level
-than the API otherwise allows. The code that calls these hooks and
-actually drives the NTLM authentication process is in
-lib/e2k-global-catalog.c, and the code that actually implements the
-NTLM algorithms is in xntlm/.)
-
-This is a patch against OpenLDAP 2.3.20. Apply with -p0
-
-
---- ./include/ldap.h~	2006-02-15 16:32:17.000000000 -0500
-+++ ./include/ldap.h	2006-03-08 20:29:49.092866000 -0500
-@@ -2115,5 +2115,26 @@
- ldap_passwordpolicy_err2txt LDAP_P(( LDAPPasswordPolicyError ));
- #endif /* LDAP_CONTROL_PASSWORDPOLICYREQUEST */
- 
-+/*
-+ * hacks for NTLM
-+ */
-+#define LDAP_AUTH_NTLM_REQUEST	((ber_tag_t) 0x8aU)
-+#define LDAP_AUTH_NTLM_RESPONSE	((ber_tag_t) 0x8bU)
-+LDAP_F( int )
-+ldap_ntlm_bind LDAP_P((
-+	LDAP		*ld,
-+	LDAP_CONST char	*dn,
-+	ber_tag_t	tag,
-+	struct berval	*cred,
-+	LDAPControl	**sctrls,
-+	LDAPControl	**cctrls,
-+	int		*msgidp ));
-+LDAP_F( int )
-+ldap_parse_ntlm_bind_result LDAP_P((
-+	LDAP		*ld,
-+	LDAPMessage	*res,
-+	struct berval	*challenge));
-+
-+
- LDAP_END_DECL
- #endif /* _LDAP_H */
---- ./libraries/libldap/Makefile.in~	2006-01-03 17:16:08.000000000 -0500
-+++ ./libraries/libldap/Makefile.in	2006-03-08 20:29:49.177284000 -0500
-@@ -20,7 +20,7 @@
- SRCS	= bind.c open.c result.c error.c compare.c search.c \
- 	controls.c messages.c references.c extended.c cyrus.c \
- 	modify.c add.c modrdn.c delete.c abandon.c \
--	sasl.c sbind.c kbind.c unbind.c cancel.c  \
-+	sasl.c ntlm.c sbind.c kbind.c unbind.c cancel.c  \
- 	filter.c free.c sort.c passwd.c whoami.c \
- 	getdn.c getentry.c getattr.c getvalues.c addentry.c \
- 	request.c os-ip.c url.c sortctrl.c vlvctrl.c \
-@@ -31,7 +31,7 @@
- OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
- 	controls.lo messages.lo references.lo extended.lo cyrus.lo \
- 	modify.lo add.lo modrdn.lo delete.lo abandon.lo \
--	sasl.lo sbind.lo kbind.lo unbind.lo cancel.lo \
-+	sasl.lo ntlm.lo sbind.lo kbind.lo unbind.lo cancel.lo \
- 	filter.lo free.lo sort.lo passwd.lo whoami.lo \
- 	getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
- 	request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \
---- /dev/null   2004-06-30 15:04:37.000000000 -0400
-+++ ./libraries/libldap/ntlm.c    2004-07-14 13:44:18.000000000 -0400
-@@ -0,0 +1,137 @@
-+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
-+/*
-+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+ */
-+
-+/* Mostly copied from sasl.c */
-+
-+#include "portable.h"
-+
-+#include 
-+#include 
-+
-+#include 
-+#include 
-+#include 
-+#include 
-+
-+#include "ldap-int.h"
-+
-+int
-+ldap_ntlm_bind(
-+       LDAP            *ld,
-+       LDAP_CONST char *dn,
-+       ber_tag_t       tag,
-+       struct berval   *cred,
-+       LDAPControl     **sctrls,
-+       LDAPControl     **cctrls,
-+       int             *msgidp )
-+{
-+       BerElement      *ber;
-+       int rc;
-+       ber_int_t id;
-+
-+       Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+
-+       assert( ld != NULL );
-+       assert( LDAP_VALID( ld ) );
-+       assert( msgidp != NULL );
-+
-+       if( msgidp == NULL ) {
-+               ld->ld_errno = LDAP_PARAM_ERROR;
-+               return ld->ld_errno;
-+       }
-+
-+       /* create a message to send */
-+       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+               ld->ld_errno = LDAP_NO_MEMORY;
-+               return ld->ld_errno;
-+       }
-+
-+       assert( LBER_VALID( ber ) );
-+
-+       LDAP_NEXT_MSGID( ld, id );
-+       rc = ber_printf( ber, "{it{istON}" /*}*/,
-+                        id, LDAP_REQ_BIND,
-+                        ld->ld_version, dn, tag,
-+                        cred );
-+
-+       /* Put Server Controls */
-+       if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+               ber_free( ber, 1 );
-+               return ld->ld_errno;
-+       }
-+
-+       if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+               ld->ld_errno = LDAP_ENCODING_ERROR;
-+               ber_free( ber, 1 );
-+               return ld->ld_errno;
-+       }
-+
-+       /* send the message */
-+       *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
-+
-+       if(*msgidp < 0)
-+               return ld->ld_errno;
-+
-+       return LDAP_SUCCESS;
-+}
-+
-+int
-+ldap_parse_ntlm_bind_result(
-+       LDAP            *ld,
-+       LDAPMessage     *res,
-+       struct berval   *challenge)
-+{
-+       ber_int_t       errcode;
-+       ber_tag_t       tag;
-+       BerElement      *ber;
-+       ber_len_t       len;
-+
-+       Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+
-+       assert( ld != NULL );
-+       assert( LDAP_VALID( ld ) );
-+       assert( res != NULL );
-+
-+       if ( ld == NULL || res == NULL ) {
-+               return LDAP_PARAM_ERROR;
-+       }
-+
-+       if( res->lm_msgtype != LDAP_RES_BIND ) {
-+               ld->ld_errno = LDAP_PARAM_ERROR;
-+               return ld->ld_errno;
-+       }
-+
-+       if ( ld->ld_error ) {
-+               LDAP_FREE( ld->ld_error );
-+               ld->ld_error = NULL;
-+       }
-+       if ( ld->ld_matched ) {
-+               LDAP_FREE( ld->ld_matched );
-+               ld->ld_matched = NULL;
-+       }
-+
-+       /* parse results */
-+
-+       ber = ber_dup( res->lm_ber );
-+
-+       if( ber == NULL ) {
-+               ld->ld_errno = LDAP_NO_MEMORY;
-+               return ld->ld_errno;
-+       }
-+
-+       tag = ber_scanf( ber, "{ioa" /*}*/,
-+                        &errcode, challenge, &ld->ld_error );
-+       ber_free( ber, 0 );
-+
-+       if( tag == LBER_ERROR ) {
-+               ld->ld_errno = LDAP_DECODING_ERROR;
-+               return ld->ld_errno;
-+       }
-+
-+       ld->ld_errno = errcode;
-+
-+       return( ld->ld_errno );
-+}


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


From dmichelsen at users.sourceforge.net  Wed May 27 13:53:04 2009
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 27 May 2009 11:53:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[5067] csw/mgar/pkg/bdb47/trunk
Message-ID: 

Revision: 5067
          http://gar.svn.sourceforge.net/gar/?rev=5067&view=rev
Author:   dmichelsen
Date:     2009-05-27 11:53:04 +0000 (Wed, 27 May 2009)

Log Message:
-----------
bdb47: Add patches

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

Added Paths:
-----------
    csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1
    csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2
    csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3
    csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4

Modified: csw/mgar/pkg/bdb47/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb47/trunk/Makefile	2009-05-26 20:05:35 UTC (rev 5066)
+++ csw/mgar/pkg/bdb47/trunk/Makefile	2009-05-27 11:53:04 UTC (rev 5067)
@@ -23,10 +23,9 @@
 
 WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix
 
-# No patches for the 4.7 series... yet.
-#PATCHDIR = $(WORKSRC)/..
-#PATCHDIRLEVEL = 0
-#PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*.diff))
+PATCHDIR = $(WORKSRC)/..
+PATCHDIRLEVEL = 0
+PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*))
 
 BUILD64 = 1
 CONFIGURE_SCRIPTS = dist

Modified: csw/mgar/pkg/bdb47/trunk/checksums
===================================================================
--- csw/mgar/pkg/bdb47/trunk/checksums	2009-05-26 20:05:35 UTC (rev 5066)
+++ csw/mgar/pkg/bdb47/trunk/checksums	2009-05-27 11:53:04 UTC (rev 5067)
@@ -1 +1,5 @@
 ec2b87e833779681a0c3a814aa71359e  download/db-4.7.25.tar.gz
+5fdf101259e5164dea1c8c86214fde38  download/patch.4.7.25.1
+bd410a11c71fee52fddb6aa2d8d4f80c  download/patch.4.7.25.2
+6fcd69f64f5b34bfe8f0a63cc2e402c1  download/patch.4.7.25.3
+42c5d1a727e4a7f59b9dce12ff2f6b84  download/patch.4.7.25.4

Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1
===================================================================
--- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1	                        (rev 0)
+++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.1	2009-05-27 11:53:04 UTC (rev 5067)
@@ -0,0 +1,75 @@
+*** sequence/sequence.c.orig	2008-05-05 13:25:09.000000000 -0700
+--- sequence/sequence.c	2008-08-15 09:58:46.000000000 -0700
+***************
+*** 187,193 ****
+  	if ((ret = __db_get_flags(dbp, &tflags)) != 0)
+  		goto err;
+  
+! 	if (DB_IS_READONLY(dbp)) {
+  		ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open");
+  		goto err;
+  	}
+--- 187,197 ----
+  	if ((ret = __db_get_flags(dbp, &tflags)) != 0)
+  		goto err;
+  
+! 	/*
+! 	 * We can let replication clients open sequences, but must
+! 	 * check later that they do not update them.
+! 	 */
+! 	if (F_ISSET(dbp, DB_AM_RDONLY)) {
+  		ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open");
+  		goto err;
+  	}
+***************
+*** 244,249 ****
+--- 248,258 ----
+  		if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) ||
+  		    !LF_ISSET(DB_CREATE))
+  			goto err;
++ 		if (IS_REP_CLIENT(env) &&
++ 		    !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
++ 			ret = __db_rdonly(env, "DB_SEQUENCE->open");
++ 			goto err;
++ 		}
+  		ret = 0;
+  
+  		rp = &seq->seq_record;
+***************
+*** 296,302 ****
+  	 */
+  	rp = seq->seq_data.data;
+  	if (rp->seq_version == DB_SEQUENCE_OLDVER) {
+! oldver:		rp->seq_version = DB_SEQUENCE_VERSION;
+  		if (!F_ISSET(env, ENV_LITTLEENDIAN)) {
+  			if (IS_DB_AUTO_COMMIT(dbp, txn)) {
+  				if ((ret =
+--- 305,316 ----
+  	 */
+  	rp = seq->seq_data.data;
+  	if (rp->seq_version == DB_SEQUENCE_OLDVER) {
+! oldver:		if (IS_REP_CLIENT(env) &&
+! 		    !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
+! 			ret = __db_rdonly(env, "DB_SEQUENCE->open");
+! 			goto err;
+! 		}
+! 		rp->seq_version = DB_SEQUENCE_VERSION;
+  		if (!F_ISSET(env, ENV_LITTLEENDIAN)) {
+  			if (IS_DB_AUTO_COMMIT(dbp, txn)) {
+  				if ((ret =
+***************
+*** 707,712 ****
+--- 721,733 ----
+  
+  	MUTEX_LOCK(env, seq->mtx_seq);
+  
++ 	if (handle_check && IS_REP_CLIENT(env) &&
++ 	    !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
++ 		ret = __db_rdonly(env, "DB_SEQUENCE->get");
++ 		goto err;
++ 	}
++ 
++ 
+  	if (rp->seq_min + delta > rp->seq_max) {
+  		__db_errx(env, "Sequence overflow");
+  		ret = EINVAL;

Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2
===================================================================
--- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2	                        (rev 0)
+++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.2	2009-05-27 11:53:04 UTC (rev 5067)
@@ -0,0 +1,71 @@
+Index: lock/lock.c
+===================================================================
+RCS file: /a/CVSROOT/db/lock/lock.c,v
+retrieving revision 12.61
+diff -c -r12.61 lock.c
+*** lock/lock.c	22 Jul 2008 12:08:53 -0000	12.61
+--- lock/lock.c	19 Aug 2008 17:28:24 -0000
+***************
+*** 1278,1287 ****
+  		SH_TAILQ_REMOVE(
+  		    <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj);
+  		if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) {
+! 			LOCK_REGION_LOCK(env);
+  			__env_alloc_free(<->reginfo,
+  			    SH_DBT_PTR(&sh_obj->lockobj));
+! 			LOCK_REGION_UNLOCK(env);
+  		}
+  		SH_TAILQ_INSERT_HEAD(
+  		    &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj);
+--- 1278,1289 ----
+  		SH_TAILQ_REMOVE(
+  		    <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj);
+  		if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) {
+! 			if (region->part_t_size != 1)
+! 				LOCK_REGION_LOCK(env);
+  			__env_alloc_free(<->reginfo,
+  			    SH_DBT_PTR(&sh_obj->lockobj));
+! 			if (region->part_t_size != 1)
+! 				LOCK_REGION_UNLOCK(env);
+  		}
+  		SH_TAILQ_INSERT_HEAD(
+  		    &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj);
+***************
+*** 1470,1484 ****
+  		if (obj->size <= sizeof(sh_obj->objdata))
+  			p = sh_obj->objdata;
+  		else {
+! 			LOCK_REGION_LOCK(env);
+  			if ((ret =
+  			    __env_alloc(<->reginfo, obj->size, &p)) != 0) {
+  				__db_errx(env,
+  				    "No space for lock object storage");
+! 				LOCK_REGION_UNLOCK(env);
+  				goto err;
+  			}
+! 			LOCK_REGION_UNLOCK(env);
+  		}
+  
+  		memcpy(p, obj->data, obj->size);
+--- 1472,1492 ----
+  		if (obj->size <= sizeof(sh_obj->objdata))
+  			p = sh_obj->objdata;
+  		else {
+! 			/*
+! 			 * If we have only one partition, the region is locked.
+! 			 */
+! 			if (region->part_t_size != 1)
+! 				LOCK_REGION_LOCK(env);
+  			if ((ret =
+  			    __env_alloc(<->reginfo, obj->size, &p)) != 0) {
+  				__db_errx(env,
+  				    "No space for lock object storage");
+! 				if (region->part_t_size != 1)
+! 					LOCK_REGION_UNLOCK(env);
+  				goto err;
+  			}
+! 			if (region->part_t_size != 1)
+! 				LOCK_REGION_UNLOCK(env);
+  		}
+  
+  		memcpy(p, obj->data, obj->size);

Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3
===================================================================
--- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3	                        (rev 0)
+++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.3	2009-05-27 11:53:04 UTC (rev 5067)
@@ -0,0 +1,314 @@
+*** lock/lock_deadlock.c	2008-03-11 00:31:33.000000000 +1100
+--- lock/lock_deadlock.c	2008-12-16 21:54:18.000000000 +1100
+***************
+*** 121,127 ****
+  	DB_LOCKTAB *lt;
+  	db_timespec now;
+  	locker_info *idmap;
+! 	u_int32_t *bitmap, *copymap, **deadp, **free_me, *tmpmap;
+  	u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers;
+  	u_int32_t lock_max, txn_max;
+  	int ret, status;
+--- 121,127 ----
+  	DB_LOCKTAB *lt;
+  	db_timespec now;
+  	locker_info *idmap;
+! 	u_int32_t *bitmap, *copymap, **deadp, **deadlist, *tmpmap;
+  	u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers;
+  	u_int32_t lock_max, txn_max;
+  	int ret, status;
+***************
+*** 133,139 ****
+  	if (IS_REP_CLIENT(env))
+  		atype = DB_LOCK_MINWRITE;
+  
+! 	free_me = NULL;
+  
+  	lt = env->lk_handle;
+  	if (rejectp != NULL)
+--- 133,140 ----
+  	if (IS_REP_CLIENT(env))
+  		atype = DB_LOCK_MINWRITE;
+  
+! 	copymap = tmpmap = NULL;
+! 	deadlist = NULL;
+  
+  	lt = env->lk_handle;
+  	if (rejectp != NULL)
+***************
+*** 179,189 ****
+  	memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc);
+  
+  	if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0)
+! 		goto err1;
+  
+  	/* Find a deadlock. */
+  	if ((ret =
+! 	    __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadp)) != 0)
+  		return (ret);
+  
+  	/*
+--- 180,190 ----
+  	memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc);
+  
+  	if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0)
+! 		goto err;
+  
+  	/* Find a deadlock. */
+  	if ((ret =
+! 	    __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadlist)) != 0)
+  		return (ret);
+  
+  	/*
+***************
+*** 204,211 ****
+  		txn_max = TXN_MAXIMUM;
+  
+  	killid = BAD_KILLID;
+! 	free_me = deadp;
+! 	for (; *deadp != NULL; deadp++) {
+  		if (rejectp != NULL)
+  			++*rejectp;
+  		killid = (u_int32_t)(*deadp - bitmap) / nalloc;
+--- 205,211 ----
+  		txn_max = TXN_MAXIMUM;
+  
+  	killid = BAD_KILLID;
+! 	for (deadp = deadlist; *deadp != NULL; deadp++) {
+  		if (rejectp != NULL)
+  			++*rejectp;
+  		killid = (u_int32_t)(*deadp - bitmap) / nalloc;
+***************
+*** 342,352 ****
+  			__db_msg(env,
+  			    "Aborting locker %lx", (u_long)idmap[killid].id);
+  	}
+! 	__os_free(env, tmpmap);
+! err1:	__os_free(env, copymap);
+! 
+! err:	if (free_me != NULL)
+! 		__os_free(env, free_me);
+  	__os_free(env, bitmap);
+  	__os_free(env, idmap);
+  
+--- 342,353 ----
+  			__db_msg(env,
+  			    "Aborting locker %lx", (u_long)idmap[killid].id);
+  	}
+! err:	if(copymap != NULL)
+! 		__os_free(env, copymap);
+! 	if (deadlist != NULL)
+! 		__os_free(env, deadlist);
+! 	if(tmpmap != NULL)
+! 		__os_free(env, tmpmap);
+  	__os_free(env, bitmap);
+  	__os_free(env, idmap);
+  
+***************
+*** 360,365 ****
+--- 361,377 ----
+  
+  #define	DD_INVALID_ID	((u_int32_t) -1)
+  
++ /*
++  * __dd_build --
++  *	Build the lock dependency bit maps.
++  * Notes on syncronization:  
++  *	LOCK_SYSTEM_LOCK is used to hold objects locked when we have
++  *		a single partition.
++  *	LOCK_LOCKERS is held while we are walking the lockers list and
++  *		to single thread the use of lockerp->dd_id.
++  *	LOCK_DD protects the DD list of objects.
++  */
++ 
+  static int
+  __dd_build(env, atype, bmp, nlockers, allocp, idmap, rejectp)
+  	ENV *env;
+***************
+*** 393,398 ****
+--- 405,411 ----
+  	 * In particular we do not build the conflict array and our caller
+  	 * needs to expect this.
+  	 */
++ 	LOCK_SYSTEM_LOCK(lt, region);
+  	if (atype == DB_LOCK_EXPIRE) {
+  skip:		LOCK_DD(env, region);
+  		op = SH_TAILQ_FIRST(®ion->dd_objs, __db_lockobj);
+***************
+*** 430,446 ****
+  			OBJECT_UNLOCK(lt, region, indx);
+  		}
+  		UNLOCK_DD(env, region);
+  		goto done;
+  	}
+  
+  	/*
+! 	 * We'll check how many lockers there are, add a few more in for
+! 	 * good measure and then allocate all the structures.  Then we'll
+! 	 * verify that we have enough room when we go back in and get the
+! 	 * mutex the second time.
+  	 */
+! retry:	count = region->stat.st_nlockers;
+  	if (count == 0) {
+  		*nlockers = 0;
+  		return (0);
+  	}
+--- 443,460 ----
+  			OBJECT_UNLOCK(lt, region, indx);
+  		}
+  		UNLOCK_DD(env, region);
++ 		LOCK_SYSTEM_UNLOCK(lt, region);
+  		goto done;
+  	}
+  
+  	/*
+! 	 * Allocate after locking the region
+! 	 * to make sure the structures are large enough.
+  	 */
+! 	LOCK_LOCKERS(env, region);
+! 	count = region->stat.st_nlockers;
+  	if (count == 0) {
++ 		UNLOCK_LOCKERS(env, region);
+  		*nlockers = 0;
+  		return (0);
+  	}
+***************
+*** 448,497 ****
+  	if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK))
+  		__db_msg(env, "%lu lockers", (u_long)count);
+  
+- 	count += 20;
+  	nentries = (u_int32_t)DB_ALIGN(count, 32) / 32;
+  
+! 	/*
+! 	 * Allocate enough space for a count by count bitmap matrix.
+! 	 *
+! 	 * XXX
+! 	 * We can probably save the malloc's between iterations just
+! 	 * reallocing if necessary because count grew by too much.
+! 	 */
+  	if ((ret = __os_calloc(env, (size_t)count,
+! 	    sizeof(u_int32_t) * nentries, &bitmap)) != 0)
+  		return (ret);
+  
+  	if ((ret = __os_calloc(env,
+  	    sizeof(u_int32_t), nentries, &tmpmap)) != 0) {
+  		__os_free(env, bitmap);
+  		return (ret);
+  	}
+  
+  	if ((ret = __os_calloc(env,
+  	    (size_t)count, sizeof(locker_info), &id_array)) != 0) {
+  		__os_free(env, bitmap);
+  		__os_free(env, tmpmap);
+  		return (ret);
+  	}
+  
+  	/*
+- 	 * Now go back in and actually fill in the matrix.
+- 	 */
+- 	if (region->stat.st_nlockers > count) {
+- 		__os_free(env, bitmap);
+- 		__os_free(env, tmpmap);
+- 		__os_free(env, id_array);
+- 		goto retry;
+- 	}
+- 
+- 	/*
+  	 * First we go through and assign each locker a deadlock detector id.
+  	 */
+  	id = 0;
+- 	LOCK_LOCKERS(env, region);
+  	SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) {
+  		if (lip->master_locker == INVALID_ROFF) {
+  			lip->dd_id = id++;
+  			id_array[lip->dd_id].id = lip->id;
+  			switch (atype) {
+--- 462,498 ----
+  	if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK))
+  		__db_msg(env, "%lu lockers", (u_long)count);
+  
+  	nentries = (u_int32_t)DB_ALIGN(count, 32) / 32;
+  
+! 	/* Allocate enough space for a count by count bitmap matrix. */
+  	if ((ret = __os_calloc(env, (size_t)count,
+! 	    sizeof(u_int32_t) * nentries, &bitmap)) != 0) {
+! 		UNLOCK_LOCKERS(env, region);
+  		return (ret);
++ 	}
+  
+  	if ((ret = __os_calloc(env,
+  	    sizeof(u_int32_t), nentries, &tmpmap)) != 0) {
++ 		UNLOCK_LOCKERS(env, region);
+  		__os_free(env, bitmap);
+  		return (ret);
+  	}
+  
+  	if ((ret = __os_calloc(env,
+  	    (size_t)count, sizeof(locker_info), &id_array)) != 0) {
++ 		UNLOCK_LOCKERS(env, region);
+  		__os_free(env, bitmap);
+  		__os_free(env, tmpmap);
+  		return (ret);
+  	}
+  
+  	/*
+  	 * First we go through and assign each locker a deadlock detector id.
+  	 */
+  	id = 0;
+  	SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) {
+  		if (lip->master_locker == INVALID_ROFF) {
++ 			DB_ASSERT(env, id < count);
+  			lip->dd_id = id++;
+  			id_array[lip->dd_id].id = lip->id;
+  			switch (atype) {
+***************
+*** 510,516 ****
+  			lip->dd_id = DD_INVALID_ID;
+  
+  	}
+- 	UNLOCK_LOCKERS(env, region);
+  
+  	/*
+  	 * We only need consider objects that have waiters, so we use
+--- 511,516 ----
+***************
+*** 669,675 ****
+  	 * status after building the bit maps so that we will not detect
+  	 * a blocked transaction without noting that it is already aborting.
+  	 */
+- 	LOCK_LOCKERS(env, region);
+  	for (id = 0; id < count; id++) {
+  		if (!id_array[id].valid)
+  			continue;
+--- 669,674 ----
+***************
+*** 738,743 ****
+--- 737,743 ----
+  			id_array[id].in_abort = 1;
+  	}
+  	UNLOCK_LOCKERS(env, region);
++ 	LOCK_SYSTEM_UNLOCK(lt, region);
+  
+  	/*
+  	 * Now we can release everything except the bitmap matrix that we
+***************
+*** 839,844 ****
+--- 839,845 ----
+  	ret = 0;
+  
+  	/* We must lock so this locker cannot go away while we abort it. */
++ 	LOCK_SYSTEM_LOCK(lt, region);
+  	LOCK_LOCKERS(env, region);
+  
+  	/*
+***************
+*** 895,900 ****
+--- 896,902 ----
+  done:	OBJECT_UNLOCK(lt, region, info->last_ndx);
+  err:
+  out:	UNLOCK_LOCKERS(env, region);
++ 	LOCK_SYSTEM_UNLOCK(lt, region);
+  	return (ret);
+  }
+  

Added: csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4
===================================================================
--- csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4	                        (rev 0)
+++ csw/mgar/pkg/bdb47/trunk/files/patch.4.7.25.4	2009-05-27 11:53:04 UTC (rev 5067)
@@ -0,0 +1,183 @@
+*** dbinc/repmgr.h.orig	2009-05-04 10:33:55.000000000 -0400
+--- dbinc/repmgr.h	2009-05-04 10:27:26.000000000 -0400
+***************
+*** 374,379 ****
+--- 374,380 ----
+  #define	SITE_FROM_EID(eid)	(&db_rep->sites[eid])
+  #define	EID_FROM_SITE(s)	((int)((s) - (&db_rep->sites[0])))
+  #define	IS_VALID_EID(e)		((e) >= 0)
++ #define	IS_KNOWN_REMOTE_SITE(e)	((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt)
+  #define	SELF_EID		INT_MAX
+  
+  #define	IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS ||		\
+*** rep/rep_elect.c.orig	2009-05-04 10:35:50.000000000 -0400
+--- rep/rep_elect.c	2009-05-04 10:31:24.000000000 -0400
+***************
+*** 33,39 ****
+  static int __rep_fire_elected __P((ENV *, REP *, u_int32_t));
+  static void __rep_elect_master __P((ENV *, REP *));
+  static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t));
+! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t));
+  
+  /*
+   * __rep_elect --
+--- 33,39 ----
+  static int __rep_fire_elected __P((ENV *, REP *, u_int32_t));
+  static void __rep_elect_master __P((ENV *, REP *));
+  static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t));
+! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t));
+  
+  /*
+   * __rep_elect --
+***************
+*** 55,61 ****
+  	ENV *env;
+  	LOG *lp;
+  	REP *rep;
+! 	int done, eid, elected, full_elect, locked, in_progress, need_req;
+  	int ret, send_vote, t_ret;
+  	u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri;
+  	u_int32_t tiebreaker;
+--- 55,61 ----
+  	ENV *env;
+  	LOG *lp;
+  	REP *rep;
+! 	int done, elected, full_elect, locked, in_progress, need_req;
+  	int ret, send_vote, t_ret;
+  	u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri;
+  	u_int32_t tiebreaker;
+***************
+*** 181,188 ****
+  			REP_SYSTEM_UNLOCK(env);
+  			(void)__rep_send_message(env, DB_EID_BROADCAST,
+  			    REP_MASTER_REQ, NULL, NULL, 0, 0);
+! 			ret = __rep_wait(env, &to, &eid,
+! 			    0, REP_F_EPHASE0);
+  			REP_SYSTEM_LOCK(env);
+  			F_CLR(rep, REP_F_EPHASE0);
+  			switch (ret) {
+--- 181,187 ----
+  			REP_SYSTEM_UNLOCK(env);
+  			(void)__rep_send_message(env, DB_EID_BROADCAST,
+  			    REP_MASTER_REQ, NULL, NULL, 0, 0);
+! 			ret = __rep_wait(env, &to, 0, REP_F_EPHASE0);
+  			REP_SYSTEM_LOCK(env);
+  			F_CLR(rep, REP_F_EPHASE0);
+  			switch (ret) {
+***************
+*** 286,296 ****
+  		REP_SYSTEM_LOCK(env);
+  		goto vote;
+  	}
+! 	ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1);
+  	switch (ret) {
+  		case 0:
+  			/* Check if election complete or phase complete. */
+! 			if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) {
+  				RPRINT(env, DB_VERB_REP_ELECT,
+  				    (env, "Ended election phase 1"));
+  				goto edone;
+--- 285,295 ----
+  		REP_SYSTEM_LOCK(env);
+  		goto vote;
+  	}
+! 	ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1);
+  	switch (ret) {
+  		case 0:
+  			/* Check if election complete or phase complete. */
+! 			if (!IN_ELECTION(rep)) {
+  				RPRINT(env, DB_VERB_REP_ELECT,
+  				    (env, "Ended election phase 1"));
+  				goto edone;
+***************
+*** 398,412 ****
+  		REP_SYSTEM_LOCK(env);
+  		goto i_won;
+  	}
+! 	ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2);
+  	RPRINT(env, DB_VERB_REP_ELECT,
+  	    (env, "Ended election phase 2 %d", ret));
+  	switch (ret) {
+  		case 0:
+! 			if (eid != DB_EID_INVALID)
+! 				goto edone;
+! 			ret = DB_REP_UNAVAIL;
+! 			break;
+  		case DB_REP_EGENCHG:
+  			if (to > timeout)
+  				to = timeout;
+--- 397,408 ----
+  		REP_SYSTEM_LOCK(env);
+  		goto i_won;
+  	}
+! 	ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2);
+  	RPRINT(env, DB_VERB_REP_ELECT,
+  	    (env, "Ended election phase 2 %d", ret));
+  	switch (ret) {
+  		case 0:
+! 			goto edone;
+  		case DB_REP_EGENCHG:
+  			if (to > timeout)
+  				to = timeout;
+***************
+*** 1050,1062 ****
+  	ENV *env;
+  	REP *rep;
+  {
+- 	/*
+- 	 * We often come through here twice, sometimes even more.  We mustn't
+- 	 * let the redundant calls affect stats counting.  But rep_elect relies
+- 	 * on this first part for setting eidp.
+- 	 */
+- 	rep->master_id = rep->eid;
+- 
+  	if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) {
+  		/* We've been through here already; avoid double counting. */
+  		return;
+--- 1046,1051 ----
+***************
+*** 1093,1102 ****
+  	(timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1);
+  
+  static int
+! __rep_wait(env, timeoutp, eidp, full_elect, flags)
+  	ENV *env;
+  	db_timeout_t *timeoutp;
+! 	int *eidp, full_elect;
+  	u_int32_t flags;
+  {
+  	DB_REP *db_rep;
+--- 1082,1091 ----
+  	(timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1);
+  
+  static int
+! __rep_wait(env, timeoutp, full_elect, flags)
+  	ENV *env;
+  	db_timeout_t *timeoutp;
+! 	int full_elect;
+  	u_int32_t flags;
+  {
+  	DB_REP *db_rep;
+***************
+*** 1174,1180 ****
+  			F_CLR(rep, REP_F_EGENUPDATE);
+  			ret = DB_REP_EGENCHG;
+  		} else if (phase_over) {
+- 			*eidp = rep->master_id;
+  			done = 1;
+  			ret = 0;
+  		}
+--- 1163,1168 ----
+*** repmgr/repmgr_net.c.orig	2009-05-04 10:34:46.000000000 -0400
+--- repmgr/repmgr_net.c	2009-05-04 10:27:26.000000000 -0400
+***************
+*** 100,105 ****
+--- 100,107 ----
+  		    control, rec, &nsites_sent, &npeers_sent)) != 0)
+  			goto out;
+  	} else {
++ 		DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid));
++ 
+  		/*
+  		 * If this is a request that can be sent anywhere, then see if
+  		 * we can send it to our peer (to save load on the master), but


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


From wbonnet at users.sourceforge.net  Wed May 27 17:40:34 2009
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Wed, 27 May 2009 15:40:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[5068] csw/mgar/pkg/thunderbird/trunk
Message-ID: 

Revision: 5068
          http://gar.svn.sourceforge.net/gar/?rev=5068&view=rev
Author:   wbonnet
Date:     2009-05-27 15:40:34 +0000 (Wed, 27 May 2009)

Log Message:
-----------
Add patches for GAR build

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

Added Paths:
-----------
    csw/mgar/pkg/thunderbird/trunk/files/lber-int.h.diff
    csw/mgar/pkg/thunderbird/trunk/files/ldap-int.h.diff
    csw/mgar/pkg/thunderbird/trunk/files/ldappr-int.h.diff

Modified: csw/mgar/pkg/thunderbird/trunk/Makefile
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/Makefile	2009-05-27 11:53:04 UTC (rev 5067)
+++ csw/mgar/pkg/thunderbird/trunk/Makefile	2009-05-27 15:40:34 UTC (rev 5068)
@@ -51,7 +51,10 @@
 REQUIRED_PKGS_CSWthunderbird += CSWpango 
 REQUIRED_PKGS_CSWthunderbird += CSWzlib
 
-PATCHFILES = autoconf.mk.in.diff
+PATCHFILES  = autoconf.mk.in.diff 
+PATCHFILES += lber-int.h.diff 
+PATCHFILES += ldappr-int.h.diff
+PATCHFILES += ldap-int.h.diff
 
 TEST_SCRIPTS = 
 
@@ -70,7 +73,7 @@
 
 pre-install:
 	( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi )
-	( cd $(WORK_INSTALL)/opt/csw/bin && if [ -L $(GARNAME) ] ; then rm $(GARNAME) ; fi  && ln -s ../mozilla/$(GARNAME)/bin/$(GARNAME) . )
+	( cd $(WORK_INSTALL)/opt/csw/bin ; rm $(GARNAME) ; ln -s ../mozilla/$(GARNAME)/bin/$(GARNAME) . )
 	( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps )
 	( cp $(WORK_BUILD)/other-licenses/branding/thunderbird/content/icon64.png $(WORK_INSTALL)/opt/csw/share/pixmaps/thunderbird.png )
 	( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications )

Modified: csw/mgar/pkg/thunderbird/trunk/checksums
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/checksums	2009-05-27 11:53:04 UTC (rev 5067)
+++ csw/mgar/pkg/thunderbird/trunk/checksums	2009-05-27 15:40:34 UTC (rev 5068)
@@ -1,2 +1,5 @@
-73a73d79047dea6be2d222d5b9eeb5f7  download/autoconf.mk.in.diff
+7c53a5e8edb2b492d33f4f405b70c1a1  download/autoconf.mk.in.diff
+46527aded9c373b6095fea546d4d74f0  download/lber-int.h.diff
+46ef334e67dab2301b53b661494f9d58  download/ldap-int.h.diff
+e7054c1d1d6dc708805a6110ccfa7f70  download/ldappr-int.h.diff
 55e24753a7ccf2fbf0272987dd4bb086  download/thunderbird-2.0.0.21-source.tar.bz2

Added: csw/mgar/pkg/thunderbird/trunk/files/lber-int.h.diff
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/files/lber-int.h.diff	                        (rev 0)
+++ csw/mgar/pkg/thunderbird/trunk/files/lber-int.h.diff	2009-05-27 15:40:34 UTC (rev 5068)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru thunderbird.orig/directory/c-sdk/ldap/libraries/liblber/lber-int.h thunderbird/directory/c-sdk/ldap/libraries/liblber/lber-int.h
+--- thunderbird.orig/directory/c-sdk/ldap/libraries/liblber/lber-int.h	2009-05-27 09:58:02.216472168 +0200
++++ thunderbird/directory/c-sdk/ldap/libraries/liblber/lber-int.h	2009-05-27 09:58:25.484409572 +0200
+@@ -107,7 +107,7 @@
+ #define stderr NULL
+ #endif
+ 
+-#include "lber.h"
++#include "../../include/lber.h"
+ 
+ #ifdef macintosh
+ #define NSLDAPI_LBER_SOCKET_IS_PTR

Added: csw/mgar/pkg/thunderbird/trunk/files/ldap-int.h.diff
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/files/ldap-int.h.diff	                        (rev 0)
+++ csw/mgar/pkg/thunderbird/trunk/files/ldap-int.h.diff	2009-05-27 15:40:34 UTC (rev 5068)
@@ -0,0 +1,18 @@
+diff --speed-large-files --minimal -Nru thunderbird.orig/directory/c-sdk/ldap/libraries/libldap/ldap-int.h thunderbird/directory/c-sdk/ldap/libraries/libldap/ldap-int.h
+--- thunderbird.orig/directory/c-sdk/ldap/libraries/libldap/ldap-int.h	2009-05-27 09:59:24.939222864 +0200
++++ thunderbird/directory/c-sdk/ldap/libraries/libldap/ldap-int.h	2009-05-27 10:00:08.738847653 +0200
+@@ -82,10 +82,10 @@
+ #include "../liblber/lber-int.h"
+ #endif /* macintosh */
+ 
+-#include "ldap.h"
+-#include "ldaprot.h"
+-#include "ldaplog.h"
+-#include "portable.h"
++#include "../../include/ldap.h"
++#include "../../include/ldaprot.h"
++#include "../../include/ldaplog.h"
++#include "../../include/portable.h"
+ 
+ #ifdef LDAP_ASYNC_IO
+ #ifdef NEED_FILIO

Added: csw/mgar/pkg/thunderbird/trunk/files/ldappr-int.h.diff
===================================================================
--- csw/mgar/pkg/thunderbird/trunk/files/ldappr-int.h.diff	                        (rev 0)
+++ csw/mgar/pkg/thunderbird/trunk/files/ldappr-int.h.diff	2009-05-27 15:40:34 UTC (rev 5068)
@@ -0,0 +1,15 @@
+diff --speed-large-files --minimal -Nru thunderbird.orig/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h thunderbird/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h
+--- thunderbird.orig/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h	2009-05-27 10:01:14.924882377 +0200
++++ thunderbird/directory/c-sdk/ldap/libraries/libprldap/ldappr-int.h	2009-05-27 10:02:26.014267148 +0200
+@@ -41,9 +41,9 @@
+  *
+  */
+ 
+-#include "ldap.h"
++#include "../../include/ldap.h"
+ #include "nspr.h"
+-#include "ldappr.h"
++#include "../../include/ldappr.h"
+ 
+ #include 
+ #include 


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


From valholla at users.sourceforge.net  Wed May 27 19:36:25 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 27 May 2009 17:36:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[5069] csw/mgar/pkg/python/trunk
Message-ID: 

Revision: 5069
          http://gar.svn.sourceforge.net/gar/?rev=5069&view=rev
Author:   valholla
Date:     2009-05-27 17:36:24 +0000 (Wed, 27 May 2009)

Log Message:
-----------
use new pycompile class

Modified Paths:
--------------
    csw/mgar/pkg/python/trunk/Makefile
    csw/mgar/pkg/python/trunk/checksums
    csw/mgar/pkg/python/trunk/files/i.pycompile

Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile	2009-05-27 15:40:34 UTC (rev 5068)
+++ csw/mgar/pkg/python/trunk/Makefile	2009-05-27 17:36:24 UTC (rev 5069)
@@ -3,6 +3,7 @@
 CATEGORIES = lang
 
 SPKG_SOURCEURL = http://www.python.org/download/releases/$(GARVERSION)
+SPKG_CLASSES = none pycompile
 
 DESCRIPTION = A high-level scripting language.
 define BLURB
@@ -23,8 +24,6 @@
 # Previous Library for compatability
 DISTFILES += libpython2.5.so.1.0-isa-sparcv8
 DISTFILES += libpython2.5.so.1.0-isa-i386
-DISTFILES += CSWpython.postinstall CSWpython-tk.postinstall CSWidle.postinstall
-DISTFILES += CSWpython.space CSWpython-tk.space CSWidle.space
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
@@ -37,7 +36,6 @@
 PATCHFILES += pyport.diff
 PATCHFILES += setup.diff
 PATCHFILES += site.diff
-#PATCHFILES += configure.diff
 PATCHFILES += python-config-in.diff
 
 # Test for sunaudiodev fails.
@@ -77,6 +75,9 @@
 CONFIGURE_ARGS += --with-system-ffi
 CONFIGURE_ARGS += LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib'
 
+# use prototype filters to set the class 
+PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "pycompile" } { print }'
+
 PACKAGES  = CSWidle CSWpython CSWpython-devel CSWpython-rt CSWpython-tk
 
 PKGFILES_CSWidle  = $(libdir)/.*/idlelib/.*
@@ -128,3 +129,9 @@
 	@gfind $(DESTDIR)$(libdir) -name "*.py[co]" -exec grm -f {} \;
 	@$(MAKECOOKIE)
 
+define CSWpython_postinstall
+#!/bin/sh
+echo "Cleaning up bytecode files..."
+find $(libdir)/python -name "*.py[co]" -exec grm -f {} \;
+exit 0
+endef

Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums	2009-05-27 15:40:34 UTC (rev 5068)
+++ csw/mgar/pkg/python/trunk/checksums	2009-05-27 17:36:24 UTC (rev 5069)
@@ -1,9 +1,3 @@
-4dbb004a4e26def221444577363146e3  download/CSWidle.postinstall
-e510b1d6436f7688050253c924e72c2d  download/CSWidle.space
-31f5596f66235a8641b25c3b6e3fc28f  download/CSWpython-tk.postinstall
-e889a5cfdbf807b253df2dce3d852429  download/CSWpython-tk.space
-55e25e8ec22e043715306ea03e6eed26  download/CSWpython.postinstall
-35d3380fc79c53da3580dc4ac60aa501  download/CSWpython.space
 245db9f1e0f09ab7e0faaa0cf7301011  download/Python-2.6.2.tar.bz2
 42dd6523beb94a805d5764ae1276091c  download/faqwiz.diff
 5664b3970307d7d39d8d4061e7dccbb0  download/libpython2.5.so.1.0-isa-i386

Modified: csw/mgar/pkg/python/trunk/files/i.pycompile
===================================================================
--- csw/mgar/pkg/python/trunk/files/i.pycompile	2009-05-27 15:40:34 UTC (rev 5068)
+++ csw/mgar/pkg/python/trunk/files/i.pycompile	2009-05-27 17:36:24 UTC (rev 5069)
@@ -11,21 +11,23 @@
 
 # Force Path for the script to use
 PATH=/usr/bin:/usr/sbin:/opt/csw/bin
+
 PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-PY_BINDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/bin
-PY_LIBDIR=${PKG_INSTALL_ROOT}${PY_PREFIX}/lib/python
+PY_BINDIR=${PY_PREFIX}/bin
+PY_LIBDIR=${PY_PREFIX}/lib/python
 
+#DEBUG = 1  # Uncomment to enable debug
 if [ "${DEBUG}" ]; then
     echo PACKAGE: $PKGINST
 fi
 
-if [ -f ${PY_BINDIR}/python -a -x ${PY_BINDIR}/python ]; then
+if [ ! -f ${PY_BINDIR}/python -a ! -x ${PY_BINDIR}/python ]; then
     echo "Could not find or execute ${PY_BINDIR}/python"
     echo "Check your Python installation."
     exit 2
 fi
     
-if [ -f ${PY_LIBDIR}/compileall.py ]; then
+if [ ! -f ${PY_LIBDIR}/compileall.py ]; then
     echo "Could not find ${PY_LIBDIR}/compileall.py"
     echo "Check your Python installation."
     exit 2


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


From ellson at users.sourceforge.net  Wed May 27 19:46:36 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Wed, 27 May 2009 17:46:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[5070]
	csw/mgar/pkg/liblasi/trunk/Makefile
Message-ID: 

Revision: 5070
          http://gar.svn.sourceforge.net/gar/?rev=5070&view=rev
Author:   ellson
Date:     2009-05-27 17:46:35 +0000 (Wed, 27 May 2009)

Log Message:
-----------
rename install directories:
	/opt/csw/share/doc/libLASi-1.1.0 ==> /opt/csw/share/doc/liblasi
	/opt/csw/share/liblasi ==> /opt/csw/share/liblasi

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

Modified: csw/mgar/pkg/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 17:36:24 UTC (rev 5069)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 17:46:35 UTC (rev 5070)
@@ -65,5 +65,8 @@
 
 install-custom:
 	@echo " ==> Installing $(GARNAME) (custom)"
-	@( cd $(WORKSRC) ; gmake install DESTDIR=$(DESTDIR) )
+	@( cd $(WORKSRC) ; \
+		gmake install DESTDIR=$(DESTDIR) ; \
+		mv $(DESTDIR)/opt/csw/share/doc/$(SOURCENAME)-$(GARVERSION) $(DESTDIR)/opt/csw/share/doc/$(GARNAME) ; \
+		mv $(DESTDIR)/opt/csw/share/lasi$(GARVERSION) $(DESTDIR)/opt/csw/share/$(GARNAME))
 	@$(MAKECOOKIE)


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


From valholla at users.sourceforge.net  Wed May 27 19:58:01 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 27 May 2009 17:58:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[5071]
	csw/mgar/pkg/python/trunk/Makefile
Message-ID: 

Revision: 5071
          http://gar.svn.sourceforge.net/gar/?rev=5071&view=rev
Author:   valholla
Date:     2009-05-27 17:58:01 +0000 (Wed, 27 May 2009)

Log Message:
-----------
CSWpython.preremove

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

Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile	2009-05-27 17:46:35 UTC (rev 5070)
+++ csw/mgar/pkg/python/trunk/Makefile	2009-05-27 17:58:01 UTC (rev 5071)
@@ -109,8 +109,6 @@
 SPKG_DESC_CSWpython-rt = Python Runtime Libraries
 SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter)
 
-include gar/category.mk
-
 POST_INST_SCR  = add-depricated-libs
 POST_INST_SCR += remove-compiled-py
 
@@ -129,9 +127,12 @@
 	@gfind $(DESTDIR)$(libdir) -name "*.py[co]" -exec grm -f {} \;
 	@$(MAKECOOKIE)
 
-define CSWpython_postinstall
+define CSWpython_preremove
 #!/bin/sh
 echo "Cleaning up bytecode files..."
 find $(libdir)/python -name "*.py[co]" -exec grm -f {} \;
 exit 0
 endef
+
+include gar/category.mk
+


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


From ellson at users.sourceforge.net  Wed May 27 20:06:27 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Wed, 27 May 2009 18:06:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[5072]
	csw/mgar/pkg/liblasi/trunk/Makefile
Message-ID: 

Revision: 5072
          http://gar.svn.sourceforge.net/gar/?rev=5072&view=rev
Author:   ellson
Date:     2009-05-27 18:06:26 +0000 (Wed, 27 May 2009)

Log Message:
-----------
rename /opt/csw/share/liblasi/examples ==> /opt/csw/share/doc/examples

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

Modified: csw/mgar/pkg/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 17:58:01 UTC (rev 5071)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 18:06:26 UTC (rev 5072)
@@ -68,5 +68,6 @@
 	@( cd $(WORKSRC) ; \
 		gmake install DESTDIR=$(DESTDIR) ; \
 		mv $(DESTDIR)/opt/csw/share/doc/$(SOURCENAME)-$(GARVERSION) $(DESTDIR)/opt/csw/share/doc/$(GARNAME) ; \
-		mv $(DESTDIR)/opt/csw/share/lasi$(GARVERSION) $(DESTDIR)/opt/csw/share/$(GARNAME))
+		mv $(DESTDIR)/opt/csw/share/lasi$(GARVERSION)/examples $(DESTDIR)/opt/csw/share/$(GARNAME)/ ; \
+		rmdir $(DESTDIR)/opt/csw/share/lasi$(GARVERSION) )
 	@$(MAKECOOKIE)


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


From ellson at users.sourceforge.net  Wed May 27 20:11:51 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Wed, 27 May 2009 18:11:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[5073]
	csw/mgar/pkg/liblasi/trunk/Makefile
Message-ID: 

Revision: 5073
          http://gar.svn.sourceforge.net/gar/?rev=5073&view=rev
Author:   ellson
Date:     2009-05-27 18:11:49 +0000 (Wed, 27 May 2009)

Log Message:
-----------
fix the directory renaming

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

Modified: csw/mgar/pkg/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 18:06:26 UTC (rev 5072)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 18:11:49 UTC (rev 5073)
@@ -68,6 +68,6 @@
 	@( cd $(WORKSRC) ; \
 		gmake install DESTDIR=$(DESTDIR) ; \
 		mv $(DESTDIR)/opt/csw/share/doc/$(SOURCENAME)-$(GARVERSION) $(DESTDIR)/opt/csw/share/doc/$(GARNAME) ; \
-		mv $(DESTDIR)/opt/csw/share/lasi$(GARVERSION)/examples $(DESTDIR)/opt/csw/share/$(GARNAME)/ ; \
+		mv $(DESTDIR)/opt/csw/share/lasi$(GARVERSION)/* $(DESTDIR)/opt/csw/share/doc/$(GARNAME)/ ; \
 		rmdir $(DESTDIR)/opt/csw/share/lasi$(GARVERSION) )
 	@$(MAKECOOKIE)


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


From valholla at users.sourceforge.net  Wed May 27 20:32:29 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 27 May 2009 18:32:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[5074]
	csw/mgar/pkg/python/trunk/Makefile
Message-ID: 

Revision: 5074
          http://gar.svn.sourceforge.net/gar/?rev=5074&view=rev
Author:   valholla
Date:     2009-05-27 18:32:28 +0000 (Wed, 27 May 2009)

Log Message:
-----------
fix depend

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

Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile	2009-05-27 18:11:49 UTC (rev 5073)
+++ csw/mgar/pkg/python/trunk/Makefile	2009-05-27 18:32:28 UTC (rev 5074)
@@ -91,11 +91,13 @@
 
 ENABLE_CHECK = 0
 
-REQUIRED_PKGS_CSWidle = CSWpython CSWpython-tk
-REQUIRED_PKGS_CSWpython  = CSWbdb44 CSWbzip2 CSWgdbm CSWggettextrt 
-REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWpython-rt CSWreadline 
-REQUIRED_PKGS_CSWpython += CSWsqlite3rt CSWzlib
-REQUIRED_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk CSWpython-rt
+REQUIRED_PKGS_CSWidle         = CSWpython CSWpython-tk CSWcswclassutils
+REQUIRED_PKGS_CSWpython       = CSWbdb44 CSWbzip2 CSWgdbm CSWggettextrt 
+REQUIRED_PKGS_CSWpython      += CSWncurses CSWosslrt CSWpython-rt CSWreadline 
+REQUIRED_PKGS_CSWpython      += CSWsqlite3rt CSWzlib CSWcswclassutils
+REQUIRED_PKGS_CSWpython-tk    = CSWpython CSWtcl CSWtk 
+REQUIRED_PKGS_CSWpython-tk   += CSWpython-rt CSWcswclassutils
+REQUIRED_PKGS_CSWpython-devel = CSWcswclassutils
 
 CATALOGNAME_CSWidle = idle
 CATALOGNAME_CSWpython = python


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


From valholla at users.sourceforge.net  Wed May 27 21:28:41 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 27 May 2009 19:28:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[5075]
	csw/mgar/pkg/squid/trunk/files/cswsquid
Message-ID: 

Revision: 5075
          http://gar.svn.sourceforge.net/gar/?rev=5075&view=rev
Author:   valholla
Date:     2009-05-27 19:28:41 +0000 (Wed, 27 May 2009)

Log Message:
-----------
include smf shares

Modified Paths:
--------------
    csw/mgar/pkg/squid/trunk/files/cswsquid

Modified: csw/mgar/pkg/squid/trunk/files/cswsquid
===================================================================
--- csw/mgar/pkg/squid/trunk/files/cswsquid	2009-05-27 18:32:28 UTC (rev 5074)
+++ csw/mgar/pkg/squid/trunk/files/cswsquid	2009-05-27 19:28:41 UTC (rev 5075)
@@ -7,6 +7,10 @@
 SQUID_DAEMON=${CSWSBIN}/squid
 SQUID_CONF=${CSWETC}/squid.conf
 
+if [ -f /lib/svc/share/smf_include.sh ]; then
+    . /lib/svc/share/smf_include.sh
+fi
+
 case "$1" in
     'start')
         if [ -x ${SQUID_DAEMON} -a -f ${SQUID_CONF} ]; then


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


From valholla at users.sourceforge.net  Wed May 27 21:43:48 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 27 May 2009 19:43:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[5076] csw/mgar/pkg/openldap/trunk
Message-ID: 

Revision: 5076
          http://gar.svn.sourceforge.net/gar/?rev=5076&view=rev
Author:   valholla
Date:     2009-05-27 19:43:48 +0000 (Wed, 27 May 2009)

Log Message:
-----------
smf support and start/stop script

Modified Paths:
--------------
    csw/mgar/pkg/openldap/trunk/Makefile
    csw/mgar/pkg/openldap/trunk/checksums
    csw/mgar/pkg/openldap/trunk/files/cswopenldap

Property Changed:
----------------
    csw/mgar/pkg/openldap/trunk/


Property changes on: csw/mgar/pkg/openldap/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2

   + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2009-05-27 19:28:41 UTC (rev 5075)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2009-05-27 19:43:48 UTC (rev 5076)
@@ -14,7 +14,6 @@
 MASTER_SITES = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tgz
 DISTFILES += $(call admfiles,CSWoldap)
-DISTFILES += cswopenldap openldap.xml svc-openldap
 DISTFILES += README.CSW openldaprc
 
 LICENSE = COPYRIGHT
@@ -54,9 +53,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-EXTRA_BUILD_ISAS_sparc = sparcv9
-EXTRA_BUILD_ISAS_i386  = pentium_pro amd64
-
 PKGFILES_CSWoldapclient  = $(bindir)/.*
 PKGFILES_CSWoldapclient += $(mandir)/man1/.*
 
@@ -67,6 +63,8 @@
 PKGFILES_CSWoldaprt += $(sysconfdir)/ldap.conf
 PKGFILES_CSWoldaprt += $(mandir)/man5/ldap.conf.5
 
+PROTOTYPE_FILTER = awk '$$$$3 ~/\/init.d\/cswopenldap$$$$/ { $$$$2 = "cswinitsmf" } { print }'
+
 include gar/category.mk
 
 CFLAGS := $(filter-out -I%,$(CFLAGS))
@@ -75,6 +73,8 @@
 INSTALL_SCRIPTS += custom
 
 install-custom:
+	ginstall -D $(DOWNLOADDIR)/cswopenldap \
+		$(DESTDIR)/etc/opt/csw/init.d/cswopenldap
 	@for file in $(EXTRA_DOCS); do \
 		ginstall -D $(WORKDIR)/$$file $(DESTDIR)$(docdir)/$(GARNAME)/$$file; \
 	done

Modified: csw/mgar/pkg/openldap/trunk/checksums
===================================================================
--- csw/mgar/pkg/openldap/trunk/checksums	2009-05-27 19:28:41 UTC (rev 5075)
+++ csw/mgar/pkg/openldap/trunk/checksums	2009-05-27 19:43:48 UTC (rev 5076)
@@ -3,6 +3,9 @@
 d7e13ba31a8de786f7cdbe3d529a9728  download/cswopenldap
 ed5b86e9d2b372d10edfe3bb59fee165  download/openldap-2.4.16.tgz
 0e57547ad2b5fedca9f0bd4beaddfe39  download/openldap.xml
+d7e13ba31a8de786f7cdbe3d529a9728  download/cswopenldap
+ed5b86e9d2b372d10edfe3bb59fee165  download/openldap-2.4.16.tgz
+0e57547ad2b5fedca9f0bd4beaddfe39  download/openldap.xml
 ab2ac7519b092ce8d16124c5270bfec0  download/openldaprc
 d3dee9018137c39f357859b652e3a67c  download/patch-oldap-2.4.16-ntlm.diff
 e15c2020566e56f02118e75c89111f15  download/svc-openldap

Modified: csw/mgar/pkg/openldap/trunk/files/cswopenldap
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/cswopenldap	2009-05-27 19:28:41 UTC (rev 5075)
+++ csw/mgar/pkg/openldap/trunk/files/cswopenldap	2009-05-27 19:43:48 UTC (rev 5076)
@@ -34,6 +34,7 @@
 SLURPD=/opt/csw/libexec/slurpd
 
 # Source startup options
+[ -r /lib/svc/share/smf_include.sh ] && . /lib/svc/share/smf_include.sh
 [ -r /opt/csw/etc/openldaprc ] && . /opt/csw/etc/openldaprc
 [ -r /etc/opt/csw/openldaprc ] && . /etc/opt/csw/openldaprc
 


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


From valholla at users.sourceforge.net  Wed May 27 21:47:28 2009
From: valholla at users.sourceforge.net (valholla at users.sourceforge.net)
Date: Wed, 27 May 2009 19:47:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[5077]
	csw/mgar/pkg/openldap/trunk/Makefile
Message-ID: 

Revision: 5077
          http://gar.svn.sourceforge.net/gar/?rev=5077&view=rev
Author:   valholla
Date:     2009-05-27 19:47:28 +0000 (Wed, 27 May 2009)

Log Message:
-----------
smf support

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

Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2009-05-27 19:43:48 UTC (rev 5076)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2009-05-27 19:47:28 UTC (rev 5077)
@@ -29,7 +29,7 @@
 SPKG_DESC_CSWoldaprt     = OpenLDAP runtime libraries
 
 REQUIRED_PKGS_CSWoldap       = CSWbdb4 CSWiconv CSWlibnet CSWlibtoolrt CSWoldaprt
-REQUIRED_PKGS_CSWoldap      += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc
+REQUIRED_PKGS_CSWoldap      += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc CSWcswclassutils
 REQUIRED_PKGS_CSWoldapclient = CSWlibnet CSWoldaprt CSWosslrt CSWsasl
 REQUIRED_PKGS_CSWoldapdevel  = CSWoldaprt
 REQUIRED_PKGS_CSWoldaprt     = CSWlibnet CSWosslrt CSWsasl


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


From ellson at users.sourceforge.net  Wed May 27 23:43:52 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Wed, 27 May 2009 21:43:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[5078]
	csw/mgar/pkg/liblasi/trunk/Makefile
Message-ID: 

Revision: 5078
          http://gar.svn.sourceforge.net/gar/?rev=5078&view=rev
Author:   ellson
Date:     2009-05-27 21:43:52 +0000 (Wed, 27 May 2009)

Log Message:
-----------
add a "SF_PROJ = lasi" becasue sf name != gar name ! = library name .....gah!

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

Modified: csw/mgar/pkg/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 19:47:28 UTC (rev 5077)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 21:43:52 UTC (rev 5078)
@@ -2,6 +2,7 @@
 GARVERSION = 1.1.0
 CATEGORIES = lib
 
+SF_PROJ      = lasi
 SOURCENAME = libLASi
 
 DESCRIPTION = C++ Unicode support for PostScript
@@ -44,10 +45,12 @@
 
 WORKSRC = $(WORKDIR)/$(SOURCENAME)-$(GARVERSION)
 
+#		CXX=/opt/csw/gcc4/bin/g++ \
+#
+
 configure-custom:
 	@echo " ==> Configuring $(GARNAME) (custom)"
 	@( cd $(WORKSRC) ; \
-		CXX=/opt/csw/gcc4/bin/g++ \
 		cmake	-DCMAKE_INSTALL_PREFIX=/opt/csw \
 			-DCMAKE_VERBOSE_MAKEFILE=ON \
 			. )


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


From ellson at users.sourceforge.net  Wed May 27 23:50:22 2009
From: ellson at users.sourceforge.net (ellson at users.sourceforge.net)
Date: Wed, 27 May 2009 21:50:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[5079]
	csw/mgar/pkg/liblasi/trunk/Makefile
Message-ID: 

Revision: 5079
          http://gar.svn.sourceforge.net/gar/?rev=5079&view=rev
Author:   ellson
Date:     2009-05-27 21:50:22 +0000 (Wed, 27 May 2009)

Log Message:
-----------
put back g++ for now

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

Modified: csw/mgar/pkg/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 21:43:52 UTC (rev 5078)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2009-05-27 21:50:22 UTC (rev 5079)
@@ -45,12 +45,11 @@
 
 WORKSRC = $(WORKDIR)/$(SOURCENAME)-$(GARVERSION)
 
-#		CXX=/opt/csw/gcc4/bin/g++ \
-#
 
 configure-custom:
 	@echo " ==> Configuring $(GARNAME) (custom)"
 	@( cd $(WORKSRC) ; \
+		CXX=/opt/csw/gcc4/bin/g++ \
 		cmake	-DCMAKE_INSTALL_PREFIX=/opt/csw \
 			-DCMAKE_VERBOSE_MAKEFILE=ON \
 			. )


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


From bonivart at users.sourceforge.net  Thu May 28 09:29:42 2009
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 28 May 2009 07:29:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[5080] csw/mgar/pkg/cswclassutils/trunk
Message-ID: 

Revision: 5080
          http://gar.svn.sourceforge.net/gar/?rev=5080&view=rev
Author:   bonivart
Date:     2009-05-28 07:29:42 +0000 (Thu, 28 May 2009)

Log Message:
-----------
cswclassutils: added cswpycompile

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/Makefile
    csw/mgar/pkg/cswclassutils/trunk/checksums
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype

Added Paths:
-----------
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpycompile

Property Changed:
----------------
    csw/mgar/pkg/cswclassutils/trunk/


Property changes on: csw/mgar/pkg/cswclassutils/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-27 21:50:22 UTC (rev 5079)
+++ csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-28 07:29:42 UTC (rev 5080)
@@ -1,5 +1,5 @@
 GARNAME = cswclassutils
-GARVERSION = 1.9
+GARVERSION = 1.10
 CATEGORIES = utils
 
 DESCRIPTION = CSW class action utilities
@@ -17,7 +17,7 @@
 WORKSRC = $(WORKDIR)
 SPKG_SOURCEURL = http://www.opencsw.org
 
-CASLIST = cswcpsampleconf cswpreserveconf cswinitsmf cswusergroup
+CASLIST = cswcpsampleconf cswpreserveconf cswinitsmf cswusergroup cswpycompile
 
 install-custom:
 	@echo " ==> Installing $(GARNAME) (custom)"

Modified: csw/mgar/pkg/cswclassutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/checksums	2009-05-27 21:50:22 UTC (rev 5079)
+++ csw/mgar/pkg/cswclassutils/trunk/checksums	2009-05-28 07:29:42 UTC (rev 5080)
@@ -1,2 +1,2 @@
 38e0bf6e204e003254ed246df2b4e1f9  download/CSWcswclassutils.gspec
-2779acb0e9549f5e3de16759f59d2e53  download/CSWcswclassutils.prototype
+854d77b21b177b15fd2aac39339a0c8c  download/CSWcswclassutils.prototype

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW	2009-05-27 21:50:22 UTC (rev 5079)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW	2009-05-28 07:29:42 UTC (rev 5080)
@@ -35,6 +35,14 @@
   users, groups, gcos, home directory and shell. You can also decide if you want
   the home directories to be created and/or removed during install/remove.
 
+- cswpycompile
+
+  This class takes care of creating/removing python's normal and optimized
+  bytecode files.  Set all *.py files' class = pycompile to activate.
+  Example:
+  # use prototype filters to set the class
+  PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "pycompile" } { print }'
+
 Read more on the wiki: http://wiki.opencsw.org/cswclassutils-package.
 
 -- 

Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile	                        (rev 0)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpycompile	2009-05-28 07:29:42 UTC (rev 5080)
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# i.pycompile - Class action script for compiling pyo and pyc files
+#
+# $Id: i.pycompile 5069 2009-05-27 17:36:24Z valholla $
+#
+# Written by Mike Watters
+#
+# 2009-05-25 First Release
+#
+
+# Force Path for the script to use
+PATH=/usr/bin:/usr/sbin:/opt/csw/bin
+
+PY_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+PY_BINDIR=${PY_PREFIX}/bin
+PY_LIBDIR=${PY_PREFIX}/lib/python
+
+#DEBUG = 1  # Uncomment to enable debug
+if [ "${DEBUG}" ]; then
+    echo PACKAGE: $PKGINST
+fi
+
+if [ ! -f ${PY_BINDIR}/python -a ! -x ${PY_BINDIR}/python ]; then
+    echo "Could not find or execute ${PY_BINDIR}/python"
+    echo "Check your Python installation."
+    exit 2
+fi
+    
+if [ ! -f ${PY_LIBDIR}/compileall.py ]; then
+    echo "Could not find ${PY_LIBDIR}/compileall.py"
+    echo "Check your Python installation."
+    exit 2
+fi
+
+echo "Compiling py files to normal bytecode ..."
+# Compile .py libraries to .pyc files
+${PY_BINDIR}/python -Wi -tt ${PY_LIBDIR}/compileall.py \
+    -d ${PY_LIBDIR} -x 'bad_coding|badsyntax' ${PY_LIBDIR}
+
+echo "Compiling py files to optimized bytecode ..."
+# Compile .py libraries to .pyo files
+${PY_BINDIR}/python -Wi -tt -O ${PY_LIBDIR}/compileall.py \
+    -d ${PY_LIBDIR} -x 'bad_coding|badsyntax' ${PY_LIBDIR}
+ 
+exit 0

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype	2009-05-27 21:50:22 UTC (rev 5079)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.prototype	2009-05-28 07:29:42 UTC (rev 5080)
@@ -15,6 +15,8 @@
 f none /usr/sadm/install/scripts/r.cswcpsampleconf 0555 root sys
 f none /usr/sadm/install/scripts/i.cswpreserveconf 0555 root sys
 f none /usr/sadm/install/scripts/r.cswpreserveconf 0555 root sys
+f none /usr/sadm/install/scripts/i.cswpycompile 0555 root sys
+f none /usr/sadm/install/scripts/r.cswpycompile 0555 root sys
 d none /opt/csw/share 0755 root bin
 d none /opt/csw/share/doc 0755 root bin
 d none /opt/csw/share/doc/cswclassutils 0755 root bin

Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpycompile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpycompile	                        (rev 0)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpycompile	2009-05-28 07:29:42 UTC (rev 5080)
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# r.pycompile - Class action script for removing pyo and pyc files
+#
+# $Id: r.pycompile 5019 2009-05-23 04:00:12Z valholla $
+#
+# Written by Mike Watters
+#
+#   2009-05-25 First Release
+#
+
+# Force Path for the script to use
+PATH=/usr/bin:/usr/sbin:/opt/csw/bin
+DEBUG=      # clear to disable debug, set to anything to enable
+
+if [ "${DEBUG}" ]; then
+    echo PACKAGE: $PKGINST
+fi
+
+echo "Removing pyo and pyc files for package <$PKGINST> ..."
+pkgchk -v $PKGINST 2>&1 |grep \.py$ | xargs -i rm -f {}c {}o
+
+exit 0


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


From wahwah at users.sourceforge.net  Thu May 28 11:09:53 2009
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 28 May 2009 09:09:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[5081] csw/mgar/pkg
Message-ID: 

Revision: 5081
          http://gar.svn.sourceforge.net/gar/?rev=5081&view=rev
Author:   wahwah
Date:     2009-05-28 09:09:51 +0000 (Thu, 28 May 2009)

Log Message:
-----------
minimalsmf, a package documenting and testing SMF support in mGAR.

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

Added Paths:
-----------
    csw/mgar/pkg/minimalsmf/
    csw/mgar/pkg/minimalsmf/trunk/files/CSWminimalsmf.gspec
    csw/mgar/pkg/minimalsmf/trunk/files/cswminimalsmf
    csw/mgar/pkg/minimalsmf/trunk/files/cswminimalsmf.xml
    csw/mgar/pkg/minimalsmf/trunk/files/sleeping-beauty
    csw/mgar/pkg/minimalsmf/trunk/files/svc-cswminimalsmf

Modified: csw/mgar/pkg/minimalsmf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/template/trunk/Makefile	2009-05-26 00:54:19 UTC (rev 5052)
+++ csw/mgar/pkg/minimalsmf/trunk/Makefile	2009-05-28 09:09:51 UTC (rev 5081)
@@ -1,24 +1,35 @@
-GARNAME = mypkg
-GARVERSION = 1.0
-CATEGORIES = lib
+GARNAME = minimalsmf
+GARVERSION = 0.1
+CATEGORIES = server
 
-DESCRIPTION = This is a useful library
+DESCRIPTION = A test of an SMF-enabled package and mGAR SMF support
 define BLURB
-  It does stuff with things
+  This package is a minimal build of a package with SMF support, for the
+  purposes of testing and documenting mGAR.
+
+  It should contain the least amount of code necessary to build a package,
+  which, upon installation, imports a manifest and starts the service in the
+  global zone as well as in the non-global zones (full and sparse).
 endef
 
-MASTER_SITES = 
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+ARCHALL = 1
+MASTER_SITES =
+DISTFILES  = sleeping-beauty
+DISTFILES += $(call admfiles,CSW$(GARNAME),)
+DISTFILES += csw$(GARNAME) csw$(GARNAME).xml svc-csw$(GARNAME)
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+INITSMF = /opt/csw/etc/init.d/csw$(GARNAME)
 
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = $(GARNAME)
 
-# Remove the following rules and uncomment the
-# include before building.
-all: .DEFAULT
-.DEFAULT:
-	@true
+install-$(GARNAME):
+	ginstall -d $(DESTDIR)
+	ginstall -d $(DESTDIR)$(bindir)
+	ginstall -m 755 files/sleeping-beauty $(DESTDIR)$(bindir)
+	ginstall -d $(DESTDIR)$(libdir)/svc/method
+	ginstall -m 755 files/svc-csw$(GARNAME) $(DESTDIR)$(libdir)/svc/method/csw$(GARNAME)
 
-#include gar/category.mk
+include gar/category.mk

Added: csw/mgar/pkg/minimalsmf/trunk/files/CSWminimalsmf.gspec
===================================================================
--- csw/mgar/pkg/minimalsmf/trunk/files/CSWminimalsmf.gspec	                        (rev 0)
+++ csw/mgar/pkg/minimalsmf/trunk/files/CSWminimalsmf.gspec	2009-05-28 09:09:51 UTC (rev 5081)
@@ -0,0 +1,6 @@
+%var		bitname minimalsmf
+%var		pkgname CSWminimalsmf
+%include        url file://%{PKGLIB}/csw_dyndepend.gspec
+%include	url file://%{PKGLIB}/smf_enabled.gspec
+%var		SERVICE_NAME cswminimalsmf
+%var            SERVICE_CONF_FILES /etc/foo

Added: csw/mgar/pkg/minimalsmf/trunk/files/cswminimalsmf.xml
===================================================================
--- csw/mgar/pkg/minimalsmf/trunk/files/cswminimalsmf.xml	                        (rev 0)
+++ csw/mgar/pkg/minimalsmf/trunk/files/cswminimalsmf.xml	2009-05-28 09:09:51 UTC (rev 5081)
@@ -0,0 +1,26 @@
+
+
+
+  
+    
+    
+    
+      
+    
+    
+      
+    
+    
+      
+    
+    
+    
+  
+

Added: csw/mgar/pkg/minimalsmf/trunk/files/sleeping-beauty
===================================================================
--- csw/mgar/pkg/minimalsmf/trunk/files/sleeping-beauty	                        (rev 0)
+++ csw/mgar/pkg/minimalsmf/trunk/files/sleeping-beauty	2009-05-28 09:09:51 UTC (rev 5081)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+while true
+do
+	sleep 10
+	logger user.info "Sleeping $(date)"
+done


Property changes on: csw/mgar/pkg/minimalsmf/trunk/files/sleeping-beauty
___________________________________________________________________
Added: svn:executable
   + *

Added: csw/mgar/pkg/minimalsmf/trunk/files/svc-cswminimalsmf
===================================================================
--- csw/mgar/pkg/minimalsmf/trunk/files/svc-cswminimalsmf	                        (rev 0)
+++ csw/mgar/pkg/minimalsmf/trunk/files/svc-cswminimalsmf	2009-05-28 09:09:51 UTC (rev 5081)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/opt/csw/bin/sleeping-beauty &


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


From bonivart at users.sourceforge.net  Thu May 28 11:21:43 2009
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 28 May 2009 09:21:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[5082] csw/mgar/pkg/cswclassutils/trunk
Message-ID: 

Revision: 5082
          http://gar.svn.sourceforge.net/gar/?rev=5082&view=rev
Author:   bonivart
Date:     2009-05-28 09:21:43 +0000 (Thu, 28 May 2009)

Log Message:
-----------
cswclassutils: re-enable persistent state code (cswinitsmf)

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/Makefile
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinitsmf

Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-28 09:09:51 UTC (rev 5081)
+++ csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-28 09:21:43 UTC (rev 5082)
@@ -1,5 +1,5 @@
 GARNAME = cswclassutils
-GARVERSION = 1.10
+GARVERSION = 1.11
 CATEGORIES = utils
 
 DESCRIPTION = CSW class action utilities

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2009-05-28 09:09:51 UTC (rev 5081)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2009-05-28 09:21:43 UTC (rev 5082)
@@ -18,22 +18,22 @@
 DEBUG=		# clear to disable debug, set to anything to enable
 SVCDIR=/var/opt/csw/svc
 
-#SMF_STATE_DIR="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG"
-#SMF_STATE_FILE="$SMF_STATE_DIR/smf.state"
+SMF_STATE_DIR="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG"
+SMF_STATE_FILE="$SMF_STATE_DIR/smf.state"
 
 # retrieve the previous state of a service identified by the given FRMI
-#load_smf_service_state ()
-#{
-#    SMF_STATE="disabled"
-#
-#    if [ -f "$SMF_STATE_FILE" ]; then
-#        set -- `/usr/bin/awk " \\\$1 == \"$1\" { print \\\$2 } " "$SMF_STATE_FILE"`
-#        if [ "$1" = "enabled" ]; then
-#            SMF_STATE="enabled"
-#        fi
-#    fi
-#}
+load_smf_service_state ()
+{
+    SMF_STATE="enabled"
 
+    if [ -f "$SMF_STATE_FILE" ]; then
+        set -- `/usr/bin/awk " \\\$1 == \"$1\" { print \\\$2 } " "$SMF_STATE_FILE"`
+        if [ "$1" = "disabled" ]; then
+            SMF_STATE="disabled"
+        fi
+    fi
+}
+
 # Source csw.conf, if it exists
 if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then
   . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf
@@ -204,11 +204,11 @@
 
     # Start service
     if [ "$daemon" = "yes" ]; then
-#      load_smf_service_state "$FMRI/$service"
-#      if [ "$SMF_STATE" = "enabled" ]; then
+      load_smf_service_state "$FMRI/$service"
+      if [ "$SMF_STATE" = "enabled" ]; then
         echo Enabling svc:/$FMRI/$service ...
         /usr/sbin/svcadm enable svc:/$FMRI/$service > /dev/null 2>&1
-#      fi
+      fi
     fi
   else
     # Copy the service script
@@ -279,7 +279,7 @@
 done
 
 # we delete the smf state file as we don't need it anymore
-#rm -f "$SMF_STATE_FILE"
+rm -f "$SMF_STATE_FILE"
 
 /usr/sbin/installf -f $PKGINST
 

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinitsmf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinitsmf	2009-05-28 09:09:51 UTC (rev 5081)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinitsmf	2009-05-28 09:21:43 UTC (rev 5082)
@@ -21,25 +21,25 @@
 # The following file is used to save the state of smf service upon
 # package removal
 # This allows to restore the service state across package upgrades.
-#SMF_STATE_DIR="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG"
-#SMF_STATE_FILE="$SMF_STATE_DIR/smf.state"
+SMF_STATE_DIR="$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG"
+SMF_STATE_FILE="$SMF_STATE_DIR/smf.state"
 
 # The smf state file shouldn't be there at this time but we
 # delete it to be sure
-#rm -f "$SMF_STATE_FILE"
+rm -f "$SMF_STATE_FILE"
 
 # save the current service state for the given frmi
-#save_smf_state ()
-#{
-#    SMF_STATE=`/usr/sbin/svccfg -s "$1:default" listprop general/enabled | /usr/bin/awk '{ print $3 }'`
-#    if [ "$SMF_STATE" != "true" ]; then
-#        SMF_STATE="disabled"
-#    else
-#        SMF_STATE="enabled"
-#    fi
-#    [ -d "$SMF_STATE_DIR" ] || mkdir -p "$SMF_STATE_DIR"
-#    echo "$1 $SMF_STATE" >> "$SMF_STATE_FILE"
-#}
+save_smf_state ()
+{
+    SMF_STATE=`/usr/sbin/svccfg -s "$1:default" listprop general/enabled | /usr/bin/awk '{ print $3 }'`
+    if [ "$SMF_STATE" != "true" ]; then
+        SMF_STATE="disabled"
+    else
+        SMF_STATE="enabled"
+    fi
+    [ -d "$SMF_STATE_DIR" ] || mkdir -p "$SMF_STATE_DIR"
+    echo "$1 $SMF_STATE" >> "$SMF_STATE_FILE"
+}
 
 # Source csw.conf, if it exists
 if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then
@@ -70,7 +70,7 @@
   FMRI=`grep ${PKGINST}$ /var/sadm/install/contents | grep "^/var/opt/csw/svc/manifest" | egrep '\.xml ' | cut -d'/' -f7- | awk -F'.xml' '{print $1}'`
   for i in `echo $FMRI | tr '\n' ' '`
   do
-#    save_smf_state "$i"
+    save_smf_state "$i"
     echo "Disabling svc:/$i ..."
     /usr/sbin/svcadm disable -s svc:/$i
     # Unregister with SMF


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


From bonivart at users.sourceforge.net  Thu May 28 14:39:59 2009
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 28 May 2009 12:39:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[5083] csw/mgar/pkg/cswclassutils/trunk
Message-ID: 

Revision: 5083
          http://gar.svn.sourceforge.net/gar/?rev=5083&view=rev
Author:   bonivart
Date:     2009-05-28 12:39:59 +0000 (Thu, 28 May 2009)

Log Message:
-----------
cswclassutils: add AUTOENABLE tweak to cswinitsmf (#3635)

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/Makefile
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf

Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-28 09:21:43 UTC (rev 5082)
+++ csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-28 12:39:59 UTC (rev 5083)
@@ -1,5 +1,5 @@
 GARNAME = cswclassutils
-GARVERSION = 1.11
+GARVERSION = 1.12
 CATEGORIES = utils
 
 DESCRIPTION = CSW class action utilities

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample	2009-05-28 09:21:43 UTC (rev 5082)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample	2009-05-28 12:39:59 UTC (rev 5083)
@@ -8,6 +8,7 @@
 # Written by Peter Bonivart
 #
 # 2008-04-22 First release
+# 2009-05-28 Add AUTOENABLE
 #
 # Usage
 # -----
@@ -51,6 +52,9 @@
 ##RC_SLEV 3          # Run levels that should have a start script symlink
 ##FMRI network       # FMRI path for service (S10+), the example would give
 #                      an FMRI of "svc:/network/cswfoo:default"
+##AUTOENABLE no	     # Will not enable SMF service regardless of local csw.conf,
+#                      use when a package needs setup before being useful,
+#                      would otherwise leave service in maintainance mode
 
 case "$1" in
   start)

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2009-05-28 09:21:43 UTC (rev 5082)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2009-05-28 12:39:59 UTC (rev 5083)
@@ -14,6 +14,9 @@
 # 2009-04-22 Fix bug when starting packages with multiple services (Ihsan Dogan)
 # 2009-04-24 Temporarily disabled the "persistent state" code until it can be used
 #            per service, not just per package
+# 2009-05-28 Enabled persistent state code again after receiving patch from Yann.
+#            Support AUTOENABLE to force no start regardless of
+#            local csw.conf (Bug ID 0003635)
 
 DEBUG=		# clear to disable debug, set to anything to enable
 SVCDIR=/var/opt/csw/svc
@@ -203,7 +206,11 @@
     echo $PKGINST is using Service Management Facility. The FMRI is svc:/$FMRI/$service:default
 
     # Start service
-    if [ "$daemon" = "yes" ]; then
+    AUTOENABLE="yes"
+    if [ "`grep '^#AUTOENABLE' $dest`" ]; then
+      AUTOENABLE=`grep '^#AUTOENABLE' $dest | awk '{print $2}' | tr -s '[:upper:]' '[:lower:]'`
+    fi
+    if [ "$daemon" = "yes" -a "$AUTOENABLE" != "no" -a "$AUTOENABLE" != "false"]; then
       load_smf_service_state "$FMRI/$service"
       if [ "$SMF_STATE" = "enabled" ]; then
         echo Enabling svc:/$FMRI/$service ...


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


From bonivart at users.sourceforge.net  Thu May 28 15:14:11 2009
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 28 May 2009 13:14:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[5084] csw/mgar/pkg/cswclassutils/trunk
Message-ID: 

Revision: 5084
          http://gar.svn.sourceforge.net/gar/?rev=5084&view=rev
Author:   bonivart
Date:     2009-05-28 13:14:11 +0000 (Thu, 28 May 2009)

Log Message:
-----------
cswclassutils: add MANIFEST tweak to cswinitsmf (custom manifests) (#3636)

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/Makefile
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf

Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-28 12:39:59 UTC (rev 5083)
+++ csw/mgar/pkg/cswclassutils/trunk/Makefile	2009-05-28 13:14:11 UTC (rev 5084)
@@ -1,5 +1,5 @@
 GARNAME = cswclassutils
-GARVERSION = 1.12
+GARVERSION = 1.13
 CATEGORIES = utils
 
 DESCRIPTION = CSW class action utilities

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample	2009-05-28 12:39:59 UTC (rev 5083)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.csw.smf.sample	2009-05-28 13:14:11 UTC (rev 5084)
@@ -8,7 +8,7 @@
 # Written by Peter Bonivart
 #
 # 2008-04-22 First release
-# 2009-05-28 Add AUTOENABLE
+# 2009-05-28 Add AUTOENABLE, MANIFEST
 #
 # Usage
 # -----
@@ -52,9 +52,12 @@
 ##RC_SLEV 3          # Run levels that should have a start script symlink
 ##FMRI network       # FMRI path for service (S10+), the example would give
 #                      an FMRI of "svc:/network/cswfoo:default"
-##AUTOENABLE no	     # Will not enable SMF service regardless of local csw.conf,
-#                      use when a package needs setup before being useful,
-#                      would otherwise leave service in maintainance mode
+##AUTOENABLE yes     # If set to no will not enable SMF service regardless of
+#                      local csw.conf, use when a package needs setup before
+#                      being useful, would otherwise leave service in
+#                      maintenance mode
+##MANIFEST /absolute/path/to/manifest   # If set, use this manifest instead
+#                      of autogenerating one (default)
 
 case "$1" in
   start)

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2009-05-28 12:39:59 UTC (rev 5083)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2009-05-28 13:14:11 UTC (rev 5084)
@@ -16,7 +16,8 @@
 #            per service, not just per package
 # 2009-05-28 Enabled persistent state code again after receiving patch from Yann.
 #            Support AUTOENABLE to force no start regardless of
-#            local csw.conf (Bug ID 0003635)
+#            local csw.conf (Bug ID 0003635).
+#            Support custom manifests (Bug ID 0003636)
 
 DEBUG=		# clear to disable debug, set to anything to enable
 SVCDIR=/var/opt/csw/svc
@@ -112,10 +113,16 @@
     /usr/bin/chmod 755 $SVCDIR/method/svc-$service
     /usr/bin/chown root:bin $SVCDIR/method/svc-$service
 
-    # Creating manifest
-    echo Creating manifest ...
-    # Add first part of manifest
-    cat > $SVCDIR/manifest/$FMRI/$service.xml << EOF
+    MANIFEST=
+    if [ "`grep '^#MANIFEST' $dest`" ]; then
+      MANIFEST=`grep '^#MANIFEST' $dest | awk '{print $2}'`
+    fi
+    if [ ! "$MANIFEST" ]; then
+      # Creating manifest
+      echo Creating manifest ...
+      # Add first part of manifest
+      MANIFEST=$SVCDIR/manifest/$FMRI/$service.xml
+      cat > $MANIFEST << EOF