From wahwah at users.sourceforge.net Mon Mar 1 00:32:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 28 Feb 2010 23:32:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8901] csw/mgar/pkg/gnome-icon-theme/trunk/Makefile Message-ID: Revision: 8901 http://gar.svn.sourceforge.net/gar/?rev=8901&view=rev Author: wahwah Date: 2010-02-28 23:31:45 +0000 (Sun, 28 Feb 2010) Log Message: ----------- gnome-icon-theme: Correcting the archall variable. Modified Paths: -------------- csw/mgar/pkg/gnome-icon-theme/trunk/Makefile Modified: csw/mgar/pkg/gnome-icon-theme/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-icon-theme/trunk/Makefile 2010-02-28 22:09:10 UTC (rev 8900) +++ csw/mgar/pkg/gnome-icon-theme/trunk/Makefile 2010-02-28 23:31:45 UTC (rev 8901) @@ -19,5 +19,5 @@ BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWgnomeicontheme) TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) -ARCHALL_CSWgnome-icon-theme = 1 +ARCHALL_CSWgnomeicontheme = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Mar 1 01:04:08 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 01 Mar 2010 00:04:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8902] csw/mgar/pkg Message-ID: Revision: 8902 http://gar.svn.sourceforge.net/gar/?rev=8902&view=rev Author: hson Date: 2010-03-01 00:04:08 +0000 (Mon, 01 Mar 2010) Log Message: ----------- enchant: Initial commit Added Paths: ----------- csw/mgar/pkg/enchant/ csw/mgar/pkg/enchant/Makefile csw/mgar/pkg/enchant/branches/ csw/mgar/pkg/enchant/tags/ csw/mgar/pkg/enchant/trunk/ csw/mgar/pkg/enchant/trunk/Makefile csw/mgar/pkg/enchant/trunk/checksums csw/mgar/pkg/enchant/trunk/files/ Added: csw/mgar/pkg/enchant/Makefile =================================================================== --- csw/mgar/pkg/enchant/Makefile (rev 0) +++ csw/mgar/pkg/enchant/Makefile 2010-03-01 00:04:08 UTC (rev 8902) @@ -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) Property changes on: csw/mgar/pkg/enchant/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/enchant/trunk/Makefile =================================================================== --- csw/mgar/pkg/enchant/trunk/Makefile (rev 0) +++ csw/mgar/pkg/enchant/trunk/Makefile 2010-03-01 00:04:08 UTC (rev 8902) @@ -0,0 +1,77 @@ +GARNAME = enchant +GARVERSION = 1.5.0 +CATEGORIES = apps + +DESCRIPTION = A generic spell checking library +define BLURB +endef + +MASTER_SITES = http://www.abisource.com/downloads/$(GARNAME)/$(GARVERSION)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWenchant CSWenchantrt CSWenchantdevel CSWenchantdoc +CATALOGNAME_CSWenchant = enchant +CATALOGNAME_CSWenchantrt = enchant_rt +CATALOGNAME_CSWenchantdevel = enchant_devel +CATALOGNAME_CSWenchantdoc = enchant_doc + +SPKG_DESC_CSWenchant += $(DESCRIPTION) +SPKG_DESC_CSWenchantrt += $(DESCRIPTION) - runtime package +SPKG_DESC_CSWenchantdevel += $(DESCRIPTION) - developer package +SPKG_DESC_CSWenchantdoc += $(DESCRIPTION) - documentation + +PKGFILES_CSWenchantrt = $(PKGFILES_RT) +PKGFILES_CSWenchantrt += $(libdir)/.*\.so.* +PKGFILES_CSWenchantdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWenchantdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWenchantdoc = 1 + +RUNTIME_DEP_PKGS_CSWenchant += CSWenchantrt +RUNTIME_DEP_PKGS_CSWenchant += CSWggettextrt +RUNTIME_DEP_PKGS_CSWenchant += CSWglib2 +RUNTIME_DEP_PKGS_CSWenchantrt += CSWaspell +RUNTIME_DEP_PKGS_CSWenchantrt += CSWdbusglib +RUNTIME_DEP_PKGS_CSWenchantrt += CSWggettextrt +RUNTIME_DEP_PKGS_CSWenchantrt += CSWglib2 +RUNTIME_DEP_PKGS_CSWenchantrt += CSWlibdbus +RUNTIME_DEP_PKGS_CSWenchantdevel += CSWenchant +RUNTIME_DEP_PKGS_CSWenchantdoc += + +BUILD_DEP_PKGS += CSWdbusglibdev + +LICENSE = COPYING.LIB + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://www.abisource.com/projects/enchant/ + +CHECKPKG_OVERRIDES_CSWenchant += symbol-not-found|enchant-lsmod +CHECKPKG_OVERRIDES_CSWenchant += symbol-not-found|enchant +CHECKPKG_OVERRIDES_CSWenchantrt += symbol-not-found|libenchant_ispell.so +CHECKPKG_OVERRIDES_CSWenchantrt += symbol-not-found|libenchant_aspell.so +CHECKPKG_OVERRIDES_CSWenchantrt += symbol-not-found|libenchant_myspell.so + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +NOISAEXEC = 1 +#NOISALIST = 1 +# libdbus not 64-bit yet +#BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static=no +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/enchant/trunk/checksums =================================================================== --- csw/mgar/pkg/enchant/trunk/checksums (rev 0) +++ csw/mgar/pkg/enchant/trunk/checksums 2010-03-01 00:04:08 UTC (rev 8902) @@ -0,0 +1 @@ +7dfaed14e142b4a0004b770c9568ed02 enchant-1.5.0.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 Mon Mar 1 05:44:12 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 01 Mar 2010 04:44:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8903] csw/mgar/pkg Message-ID: Revision: 8903 http://gar.svn.sourceforge.net/gar/?rev=8903&view=rev Author: hson Date: 2010-03-01 04:44:08 +0000 (Mon, 01 Mar 2010) Log Message: ----------- autotrace: Initial commit Added Paths: ----------- csw/mgar/pkg/autotrace/ csw/mgar/pkg/autotrace/Makefile csw/mgar/pkg/autotrace/branches/ csw/mgar/pkg/autotrace/tags/ csw/mgar/pkg/autotrace/trunk/ csw/mgar/pkg/autotrace/trunk/Makefile csw/mgar/pkg/autotrace/trunk/checksums csw/mgar/pkg/autotrace/trunk/files/ Added: csw/mgar/pkg/autotrace/Makefile =================================================================== --- csw/mgar/pkg/autotrace/Makefile (rev 0) +++ csw/mgar/pkg/autotrace/Makefile 2010-03-01 04:44:08 UTC (rev 8903) @@ -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) Property changes on: csw/mgar/pkg/autotrace/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/autotrace/trunk/Makefile =================================================================== --- csw/mgar/pkg/autotrace/trunk/Makefile (rev 0) +++ csw/mgar/pkg/autotrace/trunk/Makefile 2010-03-01 04:44:08 UTC (rev 8903) @@ -0,0 +1,64 @@ +GARNAME = autotrace +GARVERSION = 0.31.1 +CATEGORIES = apps + +DESCRIPTION = A program for converting bitmap to vector graphics +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +SPKG_SOURCEURL = http://autotrace.sourceforge.net + +PACKAGES = CSWautotrace CSWautotracert CSWautotracedevel CSWautotracedoc +CATALOGNAME_CSWautotrace = autotrace +CATALOGNAME_CSWautotracert = autotrace_rt +CATALOGNAME_CSWautotracedevel = autotrace_devel +CATALOGNAME_CSWautotracedoc = autotrace_doc +SPKG_DESC_CSWautotrace = $(DESCRIPTION) +SPKG_DESC_CSWautotracert = $(DESCRIPTION) - runtime package +SPKG_DESC_CSWautotracedevel = $(DESCRIPTION) - developer package +SPKG_DESC_CSWautotracedoc = $(DESCRIPTION) - API documentation package + +PKGFILES_CSWautotracedevel = $(PKGFILES_DEVEL) +PKGFILES_CSWautotracert = $(PKGFILES_RT) +PKGFILES_CSWautotracedoc = $(sharedstatedir)/doc/autotrace/.* + +RUNTIME_DEP_PKGS_CSWautotrace += CSWautotracert +RUNTIME_DEP_PKGS_CSWautotrace += CSWbzip2 +RUNTIME_DEP_PKGS_CSWautotrace += CSWfconfig +RUNTIME_DEP_PKGS_CSWautotrace += CSWftype2 +RUNTIME_DEP_PKGS_CSWautotrace += CSWimagemagick +RUNTIME_DEP_PKGS_CSWautotrace += CSWjpeg +RUNTIME_DEP_PKGS_CSWautotrace += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWautotrace += CSWlibice +RUNTIME_DEP_PKGS_CSWautotrace += CSWlibsm +RUNTIME_DEP_PKGS_CSWautotrace += CSWlibtoolrt +RUNTIME_DEP_PKGS_CSWautotrace += CSWlibx11 +RUNTIME_DEP_PKGS_CSWautotrace += CSWlibxext +RUNTIME_DEP_PKGS_CSWautotrace += CSWlibxt +RUNTIME_DEP_PKGS_CSWautotrace += CSWpng +RUNTIME_DEP_PKGS_CSWautotrace += CSWtiff +RUNTIME_DEP_PKGS_CSWautotrace += CSWzlib +RUNTIME_DEP_PKGS_CSWautotracedevel += CSWautotracert +RUNTIME_DEP_PKGS_CSWautotracedoc += CSWautotracert + +ARCHALL_CSWautotracedoc = 1 + +LICENSE = COPYING + +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)= +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +# Not until we have a 64-bit imagemagick +#BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-magick +CONFIGURE_ARGS += --with-pstoedit + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/autotrace/trunk/checksums =================================================================== --- csw/mgar/pkg/autotrace/trunk/checksums (rev 0) +++ csw/mgar/pkg/autotrace/trunk/checksums 2010-03-01 04:44:08 UTC (rev 8903) @@ -0,0 +1 @@ +54eabbb38d2076ded6d271e1ee4d0783 autotrace-0.31.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 Mon Mar 1 05:45:10 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 01 Mar 2010 04:45:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8904] csw/mgar/pkg/enchant/trunk/Makefile Message-ID: Revision: 8904 http://gar.svn.sourceforge.net/gar/?rev=8904&view=rev Author: hson Date: 2010-03-01 04:45:10 +0000 (Mon, 01 Mar 2010) Log Message: ----------- enchant: Fix dependency Modified Paths: -------------- csw/mgar/pkg/enchant/trunk/Makefile Modified: csw/mgar/pkg/enchant/trunk/Makefile =================================================================== --- csw/mgar/pkg/enchant/trunk/Makefile 2010-03-01 04:44:08 UTC (rev 8903) +++ csw/mgar/pkg/enchant/trunk/Makefile 2010-03-01 04:45:10 UTC (rev 8904) @@ -36,7 +36,7 @@ RUNTIME_DEP_PKGS_CSWenchantrt += CSWggettextrt RUNTIME_DEP_PKGS_CSWenchantrt += CSWglib2 RUNTIME_DEP_PKGS_CSWenchantrt += CSWlibdbus -RUNTIME_DEP_PKGS_CSWenchantdevel += CSWenchant +RUNTIME_DEP_PKGS_CSWenchantdevel += CSWenchantrt RUNTIME_DEP_PKGS_CSWenchantdoc += BUILD_DEP_PKGS += CSWdbusglibdev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Mar 1 06:10:11 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 01 Mar 2010 05:10:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8905] csw/mgar/pkg/libsoup/trunk Message-ID: Revision: 8905 http://gar.svn.sourceforge.net/gar/?rev=8905&view=rev Author: hson Date: 2010-03-01 05:10:11 +0000 (Mon, 01 Mar 2010) Log Message: ----------- libsoup: Update to 2.29.91 Modified Paths: -------------- csw/mgar/pkg/libsoup/trunk/Makefile csw/mgar/pkg/libsoup/trunk/checksums Modified: csw/mgar/pkg/libsoup/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup/trunk/Makefile 2010-03-01 04:45:10 UTC (rev 8904) +++ csw/mgar/pkg/libsoup/trunk/Makefile 2010-03-01 05:10:11 UTC (rev 8905) @@ -1,5 +1,5 @@ GARNAME = libsoup -GARVERSION = 2.26.3 +GARVERSION = 2.29.91 CATEGORIES = gnome Modified: csw/mgar/pkg/libsoup/trunk/checksums =================================================================== --- csw/mgar/pkg/libsoup/trunk/checksums 2010-03-01 04:45:10 UTC (rev 8904) +++ csw/mgar/pkg/libsoup/trunk/checksums 2010-03-01 05:10:11 UTC (rev 8905) @@ -1,3 +1,3 @@ -19f15636380a9a08a0f071cc53069b80 libsoup-2.26.3.tar.bz2 +900390c0ead254fbb23f3f0b84fd18bb libsoup-2.29.91.tar.bz2 7664d9f4057e9d7ce89d3dd7d7466061 old_libs_i386.tar.bz2 8bdff7a9f5b23bd63ffcf6fef24734e5 old_libs_sparc.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 Mon Mar 1 10:02:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Mar 2010 09:02:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8906] csw/mgar/pkg/mtools/trunk Message-ID: Revision: 8906 http://gar.svn.sourceforge.net/gar/?rev=8906&view=rev Author: dmichelsen Date: 2010-03-01 09:02:35 +0000 (Mon, 01 Mar 2010) Log Message: ----------- mtools: Update to 4.0.13 Modified Paths: -------------- csw/mgar/pkg/mtools/trunk/Makefile csw/mgar/pkg/mtools/trunk/checksums Modified: csw/mgar/pkg/mtools/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtools/trunk/Makefile 2010-03-01 05:10:11 UTC (rev 8905) +++ csw/mgar/pkg/mtools/trunk/Makefile 2010-03-01 09:02:35 UTC (rev 8906) @@ -1,5 +1,5 @@ GARNAME = mtools -GARVERSION = 4.0.12 +GARVERSION = 4.0.13 CATEGORIES = utils DESCRIPTION = read/write/list/format DOS disks under Unix Modified: csw/mgar/pkg/mtools/trunk/checksums =================================================================== --- csw/mgar/pkg/mtools/trunk/checksums 2010-03-01 05:10:11 UTC (rev 8905) +++ csw/mgar/pkg/mtools/trunk/checksums 2010-03-01 09:02:35 UTC (rev 8906) @@ -1,2 +1,2 @@ b3625d680ccc02b0a941e98c5bd36118 0001-Removeprototypes-unknown-to-Sun-Studio.patch -0ee77a14e5f113ad8136a867f8ed4c3a mtools-4.0.12.tar.bz2 +334fe1580d6e3f4b5c904ce097267477 mtools-4.0.13.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 1 10:23:32 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 01 Mar 2010 09:23:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8907] csw/mgar/gar/v2 Message-ID: Revision: 8907 http://gar.svn.sourceforge.net/gar/?rev=8907&view=rev Author: wahwah Date: 2010-03-01 09:23:31 +0000 (Mon, 01 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, first bunch of checks using the new API Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/testdata/stats/ csw/mgar/gar/v2/lib/python/testdata/stats/46/ csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/ csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/all_filenames.yml csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/basic_stats.yml csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/binaries.yml csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/binaries_dump_info.yml csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/depends.yml csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/isalist.yml csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/overrides.yml csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkginfo.yml csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkgmap.yml Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-03-01 09:02:35 UTC (rev 8906) +++ csw/mgar/gar/v2/bin/checkpkg 2010-03-01 09:23:31 UTC (rev 8907) @@ -260,58 +260,6 @@ ######################################## # Check for some common errors -if [[ $pkgname != "CSWcommon" ]] ; then - - 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() { @@ -324,26 +272,15 @@ find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' } - - - 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 /usr/ccs/bin/dump -Lv |nawk '$2=="NEEDED"{print $3}' | sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist - - - print libraries used are: cat $EXTRACTDIR/liblist print "cross-referencing with depend file (May take a while)" @@ -375,14 +312,6 @@ errmsg "$pkgname references self in depend file" fi -# Verify that there are no multiple depends -repeated_depends="$(awk '{print $2}' $EXTRACTDIR/$pkgname/install/depend \ - | sort | uniq -c | awk '{print $1}' | sort | uniq | wc -l)" -if [[ "$repeated_depends" -gt 1 ]]; then - cat $EXTRACTDIR/$pkgname/install/depend - errmsg "$pkgname lists a dependency more than once, see above" -fi - #to retain a record of all packages currently being examined from $@ echo $pkgname >> $SETDEPS Modified: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py 2010-03-01 09:02:35 UTC (rev 8906) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py 2010-03-01 09:23:31 UTC (rev 8907) @@ -123,27 +123,7 @@ dependent_pkgs = {} for checker in pkgs_data: pkgname = checker["basic_stats"]["pkgname"] - declared_dependencies = checker["depends"] - if debug and False: - sanitized_pkgname = pkgname.replace("-", "_") - data_file_name = "/var/tmp/checkpkg_test_data_%s.py" % sanitized_pkgname - logging.warn("Saving test data to %s." % repr(data_file_name)) - test_fd = open(data_file_name, "w") - print >>test_fd, "# Testing data for %s" % pkgname - print >>test_fd, "# $Id$" - print >>test_fd, "DATA_PKGNAME =", repr(pkgname) - print >>test_fd, "DATA_DECLARED_DEPENDENCIES =", repr(declared_dependencies) - print >>test_fd, "DATA_BINARIES_BY_PKGNAME =", repr(binaries_by_pkgname) - print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =", repr(needed_sonames_by_binary) - print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) - print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) - print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) - print >>test_fd, "DATA_LINES_BY_SONAME =", repr(lines_by_soname) - print >>test_fd, "DATA_PKGMAP_CACHE =", repr(pkgmap.cache) - print >>test_fd, "DATA_BINARIES_BY_SONAME =", repr(binaries_by_soname) - print >>test_fd, "DATA_ISALIST =", repr(isalist) - test_fd.close() - + declared_dependencies = dict(checker["depends"]) missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( pkgname, declared_dependencies, Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-01 09:02:35 UTC (rev 8906) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-01 09:23:31 UTC (rev 8907) @@ -40,6 +40,7 @@ ) INSTALL_CONTENTS_AVG_LINE_LENGTH = 102.09710677919261 DB_SCHEMA_VERSION = 2L +PACKAGE_STATS_VERSION = 2L # This shared library is present on Solaris 10 on amd64, but it's missing on # Solaris 8 on i386. It's okay if it's missing. @@ -772,6 +773,7 @@ def SetErrorsToDict(self, set_errors, a_dict): # These were generated by a set, but are likely to be bound to specific # packages. We'll try to preserve the package assignments. + errors = copy.copy(a_dict) for tag in set_errors: if tag.pkgname: if not tag.pkgname in errors: @@ -864,15 +866,17 @@ all_stats = pkg_data.GetAllStats() pkgname = all_stats["basic_stats"]["pkgname"] error_mgr = self.IndividualErrorGatherer(pkgname) - logger = logging.getLogger(pkgname) + logger = logging.getLogger("%s-%s" % (pkgname, function.__name__)) + logger.debug("Calling %s", function.__name__) function(all_stats, error_mgr, logger=logger) if error_mgr.errors: errors[pkgname] = error_mgr.errors # Set checks for function in self.set_checks: pkgs_data = [x.GetAllStats() for x in packages_data] - logger = logging.getLogger("SetCheck %s" % function) + logger = logging.getLogger("SetCheck-%s" % (function.__name__,)) error_mgr = self.SetErrorGatherer() + logger.debug("Calling %s", function.__name__) function(pkgs_data, error_mgr, logger) if error_mgr.errors: errors = self.SetErrorsToDict(error_mgr.errors, errors) @@ -985,7 +989,6 @@ class PackageStats(object): """Collects stats about a package and saves it.""" - STATS_VERSION = 1L # This list needs to be synchronized with the CollectStats() method. STAT_FILES = [ "all_filenames", @@ -1091,7 +1094,7 @@ def GetBasicStats(self): dir_pkg = self.GetDirFormatPkg() basic_stats = {} - basic_stats["stats_version"] = self.STATS_VERSION + basic_stats["stats_version"] = PACKAGE_STATS_VERSION basic_stats["pkg_path"] = self.srv4_pkg.pkg_path basic_stats["pkg_basename"] = os.path.basename(self.srv4_pkg.pkg_path) basic_stats["parsed_basename"] = opencsw.ParsePackageFileName(basic_stats["pkg_basename"]) Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-01 09:02:35 UTC (rev 8906) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-01 09:23:31 UTC (rev 8907) @@ -739,11 +739,15 @@ def GetDependencies(self): fd = open(os.path.join(self.directory, "install", "depend"), "r") - depends = {} + # It needs to be a list because there might be duplicates and it's + # necessary to carry that information. + depends = [] for line in fd: fields = re.split(WS_RE, line) if fields[0] == "P": - depends[fields[1]] = " ".join(fields[1:]) + pkgname = fields[1] + pkg_desc = " ".join(fields[1:]) + depends.append((pkgname, pkg_desc)) fd.close() return depends Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-01 09:02:35 UTC (rev 8906) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-01 09:23:31 UTC (rev 8907) @@ -11,6 +11,59 @@ # logger.debug("Checking something.") # error_mgr.ReportError("something-is-wrong") -def CheckPkgmap(pkg_data, error_mgr, logger): - # error_mgr.ReportError("foo") +import re + +PATHS_ALLOWED_ONLY_IN = { + "CSWcommon": ["/opt", + "/opt/csw/man", + "/opt/csw/doc", + "/opt/csw/info", + "/opt/csw/share/locale/locale.alias"], + "CSWiconv": ["/opt/csw/lib/charset.alias"], + "CSWtexinfp": ["/opt/csw/share/info/dir"], +} + + +def CheckForbiddenPaths(pkg_data, error_mgr, logger): + for pkgname in PATHS_ALLOWED_ONLY_IN: + if pkgname != pkg_data["basic_stats"]["pkgname"]: + for entry in pkg_data["pkgmap"]: + for forbidden_path in PATHS_ALLOWED_ONLY_IN[pkgname]: + if entry["path"] == forbidden_path: + error_mgr.ReportError("forbidden-path", entry["path"]) + + +def CheckDirectoryPermissions(pkg_data, error_mgr, logger): + for entry in pkg_data["pkgmap"]: + if entry["type"] == "d": + if entry["mode"][1] == "6": + error_mgr.ReportError("executable-bit-missing-on-a-directory", + entry["path"]) + + +def CheckNonCswPathsDirectoryPerms(pkg_data, error_mgr, logger): + for entry in pkg_data["pkgmap"]: + if entry["user"] == "?" or entry["group"] == "?" or entry["mode"] == "?": + if entry["path"].startswith("/opt/csw"): + error_mgr.ReportError("question-mark-perms-in-opt-csw", entry["path"]) + + +def CheckPerlLocal(pkg_data, error_mgr, logger): + perllocal_re = re.compile(r'/perllocal.pod') + for entry in pkg_data["pkgmap"]: + if entry["path"]: + if re.search(perllocal_re, entry["path"]): + error_mgr.ReportError("perllocal-pod-in-pkgmap", entry["path"]) + + +def CheckMultipleDepends(pkg_data, error_mgr, logger): + new_depends = set() + for pkgname, desc in pkg_data["depends"]: + if pkgname in new_depends: + error_mgr.ReportError("dependency-listed-more-than-once", pkgname) + new_depends.add(pkgname) + + +def SetCheckDependencies(pkgs_data, error_mgr, logger): + """Dependencies must be either installed in the system, or in the set.""" pass Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-01 09:02:35 UTC (rev 8906) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-01 09:23:31 UTC (rev 8907) @@ -4,11 +4,37 @@ import unittest import package_checks as pc +import checkpkg import yaml import os.path +import mox +import logging BASE_DIR = os.path.dirname(__file__) TESTDATA_DIR = os.path.join(BASE_DIR, "testdata") +CHECKPKG_STATS_DIR = os.path.join(TESTDATA_DIR, "stats") +DEFAULT_MD5 = "461a24f02dd5020b4aa014b76f3ec2cc" -class Foo(unittest.TestCase): - pass +class CheckpkgUnitTest(unittest.TestCase): + """Write a helper function using mox.""" + + def setUp(self): + self.pkg_stats = checkpkg.PackageStats(None, + CHECKPKG_STATS_DIR, + DEFAULT_MD5) + self.pkg_data = self.pkg_stats.GetAllStats() + self.mocker = mox.Mox() + + def testMultipleDepends(self): + logger_mock = self.mocker.CreateMock(logging.Logger) + error_mgr_mock = self.mocker.CreateMock( + checkpkg.CheckpkgManager2.IndividualErrorGatherer) + self.pkg_data["depends"].append(("CSWcommon", "This is surplus")) # this + error_mgr_mock.ReportError('dependency-listed-more-than-once', 'CSWcommon') # this + self.mocker.ReplayAll() + pc.CheckMultipleDepends(self.pkg_data, error_mgr_mock, logger_mock) # name or variable + self.mocker.VerifyAll() + + +if __name__ == '__main__': + unittest.main() Added: csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/all_filenames.yml =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/all_filenames.yml (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/all_filenames.yml 2010-03-01 09:23:31 UTC (rev 8907) @@ -0,0 +1 @@ +[pkginfo, pkgmap, copyright, depend, rsyncd.conf.5, rsync.1, license, rsync, rsync] Added: csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/basic_stats.yml =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/basic_stats.yml (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/basic_stats.yml 2010-03-01 09:23:31 UTC (rev 8907) @@ -0,0 +1,14 @@ +catalogname: rsync +parsed_basename: + arch: sparc + catalogname: rsync + full_version_string: 3.0.7,REV=2010.02.17 + osrel: SunOS5.8 + revision_info: {REV: 2010.02.17} + vendortag: CSW + version: 3.0.7 + version_info: {major version: '3', minor version: '0', patchlevel: '7'} +pkg_basename: rsync-3.0.7,REV=2010.02.17-SunOS5.8-sparc-CSW.pkg.gz +pkg_path: /tmp/pkg_dhBeK1/rsync-3.0.7,REV=2010.02.17-SunOS5.8-sparc-CSW.pkg.gz +pkgname: CSWrsync +stats_version: 1 Added: csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/binaries.yml =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/binaries.yml (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/binaries.yml 2010-03-01 09:23:31 UTC (rev 8907) @@ -0,0 +1 @@ +[opt/csw/bin/sparcv9/rsync, opt/csw/bin/sparcv8/rsync] Added: csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/binaries_dump_info.yml =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/binaries_dump_info.yml (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/binaries_dump_info.yml 2010-03-01 09:23:31 UTC (rev 8907) @@ -0,0 +1,16 @@ +- base_name: rsync + needed sonames: [libpopt.so.0, libsec.so.1, libiconv.so.2, libsocket.so.1, libnsl.so.1, + libc.so.1] + path: opt/csw/bin/sparcv9/rsync + runpath: [/opt/csw/lib/$ISALIST, /opt/csw/lib/64, /usr/lib/$ISALIST, /usr/lib, /lib/$ISALIST, + /lib] + soname: rsync + soname_guessed: true +- base_name: rsync + needed sonames: [libpopt.so.0, libsec.so.1, libiconv.so.2, libsocket.so.1, libnsl.so.1, + libc.so.1] + path: opt/csw/bin/sparcv8/rsync + runpath: [/opt/csw/lib/$ISALIST, /opt/csw/lib, /usr/lib/$ISALIST, /usr/lib, /lib/$ISALIST, + /lib] + soname: rsync + soname_guessed: true Added: csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/depends.yml =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/depends.yml (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/depends.yml 2010-03-01 09:23:31 UTC (rev 8907) @@ -0,0 +1,5 @@ +- [CSWcommon, 'CSWcommon common - common files and dirs for CSW packages '] +- [CSWisaexec, 'CSWisaexec isaexec - sneaky wrapper around Sun isaexec '] +- [CSWiconv, 'CSWiconv libiconv - GNU iconv library '] +- [CSWlibpopt, 'CSWlibpopt libpopt - Popt is a C library for parsing command line + parameters '] Added: csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/isalist.yml =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/isalist.yml (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/isalist.yml 2010-03-01 09:23:31 UTC (rev 8907) @@ -0,0 +1,2 @@ +[sparcv9+vis2, sparcv9+vis, sparcv9, sparcv8plus+vis2, sparcv8plus+vis, sparcv8plus, + sparcv8, sparcv8-fsmuld, sparcv7, sparc] Added: csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/overrides.yml =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/overrides.yml (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/overrides.yml 2010-03-01 09:23:31 UTC (rev 8907) @@ -0,0 +1 @@ +[] Added: csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkginfo.yml =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkginfo.yml (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkginfo.yml 2010-03-01 09:23:31 UTC (rev 8907) @@ -0,0 +1,5 @@ +{ARCH: sparc, CATEGORY: application, CLASSES: none, EMAIL: maciej at opencsw.org, HOTLINE: 'http://www.opencsw.org/bugtrack/', + NAME: rsync - utility which provides fast incremental file transfer, OPENCSW_CATALOGNAME: rsync, + OPENCSW_MODE64: 32/64/isaexec, OPENCSW_REPOSITORY: 'https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/rsync/trunk at 8611', + PKG: CSWrsync, PSTAMP: maciej at build8s-20100217094608, VENDOR: 'http://rsync.samba.org/ + packaged for CSW by Maciej Blizinski', VERSION: '3.0.7,REV=2010.02.17', WORKDIR_FIRSTMOD: ../build-isa-sparcv8} Added: csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkgmap.yml =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkgmap.yml (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkgmap.yml 2010-03-01 09:23:31 UTC (rev 8907) @@ -0,0 +1,31 @@ +- {class: null, group: null, line: ': 1 2912', mode: null, path: null, type: '1', + user: null} +- {class: none, group: null, line: 1 l none /opt/csw/bin/rsync=/opt/csw/bin/isaexec, + mode: null, path: /opt/csw/bin/rsync, type: l, user: null} +- {class: none, group: bin, line: 1 f none /opt/csw/bin/sparcv8/rsync 0755 root bin + 585864 12576 1266395028, mode: '0755', path: /opt/csw/bin/sparcv8/rsync, type: f, + user: root} +- {class: none, group: bin, line: 1 f none /opt/csw/bin/sparcv9/rsync 0755 root bin + 665520 60792 1266395239, mode: '0755', path: /opt/csw/bin/sparcv9/rsync, type: f, + user: root} +- {class: none, group: bin, line: 1 d none /opt/csw/share/doc/rsync 0755 root bin, + mode: '0755', path: /opt/csw/share/doc/rsync, type: d, user: root} +- {class: none, group: bin, line: 1 f none /opt/csw/share/doc/rsync/license 0644 root + bin 35147 30328 1266396366, mode: '0644', path: /opt/csw/share/doc/rsync/license, + type: f, user: root} +- {class: none, group: bin, line: 1 d none /opt/csw/share/man/man1 0755 root bin, + mode: '0755', path: /opt/csw/share/man/man1, type: d, user: root} +- {class: none, group: bin, line: 1 f none /opt/csw/share/man/man1/rsync.1 0644 root + bin 159739 65016 1266395027, mode: '0644', path: /opt/csw/share/man/man1/rsync.1, + type: f, user: root} +- {class: none, group: bin, line: 1 d none /opt/csw/share/man/man5 0755 root bin, + mode: '0755', path: /opt/csw/share/man/man5, type: d, user: root} +- {class: none, group: bin, line: 1 f none /opt/csw/share/man/man5/rsyncd.conf.5 0644 + root bin 36372 24688 1266395027, mode: '0644', path: /opt/csw/share/man/man5/rsyncd.conf.5, + type: f, user: root} +- {class: null, group: null, line: 1 i copyright 69 6484 1266396366, mode: null, path: null, + type: i, user: null} +- {class: null, group: null, line: 1 i depend 236 21212 1266396368, mode: null, path: null, + type: i, user: null} +- {class: null, group: null, line: 1 i pkginfo 511 43247 1266396371, mode: null, path: null, + type: i, user: null} 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 Mar 1 10:46:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Mar 2010 09:46:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8908] csw/mgar/pkg Message-ID: Revision: 8908 http://gar.svn.sourceforge.net/gar/?rev=8908&view=rev Author: dmichelsen Date: 2010-03-01 09:46:49 +0000 (Mon, 01 Mar 2010) Log Message: ----------- x11vnc: Initial commit Added Paths: ----------- csw/mgar/pkg/x11vnc/ csw/mgar/pkg/x11vnc/branches/ csw/mgar/pkg/x11vnc/tags/ csw/mgar/pkg/x11vnc/trunk/ csw/mgar/pkg/x11vnc/trunk/Makefile csw/mgar/pkg/x11vnc/trunk/checksums csw/mgar/pkg/x11vnc/trunk/files/ Property changes on: csw/mgar/pkg/x11vnc/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/x11vnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11vnc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11vnc/trunk/Makefile 2010-03-01 09:46:49 UTC (rev 8908) @@ -0,0 +1,31 @@ +GARNAME = x11vnc +GARVERSION = 0.9.9 +CATEGORIES = apps + +DESCRIPTION = Allows one to view remotely and interact with real X displays +define BLURB +endef + +SF_PROJ = libvncserver +MASTER_SITES = $(SF_MIRROR) +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 + +VENDOR_URL = http://www.karlrunge.com/x11vnc/ + +BUILD_DEP_PKGS = CSWossldevel CSWzlib CSWjpeg +RUNTIME_DEP_PKGS = CSWosslrt CSWzlib CSWjpeg + +# This is to make sure the X11 path is prepended to the front of lib pathes. +# Otherwise the wrong X11 gets picked up. +EXTRA_LIB = /usr/openwin/lib + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-includes=/usr/openwin/include +CONFIGURE_ARGS += --x-libraries=/usr/openwin/lib + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/x11vnc/trunk/checksums =================================================================== --- csw/mgar/pkg/x11vnc/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11vnc/trunk/checksums 2010-03-01 09:46:49 UTC (rev 8908) @@ -0,0 +1 @@ +874008821a0588a73ec7fbe09b747bb0 x11vnc-0.9.9.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 Mar 1 11:43:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Mar 2010 10:43:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8909] csw/mgar/pkg/x11vnc/trunk/Makefile Message-ID: Revision: 8909 http://gar.svn.sourceforge.net/gar/?rev=8909&view=rev Author: dmichelsen Date: 2010-03-01 10:43:32 +0000 (Mon, 01 Mar 2010) Log Message: ----------- x11vnc: Build extra packages for Solaris 10 due to moved X11 Modified Paths: -------------- csw/mgar/pkg/x11vnc/trunk/Makefile Modified: csw/mgar/pkg/x11vnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11vnc/trunk/Makefile 2010-03-01 09:46:49 UTC (rev 8908) +++ csw/mgar/pkg/x11vnc/trunk/Makefile 2010-03-01 10:43:32 UTC (rev 8909) @@ -18,13 +18,24 @@ BUILD_DEP_PKGS = CSWossldevel CSWzlib CSWjpeg RUNTIME_DEP_PKGS = CSWosslrt CSWzlib CSWjpeg +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + # This is to make sure the X11 path is prepended to the front of lib pathes. # Otherwise the wrong X11 gets picked up. -EXTRA_LIB = /usr/openwin/lib +EXTRA_LIB_garosrel-5.8 = /usr/openwin/lib +# We can't add /usr/sfw/lib because then openssl is pickedup from there too. +#EXTRA_LIB_garosrel-5.10 = /usr/X11/lib /usr/sfw/lib +EXTRA_LIB_garosrel-5.10 = /usr/X11/lib +EXTRA_LIB = $(EXTRA_LIB_garosrel-$(GAROSREL)) +CONFIGURE_ARGS_garosrel-5.8 = --x-includes=/usr/openwin/include +CONFIGURE_ARGS_garosrel-5.8 += --x-libraries=/usr/openwin/lib +CONFIGURE_ARGS_garosrel-5.10 = --x-includes=/usr/X11/include +CONFIGURE_ARGS_garosrel-5.10 += --x-libraries=/usr/X11/lib + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --x-includes=/usr/openwin/include -CONFIGURE_ARGS += --x-libraries=/usr/openwin/lib +CONFIGURE_ARGS += $(CONFIGURE_ARGS_garosrel-$(GAROSREL)) TEST_TARGET = check 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 Mar 1 12:09:49 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Mar 2010 11:09:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[8910] csw/mgar/pkg Message-ID: Revision: 8910 http://gar.svn.sourceforge.net/gar/?rev=8910&view=rev Author: dmichelsen Date: 2010-03-01 11:09:48 +0000 (Mon, 01 Mar 2010) Log Message: ----------- gdmap: Initial commit Added Paths: ----------- csw/mgar/pkg/gdmap/ csw/mgar/pkg/gdmap/branches/ csw/mgar/pkg/gdmap/tags/ csw/mgar/pkg/gdmap/trunk/ csw/mgar/pkg/gdmap/trunk/Makefile csw/mgar/pkg/gdmap/trunk/checksums csw/mgar/pkg/gdmap/trunk/files/ Property changes on: csw/mgar/pkg/gdmap/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/gdmap/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdmap/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gdmap/trunk/Makefile 2010-03-01 11:09:48 UTC (rev 8910) @@ -0,0 +1,38 @@ +GARNAME = gdmap +GARVERSION = 0.8.1 +CATEGORIES = utils + +DESCRIPTION = GdMap is a tool which allows to visualize disk space +define BLURB + GdMap is a tool which allows to visualize disk space. Ever wondered why your + hard disk is full or what directory and files take up most of the space? + With GdMap these questions can be answered quickly. To display directory + structures cushion treemaps are used which visualize a complete folder or + even the whole hard drive with one picture. +endef + +MASTER_SITES = $(SF_MIRROR) +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 + +RUNTIME_DEP_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo CSWlibxml2 CSWpango +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +BUILD_DEP_PKGS += CSWglib2devel CSWgtk2devel CSWlibcairodevel CSWlibxml2devel CSWpangodevel + +EXTRA_INC = $(prefix)X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +# Needed for sqrt(3m) +EXTRA_LDFLAGS = -lm + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +# For GNU gettext +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/gdmap/trunk/checksums =================================================================== --- csw/mgar/pkg/gdmap/trunk/checksums (rev 0) +++ csw/mgar/pkg/gdmap/trunk/checksums 2010-03-01 11:09:48 UTC (rev 8910) @@ -0,0 +1 @@ +54b43354dbe774810104607ad1eaaed3 gdmap-0.8.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 1 13:29:39 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 01 Mar 2010 12:29:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8911] csw/mgar/pkg/sudo Message-ID: Revision: 8911 http://gar.svn.sourceforge.net/gar/?rev=8911&view=rev Author: wahwah Date: 2010-03-01 12:29:39 +0000 (Mon, 01 Mar 2010) Log Message: ----------- sudo: Version update to 1.7.2p4 Modified Paths: -------------- csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile csw/mgar/pkg/sudo/branches/old-symlink-scheme/checksums csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile =================================================================== --- csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile 2010-03-01 11:09:48 UTC (rev 8910) +++ csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile 2010-03-01 12:29:39 UTC (rev 8911) @@ -1,7 +1,7 @@ GARNAME = sudo GARVERSION = 1.7.2 CATEGORIES = utils -RELEASE = p2 +RELEASE = p4 DISTVERSION = $(GARVERSION)$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) @@ -68,4 +68,3 @@ @$(MAKECOOKIE) SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) - Modified: csw/mgar/pkg/sudo/branches/old-symlink-scheme/checksums =================================================================== --- csw/mgar/pkg/sudo/branches/old-symlink-scheme/checksums 2010-03-01 11:09:48 UTC (rev 8910) +++ csw/mgar/pkg/sudo/branches/old-symlink-scheme/checksums 2010-03-01 12:29:39 UTC (rev 8911) @@ -1,3 +1,3 @@ 955d99eda1432c7b7e00d98b91e35a79 CSWsudo-common.postinstall 157b2e5e38ca54eb36e0364706bd0292 install.diff -2a19cf1ab4afc94fe19d0d0899d4cd45 sudo-1.7.2p2.tar.gz +3989e5a00538247d7dcef8b514076752 sudo-1.7.2p4.tar.gz Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2010-03-01 11:09:48 UTC (rev 8910) +++ csw/mgar/pkg/sudo/trunk/Makefile 2010-03-01 12:29:39 UTC (rev 8911) @@ -1,7 +1,7 @@ GARNAME = sudo GARVERSION = 1.7.2 CATEGORIES = utils -RELEASE = p2 +RELEASE = p4 DISTVERSION = $(GARVERSION)$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) @@ -63,6 +63,8 @@ PROTOTYPE_FILES_sudo = $(bindir)/sudo.minimal PROTOTYPE_PERMS_sudo = 4755 +LICENSE = LICENSE + include gar/category.mk post-install-modulated: Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2010-03-01 11:09:48 UTC (rev 8910) +++ csw/mgar/pkg/sudo/trunk/checksums 2010-03-01 12:29:39 UTC (rev 8911) @@ -1,3 +1,3 @@ 955d99eda1432c7b7e00d98b91e35a79 CSWsudo-common.postinstall 157b2e5e38ca54eb36e0364706bd0292 install.diff -2a19cf1ab4afc94fe19d0d0899d4cd45 sudo-1.7.2p2.tar.gz +3989e5a00538247d7dcef8b514076752 sudo-1.7.2p4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 1 13:38:32 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 01 Mar 2010 12:38:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8912] csw/mgar/pkg/sudo/branches/old-symlink-scheme/ Makefile Message-ID: Revision: 8912 http://gar.svn.sourceforge.net/gar/?rev=8912&view=rev Author: wahwah Date: 2010-03-01 12:38:32 +0000 (Mon, 01 Mar 2010) Log Message: ----------- sudo/old-symlink-scheme: Adding license Modified Paths: -------------- csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile Modified: csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile =================================================================== --- csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile 2010-03-01 12:29:39 UTC (rev 8911) +++ csw/mgar/pkg/sudo/branches/old-symlink-scheme/Makefile 2010-03-01 12:38:32 UTC (rev 8912) @@ -54,6 +54,8 @@ PKGFILES_CSWsudo = .*$(bindir).*/sudo.minimal +LICENSE = LICENSE + post-install-modulated: @( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.minimal ) @( cd $(DESTDIR)$(bindir) ; gln -s sudo.minimal sudo ) 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 Mar 1 13:50:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Mar 2010 12:50:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8913] csw/mgar/pkg/augeas/trunk Message-ID: Revision: 8913 http://gar.svn.sourceforge.net/gar/?rev=8913&view=rev Author: dmichelsen Date: 2010-03-01 12:50:22 +0000 (Mon, 01 Mar 2010) Log Message: ----------- augeas: Initial commit Modified Paths: -------------- csw/mgar/pkg/augeas/trunk/Makefile csw/mgar/pkg/augeas/trunk/checksums Added Paths: ----------- csw/mgar/pkg/augeas/trunk/bin/ csw/mgar/pkg/augeas/trunk/bin/readlink csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch Modified: csw/mgar/pkg/augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/augeas/trunk/Makefile 2010-03-01 12:38:32 UTC (rev 8912) +++ csw/mgar/pkg/augeas/trunk/Makefile 2010-03-01 12:50:22 UTC (rev 8913) @@ -11,12 +11,34 @@ MASTER_SITES = http://augeas.net/download/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Do-not-use-_N-already-taken-on-Solaris.patch +PATCHFILES += 0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz VENDOR_URL = http://augeas.net +RUNTIME_DEP_PKGS = CSWgcc4corert CSWlibgnugetopt CSWreadline + +GARCOMPILER = GCC4 + +EXTRA_LDFLAGS = -lgnugetopt + BUILD64 = 1 +NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + +EXTRA_MERGE_EXCLUDE_FILES = .*/charset.alias +MERGE_DIRS_isa-extra = $(libdir) + include gar/category.mk + +# Local bin/ for readlink, /opt/csw/gnu for GNU tail, diff +PATH := $(abspath ./bin):/opt/csw/gnu:$(PATH) + +post-extract-modulated: + @# Tests are written in bash + -cd $(WORKSRC)/tests && perl -e 's,#! /bin/sh,#! /bin/bash,' -pi *.sh + @$(MAKECOOKIE) Added: csw/mgar/pkg/augeas/trunk/bin/readlink =================================================================== --- csw/mgar/pkg/augeas/trunk/bin/readlink (rev 0) +++ csw/mgar/pkg/augeas/trunk/bin/readlink 2010-03-01 12:50:22 UTC (rev 8913) @@ -0,0 +1,3 @@ +#!/usr/bin/perl + +print readlink($ARGV[0]); Property changes on: csw/mgar/pkg/augeas/trunk/bin/readlink ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/pkg/augeas/trunk/checksums =================================================================== --- csw/mgar/pkg/augeas/trunk/checksums 2010-03-01 12:38:32 UTC (rev 8912) +++ csw/mgar/pkg/augeas/trunk/checksums 2010-03-01 12:50:22 UTC (rev 8913) @@ -1 +1,3 @@ +eed0e7f40f22e580ccf5d78884ebe1a0 0001-Do-not-use-_N-already-taken-on-Solaris.patch +b9cbbe07e58bba1572838ec0cb1f6c49 0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch a6a6a5515d7bbebe61c1e90db12eef72 augeas-0.7.0.tar.gz Added: csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch =================================================================== --- csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch 2010-03-01 12:50:22 UTC (rev 8913) @@ -0,0 +1,43 @@ +From 7f2da212368aa6eb7d4e63afaa7e8a4ab3325214 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 1 Mar 2010 11:55:44 +0100 +Subject: [PATCH] Do not use _N already taken on Solaris + +--- + src/fa.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/fa.c b/src/fa.c +index b3f56d0..0c6f8b8 100644 +--- a/src/fa.c ++++ b/src/fa.c +@@ -46,7 +46,7 @@ typedef unsigned char uchar; + + #define _E(cond) if (cond) goto error + #define _F(expr) if ((expr) < 0) goto error +-#define _N(expr) if ((expr) == NULL) goto error ++#define _NULL(expr) if ((expr) == NULL) goto error + + /* Which algorithm to use in FA_MINIMIZE */ + int fa_minimization_algorithm = FA_MIN_HOPCROFT; +@@ -2241,7 +2241,7 @@ struct fa *fa_intersect(struct fa *fa1, struct fa *fa2) { + t1[n1].to, t2[n2].to); + if (r == NULL) { + r = add_state(fa, 0); +- _N(r); ++ _NULL(r); + _F(state_set_push(worklist, t1[n1].to)); + _F(state_set_push(worklist, t2[n2].to)); + _F(state_set_push(worklist, r)); +@@ -2601,7 +2601,7 @@ int fa_example(struct fa *fa, char **example, size_t *example_len) { + int toind = state_set_index(path, t->to); + if (toind == -1) { + struct re_str *w = string_extend(NULL, ps, c); +- _N(w); ++ _NULL(w); + _F(state_set_push(worklist, t->to)); + _F(state_set_push_data(path, t->to, w)); + } else { +-- +1.6.6 + Added: csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch =================================================================== --- csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch (rev 0) +++ csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch 2010-03-01 12:50:22 UTC (rev 8913) @@ -0,0 +1,24 @@ +From 3c294e2e73c600d888329188b41adb7ed02577e7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 1 Mar 2010 12:12:02 +0100 +Subject: [PATCH] Hack in isblank as gnutools dont seem to be used + +--- + src/augtool.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/augtool.c b/src/augtool.c +index ab412fd..0539b64 100644 +--- a/src/augtool.c ++++ b/src/augtool.c +@@ -21,6 +21,7 @@ + */ + + #include ++# define isblank(ch) ((ch) == ' ' || (ch) == '\t') + #include "augeas.h" + #include "internal.h" + #include "safe-alloc.h" +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 1 14:05:45 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 01 Mar 2010 13:05:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8914] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 8914 http://gar.svn.sourceforge.net/gar/?rev=8914&view=rev Author: wahwah Date: 2010-03-01 13:05:45 +0000 (Mon, 01 Mar 2010) Log Message: ----------- sudo: adding alternatives support Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2010-03-01 12:50:22 UTC (rev 8913) +++ csw/mgar/pkg/sudo/trunk/Makefile 2010-03-01 13:05:45 UTC (rev 8914) @@ -65,13 +65,15 @@ LICENSE = LICENSE +ALTERNATIVES_CSWsudo = minimal +ALTERNATIVE_minimal = $(bindir)/sudo sudo $(bindir)/sudo.minimal 50 +ALTERNATIVE_minimal += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.minimal + include gar/category.mk post-install-modulated: @( 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.minimal sudoedit ) + @( cd $(DESTDIR)$(bindir) ; gmv sudoedit sudoedit.minimal ) @( cd $(DESTDIR)$(sysconfdir) ; gmv sudoers sudoers.CSW ) install -m 755 -d $(DESTDIR)$(LOGPATH)/logs @$(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 Mar 1 14:07:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Mar 2010 13:07:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8915] csw/mgar/pkg/augeas/trunk/Makefile Message-ID: Revision: 8915 http://gar.svn.sourceforge.net/gar/?rev=8915&view=rev Author: dmichelsen Date: 2010-03-01 13:07:52 +0000 (Mon, 01 Mar 2010) Log Message: ----------- augeas: Disable 64 bit for now as amd64 throws errors. Get acquainted with it first Modified Paths: -------------- csw/mgar/pkg/augeas/trunk/Makefile Modified: csw/mgar/pkg/augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/augeas/trunk/Makefile 2010-03-01 13:05:45 UTC (rev 8914) +++ csw/mgar/pkg/augeas/trunk/Makefile 2010-03-01 13:07:52 UTC (rev 8915) @@ -24,7 +24,9 @@ EXTRA_LDFLAGS = -lgnugetopt -BUILD64 = 1 +# Building on Solaris 10 doesn't work as it support C99 and the above fixes are not necessary there. +# Disable 64 bit for now. +# BUILD64 = 1 NOISAEXEC = 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 Mon Mar 1 14:35:34 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Mar 2010 13:35:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8916] csw/mgar/pkg/cpan Message-ID: Revision: 8916 http://gar.svn.sourceforge.net/gar/?rev=8916&view=rev Author: dmichelsen Date: 2010-03-01 13:35:34 +0000 (Mon, 01 Mar 2010) Log Message: ----------- cpan/Config-Augeas: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Config-Augeas/ csw/mgar/pkg/cpan/Config-Augeas/branches/ csw/mgar/pkg/cpan/Config-Augeas/tags/ csw/mgar/pkg/cpan/Config-Augeas/trunk/ csw/mgar/pkg/cpan/Config-Augeas/trunk/Makefile csw/mgar/pkg/cpan/Config-Augeas/trunk/checksums csw/mgar/pkg/cpan/Config-Augeas/trunk/files/ csw/mgar/pkg/cpan/Config-Augeas/trunk/files/0001-Do-not-use-GCC-flags.patch csw/mgar/pkg/cpan/Config-Augeas/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Config-Augeas/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/Config-Augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Config-Augeas/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Config-Augeas/trunk/Makefile 2010-03-01 13:35:34 UTC (rev 8916) @@ -0,0 +1,23 @@ +GARNAME = Config-Augeas +GARVERSION = 0.701 +CATEGORIES = cpan +AUTHOR = DDUMONT + +DESCRIPTION = Augeas Perl Binding +define BLURB +endef + +DISTFILES = COPYING +PATCHFILES = 0001-Do-not-use-GCC-flags.patch + +PACKAGES = CSWpmconfigaugeas +CATALOGNAME = pm_configaugeas + +DEP_PKGS = CSWaugeas + +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +INSTALL_SCRIPTS = $(WORKSRC)/Build + +include gar/category.mk Added: csw/mgar/pkg/cpan/Config-Augeas/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Config-Augeas/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Config-Augeas/trunk/checksums 2010-03-01 13:35:34 UTC (rev 8916) @@ -0,0 +1,3 @@ +dc686d3811a6ab546cc119d92973b4ee 0001-Do-not-use-GCC-flags.patch +42c83f503b9883e25c7cd31ccbcb2d89 COPYING +05e9b16d2f89bdcdb456dff47f58ecdb Config-Augeas-0.701.tar.gz Added: csw/mgar/pkg/cpan/Config-Augeas/trunk/files/0001-Do-not-use-GCC-flags.patch =================================================================== --- csw/mgar/pkg/cpan/Config-Augeas/trunk/files/0001-Do-not-use-GCC-flags.patch (rev 0) +++ csw/mgar/pkg/cpan/Config-Augeas/trunk/files/0001-Do-not-use-GCC-flags.patch 2010-03-01 13:35:34 UTC (rev 8916) @@ -0,0 +1,25 @@ +From 2daa607da163d6bd6aec9f279ff6df791b9203fd Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 1 Mar 2010 14:31:00 +0100 +Subject: [PATCH] Do not use GCC flags + +--- + Build.PL | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Build.PL b/Build.PL +index 34992df..3ccfc25 100644 +--- a/Build.PL ++++ b/Build.PL +@@ -78,7 +78,7 @@ my $build = Module::Build->new + dist_abstract => "Edit configuration files through Augeas C library", + + dynamic_config => 1, +- extra_compiler_flags => $aug_cflags . ' -Wall -Wformat -Werror=format-security', ++# extra_compiler_flags => $aug_cflags . ' -Wall -Wformat -Werror=format-security', + extra_linker_flags => $aug_libs, + + build_requires => { +-- +1.6.5.1 + Added: csw/mgar/pkg/cpan/Config-Augeas/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Config-Augeas/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Config-Augeas/trunk/files/COPYING 2010-03-01 13:35:34 UTC (rev 8916) @@ -0,0 +1,19 @@ +COPYRIGHT AND LICENCE + +Copyright (C) 2008-2009 by Dominique Dumont + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser Public License as +published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + +Config-Model 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 +Lesser Public License for more details. + +You should have received a copy of the GNU Lesser Public License +along with Config-Model; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +02110-1301 USA + 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 Mar 1 14:51:03 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Mar 2010 13:51:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8917] csw/mgar/pkg Message-ID: Revision: 8917 http://gar.svn.sourceforge.net/gar/?rev=8917&view=rev Author: dmichelsen Date: 2010-03-01 13:50:58 +0000 (Mon, 01 Mar 2010) Log Message: ----------- python-augeas: Initial commit Added Paths: ----------- csw/mgar/pkg/python-augeas/ csw/mgar/pkg/python-augeas/branches/ csw/mgar/pkg/python-augeas/tags/ csw/mgar/pkg/python-augeas/trunk/ csw/mgar/pkg/python-augeas/trunk/Makefile csw/mgar/pkg/python-augeas/trunk/checksums csw/mgar/pkg/python-augeas/trunk/files/ Property changes on: csw/mgar/pkg/python-augeas/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-augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/python-augeas/trunk/Makefile (rev 0) +++ csw/mgar/pkg/python-augeas/trunk/Makefile 2010-03-01 13:50:58 UTC (rev 8917) @@ -0,0 +1,29 @@ +GARNAME = python-augeas +GARVERSION = 0.3.0 +CATEGORIES = python + +DESCRIPTION = Augeas Python Bindings +define BLURB +endef + +MASTER_SITES = http://augeas.net/download/python/ +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 + +VENDOR_URL = http://augeas.net + +PACKAGES = CSWpyaugeas +CATALOGNAME = py_augeas + +DEP_PKGS = CSWaugeas + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = +# TEST_TARGET = check + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/python-augeas/trunk/checksums =================================================================== --- csw/mgar/pkg/python-augeas/trunk/checksums (rev 0) +++ csw/mgar/pkg/python-augeas/trunk/checksums 2010-03-01 13:50:58 UTC (rev 8917) @@ -0,0 +1 @@ +428fb2a54dea896131dbae5af10fccac python-augeas-0.3.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 Mon Mar 1 14:59:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Mar 2010 13:59:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[8918] csw Message-ID: Revision: 8918 http://gar.svn.sourceforge.net/gar/?rev=8918&view=rev Author: dmichelsen Date: 2010-03-01 13:59:31 +0000 (Mon, 01 Mar 2010) Log Message: ----------- Add manual build recipes to grab Sun Studio compilers Added Paths: ----------- csw/manual-recipes/ csw/manual-recipes/sspkg/ csw/manual-recipes/sspkg/create-ss11-pkg csw/manual-recipes/sspkg/create-ss12-pkg csw/manual-recipes/sspkg/create-ss12u1-pkg csw/manual-recipes/sspkg/sos11-i386-pkginfo csw/manual-recipes/sspkg/sos11-sparc-pkginfo csw/manual-recipes/sspkg/sos12-i386-pkginfo csw/manual-recipes/sspkg/sos12-sparc-pkginfo csw/manual-recipes/sspkg/sos12u1-i386-pkginfo csw/manual-recipes/sspkg/sos12u1-sparc-pkginfo Added: csw/manual-recipes/sspkg/create-ss11-pkg =================================================================== --- csw/manual-recipes/sspkg/create-ss11-pkg (rev 0) +++ csw/manual-recipes/sspkg/create-ss11-pkg 2010-03-01 13:59:31 UTC (rev 8918) @@ -0,0 +1,14 @@ +#!/bin/sh + +ARCH=`uname -p` +PKGINFO=sos11-${ARCH}-pkginfo +WORK=work/sos11-${ARCH} +(cd /opt/studio/SOS11; pkgproto .; + echo "i pkginfo=${PKGINFO}") > sos11-${ARCH}-pkgproto +mkdir -p ${WORK} +pkgmk -a ${ARCH} \ + -b /opt/studio/SOS11 \ + -f sos11-${ARCH}-pkgproto \ + -p "$(LOGNAME)@$(hostname)-$(date '+%Y%m%d%H%M%S')" \ + -o -d ${WORK} +pkgtrans ${WORK} /dev/fd/1 CSWsos11 | pigz -c -9 > sos11-11,REV=`date '+%Y.%m.%d'`-`uname -s``uname -r`-${ARCH}-CSW.pkg.gz Property changes on: csw/manual-recipes/sspkg/create-ss11-pkg ___________________________________________________________________ Added: svn:executable + * Added: csw/manual-recipes/sspkg/create-ss12-pkg =================================================================== --- csw/manual-recipes/sspkg/create-ss12-pkg (rev 0) +++ csw/manual-recipes/sspkg/create-ss12-pkg 2010-03-01 13:59:31 UTC (rev 8918) @@ -0,0 +1,15 @@ +#!/bin/sh + +ARCH=`uname -p` +PKGINFO=sos12-${ARCH}-pkginfo +WORK=work/sos12-${ARCH} +(cd /opt/studio/SOS12; pkgproto .; + echo "i pkginfo=${PKGINFO}") > sos12-${ARCH}-pkgproto +mkdir -p ${WORK} +pkgmk -a ${ARCH} \ + -b /opt/studio/SOS12 \ + -f sos12-${ARCH}-pkgproto \ + -p "$(LOGNAME)@$(hostname)-$(date '+%Y%m%d%H%M%S')" \ + -o -d ${WORK} +pkgtrans ${WORK} /dev/fd/1 CSWsos12 | pigz -c -9 > sos12-12,REV=`date '+%Y.%m.%d'`-`uname -s``uname -r`-${ARCH}-CSW.pkg.gz + Property changes on: csw/manual-recipes/sspkg/create-ss12-pkg ___________________________________________________________________ Added: svn:executable + * Added: csw/manual-recipes/sspkg/create-ss12u1-pkg =================================================================== --- csw/manual-recipes/sspkg/create-ss12u1-pkg (rev 0) +++ csw/manual-recipes/sspkg/create-ss12u1-pkg 2010-03-01 13:59:31 UTC (rev 8918) @@ -0,0 +1,15 @@ +#!/bin/sh + +ARCH=`uname -p` +PKGINFO=sos12u1-${ARCH}-pkginfo +WORK=work/sos12u1-${ARCH} +(cd /opt/studio/sunstudio12.1; pkgproto .; + echo "i pkginfo=${PKGINFO}") > sos12u1-${ARCH}-pkgproto +mkdir -p ${WORK} +pkgmk -a ${ARCH} \ + -b /opt/studio/sunstudio12.1 \ + -f sos12u1-${ARCH}-pkgproto \ + -p "$(LOGNAME)@$(hostname)-$(date '+%Y%m%d%H%M%S')" \ + -o -d ${WORK} +pkgtrans ${WORK} /dev/fd/1 CSWsos12u1 | pigz -c -9 > sos12u1-12.1,REV=`date '+%Y.%m.%d'`-`uname -s``uname -r`-${ARCH}-CSW.pkg.gz + Property changes on: csw/manual-recipes/sspkg/create-ss12u1-pkg ___________________________________________________________________ Added: svn:executable + * Added: csw/manual-recipes/sspkg/sos11-i386-pkginfo =================================================================== --- csw/manual-recipes/sspkg/sos11-i386-pkginfo (rev 0) +++ csw/manual-recipes/sspkg/sos11-i386-pkginfo 2010-03-01 13:59:31 UTC (rev 8918) @@ -0,0 +1,9 @@ +PKG=CSWsos11 +NAME=sos11 - Sun Studio 11 +ARCH=i386 +VERSION=11 +CATEGORY=application +VENDOR=http://developers.sun.com/sunstudio/products/previous/11/index.jsp packaged for CSW by Dagobert Michelsen +EMAIL=dam at opencsw.org +CLASSES=none +HOTLINE=http://www.opencsw.org/bugtrack/ Added: csw/manual-recipes/sspkg/sos11-sparc-pkginfo =================================================================== --- csw/manual-recipes/sspkg/sos11-sparc-pkginfo (rev 0) +++ csw/manual-recipes/sspkg/sos11-sparc-pkginfo 2010-03-01 13:59:31 UTC (rev 8918) @@ -0,0 +1,9 @@ +PKG=CSWsos11 +NAME=sos11 - Sun Studio 11 +ARCH=sparc +VERSION=11 +CATEGORY=application +VENDOR=http://developers.sun.com/sunstudio/products/previous/11/index.jsp packaged for CSW by Dagobert Michelsen +EMAIL=dam at opencsw.org +CLASSES=none +HOTLINE=http://www.opencsw.org/bugtrack/ Added: csw/manual-recipes/sspkg/sos12-i386-pkginfo =================================================================== --- csw/manual-recipes/sspkg/sos12-i386-pkginfo (rev 0) +++ csw/manual-recipes/sspkg/sos12-i386-pkginfo 2010-03-01 13:59:31 UTC (rev 8918) @@ -0,0 +1,9 @@ +PKG=CSWsos12 +NAME=sos12 - Sun Studio 12 +ARCH=i386 +VERSION=12 +CATEGORY=application +VENDOR=http://developers.sun.com/sunstudio/downloads/previous/ss12/ packaged for CSW by Dagobert Michelsen +EMAIL=dam at opencsw.org +CLASSES=none +HOTLINE=http://www.opencsw.org/bugtrack/ Added: csw/manual-recipes/sspkg/sos12-sparc-pkginfo =================================================================== --- csw/manual-recipes/sspkg/sos12-sparc-pkginfo (rev 0) +++ csw/manual-recipes/sspkg/sos12-sparc-pkginfo 2010-03-01 13:59:31 UTC (rev 8918) @@ -0,0 +1,9 @@ +PKG=CSWsos12 +NAME=sos12 - Sun Studio 12 +ARCH=sparc +VERSION=12 +CATEGORY=application +VENDOR=http://developers.sun.com/sunstudio/downloads/previous/ss12/ packaged for CSW by Dagobert Michelsen +EMAIL=dam at opencsw.org +CLASSES=none +HOTLINE=http://www.opencsw.org/bugtrack/ Added: csw/manual-recipes/sspkg/sos12u1-i386-pkginfo =================================================================== --- csw/manual-recipes/sspkg/sos12u1-i386-pkginfo (rev 0) +++ csw/manual-recipes/sspkg/sos12u1-i386-pkginfo 2010-03-01 13:59:31 UTC (rev 8918) @@ -0,0 +1,9 @@ +PKG=CSWsos12u1 +NAME=sos12u1 - Sun Studio 12u1 +ARCH=i386 +VERSION=12.1 +CATEGORY=application +VENDOR=http://developers.sun.com/sunstudio/downloads/index.jsp packaged for CSW by Dagobert Michelsen +EMAIL=dam at opencsw.org +CLASSES=none +HOTLINE=http://www.opencsw.org/bugtrack/ Added: csw/manual-recipes/sspkg/sos12u1-sparc-pkginfo =================================================================== --- csw/manual-recipes/sspkg/sos12u1-sparc-pkginfo (rev 0) +++ csw/manual-recipes/sspkg/sos12u1-sparc-pkginfo 2010-03-01 13:59:31 UTC (rev 8918) @@ -0,0 +1,9 @@ +PKG=CSWsos12u1 +NAME=sos12u1 - Sun Studio 12u1 +ARCH=sparc +VERSION=12.1 +CATEGORY=application +VENDOR=http://developers.sun.com/sunstudio/downloads/index.jsp packaged for CSW by Dagobert Michelsen +EMAIL=dam at opencsw.org +CLASSES=none +HOTLINE=http://www.opencsw.org/bugtrack/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 1 15:34:09 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 01 Mar 2010 14:34:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8919] csw/mgar/gar/v2/lib/python Message-ID: Revision: 8919 http://gar.svn.sourceforge.net/gar/?rev=8919&view=rev Author: wahwah Date: 2010-03-01 14:34:08 +0000 (Mon, 01 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, better handling of bad catalognames. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_old.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-01 13:59:31 UTC (rev 8918) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-01 14:34:08 UTC (rev 8919) @@ -12,6 +12,7 @@ # error_mgr.ReportError("something-is-wrong") import re +import checkpkg PATHS_ALLOWED_ONLY_IN = { "CSWcommon": ["/opt", @@ -64,6 +65,24 @@ new_depends.add(pkgname) +def CheckDescription(pkg_data, error_mgr, logger): + pkginfo = pkg_data["pkginfo"] + desc = checkpkg.ExtractDescription(pkginfo) + if not desc: + error_mgr.ReportError("pkginfo-description-missing") + else: + if len(desc) > MAX_DESCRIPTION_LENGTH: + error_mgr.ReportError("pkginfo-description-too-long") + + +def CheckCatalogname(pkg_data, error_mgr, logger): + pkginfo = pkg_data["pkginfo"] + catalogname = pkginfo["NAME"].split(" ")[0] + catalogname_re = r"^(\w+)$" + if not re.match(catalogname_re, catalogname): + error_mgr.ReportError("pkginfo-bad-catalogname") + + def SetCheckDependencies(pkgs_data, error_mgr, logger): """Dependencies must be either installed in the system, or in the set.""" pass Modified: csw/mgar/gar/v2/lib/python/package_checks_old.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_old.py 2010-03-01 13:59:31 UTC (rev 8918) +++ csw/mgar/gar/v2/lib/python/package_checks_old.py 2010-03-01 14:34:08 UTC (rev 8919) @@ -24,7 +24,7 @@ errors.append(checkpkg.CheckpkgTag( pkg_data["basic_stats"]["pkgname"], "catalogname-not-lowercase")) - if not re.match(r"^\w+$", catalogname): + if not re.match(r"^[\w_]+$", catalogname): errors.append(checkpkg.CheckpkgTag( pkg_data["basic_stats"]["pkgname"], "catalogname-is-not-a-simple-word")) @@ -99,13 +99,6 @@ if not "VERSION" in pkginfo or not pkginfo["VERSION"]: errors.append(checkpkg.CheckpkgTag( pkgname, "pkginfo-version-field-missing")) - desc = checkpkg.ExtractDescription(pkginfo) - if not desc: - errors.append(checkpkg.CheckpkgTag( - pkgname, "description-missing")) - if len(desc) > MAX_DESCRIPTION_LENGTH: - errors.append(checkpkg.CheckpkgTag( - pkgname, "description-too-long")) # maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE` maintname = checkpkg.ExtractMaintainerName(pkginfo) if not maintname: Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-01 13:59:31 UTC (rev 8918) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-01 14:34:08 UTC (rev 8919) @@ -13,28 +13,48 @@ BASE_DIR = os.path.dirname(__file__) TESTDATA_DIR = os.path.join(BASE_DIR, "testdata") CHECKPKG_STATS_DIR = os.path.join(TESTDATA_DIR, "stats") -DEFAULT_MD5 = "461a24f02dd5020b4aa014b76f3ec2cc" -class CheckpkgUnitTest(unittest.TestCase): - """Write a helper function using mox.""" +class CheckpkgUnitTestHelper(object): + """Wraps common components of checkpkg tests.""" + MD5 = "461a24f02dd5020b4aa014b76f3ec2cc" def setUp(self): - self.pkg_stats = checkpkg.PackageStats(None, - CHECKPKG_STATS_DIR, - DEFAULT_MD5) + # This is slow. Let's speed it up somehow. Move away from yaml and create + # a Python module with the data. + self.pkg_stats = checkpkg.PackageStats(None, CHECKPKG_STATS_DIR, self.MD5) self.pkg_data = self.pkg_stats.GetAllStats() self.mocker = mox.Mox() - def testMultipleDepends(self): - logger_mock = self.mocker.CreateMock(logging.Logger) - error_mgr_mock = self.mocker.CreateMock( + def testDefault(self): + self.logger_mock = self.mocker.CreateMock(logging.Logger) + self.error_mgr_mock = self.mocker.CreateMock( checkpkg.CheckpkgManager2.IndividualErrorGatherer) - self.pkg_data["depends"].append(("CSWcommon", "This is surplus")) # this - error_mgr_mock.ReportError('dependency-listed-more-than-once', 'CSWcommon') # this + self.CheckpkgTest() self.mocker.ReplayAll() - pc.CheckMultipleDepends(self.pkg_data, error_mgr_mock, logger_mock) # name or variable + getattr(pc, self.FUNCTION_NAME)(self.pkg_data, self.error_mgr_mock, self.logger_mock) self.mocker.VerifyAll() +class TestMultipleDepends(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckMultipleDepends' + def CheckpkgTest(self): + self.pkg_data["depends"].append(("CSWcommon", "This is surplus")) + self.error_mgr_mock.ReportError('dependency-listed-more-than-once', + 'CSWcommon') + +class TestDescription(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckDescription' + def CheckpkgTest(self): + self.pkg_data["pkginfo"]["NAME"] = 'foo' + self.error_mgr_mock.ReportError('pkginfo-description-missing') + + +class TestCheckCatalogname(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckCatalogname' + def CheckpkgTest(self): + self.pkg_data["pkginfo"]["NAME"] = 'foo-bar - This catalog name is bad' + self.error_mgr_mock.ReportError('pkginfo-bad-catalogname') + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 1 15:44:14 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 01 Mar 2010 14:44:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8920] csw/mgar/gar/v2/lib/python Message-ID: Revision: 8920 http://gar.svn.sourceforge.net/gar/?rev=8920&view=rev Author: wahwah Date: 2010-03-01 14:44:14 +0000 (Mon, 01 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, fixed CheckDescription. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_old.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-01 14:34:08 UTC (rev 8919) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-01 14:44:14 UTC (rev 8920) @@ -23,6 +23,7 @@ "CSWiconv": ["/opt/csw/lib/charset.alias"], "CSWtexinfp": ["/opt/csw/share/info/dir"], } +MAX_DESCRIPTION_LENGTH = 100 def CheckForbiddenPaths(pkg_data, error_mgr, logger): Modified: csw/mgar/gar/v2/lib/python/package_checks_old.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_old.py 2010-03-01 14:34:08 UTC (rev 8919) +++ csw/mgar/gar/v2/lib/python/package_checks_old.py 2010-03-01 14:44:14 UTC (rev 8920) @@ -9,7 +9,6 @@ MAX_CATALOGNAME_LENGTH = 20 MAX_PKGNAME_LENGTH = 20 -MAX_DESCRIPTION_LENGTH = 100 ARCH_LIST = ["sparc", "i386", "all"] VERSION_RE = r".*,REV=(20[01][0-9]\.[0-9][0-9]\.[0-9][0-9]).*" ONLY_ALLOWED_IN_PKG = { Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-01 14:34:08 UTC (rev 8919) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-01 14:44:14 UTC (rev 8920) @@ -49,6 +49,13 @@ self.error_mgr_mock.ReportError('pkginfo-description-missing') +class TestDescriptionLong(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckDescription' + def CheckpkgTest(self): + self.pkg_data["pkginfo"]["NAME"] = 'foo - ' 'A' * 200 + self.error_mgr_mock.ReportError('pkginfo-description-too-long') + + class TestCheckCatalogname(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckCatalogname' def CheckpkgTest(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 1 18:23:46 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 01 Mar 2010 17:23:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8921] csw/mgar/pkg/sudo_ldap/trunk Message-ID: Revision: 8921 http://gar.svn.sourceforge.net/gar/?rev=8921&view=rev Author: wahwah Date: 2010-03-01 17:23:46 +0000 (Mon, 01 Mar 2010) Log Message: ----------- sudo_ldap: Version update to 1.7.2p4, adding alternatives support. 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 2010-03-01 14:44:14 UTC (rev 8920) +++ csw/mgar/pkg/sudo_ldap/trunk/Makefile 2010-03-01 17:23:46 UTC (rev 8921) @@ -1,7 +1,7 @@ GARNAME = sudo GARVERSION = 1.7.2 CATEGORIES = utils -RELEASE = p2 +RELEASE = p4 DISTVERSION = $(GARVERSION)$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) @@ -29,6 +29,8 @@ SPKG_SOURCEURL_CSWsudoldap = http://www.sudo.ws RUNTIME_DEP_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt +LOGPATH = /var/opt/csw/log/sudo + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-pam CONFIGURE_ARGS += --with-logging=both @@ -37,23 +39,36 @@ CONFIGURE_ARGS += --with-ldap=$(prefix) CONFIGURE_ARGS += --with-ldap-conf-file=$(sysconfdir)/ldap.conf CONFIGURE_ARGS += --disable-path-info -CONFIGURE_ARGS += --with-logpath=/var/opt/csw/sudo/logs/sudolog +CONFIGURE_ARGS += --with-logpath=$(LOGPATH)/sudolog ifneq ($(shell uname -r),5.8) CONFIGURE_ARGS += --with-project endif +# sysconfdir to be enabled later +# sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw TEST_TARGET = check +FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir) +LICENSE = LICENSE +ALTERNATIVES_CSWsudoldap = sudoldap +ALTERNATIVE_sudoldap = $(bindir)/sudo sudo $(bindir)/sudo.ldap 60 +ALTERNATIVE_sudoldap += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.ldap + include gar/category.mk PKGFILES_CSWsudoldap = .*$(bindir).*/sudo.ldap post-install-modulated: @( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.ldap ) - @( cd $(DESTDIR)$(bindir) ; grm sudoedit ) - @( cd $(DESTDIR)$(bindir) ; gchmod 4755 sudo.ldap ) + @( cd $(DESTDIR)$(bindir) ; gmv sudoedit sudoedit.ldap ) + install -m 755 -d $(DESTDIR)$(LOGPATH)/logs @$(MAKECOOKIE) +post-merge-modulated: + @( cd $(PKGROOT)$(bindir); \ + gfind . -type f -name sudo\* -exec gchmod 4755 {} \; ) + @$(MAKECOOKIE) + SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) - Modified: csw/mgar/pkg/sudo_ldap/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/checksums 2010-03-01 14:44:14 UTC (rev 8920) +++ csw/mgar/pkg/sudo_ldap/trunk/checksums 2010-03-01 17:23:46 UTC (rev 8921) @@ -1,2 +1,2 @@ 157b2e5e38ca54eb36e0364706bd0292 install.diff -2a19cf1ab4afc94fe19d0d0899d4cd45 sudo-1.7.2p2.tar.gz +3989e5a00538247d7dcef8b514076752 sudo-1.7.2p4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Mon Mar 1 21:03:22 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 01 Mar 2010 20:03:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8922] csw/mgar/pkg/gkrellm/trunk/Makefile Message-ID: Revision: 8922 http://gar.svn.sourceforge.net/gar/?rev=8922&view=rev Author: jake_goerzen Date: 2010-03-01 20:03:22 +0000 (Mon, 01 Mar 2010) Log Message: ----------- removing EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so Modified Paths: -------------- csw/mgar/pkg/gkrellm/trunk/Makefile Modified: csw/mgar/pkg/gkrellm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/Makefile 2010-03-01 17:23:46 UTC (rev 8921) +++ csw/mgar/pkg/gkrellm/trunk/Makefile 2010-03-01 20:03:22 UTC (rev 8922) @@ -30,11 +30,9 @@ SPKG_DESC_CSWgkrellmd = System monitor package daemon RUNTIME_DEP_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo CSWpango + RUNTIME_DEP_PKGS_CSWgkrellmd = CSWggettextrt CSWglib2 -# Make sure to remove this after the X11 issues have all been settled -EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so - # Disable configure scripts step CONFIGURE_SCRIPTS = 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 Mar 1 21:32:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Mar 2010 20:32:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8923] csw/mgar/pkg Message-ID: Revision: 8923 http://gar.svn.sourceforge.net/gar/?rev=8923&view=rev Author: dmichelsen Date: 2010-03-01 20:32:11 +0000 (Mon, 01 Mar 2010) Log Message: ----------- xtitle: Initial commit Added Paths: ----------- csw/mgar/pkg/xtitle/ csw/mgar/pkg/xtitle/branches/ csw/mgar/pkg/xtitle/tags/ csw/mgar/pkg/xtitle/trunk/ csw/mgar/pkg/xtitle/trunk/Makefile csw/mgar/pkg/xtitle/trunk/checksums csw/mgar/pkg/xtitle/trunk/files/ Property changes on: csw/mgar/pkg/xtitle/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/xtitle/trunk/Makefile =================================================================== --- csw/mgar/pkg/xtitle/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xtitle/trunk/Makefile 2010-03-01 20:32:11 UTC (rev 8923) @@ -0,0 +1,31 @@ +GARNAME = xtitle +GARVERSION = 1.0.2 +CATEGORIES = utils + +DESCRIPTION = Set the window's title and/or icon name to the script's arguments +define BLURB + Xtitle is a relatively simple shell script program that, when run in an xterm or + xterm-like window, will set the window's title and/or icon name to the script's + arguments. +endef + +MASTER_SITES = http://www.cs.indiana.edu/~kinzler/xtitle/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + +VENDOR_URL = http://www.cs.indiana.edu/~kinzler/xtitle/ + +CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile + +TEST_SCRIPTS = + +INSTALL_OVERRIDE_VARS = BINDIR MANDIR +INSTALL_OVERRIDE_VAR_BINDIR = $(bindir) +INSTALL_OVERRIDE_VAR_MANDIR = $(mandir) +INSTALL_ARGS = install install.man + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/xtitle/trunk/checksums =================================================================== --- csw/mgar/pkg/xtitle/trunk/checksums (rev 0) +++ csw/mgar/pkg/xtitle/trunk/checksums 2010-03-01 20:32:11 UTC (rev 8923) @@ -0,0 +1 @@ +0b9d898be7fc3d40a2732b2ab7693727 xtitle-1.0.2.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 Mon Mar 1 23:42:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 01 Mar 2010 22:42:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8924] csw/mgar/pkg/x11/xcb/x11_xcbproto/trunk Message-ID: Revision: 8924 http://gar.svn.sourceforge.net/gar/?rev=8924&view=rev Author: dmichelsen Date: 2010-03-01 22:42:10 +0000 (Mon, 01 Mar 2010) Log Message: ----------- x11/xcb/x11_xcbproto: Update to 1.6 Modified Paths: -------------- csw/mgar/pkg/x11/xcb/x11_xcbproto/trunk/Makefile csw/mgar/pkg/x11/xcb/x11_xcbproto/trunk/checksums Modified: csw/mgar/pkg/x11/xcb/x11_xcbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb/x11_xcbproto/trunk/Makefile 2010-03-01 20:32:11 UTC (rev 8923) +++ csw/mgar/pkg/x11/xcb/x11_xcbproto/trunk/Makefile 2010-03-01 22:42:10 UTC (rev 8924) @@ -1,4 +1,4 @@ -GARVERSION = 1.5 +GARVERSION = 1.6 CATEGORIES = x11 PROTONAME = xcb-proto GARNAME = x11_$(PROTONAME) Modified: csw/mgar/pkg/x11/xcb/x11_xcbproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xcb/x11_xcbproto/trunk/checksums 2010-03-01 20:32:11 UTC (rev 8923) +++ csw/mgar/pkg/x11/xcb/x11_xcbproto/trunk/checksums 2010-03-01 22:42:10 UTC (rev 8924) @@ -1 +1 @@ -e0cddea0c1a7c8497e63831267b73bda download/xcb-proto-1.5.tar.gz +8d29695e8faf5fcdce568c66eaeaa5ee xcb-proto-1.6.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 Mar 2 00:08:36 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 01 Mar 2010 23:08:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8925] csw/mgar/pkg/ksh/trunk Message-ID: Revision: 8925 http://gar.svn.sourceforge.net/gar/?rev=8925&view=rev Author: hson Date: 2010-03-01 23:08:36 +0000 (Mon, 01 Mar 2010) Log Message: ----------- ksh: Update to 93t+ Modified Paths: -------------- csw/mgar/pkg/ksh/trunk/Makefile csw/mgar/pkg/ksh/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/ksh/trunk/files/CSWksh.gspec Property Changed: ---------------- csw/mgar/pkg/ksh/trunk/ Property changes on: csw/mgar/pkg/ksh/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/ksh/trunk/Makefile =================================================================== --- csw/mgar/pkg/ksh/trunk/Makefile 2010-03-01 22:42:10 UTC (rev 8924) +++ csw/mgar/pkg/ksh/trunk/Makefile 2010-03-01 23:08:36 UTC (rev 8925) @@ -1,5 +1,5 @@ GARNAME = ksh -GARVERSION = 93 +GARVERSION = 93t+ CATEGORIES = devel DESCRIPTION = The KornShell Command and Programming Language @@ -11,10 +11,12 @@ endef # Main archive location -MASTER_SITES = +MASTER_SITES = http://www.research.att.com/~gsf/download/tgz/ +DISTFILES += ast-ksh.2010-02-02.tgz +DISTFILES += INIT.2010-02-02.tgz #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWksh,) +WGET_OPTS = --user="I accept www.opensource.org/licenses/cpl" --password="." # 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/ksh/trunk/checksums =================================================================== --- csw/mgar/pkg/ksh/trunk/checksums 2010-03-01 22:42:10 UTC (rev 8924) +++ csw/mgar/pkg/ksh/trunk/checksums 2010-03-01 23:08:36 UTC (rev 8925) @@ -1 +1,2 @@ -b719413420187856a55fd8e7a0743f50 download/CSWksh.gspec +9c96ca12947f52274606a0625466b6dc INIT.2010-02-02.tgz +00282866e979eb21403f0fa73212e3c5 ast-ksh.2010-02-02.tgz Deleted: csw/mgar/pkg/ksh/trunk/files/CSWksh.gspec =================================================================== --- csw/mgar/pkg/ksh/trunk/files/CSWksh.gspec 2010-03-01 22:42:10 UTC (rev 8924) +++ csw/mgar/pkg/ksh/trunk/files/CSWksh.gspec 2010-03-01 23:08:36 UTC (rev 8925) @@ -1,4 +0,0 @@ -%var bitname ksh -%var pkgname CSWksh -%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 hson at users.sourceforge.net Tue Mar 2 00:13:06 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 01 Mar 2010 23:13:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8926] csw/mgar/pkg/ntop/trunk/ Message-ID: Revision: 8926 http://gar.svn.sourceforge.net/gar/?rev=8926&view=rev Author: hson Date: 2010-03-01 23:13:06 +0000 (Mon, 01 Mar 2010) Log Message: ----------- ntop: Set externals ref to sourceforce.net insted of sf.net Property Changed: ---------------- csw/mgar/pkg/ntop/trunk/ Property changes on: csw/mgar/pkg/ntop/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 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 Mar 2 00:16:21 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 01 Mar 2010 23:16:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8927] csw/mgar/pkg/koffice/trunk Message-ID: Revision: 8927 http://gar.svn.sourceforge.net/gar/?rev=8927&view=rev Author: hson Date: 2010-03-01 23:16:21 +0000 (Mon, 01 Mar 2010) Log Message: ----------- koffice: Update to 1.6.3 Modified Paths: -------------- csw/mgar/pkg/koffice/trunk/Makefile csw/mgar/pkg/koffice/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/koffice/trunk/ Property changes on: csw/mgar/pkg/koffice/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/koffice/trunk/Makefile =================================================================== --- csw/mgar/pkg/koffice/trunk/Makefile 2010-03-01 23:13:06 UTC (rev 8926) +++ csw/mgar/pkg/koffice/trunk/Makefile 2010-03-01 23:16:21 UTC (rev 8927) @@ -1,5 +1,5 @@ GARNAME = koffice -GARVERSION = 1.5.1 +GARVERSION = 1.6.3 CATEGORIES = kde DESCRIPTION = KDE Web Development Environment (gcc3) @@ -11,11 +11,29 @@ #DISTFILES += Templates, addons, etc... DISTFILES += $(call admfiles,CSWkofficegcc,) DISTFILES += $(call admfiles,CSWkofficeaddons,) + # We define upstream file regex so we can be notifed of new upstream software release #UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz DEPENDS += -CONFIGURE_ARGS = $(DIRPATHS) +LIBS += -lCstd -lCrun +CONFIGURE_ARGS = PATH="/opt/csw/kde-gcc/bin:$$PATH" +CONFIGURE_ARGS += QTDIR=/opt/csw/kde-gcc +CONFIGURE_ARGS += CC=/opt/csw/gcc3/bin/gcc +CONFIGURE_ARGS += CXX=/opt/csw/gcc3/bin/g++ +CONFIGURE_ARGS += CPPFLAGS='-I/opt/csw/include' +CONFIGURE_ARGS += CFLAGS=-O2 +CONFIGURE_ARGS += CXXFLAGS=-O2 +CONFIGURE_ARGS += LIBS='-lCstd -lCrun' +CONFIGURE_ARGS += --with-qt-dir=/opt/csw/kde-gcc +CONFIGURE_ARGS += --with-extra-includes=/opt/csw/include +CONFIGURE_ARGS += --with-extra-libs=/opt/csw/lib +CONFIGURE_ARGS += --prefix=/opt/csw/kde-gcc --x-includes=/usr/openwin/include +CONFIGURE_ARGS += --x-libraries=/usr/openwin/lib --with-pspell +CONFIGURE_ARGS += --with-frontend=qt --enable-compression-support +CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw +CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw + include gar/category.mk Modified: csw/mgar/pkg/koffice/trunk/checksums =================================================================== --- csw/mgar/pkg/koffice/trunk/checksums 2010-03-01 23:13:06 UTC (rev 8926) +++ csw/mgar/pkg/koffice/trunk/checksums 2010-03-01 23:16:21 UTC (rev 8927) @@ -1,3 +1,3 @@ c950948c37bf471a173d18bdd8dcb15d download/CSWkofficegcc.gspec e6abb90200c3f5f64df04111b21a06b0 download/CSWkofficeaddons.gspec -50897bd5dfd4eba8a0d78a02003a6ec9 download/koffice-1.5.1.tar.bz2 +386d388094734f9759977c3267098e30 download/koffice-1.6.3.tar.bz2 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 Mar 2 00:36:40 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 01 Mar 2010 23:36:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8928] csw/mgar/pkg/firefox/trunk Message-ID: Revision: 8928 http://gar.svn.sourceforge.net/gar/?rev=8928&view=rev Author: wbonnet Date: 2010-03-01 23:36:40 +0000 (Mon, 01 Mar 2010) Log Message: ----------- Switch to 3.0.18 Modified Paths: -------------- csw/mgar/pkg/firefox/trunk/Makefile csw/mgar/pkg/firefox/trunk/checksums Modified: csw/mgar/pkg/firefox/trunk/Makefile =================================================================== --- csw/mgar/pkg/firefox/trunk/Makefile 2010-03-01 23:16:21 UTC (rev 8927) +++ csw/mgar/pkg/firefox/trunk/Makefile 2010-03-01 23:36:40 UTC (rev 8928) @@ -1,5 +1,5 @@ GARNAME = firefox -GARVERSION = 3.0.16 +GARVERSION = 3.0.18 CATEGORIES = apps DISTNAME = $(GARNAME) @@ -13,14 +13,15 @@ # 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/firefox/releases/$(GARVERSION)-real/source/ +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/ PACKAGES = CSWfirefox CATALOGNAME_CSWfirefox = $(GARNAME) SPKG_DESC_CSWfirefox = $(DESCRIPTION) -BUILD_DEP_PKGS = CSWgtk2devel CSWlibdbusdev CSWdbusglibdev CSWsqlite3devel CSWkbproto CSWrenderproto +BUILD_DEP_PKGS = CSWgtk2devel CSWlibdbusdev CSWdbusglibdev CSWsqlite3devel CSWkbproto CSWrenderproto +BUILD_DEP_PKGS += CSWxproto CSWlibpthreadstubs CSWlibxcb CSWlibxcbdevel CSWlibxft2 CSWlibxft2devel RUNTIME_DEP_PKGS_CSWfirefox = CSWdbusglib RUNTIME_DEP_PKGS_CSWfirefox += CSWfconfig @@ -52,7 +53,7 @@ PATCHFILES += nsNativeApSuportUnix.cpp.diff PATCHFILES += nsExceptionHandler.cpp.diff PATCHFILES += SunOS5.mk.diff -PATCHFILES += nsWildCard.cpp.diff +# PATCHFILES += nsWildCard.cpp.diff PATCHFILES += softoken.manifest.mm.diff PATCHFILES += softoken.config.mk.diff PATCHFILES += legacydb.manifest.mm.diff Modified: csw/mgar/pkg/firefox/trunk/checksums =================================================================== --- csw/mgar/pkg/firefox/trunk/checksums 2010-03-01 23:16:21 UTC (rev 8927) +++ csw/mgar/pkg/firefox/trunk/checksums 2010-03-01 23:36:40 UTC (rev 8928) @@ -5,7 +5,7 @@ 45bba282258a321e5e4f73a742bcc31b autoconf.mk.in.diff c869762735a41bb30f417e510ccb7f31 configure.diff a71a4afaabc4d067f30d8fb184fea520 file_id.cc.diff -e28e30d74c1488c8a8e2ff8cd2c37439 firefox-3.0.15-source.tar.bz2 +5990b5f766a041ed6410bc7fdf3332d4 firefox-3.0.18-source.tar.bz2 125a5da522c7b0cc834ba6d97694d162 firefox.diff 162d4cf2d198196e94f6878d60dc7a26 firefox.dist.bin.diff a19792f0b67f28c9227d19d069369369 jemalloc.c.diff @@ -16,7 +16,6 @@ ca4162516d8c09deaa9f0b6f3b3ecffb nsMathUtils.h.diff d8f7ec0df9f63317ff2d8578d9dbe3ff nsNativeApSuportUnix.cpp.diff f562a935a0fb2c5ad38f95af114d0a49 nsPluginsDirUnix.cpp.diff -32a26e077d300d4f3ae135a778e43525 nsWildCard.cpp.diff d0d942fa0c012abcb2a45b1d0fc99051 packager.mk.diff 25efd55ebf8715e66a28f2b07b25f38a softoken.config.mk.diff 187c192196a8c721ac7ae93466614c95 softoken.manifest.mm.diff 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 Mar 2 01:04:41 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 02 Mar 2010 00:04:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8929] csw/mgar/pkg Message-ID: Revision: 8929 http://gar.svn.sourceforge.net/gar/?rev=8929&view=rev Author: hson Date: 2010-03-02 00:04:40 +0000 (Tue, 02 Mar 2010) Log Message: ----------- webkit: Initial commit Added Paths: ----------- csw/mgar/pkg/webkit/ csw/mgar/pkg/webkit/Makefile csw/mgar/pkg/webkit/branches/ csw/mgar/pkg/webkit/tags/ csw/mgar/pkg/webkit/trunk/ csw/mgar/pkg/webkit/trunk/Makefile csw/mgar/pkg/webkit/trunk/checksums csw/mgar/pkg/webkit/trunk/files/ Added: csw/mgar/pkg/webkit/Makefile =================================================================== --- csw/mgar/pkg/webkit/Makefile (rev 0) +++ csw/mgar/pkg/webkit/Makefile 2010-03-02 00:04:40 UTC (rev 8929) @@ -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) Property changes on: csw/mgar/pkg/webkit/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/webkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/webkit/trunk/Makefile (rev 0) +++ csw/mgar/pkg/webkit/trunk/Makefile 2010-03-02 00:04:40 UTC (rev 8929) @@ -0,0 +1,62 @@ +GARNAME = webkit +GARVERSION = 1.1.15.4 +CATEGORIES = gnome + +DESCRIPTION = Portable web rendering engine +define BLURB +endef + +MASTER_SITES = http://www.webkitgtk.org/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWwebkit CSWwebkitdevel CSWwebkitdoc +CATALOGNAME_CSWwebkit = webkit +CATALOGNAME_CSWwebkitdevel = webkit_devel +CATALOGNAME_CSWwebkitdoc = webkit_doc + +SPKG_DESC_CSWwebkit += $(DESCRIPTION) +SPKG_DESC_CSWwebkitdevel += $(DESCRIPTION) - developer package +SPKG_DESC_CSWwebkitdoc += $(DESCRIPTION) - documentation + +RUNTIME_DEP_PKGS_CSWwebkitdevel += CSWwebkit +RUNTIME_DEP_PKGS_CSWwebkitdoc += CSWwebkit + +BUILD_DEP_PKGS += CSWenchantdevel CSWgperf CSWlibicudevel CSWlibsoupdevel +BUILD_DEP_PKGS += CSWgstreamer + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://www.webkitgtk.org/ + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +#NOISAEXEC = 1 +#NOISALIST = 1 +# libdbus not 64-bit yet +#BUILD64 = 1 + +PKGFILES_CSWwebkitdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWwebkitdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWwebkitdoc = 1 + +LIBS = -lsocket -lnsl +export LIBS + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static=no +CONFIGURE_ARGS += --enable-gtk-doc +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/webkit/trunk/checksums =================================================================== --- csw/mgar/pkg/webkit/trunk/checksums (rev 0) +++ csw/mgar/pkg/webkit/trunk/checksums 2010-03-02 00:04:40 UTC (rev 8929) @@ -0,0 +1 @@ +47301fb7120421ac38bf714db8f5d428 webkit-1.1.15.4.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 Mar 2 01:06:59 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 02 Mar 2010 00:06:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8930] csw/mgar/pkg Message-ID: Revision: 8930 http://gar.svn.sourceforge.net/gar/?rev=8930&view=rev Author: hson Date: 2010-03-02 00:06:52 +0000 (Tue, 02 Mar 2010) Log Message: ----------- ocaml: Initial commit Added Paths: ----------- csw/mgar/pkg/ocaml/ csw/mgar/pkg/ocaml/Makefile csw/mgar/pkg/ocaml/branches/ csw/mgar/pkg/ocaml/tags/ csw/mgar/pkg/ocaml/trunk/ csw/mgar/pkg/ocaml/trunk/Makefile csw/mgar/pkg/ocaml/trunk/checksums csw/mgar/pkg/ocaml/trunk/files/ Added: csw/mgar/pkg/ocaml/Makefile =================================================================== --- csw/mgar/pkg/ocaml/Makefile (rev 0) +++ csw/mgar/pkg/ocaml/Makefile 2010-03-02 00:06:52 UTC (rev 8930) @@ -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) Property changes on: csw/mgar/pkg/ocaml/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/ocaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/ocaml/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ocaml/trunk/Makefile 2010-03-02 00:06:52 UTC (rev 8930) @@ -0,0 +1,36 @@ +GARNAME = ocaml +GARVERSION = 3.11.2 +CATEGORIES = lang + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://caml.inria.fr/pub/distrib/ocaml-3.11/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# UPSTREAM_MASTER_SITES = + +RUNTIME_DEP_PKGS_CSWocaml = CSWlibx11 +LICENSE = LICENSE + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD_ARGS = world.opt +#CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += -bindir $(bindir) +CONFIGURE_ARGS += -libdir $(libdir) +CONFIGURE_ARGS += -mandir $(mandir) +CONFIGURE_ARGS += -prefix $(prefix) +CONFIGURE_ARGS += -cc "$(CC) $(CFLAGS)" +CONFIGURE_ARGS += -x11include $(prefix)/X11/include +CONFIGURE_ARGS += -x11lib $(prefix)/X11/lib + +TEST_TARGET = + +include gar/category.mk Added: csw/mgar/pkg/ocaml/trunk/checksums =================================================================== --- csw/mgar/pkg/ocaml/trunk/checksums (rev 0) +++ csw/mgar/pkg/ocaml/trunk/checksums 2010-03-02 00:06:52 UTC (rev 8930) @@ -0,0 +1 @@ +9d0611245122ffbc8263735cae1da7fb ocaml-3.11.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 Tue Mar 2 08:46:03 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Mar 2010 07:46:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8931] csw/mgar/pkg/bdb48/trunk Message-ID: Revision: 8931 http://gar.svn.sourceforge.net/gar/?rev=8931&view=rev Author: dmichelsen Date: 2010-03-02 07:46:03 +0000 (Tue, 02 Mar 2010) Log Message: ----------- bdb48: Update to 4.8.26 Modified Paths: -------------- csw/mgar/pkg/bdb48/trunk/Makefile csw/mgar/pkg/bdb48/trunk/checksums Modified: csw/mgar/pkg/bdb48/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb48/trunk/Makefile 2010-03-02 00:06:52 UTC (rev 8930) +++ csw/mgar/pkg/bdb48/trunk/Makefile 2010-03-02 07:46:03 UTC (rev 8931) @@ -1,5 +1,5 @@ GARNAME = db -GARVERSION = 4.8.24 +GARVERSION = 4.8.26 CATEGORIES = lib DESCRIPTION = Berkeley DB 4.8 Modified: csw/mgar/pkg/bdb48/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb48/trunk/checksums 2010-03-02 00:06:52 UTC (rev 8930) +++ csw/mgar/pkg/bdb48/trunk/checksums 2010-03-02 07:46:03 UTC (rev 8931) @@ -1 +1 @@ -147afdecf438ff99ade105a5272db158 download/db-4.8.24.tar.gz +3476bac9ec0f3c40729c8a404151d5e3 db-4.8.26.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 2 09:54:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Mar 2010 08:54:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8932] csw/mgar/pkg/sudo Message-ID: Revision: 8932 http://gar.svn.sourceforge.net/gar/?rev=8932&view=rev Author: wahwah Date: 2010-03-02 08:54:55 +0000 (Tue, 02 Mar 2010) Log Message: ----------- sudo: Version bump to 1.7.2p5 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums csw/mgar/pkg/sudo_ldap/trunk/Makefile csw/mgar/pkg/sudo_ldap/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2010-03-02 07:46:03 UTC (rev 8931) +++ csw/mgar/pkg/sudo/trunk/Makefile 2010-03-02 08:54:55 UTC (rev 8932) @@ -1,7 +1,7 @@ GARNAME = sudo GARVERSION = 1.7.2 CATEGORIES = utils -RELEASE = p4 +RELEASE = p5 DISTVERSION = $(GARVERSION)$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) @@ -56,15 +56,14 @@ TEST_TARGET = check FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir) -PKGFILES_CSWsudo = $(bindir)/sudo.minimal -PKGFILES_CSWsudo += $(bindir)/sudo +PKGFILES_CSWsudo = $(bindir)/sudo\.minimal +PKGFILES_CSWsudo += $(bindir)/sudoedit\.minimal PROTOTYPE_MODIFIERS = sudo -PROTOTYPE_FILES_sudo = $(bindir)/sudo.minimal +PROTOTYPE_FILES_sudo = $(bindir)/sudo(|edit).minimal PROTOTYPE_PERMS_sudo = 4755 LICENSE = LICENSE - ALTERNATIVES_CSWsudo = minimal ALTERNATIVE_minimal = $(bindir)/sudo sudo $(bindir)/sudo.minimal 50 ALTERNATIVE_minimal += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.minimal @@ -77,10 +76,3 @@ @( cd $(DESTDIR)$(sysconfdir) ; gmv sudoers sudoers.CSW ) install -m 755 -d $(DESTDIR)$(LOGPATH)/logs @$(MAKECOOKIE) - -post-merge-modulated: - @( cd $(PKGROOT)$(bindir); \ - gfind . -type f -name sudo\* -exec gchmod 4755 {} \; ) - @$(MAKECOOKIE) - -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2010-03-02 07:46:03 UTC (rev 8931) +++ csw/mgar/pkg/sudo/trunk/checksums 2010-03-02 08:54:55 UTC (rev 8932) @@ -1,3 +1,3 @@ 955d99eda1432c7b7e00d98b91e35a79 CSWsudo-common.postinstall 157b2e5e38ca54eb36e0364706bd0292 install.diff -3989e5a00538247d7dcef8b514076752 sudo-1.7.2p4.tar.gz +398f584e831bd75b3c0179e28368c2a3 sudo-1.7.2p5.tar.gz Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/Makefile 2010-03-02 07:46:03 UTC (rev 8931) +++ csw/mgar/pkg/sudo_ldap/trunk/Makefile 2010-03-02 08:54:55 UTC (rev 8932) @@ -1,7 +1,7 @@ GARNAME = sudo GARVERSION = 1.7.2 CATEGORIES = utils -RELEASE = p4 +RELEASE = p5 DISTVERSION = $(GARVERSION)$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) @@ -28,6 +28,7 @@ SPKG_DESC_CSWsudoldap = $(DESCRIPTION) SPKG_SOURCEURL_CSWsudoldap = http://www.sudo.ws RUNTIME_DEP_PKGS_CSWsudoldap = CSWsudo-common CSWggettextrt CSWoldaprt +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWsudoldap) CSWggettext LOGPATH = /var/opt/csw/log/sudo @@ -51,6 +52,13 @@ TEST_TARGET = check FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir) +PKGFILES_CSWsudoldap = $(bindir)/sudo\.ldap +PKGFILES_CSWsudoldap += $(bindir)/sudoedit\.ldap + +PROTOTYPE_MODIFIERS = sudo +PROTOTYPE_FILES_sudo = $(bindir)/sudo(|edit).ldap +PROTOTYPE_PERMS_sudo = 4755 + LICENSE = LICENSE ALTERNATIVES_CSWsudoldap = sudoldap ALTERNATIVE_sudoldap = $(bindir)/sudo sudo $(bindir)/sudo.ldap 60 @@ -58,17 +66,10 @@ include gar/category.mk -PKGFILES_CSWsudoldap = .*$(bindir).*/sudo.ldap +PKGFILES_CSWsudoldap = $(bindir)/sudo.* post-install-modulated: - @( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.ldap ) - @( cd $(DESTDIR)$(bindir) ; gmv sudoedit sudoedit.ldap ) + ( cd $(DESTDIR)$(bindir) ; gmv sudo sudo.ldap ) + ( cd $(DESTDIR)$(bindir) ; gmv sudoedit sudoedit.ldap ) install -m 755 -d $(DESTDIR)$(LOGPATH)/logs @$(MAKECOOKIE) - -post-merge-modulated: - @( cd $(PKGROOT)$(bindir); \ - gfind . -type f -name sudo\* -exec gchmod 4755 {} \; ) - @$(MAKECOOKIE) - -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) Modified: csw/mgar/pkg/sudo_ldap/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/checksums 2010-03-02 07:46:03 UTC (rev 8931) +++ csw/mgar/pkg/sudo_ldap/trunk/checksums 2010-03-02 08:54:55 UTC (rev 8932) @@ -1,2 +1,2 @@ 157b2e5e38ca54eb36e0364706bd0292 install.diff -3989e5a00538247d7dcef8b514076752 sudo-1.7.2p4.tar.gz +398f584e831bd75b3c0179e28368c2a3 sudo-1.7.2p5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 2 10:10:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Mar 2010 09:10:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8933] csw/mgar/pkg/sudo_ldap/trunk/Makefile Message-ID: Revision: 8933 http://gar.svn.sourceforge.net/gar/?rev=8933&view=rev Author: wahwah Date: 2010-03-02 09:10:43 +0000 (Tue, 02 Mar 2010) Log Message: ----------- sudo_ldap: Including sudoers.ldap.4 Modified Paths: -------------- csw/mgar/pkg/sudo_ldap/trunk/Makefile Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/Makefile 2010-03-02 08:54:55 UTC (rev 8932) +++ csw/mgar/pkg/sudo_ldap/trunk/Makefile 2010-03-02 09:10:43 UTC (rev 8933) @@ -54,6 +54,7 @@ PKGFILES_CSWsudoldap = $(bindir)/sudo\.ldap PKGFILES_CSWsudoldap += $(bindir)/sudoedit\.ldap +PKGFILES_CSWsudoldap += $(mandir)/man4/sudoers\.ldap\.4 PROTOTYPE_MODIFIERS = sudo PROTOTYPE_FILES_sudo = $(bindir)/sudo(|edit).ldap 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 Mar 2 10:28:02 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Mar 2010 09:28:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[8934] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8934 http://gar.svn.sourceforge.net/gar/?rev=8934&view=rev Author: dmichelsen Date: 2010-03-02 09:28:01 +0000 (Tue, 02 Mar 2010) Log Message: ----------- mGAR v2: Redo r8651 to fix #16 because the previous fix couldn't cope with () Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-03-02 09:10:43 UTC (rev 8933) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-03-02 09:28:01 UTC (rev 8934) @@ -354,7 +354,7 @@ _PROTOTYPE_MODIFIERS = | perl -ane '\ $(foreach M,$(PROTOTYPE_MODIFIERS),\ - $(if $(PROTOTYPE_FILES_$M),if( $$F[2] =~ m(^$(shell echo $(PROTOTYPE_FILES_$M) | /usr/bin/tr " " "|")$$) ) {)\ + $(if $(PROTOTYPE_FILES_$M),if( $$F[2] =~ m(^$(firstword $(PROTOTYPE_FILES_$M))$(foreach F,$(wordlist 2,$(words $(PROTOTYPE_FILES_$M)),$(PROTOTYPE_FILES_$M)),|$F)$$) ) {)\ $(if $(PROTOTYPE_FTYPE_$M),$$F[0] = "$(PROTOTYPE_FTYPE_$M)";)\ $(if $(PROTOTYPE_CLASS_$M),$$F[1] = "$(PROTOTYPE_CLASS_$M)";)\ $(if $(PROTOTYPE_PERMS_$M),$$F[3] = "$(PROTOTYPE_PERMS_$M)";)\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 2 10:46:30 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Mar 2010 09:46:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8935] csw/mgar/pkg/sudo Message-ID: Revision: 8935 http://gar.svn.sourceforge.net/gar/?rev=8935&view=rev Author: wahwah Date: 2010-03-02 09:46:30 +0000 (Tue, 02 Mar 2010) Log Message: ----------- Adjusting the file names to contain the full version string (including p5) Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo_ldap/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2010-03-02 09:28:01 UTC (rev 8934) +++ csw/mgar/pkg/sudo/trunk/Makefile 2010-03-02 09:46:30 UTC (rev 8935) @@ -1,11 +1,7 @@ GARNAME = sudo -GARVERSION = 1.7.2 +GARVERSION = 1.7.2p5 CATEGORIES = utils -RELEASE = p5 -DISTVERSION = $(GARVERSION)$(RELEASE) -DISTNAME = $(GARNAME)-$(DISTVERSION) - DESCRIPTION = Provides limited super user privileges define BLURB Sudo (superuser do) allows a system administrator to give certain users (or @@ -15,7 +11,7 @@ endef MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/ -DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = install.diff # We define upstream file regex so we can be notifed of new Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo_ldap/trunk/Makefile 2010-03-02 09:28:01 UTC (rev 8934) +++ csw/mgar/pkg/sudo_ldap/trunk/Makefile 2010-03-02 09:46:30 UTC (rev 8935) @@ -1,11 +1,7 @@ GARNAME = sudo -GARVERSION = 1.7.2 +GARVERSION = 1.7.2p5 CATEGORIES = utils -RELEASE = p5 -DISTVERSION = $(GARVERSION)$(RELEASE) -DISTNAME = $(GARNAME)-$(DISTVERSION) - DESCRIPTION = Provides limited super user privileges (LDAP Enabled) define BLURB Sudo (superuser do) allows a system administrator to give certain users (or @@ -15,7 +11,7 @@ endef MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/ -DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = install.diff # We define upstream file regex so we can be notifed of new This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 2 11:14:39 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Mar 2010 10:14:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8936] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw Message-ID: Revision: 8936 http://gar.svn.sourceforge.net/gar/?rev=8936&view=rev Author: wahwah Date: 2010-03-02 10:14:39 +0000 (Tue, 02 Mar 2010) Log Message: ----------- mysql-5.1.x-optcsw: changes ported from mysql-5.0.x, added an override, cleaned up a few things. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.preinstall csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql51 Removed Paths: ------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql5.preinstall csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql5 Property Changed: ---------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2010-03-02 09:46:30 UTC (rev 8935) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2010-03-02 10:14:39 UTC (rev 8936) @@ -3,14 +3,14 @@ # $Id$ PROJ_NAME = mysql -GARNAME = $(PROJ_NAME)5 +GARNAME = $(PROJ_NAME)51 BASE_VERSION = 5.1 -PATCHLEVEL = 40 +PATCHLEVEL = 44 GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server # Useful when making a series of builds on the same day -GARFLAVOR ?= DBG +# GARFLAVOR ?= DBG DISTNAME = mysql-$(GARVERSION) SPKG_SOURCEURL = http://www.mysql.com/ @@ -43,8 +43,12 @@ INITSMF = $(global_sysconfdir)/init\.d/csw$(GARNAME) -PACKAGES = CSW$(GARNAME) CSW$(GARNAME)bench CSW$(GARNAME)client CSW$(GARNAME)devel -PACKAGES += CSW$(GARNAME)rt CSW$(GARNAME)test +PACKAGES = CSW$(GARNAME) +PACKAGES += CSW$(GARNAME)bench +PACKAGES += CSW$(GARNAME)client +PACKAGES += CSW$(GARNAME)devel +PACKAGES += CSW$(GARNAME)rt +PACKAGES += CSW$(GARNAME)test PATCHFILES = 0001-Use-libc-not-libcrypt.patch PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch @@ -66,7 +70,7 @@ CATALOGNAME_CSW$(GARNAME)test = $(GARNAME)test -ARCHALL_CSWmysql5bench = 1 +ARCHALL_CSW$(GARNAME)bench = 1 # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. @@ -132,7 +136,7 @@ RUNTIME_DEP_PKGS_CSW$(GARNAME)client += CSWosslrt RUNTIME_DEP_PKGS_CSW$(GARNAME)client += CSWncurses RUNTIME_DEP_PKGS_CSW$(GARNAME)client += CSWzlib -RUNTIME_DEP_PKGS_CSW$(GARNAME)devel = CSW$(GARNAME) +RUNTIME_DEP_PKGS_CSW$(GARNAME)devel = CSW$(GARNAME)rt RUNTIME_DEP_PKGS_CSW$(GARNAME)test = CSW$(GARNAME) RUNTIME_DEP_PKGS_CSW$(GARNAME)test += CSWperl @@ -196,12 +200,12 @@ PROTOTYPE_PERMS_dbdir = 0700 PROTOTYPE_CLASS_dbdir = ugfiles -SPKG_CLASSES = none ugfiles - include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) +CHECKPKG_OVERRIDES_CSWmysql51devel += missing-dependency|CSWmysql51 + test-custom: alias sh=/usr/bin/bash; \ cd $(WORKSRC)/mysql-test; \ @@ -223,20 +227,22 @@ ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc - # ln -sf ../../../mysql5/share/mysql/doc/README.CSW \ - # $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW + ln -sf ../../../$(GARNAME)/share/mysql/doc/README.CSW \ + $(PKGROOT)/opt/csw/share/mysql/doc/README.CSW ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/csw$(GARNAME) $(PKGROOT)/etc/opt/csw/init.d ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME) - ## A symlink for mysql5 include files - ## ginstall -m 755 -d $(PKGROOT)/opt/csw/include - ## ln -s ../mysql5/include/mysql $(PKGROOT)/opt/csw/include/mysql + # A symlink for mysql5 include files + # ginstall -m 755 -d $(PKGROOT)/opt/csw/include + # ln -s ../$(GARNAME)/include/mysql $(PKGROOT)/opt/csw/include/mysql # Create symlinks to binaries ginstall -m 755 -d $(PKGROOT)$(global_bindir) for f in $(PKGROOT)$(bindir)/*; do \ + if echo $$f | grep amd64$$; then continue; fi; \ + if echo $$f | grep sparcv9$$; then continue; fi; \ ln -s ../..$(bindir)/`basename $$f` \ $(PKGROOT)$(global_bindir)/`basename $$f`; \ done Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums 2010-03-02 09:46:30 UTC (rev 8935) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums 2010-03-02 10:14:39 UTC (rev 8936) @@ -2,11 +2,11 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -747637bc4be42207974ae845d832ae65 CSWmysql5.postinstall -60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall +feef62c3234b1e054ec4d06290b8b43d CSWmysql51.postinstall +a652ccff001c328178f4b0ed9bfebbd6 CSWmysql51.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW -aaca748fc044834e71ad544ab293c494 cswmysql5 +0974c28c048437612c6a0ace93460d3b cswmysql51 67228e1f096fe08a94f4267439a4ec36 cswusergroup -32e7373c16271606007374396e6742ad mysql-5.1.40.tar.gz +a16fa6d6c7f40a963919cbc1c5e86111 mysql-5.1.44.tar.gz 90b7cfcd11ab56e021a195a6a085fa21 quick_start-csw Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql5.postinstall 2010-03-02 09:46:30 UTC (rev 8935) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql5.postinstall 2010-03-02 10:14:39 UTC (rev 8936) @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $Id$ -# - -MYSQLDATADIR=/var/opt/csw/mysql5 -if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then - echo "No database directory found in the default location:" - echo "${MYSQLDATADIR}/mysql" - echo "If you need to build the initial database directory," - echo " see /opt/csw/mysql5/share/mysql/quick_start-csw" - echo "If you are using a non-default database directory location," - echo " please start mysql manually." - exit 0 -fi Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql5.preinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql5.preinstall 2010-03-02 09:46:30 UTC (rev 8935) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql5.preinstall 2010-03-02 10:14:39 UTC (rev 8936) @@ -1,40 +0,0 @@ -#!/bin/sh -# vim:set sw=2 ts=2 sts=2 expandtab: -# -# $Id$ -# - -obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5" - -obsolete_dir_information=" -This directory is obsolete. Files in this directory are going to be ignored. -Please move your data to the new location. - -Feel free to remove this file afterwards. -" -obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" - -for dirpair in ${obsolete_directories}; do - obsolete_dir=`echo ${dirpair} | cut -d: -f1` - new_dir=`echo ${dirpair} | cut -d: -f2` - if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then - echo - echo "*******************************************************************" - echo "* The old configuration directory ${obsolete_dir} still exists. " - echo "* Please move your configuration to ${new_dir}. " - echo "* " - echo "* Installation will continue in 10 seconds. " - echo "* Press CTRL+C if you want to stop now. " - echo "*******************************************************************" - echo - sleep 10 - - # Leaving a note for the sysadmin if the they proceed with the installation. - fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" - if touch "${fn}" 2>/dev/null; then - echo "${obsolete_dir_information}" > "${fn}" - fi - fi -done - -exit 0 Copied: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall (from rev 7856, csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql5.postinstall) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall 2010-03-02 10:14:39 UTC (rev 8936) @@ -0,0 +1,95 @@ +#!/bin/ksh -p +# +# $Id$ +# +# initial version for blastwave.org by Alex Moore 2006.02.25 +# Revised 2006.03.25 - see bug report 0001542 +# +# This script creates a default database with the small-memory footprint. +# Input may be provided for DATADIR and DEFAULTS_FILE +# +BASEDIR=/opt/csw +MYSQL_VAR=/var/opt/csw/mysql/@MYSQL_BASE_VERSION@ +DEFAULTS_FILE=$BASEDIR/my.cnf +SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf +MYSQLD_USER=mysql +# Provide the default data directory +MYSQLD_DATADIR=$MYSQL_VAR + +# http://bugs.mysql.com/bug.php?id=31164 +# ERROR: 1004 Can't create file '/var/tmp//installRJaiQ3/#sql6fee_1_0.frm' (errno: 13) +unset TMPDIR + +if [ ! -f "$DEFAULTS_FILE" ]; then + IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf + echo "Using $IN_DEFAULTS_FILE to create the options file." +else + IN_DEFAULTS_FILE=$DEFAULTS_FILE + echo "Using $DEFAULTS_FILE as the options file." +fi + +if [ -d "$MYSQLD_DATADIR/mysql" ]; then + echo "mysql database already exists." + echo "Leaving script without initializing a database." + exit 0 +fi + +echo "Setting up the database" +# Create the database directory and set the permissions if needed +if [ ! -d "$MYSQLD_DATADIR" ] ; then + mkdir -p $MYSQLD_DATADIR + chown -R mysql:mysql $MYSQLD_DATADIR + chmod 0700 $MYSQLD_DATADIR +fi +# +# copy the configuration file if not exists. +CNFCOPIED=no +if [ ! -f "$DEFAULTS_FILE" ] ; then + cp -p $IN_DEFAULTS_FILE $DEFAULTS_FILE + CNFCOPIED=yes +fi +# +# Run the mysql script to create the database +echo "Creating MySQL core database in $MYSQLD_DATADIR" +echo +echo "### The following messages are from mysql_install_db." +$BASEDIR/bin/mysql_install_db \ + --defaults-extra-file="$DEFAULTS_FILE" \ + --user="$MYSQLD_USER" \ + --basedir="$BASEDIR" \ + --datadir="$MYSQLD_DATADIR" + +# Fix permissions on the data directory, since mysql_install_db was run as +# root. +chown -R mysql:mysql $MYSQLD_DATADIR + +# Update --datadir in the cnf file with the correct value if file was copied +if [ x"$CNFCOPIED" = xyes ]; then + sed -e "s|/var/opt/csw/mysql5|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new + mv $DEFAULTS_FILE.new $DEFAULTS_FILE +fi + +# Ending message +echo +echo "### The following messages are from $0." +echo "See /opt/csw/mysql5/share/mysql/doc/README.CSW for packaging changes." +echo "Please ignore references to starting mysqld_safe in the messages above." +echo " These messages are from mysql_install_db. See the following" +echo " for starting CSWmysql5." +smf=no +if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi +if [ $smf = yes ] +then + echo "Running \`svcadm enable cswmysql5\` start to start the database." + # First, we clear the status, since it's likely to be 'maintenance'. + svcadm disable cswmysql5 + svcadm clear cswmysql5 + svcadm enable cswmysql5 +else + echo "Running \`/etc/opt/csw/init.d/cswmysql\` start to start the database." + /etc/opt/csw/init.d/cswmysql start +fi + +exit 0 + +# vim:set ts=2 sw=2 sts=2 expandtab: Copied: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.preinstall (from rev 7856, csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql5.preinstall) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.preinstall (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.preinstall 2010-03-02 10:14:39 UTC (rev 8936) @@ -0,0 +1,40 @@ +#!/bin/sh +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# $Id$ +# + +obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5" + +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi +done + +exit 0 Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql5 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql5 2010-03-02 09:46:30 UTC (rev 8935) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql5 2010-03-02 10:14:39 UTC (rev 8936) @@ -1,183 +0,0 @@ -#!/bin/sh -# -# $Id$ -# Start script for MySQL database. -# -# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod -# 700. -# -# First time installation can use quick_start-csw in -# /opt/csw/mysql5/share/mysql to build the mysql database for the -# grant tables. Or create the initial database yourself. -# -# Use my.cnf for startup options. See MySQL documention -# for 'Using Option Files'. -# Support for mysql5rc still remains in this startup script. -# - -RETVAL=0 -MYSQLHOME=/opt/csw/mysql5 -MYSQL_VAR=/var/opt/csw/mysql5 -MYSQLD_DATADIR=$MYSQL_VAR -MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid -CONFFILE=$MYSQL_VAR/my.cnf - -# -# Source configuration -[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc -[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc - -# To get started quickly, copy a sample configuration file from -# $MYSQLHOME/share/mysql -# For example, -# cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf -# -# Or, manually follow the database creation steps below, and have -# mysql just use defaults for everything. - -# 2006-03-11 Changed to only look for the grant tables database -# 2006-04-16 Changed again. Look for either the grant tables database -# or the options file. -# 2006-12-28 Fix problem. Look for either the grant tables database in -# the default location or the default options file. -if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then - exit 0 -fi - -# If CONFFILE is the server default file, unset CONFFILE -if [ x"$CONFFILE" = x"$MYSQL_VAR/my.cnf" ]; then - CONFFILE= -fi - -# If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR -# Also, check that MYSQLD_DATADIR contains a mysql directory -if [ ! -d "$MYSQL_VAR/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then - MYSQLD_DATADIR= -fi - -# Make sure required vars are set -MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_VAR/mysql.pid} - -# If a database already exists, start whether or not there is a conf file. -# If no conf file, the database will just use internal defaults for everything. - -start_it() { - if test -r $MYSQLD_PID_FILE ; then - if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then - echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running." - return 1 - fi - fi - - printf "%-60s" "Starting mysqld: " -# 2006-03-11 -# This script no longer creates the default database. You may create the -# default database manually or use /opt/csw/mysql5/share/mysql/quick_start-csw -# if [ ! -d "$MYSQLHOME/var/mysql" ] ; then -# echo MySQL core database has not been created. -# echo Creating it now... -# $MYSQLHOME/bin/mysql_install_db -# chown -R mysql:mysql $MYSQLHOME/var -# fi - -# 2006-04-16 --defaults-file is changed to --defaults-extra-file - $MYSQLHOME/bin/mysqld_safe \ - `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ - --pid-file=$MYSQLD_PID_FILE \ - `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ - `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ - `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ - `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ - `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ - `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ - `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ - `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ - `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ - `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ - `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ - `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ - `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ - `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ - `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ - `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ - `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ - `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ - `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ - `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ - `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ - `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ - `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ - `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ - `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ - `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ - `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ - `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ - `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ - `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ - `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ - `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ - `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ - `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ - `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ - `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ - `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ - `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ - `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ - `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ - `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ - `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ - `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ - & >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - return 1 - fi - return 0 -} - -stop_it() { - - printf "%-60s" "Shutting down mysqld: " - if test -f "$MYSQLD_PID_FILE" ; then - pkill mysqld_safe >/dev/null 2>&1 - kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 - RETVAL=$? - else - RETVAL=1 - fi - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - fi - echo "" - return 0 -} - -case $1 in - start) - start_it - ;; - - stop) - stop_it - ;; - - restart) - stop_it - while pgrep mysqld > /dev/null - do - sleep 1 - done - start_it - ;; - - *) - echo "Usage: $0 { start | stop | restart } " - ;; -esac - -exit $RETVAL Copied: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql51 (from rev 8927, csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql5) =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql51 (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/cswmysql51 2010-03-02 10:14:39 UTC (rev 8936) @@ -0,0 +1,183 @@ +#!/bin/sh +# +# $Id$ +# Start script for MySQL database. +# +# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod +# 700. +# +# First time installation can use quick_start-csw in +# /opt/csw/mysql5/share/mysql to build the mysql database for the +# grant tables. Or create the initial database yourself. +# +# Use my.cnf for startup options. See MySQL documention +# for 'Using Option Files'. +# Support for mysql5rc still remains in this startup script. +# + +RETVAL=0 +MYSQLHOME=/opt/csw/mysql5 +MYSQL_VAR=/var/opt/csw/mysql5 +MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid +CONFFILE=$MYSQL_VAR/my.cnf + +# +# Source configuration +[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc +[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc + +# To get started quickly, copy a sample configuration file from +# $MYSQLHOME/share/mysql +# For example, +# cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf +# +# Or, manually follow the database creation steps below, and have +# mysql just use defaults for everything. + +# 2006-03-11 Changed to only look for the grant tables database +# 2006-04-16 Changed again. Look for either the grant tables database +# or the options file. +# 2006-12-28 Fix problem. Look for either the grant tables database in +# the default location or the default options file. +if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then + exit 0 +fi + +# If CONFFILE is the server default file, unset CONFFILE +if [ x"$CONFFILE" = x"$MYSQL_VAR/my.cnf" ]; then + CONFFILE= +fi + +# If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR +# Also, check that MYSQLD_DATADIR contains a mysql directory +if [ ! -d "$MYSQL_VAR/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then + MYSQLD_DATADIR= +fi + +# Make sure required vars are set +MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_VAR/mysql.pid} + +# If a database already exists, start whether or not there is a conf file. +# If no conf file, the database will just use internal defaults for everything. + +start_it() { + if test -r $MYSQLD_PID_FILE ; then + if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then + echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running." + return 1 + fi + fi + + printf "%-60s" "Starting mysqld: " +# 2006-03-11 +# This script no longer creates the default database. You may create the +# default database manually or use /opt/csw/mysql5/share/mysql/quick_start-csw +# if [ ! -d "$MYSQLHOME/var/mysql" ] ; then +# echo MySQL core database has not been created. +# echo Creating it now... +# $MYSQLHOME/bin/mysql_install_db +# chown -R mysql:mysql $MYSQLHOME/var +# fi + +# 2006-04-16 --defaults-file is changed to --defaults-extra-file + $MYSQLHOME/bin/mysqld_safe \ + `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ + --pid-file=$MYSQLD_PID_FILE \ + `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ + `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ + `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ + `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ + `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ + `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ + `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ + `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ + `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ + `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ + `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ + `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ + `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ + `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ + `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ + `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ + `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ + `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ + `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ + `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ + `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ + `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ + `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ + `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ + `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ + `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ + `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ + `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ + `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ + `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ + `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ + `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ + `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ + `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ + `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ + `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ + `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ + `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ + `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ + `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ + `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ + `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ + `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ + & >/dev/null 2>&1 + RETVAL=$? + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + return 1 + fi + return 0 +} + +stop_it() { + + printf "%-60s" "Shutting down mysqld: " + if test -f "$MYSQLD_PID_FILE" ; then + pkill mysqld_safe >/dev/null 2>&1 + kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 + RETVAL=$? + else + RETVAL=1 + fi + if [ $RETVAL = 0 ] ; then + echo "[ OK ]" + else + echo "[FAILED]" + fi + echo "" + return 0 +} + +case $1 in + start) + start_it + ;; + + stop) + stop_it + ;; + + restart) + stop_it + while pgrep mysqld > /dev/null + do + sleep 1 + done + start_it + ;; + + *) + echo "Usage: $0 { start | stop | restart } " + ;; +esac + +exit $RETVAL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 2 11:29:46 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Mar 2010 10:29:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8937] csw/mgar/pkg/nss/trunk/Makefile Message-ID: Revision: 8937 http://gar.svn.sourceforge.net/gar/?rev=8937&view=rev Author: wahwah Date: 2010-03-02 10:29:46 +0000 (Tue, 02 Mar 2010) Log Message: ----------- nss: Removing the merging of sparcv9/amd64 binaries. Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2010-03-02 10:14:39 UTC (rev 8936) +++ csw/mgar/pkg/nss/trunk/Makefile 2010-03-02 10:29:46 UTC (rev 8937) @@ -57,6 +57,9 @@ INSTALL_SCRIPTS = nss TEST_SCRIPTS = BUILD64 = 1 +MERGE_DIRS_isa-sparcv9 = $(libdir) +MERGE_DIRS_isa-amd64 = $(libdir) + EXTRA_INC = $(prefix)/include libdir_install = $(prefix)/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 2 11:54:19 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Mar 2010 10:54:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8938] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ checksums Message-ID: Revision: 8938 http://gar.svn.sourceforge.net/gar/?rev=8938&view=rev Author: wahwah Date: 2010-03-02 10:54:18 +0000 (Tue, 02 Mar 2010) Log Message: ----------- mysql-5.1.x-optcsw: checksum updates for files with the Id tag. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums 2010-03-02 10:29:46 UTC (rev 8937) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums 2010-03-02 10:54:18 UTC (rev 8938) @@ -2,11 +2,11 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -feef62c3234b1e054ec4d06290b8b43d CSWmysql51.postinstall -a652ccff001c328178f4b0ed9bfebbd6 CSWmysql51.preinstall +9c2c43fa308488e28b2ca79167220c4e CSWmysql51.postinstall +1dcbbf2341ad8d75de3d0e99d7995c3e CSWmysql51.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW -0974c28c048437612c6a0ace93460d3b cswmysql51 +7124b641ff82ee17033ce8f573700c89 cswmysql51 67228e1f096fe08a94f4267439a4ec36 cswusergroup a16fa6d6c7f40a963919cbc1c5e86111 mysql-5.1.44.tar.gz 90b7cfcd11ab56e021a195a6a085fa21 quick_start-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 Tue Mar 2 13:44:14 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 02 Mar 2010 12:44:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8939] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8939 http://gar.svn.sourceforge.net/gar/?rev=8939&view=rev Author: skayser Date: 2010-03-02 12:44:13 +0000 (Tue, 02 Mar 2010) Log Message: ----------- gar/v2: allow ENABLE_CHECK=0 as well as the currently allowed ENABLE_CHECK= Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-03-02 10:54:18 UTC (rev 8938) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-03-02 12:44:13 UTC (rev 8939) @@ -762,7 +762,7 @@ if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ done)),) _buildpackage: _EXTRA_GAR_PKGS += $(if $(ISAEXEC_FILES),CSWisaexec) -_buildpackage: pre-package $(PACKAGE_TARGETS) post-package $(if $(ENABLE_CHECK),pkgcheck) +_buildpackage: pre-package $(PACKAGE_TARGETS) post-package $(if $(filter-out 0,$(ENABLE_CHECK)),pkgcheck) _package: validateplatform extract-global merge $(SPKG_DESTDIRS) _buildpackage @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Mar 2 14:26:01 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 02 Mar 2010 13:26:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[8941] csw/mgar/pkg/rrdtool/branches/benny/files Message-ID: Revision: 8941 http://gar.svn.sourceforge.net/gar/?rev=8941&view=rev Author: bensons Date: 2010-03-02 13:26:01 +0000 (Tue, 02 Mar 2010) Log Message: ----------- rrdtool: renamed patch files Added Paths: ----------- csw/mgar/pkg/rrdtool/branches/benny/files/patch-64-Makefile.in csw/mgar/pkg/rrdtool/branches/benny/files/patch-64-bindings-Makefile.in Removed Paths: ------------- csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-Makefile.in csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-bindings-Makefile.in Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-64-Makefile.in =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/patch-64-Makefile.in (rev 0) +++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-64-Makefile.in 2010-03-02 13:26:01 UTC (rev 8941) @@ -0,0 +1,75 @@ +--- rrdtool-1.4.2.orig/Makefile.in 2009-11-15 12:55:05.000000000 +0100 ++++ rrdtool-1.4.2/Makefile.in 2010-02-26 19:19:42.923524958 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -222,6 +222,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +@@ -427,7 +428,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -452,7 +453,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -616,7 +617,8 @@ + fi; \ + done + -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +@@ -660,17 +662,17 @@ + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ +- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ ++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +@@ -867,7 +869,7 @@ + + # $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi at ipn.caida.org:/ipn/web/Tools/RRDtool/pub/ + +-site-perl-inst: site-perl-install ++site-perl-inst: echo skipping 64bit perl module install + + site-perl-install: all bindings/perl-piped/Makefile bindings/perl-shared/Makefile + cd bindings/perl-piped && $(MAKE) install Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-64-bindings-Makefile.in =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/patch-64-bindings-Makefile.in (rev 0) +++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-64-bindings-Makefile.in 2010-03-02 13:26:01 UTC (rev 8941) @@ -0,0 +1,43 @@ +--- rrdtool-1.4.2.orig/bindings/Makefile.in 2009-11-15 12:55:04.000000000 +0100 ++++ rrdtool-1.4.2/bindings/Makefile.in 2010-02-26 19:19:41.514583447 +0100 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -205,6 +205,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ +@@ -374,7 +375,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -399,7 +400,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -676,7 +677,7 @@ + .PHONY: python ruby + + # add the following to the all target +-all-local: @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@ ++all-local: @COMP_RUBY@ @COMP_PYTHON@ + + install-data-local: + $(AM_V_GEN)test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true Deleted: csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-Makefile.in =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-Makefile.in 2010-03-02 13:22:34 UTC (rev 8940) +++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-Makefile.in 2010-03-02 13:26:01 UTC (rev 8941) @@ -1,75 +0,0 @@ ---- rrdtool-1.4.2.orig/Makefile.in 2009-11-15 12:55:05.000000000 +0100 -+++ rrdtool-1.4.2/Makefile.in 2010-02-26 19:19:42.923524958 +0100 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -222,6 +222,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ -@@ -427,7 +428,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -+ @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ -@@ -452,7 +453,7 @@ - fi; test -z "$$fail" - - $(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -+ @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ -@@ -616,7 +617,8 @@ - fi; \ - done - -test -n "$(am__skip_mode_fix)" \ -- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -+ || find "$(distdir)" -type d ! -perm -755 \ -+ -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ -@@ -660,17 +662,17 @@ - distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ -+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ -- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ -- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ -+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ -+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac -@@ -867,7 +869,7 @@ - - # $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi at ipn.caida.org:/ipn/web/Tools/RRDtool/pub/ - --site-perl-inst: site-perl-install -+site-perl-inst: echo skipping 64bit perl module install - - site-perl-install: all bindings/perl-piped/Makefile bindings/perl-shared/Makefile - cd bindings/perl-piped && $(MAKE) install Deleted: csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-bindings-Makefile.in =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-bindings-Makefile.in 2010-03-02 13:22:34 UTC (rev 8940) +++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-amd64-bindings-Makefile.in 2010-03-02 13:26:01 UTC (rev 8941) @@ -1,43 +0,0 @@ ---- rrdtool-1.4.2.orig/bindings/Makefile.in 2009-11-15 12:55:04.000000000 +0100 -+++ rrdtool-1.4.2/bindings/Makefile.in 2010-02-26 19:19:41.514583447 +0100 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -205,6 +205,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ -@@ -374,7 +375,7 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @failcom='exit 1'; \ -+ @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ -@@ -399,7 +400,7 @@ - fi; test -z "$$fail" - - $(RECURSIVE_CLEAN_TARGETS): -- @failcom='exit 1'; \ -+ @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ -@@ -676,7 +677,7 @@ - .PHONY: python ruby - - # add the following to the all target --all-local: @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@ -+all-local: @COMP_RUBY@ @COMP_PYTHON@ - - install-data-local: - $(AM_V_GEN)test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Mar 2 14:22:34 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 02 Mar 2010 13:22:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8940] csw/mgar/pkg/rrdtool/branches/benny Message-ID: Revision: 8940 http://gar.svn.sourceforge.net/gar/?rev=8940&view=rev Author: bensons Date: 2010-03-02 13:22:34 +0000 (Tue, 02 Mar 2010) Log Message: ----------- rrdtool: handle sparcv9 Modified Paths: -------------- csw/mgar/pkg/rrdtool/branches/benny/Makefile csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c Modified: csw/mgar/pkg/rrdtool/branches/benny/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-02 12:44:13 UTC (rev 8939) +++ csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-02 13:22:34 UTC (rev 8940) @@ -34,6 +34,8 @@ RUNTIME_DEP_PKGS += CSWperl RUNTIME_DEP_PKGS += CSWruby +# BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) CSWlua + EXTRA_INC = $(prefix)/include/cairo EXTRA_INC += $(prefix)/include/libxml2 EXTRA_INC += $(prefix)/X11/include @@ -47,9 +49,9 @@ CONFIGURE_ARS = $(DIRPATHS) CONFIGURE_ARGS += --with-docdir=$(sharedstatedir)/doc/$(GARNAME) -CONFIGURE_ARGS += --disable-python +CONFIGURE_ARGS += --disable-lua +CONFIGURE_ARGS += --enable-python CONFIGURE_ARGS += --enable-ruby -CONFIGURE_ARGS += --disable-libintl CONFIGURE_ARGS += --enable-perl CONFIGURE_ARGS += --with-perl-options=INSTALLDIRS=vendor CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include @@ -80,10 +82,15 @@ pre-build-isa-amd64: @# since our perl is 32bit, we need to patch away the module build - gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-amd64-Makefile.in - gpatch -d$(WORKSRC) -p1 -F2 < \ - $(FILEDIR)/patch-amd64-bindings-Makefile.in + gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-Makefile.in + gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-bindings-Makefile.in @$(MAKECOOKIE) +pre-build-isa-sparcv9: + @# since our perl is 32bit, we need to patch away the module build + gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-Makefile.in + gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-bindings-Makefile.in + @$(MAKECOOKIE) + env: @echo "PKG_CONFIG_PATH: $(PKG_CONFIG_PATH)" Modified: csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c 2010-03-02 12:44:13 UTC (rev 8939) +++ csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c 2010-03-02 13:22:34 UTC (rev 8940) @@ -30,10 +30,6 @@ round(double x) { double t; -/* - if (!isfinite(x)) - return (x); -*/ if (x >= 0.0) { t = floor(x); if (t - x <= -0.5) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 2 15:16:28 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Mar 2010 14:16:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8942] csw/mgar/pkg/protobuf/trunk/Makefile Message-ID: Revision: 8942 http://gar.svn.sourceforge.net/gar/?rev=8942&view=rev Author: wahwah Date: 2010-03-02 14:16:28 +0000 (Tue, 02 Mar 2010) Log Message: ----------- protobuf: Adding Python support, splitting off runtime and devel packages. Modified Paths: -------------- csw/mgar/pkg/protobuf/trunk/Makefile Modified: csw/mgar/pkg/protobuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/protobuf/trunk/Makefile 2010-03-02 13:26:01 UTC (rev 8941) +++ csw/mgar/pkg/protobuf/trunk/Makefile 2010-03-02 14:16:28 UTC (rev 8942) @@ -2,7 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -# Still doesn't build, I've filed a bug: # http://code.google.com/p/protobuf/issues/detail?id=166 # # About using stlport4 @@ -11,7 +10,6 @@ GARNAME = protobuf GARVERSION = 2.3.0 CATEGORIES = lib -DESCRIPTION = encoding structured data in an efficient yet extensible format define BLURB Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its @@ -32,6 +30,40 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +PYCOMPILE = 1 + +PACKAGES = CSWprotobuf +PACKAGES += CSWprotobuf-rt +PACKAGES += CSWprotobuf-devel +PACKAGES += CSWpy-protobuf +SPKG_DESC_CSWprotobuf = Google Protocol buffers +SPKG_DESC_CSWprotobuf-rt = $(SPKG_DESC_CSWprotobuf), shared libraries +SPKG_DESC_CSWprotobuf-devel = $(SPKG_DESC_CSWprotobuf), header files +SPKG_DESC_CSWpy-protobuf= $(SPKG_DESC_CSWprotobuf), Python support +CATALOGNAME_CSWprotobuf-rt = protobuf_rt +CATALOGNAME_CSWprotobuf-devel = protobuf_devel +CATALOGNAME_CSWpy-protobuf = py_protobuf +PKGFILES_CSWprotobuf += $(bindir).*protoc.* +PKGFILES_CSWprotobuf += $(libdir).*protoc.* +PKGFILES_CSWprotobuf-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWprotobuf-rt = $(libdir).*libprotobuf.* +PKGFILES_CSWpy-protobuf = $(libdir)/python.* + +ARCHALL_CSWpy-protobuf = 1 +RUNTIME_DEP_PKGS_CSWprotobuf += CSWprotobuf-rt RUNTIME_DEP_PKGS_CSWprotobuf += CSWstlport RUNTIME_DEP_PKGS_CSWprotobuf += CSWzlib +RUNTIME_DEP_PKGS_CSWprotobuf-devel += CSWprotobuf +RUNTIME_DEP_PKGS_CSWprotobuf-rt += CSWstlport +RUNTIME_DEP_PKGS_CSWprotobuf-rt += CSWzlib +RUNTIME_DEP_PKGS_CSWpy-protobuf += CSWprotobuf + include gar/category.mk + +post-build-modulated: + (cd $(WORKSRC)/python; python setup.py build) + @$(MAKECOOKIE) + +post-install-modulated: + (cd $(WORKSRC)/python; python setup.py install --root=$(DESTDIR) --prefix=$(prefix)) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Mar 2 15:51:16 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 02 Mar 2010 14:51:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8943] csw/mgar/pkg/rrdtool/branches/benny Message-ID: Revision: 8943 http://gar.svn.sourceforge.net/gar/?rev=8943&view=rev Author: bensons Date: 2010-03-02 14:51:16 +0000 (Tue, 02 Mar 2010) Log Message: ----------- rrdtool: patched python bindings to place CCHOME/bin into PATH Modified Paths: -------------- csw/mgar/pkg/rrdtool/branches/benny/Makefile csw/mgar/pkg/rrdtool/branches/benny/checksums Modified: csw/mgar/pkg/rrdtool/branches/benny/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-02 14:16:28 UTC (rev 8942) +++ csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-02 14:51:16 UTC (rev 8943) @@ -63,8 +63,9 @@ PATCHFILES += patch-src-Makefile.in PATCHFILES += patch-src-rrd_open.c +PATCHFILES += patch-bindings-Makefile.in -BUILD64 = 1 +# BUILD64 = 1 STRIP_LIBTOOL = 1 Modified: csw/mgar/pkg/rrdtool/branches/benny/checksums =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/checksums 2010-03-02 14:16:28 UTC (rev 8942) +++ csw/mgar/pkg/rrdtool/branches/benny/checksums 2010-03-02 14:51:16 UTC (rev 8943) @@ -1,4 +1,4 @@ -48a9b258cf8b4b943dbaf30ea939c315 CSWrrdtool.gspec +c6bc2f9c3d88e0488f0332a9d288dc39 patch-bindings-Makefile.in 20e58c7facf2687037288c157c32df1a patch-src-Makefile.in 47709778545eec2e8c5c3b38f9c94fcd patch-src-rrd_open.c 9318d3b4016dd9dd9897f1eac7548032 rrdtool-1.4.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Mar 2 15:51:55 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 02 Mar 2010 14:51:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8944] csw/mgar/pkg/rrdtool/branches/benny/files/ patch-bindings-Makefile.in Message-ID: Revision: 8944 http://gar.svn.sourceforge.net/gar/?rev=8944&view=rev Author: bensons Date: 2010-03-02 14:51:54 +0000 (Tue, 02 Mar 2010) Log Message: ----------- rrdtool: and the patchfile 8-) Added Paths: ----------- csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-Makefile.in Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-Makefile.in =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-Makefile.in (rev 0) +++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-Makefile.in 2010-03-02 14:51:54 UTC (rev 8944) @@ -0,0 +1,11 @@ +--- rrdtool-1.4.2.orig/bindings/Makefile.in 2009-11-15 12:55:04.000000000 +0100 ++++ rrdtool-1.4.2/bindings/Makefile.in 2010-03-02 15:29:39.602876133 +0100 +@@ -692,7 +692,7 @@ + + # rules for building the pyton module + python: +- cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build ++ cd python && env PATH=$(CC_HOME)/bin BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build + + # rules for building the perl module + perl_piped: perl-piped/Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Mar 2 17:39:14 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 02 Mar 2010 16:39:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8945] csw/mgar/pkg/rrdtool/branches/benny Message-ID: Revision: 8945 http://gar.svn.sourceforge.net/gar/?rev=8945&view=rev Author: bensons Date: 2010-03-02 16:39:13 +0000 (Tue, 02 Mar 2010) Log Message: ----------- rrdtool: hacked ruby support Modified Paths: -------------- csw/mgar/pkg/rrdtool/branches/benny/Makefile csw/mgar/pkg/rrdtool/branches/benny/checksums Added Paths: ----------- csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-ruby-extconf.rb Modified: csw/mgar/pkg/rrdtool/branches/benny/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-02 14:51:54 UTC (rev 8944) +++ csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-02 16:39:13 UTC (rev 8945) @@ -4,9 +4,9 @@ DESCRIPTION = time-series data logging and graphing. define BLURB - RRDtool is basically the time-series graphing and data storage/management - component of MRTG, broken out and `done right'. `done right' means that - RRDtool is magnitudes faster than MRTG and extremely configurable. + RRDtool is basically the time-series graphing and data storage/management + component of MRTG, broken out and `done right'. `done right' means that + RRDtool is magnitudes faster than MRTG and extremely configurable. endef MASTER_SITES = http://oss.oetiker.ch/$(GARNAME)/pub/ @@ -33,6 +33,7 @@ RUNTIME_DEP_PKGS += CSWzlib RUNTIME_DEP_PKGS += CSWperl RUNTIME_DEP_PKGS += CSWruby +RUNTIME_DEP_PKGS += CSWpython # BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) CSWlua @@ -52,10 +53,12 @@ CONFIGURE_ARGS += --disable-lua CONFIGURE_ARGS += --enable-python CONFIGURE_ARGS += --enable-ruby +CONFIGURE_ARGS += --with-ruby-options=CFLAGS= CONFIGURE_ARGS += --enable-perl CONFIGURE_ARGS += --with-perl-options=INSTALLDIRS=vendor CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS += --exec-prefix=$(prefix) EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod @@ -64,6 +67,7 @@ PATCHFILES += patch-src-Makefile.in PATCHFILES += patch-src-rrd_open.c PATCHFILES += patch-bindings-Makefile.in +PATCHFILES += patch-bindings-ruby-extconf.rb # BUILD64 = 1 Modified: csw/mgar/pkg/rrdtool/branches/benny/checksums =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/checksums 2010-03-02 14:51:54 UTC (rev 8944) +++ csw/mgar/pkg/rrdtool/branches/benny/checksums 2010-03-02 16:39:13 UTC (rev 8945) @@ -1,4 +1,5 @@ c6bc2f9c3d88e0488f0332a9d288dc39 patch-bindings-Makefile.in +072482090287b462c8c092b2ead132da patch-bindings-ruby-extconf.rb 20e58c7facf2687037288c157c32df1a patch-src-Makefile.in 47709778545eec2e8c5c3b38f9c94fcd patch-src-rrd_open.c 9318d3b4016dd9dd9897f1eac7548032 rrdtool-1.4.2.tar.gz Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-ruby-extconf.rb =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-ruby-extconf.rb (rev 0) +++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-ruby-extconf.rb 2010-03-02 16:39:13 UTC (rev 8945) @@ -0,0 +1,11 @@ +--- rrdtool-1.4.2.orig/bindings/ruby/extconf.rb 2010-03-02 16:12:18.622716000 +0100 ++++ rrdtool-1.4.2/bindings/ruby/extconf.rb 2010-03-02 17:27:47.399923107 +0100 +@@ -6,7 +6,7 @@ + if /linux/ =~ RUBY_PLATFORM + $LDFLAGS += '-Wl,--rpath -Wl,$(EPREFIX)/lib' + elsif /solaris/ =~ RUBY_PLATFORM +- $LDFLAGS += '-R$(EPREFIX)/lib' ++ $LDFLAGS += ' -R$(EPREFIX)/lib' + elsif /hpux/ =~ RUBY_PLATFORM + $LDFLAGS += '+b$(EPREFIX)/lib' + elsif /aix/ =~ RUBY_PLATFORM 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 Mar 2 22:02:43 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Mar 2010 21:02:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8946] csw/mgar/pkg Message-ID: Revision: 8946 http://gar.svn.sourceforge.net/gar/?rev=8946&view=rev Author: dmichelsen Date: 2010-03-02 21:02:23 +0000 (Tue, 02 Mar 2010) Log Message: ----------- xcb, freedesktop/: Move x11/xcb/* to new hierarchy freedesktop Modified Paths: -------------- csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile csw/mgar/pkg/freedesktop/libxcb/trunk/checksums Added Paths: ----------- csw/mgar/pkg/freedesktop/ csw/mgar/pkg/freedesktop/Makefile csw/mgar/pkg/freedesktop/libxcb/ csw/mgar/pkg/freedesktop/x11_xcbproto/ csw/mgar/pkg/freedesktop/xcb-util/ Removed Paths: ------------- csw/mgar/pkg/x11/xcb/ Copied: csw/mgar/pkg/freedesktop/Makefile (from rev 8930, csw/mgar/pkg/x11/xcb/Makefile) =================================================================== --- csw/mgar/pkg/freedesktop/Makefile (rev 0) +++ csw/mgar/pkg/freedesktop/Makefile 2010-03-02 21:02:23 UTC (rev 8946) @@ -0,0 +1,65 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 6092 2009-08-23 21:50:45Z skayser $ +# +# vim: ft=make ts=4 sw=4 noet +# This makefile is to be included from Makefiles in each category +# directory. + +default: + @echo "You are in the pkg/x11/xcb directory." + +%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* ; \ + done + +paranoid-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || exit 2; \ + done + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ + done + +newpkg-%: + @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files + @(echo "GARNAME = $*"; \ + echo "GARVERSION = 1.0"; \ + echo "CATEGORIES = category"; \ + echo ""; \ + echo "DESCRIPTION = Brief description"; \ + echo "define BLURB"; \ + echo " Long description"; \ + echo "endef"; \ + echo ""; \ + echo "MASTER_SITES = "; \ + echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ + 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 "include gar/category.mk"; \ + ) > $*/trunk/Makefile + @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 + @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" + Modified: csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb/libxcb/trunk/Makefile 2010-03-02 00:06:52 UTC (rev 8930) +++ csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile 2010-03-02 21:02:23 UTC (rev 8946) @@ -1,5 +1,5 @@ GARNAME = libxcb -GARVERSION = 1.2 +GARVERSION = 1.5 CATEGORIES = x11 DESCRIPTION = The XCB library @@ -9,7 +9,7 @@ endef MASTER_SITES = http://xcb.freedesktop.org/dist/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 BUILD_DEP_PKGS = CSWlibxaudevel CSWlibpthreadstubs CSWdoxygen CSWpython CSWxcbproto CSWgraphviz2 RUNTIME_DEP_PKGS_CSWlibxcb = CSWlibxau @@ -29,7 +29,7 @@ PKGFILES_CSWlibxcbdevel = $(PKGFILES_DEVEL) PKGFILES_CSWlibxcbdoc = $(PKGFILES_DOC) -RUNTIME_DEP_PKGS_CSWlibxcbdevel = CSWlibxcb +RUNTIME_DEP_PKGS_CSWlibxcbdevel = CSWlibxcb CSWlibpthreadstubs RUNTIME_DEP_PKGS_CSWlibxcb = CSWx11common CSWlibxau CSWlibxdmcp ARCHALL_CSWlibxcbdoc = 1 Modified: csw/mgar/pkg/freedesktop/libxcb/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xcb/libxcb/trunk/checksums 2010-03-02 00:06:52 UTC (rev 8930) +++ csw/mgar/pkg/freedesktop/libxcb/trunk/checksums 2010-03-02 21:02:23 UTC (rev 8946) @@ -1 +1 @@ -f55c731d32ec1a555c77ebbbc8f386aa libxcb-1.2.tar.gz +d19c0ba6ba42ebccd3d62d8bb147b551 libxcb-1.5.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 Tue Mar 2 22:54:10 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Mar 2010 21:54:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8947] csw/mgar/pkg/freedesktop Message-ID: Revision: 8947 http://gar.svn.sourceforge.net/gar/?rev=8947&view=rev Author: dmichelsen Date: 2010-03-02 21:54:10 +0000 (Tue, 02 Mar 2010) Log Message: ----------- xcbproto: Remove x11 from name part Modified Paths: -------------- csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/freedesktop/xcbproto/ Removed Paths: ------------- csw/mgar/pkg/freedesktop/x11_xcbproto/ Modified: csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/freedesktop/x11_xcbproto/trunk/Makefile 2010-03-02 21:02:23 UTC (rev 8946) +++ csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile 2010-03-02 21:54:10 UTC (rev 8947) @@ -1,7 +1,7 @@ GARVERSION = 1.6 CATEGORIES = x11 PROTONAME = xcb-proto -GARNAME = x11_$(PROTONAME) +GARNAME = $(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = XCB protocol descriptions (in XML) @@ -28,17 +28,17 @@ MASTER_SITES = $(XCB_MASTER_SITES) DISTFILES = $(DISTNAME).tar.gz -PACKAGES = CSWx11xcbproto CSWpyx11xcbproto +PACKAGES = CSWxcbproto CSWpyxcbproto -CATALOGNAME_CSWx11xcbproto = x11_xcbproto -CATALOGNAME_CSWpyx11xcbproto = py_x11xcbproto +CATALOGNAME_CSWxcbproto = xcbproto +CATALOGNAME_CSWpyxcbproto = py_xcbproto BUILD_DEP_PKGS = CSWpython RUNTIME_DEP_PKGS_CSWxcbproto = CSWx11common -RUNTIME_DEP_PKGS_CSWpyxcbproto = CSWx11xcbproto CSWpython +RUNTIME_DEP_PKGS_CSWpyxcbproto = CSWxcbproto CSWpython -SPKG_DESC_CSWx11xcbproto = XCB protocol descriptions (in XML) -SPKG_DESC_CSWpyx11xcbproto = XCB protocol descriptions (in XML) Python Bindings +SPKG_DESC_CSWxcbproto = XCB protocol descriptions (in XML) +SPKG_DESC_CSWpyxcbproto = XCB protocol descriptions (in XML) Python Bindings # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -54,6 +54,6 @@ PYCOMPILE = 1 -PKGFILES_CSWpyx11xcbproto = .*\.py +PKGFILES_CSWpyxcbproto = .*\.py include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Mar 3 01:36:54 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 03 Mar 2010 00:36:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8948] csw/mgar/pkg/lsof/trunk Message-ID: Revision: 8948 http://gar.svn.sourceforge.net/gar/?rev=8948&view=rev Author: hson Date: 2010-03-03 00:36:54 +0000 (Wed, 03 Mar 2010) Log Message: ----------- lsof: Update to 4.83, fix packaging Modified Paths: -------------- csw/mgar/pkg/lsof/trunk/Makefile csw/mgar/pkg/lsof/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lsof/trunk/files/lsof-license Removed Paths: ------------- csw/mgar/pkg/lsof/trunk/files/CSWlsof.gspec Modified: csw/mgar/pkg/lsof/trunk/Makefile =================================================================== --- csw/mgar/pkg/lsof/trunk/Makefile 2010-03-02 21:54:10 UTC (rev 8947) +++ csw/mgar/pkg/lsof/trunk/Makefile 2010-03-03 00:36:54 UTC (rev 8948) @@ -1,5 +1,5 @@ GARNAME = lsof -GARVERSION = 4.81 +GARVERSION = 4.83 CATEGORIES = utils DESCRIPTION = List open files @@ -14,6 +14,7 @@ TOPDIST = $(GARNAME)_$(GARVERSION) SRCDIST = $(TOPDIST)_src DISTFILES = $(TOPDIST).tar.bz2 +DISTFILES += lsof-license WORKSRC = $(WORKDIR)/$(TOPDIST)/$(SRCDIST) SPKG_SOURCEURL = http://people.freebsd.org/~abe/ @@ -21,6 +22,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.bz2 +LICENSE = lsof-license + BUILD64 = 1 CONFIGURE_SCRIPTS = custom @@ -43,27 +46,37 @@ # SOLARIS_VXFSLIB This environment variable defines the path to the CONFIGURE_EXPORTS = LSOF_CFGF SOLARIS_CCDIR SOLARIS_INSTR SOLARIS_KERNBITS -SOLARIS_CCDIR = $(CC_HOME) +SOLARIS_CCDIR = $(CC_HOME)/bin SOLARIS_INSTR = $(ISA) SOLARIS_KERNBITS = $(MEMORYMODEL) +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 + include gar/category.mk +INSTALLISADIR ?= $(WORKROOTDIR)/install-$(MODULATION) + post-extract-modulated: @echo " ==> Extracting source distribution" - @( cd $(WORKDIR)/$(TOPDIST) ; tar xf $(SRCDIST).tar ) + $(if $(filter-out global,$(MODULATION)),( cd $(WORKDIR)/$(TOPDIST) ; tar xf $(SRCDIST).tar )) + $(MAKECOOKIE) configure-custom: @echo " ==> Configuring in $(WORKSRC)" ( cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) ) + $(MAKECOOKIE) -test-custom-modulated: +test-custom: @echo " ==> Testing in $(WORKSRC)/tests" - @$(MAKE) -C $(WORKSRC)/tests + @$(MAKE) -C $(WORKSRC)/tests all opt + $(MAKECOOKIE) -install-custom-modulated: - @echo " ==> Installing $(GARNAME) $(GARVERSION)" +install-custom: + @echo " ==> Installing $(GARNAME) $(GARVERSION) for $(MODULATION)" + echo DESTDIR: $(DESTDIR) @( cd $(WORKSRC) ; \ - install -m 2755 -g sys lsof $(DESTDIR)$(bindir) ; \ - install -d $(DESTDIR)$(mandir)/man8 ; \ - install -m 444 lsof.8 $(DESTDIR)$(mandir)/man8 ) + ginstall -d $(DESTDIR)$(bindir) ; \ + ginstall -m 2755 -g sys lsof $(DESTDIR)$(bindir) ; \ + ginstall -d $(DESTDIR)$(mandir)/man8 ; \ + ginstall -m 444 lsof.8 $(DESTDIR)$(mandir)/man8 ) + $(MAKECOOKIE) Modified: csw/mgar/pkg/lsof/trunk/checksums =================================================================== --- csw/mgar/pkg/lsof/trunk/checksums 2010-03-02 21:54:10 UTC (rev 8947) +++ csw/mgar/pkg/lsof/trunk/checksums 2010-03-03 00:36:54 UTC (rev 8948) @@ -1 +1,2 @@ -c482bda0764a8e618f87682347b22a87 download/lsof_4.81.tar.bz2 +a42fe89c6b596930d79cc119928b6176 lsof-license +8f731a6251b8c0143d585df0d5ca779e lsof_4.83.tar.bz2 Deleted: csw/mgar/pkg/lsof/trunk/files/CSWlsof.gspec =================================================================== --- csw/mgar/pkg/lsof/trunk/files/CSWlsof.gspec 2010-03-02 21:54:10 UTC (rev 8947) +++ csw/mgar/pkg/lsof/trunk/files/CSWlsof.gspec 2010-03-03 00:36:54 UTC (rev 8948) @@ -1,4 +0,0 @@ -%var bitname lsof -%var pkgname CSWlsof -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Added: csw/mgar/pkg/lsof/trunk/files/lsof-license =================================================================== --- csw/mgar/pkg/lsof/trunk/files/lsof-license (rev 0) +++ csw/mgar/pkg/lsof/trunk/files/lsof-license 2010-03-03 00:36:54 UTC (rev 8948) @@ -0,0 +1,25 @@ +/* + * Copyright 1994 Purdue Research Foundation, West Lafayette, Indiana + * 47907. All rights reserved. + * + * Written by Victor A. Abell + * + * This software is not subject to any license of the American Telephone + * and Telegraph Company or the Regents of the University of California. + * + * Permission is granted to anyone to use this software for any purpose on + * any computer system, and to alter it and redistribute it freely, subject + * to the following restrictions: + * + * 1. Neither the authors nor Purdue University are responsible for any + * consequences of the use of this software. + * + * 2. The origin of this software must not be misrepresented, either by + * explicit claim or by omission. Credit to the authors and Purdue + * University must appear in documentation and sources. + * + * 3. Altered versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * + * 4. This notice may not be removed or altered. + */ Property changes on: csw/mgar/pkg/lsof/trunk/files/lsof-license ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 3 08:48:07 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 03 Mar 2010 07:48:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[8949] csw/mgar/pkg Message-ID: Revision: 8949 http://gar.svn.sourceforge.net/gar/?rev=8949&view=rev Author: wahwah Date: 2010-03-03 07:48:06 +0000 (Wed, 03 Mar 2010) Log Message: ----------- python-gflags: Initial commit Modified Paths: -------------- csw/mgar/pkg/python-gflags/trunk/Makefile csw/mgar/pkg/python-gflags/trunk/checksums Added Paths: ----------- csw/mgar/pkg/python-gflags/ Modified: csw/mgar/pkg/python-gflags/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/python-gflags/trunk/Makefile 2010-03-03 07:48:06 UTC (rev 8949) @@ -2,184 +2,24 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = python-gflags +GARVERSION = 1.3 +CATEGORIES = python +DESCRIPTION = python equivalent of google-gflags, a Google commandline flag implementation define BLURB - + This project is the python equivalent of google-gflags, a Google commandline + flag implementation for C++. It is intended to be used in situations where a + project wants to mimic the command-line flag handling of a C++ app that uses + google-gflags, or for a Python app that, via swig or some other means, is + linked with a C++ app that uses google-gflags. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release +SPKG_SOURCEURL = http://code.google.com/p/python-gflags/ +MASTER_SITES = $(GOOGLE_MIRROR) +DISTNAME = $(GARNAME)-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +PACKAGES = CSWpy-gflags +CATALOGNAME = py_gflags +TEST_TARGET = check +ARCHALL_CSWpy-gflags = 1 +include gar/category.mk Modified: csw/mgar/pkg/python-gflags/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/python-gflags/trunk/checksums 2010-03-03 07:48:06 UTC (rev 8949) @@ -0,0 +1 @@ +791a93cfbcea94e35576865c9c1e8ee3 python-gflags-1.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 3 09:31:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 03 Mar 2010 08:31:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8950] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 8950 http://gar.svn.sourceforge.net/gar/?rev=8950&view=rev Author: wahwah Date: 2010-03-03 08:31:12 +0000 (Wed, 03 Mar 2010) Log Message: ----------- mysql-5.0.x: Version bump up to 5.0.90 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-03-03 07:48:06 UTC (rev 8949) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-03-03 08:31:12 UTC (rev 8950) @@ -5,7 +5,7 @@ PROJ_NAME = mysql GARNAME = $(PROJ_NAME)5 BASE_VERSION = 5.0 -PATCHLEVEL = 87 +PATCHLEVEL = 90 GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server @@ -60,8 +60,8 @@ CATALOGNAME_CSW$(GARNAME)test = $(GARNAME)test -ARCHALL_CSWmysql5bench = 1 -ARCHALL_CSWmysql5test = 1 +ARCHALL_CSW$(GARNAME)bench = 1 +ARCHALL_CSW$(GARNAME)test = 1 # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-03-03 07:48:06 UTC (rev 8949) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-03-03 08:31:12 UTC (rev 8950) @@ -8,5 +8,5 @@ e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW aaca748fc044834e71ad544ab293c494 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup -65e6229cc98b6a8d4c5206d7fe16c7be mysql-5.0.87.tar.gz +6d325f2b4a60539699558bc5e4452388 mysql-5.0.90.tar.gz 0d083f6dab0bc083fd302ef1375e3d59 quick_start-csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Mar 3 16:36:20 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 03 Mar 2010 15:36:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8951] csw/mgar/pkg/rrdtool/branches/benny Message-ID: Revision: 8951 http://gar.svn.sourceforge.net/gar/?rev=8951&view=rev Author: bensons Date: 2010-03-03 15:36:19 +0000 (Wed, 03 Mar 2010) Log Message: ----------- rrdtool: fixed build, activate 64bit Modified Paths: -------------- csw/mgar/pkg/rrdtool/branches/benny/Makefile csw/mgar/pkg/rrdtool/branches/benny/files/patch-64-bindings-Makefile.in Modified: csw/mgar/pkg/rrdtool/branches/benny/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-03 08:31:12 UTC (rev 8950) +++ csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-03 15:36:19 UTC (rev 8951) @@ -18,15 +18,10 @@ PACKAGES = CSWrrd CATALOGNAME = rrdtool -#GARCOMPILER = SOS12 -#GARCOMPILER = GCC4 -#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 - -RUNTIME_DEP_PKGS = CSWggettextrt +RUNTIME_DEP_PKGS += CSWggettextrt RUNTIME_DEP_PKGS += CSWglib2 RUNTIME_DEP_PKGS += CSWiconv RUNTIME_DEP_PKGS += CSWlibcairo -# RUNTIME_DEP_PKGS += CSWlibxml2 RUNTIME_DEP_PKGS += CSWpango RUNTIME_DEP_PKGS += CSWpng RUNTIME_DEP_PKGS += CSWsunmath @@ -34,8 +29,20 @@ RUNTIME_DEP_PKGS += CSWperl RUNTIME_DEP_PKGS += CSWruby RUNTIME_DEP_PKGS += CSWpython +RUNTIME_DEP_PKGS += CSWlibxml2 -# BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) CSWlua +BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) +BUILD_DEP_PKGS += CSWlibpthreadstubs +BUILD_DEP_PKGS += CSWlibxaudevel +BUILD_DEP_PKGS += CSWlibxcbdevel +BUILD_DEP_PKGS += CSWpangodevel +BUILD_DEP_PKGS += CSWlibcairodevel +BUILD_DEP_PKGS += CSWglib2devel +BUILD_DEP_PKGS += CSWxproto +BUILD_DEP_PKGS += CSWlibxrenderdevel +BUILD_DEP_PKGS += CSWrenderproto +BUILD_DEP_PKGS += CSWkbproto +BUILD_DEP_PKGS += CSWpython-devel EXTRA_INC = $(prefix)/include/cairo EXTRA_INC += $(prefix)/include/libxml2 @@ -49,7 +56,7 @@ EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) CONFIGURE_ARS = $(DIRPATHS) -CONFIGURE_ARGS += --with-docdir=$(sharedstatedir)/doc/$(GARNAME) +CONFIGURE_ARGS += --docdir=$(sharedstatedir)/doc/$(GARNAME) CONFIGURE_ARGS += --disable-lua CONFIGURE_ARGS += --enable-python CONFIGURE_ARGS += --enable-ruby @@ -69,7 +76,8 @@ PATCHFILES += patch-bindings-Makefile.in PATCHFILES += patch-bindings-ruby-extconf.rb -# BUILD64 = 1 +BUILD64 = 1 +#NOISAEXEC = 1 STRIP_LIBTOOL = 1 @@ -85,17 +93,14 @@ cp $(FILEDIR)/s_round.h $(WORKSRC)/src @$(MAKECOOKIE) -pre-build-isa-amd64: +post-patch-isa-amd64: @# since our perl is 32bit, we need to patch away the module build gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-Makefile.in gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-bindings-Makefile.in @$(MAKECOOKIE) -pre-build-isa-sparcv9: +post-patch-isa-sparcv9: @# since our perl is 32bit, we need to patch away the module build gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-Makefile.in gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-bindings-Makefile.in @$(MAKECOOKIE) - -env: - @echo "PKG_CONFIG_PATH: $(PKG_CONFIG_PATH)" Modified: csw/mgar/pkg/rrdtool/branches/benny/files/patch-64-bindings-Makefile.in =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/patch-64-bindings-Makefile.in 2010-03-03 08:31:12 UTC (rev 8950) +++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-64-bindings-Makefile.in 2010-03-03 15:36:19 UTC (rev 8951) @@ -37,7 +37,7 @@ # add the following to the all target -all-local: @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@ -+all-local: @COMP_RUBY@ @COMP_PYTHON@ ++all-local: @COMP_RUBY@ install-data-local: $(AM_V_GEN)test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Mar 3 17:37:27 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 03 Mar 2010 16:37:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8952] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 8952 http://gar.svn.sourceforge.net/gar/?rev=8952&view=rev Author: bonivart Date: 2010-03-03 16:37:27 +0000 (Wed, 03 Mar 2010) Log Message: ----------- pkgutil: prepare for 1.10 beta 1 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/pkgutil/trunk/files/cswcatalog Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2010-03-03 15:36:19 UTC (rev 8951) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2010-03-03 16:37:27 UTC (rev 8952) @@ -1,6 +1,5 @@ GARNAME = pkgutil -#GARVERSION = 1.10b1 -GARVERSION = 1.9.1 +GARVERSION = 1.10b1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -19,6 +18,7 @@ DISTFILES += $(call admfiles,CSWpkgutil,prototype preremove postinstall) DISTFILES += build_sun_catalog.py DISTFILES += opencsw.py +DISTFILES += cswcatalog PACKAGES = CSWpkgutil CSWpkgutilplus @@ -32,8 +32,9 @@ PKGFILES_CSWpkgutilplus = .*bldcat.* PKGFILES_CSWpkgutilplus += .*chkcat.* PKGFILES_CSWpkgutilplus += .*pkgutilplus.* -PKGFILES_CSWpkgutilplus += .*build_sun_catalog.* -PKGFILES_CSWpkgutilplus += .*opencsw.py.* +PKGFILES_CSWpkgutilplus += .*build_sun_catalog +PKGFILES_CSWpkgutilplus += .*opencsw.py +PKGFILES_CSWpkgutilplus += .*cswcatalog ARCHALL_CSWpkgutilplus = 1 @@ -58,6 +59,7 @@ @ginstall -m 755 $(WORKSRC)/pkgutillog $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d/01-CSW$(GARNAME)plus-log @ginstall -m 755 -d $(DESTDIR)$(bindir) @ginstall -m 755 $(WORKSRC)/$(GARNAME) $(WORKSRC)/bldcat $(WORKSRC)/chkcat $(DESTDIR)$(bindir) + @ginstall -m 755 $(FILEDIR)/cswcatalog $(DESTDIR)$(bindir) @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc @ginstall -m 644 $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/opt/csw/etc/$(GARNAME).conf.CSW @ginstall -m 755 -d $(DESTDIR)/opt/csw/libexec/$(GARNAME) Added: csw/mgar/pkg/pkgutil/trunk/files/cswcatalog =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/cswcatalog (rev 0) +++ csw/mgar/pkg/pkgutil/trunk/files/cswcatalog 2010-03-03 16:37:27 UTC (rev 8952) @@ -0,0 +1,274 @@ +#!/opt/csw/bin/perl -w + +# This script takes the packages from a source directory containing packages +# and builds a target directory suitable for pkg-get/pkgutil. +# If the target directory already exists the contents is synced to match the +# source packages. It is possible to make the new catalog an overlay over an +# existing catalog. In this case symlinks are used to reference the packages. +# +# cswcatalog --basedir /export/mirror/opencsw/current \ +# --pkgdir /export/home/experimental/perl \ +# --repodir /export/mirror/opencsw/experimental/perl +# +# Known issues/limitations: +# * Only the most recent version of a package will go it into the catalog +# * To build the catalog, bldcat extracts the packages which takes long, +# could possibly be sped up by only gzcat'ing (in bldcat) + +# 1. Read catalog with new packages to overlay +# 2. Read catalog of base directory +# 3. Read output directory + +use strict; +use Data::Dumper; +use POSIX qw( strftime ); +use Getopt::Long; +use File::Basename; +use File::Spec; + +my @architectures = qw( i386 sparc ); +my @osversions = qw( 5.8 5.9 5.10 5.11 ); +my $pkg_lastmod = 0; # Modification time of most recent package +my %p; # Nested data structure for pkg information + +my $opt_basedir; +my $opt_pkgdir; +my $opt_repodir; +my $opt_help; +my $opt_verbose; +my $opt_noaction; +my $opt_relative; + + +sub get_filelist { + my $dir = shift; + opendir T, $dir || die "ERROR: Cannot open directory $dir\n"; + my @files = grep { !/^\.\.?$/ } readdir T; + closedir T; + return @files; +} + +sub is_pkgfile { + my $f = shift; + return 1 if $f =~ /\.pkg(\.gz)?$/; + return 0; +} + +sub sanity_checks { + die "ERROR: /opt/csw/bin/bldcat not found. Please install pkgutilplus.\n" + unless (-x "/opt/csw/bin/bldcat"); + die "ERROR: $opt_pkgdir doesn't exist\n" unless (-d $opt_pkgdir); +} + +sub usage { + my $name = basename($0); + print < ] [-n] -d -o + + -d|--pkgdir Specifies the directory with CSW packages (source) + -o|--repodir Specifies the directory for the repository (target) + -b|--basedir If the source directory only contains a subset of pkgs, + basedir can be an existing repository fromw which additional + packages, usually dependencies, will be pulled in (optional) + -n|--noaction Dry-run, no symlinks, no bldcat invocation + --relative Create relative symlinks (default: absolute symlinks) +EOM + exit; +} + + +### Main ### + +my $result = GetOptions( + "b|basedir=s" => \$opt_basedir, + "d|pkgdir:s" => \$opt_pkgdir, + "o|repodir:s" => \$opt_repodir, + "verbose" => \$opt_verbose, + "noaction" => \$opt_noaction, + "help" => \$opt_help, + "relative" => \$opt_relative, + ); +usage if $opt_help; +usage if !$opt_repodir || !$opt_pkgdir; + +$opt_basedir = File::Spec->rel2abs($opt_basedir) if $opt_basedir; +$opt_pkgdir = File::Spec->rel2abs($opt_pkgdir) if $opt_pkgdir; +$opt_repodir = File::Spec->rel2abs($opt_repodir) if $opt_repodir; + +sanity_checks; + + +# Read information from package file names and store this data in %p for later +# rubytk-1.8.7,REV=2008.09.19_p72-SunOS5.8-sparc-CSW.pkg.gz +print "Processing packages from $opt_pkgdir\n"; +my @pkgs = grep { is_pkgfile $_ } get_filelist("$opt_pkgdir"); +foreach my $pkg (@pkgs) { + my ($cname,$vers,$os,$arch) = ($pkg =~ /^([^-]+)-([^-]+)-SunOS([^-]+)-([^-]+)-CSW\./); + + if( !defined $cname || !defined $vers ) { + print "- Ignoring $pkg\n"; + next; + } + + print "- Processing $opt_pkgdir/$pkg\n" if ($opt_verbose); + + #my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) + my $mtime = (stat( "$opt_pkgdir/$pkg" ))[9]; + $pkg_lastmod = $mtime if( $mtime > $pkg_lastmod ); + + # ? When you encounter a catalogname for the second time and then skip it, + # how exactly do you know that it's older than the previous package? + if( $arch eq "all" ) { + if( exists $p{sparc}->{$os}->{$cname} ) { + print "- Skipping $pkg as there is already a newer version\n"; + next; + } + $p{sparc}->{$os}->{$cname} = "$opt_pkgdir/$pkg"; + + if( exists $p{i386}->{$os}->{$cname} ) { + print "- Skipping $pkg as there is already a newer version\n"; + next; + } + $p{i386}->{$os}->{$cname} = "$opt_pkgdir/$pkg"; + } else { + if( exists $p{$arch}->{$os}->{$cname} ) { + print "- Skipping $pkg as there is already a newer version\n"; + next; + } + $p{$arch}->{$os}->{$cname} = "$opt_pkgdir/$pkg"; + } + +} + + +# Packages usually only exists for a base OS release (say 5.8) and are then +# also used on newer OS releases. Populate package data upwards if required. +foreach my $arch (@architectures) { + for (0 .. ($#osversions - 1)) { + my $osver = $osversions[$_]; + foreach my $c (keys %{$p{$arch}->{$osver}}) { + $p{$arch}->{$osversions[$_+1]}->{$c} ||= + $p{$arch}->{$osversions[$_]}->{$c}; + } + } +} + + +# Also read in packages from a base repository (usually current). Packages +# from the overlay directory take precendence. +if( $opt_basedir) { + print "Processing packages from $opt_basedir\n"; + foreach my $a (@architectures) { + foreach my $v (@osversions) { + my @pkgs = grep { is_pkgfile $_ } get_filelist("$opt_basedir/$a/$v"); + foreach my $pkg (@pkgs) { + + print "- VERBOSE: Processing $opt_basedir/$pkg\n" if ($opt_verbose); + # rubytk-1.8.7,REV=2008.09.19_p72-SunOS5.8-sparc-CSW.pkg.gz + my ($cname,$vers,$os,$arch) = ($pkg =~ /^([^-]+)-([^-]+)-SunOS([^-]+)-([^-]+)-CSW\./); + if( !defined $cname || !defined $vers ) { + print "- Ignoring $pkg\n"; + next; + } + + # XXX: Strip files with length == 0 fro overlay out of current/. + + if( exists $p{$a}->{$v}->{$cname} ) { + print "- Skipping $pkg from base as it is overwritten\n"; + next; + } + $p{$a}->{$v}->{$cname} = "$opt_basedir/$a/$v/$pkg"; + } + } + } +} + +print "\nPre-processing done. Starting to build repository structure at $opt_repodir\n"; +foreach my $a (@architectures) { + foreach my $v (@osversions) { + my %base; + + my $d = $opt_repodir; + my $changed = 0; + + print "\nBuilding catalog for $d/$a/$v\n"; + + mkdir( "$d" ) if( ! -d "$d" ); + mkdir( "$d/$a" ) if( ! -d "$d/$a" ); + mkdir( "$d/$a/$v" ) if( ! -d "$d/$a/$v" ); + + # When building the catalog and description files for the first time, use + # the base catalog and description to speed things up. bldcat will + # re-use such existing catalog information. + if ($opt_basedir && !$opt_noaction) { + if( ! -f "$d/$a/$v/catalog" && -f "$opt_basedir/$a/$v/catalog" ) { + system( "cp $opt_basedir/$a/$v/catalog $d/$a/$v/catalog" ); + } + delete $base{catalog}; + if( ! -f "$d/$a/$v/descriptions" && -f "$opt_basedir/$a/$v/descriptions" ) { + system( "cp $opt_basedir/$a/$v/descriptions $d/$a/$v/descriptions" ); + } + delete $base{descriptions}; + } + + # Index all files that should be in there by pkgname + my %basefiles; + foreach my $c (keys %{$p{$a}->{$v}}) { + my $pkg = $p{$a}->{$v}->{$c}; + $basefiles{$pkg} = $c; + } + + # Housekeeping, delete dangling links pointing to vanished packages + my @f = get_filelist("$d/$a/$v"); + foreach my $f (sort @f) { + next if( $f eq "descriptions" || $f eq "catalog" ); + if( ! -r "$d/$a/$v/$f" ) { + print "- Deleting $d/$a/$v/$f because the link can not be read.\n"; + unlink( "$d/$a/$v/$f" ) unless ($opt_noaction); + $changed = 1; + next; + } + my $dest = (-l "$d/$a/$v/$f" && readlink "$d/$a/$v/$f") || "$d/$a/$v/$f"; + if( !exists $basefiles{$dest} ) { + print "- Deleting $d/$a/$v/$f because it was not in the basedirectory.\n"; + unlink( "$d/$a/$v/$f" ) unless ($opt_noaction); + $changed = 1; + next; + } + } + + # Populate repository with symlinks to each pkg (unless already in place) + foreach my $c (sort keys %{$p{$a}->{$v}}) { + my $pkg = $p{$a}->{$v}->{$c}; + my $pfile = basename($pkg); + if( -e "$d/$a/$v/$pfile" ) { + print "- Keeping $pfile\n" if ($opt_verbose); + next; + } + print "- Linking $pkg to $d/$a/$v/$pfile\n"; + + # If the --relative option is given we create relative pkg symlinks + unless ($opt_noaction) { + my $linkdest = $pkg; + if ($opt_relative) { + $linkdest = File::Spec->abs2rel("$pkg", "$d/$a/$v"); + } + symlink "$linkdest", "$d/$a/$v/$pfile"; + } + $changed = 1; + } + + my $catalog_lastmod = (stat( "$d/$a/$v/catalog" ))[9]; + if( $changed || !$catalog_lastmod || $pkg_lastmod > $catalog_lastmod ) { + print "- Packages changed, rebuilding catalog.\n"; + unless($opt_noaction) { + system( "cd $d/$a/$v && /opt/csw/bin/bldcat . | sed -e 's/^/- /" ); + system( "rm -rf /tmp/bldcat.*" ); + } + } else { + print "- No packages changed, skipping catalog rebuild.\n"; + } + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 3 20:09:52 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 03 Mar 2010 19:09:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8953] csw/mgar/pkg/rox-filer/trunk Message-ID: Revision: 8953 http://gar.svn.sourceforge.net/gar/?rev=8953&view=rev Author: wahwah Date: 2010-03-03 19:09:47 +0000 (Wed, 03 Mar 2010) Log Message: ----------- rox-filer: Update to 2.10, plus a fix for http://www.opencsw.org/mantis/view.php?id=4187 Modified Paths: -------------- csw/mgar/pkg/rox-filer/trunk/Makefile csw/mgar/pkg/rox-filer/trunk/checksums csw/mgar/pkg/rox-filer/trunk/files/rox-filer Modified: csw/mgar/pkg/rox-filer/trunk/Makefile =================================================================== --- csw/mgar/pkg/rox-filer/trunk/Makefile 2010-03-03 16:37:27 UTC (rev 8952) +++ csw/mgar/pkg/rox-filer/trunk/Makefile 2010-03-03 19:09:47 UTC (rev 8953) @@ -6,7 +6,7 @@ # set icon directories. GARNAME = rox-filer -GARVERSION = 2.9 +GARVERSION = 2.10 CATEGORIES = apps DESCRIPTION = A lightweight X file manager define BLURB Modified: csw/mgar/pkg/rox-filer/trunk/checksums =================================================================== --- csw/mgar/pkg/rox-filer/trunk/checksums 2010-03-03 16:37:27 UTC (rev 8952) +++ csw/mgar/pkg/rox-filer/trunk/checksums 2010-03-03 19:09:47 UTC (rev 8953) @@ -1 +1 @@ -d514b409e074ad77488aa7b44372aad1 download/rox-filer-2.9.tar.bz2 +28e8494c9af783258ff86c830f8f0062 rox-filer-2.10.tar.bz2 Modified: csw/mgar/pkg/rox-filer/trunk/files/rox-filer =================================================================== --- csw/mgar/pkg/rox-filer/trunk/files/rox-filer 2010-03-03 16:37:27 UTC (rev 8952) +++ csw/mgar/pkg/rox-filer/trunk/files/rox-filer 2010-03-03 19:09:47 UTC (rev 8953) @@ -1,4 +1,4 @@ #!/opt/csw/bin/bash export APP_DIR="/opt/csw/share/ROX" -exec /opt/csw/libexec/ROX-Filer +exec /opt/csw/libexec/ROX-Filer "$@" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 3 20:31:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 03 Mar 2010 19:31:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8954] csw/mgar/pkg/rox-filer/trunk/Makefile Message-ID: Revision: 8954 http://gar.svn.sourceforge.net/gar/?rev=8954&view=rev Author: wahwah Date: 2010-03-03 19:31:31 +0000 (Wed, 03 Mar 2010) Log Message: ----------- rox-filer: Adding license, removing unnecessary dependencies. Modified Paths: -------------- csw/mgar/pkg/rox-filer/trunk/Makefile Modified: csw/mgar/pkg/rox-filer/trunk/Makefile =================================================================== --- csw/mgar/pkg/rox-filer/trunk/Makefile 2010-03-03 19:09:47 UTC (rev 8953) +++ csw/mgar/pkg/rox-filer/trunk/Makefile 2010-03-03 19:31:31 UTC (rev 8954) @@ -16,11 +16,19 @@ SF_PROJ = rox DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -RUNTIME_DEP_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 -RUNTIME_DEP_PKGS += CSWlibatk CSWlibcairo CSWlibglade2 CSWlibxml2 CSWpango -RUNTIME_DEP_PKGS += CSWbash CSWlibice CSWlibsm +RUNTIME_DEP_PKGS_CSWroxfiler = CSWbash +RUNTIME_DEP_PKGS_CSWroxfiler += CSWfconfig +RUNTIME_DEP_PKGS_CSWroxfiler += CSWftype2 +RUNTIME_DEP_PKGS_CSWroxfiler += CSWggettextrt +RUNTIME_DEP_PKGS_CSWroxfiler += CSWglib2 +RUNTIME_DEP_PKGS_CSWroxfiler += CSWgtk2 +RUNTIME_DEP_PKGS_CSWroxfiler += CSWlibatk +RUNTIME_DEP_PKGS_CSWroxfiler += CSWlibcairo +RUNTIME_DEP_PKGS_CSWroxfiler += CSWlibglade2 +RUNTIME_DEP_PKGS_CSWroxfiler += CSWlibgnugetopt +RUNTIME_DEP_PKGS_CSWroxfiler += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWroxfiler += CSWpango - CONFIGURE_SCRIPTS = BUILD_SCRIPTS = rox INSTALL_SCRIPTS = rox @@ -30,6 +38,10 @@ X_EXTRA_LIBS = -lm export X_EXTRA_LIBS +LICENSE = ROX-Filer/Help/COPYING + +include gar/category.mk + build-rox: (cd $(WORKSRC); $(BUILD_ENV) ./ROX-Filer/AppRun --compile) @$(MAKECOOKIE) @@ -51,5 +63,3 @@ gfind $(DESTDIR)$(datadir) -type d -exec chmod 0755 {} \; gfind $(DESTDIR)$(datadir) -type f -exec chmod 0644 {} \; @$(MAKECOOKIE) - -include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 3 20:59:39 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 03 Mar 2010 19:59:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8955] csw/mgar/pkg/google-gflags/trunk/Makefile Message-ID: Revision: 8955 http://gar.svn.sourceforge.net/gar/?rev=8955&view=rev Author: wahwah Date: 2010-03-03 19:59:12 +0000 (Wed, 03 Mar 2010) Log Message: ----------- google-gflags: Setting NOISAEXEC and merging the libraries only. Modified Paths: -------------- csw/mgar/pkg/google-gflags/trunk/Makefile Modified: csw/mgar/pkg/google-gflags/trunk/Makefile =================================================================== --- csw/mgar/pkg/google-gflags/trunk/Makefile 2010-03-03 19:31:31 UTC (rev 8954) +++ csw/mgar/pkg/google-gflags/trunk/Makefile 2010-03-03 19:59:12 UTC (rev 8955) @@ -20,4 +20,7 @@ TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 1 +MERGE_DIRS_isa-sparcv9 = $(libdir) +MERGE_DIRS_isa-amd64 = $(libdir) +NOISAEXEC = 1 include gar/category.mk 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 Mar 3 22:03:03 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 03 Mar 2010 21:03:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8956] csw/mgar/pkg/cswclassutils/branches/ cswclassutils-usergroup-idrange/files/CSWcswclassutils.i.cswusergroup Message-ID: Revision: 8956 http://gar.svn.sourceforge.net/gar/?rev=8956&view=rev Author: skayser Date: 2010-03-03 21:02:49 +0000 (Wed, 03 Mar 2010) Log Message: ----------- i.cswusergroup (branch): finalizing fixes Modified Paths: -------------- csw/mgar/pkg/cswclassutils/branches/cswclassutils-usergroup-idrange/files/CSWcswclassutils.i.cswusergroup Modified: csw/mgar/pkg/cswclassutils/branches/cswclassutils-usergroup-idrange/files/CSWcswclassutils.i.cswusergroup =================================================================== --- csw/mgar/pkg/cswclassutils/branches/cswclassutils-usergroup-idrange/files/CSWcswclassutils.i.cswusergroup 2010-03-03 19:59:12 UTC (rev 8955) +++ csw/mgar/pkg/cswclassutils/branches/cswclassutils-usergroup-idrange/files/CSWcswclassutils.i.cswusergroup 2010-03-03 21:02:49 UTC (rev 8956) @@ -10,16 +10,23 @@ # # Documentation: http://wiki.opencsw.org/cswclassutils-package # -# TODO +# Known issues: # ! calls to useradd, groupadd, and getent are not PKG_INSTALL_ROOT aware, -# but CAS via -R might be flawed anyway, needs inspection eventually. -# ! path to /etc/shadow in set_user_nologin() are not PKG_ISNTALL_ROOT aware -# ! on failure to determine UID/GID it might be more robust to not exit_error -# but instead only display a warning +# but CAS via -R are flawed anyway. See: +# http://wiki.opencsw.org/cswclassutils-package#toc5 +# ! path to /etc/shadow in set_user_nologin() are not PKG_INSTALL_ROOT aware # -DEBUG=${DEBUG:-} # set via environment to enable debugging +# Safety measure during coding, bail out on access of unset variables +set -u +# Set DEBUG to anything via environment to display debugging messages +DEBUG=${DEBUG:-} + +# Avoid unset errors for variables which are usually unset during CLI tests +PKGINST=${PKGINST:-} +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-} + UID_MIN_DEFAULT=100 UID_MAX_DEFAULT=999 GID_MIN_DEFAULT=100 @@ -57,12 +64,20 @@ exit 1 } +debug_echo() { + [ -n "$DEBUG" ] && echo "DEBUG: $*" >&2 +} + is_numeric() { - case "$1" in *[^0-9]*) return 1;; esac + case "$1" in *[!0-9]*) return 1;; esac [ -z "$1" ] && return 1 return 0 } +# Return the first available UID where UID_MIN <= UID <= UID_MAX. +# Return -1 if no UID is available. Done in two steps: +# 1) One getent call -> store all occupied UIDs from the target range +# 2) Iterate over the target range, return the first non-taken UID first_avail_uid() { for uid in `/usr/bin/getent passwd | cut -d: -f3 | sort -n` do @@ -80,6 +95,7 @@ echo -1 } +# Same as first_avail_uid (see above) just for GIDs. first_avail_gid() { for gid in `/usr/bin/getent group | cut -d: -f3 | sort -n` do @@ -97,8 +113,8 @@ echo -1 } -# Validate ID range settings, ref. useradd(1m) and groupadd(1m) for sys limit -# Currently defined by MAXUID in /usr/include/sys/param.h -> 2147483647 +# Validate ID range configuration, ref. useradd(1m) and groupadd(1m) for sys +# limit, currently defined by MAXUID in /usr/include/sys/param.h -> 2147483647 is_numeric $UID_MIN || exit_error "$UID_MIN_CFGNAME is non-numeric ($UID_MIN)" is_numeric $UID_MAX || exit_error "$UID_MAX_CFGNAME is non-numeric ($UID_MAX)" @@ -126,10 +142,6 @@ $GID_MIN_CFGNAME must be < $GID_MAX_CFGNAME " -if [ "$DEBUG" ]; then - echo PACKAGE: $PKGINST -fi - create_group() { group="$1" @@ -140,10 +152,10 @@ fi gid=`first_avail_gid` - if [ "$gid" == "-1" ]; then - exit_error "Failed to determine GID for group $group" - fi + [ "$gid" = "-1" ] && exit_error "Failed to determine GID for group $group" + is_numeric "$gid" || exit_error "Failed to determine GID for group $group" + debug_echo "/usr/sbin/groupadd -g $gid $group" if /usr/sbin/groupadd -g $gid $group > /dev/null; then echo Group $group has been added else @@ -159,18 +171,25 @@ shell="$5" create="$6" - if /bin/getent passwd $user > /dev/null; then + if getent passwd $user > /dev/null; then echo User $user already exists return fi + uid=`first_avail_uid` + [ "$uid" = "-1" ] && exit_error "Failed to determine UID for user $user" + is_numeric "$uid" || exit_error "Failed to determine UID for user $user" + [ -n "$group" ] && group="-g $group" [ -n "$gcos" ] && gcos="-c $gcos" [ -n "$dir" ] && dir="-d $dir" [ -n "$shell" ] && shell="-s $shell" [ -n "$create" ] && create="-m" - if /usr/sbin/useradd $gcos $group $create $dir $shell $user > /dev/null; then + debug_echo "/usr/sbin/useradd -g $uid $gcos $group $create $dir $shell $user" + if /usr/sbin/useradd \ + -u $uid $gcos $group $create $dir $shell $user > /dev/null + then echo User $user has been added else exit_error "Failed to add user $user" @@ -209,13 +228,13 @@ esac } +debug_echo "PACKAGE: $PKGINST" + # Copy files echo "Installing class ..." while read src dest; do - if [ "$DEBUG" ]; then - echo SRC: $src DEST: $dest - fi + debug_echo "SRC: $src DEST: $dest" # Copy the conf-file /usr/bin/cp $src $dest || exit 2 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 Mar 3 22:41:41 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 03 Mar 2010 21:41:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8957] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswusergroup Message-ID: Revision: 8957 http://gar.svn.sourceforge.net/gar/?rev=8957&view=rev Author: skayser Date: 2010-03-03 21:41:32 +0000 (Wed, 03 Mar 2010) Log Message: ----------- i.cswusergroup: added configurable UID/GID range via csw.conf Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup Property Changed: ---------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup 2010-03-03 21:02:49 UTC (rev 8956) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup 2010-03-03 21:41:32 UTC (rev 8957) @@ -9,25 +9,238 @@ # 2009-02-10 First release # # Documentation: http://wiki.opencsw.org/cswclassutils-package +# +# Known issues: +# ! calls to useradd, groupadd, and getent are not PKG_INSTALL_ROOT aware, +# but CAS via -R are flawed anyway. See: +# http://wiki.opencsw.org/cswclassutils-package#toc5 +# ! path to /etc/shadow in set_user_nologin() are not PKG_INSTALL_ROOT aware +# -DEBUG= # clear to disable debug, set to anything to enable +# Safety measure during coding, bail out on access of unset variables +set -u -if [ "$DEBUG" ]; then - echo PACKAGE: $PKGINST +# Set DEBUG to anything via environment to display debugging messages +DEBUG=${DEBUG:-} + +# Avoid unset errors for variables which are usually unset during CLI tests +PKGINST=${PKGINST:-} +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-} + +UID_MIN_DEFAULT=100 +UID_MAX_DEFAULT=999 +GID_MIN_DEFAULT=100 +GID_MAX_DEFAULT=999 + +# Retrieve min/max UID/GID settings from csw.conf. Use usergroup_ variables +# to be naming-consistant with the already existing usergroup_remove variable. +# See http://www.opencsw.org/mantis/view.php?id=3637 +# +# Internally, we use shorter var names which makes it IMHO easier to +# code (particularly WRT to 80 chars width) and read the code, but it's a bit +# of a PITA at the same time. Thoughts? + +if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then + . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf fi +if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then + . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf +fi +UID_MIN_CFGNAME=usergroup_uid_low +UID_MAX_CFGNAME=usergroup_uid_high +GID_MIN_CFGNAME=usergroup_gid_low +GID_MAX_CFGNAME=usergroup_gid_high + +UID_MIN=`eval echo \$\{$UID_MIN_CFGNAME:-$UID_MIN_DEFAULT}` +UID_MAX=`eval echo \$\{$UID_MAX_CFGNAME:-$UID_MAX_DEFAULT}` +GID_MIN=`eval echo \$\{$GID_MIN_CFGNAME:-$GID_MIN_DEFAULT}` +GID_MAX=`eval echo \$\{$GID_MAX_CFGNAME:-$GID_MAX_DEFAULT}` + +# Functions + +exit_error() { + echo "ERROR: $*" >&2 + exit 1 +} + +debug_echo() { + [ -n "$DEBUG" ] && echo "DEBUG: $*" >&2 +} + +is_numeric() { + case "$1" in *[!0-9]*) return 1;; esac + [ -z "$1" ] && return 1 + return 0 +} + +# Return the first available UID where UID_MIN <= UID <= UID_MAX. +# Return -1 if no UID is available. Done in two steps: +# 1) One getent call -> store all occupied UIDs from the target range +# 2) Iterate over the target range, return the first non-taken UID +first_avail_uid() { + for uid in `/usr/bin/getent passwd | cut -d: -f3 | sort -n` + do + [ $uid -lt $UID_MIN ] && continue + [ $uid -gt $UID_MAX ] && break + eval UID_TAKEN_$uid=1 + done + + uid=$UID_MIN + while test $uid -le $UID_MAX + do + [ `eval echo \$\{UID_TAKEN_$uid:-0}` -eq 1 ] || { echo $uid; return; } + uid=`expr $uid + 1` + done + echo -1 +} + +# Same as first_avail_uid (see above) just for GIDs. +first_avail_gid() { + for gid in `/usr/bin/getent group | cut -d: -f3 | sort -n` + do + [ $gid -lt $GID_MIN ] && continue + [ $gid -gt $GID_MAX ] && break + eval GID_TAKEN_$gid=1 + done + + gid=$GID_MIN + while test $gid -le $GID_MAX + do + [ `eval echo \$\{GID_TAKEN_$gid:-0}` -eq 1 ] || { echo $gid; return; } + gid=`expr $gid + 1` + done + echo -1 +} + +# Validate ID range configuration, ref. useradd(1m) and groupadd(1m) for sys +# limit, currently defined by MAXUID in /usr/include/sys/param.h -> 2147483647 + +is_numeric $UID_MIN || exit_error "$UID_MIN_CFGNAME is non-numeric ($UID_MIN)" +is_numeric $UID_MAX || exit_error "$UID_MAX_CFGNAME is non-numeric ($UID_MAX)" +is_numeric $GID_MIN || exit_error "$GID_MIN_CFGNAME is non-numeric ($GID_MIN)" +is_numeric $GID_MAX || exit_error "$GID_MAX_CFGNAME is non-numeric ($GID_MAX)" + +test $UID_MIN -ge 0 \ + -a $UID_MAX -le 2147483647 \ + -a $UID_MIN -lt $UID_MAX \ + -a $GID_MIN -ge 0 \ + -a $GID_MAX -le 2147483647 \ + -a $GID_MIN -lt $GID_MAX || \ + exit_error "usergroup ID range settings are invalid + +Settings are + $UID_MIN_CFGNAME: $UID_MIN + $UID_MAX_CFGNAME: $UID_MAX + $GID_MIN_CFGNAME: $GID_MIN + $GID_MAX_CFGNAME: $GID_MAX + +Constraints are + $UID_MIN_CFGNAME and $GID_MIN_CFGNAME must be >0 + $UID_MAX_CFGNAME and $GID_MAX_CFGNAME must be <2147483647 + $UID_MIN_CFGNAME must be < $UID_MAX_CFGNAME + $GID_MIN_CFGNAME must be < $GID_MAX_CFGNAME +" + +create_group() { + + group="$1" + + if /bin/getent group $group > /dev/null; then + echo Group $group already exists + return + fi + + gid=`first_avail_gid` + [ "$gid" = "-1" ] && exit_error "Failed to determine GID for group $group" + is_numeric "$gid" || exit_error "Failed to determine GID for group $group" + + debug_echo "/usr/sbin/groupadd -g $gid $group" + if /usr/sbin/groupadd -g $gid $group > /dev/null; then + echo Group $group has been added + else + exit_error "Failed to add group $group" + fi +} + +create_user() { + user="$1" + group="$2" + gcos="$3" + dir="$4" + shell="$5" + create="$6" + + if getent passwd $user > /dev/null; then + echo User $user already exists + return + fi + + uid=`first_avail_uid` + [ "$uid" = "-1" ] && exit_error "Failed to determine UID for user $user" + is_numeric "$uid" || exit_error "Failed to determine UID for user $user" + + [ -n "$group" ] && group="-g $group" + [ -n "$gcos" ] && gcos="-c $gcos" + [ -n "$dir" ] && dir="-d $dir" + [ -n "$shell" ] && shell="-s $shell" + [ -n "$create" ] && create="-m" + + debug_echo "/usr/sbin/useradd -g $uid $gcos $group $create $dir $shell $user" + if /usr/sbin/useradd \ + -u $uid $gcos $group $create $dir $shell $user > /dev/null + then + echo User $user has been added + else + exit_error "Failed to add user $user" + fi +} + +set_user_nologin() { + case "`uname -r`" in + 5.8|5.9) + # for old solaris, we munge the shadow file manually. + omask=`umask` + umask 0377 + + awk 'BEGIN { FS=":"; OFS=":" } $1 == "'$user'" { $2 = "NP" } { print }' /etc/shadow > /etc/shadow.$PKGINST + if [ $? -ne 0 ]; then + rm /etc/shadow.$PKGINST + exit_error "Setting NP for '$user' failed." + fi + + if cmp -s /etc/shadow /etc/shadow.$PKGINST; then + rm /etc/shadow.$PKGINST + else + echo "Updating account '$user' to be no-login (NP)" + chgrp sys /etc/shadow.$PKGINST + cp -p /etc/shadow /etc/shadow.CSW && \ + mv /etc/shadow.$PKGINST /etc/shadow + fi + umask $omask + ;; + *) + # for modern solaris, use the built-in tools + if ! passwd -N $user; then + exit_error "Setting NP for '$user' failed." + fi + ;; + esac +} + +debug_echo "PACKAGE: $PKGINST" + # Copy files echo "Installing class ..." while read src dest; do - if [ "$DEBUG" ]; then - echo SRC: $src DEST: $dest - fi + debug_echo "SRC: $src DEST: $dest" # Copy the conf-file /usr/bin/cp $src $dest || exit 2 for i in `cat $dest | sed 's/ /_/g'`; do + user=`echo $i | awk -F':' '{print $1}'` group=`echo $i | awk -F':' '{print $2}'` gcos=`echo $i | awk -F':' '{print $3}'` @@ -35,88 +248,21 @@ shell=`echo $i | awk -F':' '{print $5}'` create=`echo $i | awk -F':' '{print $6}'` nopass=`echo $i | awk -F':' '{print $8}'` + if [ -n "$group" ]; then - /bin/getent group $group > /dev/null - if [ $? -ne 0 ]; then - /usr/sbin/groupadd $group > /dev/null - if [ $? -eq 0 ]; then - echo Group $group has been added - else - echo ERROR: Failed to add group $group - fi - else - echo Group $group already exists - fi + create_group $group else echo No group to create fi if [ -n "$user" ]; then - /bin/getent passwd $user > /dev/null - if [ $? -ne 0 ]; then - if [ -n "$group" ]; then - group="-g $group" - fi - if [ -n "$gcos" ]; then - gcos="-c $gcos" - fi - if [ -n "$dir" ]; then - dir="-d $dir" - fi - if [ -n "$shell" ]; then - shell="-s $shell" - fi - if [ -n "$create" ]; then - create="-m" - fi - /usr/sbin/useradd $gcos $group $create $dir $shell $user > /dev/null - if [ $? -eq 0 ]; then - echo User $user has been added - else - echo ERROR: Failed to add user $user - fi - else - echo User $user already exists - fi - - if [ -n "$nopass" ]; then - case "`uname -r`" in - 5.8|5.9) - # for old solaris, we munge the shadow file manually. - omask=`umask` - umask 0377 - awk 'BEGIN { FS=":"; OFS=":" } $1 == "'$user'" { $2 = "NP" } { print }' /etc/shadow > /etc/shadow.$PKGINST - if [ $? -eq 0 ]; then - cmp -s /etc/shadow /etc/shadow.$PKGINST - if [ $? -ne 0 ]; then - echo "Updating account '$user' to be no-login (NP)" - chgrp sys /etc/shadow.$PKGINST - cp -p /etc/shadow /etc/shadow.CSW && \ - mv /etc/shadow.$PKGINST /etc/shadow - else - rm /etc/shadow.$PKGINST - fi - else - echo "ERROR: Setting NP for '$user' failed." - rm /etc/shadow.$PKGINST - fi - umask $omask - ;; - *) - # for modern solaris, use the built-in tools - passwd -N $user - if [ $? -ne 0 ]; then - echo "ERROR: Setting NP for '$user' failed." - fi - ;; - esac - fi + create_user "$user" "$group" "$gcos" "$dir" "$shell" "$create" + [ -n "$nopass" ] && set_user_nologin "$user" else echo No user to create fi echo done - done exit 0 Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswusergroup ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/cswclassutils/branches/cswclassutils-usergroup-idrange/files/CSWcswclassutils.i.cswusergroup:8421-8956 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Thu Mar 4 05:15:25 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 04 Mar 2010 04:15:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8958] csw/mgar/pkg/wesnoth/trunk Message-ID: Revision: 8958 http://gar.svn.sourceforge.net/gar/?rev=8958&view=rev Author: jake_goerzen Date: 2010-03-04 04:15:25 +0000 (Thu, 04 Mar 2010) Log Message: ----------- update Makefile; add editor server and tools Modified Paths: -------------- csw/mgar/pkg/wesnoth/trunk/Makefile csw/mgar/pkg/wesnoth/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wesnoth/trunk/files/Makefile.fixed csw/mgar/pkg/wesnoth/trunk/files/configure.patch csw/mgar/pkg/wesnoth/trunk/files/global.hpp.patch csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.patch Removed Paths: ------------- csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.gspec csw/mgar/pkg/wesnoth/trunk/files/Makefile.am.diff Modified: csw/mgar/pkg/wesnoth/trunk/Makefile =================================================================== --- csw/mgar/pkg/wesnoth/trunk/Makefile 2010-03-03 21:41:32 UTC (rev 8957) +++ csw/mgar/pkg/wesnoth/trunk/Makefile 2010-03-04 04:15:25 UTC (rev 8958) @@ -9,27 +9,53 @@ MASTER_SITES += $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWwesnoth, depend ) +DISTFILES += Makefile.fixed # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=89495 UPSTREAM_USE_SF = 1 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) -GARCOMPILER ?= SUN - PATCHFILES = language.cpp.diff +PATCHFILES += configure.patch +PATCHFILES += simple_wml.cpp.patch +PATCHFILES += global.hpp.patch +RUNTIME_DEP_PKGS_CSWwesnoth = CSWboostrt +RUNTIME_DEP_PKGS_CSWwesnoth += CSWftype2 +RUNTIME_DEP_PKGS_CSWwesnoth += CSWggettextrt +RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibsdl +RUNTIME_DEP_PKGS_CSWwesnoth += CSWpng +RUNTIME_DEP_PKGS_CSWwesnoth += CSWpython +RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlimage +RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlmixer +RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlnet +RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlttf +RUNTIME_DEP_PKGS_CSWwesnoth += CSWstlport +RUNTIME_DEP_PKGS_CSWwesnoth += CSWsunmath +RUNTIME_DEP_PKGS_CSWwesnoth += CSWzlib + +CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|campaignd +CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|exploder +CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|cutter +CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|wesnoth_editor +CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|wesnoth +CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|wesnothd + CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += CXXFLAGS='-features=extensions -library=stlport4' CONFIGURE_ARGS += LDFLAGS='-L. -L/opt/csw/lib -lstlport -lintl -lsocket -lboost_iostreams -lsunmath -lSDL_ttf' -CONFIGURE_ARGS += --with-fifodir=/var/opt/csw/run/wesnothd -#CONFIGURE_ARGS += --enable-server -#CONFIGURE_ARGS += --enable-campaign-server -#CONFIGURE_ARGS += --enable-tools -#CONFIGURE_ARGS += --enable-editor +CONFIGURE_ARGS += --with-fifodir=/var/opt/csw/run +CONFIGURE_ARGS += --enable-server +CONFIGURE_ARGS += --enable-campaign-server +CONFIGURE_ARGS += --enable-tools +CONFIGURE_ARGS += --enable-editor CONFIGURE_ARGS += --with-boost=/opt/csw TEST_SCRIPTS = include gar/category.mk + +post-configure-modulated: + -cp $(FILEDIR)/Makefile.fixed $(WORKSRC)/src/Makefile + $(MAKECOOKIE) Modified: csw/mgar/pkg/wesnoth/trunk/checksums =================================================================== --- csw/mgar/pkg/wesnoth/trunk/checksums 2010-03-03 21:41:32 UTC (rev 8957) +++ csw/mgar/pkg/wesnoth/trunk/checksums 2010-03-04 04:15:25 UTC (rev 8958) @@ -1,4 +1,6 @@ -fdd341c3d66bf1bea2113c79db852d68 download/wesnoth-1.4.7.tar.bz2 -724aaa92df2d85d3e69b96837786cb64 download/CSWwesnoth.gspec -3ad3f94e881c3be62ec6424df8013ab4 download/CSWwesnoth.depend -59968804e93a18220d7d18e8252fff8d download/language.cpp.diff +f316fcd8051bec370f21ea75a2638477 Makefile.fixed +76eeb1596dfa00c985f0f7c02d2c4b1b configure.patch +1e4363990aa7b5eb2ceaf4cef2237c80 global.hpp.patch +59968804e93a18220d7d18e8252fff8d language.cpp.diff +b9890e1344f0f1d62bdf3e80cf4e4575 simple_wml.cpp.patch +fdd341c3d66bf1bea2113c79db852d68 wesnoth-1.4.7.tar.bz2 Deleted: csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend 2010-03-03 21:41:32 UTC (rev 8957) +++ csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend 2010-03-04 04:15:25 UTC (rev 8958) @@ -1,16 +0,0 @@ -P CSWftype2 -P CSWboostrt -P CSWpython -P CSWstlport -P CSWiconv -P CSWggettext -P CSWlibsdl -P CSWpng -P CSWsdlimage -P CSWsdlmixer -P CSWsdlnet -P CSWsdlttf -P CSWsunmath -P CSWzlib -P CSWfribidi -P CSWcommon common - common files and dirs for CSW packages Deleted: csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.gspec =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.gspec 2010-03-03 21:41:32 UTC (rev 8957) +++ csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.gspec 2010-03-04 04:15:25 UTC (rev 8958) @@ -1,4 +0,0 @@ -%var bitname wesnoth -%var pkgname CSWwesnoth -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/wesnoth/trunk/files/Makefile.am.diff =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/Makefile.am.diff 2010-03-03 21:41:32 UTC (rev 8957) +++ csw/mgar/pkg/wesnoth/trunk/files/Makefile.am.diff 2010-03-04 04:15:25 UTC (rev 8958) @@ -1,11 +0,0 @@ -diff --speed-large-files --minimal -Nru wesnoth-1.0.2.orig/src/Makefile.am wesnoth-1.0.2/src/Makefile.am ---- wesnoth-1.0.2.orig/src/Makefile.am 2006-05-24 12:12:11.472794000 -0400 -+++ wesnoth-1.0.2/src/Makefile.am 2006-05-24 12:12:02.042749000 -0400 -@@ -582,7 +582,6 @@ - if SERVER - install-exec-hook: - mkdir -p -m 0700 $(DESTDIR)$(fifodir) -- chown $(serveruid):$(servergid) $(DESTDIR)$(fifodir) - - uninstall-hook: - rm -rf $(DESTDIR)$(fifodir) Added: csw/mgar/pkg/wesnoth/trunk/files/Makefile.fixed =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/Makefile.fixed (rev 0) +++ csw/mgar/pkg/wesnoth/trunk/files/Makefile.fixed 2010-03-04 04:15:25 UTC (rev 8958) @@ -0,0 +1,1544 @@ +# Makefile.in generated by automake 1.10.2 from Makefile.am. +# src/Makefile. Generated from Makefile.in by configure. + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + + + + + + +pkglibdir = $(libdir)/wesnoth +pkgincludedir = $(includedir)/wesnoth +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = sparc-sun-solaris2.8 +host_triplet = sparc-sun-solaris2.8 +target_triplet = sparc-sun-solaris2.8 +#am__append_1 = "-DSVNREV=\"$(SVNREV)\"" +#am__append_2 = "-DSVNREV=\"$(SVNREV)\"" +bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ + $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) +am__append_3 = wesnoth +am__append_4 = wesnothd +am__append_5 = campaignd +#am__append_6 = test +am__append_7 = exploder cutter +am__append_8 = wmlscope wmllint wmlindent +am__append_9 = $(bin_SCRIPTS) +am__append_10 = wesnoth_editor +#am__append_11 = -DBANDWIDTH_MONITOR +am__append_12 = -DHAVE_PYTHON -I/opt/csw/include/python2.6 +am__append_13 = -DHAVE_PYTHON -I/opt/csw/include/python2.6 +#am__append_14 = -DHAVE_FRIBIDI +#am__append_15 = -DHAVE_FRIBIDI +#am__append_16 = +am__append_17 = -D_X11 -I/usr/openwin/include +am__append_18 = -D_X11 -I/usr/openwin/include +#am__append_19 = -fno-omit-frame-pointer +#am__append_20 = -fno-omit-frame-pointer +#am__append_21 = -DPREFERENCES_DIR=\"$(prefsdir)\" +#am__append_22 = -DBOOST_TEST_DYN_LINK +#am__append_23 = -DWESNOTH_BOOST_AUTO_TEST_MAIN +am__append_24 = -DWESNOTH_BOOST_TEST_MAIN +#am__append_25 = -all-static +subdir = src +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/boost.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) +AR = ar +ARFLAGS = cru +libwesnoth_core_a_AR = $(AR) $(ARFLAGS) +libwesnoth_core_a_LIBADD = +am__dirstamp = $(am__leading_dot)dirstamp +am_libwesnoth_core_a_OBJECTS = color_range.$(OBJEXT) config.$(OBJEXT) \ + filesystem.$(OBJEXT) game_config.$(OBJEXT) gettext.$(OBJEXT) \ + log.$(OBJEXT) map.$(OBJEXT) thread.$(OBJEXT) tstring.$(OBJEXT) \ + util.$(OBJEXT) serialization/binary_or_text.$(OBJEXT) \ + serialization/binary_wml.$(OBJEXT) \ + serialization/parser.$(OBJEXT) \ + serialization/preprocessor.$(OBJEXT) \ + serialization/string_utils.$(OBJEXT) \ + serialization/tokenizer.$(OBJEXT) +libwesnoth_core_a_OBJECTS = $(am_libwesnoth_core_a_OBJECTS) +libwesnoth_a_AR = $(AR) $(ARFLAGS) +libwesnoth_a_LIBADD = +am_libwesnoth_a_OBJECTS = astarnode.$(OBJEXT) astarsearch.$(OBJEXT) \ + builder.$(OBJEXT) cavegen.$(OBJEXT) clipboard.$(OBJEXT) \ + construct_dialog.$(OBJEXT) cursor.$(OBJEXT) display.$(OBJEXT) \ + events.$(OBJEXT) filechooser.$(OBJEXT) font.$(OBJEXT) \ + hotkeys.$(OBJEXT) image.$(OBJEXT) key.$(OBJEXT) \ + language.$(OBJEXT) loadscreen.$(OBJEXT) map_create.$(OBJEXT) \ + map_label.$(OBJEXT) mapgen.$(OBJEXT) mapgen_dialog.$(OBJEXT) \ + marked-up_text.$(OBJEXT) minimap.$(OBJEXT) pathutils.$(OBJEXT) \ + preferences.$(OBJEXT) preferences_display.$(OBJEXT) \ + race.$(OBJEXT) random.$(OBJEXT) reports.$(OBJEXT) \ + sdl_utils.$(OBJEXT) show_dialog.$(OBJEXT) sound.$(OBJEXT) \ + soundsource.$(OBJEXT) terrain.$(OBJEXT) \ + terrain_translation.$(OBJEXT) video.$(OBJEXT) theme.$(OBJEXT) \ + widgets/button.$(OBJEXT) widgets/file_menu.$(OBJEXT) \ + widgets/label.$(OBJEXT) widgets/menu.$(OBJEXT) \ + widgets/menu_style.$(OBJEXT) widgets/progressbar.$(OBJEXT) \ + widgets/scrollarea.$(OBJEXT) widgets/scrollbar.$(OBJEXT) \ + widgets/slider.$(OBJEXT) widgets/textbox.$(OBJEXT) \ + widgets/widget.$(OBJEXT) sdl_ttf/SDL_ttf.$(OBJEXT) \ + wml_exception.$(OBJEXT) +libwesnoth_a_OBJECTS = $(am_libwesnoth_a_OBJECTS) +am__EXEEXT_1 = wesnoth$(EXEEXT) +am__EXEEXT_2 = wesnothd$(EXEEXT) +am__EXEEXT_3 = campaignd$(EXEEXT) +#am__EXEEXT_4 = test$(EXEEXT) +am__EXEEXT_5 = exploder$(EXEEXT) cutter$(EXEEXT) +am__EXEEXT_6 = wesnoth_editor$(EXEEXT) +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) +am_campaignd_OBJECTS = campaign_server/campaign_server.$(OBJEXT) \ + server/input_stream.$(OBJEXT) network.$(OBJEXT) \ + network_worker.$(OBJEXT) publish_campaign.$(OBJEXT) \ + loadscreen_empty.$(OBJEXT) +campaignd_OBJECTS = $(am_campaignd_OBJECTS) +am__DEPENDENCIES_1 = +am_cutter_OBJECTS = tools/cutter.$(OBJEXT) \ + tools/exploder_utils.$(OBJEXT) tools/exploder_cutter.$(OBJEXT) \ + tools/dummy_video.$(OBJEXT) sdl_utils.$(OBJEXT) \ + loadscreen_empty.$(OBJEXT) +cutter_OBJECTS = $(am_cutter_OBJECTS) +am_exploder_OBJECTS = tools/exploder.$(OBJEXT) \ + tools/exploder_utils.$(OBJEXT) tools/exploder_cutter.$(OBJEXT) \ + tools/exploder_composer.$(OBJEXT) tools/dummy_video.$(OBJEXT) \ + sdl_utils.$(OBJEXT) loadscreen_empty.$(OBJEXT) +exploder_OBJECTS = $(am_exploder_OBJECTS) +am__objects_1 = about.$(OBJEXT) actions.$(OBJEXT) ai.$(OBJEXT) \ + ai_dfool.$(OBJEXT) ai_attack.$(OBJEXT) ai_move.$(OBJEXT) \ + ai_python.$(OBJEXT) ai_village.$(OBJEXT) \ + animated_game.$(OBJEXT) attack_prediction.$(OBJEXT) \ + config_adapter.$(OBJEXT) dialogs.$(OBJEXT) \ + floating_textbox.$(OBJEXT) game_display.$(OBJEXT) \ + game_events.$(OBJEXT) game_preferences.$(OBJEXT) \ + game_preferences_display.$(OBJEXT) gamestatus.$(OBJEXT) \ + generate_report.$(OBJEXT) generic_event.$(OBJEXT) \ + halo.$(OBJEXT) help.$(OBJEXT) intro.$(OBJEXT) \ + leader_list.$(OBJEXT) menu_events.$(OBJEXT) \ + mouse_events.$(OBJEXT) multiplayer.$(OBJEXT) \ + multiplayer_ui.$(OBJEXT) multiplayer_wait.$(OBJEXT) \ + multiplayer_connect.$(OBJEXT) multiplayer_create.$(OBJEXT) \ + multiplayer_lobby.$(OBJEXT) network.$(OBJEXT) \ + network_worker.$(OBJEXT) pathfind.$(OBJEXT) \ + playcampaign.$(OBJEXT) play_controller.$(OBJEXT) \ + playmp_controller.$(OBJEXT) playsingle_controller.$(OBJEXT) \ + playturn.$(OBJEXT) publish_campaign.$(OBJEXT) replay.$(OBJEXT) \ + replay_controller.$(OBJEXT) sha1.$(OBJEXT) settings.$(OBJEXT) \ + statistics.$(OBJEXT) team.$(OBJEXT) terrain_filter.$(OBJEXT) \ + titlescreen.$(OBJEXT) tooltips.$(OBJEXT) unit.$(OBJEXT) \ + unit_abilities.$(OBJEXT) unit_animation.$(OBJEXT) \ + unit_display.$(OBJEXT) unit_frame.$(OBJEXT) unit_map.$(OBJEXT) \ + unit_types.$(OBJEXT) upload_log.$(OBJEXT) variable.$(OBJEXT) \ + widgets/combo.$(OBJEXT) widgets/scrollpane.$(OBJEXT) +am_test_OBJECTS = tests/main.$(OBJEXT) tests/test_util.$(OBJEXT) \ + tests/test_network_worker.$(OBJEXT) $(am__objects_1) +test_OBJECTS = $(am_test_OBJECTS) +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +am_wesnoth_OBJECTS = game.$(OBJEXT) $(am__objects_1) +wesnoth_OBJECTS = $(am_wesnoth_OBJECTS) +am_wesnoth_editor_OBJECTS = editor/editor.$(OBJEXT) \ + editor/editor_layout.$(OBJEXT) editor/map_manip.$(OBJEXT) \ + editor/editor_display.$(OBJEXT) \ + editor/editor_palettes.$(OBJEXT) editor/editor_main.$(OBJEXT) \ + editor/editor_dialogs.$(OBJEXT) editor/editor_undo.$(OBJEXT) \ + animated_editor.$(OBJEXT) gamestatus_editor.$(OBJEXT) \ + generic_event.$(OBJEXT) tooltips.$(OBJEXT) +wesnoth_editor_OBJECTS = $(am_wesnoth_editor_OBJECTS) +am_wesnothd_OBJECTS = server/wesnothd-game.$(OBJEXT) \ + server/wesnothd-ban.$(OBJEXT) \ + server/wesnothd-input_stream.$(OBJEXT) \ + server/wesnothd-metrics.$(OBJEXT) \ + server/wesnothd-player.$(OBJEXT) \ + server/wesnothd-proxy.$(OBJEXT) \ + server/wesnothd-server.$(OBJEXT) \ + server/wesnothd-simple_wml.$(OBJEXT) \ + wesnothd-network.$(OBJEXT) wesnothd-network_worker.$(OBJEXT) \ + wesnothd-loadscreen_empty.$(OBJEXT) +wesnothd_OBJECTS = $(am_wesnothd_OBJECTS) +wesnothd_LINK = $(CXXLD) $(wesnothd_CXXFLAGS) $(CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +SCRIPTS = $(bin_SCRIPTS) +DEFAULT_INCLUDES = -I. -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/config/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ +SOURCES = $(libwesnoth_core_a_SOURCES) $(libwesnoth_a_SOURCES) \ + $(campaignd_SOURCES) $(cutter_SOURCES) $(exploder_SOURCES) \ + $(test_SOURCES) $(wesnoth_SOURCES) $(wesnoth_editor_SOURCES) \ + $(wesnothd_SOURCES) +DIST_SOURCES = $(libwesnoth_core_a_SOURCES) $(libwesnoth_a_SOURCES) \ + $(campaignd_SOURCES) $(cutter_SOURCES) $(exploder_SOURCES) \ + $(test_SOURCES) $(wesnoth_SOURCES) $(wesnoth_editor_SOURCES) \ + $(wesnothd_SOURCES) +HEADERS = $(noinst_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = $(datadir)/wesnoth +ACLOCAL = ${SHELL} /home/jgoerzen/mgar/wesnoth/trunk/work/solaris8-sparc/build-isa-sparcv8/wesnoth-1.4.7/config/missing --run aclocal-1.10 +AMTAR = ${SHELL} /home/jgoerzen/mgar/wesnoth/trunk/work/solaris8-sparc/build-isa-sparcv8/wesnoth-1.4.7/config/missing --run tar +APP_ENTRY = ${datarootdir}/applications +APP_ICON = ${datarootdir}/icons +ASCIIDOC = /opt/csw/bin/asciidoc +AUTOCONF = ${SHELL} /home/jgoerzen/mgar/wesnoth/trunk/work/solaris8-sparc/build-isa-sparcv8/wesnoth-1.4.7/config/missing --run autoconf +AUTOHEADER = ${SHELL} /home/jgoerzen/mgar/wesnoth/trunk/work/solaris8-sparc/build-isa-sparcv8/wesnoth-1.4.7/config/missing --run autoheader +AUTOMAKE = ${SHELL} /home/jgoerzen/mgar/wesnoth/trunk/work/solaris8-sparc/build-isa-sparcv8/wesnoth-1.4.7/config/missing --run automake-1.10 +AWK = gawk +BOOST_CPPFLAGS = -I/opt/csw/include +BOOST_IOSTREAMS_LDFLAGS = -L/opt/csw/lib +BOOST_IOSTREAMS_LIBS = -lboost_iostreams +BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = +BOOST_UNIT_TEST_FRAMEWORK_LIBS = +CC = /opt/studio/SOS11/SUNWspro/bin/cc +CCDEPMODE = depmode=none +CFLAGS = -xO3 -xarch=v8 $(am__append_1) $(am__append_18) $(am__append_20) +CPP = /opt/studio/SOS11/SUNWspro/bin/cc -E +CPPFLAGS = -I/usr/openwin/include -I/opt/csw/include -I/opt/csw/include/freetype2 -I/opt/csw/include +CXX = /opt/studio/SOS11/SUNWspro/bin/CC +CXXCPP = /opt/studio/SOS11/SUNWspro/bin/CC -E +CXXDEPMODE = depmode=none +CXXFLAGS = -features=extensions -library=stlport4 $(am__append_2) $(am__append_17) \ + $(am__append_19) $(am__append_21) $(am__append_22) \ + $(am__append_23) $(am__append_24) $(BOOST_CPPFLAGS) +CYGPATH_W = echo +DATADIR = wesnoth +DATA_FILES = +DEFS = -DHAVE_CONFIG_H +DEPDIR = .deps +DISTCHECK_CONFIGURE_FLAGS = '--with-boost=/opt/csw' +DOS2UNIX = /opt/csw/bin/dos2unix +ECHO_C = +ECHO_N = -n +ECHO_T = +EGREP = /opt/csw/bin/ggrep -E +EXEEXT = +FONT_FILES = +FREETYPE_CONFIG = /opt/csw/bin/freetype-config +FREETYPE_LIBS = -L/opt/csw/lib -lfreetype -lz +FRIBIDI_CFLAGS = +FRIBIDI_CONFIG = none +FRIBIDI_LIBS = +FULLLOCALEDIR = ${datadir}/${DATADIR}/${LOCALEDIR} +GMSGFMT = /opt/csw/bin/gmsgfmt +GREP = /opt/csw/bin/ggrep +HAS_RELATIVE_LOCALEDIR = 1 +IMAGE_FILES = +INSTALL = /opt/csw/bin/ginstall -c +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +INTLLIBS = /opt/csw/lib/libintl.so -R/opt/csw/lib +INTL_MACOSX_LIBS = +LDFLAGS = -L. -L/opt/csw/lib -lstlport -lintl -lsocket -lboost_iostreams -lsunmath -lSDL_ttf $(am__append_25) $(BOOST_IOSTREAMS_LDFLAGS) +LDPREFIX = +LIBICONV = /opt/csw/lib/libiconv.so -R/opt/csw/lib +LIBINTL = /opt/csw/lib/libintl.so -R/opt/csw/lib +LIBOBJS = ${LIBOBJDIR}error$U.o +LIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 +LOCALEDIR = translations +LTLIBICONV = -L/opt/csw/lib -liconv -R/opt/csw/lib +LTLIBINTL = -L/opt/csw/lib -lintl -R/opt/csw/lib +LTLIBOBJS = ${LIBOBJDIR}error$U.lo +LTOOL = /opt/csw/bin/libtool +MAKEINFO = ${SHELL} /home/jgoerzen/mgar/wesnoth/trunk/work/solaris8-sparc/build-isa-sparcv8/wesnoth-1.4.7/config/missing --run makeinfo +MKDIR_P = /opt/csw/bin/gmkdir -p +MKINSTALLDIRS = $(top_builddir)/config/mkinstalldirs +MSGFMT = : +MSGMERGE = : +MUSIC_FILES = +OBJEXT = o +OPTIPNG_BIN = +PACKAGE = wesnoth +PACKAGE_BUGREPORT = isaac at warp.es +PACKAGE_NAME = Battle for Wesnoth +PACKAGE_STRING = Battle for Wesnoth 1.4.7 +PACKAGE_TARNAME = wesnoth +PACKAGE_VERSION = 1.4.7 +PATH_SEPARATOR = : +PNGMETA = none +PNG_CFLAGS = -I/opt/csw/include/libpng12 +PNG_CONFIG = /opt/csw/bin/libpng-config +PNG_LIBS = -lpng12 +PO4A = none +POSUB = po +PYTHON = /opt/csw/bin/python +PYTHON_CFLAGS = -DHAVE_PYTHON -I/opt/csw/include/python2.6 +PYTHON_LIBS = -L/usr/lib -lpython2.6 +RANLIB = ranlib +SDL_CFLAGS = -I/opt/csw/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT +SDL_CONFIG = /opt/csw/bin/sdl-config +SDL_IMAGE_LIBS = -lSDL_image +SDL_LIBS = -L/opt/csw/lib -R/opt/csw/lib -lSDL -lpthread -lposix4 +SDL_MIXER_LIBS = -lSDL_mixer +SDL_NET_LIBS = -lSDL_net +SET_MAKE = +SHELL = /bin/bash +SOUND_FILES = +STRIP = +USE_NLS = yes +VERSION = 1.4.7 +XGETTEXT = : +XMKMF = +XSLTPROC = /opt/csw/bin/xsltproc +X_CFLAGS = -I/usr/openwin/include +X_EXTRA_LIBS = -lnsl +X_LIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 +X_PRE_LIBS = -lSM -lICE +abs_builddir = /home/jgoerzen/mgar/wesnoth/trunk/work/solaris8-sparc/build-isa-sparcv8/wesnoth-1.4.7/src +abs_srcdir = /home/jgoerzen/mgar/wesnoth/trunk/work/solaris8-sparc/build-isa-sparcv8/wesnoth-1.4.7/src +abs_top_builddir = /home/jgoerzen/mgar/wesnoth/trunk/work/solaris8-sparc/build-isa-sparcv8/wesnoth-1.4.7 +abs_top_srcdir = /home/jgoerzen/mgar/wesnoth/trunk/work/solaris8-sparc/build-isa-sparcv8/wesnoth-1.4.7 +ac_ct_CC = /opt/studio/SOS11/SUNWspro/bin/cc +ac_ct_CXX = +am__include = include +am__leading_dot = . +am__quote = +am__tar = find "$$tardir" -print | cpio -o -H ustar -L +am__untar = cpio -i -H ustar -d +bindir = ${exec_prefix}/bin +build = sparc-sun-solaris2.8 +build_alias = +build_cpu = sparc +build_os = solaris2.8 +build_vendor = sun +builddir = . +datadir = ${datarootdir} +datarootdir = ${prefix}/share +docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +dvidir = ${docdir} +exec_prefix = ${prefix} +fifodir = /var/opt/csw/run/wesnothd +host = sparc-sun-solaris2.8 +host_alias = +host_cpu = sparc +host_os = solaris2.8 +host_vendor = sun +htmldir = ${docdir} +includedir = ${prefix}/include +infodir = ${datarootdir}/info +install_sh = $(SHELL) /home/jgoerzen/mgar/wesnoth/trunk/work/solaris8-sparc/build-isa-sparcv8/wesnoth-1.4.7/config/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${exec_prefix}/libexec +localedir = ${datarootdir}/locale +localstatedir = ${prefix}/var +mandir = ${datarootdir}/man +mkdir_p = /opt/csw/bin/gmkdir -p +oldincludedir = /usr/include +pdfdir = ${docdir} +pkgpythondir = +prefix = /opt/csw +prefsdir = +program_transform_name = s,x,x, +psdir = ${docdir} +sbindir = ${exec_prefix}/sbin +servergid = +serveruid = +sharedstatedir = ${prefix}/com +srcdir = . +sysconfdir = ${prefix}/etc +target = sparc-sun-solaris2.8 +target_alias = +target_cpu = sparc +target_os = solaris2.8 +target_vendor = sun +top_build_prefix = ../ +top_builddir = .. +top_srcdir = .. +#SVNREV = $(shell svnversion -n $(topdir) 2>/dev/null) +AUTOMAKE_OPTIONS = subdir-objects +bin_SCRIPTS = $(am__append_8) + +############################################################################# +# Tag support +############################################################################# +CLEANFILES = $(am__append_9) TAGS +noinst_LIBRARIES = libwesnoth-core.a libwesnoth.a +INTERNALLIBS = -lwesnoth-core +THELIBS = -L. $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS) $(SDL_NET_LIBS) \ + $(SDL_TTF_LIBS) $(SDL_LIBS) $(PYTHON_LIBS) $(FREETYPE_LIBS) \ + $(LIBINTL) $(BOOST_IOSTREAMS_LIBS) $(am__append_16) +wesnoth_source = \ + about.cpp \ + actions.cpp \ + ai.cpp \ + ai_dfool.cpp \ + ai_attack.cpp \ + ai_move.cpp \ + ai_python.cpp \ + ai_village.cpp \ + animated_game.cpp \ + attack_prediction.cpp \ + config_adapter.cpp \ + dialogs.cpp \ + floating_textbox.cpp \ + game_display.cpp \ + game_events.cpp \ + game_preferences.cpp \ + game_preferences_display.cpp \ + gamestatus.cpp \ + generate_report.cpp \ + generic_event.cpp \ + halo.cpp \ + help.cpp \ + intro.cpp \ + leader_list.cpp \ + menu_events.cpp \ + mouse_events.cpp \ + multiplayer.cpp \ + multiplayer_ui.cpp \ + multiplayer_wait.cpp \ + multiplayer_connect.cpp \ + multiplayer_create.cpp \ + multiplayer_lobby.cpp \ + network.cpp \ + network_worker.cpp \ + pathfind.cpp \ + playcampaign.cpp \ + play_controller.cpp \ + playmp_controller.cpp \ + playsingle_controller.cpp \ + playturn.cpp \ + publish_campaign.cpp \ + replay.cpp \ + replay_controller.cpp \ + sha1.cpp \ + settings.cpp \ + statistics.cpp \ + team.cpp \ + terrain_filter.cpp \ + titlescreen.cpp \ + tooltips.cpp \ + unit.cpp \ + unit_abilities.cpp \ + unit_animation.cpp \ + unit_display.cpp \ + unit_frame.cpp \ + unit_map.cpp \ + unit_types.cpp \ + upload_log.cpp \ + variable.cpp \ + widgets/combo.cpp \ + widgets/scrollpane.cpp + + +############################################################################# +# Wesnoth # +############################################################################# +wesnoth_SOURCES = \ + game.cpp \ + $(wesnoth_source) + +wesnoth_LDADD = $(INTERNALLIBS) -lwesnoth $(THELIBS) +wesnoth_DEPENDENCIES = libwesnoth-core.a libwesnoth.a + +############################################################################# +# Editor # +############################################################################# +wesnoth_editor_SOURCES = \ + editor/editor.cpp \ + editor/editor_layout.cpp \ + editor/map_manip.cpp \ + editor/editor_display.cpp \ + editor/editor_palettes.cpp \ + editor/editor_main.cpp \ + editor/editor_dialogs.cpp \ + editor/editor_undo.cpp \ + animated_editor.cpp \ + gamestatus_editor.cpp \ + generic_event.cpp \ + tooltips.cpp + +wesnoth_editor_LDADD = $(INTERNALLIBS) -lwesnoth $(THELIBS) +wesnoth_editor_DEPENDENCIES = libwesnoth-core.a libwesnoth.a + +############################################################################# +# Wesnothd Server # +############################################################################# +wesnothd_SOURCES = \ + server/game.cpp \ + server/ban.cpp \ + server/input_stream.cpp \ + server/metrics.cpp \ + server/player.cpp \ + server/proxy.cpp \ + server/server.cpp \ + server/simple_wml.cpp \ + network.cpp \ + network_worker.cpp \ + loadscreen_empty.cpp + +wesnothd_compilerflags = $(AM_CXXFLAGS) $(am__append_11) +wesnothd_CXXFLAGS = $(wesnothd_compilerflags) +wesnothd_LDADD = -L. -lwesnoth-core $(BOOST_IOSTREAMS_LIBS) -lSDL_net -L/opt/csw/lib -R/opt/csw/lib -lSDL -lpthread -lposix4 $(LIBINTL) +wesnothd_DEPENDENCIES = libwesnoth-core.a + +############################################################################# +# Campaign Server # +############################################################################# +campaignd_SOURCES = \ + campaign_server/campaign_server.cpp \ + server/input_stream.cpp \ + network.cpp \ + network_worker.cpp \ + publish_campaign.cpp \ + loadscreen_empty.cpp + +campaignd_LDADD = -L. -lwesnoth-core $(BOOST_IOSTREAMS_LIBS) -lSDL_net -L/opt/csw/lib -R/opt/csw/lib -lSDL -lpthread -lposix4 $(LIBINTL) +campaignd_DEPENDENCIES = libwesnoth-core.a + +############################################################################# +# Castle building helpers # +############################################################################# +exploder_SOURCES = \ + tools/exploder.cpp \ + tools/exploder_utils.cpp \ + tools/exploder_cutter.cpp \ + tools/exploder_composer.cpp \ + tools/dummy_video.cpp \ + sdl_utils.cpp \ + loadscreen_empty.cpp + +cutter_SOURCES = \ + tools/cutter.cpp \ + tools/exploder_utils.cpp \ + tools/exploder_cutter.cpp \ + tools/dummy_video.cpp \ + sdl_utils.cpp \ + loadscreen_empty.cpp + +exploder_LDADD = -L. -lwesnoth-core $(BOOST_IOSTREAMS_LIBS) -lSDL_image -L/opt/csw/lib -R/opt/csw/lib -lSDL -lpthread -lposix4 $(LIBINTL) $(PNG_LIBS) +exploder_DEPENDENCIES = libwesnoth-core.a +cutter_LDADD = -L. -lwesnoth-core $(BOOST_IOSTREAMS_LIBS) -lSDL_image -L/opt/csw/lib -R/opt/csw/lib -lSDL -lpthread -lposix4 $(LIBINTL) $(PNG_LIBS) +cutter_DEPENDENCIES = libwesnoth-core.a + +############################################################################# +# Unit tests # +############################################################################# +test_SOURCES = \ + tests/main.cpp \ + tests/test_util.cpp \ + tests/test_network_worker.cpp \ + $(wesnoth_source) + +test_LDADD = $(INTERNALLIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) -lwesnoth $(THELIBS) +test_DEPENDENCIES = libwesnoth-core.a libwesnoth.a + +############################################################################# +# Headers # +############################################################################# +noinst_HEADERS = \ + wesconfig.h + + +############################################################################# +# Headers +############################################################################# + +#color_range.cpp should be removed, but game_config depends on it. +#game_config has very few things that are needed elsewhere, it should be +#removed. Requires moving path and version at least to other files. +libwesnoth_core_a_SOURCES = \ + color_range.cpp \ + config.cpp \ + filesystem.cpp \ + game_config.cpp \ + gettext.cpp \ + log.cpp \ + map.cpp \ + thread.cpp \ + tstring.cpp \ + util.cpp \ + serialization/binary_or_text.cpp \ + serialization/binary_wml.cpp \ + serialization/parser.cpp \ + serialization/preprocessor.cpp \ + serialization/string_utils.cpp \ + serialization/tokenizer.cpp + +libwesnoth_a_SOURCES = \ + astarnode.cpp \ + astarsearch.cpp \ + builder.cpp \ + cavegen.cpp \ + clipboard.cpp \ + construct_dialog.cpp \ + cursor.cpp \ + display.cpp \ + events.cpp \ + filechooser.cpp \ + font.cpp \ + hotkeys.cpp \ + image.cpp \ + key.cpp \ + language.cpp \ + loadscreen.cpp \ + map_create.cpp \ + map_label.cpp \ + mapgen.cpp \ + mapgen_dialog.cpp \ + marked-up_text.cpp \ + minimap.cpp \ + pathutils.cpp \ + preferences.cpp \ + preferences_display.cpp \ + race.cpp \ + random.cpp \ + reports.cpp \ + sdl_utils.cpp \ + show_dialog.cpp \ + sound.cpp \ + soundsource.cpp \ + terrain.cpp \ + terrain_translation.cpp \ + video.cpp \ + theme.cpp \ + widgets/button.cpp \ + widgets/file_menu.cpp \ + widgets/label.cpp \ + widgets/menu.cpp \ + widgets/menu_style.cpp \ + widgets/progressbar.cpp \ + widgets/scrollarea.cpp \ + widgets/scrollbar.cpp \ + widgets/slider.cpp \ + widgets/textbox.cpp \ + widgets/widget.cpp \ + sdl_ttf/SDL_ttf.c \ + wml_exception.cpp + +AM_CXXFLAGS = -I../intl -I$(top_srcdir)/intl \ + -I/opt/csw/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DWESNOTH_PATH=\"$(pkgdatadir)\" \ + -DLOCALEDIR=\"$(LOCALEDIR)\" \ + -DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR) \ + -DFIFODIR=\"$(fifodir)\" $(am__append_12) $(am__append_14) +AM_CFLAGS = -I../intl -I$(top_srcdir)/intl \ + -I/opt/csw/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DWESNOTH_PATH=\"$(pkgdatadir)\" \ + -DLOCALEDIR=\"$(LOCALEDIR)\" \ + -DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR) \ + $(am__append_13) $(am__append_15) +CXXLD = $(LDPREFIX) $(CXX) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .cpp .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +serialization/$(am__dirstamp): + @$(MKDIR_P) serialization + @: > serialization/$(am__dirstamp) +serialization/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) serialization/$(DEPDIR) + @: > serialization/$(DEPDIR)/$(am__dirstamp) +serialization/binary_or_text.$(OBJEXT): serialization/$(am__dirstamp) \ + serialization/$(DEPDIR)/$(am__dirstamp) +serialization/binary_wml.$(OBJEXT): serialization/$(am__dirstamp) \ + serialization/$(DEPDIR)/$(am__dirstamp) +serialization/parser.$(OBJEXT): serialization/$(am__dirstamp) \ + serialization/$(DEPDIR)/$(am__dirstamp) +serialization/preprocessor.$(OBJEXT): serialization/$(am__dirstamp) \ + serialization/$(DEPDIR)/$(am__dirstamp) +serialization/string_utils.$(OBJEXT): serialization/$(am__dirstamp) \ + serialization/$(DEPDIR)/$(am__dirstamp) +serialization/tokenizer.$(OBJEXT): serialization/$(am__dirstamp) \ + serialization/$(DEPDIR)/$(am__dirstamp) +libwesnoth-core.a: $(libwesnoth_core_a_OBJECTS) $(libwesnoth_core_a_DEPENDENCIES) + -rm -f libwesnoth-core.a + $(libwesnoth_core_a_AR) libwesnoth-core.a $(libwesnoth_core_a_OBJECTS) $(libwesnoth_core_a_LIBADD) + $(RANLIB) libwesnoth-core.a +widgets/$(am__dirstamp): + @$(MKDIR_P) widgets + @: > widgets/$(am__dirstamp) +widgets/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) widgets/$(DEPDIR) + @: > widgets/$(DEPDIR)/$(am__dirstamp) +widgets/button.$(OBJEXT): widgets/$(am__dirstamp) \ + widgets/$(DEPDIR)/$(am__dirstamp) +widgets/file_menu.$(OBJEXT): widgets/$(am__dirstamp) \ + widgets/$(DEPDIR)/$(am__dirstamp) +widgets/label.$(OBJEXT): widgets/$(am__dirstamp) \ + widgets/$(DEPDIR)/$(am__dirstamp) +widgets/menu.$(OBJEXT): widgets/$(am__dirstamp) \ + widgets/$(DEPDIR)/$(am__dirstamp) +widgets/menu_style.$(OBJEXT): widgets/$(am__dirstamp) \ + widgets/$(DEPDIR)/$(am__dirstamp) +widgets/progressbar.$(OBJEXT): widgets/$(am__dirstamp) \ + widgets/$(DEPDIR)/$(am__dirstamp) +widgets/scrollarea.$(OBJEXT): widgets/$(am__dirstamp) \ + widgets/$(DEPDIR)/$(am__dirstamp) +widgets/scrollbar.$(OBJEXT): widgets/$(am__dirstamp) \ + widgets/$(DEPDIR)/$(am__dirstamp) +widgets/slider.$(OBJEXT): widgets/$(am__dirstamp) \ + widgets/$(DEPDIR)/$(am__dirstamp) +widgets/textbox.$(OBJEXT): widgets/$(am__dirstamp) \ + widgets/$(DEPDIR)/$(am__dirstamp) +widgets/widget.$(OBJEXT): widgets/$(am__dirstamp) \ + widgets/$(DEPDIR)/$(am__dirstamp) +sdl_ttf/$(am__dirstamp): + @$(MKDIR_P) sdl_ttf + @: > sdl_ttf/$(am__dirstamp) +sdl_ttf/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) sdl_ttf/$(DEPDIR) + @: > sdl_ttf/$(DEPDIR)/$(am__dirstamp) +sdl_ttf/SDL_ttf.$(OBJEXT): sdl_ttf/$(am__dirstamp) \ + sdl_ttf/$(DEPDIR)/$(am__dirstamp) +libwesnoth.a: $(libwesnoth_a_OBJECTS) $(libwesnoth_a_DEPENDENCIES) + -rm -f libwesnoth.a + $(libwesnoth_a_AR) libwesnoth.a $(libwesnoth_a_OBJECTS) $(libwesnoth_a_LIBADD) + $(RANLIB) libwesnoth.a +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +campaign_server/$(am__dirstamp): + @$(MKDIR_P) campaign_server + @: > campaign_server/$(am__dirstamp) +campaign_server/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) campaign_server/$(DEPDIR) + @: > campaign_server/$(DEPDIR)/$(am__dirstamp) +campaign_server/campaign_server.$(OBJEXT): \ + campaign_server/$(am__dirstamp) \ + campaign_server/$(DEPDIR)/$(am__dirstamp) +server/$(am__dirstamp): + @$(MKDIR_P) server + @: > server/$(am__dirstamp) +server/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) server/$(DEPDIR) + @: > server/$(DEPDIR)/$(am__dirstamp) +server/input_stream.$(OBJEXT): server/$(am__dirstamp) \ + server/$(DEPDIR)/$(am__dirstamp) +campaignd$(EXEEXT): $(campaignd_OBJECTS) $(campaignd_DEPENDENCIES) + @rm -f campaignd$(EXEEXT) + $(CXXLINK) $(campaignd_OBJECTS) $(campaignd_LDADD) $(LIBS) +tools/$(am__dirstamp): + @$(MKDIR_P) tools + @: > tools/$(am__dirstamp) +tools/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) tools/$(DEPDIR) + @: > tools/$(DEPDIR)/$(am__dirstamp) +tools/cutter.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/exploder_utils.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/exploder_cutter.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/dummy_video.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +cutter$(EXEEXT): $(cutter_OBJECTS) $(cutter_DEPENDENCIES) + @rm -f cutter$(EXEEXT) + $(CXXLINK) $(cutter_OBJECTS) $(cutter_LDADD) $(LIBS) +tools/exploder.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/exploder_composer.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +exploder$(EXEEXT): $(exploder_OBJECTS) $(exploder_DEPENDENCIES) + @rm -f exploder$(EXEEXT) + $(CXXLINK) $(exploder_OBJECTS) $(exploder_LDADD) $(LIBS) +tests/$(am__dirstamp): + @$(MKDIR_P) tests + @: > tests/$(am__dirstamp) +tests/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) tests/$(DEPDIR) + @: > tests/$(DEPDIR)/$(am__dirstamp) +tests/main.$(OBJEXT): tests/$(am__dirstamp) \ + tests/$(DEPDIR)/$(am__dirstamp) +tests/test_util.$(OBJEXT): tests/$(am__dirstamp) \ + tests/$(DEPDIR)/$(am__dirstamp) +tests/test_network_worker.$(OBJEXT): tests/$(am__dirstamp) \ + tests/$(DEPDIR)/$(am__dirstamp) +widgets/combo.$(OBJEXT): widgets/$(am__dirstamp) \ + widgets/$(DEPDIR)/$(am__dirstamp) +widgets/scrollpane.$(OBJEXT): widgets/$(am__dirstamp) \ + widgets/$(DEPDIR)/$(am__dirstamp) +test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) + @rm -f test$(EXEEXT) + $(CXXLINK) $(test_OBJECTS) $(test_LDADD) $(LIBS) +wesnoth$(EXEEXT): $(wesnoth_OBJECTS) $(wesnoth_DEPENDENCIES) + @rm -f wesnoth$(EXEEXT) + $(CXXLINK) $(wesnoth_OBJECTS) $(wesnoth_LDADD) $(LIBS) +editor/$(am__dirstamp): + @$(MKDIR_P) editor + @: > editor/$(am__dirstamp) +editor/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) editor/$(DEPDIR) + @: > editor/$(DEPDIR)/$(am__dirstamp) +editor/editor.$(OBJEXT): editor/$(am__dirstamp) \ + editor/$(DEPDIR)/$(am__dirstamp) +editor/editor_layout.$(OBJEXT): editor/$(am__dirstamp) \ + editor/$(DEPDIR)/$(am__dirstamp) +editor/map_manip.$(OBJEXT): editor/$(am__dirstamp) \ + editor/$(DEPDIR)/$(am__dirstamp) +editor/editor_display.$(OBJEXT): editor/$(am__dirstamp) \ + editor/$(DEPDIR)/$(am__dirstamp) +editor/editor_palettes.$(OBJEXT): editor/$(am__dirstamp) \ + editor/$(DEPDIR)/$(am__dirstamp) +editor/editor_main.$(OBJEXT): editor/$(am__dirstamp) \ + editor/$(DEPDIR)/$(am__dirstamp) +editor/editor_dialogs.$(OBJEXT): editor/$(am__dirstamp) \ + editor/$(DEPDIR)/$(am__dirstamp) +editor/editor_undo.$(OBJEXT): editor/$(am__dirstamp) \ + editor/$(DEPDIR)/$(am__dirstamp) +wesnoth_editor$(EXEEXT): $(wesnoth_editor_OBJECTS) $(wesnoth_editor_DEPENDENCIES) + @rm -f wesnoth_editor$(EXEEXT) + $(CXXLINK) $(wesnoth_editor_OBJECTS) $(wesnoth_editor_LDADD) $(LIBS) +server/wesnothd-game.$(OBJEXT): server/$(am__dirstamp) \ + server/$(DEPDIR)/$(am__dirstamp) +server/wesnothd-ban.$(OBJEXT): server/$(am__dirstamp) \ + server/$(DEPDIR)/$(am__dirstamp) +server/wesnothd-input_stream.$(OBJEXT): server/$(am__dirstamp) \ + server/$(DEPDIR)/$(am__dirstamp) +server/wesnothd-metrics.$(OBJEXT): server/$(am__dirstamp) \ + server/$(DEPDIR)/$(am__dirstamp) +server/wesnothd-player.$(OBJEXT): server/$(am__dirstamp) \ + server/$(DEPDIR)/$(am__dirstamp) +server/wesnothd-proxy.$(OBJEXT): server/$(am__dirstamp) \ + server/$(DEPDIR)/$(am__dirstamp) +server/wesnothd-server.$(OBJEXT): server/$(am__dirstamp) \ + server/$(DEPDIR)/$(am__dirstamp) +server/wesnothd-simple_wml.$(OBJEXT): server/$(am__dirstamp) \ + server/$(DEPDIR)/$(am__dirstamp) +wesnothd$(EXEEXT): $(wesnothd_OBJECTS) $(wesnothd_DEPENDENCIES) + @rm -f wesnothd$(EXEEXT) + $(wesnothd_LINK) $(wesnothd_OBJECTS) $(wesnothd_LDADD) $(LIBS) +install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ + else :; fi; \ + done + +uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + -rm -f campaign_server/campaign_server.$(OBJEXT) + -rm -f editor/editor.$(OBJEXT) + -rm -f editor/editor_dialogs.$(OBJEXT) + -rm -f editor/editor_display.$(OBJEXT) + -rm -f editor/editor_layout.$(OBJEXT) + -rm -f editor/editor_main.$(OBJEXT) + -rm -f editor/editor_palettes.$(OBJEXT) + -rm -f editor/editor_undo.$(OBJEXT) + -rm -f editor/map_manip.$(OBJEXT) + -rm -f sdl_ttf/SDL_ttf.$(OBJEXT) + -rm -f serialization/binary_or_text.$(OBJEXT) + -rm -f serialization/binary_wml.$(OBJEXT) + -rm -f serialization/parser.$(OBJEXT) + -rm -f serialization/preprocessor.$(OBJEXT) + -rm -f serialization/string_utils.$(OBJEXT) + -rm -f serialization/tokenizer.$(OBJEXT) + -rm -f server/input_stream.$(OBJEXT) + -rm -f server/wesnothd-ban.$(OBJEXT) + -rm -f server/wesnothd-game.$(OBJEXT) + -rm -f server/wesnothd-input_stream.$(OBJEXT) + -rm -f server/wesnothd-metrics.$(OBJEXT) + -rm -f server/wesnothd-player.$(OBJEXT) + -rm -f server/wesnothd-proxy.$(OBJEXT) + -rm -f server/wesnothd-server.$(OBJEXT) + -rm -f server/wesnothd-simple_wml.$(OBJEXT) + -rm -f tests/main.$(OBJEXT) + -rm -f tests/test_network_worker.$(OBJEXT) + -rm -f tests/test_util.$(OBJEXT) + -rm -f tools/cutter.$(OBJEXT) + -rm -f tools/dummy_video.$(OBJEXT) + -rm -f tools/exploder.$(OBJEXT) + -rm -f tools/exploder_composer.$(OBJEXT) + -rm -f tools/exploder_cutter.$(OBJEXT) + -rm -f tools/exploder_utils.$(OBJEXT) + -rm -f widgets/button.$(OBJEXT) + -rm -f widgets/combo.$(OBJEXT) + -rm -f widgets/file_menu.$(OBJEXT) + -rm -f widgets/label.$(OBJEXT) + -rm -f widgets/menu.$(OBJEXT) + -rm -f widgets/menu_style.$(OBJEXT) + -rm -f widgets/progressbar.$(OBJEXT) + -rm -f widgets/scrollarea.$(OBJEXT) + -rm -f widgets/scrollbar.$(OBJEXT) + -rm -f widgets/scrollpane.$(OBJEXT) + -rm -f widgets/slider.$(OBJEXT) + -rm -f widgets/textbox.$(OBJEXT) + -rm -f widgets/widget.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/about.Po +include ./$(DEPDIR)/actions.Po +include ./$(DEPDIR)/ai.Po +include ./$(DEPDIR)/ai_attack.Po +include ./$(DEPDIR)/ai_dfool.Po +include ./$(DEPDIR)/ai_move.Po +include ./$(DEPDIR)/ai_python.Po +include ./$(DEPDIR)/ai_village.Po +include ./$(DEPDIR)/animated_editor.Po +include ./$(DEPDIR)/animated_game.Po +include ./$(DEPDIR)/astarnode.Po +include ./$(DEPDIR)/astarsearch.Po +include ./$(DEPDIR)/attack_prediction.Po +include ./$(DEPDIR)/builder.Po +include ./$(DEPDIR)/cavegen.Po +include ./$(DEPDIR)/clipboard.Po +include ./$(DEPDIR)/color_range.Po +include ./$(DEPDIR)/config.Po +include ./$(DEPDIR)/config_adapter.Po +include ./$(DEPDIR)/construct_dialog.Po +include ./$(DEPDIR)/cursor.Po +include ./$(DEPDIR)/dialogs.Po +include ./$(DEPDIR)/display.Po +include ./$(DEPDIR)/events.Po +include ./$(DEPDIR)/filechooser.Po +include ./$(DEPDIR)/filesystem.Po +include ./$(DEPDIR)/floating_textbox.Po +include ./$(DEPDIR)/font.Po +include ./$(DEPDIR)/game.Po +include ./$(DEPDIR)/game_config.Po +include ./$(DEPDIR)/game_display.Po +include ./$(DEPDIR)/game_events.Po +include ./$(DEPDIR)/game_preferences.Po +include ./$(DEPDIR)/game_preferences_display.Po +include ./$(DEPDIR)/gamestatus.Po +include ./$(DEPDIR)/gamestatus_editor.Po +include ./$(DEPDIR)/generate_report.Po +include ./$(DEPDIR)/generic_event.Po +include ./$(DEPDIR)/gettext.Po +include ./$(DEPDIR)/halo.Po +include ./$(DEPDIR)/help.Po +include ./$(DEPDIR)/hotkeys.Po +include ./$(DEPDIR)/image.Po +include ./$(DEPDIR)/intro.Po +include ./$(DEPDIR)/key.Po +include ./$(DEPDIR)/language.Po +include ./$(DEPDIR)/leader_list.Po +include ./$(DEPDIR)/loadscreen.Po +include ./$(DEPDIR)/loadscreen_empty.Po +include ./$(DEPDIR)/log.Po +include ./$(DEPDIR)/map.Po +include ./$(DEPDIR)/map_create.Po +include ./$(DEPDIR)/map_label.Po +include ./$(DEPDIR)/mapgen.Po +include ./$(DEPDIR)/mapgen_dialog.Po +include ./$(DEPDIR)/marked-up_text.Po +include ./$(DEPDIR)/menu_events.Po +include ./$(DEPDIR)/minimap.Po +include ./$(DEPDIR)/mouse_events.Po +include ./$(DEPDIR)/multiplayer.Po +include ./$(DEPDIR)/multiplayer_connect.Po +include ./$(DEPDIR)/multiplayer_create.Po +include ./$(DEPDIR)/multiplayer_lobby.Po +include ./$(DEPDIR)/multiplayer_ui.Po +include ./$(DEPDIR)/multiplayer_wait.Po +include ./$(DEPDIR)/network.Po +include ./$(DEPDIR)/network_worker.Po +include ./$(DEPDIR)/pathfind.Po +include ./$(DEPDIR)/pathutils.Po +include ./$(DEPDIR)/play_controller.Po +include ./$(DEPDIR)/playcampaign.Po +include ./$(DEPDIR)/playmp_controller.Po +include ./$(DEPDIR)/playsingle_controller.Po +include ./$(DEPDIR)/playturn.Po +include ./$(DEPDIR)/preferences.Po +include ./$(DEPDIR)/preferences_display.Po +include ./$(DEPDIR)/publish_campaign.Po +include ./$(DEPDIR)/race.Po +include ./$(DEPDIR)/random.Po +include ./$(DEPDIR)/replay.Po +include ./$(DEPDIR)/replay_controller.Po +include ./$(DEPDIR)/reports.Po +include ./$(DEPDIR)/sdl_utils.Po +include ./$(DEPDIR)/settings.Po +include ./$(DEPDIR)/sha1.Po +include ./$(DEPDIR)/show_dialog.Po +include ./$(DEPDIR)/sound.Po +include ./$(DEPDIR)/soundsource.Po +include ./$(DEPDIR)/statistics.Po +include ./$(DEPDIR)/team.Po +include ./$(DEPDIR)/terrain.Po +include ./$(DEPDIR)/terrain_filter.Po +include ./$(DEPDIR)/terrain_translation.Po +include ./$(DEPDIR)/theme.Po +include ./$(DEPDIR)/thread.Po +include ./$(DEPDIR)/titlescreen.Po +include ./$(DEPDIR)/tooltips.Po +include ./$(DEPDIR)/tstring.Po +include ./$(DEPDIR)/unit.Po +include ./$(DEPDIR)/unit_abilities.Po +include ./$(DEPDIR)/unit_animation.Po +include ./$(DEPDIR)/unit_display.Po +include ./$(DEPDIR)/unit_frame.Po +include ./$(DEPDIR)/unit_map.Po +include ./$(DEPDIR)/unit_types.Po +include ./$(DEPDIR)/upload_log.Po +include ./$(DEPDIR)/util.Po +include ./$(DEPDIR)/variable.Po +include ./$(DEPDIR)/video.Po +include ./$(DEPDIR)/wesnothd-loadscreen_empty.Po +include ./$(DEPDIR)/wesnothd-network.Po +include ./$(DEPDIR)/wesnothd-network_worker.Po +include ./$(DEPDIR)/wml_exception.Po +include campaign_server/$(DEPDIR)/campaign_server.Po +include editor/$(DEPDIR)/editor.Po +include editor/$(DEPDIR)/editor_dialogs.Po +include editor/$(DEPDIR)/editor_display.Po +include editor/$(DEPDIR)/editor_layout.Po +include editor/$(DEPDIR)/editor_main.Po +include editor/$(DEPDIR)/editor_palettes.Po +include editor/$(DEPDIR)/editor_undo.Po +include editor/$(DEPDIR)/map_manip.Po +include sdl_ttf/$(DEPDIR)/SDL_ttf.Po +include serialization/$(DEPDIR)/binary_or_text.Po +include serialization/$(DEPDIR)/binary_wml.Po +include serialization/$(DEPDIR)/parser.Po +include serialization/$(DEPDIR)/preprocessor.Po +include serialization/$(DEPDIR)/string_utils.Po +include serialization/$(DEPDIR)/tokenizer.Po +include server/$(DEPDIR)/input_stream.Po +include server/$(DEPDIR)/wesnothd-ban.Po +include server/$(DEPDIR)/wesnothd-game.Po +include server/$(DEPDIR)/wesnothd-input_stream.Po +include server/$(DEPDIR)/wesnothd-metrics.Po +include server/$(DEPDIR)/wesnothd-player.Po +include server/$(DEPDIR)/wesnothd-proxy.Po +include server/$(DEPDIR)/wesnothd-server.Po +include server/$(DEPDIR)/wesnothd-simple_wml.Po +include tests/$(DEPDIR)/main.Po +include tests/$(DEPDIR)/test_network_worker.Po +include tests/$(DEPDIR)/test_util.Po +include tools/$(DEPDIR)/cutter.Po +include tools/$(DEPDIR)/dummy_video.Po +include tools/$(DEPDIR)/exploder.Po +include tools/$(DEPDIR)/exploder_composer.Po +include tools/$(DEPDIR)/exploder_cutter.Po +include tools/$(DEPDIR)/exploder_utils.Po +include widgets/$(DEPDIR)/button.Po +include widgets/$(DEPDIR)/combo.Po +include widgets/$(DEPDIR)/file_menu.Po +include widgets/$(DEPDIR)/label.Po +include widgets/$(DEPDIR)/menu.Po +include widgets/$(DEPDIR)/menu_style.Po +include widgets/$(DEPDIR)/progressbar.Po +include widgets/$(DEPDIR)/scrollarea.Po +include widgets/$(DEPDIR)/scrollbar.Po +include widgets/$(DEPDIR)/scrollpane.Po +include widgets/$(DEPDIR)/slider.Po +include widgets/$(DEPDIR)/textbox.Po +include widgets/$(DEPDIR)/widget.Po + +.c.o: +# depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +# $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +# mv -f $$depbase.Tpo $$depbase.Po + source='$<' object='$@' libtool=no \ + DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ + $(COMPILE) -c -o $@ $< + +.c.obj: +# depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +# $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +# mv -f $$depbase.Tpo $$depbase.Po + source='$<' object='$@' libtool=no \ + DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ + $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.o: +# depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +# $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +# mv -f $$depbase.Tpo $$depbase.Po + source='$<' object='$@' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +# depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +# $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +# mv -f $$depbase.Tpo $$depbase.Po + source='$<' object='$@' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +server/wesnothd-game.o: server/game.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-game.o -MD -MP -MF server/$(DEPDIR)/wesnothd-game.Tpo -c -o server/wesnothd-game.o `test -f 'server/game.cpp' || echo '$(srcdir)/'`server/game.cpp +# mv -f server/$(DEPDIR)/wesnothd-game.Tpo server/$(DEPDIR)/wesnothd-game.Po + source='server/game.cpp' object='server/wesnothd-game.o' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-game.o `test -f 'server/game.cpp' || echo '$(srcdir)/'`server/game.cpp + +server/wesnothd-game.obj: server/game.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-game.obj -MD -MP -MF server/$(DEPDIR)/wesnothd-game.Tpo -c -o server/wesnothd-game.obj `if test -f 'server/game.cpp'; then $(CYGPATH_W) 'server/game.cpp'; else $(CYGPATH_W) '$(srcdir)/server/game.cpp'; fi` +# mv -f server/$(DEPDIR)/wesnothd-game.Tpo server/$(DEPDIR)/wesnothd-game.Po + source='server/game.cpp' object='server/wesnothd-game.obj' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-game.obj `if test -f 'server/game.cpp'; then $(CYGPATH_W) 'server/game.cpp'; else $(CYGPATH_W) '$(srcdir)/server/game.cpp'; fi` + +server/wesnothd-ban.o: server/ban.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-ban.o -MD -MP -MF server/$(DEPDIR)/wesnothd-ban.Tpo -c -o server/wesnothd-ban.o `test -f 'server/ban.cpp' || echo '$(srcdir)/'`server/ban.cpp +# mv -f server/$(DEPDIR)/wesnothd-ban.Tpo server/$(DEPDIR)/wesnothd-ban.Po + source='server/ban.cpp' object='server/wesnothd-ban.o' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-ban.o `test -f 'server/ban.cpp' || echo '$(srcdir)/'`server/ban.cpp + +server/wesnothd-ban.obj: server/ban.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-ban.obj -MD -MP -MF server/$(DEPDIR)/wesnothd-ban.Tpo -c -o server/wesnothd-ban.obj `if test -f 'server/ban.cpp'; then $(CYGPATH_W) 'server/ban.cpp'; else $(CYGPATH_W) '$(srcdir)/server/ban.cpp'; fi` +# mv -f server/$(DEPDIR)/wesnothd-ban.Tpo server/$(DEPDIR)/wesnothd-ban.Po + source='server/ban.cpp' object='server/wesnothd-ban.obj' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-ban.obj `if test -f 'server/ban.cpp'; then $(CYGPATH_W) 'server/ban.cpp'; else $(CYGPATH_W) '$(srcdir)/server/ban.cpp'; fi` + +server/wesnothd-input_stream.o: server/input_stream.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-input_stream.o -MD -MP -MF server/$(DEPDIR)/wesnothd-input_stream.Tpo -c -o server/wesnothd-input_stream.o `test -f 'server/input_stream.cpp' || echo '$(srcdir)/'`server/input_stream.cpp +# mv -f server/$(DEPDIR)/wesnothd-input_stream.Tpo server/$(DEPDIR)/wesnothd-input_stream.Po + source='server/input_stream.cpp' object='server/wesnothd-input_stream.o' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-input_stream.o `test -f 'server/input_stream.cpp' || echo '$(srcdir)/'`server/input_stream.cpp + +server/wesnothd-input_stream.obj: server/input_stream.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-input_stream.obj -MD -MP -MF server/$(DEPDIR)/wesnothd-input_stream.Tpo -c -o server/wesnothd-input_stream.obj `if test -f 'server/input_stream.cpp'; then $(CYGPATH_W) 'server/input_stream.cpp'; else $(CYGPATH_W) '$(srcdir)/server/input_stream.cpp'; fi` +# mv -f server/$(DEPDIR)/wesnothd-input_stream.Tpo server/$(DEPDIR)/wesnothd-input_stream.Po + source='server/input_stream.cpp' object='server/wesnothd-input_stream.obj' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-input_stream.obj `if test -f 'server/input_stream.cpp'; then $(CYGPATH_W) 'server/input_stream.cpp'; else $(CYGPATH_W) '$(srcdir)/server/input_stream.cpp'; fi` + +server/wesnothd-metrics.o: server/metrics.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-metrics.o -MD -MP -MF server/$(DEPDIR)/wesnothd-metrics.Tpo -c -o server/wesnothd-metrics.o `test -f 'server/metrics.cpp' || echo '$(srcdir)/'`server/metrics.cpp +# mv -f server/$(DEPDIR)/wesnothd-metrics.Tpo server/$(DEPDIR)/wesnothd-metrics.Po + source='server/metrics.cpp' object='server/wesnothd-metrics.o' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-metrics.o `test -f 'server/metrics.cpp' || echo '$(srcdir)/'`server/metrics.cpp + +server/wesnothd-metrics.obj: server/metrics.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-metrics.obj -MD -MP -MF server/$(DEPDIR)/wesnothd-metrics.Tpo -c -o server/wesnothd-metrics.obj `if test -f 'server/metrics.cpp'; then $(CYGPATH_W) 'server/metrics.cpp'; else $(CYGPATH_W) '$(srcdir)/server/metrics.cpp'; fi` +# mv -f server/$(DEPDIR)/wesnothd-metrics.Tpo server/$(DEPDIR)/wesnothd-metrics.Po + source='server/metrics.cpp' object='server/wesnothd-metrics.obj' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-metrics.obj `if test -f 'server/metrics.cpp'; then $(CYGPATH_W) 'server/metrics.cpp'; else $(CYGPATH_W) '$(srcdir)/server/metrics.cpp'; fi` + +server/wesnothd-player.o: server/player.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-player.o -MD -MP -MF server/$(DEPDIR)/wesnothd-player.Tpo -c -o server/wesnothd-player.o `test -f 'server/player.cpp' || echo '$(srcdir)/'`server/player.cpp +# mv -f server/$(DEPDIR)/wesnothd-player.Tpo server/$(DEPDIR)/wesnothd-player.Po + source='server/player.cpp' object='server/wesnothd-player.o' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-player.o `test -f 'server/player.cpp' || echo '$(srcdir)/'`server/player.cpp + +server/wesnothd-player.obj: server/player.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-player.obj -MD -MP -MF server/$(DEPDIR)/wesnothd-player.Tpo -c -o server/wesnothd-player.obj `if test -f 'server/player.cpp'; then $(CYGPATH_W) 'server/player.cpp'; else $(CYGPATH_W) '$(srcdir)/server/player.cpp'; fi` +# mv -f server/$(DEPDIR)/wesnothd-player.Tpo server/$(DEPDIR)/wesnothd-player.Po + source='server/player.cpp' object='server/wesnothd-player.obj' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-player.obj `if test -f 'server/player.cpp'; then $(CYGPATH_W) 'server/player.cpp'; else $(CYGPATH_W) '$(srcdir)/server/player.cpp'; fi` + +server/wesnothd-proxy.o: server/proxy.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-proxy.o -MD -MP -MF server/$(DEPDIR)/wesnothd-proxy.Tpo -c -o server/wesnothd-proxy.o `test -f 'server/proxy.cpp' || echo '$(srcdir)/'`server/proxy.cpp +# mv -f server/$(DEPDIR)/wesnothd-proxy.Tpo server/$(DEPDIR)/wesnothd-proxy.Po + source='server/proxy.cpp' object='server/wesnothd-proxy.o' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-proxy.o `test -f 'server/proxy.cpp' || echo '$(srcdir)/'`server/proxy.cpp + +server/wesnothd-proxy.obj: server/proxy.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-proxy.obj -MD -MP -MF server/$(DEPDIR)/wesnothd-proxy.Tpo -c -o server/wesnothd-proxy.obj `if test -f 'server/proxy.cpp'; then $(CYGPATH_W) 'server/proxy.cpp'; else $(CYGPATH_W) '$(srcdir)/server/proxy.cpp'; fi` +# mv -f server/$(DEPDIR)/wesnothd-proxy.Tpo server/$(DEPDIR)/wesnothd-proxy.Po + source='server/proxy.cpp' object='server/wesnothd-proxy.obj' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-proxy.obj `if test -f 'server/proxy.cpp'; then $(CYGPATH_W) 'server/proxy.cpp'; else $(CYGPATH_W) '$(srcdir)/server/proxy.cpp'; fi` + +server/wesnothd-server.o: server/server.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-server.o -MD -MP -MF server/$(DEPDIR)/wesnothd-server.Tpo -c -o server/wesnothd-server.o `test -f 'server/server.cpp' || echo '$(srcdir)/'`server/server.cpp +# mv -f server/$(DEPDIR)/wesnothd-server.Tpo server/$(DEPDIR)/wesnothd-server.Po + source='server/server.cpp' object='server/wesnothd-server.o' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-server.o `test -f 'server/server.cpp' || echo '$(srcdir)/'`server/server.cpp + +server/wesnothd-server.obj: server/server.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-server.obj -MD -MP -MF server/$(DEPDIR)/wesnothd-server.Tpo -c -o server/wesnothd-server.obj `if test -f 'server/server.cpp'; then $(CYGPATH_W) 'server/server.cpp'; else $(CYGPATH_W) '$(srcdir)/server/server.cpp'; fi` +# mv -f server/$(DEPDIR)/wesnothd-server.Tpo server/$(DEPDIR)/wesnothd-server.Po + source='server/server.cpp' object='server/wesnothd-server.obj' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-server.obj `if test -f 'server/server.cpp'; then $(CYGPATH_W) 'server/server.cpp'; else $(CYGPATH_W) '$(srcdir)/server/server.cpp'; fi` + +server/wesnothd-simple_wml.o: server/simple_wml.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-simple_wml.o -MD -MP -MF server/$(DEPDIR)/wesnothd-simple_wml.Tpo -c -o server/wesnothd-simple_wml.o `test -f 'server/simple_wml.cpp' || echo '$(srcdir)/'`server/simple_wml.cpp +# mv -f server/$(DEPDIR)/wesnothd-simple_wml.Tpo server/$(DEPDIR)/wesnothd-simple_wml.Po + source='server/simple_wml.cpp' object='server/wesnothd-simple_wml.o' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-simple_wml.o `test -f 'server/simple_wml.cpp' || echo '$(srcdir)/'`server/simple_wml.cpp + +server/wesnothd-simple_wml.obj: server/simple_wml.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT server/wesnothd-simple_wml.obj -MD -MP -MF server/$(DEPDIR)/wesnothd-simple_wml.Tpo -c -o server/wesnothd-simple_wml.obj `if test -f 'server/simple_wml.cpp'; then $(CYGPATH_W) 'server/simple_wml.cpp'; else $(CYGPATH_W) '$(srcdir)/server/simple_wml.cpp'; fi` +# mv -f server/$(DEPDIR)/wesnothd-simple_wml.Tpo server/$(DEPDIR)/wesnothd-simple_wml.Po + source='server/simple_wml.cpp' object='server/wesnothd-simple_wml.obj' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o server/wesnothd-simple_wml.obj `if test -f 'server/simple_wml.cpp'; then $(CYGPATH_W) 'server/simple_wml.cpp'; else $(CYGPATH_W) '$(srcdir)/server/simple_wml.cpp'; fi` + +wesnothd-network.o: network.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT wesnothd-network.o -MD -MP -MF $(DEPDIR)/wesnothd-network.Tpo -c -o wesnothd-network.o `test -f 'network.cpp' || echo '$(srcdir)/'`network.cpp +# mv -f $(DEPDIR)/wesnothd-network.Tpo $(DEPDIR)/wesnothd-network.Po + source='network.cpp' object='wesnothd-network.o' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o wesnothd-network.o `test -f 'network.cpp' || echo '$(srcdir)/'`network.cpp + +wesnothd-network.obj: network.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT wesnothd-network.obj -MD -MP -MF $(DEPDIR)/wesnothd-network.Tpo -c -o wesnothd-network.obj `if test -f 'network.cpp'; then $(CYGPATH_W) 'network.cpp'; else $(CYGPATH_W) '$(srcdir)/network.cpp'; fi` +# mv -f $(DEPDIR)/wesnothd-network.Tpo $(DEPDIR)/wesnothd-network.Po + source='network.cpp' object='wesnothd-network.obj' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o wesnothd-network.obj `if test -f 'network.cpp'; then $(CYGPATH_W) 'network.cpp'; else $(CYGPATH_W) '$(srcdir)/network.cpp'; fi` + +wesnothd-network_worker.o: network_worker.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT wesnothd-network_worker.o -MD -MP -MF $(DEPDIR)/wesnothd-network_worker.Tpo -c -o wesnothd-network_worker.o `test -f 'network_worker.cpp' || echo '$(srcdir)/'`network_worker.cpp +# mv -f $(DEPDIR)/wesnothd-network_worker.Tpo $(DEPDIR)/wesnothd-network_worker.Po + source='network_worker.cpp' object='wesnothd-network_worker.o' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o wesnothd-network_worker.o `test -f 'network_worker.cpp' || echo '$(srcdir)/'`network_worker.cpp + +wesnothd-network_worker.obj: network_worker.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT wesnothd-network_worker.obj -MD -MP -MF $(DEPDIR)/wesnothd-network_worker.Tpo -c -o wesnothd-network_worker.obj `if test -f 'network_worker.cpp'; then $(CYGPATH_W) 'network_worker.cpp'; else $(CYGPATH_W) '$(srcdir)/network_worker.cpp'; fi` +# mv -f $(DEPDIR)/wesnothd-network_worker.Tpo $(DEPDIR)/wesnothd-network_worker.Po + source='network_worker.cpp' object='wesnothd-network_worker.obj' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o wesnothd-network_worker.obj `if test -f 'network_worker.cpp'; then $(CYGPATH_W) 'network_worker.cpp'; else $(CYGPATH_W) '$(srcdir)/network_worker.cpp'; fi` + +wesnothd-loadscreen_empty.o: loadscreen_empty.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT wesnothd-loadscreen_empty.o -MD -MP -MF $(DEPDIR)/wesnothd-loadscreen_empty.Tpo -c -o wesnothd-loadscreen_empty.o `test -f 'loadscreen_empty.cpp' || echo '$(srcdir)/'`loadscreen_empty.cpp +# mv -f $(DEPDIR)/wesnothd-loadscreen_empty.Tpo $(DEPDIR)/wesnothd-loadscreen_empty.Po + source='loadscreen_empty.cpp' object='wesnothd-loadscreen_empty.o' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o wesnothd-loadscreen_empty.o `test -f 'loadscreen_empty.cpp' || echo '$(srcdir)/'`loadscreen_empty.cpp + +wesnothd-loadscreen_empty.obj: loadscreen_empty.cpp +# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -MT wesnothd-loadscreen_empty.obj -MD -MP -MF $(DEPDIR)/wesnothd-loadscreen_empty.Tpo -c -o wesnothd-loadscreen_empty.obj `if test -f 'loadscreen_empty.cpp'; then $(CYGPATH_W) 'loadscreen_empty.cpp'; else $(CYGPATH_W) '$(srcdir)/loadscreen_empty.cpp'; fi` +# mv -f $(DEPDIR)/wesnothd-loadscreen_empty.Tpo $(DEPDIR)/wesnothd-loadscreen_empty.Po + source='loadscreen_empty.cpp' object='wesnothd-loadscreen_empty.obj' libtool=no \ + DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wesnothd_CXXFLAGS) $(CXXFLAGS) -c -o wesnothd-loadscreen_empty.obj `if test -f 'loadscreen_empty.cpp'; then $(CYGPATH_W) 'loadscreen_empty.cpp'; else $(CYGPATH_W) '$(srcdir)/loadscreen_empty.cpp'; fi` + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f campaign_server/$(DEPDIR)/$(am__dirstamp) + -rm -f campaign_server/$(am__dirstamp) + -rm -f editor/$(DEPDIR)/$(am__dirstamp) + -rm -f editor/$(am__dirstamp) + -rm -f sdl_ttf/$(DEPDIR)/$(am__dirstamp) + -rm -f sdl_ttf/$(am__dirstamp) + -rm -f serialization/$(DEPDIR)/$(am__dirstamp) + -rm -f serialization/$(am__dirstamp) + -rm -f server/$(DEPDIR)/$(am__dirstamp) + -rm -f server/$(am__dirstamp) + -rm -f tests/$(DEPDIR)/$(am__dirstamp) + -rm -f tests/$(am__dirstamp) + -rm -f tools/$(DEPDIR)/$(am__dirstamp) + -rm -f tools/$(am__dirstamp) + -rm -f widgets/$(DEPDIR)/$(am__dirstamp) + -rm -f widgets/$(am__dirstamp) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) campaign_server/$(DEPDIR) editor/$(DEPDIR) sdl_ttf/$(DEPDIR) serialization/$(DEPDIR) server/$(DEPDIR) tests/$(DEPDIR) tools/$(DEPDIR) widgets/$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: install-binPROGRAMS install-binSCRIPTS + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) campaign_server/$(DEPDIR) editor/$(DEPDIR) sdl_ttf/$(DEPDIR) serialization/$(DEPDIR) server/$(DEPDIR) tests/$(DEPDIR) tools/$(DEPDIR) widgets/$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook + +.MAKE: install-am install-exec-am install-strip uninstall-am + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-noinstLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-binSCRIPTS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-exec-hook install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-hook + + +# Until game_config.cpp is removed, this will be needed to ensure that the +# SVNVER constant gets updated correctly. If and when that definition is +# moved elsewhere, this dependency must follow it. +#game_config.o: revision-stamp + +# Should be touched each time the SVN revision number goes up +#revision-stamp: FORCE +# if [ x"$(SVNREV)" != x`cat revision-stamp 2>/dev/null` ]; then echo -n $(SVNREV) >revision-stamp; fi + +#FORCE: + +#if STATIC +#LIBS += -static -L/usr/lib -Wl,-rpath,/usr/lib -L/usr/X11R6/lib -lSDL_image \ +#-lSDL_mixer -lSDL_net -lSDL_ttf -lSDL -lpthread -ldl -laudio -lXt -lX11 -lXext \ +#-lSDL_image -lSDL_mixer -lSDL_net -lSDL_ttf -lstdc++ -lm -lSM -lICE -ljpeg \ +#-lpng -lz -lvorbisfile -lvorbis -logg -lsmpeg -lfreetype +#endif + +install-exec-hook: + mkdir -p -m 0700 $(DESTDIR)$(fifodir) + -chown $(serveruid):$(servergid) $(DESTDIR)$(fifodir) + +uninstall-hook: + rm -rf $(DESTDIR)$(fifodir) +#install-exec-hook: +#uninstall-hook: + +TAGS: + etags -l c++ $(wesnoth_SOURCES) $(wesnoth_editor_SOURCES) $(wesnothd_SOURCES) $(campaignd_SOURCES) $(exploder_SOURCES) $(cutter_SOURCES) $(libwesnoth_core_a_SOURCES) $(libwesnoth__a_SOURCES) + +############################################################################# +# Scripts +############################################################################# + +$(bin_SCRIPTS): + cp ../data/tools/$@ . +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Added: csw/mgar/pkg/wesnoth/trunk/files/configure.patch =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/configure.patch (rev 0) +++ csw/mgar/pkg/wesnoth/trunk/files/configure.patch 2010-03-04 04:15:25 UTC (rev 8958) @@ -0,0 +1,12 @@ +diff -rupN wesnoth-1.4.7/configure wesnoth-1.4.7.new//configure +--- wesnoth-1.4.7/configure 2008-12-12 22:20:25.000000000 +0100 ++++ wesnoth-1.4.7.new//configure 2010-03-03 23:58:23.966426235 +0100 +@@ -5917,8 +5917,6 @@ fi + if test "x$debug" = "xyes" + then + CXXFLAGS="$CXXFLAGS -O0 -DDEBUG -ggdb3 -W -Wall -ansi" +-else +- CXXFLAGS="-O2 -W -Wall -ansi $CXXFLAGS" + fi + + if test "x$profile" = "xyes" Added: csw/mgar/pkg/wesnoth/trunk/files/global.hpp.patch =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/global.hpp.patch (rev 0) +++ csw/mgar/pkg/wesnoth/trunk/files/global.hpp.patch 2010-03-04 04:15:25 UTC (rev 8958) @@ -0,0 +1,9 @@ +diff -rupN wesnoth-1.4.7/src/global.hpp wesnoth-1.4.7.new/src/global.hpp +--- wesnoth-1.4.7/src/global.hpp 2008-02-16 09:47:16.000000000 +0100 ++++ wesnoth-1.4.7.new/src/global.hpp 2010-03-04 01:40:03.524211569 +0100 +@@ -80,3 +80,5 @@ namespace std { + + #endif + #endif ++ ++#include Added: csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.patch =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.patch (rev 0) +++ csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.patch 2010-03-04 04:15:25 UTC (rev 8958) @@ -0,0 +1,11 @@ +diff -rupN wesnoth-1.4.7/src/server/simple_wml.cpp wesnoth-1.4.7.new/src/server/simple_wml.cpp +--- wesnoth-1.4.7/src/server/simple_wml.cpp 2008-03-29 19:05:38.000000000 +0100 ++++ wesnoth-1.4.7.new/src/server/simple_wml.cpp 2010-03-04 00:07:07.874792552 +0100 +@@ -1,3 +1,7 @@ ++#include ++#include ++#include ++ + #include + #include + #include 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 Mar 4 09:07:50 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Mar 2010 08:07:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8959] csw/mgar/pkg/tightvnc/trunk/Makefile Message-ID: Revision: 8959 http://gar.svn.sourceforge.net/gar/?rev=8959&view=rev Author: wahwah Date: 2010-03-04 08:07:43 +0000 (Thu, 04 Mar 2010) Log Message: ----------- tightvnc: Adding license files, removing unnecessary dependencies. Modified Paths: -------------- csw/mgar/pkg/tightvnc/trunk/Makefile Modified: csw/mgar/pkg/tightvnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/tightvnc/trunk/Makefile 2010-03-04 04:15:25 UTC (rev 8958) +++ csw/mgar/pkg/tightvnc/trunk/Makefile 2010-03-04 08:07:43 UTC (rev 8959) @@ -32,13 +32,12 @@ MIGRATE_FILES_CSWvncs = vncservers INITSMF = /etc/opt/csw/init.d/cswvncserver -RUNTIME_DEP_PKGS = CSWbash -RUNTIME_DEP_PKGS += CSWjpeg -RUNTIME_DEP_PKGS += CSWlibice -RUNTIME_DEP_PKGS += CSWlibsm -RUNTIME_DEP_PKGS += CSWlibxext -RUNTIME_DEP_PKGS += CSWtcpwrap -RUNTIME_DEP_PKGS += CSWzlib +RUNTIME_DEP_PKGS_CSWvncs = CSWbash +RUNTIME_DEP_PKGS_CSWvncs += CSWjpeg +RUNTIME_DEP_PKGS_CSWvncs += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWvncs += CSWzlib +RUNTIME_DEP_PKGS_CSWvncv += CSWjpeg +RUNTIME_DEP_PKGS_CSWvncv += CSWzlib BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) @@ -61,6 +60,8 @@ PATCHFILES += 0003-libdix.a-after-libos.a.patch PATCHFILES += 0001-Force-the-use-of-libwrap.patch +LICENSE = LICENCE.TXT + include gar/category.mk pre-configure-modulated: 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 Mar 4 09:38:56 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Mar 2010 08:38:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8960] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 8960 http://gar.svn.sourceforge.net/gar/?rev=8960&view=rev Author: wahwah Date: 2010-03-04 08:38:56 +0000 (Thu, 04 Mar 2010) Log Message: ----------- cups: Fixing a bug with the missing SMF integration. Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2010-03-04 08:07:43 UTC (rev 8959) +++ csw/mgar/pkg/cups/trunk/Makefile 2010-03-04 08:38:56 UTC (rev 8960) @@ -162,7 +162,7 @@ # http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html SAMPLECONF_CSWcupsd = $(sysconfdir)/cups/cupsd\.conf\.CSW SAMPLECONF_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW -INITSMF_CSWcupsd = $(sysconfdir)/init\.d/cswcups +INITSMF = $(sysconfdir)/init\.d/cswcups LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib @@ -205,9 +205,6 @@ LICENSE = LICENSE.txt -CHECKPKG_OVERRIDES_CSWlibcups += symbol-not-found|libcupsppdc.so.1 -CHECKPKG_OVERRIDES_CSWcupsdev += missing-dependency|CSWcups - include gar/category.mk post-install-modulated: 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 Mar 4 09:44:21 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Mar 2010 08:44:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8961] csw/mgar/gar/v2 Message-ID: Revision: 8961 http://gar.svn.sourceforge.net/gar/?rev=8961&view=rev Author: wahwah Date: 2010-03-04 08:44:20 +0000 (Thu, 04 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, reporting an error when there's a file in .../init.d/ which is not of the cswinitsmf class. Modified Paths: -------------- csw/mgar/gar/v2/bin/analyze_module_results.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_old.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/bin/analyze_module_results.py =================================================================== --- csw/mgar/gar/v2/bin/analyze_module_results.py 2010-03-04 08:38:56 UTC (rev 8960) +++ csw/mgar/gar/v2/bin/analyze_module_results.py 2010-03-04 08:44:20 UTC (rev 8961) @@ -48,7 +48,7 @@ print " If you're getting errors at the same time, maybe you didn't" print " specify the overrides correctly." for override in unapplied_overrides: - print "* %s" % override + print "* Unused %s" % override sys.exit(exit_code) Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-04 08:38:56 UTC (rev 8960) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-04 08:44:20 UTC (rev 8961) @@ -810,7 +810,16 @@ Its purpose is to reduce the amount of boilerplate code and allow for easier unit test writing. """ - class IndividualErrorGatherer(object): + class CheckInterfaceBase(object): + """Base class for check proxies. + + It wraps access to the /var/sadm/install/contents cache. + """ + + def __init__(self, system_pkgmap): + self.system_pkgmap = system_pkgmap + + class IndividualCheckInterface(CheckInterfaceBase): """To be passed to the checking functions. Wraps the creation of CheckpkgTag objects. @@ -824,7 +833,7 @@ self.errors.append( CheckpkgTag(self.pkgname, tag_name, tag_info, msg)) - def SetErrorGatherer(object): + def SetCheckInterface(object): """To be bassed to set checking functions.""" def __init__(self): self.errors = [] @@ -865,21 +874,21 @@ for function in self.individual_checks: all_stats = pkg_data.GetAllStats() pkgname = all_stats["basic_stats"]["pkgname"] - error_mgr = self.IndividualErrorGatherer(pkgname) + check_interface = self.IndividualCheckInterface(pkgname) logger = logging.getLogger("%s-%s" % (pkgname, function.__name__)) logger.debug("Calling %s", function.__name__) - function(all_stats, error_mgr, logger=logger) - if error_mgr.errors: - errors[pkgname] = error_mgr.errors + function(all_stats, check_interface, logger=logger) + if check_interface.errors: + errors[pkgname] = check_interface.errors # Set checks for function in self.set_checks: pkgs_data = [x.GetAllStats() for x in packages_data] logger = logging.getLogger("SetCheck-%s" % (function.__name__,)) - error_mgr = self.SetErrorGatherer() + check_interface = self.SetCheckInterface() logger.debug("Calling %s", function.__name__) - function(pkgs_data, error_mgr, logger) - if error_mgr.errors: - errors = self.SetErrorsToDict(error_mgr.errors, errors) + function(pkgs_data, check_interface, logger) + if check_interface.errors: + errors = self.SetErrorsToDict(check_interface.errors, errors) return errors def Run(self): @@ -1097,7 +1106,8 @@ basic_stats["stats_version"] = PACKAGE_STATS_VERSION basic_stats["pkg_path"] = self.srv4_pkg.pkg_path basic_stats["pkg_basename"] = os.path.basename(self.srv4_pkg.pkg_path) - basic_stats["parsed_basename"] = opencsw.ParsePackageFileName(basic_stats["pkg_basename"]) + basic_stats["parsed_basename"] = opencsw.ParsePackageFileName( + basic_stats["pkg_basename"]) basic_stats["pkgname"] = dir_pkg.pkgname basic_stats["catalogname"] = dir_pkg.GetCatalogname() return basic_stats Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-04 08:38:56 UTC (rev 8960) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-04 08:44:20 UTC (rev 8961) @@ -787,7 +787,7 @@ stdout, stderr = find_proc.communicate() ret = find_proc.wait() if ret: - logging.error("The find command returned an error.") + logging.error("The %s command returned an error.", repr(find_tmpl)) dotslash_re = re.compile(r"^./") def StripRe(x, strip_re): return re.sub(strip_re, "", x) Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-04 08:38:56 UTC (rev 8960) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-04 08:44:20 UTC (rev 8961) @@ -84,6 +84,19 @@ error_mgr.ReportError("pkginfo-bad-catalogname") +def CheckSmfIntegration(pkg_data, error_mgr, logger): + init_re = re.compile(r"/init\.d/") + for entry in pkg_data["pkgmap"]: + if not entry["path"]: + continue + if not re.search(init_re, entry["path"]): + continue + if entry["class"] != "cswinitsmf": + error_mgr.ReportError( + "init-file-missing-cswinitsmf-class", + "%s class=%s" % (entry["path"], entry["class"])) + + def SetCheckDependencies(pkgs_data, error_mgr, logger): """Dependencies must be either installed in the system, or in the set.""" pass Modified: csw/mgar/gar/v2/lib/python/package_checks_old.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_old.py 2010-03-04 08:38:56 UTC (rev 8960) +++ csw/mgar/gar/v2/lib/python/package_checks_old.py 2010-03-04 08:44:20 UTC (rev 8961) @@ -2,6 +2,8 @@ # coding=utf-8 # $Id$ +"""This module uses an old API. Please do not add new checks here.""" + import checkpkg import re @@ -102,30 +104,30 @@ maintname = checkpkg.ExtractMaintainerName(pkginfo) if not maintname: errors.append(checkpkg.CheckpkgTag( - pkgname, "maintainer-name-not-set")) + pkgname, "pkginfo-maintainer-name-not-set")) # email if not pkginfo["EMAIL"]: errors.append(checkpkg.CheckpkgTag( - pkgname, "email-blank")) + pkgname, "pkginfo-blank-email")) # hotline if not pkginfo["HOTLINE"]: errors.append(checkpkg.CheckpkgTag( - pkgname, "hotline-blank")) + pkgname, "pkginfo-hotline-blank")) pkginfo_version = pkg_data["basic_stats"]["parsed_basename"]["full_version_string"] if pkginfo_version != pkginfo["VERSION"]: errors.append(checkpkg.CheckpkgTag( pkgname, "filename-version-does-not-match-pkginfo-version")) if re.search(r"-", pkginfo["VERSION"]): errors.append(checkpkg.CheckpkgTag( - pkgname, "minus-not-allowed-in-version")) + pkgname, "pkginfo-minus-in-version")) if not re.match(VERSION_RE, pkginfo["VERSION"]): msg = ("Version regex: %s, version value: %s." % (repr(VERSION_RE), repr(pkginfo["VERSION"]))) errors.append(checkpkg.CheckpkgTag( - pkgname, "version-does-not-match-regex", msg=msg)) + pkgname, "pkginfo-version-wrong-format", msg=msg)) if pkginfo["ARCH"] not in ARCH_LIST: errors.append(checkpkg.CheckpkgTag( - pkgname, "non-standard-architecture", pkginfo["ARCH"])) + pkgname, "pkginfo-nonstandard-architecture", pkginfo["ARCH"])) if "PSTAMP" in pkginfo: if not re.match(checkpkg.PSTAMP_RE, pkginfo["PSTAMP"]): errors.append(checkpkg.CheckpkgTag( Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-04 08:38:56 UTC (rev 8960) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-04 08:44:20 UTC (rev 8961) @@ -28,7 +28,7 @@ def testDefault(self): self.logger_mock = self.mocker.CreateMock(logging.Logger) self.error_mgr_mock = self.mocker.CreateMock( - checkpkg.CheckpkgManager2.IndividualErrorGatherer) + checkpkg.CheckpkgManager2.IndividualCheckInterface) self.CheckpkgTest() self.mocker.ReplayAll() getattr(pc, self.FUNCTION_NAME)(self.pkg_data, self.error_mgr_mock, self.logger_mock) @@ -62,6 +62,34 @@ self.pkg_data["pkginfo"]["NAME"] = 'foo-bar - This catalog name is bad' self.error_mgr_mock.ReportError('pkginfo-bad-catalogname') +class TestCheckCatalogname(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckSmfIntegration' + def CheckpkgTest(self): + self.pkg_data["pkgmap"].append({ + "class": "none", + "group": "bin", + "line": "1 f none /etc/opt/csw/init.d/foo 0644 root bin 36372 24688 1266395027", + "mode": '0755', + "path": "/etc/opt/csw/init.d/foo", + "type": "f", + "user": "root" + }) + self.error_mgr_mock.ReportError('init-file-missing-cswinitsmf-class', + '/etc/opt/csw/init.d/foo class=none') +class TestCheckCatalognameGood(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckSmfIntegration' + def CheckpkgTest(self): + self.pkg_data["pkgmap"].append({ + "class": "cswinitsmf", + "group": "bin", + "line": "1 f none /etc/opt/csw/init.d/foo 0644 root bin 36372 24688 1266395027", + "mode": '0755', + "path": "/etc/opt/csw/init.d/foo", + "type": "f", + "user": "root" + }) + + if __name__ == '__main__': - unittest.main() + unittest.main() 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 Mar 4 09:59:33 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Mar 2010 08:59:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8962] csw/mgar/pkg/rsync/trunk/Makefile Message-ID: Revision: 8962 http://gar.svn.sourceforge.net/gar/?rev=8962&view=rev Author: wahwah Date: 2010-03-04 08:59:33 +0000 (Thu, 04 Mar 2010) Log Message: ----------- rsync: Makefile cleanup Modified Paths: -------------- csw/mgar/pkg/rsync/trunk/Makefile Modified: csw/mgar/pkg/rsync/trunk/Makefile =================================================================== --- csw/mgar/pkg/rsync/trunk/Makefile 2010-03-04 08:44:20 UTC (rev 8961) +++ csw/mgar/pkg/rsync/trunk/Makefile 2010-03-04 08:59:33 UTC (rev 8962) @@ -2,181 +2,21 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## GARNAME = rsync GARVERSION = 3.0.7 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra CATEGORIES = utils -## -## A one-line description of the package, which will appear in the pkginfo. DESCRIPTION = utility which provides fast incremental file transfer -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. define BLURB rsync is an open source utility that provides fast incremental file transfer. rsync is freely available under the GNU General Public License and is currently being maintained by Wayne Davison. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = http://rsync.samba.org/ -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = http://samba.anu.edu.au/ftp/rsync/ -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +MASTER_SITES = http://samba.anu.edu.au/ftp/rsync/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) -## BUILD64 = 1 -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## RUNTIME_DEP_PKGS_CSWrsync = CSWiconv RUNTIME_DEP_PKGS_CSWrsync += CSWlibpopt include gar/category.mk 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 Mar 4 11:52:06 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Mar 2010 10:52:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8963] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 8963 http://gar.svn.sourceforge.net/gar/?rev=8963&view=rev Author: wahwah Date: 2010-03-04 10:52:05 +0000 (Thu, 04 Mar 2010) Log Message: ----------- wxwidgets: Adding the license file, fixing the problem with the devel package which contains a binary. Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2010-03-04 08:59:33 UTC (rev 8962) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2010-03-04 10:52:05 UTC (rev 8963) @@ -68,7 +68,6 @@ PACKAGES = CSWwxwidgetscommon PACKAGES += CSWwxwidgetsdevel PACKAGES += CSWwxwidgetsgtk2 -ARCHALL_CSWwxwidgetsdevel = 1 SPKG_DESC_CSWwxwidgetscommon = A cross-platform toolkit, common files SPKG_DESC_CSWwxwidgetsdevel = A cross-platform toolkit, header files SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support @@ -79,7 +78,12 @@ RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWncurses RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWsunmath RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWzlib - +RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWexpat +RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWiconv +RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWlibxext +RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWncurses +RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWsunmath +RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWzlib RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWexpat RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWfconfig RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWftype2 @@ -99,6 +103,7 @@ RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWtiff RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWzlib + # Dependencies between wxwidgets subpackages RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWwxwidgetscommon RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWwxwidgetscommon CSWwxwidgetsgtk2 @@ -161,6 +166,8 @@ INSTALL_SCRIPTS = wxwidgets +LICENSE = docs/licence.txt + include gar/category.mk install-wxwidgets: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Thu Mar 4 13:53:30 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Thu, 04 Mar 2010 12:53:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8964] csw/mgar/pkg/rrdtool/branches/benny/Makefile Message-ID: Revision: 8964 http://gar.svn.sourceforge.net/gar/?rev=8964&view=rev Author: bensons Date: 2010-03-04 12:53:30 +0000 (Thu, 04 Mar 2010) Log Message: ----------- rrdtool: added libintl prefix Modified Paths: -------------- csw/mgar/pkg/rrdtool/branches/benny/Makefile Modified: csw/mgar/pkg/rrdtool/branches/benny/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-04 10:52:05 UTC (rev 8963) +++ csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-04 12:53:30 UTC (rev 8964) @@ -65,6 +65,7 @@ CONFIGURE_ARGS += --with-perl-options=INSTALLDIRS=vendor CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS += --with-libintl-prefix=$(libdir) CONFIGURE_ARGS += --exec-prefix=$(prefix) EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod 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 Mar 4 14:14:25 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 04 Mar 2010 13:14:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8965] csw/mgar/pkg/pkgutil/trunk/checksums Message-ID: Revision: 8965 http://gar.svn.sourceforge.net/gar/?rev=8965&view=rev Author: bonivart Date: 2010-03-04 13:14:24 +0000 (Thu, 04 Mar 2010) Log Message: ----------- pkgutil: update checksums Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2010-03-04 12:53:30 UTC (rev 8964) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2010-03-04 13:14:24 UTC (rev 8965) @@ -3,5 +3,6 @@ 2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove a0e549282bf18241e4490ed6b051b92a CSWpkgutil.prototype b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py +7ad27336f90e73da3254a61d91025ee5 cswcatalog 3a6b789b3d5e05f41d2363dd26a92acf opencsw.py -d65a85a929f3901d4a613006e7c2c7bd pkgutil-1.9.1.zip +0de3732c58681eeaa21ce64b252607c8 pkgutil-1.10b1.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Mar 4 15:30:59 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 04 Mar 2010 14:30:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8966] csw/mgar/pkg/openexr/trunk/Makefile Message-ID: Revision: 8966 http://gar.svn.sourceforge.net/gar/?rev=8966&view=rev Author: hson Date: 2010-03-04 14:30:59 +0000 (Thu, 04 Mar 2010) Log Message: ----------- openexr: Split package Modified Paths: -------------- csw/mgar/pkg/openexr/trunk/Makefile Modified: csw/mgar/pkg/openexr/trunk/Makefile =================================================================== --- csw/mgar/pkg/openexr/trunk/Makefile 2010-03-04 13:14:24 UTC (rev 8965) +++ csw/mgar/pkg/openexr/trunk/Makefile 2010-03-04 14:30:59 UTC (rev 8966) @@ -2,7 +2,7 @@ GARVERSION = 1.6.1 CATEGORIES = lib -DESCRIPTION = high dynamic-range (HDR) image file format developed by Industrial Light & Magic +DESCRIPTION = High dynamic-range (HDR) image file format developed by Industrial Light & Magic define BLURB IlmImf is our "EXR" file format for storing 16-bit FP images. Libraries in this package depend on the IlmBase library. @@ -22,16 +22,22 @@ DISTFILES += libIlmImf.so.2.0.2.i DISTFILES += libIlmImf.so.2.0.2.s -PACKAGES = CSWopenexr CSWopenexrdevel +PACKAGES = CSWopenexr CSWopenexrrt CSWopenexrdevel CATALOGNAME_CSWopenexr = openexr +CATALOGNAME_CSWopenexrrt = openexr_rt CATALOGNAME_CSWopenexrdevel = openexr_devel -SPKG_DESC_CSWopenexr += High dynamic-range (HDR) image file format developed by Industrial Light & Magic -SPKG_DESC_CSWopenexrdevel += High dynamic-range (HDR) image file format developed by Industrial Light & Magic - developer package +SPKG_DESC_CSWopenexr += $(DESCRIPTION) +SPKG_DESC_CSWopenexrrt += $(DESCRIPTION) - runtime package +SPKG_DESC_CSWopenexrdevel += $(DESCRIPTION) - developer package +PKGFILES_CSWopenexrrt = $(PKGFILES_RT) PKGFILES_CSWopenexrdevel = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWopenexr += CSWilmbase CSWzlib +RUNTIME_DEP_PKGS_CSWopenexr += CSWopenexrrt +RUNTIME_DEP_PKGS_CSWopenexr += CSWilmbase +RUNTIME_DEP_PKGS_CSWopenexr += CSWzlib +RUNTIME_DEP_PKGS_CSWopenexrrt += CSWilmbase CSWzlib RUNTIME_DEP_PKGS_CSWopenexrdevel += CSWopenexr SPKG_SOURCEURL = http://www.openexr.com @@ -51,7 +57,6 @@ EXTRA_CXX_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) BUILD64 = 1 -NOISAEXEC = 1 # Check fails if library isn't installed /opt/csw/lib and until a 64-bit # lib is installed test has to be disabled This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Thu Mar 4 16:01:25 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Thu, 04 Mar 2010 15:01:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8967] csw/mgar/pkg/rrdtool/branches/benny Message-ID: Revision: 8967 http://gar.svn.sourceforge.net/gar/?rev=8967&view=rev Author: bensons Date: 2010-03-04 15:01:25 +0000 (Thu, 04 Mar 2010) Log Message: ----------- rrdtool: fixed typo *narf* so 64 bit build works now Modified Paths: -------------- csw/mgar/pkg/rrdtool/branches/benny/Makefile csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c Modified: csw/mgar/pkg/rrdtool/branches/benny/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-04 14:30:59 UTC (rev 8966) +++ csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-04 15:01:25 UTC (rev 8967) @@ -55,7 +55,7 @@ EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -CONFIGURE_ARS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --docdir=$(sharedstatedir)/doc/$(GARNAME) CONFIGURE_ARGS += --disable-lua CONFIGURE_ARGS += --enable-python @@ -66,7 +66,6 @@ CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) CONFIGURE_ARGS += --with-libintl-prefix=$(libdir) -CONFIGURE_ARGS += --exec-prefix=$(prefix) EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod @@ -78,30 +77,31 @@ PATCHFILES += patch-bindings-ruby-extconf.rb BUILD64 = 1 -#NOISAEXEC = 1 STRIP_LIBTOOL = 1 +include gar/category.mk # ugly fix to fix doc path #post-install-modulated: - #@echo " ==> Fixing doc path" - #@mv $(DESTDIR)$(prefix)/share/doc/rrdtool-$(GARVERSION) $(DESTDIR)$(prefix)/share/doc/rrdtool + #echo " ==> Fixing doc path" + #mv $(DESTDIR)$(prefix)/share/doc/rrdtool-$(GARVERSION) $(DESTDIR)$(prefix)/share/doc/rrdtool -include gar/category.mk - pre-build-modulated: + echo " ==> Adding math function round()" cp $(FILEDIR)/s_round.c $(WORKSRC)/src cp $(FILEDIR)/s_round.h $(WORKSRC)/src @$(MAKECOOKIE) post-patch-isa-amd64: - @# since our perl is 32bit, we need to patch away the module build + @# since our perl/python is 32bit, we need to patch away the build + echo " ==> Removing perl/python module" gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-Makefile.in gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-bindings-Makefile.in @$(MAKECOOKIE) post-patch-isa-sparcv9: - @# since our perl is 32bit, we need to patch away the module build + @# since our perl/python is 32bit, we need to patch away the build + echo " ==> Removing perl/python module" gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-Makefile.in gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-bindings-Makefile.in @$(MAKECOOKIE) Modified: csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c 2010-03-04 14:30:59 UTC (rev 8966) +++ csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c 2010-03-04 15:01:25 UTC (rev 8967) @@ -30,6 +30,10 @@ round(double x) { double t; + + if (!isfinite(x)) + return (x); + if (x >= 0.0) { t = floor(x); if (t - x <= -0.5) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Mar 4 17:37:24 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 04 Mar 2010 16:37:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8968] csw/mgar/pkg/openexr/trunk/Makefile Message-ID: Revision: 8968 http://gar.svn.sourceforge.net/gar/?rev=8968&view=rev Author: hson Date: 2010-03-04 16:37:23 +0000 (Thu, 04 Mar 2010) Log Message: ----------- openexr: Split out documentation Modified Paths: -------------- csw/mgar/pkg/openexr/trunk/Makefile Modified: csw/mgar/pkg/openexr/trunk/Makefile =================================================================== --- csw/mgar/pkg/openexr/trunk/Makefile 2010-03-04 15:01:25 UTC (rev 8967) +++ csw/mgar/pkg/openexr/trunk/Makefile 2010-03-04 16:37:23 UTC (rev 8968) @@ -22,26 +22,34 @@ DISTFILES += libIlmImf.so.2.0.2.i DISTFILES += libIlmImf.so.2.0.2.s -PACKAGES = CSWopenexr CSWopenexrrt CSWopenexrdevel +PACKAGES = CSWopenexr CSWopenexrrt CSWopenexrdevel CSWopenexrdoc CATALOGNAME_CSWopenexr = openexr CATALOGNAME_CSWopenexrrt = openexr_rt CATALOGNAME_CSWopenexrdevel = openexr_devel +CATALOGNAME_CSWopenexrdoc = openexr_doc SPKG_DESC_CSWopenexr += $(DESCRIPTION) SPKG_DESC_CSWopenexrrt += $(DESCRIPTION) - runtime package SPKG_DESC_CSWopenexrdevel += $(DESCRIPTION) - developer package +SPKG_DESC_CSWopenexrdoc += $(DESCRIPTION) - documentation PKGFILES_CSWopenexrrt = $(PKGFILES_RT) PKGFILES_CSWopenexrdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWopenexrdoc = $(docdir)/OpenEXR.* +ARCHALL_CSWopenexrdoc = 1 + RUNTIME_DEP_PKGS_CSWopenexr += CSWopenexrrt RUNTIME_DEP_PKGS_CSWopenexr += CSWilmbase RUNTIME_DEP_PKGS_CSWopenexr += CSWzlib RUNTIME_DEP_PKGS_CSWopenexrrt += CSWilmbase CSWzlib -RUNTIME_DEP_PKGS_CSWopenexrdevel += CSWopenexr +RUNTIME_DEP_PKGS_CSWopenexrdevel += CSWopenexrrt +RUNTIME_DEP_PKGS_CSWopenexrdoc += SPKG_SOURCEURL = http://www.openexr.com +CHECKPKG_OVERRIDES_CSWopenexrdevel += missing-dependency|CSWopenexr + LICENSE = LICENSE 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 skayser at users.sourceforge.net Thu Mar 4 20:49:22 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 04 Mar 2010 19:49:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8969] csw/mgar/pkg Message-ID: Revision: 8969 http://gar.svn.sourceforge.net/gar/?rev=8969&view=rev Author: skayser Date: 2010-03-04 19:49:22 +0000 (Thu, 04 Mar 2010) Log Message: ----------- httperf: initial commit Added Paths: ----------- csw/mgar/pkg/httperf/ csw/mgar/pkg/httperf/branches/ csw/mgar/pkg/httperf/tags/ csw/mgar/pkg/httperf/trunk/ csw/mgar/pkg/httperf/trunk/Makefile csw/mgar/pkg/httperf/trunk/checksums csw/mgar/pkg/httperf/trunk/files/ csw/mgar/pkg/httperf/trunk/files/0001-Move-cpp-includes-from-AM_CFLAGS-to-AM_CPPFLAGS.patch csw/mgar/pkg/httperf/trunk/files/0002-getopt.c-include-header-files-for-getpid-and-strlen-.patch csw/mgar/pkg/httperf/trunk/files/0003-avoid-variably-modified-type-in-struct.patch Property changes on: csw/mgar/pkg/httperf/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/httperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/httperf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/httperf/trunk/Makefile 2010-03-04 19:49:22 UTC (rev 8969) @@ -0,0 +1,54 @@ +# TODO +# ! Doesn't compile yet, getopt.h is unhappy about the inclusion of +# unistd.h (from patch 0002-...) +# +# source='getopt.c' object='getopt.o' libtool=no \ +# DEPDIR=.deps depmode=none /bin/bash ../../depcomp \ +# /opt/studio/SOS11/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I../.. -I/opt/csw/include -xO3 -xarch=386 -DHAVE_SSL -c getopt.c +#"/usr/include/iso/stdio_iso.h", line 165: identifier redeclared: rename +# current : function(pointer to char, pointer to char) returning int +# previous: function(pointer to const char, pointer to const char) returning int : "/usr/include/unistd.h", line 382 +#"/usr/include/stdio.h", line 265: identifier redeclared: getopt +# current : function(int, pointer to pointer to char, pointer to char) returning int +# previous: function(int, pointer to const pointer to char, pointer to const char) returning int : "/usr/include/unistd.h", line 282 +# +GARNAME = httperf +GARVERSION = 0.9.0 +CATEGORIES = apps + +DESCRIPTION = A tool for measuring web server performance. +define BLURB + Httperf is a tool for measuring web server performance. It provides a + flexible facility for generating various HTTP workloads and for + measuring server performance. + + The focus of httperf is not on implementing one particular benchmark but + on providing a robust, high-performance tool that facilitates the + construction of both micro- and macro-level benchmarks. The three + distinguishing characteristics of httperf are its robustness, which + includes the ability to generate and sustain server overload, support + for the HTTP/1.1 and SSL protocols, and its extensibility to new + workload generators and performance measurements. +endef + +VENDOR_URL = http://code.google.com/p/httperf/ +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# Put source tree -I instructions first so that is not picked +# up from -I/opt/csw/lib +PATCHFILES = 0001-Move-cpp-includes-from-AM_CFLAGS-to-AM_CPPFLAGS.patch +# Avoid implicit declarations for getpid and some str* functions +PATCHFILES += 0002-getopt.c-include-header-files-for-getpid-and-strlen-.patch +# Rewrite non-constant subscript in array declaration to make cc happy +PATCHFILES += 0003-avoid-variably-modified-type-in-struct.patch + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +# Patch 0001 tweaks "Makefile.am"s so we then pull out the autoreconf hammer +pre-configure-modulated: + autoreconf -fi $(WORKSRC) + @$(MAKECOOKIE) Added: csw/mgar/pkg/httperf/trunk/checksums =================================================================== --- csw/mgar/pkg/httperf/trunk/checksums (rev 0) +++ csw/mgar/pkg/httperf/trunk/checksums 2010-03-04 19:49:22 UTC (rev 8969) @@ -0,0 +1,4 @@ +b5e6a0c732e428134783b6ec6e06c577 0001-Move-cpp-includes-from-AM_CFLAGS-to-AM_CPPFLAGS.patch +4e9453cdd9a71c843b2e4dd561073f6c 0002-getopt.c-include-header-files-for-getpid-and-strlen-.patch +858eeb97b1106d2d4dbd2c171040866e 0003-avoid-variably-modified-type-in-struct.patch +2968c36b9ecf3d98fc1f2c1c9c0d9341 httperf-0.9.0.tar.gz Added: csw/mgar/pkg/httperf/trunk/files/0001-Move-cpp-includes-from-AM_CFLAGS-to-AM_CPPFLAGS.patch =================================================================== --- csw/mgar/pkg/httperf/trunk/files/0001-Move-cpp-includes-from-AM_CFLAGS-to-AM_CPPFLAGS.patch (rev 0) +++ csw/mgar/pkg/httperf/trunk/files/0001-Move-cpp-includes-from-AM_CFLAGS-to-AM_CPPFLAGS.patch 2010-03-04 19:49:22 UTC (rev 8969) @@ -0,0 +1,49 @@ +From 032fdb655f2c9096920c925577396fb71b9d7a78 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Thu, 4 Mar 2010 19:37:27 +0100 +Subject: [PATCH 1/3] Move cpp includes from AM_CFLAGS to AM_CPPFLAGS + +--- + src/Makefile.am | 2 +- + src/gen/Makefile.am | 2 +- + src/stat/Makefile.am | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 6685b4d..a91540d 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,7 +1,7 @@ + SUBDIRS = gen lib stat + + # what flags you want to pass to the C compiler & linker +-AM_CFLAGS = -I$(srcdir) -I$(srcdir)/gen -I$(srcdir)/lib -I$(srcdir)/stat ++AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/gen -I$(srcdir)/lib -I$(srcdir)/stat + + bin_PROGRAMS = httperf idleconn + httperf_SOURCES = httperf.c httperf.h object.c object.h call.c call.h conn.c \ +diff --git a/src/gen/Makefile.am b/src/gen/Makefile.am +index 740f27e..75dff29 100644 +--- a/src/gen/Makefile.am ++++ b/src/gen/Makefile.am +@@ -1,5 +1,5 @@ + # what flags you want to pass to the C compiler & linker +-AM_CFLAGS = -I$(srcdir)/.. ++AM_CPPFLAGS = -I$(srcdir)/.. + AM_LDFLAGS = + + noinst_LIBRARIES = libgen.a +diff --git a/src/stat/Makefile.am b/src/stat/Makefile.am +index 08498aa..d98f3cb 100644 +--- a/src/stat/Makefile.am ++++ b/src/stat/Makefile.am +@@ -1,5 +1,5 @@ + # what flags you want to pass to the C compiler & linker +-AM_CFLAGS = -I$(srcdir)/.. -I$(srcdir)/../gen ++AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../gen + + noinst_LIBRARIES = libstat.a + libstat_a_SOURCES = basic.c sess_stat.c print_reply.c stats.h +-- +1.6.6 + Added: csw/mgar/pkg/httperf/trunk/files/0002-getopt.c-include-header-files-for-getpid-and-strlen-.patch =================================================================== --- csw/mgar/pkg/httperf/trunk/files/0002-getopt.c-include-header-files-for-getpid-and-strlen-.patch (rev 0) +++ csw/mgar/pkg/httperf/trunk/files/0002-getopt.c-include-header-files-for-getpid-and-strlen-.patch 2010-03-04 19:49:22 UTC (rev 8969) @@ -0,0 +1,44 @@ +From 49711d5440c1c4711f2f8f1f52a0bcec1a901ad4 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Thu, 4 Mar 2010 20:06:33 +0100 +Subject: [PATCH 2/3] getopt.c: include header files for getpid and strlen,strcmp,strncmp + +--- + configure.ac | 1 + + src/lib/getopt.c | 8 ++++++++ + 2 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2ef6369..811c0ad 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -51,6 +51,7 @@ AC_C_CONST + AC_TYPE_SIZE_T + AC_TYPE_SSIZE_T + AC_HEADER_TIME ++AC_HEADER_STDC + AC_CHECK_TYPE(u_char, unsigned char) + AC_CHECK_TYPE(u_short, unsigned short) + AC_CHECK_TYPE(u_int, unsigned int) +diff --git a/src/lib/getopt.c b/src/lib/getopt.c +index 1b386c0..4a7d279 100644 +--- a/src/lib/getopt.c ++++ b/src/lib/getopt.c +@@ -32,6 +32,14 @@ Cambridge, MA 02139, USA. */ + + #include "config.h" + ++#ifdef HAVE_STRING_H ++# include ++#endif ++ ++#ifdef HAVE_UNISTD_H ++# include ++#endif ++ + #ifndef HAVE_GETOPT_LONG + + #if !defined (__STDC__) || !__STDC__ +-- +1.6.6 + Added: csw/mgar/pkg/httperf/trunk/files/0003-avoid-variably-modified-type-in-struct.patch =================================================================== --- csw/mgar/pkg/httperf/trunk/files/0003-avoid-variably-modified-type-in-struct.patch (rev 0) +++ csw/mgar/pkg/httperf/trunk/files/0003-avoid-variably-modified-type-in-struct.patch 2010-03-04 19:49:22 UTC (rev 8969) @@ -0,0 +1,36 @@ +From 21ad56ee66fc00014fdc7c53ddd26c4d556c7867 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Thu, 4 Mar 2010 20:33:33 +0100 +Subject: [PATCH 3/3] avoid variably modified type in struct + +This rewrites the floating point operation (i.e. non integer constant) +for the array length of conn_lifetime_hist to an integer constant. +Otherwise cc is unhappy. + + "basic.c", line 97: warning: can not declare variably modified type at file scope + "basic.c", line 97: warning: member can not have variably modified type: conn_lifetime_hist + +For some background details see: +Sun Studio C - Is this warning valid? Is it suppressable? +http://forums.sun.com/thread.jspa?threadID=5412459 +--- + src/stat/basic.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/src/stat/basic.c b/src/stat/basic.c +index e5c4b77..be57bc3 100644 +--- a/src/stat/basic.c ++++ b/src/stat/basic.c +@@ -50,7 +50,8 @@ + times. */ + #define MAX_LIFETIME 100.0 /* max. conn. lifetime in seconds */ + #define BIN_WIDTH 1e-3 +-#define NUM_BINS ((u_int) (MAX_LIFETIME / BIN_WIDTH)) ++/*#define NUM_BINS ((u_int) (MAX_LIFETIME / BIN_WIDTH)) */ ++#define NUM_BINS 100000 + + static struct + { +-- +1.6.6 + 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 Mar 4 21:36:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Mar 2010 20:36:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8971] csw/mgar/pkg/cpan/XML-SAX/trunk Message-ID: Revision: 8971 http://gar.svn.sourceforge.net/gar/?rev=8971&view=rev Author: dmichelsen Date: 2010-03-04 20:35:51 +0000 (Thu, 04 Mar 2010) Log Message: ----------- cpan/XML-SAX: Update to 0.96 to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/XML-SAX/trunk/Makefile csw/mgar/pkg/cpan/XML-SAX/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/XML-SAX/trunk/files/CSWpmxmlsax.depend csw/mgar/pkg/cpan/XML-SAX/trunk/files/CSWpmxmlsax.gspec csw/mgar/pkg/cpan/XML-SAX/trunk/files/CSWpmxmlsax.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/XML-SAX/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-SAX/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-SAX/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-SAX/trunk/Makefile 2010-03-04 20:32:29 UTC (rev 8970) +++ csw/mgar/pkg/cpan/XML-SAX/trunk/Makefile 2010-03-04 20:35:51 UTC (rev 8971) @@ -1,7 +1,7 @@ GARNAME = XML-SAX -GARVERSION = 0.14 +GARVERSION = 0.96 CATEGORIES = cpan -AUTHOR = MSERGEANT +AUTHOR = GRANTM DESCRIPTION = Simple API for XML define BLURB @@ -10,11 +10,13 @@ returning any SAX parser installed on the user's system. endef -DISTFILES += $(call admfiles,CSWpmxmlsax,depend prototype) +DEP_PKGS = CSWpmxmlnssupp -DEPENDS += cpan/XML-NamespaceSupport +PACKAGES = CSWpmxmlsax +CATALOGNAME = pm_xmlsax -# Enable modification of ParserDetails.ini -PATCHFILES = parser.diff +LICENSE = LICENSE +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/XML-SAX/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-SAX/trunk/checksums 2010-03-04 20:32:29 UTC (rev 8970) +++ csw/mgar/pkg/cpan/XML-SAX/trunk/checksums 2010-03-04 20:35:51 UTC (rev 8971) @@ -1,5 +1 @@ -5496c875c7478447ea9dcb12a5e92ebe download/CSWpmxmlsax.gspec -a8ef1ed6e7a28d12e590755ec072a5c2 download/CSWpmxmlsax.depend -3b7f2055606bf4074ad30f9123069ef1 download/CSWpmxmlsax.prototype -ab13c04a3cf63a0ae63fa73c863cf23e download/XML-SAX-0.14.tar.gz -292ccc427416fb2a13025c24d87f2e24 download/parser.diff +bdcd4119a62505184e211e9dfaef0ab1 XML-SAX-0.96.tar.gz Deleted: csw/mgar/pkg/cpan/XML-SAX/trunk/files/CSWpmxmlsax.depend =================================================================== --- csw/mgar/pkg/cpan/XML-SAX/trunk/files/CSWpmxmlsax.depend 2010-03-04 20:32:29 UTC (rev 8970) +++ csw/mgar/pkg/cpan/XML-SAX/trunk/files/CSWpmxmlsax.depend 2010-03-04 20:35:51 UTC (rev 8971) @@ -1 +0,0 @@ -P CSWpmxmlnssupp pm_xmlnssupp - a simple generic namespace support class Deleted: csw/mgar/pkg/cpan/XML-SAX/trunk/files/CSWpmxmlsax.gspec =================================================================== --- csw/mgar/pkg/cpan/XML-SAX/trunk/files/CSWpmxmlsax.gspec 2010-03-04 20:32:29 UTC (rev 8970) +++ csw/mgar/pkg/cpan/XML-SAX/trunk/files/CSWpmxmlsax.gspec 2010-03-04 20:35:51 UTC (rev 8971) @@ -1,5 +0,0 @@ -%var bitname pm_xmlsax -%var pkgname CSWpmxmlsax -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/cpan/XML-SAX/trunk/files/CSWpmxmlsax.prototype =================================================================== --- csw/mgar/pkg/cpan/XML-SAX/trunk/files/CSWpmxmlsax.prototype 2010-03-04 20:32:29 UTC (rev 8970) +++ csw/mgar/pkg/cpan/XML-SAX/trunk/files/CSWpmxmlsax.prototype 2010-03-04 20:35:51 UTC (rev 8971) @@ -1,47 +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/XML 0755 root bin -d none /opt/csw/lib/perl/csw/auto/XML/SAX 0755 root bin -f none /opt/csw/lib/perl/csw/auto/XML/SAX/.packlist 0444 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/XML::SAX.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::SAX::Base.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::SAX::DocumentLocator.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::SAX::Exception.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::SAX::Intro.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::SAX::ParserFactory.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::SAX::PurePerl.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::SAX::PurePerl::Reader.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/XML 0755 root bin -f none /opt/csw/share/perl/csw/XML/SAX.pm 0444 root bin -d none /opt/csw/share/perl/csw/XML/SAX 0755 root bin -f none /opt/csw/share/perl/csw/XML/SAX/Base.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/DocumentLocator.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/Exception.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/Intro.pod 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/ParserFactory.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl.pm 0444 root bin -d none /opt/csw/share/perl/csw/XML/SAX/PurePerl 0755 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl/DTDDecls.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl/DebugHandler.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl/DocType.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl/EncodingDetect.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl/Exception.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl/NoUnicodeExt.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl/Productions.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl/Reader.pm 0444 root bin -d none /opt/csw/share/perl/csw/XML/SAX/PurePerl/Reader 0755 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl/Reader/NoUnicodeExt.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl/Reader/Stream.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl/Reader/String.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl/Reader/URI.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl/Reader/UnicodeExt.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl/UnicodeExt.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/PurePerl/XMLDecl.pm 0444 root bin -f none /opt/csw/share/perl/csw/XML/SAX/placeholder.pl 0444 root 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 Thu Mar 4 21:48:37 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 04 Mar 2010 20:48:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8972] csw/mgar/pkg/httperf/trunk Message-ID: Revision: 8972 http://gar.svn.sourceforge.net/gar/?rev=8972&view=rev Author: skayser Date: 2010-03-04 20:48:23 +0000 (Thu, 04 Mar 2010) Log Message: ----------- httperf: added license and changelog.CSW Modified Paths: -------------- csw/mgar/pkg/httperf/trunk/Makefile csw/mgar/pkg/httperf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/httperf/trunk/files/COPYING csw/mgar/pkg/httperf/trunk/files/changelog.CSW Modified: csw/mgar/pkg/httperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/httperf/trunk/Makefile 2010-03-04 20:35:51 UTC (rev 8971) +++ csw/mgar/pkg/httperf/trunk/Makefile 2010-03-04 20:48:23 UTC (rev 8972) @@ -36,15 +36,23 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# License taken from one of the .c files in lieu of an official COPYING +DISTFILES = COPYING + +RUNTIME_DEP_PKGS_CSWhttperf += CSWosslrt + # Put source tree -I instructions first so that is not picked # up from -I/opt/csw/lib PATCHFILES = 0001-Move-cpp-includes-from-AM_CFLAGS-to-AM_CPPFLAGS.patch -# Avoid implicit declarations for getpid and some str* functions -PATCHFILES += 0002-getopt.c-include-header-files-for-getpid-and-strlen-.patch +# Avoid implicit declarations for getpid and some str* functions. +# Commented out as unistd.h causes rename()/getopt() redeclarations in getopt.c +#PATCHFILES += 0002-getopt.c-include-header-files-for-getpid-and-strlen-.patch + # Rewrite non-constant subscript in array declaration to make cc happy PATCHFILES += 0003-avoid-variably-modified-type-in-struct.patch CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = include gar/category.mk @@ -52,3 +60,9 @@ pre-configure-modulated: autoreconf -fi $(WORKSRC) @$(MAKECOOKIE) + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: + ginstall -D $(WORKSRC)/AUTHORS $(DOCDEST)/AUTHORS + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/httperf/trunk/checksums =================================================================== --- csw/mgar/pkg/httperf/trunk/checksums 2010-03-04 20:35:51 UTC (rev 8971) +++ csw/mgar/pkg/httperf/trunk/checksums 2010-03-04 20:48:23 UTC (rev 8972) @@ -1,4 +1,3 @@ b5e6a0c732e428134783b6ec6e06c577 0001-Move-cpp-includes-from-AM_CFLAGS-to-AM_CPPFLAGS.patch -4e9453cdd9a71c843b2e4dd561073f6c 0002-getopt.c-include-header-files-for-getpid-and-strlen-.patch 858eeb97b1106d2d4dbd2c171040866e 0003-avoid-variably-modified-type-in-struct.patch -2968c36b9ecf3d98fc1f2c1c9c0d9341 httperf-0.9.0.tar.gz +ffe0c63c95c3bc2893bccf6561d9c013 COPYING Added: csw/mgar/pkg/httperf/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/httperf/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/httperf/trunk/files/COPYING 2010-03-04 20:48:23 UTC (rev 8972) @@ -0,0 +1,31 @@ + httperf -- a tool for measuring web server performance + Copyright 2000-2007 Hewlett-Packard Company and Contributors listed in + AUTHORS file. Originally contributed by David Mosberger-Tang + + This file is part of httperf, a web server performance measurment + tool. + + 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. + + In addition, as a special exception, the copyright holders give + permission to link the code of this work with the OpenSSL project's + "OpenSSL" library (or with modified versions of it that use the same + license as the "OpenSSL" library), and distribute linked combinations + including the two. You must obey the GNU General Public License in + all respects for all of the code used other than "OpenSSL". If you + modify this file, you may extend this exception to your version of the + file, but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your 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., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA Added: csw/mgar/pkg/httperf/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/httperf/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/httperf/trunk/files/changelog.CSW 2010-03-04 20:48:23 UTC (rev 8972) @@ -0,0 +1,5 @@ +httperf (0.9.0,REV=2010.03.04) + + * Initial release. + + -- Sebastian Kayser Thu, 4 Mar 2010 21:38:05 +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 Thu Mar 4 21:32:29 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Mar 2010 20:32:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8970] csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk Message-ID: Revision: 8970 http://gar.svn.sourceforge.net/gar/?rev=8970&view=rev Author: dmichelsen Date: 2010-03-04 20:32:29 +0000 (Thu, 04 Mar 2010) Log Message: ----------- cpan/XML-NamespaceSupport: Update to 1.10 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/Makefile csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/files/CSWpmxmlnssupp.gspec csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/files/CSWpmxmlnssupp.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-NamespaceSupport/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-NamespaceSupport/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/Makefile 2010-03-04 19:49:22 UTC (rev 8969) +++ csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/Makefile 2010-03-04 20:32:29 UTC (rev 8970) @@ -1,15 +1,22 @@ GARNAME = XML-NamespaceSupport -GARVERSION = 1.09 +GARVERSION = 1.10 CATEGORIES = cpan -AUTHOR = RBERJON +AUTHOR = PERIGRIN -DESCRIPTION = a simple generic namespace support class +DESCRIPTION = Simple generic namespace support class define BLURB This module offers a simple to process namespaced XML names (unames) from within any application that may need them. It also helps maintain a prefix to namespace URI map, and provides a number of basic checks. endef -DISTFILES += $(call admfiles,CSWpmxmlnssupp,prototype) +DISTFILES = COPYING +PACKAGES = CSWpmxmlnssupp +CATALOGNAME = pm_xmlnssupp + +PERL_CONFIGURE_ARGS = --skip + +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/checksums 2010-03-04 19:49:22 UTC (rev 8969) +++ csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/checksums 2010-03-04 20:32:29 UTC (rev 8970) @@ -1,3 +1,2 @@ -3bfd46df15e7c8955baf80e4712ce388 download/CSWpmxmlnssupp.gspec -ce04b3def37b96699c802ecf3f5d245f download/CSWpmxmlnssupp.prototype -b0867d7b599d8a63ba630fa6227936fe download/XML-NamespaceSupport-1.09.tar.gz +3bfd46df15e7c8955baf80e4712ce388 COPYING +0a760067d4b517672f064e911679c509 XML-NamespaceSupport-1.10.tar.gz Copied: csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/files/COPYING (from rev 8930, csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/files/CSWpmxmlnssupp.gspec) =================================================================== --- csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/files/COPYING 2010-03-04 20:32:29 UTC (rev 8970) @@ -0,0 +1,8 @@ +%var bitname pm_xmlnssupp +%var pkgname CSWpmxmlnssupp +%var arch all +%include url file://%{PKGLIB}/csw_cpan.gspec +%copyright +Copyright (c) 2001-2002 Robin Berjon. 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/XML-NamespaceSupport/trunk/files/CSWpmxmlnssupp.gspec =================================================================== --- csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/files/CSWpmxmlnssupp.gspec 2010-03-04 19:49:22 UTC (rev 8969) +++ csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/files/CSWpmxmlnssupp.gspec 2010-03-04 20:32:29 UTC (rev 8970) @@ -1,8 +0,0 @@ -%var bitname pm_xmlnssupp -%var pkgname CSWpmxmlnssupp -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2001-2002 Robin Berjon. 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/XML-NamespaceSupport/trunk/files/CSWpmxmlnssupp.prototype =================================================================== --- csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/files/CSWpmxmlnssupp.prototype 2010-03-04 19:49:22 UTC (rev 8969) +++ csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/files/CSWpmxmlnssupp.prototype 2010-03-04 20:32:29 UTC (rev 8970) @@ -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/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/XML 0755 root bin -d none /opt/csw/lib/perl/csw/auto/XML/NamespaceSupport 0755 root bin -f none /opt/csw/lib/perl/csw/auto/XML/NamespaceSupport/.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/XML::NamespaceSupport.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/XML 0755 root bin -f none /opt/csw/share/perl/csw/XML/NamespaceSupport.pm 0555 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 Thu Mar 4 21:57:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Mar 2010 20:57:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8973] csw/mgar/pkg Message-ID: Revision: 8973 http://gar.svn.sourceforge.net/gar/?rev=8973&view=rev Author: dmichelsen Date: 2010-03-04 20:57:34 +0000 (Thu, 04 Mar 2010) Log Message: ----------- tkdiff: Initial commit Added Paths: ----------- csw/mgar/pkg/tkdiff/ csw/mgar/pkg/tkdiff/branches/ csw/mgar/pkg/tkdiff/tags/ csw/mgar/pkg/tkdiff/trunk/ csw/mgar/pkg/tkdiff/trunk/Makefile csw/mgar/pkg/tkdiff/trunk/checksums csw/mgar/pkg/tkdiff/trunk/files/ csw/mgar/pkg/tkdiff/trunk/files/force-csw-wish.patch Property changes on: csw/mgar/pkg/tkdiff/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/tkdiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tkdiff/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tkdiff/trunk/Makefile 2010-03-04 20:57:34 UTC (rev 8973) @@ -0,0 +1,29 @@ +GARNAME = tkdiff +GARVERSION = 4.1.4 +CATEGORIES = utils + +DESCRIPTION = A graphical diff tool +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +DISTNAME = $(GARNAME)-$(GARVERSION)-unix +DISTFILES = $(DISTNAME).tar.gz +PATCHFILES = force-csw-wish.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-unix.tar.gz + +DEP_PKGS = CSWtk + +BUILD_SCRIPTS = +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/tkdiff $(DESTDIR)$(bindir)/tkdiff + @$(MAKECOOKIE) Added: csw/mgar/pkg/tkdiff/trunk/checksums =================================================================== --- csw/mgar/pkg/tkdiff/trunk/checksums (rev 0) +++ csw/mgar/pkg/tkdiff/trunk/checksums 2010-03-04 20:57:34 UTC (rev 8973) @@ -0,0 +1,2 @@ +073909cbcda23f9365a3f38463a3b011 force-csw-wish.patch +f904fbbb71ab2ab5390f747e6c1114ee tkdiff-4.1.4-unix.tar.gz Added: csw/mgar/pkg/tkdiff/trunk/files/force-csw-wish.patch =================================================================== --- csw/mgar/pkg/tkdiff/trunk/files/force-csw-wish.patch (rev 0) +++ csw/mgar/pkg/tkdiff/trunk/files/force-csw-wish.patch 2010-03-04 20:57:34 UTC (rev 8973) @@ -0,0 +1,11 @@ +--- tkdiff-4.1.4-unix.orig/tkdiff 2007-11-15 07:52:48.000000000 +0100 ++++ tkdiff-4.1.4-unix/tkdiff 2008-04-11 21:31:52.000000000 +0200 +@@ -1,7 +1,7 @@ + #!/bin/sh + #-*-tcl-*- + # the next line restarts using wish \ +-exec wish "$0" -- ${1+"$@"} ++exec /opt/csw/bin/wish "$0" -- ${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 Mar 4 21:58:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Mar 2010 20:58:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8974] csw/mgar/pkg/tkdiff/trunk/Makefile Message-ID: Revision: 8974 http://gar.svn.sourceforge.net/gar/?rev=8974&view=rev Author: dmichelsen Date: 2010-03-04 20:58:16 +0000 (Thu, 04 Mar 2010) Log Message: ----------- tkdiff: Update vendor URL Modified Paths: -------------- csw/mgar/pkg/tkdiff/trunk/Makefile Modified: csw/mgar/pkg/tkdiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tkdiff/trunk/Makefile 2010-03-04 20:57:34 UTC (rev 8973) +++ csw/mgar/pkg/tkdiff/trunk/Makefile 2010-03-04 20:58:16 UTC (rev 8974) @@ -16,6 +16,8 @@ DEP_PKGS = CSWtk +VENDOR_URL = http://tkdiff.sourceforge.net/ + BUILD_SCRIPTS = CONFIGURE_SCRIPTS = TEST_SCRIPTS = 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 Mar 4 22:00:01 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 04 Mar 2010 21:00:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[8975] csw/mgar/pkg/tkdiff/trunk/Makefile Message-ID: Revision: 8975 http://gar.svn.sourceforge.net/gar/?rev=8975&view=rev Author: dmichelsen Date: 2010-03-04 21:00:01 +0000 (Thu, 04 Mar 2010) Log Message: ----------- tkdiff: Add ARCHALL Modified Paths: -------------- csw/mgar/pkg/tkdiff/trunk/Makefile Modified: csw/mgar/pkg/tkdiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tkdiff/trunk/Makefile 2010-03-04 20:58:16 UTC (rev 8974) +++ csw/mgar/pkg/tkdiff/trunk/Makefile 2010-03-04 21:00:01 UTC (rev 8975) @@ -23,6 +23,8 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom +ARCHALL = 1 + include gar/category.mk install-custom: 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 Mar 4 22:16:03 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Mar 2010 21:16:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8976] csw/mgar/pkg Message-ID: Revision: 8976 http://gar.svn.sourceforge.net/gar/?rev=8976&view=rev Author: wahwah Date: 2010-03-04 21:15:57 +0000 (Thu, 04 Mar 2010) Log Message: ----------- evince: Initial commit, doesn't build yet. Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile csw/mgar/pkg/evince/trunk/checksums Added Paths: ----------- csw/mgar/pkg/evince/ Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/evince/trunk/Makefile 2010-03-04 21:15:57 UTC (rev 8976) @@ -2,184 +2,17 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = evince +GNOME_VERSION = 2.22 +GARVERSION = $(GNOME_VERSION).2 +CATEGORIES = gnome +DESCRIPTION = Document viewer for multiple document formats define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://projects.gnome.org/evince/ +MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(GARNAME)/$(GNOME_VERSION)/ 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 -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +STRIP_LIBTOOL = 1 +include gar/category.mk Modified: csw/mgar/pkg/evince/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-02-13 12:42:13 UTC (rev 8535) +++ csw/mgar/pkg/evince/trunk/checksums 2010-03-04 21:15:57 UTC (rev 8976) @@ -0,0 +1 @@ +b1d923e6524701e2d372c37cbd534f4b evince-2.22.2.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 Mar 4 22:52:06 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 04 Mar 2010 21:52:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8977] csw/mgar/pkg Message-ID: Revision: 8977 http://gar.svn.sourceforge.net/gar/?rev=8977&view=rev Author: skayser Date: 2010-03-04 21:52:06 +0000 (Thu, 04 Mar 2010) Log Message: ----------- autobench: initial commit Added Paths: ----------- csw/mgar/pkg/autobench/ csw/mgar/pkg/autobench/branches/ csw/mgar/pkg/autobench/tags/ csw/mgar/pkg/autobench/trunk/ csw/mgar/pkg/autobench/trunk/Makefile csw/mgar/pkg/autobench/trunk/checksums csw/mgar/pkg/autobench/trunk/files/ csw/mgar/pkg/autobench/trunk/files/0001-Makefile-only-set-defaults-if-not-explicitly-given.patch csw/mgar/pkg/autobench/trunk/files/0002-man-pages-adjust-default-conf-location.patch csw/mgar/pkg/autobench/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/autobench/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/autobench/trunk/Makefile =================================================================== --- csw/mgar/pkg/autobench/trunk/Makefile (rev 0) +++ csw/mgar/pkg/autobench/trunk/Makefile 2010-03-04 21:52:06 UTC (rev 8977) @@ -0,0 +1,56 @@ +GARNAME = autobench +GARVERSION = 2.1.2 +CATEGORIES = apps + +DESCRIPTION = Wrapper around httperf which automates the benchmarking process +define BLURB + Autobench is a simple Perl script for automating the process of + benchmarking a web server (or for conducting a comparative test of two + different web servers). The script is a wrapper around httperf. + Autobench runs httperf a number of times against each host, increasing + the number of requested connections per second on each iteration, and + extracts the significant data from the httperf output, delivering a CSV + or TSV format file which can be imported directly into a spreadsheet for + analysis/graphing. +endef + +VENDOR_URL = http://www.xenoclast.org/autobench/ +MASTER_SITES = http://www.xenoclast.org/autobench/downloads/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +LICENSE = LICENCE + +# Make the Makefile honor our defaults +PATCHFILES = 0001-Makefile-only-set-defaults-if-not-explicitly-given.patch +# Adjust config file location paths +PATCHFILES += 0002-man-pages-adjust-default-conf-location.patch + +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = + +# Override the /usr/local installation defaults, the config is only used +# to pre-populate a user config, so we move it to examples +BINDIR=$(DESTDIR)$(bindir) +MANDIR=$(DESTDIR)$(mandir)/man1 +ETCDIR=$(DESTDIR)$(docdir)/$(GARNAME)/examples +INSTALL_EXPORTS=BINDIR MANDIR ETCDIR + +EXTRA_PAX_ARGS = '-s,ChangeLog$$,changelog,p' + +include gar/category.mk + +# See above, config is only used as a template +pre-install-modulated: + gsed -i -e 's,/etc/autobench.conf,$(ETCDIR)/autobench.conf,' \ + $(WORKSRC)/autobench \ + $(WORKSRC)/autobench_admin + @$(MAKECOOKIE) + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: DOCS=ChangeLog +post-install-modulated: + mkdir -p $(DOCDEST) + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Added: csw/mgar/pkg/autobench/trunk/checksums =================================================================== --- csw/mgar/pkg/autobench/trunk/checksums (rev 0) +++ csw/mgar/pkg/autobench/trunk/checksums 2010-03-04 21:52:06 UTC (rev 8977) @@ -0,0 +1,3 @@ +6687489b7b1c249b622ba6a3d0100fa0 0001-Makefile-only-set-defaults-if-not-explicitly-given.patch +dbf7db26670e07cdcb4ffd2b70bd9451 0002-man-pages-adjust-default-conf-location.patch +dbd00818840ed8d3c3d35734f0353cff autobench-2.1.2.tar.gz Added: csw/mgar/pkg/autobench/trunk/files/0001-Makefile-only-set-defaults-if-not-explicitly-given.patch =================================================================== --- csw/mgar/pkg/autobench/trunk/files/0001-Makefile-only-set-defaults-if-not-explicitly-given.patch (rev 0) +++ csw/mgar/pkg/autobench/trunk/files/0001-Makefile-only-set-defaults-if-not-explicitly-given.patch 2010-03-04 21:52:06 UTC (rev 8977) @@ -0,0 +1,50 @@ +From c4d419358421a3d6c54adc1d9a4118b4245581e1 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Thu, 4 Mar 2010 22:07:10 +0100 +Subject: [PATCH 1/2] Makefile: only set defaults if not explicitly given + +--- + Makefile | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index b0e9539..eaf2323 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + # Makefile for autobench scripts + VERSION = 2.1.2 +-PREFIX = /usr/local ++PREFIX ?= /usr/local + + # Automatically set correct paths for building Debian packages + ifdef DEB_BUILD_ARCH +@@ -9,9 +9,9 @@ ifdef DEB_BUILD_ARCH + PREFIX = $(DESTDIR) + endif + +-BINDIR = $(PREFIX)$(ROOTBIN_PREFIX)/bin +-MANDIR = $(PREFIX)$(ROOTMAN_PREFIX)/man/man1 +-ETCDIR = $(PREFIX)/etc ++BINDIR ?= $(PREFIX)$(ROOTBIN_PREFIX)/bin ++MANDIR ?= $(PREFIX)$(ROOTMAN_PREFIX)/man/man1 ++ETCDIR ?= $(PREFIX)/etc + + ifdef DEB_BUILD_ARCH + export AB_CFG = /etc/autobench.conf +@@ -20,9 +20,9 @@ else + endif + + # Compiler & flags +-CC=gcc +-CFLAGS=-O2 -Wall +-DEBUG_FLAGS=-Wall -g ++CC?=gcc ++CFLAGS?=-O2 -Wall ++DEBUG_FLAGS?=-Wall -g + + #--------------------------------------------------------------------------- + # Release related +-- +1.6.6 + Added: csw/mgar/pkg/autobench/trunk/files/0002-man-pages-adjust-default-conf-location.patch =================================================================== --- csw/mgar/pkg/autobench/trunk/files/0002-man-pages-adjust-default-conf-location.patch (rev 0) +++ csw/mgar/pkg/autobench/trunk/files/0002-man-pages-adjust-default-conf-location.patch 2010-03-04 21:52:06 UTC (rev 8977) @@ -0,0 +1,56 @@ +From 2dcc550bd0c7eaa94c7dee745898121b180afcf3 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Thu, 4 Mar 2010 22:45:36 +0100 +Subject: [PATCH 2/2] man pages: adjust default conf location + +--- + autobench.1 | 6 ++---- + autobench_admin.1 | 8 +++----- + 2 files changed, 5 insertions(+), 9 deletions(-) + +diff --git a/autobench.1 b/autobench.1 +index 335ca58..55b30b3 100644 +--- a/autobench.1 ++++ b/autobench.1 +@@ -150,14 +150,12 @@ httperf_print-reply = body + httperf_print-request = header + .SH FILES + .TP +-.I [/usr/local]/etc/autobench.conf ++.I /opt/csw/share/doc/autobench/examples/autobench.conf + Default configuration file, copied into the user's home directory when + .B autobench + or + .B autobench_admin +-is first run. Defaults to \fI/etc/autobench.conf\fR if +-autobench was installed from the Debian package, +-\fI/usr/local/etc/autobench.conf\fR otherwise. ++is first run. + .TP + .I $HOME/.autobench.conf + The active autobench configuration file. +diff --git a/autobench_admin.1 b/autobench_admin.1 +index aa5b74b..30ed6c8 100644 +--- a/autobench_admin.1 ++++ b/autobench_admin.1 +@@ -148,14 +148,12 @@ httperf_print-reply = body + httperf_print-request = header + .SH FILES + .TP +-.I [/usr/local]/etc/autobench.conf ++.I /opt/csw/share/doc/autobench/examples/autobench.conf + Default configuration file, copied into the user's home directory when +-.B autobench ++.B autobench + or + .B autobench_admin +-is first run. Defaults to \fI/etc/autobench.conf\fR if +-autobench was installed from the Debian package, +-\fI/usr/local/etc/autobench.conf\fR otherwise. ++is first run. + .TP + .I $HOME/.autobench.conf + The active autobench configuration file. +-- +1.6.6 + Added: csw/mgar/pkg/autobench/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/autobench/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/autobench/trunk/files/changelog.CSW 2010-03-04 21:52:06 UTC (rev 8977) @@ -0,0 +1,5 @@ +autobench (2.1.2,REV=2010.03.04) + + * Initial release. + + -- Sebastian Kayser Thu, 4 Mar 2010 22:14:24 +0100 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 Mar 4 23:11:14 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 04 Mar 2010 22:11:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8978] csw/mgar/pkg/httperf/trunk/Makefile Message-ID: Revision: 8978 http://gar.svn.sourceforge.net/gar/?rev=8978&view=rev Author: skayser Date: 2010-03-04 22:11:14 +0000 (Thu, 04 Mar 2010) Log Message: ----------- httperf: fix DISTFILES Modified Paths: -------------- csw/mgar/pkg/httperf/trunk/Makefile Modified: csw/mgar/pkg/httperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/httperf/trunk/Makefile 2010-03-04 21:52:06 UTC (rev 8977) +++ csw/mgar/pkg/httperf/trunk/Makefile 2010-03-04 22:11:14 UTC (rev 8978) @@ -37,7 +37,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # License taken from one of the .c files in lieu of an official COPYING -DISTFILES = COPYING +DISTFILES += COPYING RUNTIME_DEP_PKGS_CSWhttperf += CSWosslrt 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 Mar 5 00:01:42 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 04 Mar 2010 23:01:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[8979] csw/mgar/pkg/pylxml/trunk/Makefile Message-ID: Revision: 8979 http://gar.svn.sourceforge.net/gar/?rev=8979&view=rev Author: skayser Date: 2010-03-04 23:01:42 +0000 (Thu, 04 Mar 2010) Log Message: ----------- pylxml: oh what a better place the world will be! Modified Paths: -------------- csw/mgar/pkg/pylxml/trunk/Makefile Modified: csw/mgar/pkg/pylxml/trunk/Makefile =================================================================== --- csw/mgar/pkg/pylxml/trunk/Makefile 2010-03-04 22:11:14 UTC (rev 8978) +++ csw/mgar/pkg/pylxml/trunk/Makefile 2010-03-04 23:01:42 UTC (rev 8979) @@ -5,7 +5,7 @@ GARVERSION = 2.2.4 CATEGORIES = python -DESCRIPTION = Pythonic binding for the libxml2 and libxslt libraries +DESCRIPTION = Easy to use and powerful libxml2/libxslt binding for Python define BLURB lxml is a Pythonic binding for the libxml2 and libxslt libraries. It is unique in that it combines the speed and feature completeness of these This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 5 00:22:29 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Mar 2010 23:22:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8980] csw/mgar/pkg/evince/trunk Message-ID: Revision: 8980 http://gar.svn.sourceforge.net/gar/?rev=8980&view=rev Author: wahwah Date: 2010-03-04 23:22:28 +0000 (Thu, 04 Mar 2010) Log Message: ----------- evince: It builds now. Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile csw/mgar/pkg/evince/trunk/checksums Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2010-03-04 23:01:42 UTC (rev 8979) +++ csw/mgar/pkg/evince/trunk/Makefile 2010-03-04 23:22:28 UTC (rev 8980) @@ -3,7 +3,7 @@ # $Id$ GARNAME = evince -GNOME_VERSION = 2.22 +GNOME_VERSION = 2.24 GARVERSION = $(GNOME_VERSION).2 CATEGORIES = gnome DESCRIPTION = Document viewer for multiple document formats @@ -15,4 +15,28 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) STRIP_LIBTOOL = 1 +EXTRA_LD_OPTIONS = /opt/csw/X11/lib/libX11.so -lm +RUNTIME_DEP_PKGS_CSWevince += CSWdbusglib +RUNTIME_DEP_PKGS_CSWevince += CSWdjvulibre +RUNTIME_DEP_PKGS_CSWevince += CSWfconfig +RUNTIME_DEP_PKGS_CSWevince += CSWftype2 +RUNTIME_DEP_PKGS_CSWevince += CSWgconf2 +RUNTIME_DEP_PKGS_CSWevince += CSWggettextrt +RUNTIME_DEP_PKGS_CSWevince += CSWglib2 +RUNTIME_DEP_PKGS_CSWevince += CSWgnomekeyring +RUNTIME_DEP_PKGS_CSWevince += CSWgtk2 +RUNTIME_DEP_PKGS_CSWevince += CSWiconv +RUNTIME_DEP_PKGS_CSWevince += CSWjpeg +RUNTIME_DEP_PKGS_CSWevince += CSWlibatk +RUNTIME_DEP_PKGS_CSWevince += CSWlibcairo +RUNTIME_DEP_PKGS_CSWevince += CSWlibdbus +RUNTIME_DEP_PKGS_CSWevince += CSWlibglade2 +RUNTIME_DEP_PKGS_CSWevince += CSWlibice +RUNTIME_DEP_PKGS_CSWevince += CSWlibsm +RUNTIME_DEP_PKGS_CSWevince += CSWlibx11 +RUNTIME_DEP_PKGS_CSWevince += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWevince += CSWpango +RUNTIME_DEP_PKGS_CSWevince += CSWpoppler +RUNTIME_DEP_PKGS_CSWevince += CSWtiff +RUNTIME_DEP_PKGS_CSWevince += CSWzlib include gar/category.mk Modified: csw/mgar/pkg/evince/trunk/checksums =================================================================== --- csw/mgar/pkg/evince/trunk/checksums 2010-03-04 23:01:42 UTC (rev 8979) +++ csw/mgar/pkg/evince/trunk/checksums 2010-03-04 23:22:28 UTC (rev 8980) @@ -1 +1 @@ -b1d923e6524701e2d372c37cbd534f4b evince-2.22.2.tar.gz +9b190961795bcb0394502597470420db evince-2.24.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 5 00:25:56 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Mar 2010 23:25:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8981] csw/mgar/pkg Message-ID: Revision: 8981 http://gar.svn.sourceforge.net/gar/?rev=8981&view=rev Author: wahwah Date: 2010-03-04 23:25:55 +0000 (Thu, 04 Mar 2010) Log Message: ----------- awesome: Initial commit, lots of dependencies are missing. Modified Paths: -------------- csw/mgar/pkg/awesome/trunk/Makefile csw/mgar/pkg/awesome/trunk/checksums Added Paths: ----------- csw/mgar/pkg/awesome/ Modified: csw/mgar/pkg/awesome/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-03-01 11:09:48 UTC (rev 8910) +++ csw/mgar/pkg/awesome/trunk/Makefile 2010-03-04 23:25:55 UTC (rev 8981) @@ -2,184 +2,31 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = awesome +GARVERSION = 3.4.4 +CATEGORIES = apps +DESCRIPTION = A tiling window manager for X define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -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 -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +SPKG_SOURCEURL = http://awesome.naquadah.org/ +MASTER_SITES = http://awesome.naquadah.org/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = awesome +INSTALL_SCRIPTS = awesome CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +GARCOMPILER = GNU -#include gar/category.mk +EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig + +include gar/category.mk + +build-awesome: + (cd $(WORKSRC); gmake $(BUILD_ENV)) + @$(MAKECOOKIE) + +install-awesome: + (cd $(WORKSRC); gmake $(INSTALL_ENV) install) + @$(MAKECOOKIE) + Modified: csw/mgar/pkg/awesome/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-03-01 11:09:48 UTC (rev 8910) +++ csw/mgar/pkg/awesome/trunk/checksums 2010-03-04 23:25:55 UTC (rev 8981) @@ -0,0 +1 @@ +8c2537ad898d7f58a0f3ba92e6a561a1 awesome-3.4.4.tar.bz2 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 Mar 5 00:50:12 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 04 Mar 2010 23:50:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8982] csw/mgar/pkg/pylxml/trunk/files/changelog.CSW Message-ID: Revision: 8982 http://gar.svn.sourceforge.net/gar/?rev=8982&view=rev Author: skayser Date: 2010-03-04 23:50:12 +0000 (Thu, 04 Mar 2010) Log Message: ----------- pylxml: updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/pylxml/trunk/files/changelog.CSW Modified: csw/mgar/pkg/pylxml/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pylxml/trunk/files/changelog.CSW 2010-03-04 23:25:55 UTC (rev 8981) +++ csw/mgar/pkg/pylxml/trunk/files/changelog.CSW 2010-03-04 23:50:12 UTC (rev 8982) @@ -1,5 +1,5 @@ -pylxml (2.2.4,REV=2010.02.26) +pylxml (2.2.4,REV=2010.03.05) * Initial release. - -- Sebastian Kayser Fri, 26 Feb 2010 15:05:38 +0100 + -- Sebastian Kayser Fri, 5 Mar 2010 00:04:26 +0100 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 Mar 5 00:50:49 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 04 Mar 2010 23:50:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[8983] csw/mgar/pkg/httperf/trunk/checksums Message-ID: Revision: 8983 http://gar.svn.sourceforge.net/gar/?rev=8983&view=rev Author: skayser Date: 2010-03-04 23:50:48 +0000 (Thu, 04 Mar 2010) Log Message: ----------- httperf: updated checksums Modified Paths: -------------- csw/mgar/pkg/httperf/trunk/checksums Modified: csw/mgar/pkg/httperf/trunk/checksums =================================================================== --- csw/mgar/pkg/httperf/trunk/checksums 2010-03-04 23:50:12 UTC (rev 8982) +++ csw/mgar/pkg/httperf/trunk/checksums 2010-03-04 23:50:48 UTC (rev 8983) @@ -1,3 +1,4 @@ b5e6a0c732e428134783b6ec6e06c577 0001-Move-cpp-includes-from-AM_CFLAGS-to-AM_CPPFLAGS.patch 858eeb97b1106d2d4dbd2c171040866e 0003-avoid-variably-modified-type-in-struct.patch ffe0c63c95c3bc2893bccf6561d9c013 COPYING +2968c36b9ecf3d98fc1f2c1c9c0d9341 httperf-0.9.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 5 09:40:18 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Mar 2010 08:40:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8984] csw/mgar/pkg/gnome-keyring Message-ID: Revision: 8984 http://gar.svn.sourceforge.net/gar/?rev=8984&view=rev Author: wahwah Date: 2010-03-05 08:40:18 +0000 (Fri, 05 Mar 2010) Log Message: ----------- gnome-keyring: GARification, update to 2.28 Added Paths: ----------- csw/mgar/pkg/gnome-keyring/branches/ csw/mgar/pkg/gnome-keyring/branches/legacy/ csw/mgar/pkg/gnome-keyring/tags/ csw/mgar/pkg/gnome-keyring/trunk/Makefile csw/mgar/pkg/gnome-keyring/trunk/checksums csw/mgar/pkg/gnome-keyring/trunk/files/ csw/mgar/pkg/gnome-keyring/trunk/files/inttypes-gck-rpc-module.c.patch csw/mgar/pkg/gnome-keyring/trunk/files/inttypes.patch Removed Paths: ------------- csw/mgar/pkg/gnome-keyring/trunk/legacy/ Property Changed: ---------------- csw/mgar/pkg/gnome-keyring/trunk/ Property changes on: csw/mgar/pkg/gnome-keyring/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Copied: csw/mgar/pkg/gnome-keyring/trunk/Makefile (from rev 8910, csw/mgar/pkg/template/trunk/Makefile) =================================================================== --- csw/mgar/pkg/gnome-keyring/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnome-keyring/trunk/Makefile 2010-03-05 08:40:18 UTC (rev 8984) @@ -0,0 +1,197 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +## This file contains comments to guide you through various GAR settings. +## Please remove unnecessary comments before committing your code to the code +## repository. The comments to remove are marked with double hashes. +## If you want to remove them all in-place, use: +## gsed -i -e '/^##/d' Makefile +## +## For more information about GAR variables, please see: +## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference +## +GARNAME = gnome-keyring +GNOME_VERSION = 2.28 +GARVERSION = $(GNOME_VERSION).2 +## +## The category that your software fits in. This is not a descriptive field, but +## influences the build process. Depending on the CATEGORIES setting, different +## Makefiles are included from gar/categories/ in your trunk directory, which +## adjust the build settings for the respective category. +## +## Possible settings are: +## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, +## utils, x11, xfce, xorg, xtra +CATEGORIES = gnome +## +## A one-line description of the package, which will appear in the pkginfo. +DESCRIPTION = +## +## A longer description of the package. This is only for descriptive purposes +## inside the Makefile and is not used elsewhere. +define BLURB +endef +## +## Upstream URL that should show up in the VENDOR field as well as on +## http://opencsw.org/packages/. +SPKG_SOURCEURL = http://ftp.gnome.org/pub/GNOME/sources/$(GARNAME)/ +## +## Whitespace-separated list of URLs to download the source package from. +## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). +MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(GARNAME)/$(GNOME_VERSION)/ +## +## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the +## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge +## project name of the software you wish to download. +## SF_PROJ = +## +## A list of space separated patch filenames from files/ that are to be applied +## to the extracted software before the ./configure stage. Patches need to be +## included in the DISTFILES variable as well. +## PATCHFILES = +## +## Whitespace-separated list of files which comprise this build. mGAR will look +## for the files in the $(FILEDIR) (trunk/files) directory and on the +## $(MASTER_SITES). +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 +## +## Catalog name is the name to be used with pkg{-get,util} -i . +## It is different from the system package name, which by convention is CSWpkgname. +CATALOGNAME_CSWgnomekeyring = gnomekeyring +## +## Set to 1 to mark the package as architecture-independent. +## ARCHALL = 0 +## +## A list of files / patterns that should be excluded from the package. Amends +## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which +## contains things like libtool .la files and files with a leading ~. +## EXTRA_MERGE_EXCLUDE_FILES = +## +## A list of space separated package names that should be marked as +## incompatible with the current package. This will go into the depend file. +## When a user has one of the incompatible packages installed and installs +## your package, he will be prompted that the incompatible package must be +## removed. He will however not be prevented to install your package without +## removing the conflicting package first. +## INCOMPATIBLE_PKGS = +## +## The name of the license file that should be included in your package. Defaults +## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details +## on including and displaying licenses. +## LICENSE = +## +## A list of space separated package names that should be produced from your +## Makefile. This is used when a software has different components that can be +## packaged and used individually (think runtime libraries, client tools, server +## files, development headers). You don't need to set this when you just want to +## produce one package. +## +## When you set this variable to include more than one package, you also need to +## set PKGFILES_CSWpkgname for each package (except for the first one in your +## $(PACKAGES) list) to define which files go into each package. The first +## package from $(PACKAGES) one will hold all files that are not matched by +## PKGFILES_ for other packages. +PACKAGES = CSWgnomekeyring +## +## If specified, GAR feeds the almost-final package prototype file to +## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. +## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used +## to prepare the prototype file for use with cswclassutils (see +## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, +## you will rarely have to use this. A still valid use case would be to change +## the file permissions of a file to be set-UID. +## See http://wiki.opencsw.org/cswclassutils-package for common usage information +## PROTOTYPE_FILTER = +## +## cswclassutils settings +## +## A list of action classes. Possible values are: +## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf +## cswinetd cswetcservices +## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, +## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. +## SPKG_CLASSES = none +## Simplified settings for classes: +## PRESERVECONF = +## SAMPLECONF = +## INITSMF = +## USERGROUP = +## ETCSERVICES = +## INETDCONF = +## A list of runtime package dependencies in the form of CSWfoo. +## RUNTIME_DEP_PKGS = +## +## A list of packages necessary to build this package +## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +## +## When using non-empty $(PACKAGES): +## RUNTIME_DEP_PKGS_CSWpkgname = +## SPKG_DESC_CSWpkgname = +## PKGFILES_CSWpkgname = +## CATALOGNAME_CSWpkgname = +## +## A list of space separated directories where objects should be stripped in +## addition to the bin/ and sbin/ directories. +## STRIP_DIRS = +## +## Define a custom target for the configure phase. When you set this, the target +## that will be used instead of configure: target, is named +## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile +## after including gar/gar.include.mk. If you want to skip the configure phase +## completely (for example when your software doesn't need to be compiled) assign +## this variable an empty value. The procedure works for configure, build, +## install and test steps. +## CONFIGURE_SCRIPTS = +## BUILD_SCRIPTS = +## INSTALL_SCRIPTS = +## TEST_SCRIPTS = +## +## Compilation settings +## +## The build directory. +## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) +## +## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this +## for example, if you need to override Makefile variables. +## BUILD_ARGS = +## +## Arguments passed to the ./configure script. +CONFIGURE_ARGS = $(DIRPATHS) +## +## BUILD64 = +## CONFIGURE_ENV = +## EXTRA_CFLAGS = +## EXTRA_LDFLAGS = +## EXTRA_INC = +## EXTRA_LIB = +## GARFLAVOR = +## INSTALL_ARGS = +## OPT_FLAGS_SOS = -xO3 +## OPT_FLAGS_GCC = -O2 -pipe +## +## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. +## GARCOMPILER = SOS11 +## +TEST_TARGET = check +PATCHFILES += inttypes.patch +PATCHFILES += inttypes-gck-rpc-module.c.patch +STRIP_LIBTOOL = 1 +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWfconfig +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWftype2 +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWgconf2 +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWgcrypt +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWggettextrt +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWglib2 +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWgpgerr +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWgtk2 +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibatk +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibcairo +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibdbus +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWlibtasn1 +RUNTIME_DEP_PKGS_CSWgnomekeyring += CSWpango + +include gar/category.mk Copied: csw/mgar/pkg/gnome-keyring/trunk/checksums (from rev 8910, csw/mgar/pkg/template/trunk/checksums) =================================================================== --- csw/mgar/pkg/gnome-keyring/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnome-keyring/trunk/checksums 2010-03-05 08:40:18 UTC (rev 8984) @@ -0,0 +1,3 @@ +4b4bf38ea71ad5f10c40641c82ae02bc gnome-keyring-2.28.2.tar.gz +68afa66e7612189abe60c10102072a2c inttypes-gck-rpc-module.c.patch +cfa09fb838187a10fa2f936498982c77 inttypes.patch Added: csw/mgar/pkg/gnome-keyring/trunk/files/inttypes-gck-rpc-module.c.patch =================================================================== --- csw/mgar/pkg/gnome-keyring/trunk/files/inttypes-gck-rpc-module.c.patch (rev 0) +++ csw/mgar/pkg/gnome-keyring/trunk/files/inttypes-gck-rpc-module.c.patch 2010-03-05 08:40:18 UTC (rev 8984) @@ -0,0 +1,11 @@ +--- gnome-keyring-2.28.2/pkcs11/rpc-layer/gck-rpc-module.c.orig 2010-03-05 09:18:08.406837643 +0100 ++++ gnome-keyring-2.28.2/pkcs11/rpc-layer/gck-rpc-module.c 2010-03-05 09:18:20.406704072 +0100 +@@ -38,7 +38,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include Added: csw/mgar/pkg/gnome-keyring/trunk/files/inttypes.patch =================================================================== --- csw/mgar/pkg/gnome-keyring/trunk/files/inttypes.patch (rev 0) +++ csw/mgar/pkg/gnome-keyring/trunk/files/inttypes.patch 2010-03-05 08:40:18 UTC (rev 8984) @@ -0,0 +1,11 @@ +--- gnome-keyring-2.28.2/egg/egg-buffer.h.orig 2010-03-05 09:06:31.005474422 +0100 ++++ gnome-keyring-2.28.2/egg/egg-buffer.h 2010-03-05 09:06:59.832964326 +0100 +@@ -25,7 +25,7 @@ + #define EGG_BUFFER_H + + #include +-#include ++#include + + /* ------------------------------------------------------------------- + * EggBuffer This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 5 09:49:22 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Mar 2010 08:49:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8985] csw/mgar/gar/v2/categories/gnome/category.mk Message-ID: Revision: 8985 http://gar.svn.sourceforge.net/gar/?rev=8985&view=rev Author: wahwah Date: 2010-03-05 08:49:22 +0000 (Fri, 05 Mar 2010) Log Message: ----------- gnome category: use /opt/csw/X11/lib by default Modified Paths: -------------- csw/mgar/gar/v2/categories/gnome/category.mk Modified: csw/mgar/gar/v2/categories/gnome/category.mk =================================================================== --- csw/mgar/gar/v2/categories/gnome/category.mk 2010-03-05 08:40:18 UTC (rev 8984) +++ csw/mgar/gar/v2/categories/gnome/category.mk 2010-03-05 08:49:22 UTC (rev 8985) @@ -10,4 +10,8 @@ export XGETTEXT export GETTEXT +# Perhaps there is a category-level variable set? +EXTRA_INC ?= /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include +EXTRA_LIB ?= /opt/csw/X11/lib + include gar/gar.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 5 09:51:32 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Mar 2010 08:51:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8986] csw/mgar/pkg/gnome-keyring/trunk/ Message-ID: Revision: 8986 http://gar.svn.sourceforge.net/gar/?rev=8986&view=rev Author: wahwah Date: 2010-03-05 08:51:32 +0000 (Fri, 05 Mar 2010) Log Message: ----------- gnome-keyring: Adding svn:externals to trunk Property Changed: ---------------- csw/mgar/pkg/gnome-keyring/trunk/ Property changes on: csw/mgar/pkg/gnome-keyring/trunk ___________________________________________________________________ Added: svn:externals + 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 wahwah at users.sourceforge.net Fri Mar 5 12:16:42 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Mar 2010 11:16:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[8987] csw/mgar/pkg/gnome-keyring/trunk/Makefile Message-ID: Revision: 8987 http://gar.svn.sourceforge.net/gar/?rev=8987&view=rev Author: wahwah Date: 2010-03-05 11:16:42 +0000 (Fri, 05 Mar 2010) Log Message: ----------- gnome-keyring: Added a description, source URL, removed boilerplate comments. Modified Paths: -------------- csw/mgar/pkg/gnome-keyring/trunk/Makefile Modified: csw/mgar/pkg/gnome-keyring/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-keyring/trunk/Makefile 2010-03-05 08:51:32 UTC (rev 8986) +++ csw/mgar/pkg/gnome-keyring/trunk/Makefile 2010-03-05 11:16:42 UTC (rev 8987) @@ -2,180 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## GARNAME = gnome-keyring GNOME_VERSION = 2.28 GARVERSION = $(GNOME_VERSION).2 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra CATEGORIES = gnome -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = Stores passwords and encryption keys in an encrypted file define BLURB endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = http://ftp.gnome.org/pub/GNOME/sources/$(GARNAME)/ -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). +SPKG_SOURCEURL = http://live.gnome.org/GnomeKeyring MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(GARNAME)/$(GNOME_VERSION)/ -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). 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 -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. CATALOGNAME_CSWgnomekeyring = gnomekeyring -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. PACKAGES = CSWgnomekeyring -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## TEST_TARGET = check PATCHFILES += inttypes.patch PATCHFILES += inttypes-gck-rpc-module.c.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Mar 5 15:12:40 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 05 Mar 2010 14:12:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8988] csw/mgar/pkg/rrdtool/branches/benny Message-ID: Revision: 8988 http://gar.svn.sourceforge.net/gar/?rev=8988&view=rev Author: bensons Date: 2010-03-05 14:12:40 +0000 (Fri, 05 Mar 2010) Log Message: ----------- rrdtool: final GAR recipe Modified Paths: -------------- csw/mgar/pkg/rrdtool/branches/benny/Makefile csw/mgar/pkg/rrdtool/branches/benny/checksums csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c Added Paths: ----------- csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-piped-Makefile.PL csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-shared-Makefile.PL Modified: csw/mgar/pkg/rrdtool/branches/benny/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-05 11:16:42 UTC (rev 8987) +++ csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-05 14:12:40 UTC (rev 8988) @@ -43,6 +43,7 @@ BUILD_DEP_PKGS += CSWrenderproto BUILD_DEP_PKGS += CSWkbproto BUILD_DEP_PKGS += CSWpython-devel +BUILD_DEP_PKGS += CSWrubydev EXTRA_INC = $(prefix)/include/cairo EXTRA_INC += $(prefix)/include/libxml2 @@ -75,6 +76,8 @@ PATCHFILES += patch-src-rrd_open.c PATCHFILES += patch-bindings-Makefile.in PATCHFILES += patch-bindings-ruby-extconf.rb +PATCHFILES += patch-bindings-perl-piped-Makefile.PL +PATCHFILES += patch-bindings-perl-shared-Makefile.PL BUILD64 = 1 Modified: csw/mgar/pkg/rrdtool/branches/benny/checksums =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/checksums 2010-03-05 11:16:42 UTC (rev 8987) +++ csw/mgar/pkg/rrdtool/branches/benny/checksums 2010-03-05 14:12:40 UTC (rev 8988) @@ -1,4 +1,6 @@ c6bc2f9c3d88e0488f0332a9d288dc39 patch-bindings-Makefile.in +0d068a4648f3a52c79c00374fa0ef486 patch-bindings-perl-piped-Makefile.PL +4fd31144a5e2799db7440d97430d3ab6 patch-bindings-perl-shared-Makefile.PL 072482090287b462c8c092b2ead132da patch-bindings-ruby-extconf.rb 20e58c7facf2687037288c157c32df1a patch-src-Makefile.in 47709778545eec2e8c5c3b38f9c94fcd patch-src-rrd_open.c Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-piped-Makefile.PL =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-piped-Makefile.PL (rev 0) +++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-piped-Makefile.PL 2010-03-05 14:12:40 UTC (rev 8988) @@ -0,0 +1,10 @@ +--- rrdtool-1.4.2.orig/bindings/perl-piped/Makefile.PL 2008-03-15 11:39:48.000000000 +0100 ++++ rrdtool-1.4.2/bindings/perl-piped/Makefile.PL 2010-03-04 16:15:51.013159708 +0100 +@@ -5,6 +5,7 @@ + WriteMakefile( + 'NAME' => 'RRDp', + 'VERSION' => '0.99.0', # finds $VERSION ++ 'LIBS' => '-lperl', + 'linkext' => {LINKTYPE => ''}, + 'dist' => {COMPRESS=>'gzip', SUFFIX=>'gz'}, + ); Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-shared-Makefile.PL =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-shared-Makefile.PL (rev 0) +++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-shared-Makefile.PL 2010-03-05 14:12:40 UTC (rev 8988) @@ -0,0 +1,10 @@ +--- rrdtool-1.4.2.orig/bindings/perl-shared/Makefile.PL 2008-12-05 16:39:55.000000000 +0100 ++++ rrdtool-1.4.2/bindings/perl-shared/Makefile.PL 2010-03-04 16:15:30.877275566 +0100 +@@ -37,6 +37,7 @@ + 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION + 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}", + 'INC' => '-I../../src', ++ 'LIBS' => '-lperl', + # Perl will figure out which one is valid + #'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lm"}, + 'depend' => {'RRDs.c' => "../../src/librrd.la"}, Modified: csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c 2010-03-05 11:16:42 UTC (rev 8987) +++ csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c 2010-03-05 14:12:40 UTC (rev 8988) @@ -25,15 +25,13 @@ */ #include +#include "s_round.h" double round(double x) { double t; - if (!isfinite(x)) - return (x); - if (x >= 0.0) { t = floor(x); if (t - x <= -0.5) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Mar 5 15:26:51 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 05 Mar 2010 14:26:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[8989] csw/mgar/pkg/rrdtool/branches/benny/ Message-ID: Revision: 8989 http://gar.svn.sourceforge.net/gar/?rev=8989&view=rev Author: bensons Date: 2010-03-05 14:26:41 +0000 (Fri, 05 Mar 2010) Log Message: ----------- rrdtool: fix svn:ignore Property Changed: ---------------- csw/mgar/pkg/rrdtool/branches/benny/ Property changes on: csw/mgar/pkg/rrdtool/branches/benny ___________________________________________________________________ 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 bonivart at users.sourceforge.net Fri Mar 5 16:37:33 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 05 Mar 2010 15:37:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8990] csw/mgar/pkg/spamassassin/trunk/files Message-ID: Revision: 8990 http://gar.svn.sourceforge.net/gar/?rev=8990&view=rev Author: bonivart Date: 2010-03-05 15:37:32 +0000 (Fri, 05 Mar 2010) Log Message: ----------- spamassassin: fix pid file location (#4323) Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.CSW Modified: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd 2010-03-05 14:26:41 UTC (rev 8989) +++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd 2010-03-05 15:37:32 UTC (rev 8990) @@ -14,7 +14,7 @@ PROG=spamd PATH=$PATH:/usr/bin:/opt/csw/bin -#OPTIONS=-i 127.0.0.1 -m 10 --min-children=2 --max-conn-per-child=50 -s local2 --syslog-socket=inet -u spamd -x -r /opt/csw/var/spamd/spamd.pid +#OPTIONS=-i 127.0.0.1 -m 10 --min-children=2 --max-conn-per-child=50 -s local2 --syslog-socket=inet -u spamd -x -r /var/opt/csw/spamassassin/spamd.pid ZONE= # used for initialization, do not change Modified: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.CSW =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.CSW 2010-03-05 14:26:41 UTC (rev 8989) +++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.CSW 2010-03-05 15:37:32 UTC (rev 8990) @@ -4,4 +4,4 @@ # # Peter Bonivart, OpenCSW -OPTIONS=-i 127.0.0.1 -m 10 --min-children=2 --max-conn-per-child=50 -s local2 --syslog-socket=inet -u spamd -x -r /opt/csw/var/spamd/spamd.pid +OPTIONS=-i 127.0.0.1 -m 10 --min-children=2 --max-conn-per-child=50 -s local2 --syslog-socket=inet -u spamd -x -r /var/opt/csw/spamassassin/spamd.pid This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Sat Mar 6 00:59:55 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 05 Mar 2010 23:59:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8991] csw/mgar/pkg Message-ID: Revision: 8991 http://gar.svn.sourceforge.net/gar/?rev=8991&view=rev Author: jake_goerzen Date: 2010-03-05 23:59:55 +0000 (Fri, 05 Mar 2010) Log Message: ----------- initial commit Added Paths: ----------- csw/mgar/pkg/xpilot/ csw/mgar/pkg/xpilot/branches/ csw/mgar/pkg/xpilot/tags/ csw/mgar/pkg/xpilot/trunk/ csw/mgar/pkg/xpilot/trunk/Makefile csw/mgar/pkg/xpilot/trunk/checksums csw/mgar/pkg/xpilot/trunk/files/ csw/mgar/pkg/xpilot/trunk/files/Makefile.std csw/mgar/pkg/xpilot/trunk/files/query.c.patch Property changes on: csw/mgar/pkg/xpilot/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/xpilot/trunk/Makefile =================================================================== --- csw/mgar/pkg/xpilot/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xpilot/trunk/Makefile 2010-03-05 23:59:55 UTC (rev 8991) @@ -0,0 +1,37 @@ +GARNAME = xpilot +GARVERSION = 4.5.5 +CATEGORIES = net + +DESCRIPTION = multi-player 2D space game +define BLURB + XPilot is a multi-player 2D space game for both local and Internet gaming. Some features are borrowed from classics like the Atari coin-ups Asteroids and Gravitar, and the home-computer games Thrust and Gravity Force, but XPilot has many new aspects too. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES = query.c.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +SF_PROJ = project/xpilotgame/xpilot-4/xpilot-4.5.5 +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=14558 +UPSTREAM_USE_SF = 1 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +post-extract-modulated: + -cp $(FILEDIR)/Makefile.std $(WORKSRC)/src/Makefile + $(MAKECOOKIE) + +build-custom: + -cd $(WORKSRC)/src && make solaris + $(MAKECOOKIE) + +install-custom: + -cd $(WORKSRC)/src && make install-solaris + $(MAKECOOKIE) Added: csw/mgar/pkg/xpilot/trunk/checksums =================================================================== --- csw/mgar/pkg/xpilot/trunk/checksums (rev 0) +++ csw/mgar/pkg/xpilot/trunk/checksums 2010-03-05 23:59:55 UTC (rev 8991) @@ -0,0 +1,2 @@ +c5f6ffbab34ab72688713ae0085747c8 query.c.patch +1202996da5e35b7372702b9287e65fc4 xpilot-4.5.5.tar.bz2 Added: csw/mgar/pkg/xpilot/trunk/files/Makefile.std =================================================================== --- csw/mgar/pkg/xpilot/trunk/files/Makefile.std (rev 0) +++ csw/mgar/pkg/xpilot/trunk/files/Makefile.std 2010-03-05 23:59:55 UTC (rev 8991) @@ -0,0 +1,893 @@ +# $Id: Makefile.std,v 5.30 2002/04/28 11:35:34 bertg Exp $ +# +# XPilot, a multiplayer gravity war game. Copyright (C) 1991-2001 by +# +# Bj\xF8rn Stabell +# Ken Ronny Schouten +# Bert Gijsbers +# Dick Balaska +# +# 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., 675 Mass Ave, Cambridge, MA 02139, USA. + +# +# Set the version number here so that we can we use it when installing +# the binaries in the destination directory. +# +VERSION=4.5.4 + +# +# Change these for your site +# +LOCALGURU=xpilot at xpilot.org +INSTALLDIR=/opt/csw +BINDIR=$(INSTALLDIR)/bin +LIBDIR=$(INSTALLDIR)/lib/xpilot +MANDIR=$(INSTALLDIR)/man/man6 + +# +# Generic flags. Probably won't work. Use one of the specifics below. +# +CC = gcc +CFLAGS = $(DEFS) $(INCS) -O -I/usr/local/X11/include +MLIB = -lm +XLIB = -L/usr/local/X11/lib -lX11 + +# +# Flags for HP-UX using the native HP compiler. +# +HPPA_CC = cc +HPPA_CPLUS = g++ +HPPA_CFLAGS = $(DEFS) $(INCS) -Ae +w2 -z +FPD -I/usr/include/X11R5 +HPPA_OPT = +O3 # +Oaggressive +Olimit +Olibcalls +Oregionsched +Onofltacc +HPPA_DEBUG = -g +HPPA_PROF = -G +HPPA_PLUS = $(DEFS) $(INCS) -x c++ -O2 -g -I/usr/include/X11R5 +HPPA_LPLUS = $(DEFS) $(INCS) -O2 -g +HPPA_XLIB = -L/usr/lib/X11R5 -lX11 +HPPA_MLIB = -lM + +# +# Flags for Sun with GCC. +# +# For Solaris 2.1 the following flags were used instead: +# SUN_CFLAGS = $(DEFS) $(INCS) -DSVR4 -I/usr/openwin/include +# SUN_MLIB = -lm -lsocket -lnsl -lkrb +# +SUN_CC = gcc +SUN_CFLAGS = $(DEFS) $(INCS) +SUN_OPT = -O +SUN_DEBUG = -g +SUN_MLIB = -lm +SUN_XLIB = -lX11 + +SOLARIS_CC = cc +#SOLARIS_CFLAGS = $(DEFS) $(INCS) +SOLARIS_CFLAGS = $(DEFS) $(INCS) -I/usr/openwin/include +SOLARIS_OPT = -O +SOLARIS_DEBUG = -g +SOLARIS_MLIB = -lm -lsocket -lnsl -lc /usr/ucblib/libucb.a +SOLARIS_XLIB = -L/usr/openwin/lib -lX11 + +# +# Flags to use with SGI boxes. +# +SGI_CC = cc +SGI_CFLAGS = $(DEFS) $(INCS) -xansi +SGI_OPT = -O2 +SGI_PROF = +SGI_XLIB = -lX11 +SGI_MLIB = -lm -lsun + +# +# Flags for AIX on a 3090 Mainframe +# +AIX_CC = cc +AIX_CFLAGS = -DAIX $(DEFS) $(INCS) +AIX_OPT = -O -w +AIX_DEBUG = -g +AIX_MLIB = -lm +AIX_XLIB = -lX11 + +# +# Flags for Linux. +# Flags for compiling by GNU C++ are provided also. +# +LINUX_CC = gcc +LINUX_CPLUSPLUS = g++ +LINUX_CFLAGS = $(DEFS) $(INCS) -Wall -fstrict-prototype +LINUX_OPT = -O2 +LINUX_DEBUG = -g -O2 +LINUX_PROF = -pg -O2 +LINUX_CHECKER = -checker +LINUX_PLUS = -g -O2 -x c++ +LINUX_MLIB = -lm +LINUX_XLIB = -L/usr/X11R6/lib -lX11 +LINUX_LPLUS = $(LINUX_CFLAGS) + + +# +# Flags for OS/2 - XFree86/2 +# +# Actually, only server needs to be compiled multi-threaded. (-Zmtd) +# Client can be single-threaded. +# +OS2_CC = gcc +#OS2_CFLAGS = $(DEFS) $(INCS) -fno-strength-reduce -Zmtd -Zbsd-signals -I. -I$(X11ROOT)/xfree86/include -DWINDOWSCALING -DMBX -D__ST_MT_ERRNO__ -D_OS2_ -DFUNCPROTO=15 -DNARROWPROTO -Dstrncasecmp=strnicmp -Dstrcasecmp=stricmp +OS2_CFLAGS = $(DEFS) $(INCS) -fno-strength-reduce -Zmtd -Zbsd-signals -I. -I$(X11ROOT)/xfree86/include -DWINDOWSCALING -DMBX -D__ST_MT_ERRNO__ -D_OS2_ -DFUNCPROTO=15 -DNARROWPROTO +OS2_OPT = -O2 +OS2_MLIB = -lsocket -lbsd -lm -Zbin-files -Zexe +OS2_XLIB = -L$(X11ROOT)/xfree86/lib -L$(LIBRARY_PATH) -lX11 -lXext + + +# +# DEFS should be used for program specific defines. +# Currently supported flags are: +# +# LIMIT_ACCESS - extremely local, cannot be used without modification. +# LOG - try to log every server start +# SILENT - makes the server real silent. +# SOUND - for sound support (requires rplay 3.0 or NCDaudio) +# SERVER_SOUND - for sound support in the server only, not in the client. +# SPARC_CMAP_HACK - try the alternate colormap swapping code +# that talks directly to the sparc hardware. +# WARNING: WILL NOT WORK ON ANY OTHER HARDWARE +# CAUTION: dangerous if you don't know +# what it does and how it works. +# JOYSTICK - joystick support for Linux 1.0, needs joystick-0.7. +# PLOCKSERVER - Use the plock(2) system call to lock the xpilots +# server into memory to inhibit paging/swapping. +# This probably only makes sense in conjunction with +# raising the priority of the server a little, which is +# equivalent to reducing the nice value a few points. +# Note that both require special system privileges. +# Sofar this feature has only been tested on HP-UX and Linux. +# DBE - To enable support for the X doublebuffer extension. +# This needs an extra -lXext somewhere. +# MBX - To enable support for the X multibuffer extension. +# This needs an extra -lXext somewhere. +# +# It is very important that you also set these appropriately in config.h: +# +# LOCALGURU - define to the person in charge of xpilot on this site. +# LIBDIR - define to where you want the help-files etc. +# (HELPFILE, MOTDFILE, LOGFILE, MAPDIR and TEXTUREDIR) +# This should be set the same as LIBDIR above! +# +DEFS = -DSERVER_SOUND # -DDBE + +INCS = $(AUDIOINC) -I../common -I../client -I../../lib + +# +# For NCDaudio support, uncomment the following lines in addition to adding +# -DSOUND to the DEFS line above +# +#AUDIOINC = -I/usr/local/include +#AUDIOLIB = -L/usr/local/lib -laudio +#AUDIOSRC = ncdaudio.c +#AUDIOOBJ = ncdaudio.o + +# +# For rplay support, uncomment the following lines in addition to adding +# -DSOUND to the DEFS line above +# +#AUDIOINC = -I/usr/local/include +#AUDIOLIB = -L/usr/local/lib -lrplay +#AUDIOSRC = rplayaudio.c +#AUDIOOBJ = rplayaudio.o + +# +# For HP audio support, uncomment the following lines in addition to adding +# -DSOUND to the DEFS line above. +# NOTE that this doesn't really work well. Dunno why. Blame Alib & Aserver. +# +#AUDIOINC = +#AUDIOLIB = -lAlib +#AUDIOSRC = hpaudio.c +#AUDIOOBJ = hpaudio.o + +# +# Common library libxpcommon.a +# +OBJS0 = checknames.o config.o error.o \ + list.o math.o net.o \ + portability.o randommt.o \ + shipshape.o socklib.o \ + strcasecmp.o strdup.o strlcpy.o \ + xpmemory.o + +SRCS0 = checknames.c config.c error.c \ + list.c math.c net.c \ + portability.c randommt.c \ + shipshape.c socklib.c \ + strcasecmp.c strdup.c strlcpy.c \ + xpmemory.c + +# +# Client program xpilot +# +OBJS1 = about.o blockbitmaps.o \ + caudio.o client.o colors.o configure.o \ + datagram.o dbuff.o default.o \ + gfx2d.o gfx3d.o guimap.o guiobjects.o \ + join.o netclient.o \ + paint.o paintdata.o painthud.o paintmap.o \ + paintobjects.o paintradar.o query.o record.o sim.o \ + syslimit.o talk.o talkmacros.o textinterface.o texture.o \ + usleep.o welcome.o widget.o xeventhandlers.o \ + xevent.o xinit.o xpilot.o xpmread.o \ + $(AUDIOOBJ) +SRCS1 = about.c blockbitmaps.c \ + caudio.c client.c colors.c configure.c \ + datagram.c dbuff.c default.c \ + gfx2d.c gfx3d.c guimap.c guiobjects.c \ + join.c netclient.c \ + paint.c paintdata.c painthud.c paintmap.c \ + paintobjects.c paintradar.c query.c record.c sim.c \ + syslimit.c talk.c talkmacros.c textinterface.c texture.c \ + usleep.c welcome.c widget.c xeventhandlers.c \ + xevent.c xinit.c xpilot.c xpmread.c \ + $(AUDIOSRC) + +# +# Server program xpilots +# +OBJS2 = alliance.o asteroid.o cannon.o cell.o cmdline.o \ + collision.o command.o contact.o \ + event.o fileparser.o frame.o \ + id.o item.o laser.o \ + map.o metaserver.o netserver.o \ + object.o objpos.o option.o \ + parser.o play.o player.o \ + robot.o robotdef.o rules.o \ + saudio.o sched.o score.o server.o \ + ship.o shot.o showtime.o stratbot.o \ + tuner.o \ + update.o walls.o wildmap.o +SRCS2 = alliance.c asteroid.c cannon.c cell.c cmdline.c \ + collision.c command.c contact.c \ + event.c fileparser.c frame.c \ + id.c item.c laser.c \ + map.c metaserver.c netserver.c \ + object.c objpos.c option.c \ + parser.c play.c player.c \ + robot.c robotdef.c rules.c \ + saudio.c sched.c score.c server.c \ + ship.c shot.c showtime.c stratbot.c \ + tuner.c \ + update.c walls.c wildmap.c + +# +# Playback program xp-replay +# +OBJS3 = xp-replay.o buttons.o +SRCS3 = xp-replay.c buttons.c + +# +# Variables to locate, make, and run the msub program +# when we are in one of the subdirectories. +# +MSUB = ../../contrib/msub/msub +MSUBSRC = ../../contrib/msub +MSUBFLAGS = -f ../../Local.config +R"@<" -R">@" + +# +# If LFLAGS is specified on the command line then +# that will override the following default. +# CFLAGS will be defined by the command line arguments +# of the recursive make. +# +LFLAGS=$(CFLAGS) + +LIBCOMMON=libxpcommon.a + +TARGETS=make-common make-client make-server make-replay + +all: + @echo "Please specify your system. Choose one of:" + @echo " hppa/solaris/sun/aix/linux/sgi/os2" + +targets: $(TARGETS) + +make-common: + cd common && $(MAKE) -f ../Makefile.std $(LIBCOMMON) \ + "CC=$(CC)" "CFLAGS=$(CFLAGS)" "MLIB=$(MLIB)" "XLIB=$(XLIB)" + +$(LIBCOMMON): $(OBJS0) + ar cql $@ $(OBJS0) + +make-client: + cd client && $(MAKE) -f ../Makefile.std xpilot \ + "CC=$(CC)" "CFLAGS=$(CFLAGS)" "MLIB=$(MLIB)" "XLIB=$(XLIB)" + +xpilot: $(OBJS1) + $(CC) $(LFLAGS) -o $@ $(OBJS1) ../common/$(LIBCOMMON) $(XLIB) $(MLIB) + +make-server: + cd server && $(MAKE) -f ../Makefile.std xpilots \ + "CC=$(CC)" "CFLAGS=$(CFLAGS)" "MLIB=$(MLIB)" "XLIB=$(XLIB)" + +xpilots: $(OBJS2) + $(CC) $(LFLAGS) -o $@ $(OBJS2) ../common/$(LIBCOMMON) $(MLIB) + +make-replay: + cd replay && $(MAKE) -f ../Makefile.std xp-replay \ + "CC=$(CC)" "CFLAGS=$(CFLAGS)" "MLIB=$(MLIB)" "XLIB=$(XLIB)" + +xp-replay: $(OBJS3) + $(CC) $(LFLAGS) -o $@ $(OBJS3) $(XLIB) $(MLIB) + +hppa: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(HPPA_CC)" "CFLAGS=$(HPPA_CFLAGS) $(HPPA_OPT)" "MLIB=$(HPPA_MLIB)" "XLIB=$(HPPA_XLIB)" + +hppa-gcc: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=gcc" "CFLAGS=-D_HPUX_SOURCE -I/usr/include/X11R5 -O2 $(DEFS) $(INCS)" "MLIB=$(HPPA_MLIB)" "XLIB=$(HPPA_XLIB)" + +hppa-gcc-debug: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=gcc" "CFLAGS=-D_HPUX_SOURCE -I/usr/include/X11R5 -O2 -g $(DEFS) $(INCS)" "MLIB=$(HPPA_MLIB)" "XLIB=$(HPPA_XLIB)" + +hppa-debug: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(HPPA_CC)" "CFLAGS=$(HPPA_DEBUG) $(HPPA_CFLAGS)" "MLIB=$(HPPA_MLIB)" "XLIB=$(HPPA_XLIB)" + +hppa-prof: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(HPPA_CC)" "CFLAGS=$(HPPA_CFLAGS) $(HPPA_OPT) $(HPPA_PROF)" "MLIB=$(HPPA_MLIB)" "XLIB=$(HPPA_XLIB)" + +hppa-plus: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(HPPA_CPLUS)" "CFLAGS=$(HPPA_PLUS)" "LFLAGS=$(HPPA_LPLUS)" "MLIB=$(HPPA_MLIB)" "XLIB=$(HPPA_XLIB)" + +hppa-CC: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=CC" "CFLAGS=+a1 +O3 -I/usr/include/X11R5 $(DEFS)" "LFLAGS=+a1 +O3" "MLIB=$(HPPA_MLIB)" "XLIB=$(HPPA_XLIB)" + +sun: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(SUN_CC)" "CFLAGS=$(SUN_CFLAGS) $(SUN_OPT)" "MLIB=$(SUN_MLIB)" "XLIB=$(SUN_XLIB)" + +sun-debug: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(SUN_CC)" "CFLAGS=$(SUN_CFLAGS) $(SUN_DEBUG)" "MLIB=$(SUN_MLIB)" "XLIB=$(SUN_XLIB)" + +solaris: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(SOLARIS_CC)" "CFLAGS=$(SOLARIS_CFLAGS) $(SOLARIS_OPT)" "MLIB=$(SOLARIS_MLIB)" "XLIB=$(SOLARIS_XLIB)" + +solaris-debug: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(SOLARIS_CC)" "CFLAGS=$(SOLARIS_CFLAGS) $(SOLARIS_DEBUG)" "MLIB=$(SOLARIS_MLIB)" "XLIB=$(SOLARIS_XLIB)" + +aix: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(AIX_CC)" "CFLAGS=$(AIX_CFLAGS) $(AIX_OPT)" "MLIB=$(AIX_MLIB)" "XLIB=$(AIX_XLIB)" + +linux: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(LINUX_CC)" "CFLAGS=$(LINUX_CFLAGS) $(LINUX_OPT)" "MLIB=$(LINUX_MLIB)" "XLIB=$(LINUX_XLIB)" + +linux-debug: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(LINUX_CC)" "CFLAGS=$(LINUX_CFLAGS) $(LINUX_DEBUG)" "MLIB=$(LINUX_MLIB)" "XLIB=$(LINUX_XLIB)" + +linux-prof: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(LINUX_CC)" "CFLAGS=$(LINUX_CFLAGS) $(LINUX_PROF)" "MLIB=$(LINUX_MLIB)" "XLIB=$(LINUX_XLIB)" + +linux-bprof: linux-debug + rm -f client/xpilot server/xpilots replay/xp-replay + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(LINUX_CC)" "CFLAGS=$(LINUX_CFLAGS) $(LINUX_PROF)" "BMON=-lbmon" "MLIB=$(LINUX_MLIB)" "XLIB=$(LINUX_XLIB)" + +linux-checker: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(LINUX_CC)" "CFLAGS=$(LINUX_CFLAGS) $(LINUX_CHECKER)" "MLIB=$(LINUX_MLIB)" "XLIB=$(LINUX_XLIB)" + +linux-plus: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(LINUX_CPLUSPLUS)" "CFLAGS=$(LINUX_CFLAGS) $(LINUX_PLUS)" "LFLAGS=$(LINUX_LPLUS)" "MLIB=$(LINUX_MLIB)" "XLIB=$(LINUX_XLIB)" + +os2: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(OS2_CC)" "CFLAGS=$(OS2_CFLAGS) $(OS2_OPT)" "MLIB=$(OS2_MLIB)" "XLIB=$(OS2_XLIB)" + +sgi: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(SGI_CC)" "CFLAGS=$(SGI_CFLAGS) $(SGI_OPT)" "MLIB=$(SGI_MLIB)" "XLIB=$(SGI_XLIB)" + +sgi-debug: + @$(MAKE) -f Makefile.std $(TARGETS) \ + "CC=$(SGI_CC)" "CFLAGS=$(SGI_CFLAGS) $(SGI_DEBUG)" "MLIB=$(SGI_MLIB)" "XLIB=$(SGI_XLIB)" + +version.h: $(MSUB) version.h.msub + $(MSUB) $(MSUBFLAGS) version.h.msub >version.h + +../common/version.h: $(MSUB) ../common/version.h.msub + $(MSUB) $(MSUBFLAGS) ../common/version.h.msub >../common/version.h + +$(MSUB): $(MSUB).c + $(CC) $(CFLAGS) $(MSUB).c -o $(MSUB) + +install: + @echo "Specify either install-hppa, install-linux, install-sgi, install-solaris or install-sun" + +install-binaries: + if [ ! -d $(BINDIR)/. ]; then mkdir -p $(BINDIR); fi + cp client/xpilot server/xpilots replay/xp-replay $(BINDIR) + -strip $(BINDIR)/xpilot $(BINDIR)/xpilots $(BINDIR)/xp-replay + -chmod +x $(BINDIR)/xpilot $(BINDIR)/xpilots $(BINDIR)/xp-replay + +install-libdir: + if [ ! -d $(LIBDIR)/. ]; then mkdir -p $(LIBDIR); fi + cp ../lib/defaults $(LIBDIR)/. + cp ../lib/sounds $(LIBDIR)/. + if [ -f $(LIBDIR)/maps ]; then /bin/rm -f $(LIBDIR)/maps; fi + cp -r ../lib/maps $(LIBDIR)/. + cp -r ../lib/textures $(LIBDIR)/. + chmod -R a+r $(LIBDIR)/. + chmod a+x $(LIBDIR) $(LIBDIR)/maps $(LIBDIR)/textures + +install-man: + if [ ! -d $(MANDIR)/. ]; then mkdir -p $(MANDIR); fi + for f in xpilot xpilots xp-replay; \ + do \ + if [ -f ../doc/man/$$f.man ]; then \ + cp ../doc/man/$$f.man $(MANDIR)/$$f.6; \ + fi; \ + done + +install-hppa: hppa install-binaries install-libdir + +install-linux: linux install-binaries install-libdir + +install-sun: sun install-binaries install-libdir + +install-solaris: solaris install-binaries install-libdir + +install-sgi: sgi install-binaries install-libdir + +install-hppa-debug: hppa-debug install-hppa + +install-linux-debug: linux-debug install-hppa + +install-sun-debug: sun-debug install-sun + +install-sgi-debug: sgi-debug install-sgi + +clean: + cd common && rm -f $(OBJS0) libxpcommon.a core + cd client && rm -f $(OBJS1) xpilot core + cd server && rm -f $(OBJS2) xpilots core + cd replay && rm -f $(OBJS3) xp-replay core + +ctags: + ctags *.h *.c + +depend: depend-common depend-client depend-server depend-replay + +depend-common: + cd common && gcc -MM $(SRCS0) >> ../Makefile.std + +depend-client: + cd client && gcc -MM -I../common $(SRCS1) >> ../Makefile.std + +depend-server: + cd server && gcc -MM -I../common $(SRCS2) >> ../Makefile.std + +depend-replay: + cd replay && gcc -MM -I../common -I../client $(SRCS3) >> ../Makefile.std + +# DO NOT DELETE +checknames.o: checknames.c version.h config.h const.h types.h error.h \ + pack.h checknames.h commonproto.h +config.o: config.c version.h config.h +error.o: error.c version.h config.h const.h types.h error.h \ + portability.h commonproto.h +list.o: list.c list.h +math.o: math.c version.h config.h const.h types.h error.h \ + commonproto.h +net.o: net.c version.h config.h const.h types.h error.h net.h \ + socklib.h packet.h bit.h +portability.o: portability.c version.h config.h portability.h \ + commonproto.h types.h +randommt.o: randommt.c +shipshape.o: shipshape.c version.h config.h const.h types.h draw.h \ + error.h +socklib.o: socklib.c version.h socklib.h commonproto.h types.h +strcasecmp.o: strcasecmp.c +strdup.o: strdup.c error.h commonproto.h types.h +strlcpy.o: strlcpy.c commonproto.h types.h +xpmemory.o: xpmemory.c error.h commonproto.h types.h +about.o: about.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h ../common/keys.h paint.h client.h \ + ../common/draw.h ../common/item.h xinit.h widget.h configure.h \ + ../common/error.h netclient.h dbuff.h protoclient.h +blockbitmaps.o: blockbitmaps.c blockbitmaps.h gfx2d.h \ + ../common/version.h ../common/error.h ../common/const.h \ + ../common/types.h paint.h client.h ../common/draw.h ../common/item.h \ + ../common/portability.h paintdata.h +caudio.o: caudio.c ../common/version.h +client.o: client.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h ../common/setup.h \ + ../common/error.h ../common/rules.h ../common/bit.h netclient.h \ + paint.h client.h ../common/draw.h ../common/item.h xinit.h \ + protoclient.h ../common/portability.h talk.h ../common/commonproto.h +colors.o: colors.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h paint.h client.h ../common/draw.h \ + ../common/item.h xinit.h ../common/error.h dbuff.h protoclient.h +configure.o: configure.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h paint.h client.h ../common/draw.h \ + ../common/item.h xinit.h ../common/bit.h ../common/keys.h netclient.h \ + widget.h configure.h ../common/setup.h ../common/error.h \ + protoclient.h ../common/portability.h ../common/commonproto.h +datagram.o: datagram.c ../common/version.h ../common/config.h \ + ../common/error.h client.h ../common/draw.h ../common/types.h \ + ../common/../common/const.h ../common/item.h ../common/socklib.h \ + protoclient.h datagram.h ../common/portability.h +dbuff.o: dbuff.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h ../common/draw.h ../common/bit.h \ + dbuff.h +default.o: default.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h paint.h client.h ../common/draw.h \ + ../common/item.h ../common/pack.h ../common/bit.h ../common/keys.h \ + netclient.h xinit.h ../common/error.h protoclient.h ../common/audio.h \ + ../common/commonproto.h ../common/portability.h talk.h default.h \ + ../common/checknames.h +gfx2d.o: gfx2d.c ../common/version.h ../common/config.h gfx2d.h \ + ../common/error.h ../common/const.h ../common/types.h \ + ../common/portability.h ../common/commonproto.h +gfx3d.o: gfx3d.c gfx3d.h ../common/const.h ../common/types.h +guimap.o: guimap.c gfx2d.h ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h ../common/error.h ../common/bit.h \ + ../common/keys.h ../common/rules.h ../common/setup.h texture.h \ + paint.h client.h ../common/draw.h ../common/item.h paintdata.h \ + paintmacros.h record.h xinit.h protoclient.h blockbitmaps.h guimap.h +guiobjects.o: guiobjects.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h ../common/error.h ../common/bit.h \ + ../common/keys.h ../common/rules.h ../common/setup.h texture.h \ + paint.h client.h ../common/draw.h ../common/item.h paintdata.h \ + paintmacros.h record.h xinit.h protoclient.h ../common/portability.h \ + blockbitmaps.h gfx2d.h ../common/wreckshape.h ../common/astershape.h \ + guiobjects.h +join.o: join.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h ../common/error.h client.h \ + ../common/draw.h ../common/item.h netclient.h protoclient.h \ + ../common/portability.h +netclient.o: netclient.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h ../common/error.h ../common/net.h \ + ../common/socklib.h netclient.h ../common/setup.h ../common/packet.h \ + ../common/bit.h paint.h client.h ../common/draw.h ../common/item.h \ + xinit.h ../common/pack.h protoclient.h ../common/portability.h talk.h \ + ../common/commonproto.h +paint.o: paint.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h ../common/error.h ../common/bit.h \ + ../common/keys.h ../common/rules.h ../common/setup.h dbuff.h \ + texture.h paint.h client.h ../common/draw.h ../common/item.h \ + paintdata.h record.h xinit.h blockbitmaps.h gfx2d.h \ + ../common/portability.h ../common/commonproto.h +paintdata.o: paintdata.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h ../common/error.h ../common/bit.h \ + client.h ../common/draw.h ../common/item.h ../common/setup.h \ + ../common/rules.h paint.h paintdata.h record.h xinit.h protoclient.h \ + dbuff.h ../common/commonproto.h +painthud.o: painthud.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h ../common/error.h ../common/bit.h \ + ../common/keys.h ../common/rules.h ../common/setup.h texture.h \ + paint.h client.h ../common/draw.h ../common/item.h paintdata.h \ + paintmacros.h record.h xinit.h protoclient.h blockbitmaps.h gfx2d.h \ + ../common/commonproto.h +paintmap.o: paintmap.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h ../common/error.h ../common/bit.h \ + ../common/keys.h ../common/rules.h ../common/setup.h texture.h \ + paint.h client.h ../common/draw.h ../common/item.h paintdata.h \ + paintmacros.h record.h xinit.h protoclient.h guimap.h +paintobjects.o: paintobjects.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h ../common/error.h ../common/bit.h \ + ../common/keys.h ../common/rules.h ../common/setup.h texture.h \ + paint.h client.h ../common/draw.h ../common/item.h paintdata.h \ + paintmacros.h record.h xinit.h protoclient.h ../common/portability.h \ + guiobjects.h gfx3d.h blockbitmaps.h gfx2d.h ../common/wreckshape.h \ + ../common/astershape.h +paintradar.o: paintradar.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h ../common/error.h ../common/bit.h \ + ../common/keys.h ../common/rules.h ../common/setup.h paint.h client.h \ + ../common/draw.h ../common/item.h paintdata.h xinit.h +query.o: query.c ../common/version.h ../common/config.h \ + ../common/error.h ../common/socklib.h protoclient.h +record.o: record.c ../common/version.h ../common/config.h \ + ../common/error.h ../common/const.h ../common/types.h client.h \ + ../common/draw.h ../common/item.h paint.h ../common/setup.h record.h \ + recordfmt.h xpmread.h ../common/commonproto.h xinit.h +sim.o: sim.c +syslimit.o: syslimit.c +talk.o: talk.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h paint.h client.h ../common/draw.h \ + ../common/item.h xinit.h ../common/error.h netclient.h protoclient.h \ + ../common/keys.h ../common/bit.h ../common/commonproto.h +talkmacros.o: talkmacros.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h client.h ../common/draw.h \ + ../common/item.h netclient.h ../common/setup.h ../common/bit.h \ + ../common/error.h protoclient.h ../common/portability.h talk.h \ + ../common/rules.h ../common/commonproto.h +textinterface.o: textinterface.c ../common/version.h \ + ../common/config.h ../common/const.h ../common/types.h \ + ../common/pack.h ../common/bit.h ../common/error.h \ + ../common/socklib.h ../common/net.h datagram.h \ + ../common/portability.h ../common/checknames.h connectparam.h \ + protoclient.h ../common/commonproto.h +texture.o: texture.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h paint.h client.h ../common/draw.h \ + ../common/item.h xinit.h ../common/error.h xpmread.h texture.h \ + ../common/portability.h ../../lib/textures/rock4.xpm \ + ../../lib/textures/ball.xpm +usleep.o: usleep.c ../common/types.h +welcome.o: welcome.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h paint.h client.h ../common/draw.h \ + ../common/item.h xinit.h ../common/list.h widget.h ../common/error.h \ + dbuff.h ../common/socklib.h ../common/net.h ../common/pack.h \ + connectparam.h protoclient.h ../common/portability.h \ + ../common/commonproto.h +widget.o: widget.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h paint.h client.h ../common/draw.h \ + ../common/item.h paintdata.h xinit.h ../common/bit.h \ + ../common/error.h widget.h protoclient.h ../common/portability.h +xeventhandlers.o: xeventhandlers.c ../common/version.h \ + ../common/config.h ../common/const.h ../common/types.h paint.h \ + client.h ../common/draw.h ../common/item.h xinit.h ../common/keys.h \ + ../common/packet.h ../common/bit.h ../common/setup.h netclient.h \ + widget.h ../common/error.h record.h ../common/portability.h \ + paintdata.h talk.h configure.h xeventhandlers.h +xevent.o: xevent.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h paint.h client.h ../common/draw.h \ + ../common/item.h xinit.h ../common/keys.h ../common/packet.h \ + ../common/bit.h ../common/setup.h netclient.h widget.h \ + ../common/error.h record.h ../common/portability.h paintdata.h talk.h \ + configure.h xeventhandlers.h xevent.h +xinit.o: xinit.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h ../common/keys.h icon.h paint.h \ + client.h ../common/draw.h ../common/item.h xinit.h widget.h \ + configure.h ../common/error.h netclient.h dbuff.h protoclient.h \ + ../common/portability.h items/itemRocketPack.xbm \ + items/itemCloakingDevice.xbm items/itemEnergyPack.xbm \ + items/itemWideangleShot.xbm items/itemRearShot.xbm \ + items/itemMinePack.xbm items/itemSensorPack.xbm items/itemTank.xbm \ + items/itemEcm.xbm items/itemArmor.xbm items/itemAfterburner.xbm \ + items/itemTransporter.xbm items/itemDeflector.xbm \ + items/itemHyperJump.xbm items/itemPhasingDevice.xbm \ + items/itemMirror.xbm items/itemLaser.xbm \ + items/itemEmergencyThrust.xbm items/itemTractorBeam.xbm \ + items/itemAutopilot.xbm items/itemEmergencyShield.xbm +xpilot.o: xpilot.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h ../common/pack.h ../common/bit.h \ + ../common/error.h ../common/socklib.h ../common/net.h connectparam.h \ + protoclient.h ../common/portability.h ../common/checknames.h \ + ../common/commonproto.h +xpmread.o: xpmread.c ../common/version.h ../common/config.h \ + ../common/const.h ../common/types.h paint.h client.h ../common/draw.h \ + ../common/item.h xinit.h ../common/error.h ../common/commonproto.h \ + xpmread.h +alliance.o: alliance.c ../common/version.h ../common/config.h \ + serverconst.h ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h netserver.h \ + ../common/error.h ../common/commonproto.h +asteroid.o: asteroid.c ../common/version.h ../common/config.h \ + serverconst.h ../common/const.h ../common/types.h ../common/list.h \ + global.h object.h ../common/keys.h ../common/bit.h ../common/draw.h \ + ../common/item.h click.h map.h ../common/rules.h proto.h saudio.h \ + objpos.h asteroid.h +cannon.o: cannon.c ../common/version.h ../common/config.h \ + serverconst.h ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h objpos.h \ + cannon.h saudio.h ../common/commonproto.h +cell.o: cell.c ../common/version.h ../common/config.h serverconst.h \ + ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h \ + ../common/error.h +cmdline.o: cmdline.c ../common/version.h ../common/config.h \ + serverconst.h ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h defaults.h \ + ../common/error.h ../common/portability.h ../common/checknames.h \ + ../common/commonproto.h tuner.h +collision.o: collision.c ../common/version.h ../common/config.h \ + serverconst.h ../common/const.h ../common/types.h ../common/list.h \ + global.h object.h ../common/keys.h ../common/bit.h ../common/draw.h \ + ../common/item.h click.h map.h ../common/rules.h proto.h score.h \ + saudio.h netserver.h ../common/pack.h ../common/error.h \ + ../common/portability.h objpos.h asteroid.h ../common/commonproto.h +command.o: command.c ../common/version.h serverconst.h \ + ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h \ + ../common/error.h netserver.h ../common/commonproto.h score.h +contact.o: contact.c ../common/version.h ../common/config.h \ + ../common/types.h serverconst.h ../common/const.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h \ + ../common/socklib.h ../common/pack.h ../common/net.h netserver.h \ + sched.h ../common/error.h ../common/checknames.h server.h \ + ../common/commonproto.h ../common/portability.h +event.o: event.c ../common/version.h ../common/config.h serverconst.h \ + ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h score.h \ + saudio.h netserver.h +fileparser.o: fileparser.c ../common/version.h ../common/config.h \ + serverconst.h ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h defaults.h \ + ../common/error.h ../common/commonproto.h +frame.o: frame.c ../common/version.h ../common/config.h serverconst.h \ + ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h netserver.h \ + saudio.h ../common/error.h ../common/commonproto.h +id.o: id.c ../common/version.h serverconst.h ../common/const.h \ + ../common/types.h global.h object.h ../common/keys.h ../common/bit.h \ + ../common/draw.h ../common/item.h click.h map.h ../common/rules.h \ + ../common/list.h proto.h ../common/error.h +item.o: item.c ../common/version.h ../common/config.h serverconst.h \ + ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h saudio.h \ + score.h netserver.h ../common/error.h objpos.h +laser.o: laser.c ../common/version.h ../common/config.h serverconst.h \ + ../common/const.h ../common/types.h ../common/list.h global.h \ + object.h ../common/keys.h ../common/bit.h ../common/draw.h \ + ../common/item.h click.h map.h ../common/rules.h proto.h score.h \ + saudio.h ../common/error.h ../common/portability.h objpos.h \ + asteroid.h +map.o: map.c ../common/version.h ../common/config.h serverconst.h \ + ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h \ + ../common/error.h ../common/commonproto.h +metaserver.o: metaserver.c ../common/config.h ../common/version.h \ + serverconst.h ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h \ + ../common/socklib.h ../common/pack.h metaserver.h saudio.h \ + ../common/error.h netserver.h ../common/commonproto.h +netserver.o: netserver.c ../common/version.h ../common/config.h \ + serverconst.h ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h \ + ../common/pack.h ../common/socklib.h sched.h ../common/net.h \ + ../common/error.h netserver.h ../common/packet.h ../common/setup.h \ + connection.h saudio.h ../common/checknames.h server.h \ + ../common/commonproto.h asteroid.h score.h +object.o: object.c ../common/version.h ../common/config.h \ + ../common/types.h serverconst.h ../common/const.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h \ + ../common/error.h ../common/portability.h ../common/commonproto.h +objpos.o: objpos.c ../common/version.h ../common/config.h \ + serverconst.h ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h objpos.h +option.o: option.c ../common/version.h ../common/config.h \ + serverconst.h ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h defaults.h \ + ../common/error.h ../common/commonproto.h +parser.o: parser.c ../common/version.h ../common/config.h \ + serverconst.h ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h defaults.h \ + ../common/error.h ../common/portability.h ../common/checknames.h \ + ../common/commonproto.h +play.o: play.c ../common/version.h ../common/config.h serverconst.h \ + ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h saudio.h \ + score.h objpos.h +player.o: player.c ../common/version.h ../common/config.h \ + serverconst.h ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h score.h \ + netserver.h saudio.h ../common/error.h objpos.h +robot.o: robot.c ../common/version.h ../common/config.h serverconst.h \ + ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h score.h \ + saudio.h netserver.h ../common/pack.h robot.h ../common/error.h \ + server.h ../common/commonproto.h +robotdef.o: robotdef.c ../common/version.h ../common/config.h \ + serverconst.h ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h score.h \ + saudio.h netserver.h ../common/pack.h robot.h ../common/error.h \ + ../common/portability.h ../common/commonproto.h +rules.o: rules.c ../common/version.h ../common/config.h serverconst.h \ + ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h cannon.h +saudio.o: saudio.c ../common/version.h ../common/config.h \ + serverconst.h ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h netserver.h \ + saudio.h +sched.o: sched.c ../common/version.h ../common/config.h serverconst.h \ + ../common/const.h ../common/types.h ../common/error.h sched.h \ + global.h object.h ../common/keys.h ../common/bit.h ../common/draw.h \ + ../common/item.h click.h map.h ../common/rules.h ../common/list.h \ + ../common/portability.h +score.o: score.c ../common/version.h ../common/config.h serverconst.h \ + ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h score.h \ + netserver.h +server.o: server.c ../common/version.h ../common/config.h \ + ../common/types.h serverconst.h ../common/const.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h \ + ../common/socklib.h sched.h netserver.h ../common/error.h \ + ../common/portability.h server.h ../common/commonproto.h +ship.o: ship.c ../common/version.h ../common/config.h serverconst.h \ + ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h saudio.h \ + ../common/error.h objpos.h netserver.h ../common/commonproto.h +shot.o: shot.c ../common/version.h ../common/config.h serverconst.h \ + ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h score.h \ + saudio.h cannon.h objpos.h netserver.h ../common/error.h \ + ../common/commonproto.h +showtime.o: showtime.c proto.h object.h serverconst.h \ + ../common/const.h ../common/types.h ../common/keys.h ../common/bit.h \ + ../common/draw.h ../common/item.h click.h ../common/list.h +tuner.o: tuner.c serverconst.h ../common/const.h ../common/types.h \ + global.h object.h ../common/keys.h ../common/bit.h ../common/draw.h \ + ../common/item.h click.h map.h ../common/rules.h ../common/list.h \ + proto.h ../common/error.h ../common/commonproto.h +update.o: update.c ../common/version.h ../common/config.h \ + serverconst.h ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h score.h \ + saudio.h objpos.h cannon.h asteroid.h ../common/commonproto.h \ + netserver.h +walls.o: walls.c ../common/version.h ../common/config.h serverconst.h \ + ../common/const.h ../common/types.h global.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h map.h ../common/rules.h ../common/list.h proto.h score.h \ + saudio.h ../common/error.h walls.h objpos.h +wildmap.o: wildmap.c ../common/portability.h ../common/version.h \ + serverconst.h ../common/const.h ../common/types.h object.h \ + ../common/keys.h ../common/bit.h ../common/draw.h ../common/item.h \ + click.h proto.h ../common/list.h +xp-replay.o: xp-replay.c ../client/recordfmt.h ../common/item.h \ + buttons.h xp-replay.h ../client/items/itemRocketPack.xbm \ + ../client/items/itemCloakingDevice.xbm \ + ../client/items/itemEnergyPack.xbm \ + ../client/items/itemWideangleShot.xbm \ + ../client/items/itemRearShot.xbm ../client/items/itemMinePack.xbm \ + ../client/items/itemSensorPack.xbm ../client/items/itemTank.xbm \ + ../client/items/itemEcm.xbm ../client/items/itemAfterburner.xbm \ + ../client/items/itemTransporter.xbm ../client/items/itemDeflector.xbm \ + ../client/items/itemHyperJump.xbm \ + ../client/items/itemPhasingDevice.xbm ../client/items/itemLaser.xbm \ + ../client/items/itemMirror.xbm ../client/items/itemArmor.xbm \ + ../client/items/itemEmergencyThrust.xbm \ + ../client/items/itemTractorBeam.xbm ../client/items/itemAutopilot.xbm \ + ../client/items/itemEmergencyShield.xbm tools/eject.xbm \ + tools/fastf.xbm tools/pause.xbm tools/play.xbm tools/record.xbm \ + tools/revplay.xbm tools/rewind.xbm tools/stop.xbm +buttons.o: buttons.c buttons.h xp-replay.h tools/grey.xbm Added: csw/mgar/pkg/xpilot/trunk/files/query.c.patch =================================================================== --- csw/mgar/pkg/xpilot/trunk/files/query.c.patch (rev 0) +++ csw/mgar/pkg/xpilot/trunk/files/query.c.patch 2010-03-05 23:59:55 UTC (rev 8991) @@ -0,0 +1,12 @@ +diff -rupN xpilot-4.5.5/src/client/query.c xpilot-4.5.5.new/src/client/query.c +--- xpilot-4.5.5/src/client/query.c 2010-02-21 16:59:29.000000000 +0100 ++++ xpilot-4.5.5.new/src/client/query.c 2010-03-05 23:39:44.876118127 +0100 +@@ -37,7 +37,7 @@ + # include + # include + # include +-# if defined(SVR4) || defined(__svr4__) ++# if defined(SVR4) || defined(__svr4__) || defined (__SVR4) + # include + # endif + # ifndef __hpux This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 6 08:33:49 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Mar 2010 07:33:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[8992] csw/mgar/gar/v2/lib/python Message-ID: Revision: 8992 http://gar.svn.sourceforge.net/gar/?rev=8992&view=rev Author: wahwah Date: 2010-03-06 07:33:48 +0000 (Sat, 06 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, description needs to start with an uppercase letter. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-05 23:59:55 UTC (rev 8991) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-06 07:33:48 UTC (rev 8992) @@ -32,6 +32,7 @@ DO_NOT_REPORT_MISSING_RE = [r"SUNW.*", r"\*SUNW.*"] DUMP_BIN = "/usr/ccs/bin/dump" PSTAMP_RE = r"(?P\w)+@(?P\w+)-(?P\d+)" +DESCRIPTION_RE = r"^([\S]+) - (.*)$" SYSTEM_SYMLINKS = ( ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), @@ -154,9 +155,9 @@ def ExtractDescription(pkginfo): - desc_re = re.compile(r"^[\w_]+ - (.*)$") + desc_re = re.compile(DESCRIPTION_RE) m = re.match(desc_re, pkginfo["NAME"]) - return m.group(1) if m else None + return m.group(2) if m else None def ExtractMaintainerName(pkginfo): Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-05 23:59:55 UTC (rev 8991) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-06 07:33:48 UTC (rev 8992) @@ -828,11 +828,16 @@ class ExtractorsUnitTest(unittest.TestCase): - def testExtractDescription_1(self): + def testExtractDescriptionFromGoodData(self): data = {"NAME": "nspr_devel - Netscape Portable Runtime header files"} result = "Netscape Portable Runtime header files" self.assertEqual(result, checkpkg.ExtractDescription(data)) + def testExtractDescriptionWithBadCatalogname(self): + data = {"NAME": "foo-bar - Bad catalogname shouldn't break this function"} + result = "Bad catalogname shouldn't break this function" + self.assertEqual(result, checkpkg.ExtractDescription(data)) + def testExtractMaintainerName(self): data = {"VENDOR": "https://ftp.mozilla.org/pub/mozilla.org/" "nspr/releases/v4.8/src/ packaged for CSW by " Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-05 23:59:55 UTC (rev 8991) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-06 07:33:48 UTC (rev 8992) @@ -74,6 +74,9 @@ else: if len(desc) > MAX_DESCRIPTION_LENGTH: error_mgr.ReportError("pkginfo-description-too-long") + if not desc[0].isupper(): + error_mgr.ReportError("pkginfo-description-not-starting-with-uppercase", + desc) def CheckCatalogname(pkg_data, error_mgr, logger): @@ -81,7 +84,7 @@ catalogname = pkginfo["NAME"].split(" ")[0] catalogname_re = r"^(\w+)$" if not re.match(catalogname_re, catalogname): - error_mgr.ReportError("pkginfo-bad-catalogname") + error_mgr.ReportError("pkginfo-bad-catalogname", catalogname) def CheckSmfIntegration(pkg_data, error_mgr, logger): Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-05 23:59:55 UTC (rev 8991) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-06 07:33:48 UTC (rev 8992) @@ -56,6 +56,14 @@ self.error_mgr_mock.ReportError('pkginfo-description-too-long') +class TestDescriptionNotCapitalized(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckDescription' + def CheckpkgTest(self): + self.pkg_data["pkginfo"]["NAME"] = 'foo - lowercase' + self.error_mgr_mock.ReportError('pkginfo-description-not-starting-with-uppercase', + 'lowercase') + + class TestCheckCatalogname(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckCatalogname' def CheckpkgTest(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 6 08:43:19 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Mar 2010 07:43:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8993] csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile Message-ID: Revision: 8993 http://gar.svn.sourceforge.net/gar/?rev=8993&view=rev Author: wahwah Date: 2010-03-06 07:43:18 +0000 (Sat, 06 Mar 2010) Log Message: ----------- xcbproto: +ARCHALL_CSWpyxcbproto = 1 Modified Paths: -------------- csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile Modified: csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile 2010-03-06 07:33:48 UTC (rev 8992) +++ csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile 2010-03-06 07:43:18 UTC (rev 8993) @@ -55,5 +55,6 @@ PYCOMPILE = 1 PKGFILES_CSWpyxcbproto = .*\.py +ARCHALL_CSWpyxcbproto = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 6 09:43:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Mar 2010 08:43:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8994] csw/mgar/gar/v2/lib/python Message-ID: Revision: 8994 http://gar.svn.sourceforge.net/gar/?rev=8994&view=rev Author: wahwah Date: 2010-03-06 08:43:57 +0000 (Sat, 06 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, allow dots in the PSTAMP Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/package_checks_old.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-06 07:43:18 UTC (rev 8993) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-06 08:43:57 UTC (rev 8994) @@ -31,7 +31,7 @@ DO_NOT_REPORT_MISSING = set([]) DO_NOT_REPORT_MISSING_RE = [r"SUNW.*", r"\*SUNW.*"] DUMP_BIN = "/usr/ccs/bin/dump" -PSTAMP_RE = r"(?P\w)+@(?P\w+)-(?P\d+)" +PSTAMP_RE = r"(?P\w)+@(?P[\w\.]+)-(?P\d+)" DESCRIPTION_RE = r"^([\S]+) - (.*)$" SYSTEM_SYMLINKS = ( Modified: csw/mgar/gar/v2/lib/python/package_checks_old.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_old.py 2010-03-06 07:43:18 UTC (rev 8993) +++ csw/mgar/gar/v2/lib/python/package_checks_old.py 2010-03-06 08:43:57 UTC (rev 8994) @@ -131,7 +131,8 @@ if "PSTAMP" in pkginfo: if not re.match(checkpkg.PSTAMP_RE, pkginfo["PSTAMP"]): errors.append(checkpkg.CheckpkgTag( - pkgname, "pkginfo-pkstamp-in-wrong-format", + pkgname, "pkginfo-pstamp-in-wrong-format", + pkginfo["PSTAMP"], msg=("It should be 'username at hostname-timestamp', " "but it's %s." % repr(pkginfo["PSTAMP"])))) else: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 6 09:44:35 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Mar 2010 08:44:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8995] csw/mgar/pkg Message-ID: Revision: 8995 http://gar.svn.sourceforge.net/gar/?rev=8995&view=rev Author: wahwah Date: 2010-03-06 08:44:34 +0000 (Sat, 06 Mar 2010) Log Message: ----------- mpg321: Initial commit Modified Paths: -------------- csw/mgar/pkg/mpg321/trunk/Makefile csw/mgar/pkg/mpg321/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mpg321/ Property Changed: ---------------- csw/mgar/pkg/mpg321/trunk/Makefile Modified: csw/mgar/pkg/mpg321/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-05-28 21:20:52 UTC (rev 5099) +++ csw/mgar/pkg/mpg321/trunk/Makefile 2010-03-06 08:44:34 UTC (rev 8995) @@ -1,24 +1,26 @@ -GARNAME = mypkg -GARVERSION = 1.0 -CATEGORIES = lib +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ -DESCRIPTION = This is a useful library +GARNAME = mpg321 +GARVERSION = 0.2.11 +DISTFILE_SUFFIX = -2 +CATEGORIES = apps + +DESCRIPTION = A Free replacement for mpg123 +SPKG_SOURCEURL = http://mpg321.sourceforge.net/ define BLURB - It does stuff with things endef - -MASTER_SITES = -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - -# We define upstream file regex so we can be notifed of new upstream software release +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION)$(DISTFILE_SUFFIX).tar.gz +RUNTIME_DEP_PKGS_CSWmpg321 += CSWlibao +RUNTIME_DEP_PKGS_CSWmpg321 += CSWlibid3tag +RUNTIME_DEP_PKGS_CSWmpg321 += CSWlibmad +RUNTIME_DEP_PKGS_CSWmpg321 += CSWzlib +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWmpg321) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - +TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) - -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +# A fix for an inline function and 'symbol not found'. +EXTRA_CFLAGS = -features=no%extinl +include gar/category.mk Property changes on: csw/mgar/pkg/mpg321/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/mpg321/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-05-28 21:20:52 UTC (rev 5099) +++ csw/mgar/pkg/mpg321/trunk/checksums 2010-03-06 08:44:34 UTC (rev 8995) @@ -0,0 +1 @@ +dff0ce31869847db251878561a621ae0 mpg321-0.2.11-2.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 Sat Mar 6 13:25:46 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 06 Mar 2010 12:25:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8996] csw/mgar/pkg/exiftool/trunk Message-ID: Revision: 8996 http://gar.svn.sourceforge.net/gar/?rev=8996&view=rev Author: hson Date: 2010-03-06 12:25:45 +0000 (Sat, 06 Mar 2010) Log Message: ----------- exiftool: Update to 8.13 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 2010-03-06 08:44:34 UTC (rev 8995) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2010-03-06 12:25:45 UTC (rev 8996) @@ -1,5 +1,5 @@ GARNAME = exiftool -GARVERSION = 8.09 +GARVERSION = 8.13 CATEGORIES = cpan DESCRIPTION = Read, Write and Edit Image File Meta Information Modified: csw/mgar/pkg/exiftool/trunk/checksums =================================================================== --- csw/mgar/pkg/exiftool/trunk/checksums 2010-03-06 08:44:34 UTC (rev 8995) +++ csw/mgar/pkg/exiftool/trunk/checksums 2010-03-06 12:25:45 UTC (rev 8996) @@ -1 +1 @@ -4986e1acb04453350378c2161784ae6c Image-ExifTool-8.09.tar.gz +643d7a69cf97dabf30cba34426a23048 Image-ExifTool-8.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 6 13:27:08 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Mar 2010 12:27:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8997] csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile Message-ID: Revision: 8997 http://gar.svn.sourceforge.net/gar/?rev=8997&view=rev Author: wahwah Date: 2010-03-06 12:27:08 +0000 (Sat, 06 Mar 2010) Log Message: ----------- xcbproto: A hack to place the Python modules in the right directory. Modified Paths: -------------- csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile Modified: csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile 2010-03-06 12:25:45 UTC (rev 8996) +++ csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile 2010-03-06 12:27:08 UTC (rev 8997) @@ -1,3 +1,5 @@ +# $Id$ + GARVERSION = 1.6 CATEGORIES = x11 PROTONAME = xcb-proto @@ -38,23 +40,28 @@ RUNTIME_DEP_PKGS_CSWpyxcbproto = CSWxcbproto CSWpython SPKG_DESC_CSWxcbproto = XCB protocol descriptions (in XML) -SPKG_DESC_CSWpyxcbproto = XCB protocol descriptions (in XML) Python Bindings +SPKG_DESC_CSWpyxcbproto = $(SPKG_DESC_CSWxcbproto) Python Bindings -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -PYTHON_PREFIX=$(BUILD_PREFIX)/lib/python/site-packages +PYTHON_PREFIX = $(BUILD_PREFIX)/lib/python/site-packages -EXTRA_PAX_ARGS = -s ',^.*/\(xcbgen/.*\.py\),.$(BUILD_PREFIX)/lib/python/site-packages/\1,' -EXTRA_PAX_ARGS += -s ',^\.$(libdir)/python.*,,' - PYCOMPILE = 1 PKGFILES_CSWpyxcbproto = .*\.py ARCHALL_CSWpyxcbproto = 1 include gar/category.mk + +# This bit is probably somewhat objectionable, but it gets the job done. +post-merge: + ginstall -m 755 -d $(PKGROOT)/opt/csw/lib + [ -d $(PKGROOT)$(prefix)/lib/python ] \ + && \ + gmv -v $(PKGROOT)$(prefix)/lib/python $(PKGROOT)/opt/csw/lib + grm -fv $(PKGROOT)/opt/csw/lib/python/site-packages/xcbgen/*.py[co] + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 6 13:33:16 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Mar 2010 12:33:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8998] csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile Message-ID: Revision: 8998 http://gar.svn.sourceforge.net/gar/?rev=8998&view=rev Author: wahwah Date: 2010-03-06 12:33:16 +0000 (Sat, 06 Mar 2010) Log Message: ----------- xcbproto: A better handling of the conditionals; gmake fill stop the build if the directory is not there and the construct '[ -d ... ] && command' is used without the '|| true' suffix. Modified Paths: -------------- csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile Modified: csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile 2010-03-06 12:27:08 UTC (rev 8997) +++ csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile 2010-03-06 12:33:16 UTC (rev 8998) @@ -60,8 +60,8 @@ # This bit is probably somewhat objectionable, but it gets the job done. post-merge: ginstall -m 755 -d $(PKGROOT)/opt/csw/lib - [ -d $(PKGROOT)$(prefix)/lib/python ] \ - && \ - gmv -v $(PKGROOT)$(prefix)/lib/python $(PKGROOT)/opt/csw/lib + if [ -d $(PKGROOT)$(prefix)/lib/python ]; then \ + gmv -v $(PKGROOT)$(prefix)/lib/python $(PKGROOT)/opt/csw/lib; \ + fi grm -fv $(PKGROOT)/opt/csw/lib/python/site-packages/xcbgen/*.py[co] @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 6 14:04:41 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Mar 2010 13:04:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8999] csw/mgar/pkg/startup-notification Message-ID: Revision: 8999 http://gar.svn.sourceforge.net/gar/?rev=8999&view=rev Author: wahwah Date: 2010-03-06 13:04:41 +0000 (Sat, 06 Mar 2010) Log Message: ----------- startup-notification: Moving legacy to branches. Added Paths: ----------- csw/mgar/pkg/startup-notification/branches/ csw/mgar/pkg/startup-notification/branches/legacy/ csw/mgar/pkg/startup-notification/tags/ Removed Paths: ------------- csw/mgar/pkg/startup-notification/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 6 14:11:41 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Mar 2010 13:11:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9000] csw/mgar/pkg/startup-notification Message-ID: Revision: 9000 http://gar.svn.sourceforge.net/gar/?rev=9000&view=rev Author: wahwah Date: 2010-03-06 13:11:41 +0000 (Sat, 06 Mar 2010) Log Message: ----------- startup-notification: Upgrade to 0.10 Modified Paths: -------------- csw/mgar/pkg/startup-notification/trunk/Makefile csw/mgar/pkg/startup-notification/trunk/checksums Added Paths: ----------- csw/mgar/pkg/startup-notification/trunk/ Modified: csw/mgar/pkg/startup-notification/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-03-05 15:37:32 UTC (rev 8990) +++ csw/mgar/pkg/startup-notification/trunk/Makefile 2010-03-06 13:11:41 UTC (rev 9000) @@ -2,184 +2,22 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = startup-notification +GARVERSION = 0.10 +CATEGORIES = gnome +DESCRIPTION = Reference implementation of the startup notification protocol define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://www.freedesktop.org/wiki/Software/startup-notification +MASTER_SITES = http://www.freedesktop.org/software/startup-notification/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 -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +CATALOGNAME = startup_notif +PACKAGES = CSWstartupnotif CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +RUNTIME_DEP_PKGS_CSWstartupnotif += CSWlibice +RUNTIME_DEP_PKGS_CSWstartupnotif += CSWlibsm +RUNTIME_DEP_PKGS_CSWstartupnotif += CSWlibx11 +RUNTIME_DEP_PKGS_CSWstartupnotif += CSWlibxcb +RUNTIME_DEP_PKGS_CSWstartupnotif += CSWxcbutil +include gar/category.mk Modified: csw/mgar/pkg/startup-notification/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-03-05 15:37:32 UTC (rev 8990) +++ csw/mgar/pkg/startup-notification/trunk/checksums 2010-03-06 13:11:41 UTC (rev 9000) @@ -0,0 +1 @@ +bca0ed1c74bc4e483ea2ed12a5717354 startup-notification-0.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 6 14:44:30 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Mar 2010 13:44:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9001] csw/mgar/pkg/freedesktop/xcb-util/trunk Message-ID: Revision: 9001 http://gar.svn.sourceforge.net/gar/?rev=9001&view=rev Author: wahwah Date: 2010-03-06 13:44:24 +0000 (Sat, 06 Mar 2010) Log Message: ----------- xcb-util: xcb_size_hints_set_win_gravity-prototype.patch Modified Paths: -------------- csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile csw/mgar/pkg/freedesktop/xcb-util/trunk/checksums Added Paths: ----------- csw/mgar/pkg/freedesktop/xcb-util/trunk/files/xcb_size_hints_set_win_gravity-prototype.patch Modified: csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile 2010-03-06 13:11:41 UTC (rev 9000) +++ csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile 2010-03-06 13:44:24 UTC (rev 9001) @@ -1,5 +1,7 @@ +# $Id$ + GARNAME = xcb-util -GARVERSION = 0.3.5 +GARVERSION = 0.3.6 CATEGORIES = x11 DESCRIPTION = The XCB utility library @@ -13,7 +15,6 @@ RUNTIME_DEP_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 @@ -22,7 +23,7 @@ NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) -#EXTRA_CFLAGS = -D__solaris__ +PATCHFILES += xcb_size_hints_set_win_gravity-prototype.patch include gar/category.mk Modified: csw/mgar/pkg/freedesktop/xcb-util/trunk/checksums =================================================================== --- csw/mgar/pkg/freedesktop/xcb-util/trunk/checksums 2010-03-06 13:11:41 UTC (rev 9000) +++ csw/mgar/pkg/freedesktop/xcb-util/trunk/checksums 2010-03-06 13:44:24 UTC (rev 9001) @@ -1 +1,2 @@ -dd85eadb20c4fde4a437f7e69d266103 download/xcb-util-0.3.5.tar.gz +a8f8f710a202079d1ead532abd061672 xcb-util-0.3.6.tar.gz +77e28bd23267540e6b348cc44a5c62d1 xcb_size_hints_set_win_gravity-prototype.patch Added: csw/mgar/pkg/freedesktop/xcb-util/trunk/files/xcb_size_hints_set_win_gravity-prototype.patch =================================================================== --- csw/mgar/pkg/freedesktop/xcb-util/trunk/files/xcb_size_hints_set_win_gravity-prototype.patch (rev 0) +++ csw/mgar/pkg/freedesktop/xcb-util/trunk/files/xcb_size_hints_set_win_gravity-prototype.patch 2010-03-06 13:44:24 UTC (rev 9001) @@ -0,0 +1,11 @@ +--- xcb-util-0.3.6/icccm/xcb_icccm.h.orig 2010-03-06 14:41:45.211336028 +0100 ++++ xcb-util-0.3.6/icccm/xcb_icccm.h 2010-03-06 14:42:30.116368353 +0100 +@@ -521,7 +521,7 @@ + * @param win_gravity Window gravity value. + */ + void xcb_size_hints_set_win_gravity(xcb_size_hints_t *hints, +- uint32_t win_gravity); ++ xcb_gravity_t win_gravity); + + /** + * @brief Deliver a ChangeProperty request to set a value to a given property. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Mar 6 19:32:12 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 06 Mar 2010 18:32:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9002] csw/mgar/pkg/pixman/trunk Message-ID: Revision: 9002 http://gar.svn.sourceforge.net/gar/?rev=9002&view=rev Author: wbonnet Date: 2010-03-06 18:32:12 +0000 (Sat, 06 Mar 2010) Log Message: ----------- Upgrade to 0.17.10 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 2010-03-06 13:44:24 UTC (rev 9001) +++ csw/mgar/pkg/pixman/trunk/Makefile 2010-03-06 18:32:12 UTC (rev 9002) @@ -1,5 +1,5 @@ GARNAME = pixman -GARVERSION = 0.17.8 +GARVERSION = 0.17.10 CATEGORIES = lib DESCRIPTION = The pixel-manipulation library for X and cairo Modified: csw/mgar/pkg/pixman/trunk/checksums =================================================================== --- csw/mgar/pkg/pixman/trunk/checksums 2010-03-06 13:44:24 UTC (rev 9001) +++ csw/mgar/pkg/pixman/trunk/checksums 2010-03-06 18:32:12 UTC (rev 9002) @@ -1,2 +1,2 @@ -a7deb2ff6b286b676d67aa6ae91317ae pixman-0.17.8.tar.gz +6041fe8982cc4d1323adc47e629c7d13 pixman-0.17.10.tar.gz f78d71433a7d574ff66b7d2bf3ea2a49 pixman-private.h.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sat Mar 6 19:45:41 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 06 Mar 2010 18:45:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9003] csw/mgar/pkg/rrdtool/branches/benny/Makefile Message-ID: Revision: 9003 http://gar.svn.sourceforge.net/gar/?rev=9003&view=rev Author: bensons Date: 2010-03-06 18:45:41 +0000 (Sat, 06 Mar 2010) Log Message: ----------- rrdtool: adjust DESCRIPTION Modified Paths: -------------- csw/mgar/pkg/rrdtool/branches/benny/Makefile Modified: csw/mgar/pkg/rrdtool/branches/benny/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-06 18:32:12 UTC (rev 9002) +++ csw/mgar/pkg/rrdtool/branches/benny/Makefile 2010-03-06 18:45:41 UTC (rev 9003) @@ -2,7 +2,7 @@ GARVERSION = 1.4.2 CATEGORIES = utils -DESCRIPTION = time-series data logging and graphing. +DESCRIPTION = Time-series data logging and graphing. define BLURB RRDtool is basically the time-series graphing and data storage/management component of MRTG, broken out and `done right'. `done right' means that This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 7 00:20:48 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Mar 2010 23:20:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9004] csw/mgar/pkg/freedesktop/xcb-util/trunk Message-ID: Revision: 9004 http://gar.svn.sourceforge.net/gar/?rev=9004&view=rev Author: wahwah Date: 2010-03-06 23:20:45 +0000 (Sat, 06 Mar 2010) Log Message: ----------- xcb-util: Adding the license Modified Paths: -------------- csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile csw/mgar/pkg/freedesktop/xcb-util/trunk/checksums Added Paths: ----------- csw/mgar/pkg/freedesktop/xcb-util/trunk/files/COPYING Modified: csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile 2010-03-06 18:45:41 UTC (rev 9003) +++ csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile 2010-03-06 23:20:45 UTC (rev 9004) @@ -8,11 +8,13 @@ define BLURB endef +SPKG_SOURCEDIR = http://xcb.freedesktop.org/XcbUtil/ MASTER_SITES = http://xcb.freedesktop.org/dist/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += COPYING -BUILD_DEP_PKGS = CSWgnulinks RUNTIME_DEP_PKGS = CSWlibxcb +BUILD_DEP_PKGS = CSWgnulinks $(RUNTIME_DEP_PKGS) PACKAGES = CSWxcbutil UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/freedesktop/xcb-util/trunk/checksums =================================================================== --- csw/mgar/pkg/freedesktop/xcb-util/trunk/checksums 2010-03-06 18:45:41 UTC (rev 9003) +++ csw/mgar/pkg/freedesktop/xcb-util/trunk/checksums 2010-03-06 23:20:45 UTC (rev 9004) @@ -1,2 +1,3 @@ +d763b081cb10c223435b01e00dc0aba7 COPYING a8f8f710a202079d1ead532abd061672 xcb-util-0.3.6.tar.gz 77e28bd23267540e6b348cc44a5c62d1 xcb_size_hints_set_win_gravity-prototype.patch Added: csw/mgar/pkg/freedesktop/xcb-util/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/freedesktop/xcb-util/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/freedesktop/xcb-util/trunk/files/COPYING 2010-03-06 23:20:45 UTC (rev 9004) @@ -0,0 +1,30 @@ +Copyright (C) 2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the +Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, +sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall +be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the names of the authors +or their institutions shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this +Software without prior written authorization from the +authors. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 7 00:43:52 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Mar 2010 23:43:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9005] csw/mgar/pkg Message-ID: Revision: 9005 http://gar.svn.sourceforge.net/gar/?rev=9005&view=rev Author: wahwah Date: 2010-03-06 23:43:51 +0000 (Sat, 06 Mar 2010) Log Message: ----------- libev: Initial commit, 64-bit build. Modified Paths: -------------- csw/mgar/pkg/libev/trunk/Makefile csw/mgar/pkg/libev/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libev/ Modified: csw/mgar/pkg/libev/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-03-05 23:59:55 UTC (rev 8991) +++ csw/mgar/pkg/libev/trunk/Makefile 2010-03-06 23:43:51 UTC (rev 9005) @@ -2,184 +2,17 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = libev +GARVERSION = 3.9 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = Event loop modelled after libevent define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://software.schmorp.de/pkg/libev.html +MASTER_SITES = http://dist.schmorp.de/libev/ 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 -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +BUILD64 = 1 +NOISAEXEC = 1 +include gar/category.mk Modified: csw/mgar/pkg/libev/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-03-05 23:59:55 UTC (rev 8991) +++ csw/mgar/pkg/libev/trunk/checksums 2010-03-06 23:43:51 UTC (rev 9005) @@ -0,0 +1 @@ +40fe7d56d70db83cc0c22a6a68d87a96 libev-3.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 7 00:58:01 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Mar 2010 23:58:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[9006] csw/mgar/pkg/libev/trunk/Makefile Message-ID: Revision: 9006 http://gar.svn.sourceforge.net/gar/?rev=9006&view=rev Author: wahwah Date: 2010-03-06 23:58:01 +0000 (Sat, 06 Mar 2010) Log Message: ----------- libev: Setting TEST_TARGET Modified Paths: -------------- csw/mgar/pkg/libev/trunk/Makefile Modified: csw/mgar/pkg/libev/trunk/Makefile =================================================================== --- csw/mgar/pkg/libev/trunk/Makefile 2010-03-06 23:43:51 UTC (rev 9005) +++ csw/mgar/pkg/libev/trunk/Makefile 2010-03-06 23:58:01 UTC (rev 9006) @@ -15,4 +15,5 @@ CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 1 NOISAEXEC = 1 +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 wahwah at users.sourceforge.net Sun Mar 7 09:22:35 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 07 Mar 2010 08:22:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[9007] csw/mgar/pkg/libev/trunk/Makefile Message-ID: Revision: 9007 http://gar.svn.sourceforge.net/gar/?rev=9007&view=rev Author: wahwah Date: 2010-03-07 08:22:32 +0000 (Sun, 07 Mar 2010) Log Message: ----------- libev: Adding license Modified Paths: -------------- csw/mgar/pkg/libev/trunk/Makefile Modified: csw/mgar/pkg/libev/trunk/Makefile =================================================================== --- csw/mgar/pkg/libev/trunk/Makefile 2010-03-06 23:58:01 UTC (rev 9006) +++ csw/mgar/pkg/libev/trunk/Makefile 2010-03-07 08:22:32 UTC (rev 9007) @@ -16,4 +16,5 @@ BUILD64 = 1 NOISAEXEC = 1 TEST_TARGET = check +LICENSE = LICENSE include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 7 09:36:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 07 Mar 2010 08:36:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9008] csw/mgar/pkg/lua/trunk Message-ID: Revision: 9008 http://gar.svn.sourceforge.net/gar/?rev=9008&view=rev Author: wahwah Date: 2010-03-07 08:35:55 +0000 (Sun, 07 Mar 2010) Log Message: ----------- lua: Moved to GAR v2 Modified Paths: -------------- csw/mgar/pkg/lua/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/lua/trunk/files/CSWlua.gspec Property Changed: ---------------- csw/mgar/pkg/lua/trunk/ csw/mgar/pkg/lua/trunk/Makefile Property changes on: csw/mgar/pkg/lua/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/lua/trunk/Makefile =================================================================== --- csw/mgar/pkg/lua/trunk/Makefile 2010-03-07 08:22:32 UTC (rev 9007) +++ csw/mgar/pkg/lua/trunk/Makefile 2010-03-07 08:35:55 UTC (rev 9008) @@ -1,3 +1,5 @@ +# $Id$ + GARNAME = lua GARVERSION = 5.1.4 CATEGORIES = lang @@ -2,3 +4,3 @@ -DESCRIPTION = light-weight language designed for extending applications +DESCRIPTION = Light-weight language designed for extending applications define BLURB @@ -9,23 +11,25 @@ language. endef +SPKG_SOURCEURL = http://www.lua.org/ MASTER_SITES = http://www.lua.org/ftp/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWlua.gspec PATCHFILES = dynamic.patch -#CSWlua.prototype CSWlua.depend - -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -#LIBDEPS += lib/db lib/gdbm +CONFIGURE_SCRIPTS = -# Configuration flags -CONFIGURE_SCRIPTS= +BUILD_ARGS += solaris CC=$(CC) +BUILD_ARGS += CFLAGS="${CFLAGS} +BUILD_ARGS += -DLUA_USE_POSIX +BUILD_ARGS += -DLUA_USE_DLOPEN +BUILD_ARGS += -KPIC" MYLIBS="-ldl" -BUILD_ARGS += solaris CC=$(CC) CFLAGS="${CFLAGS} -DLUA_USE_POSIX -DLUA_USE_DLOPEN -KPIC" MYLIBS="-ldl" +INSTALL_ARGS += INSTALL=ginstall +INSTALL_ARGS += INSTALL_TOP=$(DESTDIR)$(prefix) +INSTALL_ARGS += INSTALL_MAN=$(DESTDIR)$(mandir)/man1 -INSTALL_ARGS += INSTALL=ginstall INSTALL_TOP=$(DESTDIR)$(prefix) INSTALL_MAN=$(DESTDIR)$(mandir)/man1 +LICENSE = COPYRIGHT include gar/category.mk Property changes on: csw/mgar/pkg/lua/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Deleted: csw/mgar/pkg/lua/trunk/files/CSWlua.gspec =================================================================== --- csw/mgar/pkg/lua/trunk/files/CSWlua.gspec 2010-03-07 08:22:32 UTC (rev 9007) +++ csw/mgar/pkg/lua/trunk/files/CSWlua.gspec 2010-03-07 08:35:55 UTC (rev 9008) @@ -1,4 +0,0 @@ -%var bitname lua -%var pkgname CSWlua -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYRIGHT 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 Mar 7 11:19:13 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 07 Mar 2010 10:19:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9009] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 9009 http://gar.svn.sourceforge.net/gar/?rev=9009&view=rev Author: rthurner Date: 2010-03-07 10:19:12 +0000 (Sun, 07 Mar 2010) Log Message: ----------- mercurial - update to hg-1.5 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 2010-03-07 08:35:55 UTC (rev 9008) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-03-07 10:19:12 UTC (rev 9009) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.4.3 +GARVERSION = 1.5 CATEGORIES = devel DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2010-03-07 08:35:55 UTC (rev 9008) +++ csw/mgar/pkg/mercurial/trunk/checksums 2010-03-07 10:19:12 UTC (rev 9009) @@ -1 +1 @@ -b075a2a6a08c10405ef3483aecb1a991 mercurial-1.4.3.tar.gz +6e31357ada35fe20557f08a4e89f9c42 mercurial-1.5.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 Mar 7 11:34:05 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 07 Mar 2010 10:34:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[9010] csw/mgar/pkg/wesnoth/trunk Message-ID: Revision: 9010 http://gar.svn.sourceforge.net/gar/?rev=9010&view=rev Author: rthurner Date: 2010-03-07 10:34:05 +0000 (Sun, 07 Mar 2010) Log Message: ----------- wesnoth - upgrade to 1.7.13 Modified Paths: -------------- csw/mgar/pkg/wesnoth/trunk/Makefile csw/mgar/pkg/wesnoth/trunk/checksums Modified: csw/mgar/pkg/wesnoth/trunk/Makefile =================================================================== --- csw/mgar/pkg/wesnoth/trunk/Makefile 2010-03-07 10:19:12 UTC (rev 9009) +++ csw/mgar/pkg/wesnoth/trunk/Makefile 2010-03-07 10:34:05 UTC (rev 9010) @@ -1,5 +1,5 @@ GARNAME = wesnoth -GARVERSION = 1.4.7 +GARVERSION = 1.7.13 CATEGORIES = apps DESCRIPTION = a free turn-based strategy game with a fanasy theme Modified: csw/mgar/pkg/wesnoth/trunk/checksums =================================================================== --- csw/mgar/pkg/wesnoth/trunk/checksums 2010-03-07 10:19:12 UTC (rev 9009) +++ csw/mgar/pkg/wesnoth/trunk/checksums 2010-03-07 10:34:05 UTC (rev 9010) @@ -3,4 +3,4 @@ 1e4363990aa7b5eb2ceaf4cef2237c80 global.hpp.patch 59968804e93a18220d7d18e8252fff8d language.cpp.diff b9890e1344f0f1d62bdf3e80cf4e4575 simple_wml.cpp.patch -fdd341c3d66bf1bea2113c79db852d68 wesnoth-1.4.7.tar.bz2 +b1e452e8138e3c573e92eb75f8a2d31a wesnoth-1.7.13.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 7 11:51:35 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 07 Mar 2010 10:51:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[9011] csw/mgar/pkg/awesome/trunk Message-ID: Revision: 9011 http://gar.svn.sourceforge.net/gar/?rev=9011&view=rev Author: wahwah Date: 2010-03-07 10:51:35 +0000 (Sun, 07 Mar 2010) Log Message: ----------- awesome: compiles, but fails to link. Modified Paths: -------------- csw/mgar/pkg/awesome/trunk/Makefile csw/mgar/pkg/awesome/trunk/checksums Added Paths: ----------- csw/mgar/pkg/awesome/trunk/files/backtrace.c.patch csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch Modified: csw/mgar/pkg/awesome/trunk/Makefile =================================================================== --- csw/mgar/pkg/awesome/trunk/Makefile 2010-03-07 10:34:05 UTC (rev 9010) +++ csw/mgar/pkg/awesome/trunk/Makefile 2010-03-07 10:51:35 UTC (rev 9011) @@ -17,16 +17,21 @@ INSTALL_SCRIPTS = awesome CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU +EXTRA_LD_OPTIONS = -L/opt/csw/lib -liconv +BUILD_DEP_PKGS += CSWlua CSWgperf EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig +PATCHFILES += gperf.sh-solarify.patch +PATCHFILES += backtrace.c.patch include gar/category.mk build-awesome: - (cd $(WORKSRC); gmake $(BUILD_ENV)) + (cd $(WORKSRC); gmake $(BUILD_ENV) VERBOSE=1) @$(MAKECOOKIE) install-awesome: (cd $(WORKSRC); gmake $(INSTALL_ENV) install) @$(MAKECOOKIE) +PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/awesome/trunk/checksums =================================================================== --- csw/mgar/pkg/awesome/trunk/checksums 2010-03-07 10:34:05 UTC (rev 9010) +++ csw/mgar/pkg/awesome/trunk/checksums 2010-03-07 10:51:35 UTC (rev 9011) @@ -1 +1,3 @@ 8c2537ad898d7f58a0f3ba92e6a561a1 awesome-3.4.4.tar.bz2 +1d5c67eb4555b367032c1294fb72bf0b backtrace.c.patch +346c2299f6f5be4d667ff3769a1251f0 gperf.sh-solarify.patch Added: csw/mgar/pkg/awesome/trunk/files/backtrace.c.patch =================================================================== --- csw/mgar/pkg/awesome/trunk/files/backtrace.c.patch (rev 0) +++ csw/mgar/pkg/awesome/trunk/files/backtrace.c.patch 2010-03-07 10:51:35 UTC (rev 9011) @@ -0,0 +1,30 @@ +--- awesome-3.4.4/common/backtrace.c.orig 2010-03-07 10:55:50.898528590 +0100 ++++ awesome-3.4.4/common/backtrace.c 2010-03-07 10:57:36.194936144 +0100 +@@ -19,7 +19,6 @@ + * + */ + +-#include + #include "common/backtrace.h" + + #define MAX_STACK_SIZE 32 +@@ -34,8 +33,8 @@ + char **bt; + int stack_size; + +- stack_size = backtrace(stack, countof(stack)); +- bt = backtrace_symbols(stack, stack_size); ++ stack_size = 0; ++ bt = NULL; + + buffer_init(buf); + if(bt) +@@ -49,7 +48,7 @@ + p_delete(&bt); + } + else +- buffer_addsl(buf, "Cannot get backtrace symbols."); ++ buffer_addsl(buf, "Cannot get backtrace symbols, disabled due to missing execinfo.h on Solaris."); + } + + // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 Added: csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch =================================================================== --- csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch (rev 0) +++ csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch 2010-03-07 10:51:35 UTC (rev 9011) @@ -0,0 +1,43 @@ +--- awesome-3.4.4/build-utils/gperf.sh.orig 2010-03-07 10:35:38.518346274 +0100 ++++ awesome-3.4.4/build-utils/gperf.sh 2010-03-07 10:37:23.977357986 +0100 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + # + # Copyright ? 2008 Pierre Habouzit + # +@@ -50,7 +50,7 @@ + + typedef enum awesome_token_t { + A_TK_UNKNOWN, +-`tr '[:lower:]' '[:upper:]' | sed -e "s/^[^/].*/ A_TK_&,/"` ++`tr '[:lower:]' '[:upper:]' | gsed -e "s/^[^/].*/ A_TK_&,/"` + } awesome_token_t; + + __attribute__((pure)) enum awesome_token_t a_tokenize(const char *s, int len); +@@ -109,14 +109,14 @@ + } + + extract_tokens() { +- grep '^### ' "$1" | cut -d ' ' -f 2 ++ ggrep '^### ' "$1" | cut -d ' ' -f 2 + } + + + TOKENS_FILE="$1" + TARGET="$2" + +-trap "rm -f ${TARGET}" 0 ++trap "grm -f ${TARGET}" 0 + + rm -f "${TARGET}" + case "${TARGET}" in +@@ -124,7 +124,7 @@ + *.c) do_c > "${TARGET}" < "${TOKENS_FILE}" ;; + *) die "you must ask for the 'h' or 'c' generation";; + esac +-chmod -w "${TARGET}" ++gchmod -w "${TARGET}" + + trap - 0 + exit 0 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 Mar 7 12:24:03 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 07 Mar 2010 11:24:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[9012] csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Message-ID: Revision: 9012 http://gar.svn.sourceforge.net/gar/?rev=9012&view=rev Author: rthurner Date: 2010-03-07 11:24:03 +0000 (Sun, 07 Mar 2010) Log Message: ----------- submitpkg - default the options closer to reality Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-03-07 10:51:35 UTC (rev 9011) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-03-07 11:24:03 UTC (rev 9012) @@ -42,10 +42,10 @@ [releases] sender name = Your Name -sender email = your.email at example.com +sender email = your.email at opencsw.org release manager name = Release Manager -release manager email = their.email at example.com -release cc = maintainers at example.com +release manager email = pkgsubmissions at lists.opencsw.org +; release cc = maintainers at example.com ; Usually it's /home/testing package dir = /home/testing target host = bender @@ -58,7 +58,7 @@ ] CONFIG_REQUIRED_OPTS = [ "sender name", "sender email", - "release manager name", "release manager email", + "release manager email", "package dir", ] DEFAULT_FILE_NAME = "newpkgs.mail" 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 Mar 7 13:43:08 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 07 Mar 2010 12:43:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9013] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9013 http://gar.svn.sourceforge.net/gar/?rev=9013&view=rev Author: rthurner Date: 2010-03-07 12:43:08 +0000 (Sun, 07 Mar 2010) Log Message: ----------- submitpkg - remove release mgr name as mandatory field Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-07 11:24:03 UTC (rev 9012) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-07 12:43:08 UTC (rev 9013) @@ -302,7 +302,10 @@ self.sender = u"%s <%s>" % (sender_name, sender_email) self.pkgnames = pkgnames self.paths = paths - self.release_mgr = u"%s <%s>" % (release_mgr_name, release_mgr_email) + if release_mgr_name: + self.release_mgr = u"%s <%s>" % (release_mgr_name, release_mgr_email) + else: + self.release_mgr = u"%s" % (release_mgr_email) self.release_cc = release_cc if self.release_cc: self.release_cc = unicode(release_cc) Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-03-07 11:24:03 UTC (rev 9012) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-03-07 12:43:08 UTC (rev 9013) @@ -114,6 +114,10 @@ options.pkgnames]) else: options.catalognames = options.pkgnames + if config.has_option(CONFIG_RELEASE_SECTION, "release manager name"): + release_mgr_name=config.get(CONFIG_RELEASE_SECTION, "release manager name"), + else: + release_mgr_name = None if config.has_option(CONFIG_RELEASE_SECTION, "release cc"): release_cc = config.get(CONFIG_RELEASE_SECTION, "release cc") else: @@ -174,7 +178,7 @@ raise PackageSubmissionError(msg) nm = opencsw.NewpkgMailer( catalognames, remote_package_references, - release_mgr_name=config.get(CONFIG_RELEASE_SECTION, "release manager name"), + release_mgr_name=release_mgr_name, release_mgr_email=config.get(CONFIG_RELEASE_SECTION, "release manager email"), sender_name=config.get(CONFIG_RELEASE_SECTION, "sender name"), sender_email=config.get(CONFIG_RELEASE_SECTION, "sender email"), 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 Mar 7 23:48:47 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 07 Mar 2010 22:48:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9014] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 9014 http://gar.svn.sourceforge.net/gar/?rev=9014&view=rev Author: rthurner Date: 2010-03-07 22:48:42 +0000 (Sun, 07 Mar 2010) Log Message: ----------- svn-1.6.9 - switch off the tests temporarily, as skiptest stated in the makefile does not work Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-03-07 12:43:08 UTC (rev 9013) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-03-07 22:48:42 UTC (rev 9014) @@ -202,7 +202,7 @@ # $(WORKSRC)/subversion/tests/cmdline/merge_tests.py --list # and for progress information you could compare this with # tail -f $(WORKSRC)/tests.log | grep merge_tests.py -TEST_TARGET = check +TEST_TARGET = #check # Overrides CHECKPKG_OVERRIDES_CSWap2svn = symbol-not-found This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 8 08:55:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 08 Mar 2010 07:55:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9015] csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Message-ID: Revision: 9015 http://gar.svn.sourceforge.net/gar/?rev=9015&view=rev Author: wahwah Date: 2010-03-08 07:55:44 +0000 (Mon, 08 Mar 2010) Log Message: ----------- mGAR v2: submitpkg, small bugfix, remove a comma which makes the release manager name be a tuple Modified Paths: -------------- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py Modified: csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-03-07 22:48:42 UTC (rev 9014) +++ csw/mgar/gar/v2/lib/python/submit_to_newpkgs.py 2010-03-08 07:55:44 UTC (rev 9015) @@ -115,7 +115,8 @@ else: options.catalognames = options.pkgnames if config.has_option(CONFIG_RELEASE_SECTION, "release manager name"): - release_mgr_name=config.get(CONFIG_RELEASE_SECTION, "release manager name"), + release_mgr_name = config.get(CONFIG_RELEASE_SECTION, + "release manager name") else: release_mgr_name = None if config.has_option(CONFIG_RELEASE_SECTION, "release cc"): 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 Mar 8 09:45:27 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 08 Mar 2010 08:45:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[9016] csw/mgar/pkg/spamassassin/trunk/files Message-ID: Revision: 9016 http://gar.svn.sourceforge.net/gar/?rev=9016&view=rev Author: bonivart Date: 2010-03-08 08:45:27 +0000 (Mon, 08 Mar 2010) Log Message: ----------- spamassassin: fix quotation (#4323) Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.CSW Modified: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd 2010-03-08 07:55:44 UTC (rev 9015) +++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd 2010-03-08 08:45:27 UTC (rev 9016) @@ -14,7 +14,7 @@ PROG=spamd PATH=$PATH:/usr/bin:/opt/csw/bin -#OPTIONS=-i 127.0.0.1 -m 10 --min-children=2 --max-conn-per-child=50 -s local2 --syslog-socket=inet -u spamd -x -r /var/opt/csw/spamassassin/spamd.pid +#OPTIONS="-i 127.0.0.1 -m 10 --min-children=2 --max-conn-per-child=50 -s local2 --syslog-socket=inet -u spamd -x -r /var/opt/csw/spamassassin/spamd.pid" ZONE= # used for initialization, do not change Modified: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.CSW =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.CSW 2010-03-08 07:55:44 UTC (rev 9015) +++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.CSW 2010-03-08 08:45:27 UTC (rev 9016) @@ -4,4 +4,4 @@ # # Peter Bonivart, OpenCSW -OPTIONS=-i 127.0.0.1 -m 10 --min-children=2 --max-conn-per-child=50 -s local2 --syslog-socket=inet -u spamd -x -r /var/opt/csw/spamassassin/spamd.pid +OPTIONS="-i 127.0.0.1 -m 10 --min-children=2 --max-conn-per-child=50 -s local2 --syslog-socket=inet -u spamd -x -r /var/opt/csw/spamassassin/spamd.pid" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 8 10:34:32 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 08 Mar 2010 09:34:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9017] csw/mgar/pkg/evince/trunk/Makefile Message-ID: Revision: 9017 http://gar.svn.sourceforge.net/gar/?rev=9017&view=rev Author: wahwah Date: 2010-03-08 09:34:31 +0000 (Mon, 08 Mar 2010) Log Message: ----------- evince: Adding the dependency on CSWdbus Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2010-03-08 08:45:27 UTC (rev 9016) +++ csw/mgar/pkg/evince/trunk/Makefile 2010-03-08 09:34:31 UTC (rev 9017) @@ -16,6 +16,9 @@ CONFIGURE_ARGS = $(DIRPATHS) STRIP_LIBTOOL = 1 EXTRA_LD_OPTIONS = /opt/csw/X11/lib/libX11.so -lm +# There are no shared-object dependencies on CSWdbus, but it's required for +# evince to work. +RUNTIME_DEP_PKGS_CSWevince += CSWdbus RUNTIME_DEP_PKGS_CSWevince += CSWdbusglib RUNTIME_DEP_PKGS_CSWevince += CSWdjvulibre RUNTIME_DEP_PKGS_CSWevince += CSWfconfig This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 8 14:05:23 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 08 Mar 2010 13:05:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9018] csw/mgar/pkg/mpd/trunk Message-ID: Revision: 9018 http://gar.svn.sourceforge.net/gar/?rev=9018&view=rev Author: wahwah Date: 2010-03-08 13:05:23 +0000 (Mon, 08 Mar 2010) Log Message: ----------- mpd: Update to 0.15.8 Modified Paths: -------------- csw/mgar/pkg/mpd/trunk/Makefile csw/mgar/pkg/mpd/trunk/checksums Modified: csw/mgar/pkg/mpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpd/trunk/Makefile 2010-03-08 09:34:31 UTC (rev 9017) +++ csw/mgar/pkg/mpd/trunk/Makefile 2010-03-08 13:05:23 UTC (rev 9018) @@ -1,5 +1,5 @@ GARNAME = mpd -GARVERSION = 0.14.2 +GARVERSION = 0.15.8 CATEGORIES = server DESCRIPTION = The Music Player Daemon @@ -43,7 +43,11 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-ao +CONFIGURE_ARGS += --enable-aac CONFIGURE_ARGS += --bindir=/opt/csw/sbin +CONFIGURE_ARGS += --with-faad=/opt/csw +CONFIGURE_ARGS += --with-faad-libraries=/opt/csw/lib +CONFIGURE_ARGS += --with-faad-includes=/opt/csw/include sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw @@ -57,15 +61,18 @@ ginstall $(FILEDIR)/cswmpd.init $(DESTDIR)/etc/opt/csw/init.d/cswmpd ginstall -D $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWmpd/cswusergroup -RUNTIME_DEP_PKGS = CSWaudiofile -RUNTIME_DEP_PKGS += CSWcswclassutils -RUNTIME_DEP_PKGS += CSWflac -RUNTIME_DEP_PKGS += CSWggettextrt -RUNTIME_DEP_PKGS += CSWglib2 -RUNTIME_DEP_PKGS += CSWlibao -RUNTIME_DEP_PKGS += CSWlibid3tag -RUNTIME_DEP_PKGS += CSWlibmad -RUNTIME_DEP_PKGS += CSWzlib +RUNTIME_DEP_PKGS_CSWmpd += CSWaudiofile +RUNTIME_DEP_PKGS_CSWmpd += CSWflac +RUNTIME_DEP_PKGS_CSWmpd += CSWggettextrt +RUNTIME_DEP_PKGS_CSWmpd += CSWglib2 +RUNTIME_DEP_PKGS_CSWmpd += CSWlame +RUNTIME_DEP_PKGS_CSWmpd += CSWlibao +RUNTIME_DEP_PKGS_CSWmpd += CSWlibid3tag +RUNTIME_DEP_PKGS_CSWmpd += CSWlibmad +RUNTIME_DEP_PKGS_CSWmpd += CSWlibogg +RUNTIME_DEP_PKGS_CSWmpd += CSWsqlite3rt +RUNTIME_DEP_PKGS_CSWmpd += CSWvorbis +RUNTIME_DEP_PKGS_CSWmpd += CSWzlib BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) Modified: csw/mgar/pkg/mpd/trunk/checksums =================================================================== --- csw/mgar/pkg/mpd/trunk/checksums 2010-03-08 09:34:31 UTC (rev 9017) +++ csw/mgar/pkg/mpd/trunk/checksums 2010-03-08 13:05:23 UTC (rev 9018) @@ -1,4 +1,4 @@ -e02f090a3592231ce20683f3b9d8f965 download/cswmpd.init -6fee19ad604cfb80c5a13106df6c8925 download/cswusergroup -66817a4b4c05454e6488f6b821f2a6a3 download/mpd-0.14.2.tar.bz2 -cbfadc495881963071465341cbb6b411 download/mpd.conf +e02f090a3592231ce20683f3b9d8f965 cswmpd.init +6fee19ad604cfb80c5a13106df6c8925 cswusergroup +824e1ce46c0f468865d9e5e403cdaf5d mpd-0.15.8.tar.bz2 +cbfadc495881963071465341cbb6b411 mpd.conf 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 Mar 8 14:11:15 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Mar 2010 13:11:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9019] csw/mgar/pkg/cpan/Net-Patricia/trunk Message-ID: Revision: 9019 http://gar.svn.sourceforge.net/gar/?rev=9019&view=rev Author: dmichelsen Date: 2010-03-08 13:11:15 +0000 (Mon, 08 Mar 2010) Log Message: ----------- cpan/Net-Patricia: Update to 1.16 Modified Paths: -------------- csw/mgar/pkg/cpan/Net-Patricia/trunk/Makefile csw/mgar/pkg/cpan/Net-Patricia/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Net-Patricia/trunk/files/CSWpmnetpatricia.gspec csw/mgar/pkg/cpan/Net-Patricia/trunk/files/CSWpmnetpatricia.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Net-Patricia/trunk/ Property changes on: csw/mgar/pkg/cpan/Net-Patricia/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/Net-Patricia/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Patricia/trunk/Makefile 2010-03-08 13:05:23 UTC (rev 9018) +++ csw/mgar/pkg/cpan/Net-Patricia/trunk/Makefile 2010-03-08 13:11:15 UTC (rev 9019) @@ -1,7 +1,7 @@ GARNAME = Net-Patricia -GARVERSION = 1.014 +GARVERSION = 1.16 CATEGORIES = cpan -AUTHOR = PLONKA +AUTHOR = PHILIPP DESCRIPTION = Patricia Trie perl module for fast IP address lookups define BLURB @@ -20,6 +20,7 @@ Reno release. endef -DISTFILES += $(call admfiles,CSWpmnetpatricia,prototype) +PACKAGES = CSWpmnetpatricia +CATALOGNAME = pm_netpatricia include gar/category.mk Modified: csw/mgar/pkg/cpan/Net-Patricia/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-Patricia/trunk/checksums 2010-03-08 13:05:23 UTC (rev 9018) +++ csw/mgar/pkg/cpan/Net-Patricia/trunk/checksums 2010-03-08 13:11:15 UTC (rev 9019) @@ -1,3 +1 @@ -b05f096856aae042b285807e4cd31e3b download/CSWpmnetpatricia.gspec -c5c221d6f8410805bffb6bf0b7c95ec3 download/CSWpmnetpatricia.prototype -16ec73b5b514dbe4275e349fca236c49 download/Net-Patricia-1.014.tar.gz +0b3d6bdc2426ababe0c95304fd58d6eb Net-Patricia-1.16.tar.gz Deleted: csw/mgar/pkg/cpan/Net-Patricia/trunk/files/CSWpmnetpatricia.gspec =================================================================== --- csw/mgar/pkg/cpan/Net-Patricia/trunk/files/CSWpmnetpatricia.gspec 2010-03-08 13:05:23 UTC (rev 9018) +++ csw/mgar/pkg/cpan/Net-Patricia/trunk/files/CSWpmnetpatricia.gspec 2010-03-08 13:11:15 UTC (rev 9019) @@ -1,7 +0,0 @@ -%var bitname pm_netpatricia -%var pkgname CSWpmnetpatricia -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -This library is free software; you may distribute under the terms -of either the GNU General Public License or the Artistic License, as -specified in the Perl README file. Deleted: csw/mgar/pkg/cpan/Net-Patricia/trunk/files/CSWpmnetpatricia.prototype =================================================================== --- csw/mgar/pkg/cpan/Net-Patricia/trunk/files/CSWpmnetpatricia.prototype 2010-03-08 13:05:23 UTC (rev 9018) +++ csw/mgar/pkg/cpan/Net-Patricia/trunk/files/CSWpmnetpatricia.prototype 2010-03-08 13:11:15 UTC (rev 9019) @@ -1,18 +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/Net 0755 root bin -f none /opt/csw/lib/perl/csw/Net/Patricia.pm 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Net 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Net/Patricia 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Net/Patricia/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/Net/Patricia/Patricia.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/Net/Patricia/Patricia.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/Net::Patricia.3perl 0444 root bin -i copyright=CSWpmnetpatricia.copyright -i depend=CSWpmnetpatricia.depend -i pkginfo=CSWpmnetpatricia.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 8 14:16:46 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 08 Mar 2010 13:16:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9020] csw/mgar/pkg Message-ID: Revision: 9020 http://gar.svn.sourceforge.net/gar/?rev=9020&view=rev Author: wahwah Date: 2010-03-08 13:16:46 +0000 (Mon, 08 Mar 2010) Log Message: ----------- mixer: Initial commit Modified Paths: -------------- csw/mgar/pkg/mixer/trunk/Makefile csw/mgar/pkg/mixer/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mixer/ csw/mgar/pkg/mixer/trunk/files/COPYING Modified: csw/mgar/pkg/mixer/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-03-01 12:29:39 UTC (rev 8911) +++ csw/mgar/pkg/mixer/trunk/Makefile 2010-03-08 13:16:46 UTC (rev 9020) @@ -2,184 +2,30 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = mixer +GARVERSION = 1.3 +CATEGORIES = apps +DESCRIPTION = A command line utility to set audio volume define BLURB endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://www.softagalleria.net/mixer.php +MASTER_SITES = http://www.softagalleria.net/download/mixer/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release +DISTFILES += COPYING UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = mixer +INSTALL_SCRIPTS = mixer +TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +include gar/category.mk -#include gar/category.mk +build-mixer: + (cd $(WORKSRC); cc -o mixer mixer.c) + @$(MAKECOOKIE) + +install-mixer: + ginstall -m 755 -d $(DESTDIR)$(bindir) + ginstall -m 755 $(WORKSRC)/mixer $(DESTDIR)$(bindir) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/mixer/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-03-01 12:29:39 UTC (rev 8911) +++ csw/mgar/pkg/mixer/trunk/checksums 2010-03-08 13:16:46 UTC (rev 9020) @@ -0,0 +1,2 @@ +e54d6b2dd2d2f54b5c1e9e8a10981b1a COPYING +15672f5397785183c438afb1d646f1d6 mixer-1.3.tar.gz Added: csw/mgar/pkg/mixer/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/mixer/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/mixer/trunk/files/COPYING 2010-03-08 13:16:46 UTC (rev 9020) @@ -0,0 +1,23 @@ + * Copyright (C) 2006 Toni Ronkko + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * ``Software''), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL TONI RONKKO BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * + * Jul 14 2006, Toni Ronkko This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 8 14:48:16 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 08 Mar 2010 13:48:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9021] csw/mgar/pkg/mpd/trunk/Makefile Message-ID: Revision: 9021 http://gar.svn.sourceforge.net/gar/?rev=9021&view=rev Author: wahwah Date: 2010-03-08 13:48:16 +0000 (Mon, 08 Mar 2010) Log Message: ----------- mpd: A comment about faad.h Modified Paths: -------------- csw/mgar/pkg/mpd/trunk/Makefile Modified: csw/mgar/pkg/mpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpd/trunk/Makefile 2010-03-08 13:16:46 UTC (rev 9020) +++ csw/mgar/pkg/mpd/trunk/Makefile 2010-03-08 13:48:16 UTC (rev 9021) @@ -12,11 +12,13 @@ like frontend options, or restart X often. endef -# A problem: +# TODO: # -# The build, ported from gar v1 to v2 by Maciej Blizi?ski is pretty much done, -# but unfortunately, mpd segfaults when testing. More debugging is needed; this -# build is being submitted to separate segfault fixes from v1-v2 port. +# There already are libraries to compile in AAC and mp4 support, but the +# configure script is not smart enough to pick up the header files. +# +# For example, faad.h test fails when faad.h is in /opt/csw/include. This +# might require patching. SF_PROJ = musicpd MASTER_SITES = $(SF_MIRROR) 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 Mar 8 16:12:24 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Mar 2010 15:12:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9022] csw/mgar/pkg/cpan/Archive-Tar/tags/Archive-Tar-1.54, REV=2009.11.24/ Message-ID: Revision: 9022 http://gar.svn.sourceforge.net/gar/?rev=9022&view=rev Author: dmichelsen Date: 2010-03-08 15:12:24 +0000 (Mon, 08 Mar 2010) Log Message: ----------- cpan/Archive-Tar: Tag 1.54,REV=2009.11.24 Added Paths: ----------- csw/mgar/pkg/cpan/Archive-Tar/tags/Archive-Tar-1.54,REV=2009.11.24/ 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 Mar 8 16:28:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Mar 2010 15:28:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[9023] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 9023 http://gar.svn.sourceforge.net/gar/?rev=9023&view=rev Author: dmichelsen Date: 2010-03-08 15:28:33 +0000 (Mon, 08 Mar 2010) Log Message: ----------- mGAR v2: Fix makesum on empty targets Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-03-08 15:12:24 UTC (rev 9022) +++ csw/mgar/gar/v2/gar.mk 2010-03-08 15:28:33 UTC (rev 9023) @@ -361,10 +361,12 @@ MAKESUM_TARGETS = $(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES)) makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) $(GARCHIVE_TARGETS) - @if test "x$(MAKESUM_TARGETS)" != "x "; then \ + @if test "x$(MAKESUM_TARGETS)" != "x"; then \ (cd $(DOWNLOADDIR) && gmd5sum $(MAKESUM_TARGETS)) > $(CHECKSUM_FILE) ; \ echo "Checksums made for $(MAKESUM_TARGETS)" ; \ cat $(CHECKSUM_FILE) ; \ + else \ + cp /dev/null $(CHECKSUM_FILE) ; \ fi # I am always typing this by mistake 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 Mar 8 16:40:13 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Mar 2010 15:40:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9024] csw/mgar/pkg/cpan/Archive-Tar/trunk Message-ID: Revision: 9024 http://gar.svn.sourceforge.net/gar/?rev=9024&view=rev Author: dmichelsen Date: 2010-03-08 15:40:13 +0000 (Mon, 08 Mar 2010) Log Message: ----------- cpan/Archive-Tar: Convert to stub as functionality is build in Perl 5.10.1 Modified Paths: -------------- csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile csw/mgar/pkg/cpan/Archive-Tar/trunk/checksums Modified: csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile 2010-03-08 15:28:33 UTC (rev 9023) +++ csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile 2010-03-08 15:40:13 UTC (rev 9024) @@ -1,22 +1,29 @@ GARNAME = Archive-Tar -GARVERSION = 1.54 +GARVERSION = stub CATEGORIES = cpan AUTHOR = BINGOS -DESCRIPTION = Module for manipulations of tar archives +DESCRIPTION = Stub to the Perl build-in module Archive::Tar define BLURB - Archive::Tar provides an object oriented mechanism for handling tar files. - It provides class methods for quick and easy files handling while also - allowing for the creation of tar file objects for custom manipulation. If - you have the IO::Zlib module installed, Archive::Tar will also support - compressed or gzipped tar files. endef -RUNTIME_DEP_PKGS = CSWpmiozlib CSWpmiocompress CSWpmpkgconst CSWpmtextdiff +# No source file +MODDIST = PACKAGES = CSWpmarchivetar CATALOGNAME = pm_archivetar +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = + ARCHALL = 1 +# This package is completely empty, so it hasn't got any files +# and no license either. +CHECKPKG_OVERRIDES = action-class-only-in-pkginfo|none +CHECKPKG_OVERRIDES += license-missing + include gar/category.mk + Modified: csw/mgar/pkg/cpan/Archive-Tar/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Archive-Tar/trunk/checksums 2010-03-08 15:28:33 UTC (rev 9023) +++ csw/mgar/pkg/cpan/Archive-Tar/trunk/checksums 2010-03-08 15:40:13 UTC (rev 9024) @@ -1 +0,0 @@ -093c6473c315119556919bd85de0bcb7 Archive-Tar-1.54.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 Mar 8 16:43:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Mar 2010 15:43:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9025] csw/mgar/pkg/cpan/Digest/tags/Digest-1.16, REV=2009. 08.10/ Message-ID: Revision: 9025 http://gar.svn.sourceforge.net/gar/?rev=9025&view=rev Author: dmichelsen Date: 2010-03-08 15:43:00 +0000 (Mon, 08 Mar 2010) Log Message: ----------- cpan/Digest: Tag 1.16,REV=2009.08.10 Added Paths: ----------- csw/mgar/pkg/cpan/Digest/tags/Digest-1.16,REV=2009.08.10/ 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 Mar 8 16:46:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Mar 2010 15:46:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9026] csw/mgar/pkg/cpan/Digest/trunk Message-ID: Revision: 9026 http://gar.svn.sourceforge.net/gar/?rev=9026&view=rev Author: dmichelsen Date: 2010-03-08 15:46:52 +0000 (Mon, 08 Mar 2010) Log Message: ----------- cpan/Digest: Convert to stub as functionality is build in Perl 5.10.1 Modified Paths: -------------- csw/mgar/pkg/cpan/Digest/trunk/Makefile csw/mgar/pkg/cpan/Digest/trunk/checksums Modified: csw/mgar/pkg/cpan/Digest/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Digest/trunk/Makefile 2010-03-08 15:43:00 UTC (rev 9025) +++ csw/mgar/pkg/cpan/Digest/trunk/Makefile 2010-03-08 15:46:52 UTC (rev 9026) @@ -1,18 +1,27 @@ GARNAME = Digest -GARVERSION = 1.16 +GARVERSION = stub CATEGORIES = cpan AUTHOR = GAAS -DESCRIPTION = A simple frontend module for autoloading of various Digest:: modules +DESCRIPTION = Stub to the Perl build-in module Digest define BLURB - This is just a simple frontend module for autoloading of various - Digest:: modules. It also provide documentation of the interface that - all Digest:: modules should provide. endef +MODDIST = + PACKAGES = CSWpmdigest CATALOGNAME = pm_digest +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = + ARCHALL = 1 +# This package is completely empty, so it hasn't got any files +# and no license either. +CHECKPKG_OVERRIDES = action-class-only-in-pkginfo|none +CHECKPKG_OVERRIDES += license-missing + include gar/category.mk Modified: csw/mgar/pkg/cpan/Digest/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Digest/trunk/checksums 2010-03-08 15:43:00 UTC (rev 9025) +++ csw/mgar/pkg/cpan/Digest/trunk/checksums 2010-03-08 15:46:52 UTC (rev 9026) @@ -1 +0,0 @@ -df65b3c12785ff9bbf14521551f0268d download/Digest-1.16.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 Mar 8 16:51:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Mar 2010 15:51:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9027] csw/mgar/pkg/cpan/Digest-SHA1/tags/2.12, REV=2009.08. 06/ Message-ID: Revision: 9027 http://gar.svn.sourceforge.net/gar/?rev=9027&view=rev Author: dmichelsen Date: 2010-03-08 15:51:16 +0000 (Mon, 08 Mar 2010) Log Message: ----------- cpan/Digest-SHA1: Tag 2.12,REV=2009.08.06 Added Paths: ----------- csw/mgar/pkg/cpan/Digest-SHA1/tags/2.12,REV=2009.08.06/ 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 Mar 8 16:52:51 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Mar 2010 15:52:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[9028] csw/mgar/pkg/cpan/Digest-SHA1/trunk Message-ID: Revision: 9028 http://gar.svn.sourceforge.net/gar/?rev=9028&view=rev Author: dmichelsen Date: 2010-03-08 15:52:51 +0000 (Mon, 08 Mar 2010) Log Message: ----------- cpan/Digest-SHA1: Convert to stub as functionality is build in Perl 5.10.1 Modified Paths: -------------- csw/mgar/pkg/cpan/Digest-SHA1/trunk/Makefile csw/mgar/pkg/cpan/Digest-SHA1/trunk/checksums Modified: csw/mgar/pkg/cpan/Digest-SHA1/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Digest-SHA1/trunk/Makefile 2010-03-08 15:51:16 UTC (rev 9027) +++ csw/mgar/pkg/cpan/Digest-SHA1/trunk/Makefile 2010-03-08 15:52:51 UTC (rev 9028) @@ -1,17 +1,27 @@ GARNAME = Digest-SHA1 -GARVERSION = 2.12 +GARVERSION = stub CATEGORIES = cpan AUTHOR = GAAS -DESCRIPTION = Interface to the SHA-1 Algorithm +DESCRIPTION = Stub to the Perl build-in module Digest::SHA1 define BLURB - The Digest::SHA1 module allows you to use the NIST SHA-1 message digest - algorithm from within Perl programs. The algorithm takes as input a message - of arbitrary length and produces as output a 160-bit "fingerprint" or - "message digest" of the input. endef +MODDIST = + PACKAGES = CSWpmdigestsha1 CATALOGNAME = pm_digestsha1 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = + +ARCHALL = 1 + +# This package is completely empty, so it hasn't got any files +# and no license either. +CHECKPKG_OVERRIDES = action-class-only-in-pkginfo|none +CHECKPKG_OVERRIDES += license-missing + include gar/category.mk Modified: csw/mgar/pkg/cpan/Digest-SHA1/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Digest-SHA1/trunk/checksums 2010-03-08 15:51:16 UTC (rev 9027) +++ csw/mgar/pkg/cpan/Digest-SHA1/trunk/checksums 2010-03-08 15:52:51 UTC (rev 9028) @@ -1 +0,0 @@ -eeb0292868801a202bd7ead87b291374 download/Digest-SHA1-2.12.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 Mar 8 16:56:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Mar 2010 15:56:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9029] csw/mgar/pkg/cpan/Module-Build/tags/Module-Build-0. 33, REV=2009.06.08/ Message-ID: Revision: 9029 http://gar.svn.sourceforge.net/gar/?rev=9029&view=rev Author: dmichelsen Date: 2010-03-08 15:56:48 +0000 (Mon, 08 Mar 2010) Log Message: ----------- cpan/Module-Build: Tag 0.33,REV=2009.06.08 Added Paths: ----------- csw/mgar/pkg/cpan/Module-Build/tags/Module-Build-0.33,REV=2009.06.08/ 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 Mar 8 16:58:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Mar 2010 15:58:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[9030] csw/mgar/pkg/cpan/Module-Build/trunk Message-ID: Revision: 9030 http://gar.svn.sourceforge.net/gar/?rev=9030&view=rev Author: dmichelsen Date: 2010-03-08 15:58:09 +0000 (Mon, 08 Mar 2010) Log Message: ----------- cpan/Module-Build: Convert to stub as functionality is build in Perl 5.10.1 Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Build/trunk/Makefile csw/mgar/pkg/cpan/Module-Build/trunk/checksums Modified: csw/mgar/pkg/cpan/Module-Build/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Build/trunk/Makefile 2010-03-08 15:56:48 UTC (rev 9029) +++ csw/mgar/pkg/cpan/Module-Build/trunk/Makefile 2010-03-08 15:58:09 UTC (rev 9030) @@ -1,24 +1,27 @@ GARNAME = Module-Build -GARVERSION = 0.33 +GARVERSION = stub CATEGORIES = cpan AUTHOR = EWILHELM -DESCRIPTION = build and install Perl modules +DESCRIPTION = Stub to the Perl build-in module Module::Build define BLURB - Module::Build is a system for building, testing, and installing Perl - modules. It is meant to be a replacement for ExtUtils::MakeMaker. - Developers may alter the behavior of the module through subclassing in a - much more straightforward way than with MakeMaker. endef -LICENSE = LICENSE +MODDIST = PACKAGES = CSWpmmodulebuild CATALOGNAME = pm_modulebuild -RUNTIME_DEP_PKGS = CSWpmarchivetar CSWpmextutparsexs CSWpmextutcbuilder CSWpmmodulesign -BUILD_DEP_PKGS = CSWperl +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = ARCHALL = 1 +# This package is completely empty, so it hasn't got any files +# and no license either. +CHECKPKG_OVERRIDES = action-class-only-in-pkginfo|none +CHECKPKG_OVERRIDES += license-missing + include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Build/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Build/trunk/checksums 2010-03-08 15:56:48 UTC (rev 9029) +++ csw/mgar/pkg/cpan/Module-Build/trunk/checksums 2010-03-08 15:58:09 UTC (rev 9030) @@ -1 +0,0 @@ -5c31482551c2cfeb0edd6eac42869c52 download/Module-Build-0.33.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 Mar 8 18:12:24 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Mar 2010 17:12:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9031] csw/mgar/pkg Message-ID: Revision: 9031 http://gar.svn.sourceforge.net/gar/?rev=9031&view=rev Author: dmichelsen Date: 2010-03-08 17:12:23 +0000 (Mon, 08 Mar 2010) Log Message: ----------- mplex: Initial commit, doesn't build yet Added Paths: ----------- csw/mgar/pkg/mplex/ csw/mgar/pkg/mplex/branches/ csw/mgar/pkg/mplex/tags/ csw/mgar/pkg/mplex/trunk/ csw/mgar/pkg/mplex/trunk/Makefile csw/mgar/pkg/mplex/trunk/checksums csw/mgar/pkg/mplex/trunk/files/ Property changes on: csw/mgar/pkg/mplex/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/mplex/trunk/Makefile =================================================================== --- csw/mgar/pkg/mplex/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mplex/trunk/Makefile 2010-03-08 17:12:23 UTC (rev 9031) @@ -0,0 +1,19 @@ +GARNAME = mplex +GARVERSION = 0.9.3 +CATEGORIES = utils + +DESCRIPTION = Allows multiplexing of port 443 for ssh and https at the same time +define BLURB +endef + +MASTER_SITES = http://www.pond-weed.com/multiplex/ +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 + +EXTRA_LDFLAGS = -lsocket -lnsl + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/mplex/trunk/checksums =================================================================== --- csw/mgar/pkg/mplex/trunk/checksums (rev 0) +++ csw/mgar/pkg/mplex/trunk/checksums 2010-03-08 17:12:23 UTC (rev 9031) @@ -0,0 +1 @@ +a71f6d6c340939b3475ce31533fad153 mplex-0.9.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 Mon Mar 8 18:36:18 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Mar 2010 17:36:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[9032] csw/mgar/pkg Message-ID: Revision: 9032 http://gar.svn.sourceforge.net/gar/?rev=9032&view=rev Author: dmichelsen Date: 2010-03-08 17:36:17 +0000 (Mon, 08 Mar 2010) Log Message: ----------- cpan/Digest-SHA: Convert to stub as functionality is build in Perl 5.10. Modified Paths: -------------- csw/mgar/pkg/cpan/Digest-SHA/trunk/Makefile csw/mgar/pkg/cpan/Digest-SHA/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Digest-SHA/ Removed Paths: ------------- csw/mgar/pkg/Digest-SHA/ Modified: csw/mgar/pkg/cpan/Digest-SHA/trunk/Makefile =================================================================== --- csw/mgar/pkg/Digest-SHA/trunk/Makefile 2010-03-02 00:06:52 UTC (rev 8930) +++ csw/mgar/pkg/cpan/Digest-SHA/trunk/Makefile 2010-03-08 17:36:17 UTC (rev 9032) @@ -1,16 +1,27 @@ GARNAME = Digest-SHA -GARVERSION = 5.48 +GARVERSION = stub CATEGORIES = cpan AUTHOR = MSHELOR -DESCRIPTION = Perl extension for SHA-1/224/256/384/512 +DESCRIPTION = Stub to the Perl build-in module Digest::SHA define BLURB - Perl extension for SHA-1/224/256/384/512 endef -DISTFILES = COPYING +MODDIST = PACKAGES = CSWpmdigestsha CATALOGNAME = pm_digestsha +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = + +ARCHALL = 1 + +# This package is completely empty, so it hasn't got any files +# and no license either. +CHECKPKG_OVERRIDES = action-class-only-in-pkginfo|none +CHECKPKG_OVERRIDES += license-missing + include gar/category.mk Modified: csw/mgar/pkg/cpan/Digest-SHA/trunk/checksums =================================================================== --- csw/mgar/pkg/Digest-SHA/trunk/checksums 2010-03-02 00:06:52 UTC (rev 8930) +++ csw/mgar/pkg/cpan/Digest-SHA/trunk/checksums 2010-03-08 17:36:17 UTC (rev 9032) @@ -1,2 +0,0 @@ -46e51a66dc97c970b6330ce8108aca04 COPYING -a7ec2c09a58a68dbf419aa191567d75e Digest-SHA-5.48.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 Mar 8 18:48:19 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Mar 2010 17:48:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9033] csw/mgar/pkg/cpan/Digest-SHA1/trunk/ Message-ID: Revision: 9033 http://gar.svn.sourceforge.net/gar/?rev=9033&view=rev Author: dmichelsen Date: 2010-03-08 17:48:19 +0000 (Mon, 08 Mar 2010) Log Message: ----------- cpan/Digest-SHA1: Undo changes according stub Removed Paths: ------------- csw/mgar/pkg/cpan/Digest-SHA1/trunk/ 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 Mar 8 18:49:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 08 Mar 2010 17:49:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9034] csw/mgar/pkg/cpan/Digest-SHA1/trunk/ Message-ID: Revision: 9034 http://gar.svn.sourceforge.net/gar/?rev=9034&view=rev Author: dmichelsen Date: 2010-03-08 17:49:12 +0000 (Mon, 08 Mar 2010) Log Message: ----------- cpan/Digest-SHA1: Undo changes according stub Added Paths: ----------- csw/mgar/pkg/cpan/Digest-SHA1/trunk/ 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 Mar 8 19:10:54 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 08 Mar 2010 18:10:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9035] csw/mgar/pkg Message-ID: Revision: 9035 http://gar.svn.sourceforge.net/gar/?rev=9035&view=rev Author: bonivart Date: 2010-03-08 18:10:54 +0000 (Mon, 08 Mar 2010) Log Message: ----------- razor: initial checkin, upgrade to 2.85 Added Paths: ----------- csw/mgar/pkg/razor/ csw/mgar/pkg/razor/branches/ csw/mgar/pkg/razor/tags/ csw/mgar/pkg/razor/trunk/ csw/mgar/pkg/razor/trunk/Makefile csw/mgar/pkg/razor/trunk/checksums csw/mgar/pkg/razor/trunk/files/ Property changes on: csw/mgar/pkg/razor/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/razor/trunk/Makefile =================================================================== --- csw/mgar/pkg/razor/trunk/Makefile (rev 0) +++ csw/mgar/pkg/razor/trunk/Makefile 2010-03-08 18:10:54 UTC (rev 9035) @@ -0,0 +1,32 @@ +GARNAME = razor +GARVERSION = 2.85 +CATEGORIES = net +DISTNAME = $(GARNAME)-agents-$(GARVERSION) +WORKSRC = $(WORKDIR)/$(DISTNAME) + +DESCRIPTION = Spam detection and filtering network +define BLURB + Spam detection and filtering network +endef + +MASTER_SITES = http://prdownloads.sourceforge.net/razor/ +DISTFILES = $(DISTNAME).tar.bz2 + +LICENSE = LICENSE + +RUNTIME_DEP_PKGS = CSWperl CSWpmuri CSWpmnetdns CSWpmdigestsha1 CSWpmdigestnilsimsa CSWpmdigesthmac + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-agents-(\d+(?:\.\d+)*).tar.bz2 + +CONFIGURE_SCRIPTS = custom + +EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal\.pod + +include gar/category.mk + +configure-custom: + @echo " ==> Configuring $(GARNAME) (custom)" + @( cd $(WORKSRC) ; \ + perl Makefile.PL INSTALLDIRS=vendor DESTDIR=$(DESTDIR) ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/razor/trunk/checksums =================================================================== --- csw/mgar/pkg/razor/trunk/checksums (rev 0) +++ csw/mgar/pkg/razor/trunk/checksums 2010-03-08 18:10:54 UTC (rev 9035) @@ -0,0 +1 @@ +014d08db40187cb1316482191566b012 razor-agents-2.85.tar.bz2 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 Mar 8 19:44:14 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 08 Mar 2010 18:44:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[9036] csw/mgar/pkg Message-ID: Revision: 9036 http://gar.svn.sourceforge.net/gar/?rev=9036&view=rev Author: skayser Date: 2010-03-08 18:44:14 +0000 (Mon, 08 Mar 2010) Log Message: ----------- librsync: initial commit as an example for Brian Added Paths: ----------- csw/mgar/pkg/librsync/ csw/mgar/pkg/librsync/branches/ csw/mgar/pkg/librsync/tags/ csw/mgar/pkg/librsync/trunk/ csw/mgar/pkg/librsync/trunk/Makefile csw/mgar/pkg/librsync/trunk/checksums csw/mgar/pkg/librsync/trunk/files/ Property changes on: csw/mgar/pkg/librsync/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/librsync/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsync/trunk/Makefile (rev 0) +++ csw/mgar/pkg/librsync/trunk/Makefile 2010-03-08 18:44:14 UTC (rev 9036) @@ -0,0 +1,27 @@ +GARNAME = librsync +GARVERSION = 0.9.7 +CATEGORIES = lib + +DESCRIPTION = Library with the rolling-checksum algorithm known from rsync +define BLURB + ibrsync implements the rolling-checksum algorithm of remote file + synchronization that was popularized by the rsync utility and is used in + rproxy. This algorithm transfers the differences between 2 files without + needing both files on the same system. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +# delta.c contains inlined functions without storage qualifiers, treat them +# as static as the only references are within delta.c itself. Otherwise the +# linking will fail to resolve those references. See "inline functions" +# http://docs.sun.com/app/docs/doc/820-7598/6nirjunib?a=view +EXTRA_CFLAGS = -features=no%extinl + +include gar/category.mk Added: csw/mgar/pkg/librsync/trunk/checksums =================================================================== --- csw/mgar/pkg/librsync/trunk/checksums (rev 0) +++ csw/mgar/pkg/librsync/trunk/checksums 2010-03-08 18:44:14 UTC (rev 9036) @@ -0,0 +1 @@ +24cdb6b78f45e0e83766903fd4f6bc84 librsync-0.9.7.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 Mon Mar 8 23:14:01 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 08 Mar 2010 22:14:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[9037] csw/mgar/pkg/x11/lib/libxext/trunk/Makefile Message-ID: Revision: 9037 http://gar.svn.sourceforge.net/gar/?rev=9037&view=rev Author: wbonnet Date: 2010-03-08 22:14:00 +0000 (Mon, 08 Mar 2010) Log Message: ----------- Add missing dependency Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxext/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxext/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxext/trunk/Makefile 2010-03-08 18:44:14 UTC (rev 9036) +++ csw/mgar/pkg/x11/lib/libxext/trunk/Makefile 2010-03-08 22:14:00 UTC (rev 9037) @@ -27,7 +27,7 @@ SPKG_DESC_CSWlibxext = X11 miscellaneous extensions library SPKG_DESC_CSWlibxextdevel = X11 miscellaneous extensions library development files -RUNTIME_DEP_PKGS_CSWlibxext = CSWlibx11 CSWlibxau +RUNTIME_DEP_PKGS_CSWlibxext = CSWlibx11 CSWlibxau CSWx11xextproto RUNTIME_DEP_PKGS_CSWlibxextdevel = CSWlibxext PKGFILES_CSWlibxextdevel = $(PKGFILES_DEVEL) 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 Mar 8 23:16:25 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 08 Mar 2010 22:16:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[9038] csw/mgar/pkg/x11/lib/libx11/trunk/Makefile Message-ID: Revision: 9038 http://gar.svn.sourceforge.net/gar/?rev=9038&view=rev Author: wbonnet Date: 2010-03-08 22:16:25 +0000 (Mon, 08 Mar 2010) Log Message: ----------- Add missing dependency Modified Paths: -------------- csw/mgar/pkg/x11/lib/libx11/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libx11/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2010-03-08 22:14:00 UTC (rev 9037) +++ csw/mgar/pkg/x11/lib/libx11/trunk/Makefile 2010-03-08 22:16:25 UTC (rev 9038) @@ -31,7 +31,7 @@ PKGFILES_CSWlibx11devel = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibx11 = CSWx11common CSWlibxcb +RUNTIME_DEP_PKGS_CSWlibx11 = CSWx11common CSWlibxcb CSWx11xproto CSWx11kbproto RUNTIME_DEP_PKGS_CSWlibx11devel = CSWlibx11 BUILD64 = 1 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 Mar 8 23:17:36 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 08 Mar 2010 22:17:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9039] csw/mgar/pkg/x11/lib/libxau/trunk/Makefile Message-ID: Revision: 9039 http://gar.svn.sourceforge.net/gar/?rev=9039&view=rev Author: wbonnet Date: 2010-03-08 22:17:36 +0000 (Mon, 08 Mar 2010) Log Message: ----------- Add missing dependency Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxau/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxau/trunk/Makefile 2010-03-08 22:16:25 UTC (rev 9038) +++ csw/mgar/pkg/x11/lib/libxau/trunk/Makefile 2010-03-08 22:17:36 UTC (rev 9039) @@ -20,8 +20,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS_CSWlibxau = CSWx11common -RUNTIME_DEP_PKGS_CSWlibxaudevel = CSWlibxau +RUNTIME_DEP_PKGS_CSWlibxau = CSWx11common CSWxproto +RUNTIME_DEP_PKGS_CSWlibxaudevel = CSWlibxau 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 bonivart at users.sourceforge.net Mon Mar 8 23:50:40 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 08 Mar 2010 22:50:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[9040] csw/mgar/pkg/spamassassin/trunk/Makefile Message-ID: Revision: 9040 http://gar.svn.sourceforge.net/gar/?rev=9040&view=rev Author: bonivart Date: 2010-03-08 22:50:40 +0000 (Mon, 08 Mar 2010) Log Message: ----------- spamassassin: fix desc and remove 2 deps not needed with perl 5.10.1 Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2010-03-08 22:17:36 UTC (rev 9039) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2010-03-08 22:50:40 UTC (rev 9040) @@ -3,7 +3,7 @@ GARVERSION = 3.3.0 CATEGORIES = net -DESCRIPTION = mail filter with a wide range of tests +DESCRIPTION = Mail filter with a wide range of tests define BLURB SpamAssassin is a mail filter which attempts to identify spam using a variety of mechanisms including text analysis, Bayesian filtering, @@ -16,7 +16,7 @@ #DISTFILES = $(SPKG_NAME)-$(GARVERSION)-rc3.tar.gz DISTFILES += COPYING -RUNTIME_DEP_PKGS = CSWgnupg CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha +RUNTIME_DEP_PKGS = CSWgnupg CSWosslrt CSWperl CSWpmdbi RUNTIME_DEP_PKGS += CSWpmiosocketinet6 CSWpmiosocketssl CSWpmiozlib RUNTIME_DEP_PKGS += CSWpmipcountry CSWpmldap CSWpmlibwww CSWpmmaildkim RUNTIME_DEP_PKGS += CSWpmmailspf CSWpmmailtools CSWpmmimebase64 CSWpmnetaddrip CSWpmnetdns 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 Mar 9 00:14:07 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 08 Mar 2010 23:14:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[9041] csw/mgar/pkg Message-ID: Revision: 9041 http://gar.svn.sourceforge.net/gar/?rev=9041&view=rev Author: wbonnet Date: 2010-03-08 23:14:07 +0000 (Mon, 08 Mar 2010) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/thunderbird-l10n/ csw/mgar/pkg/thunderbird-l10n/branches/ csw/mgar/pkg/thunderbird-l10n/tags/ csw/mgar/pkg/thunderbird-l10n/trunk/ csw/mgar/pkg/thunderbird-l10n/trunk/Makefile csw/mgar/pkg/thunderbird-l10n/trunk/checksums csw/mgar/pkg/thunderbird-l10n/trunk/files/ csw/mgar/pkg/thunderbird-l10n/trunk/files/License Property changes on: csw/mgar/pkg/thunderbird-l10n/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/thunderbird-l10n/trunk/Makefile =================================================================== --- csw/mgar/pkg/thunderbird-l10n/trunk/Makefile (rev 0) +++ csw/mgar/pkg/thunderbird-l10n/trunk/Makefile 2010-03-08 23:14:07 UTC (rev 9041) @@ -0,0 +1,76 @@ +GARNAME = thunderbird-l10n +GARVERSION = 2.0.0.23 +CATEGORIES = apps + +DESCRIPTION = Thunderbird language pack : +define BLURB + Mozilla Thunderbird mail client localization file. +endef + +# Definition of the list of locale to process +# LANG = af be bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE he hu it ja ko lt mk nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr uk zh-CN zh-TW + +# Short list of locales, used only for testing during build description modification +LANG = de fr pt-PT + +# Set arch to all +ARCHALL = 1 + +# Defines the list of packages +PACKAGES = $(foreach PKG, $(LANG), CSWtbird-l10n-$(PKG) ) +LICENSE = License + +# There was previously a french localization package. It is renamed, thus declared as incompatible +INCOMPATIBLE_PKGS_CSWtbird-l10n-fr = CSWthunderbird-fr + +# Add thunderbird as a depend +RUNTIME_DEP_PKGS = CSWthunderbird + +# Defines the package description +$(foreach LOCALE_NAME, $(LANG), $(eval SPKG_DESC_CSWtbird-l10n-$(LOCALE_NAME) = $(DESCRIPTION) $(LOCALE_NAME))) + +# Defines the catalog names +$(foreach LOCALE_NAME, $(LANG), $(eval CATALOGNAME_CSWtbird-l10n-$(LOCALE_NAME) = tbird_l10n_$(shell echo $(LOCALE_NAME) | tr \- _ | tr [A-Z] [a-z] ))) + +# Defines the files filters +$(foreach LOCALE_NAME, $(LANG), $(eval PKGFILES_CSWtbird-l10n-$(LOCALE_NAME) = .*langpack-$(LOCALE_NAME).*)) + +# Defines the content to be downloaded +MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$(GARVERSION)/linux-i686/xpi/ +DISTFILES = License +$(foreach LOCALE_NAME, $(LANG), $(eval DISTFILES += $(LOCALE_NAME).xpi)) + +# 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 = + +# Defines the custom steps +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +post-extract-modulated: + for LOCALE_NAME in $(foreach L,$(LANG),$(L)); do \ + mkdir -p "$(WORKROOTDIR)/build-$(MODULATIONS)/$$LOCALE_NAME" ; \ + CUR_DIR=`pwd` ; \ + cd "$(WORKROOTDIR)/build-$(MODULATIONS)/$$LOCALE_NAME" ; \ + unzip -u ../$$LOCALE_NAME.xpi ; \ + cd $$CUR_DIR ; \ + done + $(MAKECOOKIE) + +install-custom: + @echo " ==> Installing $(GARNAME)" + + for LOCALE_NAME in $(foreach L, $(LANG), $(L)); do \ + PKG_EXTENSION=`grep "em:id=" "$(WORKROOTDIR)/build-$(MODULATIONS)/$$LOCALE_NAME/install.rdf" | cut -d\" -f 2` ; \ + ginstall -d "$(PKGROOT)$(prefix)/mozilla/thunderbird/lib/extensions" ; \ + cp -fr "$(WORKROOTDIR)/build-$(MODULATIONS)/$$LOCALE_NAME" "$(PKGROOT)$(prefix)/mozilla/thunderbird/lib/extensions/$$PKG_EXTENSION" ; \ + done + @$(MAKECOOKIE) Added: csw/mgar/pkg/thunderbird-l10n/trunk/checksums =================================================================== --- csw/mgar/pkg/thunderbird-l10n/trunk/checksums (rev 0) +++ csw/mgar/pkg/thunderbird-l10n/trunk/checksums 2010-03-08 23:14:07 UTC (rev 9041) @@ -0,0 +1,4 @@ +ce6efbce92c3d02ffb007c3f56747eb2 License +40444641aacef72cae13b149c2f7e941 de.xpi +1edb811c4d5d60e9b88282a73d5b041d fr.xpi +2c9eea7b3ccc9ce1bcd8f387afebaaab pt-PT.xpi Added: csw/mgar/pkg/thunderbird-l10n/trunk/files/License =================================================================== --- csw/mgar/pkg/thunderbird-l10n/trunk/files/License (rev 0) +++ csw/mgar/pkg/thunderbird-l10n/trunk/files/License 2010-03-08 23:14:07 UTC (rev 9041) @@ -0,0 +1,614 @@ +Mozilla Project and Mozilla Localization Projects. + +The official Firefox locales are tripple-licenses under the GNU General +Public License (GPL), the GNU Lesser General Public License (LGPL), and +the Mozilla Public License (MPL). + + +License (GPL): + + Copyright (C) Mozilla Project and Mozilla Localization Projects + + 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +License (LGPL): + + Copyright (C) Mozilla Project and Mozilla Localization Projects + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +License (MPL): + + Copyright (C) Mozilla Project and Mozilla Localization Projects + + MOZILLA PUBLIC LICENSE + Version 1.1 + + --------------- + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``The contents of this file are subject to the Mozilla Public License + Version 1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + The Original Code is ______________________________________. + + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + + ---------------------------------------------------------------------- + + AMENDMENTS + + The Netscape Public License Version 1.1 ("NPL") consists of the + Mozilla Public License Version 1.1 with the following Amendments, + including Exhibit A-Netscape Public License. Files identified with + "Exhibit A-Netscape Public License" are governed by the Netscape + Public License Version 1.1. + + Additional Terms applicable to the Netscape Public License. + I. Effect. + These additional terms described in this Netscape Public + License -- Amendments shall apply to the Mozilla Communicator + client code and to all Covered Code under this License. + + II. "Netscape's Branded Code" means Covered Code that Netscape + distributes and/or permits others to distribute under one or more + trademark(s) which are controlled by Netscape but which are not + licensed for use under this License. + + III. Netscape and logo. + This License does not grant any rights to use the trademarks + "Netscape", the "Netscape N and horizon" logo or the "Netscape + lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript", + "Smart Browsing" even if such marks are included in the Original + Code or Modifications. + + IV. Inability to Comply Due to Contractual Obligation. + Prior to licensing the Original Code under this License, Netscape + has licensed third party code for use in Netscape's Branded Code. + To the extent that Netscape is limited contractually from making + such third party code available under this License, Netscape may + choose to reintegrate such code into Covered Code without being + required to distribute such code in Source Code form, even if + such code would otherwise be considered "Modifications" under + this License. + + V. Use of Modifications and Covered Code by Initial Developer. + V.1. In General. + The obligations of Section 3 apply to Netscape, except to + the extent specified in this Amendment, Section V.2 and V.3. + + V.2. Other Products. + Netscape may include Covered Code in products other than the + Netscape's Branded Code which are released by Netscape + during the two (2) years following the release date of the + Original Code, without such additional products becoming + subject to the terms of this License, and may license such + additional products on different terms from those contained + in this License. + + V.3. Alternative Licensing. + Netscape may license the Source Code of Netscape's Branded + Code, including Modifications incorporated therein, without + such Netscape Branded Code becoming subject to the terms of + this License, and may license such Netscape Branded Code on + different terms from those contained in this License. + + VI. Litigation. + Notwithstanding the limitations of Section 11 above, the + provisions regarding litigation in Section 11(a), (b) and (c) of + the License shall apply to all disputes relating to this License. + + EXHIBIT A-Netscape Public License. + + "The contents of this file are subject to the Netscape Public + License Version 1.1 (the "License"); you may not use this file + except in compliance with the License. You may obtain a copy of + the License at http://www.mozilla.org/NPL/ + + Software distributed under the License is distributed on an "AS + IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + implied. See the License for the specific language governing + rights and limitations under the License. + + The Original Code is Mozilla Communicator client code, released + March 31, 1998. + + The Initial Developer of the Original Code is Netscape + Communications Corporation. Portions created by Netscape are + Copyright (C) 1998-1999 Netscape Communications Corporation. All + Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the + terms of the _____ license (the "[___] License"), in which case + the provisions of [______] License are applicable instead of + those above. If you wish to allow use of your version of this + file only under the terms of the [____] License and not to allow + others to use your version of this file under the NPL, indicate + your decision by deleting the provisions above and replace them + with the notice and other provisions required by the [___] + License. If you do not delete the provisions above, a recipient + may use your version of this file under either the NPL or the + [___] License." 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 Mar 9 00:26:05 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 08 Mar 2010 23:26:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[9042] csw/mgar/pkg/thunderbird-l10n/trunk/Makefile Message-ID: Revision: 9042 http://gar.svn.sourceforge.net/gar/?rev=9042&view=rev Author: wbonnet Date: 2010-03-08 23:26:04 +0000 (Mon, 08 Mar 2010) Log Message: ----------- Set full list of locales Modified Paths: -------------- csw/mgar/pkg/thunderbird-l10n/trunk/Makefile Modified: csw/mgar/pkg/thunderbird-l10n/trunk/Makefile =================================================================== --- csw/mgar/pkg/thunderbird-l10n/trunk/Makefile 2010-03-08 23:14:07 UTC (rev 9041) +++ csw/mgar/pkg/thunderbird-l10n/trunk/Makefile 2010-03-08 23:26:04 UTC (rev 9042) @@ -8,10 +8,10 @@ endef # Definition of the list of locale to process -# LANG = af be bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE he hu it ja ko lt mk nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr uk zh-CN zh-TW +LANG = af be bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE he hu it ja ko lt mk nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr uk zh-CN zh-TW # Short list of locales, used only for testing during build description modification -LANG = de fr pt-PT +# LANG = de fr pt-PT # Set arch to all ARCHALL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Mar 9 00:54:53 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 08 Mar 2010 23:54:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9043] csw/mgar/pkg Message-ID: Revision: 9043 http://gar.svn.sourceforge.net/gar/?rev=9043&view=rev Author: skayser Date: 2010-03-08 23:54:53 +0000 (Mon, 08 Mar 2010) Log Message: ----------- mod_fcgid: initial commit Added Paths: ----------- csw/mgar/pkg/mod_fcgid/ csw/mgar/pkg/mod_fcgid/branches/ csw/mgar/pkg/mod_fcgid/tags/ csw/mgar/pkg/mod_fcgid/trunk/ csw/mgar/pkg/mod_fcgid/trunk/Makefile csw/mgar/pkg/mod_fcgid/trunk/checksums csw/mgar/pkg/mod_fcgid/trunk/files/ csw/mgar/pkg/mod_fcgid/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/mod_fcgid/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/mod_fcgid/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_fcgid/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mod_fcgid/trunk/Makefile 2010-03-08 23:54:53 UTC (rev 9043) @@ -0,0 +1,40 @@ +GARNAME = mod_fcgid +GARVERSION = 2.3.5 +CATEGORIES = lib + +DESCRIPTION = FastCGI module with fine grained process spawn/lifetime control +define BLURB + mod_fcgid is a high performance alternative to mod_cgi or mod_cgid, + which starts a sufficient number instances of the CGI program to handle + concurrent requests, and these programs remain running to handle further + incoming requests. It is favored by the PHP developers, for example, as + a preferred alternative to running mod_php in-process, delivering very + similar performance. +endef + +VENDOR_URL = http://httpd.apache.org/mod_fcgid/ +MASTER_SITES = http://apache.mirroring.de/httpd/mod_fcgid/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +LICENSE = LICENSE-FCGID + +PACKAGES = CSWap2modfcgid +CATALOGNAME = ap2_modfcgid +RUNTIME_DEP_PKGS = CSWap2prefork + +CONFIGURE_SCRIPTS = custom +TEST_SCRIPTS = + +include gar/category.mk +include ../../apache2/trunk/files/extensionbuild.mk + +configure-custom: + cd $(WORKSRC) && APXS=$(APXS) ./configure.apxs + @$(MAKECOOKIE) + +# Install changelog.CSW +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW + @$(MAKECOOKIE) Added: csw/mgar/pkg/mod_fcgid/trunk/checksums =================================================================== --- csw/mgar/pkg/mod_fcgid/trunk/checksums (rev 0) +++ csw/mgar/pkg/mod_fcgid/trunk/checksums 2010-03-08 23:54:53 UTC (rev 9043) @@ -0,0 +1 @@ +82b5bec1ed1c0fc106d5271075641ef9 mod_fcgid-2.3.5.tar.gz Added: csw/mgar/pkg/mod_fcgid/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/mod_fcgid/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/mod_fcgid/trunk/files/changelog.CSW 2010-03-08 23:54:53 UTC (rev 9043) @@ -0,0 +1,5 @@ +mod_fcgid (2.3.5,REV=2010.03.09) + + * Initial release. + + -- Sebastian Kayser Tue, 9 Mar 2010 00:43:21 +0100 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 Mar 9 08:10:17 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 09 Mar 2010 07:10:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9044] csw/mgar/pkg/thunderbird-l10n/trunk/checksums Message-ID: Revision: 9044 http://gar.svn.sourceforge.net/gar/?rev=9044&view=rev Author: wbonnet Date: 2010-03-09 07:10:10 +0000 (Tue, 09 Mar 2010) Log Message: ----------- Update checksum Modified Paths: -------------- csw/mgar/pkg/thunderbird-l10n/trunk/checksums Modified: csw/mgar/pkg/thunderbird-l10n/trunk/checksums =================================================================== --- csw/mgar/pkg/thunderbird-l10n/trunk/checksums 2010-03-08 23:54:53 UTC (rev 9043) +++ csw/mgar/pkg/thunderbird-l10n/trunk/checksums 2010-03-09 07:10:10 UTC (rev 9044) @@ -1,4 +1,38 @@ ce6efbce92c3d02ffb007c3f56747eb2 License -40444641aacef72cae13b149c2f7e941 de.xpi -1edb811c4d5d60e9b88282a73d5b041d fr.xpi -2c9eea7b3ccc9ce1bcd8f387afebaaab pt-PT.xpi +dc136d22de69fb026feb04f015ee7735 af.xpi +9cf3109aebf93aa53e6285ca49b09f8d be.xpi +ccc2a5d369c6121da4d890eff5fcba3f bg.xpi +ecf19706082edce33b68b7bfd8b8dee8 ca.xpi +dd10749225f9e335cb5e1888fd2471c4 cs.xpi +390d1707613c65a9edd7dd9b30b4216d da.xpi +61bd7318abe30bd852ca1b5c4a6527ce de.xpi +ad4f2dadcb427d34461b57606e29fdb4 el.xpi +95dd94a7069167259a8d60dec25d1c60 en-GB.xpi +2a08a2afc913726a1e0d053a92c010f1 es-AR.xpi +f80a6bd2fd8708ff327eb6a601147ffa es-ES.xpi +8f5d5c313dbbe47bf29ce6f2a4768da2 eu.xpi +38d2db5fd4798b34fd1ddafbd4cb8284 fi.xpi +e98e92f7c7c6d6155c5d42322e0febd4 fr.xpi +ab30d4244d60a6c48be73439804fcf26 ga-IE.xpi +e206d402a49d0179a044a0ff523f7535 he.xpi +912fb7e232b2102d5b8e84fdd42ba6e6 hu.xpi +c43ca9b997298ee336edcf4432f4d4d1 it.xpi +96dba8a80e7454d4bae3e2c097c3a200 ja.xpi +45a6bf475f3b65ecfa927ffe7ad2f41e ko.xpi +5e8a12a78388a7240595ac19d71532c2 lt.xpi +fe342adb54e9c64dc4b98e0c5a3283f0 mk.xpi +0b4e3161cba287774478ad78d97a69ca nb-NO.xpi +92bc786732e8d644f3aee9dfb8afee4e nl.xpi +830ce611c23b683cfbe09ab2576ce613 nn-NO.xpi +56a8a6e618b53c93abe83c5bf705e5a2 pa-IN.xpi +0b9b25af53e26f3375057c792517db46 pl.xpi +6ea8c49f0f049aeee22305488fdd2e52 pt-BR.xpi +b4fca596ac7a2d425b73e8e02cb83474 pt-PT.xpi +d6fb312f98054c9a81972df74f0216b5 ru.xpi +c2dfe56bf934fceddd3230191c787f3e sk.xpi +c2ebfc7ef983d5373cd78203e5fb46e2 sl.xpi +ce41acc6a92112336c92f3af7f2b4a04 sv-SE.xpi +d551c19a04da6d058da9884049811c0d tr.xpi +95bef5959e38597d41ec47bcc11cfde5 uk.xpi +9fbd584295ae2e38bb8affdb627fe22f zh-CN.xpi +7ddf9300732bde946f795439311fbae2 zh-TW.xpi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 9 09:52:20 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 09 Mar 2010 08:52:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9045] csw/mgar/pkg/startup-notification/trunk/Makefile Message-ID: Revision: 9045 http://gar.svn.sourceforge.net/gar/?rev=9045&view=rev Author: wahwah Date: 2010-03-09 08:52:16 +0000 (Tue, 09 Mar 2010) Log Message: ----------- startup-notification: Adding 64-bit libs, moving prefix to /opt/csw/X11, adding a backward-compatibility symlink which doesn't allow to link against the old location. Modified Paths: -------------- csw/mgar/pkg/startup-notification/trunk/Makefile Modified: csw/mgar/pkg/startup-notification/trunk/Makefile =================================================================== --- csw/mgar/pkg/startup-notification/trunk/Makefile 2010-03-09 07:10:10 UTC (rev 9044) +++ csw/mgar/pkg/startup-notification/trunk/Makefile 2010-03-09 08:52:16 UTC (rev 9045) @@ -4,7 +4,7 @@ GARNAME = startup-notification GARVERSION = 0.10 -CATEGORIES = gnome +CATEGORIES = x11 DESCRIPTION = Reference implementation of the startup notification protocol define BLURB endef @@ -15,9 +15,16 @@ CATALOGNAME = startup_notif PACKAGES = CSWstartupnotif CONFIGURE_ARGS = $(DIRPATHS) +BUILD64 = 1 RUNTIME_DEP_PKGS_CSWstartupnotif += CSWlibice RUNTIME_DEP_PKGS_CSWstartupnotif += CSWlibsm RUNTIME_DEP_PKGS_CSWstartupnotif += CSWlibx11 RUNTIME_DEP_PKGS_CSWstartupnotif += CSWlibxcb RUNTIME_DEP_PKGS_CSWstartupnotif += CSWxcbutil include gar/category.mk + +post-merge: + ginstall -m 755 -d $(PKGROOT)/opt/csw/lib + ln -s ../X11/lib/libstartup-notification-1.so.0 \ + $(PKGROOT)/opt/csw/lib/libstartup-notification-1.so.0 + @$(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 Mar 9 10:33:34 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Mar 2010 09:33:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[9046] csw/mgar/pkg Message-ID: Revision: 9046 http://gar.svn.sourceforge.net/gar/?rev=9046&view=rev Author: dmichelsen Date: 2010-03-09 09:33:34 +0000 (Tue, 09 Mar 2010) Log Message: ----------- libnotify: Initial commit Added Paths: ----------- csw/mgar/pkg/libnotify/ csw/mgar/pkg/libnotify/branches/ csw/mgar/pkg/libnotify/tags/ csw/mgar/pkg/libnotify/trunk/ csw/mgar/pkg/libnotify/trunk/Makefile csw/mgar/pkg/libnotify/trunk/checksums csw/mgar/pkg/libnotify/trunk/files/ Property changes on: csw/mgar/pkg/libnotify/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/libnotify/trunk/Makefile =================================================================== --- csw/mgar/pkg/libnotify/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libnotify/trunk/Makefile 2010-03-09 09:33:34 UTC (rev 9046) @@ -0,0 +1,28 @@ +GARNAME = libnotify +GARVERSION = 0.4.5 +CATEGORIES = gnome + +DESCRIPTION = Notification library of the Galago desktop presence framework +define BLURB +endef + +MASTER_SITES = http://www.galago-project.org/files/releases/source/libnotify/ +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 + +VENDOR_URL = http://www.galago-project.org + +# Remove when move towards csw x11 has been finished +LARCH_sparcv9 = sparcv9 +LARCH_amd64 = amd64 +EXTRA_LINKER_FLAGS = /usr/openwin/lib/$(LARCH_$(ISA))/libXext.so + +# Enable when libdbus is done in 64 bit +# BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libnotify/trunk/checksums =================================================================== --- csw/mgar/pkg/libnotify/trunk/checksums (rev 0) +++ csw/mgar/pkg/libnotify/trunk/checksums 2010-03-09 09:33:34 UTC (rev 9046) @@ -0,0 +1 @@ +6a8388f93309dbe336bbe5fc0677de6b libnotify-0.4.5.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 Tue Mar 9 10:43:30 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Mar 2010 09:43:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9047] csw/mgar/pkg/libnotify/trunk/Makefile Message-ID: Revision: 9047 http://gar.svn.sourceforge.net/gar/?rev=9047&view=rev Author: dmichelsen Date: 2010-03-09 09:43:27 +0000 (Tue, 09 Mar 2010) Log Message: ----------- libnotify: Split off devel and add dependencies Modified Paths: -------------- csw/mgar/pkg/libnotify/trunk/Makefile Modified: csw/mgar/pkg/libnotify/trunk/Makefile =================================================================== --- csw/mgar/pkg/libnotify/trunk/Makefile 2010-03-09 09:33:34 UTC (rev 9046) +++ csw/mgar/pkg/libnotify/trunk/Makefile 2010-03-09 09:43:27 UTC (rev 9047) @@ -12,8 +12,23 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +PACKAGES = CSWlibnotify CSWlibnotifydevel + +CATALOGNAME_CSWlibnotify = libnotify +CATALOGNAME_CSWlibnotifydevel = libnotify_devel + +SPKG_DESC_CSWlibnotify = $(DESCRIPTION) +SPKG_DESC_CSWlibnotifydevel = Development files for libnotify + VENDOR_URL = http://www.galago-project.org +BUILD_DEP_PKGS = CSWglib2devel CSWgtk2devel CSWpangodevel + +RUNTIME_DEP_PKGS_CSWlibnotify = CSWdbusglib CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibnotify += CSWlibatk CSWlibcairo CSWlibdbus CSWpango + +RUNTIME_DEP_PKGS_CSWlibnotifydevel = CSWlibnotify + # Remove when move towards csw x11 has been finished LARCH_sparcv9 = sparcv9 LARCH_amd64 = amd64 @@ -25,4 +40,7 @@ TEST_TARGET = check +PKGFILES_CSWlibnotifydevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibnotifydevel += $(sharedstatedir)/gtk-doc/.* + 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 Tue Mar 9 10:55:51 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Mar 2010 09:55:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[9048] csw/mgar/pkg Message-ID: Revision: 9048 http://gar.svn.sourceforge.net/gar/?rev=9048&view=rev Author: dmichelsen Date: 2010-03-09 09:55:51 +0000 (Tue, 09 Mar 2010) Log Message: ----------- alarm-clock: Initial commit Added Paths: ----------- csw/mgar/pkg/alarm-clock/ csw/mgar/pkg/alarm-clock/branches/ csw/mgar/pkg/alarm-clock/tags/ csw/mgar/pkg/alarm-clock/trunk/ csw/mgar/pkg/alarm-clock/trunk/Makefile csw/mgar/pkg/alarm-clock/trunk/checksums csw/mgar/pkg/alarm-clock/trunk/files/ Property changes on: csw/mgar/pkg/alarm-clock/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/alarm-clock/trunk/Makefile =================================================================== --- csw/mgar/pkg/alarm-clock/trunk/Makefile (rev 0) +++ csw/mgar/pkg/alarm-clock/trunk/Makefile 2010-03-09 09:55:51 UTC (rev 9048) @@ -0,0 +1,27 @@ +GARNAME = alarm-clock +GARVERSION = 1.3 +CATEGORIES = gnome + +DESCRIPTION = A simple interface for reminding about birthdays, appointments and important dates +define BLURB + Alarm Clock is designed to provide user with simple interface for creating alarms, + reminding him about birthdays, appointments, important dates. Alarm Clock can be configured + very easily even by a non-power user and fits perfectly into the GNOME Desktop. +endef + +MASTER_SITES = http://alarm-clock.pl/media/distfiles/ +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 + +CONFIGURE_ARGS = $(DIRPATHS) + +# AM_CFLAGS contains -Wall which only works with GCC +BUILD_OVERRIDE_VARS = AM_CFLAGS +BUILD_OVERRIDE_VAR_AM_CFLAGS = + +include gar/category.mk + +#For GNU xgettext +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/alarm-clock/trunk/checksums =================================================================== --- csw/mgar/pkg/alarm-clock/trunk/checksums (rev 0) +++ csw/mgar/pkg/alarm-clock/trunk/checksums 2010-03-09 09:55:51 UTC (rev 9048) @@ -0,0 +1 @@ +a5decf49808ce99b386032dac9165971 alarm-clock-1.3.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 Tue Mar 9 12:19:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Mar 2010 11:19:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[9049] csw/mgar/pkg/alarm-clock/trunk/Makefile Message-ID: Revision: 9049 http://gar.svn.sourceforge.net/gar/?rev=9049&view=rev Author: dmichelsen Date: 2010-03-09 11:19:25 +0000 (Tue, 09 Mar 2010) Log Message: ----------- alarm-clock: Add dependencies Modified Paths: -------------- csw/mgar/pkg/alarm-clock/trunk/Makefile Modified: csw/mgar/pkg/alarm-clock/trunk/Makefile =================================================================== --- csw/mgar/pkg/alarm-clock/trunk/Makefile 2010-03-09 09:55:51 UTC (rev 9048) +++ csw/mgar/pkg/alarm-clock/trunk/Makefile 2010-03-09 11:19:25 UTC (rev 9049) @@ -15,12 +15,25 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +PACKAGES = CSWalarmclock +CATALOGNAME = alarmclock + +RUNTIME_DEP_PKGS = CSWdbusglib CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgstreamer CSWgtk2 +RUNTIME_DEP_PKGS += CSWlibatk CSWlibcairo CSWlibdbus CSWlibnotify CSWlibxml2 CSWpango + CONFIGURE_ARGS = $(DIRPATHS) # AM_CFLAGS contains -Wall which only works with GCC BUILD_OVERRIDE_VARS = AM_CFLAGS BUILD_OVERRIDE_VAR_AM_CFLAGS = +# Remove when move towards csw x11 has been finished +EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so + +STRIP_LIBTOOL = 1 + +TEST_TARGET = check + include gar/category.mk #For GNU xgettext 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 Mar 9 12:20:59 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Mar 2010 11:20:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[9050] csw/mgar/pkg Message-ID: Revision: 9050 http://gar.svn.sourceforge.net/gar/?rev=9050&view=rev Author: dmichelsen Date: 2010-03-09 11:20:58 +0000 (Tue, 09 Mar 2010) Log Message: ----------- notification-daemon: Initial commit, needs new libraries libsexy and libwnck Added Paths: ----------- csw/mgar/pkg/notification-daemon/ csw/mgar/pkg/notification-daemon/branches/ csw/mgar/pkg/notification-daemon/tags/ csw/mgar/pkg/notification-daemon/trunk/ csw/mgar/pkg/notification-daemon/trunk/Makefile csw/mgar/pkg/notification-daemon/trunk/checksums csw/mgar/pkg/notification-daemon/trunk/files/ Property changes on: csw/mgar/pkg/notification-daemon/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/notification-daemon/trunk/Makefile =================================================================== --- csw/mgar/pkg/notification-daemon/trunk/Makefile (rev 0) +++ csw/mgar/pkg/notification-daemon/trunk/Makefile 2010-03-09 11:20:58 UTC (rev 9050) @@ -0,0 +1,19 @@ +GARNAME = notification-daemon +GARVERSION = 0.3.7 +CATEGORIES = gnome + +DESCRIPTION = Daemon to aid libnotify +define BLURB +endef + +MASTER_SITES = http://www.galago-project.org/files/releases/source/notification-daemon/ +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.bzw + +VENDOR_URL = http://www.galago-project.org + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/notification-daemon/trunk/checksums =================================================================== --- csw/mgar/pkg/notification-daemon/trunk/checksums (rev 0) +++ csw/mgar/pkg/notification-daemon/trunk/checksums 2010-03-09 11:20:58 UTC (rev 9050) @@ -0,0 +1 @@ +cbeae0f29a15ff93f0b763d9e1cdf1de notification-daemon-0.3.7.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 9 12:23:17 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 09 Mar 2010 11:23:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9051] csw/mgar/pkg/libev/trunk/Makefile Message-ID: Revision: 9051 http://gar.svn.sourceforge.net/gar/?rev=9051&view=rev Author: wahwah Date: 2010-03-09 11:23:17 +0000 (Tue, 09 Mar 2010) Log Message: ----------- libev: Changing the description as per http://lists.opencsw.org/pipermail/pkgsubmissions/2010-March/000240.html Modified Paths: -------------- csw/mgar/pkg/libev/trunk/Makefile Modified: csw/mgar/pkg/libev/trunk/Makefile =================================================================== --- csw/mgar/pkg/libev/trunk/Makefile 2010-03-09 11:20:58 UTC (rev 9050) +++ csw/mgar/pkg/libev/trunk/Makefile 2010-03-09 11:23:17 UTC (rev 9051) @@ -5,8 +5,12 @@ GARNAME = libev GARVERSION = 3.9 CATEGORIES = lib -DESCRIPTION = Event loop modelled after libevent +DESCRIPTION = A high performance event handling library define BLURB + A full-featured and high-performance (see benchmark) event loop that is + loosely modelled after libevent, but without its limitations and bugs. It is + used, among others, in the GNU Virtual Private Ethernet and rxvt-unicode + packages, and in the Deliantra MORPG Server and Client. endef SPKG_SOURCEURL = http://software.schmorp.de/pkg/libev.html MASTER_SITES = http://dist.schmorp.de/libev/ 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 Mar 9 13:22:24 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Mar 2010 12:22:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9052] csw/mgar/pkg Message-ID: Revision: 9052 http://gar.svn.sourceforge.net/gar/?rev=9052&view=rev Author: dmichelsen Date: 2010-03-09 12:22:24 +0000 (Tue, 09 Mar 2010) Log Message: ----------- libsexy: Initial commit Added Paths: ----------- csw/mgar/pkg/libsexy/ csw/mgar/pkg/libsexy/branches/ csw/mgar/pkg/libsexy/tags/ csw/mgar/pkg/libsexy/trunk/ csw/mgar/pkg/libsexy/trunk/Makefile csw/mgar/pkg/libsexy/trunk/checksums csw/mgar/pkg/libsexy/trunk/files/ Property changes on: csw/mgar/pkg/libsexy/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/libsexy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsexy/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libsexy/trunk/Makefile 2010-03-09 12:22:24 UTC (rev 9052) @@ -0,0 +1,42 @@ +GARNAME = libsexy +GARVERSION = 0.1.11 +CATEGORIES = lib + +DESCRIPTION = Sexy URLs +define BLURB + Long description +endef + +MASTER_SITES = http://releases.chipx86.com/libsexy/libsexy/ +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 + +PACKAGES = CSWlibsexy CSWlibsexydevel + +CATALOGNAME_CSWlibsexy = libsexy +CATALOGNAME_CSWlibsexydevel = libsexy_devel + +SPKG_DESC_CSWlibsexy = $(DESCRIPTION) +SPKG_DESC_CSWlibsexydevel = Development files for libsexy + +BUILD_DEP_PKGS = CSWglib2devel CSWgtk2devel + +RUNTIME_DEP_PKGS_CSWlibsexy = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo CSWlibxml2 CSWpango +RUNTIME_DEP_PKGS_CSWlibsexydevel = CSWlibsexy + +VENDOR_URL = http://www.chipx86.com/blog/tag/libsexy/ + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +PKGFILES_CSWlibsexydevel = $(PKGFILES_DEVEL) + +include gar/category.mk Added: csw/mgar/pkg/libsexy/trunk/checksums =================================================================== --- csw/mgar/pkg/libsexy/trunk/checksums (rev 0) +++ csw/mgar/pkg/libsexy/trunk/checksums 2010-03-09 12:22:24 UTC (rev 9052) @@ -0,0 +1 @@ +33c079a253270ec8bfb9508e4bb30754 libsexy-0.1.11.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 Mar 9 13:23:40 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Mar 2010 12:23:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[9053] csw/mgar/pkg/libsexy/trunk/Makefile Message-ID: Revision: 9053 http://gar.svn.sourceforge.net/gar/?rev=9053&view=rev Author: dmichelsen Date: 2010-03-09 12:23:39 +0000 (Tue, 09 Mar 2010) Log Message: ----------- libsexy: Add docs to devel package Modified Paths: -------------- csw/mgar/pkg/libsexy/trunk/Makefile Modified: csw/mgar/pkg/libsexy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsexy/trunk/Makefile 2010-03-09 12:22:24 UTC (rev 9052) +++ csw/mgar/pkg/libsexy/trunk/Makefile 2010-03-09 12:23:39 UTC (rev 9053) @@ -37,6 +37,7 @@ TEST_TARGET = check -PKGFILES_CSWlibsexydevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibsexydevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibsexydevel += $(sharedstatedir)/gtk-doc/.* 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 Tue Mar 9 13:44:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Mar 2010 12:44:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9054] csw/mgar/pkg/libsexy/trunk/Makefile Message-ID: Revision: 9054 http://gar.svn.sourceforge.net/gar/?rev=9054&view=rev Author: dmichelsen Date: 2010-03-09 12:44:16 +0000 (Tue, 09 Mar 2010) Log Message: ----------- libsexy: Add linkage to Sun X11 :-( Modified Paths: -------------- csw/mgar/pkg/libsexy/trunk/Makefile Modified: csw/mgar/pkg/libsexy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsexy/trunk/Makefile 2010-03-09 12:23:39 UTC (rev 9053) +++ csw/mgar/pkg/libsexy/trunk/Makefile 2010-03-09 12:44:16 UTC (rev 9054) @@ -32,6 +32,11 @@ EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +# Remove when move towards csw x11 has been finished +LARCH_sparcv9 = sparcv9 +LARCH_amd64 = amd64 +EXTRA_LINKER_FLAGS = /usr/openwin/lib/$(LARCH_$(ISA))/libXext.so + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 9 13:58:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 09 Mar 2010 12:58:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9055] csw/mgar/pkg/mpg321/trunk/Makefile Message-ID: Revision: 9055 http://gar.svn.sourceforge.net/gar/?rev=9055&view=rev Author: wahwah Date: 2010-03-09 12:58:44 +0000 (Tue, 09 Mar 2010) Log Message: ----------- mpg321: Added alternatives support for $(bindir)/mpg123 Modified Paths: -------------- csw/mgar/pkg/mpg321/trunk/Makefile Modified: csw/mgar/pkg/mpg321/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpg321/trunk/Makefile 2010-03-09 12:44:16 UTC (rev 9054) +++ csw/mgar/pkg/mpg321/trunk/Makefile 2010-03-09 12:58:44 UTC (rev 9055) @@ -23,4 +23,13 @@ CONFIGURE_ARGS = $(DIRPATHS) # A fix for an inline function and 'symbol not found'. EXTRA_CFLAGS = -features=no%extinl + +ALTERNATIVES = mpg321 + +ALTERNATIVE_mpg321 = $(bindir)/mpg123 mpg123 $(bindir)/mpg321 50 + include gar/category.mk + +post-merge: + rm $(PKGROOT)$(bindir)/mpg123 + @$(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 Mar 9 14:01:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Mar 2010 13:01:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9056] csw/mgar/pkg/libwnck Message-ID: Revision: 9056 http://gar.svn.sourceforge.net/gar/?rev=9056&view=rev Author: dmichelsen Date: 2010-03-09 13:01:36 +0000 (Tue, 09 Mar 2010) Log Message: ----------- libwnck: Update to mGAR v2, needs current gtk+ >= 2.19.7 Added Paths: ----------- csw/mgar/pkg/libwnck/branches/ csw/mgar/pkg/libwnck/tags/ csw/mgar/pkg/libwnck/tags/legacy/ csw/mgar/pkg/libwnck/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libwnck/trunk/legacy/ Copied: csw/mgar/pkg/libwnck/trunk/Makefile (from rev 8930, csw/mgar/pkg/libgnugetopt/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libwnck/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libwnck/trunk/Makefile 2010-03-09 13:01:36 UTC (rev 9056) @@ -0,0 +1,31 @@ +GARNAME = libwnck +GARVERSION = 2.29.92 +CATEGORIES = lib + +DESCRIPTION = Library used for writing pagers and tasks lists +define BLURB +endef + +MASTER_SITES = $(GNOME_MIRROR) +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 + +VENDOR_URL = http://ftp.gnome.org/pub/GNOME/sources/libwnck/ + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +# Problem: Requested 'gtk+-2.0 >= 2.19.7' but version of GTK+ is 2.16.5 + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +# Needed for GNU gettext +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wrightru at users.sourceforge.net Tue Mar 9 14:38:04 2010 From: wrightru at users.sourceforge.net (wrightru at users.sourceforge.net) Date: Tue, 09 Mar 2010 13:38:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[9057] csw/mgar/pkg/libconfuse/trunk Message-ID: Revision: 9057 http://gar.svn.sourceforge.net/gar/?rev=9057&view=rev Author: wrightru Date: 2010-03-09 13:38:04 +0000 (Tue, 09 Mar 2010) Log Message: ----------- updated to libconfuse 2.7 Modified Paths: -------------- csw/mgar/pkg/libconfuse/trunk/Makefile csw/mgar/pkg/libconfuse/trunk/checksums Modified: csw/mgar/pkg/libconfuse/trunk/Makefile =================================================================== --- csw/mgar/pkg/libconfuse/trunk/Makefile 2010-03-09 13:01:36 UTC (rev 9056) +++ csw/mgar/pkg/libconfuse/trunk/Makefile 2010-03-09 13:38:04 UTC (rev 9057) @@ -1,12 +1,12 @@ GARNAME = libconfuse -GARVERSION = 2.6 +GARVERSION = 2.7 CATEGORIES = lib -# For libConfuse 2.6, the test suite doesn't compile cleanly on Solaris, +# For libConfuse 2.7, the test suite doesn't compile cleanly on Solaris, # so we skip it. This should be re-assessed with each new release # from upstream. Proposed fixes for the test suite to be submitted # upstream. -ifeq ($(GARVERSION),2.6) +ifeq ($(GARVERSION),2.7) #TEST_TARGET = check TEST_SCRIPTS = endif @@ -22,8 +22,9 @@ to a program using a simple API. endef -MASTER_SITES = http://bzero.se/confuse/ -PATCHFILES = setopt.diff +#MASTER_SITES = http://bzero.se/confuse/ +MASTER_SITES = http://savannah.nongnu.org/download/confuse/ +PATCHFILES = DISTFILES = confuse-$(GARVERSION).tar.gz DISTFILES += $(PATCHFILES) DISTNAME = confuse-$(GARVERSION) Modified: csw/mgar/pkg/libconfuse/trunk/checksums =================================================================== --- csw/mgar/pkg/libconfuse/trunk/checksums 2010-03-09 13:01:36 UTC (rev 9056) +++ csw/mgar/pkg/libconfuse/trunk/checksums 2010-03-09 13:38:04 UTC (rev 9057) @@ -1,2 +1 @@ -0e883d66f0f58fc33585b430c652aa30 download/confuse-2.6.tar.gz -5a7d6c8406a18340e7508b4d9d0da2ca download/setopt.diff +45932fdeeccbb9ef4228f1c1a25e9c8f confuse-2.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 Tue Mar 9 14:42:10 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Mar 2010 13:42:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9058] csw/mgar/pkg/libatk/trunk Message-ID: Revision: 9058 http://gar.svn.sourceforge.net/gar/?rev=9058&view=rev Author: dmichelsen Date: 2010-03-09 13:42:10 +0000 (Tue, 09 Mar 2010) Log Message: ----------- libatk: Update to 1.29.92 and split off devel Modified Paths: -------------- csw/mgar/pkg/libatk/trunk/Makefile csw/mgar/pkg/libatk/trunk/checksums Modified: csw/mgar/pkg/libatk/trunk/Makefile =================================================================== --- csw/mgar/pkg/libatk/trunk/Makefile 2010-03-09 13:38:04 UTC (rev 9057) +++ csw/mgar/pkg/libatk/trunk/Makefile 2010-03-09 13:42:10 UTC (rev 9058) @@ -1,5 +1,5 @@ -GARNAME = libatk -GARVERSION = 1.26.0 +GARNAME = atk +GARVERSION = 1.29.92 CATEGORIES = lib DESCRIPTION = An accessibility toolkit for GNOME @@ -11,19 +11,29 @@ utilize all of the functionality of the GNOME user environment. endef -MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/atk/1.26/ -DISTNAME = atk-$(GARVERSION) +MASTER_SITES = $(GNOME_MIRROR) 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 = (\d+(?:\.\d+)*) -RUNTIME_DEP_PKGS = CSWggettextrt CSWglib2 +PACKAGES = CSWlibatk CSWlibatkdevel +CATALOGNAME_CSWlibatk = libatk +CATALOGNAME_CSWlibatkdevek = libatk_devel + +SPKG_DESC_CSWlibatk = $(DESCRIPTION) +SPKG_DESC_CSWlibatk = Developer files for libatk + +RUNTIME_DEP_PKGS_CSWlibatk = CSWggettextrt CSWglib2 +RUNTIME_DEP_PKGS_CSWlibatkdevel = CSWlibatk CSWglib2devel + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-debug=yes TEST_TARGET = check +PKGFILES_CSWlibatkdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibatkdevel += $(sharedstatedir)/gtk-doc/.* + include gar/category.mk Modified: csw/mgar/pkg/libatk/trunk/checksums =================================================================== --- csw/mgar/pkg/libatk/trunk/checksums 2010-03-09 13:38:04 UTC (rev 9057) +++ csw/mgar/pkg/libatk/trunk/checksums 2010-03-09 13:42:10 UTC (rev 9058) @@ -1 +1 @@ -719229408019c548855673840679f156 download/atk-1.26.0.tar.bz2 +48e06ab8971acb9df4203fbda8d46d77 atk-1.29.92.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 Tue Mar 9 14:53:43 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Mar 2010 13:53:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9059] csw/mgar/pkg/libatk/trunk/Makefile Message-ID: Revision: 9059 http://gar.svn.sourceforge.net/gar/?rev=9059&view=rev Author: dmichelsen Date: 2010-03-09 13:53:42 +0000 (Tue, 09 Mar 2010) Log Message: ----------- libatk: Fix catalog name Modified Paths: -------------- csw/mgar/pkg/libatk/trunk/Makefile Modified: csw/mgar/pkg/libatk/trunk/Makefile =================================================================== --- csw/mgar/pkg/libatk/trunk/Makefile 2010-03-09 13:42:10 UTC (rev 9058) +++ csw/mgar/pkg/libatk/trunk/Makefile 2010-03-09 13:53:42 UTC (rev 9059) @@ -19,7 +19,7 @@ PACKAGES = CSWlibatk CSWlibatkdevel CATALOGNAME_CSWlibatk = libatk -CATALOGNAME_CSWlibatkdevek = libatk_devel +CATALOGNAME_CSWlibatkdevel = libatk_devel SPKG_DESC_CSWlibatk = $(DESCRIPTION) SPKG_DESC_CSWlibatk = Developer files for libatk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Tue Mar 9 14:58:29 2010 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Tue, 09 Mar 2010 13:58:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9060] csw/mgar/pkg/ganglia/branches Message-ID: Revision: 9060 http://gar.svn.sourceforge.net/gar/?rev=9060&view=rev Author: d_pocock Date: 2010-03-09 13:58:27 +0000 (Tue, 09 Mar 2010) Log Message: ----------- Branch to test 3.1.7 package Added Paths: ----------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/ csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/checksums Removed Paths: ------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/checksums Deleted: csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/Makefile =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile 2010-02-09 13:11:40 UTC (rev 8434) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/Makefile 2010-03-09 13:58:27 UTC (rev 9060) @@ -1,180 +0,0 @@ -GARNAME = ganglia -GARVERSION = 3.1.5.2258 -CATEGORIES = utils - -# How should we set this? -# There is a release number in configure.in, maybe use that? -# RELVER = - -USER_GMOND = nobody -# nobody shouldn't really be allowed to own any files -# maybe we should add a ganglia user to own the RRD files? -USER_GMETAD = nobody - -DESCRIPTION = A scalable distributed monitoring system -define BLURB - Ganglia is a scalable distributed monitoring system for high-performance computing - systems such as clusters and Grids. It is based on a hierarchical design targeted - at federations of clusters. -endef - -SF_PROJ = ganglia -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove -DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad - -PACKAGES = CSWgangliart CSWgangliaagent CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython - -CATALOGNAME_CSWganglia = ganglia -CATALOGNAME_CSWgangliart = ganglia_rt -CATALOGNAME_CSWgangliaagent = ganglia_agent -CATALOGNAME_CSWgangliamodpython = ganglia_modpython -CATALOGNAME_CSWgangliadevel = ganglia_devel -CATALOGNAME_CSWgangliagmetad = ganglia_gmetad -CATALOGNAME_CSWgangliaweb = ganglia_web - -SPKG_DESC_CSWganglia = Dummy package -SPKG_DESC_CSWgangliart = Ganglia runtime libraries -SPKG_DESC_CSWgangliaagent = Ganglia performance monitoring agent gmond -SPKG_DESC_CSWgangliamodpython = Ganglia agent module for Python metrics -SPKG_DESC_CSWgangliadevel = Ganglia headers for metric module development -SPKG_DESC_CSWgangliagmetad = Ganglia gmetad -SPKG_DESC_CSWgangliaweb = Ganglia web - -BUILD_DEP_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd CSWpcre - -RUNTIME_DEP_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt -RUNTIME_DEP_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt -RUNTIME_DEP_PKGS_CSWgangliaagent += CSWgangliart CSWpcrert -RUNTIME_DEP_PKGS_CSWgangliamodpython = CSWlibconfuse CSWapache2rt CSWgangliart -RUNTIME_DEP_PKGS_CSWgangliamodpython += CSWgangliaagent -RUNTIME_DEP_PKGS_CSWgangliadevel = CSWexpat CSWlibconfuse CSWapache2rt -RUNTIME_DEP_PKGS_CSWgangliagmetad = CSWexpat CSWlibconfuse CSWapache2rt -RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWgangliart CSWgangliaagent CSWrrd -RUNTIME_DEP_PKGS_CSWgangliaweb = CSWgangliagmetad -RUNTIME_DEP_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2modphp5 CSWrrd - -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) - -# This is attachment #45 from Ganglia bug -# http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 -#PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris-cc.patch - -# Uncomment this if we want to build both 32 bit and 64 bit binaries -# By default, only 32 bit binaries are built -#BUILD64 = 1 - -CONFIGURE_ARGS = $(DIRPATHS) - -# Don't build gmetad (not tested yet on Solaris, more deps required to build) -#CONFIGURE_ARGS += --without-gmetad -CONFIGURE_ARGS += --with-gmetad - -# Reduce dependencies, no gettext: -CONFIGURE_ARGS += --disable-nls - -# Use apr from CSWapache2rt -CONFIGURE_ARGS += --with-libapr=/opt/csw/apache2/bin/apr-1-config - -# Include the status module -CONFIGURE_ARGS += --with-status - -# When we enable this, modpython will have to go in a separate package, -# otherwise CSWgangliaagent will have lots of dependencies -# TODO: define a CSWgangliamodpython package -# Depends: some issues exist getting the Python support working on Solaris, -# Ganglia's configure.in needs to be further enhanced for this to work -CONFIGURE_ARGS += --disable-python -#CONFIGURE_ARGS += --with-python=/opt/csw - -# For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, -# so we skip it. This should be re-assessed with each new release -# from upstream. Proposed fixes for the test suite to be submitted -# upstream. -ifeq ($(GARVERSION),3.1.3) -TEST_SCRIPTS = -endif -ifeq ($(GARVERSION),3.1.4) -TEST_SCRIPTS = -endif -ifeq ($(GARVERSION),3.1.5.2258) -TEST_SCRIPTS = -endif -ifeq ($(GARVERSION),3.1.6) -TEST_SCRIPTS = -endif - -INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom - -WWWROOT = /opt/csw/share/www -WWWGANGLIA = $(WWWROOT)/ganglia -sysconfdir = /etc/opt/csw/ganglia -ETCGANGLIA = $(sysconfdir) - -PKGFILES_CSWganglia = -PKGFILES_CSWgangliart = $(libdir)/libganglia.* -PKGFILES_CSWgangliamodpython = .*python.* -PKGFILES_CSWgangliadevel = .*/include/.*.h .*/bin/ganglia-config -PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds /etc/opt/csw/init.d/cswgmetad -PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* - -PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW -PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf.CSW -PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf.CSW -PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modgstatus.conf.CSW -PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modpython.conf.CSW -PRESERVECONF += $(WWWGANGLIA)/conf.php - -# For gmond -INITSMF = /etc/opt/csw/init.d/cswgmond -# For gmetad -INITSMF += /etc/opt/csw/init.d/cswgmetad - -PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ -$$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ -{ print }' - - -#ARCHALL_CSWgangliadevel = 1 -#ARCHALL_CSWgangliaweb = 1 - -include gar/category.mk - -install-custom: - @ginstall -D $(DOWNLOADDIR)/cswgmond \ - $(PKGROOT)/etc/opt/csw/init.d/cswgmond - @ginstall -D $(DOWNLOADDIR)/cswgmetad \ - $(PKGROOT)/etc/opt/csw/init.d/cswgmetad - @ginstall -d $(DESTDIR)$(WWWGANGLIA) - @cd $(WORKSRC)/web; \ - cp -R * $(DESTDIR)$(WWWGANGLIA) - @ginstall -D $(FILEDIR)/conf.php \ - $(DESTDIR)$(WWWGANGLIA)/conf.php.CSW - @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in - @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \ - $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW - @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d - @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ - > $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW - @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ - >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW -# @ginstall -D $(FILEDIR)/gmond.conf \ -# $(DESTDIR)$(ETCGANGLIA)/gmond.conf - @ginstall -D $(FILEDIR)/gmetad.conf \ - $(DESTDIR)$(ETCGANGLIA)/gmetad.conf.CSW - @cd $(WORKSRC)/gmond/modules/conf.d; \ - for CONF_FILE in *.conf ; \ - do cp -R "$${CONF_FILE}" $(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf.CSW \ - $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf.CSW -ifeq ($(GARVERSION),3.1.2) - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf.CSW -endif - @ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds - - - Copied: csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/Makefile (from rev 8437, csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile) =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/Makefile (rev 0) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/Makefile 2010-03-09 13:58:27 UTC (rev 9060) @@ -0,0 +1,182 @@ +GARNAME = ganglia +GARVERSION = 3.1.6 +CATEGORIES = utils + +# How should we set this? +# There is a release number in configure.in, maybe use that? +# RELVER = + +USER_GMOND = nobody +# nobody shouldn't really be allowed to own any files +# maybe we should add a ganglia user to own the RRD files? +USER_GMETAD = nobody + +DESCRIPTION = A scalable distributed monitoring system +define BLURB + Ganglia is a scalable distributed monitoring system for high-performance computing + systems such as clusters and Grids. It is based on a hierarchical design targeted + at federations of clusters. +endef + +SF_PROJ = ganglia +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove +DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad + +PACKAGES = CSWgangliart CSWgangliaagent CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython + +CATALOGNAME_CSWganglia = ganglia +CATALOGNAME_CSWgangliart = ganglia_rt +CATALOGNAME_CSWgangliaagent = ganglia_agent +CATALOGNAME_CSWgangliamodpython = ganglia_modpython +CATALOGNAME_CSWgangliadevel = ganglia_devel +CATALOGNAME_CSWgangliagmetad = ganglia_gmetad +CATALOGNAME_CSWgangliaweb = ganglia_web + +SPKG_DESC_CSWganglia = Dummy package +SPKG_DESC_CSWgangliart = Ganglia runtime libraries +SPKG_DESC_CSWgangliaagent = Ganglia performance monitoring agent gmond +SPKG_DESC_CSWgangliamodpython = Ganglia agent module for Python metrics +SPKG_DESC_CSWgangliadevel = Ganglia headers for metric module development +SPKG_DESC_CSWgangliagmetad = Ganglia gmetad +SPKG_DESC_CSWgangliaweb = Ganglia web + +BUILD_DEP_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd CSWpcre + +RUNTIME_DEP_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt +RUNTIME_DEP_PKGS_CSWgangliart += CSWpcrert +RUNTIME_DEP_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt +RUNTIME_DEP_PKGS_CSWgangliaagent += CSWgangliart CSWpcrert +RUNTIME_DEP_PKGS_CSWgangliamodpython = CSWlibconfuse CSWapache2rt CSWgangliart +RUNTIME_DEP_PKGS_CSWgangliamodpython += CSWgangliaagent +RUNTIME_DEP_PKGS_CSWgangliadevel = CSWexpat CSWlibconfuse CSWapache2rt +RUNTIME_DEP_PKGS_CSWgangliagmetad = CSWexpat CSWlibconfuse CSWapache2rt +RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWgangliart CSWgangliaagent CSWrrd +RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWpcrert +RUNTIME_DEP_PKGS_CSWgangliaweb = CSWgangliagmetad +RUNTIME_DEP_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2modphp5 CSWrrd + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +# This is attachment #45 from Ganglia bug +# http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 +#PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris-cc.patch + +# Uncomment this if we want to build both 32 bit and 64 bit binaries +# By default, only 32 bit binaries are built +#BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +# Don't build gmetad (not tested yet on Solaris, more deps required to build) +#CONFIGURE_ARGS += --without-gmetad +CONFIGURE_ARGS += --with-gmetad + +# Reduce dependencies, no gettext: +CONFIGURE_ARGS += --disable-nls + +# Use apr from CSWapache2rt +CONFIGURE_ARGS += --with-libapr=/opt/csw/apache2/bin/apr-1-config + +# Include the status module +CONFIGURE_ARGS += --with-status + +# When we enable this, modpython will have to go in a separate package, +# otherwise CSWgangliaagent will have lots of dependencies +# TODO: define a CSWgangliamodpython package +# Depends: some issues exist getting the Python support working on Solaris, +# Ganglia's configure.in needs to be further enhanced for this to work +CONFIGURE_ARGS += --disable-python +#CONFIGURE_ARGS += --with-python=/opt/csw + +# For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, +# so we skip it. This should be re-assessed with each new release +# from upstream. Proposed fixes for the test suite to be submitted +# upstream. +ifeq ($(GARVERSION),3.1.3) +TEST_SCRIPTS = +endif +ifeq ($(GARVERSION),3.1.4) +TEST_SCRIPTS = +endif +ifeq ($(GARVERSION),3.1.5) +TEST_SCRIPTS = +endif +ifeq ($(GARVERSION),3.1.6) +TEST_SCRIPTS = +endif + +INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom + +WWWROOT = /opt/csw/share/www +WWWGANGLIA = $(WWWROOT)/ganglia +sysconfdir = /etc/opt/csw/ganglia +ETCGANGLIA = $(sysconfdir) + +PKGFILES_CSWganglia = +PKGFILES_CSWgangliart = $(libdir)/libganglia.* +PKGFILES_CSWgangliamodpython = .*python.* +PKGFILES_CSWgangliadevel = .*/include/.*.h .*/bin/ganglia-config +PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds /etc/opt/csw/init.d/cswgmetad +PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* + +PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modgstatus.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modpython.conf.CSW +PRESERVECONF += $(WWWGANGLIA)/conf.php + +# For gmond +INITSMF = /etc/opt/csw/init.d/cswgmond +# For gmetad +INITSMF += /etc/opt/csw/init.d/cswgmetad + +PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ +$$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ +{ print }' + + +#ARCHALL_CSWgangliadevel = 1 +#ARCHALL_CSWgangliaweb = 1 + +include gar/category.mk + +install-custom: + @ginstall -D $(DOWNLOADDIR)/cswgmond \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmond + @ginstall -D $(DOWNLOADDIR)/cswgmetad \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmetad + @ginstall -d $(DESTDIR)$(WWWGANGLIA) + @cd $(WORKSRC)/web; \ + cp -R * $(DESTDIR)$(WWWGANGLIA) + @ginstall -D $(FILEDIR)/conf.php \ + $(DESTDIR)$(WWWGANGLIA)/conf.php.CSW + @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in + @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \ + $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW + @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d + @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ + > $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW + @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ + >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW +# @ginstall -D $(FILEDIR)/gmond.conf \ +# $(DESTDIR)$(ETCGANGLIA)/gmond.conf + @ginstall -D $(FILEDIR)/gmetad.conf \ + $(DESTDIR)$(ETCGANGLIA)/gmetad.conf.CSW + @cd $(WORKSRC)/gmond/modules/conf.d; \ + for CONF_FILE in *.conf ; \ + do cp -R "$${CONF_FILE}" $(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf.CSW \ + $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf.CSW +ifeq ($(GARVERSION),3.1.2) + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf.CSW +endif + @ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds + + + Deleted: csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/checksums =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums 2010-02-09 13:11:40 UTC (rev 8434) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/checksums 2010-03-09 13:58:27 UTC (rev 9060) @@ -1,6 +0,0 @@ -f3436682e339279357aa98473a9f2b8a download/CSWgangliaweb.postinstall -c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove -25d302948e25837bf17757d5e23e4955 download/cswgmetad -c6bb96c949dbb989d06ebb36b6af885d download/cswgmond -cd33957a91bcf0fd5207002674faef0f download/ganglia-3.1.5.2258.tar.gz -2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.CSW Copied: csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/checksums (from rev 8437, csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums) =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/checksums (rev 0) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/checksums 2010-03-09 13:58:27 UTC (rev 9060) @@ -0,0 +1,6 @@ +f3436682e339279357aa98473a9f2b8a CSWgangliaweb.postinstall +c4c333a46db391464e372ad8ede4993c CSWgangliaweb.preremove +25d302948e25837bf17757d5e23e4955 cswgmetad +c6bb96c949dbb989d06ebb36b6af885d cswgmond +39134ccba646fce6979958bf9c0fc8d7 ganglia-3.1.6.tar.gz +2ff504ecb546aca2cdd6ee09af9a417e httpd-ganglia.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 Tue Mar 9 15:53:43 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Mar 2010 14:53:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9061] csw/mgar/pkg/pca/trunk Message-ID: Revision: 9061 http://gar.svn.sourceforge.net/gar/?rev=9061&view=rev Author: dmichelsen Date: 2010-03-09 14:53:38 +0000 (Tue, 09 Mar 2010) Log Message: ----------- pca: Update to 20100309-02 Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2010-03-09 13:58:27 UTC (rev 9060) +++ csw/mgar/pkg/pca/trunk/Makefile 2010-03-09 14:53:38 UTC (rev 9061) @@ -1,5 +1,5 @@ GARNAME = pca -GARVERSION = 20091216-02 +GARVERSION = 20100309-02 CATEGORIES = utils DESCRIPTION = Patch Check Advanced Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2010-03-09 13:58:27 UTC (rev 9060) +++ csw/mgar/pkg/pca/trunk/checksums 2010-03-09 14:53:38 UTC (rev 9061) @@ -1,5 +1,5 @@ 4376789925fa9002d0567d739f717748 0001-prefer-opencsw-perl.diff 78c76967d20b4c9c69acacd7417527e1 0002-Add-etc-opt-csw-as-config-location.patch 6f2f2376eba0a788795dd43d68ad32d1 COPYING -7236327edeb969fd2a223cd5b60c0b57 pca-20091216-02 +24822dfe6352f7b86f412fc46f883ab4 pca-20100309-02 12de68ff8f67b4bb8b095e5646402208 pca.conf 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 Mar 9 16:11:04 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Mar 2010 15:11:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[9062] csw/mgar/pkg/glib2/trunk Message-ID: Revision: 9062 http://gar.svn.sourceforge.net/gar/?rev=9062&view=rev Author: dmichelsen Date: 2010-03-09 15:11:03 +0000 (Tue, 09 Mar 2010) Log Message: ----------- glib2: Update to 2.23.5 Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile csw/mgar/pkg/glib2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/glib2/trunk/files/0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2010-03-09 14:53:38 UTC (rev 9061) +++ csw/mgar/pkg/glib2/trunk/Makefile 2010-03-09 15:11:03 UTC (rev 9062) @@ -1,5 +1,5 @@ GARNAME = glib -GARVERSION = 2.23.1 +GARVERSION = 2.23.5 CATEGORIES = lib DESCRIPTION = The GLib library of C routines. @@ -22,8 +22,9 @@ PATCHFILES = glib-typedetect.patch PATCHFILES += FIXED_STR.patch PATCHFILES += gsize.patch -PATCHFILES += gconverter.patch +# PATCHFILES += gconverter.patch PATCHFILES += CMSG_LEN.patch +PATCHFILES += 0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv=gnu Modified: csw/mgar/pkg/glib2/trunk/checksums =================================================================== --- csw/mgar/pkg/glib2/trunk/checksums 2010-03-09 14:53:38 UTC (rev 9061) +++ csw/mgar/pkg/glib2/trunk/checksums 2010-03-09 15:11:03 UTC (rev 9062) @@ -1,6 +1,6 @@ +a87638e0505b6ff29efd8130450003c5 0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch 9f66027a275eb34d80a68ec8927bf66e CMSG_LEN.patch f1f3c182f64be06ab57d8b01016af074 FIXED_STR.patch -ed4a6616a70705b56babe709787431d4 gconverter.patch -fb637f6122690254097d0b6d470f6ed3 glib-2.23.1.tar.bz2 +f249a94e8da086fd5d6e24dd4c1a1324 glib-2.23.5.tar.bz2 8f683820d9ecab1abd9dbe81997ab9eb glib-typedetect.patch bb2fb8eef43c995fea6c08563487ace6 gsize.patch Added: csw/mgar/pkg/glib2/trunk/files/0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch 2010-03-09 15:11:03 UTC (rev 9062) @@ -0,0 +1,25 @@ +From 0ec0789eab4126e3deee2b807da92d6a28dbdad6 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 9 Mar 2010 15:02:57 +0100 +Subject: [PATCH] Use G_STRFUNC instead of explicit gcc-only __PRETTY_FUNC__ + +--- + glib/gvariant.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/glib/gvariant.c b/glib/gvariant.c +index adc9030..d484ee2 100644 +--- a/glib/gvariant.c ++++ b/glib/gvariant.c +@@ -282,7 +282,7 @@ + */ + #define TYPE_CHECK(value, TYPE, val) \ + if G_UNLIKELY (!g_variant_is_of_type (value, TYPE)) { \ +- g_return_if_fail_warning (G_LOG_DOMAIN, __PRETTY_FUNCTION__, \ ++ g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, \ + "g_variant_is_of_type (" #value \ + ", " #TYPE ")"); \ + return val; \ +-- +1.7.0 + 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 Mar 9 16:14:20 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Mar 2010 15:14:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9063] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 9063 http://gar.svn.sourceforge.net/gar/?rev=9063&view=rev Author: dmichelsen Date: 2010-03-09 15:14:20 +0000 (Tue, 09 Mar 2010) Log Message: ----------- glib2: Add comment about patch Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2010-03-09 15:11:03 UTC (rev 9062) +++ csw/mgar/pkg/glib2/trunk/Makefile 2010-03-09 15:14:20 UTC (rev 9063) @@ -24,6 +24,9 @@ PATCHFILES += gsize.patch # PATCHFILES += gconverter.patch PATCHFILES += CMSG_LEN.patch + +# Bug reported upstream: +# https://bugzilla.gnome.org/show_bug.cgi?id=612300 PATCHFILES += 0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch 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 Tue Mar 9 16:39:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Mar 2010 15:39:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9064] csw/mgar/pkg/x11vnc/trunk/Makefile Message-ID: Revision: 9064 http://gar.svn.sourceforge.net/gar/?rev=9064&view=rev Author: dmichelsen Date: 2010-03-09 15:39:46 +0000 (Tue, 09 Mar 2010) Log Message: ----------- x11vnc: Depend on csw X11 Modified Paths: -------------- csw/mgar/pkg/x11vnc/trunk/Makefile Modified: csw/mgar/pkg/x11vnc/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11vnc/trunk/Makefile 2010-03-09 15:14:20 UTC (rev 9063) +++ csw/mgar/pkg/x11vnc/trunk/Makefile 2010-03-09 15:39:46 UTC (rev 9064) @@ -17,25 +17,15 @@ BUILD_DEP_PKGS = CSWossldevel CSWzlib CSWjpeg RUNTIME_DEP_PKGS = CSWosslrt CSWzlib CSWjpeg +RUNTIME_DEP_PKGS += CSWlibx11 CSWlibxdamage CSWlibxext CSWlibxfixes CSWlibxinerama CSWlibxtst -PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -# This is to make sure the X11 path is prepended to the front of lib pathes. -# Otherwise the wrong X11 gets picked up. -EXTRA_LIB_garosrel-5.8 = /usr/openwin/lib -# We can't add /usr/sfw/lib because then openssl is pickedup from there too. -#EXTRA_LIB_garosrel-5.10 = /usr/X11/lib /usr/sfw/lib -EXTRA_LIB_garosrel-5.10 = /usr/X11/lib -EXTRA_LIB = $(EXTRA_LIB_garosrel-$(GAROSREL)) - -CONFIGURE_ARGS_garosrel-5.8 = --x-includes=/usr/openwin/include -CONFIGURE_ARGS_garosrel-5.8 += --x-libraries=/usr/openwin/lib -CONFIGURE_ARGS_garosrel-5.10 = --x-includes=/usr/X11/include -CONFIGURE_ARGS_garosrel-5.10 += --x-libraries=/usr/X11/lib - CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += $(CONFIGURE_ARGS_garosrel-$(GAROSREL)) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 9 17:08:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 09 Mar 2010 16:08:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9065] csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile Message-ID: Revision: 9065 http://gar.svn.sourceforge.net/gar/?rev=9065&view=rev Author: wahwah Date: 2010-03-09 16:08:43 +0000 (Tue, 09 Mar 2010) Log Message: ----------- libxcb: Adding $Id$ Modified Paths: -------------- csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile Modified: csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile 2010-03-09 15:39:46 UTC (rev 9064) +++ csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile 2010-03-09 16:08:43 UTC (rev 9065) @@ -1,3 +1,5 @@ +# $Id$ + GARNAME = libxcb GARVERSION = 1.5 CATEGORIES = x11 Property changes on: csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Mar 9 17:27:40 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 09 Mar 2010 16:27:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[9066] csw/mgar/pkg/gstreamer/trunk/Makefile Message-ID: Revision: 9066 http://gar.svn.sourceforge.net/gar/?rev=9066&view=rev Author: bensons Date: 2010-03-09 16:27:40 +0000 (Tue, 09 Mar 2010) Log Message: ----------- gstreamer: fix flex call Modified Paths: -------------- csw/mgar/pkg/gstreamer/trunk/Makefile Modified: csw/mgar/pkg/gstreamer/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstreamer/trunk/Makefile 2010-03-09 16:08:43 UTC (rev 9065) +++ csw/mgar/pkg/gstreamer/trunk/Makefile 2010-03-09 16:27:40 UTC (rev 9066) @@ -44,3 +44,6 @@ TEST_SCRIPTS = include gar/category.mk + +# select the right flex parser aka CSWflex-new +CONFIGURE_ENV += FLEX_PATH=/opt/csw/bin/flex-2.5.35 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 9 17:33:23 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 09 Mar 2010 16:33:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9067] csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile Message-ID: Revision: 9067 http://gar.svn.sourceforge.net/gar/?rev=9067&view=rev Author: wahwah Date: 2010-03-09 16:33:22 +0000 (Tue, 09 Mar 2010) Log Message: ----------- xcb-util: Adding svn:keywords Id to the Makefile Property Changed: ---------------- csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile Property changes on: csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 9 18:46:53 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 09 Mar 2010 17:46:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9068] csw/mgar/pkg Message-ID: Revision: 9068 http://gar.svn.sourceforge.net/gar/?rev=9068&view=rev Author: bonivart Date: 2010-03-09 17:46:52 +0000 (Tue, 09 Mar 2010) Log Message: ----------- namebench: initial commit Added Paths: ----------- csw/mgar/pkg/namebench/ csw/mgar/pkg/namebench/branches/ csw/mgar/pkg/namebench/tags/ csw/mgar/pkg/namebench/trunk/ csw/mgar/pkg/namebench/trunk/Makefile csw/mgar/pkg/namebench/trunk/checksums csw/mgar/pkg/namebench/trunk/files/ Property changes on: csw/mgar/pkg/namebench/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/namebench/trunk/Makefile =================================================================== --- csw/mgar/pkg/namebench/trunk/Makefile (rev 0) +++ csw/mgar/pkg/namebench/trunk/Makefile 2010-03-09 17:46:52 UTC (rev 9068) @@ -0,0 +1,22 @@ +GARNAME = namebench +GARVERSION = 1.2 +CATEGORIES = python + +DESCRIPTION = DNS benchmark utility +define BLURB + DNS benchmark utility +endef + +MASTER_SITES = http://namebench.googlecode.com/files/ +DISTFILES = $(GARNAME)-$(GARVERSION)-source.tgz + +RUNTIME_DEP_PKGS = CSWpython-tk + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + +ARCHALL = 1 + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/namebench/trunk/checksums =================================================================== --- csw/mgar/pkg/namebench/trunk/checksums (rev 0) +++ csw/mgar/pkg/namebench/trunk/checksums 2010-03-09 17:46:52 UTC (rev 9068) @@ -0,0 +1 @@ +2e04a66154cc21d3fe448305c3f60558 namebench-1.2-source.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 9 18:59:21 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 09 Mar 2010 17:59:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9069] csw/mgar/pkg/awesome/trunk Message-ID: Revision: 9069 http://gar.svn.sourceforge.net/gar/?rev=9069&view=rev Author: wahwah Date: 2010-03-09 17:59:20 +0000 (Tue, 09 Mar 2010) Log Message: ----------- awesome: A patch to link against iconv Modified Paths: -------------- csw/mgar/pkg/awesome/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch Modified: csw/mgar/pkg/awesome/trunk/Makefile =================================================================== --- csw/mgar/pkg/awesome/trunk/Makefile 2010-03-09 17:46:52 UTC (rev 9068) +++ csw/mgar/pkg/awesome/trunk/Makefile 2010-03-09 17:59:20 UTC (rev 9069) @@ -17,12 +17,15 @@ INSTALL_SCRIPTS = awesome CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU -EXTRA_LD_OPTIONS = -L/opt/csw/lib -liconv +# EXTRA_LD_OPTIONS = -L/opt/csw/lib -liconv +# EXTRA_CFLAGS = -xc99 -DCE +# EXTRA_CXXFLAGS = -xc99 -DCEPLUSPLUS -BUILD_DEP_PKGS += CSWlua CSWgperf +BUILD_DEP_PKGS += CSWlua CSWgperf CSWlibdbusdev EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig PATCHFILES += gperf.sh-solarify.patch PATCHFILES += backtrace.c.patch +PATCHFILES += awesomeConfig.cmake.patch include gar/category.mk Added: csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch =================================================================== --- csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch (rev 0) +++ csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch 2010-03-09 17:59:20 UTC (rev 9069) @@ -0,0 +1,20 @@ +--- awesome-3.4.4/awesomeConfig.cmake.orig 2010-03-09 18:53:40.270578634 +0100 ++++ awesome-3.4.4/awesomeConfig.cmake 2010-03-09 18:55:57.683822917 +0100 +@@ -167,6 +167,7 @@ + + # Check for libev + a_find_library(LIB_EV ev) ++a_find_library(LIB_ICONV iconv) + + # Error check + if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug +@@ -177,7 +178,8 @@ + ${AWESOME_COMMON_REQUIRED_LDFLAGS} + ${AWESOME_REQUIRED_LIBRARIES} + ${LIB_EV} +- ${LUA_LIBRARIES}) ++ ${LUA_LIBRARIES} ++ ${LIB_ICONV}) + + set(AWESOME_REQUIRED_INCLUDE_DIRS + ${AWESOME_COMMON_REQUIRED_INCLUDE_DIRS} 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 Mar 9 19:01:42 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 09 Mar 2010 18:01:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[9070] csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile Message-ID: Revision: 9070 http://gar.svn.sourceforge.net/gar/?rev=9070&view=rev Author: wbonnet Date: 2010-03-09 18:01:41 +0000 (Tue, 09 Mar 2010) Log Message: ----------- Fix package content Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile 2010-03-09 17:59:20 UTC (rev 9069) +++ csw/mgar/pkg/x11/lib/libxrandr/trunk/Makefile 2010-03-09 18:01:41 UTC (rev 9070) @@ -28,7 +28,7 @@ # BUILD_DEP_PKGS = CSWrandrproto CSWlibxextdevel PKGFILES_CSWlibxrandrdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibxrandr = CSWlibx11 CSWlibxext CSWlibxrender +# PKGFILES_CSWlibxrandr = CSWlibx11 CSWlibxext CSWlibxrender BUILD64 = 1 NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 10 08:15:32 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Mar 2010 07:15:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9071] csw/mgar/pkg/mpg321/trunk/Makefile Message-ID: Revision: 9071 http://gar.svn.sourceforge.net/gar/?rev=9071&view=rev Author: wahwah Date: 2010-03-10 07:15:31 +0000 (Wed, 10 Mar 2010) Log Message: ----------- mpg321: Update the title to 'A Free, fast fixed-point math replacement for mpg123' Modified Paths: -------------- csw/mgar/pkg/mpg321/trunk/Makefile Modified: csw/mgar/pkg/mpg321/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpg321/trunk/Makefile 2010-03-09 18:01:41 UTC (rev 9070) +++ csw/mgar/pkg/mpg321/trunk/Makefile 2010-03-10 07:15:31 UTC (rev 9071) @@ -7,7 +7,7 @@ DISTFILE_SUFFIX = -2 CATEGORIES = apps -DESCRIPTION = A Free replacement for mpg123 +DESCRIPTION = A Free, fast fixed-point math replacement for mpg123 SPKG_SOURCEURL = http://mpg321.sourceforge.net/ define BLURB endef This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 10 08:42:29 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Mar 2010 07:42:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9072] csw/mgar/pkg/urxvt/trunk/Makefile Message-ID: Revision: 9072 http://gar.svn.sourceforge.net/gar/?rev=9072&view=rev Author: wahwah Date: 2010-03-10 07:42:29 +0000 (Wed, 10 Mar 2010) Log Message: ----------- urxvt: Compiling against OpenCSW X11 libraries. Modified Paths: -------------- csw/mgar/pkg/urxvt/trunk/Makefile Modified: csw/mgar/pkg/urxvt/trunk/Makefile =================================================================== --- csw/mgar/pkg/urxvt/trunk/Makefile 2010-03-10 07:15:31 UTC (rev 9071) +++ csw/mgar/pkg/urxvt/trunk/Makefile 2010-03-10 07:42:29 UTC (rev 9072) @@ -6,7 +6,7 @@ GARVERSION = 9.07 CATEGORIES = apps -DESCRIPTION = (ouR XVT, unicode) - a VT102 emulator for the X window system +DESCRIPTION = A VT102 emulator for the X window system (pron. ouR XVT, unicode) define BLURB rxvt-unicode, is a colour vt102 terminal emulator intended as an xterm(1) replacement for users who do not require features such as Tektronix 4014 @@ -20,17 +20,29 @@ MASTER_SITES = http://dist.schmorp.de/rxvt-unicode/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += urxvt-wrapper +DISTFILES += urxvt-wrapper UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 SPKG_SOURCEURL = http://software.schmorp.de/pkg/rxvt-unicode.html -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 PACKAGES = CSWurxvt CATALOGNAME_CSWurxvt = urxvt CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-perl +CONFIGURE_ARGS += --with-terminfo=/opt/csw/share/terminfo +# For the wrapper RUNTIME_DEP_PKGS_CSWurxvt = CSWbash +# Because of terminfo +RUNTIME_DEP_PKGS_CSWurxvt += CSWncurses +# Shared library dependencies +RUNTIME_DEP_PKGS_CSWurxvt += CSWfconfig +RUNTIME_DEP_PKGS_CSWurxvt += CSWftype2 +RUNTIME_DEP_PKGS_CSWurxvt += CSWlibx11 +RUNTIME_DEP_PKGS_CSWurxvt += CSWlibxft2 +RUNTIME_DEP_PKGS_CSWurxvt += CSWlibxrender GARCOMPILER = GNU -TEST_SCRIPTS = +TEST_TARGET = check +EXTRA_INC = /opt/csw/X11/include +EXTRA_LIB = /opt/csw/X11/lib +EXTRA_PKG_CONFIG_DIRS = /opt/csw/X11/lib 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 Mar 10 09:02:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Mar 2010 08:02:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9073] csw/mgar/pkg/gtk2/trunk Message-ID: Revision: 9073 http://gar.svn.sourceforge.net/gar/?rev=9073&view=rev Author: dmichelsen Date: 2010-03-10 08:02:31 +0000 (Wed, 10 Mar 2010) Log Message: ----------- gtk2: Update to 2.19.6, depend on csw X11 Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile csw/mgar/pkg/gtk2/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/gtk2/trunk/files/fixme.sh Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2010-03-10 07:42:29 UTC (rev 9072) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2010-03-10 08:02:31 UTC (rev 9073) @@ -1,5 +1,5 @@ GARNAME = gtk2 -GARVERSION = 2.16.5 +GARVERSION = 2.19.6 CATEGORIES = lib DESCRIPTION = GTK+, the multiplatform X11 toolkit for GUI development @@ -16,14 +16,13 @@ # # #if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) -MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.16/ +GNOME_PROJ = gtk+ +MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = gtk+-$(GARVERSION).tar.bz2 +DISTNAME = gtk+-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += CSWgtk2.postinstall -DISTFILES += fixme.sh -WORKSRC = $(WORKDIR)/gtk+-$(GARVERSION) - PACKAGES = CSWgtk2 CSWgtk2devel CSWgtk2doc CATALOGNAME_CSWgtk2 = gtk2 @@ -35,8 +34,9 @@ SPKG_DESC_CSWgtk2doc = A feature rich toolkit for creating graphical user interfaces documentation BUILD_DEP_PKGS = CSWbash -RUNTIME_DEP_PKGS_CSWgtk2 = CSWjasper CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWjpeg CSWlibatk -RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo CSWlibx11 CSWlibxrender CSWpango CSWpng CSWtiff CSWzlib +RUNTIME_DEP_PKGS_CSWgtk2 = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWjpeg CSWlibatk +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo CSWlibx11 CSWlibxrender CSWpango CSWpng CSWtiff +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibxcomposite CSWlibxcursor CSWlibxdamage CSWlibxext CSWlibxfixes CSWlibxinerama CSWlibxrandr RUNTIME_DEP_PKGS_CSWgtk2devel = CSWgtk2 CSWglib2devel RUNTIME_DEP_PKGS_CSWgtk2devel += CSWlibcairodevel CSWlibx11devel CSWlibxrenderdevel CSWpangodevel @@ -55,6 +55,8 @@ CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) CONFIGURE_ARGS += --disable-cups +STRIP_LIBTOOL = 1 + #TEST_TARGET = check # There is a test failing on Xvfb which may or may not be harmful. Disable for now. TEST_TARGET = @@ -69,8 +71,3 @@ ARCHALL_CSWgtk2doc = 1 include gar/category.mk - -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 2010-03-10 07:42:29 UTC (rev 9072) +++ csw/mgar/pkg/gtk2/trunk/checksums 2010-03-10 08:02:31 UTC (rev 9073) @@ -1,3 +1,2 @@ -7ff4fdcaa073afc764af7106c0ba441c download/CSWgtk2.postinstall -34f5b20f6caf282b2533784fbb1b4395 download/fixme.sh -8d1ea0b9b0400224d25b0cc2750b438d download/gtk+-2.16.5.tar.bz2 +7ff4fdcaa073afc764af7106c0ba441c CSWgtk2.postinstall +524021c965a0e1a4ebadd58c576926a5 gtk+-2.19.6.tar.bz2 Deleted: csw/mgar/pkg/gtk2/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/gtk2/trunk/files/fixme.sh 2010-03-10 07:42:29 UTC (rev 9072) +++ csw/mgar/pkg/gtk2/trunk/files/fixme.sh 2010-03-10 08:02:31 UTC (rev 9073) @@ -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 wahwah at users.sourceforge.net Wed Mar 10 09:09:51 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Mar 2010 08:09:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[9074] csw/mgar/pkg/evince/trunk/Makefile Message-ID: Revision: 9074 http://gar.svn.sourceforge.net/gar/?rev=9074&view=rev Author: wahwah Date: 2010-03-10 08:09:51 +0000 (Wed, 10 Mar 2010) Log Message: ----------- evince: Enabling debugging mode. Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2010-03-10 08:02:31 UTC (rev 9073) +++ csw/mgar/pkg/evince/trunk/Makefile 2010-03-10 08:09:51 UTC (rev 9074) @@ -9,16 +9,24 @@ DESCRIPTION = Document viewer for multiple document formats define BLURB endef +GARFLAVOR = DBG SPKG_SOURCEURL = http://projects.gnome.org/evince/ MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(GARNAME)/$(GNOME_VERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS_DBG = --enable-debug +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) +EXTRA_CFLAGS_DBG = -g +EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARFLAVOR)) STRIP_LIBTOOL = 1 EXTRA_LD_OPTIONS = /opt/csw/X11/lib/libX11.so -lm # There are no shared-object dependencies on CSWdbus, but it's required for # evince to work. RUNTIME_DEP_PKGS_CSWevince += CSWdbus +# Shared MIME info is needed to detect file types +RUNTIME_DEP_PKGS_CSWevince += CSWsharedmimeinfo + RUNTIME_DEP_PKGS_CSWevince += CSWdbusglib RUNTIME_DEP_PKGS_CSWevince += CSWdjvulibre RUNTIME_DEP_PKGS_CSWevince += CSWfconfig 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 Mar 10 10:28:45 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 10 Mar 2010 09:28:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[9075] csw/mgar/pkg/librsync/trunk/Makefile Message-ID: Revision: 9075 http://gar.svn.sourceforge.net/gar/?rev=9075&view=rev Author: skayser Date: 2010-03-10 09:28:45 +0000 (Wed, 10 Mar 2010) Log Message: ----------- librsync: added deps Modified Paths: -------------- csw/mgar/pkg/librsync/trunk/Makefile Modified: csw/mgar/pkg/librsync/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsync/trunk/Makefile 2010-03-10 08:09:51 UTC (rev 9074) +++ csw/mgar/pkg/librsync/trunk/Makefile 2010-03-10 09:28:45 UTC (rev 9075) @@ -4,7 +4,7 @@ DESCRIPTION = Library with the rolling-checksum algorithm known from rsync define BLURB - ibrsync implements the rolling-checksum algorithm of remote file + librsync implements the rolling-checksum algorithm of remote file synchronization that was popularized by the rsync utility and is used in rproxy. This algorithm transfers the differences between 2 files without needing both files on the same system. @@ -14,6 +14,10 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +RUNTIME_DEP_PKGS_CSWlibrsync += CSWbzip2 +RUNTIME_DEP_PKGS_CSWlibrsync += CSWlibpopt +RUNTIME_DEP_PKGS_CSWlibrsync += CSWzlib + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 10 12:35:45 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Mar 2010 11:35:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[9076] csw/mgar/pkg/awesome/trunk Message-ID: Revision: 9076 http://gar.svn.sourceforge.net/gar/?rev=9076&view=rev Author: wahwah Date: 2010-03-10 11:35:45 +0000 (Wed, 10 Mar 2010) Log Message: ----------- awesome: I got it to build on Solaris 10. Modified Paths: -------------- csw/mgar/pkg/awesome/trunk/Makefile csw/mgar/pkg/awesome/trunk/checksums Added Paths: ----------- csw/mgar/pkg/awesome/trunk/files/iconv-try-1.patch csw/mgar/pkg/awesome/trunk/files/remove-export-dynamic.patch csw/mgar/pkg/awesome/trunk/files/test-dash-e-unavailable.patch csw/mgar/pkg/awesome/trunk/files/turn-off-rpath-breakage.patch Removed Paths: ------------- csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch Modified: csw/mgar/pkg/awesome/trunk/Makefile =================================================================== --- csw/mgar/pkg/awesome/trunk/Makefile 2010-03-10 09:28:45 UTC (rev 9075) +++ csw/mgar/pkg/awesome/trunk/Makefile 2010-03-10 11:35:45 UTC (rev 9076) @@ -20,13 +20,40 @@ # EXTRA_LD_OPTIONS = -L/opt/csw/lib -liconv # EXTRA_CFLAGS = -xc99 -DCE # EXTRA_CXXFLAGS = -xc99 -DCEPLUSPLUS +TEST_SCRIPTS = +EXTRA_INC = /opt/csw/X11/include +EXTRA_LIB = /opt/csw/X11/lib BUILD_DEP_PKGS += CSWlua CSWgperf CSWlibdbusdev EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig PATCHFILES += gperf.sh-solarify.patch PATCHFILES += backtrace.c.patch -PATCHFILES += awesomeConfig.cmake.patch +PATCHFILES += iconv-try-1.patch +# PATCHFILES += libiconv.patch +PATCHFILES += test-dash-e-unavailable.patch +PATCHFILES += remove-export-dynamic.patch +CMAKE_ARGS = -DSYSCONFDIR=/etc/opt/csw +CMAKE_ARGS += -DPREFIX=/opt/csw +export CMAKE_ARGS + +RUNTIME_DEP_PKGS_CSWawesome += CSWggettextrt +RUNTIME_DEP_PKGS_CSWawesome += CSWglib2 +RUNTIME_DEP_PKGS_CSWawesome += CSWiconv +RUNTIME_DEP_PKGS_CSWawesome += CSWimlib2 +RUNTIME_DEP_PKGS_CSWawesome += CSWlibcairo +RUNTIME_DEP_PKGS_CSWawesome += CSWlibdbus +RUNTIME_DEP_PKGS_CSWawesome += CSWlibev +RUNTIME_DEP_PKGS_CSWawesome += CSWlibx11 +RUNTIME_DEP_PKGS_CSWawesome += CSWlibxcb +RUNTIME_DEP_PKGS_CSWawesome += CSWlibxdgbasedir +RUNTIME_DEP_PKGS_CSWawesome += CSWlua +RUNTIME_DEP_PKGS_CSWawesome += CSWpango +RUNTIME_DEP_PKGS_CSWawesome += CSWstartupnotif +RUNTIME_DEP_PKGS_CSWawesome += CSWxcbutil + +LICENSE = LICENSE + include gar/category.mk build-awesome: @@ -38,3 +65,4 @@ @$(MAKECOOKIE) PATH := /opt/csw/gnu:$(PATH) +# PATCHFILES += turn-off-rpath-breakage.patch Modified: csw/mgar/pkg/awesome/trunk/checksums =================================================================== --- csw/mgar/pkg/awesome/trunk/checksums 2010-03-10 09:28:45 UTC (rev 9075) +++ csw/mgar/pkg/awesome/trunk/checksums 2010-03-10 11:35:45 UTC (rev 9076) @@ -1,3 +1,6 @@ 8c2537ad898d7f58a0f3ba92e6a561a1 awesome-3.4.4.tar.bz2 1d5c67eb4555b367032c1294fb72bf0b backtrace.c.patch 346c2299f6f5be4d667ff3769a1251f0 gperf.sh-solarify.patch +3186b1d530e691611c9da0443689b5e4 iconv-try-1.patch +9201583f764cb4859e6a49c883dd6672 remove-export-dynamic.patch +346d88270c8702b7f4d7ab519d7ccc07 test-dash-e-unavailable.patch Deleted: csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch =================================================================== --- csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch 2010-03-10 09:28:45 UTC (rev 9075) +++ csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch 2010-03-10 11:35:45 UTC (rev 9076) @@ -1,20 +0,0 @@ ---- awesome-3.4.4/awesomeConfig.cmake.orig 2010-03-09 18:53:40.270578634 +0100 -+++ awesome-3.4.4/awesomeConfig.cmake 2010-03-09 18:55:57.683822917 +0100 -@@ -167,6 +167,7 @@ - - # Check for libev - a_find_library(LIB_EV ev) -+a_find_library(LIB_ICONV iconv) - - # Error check - if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug -@@ -177,7 +178,8 @@ - ${AWESOME_COMMON_REQUIRED_LDFLAGS} - ${AWESOME_REQUIRED_LIBRARIES} - ${LIB_EV} -- ${LUA_LIBRARIES}) -+ ${LUA_LIBRARIES} -+ ${LIB_ICONV}) - - set(AWESOME_REQUIRED_INCLUDE_DIRS - ${AWESOME_COMMON_REQUIRED_INCLUDE_DIRS} Added: csw/mgar/pkg/awesome/trunk/files/iconv-try-1.patch =================================================================== --- csw/mgar/pkg/awesome/trunk/files/iconv-try-1.patch (rev 0) +++ csw/mgar/pkg/awesome/trunk/files/iconv-try-1.patch 2010-03-10 11:35:45 UTC (rev 9076) @@ -0,0 +1,20 @@ +--- awesome-3.4.4/awesomeConfig.cmake.orig 2010-03-09 18:53:40.270578634 +0100 ++++ awesome-3.4.4/awesomeConfig.cmake 2010-03-09 18:55:57.683822917 +0100 +@@ -167,6 +167,7 @@ + + # Check for libev + a_find_library(LIB_EV ev) ++a_find_library(LIB_ICONV iconv) + + # Error check + if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug +@@ -177,7 +178,8 @@ + ${AWESOME_COMMON_REQUIRED_LDFLAGS} + ${AWESOME_REQUIRED_LIBRARIES} + ${LIB_EV} +- ${LUA_LIBRARIES}) ++ ${LUA_LIBRARIES} ++ ${LIB_ICONV}) + + set(AWESOME_REQUIRED_INCLUDE_DIRS + ${AWESOME_COMMON_REQUIRED_INCLUDE_DIRS} Added: csw/mgar/pkg/awesome/trunk/files/remove-export-dynamic.patch =================================================================== --- csw/mgar/pkg/awesome/trunk/files/remove-export-dynamic.patch (rev 0) +++ csw/mgar/pkg/awesome/trunk/files/remove-export-dynamic.patch 2010-03-10 11:35:45 UTC (rev 9076) @@ -0,0 +1,13 @@ +--- awesome-3.4.4/CMakeLists.txt.orig 2010-03-10 11:23:26.685134271 +0100 ++++ awesome-3.4.4/CMakeLists.txt 2010-03-10 11:23:58.858789913 +0100 +@@ -93,10 +93,6 @@ + ${AWE_SRCS} + ${BUILD_DIR}/common/tokenize.c) + +-set_target_properties(${PROJECT_AWE_NAME} +- PROPERTIES +- LINK_FLAGS -export-dynamic) +- + target_link_libraries(${PROJECT_AWE_NAME} + ${AWESOME_COMMON_REQUIRED_LIBRARIES} + ${AWESOME_REQUIRED_LIBRARIES} Added: csw/mgar/pkg/awesome/trunk/files/test-dash-e-unavailable.patch =================================================================== --- csw/mgar/pkg/awesome/trunk/files/test-dash-e-unavailable.patch (rev 0) +++ csw/mgar/pkg/awesome/trunk/files/test-dash-e-unavailable.patch 2010-03-10 11:35:45 UTC (rev 9076) @@ -0,0 +1,11 @@ +--- awesome-3.4.4/Makefile.orig 2010-03-10 11:35:56.642761333 +0100 ++++ awesome-3.4.4/Makefile 2010-03-10 11:36:11.939322719 +0100 +@@ -16,7 +16,7 @@ + ln -s -f ${builddir}/$@ $@ + + $(BUILDLN): +- test -e $(BUILDLN) || ln -s -f ${builddir} $(BUILDLN) ++ test -h $(BUILDLN) || ln -s -f ${builddir} $(BUILDLN) + + cmake ${builddir}/CMakeCache.txt: + mkdir -p ${builddir} Added: csw/mgar/pkg/awesome/trunk/files/turn-off-rpath-breakage.patch =================================================================== --- csw/mgar/pkg/awesome/trunk/files/turn-off-rpath-breakage.patch (rev 0) +++ csw/mgar/pkg/awesome/trunk/files/turn-off-rpath-breakage.patch 2010-03-10 11:35:45 UTC (rev 9076) @@ -0,0 +1,10 @@ +--- awesome-3.4.4/awesomeConfig.cmake.orig 2010-03-10 12:24:06.477524567 +0100 ++++ awesome-3.4.4/awesomeConfig.cmake 2010-03-10 12:24:34.307159286 +0100 +@@ -9,6 +9,7 @@ + project(${PROJECT_AWE_NAME} C) + + set(CMAKE_BUILD_TYPE RELEASE) ++set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) + + option(WITH_DBUS "build with D-BUS" ON) + option(GENERATE_MANPAGES "generate manpages" 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 Wed Mar 10 13:18:39 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 10 Mar 2010 12:18:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9077] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 9077 http://gar.svn.sourceforge.net/gar/?rev=9077&view=rev Author: bonivart Date: 2010-03-10 12:18:39 +0000 (Wed, 10 Mar 2010) Log Message: ----------- pkgutil: update to 1.10 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2010-03-10 11:35:45 UTC (rev 9076) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2010-03-10 12:18:39 UTC (rev 9077) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.10b1 +GARVERSION = 1.10 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2010-03-10 11:35:45 UTC (rev 9076) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2010-03-10 12:18:39 UTC (rev 9077) @@ -1,8 +1,8 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec -285664f5790e1e89cce4fe027bb296b4 CSWpkgutil.postinstall +53d703bf8258a0667bb0a20dd229ce78 CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove a0e549282bf18241e4490ed6b051b92a CSWpkgutil.prototype b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py 7ad27336f90e73da3254a61d91025ee5 cswcatalog 3a6b789b3d5e05f41d2363dd26a92acf opencsw.py -0de3732c58681eeaa21ce64b252607c8 pkgutil-1.10b1.zip +58f131b1d864f48f40630dd7b3ef37c4 pkgutil-1.10.zip Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall 2010-03-10 11:35:45 UTC (rev 9076) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall 2010-03-10 12:18:39 UTC (rev 9077) @@ -25,7 +25,9 @@ fi echo +echo "NOTE!" echo "NOTE! Make sure to check out any changes in /etc/opt/csw/pkgutil.conf.CSW." +echo "NOTE!" echo 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 Wed Mar 10 13:54:53 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Mar 2010 12:54:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9078] csw/mgar/pkg/awesome/trunk Message-ID: Revision: 9078 http://gar.svn.sourceforge.net/gar/?rev=9078&view=rev Author: wahwah Date: 2010-03-10 12:54:52 +0000 (Wed, 10 Mar 2010) Log Message: ----------- awesome: Some build dependencies. Enabling a patch that stops RPATH from being stripped off during installation. Modified Paths: -------------- csw/mgar/pkg/awesome/trunk/Makefile csw/mgar/pkg/awesome/trunk/checksums Modified: csw/mgar/pkg/awesome/trunk/Makefile =================================================================== --- csw/mgar/pkg/awesome/trunk/Makefile 2010-03-10 12:18:39 UTC (rev 9077) +++ csw/mgar/pkg/awesome/trunk/Makefile 2010-03-10 12:54:52 UTC (rev 9078) @@ -24,14 +24,14 @@ EXTRA_INC = /opt/csw/X11/include EXTRA_LIB = /opt/csw/X11/lib -BUILD_DEP_PKGS += CSWlua CSWgperf CSWlibdbusdev -EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig +EXTRA_PKG_CONFIG_DIRS = /opt/csw/X11/lib PATCHFILES += gperf.sh-solarify.patch PATCHFILES += backtrace.c.patch PATCHFILES += iconv-try-1.patch # PATCHFILES += libiconv.patch PATCHFILES += test-dash-e-unavailable.patch PATCHFILES += remove-export-dynamic.patch +PATCHFILES += turn-off-rpath-breakage.patch CMAKE_ARGS = -DSYSCONFDIR=/etc/opt/csw CMAKE_ARGS += -DPREFIX=/opt/csw @@ -52,12 +52,24 @@ RUNTIME_DEP_PKGS_CSWawesome += CSWstartupnotif RUNTIME_DEP_PKGS_CSWawesome += CSWxcbutil +BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWawesome) +BUILD_DEP_PKGS += CSWcmake +BUILD_DEP_PKGS += CSWgperf +BUILD_DEP_PKGS += CSWlibdbusdev +BUILD_DEP_PKGS += CSWimagemagick +BUILD_DEP_PKGS += CSWlibcairodevel +# Enable when fixed to used gtail +# BUILD_DEP_PKGS += CSWxmlto +BUILD_DEP_PKGS += CSWxcbproto +BUILD_DEP_PKGS += CSWpyxcbproto +BUILD_DEP_PKGS += CSWlibxdmcpdevel + LICENSE = LICENSE include gar/category.mk build-awesome: - (cd $(WORKSRC); gmake $(BUILD_ENV) VERBOSE=1) + (cd $(WORKSRC); gmake $(BUILD_ENV) VERBOSE=1 $(PARALLELMFLAGS)) @$(MAKECOOKIE) install-awesome: Modified: csw/mgar/pkg/awesome/trunk/checksums =================================================================== --- csw/mgar/pkg/awesome/trunk/checksums 2010-03-10 12:18:39 UTC (rev 9077) +++ csw/mgar/pkg/awesome/trunk/checksums 2010-03-10 12:54:52 UTC (rev 9078) @@ -4,3 +4,4 @@ 3186b1d530e691611c9da0443689b5e4 iconv-try-1.patch 9201583f764cb4859e6a49c883dd6672 remove-export-dynamic.patch 346d88270c8702b7f4d7ab519d7ccc07 test-dash-e-unavailable.patch +1da2aadcbecaa05bb5ccec654fa2c8d9 turn-off-rpath-breakage.patch 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 Mar 10 14:25:21 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 10 Mar 2010 13:25:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9079] csw/mgar/pkg/xmlto/trunk/Makefile Message-ID: Revision: 9079 http://gar.svn.sourceforge.net/gar/?rev=9079&view=rev Author: bdwalton Date: 2010-03-10 13:25:21 +0000 (Wed, 10 Mar 2010) Log Message: ----------- use gtail instead of xpg4/tail; depend on textutils Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2010-03-10 12:54:52 UTC (rev 9078) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2010-03-10 13:25:21 UTC (rev 9079) @@ -7,7 +7,7 @@ RUNTIME_DEP_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds RUNTIME_DEP_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m CSWmktemp -RUNTIME_DEP_PKGS += CSWggetopt CSWbash CSWgfile +RUNTIME_DEP_PKGS += CSWggetopt CSWbash CSWgfile CSWtextutils DESCRIPTION = An XSL toolchain front end. define BLURB @@ -19,9 +19,9 @@ MASTER_SITES = https://fedorahosted.org/releases/x/m/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -# Out gcp (from the very old fileutils) spits out warnings about -P changing +# Our gcp (from the very old fileutils) spits out warnings about -P changing # meanings. xmlto is depending on the new meaning. We'll explicitly use -# the long forms of -P (--no-dereference) and -p (--presever). +# the long forms of -P (--no-dereference) and -p (--preserve). PATCHFILES = gcp-explicit-args.patch TEST_TARGET = check @@ -42,7 +42,7 @@ CONFIGURE_ARGS += BASH=/opt/csw/bin/bash CONFIGURE_ARGS += GETOPT=/opt/csw/bin/ggetopt CONFIGURE_ARGS += FIND=/opt/csw/bin/gfind -CONFIGURE_ARGS += TAIL=/usr/xpg4/bin/tail +CONFIGURE_ARGS += TAIL=/opt/csw/bin/gtail CONFIGURE_ARGS += GCP=/opt/csw/bin/gcp CONFIGURE_ARGS += MKTEMP=/opt/csw/bin/mktemp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Mar 10 14:56:49 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 10 Mar 2010 13:56:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9080] csw/mgar/pkg/pkgutil/trunk/checksums Message-ID: Revision: 9080 http://gar.svn.sourceforge.net/gar/?rev=9080&view=rev Author: bonivart Date: 2010-03-10 13:56:49 +0000 (Wed, 10 Mar 2010) Log Message: ----------- pkgutil: update checksums (new source) Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2010-03-10 13:25:21 UTC (rev 9079) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2010-03-10 13:56:49 UTC (rev 9080) @@ -5,4 +5,4 @@ b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py 7ad27336f90e73da3254a61d91025ee5 cswcatalog 3a6b789b3d5e05f41d2363dd26a92acf opencsw.py -58f131b1d864f48f40630dd7b3ef37c4 pkgutil-1.10.zip +e826e72d1e0195ad48b385df5298a98e pkgutil-1.10.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 Wed Mar 10 16:16:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Mar 2010 15:16:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[9081] csw/mgar/pkg/gtk2/trunk Message-ID: Revision: 9081 http://gar.svn.sourceforge.net/gar/?rev=9081&view=rev Author: dmichelsen Date: 2010-03-10 15:16:27 +0000 (Wed, 10 Mar 2010) Log Message: ----------- gtk2: Update to 2.19.7 Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile csw/mgar/pkg/gtk2/trunk/checksums Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2010-03-10 13:56:49 UTC (rev 9080) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2010-03-10 15:16:27 UTC (rev 9081) @@ -1,5 +1,5 @@ GARNAME = gtk2 -GARVERSION = 2.19.6 +GARVERSION = 2.19.7 CATEGORIES = lib DESCRIPTION = GTK+, the multiplatform X11 toolkit for GUI development Modified: csw/mgar/pkg/gtk2/trunk/checksums =================================================================== --- csw/mgar/pkg/gtk2/trunk/checksums 2010-03-10 13:56:49 UTC (rev 9080) +++ csw/mgar/pkg/gtk2/trunk/checksums 2010-03-10 15:16:27 UTC (rev 9081) @@ -1,2 +1,2 @@ 7ff4fdcaa073afc764af7106c0ba441c CSWgtk2.postinstall -524021c965a0e1a4ebadd58c576926a5 gtk+-2.19.6.tar.bz2 +d28d3857bc9a668e928714d8413f8b70 gtk+-2.19.7.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 10 19:18:25 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Mar 2010 18:18:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[9082] csw/mgar/pkg Message-ID: Revision: 9082 http://gar.svn.sourceforge.net/gar/?rev=9082&view=rev Author: wahwah Date: 2010-03-10 18:18:25 +0000 (Wed, 10 Mar 2010) Log Message: ----------- gxmessage: Initial commit Modified Paths: -------------- csw/mgar/pkg/gxmessage/trunk/Makefile csw/mgar/pkg/gxmessage/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gxmessage/ Modified: csw/mgar/pkg/gxmessage/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-03-10 13:25:21 UTC (rev 9079) +++ csw/mgar/pkg/gxmessage/trunk/Makefile 2010-03-10 18:18:25 UTC (rev 9082) @@ -2,184 +2,28 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = gxmessage +GARVERSION = 2.12.4 +CATEGORIES = gnome +DESCRIPTION = An xmessage clone for GTK based desktops define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://homepages.ihug.co.nz/~trmusson/programs.html +MASTER_SITES = http://homepages.ihug.co.nz/~trmusson/stuff/ +MASTER_SITES += http://ftp.gnu.org/pub/gnu/gxmessage/ 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 -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +RUNTIME_DEP_PKGS_CSWgxmessage += CSWfconfig +RUNTIME_DEP_PKGS_CSWgxmessage += CSWftype2 +RUNTIME_DEP_PKGS_CSWgxmessage += CSWggettextrt +RUNTIME_DEP_PKGS_CSWgxmessage += CSWglib2 +RUNTIME_DEP_PKGS_CSWgxmessage += CSWgtk2 +RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibatk +RUNTIME_DEP_PKGS_CSWgxmessage += CSWlibcairo +RUNTIME_DEP_PKGS_CSWgxmessage += CSWpango +include gar/category.mk -#include gar/category.mk +# Otherwise it keeps finding /usr/bin/xgettext and failing. +PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/gxmessage/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-03-10 13:25:21 UTC (rev 9079) +++ csw/mgar/pkg/gxmessage/trunk/checksums 2010-03-10 18:18:25 UTC (rev 9082) @@ -0,0 +1 @@ +7c94c714ebedbfa2db2d645cc4a4092a gxmessage-2.12.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wrightru at users.sourceforge.net Wed Mar 10 19:54:53 2010 From: wrightru at users.sourceforge.net (wrightru at users.sourceforge.net) Date: Wed, 10 Mar 2010 18:54:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9083] csw/mgar/pkg/ganglia/branches/ganglia-3.1.7 Message-ID: Revision: 9083 http://gar.svn.sourceforge.net/gar/?rev=9083&view=rev Author: wrightru Date: 2010-03-10 18:54:53 +0000 (Wed, 10 Mar 2010) Log Message: ----------- Upgraded package to 3.1.7 status Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/Makefile csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/checksums Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/Makefile =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/Makefile 2010-03-10 18:18:25 UTC (rev 9082) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/Makefile 2010-03-10 18:54:53 UTC (rev 9083) @@ -1,5 +1,5 @@ GARNAME = ganglia -GARVERSION = 3.1.6 +GARVERSION = 3.1.7 CATEGORIES = utils # How should we set this? @@ -109,6 +109,9 @@ ifeq ($(GARVERSION),3.1.6) TEST_SCRIPTS = endif +ifeq ($(GARVERSION),3.1.7) +TEST_SCRIPTS = +endif INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/checksums =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/checksums 2010-03-10 18:18:25 UTC (rev 9082) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/checksums 2010-03-10 18:54:53 UTC (rev 9083) @@ -2,5 +2,5 @@ c4c333a46db391464e372ad8ede4993c CSWgangliaweb.preremove 25d302948e25837bf17757d5e23e4955 cswgmetad c6bb96c949dbb989d06ebb36b6af885d cswgmond -39134ccba646fce6979958bf9c0fc8d7 ganglia-3.1.6.tar.gz +6aa5e2109c2cc8007a6def0799cf1b4c ganglia-3.1.7.tar.gz 2ff504ecb546aca2cdd6ee09af9a417e httpd-ganglia.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 10 20:42:41 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Mar 2010 19:42:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9084] csw/mgar/pkg/libxdg-basedir/trunk/Makefile Message-ID: Revision: 9084 http://gar.svn.sourceforge.net/gar/?rev=9084&view=rev Author: wahwah Date: 2010-03-10 19:42:41 +0000 (Wed, 10 Mar 2010) Log Message: ----------- libxdg-basedir: Setting sysconfdir and localstatedir. Modified Paths: -------------- csw/mgar/pkg/libxdg-basedir/trunk/Makefile Modified: csw/mgar/pkg/libxdg-basedir/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxdg-basedir/trunk/Makefile 2010-03-10 18:54:53 UTC (rev 9083) +++ csw/mgar/pkg/libxdg-basedir/trunk/Makefile 2010-03-10 19:42:41 UTC (rev 9084) @@ -23,5 +23,7 @@ PACKAGES = CSWlibxdgbasedir CATALOGNAME = libxdg_basedir TEST_SCRIPTS = +sysconfdir = /etc$(prefix) +localstatedir = /var$(prefix) 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 wahwah at users.sourceforge.net Wed Mar 10 20:49:06 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Mar 2010 19:49:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9085] csw/mgar/pkg/libxdg-basedir/trunk/Makefile Message-ID: Revision: 9085 http://gar.svn.sourceforge.net/gar/?rev=9085&view=rev Author: wahwah Date: 2010-03-10 19:49:06 +0000 (Wed, 10 Mar 2010) Log Message: ----------- libxdg-basedir: Building for 64-bits too. Capitalizing the description. Modified Paths: -------------- csw/mgar/pkg/libxdg-basedir/trunk/Makefile Modified: csw/mgar/pkg/libxdg-basedir/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxdg-basedir/trunk/Makefile 2010-03-10 19:42:41 UTC (rev 9084) +++ csw/mgar/pkg/libxdg-basedir/trunk/Makefile 2010-03-10 19:49:06 UTC (rev 9085) @@ -5,7 +5,7 @@ GARNAME = libxdg-basedir GARVERSION = 1.0.2 CATEGORIES = lib -DESCRIPTION = implements functions according to the XDG Base Directory Specification +DESCRIPTION = Implements functions according to the XDG Base Directory Specification define BLURB The XDG Base Directory Specification defines where should user files be @@ -26,4 +26,5 @@ sysconfdir = /etc$(prefix) localstatedir = /var$(prefix) CONFIGURE_ARGS = $(DIRPATHS) +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 wahwah at users.sourceforge.net Wed Mar 10 21:14:15 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Mar 2010 20:14:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9086] csw/mgar/pkg/libxdg-basedir/trunk Message-ID: Revision: 9086 http://gar.svn.sourceforge.net/gar/?rev=9086&view=rev Author: wahwah Date: 2010-03-10 20:14:15 +0000 (Wed, 10 Mar 2010) Log Message: ----------- libxdg-basedir: Turns out that the configuration arguments don't do a thing. Patching the source to use OpenCSW directories. Also enabling tests (which thankfully pass). Modified Paths: -------------- csw/mgar/pkg/libxdg-basedir/trunk/Makefile csw/mgar/pkg/libxdg-basedir/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libxdg-basedir/trunk/files/opencsw-paths.patch Modified: csw/mgar/pkg/libxdg-basedir/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxdg-basedir/trunk/Makefile 2010-03-10 19:49:06 UTC (rev 9085) +++ csw/mgar/pkg/libxdg-basedir/trunk/Makefile 2010-03-10 20:14:15 UTC (rev 9086) @@ -22,9 +22,13 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWlibxdgbasedir CATALOGNAME = libxdg_basedir -TEST_SCRIPTS = -sysconfdir = /etc$(prefix) -localstatedir = /var$(prefix) +TEST_TARGET = check +# These settings do not do anything. xdg-basedir has the paths hardcoded in +# basedir.c, there's a separate patch for it. +# sysconfdir = /etc$(prefix) +# localstatedir = /var$(prefix) +# CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 1 +PATCHFILES += opencsw-paths.patch include gar/category.mk Modified: csw/mgar/pkg/libxdg-basedir/trunk/checksums =================================================================== --- csw/mgar/pkg/libxdg-basedir/trunk/checksums 2010-03-10 19:49:06 UTC (rev 9085) +++ csw/mgar/pkg/libxdg-basedir/trunk/checksums 2010-03-10 20:14:15 UTC (rev 9086) @@ -1 +1,2 @@ -944202425e5359666f268d18671303d4 download/libxdg-basedir-1.0.2.tar.gz +944202425e5359666f268d18671303d4 libxdg-basedir-1.0.2.tar.gz +8cb87bb30e60d569db6d96c7dec17ee2 opencsw-paths.patch Added: csw/mgar/pkg/libxdg-basedir/trunk/files/opencsw-paths.patch =================================================================== --- csw/mgar/pkg/libxdg-basedir/trunk/files/opencsw-paths.patch (rev 0) +++ csw/mgar/pkg/libxdg-basedir/trunk/files/opencsw-paths.patch 2010-03-10 20:14:15 UTC (rev 9086) @@ -0,0 +1,14 @@ +--- libxdg-basedir-1.0.2/src/basedir.c.orig 2010-03-10 21:04:10.463085037 +0100 ++++ libxdg-basedir-1.0.2/src/basedir.c 2010-03-10 21:05:03.056021665 +0100 +@@ -90,9 +90,9 @@ + static const char + DefaultRelativeDataHome[] = DIR_SEPARATOR_STR ".local" DIR_SEPARATOR_STR "share", + DefaultRelativeConfigHome[] = DIR_SEPARATOR_STR ".config", +- DefaultDataDirectories1[] = DIR_SEPARATOR_STR "usr" DIR_SEPARATOR_STR "local" DIR_SEPARATOR_STR "share", ++ DefaultDataDirectories1[] = DIR_SEPARATOR_STR "opt" DIR_SEPARATOR_STR "csw" DIR_SEPARATOR_STR "share", + DefaultDataDirectories2[] = DIR_SEPARATOR_STR "usr" DIR_SEPARATOR_STR "share", +- DefaultConfigDirectories[] = DIR_SEPARATOR_STR "etc" DIR_SEPARATOR_STR "xdg", ++ DefaultConfigDirectories[] = DIR_SEPARATOR_STR "etc" DIR_SEPARATOR_STR "opt" DIR_SEPARATOR_STR "csw" DIR_SEPARATOR_STR "xdg", + DefaultRelativeCacheHome[] = DIR_SEPARATOR_STR ".cache"; + + static const char This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Mar 11 04:42:14 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 11 Mar 2010 03:42:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[9087] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 9087 http://gar.svn.sourceforge.net/gar/?rev=9087&view=rev Author: rthurner Date: 2010-03-11 03:42:14 +0000 (Thu, 11 Mar 2010) Log Message: ----------- svn-1.6.9 - re-enable tests Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-03-10 20:14:15 UTC (rev 9086) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-03-11 03:42:14 UTC (rev 9087) @@ -202,7 +202,7 @@ # $(WORKSRC)/subversion/tests/cmdline/merge_tests.py --list # and for progress information you could compare this with # tail -f $(WORKSRC)/tests.log | grep merge_tests.py -TEST_TARGET = #check +TEST_TARGET = check # Overrides CHECKPKG_OVERRIDES_CSWap2svn = symbol-not-found 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 Mar 11 09:29:19 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Mar 2010 08:29:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9088] csw/mgar/pkg/poppler/trunk Message-ID: Revision: 9088 http://gar.svn.sourceforge.net/gar/?rev=9088&view=rev Author: wahwah Date: 2010-03-11 08:29:19 +0000 (Thu, 11 Mar 2010) Log Message: ----------- poppler: Add a stupid patch to work around an #include problem. http://lists.opencsw.org/pipermail/maintainers/2010-March/011546.html Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile csw/mgar/pkg/poppler/trunk/checksums Added Paths: ----------- csw/mgar/pkg/poppler/trunk/files/missing-includes.patch Property Changed: ---------------- csw/mgar/pkg/poppler/trunk/Makefile Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2010-03-11 03:42:14 UTC (rev 9087) +++ csw/mgar/pkg/poppler/trunk/Makefile 2010-03-11 08:29:19 UTC (rev 9088) @@ -1,28 +1,34 @@ +# $Id$ + GARNAME = poppler -GARVERSION = 0.10.6 +GARVERSION = 0.12.4 CATEGORIES = lib DESCRIPTION = Poppler is a PDF rendering library based on the xpdf-3.0 code base define BLURB endef +SPKG_SOURCEURL = http://poppler.freedesktop.org/ 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 +PATCHFILES += missing-includes.patch # 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 = +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -RUNTIME_DEP_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 -RUNTIME_DEP_PKGS += CSWjpeg CSWlibxml2 CSWzlib +RUNTIME_DEP_PKGS += CSWfconfig +RUNTIME_DEP_PKGS += CSWftype2 +RUNTIME_DEP_PKGS += CSWggettextrt +RUNTIME_DEP_PKGS += CSWglib2 +RUNTIME_DEP_PKGS += CSWjpeg +RUNTIME_DEP_PKGS += CSWlibxml2 +RUNTIME_DEP_PKGS += CSWzlib -SPKG_SOURCEURL = http://poppler.freedesktop.org/ - include gar/category.mk Property changes on: csw/mgar/pkg/poppler/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/poppler/trunk/checksums =================================================================== --- csw/mgar/pkg/poppler/trunk/checksums 2010-03-11 03:42:14 UTC (rev 9087) +++ csw/mgar/pkg/poppler/trunk/checksums 2010-03-11 08:29:19 UTC (rev 9088) @@ -1 +1,2 @@ -e1a2d98ba5a4199f20d7637a7d79a829 download/poppler-0.10.6.tar.gz +bf4abf5006e4a812d00567eeea42faaa missing-includes.patch +4155346f9369b192569ce9184ff73e43 poppler-0.12.4.tar.gz Added: csw/mgar/pkg/poppler/trunk/files/missing-includes.patch =================================================================== --- csw/mgar/pkg/poppler/trunk/files/missing-includes.patch (rev 0) +++ csw/mgar/pkg/poppler/trunk/files/missing-includes.patch 2010-03-11 08:29:19 UTC (rev 9088) @@ -0,0 +1,17 @@ +--- poppler-0.12.4/goo/gstrtod.cc.orig 2010-03-11 09:12:33.246797323 +0100 ++++ poppler-0.12.4/goo/gstrtod.cc 2010-03-11 09:13:57.881353247 +0100 +@@ -22,10 +22,10 @@ + + #include "gstrtod.h" + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #define ascii_isspace(c) \ + (c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v') 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 Mar 11 09:34:46 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Mar 2010 08:34:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9089] csw/mgar/pkg/Makefile Message-ID: Revision: 9089 http://gar.svn.sourceforge.net/gar/?rev=9089&view=rev Author: wahwah Date: 2010-03-11 08:34:46 +0000 (Thu, 11 Mar 2010) Log Message: ----------- gmake newpkg-%: Adding the Id tag and setting the Id property by default. Modified Paths: -------------- csw/mgar/pkg/Makefile Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2010-03-11 08:29:19 UTC (rev 9088) +++ csw/mgar/pkg/Makefile 2010-03-11 08:34:46 UTC (rev 9089) @@ -64,7 +64,8 @@ newpkg-%: @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files - @(echo "GARNAME = $*"; \ + @(echo "# $$Id$$"; \ + echo "GARNAME = $*"; \ echo "GARVERSION = 1.0"; \ echo "CATEGORIES = category"; \ echo ""; \ @@ -76,7 +77,7 @@ echo "MASTER_SITES = "; \ echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ echo ""; \ - echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "# File name regex to get notifications about upstream software releases"; \ 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 "; \ @@ -89,6 +90,7 @@ ) > $*/trunk/Makefile @touch $*/trunk/checksums @svn add $*/trunk/Makefile $*/trunk/checksums + @svn ps svn:keywords Id $*/trunk/Makefile @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 @if [ -d ../gar/v2 ]; then \ 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 Mar 11 10:03:29 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Mar 2010 09:03:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9090] csw/mgar/pkg/lcms/trunk/Makefile Message-ID: Revision: 9090 http://gar.svn.sourceforge.net/gar/?rev=9090&view=rev Author: wahwah Date: 2010-03-11 09:03:28 +0000 (Thu, 11 Mar 2010) Log Message: ----------- lcms: Disable Python in the 64-bit modulation. Modified Paths: -------------- csw/mgar/pkg/lcms/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/lcms/trunk/Makefile Modified: csw/mgar/pkg/lcms/trunk/Makefile =================================================================== --- csw/mgar/pkg/lcms/trunk/Makefile 2010-03-11 08:34:46 UTC (rev 9089) +++ csw/mgar/pkg/lcms/trunk/Makefile 2010-03-11 09:03:28 UTC (rev 9090) @@ -1,3 +1,5 @@ +# $Id$ + GARNAME = lcms GARVERSION = 1.19 GARSUBREV = @@ -35,15 +37,7 @@ RUNTIME_DEP_PKGS_CSWlcmsdevel += CSWlcmsrt RUNTIME_DEP_PKGS_CSWpy-lcms += CSWlcmsrt CSWpython -CHECKPKG_OVERRIDES_CSWlcms += symbol-not-found|icclink -CHECKPKG_OVERRIDES_CSWlcms += symbol-not-found|tiffdiff -CHECKPKG_OVERRIDES_CSWlcms += symbol-not-found|icc2ps -CHECKPKG_OVERRIDES_CSWlcms += symbol-not-found|tifficc -CHECKPKG_OVERRIDES_CSWlcms += symbol-not-found|wtpt -CHECKPKG_OVERRIDES_CSWlcms += symbol-not-found|jpegicc -CHECKPKG_OVERRIDES_CSWlcms += symbol-not-found|icctrans CHECKPKG_OVERRIDES_CSWlcmsdevel += missing-dependency|CSWlcms -CHECKPKG_OVERRIDES_CSWpy-lcms += symbol-not-found|_lcms.so PKGFILES_CSWlcmsrt = $(PKGFILES_RT) PKGFILES_CSWlcmsdevel = $(PKGFILES_DEVEL) @@ -57,9 +51,13 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-static=no -CONFIGURE_ARGS += --with-python +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static=no +CONFIGURE_ARGS_isa-sparcv8 += --with-python +CONFIGURE_ARGS_isa-i386 += --with-python +CONFIGURE_ARGS_isa-sparcv9 += --without-python +CONFIGURE_ARGS_isa-amd64 += --without-python +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) BUILD64 = 1 Property changes on: csw/mgar/pkg/lcms/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Mar 11 12:58:51 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 11 Mar 2010 11:58:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[9091] csw/mgar/pkg Message-ID: Revision: 9091 http://gar.svn.sourceforge.net/gar/?rev=9091&view=rev Author: hson Date: 2010-03-11 11:58:51 +0000 (Thu, 11 Mar 2010) Log Message: ----------- poppler-data: Initial commit Added Paths: ----------- csw/mgar/pkg/poppler-data/ csw/mgar/pkg/poppler-data/Makefile csw/mgar/pkg/poppler-data/branches/ csw/mgar/pkg/poppler-data/tags/ csw/mgar/pkg/poppler-data/trunk/ csw/mgar/pkg/poppler-data/trunk/Makefile csw/mgar/pkg/poppler-data/trunk/checksums csw/mgar/pkg/poppler-data/trunk/files/ Added: csw/mgar/pkg/poppler-data/Makefile =================================================================== --- csw/mgar/pkg/poppler-data/Makefile (rev 0) +++ csw/mgar/pkg/poppler-data/Makefile 2010-03-11 11:58:51 UTC (rev 9091) @@ -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) Property changes on: csw/mgar/pkg/poppler-data/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-data/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler-data/trunk/Makefile (rev 0) +++ csw/mgar/pkg/poppler-data/trunk/Makefile 2010-03-11 11:58:51 UTC (rev 9091) @@ -0,0 +1,30 @@ +GARNAME = poppler-data +GARVERSION = 0.4.0 +CATEGORIES = lib + +DESCRIPTION = Poppler is a PDF rendering library based on the xpdf-3.0 code base +define BLURB +endef + +PACKAGES = CSWpopplerdata +CATALOGNAME_CSWpopplerdata = poppler_data + +MASTER_SITES = http://poppler.freedesktop.org/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# UPSTREAM_MASTER_SITES = + +ARCHALL = 1 + +SPKG_SOURCEURL = http://poppler.freedesktop.org/ + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_ARGS = "prefix=$(prefix)" + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/poppler-data/trunk/checksums =================================================================== --- csw/mgar/pkg/poppler-data/trunk/checksums (rev 0) +++ csw/mgar/pkg/poppler-data/trunk/checksums 2010-03-11 11:58:51 UTC (rev 9091) @@ -0,0 +1 @@ +6975bf8e9ea2cfb42b9ecdbcc257cf57 poppler-data-0.4.0.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 Mar 11 14:59:10 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 11 Mar 2010 13:59:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9092] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 9092 http://gar.svn.sourceforge.net/gar/?rev=9092&view=rev Author: bonivart Date: 2010-03-11 13:59:10 +0000 (Thu, 11 Mar 2010) Log Message: ----------- clamav: testing 0.96rc1 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2010-03-11 11:58:51 UTC (rev 9091) +++ csw/mgar/pkg/clamav/trunk/Makefile 2010-03-11 13:59:10 UTC (rev 9092) @@ -1,5 +1,5 @@ GARNAME = clamav -GARVERSION = 0.95.3 +GARVERSION = 0.96rc1 #DISTNAME = $(GARNAME)-devel-latest CATEGORIES = apps @@ -24,15 +24,12 @@ CATALOGNAME_CSWlibclamav = libclamav SPKG_DESC_CSWlibclamav = $(DESCRIPTION) Library -RUNTIME_DEP_PKGS_CSWclamav = CSWlibclamav CSWzlib CSWbzip2 CSWiconv CSWcswclassutils CSWncurses CSWlibtoolrt +RUNTIME_DEP_PKGS_CSWclamav = CSWlibclamav CSWzlib CSWbzip2 CSWiconv CSWncurses CSWlibtoolrt RUNTIME_DEP_PKGS_CSWlibclamav = CSWzlib CSWbzip2 CSWiconv CSWlibtoolrt # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# add usergroup class -SPKG_CLASSES_CSWclamav = none cswusergroup ugfiles cswcpsampleconf cswinitsmf - PATCHFILES = CSWclamav.freshclam.conf.p PATCHFILES += CSWclamav.clamd.conf.p @@ -41,6 +38,8 @@ # New bug filed since the above one isn't really solved, no bug id yet OPT_FLAGS_SOS = -xO2 +sysconfdir = /etc/opt/csw + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-clamav CONFIGURE_ARGS += --enable-milter @@ -54,23 +53,26 @@ PKGFILES_CSWlibclamav += $(includedir)/.* PKGFILES_CSWlibclamav += $(docdir)/libclamav/.* -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/init.d\/cswclamd$$$$/ { $$$$2 = "cswinitsmf" } \ - $$$$3 ~ /\/init.d\/cswclamav-milter$$$$/ { $$$$2 = "cswinitsmf" } \ - $$$$3 ~ /\/clamd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - $$$$3 ~ /\/clamav-milter.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - $$$$3 ~ /\/freshclam.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - $$$$3 ~ /\/var\/opt\/csw\/clamav/ { $$$$5 = "clamav" ; $$$$2 = "ugfiles" } \ - $$$$3 ~ /\/opt\/csw\/etc\/CSWclamav\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } \ - { print }' +PROTOTYPE_MODIFIERS = 1 +PROTOTYPE_FILES_1 = \/var\/opt\/csw\/clamav.* +PROTOTYPE_CLASS_1 = ugfiles +PROTOTYPE_USER_1 = clamav +INITSMF = /etc/opt/csw/init.d/cswclamd +INITSMF += /etc/opt/csw/init.d/cswclamav-milter +SAMPLECONF = /etc/opt/csw/clamd.conf +SAMPLECONF += /etc/opt/csw/clamav-milter.conf +SAMPLECONF += /etc/opt/csw/freshclam.conf +USERGROUP = /etc/opt/csw/pkg/CSWclamav/cswusergroup + +MIGRATE_FILES_CSWclamav = clamd.conf clamav-milter.conf freshclam.conf +MIGRATE_SOURCE_DIR_CSWclamav = /opt/csw/etc +MIGRATE_DEST_DIR_CSWclamav = /etc/opt/csw + SPKG_SOURCEURL = http://www.clamav.net TEST_TARGET = check -# can not run checkpkg due to libs in separate package -#ENABLE_CHECK=0 - include gar/category.mk DOCS = AUTHORS BUGS ChangeLog @@ -87,18 +89,15 @@ @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamd $(DESTDIR)/etc/opt/csw/init.d/cswclamd @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamav-milter $(DESTDIR)/etc/opt/csw/init.d/cswclamav-milter - @mv $(DESTDIR)$(sysconfdir)/clamd.conf $(DESTDIR)$(sysconfdir)/clamd.conf.CSW - @mv $(DESTDIR)$(sysconfdir)/freshclam.conf $(DESTDIR)$(sysconfdir)/freshclam.conf.CSW - @mv $(DESTDIR)$(sysconfdir)/clamav-milter.conf $(DESTDIR)$(sysconfdir)/clamav-milter.conf.CSW - @ginstall -d $(DESTDIR)$(sysconfdir)/CSWclamav - @ginstall -m 644 $(FILEDIR)/CSWclamav.cswusergroup $(DESTDIR)$(sysconfdir)/CSWclamav/cswusergroup + @ginstall -d $(DESTDIR)$(sysconfdir)/pkg/CSWclamav + @ginstall -m 644 $(FILEDIR)/CSWclamav.cswusergroup $(DESTDIR)$(sysconfdir)/pkg/CSWclamav/cswusergroup @ginstall -d $(DOCDEST) @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) @ginstall -m 644 $(FILEDIR)/CSWclamav.INSTALL.clamav-milter.CSW $(DOCDEST)/INSTALL.clamav-milter.CSW @ginstall -m 644 $(FILEDIR)/CSWclamav.README.CSW $(DOCDEST)/README.CSW @ginstall -d $(DOCDEST)/contrib - @ginstall -m 644 $(WORKSRC)/contrib/clamdwatch/* $(DOCDEST)/contrib - @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(DOCDEST)/contrib +# @ginstall -m 644 $(WORKSRC)/contrib/clamdwatch/* $(DOCDEST)/contrib +# @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(DOCDEST)/contrib @ginstall -d $(DOCDEST)/html @ginstall -m 644 $(WORKSRC)/docs/html/* $(DOCDEST)/html @$(MAKECOOKIE) Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2010-03-11 11:58:51 UTC (rev 9091) +++ csw/mgar/pkg/clamav/trunk/checksums 2010-03-11 13:59:10 UTC (rev 9092) @@ -1,3 +1,3 @@ 83ab77147b8ff549a371e1042526102c CSWclamav.clamd.conf.p 6c37b881661bf28741bb69045a642790 CSWclamav.freshclam.conf.p -eaf9fccc3cc3567605a9732313652967 clamav-0.95.3.tar.gz +6cb3a716f06f00c73def71aa72ff5f41 clamav-0.96rc1.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 Mar 11 15:24:01 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Mar 2010 14:24:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[9093] csw/mgar/pkg/gtar/trunk Message-ID: Revision: 9093 http://gar.svn.sourceforge.net/gar/?rev=9093&view=rev Author: dmichelsen Date: 2010-03-11 14:24:01 +0000 (Thu, 11 Mar 2010) Log Message: ----------- gtar: Update to 1.23 Modified Paths: -------------- csw/mgar/pkg/gtar/trunk/Makefile csw/mgar/pkg/gtar/trunk/checksums Modified: csw/mgar/pkg/gtar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtar/trunk/Makefile 2010-03-11 13:59:10 UTC (rev 9092) +++ csw/mgar/pkg/gtar/trunk/Makefile 2010-03-11 14:24:01 UTC (rev 9093) @@ -1,5 +1,5 @@ GARNAME = tar -GARVERSION = 1.22 +GARVERSION = 1.23 CATEGORIES = utils DESCRIPTION = GNU tape archiver Modified: csw/mgar/pkg/gtar/trunk/checksums =================================================================== --- csw/mgar/pkg/gtar/trunk/checksums 2010-03-11 13:59:10 UTC (rev 9092) +++ csw/mgar/pkg/gtar/trunk/checksums 2010-03-11 14:24:01 UTC (rev 9093) @@ -1 +1 @@ -efafad1b256e3de410f4fce5335d9c9d download/tar-1.22.tar.gz +fe81d950b61cb2f45619e1fcef97ce60 tar-1.23.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 Thu Mar 11 16:55:55 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 11 Mar 2010 15:55:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[9094] csw/mgar/pkg/poppler/branches Message-ID: Revision: 9094 http://gar.svn.sourceforge.net/gar/?rev=9094&view=rev Author: hson Date: 2010-03-11 15:55:54 +0000 (Thu, 11 Mar 2010) Log Message: ----------- poppler: Create branch for 0.10.6 in able to release it and keep working on 0.12.x Modified Paths: -------------- csw/mgar/pkg/poppler/branches/0.10.6/Makefile csw/mgar/pkg/poppler/branches/0.10.6/checksums Added Paths: ----------- csw/mgar/pkg/poppler/branches/0.10.6/ csw/mgar/pkg/poppler/branches/0.10.6/files/old_libs_i386.tar.bz2 csw/mgar/pkg/poppler/branches/0.10.6/files/old_libs_sparc.tar.bz2 Modified: csw/mgar/pkg/poppler/branches/0.10.6/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2010-03-11 09:03:28 UTC (rev 9090) +++ csw/mgar/pkg/poppler/branches/0.10.6/Makefile 2010-03-11 15:55:54 UTC (rev 9094) @@ -1,7 +1,7 @@ # $Id$ GARNAME = poppler -GARVERSION = 0.12.4 +GARVERSION = 0.10.6 CATEGORIES = lib DESCRIPTION = Poppler is a PDF rendering library based on the xpdf-3.0 code base @@ -11,24 +11,40 @@ SPKG_SOURCEURL = http://poppler.freedesktop.org/ MASTER_SITES = http://poppler.freedesktop.org/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += old_libs_i386.tar.bz2 +DISTFILES += old_libs_sparc.tar.bz2 -PATCHFILES += missing-includes.patch +RUNTIME_DEP_PKGS_CSWpoppler += CSWgtk2 +RUNTIME_DEP_PKGS_CSWpoppler += CSWiconv +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibcairo +RUNTIME_DEP_PKGS_CSWpoppler += CSWpango +RUNTIME_DEP_PKGS_CSWpoppler += CSWzlib +RUNTIME_DEP_PKGS_CSWpoppler += CSWfconfig +RUNTIME_DEP_PKGS_CSWpoppler += CSWftype2 +RUNTIME_DEP_PKGS_CSWpoppler += CSWggettextrt +RUNTIME_DEP_PKGS_CSWpoppler += CSWglib2 +RUNTIME_DEP_PKGS_CSWpoppler += CSWjpeg +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibxml2 -# 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 +#PATCHFILES += missing-includes.patch + # UPSTREAM_MASTER_SITES = UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz BUILD64 = 1 +# Fix for making sure libtool doesn't pick up libpoppler.so from /opt/csw/lib +# when relinking libpoppler-glib during install phaze +EXTRA_SOS_LD_FLAGS += -L$(abspath $(WORKSRC)/poppler/.libs) + CONFIGURE_ARGS = $(DIRPATHS) -RUNTIME_DEP_PKGS += CSWfconfig -RUNTIME_DEP_PKGS += CSWftype2 -RUNTIME_DEP_PKGS += CSWggettextrt -RUNTIME_DEP_PKGS += CSWglib2 -RUNTIME_DEP_PKGS += CSWjpeg -RUNTIME_DEP_PKGS += CSWlibxml2 -RUNTIME_DEP_PKGS += CSWzlib +include gar/category.mk -include gar/category.mk +post-install-isa-sparcv8: + (cd $(INSTALLISADIR)$(libdir);bzip2 -dc $(CURDIR)/$(DOWNLOADDIR)/old_libs_sparc.tar.bz2|tar xf -) + $(MAKECOOKIE) + +post-install-isa-i386: + (cd $(INSTALLISADIR)$(libdir);bzip2 -dc $(CURDIR)/$(DOWNLOADDIR)/old_libs_i386.tar.bz2|tar xf -) + $(MAKECOOKIE) Modified: csw/mgar/pkg/poppler/branches/0.10.6/checksums =================================================================== --- csw/mgar/pkg/poppler/trunk/checksums 2010-03-11 09:03:28 UTC (rev 9090) +++ csw/mgar/pkg/poppler/branches/0.10.6/checksums 2010-03-11 15:55:54 UTC (rev 9094) @@ -1,2 +1,3 @@ -bf4abf5006e4a812d00567eeea42faaa missing-includes.patch -4155346f9369b192569ce9184ff73e43 poppler-0.12.4.tar.gz +776b02d90c238f08b9a8900d8e4a2580 old_libs_i386.tar.bz2 +eabd006c9b65bac874297157c8b774cb old_libs_sparc.tar.bz2 +e1a2d98ba5a4199f20d7637a7d79a829 poppler-0.10.6.tar.gz Added: csw/mgar/pkg/poppler/branches/0.10.6/files/old_libs_i386.tar.bz2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/poppler/branches/0.10.6/files/old_libs_i386.tar.bz2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/poppler/branches/0.10.6/files/old_libs_sparc.tar.bz2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/poppler/branches/0.10.6/files/old_libs_sparc.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 bensons at users.sourceforge.net Thu Mar 11 17:56:32 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Thu, 11 Mar 2010 16:56:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9095] csw/mgar/pkg/cpan Message-ID: Revision: 9095 http://gar.svn.sourceforge.net/gar/?rev=9095&view=rev Author: bensons Date: 2010-03-11 16:56:29 +0000 (Thu, 11 Mar 2010) Log Message: ----------- DBD-DB2: initial GAR recipe Added Paths: ----------- csw/mgar/pkg/cpan/DBD-DB2/ csw/mgar/pkg/cpan/DBD-DB2/branches/ csw/mgar/pkg/cpan/DBD-DB2/tags/ csw/mgar/pkg/cpan/DBD-DB2/trunk/ csw/mgar/pkg/cpan/DBD-DB2/trunk/Makefile csw/mgar/pkg/cpan/DBD-DB2/trunk/checksums csw/mgar/pkg/cpan/DBD-DB2/trunk/files/ Property changes on: csw/mgar/pkg/cpan/DBD-DB2/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/DBD-DB2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-DB2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/DBD-DB2/trunk/Makefile 2010-03-11 16:56:29 UTC (rev 9095) @@ -0,0 +1,24 @@ +GARNAME = DBD-DB2 +GARVERSION = 1.78 +CATEGORIES = cpan +AUTHOR = IBMTORDB2 + +DESCRIPTION = DataBase Driver for DB2 UDB +define BLURB + DBD::DB2 is a Perl5 module which when used in conjunction with DBI + allows Perl5 to communicate with IBM's DB2 Universal Database. + In the generic sense, most of the functionality provided by any of the + available DBDs is accessed indirectly through the DBI. +endef + +CATALOGNAME = pm_dbddb2 +PACKAGES = CSWpmdbddb2 + +DB2_HOME = /opt/IBM/db2/V9 +EXTRA_LIB = $(DB2_HOME)/lib32 +LICENSE = LICENSE + +include gar/category.mk + +CONFIGURE_ENV += DB2_HOME=$(DB2_HOME) +CONFIGURE_ENV += DB2LIB=$(DB2_HOME)/lib32 Added: csw/mgar/pkg/cpan/DBD-DB2/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DBD-DB2/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/DBD-DB2/trunk/checksums 2010-03-11 16:56:29 UTC (rev 9095) @@ -0,0 +1 @@ +ef30eb14d00edcbdcc11587a4dba8a7c DBD-DB2-1.78.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 Mar 11 23:12:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Mar 2010 22:12:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[9097] csw/mgar/pkg/cpan/POE-Test-Loops/trunk/checksums Message-ID: Revision: 9097 http://gar.svn.sourceforge.net/gar/?rev=9097&view=rev Author: dmichelsen Date: 2010-03-11 22:12:35 +0000 (Thu, 11 Mar 2010) Log Message: ----------- cpan/POE-Test-Loops: Update checksum Modified Paths: -------------- csw/mgar/pkg/cpan/POE-Test-Loops/trunk/checksums Modified: csw/mgar/pkg/cpan/POE-Test-Loops/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/POE-Test-Loops/trunk/checksums 2010-03-11 22:12:03 UTC (rev 9096) +++ csw/mgar/pkg/cpan/POE-Test-Loops/trunk/checksums 2010-03-11 22:12:35 UTC (rev 9097) @@ -1 +1,2 @@ +cddd7c392e43f3a1acb8342d9051be64 COPYING f109a514da1d002cab60966ed304bbb7 POE-Test-Loops-1.033.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 Mar 11 23:12:03 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Mar 2010 22:12:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[9096] csw/mgar/pkg/cpan/POE-Test-Loops/trunk Message-ID: Revision: 9096 http://gar.svn.sourceforge.net/gar/?rev=9096&view=rev Author: dmichelsen Date: 2010-03-11 22:12:03 +0000 (Thu, 11 Mar 2010) Log Message: ----------- cpan/POE-Test-Loops: Update to 1.033 Modified Paths: -------------- csw/mgar/pkg/cpan/POE-Test-Loops/trunk/Makefile csw/mgar/pkg/cpan/POE-Test-Loops/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/POE-Test-Loops/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/POE-Test-Loops/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/POE-Test-Loops/trunk/Makefile 2010-03-11 16:56:29 UTC (rev 9095) +++ csw/mgar/pkg/cpan/POE-Test-Loops/trunk/Makefile 2010-03-11 22:12:03 UTC (rev 9096) @@ -1,15 +1,17 @@ GARNAME = POE-Test-Loops -GARVERSION = 1.005 +GARVERSION = 1.033 CATEGORIES = cpan AUTHOR = RCAPUTO DESCRIPTION = Reusable tests for POE::Loop authors define BLURB - Long description endef +DISTFILES = COPYING + PACKAGES = CSWpoetestloops CATALOGNAME = pm_poetestloops + ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/POE-Test-Loops/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/POE-Test-Loops/trunk/checksums 2010-03-11 16:56:29 UTC (rev 9095) +++ csw/mgar/pkg/cpan/POE-Test-Loops/trunk/checksums 2010-03-11 22:12:03 UTC (rev 9096) @@ -1 +1 @@ -a075c590ef3024293377678088ebfe50 download/POE-Test-Loops-1.005.tar.gz +f109a514da1d002cab60966ed304bbb7 POE-Test-Loops-1.033.tar.gz Added: csw/mgar/pkg/cpan/POE-Test-Loops/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/POE-Test-Loops/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/POE-Test-Loops/trunk/files/COPYING 2010-03-11 22:12:03 UTC (rev 9096) @@ -0,0 +1,12 @@ +AUTHOR & COPYRIGHT + +Rocco Caputo . Benjamin Smith . +Countless other people. + +These tests are Copyright 1998-2009 by Rocco Caputo, Benjamin Smith, +and countless contributors. All rights are reserved. These tests are +free software; you may redistribute them and/or modify them under the +same terms as Perl itself. + +Thanks to Martijn van Beers for beta testing and suggestions. + 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 Mar 11 23:23:47 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Mar 2010 22:23:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9098] csw/mgar/pkg/cpan Message-ID: Revision: 9098 http://gar.svn.sourceforge.net/gar/?rev=9098&view=rev Author: dmichelsen Date: 2010-03-11 22:23:46 +0000 (Thu, 11 Mar 2010) Log Message: ----------- cpan/B-Utils: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/B-Utils/ csw/mgar/pkg/cpan/B-Utils/branches/ csw/mgar/pkg/cpan/B-Utils/tags/ csw/mgar/pkg/cpan/B-Utils/trunk/ csw/mgar/pkg/cpan/B-Utils/trunk/Makefile csw/mgar/pkg/cpan/B-Utils/trunk/checksums csw/mgar/pkg/cpan/B-Utils/trunk/files/ csw/mgar/pkg/cpan/B-Utils/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/B-Utils/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/B-Utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/B-Utils/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/B-Utils/trunk/Makefile 2010-03-11 22:23:46 UTC (rev 9098) @@ -0,0 +1,15 @@ +GARNAME = B-Utils +GARVERSION = 0.11 +CATEGORIES = cpan +AUTHOR = JJORE + +DESCRIPTION = Helper functions for op tree manipulation +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmbutils +CATALOGNAME = pm_butils + +include gar/category.mk Added: csw/mgar/pkg/cpan/B-Utils/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/B-Utils/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/B-Utils/trunk/checksums 2010-03-11 22:23:46 UTC (rev 9098) @@ -0,0 +1,2 @@ +ecfbba83b9b6c92b2ba0c832ccbc75f3 B-Utils-0.11.tar.gz +62e24a93342fede7221d66335c716f34 COPYING Added: csw/mgar/pkg/cpan/B-Utils/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/B-Utils/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/B-Utils/trunk/files/COPYING 2010-03-11 22:23:46 UTC (rev 9098) @@ -0,0 +1,2 @@ +This module 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 dmichelsen at users.sourceforge.net Thu Mar 11 23:25:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Mar 2010 22:25:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9099] csw/mgar/pkg/xjobs/trunk Message-ID: Revision: 9099 http://gar.svn.sourceforge.net/gar/?rev=9099&view=rev Author: dmichelsen Date: 2010-03-11 22:25:21 +0000 (Thu, 11 Mar 2010) Log Message: ----------- xjobs: Update to 20100311 Modified Paths: -------------- csw/mgar/pkg/xjobs/trunk/Makefile csw/mgar/pkg/xjobs/trunk/checksums Modified: csw/mgar/pkg/xjobs/trunk/Makefile =================================================================== --- csw/mgar/pkg/xjobs/trunk/Makefile 2010-03-11 22:23:46 UTC (rev 9098) +++ csw/mgar/pkg/xjobs/trunk/Makefile 2010-03-11 22:25:21 UTC (rev 9099) @@ -1,5 +1,5 @@ GARNAME = xjobs -GARVERSION = 20100203 +GARVERSION = 20100311 CATEGORIES = utils DESCRIPTION = Executes jobs in parallel similar to xargs Modified: csw/mgar/pkg/xjobs/trunk/checksums =================================================================== --- csw/mgar/pkg/xjobs/trunk/checksums 2010-03-11 22:23:46 UTC (rev 9098) +++ csw/mgar/pkg/xjobs/trunk/checksums 2010-03-11 22:25:21 UTC (rev 9099) @@ -1 +1 @@ -364ff256ec497f3b69c675edf6dbb7c8 xjobs-20100203.tgz +f20ce2b9df520a278db2c8482fb17009 xjobs-20100311.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Mar 11 23:35:42 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Mar 2010 22:35:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[9100] csw/mgar/pkg/thunderbird-l10n/trunk/Makefile Message-ID: Revision: 9100 http://gar.svn.sourceforge.net/gar/?rev=9100&view=rev Author: wbonnet Date: 2010-03-11 22:35:42 +0000 (Thu, 11 Mar 2010) Log Message: ----------- Fix package name Modified Paths: -------------- csw/mgar/pkg/thunderbird-l10n/trunk/Makefile Modified: csw/mgar/pkg/thunderbird-l10n/trunk/Makefile =================================================================== --- csw/mgar/pkg/thunderbird-l10n/trunk/Makefile 2010-03-11 22:25:21 UTC (rev 9099) +++ csw/mgar/pkg/thunderbird-l10n/trunk/Makefile 2010-03-11 22:35:42 UTC (rev 9100) @@ -17,23 +17,20 @@ ARCHALL = 1 # Defines the list of packages -PACKAGES = $(foreach PKG, $(LANG), CSWtbird-l10n-$(PKG) ) +PACKAGES = $(foreach PKG, $(LANG), CSWthunderbird-$(PKG) ) LICENSE = License -# There was previously a french localization package. It is renamed, thus declared as incompatible -INCOMPATIBLE_PKGS_CSWtbird-l10n-fr = CSWthunderbird-fr - # Add thunderbird as a depend RUNTIME_DEP_PKGS = CSWthunderbird # Defines the package description -$(foreach LOCALE_NAME, $(LANG), $(eval SPKG_DESC_CSWtbird-l10n-$(LOCALE_NAME) = $(DESCRIPTION) $(LOCALE_NAME))) +$(foreach LOCALE_NAME, $(LANG), $(eval SPKG_DESC_CSWthunderbird-$(LOCALE_NAME) = $(DESCRIPTION) $(LOCALE_NAME))) # Defines the catalog names -$(foreach LOCALE_NAME, $(LANG), $(eval CATALOGNAME_CSWtbird-l10n-$(LOCALE_NAME) = tbird_l10n_$(shell echo $(LOCALE_NAME) | tr \- _ | tr [A-Z] [a-z] ))) +$(foreach LOCALE_NAME, $(LANG), $(eval CATALOGNAME_CSWthunderbird-$(LOCALE_NAME) = thunderbird_$(shell echo $(LOCALE_NAME) | tr \- _ | tr [A-Z] [a-z] ))) # Defines the files filters -$(foreach LOCALE_NAME, $(LANG), $(eval PKGFILES_CSWtbird-l10n-$(LOCALE_NAME) = .*langpack-$(LOCALE_NAME).*)) +$(foreach LOCALE_NAME, $(LANG), $(eval PKGFILES_CSWthunderbird-$(LOCALE_NAME) = .*langpack-$(LOCALE_NAME).*)) # Defines the content to be downloaded MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$(GARVERSION)/linux-i686/xpi/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Mar 12 03:35:48 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 12 Mar 2010 02:35:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9101] csw/mgar/pkg Message-ID: Revision: 9101 http://gar.svn.sourceforge.net/gar/?rev=9101&view=rev Author: hson Date: 2010-03-12 02:35:47 +0000 (Fri, 12 Mar 2010) Log Message: ----------- Change from sf.net to sourceforge.net for gar Modified Paths: -------------- csw/mgar/pkg/cpan/XML-Twig/trunk/Makefile csw/mgar/pkg/cpan/XML-Twig/trunk/checksums csw/mgar/pkg/cpan/XML-Twig/trunk/files/install.diff Property Changed: ---------------- csw/mgar/pkg/bdb42/trunk/ csw/mgar/pkg/bdb43/trunk/ csw/mgar/pkg/cacti/trunk/ csw/mgar/pkg/centerim/trunk/ csw/mgar/pkg/cpan/XML-Twig/trunk/ csw/mgar/pkg/cswcommon/trunk/ csw/mgar/pkg/dbus-python/trunk/ csw/mgar/pkg/jetty6/trunk/ csw/mgar/pkg/ksh/trunk/ csw/mgar/pkg/libmikmod/trunk/ csw/mgar/pkg/libmpfr/trunk/ csw/mgar/pkg/munin/trunk/ csw/mgar/pkg/ntop/trunk/ csw/mgar/pkg/pygtk/trunk/ csw/mgar/pkg/spine/trunk/ csw/mgar/pkg/xfce/libxfce4menu/trunk/ csw/mgar/pkg/xpilot/trunk/ Property changes on: csw/mgar/pkg/bdb42/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/bdb43/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/cacti/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/centerim/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/cpan/XML-Twig/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-Twig/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-Twig/trunk/Makefile 2010-03-11 22:35:42 UTC (rev 9100) +++ csw/mgar/pkg/cpan/XML-Twig/trunk/Makefile 2010-03-12 02:35:47 UTC (rev 9101) @@ -1,5 +1,5 @@ GARNAME = XML-Twig -GARVERSION = 3.29 +GARVERSION = 3.32 CATEGORIES = cpan AUTHOR = MIROD @@ -10,11 +10,17 @@ allowing you to output the parts of it that have been completely processed. endef -DISTFILES = $(call admfiles,CSWpmxmltwig,depend prototype) +DISTFILES = $(call admfiles,CSWpmxmltwig) +PREREQ_PKGS += CSWpmtestpod CSWpmxmlsimple CSWpmxmlhandleyawrit +PREREQ_PKGS += CSWpmxmlsaxwriter CSWpmxmlfilterbuffertxt CSWpmiostringy + +REQUIRED_PKGS += CSWpmxmlparser CSWexpat CSWpmlibwww CSWpmhtmlparser +REQUIRED_PKGS += CSWpmtieixhash CSWpmxmlxpath CSWpmhtmltree + DEPENDS += cpan/XML-Parser # Force installation without prompting -PATCHFILES = install.diff +#PATCHFILES = install.diff include gar/category.mk Modified: csw/mgar/pkg/cpan/XML-Twig/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-Twig/trunk/checksums 2010-03-11 22:35:42 UTC (rev 9100) +++ csw/mgar/pkg/cpan/XML-Twig/trunk/checksums 2010-03-12 02:35:47 UTC (rev 9101) @@ -1,5 +1,4 @@ 17e12fefba1a9d3a6b0cc92cb285acc3 download/CSWpmxmltwig.gspec -372c4411ffc19fbda7f794a859231a7a download/CSWpmxmltwig.depend -f8e91e6532a4b91359af9ab326b0af59 download/CSWpmxmltwig.prototype -fd1931464e28fb7ad082439bc2c11c2c download/XML-Twig-3.29.tar.gz -e8d8e6972f383e1ada704a3bb1706e66 download/install.diff +6c552744e9f4dbf8271bb142b2da16a2 download/CSWpmxmltwig.depend +7295c1861f3d476180dc0e2eaa15de14 download/CSWpmxmltwig.prototype +9df9dcab00aa093c4e540caa5cb759fa download/XML-Twig-3.32.tar.gz Modified: csw/mgar/pkg/cpan/XML-Twig/trunk/files/install.diff =================================================================== --- csw/mgar/pkg/cpan/XML-Twig/trunk/files/install.diff 2010-03-11 22:35:42 UTC (rev 9100) +++ csw/mgar/pkg/cpan/XML-Twig/trunk/files/install.diff 2010-03-12 02:35:47 UTC (rev 9101) @@ -1,17 +1,12 @@ -diff --speed-large-files --minimal -Nru XML-Twig-3.10.orig/Makefile.PL XML-Twig-3.10/Makefile.PL ---- XML-Twig-3.10.orig/Makefile.PL 2003-06-06 10:22:46.000000000 -0700 -+++ XML-Twig-3.10/Makefile.PL 2003-07-29 14:37:00.821082000 -0700 -@@ -11,10 +11,10 @@ - xml_spellcheck|y|spellcheck XML files skipping tags - QUERIES - my ($program, $default, $description) = split /\|/, $_; -- if (prompt("Do you want to install '$program' ($description)?", -- $default) =~ /^y/) { -+# if (prompt("Do you want to install '$program' ($description)?", -+# $default) =~ /^y/) { - push(@programs, $program); -- } -+# } - } - - WriteMakefile( +diff -ru XML-Twig-3.32.orig/Makefile.PL XML-Twig-3.32/Makefile.PL +--- XML-Twig-3.32.orig/Makefile.PL 2009-03-17 20:16:43.000000000 +0100 ++++ XML-Twig-3.32/Makefile.PL 2009-03-17 20:26:13.438626991 +0100 +@@ -24,7 +24,7 @@ + " 'perl Makefile.PL -n' to skip installation\n"; + foreach my $prompt (@prompts) + { my ($program, $default, $description) = @$prompt; +- if( prompt("Do you want to install '$program' ($description)?", $default) =~ /^y/) ++# if( prompt("Do you want to install '$program' ($description)?", $default) =~ /^y/) + { push(@programs, $program); } + } + } Property changes on: csw/mgar/pkg/cswcommon/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/dbus-python/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/jetty6/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/ksh/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/libmikmod/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/libmpfr/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/munin/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/ntop/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/pygtk/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/spine/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/xfce/libxfce4menu/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/xpilot/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 hson at users.sourceforge.net Fri Mar 12 05:10:27 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 12 Mar 2010 04:10:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[9102] csw/mgar/pkg/cpan/XML-Twig/trunk Message-ID: Revision: 9102 http://gar.svn.sourceforge.net/gar/?rev=9102&view=rev Author: hson Date: 2010-03-12 04:10:27 +0000 (Fri, 12 Mar 2010) Log Message: ----------- pm_xmltwig: Update to 3.34 Modified Paths: -------------- csw/mgar/pkg/cpan/XML-Twig/trunk/Makefile csw/mgar/pkg/cpan/XML-Twig/trunk/checksums Modified: csw/mgar/pkg/cpan/XML-Twig/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-Twig/trunk/Makefile 2010-03-12 02:35:47 UTC (rev 9101) +++ csw/mgar/pkg/cpan/XML-Twig/trunk/Makefile 2010-03-12 04:10:27 UTC (rev 9102) @@ -1,26 +1,24 @@ GARNAME = XML-Twig -GARVERSION = 3.32 +GARVERSION = 3.34 CATEGORIES = cpan AUTHOR = MIROD -DESCRIPTION = a module for processing huge XML documents in tree mode. +DESCRIPTION = A module for processing huge XML documents in tree mode. define BLURB This module provides a way to process XML documents. It is build on top of XML::Parser. The module offers a tree interface to the document, while allowing you to output the parts of it that have been completely processed. endef -DISTFILES = $(call admfiles,CSWpmxmltwig) -PREREQ_PKGS += CSWpmtestpod CSWpmxmlsimple CSWpmxmlhandleyawrit -PREREQ_PKGS += CSWpmxmlsaxwriter CSWpmxmlfilterbuffertxt CSWpmiostringy +PACKAGES = CSWpmxmltwig +CATLOGNAME_CSWpmxmltwig = pm_xmltwig -REQUIRED_PKGS += CSWpmxmlparser CSWexpat CSWpmlibwww CSWpmhtmlparser -REQUIRED_PKGS += CSWpmtieixhash CSWpmxmlxpath CSWpmhtmltree +RUNTIME_DEP_PKGS += CSWpmxmlparser -DEPENDS += cpan/XML-Parser +ARCHALL_CSWpmxmltwig = 1 # Force installation without prompting -#PATCHFILES = install.diff +PATCHFILES = install.diff include gar/category.mk Modified: csw/mgar/pkg/cpan/XML-Twig/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-Twig/trunk/checksums 2010-03-12 02:35:47 UTC (rev 9101) +++ csw/mgar/pkg/cpan/XML-Twig/trunk/checksums 2010-03-12 04:10:27 UTC (rev 9102) @@ -1,4 +1,2 @@ -17e12fefba1a9d3a6b0cc92cb285acc3 download/CSWpmxmltwig.gspec -6c552744e9f4dbf8271bb142b2da16a2 download/CSWpmxmltwig.depend -7295c1861f3d476180dc0e2eaa15de14 download/CSWpmxmltwig.prototype -9df9dcab00aa093c4e540caa5cb759fa download/XML-Twig-3.32.tar.gz +88a24e3e09b2fc1e252f7662d1291f9a XML-Twig-3.34.tar.gz +ace5a7320bf7b6d46175fe7e098e2846 install.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 12 08:14:20 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 12 Mar 2010 07:14:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9103] csw/mgar/pkg/urxvt/trunk Message-ID: Revision: 9103 http://gar.svn.sourceforge.net/gar/?rev=9103&view=rev Author: wahwah Date: 2010-03-12 07:14:20 +0000 (Fri, 12 Mar 2010) Log Message: ----------- urxvt: Switching the wrapper from /opt/csw/bin/bash to /bin/sh. Modified Paths: -------------- csw/mgar/pkg/urxvt/trunk/Makefile csw/mgar/pkg/urxvt/trunk/checksums csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper Property Changed: ---------------- csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper Modified: csw/mgar/pkg/urxvt/trunk/Makefile =================================================================== --- csw/mgar/pkg/urxvt/trunk/Makefile 2010-03-12 04:10:27 UTC (rev 9102) +++ csw/mgar/pkg/urxvt/trunk/Makefile 2010-03-12 07:14:20 UTC (rev 9103) @@ -28,8 +28,6 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-perl CONFIGURE_ARGS += --with-terminfo=/opt/csw/share/terminfo -# For the wrapper -RUNTIME_DEP_PKGS_CSWurxvt = CSWbash # Because of terminfo RUNTIME_DEP_PKGS_CSWurxvt += CSWncurses # Shared library dependencies Modified: csw/mgar/pkg/urxvt/trunk/checksums =================================================================== --- csw/mgar/pkg/urxvt/trunk/checksums 2010-03-12 04:10:27 UTC (rev 9102) +++ csw/mgar/pkg/urxvt/trunk/checksums 2010-03-12 07:14:20 UTC (rev 9103) @@ -1,2 +1,2 @@ 49bb52c99e002bf85eb41d8385d903b5 rxvt-unicode-9.07.tar.bz2 -d1fb3a5f721baf361574880f6cdc92be urxvt-wrapper +6deddff9b0c4e0e0c6f3d12b50f5174e urxvt-wrapper Modified: csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper =================================================================== --- csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper 2010-03-12 04:10:27 UTC (rev 9102) +++ csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper 2010-03-12 07:14:20 UTC (rev 9103) @@ -1,20 +1,21 @@ -#!/opt/csw/bin/bash +#!/bin/sh # +# $Id$ +# # A workaround because of a Solaris 10 kernel bug: # http://bugs.opensolaris.org/view_bug.do?bug_id=6268715 -set -u - -executable=$(basename $0) +executable=`basename $0` libexec="/opt/csw/libexec" libexec_binary="${libexec}/${executable}" -if [[ ! -r "${libexec_binary}" ]]; then +if [ ! -r "${libexec_binary}" ]; then echo "Can't read ${libexec_binary}" exit 1 fi # The workaround itself: -export LIBEV_FLAGS=1 +LIBEV_FLAGS=1 +export LIBEV_FLAGS exec "${libexec_binary}" "$@" Property changes on: csw/mgar/pkg/urxvt/trunk/files/urxvt-wrapper ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 12 08:15:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 12 Mar 2010 07:15:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9104] csw/mgar/pkg/urxvt/trunk/checksums Message-ID: Revision: 9104 http://gar.svn.sourceforge.net/gar/?rev=9104&view=rev Author: wahwah Date: 2010-03-12 07:15:10 +0000 (Fri, 12 Mar 2010) Log Message: ----------- urxvt: Updating the makesum of a file with the Id tag (needs to be committed separately). Modified Paths: -------------- csw/mgar/pkg/urxvt/trunk/checksums Modified: csw/mgar/pkg/urxvt/trunk/checksums =================================================================== --- csw/mgar/pkg/urxvt/trunk/checksums 2010-03-12 07:14:20 UTC (rev 9103) +++ csw/mgar/pkg/urxvt/trunk/checksums 2010-03-12 07:15:10 UTC (rev 9104) @@ -1,2 +1,2 @@ 49bb52c99e002bf85eb41d8385d903b5 rxvt-unicode-9.07.tar.bz2 -6deddff9b0c4e0e0c6f3d12b50f5174e urxvt-wrapper +24c55df0baad064901c9cf5e4b8d5eef urxvt-wrapper This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 12 11:16:25 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 12 Mar 2010 10:16:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[9105] csw/mgar/pkg/imlib2/branches/csw-x11/ Message-ID: Revision: 9105 http://gar.svn.sourceforge.net/gar/?rev=9105&view=rev Author: wahwah Date: 2010-03-12 10:16:24 +0000 (Fri, 12 Mar 2010) Log Message: ----------- Branching imlib2 to test linking against CSW X11. Added Paths: ----------- csw/mgar/pkg/imlib2/branches/csw-x11/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 12 15:11:19 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 12 Mar 2010 14:11:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9106] csw/mgar/pkg/awesome/trunk Message-ID: Revision: 9106 http://gar.svn.sourceforge.net/gar/?rev=9106&view=rev Author: wahwah Date: 2010-03-12 14:11:19 +0000 (Fri, 12 Mar 2010) Log Message: ----------- awesome: shorter patch for gperf.sh Modified Paths: -------------- csw/mgar/pkg/awesome/trunk/checksums csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch Modified: csw/mgar/pkg/awesome/trunk/checksums =================================================================== --- csw/mgar/pkg/awesome/trunk/checksums 2010-03-12 10:16:24 UTC (rev 9105) +++ csw/mgar/pkg/awesome/trunk/checksums 2010-03-12 14:11:19 UTC (rev 9106) @@ -1,6 +1,6 @@ 8c2537ad898d7f58a0f3ba92e6a561a1 awesome-3.4.4.tar.bz2 1d5c67eb4555b367032c1294fb72bf0b backtrace.c.patch -346c2299f6f5be4d667ff3769a1251f0 gperf.sh-solarify.patch +15a863e32d3cd4fda402385cf0e03b46 gperf.sh-solarify.patch 3186b1d530e691611c9da0443689b5e4 iconv-try-1.patch 9201583f764cb4859e6a49c883dd6672 remove-export-dynamic.patch 346d88270c8702b7f4d7ab519d7ccc07 test-dash-e-unavailable.patch Modified: csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch =================================================================== --- csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch 2010-03-12 10:16:24 UTC (rev 9105) +++ csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch 2010-03-12 14:11:19 UTC (rev 9106) @@ -1,43 +1,20 @@ ---- awesome-3.4.4/build-utils/gperf.sh.orig 2010-03-07 10:35:38.518346274 +0100 -+++ awesome-3.4.4/build-utils/gperf.sh 2010-03-07 10:37:23.977357986 +0100 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/opt/csw/bin/bash - # - # Copyright ? 2008 Pierre Habouzit - # +--- awesome-3.4.4/build-utils/gperf.sh.orig 2010-03-12 14:08:00.910378535 +0000 ++++ awesome-3.4.4/build-utils/gperf.sh 2010-03-12 14:08:26.207943113 +0000 @@ -50,7 +50,7 @@ typedef enum awesome_token_t { A_TK_UNKNOWN, -`tr '[:lower:]' '[:upper:]' | sed -e "s/^[^/].*/ A_TK_&,/"` -+`tr '[:lower:]' '[:upper:]' | gsed -e "s/^[^/].*/ A_TK_&,/"` ++`LC_ALL=C tr a-z A-Z | sed -e "s/^[^/].*/ A_TK_&,/"` } awesome_token_t; __attribute__((pure)) enum awesome_token_t a_tokenize(const char *s, int len); -@@ -109,14 +109,14 @@ - } - - extract_tokens() { -- grep '^### ' "$1" | cut -d ' ' -f 2 -+ ggrep '^### ' "$1" | cut -d ' ' -f 2 - } - - - TOKENS_FILE="$1" - TARGET="$2" - --trap "rm -f ${TARGET}" 0 -+trap "grm -f ${TARGET}" 0 - - rm -f "${TARGET}" - case "${TARGET}" in -@@ -124,7 +124,7 @@ - *.c) do_c > "${TARGET}" < "${TOKENS_FILE}" ;; - *) die "you must ask for the 'h' or 'c' generation";; - esac --chmod -w "${TARGET}" -+gchmod -w "${TARGET}" - - trap - 0 - exit 0 +@@ -63,7 +63,7 @@ + case "$tok" in + "") continue;; + *) +- echo "$tok, A_TK_`echo $tok | tr '[:lower:]' '[:upper:]'`" ++ echo "$tok, A_TK_`echo $tok | LC_ALL=C tr a-z A-Z`" + ;; + esac + done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 12 15:46:04 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 12 Mar 2010 14:46:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[9107] csw/mgar/pkg/imlib2/branches/csw-x11/Makefile Message-ID: Revision: 9107 http://gar.svn.sourceforge.net/gar/?rev=9107&view=rev Author: wahwah Date: 2010-03-12 14:46:04 +0000 (Fri, 12 Mar 2010) Log Message: ----------- imlib2: Trying linking against CSW X11 Modified Paths: -------------- csw/mgar/pkg/imlib2/branches/csw-x11/Makefile Modified: csw/mgar/pkg/imlib2/branches/csw-x11/Makefile =================================================================== --- csw/mgar/pkg/imlib2/branches/csw-x11/Makefile 2010-03-12 14:11:19 UTC (rev 9106) +++ csw/mgar/pkg/imlib2/branches/csw-x11/Makefile 2010-03-12 14:46:04 UTC (rev 9107) @@ -1,6 +1,6 @@ GARNAME = imlib2 GARVERSION = 1.4.2 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = Imlib 2 is the successor to Imlib, a powerful graphics library define BLURB @@ -12,23 +12,29 @@ SF_PROJ = enlightenment MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(GARNAME)_loaders-$(GARVERSION).tar.bz2 +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += $(GARNAME)_loaders-$(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 -RUNTIME_DEP_PKGS = CSWbzip2 CSWftype2 CSWgiflibrt CSWjpeg CSWlibid3tag -RUNTIME_DEP_PKGS += CSWlibxext CSWpng CSWtiff CSWzlib +RUNTIME_DEP_PKGS += CSWbzip2 +RUNTIME_DEP_PKGS += CSWftype2 +RUNTIME_DEP_PKGS += CSWgiflibrt +RUNTIME_DEP_PKGS += CSWjpeg +RUNTIME_DEP_PKGS += CSWlibid3tag +RUNTIME_DEP_PKGS += CSWlibxext +RUNTIME_DEP_PKGS += CSWpng +RUNTIME_DEP_PKGS += CSWtiff +RUNTIME_DEP_PKGS += CSWzlib -#EXTRA_INC = $(prefix)/X11/include -#EXTRA_LIB = $(prefix)/X11/lib -#EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_INC = /opt/csw/include +EXTRA_LIB = /opt/csw/lib +# EXTRA_PKG_CONFIG_DIRS = /opt/csw/lib BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) -#CONFIGURE_ARGS += --x-include=$(prefix)/X11/include -#CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-include=$(prefix)/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/lib/$(MM_LIBDIR)) TEST_TARGET = check 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 Mar 12 16:46:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Mar 2010 15:46:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9108] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 9108 http://gar.svn.sourceforge.net/gar/?rev=9108&view=rev Author: dmichelsen Date: 2010-03-12 15:46:21 +0000 (Fri, 12 Mar 2010) Log Message: ----------- giflib: Depend on CSW X11 Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2010-03-12 14:46:04 UTC (rev 9107) +++ csw/mgar/pkg/giflib/trunk/Makefile 2010-03-12 15:46:21 UTC (rev 9108) @@ -29,12 +29,19 @@ SPKG_SOURCEURL = http://giflib.sourceforge.net/ -RUNTIME_DEP_PKGS_CSWgiflib = CSWgiflibrt +RUNTIME_DEP_PKGS_CSWgiflibrt = CSWlibice CSWlibsm CSWlibx11 +RUNTIME_DEP_PKGS_CSWgiflib = CSWlibice CSWlibsm CSWlibx11 CSWgiflibrt RUNTIME_DEP_PKGS_CSWungif = CSWgiflib +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) TEST_TARGET = check @@ -43,6 +50,9 @@ MERGE_DIRS_isa-sparcv9 = $(libdir) MERGE_DIRS_isa-amd64 = $(libdir) +ARCHALL_CSWgiflibdoc = 1 +ARCHALL_CSWungif = 1 + PKGFILES_CSWgiflibrt = .*/libgif\..* PKGFILES_CSWgiflibdoc = $(PKGFILES_DOC) PKGFILES_CSWungif = .*/libungif\..* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Mar 12 16:49:53 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 12 Mar 2010 15:49:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9109] csw/mgar/pkg/ghostscript/trunk/Makefile Message-ID: Revision: 9109 http://gar.svn.sourceforge.net/gar/?rev=9109&view=rev Author: hson Date: 2010-03-12 15:49:53 +0000 (Fri, 12 Mar 2010) Log Message: ----------- ghotscript: Add extra optimized versions Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2010-03-12 15:46:21 UTC (rev 9108) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2010-03-12 15:49:53 UTC (rev 9109) @@ -48,6 +48,8 @@ # $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4 EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro+mmx + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic CONFIGURE_ARGS += --enable-cups 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 Mar 12 17:10:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Mar 2010 16:10:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9110] csw/mgar/pkg/imlib2/trunk/Makefile Message-ID: Revision: 9110 http://gar.svn.sourceforge.net/gar/?rev=9110&view=rev Author: dmichelsen Date: 2010-03-12 16:10:46 +0000 (Fri, 12 Mar 2010) Log Message: ----------- imlib2: Depend on CSW X11 Modified Paths: -------------- csw/mgar/pkg/imlib2/trunk/Makefile Modified: csw/mgar/pkg/imlib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/imlib2/trunk/Makefile 2010-03-12 15:49:53 UTC (rev 9109) +++ csw/mgar/pkg/imlib2/trunk/Makefile 2010-03-12 16:10:46 UTC (rev 9110) @@ -19,16 +19,16 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 RUNTIME_DEP_PKGS = CSWbzip2 CSWftype2 CSWgiflibrt CSWjpeg CSWlibid3tag -RUNTIME_DEP_PKGS += CSWlibxext CSWpng CSWtiff CSWzlib +RUNTIME_DEP_PKGS += CSWlibxext CSWpng CSWtiff CSWzlib CSWlibx11 -#EXTRA_INC = $(prefix)/X11/include -#EXTRA_LIB = $(prefix)/X11/lib -#EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -#CONFIGURE_ARGS += --x-include=$(prefix)/X11/include -#CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Mar 12 17:18:36 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 12 Mar 2010 16:18:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9111] csw/mgar/pkg/gstreamer/trunk/Makefile Message-ID: Revision: 9111 http://gar.svn.sourceforge.net/gar/?rev=9111&view=rev Author: bensons Date: 2010-03-12 16:18:35 +0000 (Fri, 12 Mar 2010) Log Message: ----------- gstreamer: adjusted build dependencies Modified Paths: -------------- csw/mgar/pkg/gstreamer/trunk/Makefile Modified: csw/mgar/pkg/gstreamer/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstreamer/trunk/Makefile 2010-03-12 16:10:46 UTC (rev 9110) +++ csw/mgar/pkg/gstreamer/trunk/Makefile 2010-03-12 16:18:35 UTC (rev 9111) @@ -2,7 +2,7 @@ GARVERSION = 0.10.26 CATEGORIES = gnome -DESCRIPTION = open source multimedia framework +DESCRIPTION = Open source multimedia framework define BLURB GStreamer is a library for constructing graphs of media-handling components. The applications it supports range from simple Ogg/Vorbis playback, @@ -22,25 +22,14 @@ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --disable-debug -RUNTIME_DEP_PKGS = CSWglib2 CSWggettextrt CSWlibxml2 -BUILD_DEP_PKGS = CSWbison CSWflex-new $(RUNTIME_DEP_PKGS) +RUNTIME_DEP_PKGS += CSWglib2 CSWggettextrt CSWlibxml2 +BUILD_DEP_PKGS += CSWbison CSWflex-new CSWglib2devel CSWpkgconfig +BUILD_DEP_PKGS += CSWlibxml2devel +BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) STRIP_LIBTOOL = 1 -CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|gst-inspect-0.10 -CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|gst-xmlinspect-0.10 -CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|gst-xmllaunch-0.10 -CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|gst-launch-0.10 -CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|gst-typefind-0.10 -CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|libgstbase-0.10.so.0.23.0 -CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|libgstcoreindexers.so -CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|libgstcoreelements.so -CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|libgstcheck-0.10.so.0.23.0 -CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|libgstdataprotocol-0.10.so.0.23.0 -CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|libgstcontroller-0.10.so.0.23.0 -CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|libgstnet-0.10.so.0.23.0 -CHECKPKG_OVERRIDES_CSWgstreamer += symbol-not-found|gst-plugin-scanner - +# no tests.. 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 bensons at users.sourceforge.net Fri Mar 12 18:07:46 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 12 Mar 2010 17:07:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9112] csw/mgar/pkg/gstplugins/trunk/Makefile Message-ID: Revision: 9112 http://gar.svn.sourceforge.net/gar/?rev=9112&view=rev Author: bensons Date: 2010-03-12 17:07:45 +0000 (Fri, 12 Mar 2010) Log Message: ----------- gstplugins: removed checkpkg missing symbols Modified Paths: -------------- csw/mgar/pkg/gstplugins/trunk/Makefile Modified: csw/mgar/pkg/gstplugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins/trunk/Makefile 2010-03-12 16:18:35 UTC (rev 9111) +++ csw/mgar/pkg/gstplugins/trunk/Makefile 2010-03-12 17:07:45 UTC (rev 9112) @@ -42,24 +42,6 @@ TEST_SCRIPTS = -# we are providing those symbols -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstaudio-0.10.so.0.19.0 -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstriff-0.10.so.0.19.0 -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstgnomevfs.so -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstapp.so -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstvolume.so -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstplaybin.so -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstogg.so -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstdecodebin.so -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstaudioconvert.so -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstadder.so -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgsttheora.so -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstdecodebin2.so -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstvideoscale.so -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstximagesink.so -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstvorbis.so -CHECKPKG_OVERRIDES_CSWgstplugins += symbol-not-found|libgstcdda-0.10.so.0.19.0 - include gar/category.mk # sigh, portable code? 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 Mar 12 18:16:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Mar 2010 17:16:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[9113] csw/mgar/pkg/libwnck/trunk Message-ID: Revision: 9113 http://gar.svn.sourceforge.net/gar/?rev=9113&view=rev Author: dmichelsen Date: 2010-03-12 17:16:33 +0000 (Fri, 12 Mar 2010) Log Message: ----------- libwnck: Split off devel package Modified Paths: -------------- csw/mgar/pkg/libwnck/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libwnck/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/libwnck/trunk/ Property changes on: csw/mgar/pkg/libwnck/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libwnck/trunk/Makefile =================================================================== --- csw/mgar/pkg/libwnck/trunk/Makefile 2010-03-12 17:07:45 UTC (rev 9112) +++ csw/mgar/pkg/libwnck/trunk/Makefile 2010-03-12 17:16:33 UTC (rev 9113) @@ -12,19 +12,40 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +PACKAGES = CSWlibwnck CSWlibwnckdevel + +CATALOGNAME_CSWlibwnck = libwnck +CATALOGNAME_CSWlibwnckdevel = libwnck_devel + +SPKG_DESC_CSWlibwnck = $(DESCRIPTION) +SPKG_DESC_CSWlibwnckdevel = Developer files for libwnck + VENDOR_URL = http://ftp.gnome.org/pub/GNOME/sources/libwnck/ +BUILD_DEP_PKGS = CSWgtk2devel CSWglib2devel + +RUNTIME_DEP_PKGS_CSWlibwnck = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibwnck += CSWlibatk CSWlibcairo CSWlibx11 CSWlibxres CSWpango CSWstartupnotif +RUNTIME_DEP_PKGS_CSWlibwnckdevel = CSWlibwnck $(BUILD_DEP_PKGS) + EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -# Problem: Requested 'gtk+-2.0 >= 2.19.7' but version of GTK+ is 2.16.5 +# For cos(3m) +EXTRA_LINKER_FLAGS = -lm +NOISAEXEC = 1 BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +MERGE_DIRS_isa-extra = $(libdir) + +PKGFILES_CSWlibwnckdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibwnckdevel += $(sharedstatedir)/gtk-doc/.* + include gar/category.mk # Needed for GNU gettext Added: csw/mgar/pkg/libwnck/trunk/checksums =================================================================== --- csw/mgar/pkg/libwnck/trunk/checksums (rev 0) +++ csw/mgar/pkg/libwnck/trunk/checksums 2010-03-12 17:16:33 UTC (rev 9113) @@ -0,0 +1 @@ +414c377da1e38be06848875937cb2218 libwnck-2.29.92.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Mar 12 18:41:30 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 12 Mar 2010 17:41:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9114] csw/mgar/pkg/gstplugins_good/trunk/Makefile Message-ID: Revision: 9114 http://gar.svn.sourceforge.net/gar/?rev=9114&view=rev Author: bensons Date: 2010-03-12 17:41:30 +0000 (Fri, 12 Mar 2010) Log Message: ----------- gstplugins_good: cleaned up Makefile Modified Paths: -------------- csw/mgar/pkg/gstplugins_good/trunk/Makefile Modified: csw/mgar/pkg/gstplugins_good/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins_good/trunk/Makefile 2010-03-12 17:16:33 UTC (rev 9113) +++ csw/mgar/pkg/gstplugins_good/trunk/Makefile 2010-03-12 17:41:30 UTC (rev 9114) @@ -46,8 +46,8 @@ perl -pi -e 's,tanhf,tanh,' \ $(WORKSRC)/gst/replaygain/gstrglimiter.c @# [bus_message_cb]:ube: error: SIGNAL: Segmentation Fault - @# <@Dagobert> Yes, try lowering the optimizer level from -xO3 down to -xO2 - @# and may further down. + @# <@Dagobert> Yes, try lowering the optimizer level from -xO3 down to + @# -xO2 and may further down. perl -pi -e 's,xO3,xO1,' $(WORKSRC)/tests/icles/Makefile gsed -i 's/\(demo_LDFLAGS =\)/\1 $$(X_LIBS)/' \ $(WORKSRC)/tests/examples/equalizer/Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Mar 12 18:48:28 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 12 Mar 2010 17:48:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[9115] csw/mgar/pkg/gstplugins_bad/trunk/Makefile Message-ID: Revision: 9115 http://gar.svn.sourceforge.net/gar/?rev=9115&view=rev Author: bensons Date: 2010-03-12 17:48:28 +0000 (Fri, 12 Mar 2010) Log Message: ----------- gstplugins_bad: removed checkpkg missing symbol definition from Makefile Modified Paths: -------------- csw/mgar/pkg/gstplugins_bad/trunk/Makefile Modified: csw/mgar/pkg/gstplugins_bad/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins_bad/trunk/Makefile 2010-03-12 17:41:30 UTC (rev 9114) +++ csw/mgar/pkg/gstplugins_bad/trunk/Makefile 2010-03-12 17:48:28 UTC (rev 9115) @@ -37,10 +37,6 @@ PATCHFILES = patch-gstvideomeasure_collector.h patch-gstvideomeasure_ssim.h -# we provide that symbol -CHECKPKG_OVERRIDES_CSWgstpluginsbad += symbol-not-found|libgstcamerabin.so -CHECKPKG_OVERRIDES_CSWgstpluginsbad += symbol-not-found|gst-camera - include gar/category.mk post-configure-modulated: perl -pi -e 's,(LIBS = -lnsl -lsocket),$$1 -lresolv,' \ 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 Mar 12 22:01:13 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Mar 2010 21:01:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9116] csw/mgar/pkg/liboil/trunk Message-ID: Revision: 9116 http://gar.svn.sourceforge.net/gar/?rev=9116&view=rev Author: dmichelsen Date: 2010-03-12 21:01:13 +0000 (Fri, 12 Mar 2010) Log Message: ----------- liboil: Update to 0.3.17 and split off devel Modified Paths: -------------- csw/mgar/pkg/liboil/trunk/Makefile csw/mgar/pkg/liboil/trunk/checksums Modified: csw/mgar/pkg/liboil/trunk/Makefile =================================================================== --- csw/mgar/pkg/liboil/trunk/Makefile 2010-03-12 17:48:28 UTC (rev 9115) +++ csw/mgar/pkg/liboil/trunk/Makefile 2010-03-12 21:01:13 UTC (rev 9116) @@ -1,5 +1,5 @@ GARNAME = liboil -GARVERSION = 0.3.16 +GARVERSION = 0.3.17 CATEGORIES = lib DESCRIPTION = A library of simple functions that are optimized for various CPUs @@ -20,6 +20,16 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWliboil CSWliboildevel + +CATALOGNAME_CSWliboil = liboil +CATALOGNAME_CSWliboildevel = liboil_devel + +SPKG_DESC_CSWliboil = $(DESCRIPTION) +SPKG_DESC_CSWliboildevel = Development files for liboil + +RUNTIME_DEP_PKGS_CSWliboildevel = CSWliboil + SPKG_SOURCEURL = http://liboil.freedesktop.org/ BUILD64 = 1 @@ -28,4 +38,7 @@ TEST_TARGET = check +PKGFILES_CSWliboildevel = $(PKGFILES_DEVEL) +PKGFILES_CSWliboildevel += $(sharedstatedir)/gtk-doc/.* + include gar/category.mk Modified: csw/mgar/pkg/liboil/trunk/checksums =================================================================== --- csw/mgar/pkg/liboil/trunk/checksums 2010-03-12 17:48:28 UTC (rev 9115) +++ csw/mgar/pkg/liboil/trunk/checksums 2010-03-12 21:01:13 UTC (rev 9116) @@ -1,3 +1,3 @@ 4fb5c9be05a769cc606257a723ecf6cd 0001-Use-inttypes.h.patch dd92cada15fe42ef09f2bc6ed9d068db 0002-Enable-getisax-only-for-Solaris-10.patch -febb1d9f9bc4c440fcf622dc90f8b6b7 liboil-0.3.16.tar.gz +47dc734f82faeb2964d97771cfd2e701 liboil-0.3.17.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Fri Mar 12 22:29:17 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 12 Mar 2010 21:29:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9117] csw/mgar/pkg/wesnoth/trunk Message-ID: Revision: 9117 http://gar.svn.sourceforge.net/gar/?rev=9117&view=rev Author: jake_goerzen Date: 2010-03-12 21:29:16 +0000 (Fri, 12 Mar 2010) Log Message: ----------- wesnoth: 1.6.5 fixing gnuisms work in progress Modified Paths: -------------- csw/mgar/pkg/wesnoth/trunk/Makefile csw/mgar/pkg/wesnoth/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wesnoth/trunk/files/configure.diff csw/mgar/pkg/wesnoth/trunk/files/generator_private.hpp.diff csw/mgar/pkg/wesnoth/trunk/files/global.hpp.diff csw/mgar/pkg/wesnoth/trunk/files/image.cpp.diff csw/mgar/pkg/wesnoth/trunk/files/marked-up_text.cpp.diff csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.diff Removed Paths: ------------- csw/mgar/pkg/wesnoth/trunk/files/configure.patch csw/mgar/pkg/wesnoth/trunk/files/global.hpp.patch csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.patch Modified: csw/mgar/pkg/wesnoth/trunk/Makefile =================================================================== --- csw/mgar/pkg/wesnoth/trunk/Makefile 2010-03-12 21:01:13 UTC (rev 9116) +++ csw/mgar/pkg/wesnoth/trunk/Makefile 2010-03-12 21:29:16 UTC (rev 9117) @@ -1,5 +1,5 @@ GARNAME = wesnoth -GARVERSION = 1.7.13 +GARVERSION = 1.6.5 CATEGORIES = apps DESCRIPTION = a free turn-based strategy game with a fanasy theme @@ -9,7 +9,6 @@ MASTER_SITES += $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += Makefile.fixed # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=89495 @@ -17,9 +16,12 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) PATCHFILES = language.cpp.diff -PATCHFILES += configure.patch -PATCHFILES += simple_wml.cpp.patch -PATCHFILES += global.hpp.patch +PATCHFILES += configure.diff +PATCHFILES += global.hpp.diff +PATCHFILES += generator_private.hpp.diff +PATCHFILES += image.cpp.diff +PATCHFILES += marked-up_text.cpp.diff +PATCHFILES += simple_wml.cpp.diff RUNTIME_DEP_PKGS_CSWwesnoth = CSWboostrt RUNTIME_DEP_PKGS_CSWwesnoth += CSWftype2 @@ -41,21 +43,28 @@ CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|wesnoth_editor CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|wesnoth CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|wesnothd +CHECKPKG_OVERRIDES_CSWwesnoth += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWwesnoth += missing-dependency|CSWruby +EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so -L. + CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += PKG_CONFIG_PATH=/opt/csw/X11/lib/pkgconfig CONFIGURE_ARGS += CXXFLAGS='-features=extensions -library=stlport4' -CONFIGURE_ARGS += LDFLAGS='-L. -L/opt/csw/lib -lstlport -lintl -lsocket -lboost_iostreams -lsunmath -lSDL_ttf' +CONFIGURE_ARGS += LIBS='-lstlport -lintl -lsocket -lboost_iostreams -lsunmath -lSDL_ttf -lcairo -lpango-1.0 -lpangocairo-1.0' +CONFIGURE_ARGS += PANGO_CFLAGS='-I/opt/csw/include/pango-1.0 -I/opt/csw/include/glib-2.0 -I/opt/csw/lib/glib-2.0/include -I/opt/csw/include/cairo' +CONFIGURE_ARGS += PANGO_LIBS='-L/opt/csw/lib -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl' +CONFIGURE_ARGS += LUA_CFLAGS=-I/opt/csw/include +CONFIGURE_ARGS += LUA_LIBS=-L/opt/csw/lib CONFIGURE_ARGS += --with-fifodir=/var/opt/csw/run -CONFIGURE_ARGS += --enable-server -CONFIGURE_ARGS += --enable-campaign-server -CONFIGURE_ARGS += --enable-tools -CONFIGURE_ARGS += --enable-editor +#CONFIGURE_ARGS += --enable-server +#CONFIGURE_ARGS += --enable-campaign-server +#CONFIGURE_ARGS += --enable-tools +#CONFIGURE_ARGS += --enable-editor CONFIGURE_ARGS += --with-boost=/opt/csw +CONFIGURE_ARGS += --disable-strict-compilation +CONFIGURE_ARGS += --with-zlib-prefix=/opt/csw TEST_SCRIPTS = include gar/category.mk - -post-configure-modulated: - -cp $(FILEDIR)/Makefile.fixed $(WORKSRC)/src/Makefile - $(MAKECOOKIE) Modified: csw/mgar/pkg/wesnoth/trunk/checksums =================================================================== --- csw/mgar/pkg/wesnoth/trunk/checksums 2010-03-12 21:01:13 UTC (rev 9116) +++ csw/mgar/pkg/wesnoth/trunk/checksums 2010-03-12 21:29:16 UTC (rev 9117) @@ -1,6 +1,8 @@ -f316fcd8051bec370f21ea75a2638477 Makefile.fixed -76eeb1596dfa00c985f0f7c02d2c4b1b configure.patch -1e4363990aa7b5eb2ceaf4cef2237c80 global.hpp.patch +89db4313293372653371a66171268e4a configure.diff +160398f59781477186c4ae0502d3beb2 generator_private.hpp.diff +21dfaf10701d0f3a58c25d79a99cff1a global.hpp.diff +5c51a1a28e56d5725f99841dbbc30530 image.cpp.diff 59968804e93a18220d7d18e8252fff8d language.cpp.diff -b9890e1344f0f1d62bdf3e80cf4e4575 simple_wml.cpp.patch -b1e452e8138e3c573e92eb75f8a2d31a wesnoth-1.7.13.tar.bz2 +29edd308920e8e44317fffb92eb19eb4 marked-up_text.cpp.diff +3a8d9b365df3c142bac7dd4188e963b5 simple_wml.cpp.diff +493826bbd9ba355930765a7e8fe3749a wesnoth-1.6.5.tar.bz2 Added: csw/mgar/pkg/wesnoth/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/configure.diff (rev 0) +++ csw/mgar/pkg/wesnoth/trunk/files/configure.diff 2010-03-12 21:29:16 UTC (rev 9117) @@ -0,0 +1,16 @@ +--- wesnoth-1.6.5/configure 2009-09-06 18:46:43.000000000 +0200 ++++ wesnoth-1.6.5.new/configure 2010-03-11 18:32:48.463409914 +0100 +@@ -6004,10 +6004,10 @@ then + # Don't use ansi for CFLAGS since it fails to compile. + CFLAGS="-O0 -DDEBUG -ggdb3 -W -Wall $CFLAGS" + CXXFLAGS="-O0 -DDEBUG -ggdb3 -W -Wall -ansi $CXXFLAGS" +-else ++#else + # Don't use ansi for CFLAGS since it fails to compile. +- CFLAGS="-O2 -W -Wall $CFLAGS" +- CXXFLAGS="-O2 -W -Wall -ansi $CXXFLAGS" ++ #CFLAGS="-O2 -W -Wall $CFLAGS" ++ #CXXFLAGS="-O2 -W -Wall -ansi $CXXFLAGS" + fi + + if test "x$profile" = "xyes" Deleted: csw/mgar/pkg/wesnoth/trunk/files/configure.patch =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/configure.patch 2010-03-12 21:01:13 UTC (rev 9116) +++ csw/mgar/pkg/wesnoth/trunk/files/configure.patch 2010-03-12 21:29:16 UTC (rev 9117) @@ -1,12 +0,0 @@ -diff -rupN wesnoth-1.4.7/configure wesnoth-1.4.7.new//configure ---- wesnoth-1.4.7/configure 2008-12-12 22:20:25.000000000 +0100 -+++ wesnoth-1.4.7.new//configure 2010-03-03 23:58:23.966426235 +0100 -@@ -5917,8 +5917,6 @@ fi - if test "x$debug" = "xyes" - then - CXXFLAGS="$CXXFLAGS -O0 -DDEBUG -ggdb3 -W -Wall -ansi" --else -- CXXFLAGS="-O2 -W -Wall -ansi $CXXFLAGS" - fi - - if test "x$profile" = "xyes" Added: csw/mgar/pkg/wesnoth/trunk/files/generator_private.hpp.diff =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/generator_private.hpp.diff (rev 0) +++ csw/mgar/pkg/wesnoth/trunk/files/generator_private.hpp.diff 2010-03-12 21:29:16 UTC (rev 9117) @@ -0,0 +1,71 @@ +--- wesnoth-1.6.5/src/gui/widgets/generator_private.hpp 2009-03-15 13:06:50.000000000 +0100 ++++ wesnoth-1.6.5.new/src/gui/widgets/generator_private.hpp 2010-03-11 19:33:14.173591965 +0100 +@@ -170,7 +170,7 @@ struct thorizontal_list + * @return The best size, + */ + tpoint calculate_best_size() const +- { ERROR_LOG(false); } ++ { ERROR_LOG(false); return tpoint(0,0); } + + /** + * Sets the size of the generator. +@@ -198,11 +198,11 @@ struct thorizontal_list + { ERROR_LOG(false); } + + /** Inherited from tgenerator_. */ +- twidget* find_widget(const tpoint&, const bool) { ERROR_LOG(false); } ++ twidget* find_widget(const tpoint&, const bool) { ERROR_LOG(false); return NULL;} + + /** Inherited from tgenerator_. */ + const twidget* find_widget(const tpoint&, const bool) const +- { ERROR_LOG(false); } ++ { ERROR_LOG(false); return NULL;} + + /***** ***** ***** ***** keyboard functions ***** ***** ***** *****/ + +@@ -299,7 +299,7 @@ struct tmatrix + + /** See thorizontal_list::calculate_best_size(). */ + tpoint calculate_best_size() const +- { ERROR_LOG(false); } ++ { ERROR_LOG(false); return tpoint(0,0); } + + /** See thorizontal_list::set_size(). */ + void set_size(const tpoint& /*origin*/, const tpoint& /*size*/) +@@ -314,11 +314,11 @@ struct tmatrix + { ERROR_LOG(false); } + + /** See thorizontal_list::find_widget(). */ +- twidget* find_widget(const tpoint&, const bool) { ERROR_LOG(false); } ++ twidget* find_widget(const tpoint&, const bool) { ERROR_LOG(false); return NULL; } + + /** See thorizontal_list::find_widget(). */ + const twidget* find_widget(const tpoint&, const bool) const +- { ERROR_LOG(false); } ++ { ERROR_LOG(false); return NULL; } + + /***** ***** ***** ***** keyboard functions ***** ***** ***** *****/ + +@@ -354,7 +354,7 @@ struct tindependant + + /** See thorizontal_list::calculate_best_size(). */ + tpoint calculate_best_size() const +- { ERROR_LOG(false); } ++ { ERROR_LOG(false); return tpoint(0,0); } + + /** See thorizontal_list::set_size(). */ + void set_size(const tpoint& /*origin*/, const tpoint& /*size*/) +@@ -369,11 +369,11 @@ struct tindependant + { ERROR_LOG(false); } + + /** See thorizontal_list::find_widget(). */ +- twidget* find_widget(const tpoint&, const bool) { ERROR_LOG(false); } ++ twidget* find_widget(const tpoint&, const bool) { ERROR_LOG(false); return NULL; } + + /** See thorizontal_list::find_widget(). */ + const twidget* find_widget(const tpoint&, const bool) const +- { ERROR_LOG(false); } ++ { ERROR_LOG(false); return NULL; } + + /***** ***** ***** ***** keyboard functions ***** ***** ***** *****/ + Added: csw/mgar/pkg/wesnoth/trunk/files/global.hpp.diff =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/global.hpp.diff (rev 0) +++ csw/mgar/pkg/wesnoth/trunk/files/global.hpp.diff 2010-03-12 21:29:16 UTC (rev 9117) @@ -0,0 +1,11 @@ +--- wesnoth-1.6.5/src/global.hpp 2009-01-01 11:28:26.000000000 +0100 ++++ wesnoth-1.6.5.new/src/global.hpp 2010-03-12 20:48:48.684634033 +0100 +@@ -29,3 +29,8 @@ + #endif + + #endif ++ ++#include ++#include ++#include ++#include Deleted: csw/mgar/pkg/wesnoth/trunk/files/global.hpp.patch =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/global.hpp.patch 2010-03-12 21:01:13 UTC (rev 9116) +++ csw/mgar/pkg/wesnoth/trunk/files/global.hpp.patch 2010-03-12 21:29:16 UTC (rev 9117) @@ -1,9 +0,0 @@ -diff -rupN wesnoth-1.4.7/src/global.hpp wesnoth-1.4.7.new/src/global.hpp ---- wesnoth-1.4.7/src/global.hpp 2008-02-16 09:47:16.000000000 +0100 -+++ wesnoth-1.4.7.new/src/global.hpp 2010-03-04 01:40:03.524211569 +0100 -@@ -80,3 +80,5 @@ namespace std { - - #endif - #endif -+ -+#include Added: csw/mgar/pkg/wesnoth/trunk/files/image.cpp.diff =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/image.cpp.diff (rev 0) +++ csw/mgar/pkg/wesnoth/trunk/files/image.cpp.diff 2010-03-12 21:29:16 UTC (rev 9117) @@ -0,0 +1,11 @@ +--- wesnoth-1.6.5/src/gui/widgets/image.cpp 2009-08-18 21:47:08.000000000 +0200 ++++ wesnoth-1.6.5.new/src/gui/widgets/image.cpp 2010-03-11 19:23:36.284806844 +0100 +@@ -22,7 +22,7 @@ namespace gui2 { + + tpoint timage::calculate_best_size() const + { +- surface image(get_image(image::locator(label()))); ++ surface image(image::get_image(image::locator(label()))); + + tpoint result(0, 0); + if(image) { Added: csw/mgar/pkg/wesnoth/trunk/files/marked-up_text.cpp.diff =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/marked-up_text.cpp.diff (rev 0) +++ csw/mgar/pkg/wesnoth/trunk/files/marked-up_text.cpp.diff 2010-03-12 21:29:16 UTC (rev 9117) @@ -0,0 +1,11 @@ +--- wesnoth-1.6.5/src/marked-up_text.cpp 2009-08-07 04:24:48.000000000 +0200 ++++ wesnoth-1.6.5.new/src/marked-up_text.cpp 2010-03-11 21:33:02.491029941 +0100 +@@ -219,7 +219,7 @@ SDL_Rect draw_text(CVideo* gui, const SD + const SDL_Color& colour, const std::string& txt, + int x, int y, bool use_tooltips, int style) + { +- return draw_text(gui != NULL ? gui->getSurface() : NULL, area, size, colour, txt, x, y, use_tooltips, style); ++ return draw_text((gui != NULL ? gui->getSurface() : (surface)NULL), area, size, colour, txt, x, y, use_tooltips, style); + } + + bool is_format_char(char c) Added: csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.diff =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.diff (rev 0) +++ csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.diff 2010-03-12 21:29:16 UTC (rev 9117) @@ -0,0 +1,9 @@ +--- wesnoth-1.6.5/src/server/simple_wml.cpp 2009-09-01 20:36:12.000000000 +0200 ++++ wesnoth-1.6.5.new/src/server/simple_wml.cpp 2010-03-12 20:03:24.441033156 +0100 +@@ -1,3 +1,6 @@ ++#include ++#include ++ + #include + #include + Deleted: csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.patch =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.patch 2010-03-12 21:01:13 UTC (rev 9116) +++ csw/mgar/pkg/wesnoth/trunk/files/simple_wml.cpp.patch 2010-03-12 21:29:16 UTC (rev 9117) @@ -1,11 +0,0 @@ -diff -rupN wesnoth-1.4.7/src/server/simple_wml.cpp wesnoth-1.4.7.new/src/server/simple_wml.cpp ---- wesnoth-1.4.7/src/server/simple_wml.cpp 2008-03-29 19:05:38.000000000 +0100 -+++ wesnoth-1.4.7.new/src/server/simple_wml.cpp 2010-03-04 00:07:07.874792552 +0100 -@@ -1,3 +1,7 @@ -+#include -+#include -+#include -+ - #include - #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 Fri Mar 12 22:47:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Mar 2010 21:47:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9118] csw/mgar/pkg/gcpio/trunk Message-ID: Revision: 9118 http://gar.svn.sourceforge.net/gar/?rev=9118&view=rev Author: dmichelsen Date: 2010-03-12 21:47:30 +0000 (Fri, 12 Mar 2010) Log Message: ----------- gcpio: Update to 2.11, still doesn't compile, bug reported Modified Paths: -------------- csw/mgar/pkg/gcpio/trunk/Makefile csw/mgar/pkg/gcpio/trunk/checksums Modified: csw/mgar/pkg/gcpio/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcpio/trunk/Makefile 2010-03-12 21:29:16 UTC (rev 9117) +++ csw/mgar/pkg/gcpio/trunk/Makefile 2010-03-12 21:47:30 UTC (rev 9118) @@ -1,5 +1,5 @@ GARNAME = cpio -GARVERSION = 2.10 +GARVERSION = 2.11 CATEGORIES = utils DESCRIPTION = GNU cpio @@ -29,3 +29,8 @@ #EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias include gar/category.mk + +post-merge: + ginstall -d $(PKGROOT)$(prefix)/gnu + gln -s ../bin/gcpio $(PKGROOT)$(prefix)/gnu/cpio + @$(MAKECOOKIE) Modified: csw/mgar/pkg/gcpio/trunk/checksums =================================================================== --- csw/mgar/pkg/gcpio/trunk/checksums 2010-03-12 21:29:16 UTC (rev 9117) +++ csw/mgar/pkg/gcpio/trunk/checksums 2010-03-12 21:47:30 UTC (rev 9118) @@ -1,2 +1,2 @@ -351ab3d38d8949913e478cc23b9d6ad4 cpio-2.10.tar.gz +1112bb6c45863468b5496ba128792f6c cpio-2.11.tar.gz ff86aab1185277a2ae53928e4bd01692 non-gnu-compiler.patch 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 Mar 13 00:01:24 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 12 Mar 2010 23:01:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9119] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 9119 http://gar.svn.sourceforge.net/gar/?rev=9119&view=rev Author: chninkel Date: 2010-03-12 23:00:51 +0000 (Fri, 12 Mar 2010) Log Message: ----------- openssl: updated to 0.9.8m Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype csw/mgar/pkg/openssl/trunk/files/changelog.CSW csw/mgar/pkg/openssl/trunk/files/more_configure_targets.patch Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2010-03-12 21:47:30 UTC (rev 9118) +++ csw/mgar/pkg/openssl/trunk/Makefile 2010-03-12 23:00:51 UTC (rev 9119) @@ -41,9 +41,11 @@ SPKG_DESC_CSWosslutils = Openssl binaries and related tools CATALOGNAME_CSWosslutils = openssl_utils -RUNTIME_DEP_PKGS_CSWosslutils = CSWosslrt CSWcswclassutils +RUNTIME_DEP_PKGS_CSWosslutils = CSWosslrt SPKG_CLASSES_CSWosslutils = none cswpreserveconf +# we use sun perl not csw one +CHECKPKG_OVERRIDES_CSWosslutils = missing-dependency|CSWperl ###### Upstream and opencsw files information ####### @@ -65,6 +67,7 @@ # solaris-386-cc, solaris-pentium-cc, solaris-pentium_pro-cc, solaris-sparcv9+vis-cc PATCHFILES = more_configure_targets.patch +LICENSE=LICENSE ##### Build and installation information ##### Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2010-03-12 21:47:30 UTC (rev 9118) +++ csw/mgar/pkg/openssl/trunk/checksums 2010-03-12 23:00:51 UTC (rev 9119) @@ -1,13 +1,13 @@ -66ea60c5a5446d9ac900b39bc36f6afa CSWossl.prototype -84293971f7dee23869728b6434b02abe CSWossldevel.prototype-i386 -b5193ec99f643aa22156f62ee965aa82 CSWossldevel.prototype-sparc +88d71b493eb56f5a1ebf67cf33c70b9a CSWossl.prototype +2e4bcd020bc30e6eff133c7080ae1d45 CSWossldevel.prototype-i386 +d540546aeb138172a4f6b27a576f8059 CSWossldevel.prototype-sparc 05ace5330714d6cd9c0e076b6ae2518f CSWosslrt.checkinstall 1c3f600eaf942a18ecab3637e1fc32bd CSWosslrt.postinstall c9de908daad1a31fca20329cb043ad3c CSWosslrt.preinstall -8b14ea8718a295d97ace5d7933a957d1 CSWosslrt.prototype-i386 -521028d0016ae5a4cc8fd5e0b0add53f CSWosslrt.prototype-sparc -88634d81695a173bdb35df1a80cc9761 CSWosslutils.prototype +b2fb1179d94e57e9c0127c987613d5fb CSWosslrt.prototype-i386 +2b956d4877de436a584dc6e09574c8d8 CSWosslrt.prototype-sparc +1cb63bd3d00639f0aee05fdf96651d95 CSWosslutils.prototype b78faa440d6f6a2a07663de331678648 README.CSW -87a4157f907147ec2c8319698c8ab111 changelog.CSW -64f7c3f3a6cae483209b69c31c82557d more_configure_targets.patch +9936ba7d9b07b5b5e27369434000413d changelog.CSW +84830e15846f1b20d8371c1fa375a0b1 more_configure_targets.patch 898bf125370926d5f692a2201124f8ec openssl-0.9.8m.tar.gz Modified: csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype 2010-03-12 21:47:30 UTC (rev 9118) +++ csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype 2010-03-12 23:00:51 UTC (rev 9119) @@ -1,5 +1,6 @@ d none /opt/csw/share/doc/openssl 0755 root bin f none /opt/csw/share/doc/openssl/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl/license 644 root bin f none /opt/csw/share/doc/openssl/CHANGES 644 root bin f none /opt/csw/share/doc/openssl/CHANGES.SSLeay 644 root bin f none /opt/csw/share/doc/openssl/PROBLEMS 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2010-03-12 21:47:30 UTC (rev 9118) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2010-03-12 23:00:51 UTC (rev 9119) @@ -1042,6 +1042,7 @@ f none /opt/csw/share/man/man3/ui_compat.3 0644 root bin f none /opt/csw/share/man/man3/x509.3 0644 root bin f none /opt/csw/share/doc/openssl_devel/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_devel/license 644 root bin f none /opt/csw/share/doc/openssl_devel/CHANGES 644 root bin f none /opt/csw/share/doc/openssl_devel/CHANGES.SSLeay 644 root bin f none /opt/csw/share/doc/openssl_devel/PROBLEMS 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2010-03-12 21:47:30 UTC (rev 9118) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2010-03-12 23:00:51 UTC (rev 9119) @@ -1042,6 +1042,7 @@ f none /opt/csw/share/man/man3/ui_compat.3 0644 root bin f none /opt/csw/share/man/man3/x509.3 0644 root bin f none /opt/csw/share/doc/openssl_devel/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_devel/license 644 root bin f none /opt/csw/share/doc/openssl_devel/CHANGES 644 root bin f none /opt/csw/share/doc/openssl_devel/CHANGES.SSLeay 644 root bin f none /opt/csw/share/doc/openssl_devel/PROBLEMS 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 2010-03-12 21:47:30 UTC (rev 9118) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 2010-03-12 23:00:51 UTC (rev 9119) @@ -31,6 +31,7 @@ d none /etc/opt/csw/ssl/private 0700 root bin s none /opt/csw/etc/ssl/private=../../../../etc/opt/csw/ssl/private f none /opt/csw/share/doc/openssl_rt/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_rt/license 644 root bin f none /opt/csw/share/doc/openssl_rt/CHANGES 644 root bin f none /opt/csw/share/doc/openssl_rt/CHANGES.SSLeay 644 root bin f none /opt/csw/share/doc/openssl_rt/PROBLEMS 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc 2010-03-12 21:47:30 UTC (rev 9118) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc 2010-03-12 23:00:51 UTC (rev 9119) @@ -35,6 +35,7 @@ d none /etc/opt/csw/ssl/private 0700 root bin s none /opt/csw/etc/ssl/private=../../../../etc/opt/csw/ssl/private f none /opt/csw/share/doc/openssl_rt/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_rt/license 644 root bin f none /opt/csw/share/doc/openssl_rt/CHANGES 644 root bin f none /opt/csw/share/doc/openssl_rt/CHANGES.SSLeay 644 root bin f none /opt/csw/share/doc/openssl_rt/PROBLEMS 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype 2010-03-12 21:47:30 UTC (rev 9118) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype 2010-03-12 23:00:51 UTC (rev 9119) @@ -64,6 +64,7 @@ d none /opt/csw/etc/ssl 0755 root bin f cswpreserveconf /opt/csw/etc/ssl/openssl.cnf.CSW 0644 root bin f none /opt/csw/share/doc/openssl_utils/changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_utils/license 644 root bin f none /opt/csw/share/doc/openssl_utils/CHANGES 644 root bin f none /opt/csw/share/doc/openssl_utils/CHANGES.SSLeay 644 root bin f none /opt/csw/share/doc/openssl_utils/PROBLEMS 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2010-03-12 21:47:30 UTC (rev 9118) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2010-03-12 23:00:51 UTC (rev 9119) @@ -1,8 +1,9 @@ -openssl (0.9.8m,REV=2010.02.27) unstable +openssl (0.9.8m,REV=2010.03.13) unstable * New upstream version. + * Added license file. - -- Yann Rouillard Sat, 27 Feb 2010 11:30:08 +0100 + -- Yann Rouillard Sat, 13 Mar 2010 11:30:08 +0100 openssl (0.9.8l,REV=2009.12.08) unstable Modified: csw/mgar/pkg/openssl/trunk/files/more_configure_targets.patch =================================================================== --- csw/mgar/pkg/openssl/trunk/files/more_configure_targets.patch 2010-03-12 21:47:30 UTC (rev 9118) +++ csw/mgar/pkg/openssl/trunk/files/more_configure_targets.patch 2010-03-12 23:00:51 UTC (rev 9119) @@ -1,26 +1,21 @@ -diff -ur openssl-0.9.8i.orig/Configure openssl-0.9.8i/Configure ---- openssl-0.9.8i.orig/Configure 2008-09-12 16:47:00.000000000 +0200 -+++ openssl-0.9.8i/Configure 2008-09-26 21:39:48.373741600 +0200 -@@ -199,8 +199,12 @@ - "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +diff -ur openssl-0.9.8m.orig/Configure openssl-0.9.8m/Configure +-- /openssl-0.9.8m.orig/Configure 2010-02-28 17:05:23.990756297 +0100 ++++ openssl-0.9.8m/Configure 2010-02-28 17:19:37.069486305 +0100 +@@ -213,6 +213,9 @@ #### 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)", --"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}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-x86-cc","cc:-fast -xdepend=no -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-386-cc","cc:-fast -xdepend=no -xarch=386 -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-cc","cc:-fast -xdepend=no -xpentium -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 -xdepend=no -xarch=pentium_pro -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 -xdepend=no -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}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "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-386-cc","cc:-fast -xarch=386 -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-cc","cc:-fast -xpentium -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 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### SPARC Solaris with GNU C setups - "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -@@ -219,6 +223,7 @@ +@@ -232,6 +235,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.o:des_enc-sparc.o fcrypt_b.o:::::::::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::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::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::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::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:::des_enc-sparc.o fcrypt_b.o:::::::::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:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", #### "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_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.o::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Mar 13 01:50:18 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 13 Mar 2010 00:50:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[9120] csw/mgar/pkg/namebench/trunk/Makefile Message-ID: Revision: 9120 http://gar.svn.sourceforge.net/gar/?rev=9120&view=rev Author: bonivart Date: 2010-03-13 00:50:18 +0000 (Sat, 13 Mar 2010) Log Message: ----------- namebench: fix source url Modified Paths: -------------- csw/mgar/pkg/namebench/trunk/Makefile Modified: csw/mgar/pkg/namebench/trunk/Makefile =================================================================== --- csw/mgar/pkg/namebench/trunk/Makefile 2010-03-12 23:00:51 UTC (rev 9119) +++ csw/mgar/pkg/namebench/trunk/Makefile 2010-03-13 00:50:18 UTC (rev 9120) @@ -10,6 +10,8 @@ MASTER_SITES = http://namebench.googlecode.com/files/ DISTFILES = $(GARNAME)-$(GARVERSION)-source.tgz +SPKG_SOURCEURL = http://code.google.com/p/namebench + RUNTIME_DEP_PKGS = CSWpython-tk # 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 bonivart at users.sourceforge.net Sat Mar 13 02:10:37 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 13 Mar 2010 01:10:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9121] csw/mgar/pkg/nicstat/trunk Message-ID: Revision: 9121 http://gar.svn.sourceforge.net/gar/?rev=9121&view=rev Author: bonivart Date: 2010-03-13 01:10:32 +0000 (Sat, 13 Mar 2010) Log Message: ----------- nicstat: update to 1.22 Modified Paths: -------------- csw/mgar/pkg/nicstat/trunk/Makefile csw/mgar/pkg/nicstat/trunk/checksums Modified: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile 2010-03-13 00:50:18 UTC (rev 9120) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2010-03-13 01:10:32 UTC (rev 9121) @@ -1,5 +1,5 @@ GARNAME = nicstat -GARVERSION = 1.21 +GARVERSION = 1.22 CATEGORIES = net DESCRIPTION = Network monitoring tool @@ -24,8 +24,6 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -WORKSRC = $(WORKDIR) - ifeq ($(shell uname -p), sparc) MYARCH = -xarch=v8 else Modified: csw/mgar/pkg/nicstat/trunk/checksums =================================================================== --- csw/mgar/pkg/nicstat/trunk/checksums 2010-03-13 00:50:18 UTC (rev 9120) +++ csw/mgar/pkg/nicstat/trunk/checksums 2010-03-13 01:10:32 UTC (rev 9121) @@ -1 +1 @@ -14b7411916fa317920803d82346098dc nicstat-1.21.tar.gz +198299a6a899c618fa97776374e43e1a nicstat-1.22.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Mar 13 02:17:38 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 13 Mar 2010 01:17:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[9122] csw/mgar/pkg Message-ID: Revision: 9122 http://gar.svn.sourceforge.net/gar/?rev=9122&view=rev Author: bdwalton Date: 2010-03-13 01:17:38 +0000 (Sat, 13 Mar 2010) Log Message: ----------- magit: initial commit Added Paths: ----------- csw/mgar/pkg/magit/ csw/mgar/pkg/magit/branches/ csw/mgar/pkg/magit/tags/ csw/mgar/pkg/magit/trunk/ csw/mgar/pkg/magit/trunk/Makefile csw/mgar/pkg/magit/trunk/checksums csw/mgar/pkg/magit/trunk/files/ Property changes on: csw/mgar/pkg/magit/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/magit/trunk/Makefile =================================================================== --- csw/mgar/pkg/magit/trunk/Makefile (rev 0) +++ csw/mgar/pkg/magit/trunk/Makefile 2010-03-13 01:17:38 UTC (rev 9122) @@ -0,0 +1,37 @@ +GARNAME = magit +GARVERSION = 0.7 +PATCHLEVEL = 57f299 +CATEGORIES = utils + +ARCHALL = 1 + +DESCRIPTION = An Emacs Mode for Git +define BLURB +Magit is an interface to the version control system Git, implemented +as an extension to Emacs. +endef + +BUILD_DEP_PKGS = CSWautoconf CSWautomake CSWtexinfo + +GIT_REPOS = git://github.com/technomancy/magit.git +GIT_TREEISH = $(PATCHLEVEL) + +# We define upstream file regex so we can be notifed of new upstream +# software release +# 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 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +pre-configure-modulated: + @(cd $(WORKSRC); ./autogen.sh ) + @$(MAKECOOKIE) + +# When CSWemacs sprouts a nice auto-startup facility like Redhat or +# Debian, remove this... +post-install-modulated: + @(cd $(DESTDIR); rm -rf opt/csw/etc ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/magit/trunk/checksums =================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Mar 13 02:19:55 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 13 Mar 2010 01:19:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[9123] csw/mgar/pkg/magit/trunk/Makefile Message-ID: Revision: 9123 http://gar.svn.sourceforge.net/gar/?rev=9123&view=rev Author: bdwalton Date: 2010-03-13 01:19:55 +0000 (Sat, 13 Mar 2010) Log Message: ----------- magit: set install deps Modified Paths: -------------- csw/mgar/pkg/magit/trunk/Makefile Modified: csw/mgar/pkg/magit/trunk/Makefile =================================================================== --- csw/mgar/pkg/magit/trunk/Makefile 2010-03-13 01:17:38 UTC (rev 9122) +++ csw/mgar/pkg/magit/trunk/Makefile 2010-03-13 01:19:55 UTC (rev 9123) @@ -12,6 +12,7 @@ endef BUILD_DEP_PKGS = CSWautoconf CSWautomake CSWtexinfo +RUNTIME_DEP_PKGS = CSWgit CSWemacscommon GIT_REPOS = git://github.com/technomancy/magit.git GIT_TREEISH = $(PATCHLEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Mar 13 04:09:18 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 13 Mar 2010 03:09:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[9124] csw/mgar/pkg/ImageMagick/branches/64-bit/ Message-ID: Revision: 9124 http://gar.svn.sourceforge.net/gar/?rev=9124&view=rev Author: hson Date: 2010-03-13 03:09:18 +0000 (Sat, 13 Mar 2010) Log Message: ----------- imagemagick: Add a separate branch for my 64-bit tests Added Paths: ----------- csw/mgar/pkg/ImageMagick/branches/64-bit/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Mar 13 04:09:43 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 13 Mar 2010 03:09:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9125] csw/mgar/pkg/ImageMagick/branches/package-split/ Message-ID: Revision: 9125 http://gar.svn.sourceforge.net/gar/?rev=9125&view=rev Author: hson Date: 2010-03-13 03:09:42 +0000 (Sat, 13 Mar 2010) Log Message: ----------- imagemagick: Add a separate branch for my package split tests Added Paths: ----------- csw/mgar/pkg/ImageMagick/branches/package-split/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 13 09:32:52 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 13 Mar 2010 08:32:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9126] csw/mgar/gar/v2/categories/gnome/category.mk Message-ID: Revision: 9126 http://gar.svn.sourceforge.net/gar/?rev=9126&view=rev Author: wahwah Date: 2010-03-13 08:32:51 +0000 (Sat, 13 Mar 2010) Log Message: ----------- mGAR v2: gnome category, using EXTRA_PKG_CONFIG_DIRS; small style changes Modified Paths: -------------- csw/mgar/gar/v2/categories/gnome/category.mk Modified: csw/mgar/gar/v2/categories/gnome/category.mk =================================================================== --- csw/mgar/gar/v2/categories/gnome/category.mk 2010-03-13 03:09:42 UTC (rev 9125) +++ csw/mgar/gar/v2/categories/gnome/category.mk 2010-03-13 08:32:51 UTC (rev 9126) @@ -1,5 +1,5 @@ # pkg-config options -EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig +EXTRA_PKG_CONFIG_DIRS += /opt/csw/X11/lib MSGFMT= /opt/csw/bin/gmsgfmt MSGMERGE= /opt/csw/bin/gmsgmerge @@ -11,7 +11,9 @@ export GETTEXT # Perhaps there is a category-level variable set? -EXTRA_INC ?= /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include -EXTRA_LIB ?= /opt/csw/X11/lib +EXTRA_INC += /opt/csw/X11/include +EXTRA_INC += /usr/X11/include +EXTRA_INC += /usr/openwin/share/include +EXTRA_LIB += /opt/csw/X11/lib include gar/gar.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 13 09:35:34 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 13 Mar 2010 08:35:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[9127] csw/mgar/gar/v2/lib Message-ID: Revision: 9127 http://gar.svn.sourceforge.net/gar/?rev=9127&view=rev Author: wahwah Date: 2010-03-13 08:35:34 +0000 (Sat, 13 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, moving the IndividualCheckInterface class to the module top level, removing the direct use of SystemPkgmap from checkpkg.GetLinesBySoname() Modified Paths: -------------- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py csw/mgar/gar/v2/lib/python/opencsw.py Property Changed: ---------------- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py Modified: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py 2010-03-13 08:32:51 UTC (rev 9126) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py 2010-03-13 08:35:34 UTC (rev 9127) @@ -1,5 +1,5 @@ #!/opt/csw/bin/python2.6 -# $Id: checkpkg-you-can-write-your-own.py 8571 2010-02-16 09:05:51Z wahwah $ +# $Id$ """This is a dummy module. You can use it as a boilerplate for your own modules. Property changes on: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py 2010-03-13 08:32:51 UTC (rev 9126) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py 2010-03-13 08:35:34 UTC (rev 9127) @@ -64,8 +64,11 @@ pkgmap = checkpkg.SystemPkgmap() logging.debug("Determining the soname-package relationships.") # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog + runpath_data_by_soname = {} + for soname in needed_sonames: + runpath_data_by_soname[soname] = pkgmap.GetPkgmapLineByBasename(soname) lines_by_soname = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + runpath_data_by_soname, needed_sonames, runpath_by_needed_soname, isalist) # Creating a map from files to packages. pkgs_by_filename = {} Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-13 08:32:51 UTC (rev 9126) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-13 08:35:34 UTC (rev 9127) @@ -600,7 +600,9 @@ return runpath -def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): +def GetLinesBySoname(runpath_data_by_soname, + needed_sonames, + runpath_by_needed_soname, isalist): """Works out which system pkgmap lines correspond to given sonames.""" lines_by_soname = {} for soname in needed_sonames: @@ -611,11 +613,11 @@ runpath = SanitizeRunpath(runpath) runpath_list = ExpandRunpath(runpath, isalist) runpath_list = Emulate64BitSymlinks(runpath_list) - soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) # Emulating the install time symlinks, for instance, if the prototype contains # /opt/csw/lib/i386/foo.so.0 and /opt/csw/lib/i386 is a symlink to ".", - # the shared library ends up in /opt/csw/lib/foo.so.0 and should be findable even when - # RPATH does not contain $ISALIST. + # the shared library ends up in /opt/csw/lib/foo.so.0 and should be + # findable even when RPATH does not contain $ISALIST. + soname_runpath_data = runpath_data_by_soname[soname] new_soname_runpath_data = {} for p in soname_runpath_data: expanded_p_list = Emulate64BitSymlinks([p]) @@ -803,46 +805,53 @@ return errors -class CheckpkgManager2(CheckpkgManagerBase): - """The second incarnation of the checkpkg manager. +class CheckInterfaceBase(object): + """Base class for check proxies. - Implements the API to be used by checking functions. + It wraps access to the /var/sadm/install/contents cache. + """ - Its purpose is to reduce the amount of boilerplate code and allow for easier - unit test writing. + def __init__(self, system_pkgmap=None): + self.system_pkgmap = system_pkgmap + if not self.system_pkgmap: + self.system_pkgmap = SystemPkgmap() + + +class IndividualCheckInterface(CheckInterfaceBase): + """To be passed to the checking functions. + + Wraps the creation of CheckpkgTag objects. """ - class CheckInterfaceBase(object): - """Base class for check proxies. - It wraps access to the /var/sadm/install/contents cache. - """ + def __init__(self, pkgname, system_pkgmap=None): + super(IndividualCheckInterface, self).__init__(system_pkgmap) + self.pkgname = pkgname + self.errors = [] - def __init__(self, system_pkgmap): - self.system_pkgmap = system_pkgmap + def ReportError(self, tag_name, tag_info=None, msg=None): + tag = CheckpkgTag(self.pkgname, tag_name, tag_info, msg) + self.errors.append(tag) - class IndividualCheckInterface(CheckInterfaceBase): - """To be passed to the checking functions. - Wraps the creation of CheckpkgTag objects. - """ +def SetCheckInterface(object): + """To be passed to set checking functions.""" + def __init__(self, system_pkgmap): + super(SetCheckInterface, self).__init__(system_pkgmap) + self.errors = [] - def __init__(self, pkgname): - self.pkgname = pkgname - self.errors = [] + def ReportError(self, pkgname, tag_name, tag_info=None, msg=None): + tag = CheckpkgTag(pkgname, tag_name, tag_info, msg) + self.errors.append(tag) - def ReportError(self, tag_name, tag_info=None, msg=None): - self.errors.append( - CheckpkgTag(self.pkgname, tag_name, tag_info, msg)) - def SetCheckInterface(object): - """To be bassed to set checking functions.""" - def __init__(self): - self.errors = [] +class CheckpkgManager2(CheckpkgManagerBase): + """The second incarnation of the checkpkg manager. - def ReportError(self, pkgname, tag_name, tag_info=None, msg=None): - self.errors.append( - CheckpkgTag(pkgname, tag_name, tag_info, msg)) + Implements the API to be used by checking functions. + Its purpose is to reduce the amount of boilerplate code and allow for easier + unit test writing. + """ def _RegisterIndividualCheck(self, function): self.individual_checks.append(function) @@ -875,7 +884,7 @@ for function in self.individual_checks: all_stats = pkg_data.GetAllStats() pkgname = all_stats["basic_stats"]["pkgname"] - check_interface = self.IndividualCheckInterface(pkgname) + check_interface = IndividualCheckInterface(pkgname) logger = logging.getLogger("%s-%s" % (pkgname, function.__name__)) logger.debug("Calling %s", function.__name__) function(all_stats, check_interface, logger=logger) @@ -885,7 +894,7 @@ for function in self.set_checks: pkgs_data = [x.GetAllStats() for x in packages_data] logger = logging.getLogger("SetCheck-%s" % (function.__name__,)) - check_interface = self.SetCheckInterface() + check_interface = SetCheckInterface() logger.debug("Calling %s", function.__name__) function(pkgs_data, check_interface, logger) if check_interface.errors: Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-13 08:32:51 UTC (rev 9126) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-13 08:35:34 UTC (rev 9127) @@ -292,14 +292,6 @@ class GetLinesBySonameUnitTest(unittest.TestCase): - class PkgmapStub(object): - - def __init__(self, cache): - self.cache = cache - - def GetPkgmapLineByBasename(self, soname): - return self.cache[soname] - def setUp(self): self.pkgmap_mocker = mox.Mox() @@ -377,62 +369,52 @@ def testGetLinesBySoname(self): expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = {"/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo"} - # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") + runpath_data_by_soname = { + "foo.so.1": { + "/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/usr/lib": "/usr/lib/foo.so.1 foo"}, + } needed_sonames = set(["foo.so.1"]) runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() + result = checkpkg.GetLinesBySoname(runpath_data_by_soname, needed_sonames, + runpath_by_needed_soname, isalist) self.assertEqual(expected, result) def testGetLinesBySoname_3(self): expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = { - "/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo"} - # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") + runpath_data_by_soname = { + "foo.so.1": { + "/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", + "/usr/lib": "/usr/lib/foo.so.1 foo", + } + } needed_sonames = set(["foo.so.1"]) runpath_by_needed_soname = { "foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() + result = checkpkg.GetLinesBySoname(runpath_data_by_soname, needed_sonames, + runpath_by_needed_soname, isalist) self.assertEqual(expected, result) def testGetLinesBySoname_4(self): """A more complex test, four ISAs.""" expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = { - "/opt/csw/lib/isa-value-1": - "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/mysql5/lib/isa-value-2": - "/opt/csw/mysql5/lib/isa-value-2/foo.so.1 foo", - "/opt/csw/mysql5/lib/isa-value-1": - "/opt/csw/mysql5/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/lib": - "/opt/csw/lib/foo.so.1 foo", - "/usr/lib": - "/usr/lib/foo.so.1 foo"} - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") + runpath_data_by_soname = { + "foo.so.1": { + "/opt/csw/lib/isa-value-1": + "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/mysql5/lib/isa-value-2": + "/opt/csw/mysql5/lib/isa-value-2/foo.so.1 foo", + "/opt/csw/mysql5/lib/isa-value-1": + "/opt/csw/mysql5/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/lib": + "/opt/csw/lib/foo.so.1 foo", + "/usr/lib": + "/usr/lib/foo.so.1 foo" + } + } needed_sonames = set(["foo.so.1"]) runpath_by_needed_soname = { "foo.so.1": ["/opt/csw/mysql5/lib/$ISALIST/mysql", @@ -440,41 +422,40 @@ "/usr/lib"]} isalist = ["isa-value-1", "isa-value-2"] result = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + runpath_data_by_soname, needed_sonames, runpath_by_needed_soname, isalist) self.pkgmap_mocker.VerifyAll() self.assertEqual(expected, result) def testGetLinesBySoname_5(self): - """Based on CSWmysql5client on build8x.""" + """Based on CSWmysql5client on build8x (5).""" soname = u'libm.so.1' expected = {u'libm.so.1': u'/usr/lib/libm.so.1 f none 0755 root bin ' u'99844 3884 1050525375 SUNWlibms\n'} - - pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + runpath_data_by_soname = d6.DATA_PKGMAP_CACHE (needed_sonames, binaries_by_soname, runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( d6.DATA_NEEDED_SONAMES_BY_BINARY) result = checkpkg.GetLinesBySoname( - pkgmap_stub, + runpath_data_by_soname, set([soname]), runpath_by_needed_soname, d6.DATA_ISALIST) self.assertEqual(expected, result) def testGetLinesBySoname_6(self): - """Based on CSWmysql5client on build8x.""" + """Based on CSWmysql5client on build8x (6).""" soname = u'libz.so.1' expected = { u'libz.so.1': u'/opt/csw/lib/pentium_pro+mmx/libz.so.1=libz.so.1.2.3 ' u's none CSWzlib\n'} - pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + runpath_data_by_soname = d6.DATA_PKGMAP_CACHE (needed_sonames, binaries_by_soname, runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( d6.DATA_NEEDED_SONAMES_BY_BINARY) result = checkpkg.GetLinesBySoname( - pkgmap_stub, + runpath_data_by_soname, set([soname]), runpath_by_needed_soname, d6.DATA_ISALIST) @@ -488,7 +469,7 @@ u'libncursesw.so.5': u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 ' u's none CSWncurses\n'} - pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + runpath_data_by_soname = d6.DATA_PKGMAP_CACHE (needed_sonames, binaries_by_soname, runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( @@ -497,7 +478,7 @@ isalist = ['amd64', 'pentium_pro+mmx', 'pentium_pro', 'pentium+mmx', 'pentium', 'i486', 'i386', 'i86'] result = checkpkg.GetLinesBySoname( - pkgmap_stub, + runpath_data_by_soname, set([soname]), runpath_by_needed_soname, isalist) @@ -505,16 +486,17 @@ def testGetLinesBySoname_8(self): expected = {'foo.so.1': '/opt/csw/postgresql/lib/foo.so.1 foo'} - lines1 = {"/opt/csw/postgresql/lib": "/opt/csw/postgresql/lib/foo.so.1 foo"} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() + runpath_data_by_soname = { + "foo.so.1": { + "/opt/csw/postgresql/lib": "/opt/csw/postgresql/lib/foo.so.1 foo", + } + } needed_sonames = set(["foo.so.1"]) runpath_by_needed_soname = { "foo.so.1": ["/opt/csw/postgresql/lib/", "/usr/lib"]} isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() + result = checkpkg.GetLinesBySoname( + runpath_data_by_soname, needed_sonames, runpath_by_needed_soname, isalist) self.assertEqual(expected, result) def testGetLinesBySoname_9(self): @@ -524,16 +506,16 @@ end up in /opt/csw/lib instead. """ expected = {'foo.so.0': '/opt/csw/lib/i386/foo.so.0 foo'} - lines1 = {"/opt/csw/lib/i386": "/opt/csw/lib/i386/foo.so.0 foo"} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo.so.0").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() + runpath_data_by_soname = { + "foo.so.0": { + "/opt/csw/lib/i386": "/opt/csw/lib/i386/foo.so.0 foo", + } + } needed_sonames = set(["foo.so.0"]) runpath_by_needed_soname = {"foo.so.0": ["/opt/csw/lib", "/usr/lib"]} isalist = ["isa-value-1", "isa-value-2"] result = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() + runpath_data_by_soname, needed_sonames, runpath_by_needed_soname, isalist) self.assertEqual(expected, result) def testSanitizeRunpath_1(self): Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-13 08:32:51 UTC (rev 9126) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-13 08:35:34 UTC (rev 9127) @@ -312,7 +312,7 @@ def FormatMail(self): return self._FormatMail(self.paths, self.pkgnames, self.sender, - self.release_mgr, self.release_cc) + self.release_mgr, self.release_cc) def _GetPkgsData(self, paths): """Gathering package info, grouping packages that are upgraded together.""" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 13 10:55:32 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 13 Mar 2010 09:55:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9128] csw/mgar/gar/v2-git Message-ID: Revision: 9128 http://gar.svn.sourceforge.net/gar/?rev=9128&view=rev Author: wahwah Date: 2010-03-13 09:55:32 +0000 (Sat, 13 Mar 2010) Log Message: ----------- mGAR v2-git: Merging changes from v2. Modified Paths: -------------- csw/mgar/gar/v2-git/bin/analyze_module_results.py csw/mgar/gar/v2-git/bin/checkpkg csw/mgar/gar/v2-git/bin/checkpkg_collect_stats.py csw/mgar/gar/v2-git/bin/update_contents_cache.py csw/mgar/gar/v2-git/categories/gnome/category.mk csw/mgar/gar/v2-git/categories/python/category.mk csw/mgar/gar/v2-git/gar.conf.mk csw/mgar/gar/v2-git/gar.lib.mk csw/mgar/gar/v2-git/gar.mk csw/mgar/gar/v2-git/gar.pkg.mk csw/mgar/gar/v2-git/lib/python/checkpkg.py csw/mgar/gar/v2-git/lib/python/checkpkg_test.py csw/mgar/gar/v2-git/lib/python/opencsw.py csw/mgar/gar/v2-git/lib/python/opencsw_test.py csw/mgar/gar/v2-git/lib/python/package_checks.py csw/mgar/gar/v2-git/lib/python/package_checks_test.py csw/mgar/gar/v2-git/lib/python/submit_to_newpkgs.py csw/mgar/gar/v2-git/tests/run_tests.py Added Paths: ----------- csw/mgar/gar/v2-git/lib/checkpkg.d/ csw/mgar/gar/v2-git/lib/checkpkg.d/README csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-actionclasses.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-archall.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-auto.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-basic.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-license.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-missing-symbols.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-you-can-write-your-own.py csw/mgar/gar/v2-git/lib/python/package_checks_old.py csw/mgar/gar/v2-git/lib/python/package_checks_old_test.py csw/mgar/gar/v2-git/lib/python/testdata/stats/ csw/mgar/gar/v2-git/lib/python/testdata/stats/46/ csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/ csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/all_filenames.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/basic_stats.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/binaries.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/binaries_dump_info.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/depends.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/isalist.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/overrides.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkginfo.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkgmap.yml Removed Paths: ------------- csw/mgar/gar/v2-git/bin/checkpkg.d/ csw/mgar/gar/v2-git/lib/checkpkg.d/README csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-actionclasses.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-archall.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-auto.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-basic.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-license.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-missing-symbols.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-you-can-write-your-own.py csw/mgar/gar/v2-git/lib/python/testdata/stats/46/ csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/ csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/all_filenames.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/basic_stats.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/binaries.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/binaries_dump_info.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/depends.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/isalist.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/overrides.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkginfo.yml csw/mgar/gar/v2-git/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkgmap.yml Property Changed: ---------------- csw/mgar/gar/v2-git/ csw/mgar/gar/v2-git/lib/python/checkpkg_test.py csw/mgar/gar/v2-git/lib/python/package_checks.py csw/mgar/gar/v2-git/lib/python/package_checks_test.py csw/mgar/gar/v2-git/pkglib/csw/depend Property changes on: csw/mgar/gar/v2-git ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678,6915-8697 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678,6915-9127 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2-git/bin/analyze_module_results.py =================================================================== --- csw/mgar/gar/v2-git/bin/analyze_module_results.py 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/bin/analyze_module_results.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -34,18 +34,21 @@ pkgname, tag_name, tag_info = checkpkg.ParseTagLine(line) error_tags.append(checkpkg.CheckpkgTag(pkgname, tag_name, tag_info)) overrides = reduce(lambda x, y: x + y, overrides_list) - tags_after_overrides = checkpkg.ApplyOverrides(error_tags, overrides) + (tags_after_overrides, + unapplied_overrides) = checkpkg.ApplyOverrides(error_tags, overrides) exit_code = bool(tags_after_overrides) if tags_after_overrides: print "There were errors reported." print "If you know they are false positives, you can override them:" for tag in tags_after_overrides: - if tag.tag_info: - tag_postfix = "|%s" % tag.tag_info.replace(" ", "|") - else: - tag_postfix = "" - print ("CHECKPKG_OVERRIDES_%s += %s%s" - % (tag.pkgname, tag.tag_name, tag_postfix)) + print tag.ToGarSyntax() + if unapplied_overrides: + print "WARNING: Some overrides did not match any errors." + print " They can be removed, as they don't take any effect anyway." + print " If you're getting errors at the same time, maybe you didn't" + print " specify the overrides correctly." + for override in unapplied_overrides: + print "* Unused %s" % override sys.exit(exit_code) Modified: csw/mgar/gar/v2-git/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/bin/checkpkg 2010-03-13 09:55:32 UTC (rev 9128) @@ -91,8 +91,10 @@ print ERROR: $* >/dev/fd/2 cleanup cleanupset - print "To run checkpkg in the debug mode, add the '-d' flag:" + print "To run checkpkg in the debug mode, add the '-d' flag, for example:" print "${selfpath} -d ${selfargs}" + print "After you modify any overrides, you need to do gmake remerge repackage" + print "or gmake platforms-remerge platforms-repackage." exit 1 } @@ -216,109 +218,12 @@ basedir=`sed -n 's/^BASEDIR=//p' $TMPFILE` pkgarch=`sed -n 's/^ARCH=//p' $TMPFILE|head -1` -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 ${NAME_MAX_LENGTH} ]] ; then - errmsg "$f: software name longer than ${NAME_MAX_LENGTH} chars" -fi -if [[ ${#pkgname} -gt ${NAME_MAX_LENGTH} ]] ; then - errmsg "$f: pkg name longer than ${NAME_MAX_LENGTH} 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 - *-*) - errmsg "VERSION field not allowed to have \"-\" in it" - ;; - *,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 - -case $f in - *${pkgarch}*) - print "f: $f, pkgarch: $pkgarch" - ;; - *) - print "The file name is '$f'." - print "The pkgarch is '$pkgarch'." - errmsg "ERROR: package file name and pkgarch don't match." - ;; -esac - goodarch=yes case $f in *${LOCAL_ARCH}*) @@ -355,67 +260,6 @@ ######################################## # 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() { @@ -428,26 +272,15 @@ find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' } - - - 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 /usr/ccs/bin/dump -Lv |nawk '$2=="NEEDED"{print $3}' | sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist - - - print libraries used are: cat $EXTRACTDIR/liblist print "cross-referencing with depend file (May take a while)" @@ -479,14 +312,6 @@ errmsg "$pkgname references self in depend file" fi -# Verify that there are no multiple depends -repeated_depends="$(awk '{print $2}' $EXTRACTDIR/$pkgname/install/depend \ - | sort | uniq -c | awk '{print $1}' | sort | uniq | wc -l)" -if [[ "$repeated_depends" -gt 1 ]]; then - cat $EXTRACTDIR/$pkgname/install/depend - errmsg "$pkgname lists a dependency more than once, see above" -fi - #to retain a record of all packages currently being examined from $@ echo $pkgname >> $SETDEPS @@ -538,7 +363,7 @@ set_variables_for_individual_package_check "$f" test_suite_ok=1 -checkpkg_module_dir=${command_basedir}/checkpkg.d +checkpkg_module_dir=${command_basedir}/../lib/checkpkg.d checkpkg_module_tag="checkpkg-" checkpkg_stats_basedir="${HOME}/.checkpkg/stats" @@ -575,7 +400,8 @@ plugin_name="`echo ${plugin} | sed -e 's+.*/checkpkg-++' | sed -e 's+\.py$++'`" error_tag_file="tags.${plugin_name}" printf "${BOLD}${module_name_format}${COLOR_RESET} running..." "${plugin_name}" - debugmsg "Executing: ${plugin} $extra_options -b \"${checkpkg_stats_basedir}\" -o \"${EXTRACTDIR}/${error_tag_file}\" ${md5sums}" + debugmsg "Executing: ${plugin} $extra_options -b \"${checkpkg_stats_basedir}\"" \ + "-o \"${EXTRACTDIR}/${error_tag_file}\" `echo ${md5sums}`" ${plugin} \ $extra_options \ -b "${checkpkg_stats_basedir}" \ @@ -597,7 +423,9 @@ fi for log_file in ${log_files}; do - if [[ `gwc -c "${log_file}" | awk '{print $1}'` -gt 1 ]]; then + log_len=`gsed -e 's/\s\+//g' "${log_file}" | gtr -s '\n' | gwc -c | awk '{print $1}'` + if [[ "${log_len}" -gt 1 ]]; then + print "printing ${log_file}..." debugmsg ">> LOG START: ${log_file}" cat "${log_file}" debugmsg "<< LOG END: ${log_file}" Modified: csw/mgar/gar/v2-git/bin/checkpkg_collect_stats.py =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg_collect_stats.py 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/bin/checkpkg_collect_stats.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -36,7 +36,7 @@ packages = [opencsw.CswSrv4File(x, options.debug) for x in args] stats_list = [checkpkg.PackageStats(pkg) for pkg in packages] for pkg_stats in stats_list: - pkg_stats.CollectStats() + pkg_stats.CollectStats() if __name__ == '__main__': - main() + main() Modified: csw/mgar/gar/v2-git/bin/update_contents_cache.py =================================================================== --- csw/mgar/gar/v2-git/bin/update_contents_cache.py 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/bin/update_contents_cache.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -21,6 +21,7 @@ print "Checking if the package cache is up to date." logging.basicConfig(level=logging.INFO) test_pkgmap = checkpkg.SystemPkgmap() + test_pkgmap.InitializeDatabase() if __name__ == '__main__': Modified: csw/mgar/gar/v2-git/categories/gnome/category.mk =================================================================== --- csw/mgar/gar/v2-git/categories/gnome/category.mk 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/categories/gnome/category.mk 2010-03-13 09:55:32 UTC (rev 9128) @@ -1,5 +1,5 @@ # pkg-config options -EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig +EXTRA_PKG_CONFIG_DIRS += /opt/csw/X11/lib MSGFMT= /opt/csw/bin/gmsgfmt MSGMERGE= /opt/csw/bin/gmsgmerge @@ -10,4 +10,10 @@ export XGETTEXT export GETTEXT +# Perhaps there is a category-level variable set? +EXTRA_INC += /opt/csw/X11/include +EXTRA_INC += /usr/X11/include +EXTRA_INC += /usr/openwin/share/include +EXTRA_LIB += /opt/csw/X11/lib + include gar/gar.mk Modified: csw/mgar/gar/v2-git/categories/python/category.mk =================================================================== --- csw/mgar/gar/v2-git/categories/python/category.mk 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/categories/python/category.mk 2010-03-13 09:55:32 UTC (rev 9128) @@ -1,8 +1,11 @@ # Add a dependency to CSWpython _EXTRA_GAR_PKGS += CSWpython -# Exclude egg-info files (only needed for easy_install) -_MERGE_EXCLUDE_CATEGORY += .*\.egg-info.* +# For the record, do not include the following line: +# _MERGE_EXCLUDE_CATEGORY += .*\.egg-info.* +# +# It breaks pysetuptools and trac. Here's a relevant reading: +# http://fedoraproject.org/wiki/Packaging:Python#Packaging_eggs_and_setuptools_concerns # Activate cswpycompile support to exclude .pyc and .pyo files from # the package and compile them on installation. File exclusion is Modified: csw/mgar/gar/v2-git/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-git/gar.conf.mk 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/gar.conf.mk 2010-03-13 09:55:32 UTC (rev 9128) @@ -14,7 +14,7 @@ -include /etc/opt/csw/garrc -include /opt/csw/etc/garrc -THISHOST := $(shell uname -n) +THISHOST := $(shell /usr/bin/uname -n) # On these platforms packages are built. # They will include binaries for all ISAs that are specified for the platform. @@ -24,11 +24,11 @@ # invoked from "gmake platforms" or when you build a package on a host # that is suitable for the platform. # If there are no platform hosts defined the feature is disabled. -PLATFORM ?= $(firstword $(foreach P,$(PACKAGING_PLATFORMS),$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),$P))) +GAR_PLATFORM ?= $(firstword $(foreach P,$(PACKAGING_PLATFORMS),$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),$P))) MODULATION ?= global FILEDIR ?= files -WORKROOTDIR ?= $(if $(PLATFORM),work/$(PLATFORM),work) +WORKROOTDIR ?= $(if $(GAR_PLATFORM),work/$(GAR_PLATFORM),work) WORKDIR ?= $(WORKROOTDIR)/build-$(MODULATION) WORKDIR_FIRSTMOD ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS)) DOWNLOADDIR ?= $(WORKROOTDIR)/download @@ -102,8 +102,8 @@ # Architecture GARCHLIST ?= sparc i386 -GARCH ?= $(shell uname -p) -GAROSREL ?= $(shell uname -r) +GARCH := $(if $(GARCH),$(GARCH),$(shell /usr/bin/uname -p)) +GAROSREL := $(if $(GAROSREL),$(GAROSREL),$(shell /usr/bin/uname -r)) # These are the standard directory name variables from all GNU Modified: csw/mgar/gar/v2-git/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-git/gar.lib.mk 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/gar.lib.mk 2010-03-13 09:55:32 UTC (rev 9128) @@ -568,12 +568,12 @@ # Run tests on pre-built sources test-%/Makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/GNUmakefile: Modified: csw/mgar/gar/v2-git/gar.mk =================================================================== --- csw/mgar/gar/v2-git/gar.mk 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/gar.mk 2010-03-13 09:55:32 UTC (rev 9128) @@ -135,8 +135,8 @@ merge-$(2): @echo "[===== Building modulation '$(2)' on host '$$(BUILDHOST)' =====]" $$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\ - $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ - $(MAKE) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ + $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(GAR_PLATFORM),GAR_PLATFORM=$(GAR_PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\ + $(MAKE) $(if $(GAR_PLATFORM),GAR_PLATFORM=$(GAR_PLATFORM)) MODULATION=$(2) $(3) merge-modulated\ ) @# The next line has intentionally been left blank to explicitly terminate this make rule @@ -361,10 +361,12 @@ MAKESUM_TARGETS = $(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES)) makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) $(GARCHIVE_TARGETS) - @if test "x$(MAKESUM_TARGETS)" != "x "; then \ + @if test "x$(MAKESUM_TARGETS)" != "x"; then \ (cd $(DOWNLOADDIR) && gmd5sum $(MAKESUM_TARGETS)) > $(CHECKSUM_FILE) ; \ echo "Checksums made for $(MAKESUM_TARGETS)" ; \ cat $(CHECKSUM_FILE) ; \ + else \ + cp /dev/null $(CHECKSUM_FILE) ; \ fi # I am always typing this by mistake Modified: csw/mgar/gar/v2-git/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-git/gar.pkg.mk 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/gar.pkg.mk 2010-03-13 09:55:32 UTC (rev 9128) @@ -32,7 +32,7 @@ ifeq ($(origin PACKAGES), undefined) PACKAGES = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(GARNAME)) -CATALOGNAME = $(if $(filter %.gspec,$(DISTFILES)),,$(GARNAME)) +CATALOGNAME ?= $(if $(filter %.gspec,$(DISTFILES)),,$(GARNAME)) SRCPACKAGE_BASE = $(firstword $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES)) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src SPKG_SPECS ?= $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE)) @@ -155,7 +155,7 @@ 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_OSNAME := $(if $(SPKG_OSNAME),$(SPKG_OSNAME),$(shell /usr/bin/uname -s)$(shell /usr/bin/uname -r)) SPKG_SPOOLROOT ?= $(DESTROOT) SPKG_SPOOLDIR ?= $(SPKG_SPOOLROOT)/spool.$(GAROSREL)-$(GARCH) @@ -354,7 +354,7 @@ _PROTOTYPE_MODIFIERS = | perl -ane '\ $(foreach M,$(PROTOTYPE_MODIFIERS),\ - $(if $(PROTOTYPE_FILES_$M),if( $$F[2] =~ m(^$(shell echo $(PROTOTYPE_FILES_$M) | /usr/bin/tr " " "|")$$) ) {)\ + $(if $(PROTOTYPE_FILES_$M),if( $$F[2] =~ m(^$(firstword $(PROTOTYPE_FILES_$M))$(foreach F,$(wordlist 2,$(words $(PROTOTYPE_FILES_$M)),$(PROTOTYPE_FILES_$M)),|$F)$$) ) {)\ $(if $(PROTOTYPE_FTYPE_$M),$$F[0] = "$(PROTOTYPE_FTYPE_$M)";)\ $(if $(PROTOTYPE_CLASS_$M),$$F[1] = "$(PROTOTYPE_CLASS_$M)";)\ $(if $(PROTOTYPE_PERMS_$M),$$F[3] = "$(PROTOTYPE_PERMS_$M)";)\ @@ -447,6 +447,7 @@ $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),CSWalternatives) $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils) +# The final "true" is for packages without dependencies to make the shell happy as "( )" is not allowed. $(WORKDIR)/%.depend: $(WORKDIR) $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(RUNTIME_DEP_PKGS_$*)$(RUNTIME_DEP_PKGS)$(DEP_PKGS)$(DEP_PKGS_$*)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ ($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\ @@ -457,7 +458,8 @@ echo "P $(PKG) $(call catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ echo "$(shell (/usr/bin/pkginfo $(PKG) || echo "P $(PKG) - ") | $(GAWK) '{ $$1 = "P"; print } ')"; \ ) \ - )) >$@) + ) \ + true) >$@) # Dynamic gspec-files are constructed as follows: # - Packages using dynamic gspec-files must be listed in PACKAGES @@ -690,8 +692,11 @@ merge-alternatives-%: @echo "[ Generating alternatives for package $* ]" $(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/alternatives - $(_DBG)($(foreach A,$(or $(ALTERNATIVES_$*),$(ALTERNATIVES)),echo "$(ALTERNATIVE_$A)";)) \ - > $(PKGROOT)/opt/csw/share/alternatives/$(call catalogname,$*) + $(_DBG)($(foreach A,$(or $(ALTERNATIVES_$*),$(ALTERNATIVES)), \ + $(if $(ALTERNATIVE_$A), \ + echo "$(ALTERNATIVE_$A)";, \ + $(error The variable 'ALTERNATIVE_$A' is empty, but must contain an alternative) \ + ))) > $(PKGROOT)/opt/csw/share/alternatives/$(call catalogname,$*) @$(MAKECOOKIE) merge-alternatives: $(foreach S,$(SPKG_SPECS),$(if $(or $(ALTERNATIVES_$S),$(ALTERNATIVES)),merge-alternatives-$S)) @@ -757,7 +762,7 @@ if test -f "$$F" -a \! -h "$$F"; then echo $$F; fi; \ done)),) _buildpackage: _EXTRA_GAR_PKGS += $(if $(ISAEXEC_FILES),CSWisaexec) -_buildpackage: pre-package $(PACKAGE_TARGETS) post-package $(if $(ENABLE_CHECK),pkgcheck) +_buildpackage: pre-package $(PACKAGE_TARGETS) post-package $(if $(filter-out 0,$(ENABLE_CHECK)),pkgcheck) _package: validateplatform extract-global merge $(SPKG_DESTDIRS) _buildpackage @$(MAKECOOKIE) @@ -766,7 +771,7 @@ @echo @echo "The following packages have been built:" @echo - @$(MAKE) -s PLATFORM=$(PLATFORM) _pkgshow + @$(MAKE) -s GAR_PLATFORM=$(GAR_PLATFORM) _pkgshow @echo @$(DONADA) @@ -775,7 +780,7 @@ dirpackage: _package @echo "The following packages have been built:" @echo - @$(MAKE) -s PLATFORM=$(PLATFORM) _dirpkgshow + @$(MAKE) -s GAR_PLATFORM=$(GAR_PLATFORM) _dirpkgshow @echo @$(DONADA) @@ -840,8 +845,8 @@ $(foreach P,$(_PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) PLATFORM=$P _package && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P _package" && \ + $(MAKE) GAR_PLATFORM=$P _package && ,\ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) GAR_PLATFORM=$P _package" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ @@ -854,9 +859,9 @@ $(if $(ARCHALL),echo " (suitable for all architectures)\c";) \ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ echo " (built on this host)";\ - $(MAKE) -s PLATFORM=$P _pkgshow;echo;,\ + $(MAKE) -s GAR_PLATFORM=$P _pkgshow;echo;,\ echo " (built on host '$(PACKAGING_HOST_$P)')";\ - $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) -s PLATFORM=$P _pkgshow";echo;\ + $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) -s GAR_PLATFORM=$P _pkgshow";echo;\ )\ ) @$(MAKECOOKIE) @@ -866,8 +871,8 @@ $(foreach P,$(_PACKAGING_PLATFORMS),\ $(if $(PACKAGING_HOST_$P),\ $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ - $(MAKE) -s PLATFORM=$P $* && ,\ - $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P $*" && \ + $(MAKE) -s GAR_PLATFORM=$P $* && ,\ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) GAR_PLATFORM=$P $*" && \ ),\ $(error *** No host has been defined for platform $P)\ )\ Deleted: csw/mgar/gar/v2-git/lib/checkpkg.d/README =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/README 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/README 2010-03-13 09:55:32 UTC (rev 9128) @@ -1,13 +0,0 @@ -$Id$ - -This directory contains modular checks. Each check is an executable file, -written in any language, accepting specific command line options and returning -the result by writing to a text file. - -To see the required flags, issue: - -./checkpkg-you-can-write-your-own.py -h - -Each test's file name must begin with "checkpkg-". - -See http://wiki.opencsw.org/checkpkg for more information. Copied: csw/mgar/gar/v2-git/lib/checkpkg.d/README (from rev 9127, csw/mgar/gar/v2/lib/checkpkg.d/README) =================================================================== --- csw/mgar/gar/v2-git/lib/checkpkg.d/README (rev 0) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/README 2010-03-13 09:55:32 UTC (rev 9128) @@ -0,0 +1,13 @@ +$Id$ + +This directory contains modular checks. Each check is an executable file, +written in any language, accepting specific command line options and returning +the result by writing to a text file. + +To see the required flags, issue: + +./checkpkg-you-can-write-your-own.py -h + +Each test's file name must begin with "checkpkg-". + +See http://wiki.opencsw.org/checkpkg for more information. Deleted: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-actionclasses.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-actionclasses.py 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-actionclasses.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -1,75 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""This is a dummy check. You can use it as a boilerplate for your own checks. - -Copy it and modify. -""" - -import logging -import os.path -import sys -import re - -CHECKPKG_MODULE_NAME = "class action scripts / prototype integrity" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import opencsw - - -def CheckActionClasses(pkg_data, debug): - """Checks the consistency between classes in the prototype and pkginfo.""" - errors = [] - pkginfo = pkg_data["pkginfo"] - pkgmap = pkg_data["pkgmap"] - pkginfo_classes = set(re.split(opencsw.WS_RE, pkginfo["CLASSES"])) - pkgmap_classes = set() - for entry in pkgmap: - if entry["class"]: # might be None - pkgmap_classes.add(entry["class"]) - only_in_pkginfo = pkginfo_classes.difference(pkgmap_classes) - only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) - for action_class in only_in_pkginfo: - error = checkpkg.CheckpkgTag( - pkg_data["basic_stats"]["pkgname"], - "action-class-only-in-pkginfo", - action_class, - msg="This shouldn't cause any problems, but it might be not necessary.") - errors.append(error) - for action_class in only_in_pkgmap: - errors.append( - checkpkg.CheckpkgTag(pkg.pkgname, "action-class-only-in-pkgmap", action_class)) - return errors - - -def main(): - options, args = checkpkg.GetOptions() - if options.debug: - logging.basicConfig(level=logging.DEBUG) - else: - logging.basicConfig(level=logging.INFO) - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - # Registering functions defined above. - check_manager.RegisterIndividualCheck(CheckActionClasses) - # Running the checks, reporting and exiting. - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-actionclasses.py (from rev 9127, csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-actionclasses.py) =================================================================== --- csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-actionclasses.py (rev 0) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-actionclasses.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -0,0 +1,75 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""This is a dummy check. You can use it as a boilerplate for your own checks. + +Copy it and modify. +""" + +import logging +import os.path +import sys +import re + +CHECKPKG_MODULE_NAME = "class action scripts / prototype integrity" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + + +def CheckActionClasses(pkg_data, debug): + """Checks the consistency between classes in the prototype and pkginfo.""" + errors = [] + pkginfo = pkg_data["pkginfo"] + pkgmap = pkg_data["pkgmap"] + pkginfo_classes = set(re.split(opencsw.WS_RE, pkginfo["CLASSES"])) + pkgmap_classes = set() + for entry in pkgmap: + if entry["class"]: # might be None + pkgmap_classes.add(entry["class"]) + only_in_pkginfo = pkginfo_classes.difference(pkgmap_classes) + only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) + for action_class in only_in_pkginfo: + error = checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "action-class-only-in-pkginfo", + action_class, + msg="This shouldn't cause any problems, but it might be not necessary.") + errors.append(error) + for action_class in only_in_pkgmap: + errors.append( + checkpkg.CheckpkgTag(pkg.pkgname, "action-class-only-in-pkgmap", action_class)) + return errors + + +def main(): + options, args = checkpkg.GetOptions() + if options.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + # Registering functions defined above. + check_manager.RegisterIndividualCheck(CheckActionClasses) + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Deleted: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-archall.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-archall.py 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-archall.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -1,44 +0,0 @@ -#!/opt/csw/bin/python2.6 -# -# $Id$ - -"""Verifies the architecture of the package.""" - -import os.path -import re -import sys - -CHECKPKG_MODULE_NAME = "architecture check" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import package_checks_old - -def main(): - options, args = checkpkg.GetOptions() - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - - check_manager.RegisterIndividualCheck( - package_checks_old.CheckArchitectureVsContents) - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() - -# vim:set sw=2 ts=2 sts=2 expandtab: Copied: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-archall.py (from rev 9127, csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-archall.py) =================================================================== --- csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-archall.py (rev 0) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-archall.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -0,0 +1,44 @@ +#!/opt/csw/bin/python2.6 +# +# $Id$ + +"""Verifies the architecture of the package.""" + +import os.path +import re +import sys + +CHECKPKG_MODULE_NAME = "architecture check" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import package_checks_old + +def main(): + options, args = checkpkg.GetOptions() + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + + check_manager.RegisterIndividualCheck( + package_checks_old.CheckArchitectureVsContents) + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() + +# vim:set sw=2 ts=2 sts=2 expandtab: Deleted: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-auto.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-auto.py 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-auto.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -1,48 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""This is a dummy check. You can use it as a boilerplate for your own checks. - -Copy it and modify. -""" - -import logging -import os.path -import sys -import re - -CHECKPKG_MODULE_NAME = "Second checkpkg API version" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import opencsw - - -def main(): - options, args = checkpkg.GetOptions() - if options.debug: - logging.basicConfig(level=logging.DEBUG) - else: - logging.basicConfig(level=logging.INFO) - md5sums = args - # CheckpkgManager2 class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager2(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - # Running the checks, reporting and exiting. - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-auto.py (from rev 9127, csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-auto.py) =================================================================== --- csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-auto.py (rev 0) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-auto.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -0,0 +1,48 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""This is a dummy check. You can use it as a boilerplate for your own checks. + +Copy it and modify. +""" + +import logging +import os.path +import sys +import re + +CHECKPKG_MODULE_NAME = "Second checkpkg API version" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + + +def main(): + options, args = checkpkg.GetOptions() + if options.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) + md5sums = args + # CheckpkgManager2 class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager2(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Deleted: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-basic.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-basic.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -1,48 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""This is a dummy module. You can use it as a boilerplate for your own modules. - -Copy it and modify. -""" - -import os.path -import sys - -CHECKPKG_MODULE_NAME = "basic checks ported from Korn shell" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import package_checks_old - -def main(): - options, args = checkpkg.GetOptions() - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - # Registering functions defined above. - check_manager.RegisterIndividualCheck(package_checks_old.CatalognameLowercase) - check_manager.RegisterIndividualCheck(package_checks_old.FileNameSanity) - check_manager.RegisterIndividualCheck(package_checks_old.PkginfoSanity) - check_manager.RegisterIndividualCheck(package_checks_old.ArchitectureSanity) - check_manager.RegisterIndividualCheck(package_checks_old.CheckBuildingUser) - check_manager.RegisterIndividualCheck(package_checks_old.CheckPkgmapPaths) - # Running the checks, reporting and exiting. - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-basic.py (from rev 9127, csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py) =================================================================== --- csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-basic.py (rev 0) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-basic.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -0,0 +1,48 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""This is a dummy module. You can use it as a boilerplate for your own modules. + +Copy it and modify. +""" + +import os.path +import sys + +CHECKPKG_MODULE_NAME = "basic checks ported from Korn shell" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import package_checks_old + +def main(): + options, args = checkpkg.GetOptions() + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + # Registering functions defined above. + check_manager.RegisterIndividualCheck(package_checks_old.CatalognameLowercase) + check_manager.RegisterIndividualCheck(package_checks_old.FileNameSanity) + check_manager.RegisterIndividualCheck(package_checks_old.PkginfoSanity) + check_manager.RegisterIndividualCheck(package_checks_old.ArchitectureSanity) + check_manager.RegisterIndividualCheck(package_checks_old.CheckBuildingUser) + check_manager.RegisterIndividualCheck(package_checks_old.CheckPkgmapPaths) + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Deleted: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-libs.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -1,185 +0,0 @@ -#!/opt/csw/bin/python2.6 -# -# $Id$ - -"""A check for dependencies between shared libraries. -This is currently more of a prototype than a mature program, but it has some -unit tests and it appears to be working. The main problem is that it's not -divided into smaller testable sections. -""" - -import os -import os.path -import copy -import re -import subprocess -import logging -import sys -import textwrap -from Cheetah import Template - -CHECKPKG_MODULE_NAME = "shared library linking consistency" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import opencsw - -def CheckSharedLibraryConsistency(pkgs_data, debug): - ws_re = re.compile(r"\s+") - result_ok = True - errors = [] - binaries = [] - binaries_by_pkgname = {} - sonames_by_pkgname = {} - pkg_by_any_filename = {} - needed_sonames_by_binary = {} - filenames_by_soname = {} - for pkg_data in pkgs_data: - binaries_base = [os.path.basename(x) for x in pkg_data["binaries"]] - pkgname = pkg_data["basic_stats"]["pkgname"] - binaries_by_pkgname[pkgname] = binaries_base - binaries.extend(pkg_data["binaries"]) - for filename in pkg_data["all_filenames"]: - pkg_by_any_filename[filename] = pkgname - for binary_data in pkg_data["binaries_dump_info"]: - binary_base_name = os.path.basename(binary_data["base_name"]) - needed_sonames_by_binary[binary_base_name] = binary_data - filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name - - # Making the binaries unique - binaries = set(binaries) - isalist = pkg_data["isalist"] - - # Building indexes by soname to simplify further processing - # These are indexes "by soname". - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - needed_sonames_by_binary) - - pkgmap = checkpkg.SystemPkgmap() - logging.debug("Determining the soname-package relationships.") - # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog - runpath_data_by_soname = {} - for soname in needed_sonames: - runpath_data_by_soname[soname] = pkgmap.GetPkgmapLineByBasename(soname) - lines_by_soname = checkpkg.GetLinesBySoname( - runpath_data_by_soname, needed_sonames, runpath_by_needed_soname, isalist) - - # Creating a map from files to packages. - pkgs_by_filename = {} - for soname, line in lines_by_soname.iteritems(): - # TODO: Find all the packages, not just the last field. - fields = re.split(ws_re, line.strip()) - # For now, we'll assume that the last field is the package. - pkgname = fields[-1] - pkgs_by_filename[soname] = pkgname - - # A shared object dependency/provisioning report, plus checking. - # - # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), - # it has a different purpose: it reports the relationships between shared - # libraries, binaries using them and packages providing them. Ideally, the - # same bit of code would do both checking and reporting. - # - # TODO: Rewrite this using cheetah templates - if debug and needed_sonames: - print "Analysis of sonames needed by the package set:" - binaries_with_missing_sonames = set([]) - for soname in needed_sonames: - logging.debug("Analyzing: %s", soname) - if soname in filenames_by_soname: - print "%s is provided by the package itself" % soname - elif soname in lines_by_soname: - print ("%s is provided by %s and required by:" - % (soname, - pkgs_by_filename[soname])) - filename_lines = " ".join(sorted(binaries_by_soname[soname])) - for line in textwrap.wrap(filename_lines, 70): - print " ", line - else: - print ("%s is required by %s, but we don't know what provides it." - % (soname, binaries_by_soname[soname])) - for binary in binaries_by_soname[soname]: - binaries_with_missing_sonames.add(binary) - if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: - print "However, it's a whitelisted soname." - else: - pass - # The error checking needs to be unified: done in one place only. - # errors.append( - # checkpkg.CheckpkgTag( - # "%s is required by %s, but " - # "we don't know what provides it." - # % (soname, binaries_by_soname[soname]))) - if binaries_with_missing_sonames: - print "The following are binaries with missing sonames:" - binary_lines = " ".join(sorted(binaries_with_missing_sonames)) - for line in textwrap.wrap(binary_lines, 70): - print " ", line - print - - dependent_pkgs = {} - for checker in pkgs_data: - pkgname = checker["basic_stats"]["pkgname"] - declared_dependencies = dict(checker["depends"]) - missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( - pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_filename, - filenames_by_soname, - pkg_by_any_filename) - namespace = { - "pkgname": pkgname, - "missing_deps": missing_deps, - "surplus_deps": surplus_deps, - "orphan_sonames": orphan_sonames, - } - t = Template.Template(checkpkg.REPORT_TMPL, searchList=[namespace]) - print unicode(t) - - for soname in orphan_sonames: - errors.append( - checkpkg.CheckpkgTag( - pkgname, - "orphan-soname", - soname)) - for missing_dep in missing_deps: - errors.append( - checkpkg.CheckpkgTag( - pkgname, - "missing-dependency", - missing_dep)) - return errors - - -def main(): - options, args = checkpkg.GetOptions() - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - - check_manager.RegisterSetCheck(CheckSharedLibraryConsistency) - - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() - -# vim:set sw=2 ts=2 sts=2 expandtab: Copied: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-libs.py (from rev 9127, csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py) =================================================================== --- csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-libs.py (rev 0) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-libs.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -0,0 +1,185 @@ +#!/opt/csw/bin/python2.6 +# +# $Id$ + +"""A check for dependencies between shared libraries. +This is currently more of a prototype than a mature program, but it has some +unit tests and it appears to be working. The main problem is that it's not +divided into smaller testable sections. +""" + +import os +import os.path +import copy +import re +import subprocess +import logging +import sys +import textwrap +from Cheetah import Template + +CHECKPKG_MODULE_NAME = "shared library linking consistency" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + +def CheckSharedLibraryConsistency(pkgs_data, debug): + ws_re = re.compile(r"\s+") + result_ok = True + errors = [] + binaries = [] + binaries_by_pkgname = {} + sonames_by_pkgname = {} + pkg_by_any_filename = {} + needed_sonames_by_binary = {} + filenames_by_soname = {} + for pkg_data in pkgs_data: + binaries_base = [os.path.basename(x) for x in pkg_data["binaries"]] + pkgname = pkg_data["basic_stats"]["pkgname"] + binaries_by_pkgname[pkgname] = binaries_base + binaries.extend(pkg_data["binaries"]) + for filename in pkg_data["all_filenames"]: + pkg_by_any_filename[filename] = pkgname + for binary_data in pkg_data["binaries_dump_info"]: + binary_base_name = os.path.basename(binary_data["base_name"]) + needed_sonames_by_binary[binary_base_name] = binary_data + filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name + + # Making the binaries unique + binaries = set(binaries) + isalist = pkg_data["isalist"] + + # Building indexes by soname to simplify further processing + # These are indexes "by soname". + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + needed_sonames_by_binary) + + pkgmap = checkpkg.SystemPkgmap() + logging.debug("Determining the soname-package relationships.") + # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog + runpath_data_by_soname = {} + for soname in needed_sonames: + runpath_data_by_soname[soname] = pkgmap.GetPkgmapLineByBasename(soname) + lines_by_soname = checkpkg.GetLinesBySoname( + runpath_data_by_soname, needed_sonames, runpath_by_needed_soname, isalist) + + # Creating a map from files to packages. + pkgs_by_filename = {} + for soname, line in lines_by_soname.iteritems(): + # TODO: Find all the packages, not just the last field. + fields = re.split(ws_re, line.strip()) + # For now, we'll assume that the last field is the package. + pkgname = fields[-1] + pkgs_by_filename[soname] = pkgname + + # A shared object dependency/provisioning report, plus checking. + # + # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), + # it has a different purpose: it reports the relationships between shared + # libraries, binaries using them and packages providing them. Ideally, the + # same bit of code would do both checking and reporting. + # + # TODO: Rewrite this using cheetah templates + if debug and needed_sonames: + print "Analysis of sonames needed by the package set:" + binaries_with_missing_sonames = set([]) + for soname in needed_sonames: + logging.debug("Analyzing: %s", soname) + if soname in filenames_by_soname: + print "%s is provided by the package itself" % soname + elif soname in lines_by_soname: + print ("%s is provided by %s and required by:" + % (soname, + pkgs_by_filename[soname])) + filename_lines = " ".join(sorted(binaries_by_soname[soname])) + for line in textwrap.wrap(filename_lines, 70): + print " ", line + else: + print ("%s is required by %s, but we don't know what provides it." + % (soname, binaries_by_soname[soname])) + for binary in binaries_by_soname[soname]: + binaries_with_missing_sonames.add(binary) + if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: + print "However, it's a whitelisted soname." + else: + pass + # The error checking needs to be unified: done in one place only. + # errors.append( + # checkpkg.CheckpkgTag( + # "%s is required by %s, but " + # "we don't know what provides it." + # % (soname, binaries_by_soname[soname]))) + if binaries_with_missing_sonames: + print "The following are binaries with missing sonames:" + binary_lines = " ".join(sorted(binaries_with_missing_sonames)) + for line in textwrap.wrap(binary_lines, 70): + print " ", line + print + + dependent_pkgs = {} + for checker in pkgs_data: + pkgname = checker["basic_stats"]["pkgname"] + declared_dependencies = dict(checker["depends"]) + missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( + pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_filename, + filenames_by_soname, + pkg_by_any_filename) + namespace = { + "pkgname": pkgname, + "missing_deps": missing_deps, + "surplus_deps": surplus_deps, + "orphan_sonames": orphan_sonames, + } + t = Template.Template(checkpkg.REPORT_TMPL, searchList=[namespace]) + print unicode(t) + + for soname in orphan_sonames: + errors.append( + checkpkg.CheckpkgTag( + pkgname, + "orphan-soname", + soname)) + for missing_dep in missing_deps: + errors.append( + checkpkg.CheckpkgTag( + pkgname, + "missing-dependency", + missing_dep)) + return errors + + +def main(): + options, args = checkpkg.GetOptions() + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + + check_manager.RegisterSetCheck(CheckSharedLibraryConsistency) + + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() + +# vim:set sw=2 ts=2 sts=2 expandtab: Deleted: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-license.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-license.py 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-license.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -1,59 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""Checks for the existence of the license file.""" - -import logging -import os.path -import sys - -CHECKPKG_MODULE_NAME = "license presence" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import opencsw - -LICENSE_TMPL = "/opt/csw/share/doc/%s/license" - -def CheckLicenseFile(pkg_data, debug): - """Checks for the presence of the license file.""" - errors = [] - pkgmap = pkg_data["pkgmap"] - catalogname = pkg_data["basic_stats"]["catalogname"] - license_path = LICENSE_TMPL % catalogname - pkgmap_paths = [x["path"] for x in pkgmap] - if license_path not in pkgmap_paths: - errors.append( - checkpkg.CheckpkgTag( - pkg_data["basic_stats"]["pkgname"], - "license-missing", - msg="See http://sourceforge.net/apps/trac/gar/wiki/CopyRight")) - return errors - - -def main(): - options, args = checkpkg.GetOptions() - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - # Registering functions defined above. - check_manager.RegisterIndividualCheck(CheckLicenseFile) - # Running the checks, reporting and exiting. - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-license.py (from rev 9127, csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-license.py) =================================================================== --- csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-license.py (rev 0) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-license.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -0,0 +1,59 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""Checks for the existence of the license file.""" + +import logging +import os.path +import sys + +CHECKPKG_MODULE_NAME = "license presence" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + +LICENSE_TMPL = "/opt/csw/share/doc/%s/license" + +def CheckLicenseFile(pkg_data, debug): + """Checks for the presence of the license file.""" + errors = [] + pkgmap = pkg_data["pkgmap"] + catalogname = pkg_data["basic_stats"]["catalogname"] + license_path = LICENSE_TMPL % catalogname + pkgmap_paths = [x["path"] for x in pkgmap] + if license_path not in pkgmap_paths: + errors.append( + checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "license-missing", + msg="See http://sourceforge.net/apps/trac/gar/wiki/CopyRight")) + return errors + + +def main(): + options, args = checkpkg.GetOptions() + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + # Registering functions defined above. + check_manager.RegisterIndividualCheck(CheckLicenseFile) + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Deleted: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-missing-symbols.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-missing-symbols.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -1,47 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""Check for missing symbols in binaries. - -http://sourceforge.net/tracker/?func=detail&aid=2939416&group_id=229205&atid=1075770 -""" - -import os.path -import re -import sys -import subprocess - -CHECKPKG_MODULE_NAME = "missing symbols" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import package_checks_old - -# Defining checking functions. - -def main(): - options, args = checkpkg.GetOptions() - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - # Registering functions defined above. - check_manager.RegisterSetCheck(package_checks_old.CheckForMissingSymbols) - # Running the checks, reporting and exiting. - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-missing-symbols.py (from rev 9127, csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py) =================================================================== --- csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-missing-symbols.py (rev 0) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-missing-symbols.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -0,0 +1,47 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""Check for missing symbols in binaries. + +http://sourceforge.net/tracker/?func=detail&aid=2939416&group_id=229205&atid=1075770 +""" + +import os.path +import re +import sys +import subprocess + +CHECKPKG_MODULE_NAME = "missing symbols" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import package_checks_old + +# Defining checking functions. + +def main(): + options, args = checkpkg.GetOptions() + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + # Registering functions defined above. + check_manager.RegisterSetCheck(package_checks_old.CheckForMissingSymbols) + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Deleted: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-obsolete-deps.py 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-obsolete-deps.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -1,74 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""Makes sure that obsolete packages are not added as dependencies. -""" - -import logging -import os.path -import sys - -CHECKPKG_MODULE_NAME = "obsolete dependencies" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg - -OBSOLETE_DEPS = { - # "CSWfoo": { - # "hint": "Do this...", - # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." - # }, - "CSWpython-rt": { - "hint": "CSWpython-rt is deprecated, use CSWpython instead.", - "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" - }, -} - -def CheckObsoleteDeps(pkg_data, debug): - """Checks for obsolete dependencies.""" - errors = [] - deps = set(pkg_data["depends"]) - obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) - if obsolete_pkg_deps: - for obsolete_pkg in obsolete_pkg_deps: - msg = "" - if "hint" in OBSOLETE_DEPS[obsolete_pkg]: - msg += "Hint: %s" % OBSOLETE_DEPS[obsolete_pkg]["hint"] - if "url" in OBSOLETE_DEPS[obsolete_pkg]: - if msg: - msg += ", " - msg += "URL: %s" % OBSOLETE_DEPS[obsolete_pkg]["url"] - if not msg: - msg = None - errors.append( - checkpkg.CheckpkgTag( - pkg_data["basic_stats"]["pkgname"], - "obsolete-dependency", obsolete_pkg, msg=msg)) - return errors - - -def main(): - options, args = checkpkg.GetOptions() - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - check_manager.RegisterIndividualCheck(CheckObsoleteDeps) - # Running the checks, reporting and exiting. - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-obsolete-deps.py (from rev 9127, csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-obsolete-deps.py) =================================================================== --- csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-obsolete-deps.py (rev 0) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-obsolete-deps.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -0,0 +1,74 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""Makes sure that obsolete packages are not added as dependencies. +""" + +import logging +import os.path +import sys + +CHECKPKG_MODULE_NAME = "obsolete dependencies" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + +OBSOLETE_DEPS = { + # "CSWfoo": { + # "hint": "Do this...", + # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." + # }, + "CSWpython-rt": { + "hint": "CSWpython-rt is deprecated, use CSWpython instead.", + "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" + }, +} + +def CheckObsoleteDeps(pkg_data, debug): + """Checks for obsolete dependencies.""" + errors = [] + deps = set(pkg_data["depends"]) + obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) + if obsolete_pkg_deps: + for obsolete_pkg in obsolete_pkg_deps: + msg = "" + if "hint" in OBSOLETE_DEPS[obsolete_pkg]: + msg += "Hint: %s" % OBSOLETE_DEPS[obsolete_pkg]["hint"] + if "url" in OBSOLETE_DEPS[obsolete_pkg]: + if msg: + msg += ", " + msg += "URL: %s" % OBSOLETE_DEPS[obsolete_pkg]["url"] + if not msg: + msg = None + errors.append( + checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "obsolete-dependency", obsolete_pkg, msg=msg)) + return errors + + +def main(): + options, args = checkpkg.GetOptions() + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + check_manager.RegisterIndividualCheck(CheckObsoleteDeps) + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Deleted: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-you-can-write-your-own.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -1,84 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""This is a dummy module. You can use it as a boilerplate for your own modules. - -Copy it and modify. -""" - -import os.path -import sys - -CHECKPKG_MODULE_NAME = "a template of a checkpkg module" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg - -# Defining the checking functions. They come in two flavors: individual -# package checks and set checks. - -def MyCheckForAsinglePackage(pkg_data, debug): - """Checks an individual package. - - Gets a DirctoryFormatPackage as an argument, and returns a list of errors. - - Errors should be a list of checkpkg.CheckpkgTag objects: - errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "tag-name")) - - You can also add a parameter: - errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "tag-name", "/opt/csw/bin/problem")) - """ - errors = [] - # Checking code for an individual package goes here. See the - # DirectoryFormatPackage class in lib/python/opencsw.py for the available - # APIs. - - # Here's how to report an error: - something_is_wrong = False - if something_is_wrong: - errors.append(checkpkg.CheckpkgTag( - pkg_data["basic_stats"]["pkgname"], - "example-problem", "thing")) - return errors - - -def MyCheckForAsetOfPackages(pkgs_data, debug): - """Checks a set of packages. - - Sometimes individual checks aren't enough. If you need to write code which - needs to examine multiple packages at the same time, use this function. - - Gets a list of packages, returns a list of errors. - """ - errors = [] - # Checking code goes here. - return errors - - -def main(): - options, args = checkpkg.GetOptions() - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - # Registering functions defined above. - check_manager.RegisterIndividualCheck(MyCheckForAsinglePackage) - check_manager.RegisterSetCheck(MyCheckForAsetOfPackages) - # Running the checks, reporting and exiting. - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-you-can-write-your-own.py (from rev 9127, csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-you-can-write-your-own.py) =================================================================== --- csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-you-can-write-your-own.py (rev 0) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -0,0 +1,84 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""This is a dummy module. You can use it as a boilerplate for your own modules. + +Copy it and modify. +""" + +import os.path +import sys + +CHECKPKG_MODULE_NAME = "a template of a checkpkg module" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + +# Defining the checking functions. They come in two flavors: individual +# package checks and set checks. + +def MyCheckForAsinglePackage(pkg_data, debug): + """Checks an individual package. + + Gets a DirctoryFormatPackage as an argument, and returns a list of errors. + + Errors should be a list of checkpkg.CheckpkgTag objects: + errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "tag-name")) + + You can also add a parameter: + errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "tag-name", "/opt/csw/bin/problem")) + """ + errors = [] + # Checking code for an individual package goes here. See the + # DirectoryFormatPackage class in lib/python/opencsw.py for the available + # APIs. + + # Here's how to report an error: + something_is_wrong = False + if something_is_wrong: + errors.append(checkpkg.CheckpkgTag( + pkg_data["basic_stats"]["pkgname"], + "example-problem", "thing")) + return errors + + +def MyCheckForAsetOfPackages(pkgs_data, debug): + """Checks a set of packages. + + Sometimes individual checks aren't enough. If you need to write code which + needs to examine multiple packages at the same time, use this function. + + Gets a list of packages, returns a list of errors. + """ + errors = [] + # Checking code goes here. + return errors + + +def main(): + options, args = checkpkg.GetOptions() + md5sums = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + # Registering functions defined above. + check_manager.RegisterIndividualCheck(MyCheckForAsinglePackage) + check_manager.RegisterSetCheck(MyCheckForAsetOfPackages) + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + print screen_report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Modified: csw/mgar/gar/v2-git/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2-git/lib/python/checkpkg.py 2010-03-13 08:35:34 UTC (rev 9127) +++ csw/mgar/gar/v2-git/lib/python/checkpkg.py 2010-03-13 09:55:32 UTC (rev 9128) @@ -15,9 +15,11 @@ import socket import sqlite3 import subprocess +import textwrap import yaml from Cheetah import Template import opencsw +import package_checks SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") @@ -29,6 +31,8 @@ DO_NOT_REPORT_MISSING = set([]) DO_NOT_REPORT_MISSING_RE = [r"SUNW.*", r"\*SUNW.*"] DUMP_BIN = "/usr/ccs/bin/dump" +PSTAMP_RE = r"(?P\w)+@(?P[\w\.]+)-(?P\d+)" +DESCRIPTION_RE = r"^([\S]+) - (.*)$" SYSTEM_SYMLINKS = ( ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), @@ -36,6 +40,8 @@ ("/opt/csw/lib/i386", ["/opt/csw/lib"]), ) INSTALL_CONTENTS_AVG_LINE_LENGTH = 102.09710677919261 +DB_SCHEMA_VERSION = 2L +PACKAGE_STATS_VERSION = 2L # This shared library is present on Solaris 10 on amd64, but it's missing on # Solaris 8 on i386. It's okay if it's missing. @@ -91,6 +97,9 @@ # Tags reported by $name module #for $pkgname in $errors #for $tag in $errors[$pkgname] +#if $tag.msg +$textwrap.fill($tag.msg, 70, initial_indent="# ", subsequent_indent="# ") +#end if $pkgname: ${tag.tag_name}#if $tag.tag_info# $tag.tag_info#end if# #end for #end for @@ -110,6 +119,10 @@ pass +class StdoutSyntaxError(Error): + pass + + def GetOptions(): parser = optparse.OptionParser() parser.add_option("-b", dest="stats_basedir", @@ -141,13 +154,33 @@ return unicode(t) +def ExtractDescription(pkginfo): + desc_re = re.compile(DESCRIPTION_RE) + m = re.match(desc_re, pkginfo["NAME"]) + return m.group(2) if m else None + + +def ExtractMaintainerName(pkginfo): + maint_re = re.compile("^.*for CSW by (.*)$") + m = re.match(maint_re, pkginfo["VENDOR"]) + return m.group(1) if m else None + + +def ExtractBuildUsername(pkginfo): + m = re.match(PSTAMP_RE, pkginfo["PSTAMP"]) + if m: + return m.group("username") + else: + return None + + class SystemPkgmap(object): """A class to hold and manipulate the /var/sadm/install/contents file. TODO: Implement timestamp checking and refreshing the cache. """ - - STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] + + STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] CHECKPKG_DIR = ".checkpkg" SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" @@ -162,20 +195,36 @@ self.SQLITE3_DBNAME_TMPL % self.fqdn) self.file_mtime = None self.cache_mtime = None + self.initialized = False + + def _LazyInitializeDatabase(self): + if not self.initialized: + self.InitializeDatabase() + + def InitializeDatabase(self): if os.path.exists(self.db_path): logging.debug("Connecting to the %s database.", self.db_path) self.conn = sqlite3.connect(self.db_path) + if not self.IsDatabaseGoodSchema(): + logging.warning("Old database schema detected. Dropping tables.") + self.PurgeDatabase(drop_tables=True) + self.CreateTables() if not self.IsDatabaseUpToDate(): logging.warning("Rebuilding the package cache, can take a few minutes.") self.PurgeDatabase() self.PopulateDatabase() else: - print "Building a cache of /var/sadm/install/contents." + print "Building a cache of %s." % SYSTEM_PKGMAP print "The cache will be kept in %s." % self.db_path if not os.path.exists(self.checkpkg_dir): logging.debug("Creating %s", self.checkpkg_dir) os.mkdir(self.checkpkg_dir) self.conn = sqlite3.connect(self.db_path) + self.CreateTables() + self.PopulateDatabase() + self.initialized = True + + def CreateTables(self): c = self.conn.cursor() c.execute(""" CREATE TABLE systempkgmap ( @@ -190,24 +239,24 @@ CREATE TABLE config ( key VARCHAR(255) PRIMARY KEY, float_value FLOAT, + int_value INTEGER, str_value VARCHAR(255) ); """) - self.PopulateDatabase() + c.execute(""" + CREATE TABLE packages ( + pkgname VARCHAR(255) PRIMARY KEY, + pkg_desc VARCHAR(255) + ); + """) - def SymlinkDuringInstallation(self, p): - """Emulates the effect of some symlinks present during installations.""" - p = p.replace("/opt/csw/lib/i386", "/opt/csw/lib") - def PopulateDatabase(self): """Imports data into the database. Original bit of code from checkpkg: - egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog """ - contents_length = os.stat(SYSTEM_PKGMAP).st_size estimated_lines = contents_length / INSTALL_CONTENTS_AVG_LINE_LENGTH system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") @@ -219,6 +268,7 @@ print "Processing %s" % SYSTEM_PKGMAP c = self.conn.cursor() count = itertools.count() + sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" for line in system_pkgmap_fd: i = count.next() if not i % 1000: @@ -230,15 +280,40 @@ fields = re.split(WS_RE, line) pkgmap_entry_path = fields[0].split("=")[0] pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) - sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) print "\rAll lines of %s were processed." % SYSTEM_PKGMAP print "Creating the main database index." sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" c.execute(sql) + self.PopulatePackagesTable() self.SetDatabaseMtime() + self.SetDatabaseSchemaVersion() self.conn.commit() + def _ParsePkginfoLine(self, line): + fields = re.split(WS_RE, line) + pkgname = fields[1] + pkg_desc = u" ".join(fields[2:]) + return pkgname, pkg_desc + + def PopulatePackagesTable(self): + args = ["pkginfo"] + pkginfo_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = pkginfo_proc.communicate() + ret = pkginfo_proc.wait() + c = self.conn.cursor() + sql = """ + INSERT INTO packages (pkgname, pkg_desc) + VALUES (?, ?); + """ + for line in stdout.splitlines(): + pkgname, pkg_desc = self._ParsePkginfoLine(line) + try: + c.execute(sql, [pkgname, pkg_desc]) + except sqlite3.IntegrityError, e: + logging.warn("pkgname %s throws an sqlite3.IntegrityError: %s", + repr(pkgname), e) + def SetDatabaseMtime(self): c = self.conn.cursor() sql = "DELETE FROM config WHERE key = ?;" @@ -251,7 +326,17 @@ """ c.execute(sql, [CONFIG_MTIME, mtime]) + def SetDatabaseSchemaVersion(self): + sql = """ + INSERT INTO config (key, int_value) + VALUES (?, ?); + """ + c = self.conn.cursor() + c.execute(sql, ["db_schema_version", DB_SCHEMA_VERSION]) + logging.debug("Setting db_schema_version to %s", DB_SCHEMA_VERSION) + def GetPkgmapLineByBasename(self, filename): + self._LazyInitializeDatabase() if filename in self.cache: return self.cache[filename] sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" @@ -287,26 +372,67 @@ self.file_mtime = stat_data.st_mtime return self.file_mtime + def GetDatabaseSchemaVersion(self): + sql = """ + SELECT int_value FROM config + WHERE key = ?; + """ + c = self.conn.cursor() + schema_on_disk = 1L + try: + c.execute(sql, ["db_schema_version"]) + for row in c: + schema_on_disk = row[0] + except sqlite3.OperationalError, e: + # : no such column: int_value + # The first versions of the database did not + # have the int_value field. + if re.search(r"int_value", str(e)): + # We assume it's the first schema version. + logging.debug("sqlite3.OperationalError, %s: guessing it's 1.", e) + else: + raise + return schema_on_disk + + def IsDatabaseGoodSchema(self): + good_version = self.GetDatabaseSchemaVersion() >= DB_SCHEMA_VERSION + return good_version + def IsDatabaseUpToDate(self): f_mtime = self.GetFileMtime() d_mtime = self.GetDatabaseMtime() logging.debug("f_mtime %s, d_time: %s", f_mtime, d_mtime) - return self.GetFileMtime() <= self.GetDatabaseMtime() + fresh = self.GetFileMtime() <= self.GetDatabaseMtime() + good_version = self.GetDatabaseSchemaVersion() >= DB_SCHEMA_VERSION + return fresh and good_version - def PurgeDatabase(self): + def SoftDropTable(self, tablename): c = self.conn.cursor() - logging.info("Dropping the index.") - sql = "DROP INDEX basename_idx;" try: - c.execute(sql) + # This doesn't accept placeholders. + c.execute("DROP TABLE %s;" % tablename) except sqlite3.OperationalError, e: - logging.warn(e) - logging.info("Deleting all rows from the cache database") - sql = "DELETE FROM config;" - c.execute(sql) - sql = "DELETE FROM systempkgmap;" - c.execute(sql) + logging.warn("sqlite3.OperationalError: %s", e) + def PurgeDatabase(self, drop_tables=False): + c = self.conn.cursor() + if drop_tables: + for table_name in ("config", "systempkgmap", "packages"): + self.SoftDropTable(table_name) + else: + logging.info("Dropping the index.") + sql = "DROP INDEX basename_idx;" + try: + c.execute(sql) + except sqlite3.OperationalError, e: + logging.warn(e) + logging.info("Deleting all rows from the cache database") + for table in ("config", "systempkgmap", "packages"): + try: + c.execute("DELETE FROM %s;" % table) + except sqlite3.OperationalError, e: + logging.warn("sqlite3.OperationalError: %s", e) + def SharedObjectDependencies(pkgname, binaries_by_pkgname, needed_sonames_by_binary, @@ -316,7 +442,7 @@ """This is one of the more obscure and more important pieces of code. I tried to make it simpler, but given that the operations here involve - whole sets of packages, it's not easy. + whole sets of packages, it's not easy to simplify. """ so_dependencies = set() orphan_sonames = set() @@ -474,7 +600,9 @@ return runpath -def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): +def GetLinesBySoname(runpath_data_by_soname, + needed_sonames, + runpath_by_needed_soname, isalist): """Works out which system pkgmap lines correspond to given sonames.""" lines_by_soname = {} for soname in needed_sonames: @@ -485,11 +613,11 @@ runpath = SanitizeRunpath(runpath) runpath_list = ExpandRunpath(runpath, isalist) runpath_list = Emulate64BitSymlinks(runpath_list) - soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) # Emulating the install time symlinks, for instance, if the prototype contains # /opt/csw/lib/i386/foo.so.0 and /opt/csw/lib/i386 is a symlink to ".", - # the shared library ends up in /opt/csw/lib/foo.so.0 and should be findable even when - # RPATH does not contain $ISALIST. + # the shared library ends up in /opt/csw/lib/foo.so.0 and should be + # findable even when RPATH does not contain $ISALIST. + soname_runpath_data = runpath_data_by_soname[soname] new_soname_runpath_data = {} for p in soname_runpath_data: expanded_p_list = Emulate64BitSymlinks([p]) @@ -568,13 +696,31 @@ self.msg = msg def __repr__(self): - return (u"CheckpkgTag(%s, %s, %s, ...)" - % (repr(self.pkgname), repr(self.tag_name), repr(self.tag_info))) + return (u"CheckpkgTag(%s, %s, %s, %s)" + % (repr(self.pkgname), + repr(self.tag_name), + repr(self.tag_info), + repr(self.msg))) + def ToGarSyntax(self): + msg_lines = [] + if self.msg: + msg_lines.extend(textwrap(self.msg, 70, + initial_indent="# ", + subsequent_indent="# ")) + if self.tag_info: + tag_postfix = "|%s" % self.tag_info.replace(" ", "|") + else: + tag_postfix = "" + msg_lines.append(u"CHECKPKG_OVERRIDES_%s += %s%s" + % (self.pkgname, self.tag_name, tag_postfix)) + return "\n".join(msg_lines) -class CheckpkgManager(object): - """Takes care of calling checking functions""" + +class CheckpkgManagerBase(object): + """Common functions between the older and newer calling functions.""" + def __init__(self, name, stats_basedir, md5sum_list, debug=False): self.debug = debug self.name = name @@ -585,49 +731,18 @@ self.set_checks = [] self.packages = [] - def RegisterIndividualCheck(self, function): - self.individual_checks.append(function) - - def RegisterSetCheck(self, function): - self.set_checks.append(function) - def GetPackageStatsList(self): stats_list = [] for md5sum in self.md5sum_list: stats_list.append(PackageStats(None, self.stats_basedir, md5sum)) return stats_list - def GetAllTags(self, packages_data): - errors = {} - for pkg_data in packages_data: - for function in self.individual_checks: - all_stats = pkg_data.GetAllStats() - errors_for_pkg = function(all_stats, debug=self.debug) - if errors_for_pkg: - errors[all_stats["basic_stats"]["pkgname"]] = errors_for_pkg - # Set checks - for function in self.set_checks: - set_errors = function([x.GetAllStats() for x in packages_data], - debug=self.debug) - if set_errors: - # These were generated by a set, but are likely to be bound to specific - # packages. We'll try to preserve the package assignments. - for tag in set_errors: - if tag.pkgname: - if not tag.pkgname in errors: - errors[tag.pkgname] = [] - errors[tag.pkgname].append(tag) - else: - if "package-set" not in errors: - errors["package-set"] = [] - errors["package-set"].append(error) - return errors - def FormatReports(self, errors): namespace = { "name": self.name, "errors": errors, "debug": self.debug, + "textwrap": textwrap, } screen_t = Template.Template(SCREEN_ERROR_REPORT_TMPL, searchList=[namespace]) tags_report_t = Template.Template(TAG_REPORT_TMPL, searchList=[namespace]) @@ -647,6 +762,150 @@ return (exit_code, screen_report, tags_report) +class CheckpkgManager(CheckpkgManagerBase): + """Takes care of calling checking functions. + + This is an old API as of 2010-02-28. + """ + def RegisterIndividualCheck(self, function): + self.individual_checks.append(function) + + def RegisterSetCheck(self, function): + self.set_checks.append(function) + + def SetErrorsToDict(self, set_errors, a_dict): + # These were generated by a set, but are likely to be bound to specific + # packages. We'll try to preserve the package assignments. + errors = copy.copy(a_dict) + for tag in set_errors: + if tag.pkgname: + if not tag.pkgname in errors: + errors[tag.pkgname] = [] + errors[tag.pkgname].append(tag) + else: + if "package-set" not in errors: + errors["package-set"] = [] + errors["package-set"].append(error) + return a_dict + + def GetAllTags(self, packages_data): + errors = {} + for pkg_data in packages_data: + for function in self.individual_checks: + all_stats = pkg_data.GetAllStats() + errors_for_pkg = function(all_stats, debug=self.debug) + if errors_for_pkg: + errors[all_stats["basic_stats"]["pkgname"]] = errors_for_pkg + # Set checks + for function in self.set_checks: + set_errors = function([x.GetAllStats() for x in packages_data], + debug=self.debug) + if set_errors: + errors = self.SetErrorsToDict(set_errors, errors) + return errors + + +class CheckInterfaceBase(object): + """Base class for check proxies. + + It wraps access to the /var/sadm/install/contents cache. + """ + + def __init__(self, system_pkgmap=None): + self.system_pkgmap = system_pkgmap + if not self.system_pkgmap: + self.system_pkgmap = SystemPkgmap() + + +class IndividualCheckInterface(CheckInterfaceBase): + """To be passed to the checking functions. + + Wraps the creation of CheckpkgTag objects. + """ + + def __init__(self, pkgname, system_pkgmap=None): + super(IndividualCheckInterface, self).__init__(system_pkgmap) + self.pkgname = pkgname + self.errors = [] + + def ReportError(self, tag_name, tag_info=None, msg=None): + tag = CheckpkgTag(self.pkgname, tag_name, tag_info, msg) + self.errors.append(tag) + + +def SetCheckInterface(object): + """To be passed to set checking functions.""" + def __init__(self, system_pkgmap): + super(SetCheckInterface, self).__init__(system_pkgmap) + self.errors = [] + + def ReportError(self, pkgname, tag_name, tag_info=None, msg=None): + tag = CheckpkgTag(pkgname, tag_name, tag_info, msg) + self.errors.append(tag) + + +class CheckpkgManager2(CheckpkgManagerBase): + """The second incarnation of the checkpkg manager. + + Implements the API to be used by checking functions. + + Its purpose is to reduce the amount of boilerplate code and allow for easier + unit test writing. + """ + def _RegisterIndividualCheck(self, function): + self.individual_checks.append(function) + + def _RegisterSetCheck(self, function): + self.set_checks.append(function) + + def _AutoregisterChecks(self): + """Autodetects all defined checks.""" + logging.debug("CheckpkgManager2._AutoregisterChecks()") + checkpkg_module = package_checks + members = dir(checkpkg_module) + for member_name in members: + logging.debug("member_name: %s", repr(member_name)) + member = getattr(checkpkg_module, member_name) + if callable(member): + if member_name.startswith("Check"): + logging.debug("Registering individual check %s", repr(member_name)) + self._RegisterIndividualCheck(member) + elif member_name.startswith("SetCheck"): + logging.debug("Registering set check %s", repr(member_name)) + self._RegisterIndividualCheck(member) + + def GetAllTags(self, packages_data): + errors = {} + logging_level = logging.INFO + if self.debug: + logging_level = logging.DEBUG + # Individual checks + for pkg_data in packages_data: + for function in self.individual_checks: + all_stats = pkg_data.GetAllStats() + pkgname = all_stats["basic_stats"]["pkgname"] + check_interface = IndividualCheckInterface(pkgname) + logger = logging.getLogger("%s-%s" % (pkgname, function.__name__)) + logger.debug("Calling %s", function.__name__) + function(all_stats, check_interface, logger=logger) + if check_interface.errors: + errors[pkgname] = check_interface.errors + # Set checks + for function in self.set_checks: + pkgs_data = [x.GetAllStats() for x in packages_data] + logger = logging.getLogger("SetCheck-%s" % (function.__name__,)) + check_interface = SetCheckInterface() + logger.debug("Calling %s", function.__name__) + function(pkgs_data, check_interface, logger) + if check_interface.errors: + errors = self.SetErrorsToDict(check_interface.errors, errors) + return errors + + def Run(self): + self._AutoregisterChecks() + return super(CheckpkgManager2, self).Run() + + def ParseTagLine(line): """Parses a line from the tag.${module} file. @@ -681,7 +940,7 @@ def __repr__(self): return (u"Override(%s, %s, %s)" - % (self.pkgname, self.tag_name, self.tag_info)) + % (repr(self.pkgname), repr(self.tag_name), repr(self.tag_info))) def DoesApply(self, tag): """Figures out if this override applies to the given tag.""" @@ -697,6 +956,7 @@ basket_b["tag_name"] = tag.tag_name return basket_a == basket_b + def ParseOverrideLine(line): level_1 = line.split(":") if len(level_1) > 1: @@ -717,18 +977,22 @@ def ApplyOverrides(error_tags, overrides): """Filters out all the error tags that overrides apply to. - + O(N * M), but N and M are always small. """ tags_after_overrides = [] + applied_overrides = set([]) + provided_overrides = set(copy.copy(overrides)) for tag in error_tags: override_applies = False for override in overrides: if override.DoesApply(tag): override_applies = True + applied_overrides.add(override) if not override_applies: tags_after_overrides.append(tag) - return tags_after_overrides + unapplied_overrides = provided_overrides.difference(applied_overrides) + return tags_after_overrides, unapplied_overrides def GetIsalist(): @@ -744,16 +1008,16 @@ class PackageStats(object): """Collects stats about a package and saves it.""" - STATS_VERSION = 1L # This list needs to be synchronized with the CollectStats() method. STAT_FILES = [ "all_filenames", "basic_stats", "binaries", "binaries_dump_info", + # "defined_symbols", "depends", "isalist", - "ldd_dash_r", + # "ldd_dash_r", "overrides", "pkginfo", "pkgmap", @@ -849,10 +1113,11 @@ def GetBasicStats(self): dir_pkg = self.GetDirFormatPkg() basic_stats = {} - basic_stats["stats_version"] = self.STATS_VERSION + basic_stats["stats_version"] = PACKAGE_STATS_VERSION basic_stats["pkg_path"] = self.srv4_pkg.pkg_path basic_stats["pkg_basename"] = os.path.basename(self.srv4_pkg.pkg_path) - basic_stats["parsed_basename"] = opencsw.ParsePackageFileName(basic_stats["pkg_basename"]) + basic_stats["parsed_basename"] = opencsw.ParsePackageFileName( + basic_stats["pkg_basename"]) basic_stats["pkgname"] = dir_pkg.pkgname basic_stats["catalogname"] = dir_pkg.GetCatalogname() return basic_stats @@ -888,12 +1153,70 @@ retcode = ldd_proc.wait() if retcode: logging.error("%s returned an error: %s", args, stderr) - lines = stdout.splitlines() - ldd_output[binary] = lines + ldd_info = [] + for line in stdout.splitlines(): + ldd_info.append(self._ParseLddDashRline(line)) + ldd_output[binary] = ldd_info return ldd_output + def GetDefinedSymbols(self): + """Returns text symbols (i.e. defined functions) for packaged ELF objects - def CollectStats(self): + To do this we parse output lines from nm similar to the following. "T"s are + the definitions which we are after. + + 0000104000 D _lib_version + 0000986980 D _libiconv_version + 0000000000 U abort + 0000097616 T aliases_lookup + """ + dir_pkg = self.GetDirFormatPkg() + binaries = dir_pkg.ListBinaries() + defined_symbols = {} + + for binary in binaries: + binary_abspath = os.path.join(dir_pkg.directory, "root", binary) + # Get parsable, ld.so.1 relevant SHT_DYNSYM symbol information + args = ["/usr/ccs/bin/nm", "-p", "-D", binary_abspath] + nm_proc = subprocess.Popen( + args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = nm_proc.communicate() + retcode = nm_proc.wait() + if retcode: + logging.error("%s returned an error: %s", args, stderr) + continue + nm_out = stdout.splitlines() + + defined_symbols[binary] = [] + for line in nm_out: + sym = self._ParseNmSymLine(line) + if not sym: + continue + if sym['type'] not in ("T", "D", "B"): + continue + defined_symbols[binary].append(sym['name']) + + return defined_symbols + + def _ParseNmSymLine(self, line): + re_defined_symbol = re.compile('[0-9]+ [ABDFNSTU] \S+') + m = re_defined_symbol.match(line) + if not m: + return None + fields = line.split() + sym = { 'address': fields[0], 'type': fields[1], 'name': fields[2] } + return sym + + def CollectStats(self, force=False): + if not self.StatsDirExists() or force: + self._CollectStats() + + def _CollectStats(self): + """The list of variables needs to be synchronized with the one + at the top of this class. + """ stats_path = self.GetStatsPath() self.MakeStatsDir() dir_pkg = self.GetDirFormatPkg() @@ -907,7 +1230,10 @@ self.DumpObject(self.GetOverrides(), "overrides") self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo") self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap") - self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") + # This check is currently disabled, let's save time by not collecting + # these data. + # self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") + # self.DumpObject(self.GetDefinedSymbols(), "defined_symbols") logging.debug("Statistics collected.") def GetAllStats(self): @@ -942,17 +1268,18 @@ in_file_name = os.path.join(stats_path, "%s.yml" % name) in_file_name_pickle = os.path.join(stats_path, "%s.pickle" % name) if os.path.exists(in_file_name_pickle): - logging.debug("ReadObject(): reading %s", repr(in_file_name_pickle)) + # logging.debug("ReadObject(): reading %s", repr(in_file_name_pickle)) f = open(in_file_name_pickle, "r") obj = cPickle.load(f) f.close() - logging.debug("ReadObject(): finished reading %s", repr(in_file_name_pickle)) + # logging.debug("ReadObject(): finished reading %s", + # repr(in_file_name_pickle)) else: - logging.debug("ReadObject(): reading %s", repr(in_file_name)) + # logging.debug("ReadObject(): reading %s", repr(in_file_name)) f = open(in_file_name, "r") obj = yaml.safe_load(f) f.close() - logging.debug("ReadObject(): finished reading %s", repr(in_file_name)) + # logging.debug("ReadObject(): finished reading %s", repr(in_file_name)) return obj def ReadSavedStats(self): @@ -960,3 +1287,40 @@ for name in self.STAT_FILES: all_stats[name] = self.ReadObject(name) return all_stats + + def _ParseLddDashRline(self, line): + found_re = r"^\t(?P\S+)\s+=>\s+(?P\S+)" + symbol_not_found_re = r"^\tsymbol not found:\s(?P\S+)\s+\((?P\S+)\)" + only_so = r"^\t(?P\S+)$" + version_so = r'^\t(?P\S+) \((?P\S+)\) =>\t \(version not found\)' + common_re = r"(%s|%s|%s|%s)" % (found_re, symbol_not_found_re, only_so, version_so) + m = re.match(common_re, line) + response = {} + if m: + d = m.groupdict() + if "soname" in d and d["soname"]: + # it was found + response["state"] = "OK" + response["soname"] = d["soname"] + response["path"] = d["path_found"] + response["symbol"] = None + elif "symbol" in d and d["symbol"]: + response["state"] = "symbol-not-found" + response["soname"] = None + response["path"] = d["path_not_found"] + response["symbol"] = d["symbol"] @@ 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 rthurner at users.sourceforge.net Sat Mar 13 12:00:28 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 13 Mar 2010 11:00:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[9129] csw/mgar/pkg Message-ID: Revision: 9129 http://gar.svn.sourceforge.net/gar/?rev=9129&view=rev Author: rthurner Date: 2010-03-13 11:00:28 +0000 (Sat, 13 Mar 2010) Log Message: ----------- opennms - first checkin Added Paths: ----------- csw/mgar/pkg/opennms/ csw/mgar/pkg/opennms/branches/ csw/mgar/pkg/opennms/tags/ csw/mgar/pkg/opennms/trunk/ csw/mgar/pkg/opennms/trunk/Makefile csw/mgar/pkg/opennms/trunk/checksums csw/mgar/pkg/opennms/trunk/files/ Property changes on: csw/mgar/pkg/opennms/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/opennms/trunk/Makefile =================================================================== --- csw/mgar/pkg/opennms/trunk/Makefile (rev 0) +++ csw/mgar/pkg/opennms/trunk/Makefile 2010-03-13 11:00:28 UTC (rev 9129) @@ -0,0 +1,23 @@ +GARNAME = opennms +GARVERSION = 1.6.10 +CATEGORIES = java + +DESCRIPTION = enterprise grade network management platform +define BLURB + OpenNMS is an enterprise grade network management system, written in Java. + Demo is at http://demo.opennms.org/opennms, username/pwd: demo/demo. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-source-$(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 = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/opennms/trunk/checksums =================================================================== 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 Mar 13 12:09:16 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 13 Mar 2010 11:09:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9130] csw/mgar/pkg/trac/trunk Message-ID: Revision: 9130 http://gar.svn.sourceforge.net/gar/?rev=9130&view=rev Author: rthurner Date: 2010-03-13 11:09:16 +0000 (Sat, 13 Mar 2010) Log Message: ----------- trac - upgrade to trac 0.11.7 Modified Paths: -------------- csw/mgar/pkg/trac/trunk/Makefile csw/mgar/pkg/trac/trunk/checksums Modified: csw/mgar/pkg/trac/trunk/Makefile =================================================================== --- csw/mgar/pkg/trac/trunk/Makefile 2010-03-13 11:00:28 UTC (rev 9129) +++ csw/mgar/pkg/trac/trunk/Makefile 2010-03-13 11:09:16 UTC (rev 9130) @@ -1,7 +1,7 @@ # $Id$ GARNAME = Trac -GARVERSION = 0.11.6 +GARVERSION = 0.11.7 CATEGORIES = python DESCRIPTION = Integrated SCM and Project Management Modified: csw/mgar/pkg/trac/trunk/checksums =================================================================== --- csw/mgar/pkg/trac/trunk/checksums 2010-03-13 11:00:28 UTC (rev 9129) +++ csw/mgar/pkg/trac/trunk/checksums 2010-03-13 11:09:16 UTC (rev 9130) @@ -1 +1 @@ -f5a9542d81d3d50c3d9e46d8e2344f38 download/Trac-0.11.6.tar.gz +3cd96dad0e4f25d977c422fd6e985e99 Trac-0.11.7.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 Sat Mar 13 12:22:42 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 13 Mar 2010 11:22:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[9131] csw/mgar/pkg/genshi/trunk/Makefile Message-ID: Revision: 9131 http://gar.svn.sourceforge.net/gar/?rev=9131&view=rev Author: rthurner Date: 2010-03-13 11:22:42 +0000 (Sat, 13 Mar 2010) Log Message: ----------- genshi - update to 'python' in Makefile Modified Paths: -------------- csw/mgar/pkg/genshi/trunk/Makefile Modified: csw/mgar/pkg/genshi/trunk/Makefile =================================================================== --- csw/mgar/pkg/genshi/trunk/Makefile 2010-03-13 11:09:16 UTC (rev 9130) +++ csw/mgar/pkg/genshi/trunk/Makefile 2010-03-13 11:22:42 UTC (rev 9131) @@ -1,6 +1,6 @@ GARNAME = Genshi GARVERSION = 0.5.1 -CATEGORIES = utils +CATEGORIES = python DESCRIPTION = Python toolkit for generation of output for the web define BLURB @@ -9,29 +9,20 @@ or other textual content for output generation on the web endef -MASTER_SITES = http://ftp.edgewall.com/pub/genshi/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 - -ARCHALL_CSWgenshi = 1 -PACKAGES = CSWgenshi -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc -PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES = none cswpycompile - -RUNTIME_DEP_PKGS_CSWgenshi = CSWpython -CATALOGNAME_CSWgenshi = genshi -SPKG_DESC_CSWgenshi = $(DESCRIPTION) - +MASTER_SITES = http://ftp.edgewall.com/pub/genshi/ +SPKG_SOURCEURL = http://genshi.edgewall.org/wiki/TracDownload +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+)*) +UFILES_REGEX = (\d+(?:\.\d+)*).tar.gz -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = $(WORKSRC)/setup.py -TEST_SCRIPTS = -INSTALL_SCRIPTS = $(WORKSRC)/setup.py +PACKAGES = CSWgenshi +ARCHALL_CSWtrac = 1 -INSTALL_ARGS += --root=$(DESTDIR) +CATALOGNAME_CSWgenshi = genshi +SPKG_DESC_CSWgenshi = $(DESCRIPTION) +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 wahwah at users.sourceforge.net Sat Mar 13 12:58:17 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 13 Mar 2010 11:58:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9132] csw/mgar/gar/v2/lib Message-ID: Revision: 9132 http://gar.svn.sourceforge.net/gar/?rev=9132&view=rev Author: wahwah Date: 2010-03-13 11:58:17 +0000 (Sat, 13 Mar 2010) Log Message: ----------- Ported the libs check into the the new API. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/package_checks.py Removed Paths: ------------- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py Deleted: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py 2010-03-13 11:22:42 UTC (rev 9131) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-libs.py 2010-03-13 11:58:17 UTC (rev 9132) @@ -1,185 +0,0 @@ -#!/opt/csw/bin/python2.6 -# -# $Id$ - -"""A check for dependencies between shared libraries. -This is currently more of a prototype than a mature program, but it has some -unit tests and it appears to be working. The main problem is that it's not -divided into smaller testable sections. -""" - -import os -import os.path -import copy -import re -import subprocess -import logging -import sys -import textwrap -from Cheetah import Template - -CHECKPKG_MODULE_NAME = "shared library linking consistency" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import opencsw - -def CheckSharedLibraryConsistency(pkgs_data, debug): - ws_re = re.compile(r"\s+") - result_ok = True - errors = [] - binaries = [] - binaries_by_pkgname = {} - sonames_by_pkgname = {} - pkg_by_any_filename = {} - needed_sonames_by_binary = {} - filenames_by_soname = {} - for pkg_data in pkgs_data: - binaries_base = [os.path.basename(x) for x in pkg_data["binaries"]] - pkgname = pkg_data["basic_stats"]["pkgname"] - binaries_by_pkgname[pkgname] = binaries_base - binaries.extend(pkg_data["binaries"]) - for filename in pkg_data["all_filenames"]: - pkg_by_any_filename[filename] = pkgname - for binary_data in pkg_data["binaries_dump_info"]: - binary_base_name = os.path.basename(binary_data["base_name"]) - needed_sonames_by_binary[binary_base_name] = binary_data - filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name - - # Making the binaries unique - binaries = set(binaries) - isalist = pkg_data["isalist"] - - # Building indexes by soname to simplify further processing - # These are indexes "by soname". - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - needed_sonames_by_binary) - - pkgmap = checkpkg.SystemPkgmap() - logging.debug("Determining the soname-package relationships.") - # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog - runpath_data_by_soname = {} - for soname in needed_sonames: - runpath_data_by_soname[soname] = pkgmap.GetPkgmapLineByBasename(soname) - lines_by_soname = checkpkg.GetLinesBySoname( - runpath_data_by_soname, needed_sonames, runpath_by_needed_soname, isalist) - - # Creating a map from files to packages. - pkgs_by_filename = {} - for soname, line in lines_by_soname.iteritems(): - # TODO: Find all the packages, not just the last field. - fields = re.split(ws_re, line.strip()) - # For now, we'll assume that the last field is the package. - pkgname = fields[-1] - pkgs_by_filename[soname] = pkgname - - # A shared object dependency/provisioning report, plus checking. - # - # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), - # it has a different purpose: it reports the relationships between shared - # libraries, binaries using them and packages providing them. Ideally, the - # same bit of code would do both checking and reporting. - # - # TODO: Rewrite this using cheetah templates - if debug and needed_sonames: - print "Analysis of sonames needed by the package set:" - binaries_with_missing_sonames = set([]) - for soname in needed_sonames: - logging.debug("Analyzing: %s", soname) - if soname in filenames_by_soname: - print "%s is provided by the package itself" % soname - elif soname in lines_by_soname: - print ("%s is provided by %s and required by:" - % (soname, - pkgs_by_filename[soname])) - filename_lines = " ".join(sorted(binaries_by_soname[soname])) - for line in textwrap.wrap(filename_lines, 70): - print " ", line - else: - print ("%s is required by %s, but we don't know what provides it." - % (soname, binaries_by_soname[soname])) - for binary in binaries_by_soname[soname]: - binaries_with_missing_sonames.add(binary) - if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: - print "However, it's a whitelisted soname." - else: - pass - # The error checking needs to be unified: done in one place only. - # errors.append( - # checkpkg.CheckpkgTag( - # "%s is required by %s, but " - # "we don't know what provides it." - # % (soname, binaries_by_soname[soname]))) - if binaries_with_missing_sonames: - print "The following are binaries with missing sonames:" - binary_lines = " ".join(sorted(binaries_with_missing_sonames)) - for line in textwrap.wrap(binary_lines, 70): - print " ", line - print - - dependent_pkgs = {} - for checker in pkgs_data: - pkgname = checker["basic_stats"]["pkgname"] - declared_dependencies = dict(checker["depends"]) - missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( - pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_filename, - filenames_by_soname, - pkg_by_any_filename) - namespace = { - "pkgname": pkgname, - "missing_deps": missing_deps, - "surplus_deps": surplus_deps, - "orphan_sonames": orphan_sonames, - } - t = Template.Template(checkpkg.REPORT_TMPL, searchList=[namespace]) - print unicode(t) - - for soname in orphan_sonames: - errors.append( - checkpkg.CheckpkgTag( - pkgname, - "orphan-soname", - soname)) - for missing_dep in missing_deps: - errors.append( - checkpkg.CheckpkgTag( - pkgname, - "missing-dependency", - missing_dep)) - return errors - - -def main(): - options, args = checkpkg.GetOptions() - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - - check_manager.RegisterSetCheck(CheckSharedLibraryConsistency) - - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() - -# vim:set sw=2 ts=2 sts=2 expandtab: Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-13 11:22:42 UTC (rev 9131) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-13 11:58:17 UTC (rev 9132) @@ -816,7 +816,11 @@ if not self.system_pkgmap: self.system_pkgmap = SystemPkgmap() + def GetPkgmapLineByBasename(self, basename): + """Proxies calls to self.system_pkgmap.""" + return self.system_pkgmap.GetPkgmapLineByBasename(basename) + class IndividualCheckInterface(CheckInterfaceBase): """To be passed to the checking functions. @@ -833,9 +837,10 @@ self.errors.append(tag) -def SetCheckInterface(object): +class SetCheckInterface(CheckInterfaceBase): """To be passed to set checking functions.""" - def __init__(self, system_pkgmap): + + def __init__(self, system_pkgmap=None): super(SetCheckInterface, self).__init__(system_pkgmap) self.errors = [] @@ -872,19 +877,21 @@ self._RegisterIndividualCheck(member) elif member_name.startswith("SetCheck"): logging.debug("Registering set check %s", repr(member_name)) - self._RegisterIndividualCheck(member) + self._RegisterSetCheck(member) def GetAllTags(self, packages_data): errors = {} + # TODO: Configure the logger with the logging level. logging_level = logging.INFO if self.debug: logging_level = logging.DEBUG + pkgmap = SystemPkgmap() # Individual checks for pkg_data in packages_data: for function in self.individual_checks: all_stats = pkg_data.GetAllStats() pkgname = all_stats["basic_stats"]["pkgname"] - check_interface = IndividualCheckInterface(pkgname) + check_interface = IndividualCheckInterface(pkgname, pkgmap) logger = logging.getLogger("%s-%s" % (pkgname, function.__name__)) logger.debug("Calling %s", function.__name__) function(all_stats, check_interface, logger=logger) @@ -894,7 +901,7 @@ for function in self.set_checks: pkgs_data = [x.GetAllStats() for x in packages_data] logger = logging.getLogger("SetCheck-%s" % (function.__name__,)) - check_interface = SetCheckInterface() + check_interface = SetCheckInterface(pkgmap) logger.debug("Calling %s", function.__name__) function(pkgs_data, check_interface, logger) if check_interface.errors: Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-13 11:22:42 UTC (rev 9131) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-13 11:58:17 UTC (rev 9132) @@ -12,7 +12,9 @@ # error_mgr.ReportError("something-is-wrong") import re +import os import checkpkg +from Cheetah import Template PATHS_ALLOWED_ONLY_IN = { "CSWcommon": ["/opt", @@ -100,6 +102,125 @@ "%s class=%s" % (entry["path"], entry["class"])) +def SetCheckSharedLibraryConsistency(pkgs_data, error_mgr, logger): + ws_re = re.compile(r"\s+") + result_ok = True + binaries = [] + binaries_by_pkgname = {} + sonames_by_pkgname = {} + pkg_by_any_filename = {} + needed_sonames_by_binary = {} + filenames_by_soname = {} + for pkg_data in pkgs_data: + binaries_base = [os.path.basename(x) for x in pkg_data["binaries"]] + pkgname = pkg_data["basic_stats"]["pkgname"] + binaries_by_pkgname[pkgname] = binaries_base + binaries.extend(pkg_data["binaries"]) + for filename in pkg_data["all_filenames"]: + pkg_by_any_filename[filename] = pkgname + for binary_data in pkg_data["binaries_dump_info"]: + binary_base_name = os.path.basename(binary_data["base_name"]) + needed_sonames_by_binary[binary_base_name] = binary_data + filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name + + # Making the binaries unique + binaries = set(binaries) + isalist = pkg_data["isalist"] + + # Building indexes by soname to simplify further processing + # These are indexes "by soname". + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + needed_sonames_by_binary) + + logger.debug("Determining the soname-package relationships.") + # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog + runpath_data_by_soname = {} + for soname in needed_sonames: + runpath_data_by_soname[soname] = error_mgr.GetPkgmapLineByBasename(soname) + lines_by_soname = checkpkg.GetLinesBySoname( + runpath_data_by_soname, needed_sonames, runpath_by_needed_soname, isalist) + + # Creating a map from files to packages. + pkgs_by_filename = {} + for soname, line in lines_by_soname.iteritems(): + # TODO: Find all the packages, not just the last field. + fields = re.split(ws_re, line.strip()) + # For now, we'll assume that the last field is the package. + pkgname = fields[-1] + pkgs_by_filename[soname] = pkgname + + # A shared object dependency/provisioning report, plus checking. + # + # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), + # it has a different purpose: it reports the relationships between shared + # libraries, binaries using them and packages providing them. Ideally, the + # same bit of code would do both checking and reporting. + # + # TODO: Rewrite this using cheetah templates + if False and needed_sonames: + print "Analysis of sonames needed by the package set:" + binaries_with_missing_sonames = set([]) + for soname in needed_sonames: + logger.debug("Analyzing: %s", soname) + if soname in filenames_by_soname: + print "%s is provided by the package itself" % soname + elif soname in lines_by_soname: + print ("%s is provided by %s and required by:" + % (soname, + pkgs_by_filename[soname])) + filename_lines = " ".join(sorted(binaries_by_soname[soname])) + for line in textwrap.wrap(filename_lines, 70): + print " ", line + else: + print ("%s is required by %s, but we don't know what provides it." + % (soname, binaries_by_soname[soname])) + for binary in binaries_by_soname[soname]: + binaries_with_missing_sonames.add(binary) + if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: + print "However, it's a whitelisted soname." + else: + pass + # The error checking needs to be unified: done in one place only. + # errors.append( + # checkpkg.CheckpkgTag( + # "%s is required by %s, but " + # "we don't know what provides it." + # % (soname, binaries_by_soname[soname]))) + if binaries_with_missing_sonames: + print "The following are binaries with missing sonames:" + binary_lines = " ".join(sorted(binaries_with_missing_sonames)) + for line in textwrap.wrap(binary_lines, 70): + print " ", line + print + + dependent_pkgs = {} + for checker in pkgs_data: + pkgname = checker["basic_stats"]["pkgname"] + declared_dependencies = dict(checker["depends"]) + missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( + pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_filename, + filenames_by_soname, + pkg_by_any_filename) + namespace = { + "pkgname": pkgname, + "missing_deps": missing_deps, + "surplus_deps": surplus_deps, + "orphan_sonames": orphan_sonames, + } + t = Template.Template(checkpkg.REPORT_TMPL, searchList=[namespace]) + print unicode(t) + for soname in orphan_sonames: + error_mgr.ReportError(pkgname, "orphan-soname", soname) + for missing_dep in missing_deps: + error_mgr.ReportError(pkgname, "missing-dependency", missing_dep) + + def SetCheckDependencies(pkgs_data, error_mgr, logger): """Dependencies must be either installed in the system, or in the set.""" pass 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 Mar 13 13:27:10 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 13 Mar 2010 12:27:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9133] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 9133 http://gar.svn.sourceforge.net/gar/?rev=9133&view=rev Author: chninkel Date: 2010-03-13 12:27:10 +0000 (Sat, 13 Mar 2010) Log Message: ----------- openssh: updated to 5.4p1 Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2010-03-13 11:58:17 UTC (rev 9132) +++ csw/mgar/pkg/openssh/trunk/Makefile 2010-03-13 12:27:10 UTC (rev 9133) @@ -13,9 +13,9 @@ ###### Package information ####### GARNAME = openssh -GARVERSION = 5.3p1 +GARVERSION = 5.4p1 GSSKEX_PATCH_VERSION = $(GARVERSION) -GSSKEX_PATCH_DATE = 20090726 +GSSKEX_PATCH_DATE = 20100313 CATEGORIES = server DESCRIPTION = OpenSSH Secure Shell Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2010-03-13 11:58:17 UTC (rev 9132) +++ csw/mgar/pkg/openssh/trunk/checksums 2010-03-13 12:27:10 UTC (rev 9133) @@ -1,16 +1,16 @@ 1d3d6d477c09e59c514e637fa3a2f7a4 CSWossh.checkinstall 0993813fa5c752215f892cb67c86816f CSWossh.preinstall -2d0c92b03003215df91957cb51732bdb CSWossh.prototype +0e80f1918e5dd7ca26f8a65853d63561 CSWossh.prototype 100436e85373a723db3b27c5fd02ee34 CSWosshclient.prototype 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall 8918d3ebf02704b65e11e82f1db10cd5 CSWosshlpk.prototype -2d1343a75521f5db657da9ad5a6d8dca changelog.CSW +279bdcf587e6191c295c3adc1b0cfb8d changelog.CSW 9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh 8e765642349b6321d01b33e95304e113 cswopenssh.xml 4b3e79120b60e8f25be5141eba53cac5 don_t_use_TIOCSCTTY.patch ca5403c8e1539d5ced0573f289ed7aef no_x_forwarding_bug.patch -d8f82af1449f36ae9864bd614245fb59 openssh-5.3p1-gsskex-all-20090726.patch -13563dbf61f36ca9a1e4254260131041 openssh-5.3p1.tar.gz +10e0b84c84ad0dc9c490480aab36be01 openssh-5.4p1-gsskex-all-20100313.patch +da10af8a789fa2e83e3635f3a1b76f5e openssh-5.4p1.tar.gz db57ce80e8944213443caa4c52c884e5 sshd.smf_wrapper Modified: csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2010-03-13 11:58:17 UTC (rev 9132) +++ csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2010-03-13 12:27:10 UTC (rev 9133) @@ -7,7 +7,6 @@ f none /opt/csw/libexec/sftp-server 0755 root bin f none /opt/csw/sbin/sshd 0755 root bin f none /opt/csw/sbin/sshd.smf_wrapper 0755 root bin -f none /opt/csw/share/Ssh.bin 0644 root bin d none /opt/csw/share/doc/openssh 0755 root bin f none /opt/csw/share/doc/openssh/changelog.CSW 0644 root bin f none /opt/csw/share/doc/openssh/CREDITS 0644 root bin @@ -21,7 +20,6 @@ f none /opt/csw/share/doc/openssh/README.dns 0644 root bin f none /opt/csw/share/doc/openssh/README.platform 0644 root bin f none /opt/csw/share/doc/openssh/README.privsep 0644 root bin -f none /opt/csw/share/doc/openssh/README.smartcard 0644 root bin f none /opt/csw/share/doc/openssh/README.tun 0644 root bin f none /opt/csw/share/doc/openssh/TODO 0644 root bin f none /opt/csw/share/doc/openssh/WARNING.RNG 0644 root bin Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2010-03-13 11:58:17 UTC (rev 9132) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2010-03-13 12:27:10 UTC (rev 9133) @@ -1,3 +1,9 @@ +openssh (5.4p1,REV=2010.03.13) unstable + + * New upstream release. + + -- Yann Rouillard Fri, 12 Mar 2010 23:53:43 +0100 + openssh (5.3p1,REV=2010.02.28) unstable * Added ssh-copy-id contrib script (Closes: #4306) 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 Mar 13 13:29:55 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 13 Mar 2010 12:29:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[9134] csw/mgar/pkg/bash/trunk Message-ID: Revision: 9134 http://gar.svn.sourceforge.net/gar/?rev=9134&view=rev Author: chninkel Date: 2010-03-13 12:29:55 +0000 (Sat, 13 Mar 2010) Log Message: ----------- bash: updated changelog Modified Paths: -------------- csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2010-03-13 12:27:10 UTC (rev 9133) +++ csw/mgar/pkg/bash/trunk/checksums 2010-03-13 12:29:55 UTC (rev 9134) @@ -2,6 +2,6 @@ 9800d8724815fd84994d9be65ab5e7b8 bash-4.1.tar.gz 582dea5671b557f783e18629c2f77b68 bash41-001 118d465095d4a4706eb1d34696a2666a bash41-002 -a3e2dc4ade9f1b1dafc8185e7f1c737e changelog.CSW +0e8c019d3009abe72c241552b3fdc65f changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-03-13 12:27:10 UTC (rev 9133) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-03-13 12:29:55 UTC (rev 9134) @@ -1,9 +1,9 @@ -bash (4.1.02,REV=2010.01.23) unstable +bash (4.1.02,REV=2010.03.13) unstable * Added bash patches bash41-001 and bash41-002. * Removed patch vsnprintf.patch applied upstream. - -- Yann Rouillard Fri, 22 Jan 2010 22:04:28 +0100 + -- Yann Rouillard Sat, 13 Mar 2010 13:28:35 +0100 bash (4.1,REV=2010.01.07) unstable 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 Mar 13 15:28:45 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 13 Mar 2010 14:28:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[9135] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 9135 http://gar.svn.sourceforge.net/gar/?rev=9135&view=rev Author: chninkel Date: 2010-03-13 14:28:45 +0000 (Sat, 13 Mar 2010) Log Message: ----------- openssh: README.smartcard is not here anymore Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2010-03-13 12:29:55 UTC (rev 9134) +++ csw/mgar/pkg/openssh/trunk/checksums 2010-03-13 14:28:45 UTC (rev 9135) @@ -1,7 +1,7 @@ 1d3d6d477c09e59c514e637fa3a2f7a4 CSWossh.checkinstall 0993813fa5c752215f892cb67c86816f CSWossh.preinstall 0e80f1918e5dd7ca26f8a65853d63561 CSWossh.prototype -100436e85373a723db3b27c5fd02ee34 CSWosshclient.prototype +acd1e3d1a9eb1fa86df07936e292601e CSWosshclient.prototype 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall 8918d3ebf02704b65e11e82f1db10cd5 CSWosshlpk.prototype Modified: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype 2010-03-13 12:29:55 UTC (rev 9134) +++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype 2010-03-13 14:28:45 UTC (rev 9135) @@ -24,7 +24,6 @@ f none /opt/csw/share/doc/openssh_client/README.dns 0644 root bin f none /opt/csw/share/doc/openssh_client/README.platform 0644 root bin f none /opt/csw/share/doc/openssh_client/README.privsep 0644 root bin -f none /opt/csw/share/doc/openssh_client/README.smartcard 0644 root bin f none /opt/csw/share/doc/openssh_client/README.tun 0644 root bin f none /opt/csw/share/doc/openssh_client/TODO 0644 root bin f none /opt/csw/share/doc/openssh_client/WARNING.RNG 0644 root bin 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 Mar 13 17:09:30 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 13 Mar 2010 16:09:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9136] csw/mgar/pkg/bash/trunk Message-ID: Revision: 9136 http://gar.svn.sourceforge.net/gar/?rev=9136&view=rev Author: chninkel Date: 2010-03-13 16:09:30 +0000 (Sat, 13 Mar 2010) Log Message: ----------- bash: switched to dynamic prototype Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/bash/trunk/files/CSWbash.prototype Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-03-13 14:28:45 UTC (rev 9135) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-03-13 16:09:30 UTC (rev 9136) @@ -44,7 +44,6 @@ MASTER_SITES += $(GNU_MIRROR) DISTNAME = $(GARNAME)-$(BASH_VERSION) DISTFILES = $(GARNAME)-$(BASH_VERSION).tar.gz -DISTFILES += CSWbash.prototype DISTFILES += changelog.CSW # build action script to modify /etc/shells at package installation and removal time @@ -67,9 +66,23 @@ # opencsw bash use /etc/bash.bashrc and /etc/bash.bash_logout files PATCHFILES += use_system_bashrc_and_logout.patch +LICENSE = COPYING +# we add CSW bash to the /etc/shells files using the build script +PROTOTYPE_MODIFIERS = shell +PROTOTYPE_FILES_shell = \/etc\/shells # a normal Perl regexp. Watch out for links! +PROTOTYPE_PERMS_shell = ? +PROTOTYPE_CLASS_shell = build +PROTOTYPE_USER_shell = ? +PROTOTYPE_GROUP_shell = ? +PROTOTYPE_FTYPE_shell = e + + ##### Build and installation information ##### +CHECKPKG_OVERRIDES_CSWbash += action-class-only-in-pkginfo|build + + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk @@ -81,7 +94,6 @@ touch $(WORKSRC)/configure touch $(WORKSRC)/config.status - post-merge: @( for FILE in README RBASH NEWS NOTES POSIX AUTHORS doc/FAQ doc/INTRO; do \ ginstall -D $(WORKSRC_FIRSTMOD)/$$FILE $(PKGROOT)$(docdir)/$(GARNAME)/`basename $$FILE`; \ Deleted: csw/mgar/pkg/bash/trunk/files/CSWbash.prototype =================================================================== --- csw/mgar/pkg/bash/trunk/files/CSWbash.prototype 2010-03-13 14:28:45 UTC (rev 9135) +++ csw/mgar/pkg/bash/trunk/files/CSWbash.prototype 2010-03-13 16:09:30 UTC (rev 9136) @@ -1,43 +0,0 @@ -e build /etc/shells ? ? ? -f none /opt/csw/bin/bash 0755 root bin -f none /opt/csw/bin/bashbug 0555 root bin -d none /opt/csw/share/doc/bash 0755 root bin -f none /opt/csw/share/doc/bash/changelog.CSW 0644 root bin -f none /opt/csw/share/doc/bash/README 0644 root bin -f none /opt/csw/share/doc/bash/FAQ 0644 root bin -f none /opt/csw/share/doc/bash/RBASH 0644 root bin -f none /opt/csw/share/doc/bash/NEWS 0644 root bin -f none /opt/csw/share/doc/bash/NOTES 0644 root bin -f none /opt/csw/share/doc/bash/POSIX 0644 root bin -f none /opt/csw/share/doc/bash/AUTHORS 0644 root bin -f none /opt/csw/share/doc/bash/INTRO 0644 root bin -f none /opt/csw/share/info/bash.info 0644 root bin -d none /opt/csw/share/locale/en at boldquot 0755 root bin -d none /opt/csw/share/locale/en at boldquot/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/en at boldquot/LC_MESSAGES/bash.mo 0644 root bin -d none /opt/csw/share/locale/en at quot 0755 root bin -d none /opt/csw/share/locale/en at quot/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/en at quot/LC_MESSAGES/bash.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 -d none /opt/csw/share/locale/fr 0755 root bin -d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/it 0755 root bin -d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/ja 0755 root bin -d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/ko 0755 root bin -d none /opt/csw/share/locale/ko/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/pl 0755 root bin -d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 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 -d none /opt/csw/share/locale/ru 0755 root bin -d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/zh_CN 0755 root bin -d none /opt/csw/share/locale/zh_CN/LC_MESSAGES 0755 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 -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/bash.1 0644 root bin -f none /opt/csw/share/man/man1/bashbug.1 0644 root bin Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-03-13 14:28:45 UTC (rev 9135) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-03-13 16:09:30 UTC (rev 9136) @@ -2,6 +2,7 @@ * Added bash patches bash41-001 and bash41-002. * Removed patch vsnprintf.patch applied upstream. + * Switched to dynamic prototype. -- Yann Rouillard Sat, 13 Mar 2010 13:28:35 +0100 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 Mar 13 17:47:12 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 13 Mar 2010 16:47:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9137] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 9137 http://gar.svn.sourceforge.net/gar/?rev=9137&view=rev Author: chninkel Date: 2010-03-13 16:47:11 +0000 (Sat, 13 Mar 2010) Log Message: ----------- openssh: fixed license file Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2010-03-13 16:09:30 UTC (rev 9136) +++ csw/mgar/pkg/openssh/trunk/checksums 2010-03-13 16:47:11 UTC (rev 9137) @@ -1,10 +1,10 @@ 1d3d6d477c09e59c514e637fa3a2f7a4 CSWossh.checkinstall 0993813fa5c752215f892cb67c86816f CSWossh.preinstall -0e80f1918e5dd7ca26f8a65853d63561 CSWossh.prototype -acd1e3d1a9eb1fa86df07936e292601e CSWosshclient.prototype +e00106f28a2aef529e097aa182906273 CSWossh.prototype +39259b734dc10d2b7eb82d2331254d4c CSWosshclient.prototype 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall -8918d3ebf02704b65e11e82f1db10cd5 CSWosshlpk.prototype +77b86c30c3257fdf014102c8166fab2d CSWosshlpk.prototype 279bdcf587e6191c295c3adc1b0cfb8d changelog.CSW 9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh Modified: csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2010-03-13 16:09:30 UTC (rev 9136) +++ csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2010-03-13 16:47:11 UTC (rev 9137) @@ -13,8 +13,8 @@ f none /opt/csw/share/doc/openssh/ChangeLog 0644 root bin f none /opt/csw/share/doc/openssh/ChangeLog.gssapi 0644 root bin f none /opt/csw/share/doc/openssh/INSTALL 0644 root bin +l none /opt/csw/share/doc/openssh/license=LICENCE 0644 root bin f none /opt/csw/share/doc/openssh/LICENCE 0644 root bin -f none /opt/csw/share/doc/openssh/license 0644 root bin f none /opt/csw/share/doc/openssh/OVERVIEW 0644 root bin f none /opt/csw/share/doc/openssh/README 0644 root bin f none /opt/csw/share/doc/openssh/README.dns 0644 root bin Modified: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype 2010-03-13 16:09:30 UTC (rev 9136) +++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype 2010-03-13 16:47:11 UTC (rev 9137) @@ -17,8 +17,8 @@ f none /opt/csw/share/doc/openssh_client/ChangeLog 0644 root bin f none /opt/csw/share/doc/openssh_client/ChangeLog.gssapi 0644 root bin f none /opt/csw/share/doc/openssh_client/INSTALL 0644 root bin +l none /opt/csw/share/doc/openssh_client/license=LICENCE f none /opt/csw/share/doc/openssh_client/LICENCE 0644 root bin -f none /opt/csw/share/doc/openssh_client/license 0644 root bin f none /opt/csw/share/doc/openssh_client/OVERVIEW 0644 root bin f none /opt/csw/share/doc/openssh_client/README 0644 root bin f none /opt/csw/share/doc/openssh_client/README.dns 0644 root bin Modified: csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype 2010-03-13 16:09:30 UTC (rev 9136) +++ csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype 2010-03-13 16:47:11 UTC (rev 9137) @@ -13,8 +13,8 @@ f none /opt/csw/share/doc/openssh_lpk/ChangeLog 0644 root bin f none /opt/csw/share/doc/openssh_lpk/ChangeLog.gssapi 0644 root bin f none /opt/csw/share/doc/openssh_lpk/INSTALL 0644 root bin +l none /opt/csw/share/doc/openssh_lpk/license=LICENCE f none /opt/csw/share/doc/openssh_lpk/LICENCE 0644 root bin -f none /opt/csw/share/doc/openssh_lpk/license 0644 root bin f none /opt/csw/share/doc/openssh_lpk/OVERVIEW 0644 root bin f none /opt/csw/share/doc/openssh_lpk/README 0644 root bin f none /opt/csw/share/doc/openssh_lpk/README.dns 0644 root bin 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 Mar 13 17:47:28 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 13 Mar 2010 16:47:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[9138] csw/mgar/pkg/bash/trunk/checksums Message-ID: Revision: 9138 http://gar.svn.sourceforge.net/gar/?rev=9138&view=rev Author: chninkel Date: 2010-03-13 16:47:28 +0000 (Sat, 13 Mar 2010) Log Message: ----------- bash: updated changelog Modified Paths: -------------- csw/mgar/pkg/bash/trunk/checksums Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2010-03-13 16:47:11 UTC (rev 9137) +++ csw/mgar/pkg/bash/trunk/checksums 2010-03-13 16:47:28 UTC (rev 9138) @@ -1,7 +1,6 @@ -f93b41b44ce6b023df65b72f00386ac5 CSWbash.prototype 9800d8724815fd84994d9be65ab5e7b8 bash-4.1.tar.gz 582dea5671b557f783e18629c2f77b68 bash41-001 118d465095d4a4706eb1d34696a2666a bash41-002 -0e8c019d3009abe72c241552b3fdc65f changelog.CSW +5e391cd68f85c1af76bddf7b7b84549b changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch 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 Mar 13 18:23:00 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 13 Mar 2010 17:23:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9139] csw/mgar/pkg/openssh/trunk/files Message-ID: Revision: 9139 http://gar.svn.sourceforge.net/gar/?rev=9139&view=rev Author: chninkel Date: 2010-03-13 17:22:59 +0000 (Sat, 13 Mar 2010) Log Message: ----------- openssh: added gsskex patch Added Paths: ----------- csw/mgar/pkg/openssh/trunk/files/openssh-5.4p1-gsskex-all-20100313.patch Removed Paths: ------------- csw/mgar/pkg/openssh/trunk/files/openssh-5.3p1-gsskex-all-20090726.patch Deleted: csw/mgar/pkg/openssh/trunk/files/openssh-5.3p1-gsskex-all-20090726.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-5.3p1-gsskex-all-20090726.patch 2010-03-13 16:47:28 UTC (rev 9138) +++ csw/mgar/pkg/openssh/trunk/files/openssh-5.3p1-gsskex-all-20090726.patch 2010-03-13 17:22:59 UTC (rev 9139) @@ -1,3060 +0,0 @@ -? .kex.h.swp -? .pc -? openssh-5.0p1-gsskex-20080404.patch -? openssh-5.0p1-gssrenew-20080707.patch -? openssh-5.2p1-gsskex-20090726.patch -? openssh-5.2p1-gsskex-all-20090726.patch -? patches -Index: ChangeLog.gssapi -=================================================================== -RCS file: ChangeLog.gssapi -diff -N ChangeLog.gssapi ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ ./ChangeLog.gssapi 26 Jul 2009 12:21:52 -0000 -@@ -0,0 +1,95 @@ -+20090615 -+ - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c -+ sshd.c ] -+ Fix issues identified by Greg Hudson following a code review -+ Check return value of gss_indicate_mechs -+ Protect GSSAPI calls in monitor, so they can only be used if enabled -+ Check return values of bignum functions in key exchange -+ Use BN_clear_free to clear other side's DH value -+ Make ssh_gssapi_id_kex more robust -+ Only configure kex table pointers if GSSAPI is enabled -+ Don't leak mechanism list, or gss mechanism list -+ Cast data.length before printing -+ If serverkey isn't provided, use an empty string, rather than NULL -+ -+20090201 -+ - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h -+ ssh_config.5 sshconnet2.c ] -+ Add support for the GSSAPIClientIdentity option, which allows the user -+ to specify which GSSAPI identity to use to contact a given server -+ -+20080404 -+ - [ gss-serv.c ] -+ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow -+ been omitted from a previous version of this patch. Reported by Borislav -+ Stoichkov -+ -+20070317 -+ - [ gss-serv-krb5.c ] -+ Remove C99ism, where new_ccname was being declared in the middle of a -+ function -+ -+20061220 -+ - [ servconf.c ] -+ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and -+ documented, behaviour. Reported by Dan Watson. -+ -+20060910 -+ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c -+ ssh-gss.h ] -+ add support for gss-group14-sha1 key exchange mechanisms -+ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ] -+ Add GSSAPIStrictAcceptorCheck option to allow the disabling of -+ acceptor principal checking on multi-homed machines. -+ -+ - [ sshd_config ssh_config ] -+ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample -+ configuration files -+ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ] -+ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf() -+ Limit length of error messages displayed by client -+ -+20060909 -+ - [ gss-genr.c gss-serv.c ] -+ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server -+ only, where they belong -+ -+ -+20060829 -+ - [ gss-serv-krb5.c ] -+ Fix CCAPI credentials cache name when creating KRB5CCNAME environment -+ variable -+ -+20060828 -+ - [ gss-genr.c ] -+ Avoid Heimdal context freeing problem -+ -+ -+20060818 -+ - [ gss-genr.c ssh-gss.h sshconnect2.c ] -+ Make sure that SPENGO is disabled -+ -+ -+20060421 -+ - [ gssgenr.c, sshconnect2.c ] -+ a few type changes (signed versus unsigned, int versus size_t) to -+ fix compiler errors/warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ kexgssc.c, sshconnect2.c ] -+ fix uninitialized variable warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ gssgenr.c ] -+ pass oid to gss_display_status (helpful when using GSSAPI mechglue) -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ gss-serv-krb5.c ] -+ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c -+ add client-side GssapiKeyExchange option -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ sshconnect2.c ] -+ add support for GssapiTrustDns option for gssapi-with-mic -+ (from jbasney AT ncsa.uiuc.edu) -+ -Index: Makefile.in -=================================================================== -RCS file: /cvs/openssh/Makefile.in,v -retrieving revision 1.298 -diff -u -r1.298 Makefile.in ---- ./Makefile.in 5 Nov 2008 05:20:46 -0000 1.298 -+++ ./Makefile.in 26 Jul 2009 12:21:53 -0000 -@@ -71,7 +71,8 @@ - atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ - monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ - kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ -- entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o -+ entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o \ -+ kexgssc.o - - SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ - sshconnect.o sshconnect1.o sshconnect2.o mux.o -@@ -84,7 +85,7 @@ - auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ - monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ - auth-krb5.o \ -- auth2-gss.o gss-serv.o gss-serv-krb5.o \ -+ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ - loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ - audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o - -Index: auth-krb5.c -=================================================================== -RCS file: /cvs/openssh/auth-krb5.c,v -retrieving revision 1.35 -diff -u -r1.35 auth-krb5.c ---- ./auth-krb5.c 5 Aug 2006 02:39:39 -0000 1.35 -+++ ./auth-krb5.c 26 Jul 2009 12:21:53 -0000 -@@ -166,8 +166,13 @@ - - len = strlen(authctxt->krb5_ticket_file) + 6; - authctxt->krb5_ccname = xmalloc(len); -+#ifdef USE_CCAPI -+ snprintf(authctxt->krb5_ccname, len, "API:%s", -+ authctxt->krb5_ticket_file); -+#else - snprintf(authctxt->krb5_ccname, len, "FILE:%s", - authctxt->krb5_ticket_file); -+#endif - - #ifdef USE_PAM - if (options.use_pam) -@@ -219,15 +224,22 @@ - #ifndef HEIMDAL - krb5_error_code - ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { -- int tmpfd, ret; -+ int ret; - char ccname[40]; - mode_t old_umask; -+#ifdef USE_CCAPI -+ char cctemplate[] = "API:krb5cc_%d"; -+#else -+ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX"; -+ int tmpfd; -+#endif - - ret = snprintf(ccname, sizeof(ccname), -- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); -+ cctemplate, geteuid()); - if (ret < 0 || (size_t)ret >= sizeof(ccname)) - return ENOMEM; - -+#ifndef USE_CCAPI - old_umask = umask(0177); - tmpfd = mkstemp(ccname + strlen("FILE:")); - umask(old_umask); -@@ -242,6 +254,7 @@ - return errno; - } - close(tmpfd); -+#endif - - return (krb5_cc_resolve(ctx, ccname, ccache)); - } -Index: auth.h -=================================================================== -RCS file: /cvs/openssh/auth.h,v -retrieving revision 1.80 -diff -u -r1.80 auth.h ---- ./auth.h 5 Nov 2008 05:20:46 -0000 1.80 -+++ ./auth.h 26 Jul 2009 12:21:53 -0000 -@@ -53,6 +53,7 @@ - int valid; /* user exists and is allowed to login */ - int attempt; - int failures; -+ int server_caused_failure; - int force_pwchange; - char *user; /* username sent by the client */ - char *service; -Index: auth2-gss.c -=================================================================== -RCS file: /cvs/openssh/auth2-gss.c,v -retrieving revision 1.19 -diff -u -r1.19 auth2-gss.c ---- ./auth2-gss.c 2 Dec 2007 11:59:45 -0000 1.19 -+++ ./auth2-gss.c 26 Jul 2009 12:21:54 -0000 -@@ -1,7 +1,7 @@ - /* $OpenBSD: auth2-gss.c,v 1.16 2007/10/29 00:52:45 dtucker Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -52,6 +52,40 @@ - static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); - static void input_gssapi_errtok(int, u_int32_t, void *); - -+/* -+ * The 'gssapi_keyex' userauth mechanism. -+ */ -+static int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ int authenticated = 0; -+ Buffer b; -+ gss_buffer_desc mic, gssbuf; -+ u_int len; -+ -+ mic.value = packet_get_string(&len); -+ mic.length = len; -+ -+ packet_check_eom(); -+ -+ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ /* gss_kex_context is NULL with privsep, so we can't check it here */ -+ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, -+ &gssbuf, &mic)))) -+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, -+ authctxt->pw)); -+ -+ buffer_free(&b); -+ xfree(mic.value); -+ -+ return (authenticated); -+} -+ - /* - * We only support those mechanisms that we know about (ie ones that we know - * how to check local user kuserok and the like) -@@ -102,6 +136,7 @@ - - if (!present) { - xfree(doid); -+ authctxt->server_caused_failure = 1; - return (0); - } - -@@ -109,6 +144,7 @@ - if (ctxt != NULL) - ssh_gssapi_delete_ctx(&ctxt); - xfree(doid); -+ authctxt->server_caused_failure = 1; - return (0); - } - -@@ -242,7 +278,8 @@ - - packet_check_eom(); - -- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); -+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, -+ authctxt->pw)); - - authctxt->postponed = 0; - dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); -@@ -277,7 +314,8 @@ - gssbuf.length = buffer_len(&b); - - if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic)))) -- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); -+ authenticated = -+ PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw)); - else - logit("GSSAPI MIC check failed"); - -@@ -291,6 +329,12 @@ - dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE, NULL); - userauth_finish(authctxt, authenticated, "gssapi-with-mic"); - } -+ -+Authmethod method_gsskeyex = { -+ "gssapi-keyex", -+ userauth_gsskeyex, -+ &options.gss_authentication -+}; - - Authmethod method_gssapi = { - "gssapi-with-mic", -Index: auth2.c -=================================================================== -RCS file: /cvs/openssh/auth2.c,v -retrieving revision 1.149 -diff -u -r1.149 auth2.c ---- ./auth2.c 5 Nov 2008 05:20:46 -0000 1.149 -+++ ./auth2.c 26 Jul 2009 12:21:54 -0000 -@@ -69,6 +69,7 @@ - extern Authmethod method_kbdint; - extern Authmethod method_hostbased; - #ifdef GSSAPI -+extern Authmethod method_gsskeyex; - extern Authmethod method_gssapi; - #endif - #ifdef JPAKE -@@ -79,6 +80,7 @@ - &method_none, - &method_pubkey, - #ifdef GSSAPI -+ &method_gsskeyex, - &method_gssapi, - #endif - #ifdef JPAKE -@@ -274,6 +276,7 @@ - #endif - - authctxt->postponed = 0; -+ authctxt->server_caused_failure = 0; - - /* try to authenticate user */ - m = authmethod_lookup(method); -@@ -346,7 +349,8 @@ - } else { - - /* Allow initial try of "none" auth without failure penalty */ -- if (authctxt->attempt > 1 || strcmp(method, "none") != 0) -+ if (!authctxt->server_caused_failure && -+ (authctxt->attempt > 1 || strcmp(method, "none") != 0)) - authctxt->failures++; - if (authctxt->failures >= options.max_authtries) { - #ifdef SSH_AUDIT_EVENTS -Index: clientloop.c -=================================================================== -RCS file: /cvs/openssh/clientloop.c,v -retrieving revision 1.197 -diff -u -r1.197 clientloop.c ---- ./clientloop.c 14 Feb 2009 05:28:21 -0000 1.197 -+++ ./clientloop.c 26 Jul 2009 12:21:56 -0000 -@@ -110,6 +110,10 @@ - #include "match.h" - #include "msg.h" - -+#ifdef GSSAPI -+#include "ssh-gss.h" -+#endif -+ - /* import options */ - extern Options options; - -@@ -1429,6 +1433,13 @@ - /* Do channel operations unless rekeying in progress. */ - if (!rekeying) { - channel_after_select(readset, writeset); -+ -+ if (options.gss_renewal_rekey && -+ ssh_gssapi_credentials_updated(GSS_C_NO_CONTEXT)) { -+ debug("credentials updated - forcing rekey"); -+ need_rekeying = 1; -+ } -+ - if (need_rekeying || packet_need_rekeying()) { - debug("need rekeying"); - xxx_kex->done = 0; -Index: configure.ac -=================================================================== -RCS file: /cvs/openssh/configure.ac,v -retrieving revision 1.415 -diff -u -r1.415 configure.ac ---- ./configure.ac 16 Feb 2009 04:37:03 -0000 1.415 -+++ ./configure.ac 26 Jul 2009 12:22:00 -0000 -@@ -473,6 +473,30 @@ - [Use tunnel device compatibility to OpenBSD]) - AC_DEFINE(SSH_TUN_PREPEND_AF, 1, - [Prepend the address family to IP tunnel traffic]) -+ AC_MSG_CHECKING(if we have the Security Authorization Session API) -+ AC_TRY_COMPILE([#include ], -+ [SessionCreate(0, 0);], -+ [ac_cv_use_security_session_api="yes" -+ AC_DEFINE(USE_SECURITY_SESSION_API, 1, -+ [platform has the Security Authorization Session API]) -+ LIBS="$LIBS -framework Security" -+ AC_MSG_RESULT(yes)], -+ [ac_cv_use_security_session_api="no" -+ AC_MSG_RESULT(no)]) -+ AC_MSG_CHECKING(if we have an in-memory credentials cache) -+ AC_TRY_COMPILE( -+ [#include ], -+ [cc_context_t c; -+ (void) cc_initialize (&c, 0, NULL, NULL);], -+ [AC_DEFINE(USE_CCAPI, 1, -+ [platform uses an in-memory credentials cache]) -+ LIBS="$LIBS -framework Security" -+ AC_MSG_RESULT(yes) -+ if test "x$ac_cv_use_security_session_api" = "xno"; then -+ AC_MSG_ERROR(*** Need a security framework to use the credentials cache API ***) -+ fi], -+ [AC_MSG_RESULT(no)] -+ ) - m4_pattern_allow(AU_IPv) - AC_CHECK_DECL(AU_IPv4, [], - AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records]) -Index: gss-genr.c -=================================================================== -RCS file: /cvs/openssh/gss-genr.c,v -retrieving revision 1.21 -diff -u -r1.21 gss-genr.c ---- ./gss-genr.c 12 Jun 2007 13:44:36 -0000 1.21 -+++ ./gss-genr.c 26 Jul 2009 12:22:01 -0000 -@@ -1,7 +1,7 @@ - /* $OpenBSD: gss-genr.c,v 1.19 2007/06/12 11:56:15 dtucker Exp $ */ - - /* -- * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -39,12 +39,167 @@ - #include "buffer.h" - #include "log.h" - #include "ssh2.h" -+#include "cipher.h" -+#include "key.h" -+#include "kex.h" -+#include - - #include "ssh-gss.h" - - extern u_char *session_id2; - extern u_int session_id2_len; - -+typedef struct { -+ char *encoded; -+ gss_OID oid; -+} ssh_gss_kex_mapping; -+ -+/* -+ * XXX - It would be nice to find a more elegant way of handling the -+ * XXX passing of the key exchange context to the userauth routines -+ */ -+ -+Gssctxt *gss_kex_context = NULL; -+ -+static ssh_gss_kex_mapping *gss_enc2oid = NULL; -+ -+int -+ssh_gssapi_oid_table_ok() { -+ return (gss_enc2oid != NULL); -+} -+ -+/* -+ * Return a list of the gss-group1-sha1 mechanisms supported by this program -+ * -+ * We test mechanisms to ensure that we can use them, to avoid starting -+ * a key exchange with a bad mechanism -+ */ -+ -+char * -+ssh_gssapi_client_mechanisms(const char *host, const char *client) { -+ gss_OID_set gss_supported; -+ OM_uint32 min_status; -+ -+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &gss_supported))) -+ return NULL; -+ -+ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism, -+ host, client)); -+} -+ -+char * -+ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check, -+ const char *host, const char *client) { -+ Buffer buf; -+ size_t i; -+ int oidpos, enclen; -+ char *mechs, *encoded; -+ u_char digest[EVP_MAX_MD_SIZE]; -+ char deroid[2]; -+ const EVP_MD *evp_md = EVP_md5(); -+ EVP_MD_CTX md; -+ -+ if (gss_enc2oid != NULL) { -+ for (i = 0; gss_enc2oid[i].encoded != NULL; i++) -+ xfree(gss_enc2oid[i].encoded); -+ xfree(gss_enc2oid); -+ } -+ -+ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * -+ (gss_supported->count + 1)); -+ -+ buffer_init(&buf); -+ -+ oidpos = 0; -+ for (i = 0; i < gss_supported->count; i++) { -+ if (gss_supported->elements[i].length < 128 && -+ (*check)(NULL, &(gss_supported->elements[i]), host, client)) { -+ -+ deroid[0] = SSH_GSS_OIDTYPE; -+ deroid[1] = gss_supported->elements[i].length; -+ -+ EVP_DigestInit(&md, evp_md); -+ EVP_DigestUpdate(&md, deroid, 2); -+ EVP_DigestUpdate(&md, -+ gss_supported->elements[i].elements, -+ gss_supported->elements[i].length); -+ EVP_DigestFinal(&md, digest, NULL); -+ -+ encoded = xmalloc(EVP_MD_size(evp_md) * 2); -+ enclen = __b64_ntop(digest, EVP_MD_size(evp_md), -+ encoded, EVP_MD_size(evp_md) * 2); -+ -+ if (oidpos != 0) -+ buffer_put_char(&buf, ','); -+ -+ buffer_append(&buf, KEX_GSS_GEX_SHA1_ID, -+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID, -+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID, -+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ -+ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]); -+ gss_enc2oid[oidpos].encoded = encoded; -+ oidpos++; -+ } -+ } -+ gss_enc2oid[oidpos].oid = NULL; -+ gss_enc2oid[oidpos].encoded = NULL; -+ -+ buffer_put_char(&buf, '\0'); -+ -+ mechs = xmalloc(buffer_len(&buf)); -+ buffer_get(&buf, mechs, buffer_len(&buf)); -+ buffer_free(&buf); -+ -+ if (strlen(mechs) == 0) { -+ xfree(mechs); -+ mechs = NULL; -+ } -+ -+ return (mechs); -+} -+ -+gss_OID -+ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) { -+ int i = 0; -+ -+ switch (kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ if (strlen(name) < sizeof(KEX_GSS_GRP1_SHA1_ID)) -+ return GSS_C_NO_OID; -+ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ if (strlen(name) < sizeof(KEX_GSS_GRP14_SHA1_ID)) -+ return GSS_C_NO_OID; -+ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GEX_SHA1: -+ if (strlen(name) < sizeof(KEX_GSS_GEX_SHA1_ID)) -+ return GSS_C_NO_OID; -+ name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1; -+ break; -+ default: -+ return GSS_C_NO_OID; -+ } -+ -+ while (gss_enc2oid[i].encoded != NULL && -+ strcmp(name, gss_enc2oid[i].encoded) != 0) -+ i++; -+ -+ if (gss_enc2oid[i].oid != NULL && ctx != NULL) -+ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid); -+ -+ return gss_enc2oid[i].oid; -+} -+ - /* Check that the OID in a data stream matches that in the context */ - int - ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len) -@@ -197,7 +352,7 @@ - } - - ctx->major = gss_init_sec_context(&ctx->minor, -- GSS_C_NO_CREDENTIAL, &ctx->context, ctx->name, ctx->oid, -+ ctx->client_creds, &ctx->context, ctx->name, ctx->oid, - GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag, - 0, NULL, recv_tok, NULL, send_tok, flags, NULL); - -@@ -227,8 +382,42 @@ - } - - OM_uint32 -+ssh_gssapi_client_identity(Gssctxt *ctx, const char *name) -+{ -+ gss_buffer_desc gssbuf; -+ gss_name_t gssname; -+ OM_uint32 status; -+ gss_OID_set oidset; -+ -+ gssbuf.value = (void *) name; -+ gssbuf.length = strlen(gssbuf.value); -+ -+ gss_create_empty_oid_set(&status, &oidset); -+ gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ -+ ctx->major = gss_import_name(&ctx->minor, &gssbuf, -+ GSS_C_NT_USER_NAME, &gssname); -+ -+ if (!ctx->major) -+ ctx->major = gss_acquire_cred(&ctx->minor, -+ gssname, 0, oidset, GSS_C_INITIATE, -+ &ctx->client_creds, NULL, NULL); -+ -+ gss_release_name(&status, &gssname); -+ gss_release_oid_set(&status, &oidset); -+ -+ if (ctx->major) -+ ssh_gssapi_error(ctx); -+ -+ return(ctx->major); -+} -+ -+OM_uint32 - ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash) - { -+ if (ctx == NULL) -+ return -1; -+ - if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context, - GSS_C_QOP_DEFAULT, buffer, hash))) - ssh_gssapi_error(ctx); -@@ -236,6 +425,19 @@ - return (ctx->major); - } - -+/* Priviledged when used by server */ -+OM_uint32 -+ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) -+{ -+ if (ctx == NULL) -+ return -1; -+ -+ ctx->major = gss_verify_mic(&ctx->minor, ctx->context, -+ gssbuf, gssmic, NULL); -+ -+ return (ctx->major); -+} -+ - void - ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service, - const char *context) -@@ -249,11 +451,16 @@ - } - - int --ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host) -+ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host, -+ const char *client) - { - gss_buffer_desc token = GSS_C_EMPTY_BUFFER; - OM_uint32 major, minor; - gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"}; -+ Gssctxt *intctx = NULL; -+ -+ if (ctx == NULL) -+ ctx = &intctx; - - /* RFC 4462 says we MUST NOT do SPNEGO */ - if (oid->length == spnego_oid.length && -@@ -263,6 +470,10 @@ - ssh_gssapi_build_ctx(ctx); - ssh_gssapi_set_oid(*ctx, oid); - major = ssh_gssapi_import_name(*ctx, host); -+ -+ if (!GSS_ERROR(major) && client) -+ major = ssh_gssapi_client_identity(*ctx, client); -+ - if (!GSS_ERROR(major)) { - major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token, - NULL); -@@ -272,10 +483,67 @@ - GSS_C_NO_BUFFER); - } - -- if (GSS_ERROR(major)) -+ if (GSS_ERROR(major) || intctx != NULL) - ssh_gssapi_delete_ctx(ctx); - - return (!GSS_ERROR(major)); -+} -+ -+int -+ssh_gssapi_credentials_updated(Gssctxt *ctxt) { -+ static gss_name_t saved_name = GSS_C_NO_NAME; -+ static OM_uint32 saved_lifetime = 0; -+ static gss_OID saved_mech = GSS_C_NO_OID; -+ static gss_name_t name; -+ static OM_uint32 last_call = 0; -+ OM_uint32 lifetime, now, major, minor; -+ int equal; -+ gss_cred_usage_t usage = GSS_C_INITIATE; -+ -+ now = time(NULL); -+ -+ if (ctxt) { -+ debug("Rekey has happened - updating saved versions"); -+ -+ if (saved_name != GSS_C_NO_NAME) -+ gss_release_name(&minor, &saved_name); -+ -+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, -+ &saved_name, &saved_lifetime, NULL, NULL); -+ -+ if (!GSS_ERROR(major)) { -+ saved_mech = ctxt->oid; -+ saved_lifetime+= now; -+ } else { -+ /* Handle the error */ -+ } -+ return 0; -+ } -+ -+ if (now - last_call < 10) -+ return 0; -+ -+ last_call = now; -+ -+ if (saved_mech == GSS_C_NO_OID) -+ return 0; -+ -+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, -+ &name, &lifetime, NULL, NULL); -+ if (major == GSS_S_CREDENTIALS_EXPIRED) -+ return 0; -+ else if (GSS_ERROR(major)) -+ return 0; -+ -+ major = gss_compare_name(&minor, saved_name, name, &equal); -+ gss_release_name(&minor, &name); -+ if (GSS_ERROR(major)) -+ return 0; -+ -+ if (equal && (saved_lifetime < lifetime + now - 10)) -+ return 1; -+ -+ return 0; - } - - #endif /* GSSAPI */ -Index: gss-serv-krb5.c -=================================================================== -RCS file: /cvs/openssh/gss-serv-krb5.c,v -retrieving revision 1.17 -diff -u -r1.17 gss-serv-krb5.c ---- ./gss-serv-krb5.c 1 Sep 2006 05:38:36 -0000 1.17 -+++ ./gss-serv-krb5.c 26 Jul 2009 12:22:01 -0000 -@@ -1,7 +1,7 @@ - /* $OpenBSD: gss-serv-krb5.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -120,6 +120,7 @@ - krb5_principal princ; - OM_uint32 maj_status, min_status; - int len; -+ const char *new_ccname; - - if (client->creds == NULL) { - debug("No credentials stored"); -@@ -168,11 +169,16 @@ - return; - } - -- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache)); -+ new_ccname = krb5_cc_get_name(krb_context, ccache); -+ - client->store.envvar = "KRB5CCNAME"; -- len = strlen(client->store.filename) + 6; -- client->store.envval = xmalloc(len); -- snprintf(client->store.envval, len, "FILE:%s", client->store.filename); -+#ifdef USE_CCAPI -+ xasprintf(&client->store.envval, "API:%s", new_ccname); -+ client->store.filename = NULL; -+#else -+ xasprintf(&client->store.envval, "FILE:%s", new_ccname); -+ client->store.filename = xstrdup(new_ccname); -+#endif - - #ifdef USE_PAM - if (options.use_pam) -@@ -184,6 +190,71 @@ - return; - } - -+int -+ssh_gssapi_krb5_updatecreds(ssh_gssapi_ccache *store, -+ ssh_gssapi_client *client) -+{ -+ krb5_ccache ccache = NULL; -+ krb5_principal principal = NULL; -+ char *name = NULL; -+ krb5_error_code problem; -+ OM_uint32 maj_status, min_status; -+ -+ if ((problem = krb5_cc_resolve(krb_context, store->envval, &ccache))) { -+ logit("krb5_cc_resolve(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ return 0; -+ } -+ -+ /* Find out who the principal in this cache is */ -+ if ((problem = krb5_cc_get_principal(krb_context, ccache, -+ &principal))) { -+ logit("krb5_cc_get_principal(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ if ((problem = krb5_unparse_name(krb_context, principal, &name))) { -+ logit("krb5_unparse_name(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ krb5_free_principal(krb_context, principal); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ -+ if (strcmp(name,client->exportedname.value)!=0) { -+ debug("Name in local credentials cache differs. Not storing"); -+ krb5_free_principal(krb_context, principal); -+ krb5_cc_close(krb_context, ccache); -+ krb5_free_unparsed_name(krb_context, name); -+ return 0; -+ } -+ krb5_free_unparsed_name(krb_context, name); -+ -+ /* Name matches, so lets get on with it! */ -+ -+ if ((problem = krb5_cc_initialize(krb_context, ccache, principal))) { -+ logit("krb5_cc_initialize(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ krb5_free_principal(krb_context, principal); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ krb5_free_principal(krb_context, principal); -+ -+ if ((maj_status = gss_krb5_copy_ccache(&min_status, client->creds, -+ ccache))) { -+ logit("gss_krb5_copy_ccache() failed. Sorry!"); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ return 1; -+} -+ - ssh_gssapi_mech gssapi_kerberos_mech = { - "toWM5Slw5Ew8Mqkay+al2g==", - "Kerberos", -@@ -191,7 +262,8 @@ - NULL, - &ssh_gssapi_krb5_userok, - NULL, -- &ssh_gssapi_krb5_storecreds -+ &ssh_gssapi_krb5_storecreds, -+ &ssh_gssapi_krb5_updatecreds - }; - - #endif /* KRB5 */ -Index: gss-serv.c -=================================================================== -RCS file: /cvs/openssh/gss-serv.c,v -retrieving revision 1.24 -diff -u -r1.24 gss-serv.c ---- ./gss-serv.c 19 May 2008 05:05:07 -0000 1.24 -+++ ./gss-serv.c 26 Jul 2009 12:22:01 -0000 -@@ -1,7 +1,7 @@ - /* $OpenBSD: gss-serv.c,v 1.22 2008/05/08 12:02:23 djm Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -45,15 +45,20 @@ - #include "channels.h" - #include "session.h" - #include "misc.h" -+#include "servconf.h" -+#include "uidswap.h" - - #include "ssh-gss.h" -+#include "monitor_wrap.h" -+ -+extern ServerOptions options; - - static ssh_gssapi_client gssapi_client = - { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER, -- GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL}}; -+ GSS_C_NO_CREDENTIAL, GSS_C_NO_NAME, NULL, {NULL, NULL, NULL}, 0, 0}; - - ssh_gssapi_mech gssapi_null_mech = -- { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL}; -+ { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL, NULL}; - - #ifdef KRB5 - extern ssh_gssapi_mech gssapi_kerberos_mech; -@@ -81,25 +86,32 @@ - char lname[MAXHOSTNAMELEN]; - gss_OID_set oidset; - -- gss_create_empty_oid_set(&status, &oidset); -- gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ if (options.gss_strict_acceptor) { -+ gss_create_empty_oid_set(&status, &oidset); -+ gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ -+ if (gethostname(lname, MAXHOSTNAMELEN)) { -+ gss_release_oid_set(&status, &oidset); -+ return (-1); -+ } - -- if (gethostname(lname, MAXHOSTNAMELEN)) { -- gss_release_oid_set(&status, &oidset); -- return (-1); -- } -+ if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { -+ gss_release_oid_set(&status, &oidset); -+ return (ctx->major); -+ } -+ -+ if ((ctx->major = gss_acquire_cred(&ctx->minor, -+ ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, -+ NULL, NULL))) -+ ssh_gssapi_error(ctx); - -- if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { - gss_release_oid_set(&status, &oidset); - return (ctx->major); -+ } else { -+ ctx->name = GSS_C_NO_NAME; -+ ctx->creds = GSS_C_NO_CREDENTIAL; - } -- -- if ((ctx->major = gss_acquire_cred(&ctx->minor, -- ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL))) -- ssh_gssapi_error(ctx); -- -- gss_release_oid_set(&status, &oidset); -- return (ctx->major); -+ return GSS_S_COMPLETE; - } - - /* Privileged */ -@@ -114,6 +126,29 @@ - } - - /* Unprivileged */ -+char * -+ssh_gssapi_server_mechanisms() { -+ gss_OID_set supported; -+ -+ ssh_gssapi_supported_oids(&supported); -+ return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech, -+ NULL, NULL)); -+} -+ -+/* Unprivileged */ -+int -+ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data, -+ const char *dummy) { -+ Gssctxt *ctx = NULL; -+ int res; -+ -+ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid))); -+ ssh_gssapi_delete_ctx(&ctx); -+ -+ return (res); -+} -+ -+/* Unprivileged */ - void - ssh_gssapi_supported_oids(gss_OID_set *oidset) - { -@@ -123,7 +158,9 @@ - gss_OID_set supported; - - gss_create_empty_oid_set(&min_status, oidset); -- gss_indicate_mechs(&min_status, &supported); -+ -+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &supported))) -+ return; - - while (supported_mechs[i]->name != NULL) { - if (GSS_ERROR(gss_test_oid_set_member(&min_status, -@@ -247,8 +284,48 @@ - ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client) - { - int i = 0; -+ int equal = 0; -+ gss_name_t new_name = GSS_C_NO_NAME; -+ gss_buffer_desc ename = GSS_C_EMPTY_BUFFER; -+ -+ if (options.gss_store_rekey && client->used && ctx->client_creds) { -+ if (client->mech->oid.length != ctx->oid->length || -+ (memcmp(client->mech->oid.elements, -+ ctx->oid->elements, ctx->oid->length) !=0)) { -+ debug("Rekeyed credentials have different mechanism"); -+ return GSS_S_COMPLETE; -+ } -+ -+ if ((ctx->major = gss_inquire_cred_by_mech(&ctx->minor, -+ ctx->client_creds, ctx->oid, &new_name, -+ NULL, NULL, NULL))) { -+ ssh_gssapi_error(ctx); -+ return (ctx->major); -+ } -+ -+ ctx->major = gss_compare_name(&ctx->minor, client->name, -+ new_name, &equal); - -- gss_buffer_desc ename; -+ if (GSS_ERROR(ctx->major)) { -+ ssh_gssapi_error(ctx); -+ return (ctx->major); -+ } -+ -+ if (!equal) { -+ debug("Rekeyed credentials have different name"); -+ return GSS_S_COMPLETE; -+ } -+ -+ debug("Marking rekeyed credentials for export"); -+ -+ gss_release_name(&ctx->minor, &client->name); -+ gss_release_cred(&ctx->minor, &client->creds); -+ client->name = new_name; -+ client->creds = ctx->client_creds; -+ ctx->client_creds = GSS_C_NO_CREDENTIAL; -+ client->updated = 1; -+ return GSS_S_COMPLETE; -+ } - - client->mech = NULL; - -@@ -263,6 +340,13 @@ - if (client->mech == NULL) - return GSS_S_FAILURE; - -+ if (ctx->client_creds && -+ (ctx->major = gss_inquire_cred_by_mech(&ctx->minor, -+ ctx->client_creds, ctx->oid, &client->name, NULL, NULL, NULL))) { -+ ssh_gssapi_error(ctx); -+ return (ctx->major); -+ } -+ - if ((ctx->major = gss_display_name(&ctx->minor, ctx->client, - &client->displayname, NULL))) { - ssh_gssapi_error(ctx); -@@ -280,6 +364,8 @@ - return (ctx->major); - } - -+ gss_release_buffer(&ctx->minor, &ename); -+ - /* We can't copy this structure, so we just move the pointer to it */ - client->creds = ctx->client_creds; - ctx->client_creds = GSS_C_NO_CREDENTIAL; -@@ -327,7 +413,7 @@ - - /* Privileged */ - int --ssh_gssapi_userok(char *user) -+ssh_gssapi_userok(char *user, struct passwd *pw) - { - OM_uint32 lmin; - -@@ -337,9 +423,11 @@ - return 0; - } - if (gssapi_client.mech && gssapi_client.mech->userok) -- if ((*gssapi_client.mech->userok)(&gssapi_client, user)) -+ if ((*gssapi_client.mech->userok)(&gssapi_client, user)) { -+ gssapi_client.used = 1; -+ gssapi_client.store.owner = pw; - return 1; -- else { -+ } else { - /* Destroy delegated credentials if userok fails */ - gss_release_buffer(&lmin, &gssapi_client.displayname); - gss_release_buffer(&lmin, &gssapi_client.exportedname); -@@ -352,14 +440,90 @@ - return (0); - } - --/* Privileged */ --OM_uint32 --ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) -+/* These bits are only used for rekeying. The unpriviledged child is running -+ * as the user, the monitor is root. -+ * -+ * In the child, we want to : -+ * *) Ask the monitor to store our credentials into the store we specify -+ * *) If it succeeds, maybe do a PAM update -+ */ -+ -+/* Stuff for PAM */ -+ -+#ifdef USE_PAM -+static int ssh_gssapi_simple_conv(int n, const struct pam_message **msg, -+ struct pam_response **resp, void *data) - { -- ctx->major = gss_verify_mic(&ctx->minor, ctx->context, -- gssbuf, gssmic, NULL); -+ return (PAM_CONV_ERR); -+} -+#endif - -- return (ctx->major); -+void -+ssh_gssapi_rekey_creds() { -+ int ok; -+ int ret; -+#ifdef USE_PAM -+ pam_handle_t *pamh = NULL; -+ struct pam_conv pamconv = {ssh_gssapi_simple_conv, NULL}; -+ char *envstr; -+#endif -+ -+ if (gssapi_client.store.filename == NULL && -+ gssapi_client.store.envval == NULL && -+ gssapi_client.store.envvar == NULL) -+ return; -+ -+ ok = PRIVSEP(ssh_gssapi_update_creds(&gssapi_client.store)); -+ -+ if (!ok) -+ return; -+ -+ debug("Rekeyed credentials stored successfully"); -+ -+ /* Actually managing to play with the ssh pam stack from here will -+ * be next to impossible. In any case, we may want different options -+ * for rekeying. So, use our own :) -+ */ -+#ifdef USE_PAM -+ if (!use_privsep) { -+ debug("Not even going to try and do PAM with privsep disabled"); -+ return; -+ } -+ -+ ret = pam_start("sshd-rekey", gssapi_client.store.owner->pw_name, -+ &pamconv, &pamh); -+ if (ret) -+ return; -+ -+ xasprintf(&envstr, "%s=%s", gssapi_client.store.envvar, -+ gssapi_client.store.envval); -+ -+ ret = pam_putenv(pamh, envstr); -+ if (!ret) -+ pam_setcred(pamh, PAM_REINITIALIZE_CRED); -+ pam_end(pamh, PAM_SUCCESS); -+#endif -+} -+ -+int -+ssh_gssapi_update_creds(ssh_gssapi_ccache *store) { -+ int ok = 0; -+ -+ /* Check we've got credentials to store */ -+ if (!gssapi_client.updated) -+ return 0; -+ -+ gssapi_client.updated = 0; -+ -+ temporarily_use_uid(gssapi_client.store.owner); -+ if (gssapi_client.mech && gssapi_client.mech->updatecreds) -+ ok = (*gssapi_client.mech->updatecreds)(store, &gssapi_client); -+ else -+ debug("No update function for this mechanism"); -+ -+ restore_uid(); -+ -+ return ok; - } - - #endif -Index: kex.c -=================================================================== -RCS file: /cvs/openssh/kex.c,v -retrieving revision 1.87 -diff -u -r1.87 kex.c ---- ./kex.c 3 Nov 2008 08:19:12 -0000 1.87 -+++ ./kex.c 26 Jul 2009 12:22:02 -0000 -@@ -49,4 +49,8 @@ - #include "dispatch.h" - #include "monitor.h" - -+#ifdef GSSAPI -+#include "ssh-gss.h" -+#endif -+ - #if OPENSSL_VERSION_NUMBER >= 0x00907000L -@@ -326,6 +330,20 @@ - } else if (strcmp(k->name, KEX_DHGEX_SHA256) == 0) { - k->kex_type = KEX_DH_GEX_SHA256; - k->evp_md = evp_ssh_sha256(); -+#endif -+#ifdef GSSAPI -+ } else if (strncmp(k->name, KEX_GSS_GEX_SHA1_ID, -+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GEX_SHA1; -+ k->evp_md = EVP_sha1(); -+ } else if (strncmp(k->name, KEX_GSS_GRP1_SHA1_ID, -+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GRP1_SHA1; -+ k->evp_md = EVP_sha1(); -+ } else if (strncmp(k->name, KEX_GSS_GRP14_SHA1_ID, -+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GRP14_SHA1; -+ k->evp_md = EVP_sha1(); - #endif - } else - fatal("bad kex alg %s", k->name); -Index: kex.h -=================================================================== -RCS file: /cvs/openssh/kex.h,v -retrieving revision 1.49 -diff -u -r1.49 kex.h ---- ./kex.h 11 Jun 2007 04:01:42 -0000 1.49 -+++ ./kex.h 26 Jul 2009 12:22:02 -0000 -@@ -64,6 +64,9 @@ - KEX_DH_GRP14_SHA1, - KEX_DH_GEX_SHA1, - KEX_DH_GEX_SHA256, -+ KEX_GSS_GRP1_SHA1, -+ KEX_GSS_GRP14_SHA1, -+ KEX_GSS_GEX_SHA1, - KEX_MAX - }; - -@@ -119,6 +122,12 @@ - sig_atomic_t done; - int flags; - const EVP_MD *evp_md; -+#ifdef GSSAPI -+ int gss_deleg_creds; -+ int gss_trust_dns; -+ char *gss_host; -+ char *gss_client; -+#endif - char *client_version_string; - char *server_version_string; - int (*verify_host_key)(Key *); -@@ -140,6 +149,11 @@ - void kexdh_server(Kex *); - void kexgex_client(Kex *); - void kexgex_server(Kex *); -+ -+#ifdef GSSAPI -+void kexgss_client(Kex *); -+void kexgss_server(Kex *); -+#endif - - void - kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, -Index: kexgssc.c -=================================================================== -RCS file: kexgssc.c -diff -N kexgssc.c ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ ./kexgssc.c 26 Jul 2009 12:22:02 -0000 -@@ -0,0 +1,334 @@ -+/* -+ * Copyright (c) 2001-2009 Simon Wilkinson. 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. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS 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 AUTHOR 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. -+ */ -+ -+#include "includes.h" -+ -+#ifdef GSSAPI -+ -+#include "includes.h" -+ -+#include -+#include -+ -+#include -+ -+#include "xmalloc.h" -+#include "buffer.h" -+#include "ssh2.h" -+#include "key.h" -+#include "cipher.h" -+#include "kex.h" -+#include "log.h" -+#include "packet.h" -+#include "dh.h" -+ -+#include "ssh-gss.h" -+ -+void -+kexgss_client(Kex *kex) { -+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc recv_tok, gssbuf, msg_tok, *token_ptr; -+ Gssctxt *ctxt; -+ OM_uint32 maj_status, min_status, ret_flags; -+ u_int klen, kout, slen = 0, hashlen, strlen; -+ DH *dh; -+ BIGNUM *dh_server_pub = NULL; -+ BIGNUM *shared_secret = NULL; -+ BIGNUM *p = NULL; -+ BIGNUM *g = NULL; -+ u_char *kbuf, *hash; -+ u_char *serverhostkey = NULL; -+ u_char *empty = ""; -+ char *msg; -+ char *lang; -+ int type = 0; -+ int first = 1; -+ int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX; -+ -+ /* Initialise our GSSAPI world */ -+ ssh_gssapi_build_ctx(&ctxt); -+ if (ssh_gssapi_id_kex(ctxt, kex->name, kex->kex_type) -+ == GSS_C_NO_OID) -+ fatal("Couldn't identify host exchange"); -+ -+ if (ssh_gssapi_import_name(ctxt, kex->gss_host)) -+ fatal("Couldn't import hostname"); -+ -+ if (kex->gss_client && -+ ssh_gssapi_client_identity(ctxt, kex->gss_client)) -+ fatal("Couldn't acquire client credentials"); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ dh = dh_new_group1(); -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ dh = dh_new_group14(); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ debug("Doing group exchange\n"); -+ nbits = dh_estimate(kex->we_need * 8); -+ packet_start(SSH2_MSG_KEXGSS_GROUPREQ); -+ packet_put_int(min); -+ packet_put_int(nbits); -+ packet_put_int(max); -+ -+ packet_send(); -+ -+ packet_read_expect(SSH2_MSG_KEXGSS_GROUP); -+ -+ if ((p = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum2(p); -+ if ((g = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum2(g); -+ packet_check_eom(); -+ -+ if (BN_num_bits(p) < min || BN_num_bits(p) > max) -+ fatal("GSSGRP_GEX group out of range: %d !< %d !< %d", -+ min, BN_num_bits(p), max); -+ -+ dh = dh_new_group(g, p); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ /* Step 1 - e is dh->pub_key */ -+ dh_gen_key(dh, kex->we_need * 8); -+ -+ /* This is f, we initialise it now to make life easier */ -+ dh_server_pub = BN_new(); -+ if (dh_server_pub == NULL) -+ fatal("dh_server_pub == NULL"); -+ -+ token_ptr = GSS_C_NO_BUFFER; -+ -+ do { -+ debug("Calling gss_init_sec_context"); -+ -+ maj_status = ssh_gssapi_init_ctx(ctxt, -+ kex->gss_deleg_creds, token_ptr, &send_tok, -+ &ret_flags); -+ -+ if (GSS_ERROR(maj_status)) { -+ if (send_tok.length != 0) { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ } -+ fatal("gss_init_context failed"); -+ } -+ -+ /* If we've got an old receive buffer get rid of it */ -+ if (token_ptr != GSS_C_NO_BUFFER) -+ xfree(recv_tok.value); -+ -+ if (maj_status == GSS_S_COMPLETE) { -+ /* If mutual state flag is not true, kex fails */ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual authentication failed"); -+ -+ /* If integ avail flag is not true kex fails */ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity check failed"); -+ } -+ -+ /* -+ * If we have data to send, then the last message that we -+ * received cannot have been a 'complete'. -+ */ -+ if (send_tok.length != 0) { -+ if (first) { -+ packet_start(SSH2_MSG_KEXGSS_INIT); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ packet_put_bignum2(dh->pub_key); -+ first = 0; -+ } else { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ } -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ -+ /* If we've sent them data, they should reply */ -+ do { -+ type = packet_read(); -+ if (type == SSH2_MSG_KEXGSS_HOSTKEY) { -+ debug("Received KEXGSS_HOSTKEY"); -+ if (serverhostkey) -+ fatal("Server host key received more than once"); -+ serverhostkey = -+ packet_get_string(&slen); -+ } -+ } while (type == SSH2_MSG_KEXGSS_HOSTKEY); -+ -+ switch (type) { -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ debug("Received GSSAPI_CONTINUE"); -+ if (maj_status == GSS_S_COMPLETE) -+ fatal("GSSAPI Continue received from server when complete"); -+ recv_tok.value = packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ break; -+ case SSH2_MSG_KEXGSS_COMPLETE: -+ debug("Received GSSAPI_COMPLETE"); -+ packet_get_bignum2(dh_server_pub); -+ msg_tok.value = packet_get_string(&strlen); -+ msg_tok.length = strlen; -+ -+ /* Is there a token included? */ -+ if (packet_get_char()) { -+ recv_tok.value= -+ packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ /* If we're already complete - protocol error */ -+ if (maj_status == GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: received token when complete"); -+ } else { -+ /* No token included */ -+ if (maj_status != GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: did not receive final token"); -+ } -+ break; -+ case SSH2_MSG_KEXGSS_ERROR: -+ debug("Received Error"); -+ maj_status = packet_get_int(); -+ min_status = packet_get_int(); -+ msg = packet_get_string(NULL); -+ lang = packet_get_string(NULL); -+ fatal("GSSAPI Error: \n%.400s",msg); -+ default: -+ packet_disconnect("Protocol error: didn't expect packet type %d", -+ type); -+ } -+ token_ptr = &recv_tok; -+ } else { -+ /* No data, and not complete */ -+ if (maj_status != GSS_S_COMPLETE) -+ fatal("Not complete, and no token output"); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ /* -+ * We _must_ have received a COMPLETE message in reply from the -+ * server, which will have set dh_server_pub and msg_tok -+ */ -+ -+ if (type != SSH2_MSG_KEXGSS_COMPLETE) -+ fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it"); -+ -+ /* Check f in range [1, p-1] */ -+ if (!dh_pub_is_valid(dh, dh_server_pub)) -+ packet_disconnect("bad server public DH value"); -+ -+ /* compute K=f^x mod p */ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_server_pub, dh); -+ if (kout < 0) -+ fatal("DH_compute_key: failed"); -+ -+ shared_secret = BN_new(); -+ if (shared_secret == NULL) -+ fatal("kexgss_client: BN_new failed"); -+ -+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) -+ fatal("kexdh_client: BN_bin2bn failed"); -+ -+ memset(kbuf, 0, klen); -+ xfree(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ (serverhostkey ? serverhostkey : empty), slen, -+ dh->pub_key, /* e */ -+ dh_server_pub, /* f */ -+ shared_secret, /* K */ -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->evp_md, -+ kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ (serverhostkey ? serverhostkey : empty), slen, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh->pub_key, -+ dh_server_pub, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ /* Verify that the hash matches the MIC we just got. */ -+ if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok))) -+ packet_disconnect("Hash's MIC didn't verify"); -+ -+ xfree(msg_tok.value); -+ -+ DH_free(dh); -+ if (serverhostkey) -+ xfree(serverhostkey); -+ BN_clear_free(dh_server_pub); -+ -+ /* save session id */ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ if (kex->gss_deleg_creds) -+ ssh_gssapi_credentials_updated(ctxt); -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ kex_derive_keys(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+} -+ -+#endif /* GSSAPI */ -Index: kexgsss.c -=================================================================== -RCS file: kexgsss.c -diff -N kexgsss.c ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ ./kexgsss.c 26 Jul 2009 12:22:03 -0000 -@@ -0,0 +1,288 @@ -+/* -+ * Copyright (c) 2001-2009 Simon Wilkinson. 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. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS 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 AUTHOR 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. -+ */ -+ -+#include "includes.h" -+ -+#ifdef GSSAPI -+ -+#include -+ -+#include -+#include -+ -+#include "xmalloc.h" -+#include "buffer.h" -+#include "ssh2.h" -+#include "key.h" -+#include "cipher.h" -+#include "kex.h" -+#include "log.h" -+#include "packet.h" -+#include "dh.h" -+#include "ssh-gss.h" -+#include "monitor_wrap.h" -+#include "servconf.h" -+ -+extern ServerOptions options; -+ -+void -+kexgss_server(Kex *kex) -+{ -+ OM_uint32 maj_status, min_status; -+ -+ /* -+ * Some GSSAPI implementations use the input value of ret_flags (an -+ * output variable) as a means of triggering mechanism specific -+ * features. Initializing it to zero avoids inadvertently -+ * activating this non-standard behaviour. -+ */ -+ -+ OM_uint32 ret_flags = 0; -+ gss_buffer_desc gssbuf, recv_tok, msg_tok; -+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; -+ Gssctxt *ctxt = NULL; -+ u_int slen, klen, kout, hashlen; -+ u_char *kbuf, *hash; -+ DH *dh; -+ int min = -1, max = -1, nbits = -1; -+ BIGNUM *shared_secret = NULL; -+ BIGNUM *dh_client_pub = NULL; -+ int type = 0; -+ gss_OID oid; -+ char *mechs; -+ -+ /* Initialise GSSAPI */ -+ -+ /* If we're rekeying, privsep means that some of the private structures -+ * in the GSSAPI code are no longer available. This kludges them back -+ * into life -+ */ -+ if (!ssh_gssapi_oid_table_ok()) -+ if ((mechs = ssh_gssapi_server_mechanisms())) -+ xfree(mechs); -+ -+ debug2("%s: Identifying %s", __func__, kex->name); -+ oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type); -+ if (oid == GSS_C_NO_OID) -+ fatal("Unknown gssapi mechanism"); -+ -+ debug2("%s: Acquiring credentials", __func__); -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid)))) -+ fatal("Unable to acquire credentials for the server"); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ dh = dh_new_group1(); -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ dh = dh_new_group14(); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ debug("Doing group exchange"); -+ packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ); -+ min = packet_get_int(); -+ nbits = packet_get_int(); -+ max = packet_get_int(); -+ min = MAX(DH_GRP_MIN, min); -+ max = MIN(DH_GRP_MAX, max); -+ packet_check_eom(); -+ if (max < min || nbits < min || max < nbits) -+ fatal("GSS_GEX, bad parameters: %d !< %d !< %d", -+ min, nbits, max); -+ dh = PRIVSEP(choose_dh(min, nbits, max)); -+ if (dh == NULL) -+ packet_disconnect("Protocol error: no matching group found"); -+ -+ packet_start(SSH2_MSG_KEXGSS_GROUP); -+ packet_put_bignum2(dh->p); -+ packet_put_bignum2(dh->g); -+ packet_send(); -+ -+ packet_write_wait(); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ dh_gen_key(dh, kex->we_need * 8); -+ -+ do { -+ debug("Wait SSH2_MSG_GSSAPI_INIT"); -+ type = packet_read(); -+ switch(type) { -+ case SSH2_MSG_KEXGSS_INIT: -+ if (dh_client_pub != NULL) -+ fatal("Received KEXGSS_INIT after initialising"); -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ -+ if ((dh_client_pub = BN_new()) == NULL) -+ fatal("dh_client_pub == NULL"); -+ -+ packet_get_bignum2(dh_client_pub); -+ -+ /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */ -+ break; -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ break; -+ default: -+ packet_disconnect( -+ "Protocol error: didn't expect packet type %d", -+ type); -+ } -+ -+ maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok, -+ &send_tok, &ret_flags)); -+ -+ xfree(recv_tok.value); -+ -+ if (maj_status != GSS_S_COMPLETE && send_tok.length == 0) -+ fatal("Zero length token output when incomplete"); -+ -+ if (dh_client_pub == NULL) -+ fatal("No client public key"); -+ -+ if (maj_status & GSS_S_CONTINUE_NEEDED) { -+ debug("Sending GSSAPI_CONTINUE"); -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ if (GSS_ERROR(maj_status)) { -+ if (send_tok.length > 0) { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ } -+ fatal("accept_ctx died"); -+ } -+ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual Authentication flag wasn't set"); -+ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity flag wasn't set"); -+ -+ if (!dh_pub_is_valid(dh, dh_client_pub)) -+ packet_disconnect("bad client public DH value"); -+ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_client_pub, dh); -+ if (kout < 0) -+ fatal("DH_compute_key: failed"); -+ -+ shared_secret = BN_new(); -+ if (shared_secret == NULL) -+ fatal("kexgss_server: BN_new failed"); -+ -+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) -+ fatal("kexgss_server: BN_bin2bn failed"); -+ -+ memset(kbuf, 0, klen); -+ xfree(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, /* Change this if we start sending host keys */ -+ dh_client_pub, dh->pub_key, shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->evp_md, -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh_client_pub, -+ dh->pub_key, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ BN_clear_free(dh_client_pub); -+ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok)))) -+ fatal("Couldn't get MIC"); -+ -+ packet_start(SSH2_MSG_KEXGSS_COMPLETE); -+ packet_put_bignum2(dh->pub_key); -+ packet_put_string(msg_tok.value,msg_tok.length); -+ -+ if (send_tok.length != 0) { -+ packet_put_char(1); /* true */ -+ packet_put_string(send_tok.value, send_tok.length); -+ } else { -+ packet_put_char(0); /* false */ -+ } -+ packet_send(); -+ -+ gss_release_buffer(&min_status, &send_tok); -+ gss_release_buffer(&min_status, &msg_tok); -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ DH_free(dh); -+ -+ kex_derive_keys(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+ -+ /* If this was a rekey, then save out any delegated credentials we -+ * just exchanged. */ -+ if (options.gss_store_rekey) -+ ssh_gssapi_rekey_creds(); -+} -+#endif /* GSSAPI */ -Index: key.c -=================================================================== -RCS file: /cvs/openssh/key.c,v -retrieving revision 1.83 -diff -u -r1.83 key.c ---- ./key.c 3 Nov 2008 08:24:17 -0000 1.83 -+++ ./key.c 26 Jul 2009 12:22:03 -0000 -@@ -764,6 +764,8 @@ - return KEY_RSA; - } else if (strcmp(name, "ssh-dss") == 0) { - return KEY_DSA; -+ } else if (strcmp(name, "null") == 0) { -+ return KEY_NULL; - } - debug2("key_type_from_name: unknown key type '%s'", name); - return KEY_UNSPEC; -Index: key.h -=================================================================== -RCS file: /cvs/openssh/key.h,v -retrieving revision 1.29 -diff -u -r1.29 key.h ---- ./key.h 12 Jun 2008 18:40:35 -0000 1.29 -+++ ./key.h 26 Jul 2009 12:22:03 -0000 -@@ -34,6 +34,7 @@ - KEY_RSA1, - KEY_RSA, - KEY_DSA, -+ KEY_NULL, - KEY_UNSPEC - }; - enum fp_type { -Index: monitor.c -=================================================================== -RCS file: /cvs/openssh/monitor.c,v -retrieving revision 1.134 -diff -u -r1.134 monitor.c ---- ./monitor.c 14 Feb 2009 05:33:31 -0000 1.134 -+++ ./monitor.c 26 Jul 2009 12:22:06 -0000 -@@ -170,6 +170,8 @@ - int mm_answer_gss_accept_ctx(int, Buffer *); - int mm_answer_gss_userok(int, Buffer *); - int mm_answer_gss_checkmic(int, Buffer *); -+int mm_answer_gss_sign(int, Buffer *); -+int mm_answer_gss_updatecreds(int, Buffer *); - #endif - - #ifdef SSH_AUDIT_EVENTS -@@ -239,6 +241,7 @@ - {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx}, - {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok}, - {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic}, -+ {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign}, - #endif - #ifdef JPAKE - {MONITOR_REQ_JPAKE_GET_PWDATA, MON_ONCE, mm_answer_jpake_get_pwdata}, -@@ -251,6 +254,12 @@ - }; - - struct mon_table mon_dispatch_postauth20[] = { -+#ifdef GSSAPI -+ {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx}, -+ {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx}, -+ {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign}, -+ {MONITOR_REQ_GSSUPCREDS, 0, mm_answer_gss_updatecreds}, -+#endif - {MONITOR_REQ_MODULI, 0, mm_answer_moduli}, - {MONITOR_REQ_SIGN, 0, mm_answer_sign}, - {MONITOR_REQ_PTY, 0, mm_answer_pty}, -@@ -355,6 +364,10 @@ - /* Permit requests for moduli and signatures */ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_proto15; - -@@ -441,6 +454,10 @@ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_postauth15; - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); -@@ -1699,6 +1716,13 @@ - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+ } -+#endif - kex->server = 1; - kex->hostkey_type = buffer_get_int(m); - kex->kex_type = buffer_get_int(m); -@@ -1898,6 +1922,9 @@ - OM_uint32 major; - u_int len; - -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ - goid.elements = buffer_get_string(m, &len); - goid.length = len; - -@@ -1925,6 +1952,9 @@ - OM_uint32 flags = 0; /* GSI needs this */ - u_int len; - -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ - in.value = buffer_get_string(m, &len); - in.length = len; - major = ssh_gssapi_accept_ctx(gsscontext, &in, &out, &flags); -@@ -1942,6 +1972,7 @@ - monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1); -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1); - } - return (0); - } -@@ -1953,6 +1984,9 @@ - OM_uint32 ret; - u_int len; - -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ - gssbuf.value = buffer_get_string(m, &len); - gssbuf.length = len; - mic.value = buffer_get_string(m, &len); -@@ -1979,7 +2013,11 @@ - { - int authenticated; - -- authenticated = authctxt->valid && ssh_gssapi_userok(authctxt->user); -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ -+ authenticated = authctxt->valid && -+ ssh_gssapi_userok(authctxt->user, authctxt->pw); - - buffer_clear(m); - buffer_put_int(m, authenticated); -@@ -1992,6 +2030,74 @@ - /* Monitor loop will terminate if authenticated */ - return (authenticated); - } -+ -+int -+mm_answer_gss_sign(int socket, Buffer *m) -+{ -+ gss_buffer_desc data; -+ gss_buffer_desc hash = GSS_C_EMPTY_BUFFER; -+ OM_uint32 major, minor; -+ u_int len; -+ -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ -+ data.value = buffer_get_string(m, &len); -+ data.length = len; -+ if (data.length != 20) -+ fatal("%s: data length incorrect: %d", __func__, -+ (int) data.length); -+ -+ /* Save the session ID on the first time around */ -+ if (session_id2_len == 0) { -+ session_id2_len = data.length; -+ session_id2 = xmalloc(session_id2_len); -+ memcpy(session_id2, data.value, session_id2_len); -+ } -+ major = ssh_gssapi_sign(gsscontext, &data, &hash); -+ -+ xfree(data.value); -+ -+ buffer_clear(m); -+ buffer_put_int(m, major); -+ buffer_put_string(m, hash.value, hash.length); -+ -+ mm_request_send(socket, MONITOR_ANS_GSSSIGN, m); -+ -+ gss_release_buffer(&minor, &hash); -+ -+ /* Turn on getpwnam permissions */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1); -+ -+ /* And credential updating, for when rekeying */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSUPCREDS, 1); -+ -+ return (0); -+} -+ -+int -+mm_answer_gss_updatecreds(int socket, Buffer *m) { -+ ssh_gssapi_ccache store; -+ int ok; -+ -+ store.filename = buffer_get_string(m, NULL); -+ store.envvar = buffer_get_string(m, NULL); -+ store.envval = buffer_get_string(m, NULL); -+ -+ ok = ssh_gssapi_update_creds(&store); -+ -+ xfree(store.filename); -+ xfree(store.envvar); -+ xfree(store.envval); -+ -+ buffer_clear(m); -+ buffer_put_int(m, ok); -+ -+ mm_request_send(socket, MONITOR_ANS_GSSUPCREDS, m); -+ -+ return(0); -+} -+ - #endif /* GSSAPI */ - - #ifdef JPAKE -Index: monitor.h -=================================================================== -RCS file: /cvs/openssh/monitor.h,v -retrieving revision 1.22 -diff -u -r1.22 monitor.h ---- ./monitor.h 5 Nov 2008 05:20:46 -0000 1.22 -+++ ./monitor.h 26 Jul 2009 12:22:06 -0000 -@@ -53,6 +53,8 @@ - MONITOR_REQ_GSSSTEP, MONITOR_ANS_GSSSTEP, - MONITOR_REQ_GSSUSEROK, MONITOR_ANS_GSSUSEROK, - MONITOR_REQ_GSSCHECKMIC, MONITOR_ANS_GSSCHECKMIC, -+ MONITOR_REQ_GSSSIGN, MONITOR_ANS_GSSSIGN, -+ MONITOR_REQ_GSSUPCREDS, MONITOR_ANS_GSSUPCREDS, - MONITOR_REQ_PAM_START, - MONITOR_REQ_PAM_ACCOUNT, MONITOR_ANS_PAM_ACCOUNT, - MONITOR_REQ_PAM_INIT_CTX, MONITOR_ANS_PAM_INIT_CTX, -Index: monitor_wrap.c -=================================================================== -RCS file: /cvs/openssh/monitor_wrap.c,v -retrieving revision 1.80 -diff -u -r1.80 monitor_wrap.c ---- ./monitor_wrap.c 5 Nov 2008 05:20:47 -0000 1.80 -+++ ./monitor_wrap.c 26 Jul 2009 12:22:07 -0000 -@@ -1239,7 +1239,7 @@ - } - - int --mm_ssh_gssapi_userok(char *user) -+mm_ssh_gssapi_userok(char *user, struct passwd *pw) - { - Buffer m; - int authenticated = 0; -@@ -1256,6 +1256,51 @@ - debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not "); - return (authenticated); - } -+ -+OM_uint32 -+mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash) -+{ -+ Buffer m; -+ OM_uint32 major; -+ u_int len; -+ -+ buffer_init(&m); -+ buffer_put_string(&m, data->value, data->length); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m); -+ -+ major = buffer_get_int(&m); -+ hash->value = buffer_get_string(&m, &len); -+ hash->length = len; -+ -+ buffer_free(&m); -+ -+ return(major); -+} -+ -+int -+mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store) -+{ -+ Buffer m; -+ int ok; -+ -+ buffer_init(&m); -+ -+ buffer_put_cstring(&m, store->filename ? store->filename : ""); -+ buffer_put_cstring(&m, store->envvar ? store->envvar : ""); -+ buffer_put_cstring(&m, store->envval ? store->envval : ""); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUPCREDS, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUPCREDS, &m); -+ -+ ok = buffer_get_int(&m); -+ -+ buffer_free(&m); -+ -+ return (ok); -+} -+ - #endif /* GSSAPI */ - - #ifdef JPAKE -Index: monitor_wrap.h -=================================================================== -RCS file: /cvs/openssh/monitor_wrap.h,v -retrieving revision 1.28 -diff -u -r1.28 monitor_wrap.h ---- ./monitor_wrap.h 5 Nov 2008 05:20:47 -0000 1.28 -+++ ./monitor_wrap.h 26 Jul 2009 12:22:07 -0000 -@@ -57,8 +57,10 @@ - OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); - OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, - gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); --int mm_ssh_gssapi_userok(char *user); -+int mm_ssh_gssapi_userok(char *user, struct passwd *); - OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); -+OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); -+int mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *); - #endif - - #ifdef USE_PAM -Index: readconf.c -=================================================================== -RCS file: /cvs/openssh/readconf.c,v -retrieving revision 1.153 -diff -u -r1.153 readconf.c ---- ./readconf.c 14 Feb 2009 05:28:21 -0000 1.153 -+++ ./readconf.c 26 Jul 2009 12:22:10 -0000 -@@ -127,6 +127,7 @@ - oClearAllForwardings, oNoHostAuthenticationForLocalhost, - oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, - oAddressFamily, oGssAuthentication, oGssDelegateCreds, -+ oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey, - oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, - oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, - oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, -@@ -164,10 +165,18 @@ - { "afstokenpassing", oUnsupported }, - #if defined(GSSAPI) - { "gssapiauthentication", oGssAuthentication }, -+ { "gssapikeyexchange", oGssKeyEx }, - { "gssapidelegatecredentials", oGssDelegateCreds }, -+ { "gssapitrustdns", oGssTrustDns }, -+ { "gssapiclientidentity", oGssClientIdentity }, -+ { "gssapirenewalforcesrekey", oGssRenewalRekey }, - #else - { "gssapiauthentication", oUnsupported }, -+ { "gssapikeyexchange", oUnsupported }, - { "gssapidelegatecredentials", oUnsupported }, -+ { "gssapitrustdns", oUnsupported }, -+ { "gssapiclientidentity", oUnsupported }, -+ { "gssapirenewalforcesrekey", oUnsupported }, - #endif - { "fallbacktorsh", oDeprecated }, - { "usersh", oDeprecated }, -@@ -453,10 +462,26 @@ - intptr = &options->gss_authentication; - goto parse_flag; - -+ case oGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case oGssDelegateCreds: - intptr = &options->gss_deleg_creds; - goto parse_flag; - -+ case oGssTrustDns: -+ intptr = &options->gss_trust_dns; -+ goto parse_flag; -+ -+ case oGssClientIdentity: -+ charptr = &options->gss_client_identity; -+ goto parse_string; -+ -+ case oGssRenewalRekey: -+ intptr = &options->gss_renewal_rekey; -+ goto parse_flag; -+ - case oBatchMode: - intptr = &options->batch_mode; - goto parse_flag; -@@ -1008,7 +1033,11 @@ - options->pubkey_authentication = -1; - options->challenge_response_authentication = -1; - options->gss_authentication = -1; -+ options->gss_keyex = -1; - options->gss_deleg_creds = -1; -+ options->gss_trust_dns = -1; -+ options->gss_renewal_rekey = -1; -+ options->gss_client_identity = NULL; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->kbd_interactive_devices = NULL; -@@ -1099,8 +1128,14 @@ - options->challenge_response_authentication = 1; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_deleg_creds == -1) - options->gss_deleg_creds = 0; -+ if (options->gss_trust_dns == -1) -+ options->gss_trust_dns = 0; -+ if (options->gss_renewal_rekey == -1) -+ options->gss_renewal_rekey = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -Index: readconf.h -=================================================================== -RCS file: /cvs/openssh/readconf.h,v -retrieving revision 1.70 -diff -u -r1.70 readconf.h ---- ./readconf.h 14 Feb 2009 05:28:21 -0000 1.70 -+++ ./readconf.h 26 Jul 2009 12:22:10 -0000 -@@ -44,7 +44,11 @@ - int challenge_response_authentication; - /* Try S/Key or TIS, authentication. */ - int gss_authentication; /* Try GSS authentication */ -+ int gss_keyex; /* Try GSS key exchange */ - int gss_deleg_creds; /* Delegate GSS credentials */ -+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ -+ int gss_renewal_rekey; /* Credential renewal forces rekey */ -+ char *gss_client_identity; /* Principal to initiate GSSAPI with */ - int password_authentication; /* Try password - * authentication. */ - int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ -Index: servconf.c -=================================================================== -RCS file: /cvs/openssh/servconf.c,v -retrieving revision 1.186 -diff -u -r1.186 servconf.c ---- ./servconf.c 28 Jan 2009 05:31:23 -0000 1.186 -+++ ./servconf.c 26 Jul 2009 12:22:11 -0000 -@@ -92,7 +92,10 @@ - options->kerberos_ticket_cleanup = -1; - options->kerberos_get_afs_token = -1; - options->gss_authentication=-1; -+ options->gss_keyex = -1; - options->gss_cleanup_creds = -1; -+ options->gss_strict_acceptor = -1; -+ options->gss_store_rekey = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->challenge_response_authentication = -1; -@@ -210,8 +213,14 @@ - options->kerberos_get_afs_token = 0; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_cleanup_creds == -1) - options->gss_cleanup_creds = 1; -+ if (options->gss_strict_acceptor == -1) -+ options->gss_strict_acceptor = 1; -+ if (options->gss_store_rekey == -1) -+ options->gss_store_rekey = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -@@ -302,7 +311,9 @@ - sBanner, sUseDNS, sHostbasedAuthentication, - sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, - sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, -- sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, -+ sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor, -+ sGssKeyEx, sGssStoreRekey, -+ sAcceptEnv, sPermitTunnel, - sMatch, sPermitOpen, sForceCommand, sChrootDirectory, - sUsePrivilegeSeparation, sAllowAgentForwarding, - sZeroKnowledgePasswordAuthentication, -@@ -364,9 +375,15 @@ - #ifdef GSSAPI - { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL }, - { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL }, -+ { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL }, - #else - { "gssapiauthentication", sUnsupported, SSHCFG_ALL }, - { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL }, - #endif - { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL }, - { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, -@@ -891,8 +908,20 @@ - intptr = &options->gss_authentication; - goto parse_flag; - -+ case sGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case sGssCleanupCreds: - intptr = &options->gss_cleanup_creds; -+ goto parse_flag; -+ -+ case sGssStrictAcceptor: -+ intptr = &options->gss_strict_acceptor; -+ goto parse_flag; -+ -+ case sGssStoreRekey: -+ intptr = &options->gss_store_rekey; - goto parse_flag; - - case sPasswordAuthentication: -Index: servconf.h -=================================================================== -RCS file: /cvs/openssh/servconf.h,v -retrieving revision 1.79 -diff -u -r1.79 servconf.h ---- ./servconf.h 28 Jan 2009 05:31:23 -0000 1.79 -+++ ./servconf.h 26 Jul 2009 12:22:12 -0000 -@@ -91,7 +91,10 @@ - int kerberos_get_afs_token; /* If true, try to get AFS token if - * authenticated with Kerberos. */ - int gss_authentication; /* If true, permit GSSAPI authentication */ -+ int gss_keyex; /* If true, permit GSSAPI key exchange */ - int gss_cleanup_creds; /* If true, destroy cred cache on logout */ -+ int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */ -+ int gss_store_rekey; - int password_authentication; /* If true, permit password - * authentication. */ - int kbd_interactive_authentication; /* If true, permit */ -Index: ssh-gss.h -=================================================================== -RCS file: /cvs/openssh/ssh-gss.h,v -retrieving revision 1.12 -diff -u -r1.12 ssh-gss.h ---- ./ssh-gss.h 12 Jun 2007 13:40:39 -0000 1.12 -+++ ./ssh-gss.h 26 Jul 2009 12:22:12 -0000 -@@ -1,6 +1,6 @@ - /* $OpenBSD: ssh-gss.h,v 1.10 2007/06/12 08:20:00 djm Exp $ */ - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -60,10 +60,22 @@ - - #define SSH_GSS_OIDTYPE 0x06 - -+#define SSH2_MSG_KEXGSS_INIT 30 -+#define SSH2_MSG_KEXGSS_CONTINUE 31 -+#define SSH2_MSG_KEXGSS_COMPLETE 32 -+#define SSH2_MSG_KEXGSS_HOSTKEY 33 -+#define SSH2_MSG_KEXGSS_ERROR 34 -+#define SSH2_MSG_KEXGSS_GROUPREQ 40 -+#define SSH2_MSG_KEXGSS_GROUP 41 -+#define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-" -+#define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-" -+#define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-" -+ - typedef struct { - char *filename; - char *envvar; - char *envval; -+ struct passwd *owner; - void *data; - } ssh_gssapi_ccache; - -@@ -71,8 +83,11 @@ - gss_buffer_desc displayname; - gss_buffer_desc exportedname; - gss_cred_id_t creds; -+ gss_name_t name; - struct ssh_gssapi_mech_struct *mech; - ssh_gssapi_ccache store; -+ int used; -+ int updated; - } ssh_gssapi_client; - - typedef struct ssh_gssapi_mech_struct { -@@ -83,6 +98,7 @@ - int (*userok) (ssh_gssapi_client *, char *); - int (*localname) (ssh_gssapi_client *, char **); - void (*storecreds) (ssh_gssapi_client *); -+ int (*updatecreds) (ssh_gssapi_ccache *, ssh_gssapi_client *); - } ssh_gssapi_mech; - - typedef struct { -@@ -93,10 +109,11 @@ - gss_OID oid; /* client */ - gss_cred_id_t creds; /* server */ - gss_name_t client; /* server */ -- gss_cred_id_t client_creds; /* server */ -+ gss_cred_id_t client_creds; /* both */ - } Gssctxt; - - extern ssh_gssapi_mech *supported_mechs[]; -+extern Gssctxt *gss_kex_context; - - int ssh_gssapi_check_oid(Gssctxt *, void *, size_t); - void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t); -@@ -116,16 +133,30 @@ - void ssh_gssapi_delete_ctx(Gssctxt **); - OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); - void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *); --int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *); -+int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *, const char *); -+OM_uint32 ssh_gssapi_client_identity(Gssctxt *, const char *); -+int ssh_gssapi_credentials_updated(Gssctxt *); - - /* In the server */ -+typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *, -+ const char *); -+char *ssh_gssapi_client_mechanisms(const char *, const char *); -+char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *, -+ const char *); -+gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int); -+int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *, -+ const char *); - OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID); --int ssh_gssapi_userok(char *name); -+int ssh_gssapi_userok(char *name, struct passwd *); - OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); - void ssh_gssapi_do_child(char ***, u_int *); - void ssh_gssapi_cleanup_creds(void); - void ssh_gssapi_storecreds(void); - -+char *ssh_gssapi_server_mechanisms(void); -+int ssh_gssapi_oid_table_ok(); -+ -+int ssh_gssapi_update_creds(ssh_gssapi_ccache *store); - #endif /* GSSAPI */ - - #endif /* _SSH_GSS_H */ -Index: ssh_config -=================================================================== -RCS file: /cvs/openssh/ssh_config,v -retrieving revision 1.27 -diff -u -r1.27 ssh_config ---- ./ssh_config 21 Feb 2009 01:45:02 -0000 1.27 -+++ ./ssh_config 26 Jul 2009 12:22:12 -0000 -@@ -26,6 +26,8 @@ - # HostbasedAuthentication no - # GSSAPIAuthentication no - # GSSAPIDelegateCredentials no -+# GSSAPIKeyExchange no -+# GSSAPITrustDNS no - # BatchMode no - # CheckHostIP yes - # AddressFamily any -Index: ssh_config.5 -=================================================================== -RCS file: /cvs/openssh/ssh_config.5,v -retrieving revision 1.119 -diff -u -r1.119 ssh_config.5 ---- ./ssh_config.5 22 Feb 2009 23:53:58 -0000 1.119 -+++ ./ssh_config.5 26 Jul 2009 12:22:13 -0000 -@@ -478,11 +478,38 @@ - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI may be used. When using -+GSSAPI key exchange the server need not have a host key. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIClientIdentity -+If set, specifies the GSSAPI client identity that ssh should use when -+connecting to the server. The default is unset, which means that the default -+identity will be used. - .It Cm GSSAPIDelegateCredentials - Forward (delegate) credentials to the server. - The default is - .Dq no . --Note that this option applies to protocol version 2 only. -+Note that this option applies to protocol version 2 connections using GSSAPI. -+.It Cm GSSAPIRenewalForcesRekey -+If set to -+.Dq yes -+then renewal of the client's GSSAPI credentials will force the rekeying of the -+ssh connection. With a compatible server, this can delegate the renewed -+credentials to a session on the server. -+The default is -+.Dq no . -+.It Cm GSSAPITrustDns -+Set to -+.Dq yes to indicate that the DNS is trusted to securely canonicalize -+the name of the host being connected to. If -+.Dq no, the hostname entered on the -+command line will be passed untouched to the GSSAPI library. -+The default is -+.Dq no . -+This option only applies to protocol version 2 connections using GSSAPI. - .It Cm HashKnownHosts - Indicates that - .Xr ssh 1 -Index: sshconnect2.c -=================================================================== -RCS file: /cvs/openssh/sshconnect2.c,v -retrieving revision 1.162 -diff -u -r1.162 sshconnect2.c ---- ./sshconnect2.c 5 Nov 2008 05:20:47 -0000 1.162 -+++ ./sshconnect2.c 26 Jul 2009 12:22:16 -0000 -@@ -104,9 +104,34 @@ - { - Kex *kex; - -+#ifdef GSSAPI -+ char *orig = NULL, *gss = NULL; -+ char *gss_host = NULL; -+#endif -+ - xxx_host = host; - xxx_hostaddr = hostaddr; - -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ /* Add the GSSAPI mechanisms currently supported on this -+ * client to the key exchange algorithm proposal */ -+ orig = myproposal[PROPOSAL_KEX_ALGS]; -+ -+ if (options.gss_trust_dns) -+ gss_host = (char *)get_canonical_hostname(1); -+ else -+ gss_host = host; -+ -+ gss = ssh_gssapi_client_mechanisms(gss_host, options.gss_client_identity); -+ if (gss) { -+ debug("Offering GSSAPI proposal: %s", gss); -+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS], -+ "%s,%s", gss, orig); -+ } -+ } -+#endif -+ - if (options.ciphers == (char *)-1) { - logit("No valid ciphers for protocol version 2 given, using defaults."); - options.ciphers = NULL; -@@ -134,6 +159,17 @@ - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = - options.hostkeyalgorithms; - -+#ifdef GSSAPI -+ /* If we've got GSSAPI algorithms, then we also support the -+ * 'null' hostkey, as a last resort */ -+ if (options.gss_keyex && gss) { -+ orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]; -+ xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], -+ "%s,null", orig); -+ xfree(gss); -+ } -+#endif -+ - if (options.rekey_limit) - packet_set_rekey_limit((u_int32_t)options.rekey_limit); - -@@ -143,10 +179,26 @@ - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_client; -+ } -+#endif - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; - kex->verify_host_key=&verify_host_key_callback; - -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->gss_deleg_creds = options.gss_deleg_creds; -+ kex->gss_trust_dns = options.gss_trust_dns; -+ kex->gss_client = options.gss_client_identity; -+ kex->gss_host = gss_host; -+ } -+#endif -+ - xxx_kex = kex; - - dispatch_run(DISPATCH_BLOCK, &kex->done, kex); -@@ -235,6 +287,7 @@ - void input_gssapi_hash(int type, u_int32_t, void *); - void input_gssapi_error(int, u_int32_t, void *); - void input_gssapi_errtok(int, u_int32_t, void *); -+int userauth_gsskeyex(Authctxt *authctxt); - #endif - - void userauth(Authctxt *, char *); -@@ -250,6 +303,10 @@ - - Authmethod authmethods[] = { - #ifdef GSSAPI -+ {"gssapi-keyex", -+ userauth_gsskeyex, -+ &options.gss_authentication, -+ NULL}, - {"gssapi-with-mic", - userauth_gssapi, - NULL, -@@ -541,19 +598,29 @@ - static u_int mech = 0; - OM_uint32 min; - int ok = 0; -+ const char *gss_host; -+ -+ if (options.gss_trust_dns) -+ gss_host = get_canonical_hostname(1); -+ else -+ gss_host = authctxt->host; - - /* Try one GSSAPI method at a time, rather than sending them all at - * once. */ - - if (gss_supported == NULL) -- gss_indicate_mechs(&min, &gss_supported); -+ if (GSS_ERROR(gss_indicate_mechs(&min, &gss_supported))) { -+ gss_supported = NULL; -+ return 0; -+ } - - /* Check to see if the mechanism is usable before we offer it */ - while (mech < gss_supported->count && !ok) { - /* My DER encoding requires length<128 */ - if (gss_supported->elements[mech].length < 128 && - ssh_gssapi_check_mechanism(&gssctxt, -- &gss_supported->elements[mech], authctxt->host)) { -+ &gss_supported->elements[mech], gss_host, -+ options.gss_client_identity)) { - ok = 1; /* Mechanism works */ - } else { - mech++; -@@ -650,8 +717,8 @@ - { - Authctxt *authctxt = ctxt; - Gssctxt *gssctxt; -- int oidlen; -- char *oidv; -+ u_int oidlen; -+ u_char *oidv; - - if (authctxt == NULL) - fatal("input_gssapi_response: no authentication context"); -@@ -761,6 +828,48 @@ - xfree(msg); - xfree(lang); - } -+ -+int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ Buffer b; -+ gss_buffer_desc gssbuf; -+ gss_buffer_desc mic = GSS_C_EMPTY_BUFFER; -+ OM_uint32 ms; -+ -+ static int attempt = 0; -+ if (attempt++ >= 1) -+ return (0); -+ -+ if (gss_kex_context == NULL) { -+ debug("No valid Key exchange context"); -+ return (0); -+ } -+ -+ ssh_gssapi_buildmic(&b, authctxt->server_user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) { -+ buffer_free(&b); -+ return (0); -+ } -+ -+ packet_start(SSH2_MSG_USERAUTH_REQUEST); -+ packet_put_cstring(authctxt->server_user); -+ packet_put_cstring(authctxt->service); -+ packet_put_cstring(authctxt->method->name); -+ packet_put_string(mic.value, mic.length); -+ packet_send(); -+ -+ buffer_free(&b); -+ gss_release_buffer(&ms, &mic); -+ -+ return (1); -+} -+ - #endif /* GSSAPI */ - - int -Index: sshd.c -=================================================================== -RCS file: /cvs/openssh/sshd.c,v -retrieving revision 1.384 -diff -u -r1.384 sshd.c ---- ./sshd.c 28 Jan 2009 05:31:23 -0000 1.384 -+++ ./sshd.c 26 Jul 2009 12:22:17 -0000 -@@ -119,6 +119,10 @@ - #include "monitor_wrap.h" - #include "version.h" - -+#ifdef USE_SECURITY_SESSION_API -+#include -+#endif -+ - #ifdef LIBWRAP - #include - #include -@@ -1530,10 +1534,13 @@ - logit("Disabling protocol version 1. Could not load host key"); - options.protocol &= ~SSH_PROTO_1; - } -+#ifndef GSSAPI -+ /* The GSSAPI key exchange can run without a host key */ - if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) { - logit("Disabling protocol version 2. Could not load host key"); - options.protocol &= ~SSH_PROTO_2; - } -+#endif - if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) { - logit("sshd: no hostkeys available -- exiting."); - exit(1); -@@ -1817,6 +1824,60 @@ - /* Log the connection. */ - verbose("Connection from %.500s port %d", remote_ip, remote_port); - -+#ifdef USE_SECURITY_SESSION_API -+ /* -+ * Create a new security session for use by the new user login if -+ * the current session is the root session or we are not launched -+ * by inetd (eg: debugging mode or server mode). We do not -+ * necessarily need to create a session if we are launched from -+ * inetd because Panther xinetd will create a session for us. -+ * -+ * The only case where this logic will fail is if there is an -+ * inetd running in a non-root session which is not creating -+ * new sessions for us. Then all the users will end up in the -+ * same session (bad). -+ * -+ * When the client exits, the session will be destroyed for us -+ * automatically. -+ * -+ * We must create the session before any credentials are stored -+ * (including AFS pags, which happens a few lines below). -+ */ -+ { -+ OSStatus err = 0; -+ SecuritySessionId sid = 0; -+ SessionAttributeBits sattrs = 0; -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("Current Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ -+ if (inetd_flag && !(sattrs & sessionIsRoot)) -+ debug("Running in inetd mode in a non-root session... " -+ "assuming inetd created the session for us."); -+ else { -+ debug("Creating new security session..."); -+ err = SessionCreate(0, sessionHasTTY | sessionIsRemote); -+ if (err) -+ error("SessionCreate() failed with error %.8X", -+ (unsigned) err); -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, -+ &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("New Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ } -+ } -+#endif -+ - /* - * We don't want to listen forever unless the other side - * successfully authenticates itself. So we set up an alarm which is -@@ -2194,12 +2255,61 @@ - - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types(); - -+#ifdef GSSAPI -+ { -+ char *orig; -+ char *gss = NULL; -+ char *newstr = NULL; -+ orig = myproposal[PROPOSAL_KEX_ALGS]; -+ -+ /* -+ * If we don't have a host key, then there's no point advertising -+ * the other key exchange algorithms -+ */ -+ -+ if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0) -+ orig = NULL; -+ -+ if (options.gss_keyex) -+ gss = ssh_gssapi_server_mechanisms(); -+ else -+ gss = NULL; -+ -+ if (gss && orig) -+ xasprintf(&newstr, "%s,%s", gss, orig); -+ else if (gss) -+ newstr = gss; -+ else if (orig) -+ newstr = orig; -+ -+ /* -+ * If we've got GSSAPI mechanisms, then we've got the 'null' host -+ * key alg, but we can't tell people about it unless its the only -+ * host key algorithm we support -+ */ -+ if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0) -+ myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null"; -+ -+ if (newstr) -+ myproposal[PROPOSAL_KEX_ALGS] = newstr; -+ else -+ fatal("No supported key exchange algorithms"); -+ } -+#endif -+ - /* start key exchange */ - kex = kex_setup(myproposal); - kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+ } -+#endif - kex->server = 1; - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; -Index: sshd_config -=================================================================== -RCS file: /cvs/openssh/sshd_config,v -retrieving revision 1.82 -diff -u -r1.82 sshd_config ---- ./sshd_config 2 Jul 2008 12:35:43 -0000 1.82 -+++ ./sshd_config 26 Jul 2009 12:22:19 -0000 -@@ -73,6 +73,8 @@ - # GSSAPI options - #GSSAPIAuthentication no - #GSSAPICleanupCredentials yes -+#GSSAPIStrictAcceptorCheck yes -+#GSSAPIKeyExchange no - - # Set this to 'yes' to enable PAM authentication, account processing, - # and session processing. If this is enabled, PAM authentication will -Index: sshd_config.5 -=================================================================== -RCS file: /cvs/openssh/sshd_config.5,v -retrieving revision 1.108 -diff -u -r1.108 sshd_config.5 ---- ./sshd_config.5 23 Feb 2009 00:00:24 -0000 1.108 -+++ ./sshd_config.5 26 Jul 2009 12:22:20 -0000 -@@ -374,12 +374,40 @@ - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange -+doesn't rely on ssh keys to verify host identity. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. - .It Cm GSSAPICleanupCredentials - Specifies whether to automatically destroy the user's credentials cache - on logout. - The default is - .Dq yes . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIStrictAcceptorCheck -+Determines whether to be strict about the identity of the GSSAPI acceptor -+a client authenticates against. If -+.Dq yes -+then the client must authenticate against the -+.Pa host -+service on the current hostname. If -+.Dq no -+then the client may authenticate against any service key stored in the -+machine's default store. This facility is provided to assist with operation -+on multi homed machines. -+The default is -+.Dq yes . -+Note that this option applies only to protocol version 2 GSSAPI connections, -+and setting it to -+.Dq no -+may only work with recent Kerberos GSSAPI libraries. -+.It Cm GSSAPIStoreCredentialsOnRekey -+Controls whether the user's GSSAPI credentials should be updated following a -+successful connection rekeying. This option can be used to accepted renewed -+or updated credentials from a compatible client. The default is -+.Dq no . - .It Cm HostbasedAuthentication - Specifies whether rhosts or /etc/hosts.equiv authentication together - with successful public key client host authentication is allowed Added: csw/mgar/pkg/openssh/trunk/files/openssh-5.4p1-gsskex-all-20100313.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-5.4p1-gsskex-all-20100313.patch (rev 0) +++ csw/mgar/pkg/openssh/trunk/files/openssh-5.4p1-gsskex-all-20100313.patch 2010-03-13 17:22:59 UTC (rev 9139) @@ -0,0 +1,2933 @@ +diff -Nur openssh-5.4p1.orig/ChangeLog.gssapi openssh-5.4p1/ChangeLog.gssapi +--- openssh-5.4p1.orig/ChangeLog.gssapi 1970-01-01 01:00:00.000000000 +0100 ++++ openssh-5.4p1/ChangeLog.gssapi 2010-03-13 00:39:22.276624764 +0100 +@@ -0,0 +1,95 @@ ++20090615 ++ - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c ++ sshd.c ] ++ Fix issues identified by Greg Hudson following a code review ++ Check return value of gss_indicate_mechs ++ Protect GSSAPI calls in monitor, so they can only be used if enabled ++ Check return values of bignum functions in key exchange ++ Use BN_clear_free to clear other side's DH value ++ Make ssh_gssapi_id_kex more robust ++ Only configure kex table pointers if GSSAPI is enabled ++ Don't leak mechanism list, or gss mechanism list ++ Cast data.length before printing ++ If serverkey isn't provided, use an empty string, rather than NULL ++ ++20090201 ++ - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h ++ ssh_config.5 sshconnet2.c ] ++ Add support for the GSSAPIClientIdentity option, which allows the user ++ to specify which GSSAPI identity to use to contact a given server ++ ++20080404 ++ - [ gss-serv.c ] ++ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow ++ been omitted from a previous version of this patch. Reported by Borislav ++ Stoichkov ++ ++20070317 ++ - [ gss-serv-krb5.c ] ++ Remove C99ism, where new_ccname was being declared in the middle of a ++ function ++ ++20061220 ++ - [ servconf.c ] ++ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and ++ documented, behaviour. Reported by Dan Watson. ++ ++20060910 ++ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c ++ ssh-gss.h ] ++ add support for gss-group14-sha1 key exchange mechanisms ++ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ] ++ Add GSSAPIStrictAcceptorCheck option to allow the disabling of ++ acceptor principal checking on multi-homed machines. ++ ++ - [ sshd_config ssh_config ] ++ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample ++ configuration files ++ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ] ++ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf() ++ Limit length of error messages displayed by client ++ ++20060909 ++ - [ gss-genr.c gss-serv.c ] ++ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server ++ only, where they belong ++ ++ ++20060829 ++ - [ gss-serv-krb5.c ] ++ Fix CCAPI credentials cache name when creating KRB5CCNAME environment ++ variable ++ ++20060828 ++ - [ gss-genr.c ] ++ Avoid Heimdal context freeing problem ++ ++ ++20060818 ++ - [ gss-genr.c ssh-gss.h sshconnect2.c ] ++ Make sure that SPENGO is disabled ++ ++ ++20060421 ++ - [ gssgenr.c, sshconnect2.c ] ++ a few type changes (signed versus unsigned, int versus size_t) to ++ fix compiler errors/warnings ++ (from jbasney AT ncsa.uiuc.edu) ++ - [ kexgssc.c, sshconnect2.c ] ++ fix uninitialized variable warnings ++ (from jbasney AT ncsa.uiuc.edu) ++ - [ gssgenr.c ] ++ pass oid to gss_display_status (helpful when using GSSAPI mechglue) ++ (from jbasney AT ncsa.uiuc.edu) ++ ++ - [ gss-serv-krb5.c ] ++ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H ++ (from jbasney AT ncsa.uiuc.edu) ++ ++ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c ++ add client-side GssapiKeyExchange option ++ (from jbasney AT ncsa.uiuc.edu) ++ - [ sshconnect2.c ] ++ add support for GssapiTrustDns option for gssapi-with-mic ++ (from jbasney AT ncsa.uiuc.edu) ++ +diff -Nur openssh-5.4p1.orig/Makefile.in openssh-5.4p1/Makefile.in +--- openssh-5.4p1.orig/Makefile.in 2010-02-24 08:18:51.000000000 +0100 ++++ openssh-5.4p1/Makefile.in 2010-03-13 00:39:54.547584984 +0100 +@@ -74,7 +74,7 @@ + monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ + kexgex.o kexdhc.o kexgexc.o msg.o progressmeter.o dns.o \ + entropy.o gss-genr.o umac.o jpake.o schnorr.o \ +- ssh-pkcs11.o ++ ssh-pkcs11.o kexgssc.o + + SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ + sshconnect.o sshconnect1.o sshconnect2.o mux.o \ +@@ -88,7 +88,7 @@ + auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ + monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ + auth-krb5.o \ +- auth2-gss.o gss-serv.o gss-serv-krb5.o \ ++ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ + loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ + audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \ + roaming_common.o roaming_serv.o +diff -Nur openssh-5.4p1.orig/auth-krb5.c openssh-5.4p1/auth-krb5.c +--- openssh-5.4p1.orig/auth-krb5.c 2009-12-21 00:49:22.000000000 +0100 ++++ openssh-5.4p1/auth-krb5.c 2010-03-13 00:39:22.287877739 +0100 +@@ -170,8 +170,13 @@ + + len = strlen(authctxt->krb5_ticket_file) + 6; + authctxt->krb5_ccname = xmalloc(len); ++#ifdef USE_CCAPI ++ snprintf(authctxt->krb5_ccname, len, "API:%s", ++ authctxt->krb5_ticket_file); ++#else + snprintf(authctxt->krb5_ccname, len, "FILE:%s", + authctxt->krb5_ticket_file); ++#endif + + #ifdef USE_PAM + if (options.use_pam) +@@ -226,15 +231,22 @@ + #ifndef HEIMDAL + krb5_error_code + ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { +- int tmpfd, ret; ++ int ret; + char ccname[40]; + mode_t old_umask; ++#ifdef USE_CCAPI ++ char cctemplate[] = "API:krb5cc_%d"; ++#else ++ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX"; ++ int tmpfd; ++#endif + + ret = snprintf(ccname, sizeof(ccname), +- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); ++ cctemplate, geteuid()); + if (ret < 0 || (size_t)ret >= sizeof(ccname)) + return ENOMEM; + ++#ifndef USE_CCAPI + old_umask = umask(0177); + tmpfd = mkstemp(ccname + strlen("FILE:")); + umask(old_umask); +@@ -249,6 +261,7 @@ + return errno; + } + close(tmpfd); ++#endif + + return (krb5_cc_resolve(ctx, ccname, ccache)); + } +diff -Nur openssh-5.4p1.orig/auth.h openssh-5.4p1/auth.h +--- openssh-5.4p1.orig/auth.h 2010-03-04 11:53:35.000000000 +0100 ++++ openssh-5.4p1/auth.h 2010-03-13 00:39:22.290248539 +0100 +@@ -53,6 +53,7 @@ + int valid; /* user exists and is allowed to login */ + int attempt; + int failures; ++ int server_caused_failure; + int force_pwchange; + char *user; /* username sent by the client */ + char *service; +diff -Nur openssh-5.4p1.orig/auth2-gss.c openssh-5.4p1/auth2-gss.c +--- openssh-5.4p1.orig/auth2-gss.c 2007-12-02 12:59:45.000000000 +0100 ++++ openssh-5.4p1/auth2-gss.c 2010-03-13 00:39:22.294875029 +0100 +@@ -1,7 +1,7 @@ + /* $OpenBSD: auth2-gss.c,v 1.16 2007/10/29 00:52:45 dtucker Exp $ */ + + /* +- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. ++ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -52,6 +52,40 @@ + static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); + static void input_gssapi_errtok(int, u_int32_t, void *); + ++/* ++ * The 'gssapi_keyex' userauth mechanism. ++ */ ++static int ++userauth_gsskeyex(Authctxt *authctxt) ++{ ++ int authenticated = 0; ++ Buffer b; ++ gss_buffer_desc mic, gssbuf; ++ u_int len; ++ ++ mic.value = packet_get_string(&len); ++ mic.length = len; ++ ++ packet_check_eom(); ++ ++ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, ++ "gssapi-keyex"); ++ ++ gssbuf.value = buffer_ptr(&b); ++ gssbuf.length = buffer_len(&b); ++ ++ /* gss_kex_context is NULL with privsep, so we can't check it here */ ++ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, ++ &gssbuf, &mic)))) ++ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, ++ authctxt->pw)); ++ ++ buffer_free(&b); ++ xfree(mic.value); ++ ++ return (authenticated); ++} ++ + /* + * We only support those mechanisms that we know about (ie ones that we know + * how to check local user kuserok and the like) +@@ -102,6 +136,7 @@ + + if (!present) { + xfree(doid); @@ 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 hson at users.sourceforge.net Sat Mar 13 18:30:05 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 13 Mar 2010 17:30:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[9140] csw/mgar/pkg/ImageMagick/branches/package-split Message-ID: Revision: 9140 http://gar.svn.sourceforge.net/gar/?rev=9140&view=rev Author: hson Date: 2010-03-13 17:30:05 +0000 (Sat, 13 Mar 2010) Log Message: ----------- imagemagick: First checkin of split package project Modified Paths: -------------- csw/mgar/pkg/ImageMagick/branches/package-split/Makefile csw/mgar/pkg/ImageMagick/branches/package-split/checksums Added Paths: ----------- csw/mgar/pkg/ImageMagick/branches/package-split/files/6.2.9.i.tar.bz2 csw/mgar/pkg/ImageMagick/branches/package-split/files/6.2.9.s.tar.bz2 csw/mgar/pkg/ImageMagick/branches/package-split/files/6.5.2.i.tar.bz2 csw/mgar/pkg/ImageMagick/branches/package-split/files/6.5.2.s.tar.bz2 Removed Paths: ------------- csw/mgar/pkg/ImageMagick/branches/package-split/files/djvu.c.diff csw/mgar/pkg/ImageMagick/branches/package-split/files/fixme.sh csw/mgar/pkg/ImageMagick/branches/package-split/files/libMagick++.so.10.0.4.i csw/mgar/pkg/ImageMagick/branches/package-split/files/libMagick++.so.10.0.4.s csw/mgar/pkg/ImageMagick/branches/package-split/files/libMagick.so.10.0.4.i csw/mgar/pkg/ImageMagick/branches/package-split/files/libMagick.so.10.0.4.s csw/mgar/pkg/ImageMagick/branches/package-split/files/libWand.so.10.0.4.i csw/mgar/pkg/ImageMagick/branches/package-split/files/libWand.so.10.0.4.s csw/mgar/pkg/ImageMagick/branches/package-split/files/lib_6.2.9_i.tar.gz csw/mgar/pkg/ImageMagick/branches/package-split/files/lib_6.2.9_s.tar.gz Modified: csw/mgar/pkg/ImageMagick/branches/package-split/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/branches/package-split/Makefile 2010-03-13 17:22:59 UTC (rev 9139) +++ csw/mgar/pkg/ImageMagick/branches/package-split/Makefile 2010-03-13 17:30:05 UTC (rev 9140) @@ -1,5 +1,5 @@ GARNAME = imagemagick -GARVERSION = 6.5.9 +GARVERSION = 6.6.0 GARSUBREV = 5 CATEGORIES = lib @@ -11,6 +11,25 @@ PhotoCD, and GIF. endef +PACKAGES = CSWimagemagick CSWimagemagickrt CSWpmimagemagick CSWimagemagickdoc CSWimagemagickdev +CATALOGNAME_CSWimagemagick = imagemagick +CATALOGNAME_CSWimagemagickdev = imagemagick_devel +CATALOGNAME_CSWimagemagickdoc = imagemagick_doc +CATALOGNAME_CSWimagemagickrt = imagemagick_rt +CATALOGNAME_CSWpmimagemagick = pm_imagemagick +SPKG_DESC_CSWimagemagick = $(DESCRIPTION) +SPKG_DESC_CSWimagemagickdev = $(DESCRIPTION) - development package +SPKG_DESC_CSWimagemagickdoc = $(DESCRIPTION) - documentation package +SPKG_DESC_CSWimagemagickrt = $(DESCRIPTION) - runtime package +SPKG_DESC_CSWpmimagemagick = $(DESCRIPTION) - perl module + +PKGFILES_CSWimagemagickdev = $(PKGFILES_DEVEL) +PKGFILES_CSWimagemagickrt = $(PKGFILES_RT) +PKGFILES_CSWimagemagickdoc = $(docdir)/ImageMagick.* +PKGFILES_CSWpmimagemagick = $(libdir)/perl/.* + +ARCHALL_CSWimagemagickdoc = 1 + MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/ DISTFILES = ImageMagick-$(GARVERSION)-$(GARSUBREV).tar.bz2 @@ -20,6 +39,26 @@ LICENSE = LICENSE +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWbzip2 +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWfconfig +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWftype2 +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWjpeg +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibice +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibsm +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibtoolrt +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibx11 +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibxext +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibxt +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWsunmath +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWtiffrt +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWzlib + +RUNTIME_DEP_PKGS_CSWpmimagemagick += CSWimagemagickrt +RUNTIME_DEP_PKGS_CSWpmimagemagick += CSWperl + +RUNTIME_DEP_PKGS_CSWimagemagick += CSWimagemagickrt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWopenexrrt RUNTIME_DEP_PKGS_CSWimagemagick += CSWbzip2 RUNTIME_DEP_PKGS_CSWimagemagick += CSWdjvulibrert RUNTIME_DEP_PKGS_CSWimagemagick += CSWfconfig @@ -34,10 +73,8 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWjbigkit RUNTIME_DEP_PKGS_CSWimagemagick += CSWjpeg RUNTIME_DEP_PKGS_CSWimagemagick += CSWlcmsrt -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcairo RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfpx RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibice -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibsm RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibtoolrt RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmf @@ -45,236 +82,13 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxext RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxml2 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxt -RUNTIME_DEP_PKGS_CSWimagemagick += CSWopenexr RUNTIME_DEP_PKGS_CSWimagemagick += CSWperl RUNTIME_DEP_PKGS_CSWimagemagick += CSWpng RUNTIME_DEP_PKGS_CSWimagemagick += CSWsunmath RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiffrt RUNTIME_DEP_PKGS_CSWimagemagick += CSWzlib -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|libMagick++.so.10.0.4 -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ept.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cip.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|otb.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gif.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vid.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pix.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mvg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|palm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|avs.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcd.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|icon.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|magick.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tim.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xc.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps2.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|raw.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xcf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dps.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps3.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpc.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fpx.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pnm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpeg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xwd.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|url.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gray.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ycbcr.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rgb.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tile.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uil.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pwp.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sfw.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|stegano.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pattern.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|txt.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpr.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|html.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|info.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdb.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cut.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|msl.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jp2.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fits.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vicar.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cmyk.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|histogram.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|scr.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|avi.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|label.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|bmp.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|psd.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jbig.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|null.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dcm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tiff.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dot.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sun.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wmf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|x.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ttf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|miff.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xbm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jpeg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|map.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rle.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|art.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xpm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|svg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uyvy.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tga.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dib.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wbmp.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fax.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|clip.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sct.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcl.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mono.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rla.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|matte.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mat.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pict.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|preview.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|viff.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|meta.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gradient.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sgi.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|yuv.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cin.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|plasma.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|png.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mtv.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcx.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|caption.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wpg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dpx.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|analyze.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|inline.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcd.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jpeg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps2.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|miff.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tim.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpc.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xcf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps3.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|raw.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uyvy.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pnm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fpx.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jbig.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cip.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ept.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|label.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|otb.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cmyk.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|thumbnail.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tiff.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gif.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|braille.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|avs.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|null.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pix.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mvg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|exr.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vid.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|txt.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpr.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|x.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|msl.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdb.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cut.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|plasma.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jp2.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dds.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|hald.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|caption.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xwd.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|hrz.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|clip.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wbmp.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rgb.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|url.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sfw.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|meta.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uil.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|viff.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pwp.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|matte.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pict.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|preview.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xps.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mono.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xbm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ttf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sun.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|magick.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wmf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|art.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rle.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|map.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|icon.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dng.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|svg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xpm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tga.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xc.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|bmp.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cals.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|scr.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|psd.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dcm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|palm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dot.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ipl.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sgi.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gradient.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|info.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|html.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|png.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|stegano.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|djvu.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cin.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pattern.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|yuv.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcx.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mtv.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vicar.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fits.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dpx.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wpg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ycbcr.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dib.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gray.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sct.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcl.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpeg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|histogram.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fax.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mat.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tile.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rla.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|convolve.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|analyze.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|libMagick++.so.2.0.1 -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|libWand.so.10.0.4 -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|libMagickWand.so.2.0.1 -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|Magick.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|conjure -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|montage -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|animate -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|import -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|display -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mogrify -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|identify -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|convert -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|compare2 -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|composite -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|stream +CHECKPKG_OVERRIDES_CSWimagemagickdev += missing-dependency|CSWimagemagick # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 @@ -286,7 +100,7 @@ CONFIGURE_ARGS_COMMON += --x-includes=/opt/csw/X11/include CONFIGURE_ARGS_COMMON += --x-libraries=/opt/csw/X11/lib CONFIGURE_ARGS_COMMON += --with-modules=yes -CONFIGURE_ARGS_COMMON += --disable-openmp +#CONFIGURE_ARGS_COMMON += --disable-openmp CONFIGURE_ARGS_COMMON += --disable-silent-rules # Until librsvg,graphviz and perl is 64bit #CONFIGURE_ARGS_isa-amd64 += --without-gvc @@ -299,8 +113,6 @@ CONFIGURE_ARGS = $(CONFIGURE_ARGS_COMMON) $(foreach M,$(MODULATIONS),$(CONFIGURE_ARGS_$M)) PATCHFILES += Makefile.patch -# Temporary patch until upstream make a more permenent fix -#PATCHFILES += djvu.c.diff # Test has to be run *after* install #TEST_TARGET = check @@ -320,6 +132,9 @@ # We want to be link with Xrender from $(prefix)/X11/lib not $(prefix)/lib # since the latter is linked to /usr/openwin/lib/libX11.so.4 EXTRA_SOS_LD_FLAGS += -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +# +EXTRA_SOS_LD_FLAGS += -L$(shell pwd)/$(WORKSRC)/magick/.libs +EXTRA_SOS_LD_FLAGS += -L$(shell pwd)/$(WORKSRC)/wand/.libs MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod @@ -331,27 +146,17 @@ SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV) 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 - @cp $(FILEDIR)/libMagick++.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 ] ; then ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 ; fi ) - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 ] ; then ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 ; fi ) - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 ] ; then ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 ; fi ) @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick - @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(CURDIR)/$(FILEDIR)/lib_6.2.9_s.tar.gz |tar xf -) + @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.2.9.s.tar.bz2 |tar xf -) + @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.5.2.s.tar.bz2 |tar xf -) @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 @$(MAKECOOKIE) post-install-isa-i386: - @cp $(FILEDIR)/libMagick.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 - @cp $(FILEDIR)/libWand.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 - @cp $(FILEDIR)/libMagick++.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 ] ; then ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 ; fi ) - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 ] ; then ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 ; fi ) - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 ] ; then ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 ; fi ) @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick - @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(CURDIR)/$(FILEDIR)/lib_6.2.9_i.tar.gz |tar xf -) + @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.2.9.i.tar.bz2 |tar xf -) + @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.5.2.i.tar.bz2 |tar xf -) @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 @$(MAKECOOKIE) Modified: csw/mgar/pkg/ImageMagick/branches/package-split/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/branches/package-split/checksums 2010-03-13 17:22:59 UTC (rev 9139) +++ csw/mgar/pkg/ImageMagick/branches/package-split/checksums 2010-03-13 17:30:05 UTC (rev 9140) @@ -1,2 +1,2 @@ -ee8f6c42f982fe785c5df8f89e6deb91 ImageMagick-6.5.9-5.tar.bz2 +fb57509760a902af5bf535b8da15fdc7 ImageMagick-6.6.0-5.tar.bz2 6bd361fe352c7d497d60d8d2cbe7cfd4 Makefile.patch Added: csw/mgar/pkg/ImageMagick/branches/package-split/files/6.2.9.i.tar.bz2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/ImageMagick/branches/package-split/files/6.2.9.i.tar.bz2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/ImageMagick/branches/package-split/files/6.2.9.s.tar.bz2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/ImageMagick/branches/package-split/files/6.2.9.s.tar.bz2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/ImageMagick/branches/package-split/files/6.5.2.i.tar.bz2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/ImageMagick/branches/package-split/files/6.5.2.i.tar.bz2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/ImageMagick/branches/package-split/files/6.5.2.s.tar.bz2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/ImageMagick/branches/package-split/files/6.5.2.s.tar.bz2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: csw/mgar/pkg/ImageMagick/branches/package-split/files/djvu.c.diff =================================================================== --- csw/mgar/pkg/ImageMagick/branches/package-split/files/djvu.c.diff 2010-03-13 17:22:59 UTC (rev 9139) +++ csw/mgar/pkg/ImageMagick/branches/package-split/files/djvu.c.diff 2010-03-13 17:30:05 UTC (rev 9140) @@ -1,32 +0,0 @@ ---- ../build-global/ImageMagick-6.5.1-1/coders/djvu.c 2009-03-31 17:44:40.000000000 +0200 -+++ ImageMagick-6.5.1-1/coders/djvu.c 2009-04-12 11:00:15.678316236 +0200 -@@ -58,6 +58,29 @@ - #if defined(MAGICKCORE_DJVU_DELEGATE) - #include - #endif -+ -+#if defined(__SunOS_5_8) || defined(__SunOS_5_9) -+#define signbit(x) copysign(1, x)<0 -+ -+ -+double -+fmax(double x, double y) -+{ -+ if (isnan(x)) -+ return (y); -+ if (isnan(y)) -+ return (x); -+ -+ if (signbit(x) != signbit(y)) { -+ if (signbit(x)) -+ return (y); -+ else -+ return (x); -+ } -+ -+ return (x > y ? x : y); -+} -+#endif - - /* - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Deleted: csw/mgar/pkg/ImageMagick/branches/package-split/files/fixme.sh =================================================================== --- csw/mgar/pkg/ImageMagick/branches/package-split/files/fixme.sh 2010-03-13 17:22:59 UTC (rev 9139) +++ csw/mgar/pkg/ImageMagick/branches/package-split/files/fixme.sh 2010-03-13 17:30:05 UTC (rev 9140) @@ -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 - Deleted: csw/mgar/pkg/ImageMagick/branches/package-split/files/libMagick++.so.10.0.4.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/branches/package-split/files/libMagick++.so.10.0.4.s =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/branches/package-split/files/libMagick.so.10.0.4.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/branches/package-split/files/libMagick.so.10.0.4.s =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/branches/package-split/files/libWand.so.10.0.4.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/branches/package-split/files/libWand.so.10.0.4.s =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/branches/package-split/files/lib_6.2.9_i.tar.gz =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/branches/package-split/files/lib_6.2.9_s.tar.gz =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 13 18:39:05 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 13 Mar 2010 17:39:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[9141] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9141 http://gar.svn.sourceforge.net/gar/?rev=9141&view=rev Author: wahwah Date: 2010-03-13 17:39:05 +0000 (Sat, 13 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, allow dashes in host names; fix a bug in the regex; add a unit test. References: http://lists.opencsw.org/pipermail/maintainers//2010-March/011576.html Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-13 17:30:05 UTC (rev 9140) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-13 17:39:05 UTC (rev 9141) @@ -31,7 +31,7 @@ DO_NOT_REPORT_MISSING = set([]) DO_NOT_REPORT_MISSING_RE = [r"SUNW.*", r"\*SUNW.*"] DUMP_BIN = "/usr/ccs/bin/dump" -PSTAMP_RE = r"(?P\w)+@(?P[\w\.]+)-(?P\d+)" +PSTAMP_RE = r"(?P\w+)@(?P[\w\.-]+)-(?P\d+)" DESCRIPTION_RE = r"^([\S]+) - (.*)$" SYSTEM_SYMLINKS = ( Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-13 17:30:05 UTC (rev 9140) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-13 17:39:05 UTC (rev 9141) @@ -1,6 +1,7 @@ #!/opt/csw/bin/python2.6 # $Id$ +import re import unittest import mox import difflib @@ -827,6 +828,15 @@ result = "Maciej Blizinski" self.assertEqual(result, checkpkg.ExtractMaintainerName(data)) + def testPstampRegex(self): + pstamp = "hson at solaris9s-csw-20100313144445" + expected = { + 'username': 'hson', + 'timestamp': '20100313144445', + 'hostname': 'solaris9s-csw' + } + self.assertEqual(expected, re.match(checkpkg.PSTAMP_RE, pstamp).groupdict()) + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Mar 13 19:13:13 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 13 Mar 2010 18:13:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9142] csw/mgar/pkg/ImageMagick/branches/package-split/ Makefile Message-ID: Revision: 9142 http://gar.svn.sourceforge.net/gar/?rev=9142&view=rev Author: hson Date: 2010-03-13 18:13:13 +0000 (Sat, 13 Mar 2010) Log Message: ----------- imagemagick: Add missing dependency Modified Paths: -------------- csw/mgar/pkg/ImageMagick/branches/package-split/Makefile Modified: csw/mgar/pkg/ImageMagick/branches/package-split/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/branches/package-split/Makefile 2010-03-13 17:39:05 UTC (rev 9141) +++ csw/mgar/pkg/ImageMagick/branches/package-split/Makefile 2010-03-13 18:13:13 UTC (rev 9142) @@ -57,6 +57,8 @@ RUNTIME_DEP_PKGS_CSWpmimagemagick += CSWimagemagickrt RUNTIME_DEP_PKGS_CSWpmimagemagick += CSWperl +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcairo +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg RUNTIME_DEP_PKGS_CSWimagemagick += CSWimagemagickrt RUNTIME_DEP_PKGS_CSWimagemagick += CSWopenexrrt RUNTIME_DEP_PKGS_CSWimagemagick += CSWbzip2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 13 20:00:51 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 13 Mar 2010 19:00:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[9143] csw/mgar/gar/v2-git Message-ID: Revision: 9143 http://gar.svn.sourceforge.net/gar/?rev=9143&view=rev Author: wahwah Date: 2010-03-13 19:00:51 +0000 (Sat, 13 Mar 2010) Log Message: ----------- mGAR v2-git, more merge from v2. Modified Paths: -------------- csw/mgar/gar/v2-git/lib/python/checkpkg.py csw/mgar/gar/v2-git/lib/python/checkpkg_test.py csw/mgar/gar/v2-git/lib/python/package_checks.py Removed Paths: ------------- csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-libs.py Property Changed: ---------------- csw/mgar/gar/v2-git/ csw/mgar/gar/v2-git/pkglib/csw/depend Property changes on: csw/mgar/gar/v2-git ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678,6915-9127 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678,6915-9142 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Deleted: csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-libs.py 2010-03-13 18:13:13 UTC (rev 9142) +++ csw/mgar/gar/v2-git/lib/checkpkg.d/checkpkg-libs.py 2010-03-13 19:00:51 UTC (rev 9143) @@ -1,185 +0,0 @@ -#!/opt/csw/bin/python2.6 -# -# $Id$ - -"""A check for dependencies between shared libraries. -This is currently more of a prototype than a mature program, but it has some -unit tests and it appears to be working. The main problem is that it's not -divided into smaller testable sections. -""" - -import os -import os.path -import copy -import re -import subprocess -import logging -import sys -import textwrap -from Cheetah import Template - -CHECKPKG_MODULE_NAME = "shared library linking consistency" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import opencsw - -def CheckSharedLibraryConsistency(pkgs_data, debug): - ws_re = re.compile(r"\s+") - result_ok = True - errors = [] - binaries = [] - binaries_by_pkgname = {} - sonames_by_pkgname = {} - pkg_by_any_filename = {} - needed_sonames_by_binary = {} - filenames_by_soname = {} - for pkg_data in pkgs_data: - binaries_base = [os.path.basename(x) for x in pkg_data["binaries"]] - pkgname = pkg_data["basic_stats"]["pkgname"] - binaries_by_pkgname[pkgname] = binaries_base - binaries.extend(pkg_data["binaries"]) - for filename in pkg_data["all_filenames"]: - pkg_by_any_filename[filename] = pkgname - for binary_data in pkg_data["binaries_dump_info"]: - binary_base_name = os.path.basename(binary_data["base_name"]) - needed_sonames_by_binary[binary_base_name] = binary_data - filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name - - # Making the binaries unique - binaries = set(binaries) - isalist = pkg_data["isalist"] - - # Building indexes by soname to simplify further processing - # These are indexes "by soname". - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - needed_sonames_by_binary) - - pkgmap = checkpkg.SystemPkgmap() - logging.debug("Determining the soname-package relationships.") - # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog - runpath_data_by_soname = {} - for soname in needed_sonames: - runpath_data_by_soname[soname] = pkgmap.GetPkgmapLineByBasename(soname) - lines_by_soname = checkpkg.GetLinesBySoname( - runpath_data_by_soname, needed_sonames, runpath_by_needed_soname, isalist) - - # Creating a map from files to packages. - pkgs_by_filename = {} - for soname, line in lines_by_soname.iteritems(): - # TODO: Find all the packages, not just the last field. - fields = re.split(ws_re, line.strip()) - # For now, we'll assume that the last field is the package. - pkgname = fields[-1] - pkgs_by_filename[soname] = pkgname - - # A shared object dependency/provisioning report, plus checking. - # - # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), - # it has a different purpose: it reports the relationships between shared - # libraries, binaries using them and packages providing them. Ideally, the - # same bit of code would do both checking and reporting. - # - # TODO: Rewrite this using cheetah templates - if debug and needed_sonames: - print "Analysis of sonames needed by the package set:" - binaries_with_missing_sonames = set([]) - for soname in needed_sonames: - logging.debug("Analyzing: %s", soname) - if soname in filenames_by_soname: - print "%s is provided by the package itself" % soname - elif soname in lines_by_soname: - print ("%s is provided by %s and required by:" - % (soname, - pkgs_by_filename[soname])) - filename_lines = " ".join(sorted(binaries_by_soname[soname])) - for line in textwrap.wrap(filename_lines, 70): - print " ", line - else: - print ("%s is required by %s, but we don't know what provides it." - % (soname, binaries_by_soname[soname])) - for binary in binaries_by_soname[soname]: - binaries_with_missing_sonames.add(binary) - if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: - print "However, it's a whitelisted soname." - else: - pass - # The error checking needs to be unified: done in one place only. - # errors.append( - # checkpkg.CheckpkgTag( - # "%s is required by %s, but " - # "we don't know what provides it." - # % (soname, binaries_by_soname[soname]))) - if binaries_with_missing_sonames: - print "The following are binaries with missing sonames:" - binary_lines = " ".join(sorted(binaries_with_missing_sonames)) - for line in textwrap.wrap(binary_lines, 70): - print " ", line - print - - dependent_pkgs = {} - for checker in pkgs_data: - pkgname = checker["basic_stats"]["pkgname"] - declared_dependencies = dict(checker["depends"]) - missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( - pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_filename, - filenames_by_soname, - pkg_by_any_filename) - namespace = { - "pkgname": pkgname, - "missing_deps": missing_deps, - "surplus_deps": surplus_deps, - "orphan_sonames": orphan_sonames, - } - t = Template.Template(checkpkg.REPORT_TMPL, searchList=[namespace]) - print unicode(t) - - for soname in orphan_sonames: - errors.append( - checkpkg.CheckpkgTag( - pkgname, - "orphan-soname", - soname)) - for missing_dep in missing_deps: - errors.append( - checkpkg.CheckpkgTag( - pkgname, - "missing-dependency", - missing_dep)) - return errors - - -def main(): - options, args = checkpkg.GetOptions() - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - - check_manager.RegisterSetCheck(CheckSharedLibraryConsistency) - - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() - -# vim:set sw=2 ts=2 sts=2 expandtab: Modified: csw/mgar/gar/v2-git/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2-git/lib/python/checkpkg.py 2010-03-13 18:13:13 UTC (rev 9142) +++ csw/mgar/gar/v2-git/lib/python/checkpkg.py 2010-03-13 19:00:51 UTC (rev 9143) @@ -31,7 +31,7 @@ DO_NOT_REPORT_MISSING = set([]) DO_NOT_REPORT_MISSING_RE = [r"SUNW.*", r"\*SUNW.*"] DUMP_BIN = "/usr/ccs/bin/dump" -PSTAMP_RE = r"(?P\w)+@(?P[\w\.]+)-(?P\d+)" +PSTAMP_RE = r"(?P\w+)@(?P[\w\.-]+)-(?P\d+)" DESCRIPTION_RE = r"^([\S]+) - (.*)$" SYSTEM_SYMLINKS = ( @@ -816,7 +816,11 @@ if not self.system_pkgmap: self.system_pkgmap = SystemPkgmap() + def GetPkgmapLineByBasename(self, basename): + """Proxies calls to self.system_pkgmap.""" + return self.system_pkgmap.GetPkgmapLineByBasename(basename) + class IndividualCheckInterface(CheckInterfaceBase): """To be passed to the checking functions. @@ -833,9 +837,10 @@ self.errors.append(tag) -def SetCheckInterface(object): +class SetCheckInterface(CheckInterfaceBase): """To be passed to set checking functions.""" - def __init__(self, system_pkgmap): + + def __init__(self, system_pkgmap=None): super(SetCheckInterface, self).__init__(system_pkgmap) self.errors = [] @@ -872,19 +877,21 @@ self._RegisterIndividualCheck(member) elif member_name.startswith("SetCheck"): logging.debug("Registering set check %s", repr(member_name)) - self._RegisterIndividualCheck(member) + self._RegisterSetCheck(member) def GetAllTags(self, packages_data): errors = {} + # TODO: Configure the logger with the logging level. logging_level = logging.INFO if self.debug: logging_level = logging.DEBUG + pkgmap = SystemPkgmap() # Individual checks for pkg_data in packages_data: for function in self.individual_checks: all_stats = pkg_data.GetAllStats() pkgname = all_stats["basic_stats"]["pkgname"] - check_interface = IndividualCheckInterface(pkgname) + check_interface = IndividualCheckInterface(pkgname, pkgmap) logger = logging.getLogger("%s-%s" % (pkgname, function.__name__)) logger.debug("Calling %s", function.__name__) function(all_stats, check_interface, logger=logger) @@ -894,7 +901,7 @@ for function in self.set_checks: pkgs_data = [x.GetAllStats() for x in packages_data] logger = logging.getLogger("SetCheck-%s" % (function.__name__,)) - check_interface = SetCheckInterface() + check_interface = SetCheckInterface(pkgmap) logger.debug("Calling %s", function.__name__) function(pkgs_data, check_interface, logger) if check_interface.errors: Modified: csw/mgar/gar/v2-git/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-git/lib/python/checkpkg_test.py 2010-03-13 18:13:13 UTC (rev 9142) +++ csw/mgar/gar/v2-git/lib/python/checkpkg_test.py 2010-03-13 19:00:51 UTC (rev 9143) @@ -1,6 +1,7 @@ #!/opt/csw/bin/python2.6 # $Id$ +import re import unittest import mox import difflib @@ -827,6 +828,15 @@ result = "Maciej Blizinski" self.assertEqual(result, checkpkg.ExtractMaintainerName(data)) + def testPstampRegex(self): + pstamp = "hson at solaris9s-csw-20100313144445" + expected = { + 'username': 'hson', + 'timestamp': '20100313144445', + 'hostname': 'solaris9s-csw' + } + self.assertEqual(expected, re.match(checkpkg.PSTAMP_RE, pstamp).groupdict()) + if __name__ == '__main__': unittest.main() Modified: csw/mgar/gar/v2-git/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2-git/lib/python/package_checks.py 2010-03-13 18:13:13 UTC (rev 9142) +++ csw/mgar/gar/v2-git/lib/python/package_checks.py 2010-03-13 19:00:51 UTC (rev 9143) @@ -12,7 +12,9 @@ # error_mgr.ReportError("something-is-wrong") import re +import os import checkpkg +from Cheetah import Template PATHS_ALLOWED_ONLY_IN = { "CSWcommon": ["/opt", @@ -100,6 +102,125 @@ "%s class=%s" % (entry["path"], entry["class"])) +def SetCheckSharedLibraryConsistency(pkgs_data, error_mgr, logger): + ws_re = re.compile(r"\s+") + result_ok = True + binaries = [] + binaries_by_pkgname = {} + sonames_by_pkgname = {} + pkg_by_any_filename = {} + needed_sonames_by_binary = {} + filenames_by_soname = {} + for pkg_data in pkgs_data: + binaries_base = [os.path.basename(x) for x in pkg_data["binaries"]] + pkgname = pkg_data["basic_stats"]["pkgname"] + binaries_by_pkgname[pkgname] = binaries_base + binaries.extend(pkg_data["binaries"]) + for filename in pkg_data["all_filenames"]: + pkg_by_any_filename[filename] = pkgname + for binary_data in pkg_data["binaries_dump_info"]: + binary_base_name = os.path.basename(binary_data["base_name"]) + needed_sonames_by_binary[binary_base_name] = binary_data + filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name + + # Making the binaries unique + binaries = set(binaries) + isalist = pkg_data["isalist"] + + # Building indexes by soname to simplify further processing + # These are indexes "by soname". + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + needed_sonames_by_binary) + + logger.debug("Determining the soname-package relationships.") + # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog + runpath_data_by_soname = {} + for soname in needed_sonames: + runpath_data_by_soname[soname] = error_mgr.GetPkgmapLineByBasename(soname) + lines_by_soname = checkpkg.GetLinesBySoname( + runpath_data_by_soname, needed_sonames, runpath_by_needed_soname, isalist) + + # Creating a map from files to packages. + pkgs_by_filename = {} + for soname, line in lines_by_soname.iteritems(): + # TODO: Find all the packages, not just the last field. + fields = re.split(ws_re, line.strip()) + # For now, we'll assume that the last field is the package. + pkgname = fields[-1] + pkgs_by_filename[soname] = pkgname + + # A shared object dependency/provisioning report, plus checking. + # + # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), + # it has a different purpose: it reports the relationships between shared + # libraries, binaries using them and packages providing them. Ideally, the + # same bit of code would do both checking and reporting. + # + # TODO: Rewrite this using cheetah templates + if False and needed_sonames: + print "Analysis of sonames needed by the package set:" + binaries_with_missing_sonames = set([]) + for soname in needed_sonames: + logger.debug("Analyzing: %s", soname) + if soname in filenames_by_soname: + print "%s is provided by the package itself" % soname + elif soname in lines_by_soname: + print ("%s is provided by %s and required by:" + % (soname, + pkgs_by_filename[soname])) + filename_lines = " ".join(sorted(binaries_by_soname[soname])) + for line in textwrap.wrap(filename_lines, 70): + print " ", line + else: + print ("%s is required by %s, but we don't know what provides it." + % (soname, binaries_by_soname[soname])) + for binary in binaries_by_soname[soname]: + binaries_with_missing_sonames.add(binary) + if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: + print "However, it's a whitelisted soname." + else: + pass + # The error checking needs to be unified: done in one place only. + # errors.append( + # checkpkg.CheckpkgTag( + # "%s is required by %s, but " + # "we don't know what provides it." + # % (soname, binaries_by_soname[soname]))) + if binaries_with_missing_sonames: + print "The following are binaries with missing sonames:" + binary_lines = " ".join(sorted(binaries_with_missing_sonames)) + for line in textwrap.wrap(binary_lines, 70): + print " ", line + print + + dependent_pkgs = {} + for checker in pkgs_data: + pkgname = checker["basic_stats"]["pkgname"] + declared_dependencies = dict(checker["depends"]) + missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( + pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_filename, + filenames_by_soname, + pkg_by_any_filename) + namespace = { + "pkgname": pkgname, + "missing_deps": missing_deps, + "surplus_deps": surplus_deps, + "orphan_sonames": orphan_sonames, + } + t = Template.Template(checkpkg.REPORT_TMPL, searchList=[namespace]) + print unicode(t) + for soname in orphan_sonames: + error_mgr.ReportError(pkgname, "orphan-soname", soname) + for missing_dep in missing_deps: + error_mgr.ReportError(pkgname, "missing-dependency", missing_dep) + + def SetCheckDependencies(pkgs_data, error_mgr, logger): """Dependencies must be either installed in the system, or in the set.""" pass Property changes on: csw/mgar/gar/v2-git/pkglib/csw/depend ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2/pkglib/csw/depend:7201-9127 /csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855 /csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649 /csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180 + /csw/mgar/gar/v2/pkglib/csw/depend:7201-9142 /csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855 /csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649 /csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 13 20:30:49 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 13 Mar 2010 19:30:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9144] csw/mgar/gar/v2/lib/python/checkpkg.py Message-ID: Revision: 9144 http://gar.svn.sourceforge.net/gar/?rev=9144&view=rev Author: wahwah Date: 2010-03-13 19:30:49 +0000 (Sat, 13 Mar 2010) Log Message: ----------- mGAR v2: moving SetErrorsToDict to the base class of checkpkg managers. http://lists.opencsw.org/pipermail/maintainers/2010-March/011579.html Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-13 19:00:51 UTC (rev 9143) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-13 19:30:49 UTC (rev 9144) @@ -750,6 +750,21 @@ tags_report = unicode(tags_report_t) return screen_report, tags_report + def SetErrorsToDict(self, set_errors, a_dict): + # These were generated by a set, but are likely to be bound to specific + # packages. We'll try to preserve the package assignments. + errors = copy.copy(a_dict) + for tag in set_errors: + if tag.pkgname: + if not tag.pkgname in errors: + errors[tag.pkgname] = [] + errors[tag.pkgname].append(tag) + else: + if "package-set" not in errors: + errors["package-set"] = [] + errors["package-set"].append(error) + return a_dict + def Run(self): """Runs all the checks @@ -773,21 +788,6 @@ def RegisterSetCheck(self, function): self.set_checks.append(function) - def SetErrorsToDict(self, set_errors, a_dict): - # These were generated by a set, but are likely to be bound to specific - # packages. We'll try to preserve the package assignments. - errors = copy.copy(a_dict) - for tag in set_errors: - if tag.pkgname: - if not tag.pkgname in errors: - errors[tag.pkgname] = [] - errors[tag.pkgname].append(tag) - else: - if "package-set" not in errors: - errors["package-set"] = [] - errors["package-set"].append(error) - return a_dict - def GetAllTags(self, packages_data): errors = {} for pkg_data in packages_data: 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 Mar 13 20:57:24 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 13 Mar 2010 19:57:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9145] csw/mgar/pkg Message-ID: Revision: 9145 http://gar.svn.sourceforge.net/gar/?rev=9145&view=rev Author: dmichelsen Date: 2010-03-13 19:57:24 +0000 (Sat, 13 Mar 2010) Log Message: ----------- urt: Initial commit, this is needed for rle support for giflib, delayed for now as it will be horrible to compile Added Paths: ----------- csw/mgar/pkg/urt/ csw/mgar/pkg/urt/branches/ csw/mgar/pkg/urt/tags/ csw/mgar/pkg/urt/trunk/ csw/mgar/pkg/urt/trunk/Makefile csw/mgar/pkg/urt/trunk/checksums csw/mgar/pkg/urt/trunk/files/ Property changes on: csw/mgar/pkg/urt/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/urt/trunk/Makefile =================================================================== --- csw/mgar/pkg/urt/trunk/Makefile (rev 0) +++ csw/mgar/pkg/urt/trunk/Makefile 2010-03-13 19:57:24 UTC (rev 9145) @@ -0,0 +1,21 @@ +GARNAME = urt +GARVERSION = 3.1b1 +DISTVERSION = 3.1.b.1 +CATEGORIES = lib + +DESCRIPTION = Utah Raster Toolkit containing RLE encoding +define BLURB +endef + +# It is hard to find the sources nowadays +SF_PROJ = gnuwin32 +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(DISTVERSION)-2-src.zip + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-2-src.zip + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/urt/trunk/checksums =================================================================== --- csw/mgar/pkg/urt/trunk/checksums (rev 0) +++ csw/mgar/pkg/urt/trunk/checksums 2010-03-13 19:57:24 UTC (rev 9145) @@ -0,0 +1 @@ +f64cb3e12f740923b19ae6100c565a0d urt-3.1.b.1-2-src.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 Sat Mar 13 21:42:45 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 13 Mar 2010 20:42:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[9146] csw/mgar/pkg/tcl Message-ID: Revision: 9146 http://gar.svn.sourceforge.net/gar/?rev=9146&view=rev Author: dmichelsen Date: 2010-03-13 20:42:45 +0000 (Sat, 13 Mar 2010) Log Message: ----------- tcl: Move legacy to tags/ Added Paths: ----------- csw/mgar/pkg/tcl/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/tcl/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 Sat Mar 13 21:43:19 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 13 Mar 2010 20:43:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9147] csw/mgar/pkg/tcl/trunk Message-ID: Revision: 9147 http://gar.svn.sourceforge.net/gar/?rev=9147&view=rev Author: dmichelsen Date: 2010-03-13 20:43:19 +0000 (Sat, 13 Mar 2010) Log Message: ----------- tcl: Add version modulation for 8.4 Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile csw/mgar/pkg/tcl/trunk/checksums Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-03-13 20:42:45 UTC (rev 9146) +++ csw/mgar/pkg/tcl/trunk/Makefile 2010-03-13 20:43:19 UTC (rev 9147) @@ -1,38 +1,44 @@ GARNAME = tcl -GARVERSION = 8.5.7 +GARVERSION = 8.5.8 CATEGORIES = lang +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 8.4.19 8.5.8 +# The legacy library was not available in 64 bit, so don't bother compiling it +SKIP_MODULATIONS = isa-sparcv9-garversion-8.4.19 isa-amd64-garversion-8.4.19 + DESCRIPTION = Tcl programming language define BLURB endef SF_PROJ = tcl MASTER_SITES = $(SF_MIRRORS) +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)$(VERSION)-src.tar.gz) +DISTFILES = $(SOURCEFILES) +NOEXTRACT = $(filter-out $(GARNAME)$(GARVERSION)-src.tar.gz,$(SOURCEFILES)) -DISTNAME = $(GARNAME)$(GARVERSION) -DISTFILES = $(DISTNAME)-src.tar.gz - # Fix for finding libsunmath on i386 and amd64 -PATCHFILES += configure.patch -PATCHFILES += tcl.m4.patch +PATCHFILES-8.5.8 = configure.patch +PATCHFILES-8.5.8 += tcl.m4.patch -RUNTIME_DEP_PKGS_CSWtcl += CSWsunmath +PATCHFILES = $(PATCHFILES-$(GARVERSION)) +ALLFILES_PATCHFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(PATCHFILES-$(VERSION))) -PATCHDIR = $(WORKDIR)/$(DISTNAME) - -SPKG_SOURCEURL = http://www.tcl.tk/ - # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 UPSTREAM_USE_SF = 1 UFILES_REGEX = $(GARNAME)(\d+(?:\.\d+)*)-src.tar.gz -BUILD64 = 1 -NOISAEXEC = 1 +VENDOR_URL = http://www.tcl.tk/ +LICENSE = license.terms +DISTNAME = $(GARNAME)$(GARVERSION) +PATCHDIR = $(WORKDIR)/$(DISTNAME) WORKSRC = $(WORKDIR)/$(DISTNAME)/unix -LICENSE = license.terms +BUILD64-8.5.8 = 1 +BUILD64 = $(BUILD64-$(GARVERSION)) +NOISAEXEC = 1 INCLUDE_FLAGS = @@ -41,12 +47,23 @@ # tk need the static tclstub library for some reason EXTRA_MERGE_INCLUDE_FILES = $(libdir)/libtclstub.*\.a +MERGE_SCRIPTS_isa-default-garversion-8.4.19 = copy-lib-only + +MERGE_SCRIPTS_isa-default-garversion-8.5.8 = copy-all +MERGE_SCRIPTS_isa-extra-garversion-8.5.8 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-8.5.8 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + include gar/category.mk -CFLAGS := $(filter-out -I%,$(CFLAGS)) +# CFLAGS := $(filter-out -I%,$(CFLAGS)) DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS)) pre-configure-modulated: @echo " ==> Regenerating build tools..." @(cd $(WORKSRC) ; cp -p ../license.terms .; autoconf) @$(MAKECOOKIE) + +merge-copy-lib-only: + ginstall -d $(PKGROOT)$(libdir) + ginstall $(INSTALLISADIR)$(libdir)/*.so $(PKGROOT)$(libdir) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/tcl/trunk/checksums =================================================================== --- csw/mgar/pkg/tcl/trunk/checksums 2010-03-13 20:42:45 UTC (rev 9146) +++ csw/mgar/pkg/tcl/trunk/checksums 2010-03-13 20:43:19 UTC (rev 9147) @@ -1,3 +1,4 @@ dc8664f3dc92693aaaad68785e4426ae configure.patch cc9b1bd7ddf8e27e97ef464806885349 tcl.m4.patch -f70ad8f78b5e4a9f792fe101f22b125f tcl8.5.7-src.tar.gz +ade2c033a7b545ee108f3fdfeb629fcf tcl8.4.19-src.tar.gz +7f123e53b3daaaba2478d3af5a0752e3 tcl8.5.8-src.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 Mar 13 22:12:24 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 13 Mar 2010 21:12:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9148] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 9148 http://gar.svn.sourceforge.net/gar/?rev=9148&view=rev Author: dmichelsen Date: 2010-03-13 21:12:24 +0000 (Sat, 13 Mar 2010) Log Message: ----------- giflib: Add nox11/cswx11 alternatives Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2010-03-13 20:43:19 UTC (rev 9147) +++ csw/mgar/pkg/giflib/trunk/Makefile 2010-03-13 21:12:24 UTC (rev 9148) @@ -15,24 +15,32 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PACKAGES = CSWgiflib CSWgiflibrt CSWgiflibdoc CSWungif +PACKAGES = CSWgiflib CSWgiflibrt CSWgiflibrtx11 CSWgiflibdoc CSWungif CATALOGNAME_CSWgiflib = giflib CATALOGNAME_CSWgiflibrt = giflib_rt +CATALOGNAME_CSWgiflibrtx11 = giflib_rt_x11 CATALOGNAME_CSWgiflibdoc = giflib_doc CATALOGNAME_CSWungif = libungif SPKG_DESC_CSWgiflib = A library for reading and writing gif images -SPKG_DESC_CSWgiflibrt = giflib runtime libraries +SPKG_DESC_CSWgiflibrt = giflib runtime libraries (minimal alternative without X11 support) +SPKG_DESC_CSWgiflibrtx11 = giflib runtime libraries (full alternative with support for CSW X11) SPKG_DESC_CSWgiflibdoc = giflib documentation -SPKG_DESC_CSWungif = Links to giflib now the patent is dropped +SPKG_DESC_CSWungif = Stub which links to giflib now the patent is dropped SPKG_SOURCEURL = http://giflib.sourceforge.net/ -RUNTIME_DEP_PKGS_CSWgiflibrt = CSWlibice CSWlibsm CSWlibx11 -RUNTIME_DEP_PKGS_CSWgiflib = CSWlibice CSWlibsm CSWlibx11 CSWgiflibrt +BUILD_DEP_PKGS = CSWlibicedevel CSWlibsmdevel CSWlibx11devel + +RUNTIME_DEP_PKGS_CSWgiflibrt = +RUNTIME_DEP_PKGS_CSWgiflibrtx11 = CSWlibice CSWlibsm CSWlibx11 +RUNTIME_DEP_PKGS_CSWgiflib = CSWgiflibrt RUNTIME_DEP_PKGS_CSWungif = CSWgiflib +EXTRA_MODULATORS = FEATURES +MODULATIONS_FEATURES = nox11 cswx11 + EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib @@ -40,23 +48,46 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --x-include=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS_nox11 = --disable-x11 +CONFIGURE_ARGS_cswx11 = --x-include=$(prefix)/X11/include +CONFIGURE_ARGS_cswx11 += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(FEATURES)) + TEST_TARGET = check +EXTRA_PAX_ARGS-32 = -s ",\(\.$(libdir)/libgif\)\(\.so\.4\.1\.6\),\1-$(FEATURES)\2,p" +EXTRA_PAX_ARGS-64 = -s ",\.$(libdir)/libgif\(\.so\.4\.1\.6\),.$(libdir_install)/$(ISA)/libgif-$(FEATURES)\1,p" +EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS-$(MEMORYMODEL)) + # We don't want 64 bit executables as they gain no speed NOISAEXEC = 1 -MERGE_DIRS_isa-sparcv9 = $(libdir) -MERGE_DIRS_isa-amd64 = $(libdir) +MERGE_SCRIPTS_isa-default-features-nox11 = copy-all +MERGE_SCRIPTS_isa-default64-features-nox11 = copy-relocated-only +MERGE_DIRS_isa-default64-features-nox11 = $(libdir) +MERGE_SCRIPTS_isa-default-features-cswx11 = copy-only +MERGE_DIRS_isa-default-features-cswx11 = $(libdir) +MERGE_SCRIPTS_isa-default64-features-cswx11 = copy-relocated-only +MERGE_DIRS_isa-default64-features-cswx11 = $(libdir) + ARCHALL_CSWgiflibdoc = 1 ARCHALL_CSWungif = 1 -PKGFILES_CSWgiflibrt = .*/libgif\..* +PKGFILES_CSWgiflibrt = .*/libgif-nox11\..* +PKGFILES_CSWgiflibrtx11 = .*/libgif-cswx11\..* PKGFILES_CSWgiflibdoc = $(PKGFILES_DOC) PKGFILES_CSWungif = .*/libungif\..* +ALTERNATIVES_CSWgiflibrt = nox11 +ALTERNATIVES_CSWgiflibrtx11 = cswx11 + +ALTERNATIVE_nox11 = $(libdir)/libgif.so.4.1.6 giflib $(libdir)/libgif-nox11.so.4.1.6 100 +ALTERNATIVE_nox11 += $(libdir)/$(ISA_DEFAULT64)/libgif.so.4.1.6 giflib64 $(libdir)/$(ISA_DEFAULT64)/libneon-nox11.so.4.1.6 + +ALTERNATIVE_cswx11 = $(libdir)/libgif.so.4.1.6 giflib $(libdir)/libgif-cswx11.so.4.1.6 100 +ALTERNATIVE_cswx11 += $(libdir)/$(ISA_DEFAULT64)/libgif.so.4.1.6 giflib64 $(libdir)/$(ISA_DEFAULT64)/libneon-cswx11.so.4.1.6 + include gar/category.mk DOCFILES = AUTHORS BUGS COPYING ChangeLog DEVELOPERS INSTALL NEWS ONEWS README TODO 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 Mar 13 22:12:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 13 Mar 2010 21:12:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9149] csw/mgar/pkg/cpan/POE/trunk Message-ID: Revision: 9149 http://gar.svn.sourceforge.net/gar/?rev=9149&view=rev Author: dmichelsen Date: 2010-03-13 21:12:48 +0000 (Sat, 13 Mar 2010) Log Message: ----------- cpan/POE: Move to mGAR v2 and 1.287 Modified Paths: -------------- csw/mgar/pkg/cpan/POE/trunk/Makefile csw/mgar/pkg/cpan/POE/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/POE/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/POE/trunk/files/CSWpmpoe.depend csw/mgar/pkg/cpan/POE/trunk/files/CSWpmpoe.gspec csw/mgar/pkg/cpan/POE/trunk/files/optional.diff Property Changed: ---------------- csw/mgar/pkg/cpan/POE/trunk/ Property changes on: csw/mgar/pkg/cpan/POE/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/POE/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/POE/trunk/Makefile 2010-03-13 21:12:24 UTC (rev 9148) +++ csw/mgar/pkg/cpan/POE/trunk/Makefile 2010-03-13 21:12:48 UTC (rev 9149) @@ -1,9 +1,9 @@ GARNAME = POE -GARVERSION = 0.3601 +GARVERSION = 1.287 CATEGORIES = cpan AUTHOR = RCAPUTO -DESCRIPTION = portable multitasking and networking framework for Perl +DESCRIPTION = Portable multitasking and networking framework for Perl define BLURB POE is a framework for cooperative, event driven multitasking in Perl. Other languages have similar frameworks. Python has Twisted. TCL has "the event @@ -15,11 +15,16 @@ other event loops such as Event and the Tk and Gtk toolkits. endef -DISTFILES += CSWpmpoe.gspec CSWpmpoe.depend +DISTFILES = COPYING -# Disable Tk/Gtk optional module checks -PATCHFILES = optional.diff +PACKAGES = CSWpmpoe +CATALOGNAME = pm_poe -DEPENDS += cpan/Curses cpan/IO-Tty cpan/Term-Cap cpan/Event +RUNTIME_DEP_PKGS = CSWpmiotty +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWpoetestloops +ARCHALL = 1 + +CONFIGURE_ARGS = --default + include gar/category.mk Modified: csw/mgar/pkg/cpan/POE/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/POE/trunk/checksums 2010-03-13 21:12:24 UTC (rev 9148) +++ csw/mgar/pkg/cpan/POE/trunk/checksums 2010-03-13 21:12:48 UTC (rev 9149) @@ -1,4 +1,2 @@ -79e26cedcf8ac6e4a6be3c8d93852c39 download/CSWpmpoe.gspec -2ba3f7b77a0d42c18f2960d945bad86a download/CSWpmpoe.depend -e83ba84588e428915442980b06adab8a download/POE-0.3601.tar.gz -e85529b81e2fb1a1b676bdae17527d93 download/optional.diff +504b863dc2c2daabccc36f07e44a2619 COPYING +26c12727cf34190507c249a2dc5c58ce POE-1.287.tar.gz Added: csw/mgar/pkg/cpan/POE/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/POE/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/POE/trunk/files/COPYING 2010-03-13 21:12:48 UTC (rev 9149) @@ -0,0 +1,3 @@ +Except where otherwise noted, POE is Copyright 1998-2009 Rocco Caputo. +All rights reserved. POE is free software; you may redistribute it +and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/POE/trunk/files/CSWpmpoe.depend =================================================================== --- csw/mgar/pkg/cpan/POE/trunk/files/CSWpmpoe.depend 2010-03-13 21:12:24 UTC (rev 9148) +++ csw/mgar/pkg/cpan/POE/trunk/files/CSWpmpoe.depend 2010-03-13 21:12:48 UTC (rev 9149) @@ -1,4 +0,0 @@ -P CSWpmcurses pm_curses - terminal screen handling and optimization -P CSWpmevent pm_event - event loop processing -P CSWpmiotty pm_iotty - pseudo TTY object class -P CSWpmtermcap pm_termcap - termcap interface Deleted: csw/mgar/pkg/cpan/POE/trunk/files/CSWpmpoe.gspec =================================================================== --- csw/mgar/pkg/cpan/POE/trunk/files/CSWpmpoe.gspec 2010-03-13 21:12:24 UTC (rev 9148) +++ csw/mgar/pkg/cpan/POE/trunk/files/CSWpmpoe.gspec 2010-03-13 21:12:48 UTC (rev 9149) @@ -1,8 +0,0 @@ -%var bitname pm_poe -%var pkgname CSWpmpoe -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Except where otherwise noted, POE is Copyright 1998-2004 Rocco Caputo. -All rights reserved. POE is free software; you may redistribute it -and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/POE/trunk/files/optional.diff =================================================================== --- csw/mgar/pkg/cpan/POE/trunk/files/optional.diff 2010-03-13 21:12:24 UTC (rev 9148) +++ csw/mgar/pkg/cpan/POE/trunk/files/optional.diff 2010-03-13 21:12:48 UTC (rev 9149) @@ -1,47 +0,0 @@ -diff --speed-large-files --minimal -Nru POE-0.2802.orig/mylib/Makefile-5005.pm POE-0.2802/mylib/Makefile-5005.pm ---- POE-0.2802.orig/mylib/Makefile-5005.pm 2004-02-02 09:24:51.000000000 -0800 -+++ POE-0.2802/mylib/Makefile-5005.pm 2004-02-18 08:41:08.203144000 -0800 -@@ -71,11 +71,11 @@ - -tests => [ qw(t/27_poll.t) ], - 'IO::Poll' => 0.05, - ], -- "Optional modules for IPv6 support." => [ -- -default => 0, -- -tests => [ qw(t/29_sockfact6.t) ], -- 'Socket6' => 0.11, -- ], -+# "Optional modules for IPv6 support." => [ -+# -default => 0, -+# -tests => [ qw(t/29_sockfact6.t) ], -+# 'Socket6' => 0.11, -+# ], - "Optional modules for controlling full-screen programs (e.g. vi)." => [ - -default => 0, - 'IO::Pty' => '1.02', -@@ -103,16 +103,16 @@ - 'Term::ReadKey' => '', - 'Term::Cap' => '', - ], -- "Optional modules for Gtk+ graphical interfaces." => [ -- -default => 0, -- -tests => [ qw(t/21_gtk.t) ], -- 'Gtk' => '', -- ], -- "Optional modules for Tk graphical interfaces." => [ -- -default => 0, -- -tests => [ qw(t/06_tk.t) ], -- 'Tk' => '800.021', -- ], -+# "Optional modules for Gtk+ graphical interfaces." => [ -+# -default => 0, -+# -tests => [ qw(t/21_gtk.t) ], -+# 'Gtk' => '', -+# ], -+# "Optional modules for Tk graphical interfaces." => [ -+# -default => 0, -+# -tests => [ qw(t/06_tk.t) ], -+# 'Tk' => '800.021', -+# ], - "Optional modules for Event.pm support." => [ - -default => 0, - -tests => [ qw(t/07_event.t t/12_signals_ev.t) ], 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 Mar 13 22:38:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 13 Mar 2010 21:38:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9150] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 9150 http://gar.svn.sourceforge.net/gar/?rev=9150&view=rev Author: dmichelsen Date: 2010-03-13 21:38:46 +0000 (Sat, 13 Mar 2010) Log Message: ----------- giflib: Strip libtool stuff Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2010-03-13 21:12:48 UTC (rev 9149) +++ csw/mgar/pkg/giflib/trunk/Makefile 2010-03-13 21:38:46 UTC (rev 9150) @@ -45,6 +45,8 @@ EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +STRIP_LIBTOOL = 1 + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Mar 13 23:11:19 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 13 Mar 2010 22:11:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9151] csw/mgar/pkg/magit/trunk/Makefile Message-ID: Revision: 9151 http://gar.svn.sourceforge.net/gar/?rev=9151&view=rev Author: bdwalton Date: 2010-03-13 22:11:19 +0000 (Sat, 13 Mar 2010) Log Message: ----------- magit: emacs as build dep for creating the .elc files Modified Paths: -------------- csw/mgar/pkg/magit/trunk/Makefile Modified: csw/mgar/pkg/magit/trunk/Makefile =================================================================== --- csw/mgar/pkg/magit/trunk/Makefile 2010-03-13 21:38:46 UTC (rev 9150) +++ csw/mgar/pkg/magit/trunk/Makefile 2010-03-13 22:11:19 UTC (rev 9151) @@ -11,7 +11,7 @@ as an extension to Emacs. endef -BUILD_DEP_PKGS = CSWautoconf CSWautomake CSWtexinfo +BUILD_DEP_PKGS = CSWautoconf CSWautomake CSWtexinfo CSWemacs RUNTIME_DEP_PKGS = CSWgit CSWemacscommon GIT_REPOS = git://github.com/technomancy/magit.git This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Mar 13 23:38:43 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 13 Mar 2010 22:38:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9152] csw/mgar/pkg/poppler/branches/0.10.6/Makefile Message-ID: Revision: 9152 http://gar.svn.sourceforge.net/gar/?rev=9152&view=rev Author: hson Date: 2010-03-13 22:38:43 +0000 (Sat, 13 Mar 2010) Log Message: ----------- poppler: Split package Modified Paths: -------------- csw/mgar/pkg/poppler/branches/0.10.6/Makefile Modified: csw/mgar/pkg/poppler/branches/0.10.6/Makefile =================================================================== --- csw/mgar/pkg/poppler/branches/0.10.6/Makefile 2010-03-13 22:11:19 UTC (rev 9151) +++ csw/mgar/pkg/poppler/branches/0.10.6/Makefile 2010-03-13 22:38:43 UTC (rev 9152) @@ -14,18 +14,43 @@ DISTFILES += old_libs_i386.tar.bz2 DISTFILES += old_libs_sparc.tar.bz2 -RUNTIME_DEP_PKGS_CSWpoppler += CSWgtk2 -RUNTIME_DEP_PKGS_CSWpoppler += CSWiconv -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibcairo -RUNTIME_DEP_PKGS_CSWpoppler += CSWpango -RUNTIME_DEP_PKGS_CSWpoppler += CSWzlib +PACKAGES = CSWpoppler CSWlibpoppler CSWlibpopplerdev CSWlibpopplerdoc +CATALOGNAME_CSWpoppler = poppler +CATALOGNAME_CSWlibpoppler = libpoppler +CATALOGNAME_CSWlibpopplerdev = libpoppler_devel +CATALOGNAME_CSWlibpopplerdoc = libpoppler_doc +SPKG_DESC_CSWpoppler = $(DESCRIPTION) - utilities +SPKG_DESC_CSWlibpoppler = $(DESCRIPTION) +SPKG_DESC_CSWlibpopplerdev = $(DESCRIPTION) - developer package +SPKG_DESC_CSWlibpopplerdoc = $(DESCRIPTION) - documentation + +PKGFILES_CSWlibpoppler= $(PKGFILES_RT) +PKGFILES_CSWlibpopplerdev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibpopplerdoc = $(sharedstatedir)/gtk-doc/.* + +INCOMPATIBLE_PKGS_CSWpoppler = CSWxpdf + RUNTIME_DEP_PKGS_CSWpoppler += CSWfconfig RUNTIME_DEP_PKGS_CSWpoppler += CSWftype2 -RUNTIME_DEP_PKGS_CSWpoppler += CSWggettextrt -RUNTIME_DEP_PKGS_CSWpoppler += CSWglib2 RUNTIME_DEP_PKGS_CSWpoppler += CSWjpeg +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler RUNTIME_DEP_PKGS_CSWpoppler += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWiconv +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWjpeg +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWlibcairo +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWpango +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWpoppler +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWzlib + +#CHECKPKG_OVERRIDES_CSWlibpopplerdev += missing-dependency|CSWlibpoppler + #PATCHFILES += missing-includes.patch # UPSTREAM_MASTER_SITES = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 14 06:34:29 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 14 Mar 2010 05:34:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9153] csw/mgar/pkg/poppler/branches/0.10.6/Makefile Message-ID: Revision: 9153 http://gar.svn.sourceforge.net/gar/?rev=9153&view=rev Author: hson Date: 2010-03-14 05:34:29 +0000 (Sun, 14 Mar 2010) Log Message: ----------- poppler: Revert override change Modified Paths: -------------- csw/mgar/pkg/poppler/branches/0.10.6/Makefile Modified: csw/mgar/pkg/poppler/branches/0.10.6/Makefile =================================================================== --- csw/mgar/pkg/poppler/branches/0.10.6/Makefile 2010-03-13 22:38:43 UTC (rev 9152) +++ csw/mgar/pkg/poppler/branches/0.10.6/Makefile 2010-03-14 05:34:29 UTC (rev 9153) @@ -49,7 +49,7 @@ RUNTIME_DEP_PKGS_CSWlibpoppler += CSWpoppler RUNTIME_DEP_PKGS_CSWlibpoppler += CSWzlib -#CHECKPKG_OVERRIDES_CSWlibpopplerdev += missing-dependency|CSWlibpoppler +CHECKPKG_OVERRIDES_CSWlibpopplerdev += missing-dependency|CSWlibpoppler #PATCHFILES += missing-includes.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 14 11:14:39 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 14 Mar 2010 10:14:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9154] csw/mgar/gar/v2 Message-ID: Revision: 9154 http://gar.svn.sourceforge.net/gar/?rev=9154&view=rev Author: wahwah Date: 2010-03-14 10:14:39 +0000 (Sun, 14 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, removed one per-package pkgtrans, reduced the default screen output. Modified Paths: -------------- csw/mgar/gar/v2/bin/analyze_module_results.py csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_old.py csw/mgar/gar/v2/lib/python/package_checks_old_test.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/bin/analyze_module_results.py =================================================================== --- csw/mgar/gar/v2/bin/analyze_module_results.py 2010-03-14 05:34:29 UTC (rev 9153) +++ csw/mgar/gar/v2/bin/analyze_module_results.py 2010-03-14 10:14:39 UTC (rev 9154) @@ -16,13 +16,13 @@ def main(): parser = optparse.OptionParser() parser.add_option("-e", "--extract-dir", dest="extractdir", - help="Directory with extracted packages") + help="Directory with extracted packages " + "(with error tag files)") options, args = parser.parse_args() - pkgnames = args - packages = [opencsw.DirectoryFormatPackage( - os.path.join(options.extractdir, pkgname)) - for pkgname in pkgnames] - overrides_list = [pkg.GetOverrides() for pkg in packages] + filenames = args + srv4_pkgs = [opencsw.CswSrv4File(x) for x in filenames] + pkgstats = [checkpkg.PackageStats(x) for x in srv4_pkgs] + overrides_list = [pkg.GetSavedOverrides() for pkg in pkgstats] files = os.listdir(options.extractdir) error_tags = [] for file_name in files: Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-03-14 05:34:29 UTC (rev 9153) +++ csw/mgar/gar/v2/bin/checkpkg 2010-03-14 10:14:39 UTC (rev 9154) @@ -152,57 +152,54 @@ exit 1 fi +printf "Examining pkginfo files: " + for f in "$@" do - - if [[ ! -f $f ]] ; then print ERROR: $f does not exist exit 1 fi -case $f in - *) - print Examining $f +debugmsg "Examining $f" +debugmsg "Looking for bad strings..." - 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. +# +# Using rot13 so that checkpkg can check itself without reporting +# an error. +badpaths="$(echo /rkcbeg/zrqhfn /bcg/ohvyq | gtr a-mn-z n-za-m)" +for badpath in $badpaths ; 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 - # 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. - # - # Using rot13 so that checkpkg can check itself without reporting - # an error. - badpaths="$(echo /rkcbeg/zrqhfn /bcg/ohvyq | gtr a-mn-z n-za-m)" - for badpath in $badpaths ; 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 all files for more detailed inspection... - set_variables_for_individual_package_check "$f" -mkdir $EXTRACTDIR +[ -d ${EXTRACTDIR} ] || mkdir ${EXTRACTDIR} # FIXME: This doesn't support multiple packages TMPFILE=$EXTRACTDIR/pkginfo -dd if=$f skip=1 | (cd $EXTRACTDIR; cpio -ivd $pkgname/pkginfo) +printf "$pkgname " +dd if=$f skip=1 | (cd $EXTRACTDIR; cpio -ivd $pkgname/pkginfo >/dev/null 2>&1) if [[ $? -ne 0 ]] ; then - print ERROR: could not extract $f + print "ERROR: could not extract $f" + print "with (cd $EXTRACTDIR; cpio -ivd $pkgname/pkginfo)" + ls -l $EXTRACTDIR rm -rf $EXTRACTDIR $TMPARCHIVE exit 1 fi @@ -223,131 +220,44 @@ # strip out '' chars, because it interferes with mysql desc=`print $desc | sed "s/'//g"` - -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 - -print "" -print Extracing pkg for examination of files... -custom_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" +# TODO: Run this during the stats collection stage. +# /usr/sbin/pkgchk -d $EXTRACTDIR $pkgname || errmsg "Package failed integrity check" +# print "/usr/sbin/pkgchk passed." -print "/usr/sbin/pkgchk passed." - ######################################## # Check for some common errors ######################################### -# 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}' -} +# TODO: To be ported. +# +# # find all executables and dynamic libs,and list their filenames. +# 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 -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 /usr/ccs/bin/dump -Lv |nawk '$2=="NEEDED"{print $3}' | - sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist - print libraries used are: - cat $EXTRACTDIR/liblist - print "cross-referencing with depend file (May take a while)" - else - print No dynamic libraries in the package - fi -fi - -#If these dont exist, it is Bad. -touch $EXTRACTDIR/liblist $EXTRACTDIR/libpkgs - -# store things that look like shared objects from the package map for -# delayed library validation. -grep "\.so" $EXTRACTDIR/$pkgname/pkgmap >> $SETLIBS - -if [[ -f $EXTRACTDIR/$pkgname/install/depend ]] ; then - print - print "Examining 'depend' file" -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 - errmsg "$pkgname references self in depend file" -fi - -#to retain a record of all packages currently being examined from $@ -echo $pkgname >> $SETDEPS - -nawk '$1=="P" {print $2}' $EXTRACTDIR/$pkgname/install/depend | - sort >$EXTRACTDIR/deppkgs -for dep in `cat $EXTRACTDIR/deppkgs` -do - pkginfo $dep - if [[ $? -ne 0 ]]; then - #if we've already looked at the package named $dep, - #it'll be in the file. - awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/bin/grep $dep >/dev/null - if [[ $? -ne 0 ]]; then #we haven't yet seen this package in our set - echo "Can't validate dependence on $dep. Storing for delayed validation." - #store for validation at the end. - echo "$dep $pkgname" >> $SETDEPS.missing - else - echo "Found $dep as part of the package set being evaluated." - fi - fi +tmparchives="$tmparchives $TMPARCHIVE" done -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 +# Terminating the line with pkgnames +echo # Plugin section. # @@ -355,11 +265,6 @@ # checkpkg is. Each plugin file name should be an executable and begin with # "checkpkg-". -tmparchives="$tmparchives $TMPARCHIVE" -done - -# All packages have been extracted. - set_variables_for_individual_package_check "$f" test_suite_ok=1 @@ -456,9 +361,10 @@ fi # Collecting errors and applying the overrides. +# This has to use the original files. ${command_basedir}/analyze_module_results.py \ - -e "${EXTRACTDIR}" \ - ${pkgnames} + -e "${EXTRACTDIR}" \ + "$@" if [[ "$?" -ne 0 ]]; then errmsg "${RED}Modular checks are reporting errors.${COLOR_RESET}" else @@ -470,18 +376,4 @@ # Cleaning up after all packages cleanup -if [ -s $SETDEPS.missing ]; then - print "Doing late evaluations of package dependencies." - while read mdep; do - dep=`echo $mdep | nawk '{print $1}'` - pkg=`echo $mdep | nawk '{print $2}'` - /usr/bin/grep $dep $SETDEPS >/dev/null - if [ $? -ne 0 ]; then - errmsg "Couldn't validate $dep as a dependency in package $pkg" - else - print "Validated $dep as a dependency for $pkg." - fi - done < $SETDEPS.missing -fi - cleanupset Modified: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py 2010-03-14 05:34:29 UTC (rev 9153) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py 2010-03-14 10:14:39 UTC (rev 9154) @@ -29,7 +29,6 @@ md5sums, options.debug) # Registering functions defined above. - check_manager.RegisterIndividualCheck(package_checks_old.CatalognameLowercase) check_manager.RegisterIndividualCheck(package_checks_old.FileNameSanity) check_manager.RegisterIndividualCheck(package_checks_old.PkginfoSanity) check_manager.RegisterIndividualCheck(package_checks_old.ArchitectureSanity) Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-14 05:34:29 UTC (rev 9153) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-14 10:14:39 UTC (rev 9154) @@ -433,6 +433,15 @@ except sqlite3.OperationalError, e: logging.warn("sqlite3.OperationalError: %s", e) + def GetInstalledPackages(self): + """Returns a dictioary of all installed packages.""" + self._LazyInitializeDatabase() + c = self.conn.cursor() + sql = "SELECT pkgname, pkg_desc FROM packages;" + c.execute(sql) + return dict(x[0:2] for x in c) + + def SharedObjectDependencies(pkgname, binaries_by_pkgname, needed_sonames_by_binary, @@ -820,7 +829,10 @@ """Proxies calls to self.system_pkgmap.""" return self.system_pkgmap.GetPkgmapLineByBasename(basename) + def GetInstalledPackages(self): + return self.system_pkgmap.GetInstalledPackages() + class IndividualCheckInterface(CheckInterfaceBase): """To be passed to the checking functions. @@ -1250,6 +1262,13 @@ self.CollectStats() return self.all_stats + def GetSavedOverrides(self): + if not self.StatsExist(): + raise PackageError("Package stats not ready.") + override_stats = self.ReadObject("overrides") + overrides = [Override(**x) for x in override_stats] + return overrides + def DumpObject(self, obj, name): """Saves an object. Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-14 05:34:29 UTC (rev 9153) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-14 10:14:39 UTC (rev 9154) @@ -28,6 +28,14 @@ MAX_DESCRIPTION_LENGTH = 100 +def CatalognameLowercase(pkg_data, error_mgr, logger): + catalogname = pkg_data["basic_stats"]["catalogname"] + if catalogname != catalogname.lower(): + error_mgr.ReportError("catalogname-not-lowercase") + if not re.match(r"^[\w_]+$", catalogname): + error_mgr.ReportError("catalogname-is-not-a-simple-word") + + def CheckForbiddenPaths(pkg_data, error_mgr, logger): for pkgname in PATHS_ALLOWED_ONLY_IN: if pkgname != pkg_data["basic_stats"]["pkgname"]: @@ -223,4 +231,18 @@ def SetCheckDependencies(pkgs_data, error_mgr, logger): """Dependencies must be either installed in the system, or in the set.""" - pass + known_pkgs = set(error_mgr.GetInstalledPackages()) + pkgs_under_check = [x["basic_stats"]["pkgname"] for x in pkgs_data] + for pkgname in pkgs_under_check: + known_pkgs.add(pkgname) + for pkg_data in pkgs_data: + pkgname = pkg_data["basic_stats"]["pkgname"] + for depname, dep_desc in pkg_data["depends"]: + if depname not in known_pkgs: + error_mgr.ReportError(pkgname, "unidentified-dependency", depname) + +def CheckDependsOnSelf(pkg_data, error_mgr, logger): + pkgname = pkg_data["basic_stats"]["pkgname"] + for depname, dep_desc in pkg_data["depends"]: + if depname == pkgname: + error_mgr.ReportError("depends-on-self") Modified: csw/mgar/gar/v2/lib/python/package_checks_old.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_old.py 2010-03-14 05:34:29 UTC (rev 9153) +++ csw/mgar/gar/v2/lib/python/package_checks_old.py 2010-03-14 10:14:39 UTC (rev 9154) @@ -17,21 +17,6 @@ "CSWcommon": ("/opt", "",) } -def CatalognameLowercase(pkg_data, debug): - errors = [] - # Here's how to report an error: - catalogname = pkg_data["basic_stats"]["catalogname"] - if catalogname != catalogname.lower(): - errors.append(checkpkg.CheckpkgTag( - pkg_data["basic_stats"]["pkgname"], - "catalogname-not-lowercase")) - if not re.match(r"^[\w_]+$", catalogname): - errors.append(checkpkg.CheckpkgTag( - pkg_data["basic_stats"]["pkgname"], - "catalogname-is-not-a-simple-word")) - return errors - - def FileNameSanity(pkg_data, debug): errors = [] basic_stats = pkg_data["basic_stats"] Modified: csw/mgar/gar/v2/lib/python/package_checks_old_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_old_test.py 2010-03-14 05:34:29 UTC (rev 9153) +++ csw/mgar/gar/v2/lib/python/package_checks_old_test.py 2010-03-14 10:14:39 UTC (rev 9154) @@ -46,21 +46,6 @@ f.close() return data - def testCatalogName_1(self): - self.pkg_data_1["basic_stats"]["catalogname"] = "Foo" - errors = pc.CatalognameLowercase(self.pkg_data_1, False) - self.failUnless(errors) - - def testCatalogName_2(self): - self.pkg_data_1["basic_stats"]["catalogname"] = "foo" - errors = pc.CatalognameLowercase(self.pkg_data_1, False) - self.failIf(errors) - - def testCatalogNameSpecialCharacters(self): - self.pkg_data_1["basic_stats"]["catalogname"] = "foo+abc&123" - errors = pc.CatalognameLowercase(self.pkg_data_1, False) - self.failUnless(errors) - def testFileNameSanity(self): del(self.pkg_data_2["basic_stats"]["parsed_basename"]["revision_info"]["REV"]) errors = pc.FileNameSanity(self.pkg_data_2, False) Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-14 05:34:29 UTC (rev 9153) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-14 10:14:39 UTC (rev 9154) @@ -2,6 +2,7 @@ # coding=utf-8 # $Id$ +import copy import unittest import package_checks as pc import checkpkg @@ -13,22 +14,26 @@ BASE_DIR = os.path.dirname(__file__) TESTDATA_DIR = os.path.join(BASE_DIR, "testdata") CHECKPKG_STATS_DIR = os.path.join(TESTDATA_DIR, "stats") +DEFAULT_DATA_MD5 = "461a24f02dd5020b4aa014b76f3ec2cc" +DEFAULT_PKG_STATS = checkpkg.PackageStats(None, CHECKPKG_STATS_DIR, DEFAULT_DATA_MD5) +DEFAULT_PKG_DATA = DEFAULT_PKG_STATS.GetAllStats() class CheckpkgUnitTestHelper(object): """Wraps common components of checkpkg tests.""" - MD5 = "461a24f02dd5020b4aa014b76f3ec2cc" def setUp(self): # This is slow. Let's speed it up somehow. Move away from yaml and create # a Python module with the data. - self.pkg_stats = checkpkg.PackageStats(None, CHECKPKG_STATS_DIR, self.MD5) + self.pkg_stats = DEFAULT_PKG_STATS self.pkg_data = self.pkg_stats.GetAllStats() + # This makes one of the test break. To be investigated. + # self.pkg_data = DEFAULT_PKG_DATA self.mocker = mox.Mox() def testDefault(self): self.logger_mock = self.mocker.CreateMock(logging.Logger) self.error_mgr_mock = self.mocker.CreateMock( - checkpkg.CheckpkgManager2.IndividualCheckInterface) + checkpkg.IndividualCheckInterface) self.CheckpkgTest() self.mocker.ReplayAll() getattr(pc, self.FUNCTION_NAME)(self.pkg_data, self.error_mgr_mock, self.logger_mock) @@ -99,5 +104,75 @@ }) +class TestCatalognameLowercase_1(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CatalognameLowercase' + def CheckpkgTest(self): + self.pkg_data["basic_stats"]["catalogname"] = "Foo" + self.error_mgr_mock.ReportError('catalogname-not-lowercase') + +class TestCatalognameLowercase_2(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CatalognameLowercase' + def CheckpkgTest(self): + self.pkg_data["basic_stats"]["catalogname"] = "foo" + +class TestCatalognameLowercase_3(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CatalognameLowercase' + def CheckpkgTest(self): + self.pkg_data["basic_stats"]["catalogname"] = "foo+abc&123" + self.error_mgr_mock.ReportError('catalogname-is-not-a-simple-word') + + +class TestSetCheckDependencies(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckDependencies' + def CheckpkgTest(self): + self.pkg_data_single = self.pkg_data + self.pkg_data = [self.pkg_data_single] + self.pkg_data[0]["depends"].append(["CSWmarsian", "A package from Mars."]) + installed = ["CSWcommon", "CSWisaexec", "CSWiconv", "CSWlibpopt"] + self.error_mgr_mock.GetInstalledPackages().AndReturn(installed) + self.error_mgr_mock.ReportError('CSWrsync', 'unidentified-dependency', 'CSWmarsian') + + +class TestSetCheckDependenciesGood(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckDependencies' + def CheckpkgTest(self): + self.pkg_data_single = self.pkg_data + self.pkg_data = [self.pkg_data_single] + installed = ["CSWcommon", "CSWisaexec", "CSWiconv", "CSWlibpopt"] + self.error_mgr_mock.GetInstalledPackages().AndReturn(installed) + + +class TestSetCheckDependenciesTwoPkgsBad(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckDependencies' + def CheckpkgTest(self): + self.pkg_data_single = self.pkg_data + self.pkg_data = [self.pkg_data_single, copy.deepcopy(self.pkg_data_single)] + self.pkg_data[1]["basic_stats"]["pkgname"] = "CSWsecondpackage" + self.pkg_data[1]["depends"].append(["CSWmartian", ""]) + installed = ["CSWcommon", "CSWisaexec", "CSWiconv", "CSWlibpopt"] + self.error_mgr_mock.GetInstalledPackages().AndReturn(installed) + self.error_mgr_mock.ReportError( + 'CSWsecondpackage', 'unidentified-dependency', 'CSWmartian') + + +class TestSetCheckDependenciesTwoPkgsGood(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckDependencies' + def CheckpkgTest(self): + self.pkg_data_single = self.pkg_data + self.pkg_data = [self.pkg_data_single, copy.deepcopy(self.pkg_data_single)] + self.pkg_data[1]["basic_stats"]["pkgname"] = "CSWsecondpackage" + self.pkg_data[1]["depends"].append(["CSWrsync", ""]) + installed = ["CSWcommon", "CSWisaexec", "CSWiconv", "CSWlibpopt"] + self.error_mgr_mock.GetInstalledPackages().AndReturn(installed) + + +class TestCheckCheckDependsOnSelf(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckDependsOnSelf' + def CheckpkgTest(self): + self.pkg_data["depends"].append(["CSWrsync", ""]) + installed = ["CSWcommon", "CSWisaexec", "CSWiconv", "CSWlibpopt"] + self.error_mgr_mock.ReportError('depends-on-self') + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Mar 14 11:36:54 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 14 Mar 2010 10:36:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9155] csw/mgar/pkg/memconf/trunk/Makefile Message-ID: Revision: 9155 http://gar.svn.sourceforge.net/gar/?rev=9155&view=rev Author: bonivart Date: 2010-03-14 10:36:54 +0000 (Sun, 14 Mar 2010) Log Message: ----------- memconf: uc desc Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2010-03-14 10:14:39 UTC (rev 9154) +++ csw/mgar/pkg/memconf/trunk/Makefile 2010-03-14 10:36:54 UTC (rev 9155) @@ -2,7 +2,7 @@ GARVERSION = 2.13 CATEGORIES = utils -DESCRIPTION = perl script that displays memory modules installed +DESCRIPTION = Perl script that displays memory modules installed define BLURB memconf reports the size of each SIMM/DIMM memory module installed in a system. It also reports the system type and any empty memory sockets. 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 Mar 14 12:03:54 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sun, 14 Mar 2010 11:03:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9156] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 9156 http://gar.svn.sourceforge.net/gar/?rev=9156&view=rev Author: aigoshin Date: 2010-03-14 11:03:53 +0000 (Sun, 14 Mar 2010) Log Message: ----------- nginx: fix bug 0004340 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2010-03-14 10:36:54 UTC (rev 9155) +++ csw/mgar/pkg/nginx/trunk/Makefile 2010-03-14 11:03:53 UTC (rev 9156) @@ -71,6 +71,7 @@ post-configure-modulated: gsed -i s#/...ISALIST#/'$$ISALIST'# $(WORKSRC)/objs/ngx_auto_config.h + gsed -i s#/ pause#/ rep; nop# $(WORKSRC)/src/os/unix/ngx_sunpro_amd64.il $(MAKECOOKIE) post-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 14 12:12:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 14 Mar 2010 11:12:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[9158] csw/mgar/gar/v2 Message-ID: Revision: 9158 http://gar.svn.sourceforge.net/gar/?rev=9158&view=rev Author: wahwah Date: 2010-03-14 11:12:57 +0000 (Sun, 14 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, cut the running time in half, from 60 to 30 seconds in my test case. This is thanks to the reduction of the re-loading of package statistics, and moving checks from separate executables to one Python module. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py csw/mgar/gar/v2/bin/update_contents_cache.py csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_old.py csw/mgar/gar/v2/lib/python/package_checks_old_test.py csw/mgar/gar/v2/lib/python/package_checks_test.py Removed Paths: ------------- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-actionclasses.py csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-archall.py csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-license.py csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-obsolete-deps.py Modified: csw/mgar/gar/v2/bin/checkpkg_collect_stats.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py 2010-03-14 11:11:22 UTC (rev 9157) +++ csw/mgar/gar/v2/bin/checkpkg_collect_stats.py 2010-03-14 11:12:57 UTC (rev 9158) @@ -31,7 +31,7 @@ logging.basicConfig(level=logging.DEBUG) else: logging.basicConfig(level=logging.INFO) - logging.info("Collecting statistics about given package files.") + logging.debug("Collecting statistics about given package files.") logging.debug("calling: %s, please be patient", args) packages = [opencsw.CswSrv4File(x, options.debug) for x in args] stats_list = [checkpkg.PackageStats(pkg) for pkg in packages] Modified: csw/mgar/gar/v2/bin/update_contents_cache.py =================================================================== --- csw/mgar/gar/v2/bin/update_contents_cache.py 2010-03-14 11:11:22 UTC (rev 9157) +++ csw/mgar/gar/v2/bin/update_contents_cache.py 2010-03-14 11:12:57 UTC (rev 9158) @@ -18,7 +18,6 @@ import checkpkg def main(): - print "Checking if the package cache is up to date." logging.basicConfig(level=logging.INFO) test_pkgmap = checkpkg.SystemPkgmap() test_pkgmap.InitializeDatabase() Deleted: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-actionclasses.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-actionclasses.py 2010-03-14 11:11:22 UTC (rev 9157) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-actionclasses.py 2010-03-14 11:12:57 UTC (rev 9158) @@ -1,75 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""This is a dummy check. You can use it as a boilerplate for your own checks. - -Copy it and modify. -""" - -import logging -import os.path -import sys -import re - -CHECKPKG_MODULE_NAME = "class action scripts / prototype integrity" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import opencsw - - -def CheckActionClasses(pkg_data, debug): - """Checks the consistency between classes in the prototype and pkginfo.""" - errors = [] - pkginfo = pkg_data["pkginfo"] - pkgmap = pkg_data["pkgmap"] - pkginfo_classes = set(re.split(opencsw.WS_RE, pkginfo["CLASSES"])) - pkgmap_classes = set() - for entry in pkgmap: - if entry["class"]: # might be None - pkgmap_classes.add(entry["class"]) - only_in_pkginfo = pkginfo_classes.difference(pkgmap_classes) - only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) - for action_class in only_in_pkginfo: - error = checkpkg.CheckpkgTag( - pkg_data["basic_stats"]["pkgname"], - "action-class-only-in-pkginfo", - action_class, - msg="This shouldn't cause any problems, but it might be not necessary.") - errors.append(error) - for action_class in only_in_pkgmap: - errors.append( - checkpkg.CheckpkgTag(pkg.pkgname, "action-class-only-in-pkgmap", action_class)) - return errors - - -def main(): - options, args = checkpkg.GetOptions() - if options.debug: - logging.basicConfig(level=logging.DEBUG) - else: - logging.basicConfig(level=logging.INFO) - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - # Registering functions defined above. - check_manager.RegisterIndividualCheck(CheckActionClasses) - # Running the checks, reporting and exiting. - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Deleted: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-archall.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-archall.py 2010-03-14 11:11:22 UTC (rev 9157) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-archall.py 2010-03-14 11:12:57 UTC (rev 9158) @@ -1,44 +0,0 @@ -#!/opt/csw/bin/python2.6 -# -# $Id$ - -"""Verifies the architecture of the package.""" - -import os.path -import re -import sys - -CHECKPKG_MODULE_NAME = "architecture check" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import package_checks_old - -def main(): - options, args = checkpkg.GetOptions() - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - - check_manager.RegisterIndividualCheck( - package_checks_old.CheckArchitectureVsContents) - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() - -# vim:set sw=2 ts=2 sts=2 expandtab: Modified: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py 2010-03-14 11:11:22 UTC (rev 9157) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py 2010-03-14 11:12:57 UTC (rev 9158) @@ -31,7 +31,6 @@ # Registering functions defined above. check_manager.RegisterIndividualCheck(package_checks_old.FileNameSanity) check_manager.RegisterIndividualCheck(package_checks_old.PkginfoSanity) - check_manager.RegisterIndividualCheck(package_checks_old.ArchitectureSanity) check_manager.RegisterIndividualCheck(package_checks_old.CheckBuildingUser) check_manager.RegisterIndividualCheck(package_checks_old.CheckPkgmapPaths) # Running the checks, reporting and exiting. Deleted: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-license.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-license.py 2010-03-14 11:11:22 UTC (rev 9157) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-license.py 2010-03-14 11:12:57 UTC (rev 9158) @@ -1,59 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""Checks for the existence of the license file.""" - -import logging -import os.path -import sys - -CHECKPKG_MODULE_NAME = "license presence" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import opencsw - -LICENSE_TMPL = "/opt/csw/share/doc/%s/license" - -def CheckLicenseFile(pkg_data, debug): - """Checks for the presence of the license file.""" - errors = [] - pkgmap = pkg_data["pkgmap"] - catalogname = pkg_data["basic_stats"]["catalogname"] - license_path = LICENSE_TMPL % catalogname - pkgmap_paths = [x["path"] for x in pkgmap] - if license_path not in pkgmap_paths: - errors.append( - checkpkg.CheckpkgTag( - pkg_data["basic_stats"]["pkgname"], - "license-missing", - msg="See http://sourceforge.net/apps/trac/gar/wiki/CopyRight")) - return errors - - -def main(): - options, args = checkpkg.GetOptions() - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - # Registering functions defined above. - check_manager.RegisterIndividualCheck(CheckLicenseFile) - # Running the checks, reporting and exiting. - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Deleted: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-obsolete-deps.py 2010-03-14 11:11:22 UTC (rev 9157) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-obsolete-deps.py 2010-03-14 11:12:57 UTC (rev 9158) @@ -1,74 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""Makes sure that obsolete packages are not added as dependencies. -""" - -import logging -import os.path -import sys - -CHECKPKG_MODULE_NAME = "obsolete dependencies" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg - -OBSOLETE_DEPS = { - # "CSWfoo": { - # "hint": "Do this...", - # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." - # }, - "CSWpython-rt": { - "hint": "CSWpython-rt is deprecated, use CSWpython instead.", - "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" - }, -} - -def CheckObsoleteDeps(pkg_data, debug): - """Checks for obsolete dependencies.""" - errors = [] - deps = set(pkg_data["depends"]) - obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) - if obsolete_pkg_deps: - for obsolete_pkg in obsolete_pkg_deps: - msg = "" - if "hint" in OBSOLETE_DEPS[obsolete_pkg]: - msg += "Hint: %s" % OBSOLETE_DEPS[obsolete_pkg]["hint"] - if "url" in OBSOLETE_DEPS[obsolete_pkg]: - if msg: - msg += ", " - msg += "URL: %s" % OBSOLETE_DEPS[obsolete_pkg]["url"] - if not msg: - msg = None - errors.append( - checkpkg.CheckpkgTag( - pkg_data["basic_stats"]["pkgname"], - "obsolete-dependency", obsolete_pkg, msg=msg)) - return errors - - -def main(): - options, args = checkpkg.GetOptions() - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - check_manager.RegisterIndividualCheck(CheckObsoleteDeps) - # Running the checks, reporting and exiting. - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-14 11:11:22 UTC (rev 9157) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-14 11:12:57 UTC (rev 9158) @@ -14,6 +14,7 @@ import re import os import checkpkg +import opencsw from Cheetah import Template PATHS_ALLOWED_ONLY_IN = { @@ -26,6 +27,18 @@ "CSWtexinfp": ["/opt/csw/share/info/dir"], } MAX_DESCRIPTION_LENGTH = 100 +LICENSE_TMPL = "/opt/csw/share/doc/%s/license" +OBSOLETE_DEPS = { + # "CSWfoo": { + # "hint": "Do this...", + # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." + # }, + "CSWpython-rt": { + "hint": "CSWpython-rt is deprecated, use CSWpython instead.", + "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" + }, +} +ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)") def CatalognameLowercase(pkg_data, error_mgr, logger): @@ -246,3 +259,91 @@ for depname, dep_desc in pkg_data["depends"]: if depname == pkgname: error_mgr.ReportError("depends-on-self") + +def CheckArchitectureSanity(pkg_data, error_mgr, logger): + basic_stats = pkg_data["basic_stats"] + pkgname = basic_stats["pkgname"] + pkginfo = pkg_data["pkginfo"] + filename = basic_stats["pkg_basename"] + arch = pkginfo["ARCH"] + filename_re = r"-%s-" % arch + if not re.search(filename_re, filename): + error_mgr.ReportError("srv4-filename-architecture-mismatch", arch) + + +def CheckActionClasses(pkg_data, error_mgr, logger): + """Checks the consistency between classes in the prototype and pkginfo.""" + pkginfo = pkg_data["pkginfo"] + pkgmap = pkg_data["pkgmap"] + pkginfo_classes = set(re.split(opencsw.WS_RE, pkginfo["CLASSES"])) + pkgmap_classes = set() + for entry in pkgmap: + if entry["class"]: # might be None + pkgmap_classes.add(entry["class"]) + only_in_pkginfo = pkginfo_classes.difference(pkgmap_classes) + only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) + for action_class in only_in_pkginfo: + error_mgr.ReportError("action-class-only-in-pkginfo", action_class) + for action_class in only_in_pkgmap: + error_mgr.ReportError("action-class-only-in-pkgmap", action_class) + + +def CheckLicenseFile(pkg_data, error_mgr, logger): + """Checks for the presence of the license file.""" + # TODO: Write a unit test + pkgmap = pkg_data["pkgmap"] + catalogname = pkg_data["basic_stats"]["catalogname"] + license_path = LICENSE_TMPL % catalogname + pkgmap_paths = [x["path"] for x in pkgmap] + if license_path not in pkgmap_paths: + error_mgr.ReportError("license-missing") + logger.info("See http://sourceforge.net/apps/trac/gar/wiki/CopyRight") + +def CheckObsoleteDeps(pkg_data, error_mgr, logger): + """Checks for obsolete dependencies.""" + deps = set(pkg_data["depends"]) + obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) + if obsolete_pkg_deps: + for obsolete_pkg in obsolete_pkg_deps: + error_mgr.ReportError("obsolete-dependency", obsolete_pkg) + msg = "" + if "hint" in OBSOLETE_DEPS[obsolete_pkg]: + msg += "Hint: %s" % OBSOLETE_DEPS[obsolete_pkg]["hint"] + if "url" in OBSOLETE_DEPS[obsolete_pkg]: + if msg: + msg += ", " + msg += "URL: %s" % OBSOLETE_DEPS[obsolete_pkg]["url"] + if not msg: + msg = None + logger.info(msg) + + +def CheckArchitectureVsContents(pkg_data, error_mgr, logger): + """Verifies the relationship between package contents and architecture.""" + binaries = pkg_data["binaries"] + pkginfo = pkg_data["pkginfo"] + pkgmap = pkg_data["pkgmap"] + arch = pkginfo["ARCH"] + pkgname = pkg_data["basic_stats"]["pkgname"] + reasons_to_be_arch_specific = [] + pkgmap_paths = [x["path"] for x in pkgmap] + for pkgmap_path in pkgmap_paths: + if re.search(ARCH_RE, str(pkgmap_path)): + reasons_to_be_arch_specific.append(( + "archall-with-arch-paths", + pkgmap_path, + "path %s looks arch-specific" % pkgmap_path)) + for binary in binaries: + reasons_to_be_arch_specific.append(( + "archall-with-binaries", + binary, + "package contains binary %s" % binary)) + if arch == "all": + for tag, param, desc in reasons_to_be_arch_specific: + error_mgr.ReportError(tag, param, desc) + elif not reasons_to_be_arch_specific: + logger.info("Package %s does not contain any binaries.", pkgname) + logger.info("Consider making it ARCHALL = 1 instead of %s:", arch) + logger.info("ARCHALL_%s = 1", pkgname) + logger.info("However, be aware that there might be other reasons " + "to keep it architecture-specific.") Modified: csw/mgar/gar/v2/lib/python/package_checks_old.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_old.py 2010-03-14 11:11:22 UTC (rev 9157) +++ csw/mgar/gar/v2/lib/python/package_checks_old.py 2010-03-14 11:12:57 UTC (rev 9158) @@ -7,8 +7,6 @@ import checkpkg import re -ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)") - MAX_CATALOGNAME_LENGTH = 20 MAX_PKGNAME_LENGTH = 20 ARCH_LIST = ["sparc", "i386", "all"] @@ -126,55 +124,6 @@ return errors -def ArchitectureSanity(pkg_data, debug): - errors = [] - basic_stats = pkg_data["basic_stats"] - pkgname = basic_stats["pkgname"] - pkginfo = pkg_data["pkginfo"] - filename = basic_stats["pkg_basename"] - arch = pkginfo["ARCH"] - filename_re = r"-%s-" % arch - if not re.search(filename_re, filename): - errors.append(checkpkg.CheckpkgTag( - pkgname, "srv4-filename-architecture-mismatch", arch)) - return errors - - -def CheckArchitectureVsContents(pkg_data, debug): - """Verifies the relationship between package contents and architecture.""" - errors = [] - binaries = pkg_data["binaries"] - pkginfo = pkg_data["pkginfo"] - pkgmap = pkg_data["pkgmap"] - arch = pkginfo["ARCH"] - pkgname = pkg_data["basic_stats"]["pkgname"] - reasons_to_be_arch_specific = [] - pkgmap_paths = [x["path"] for x in pkgmap] - for pkgmap_path in pkgmap_paths: - if re.search(ARCH_RE, str(pkgmap_path)): - reasons_to_be_arch_specific.append(( - "archall-with-arch-paths", - pkgmap_path, - "path %s looks arch-specific" % pkgmap_path)) - for binary in binaries: - reasons_to_be_arch_specific.append(( - "archall-with-binaries", - binary, - "package contains binary %s" % binary)) - if arch == "all": - for tag, param, desc in reasons_to_be_arch_specific: - errors.append(checkpkg.CheckpkgTag(pkgname, tag, param)) - elif not reasons_to_be_arch_specific: - # This is not a clean way of handling messages for the user, but there's - # not better way at the moment. - print "Package %s does not contain any binaries." % pkgname - print "Consider making it ARCHALL = 1 instead of %s:" % arch - print "ARCHALL_%s = 1" % pkgname - print ("However, be aware that there might be other reasons " - "to keep it architecture-specific.") - return errors - - def CheckForMissingSymbols(pkgs_data, debug): """Analyzes missing symbols reported by ldd -r. Modified: csw/mgar/gar/v2/lib/python/package_checks_old_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_old_test.py 2010-03-14 11:11:22 UTC (rev 9157) +++ csw/mgar/gar/v2/lib/python/package_checks_old_test.py 2010-03-14 11:12:57 UTC (rev 9158) @@ -51,13 +51,6 @@ errors = pc.FileNameSanity(self.pkg_data_2, False) self.failUnless(errors) - def testCheckArchitectureVsContents(self): - self.pkg_data_2["pkgmap"] = self.LoadData("example-1-pkgmap") - self.pkg_data_2["binaries"] = [] - self.pkg_data_2["pkginfo"] = self.LoadData("example-1-pkginfo") - errors = pc.CheckArchitectureVsContents(self.pkg_data_2, False) - self.failIf(errors) - def testCheckForMissingSymbols(self): ldd_dash_r_yml = """opt/csw/lib/postgresql/8.4/_int.so: - {path: /usr/lib/libc.so.1, soname: libc.so.1, state: OK, symbol: null} @@ -103,12 +96,5 @@ self.failUnless(errors) - def testArchitectureSanity(self): - self.pkg_data_2["pkginfo"] = {} - self.pkg_data_2["pkginfo"]["ARCH"] = "i386" - errors = pc.ArchitectureSanity(self.pkg_data_2, False) - self.failUnless(errors) - - if __name__ == '__main__': unittest.main() Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-14 11:11:22 UTC (rev 9157) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-14 11:12:57 UTC (rev 9158) @@ -174,5 +174,24 @@ self.error_mgr_mock.ReportError('depends-on-self') +class TestCheckArchitectureSanity(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckArchitectureSanity' + def CheckpkgTest(self): + self.pkg_data["pkginfo"]["ARCH"] = "i386" + self.error_mgr_mock.ReportError('srv4-filename-architecture-mismatch', 'i386') + +class TestCheckArchitectureVsContents(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckArchitectureVsContents' + def CheckpkgTest(self): + # TODO: Update this. + # self.pkg_data["pkgmap"] = self.LoadData("example-1-pkgmap") + # self.pkg_data["binaries"] = [] + # self.pkg_data["pkginfo"] = self.LoadData("example-1-pkginfo") + # errors = pc.CheckArchitectureVsContents(self.pkg_data_2, False) + # self.failIf(errors) + pass + + + if __name__ == '__main__': unittest.main() 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 Mar 14 12:11:22 2010 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sun, 14 Mar 2010 11:11:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[9157] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 9157 http://gar.svn.sourceforge.net/gar/?rev=9157&view=rev Author: aigoshin Date: 2010-03-14 11:11:22 +0000 (Sun, 14 Mar 2010) Log Message: ----------- nginx: package release 20100314 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2010-03-14 11:03:53 UTC (rev 9156) +++ csw/mgar/pkg/nginx/trunk/Makefile 2010-03-14 11:11:22 UTC (rev 9157) @@ -70,8 +70,8 @@ include gar/category.mk post-configure-modulated: - gsed -i s#/...ISALIST#/'$$ISALIST'# $(WORKSRC)/objs/ngx_auto_config.h - gsed -i s#/ pause#/ rep; nop# $(WORKSRC)/src/os/unix/ngx_sunpro_amd64.il + gsed -i s#/...ISALIST#/'$$ISALIST'# $(WORKSRC)/objs/ngx_auto_config.h + gsed -i 's# pause# rep; nop#' $(WORKSRC)/src/os/unix/ngx_sunpro_amd64.il $(MAKECOOKIE) post-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 14 13:06:40 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 14 Mar 2010 12:06:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[9159] csw/mgar/pkg/liblqr/trunk/Makefile Message-ID: Revision: 9159 http://gar.svn.sourceforge.net/gar/?rev=9159&view=rev Author: hson Date: 2010-03-14 12:06:40 +0000 (Sun, 14 Mar 2010) Log Message: ----------- liblqr: Remove checkpkg overrides no longer needed, general cleanup of Makefile Modified Paths: -------------- csw/mgar/pkg/liblqr/trunk/Makefile Modified: csw/mgar/pkg/liblqr/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblqr/trunk/Makefile 2010-03-14 11:12:57 UTC (rev 9158) +++ csw/mgar/pkg/liblqr/trunk/Makefile 2010-03-14 12:06:40 UTC (rev 9159) @@ -14,8 +14,8 @@ CATALOGNAME_CSWliblqr = liblqr CATALOGNAME_CSWliblqrdevel = liblqr_devel -SPKG_DESC_CSWliblqr += A seam-carving C/C++ library called Liquid Rescale -SPKG_DESC_CSWliblqrdevel += A seam-carving C/C++ library called Liquid Rescale - developer package +SPKG_DESC_CSWliblqr += $(DESCRIPTION) +SPKG_DESC_CSWliblqrdevel += $(DESCRIPTION) - developer package RUNTIME_DEP_PKGS_CSWliblqr += CSWggettextrt RUNTIME_DEP_PKGS_CSWliblqr += CSWglib2 @@ -23,16 +23,10 @@ PKGFILES_CSWliblqrdevel = $(PKGFILES_DEVEL) -# Some symbols seems to be missing for some strange reason -CHECKPKG_OVERRIDES_CSWliblqr += symbol-not-found|liblqr-1.so.0.3.1 -CHECKPKG_OVERRIDES_CSWliblqr += symbol-not-found|liblqr-1.so.0.3.1 - SPKG_SOURCEURL = http://liblqr.wikidot.com/ -#LICENSE = flashpix.h +DOCFILES = AUTHORS BUGS COPYING COPYING.LESSER ChangeLog NEWS README TODO -#DOCFILES = AUTHORS ChangeLog NEWS README - UFILES_REGEX = $(GARNAME)-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) 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 Mar 14 14:50:10 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Mar 2010 13:50:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9160] csw/mgar/pkg/magit/trunk/Makefile Message-ID: Revision: 9160 http://gar.svn.sourceforge.net/gar/?rev=9160&view=rev Author: bdwalton Date: 2010-03-14 13:50:10 +0000 (Sun, 14 Mar 2010) Log Message: ----------- magit: use correct upstream repo Modified Paths: -------------- csw/mgar/pkg/magit/trunk/Makefile Modified: csw/mgar/pkg/magit/trunk/Makefile =================================================================== --- csw/mgar/pkg/magit/trunk/Makefile 2010-03-14 12:06:40 UTC (rev 9159) +++ csw/mgar/pkg/magit/trunk/Makefile 2010-03-14 13:50:10 UTC (rev 9160) @@ -1,6 +1,6 @@ GARNAME = magit GARVERSION = 0.7 -PATCHLEVEL = 57f299 +PATCHLEVEL = magit_0.7 CATEGORIES = utils ARCHALL = 1 @@ -14,7 +14,7 @@ BUILD_DEP_PKGS = CSWautoconf CSWautomake CSWtexinfo CSWemacs RUNTIME_DEP_PKGS = CSWgit CSWemacscommon -GIT_REPOS = git://github.com/technomancy/magit.git +GIT_REPOS = git://gitorious.org/magit/magit.git GIT_TREEISH = $(PATCHLEVEL) # We define upstream file regex so we can be notifed of new upstream 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 Mar 14 14:53:31 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Mar 2010 13:53:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9161] csw/mgar/pkg/magit/trunk/Makefile Message-ID: Revision: 9161 http://gar.svn.sourceforge.net/gar/?rev=9161&view=rev Author: bdwalton Date: 2010-03-14 13:53:31 +0000 (Sun, 14 Mar 2010) Log Message: ----------- magit: add a few extra files to the $docdir Modified Paths: -------------- csw/mgar/pkg/magit/trunk/Makefile Modified: csw/mgar/pkg/magit/trunk/Makefile =================================================================== --- csw/mgar/pkg/magit/trunk/Makefile 2010-03-14 13:50:10 UTC (rev 9160) +++ csw/mgar/pkg/magit/trunk/Makefile 2010-03-14 13:53:31 UTC (rev 9161) @@ -34,5 +34,8 @@ # When CSWemacs sprouts a nice auto-startup facility like Redhat or # Debian, remove this... post-install-modulated: + @(cd $(WORKSRC); \ + mkdir -p $(DESTDIR)/$(docdir)/$(GARNAME); \ + cp README AUTHORS NEWS $(DESTDIR)/$(docdir)/$(GARNAME) ) @(cd $(DESTDIR); rm -rf opt/csw/etc ) @$(MAKECOOKIE) 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 Mar 14 15:33:42 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Mar 2010 14:33:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[9162] csw/mgar/pkg/magit/trunk/Makefile Message-ID: Revision: 9162 http://gar.svn.sourceforge.net/gar/?rev=9162&view=rev Author: bdwalton Date: 2010-03-14 14:33:42 +0000 (Sun, 14 Mar 2010) Log Message: ----------- magit: remove info/dir file Modified Paths: -------------- csw/mgar/pkg/magit/trunk/Makefile Modified: csw/mgar/pkg/magit/trunk/Makefile =================================================================== --- csw/mgar/pkg/magit/trunk/Makefile 2010-03-14 13:53:31 UTC (rev 9161) +++ csw/mgar/pkg/magit/trunk/Makefile 2010-03-14 14:33:42 UTC (rev 9162) @@ -37,5 +37,5 @@ @(cd $(WORKSRC); \ mkdir -p $(DESTDIR)/$(docdir)/$(GARNAME); \ cp README AUTHORS NEWS $(DESTDIR)/$(docdir)/$(GARNAME) ) - @(cd $(DESTDIR); rm -rf opt/csw/etc ) + @(cd $(DESTDIR); rm -rf opt/csw/etc opt/csw/share/info/dir ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 14 15:38:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 14 Mar 2010 14:38:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9163] csw/mgar/gar/v2 Message-ID: Revision: 9163 http://gar.svn.sourceforge.net/gar/?rev=9163&view=rev Author: wahwah Date: 2010-03-14 14:38:43 +0000 (Sun, 14 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, removed old API tests, moved all Python checks to a separate executable. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg_run_modules.py Removed Paths: ------------- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-auto.py csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-you-can-write-your-own.py csw/mgar/gar/v2/lib/python/package_checks_old.py csw/mgar/gar/v2/lib/python/package_checks_old_test.py Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-03-14 14:33:42 UTC (rev 9162) +++ csw/mgar/gar/v2/bin/checkpkg 2010-03-14 14:38:43 UTC (rev 9163) @@ -339,6 +339,20 @@ fi done +# This check is special; it uses one executable for all the checks written in Python. +printf "${BOLD}${module_name_format}${COLOR_RESET} running..." "Python tests" +${command_basedir}/checkpkg_run_modules.py \ + ${extra_options} \ + -b "${checkpkg_stats_basedir}" \ + -o "${EXTRACTDIR}/tags.python-checks" \ + ${md5sums} +if [[ "$?" -ne 0 ]]; then + printf "\r${module_name_format} ${RED}[ERROR]${COLOR_RESET} \\n" "${plugin_name}" + test_suite_ok=0 +else + printf "\r${module_name_format} [Done] \\n" "${plugin_name}" +fi + if [[ ${test_suite_ok} -ne 1 ]]; then errmsg "One or more modular tests have finished with an error." else Copied: csw/mgar/gar/v2/bin/checkpkg_run_modules.py (from rev 9153, csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-auto.py) =================================================================== --- csw/mgar/gar/v2/bin/checkpkg_run_modules.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg_run_modules.py 2010-03-14 14:38:43 UTC (rev 9163) @@ -0,0 +1,46 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""This script runs all the checks written in Python.""" + +import logging +import os.path +import sys +import re + +CHECKPKG_MODULE_NAME = "Second checkpkg API version" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + + +def main(): + options, args = checkpkg.GetOptions() + if options.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) + md5sums = args + # CheckpkgManager2 class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager2(CHECKPKG_MODULE_NAME, + options.stats_basedir, + md5sums, + options.debug) + # Running the checks, reporting and exiting. + exit_code, screen_report, tags_report = check_manager.Run() + f = open(options.output, "w") + f.write(tags_report) + f.close() + if screen_report: + sys.stdout.write(screen_report) + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Deleted: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-auto.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-auto.py 2010-03-14 14:33:42 UTC (rev 9162) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-auto.py 2010-03-14 14:38:43 UTC (rev 9163) @@ -1,48 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""This is a dummy check. You can use it as a boilerplate for your own checks. - -Copy it and modify. -""" - -import logging -import os.path -import sys -import re - -CHECKPKG_MODULE_NAME = "Second checkpkg API version" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import opencsw - - -def main(): - options, args = checkpkg.GetOptions() - if options.debug: - logging.basicConfig(level=logging.DEBUG) - else: - logging.basicConfig(level=logging.INFO) - md5sums = args - # CheckpkgManager2 class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager2(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - # Running the checks, reporting and exiting. - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Deleted: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py 2010-03-14 14:33:42 UTC (rev 9162) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-basic.py 2010-03-14 14:38:43 UTC (rev 9163) @@ -1,46 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""This is a dummy module. You can use it as a boilerplate for your own modules. - -Copy it and modify. -""" - -import os.path -import sys - -CHECKPKG_MODULE_NAME = "basic checks ported from Korn shell" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import package_checks_old - -def main(): - options, args = checkpkg.GetOptions() - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - # Registering functions defined above. - check_manager.RegisterIndividualCheck(package_checks_old.FileNameSanity) - check_manager.RegisterIndividualCheck(package_checks_old.PkginfoSanity) - check_manager.RegisterIndividualCheck(package_checks_old.CheckBuildingUser) - check_manager.RegisterIndividualCheck(package_checks_old.CheckPkgmapPaths) - # Running the checks, reporting and exiting. - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Deleted: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-you-can-write-your-own.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-03-14 14:33:42 UTC (rev 9162) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-03-14 14:38:43 UTC (rev 9163) @@ -1,84 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""This is a dummy module. You can use it as a boilerplate for your own modules. - -Copy it and modify. -""" - -import os.path -import sys - -CHECKPKG_MODULE_NAME = "a template of a checkpkg module" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg - -# Defining the checking functions. They come in two flavors: individual -# package checks and set checks. - -def MyCheckForAsinglePackage(pkg_data, debug): - """Checks an individual package. - - Gets a DirctoryFormatPackage as an argument, and returns a list of errors. - - Errors should be a list of checkpkg.CheckpkgTag objects: - errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "tag-name")) - - You can also add a parameter: - errors.append(checkpkg.CheckpkgTag(pkg.pkgname, "tag-name", "/opt/csw/bin/problem")) - """ - errors = [] - # Checking code for an individual package goes here. See the - # DirectoryFormatPackage class in lib/python/opencsw.py for the available - # APIs. - - # Here's how to report an error: - something_is_wrong = False - if something_is_wrong: - errors.append(checkpkg.CheckpkgTag( - pkg_data["basic_stats"]["pkgname"], - "example-problem", "thing")) - return errors - - -def MyCheckForAsetOfPackages(pkgs_data, debug): - """Checks a set of packages. - - Sometimes individual checks aren't enough. If you need to write code which - needs to examine multiple packages at the same time, use this function. - - Gets a list of packages, returns a list of errors. - """ - errors = [] - # Checking code goes here. - return errors - - -def main(): - options, args = checkpkg.GetOptions() - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - # Registering functions defined above. - check_manager.RegisterIndividualCheck(MyCheckForAsinglePackage) - check_manager.RegisterSetCheck(MyCheckForAsetOfPackages) - # Running the checks, reporting and exiting. - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-14 14:33:42 UTC (rev 9162) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-14 14:38:43 UTC (rev 9163) @@ -786,34 +786,6 @@ return (exit_code, screen_report, tags_report) -class CheckpkgManager(CheckpkgManagerBase): - """Takes care of calling checking functions. - - This is an old API as of 2010-02-28. - """ - def RegisterIndividualCheck(self, function): - self.individual_checks.append(function) - - def RegisterSetCheck(self, function): - self.set_checks.append(function) - - def GetAllTags(self, packages_data): - errors = {} - for pkg_data in packages_data: - for function in self.individual_checks: - all_stats = pkg_data.GetAllStats() - errors_for_pkg = function(all_stats, debug=self.debug) - if errors_for_pkg: - errors[all_stats["basic_stats"]["pkgname"]] = errors_for_pkg - # Set checks - for function in self.set_checks: - set_errors = function([x.GetAllStats() for x in packages_data], - debug=self.debug) - if set_errors: - errors = self.SetErrorsToDict(set_errors, errors) - return errors - - class CheckInterfaceBase(object): """Base class for check proxies. Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-14 14:33:42 UTC (rev 9162) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-14 14:38:43 UTC (rev 9163) @@ -39,8 +39,16 @@ }, } ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)") +MAX_CATALOGNAME_LENGTH = 20 +MAX_PKGNAME_LENGTH = 20 +ARCH_LIST = ["sparc", "i386", "all"] +VERSION_RE = r".*,REV=(20[01][0-9]\.[0-9][0-9]\.[0-9][0-9]).*" +ONLY_ALLOWED_IN_PKG = { + "CSWcommon": ("/opt", ) +} + def CatalognameLowercase(pkg_data, error_mgr, logger): catalogname = pkg_data["basic_stats"]["catalogname"] if catalogname != catalogname.lower(): @@ -235,7 +243,9 @@ "orphan_sonames": orphan_sonames, } t = Template.Template(checkpkg.REPORT_TMPL, searchList=[namespace]) - print unicode(t) + report = unicode(t) + if report.strip(): + print report for soname in orphan_sonames: error_mgr.ReportError(pkgname, "orphan-soname", soname) for missing_dep in missing_deps: @@ -347,3 +357,143 @@ logger.info("ARCHALL_%s = 1", pkgname) logger.info("However, be aware that there might be other reasons " "to keep it architecture-specific.") + +def CheckFileNameSanity(pkg_data, error_mgr, logger): + basic_stats = pkg_data["basic_stats"] + revision_info = basic_stats["parsed_basename"]["revision_info"] + catalogname = pkg_data["basic_stats"]["catalogname"] + pkgname = pkg_data["basic_stats"]["pkgname"] + if "REV" not in revision_info: + error_mgr.ReportError("rev-tag-missing-in-filename") + if len(catalogname) > MAX_CATALOGNAME_LENGTH: + error_mgr.ReportError("catalogname-too-long") + if len(pkgname) > MAX_PKGNAME_LENGTH: + error_mgr.ReportError("pkgname-too-long") + if basic_stats["parsed_basename"]["osrel"] == "unspecified": + error_mgr.ReportError("osrel-tag-not-specified") + + +def CheckPkginfoSanity(pkg_data, error_mgr, logger): + """pkginfo sanity checks. + +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 + +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` + +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 + """ + catalogname = pkg_data["basic_stats"]["catalogname"] + pkgname = pkg_data["basic_stats"]["pkgname"] + pkginfo = pkg_data["pkginfo"] + if not catalogname: + error_mgr.ReportError("pkginfo-empty-catalogname") + if not pkgname: + error_mgr.ReportError("pkginfo-empty-pkgname") + if not "VERSION" in pkginfo or not pkginfo["VERSION"]: + error_mgr.ReportError("pkginfo-version-field-missing") + # maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE` + maintname = checkpkg.ExtractMaintainerName(pkginfo) + if not maintname: + error_mgr.ReportError("pkginfo-maintainer-name-not-set") + # email + if not pkginfo["EMAIL"]: + error_mgr.ReportError("pkginfo-blank-email") + # hotline + if not pkginfo["HOTLINE"]: + error_mgr.ReportError("pkginfo-hotline-blank") + pkginfo_version = pkg_data["basic_stats"]["parsed_basename"]["full_version_string"] + if pkginfo_version != pkginfo["VERSION"]: + error_mgr.ReportError("filename-version-does-not-match-pkginfo-version") + if re.search(r"-", pkginfo["VERSION"]): + error_mgr.ReportError("pkginfo-minus-in-version") + if not re.match(VERSION_RE, pkginfo["VERSION"]): + msg = ("Version regex: %s, version value: %s." + % (repr(VERSION_RE), repr(pkginfo["VERSION"]))) + error_mgr.ReportError("pkginfo-version-wrong-format", msg) + if pkginfo["ARCH"] not in ARCH_LIST: + error_mgr.ReportError("pkginfo-nonstandard-architecture", pkginfo["ARCH"]) + if "PSTAMP" in pkginfo: + if not re.match(checkpkg.PSTAMP_RE, pkginfo["PSTAMP"]): + msg=("It should be 'username at hostname-timestamp', " + "but it's %s." % repr(pkginfo["PSTAMP"])) + error_mgr.ReportError("pkginfo-pstamp-in-wrong-format", pkginfo["PSTAMP"], msg) + else: + error_mgr.ReportError("pkginfo-pstamp-missing") + + +def DisabledCheckMissingSymbols(pkgs_data, error_mgr, logger): + """Analyzes missing symbols reported by ldd -r. + + 1. Collect triplets: pkgname, binary, missing symbol + 2. If there are any missing symbols, collect all the symbols that are provided + by the set of packages. + 3. From the list of missing symbols, remove all symbols that are provided + by the set of packages. + 4. Report any remaining symbols as errors. + + What indexes do we need? + + symbol -> (pkgname, binary) + set(allsymbols) + """ + missing_symbols = [] + all_symbols = set() + for pkg_data in pkgs_data: + pkgname = pkg_data["basic_stats"]["pkgname"] + binaries = pkg_data["binaries"] + for binary in binaries: + for ldd_elem in pkg_data["ldd_dash_r"][binary]: + if ldd_elem["state"] == "symbol-not-found": + missing_symbols.append((pkgname, + binary, + ldd_elem["symbol"])) + for symbol in pkg_data["defined_symbols"][binary]: + all_symbols.add(symbol) + # Remove symbols defined elsewhere. + while missing_symbols: + ms_pkgname, ms_binary, ms_symbol = missing_symbols.pop() + if ms_symbol not in all_symbols: + error_mgr.ReportError("symbol-not-found", "%s %s" % (ms_binary, ms_symbol)) + + +def CheckBuildingUser(pkg_data, error_mgr, logger): + pkgname = pkg_data["basic_stats"]["pkgname"] + username = checkpkg.ExtractBuildUsername(pkg_data["pkginfo"]) + for entry in pkg_data["pkgmap"]: + if entry["user"] and entry["user"] == username: + error_mgr.ReportError("file-owned-by-building-user" + "%s, %s" % (entry["path"], entry["user"])) + + +def CheckPkgmapPaths(pkg_data, error_mgr, logger): + pkgname = pkg_data["basic_stats"]["pkgname"] + pkg_paths = set([x["path"] for x in pkg_data["pkgmap"]]) + for allowed_pkgname in ONLY_ALLOWED_IN_PKG: + for disallowed_path in ONLY_ALLOWED_IN_PKG[allowed_pkgname]: + if disallowed_path in pkg_paths and pkgname != allowed_pkgname: + error_mgr.ReportError("disallowed-path", disallowed_path) Deleted: csw/mgar/gar/v2/lib/python/package_checks_old.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_old.py 2010-03-14 14:33:42 UTC (rev 9162) +++ csw/mgar/gar/v2/lib/python/package_checks_old.py 2010-03-14 14:38:43 UTC (rev 9163) @@ -1,187 +0,0 @@ -#!/opt/csw/bin/python2.6 -# coding=utf-8 -# $Id$ - -"""This module uses an old API. Please do not add new checks here.""" - -import checkpkg -import re - -MAX_CATALOGNAME_LENGTH = 20 -MAX_PKGNAME_LENGTH = 20 -ARCH_LIST = ["sparc", "i386", "all"] -VERSION_RE = r".*,REV=(20[01][0-9]\.[0-9][0-9]\.[0-9][0-9]).*" -ONLY_ALLOWED_IN_PKG = { - "CSWcommon": ("/opt", "",) -} - -def FileNameSanity(pkg_data, debug): - errors = [] - basic_stats = pkg_data["basic_stats"] - revision_info = basic_stats["parsed_basename"]["revision_info"] - catalogname = pkg_data["basic_stats"]["catalogname"] - pkgname = pkg_data["basic_stats"]["pkgname"] - if "REV" not in revision_info: - errors.append(checkpkg.CheckpkgTag( - pkgname, "rev-tag-missing-in-filename")) - if len(catalogname) > MAX_CATALOGNAME_LENGTH: - errors.append(checkpkg.CheckpkgTag( - pkgname, "catalogname-too-long")) - if len(pkgname) > MAX_PKGNAME_LENGTH: - errors.append(checkpkg.CheckpkgTag( - pkgname, "pkgname-too-long")) - if basic_stats["parsed_basename"]["osrel"] == "unspecified": - errors.append(checkpkg.CheckpkgTag( - pkgname, "osrel-tag-not-specified")) - return errors - - -def PkginfoSanity(pkg_data, debug): - """pkginfo sanity checks. - -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 - -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` - -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 - """ - errors = [] - catalogname = pkg_data["basic_stats"]["catalogname"] - pkgname = pkg_data["basic_stats"]["pkgname"] - pkginfo = pkg_data["pkginfo"] - if not catalogname: - errors.append(checkpkg.CheckpkgTag( - pkgname, "empty-catalogname")) - if not pkgname: - errors.append(checkpkg.CheckpkgTag( - pkgname, "empty-pkgname")) - if not "VERSION" in pkginfo or not pkginfo["VERSION"]: - errors.append(checkpkg.CheckpkgTag( - pkgname, "pkginfo-version-field-missing")) - # maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE` - maintname = checkpkg.ExtractMaintainerName(pkginfo) - if not maintname: - errors.append(checkpkg.CheckpkgTag( - pkgname, "pkginfo-maintainer-name-not-set")) - # email - if not pkginfo["EMAIL"]: - errors.append(checkpkg.CheckpkgTag( - pkgname, "pkginfo-blank-email")) - # hotline - if not pkginfo["HOTLINE"]: - errors.append(checkpkg.CheckpkgTag( - pkgname, "pkginfo-hotline-blank")) - pkginfo_version = pkg_data["basic_stats"]["parsed_basename"]["full_version_string"] - if pkginfo_version != pkginfo["VERSION"]: - errors.append(checkpkg.CheckpkgTag( - pkgname, "filename-version-does-not-match-pkginfo-version")) - if re.search(r"-", pkginfo["VERSION"]): - errors.append(checkpkg.CheckpkgTag( - pkgname, "pkginfo-minus-in-version")) - if not re.match(VERSION_RE, pkginfo["VERSION"]): - msg = ("Version regex: %s, version value: %s." - % (repr(VERSION_RE), repr(pkginfo["VERSION"]))) - errors.append(checkpkg.CheckpkgTag( - pkgname, "pkginfo-version-wrong-format", msg=msg)) - if pkginfo["ARCH"] not in ARCH_LIST: - errors.append(checkpkg.CheckpkgTag( - pkgname, "pkginfo-nonstandard-architecture", pkginfo["ARCH"])) - if "PSTAMP" in pkginfo: - if not re.match(checkpkg.PSTAMP_RE, pkginfo["PSTAMP"]): - errors.append(checkpkg.CheckpkgTag( - pkgname, "pkginfo-pstamp-in-wrong-format", - pkginfo["PSTAMP"], - msg=("It should be 'username at hostname-timestamp', " - "but it's %s." % repr(pkginfo["PSTAMP"])))) - else: - errors.append(checkpkg.CheckpkgTag( - pkgname, "pkginfo-pstamp-missing")) - return errors - - -def CheckForMissingSymbols(pkgs_data, debug): - """Analyzes missing symbols reported by ldd -r. - - 1. Collect triplets: pkgname, binary, missing symbol - 2. If there are any missing symbols, collect all the symbols that are provided - by the set of packages. - 3. From the list of missing symbols, remove all symbols that are provided - by the set of packages. - 4. Report any remaining symbols as errors. - - What indexes do we need? - - symbol -> (pkgname, binary) - set(allsymbols) - """ - errors = [] - missing_symbols = [] - all_symbols = set() - for pkg_data in pkgs_data: - pkgname = pkg_data["basic_stats"]["pkgname"] - binaries = pkg_data["binaries"] - for binary in binaries: - for ldd_elem in pkg_data["ldd_dash_r"][binary]: - if ldd_elem["state"] == "symbol-not-found": - missing_symbols.append((pkgname, - binary, - ldd_elem["symbol"])) - for symbol in pkg_data["defined_symbols"][binary]: - all_symbols.add(symbol) - # Remove symbols defined elsewhere. - while missing_symbols: - ms_pkgname, ms_binary, ms_symbol = missing_symbols.pop() - if ms_symbol not in all_symbols: - errors.append(checkpkg.CheckpkgTag( - ms_pkgname, "symbol-not-found", "%s %s" % (ms_binary, ms_symbol))) - return errors - - -def CheckBuildingUser(pkg_data, debug): - errors = [] - pkgname = pkg_data["basic_stats"]["pkgname"] - username = checkpkg.ExtractBuildUsername(pkg_data["pkginfo"]) - for entry in pkg_data["pkgmap"]: - if entry["user"] and entry["user"] == username: - errors.append(checkpkg.CheckpkgTag( - pkgname, - "file-owned-by-building-user", - "%s, %s" % (entry["path"], entry["user"]))) - return errors - -def CheckPkgmapPaths(pkg_data, debug): - errors = [] - username = checkpkg.ExtractBuildUsername(pkg_data["pkginfo"]) - for entry in pkg_data["pkgmap"]: - file_path = entry["path"] - if file_path == "/opt": - errors.append(checkpkg.CheckpkgTag( - pkgname, - ("wrong-path-in-pkgmap", file_path))) - return errors - Deleted: csw/mgar/gar/v2/lib/python/package_checks_old_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_old_test.py 2010-03-14 14:33:42 UTC (rev 9162) +++ csw/mgar/gar/v2/lib/python/package_checks_old_test.py 2010-03-14 14:38:43 UTC (rev 9163) @@ -1,100 +0,0 @@ -#!/opt/csw/bin/python2.6 -# coding=utf-8 -# $Id$ - -import unittest -import package_checks_old as pc -import yaml -import os.path - -BASE_DIR = os.path.dirname(__file__) -TESTDATA_DIR = os.path.join(BASE_DIR, "testdata") - -class PackageChecksUnitTest(unittest.TestCase): - - def setUp(self): - self.pkg_data_1 = { - "basic_stats": { - "pkgname": "CSWfoo" - } - } - self.pkg_data_2 = { - 'basic_stats': { - 'parsed_basename': - {'revision_info': {'REV': '2010.02.15'}, - 'catalogname': 'python_tk', - 'full_version_string': '2.6.4,REV=2010.02.15', - 'version': '2.6.4', - 'version_info': { - 'minor version': '6', - 'major version': '2', - 'patchlevel': '4'}, - 'osrel': 'SunOS5.8', - 'arch': 'sparc', - 'vendortag': 'CSW', - }, - 'pkgname': 'CSWpython-tk', - 'stats_version': 1, - 'pkg_basename': 'python_tk-2.6.4,REV=2010.02.15-SunOS5.8-sparc-CSW.pkg.gz', - 'pkg_path': '/tmp/pkg_lL0HDH/python_tk-2.6.4,REV=2010.02.15-SunOS5.8-sparc-CSW.pkg.gz', - 'catalogname': 'python_tk'}} - - def LoadData(self, name): - file_name = os.path.join(TESTDATA_DIR, "%s.yml" % name) - f = open(file_name, "rb") - data = yaml.safe_load(f) - f.close() - return data - - def testFileNameSanity(self): - del(self.pkg_data_2["basic_stats"]["parsed_basename"]["revision_info"]["REV"]) - errors = pc.FileNameSanity(self.pkg_data_2, False) - self.failUnless(errors) - - def testCheckForMissingSymbols(self): - ldd_dash_r_yml = """opt/csw/lib/postgresql/8.4/_int.so: -- {path: /usr/lib/libc.so.1, soname: libc.so.1, state: OK, symbol: null} -- {path: /usr/lib/libdl.so.1, soname: libdl.so.1, state: OK, symbol: null} -- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, - state: symbol-not-found, symbol: CurrentMemoryContext} -- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, - state: symbol-not-found, symbol: MemoryContextAlloc} -- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, - state: symbol-not-found, symbol: errstart} -- {path: /tmp/pkg_W8UcnK/CSWlibpq-84/root/opt/csw/lib/postgresql/8.4/_int.so, soname: null, - state: symbol-not-found, symbol: errcode} -opt/csw/lib/postgresql/8.4/_int2.so: -- {path: /usr/lib/libdl.so.1, soname: libdl.so.1, state: OK, symbol: null}""" - defined_symbols_yml = """opt/csw/lib/postgresql/8.4/_int.so: [Pg_magic_func, _fini, _init, _int_contained, - _int_contains, _int_different, _int_inter, _int_overlap, _int_same, _int_union, - _int_unique, _intbig_in, _intbig_out, boolop, bqarr_in, bqarr_out, compASC, compDESC, - copy_intArrayType, execconsistent, g_int_compress, g_int_consistent, g_int_decompress, - g_int_penalty, g_int_picksplit, g_int_same, g_int_union, g_intbig_compress, g_intbig_consistent, - g_intbig_decompress, g_intbig_penalty, g_intbig_picksplit, g_intbig_same, g_intbig_union, - gensign, ginconsistent, ginint4_consistent, ginint4_queryextract, icount, idx, inner_int_contains, - inner_int_inter, inner_int_overlap, inner_int_union, int_to_intset, intarray_add_elem, - intarray_concat_arrays, intarray_del_elem, intarray_match_first, intarray_push_array, - intarray_push_elem, internal_size, intset, intset_subtract, intset_union_elem, isort, - new_intArrayType, pg_finfo__int_contained, pg_finfo__int_contains, pg_finfo__int_different, - pg_finfo__int_inter, pg_finfo__int_overlap, pg_finfo__int_same, pg_finfo__int_union, - pg_finfo__intbig_in, pg_finfo__intbig_out, pg_finfo_boolop, pg_finfo_bqarr_in, pg_finfo_bqarr_out, - pg_finfo_g_int_compress, pg_finfo_g_int_consistent, pg_finfo_g_int_decompress, pg_finfo_g_int_penalty, - pg_finfo_g_int_picksplit, pg_finfo_g_int_same, pg_finfo_g_int_union, pg_finfo_g_intbig_compress, - pg_finfo_g_intbig_consistent, pg_finfo_g_intbig_decompress, pg_finfo_g_intbig_penalty, - pg_finfo_g_intbig_picksplit, pg_finfo_g_intbig_same, pg_finfosc, subarray, uniq] -opt/csw/lib/postgresql/8.4/adminpack.so: [Pg_magic_func, _fini, _init, pg_file_rename, - pg_file_unlink, pg_file_write, pg_finfo_pg_file_rename, pg_finfo_pg_file_unlink, - pg_finfo_pg_file_write, pg_finfo_pg_logdir_ls, pg_logdir_ls] -opt/csw/lib/postgresql/8.4/_int2.so: [] - """ - - self.pkg_data_2["ldd_dash_r"] = yaml.safe_load(ldd_dash_r_yml) - self.pkg_data_2["defined_symbols"] = yaml.safe_load(defined_symbols_yml) - self.pkg_data_2["binaries"] = ["opt/csw/lib/postgresql/8.4/_int.so", - "opt/csw/lib/postgresql/8.4/_int2.so"] - errors = pc.CheckForMissingSymbols([self.pkg_data_2], False) - self.failUnless(errors) - - -if __name__ == '__main__': - unittest.main() Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-14 14:33:42 UTC (rev 9162) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-14 14:38:43 UTC (rev 9163) @@ -191,6 +191,11 @@ # self.failIf(errors) pass +class TestCheckFileNameSanity(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckFileNameSanity' + def CheckpkgTest(self): + del(self.pkg_data["basic_stats"]["parsed_basename"]["revision_info"]["REV"]) + self.error_mgr_mock.ReportError('rev-tag-missing-in-filename') if __name__ == '__main__': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 14 15:46:59 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 14 Mar 2010 14:46:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[9164] csw/mgar/pkg/ImageMagick/branches/package-split/ Makefile Message-ID: Revision: 9164 http://gar.svn.sourceforge.net/gar/?rev=9164&view=rev Author: hson Date: 2010-03-14 14:46:59 +0000 (Sun, 14 Mar 2010) Log Message: ----------- imagemagick: Update description to fit within 100 chars, fix dependencies Modified Paths: -------------- csw/mgar/pkg/ImageMagick/branches/package-split/Makefile Modified: csw/mgar/pkg/ImageMagick/branches/package-split/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/branches/package-split/Makefile 2010-03-14 14:38:43 UTC (rev 9163) +++ csw/mgar/pkg/ImageMagick/branches/package-split/Makefile 2010-03-14 14:46:59 UTC (rev 9164) @@ -3,7 +3,7 @@ GARSUBREV = 5 CATEGORIES = lib -DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images +DESCRIPTION = A software suite to create, edit, and compose bitmap images define BLURB ImageMagick is a robust collection of tools and libraries offered under a usage license to read, write, and manipulate an image in many image formats @@ -19,12 +19,14 @@ CATALOGNAME_CSWpmimagemagick = pm_imagemagick SPKG_DESC_CSWimagemagick = $(DESCRIPTION) SPKG_DESC_CSWimagemagickdev = $(DESCRIPTION) - development package -SPKG_DESC_CSWimagemagickdoc = $(DESCRIPTION) - documentation package +SPKG_DESC_CSWimagemagickdoc = $(DESCRIPTION) - documentation SPKG_DESC_CSWimagemagickrt = $(DESCRIPTION) - runtime package SPKG_DESC_CSWpmimagemagick = $(DESCRIPTION) - perl module PKGFILES_CSWimagemagickdev = $(PKGFILES_DEVEL) PKGFILES_CSWimagemagickrt = $(PKGFILES_RT) +PKGFILES_CSWimagemagickrt += $(call baseisadirs,$(libdir),ImageMagick.*) +PKGFILES_CSWimagemagickrt += $(sharedstatedir)/ImageMagick.* PKGFILES_CSWimagemagickdoc = $(docdir)/ImageMagick.* PKGFILES_CSWpmimagemagick = $(libdir)/perl/.* @@ -39,17 +41,48 @@ LICENSE = LICENSE +RUNTIME_DEP_PKGS_CSWimagemagick += CSWbzip2 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWfconfig +RUNTIME_DEP_PKGS_CSWimagemagick += CSWftype2 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWimagemagickrt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWjpeg +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibice +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibsm +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibtoolrt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibx11 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxext +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiffrt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWzlib + RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWbzip2 +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWdjvulibrert RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWfconfig RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWftype2 +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWggettextrt +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWglib2 +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWgraphviz +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWgs +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWgtk2 +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWilmbase +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWjasper +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWjbigkit RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWjpeg RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibcairo +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibfpx RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibice +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibrsvg RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibsm RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibtoolrt +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibwmf RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibx11 RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibxext +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibxml2 RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWlibxt +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWopenexrrt +RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWpng RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWsunmath RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWtiffrt RUNTIME_DEP_PKGS_CSWimagemagickrt += CSWzlib @@ -57,39 +90,6 @@ RUNTIME_DEP_PKGS_CSWpmimagemagick += CSWimagemagickrt RUNTIME_DEP_PKGS_CSWpmimagemagick += CSWperl -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcairo -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg -RUNTIME_DEP_PKGS_CSWimagemagick += CSWimagemagickrt -RUNTIME_DEP_PKGS_CSWimagemagick += CSWopenexrrt -RUNTIME_DEP_PKGS_CSWimagemagick += CSWbzip2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWdjvulibrert -RUNTIME_DEP_PKGS_CSWimagemagick += CSWfconfig -RUNTIME_DEP_PKGS_CSWimagemagick += CSWftype2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWggettextrt -RUNTIME_DEP_PKGS_CSWimagemagick += CSWglib2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWgraphviz -RUNTIME_DEP_PKGS_CSWimagemagick += CSWgs -RUNTIME_DEP_PKGS_CSWimagemagick += CSWgtk2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWilmbase -RUNTIME_DEP_PKGS_CSWimagemagick += CSWjasper -RUNTIME_DEP_PKGS_CSWimagemagick += CSWjbigkit -RUNTIME_DEP_PKGS_CSWimagemagick += CSWjpeg -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlcmsrt -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfpx -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibice -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibsm -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibtoolrt -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmf -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibx11 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxext -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxt -RUNTIME_DEP_PKGS_CSWimagemagick += CSWperl -RUNTIME_DEP_PKGS_CSWimagemagick += CSWpng -RUNTIME_DEP_PKGS_CSWimagemagick += CSWsunmath -RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiffrt -RUNTIME_DEP_PKGS_CSWimagemagick += CSWzlib - CHECKPKG_OVERRIDES_CSWimagemagickdev += missing-dependency|CSWimagemagick # 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 hson at users.sourceforge.net Sun Mar 14 16:27:13 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 14 Mar 2010 15:27:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9165] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 9165 http://gar.svn.sourceforge.net/gar/?rev=9165&view=rev Author: hson Date: 2010-03-14 15:27:13 +0000 (Sun, 14 Mar 2010) Log Message: ----------- Update too 6.6.0-5 Revamp inclusion of old libraries Remove patched not needed any longer Remove checkpkg overrides no longer needed Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.i.tar.bz2 csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.s.tar.bz2 csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.i.tar.bz2 csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.s.tar.bz2 Removed Paths: ------------- csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff csw/mgar/pkg/ImageMagick/trunk/files/fixme.sh csw/mgar/pkg/ImageMagick/trunk/files/libMagick++.so.10.0.4.i csw/mgar/pkg/ImageMagick/trunk/files/libMagick++.so.10.0.4.s csw/mgar/pkg/ImageMagick/trunk/files/libMagick.so.10.0.4.i csw/mgar/pkg/ImageMagick/trunk/files/libMagick.so.10.0.4.s csw/mgar/pkg/ImageMagick/trunk/files/libWand.so.10.0.4.i csw/mgar/pkg/ImageMagick/trunk/files/libWand.so.10.0.4.s csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_i.tar.gz csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_s.tar.gz Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-03-14 14:46:59 UTC (rev 9164) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-03-14 15:27:13 UTC (rev 9165) @@ -1,5 +1,5 @@ GARNAME = imagemagick -GARVERSION = 6.5.9 +GARVERSION = 6.6.0 GARSUBREV = 5 CATEGORIES = lib @@ -52,230 +52,6 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiffrt RUNTIME_DEP_PKGS_CSWimagemagick += CSWzlib -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|libMagick++.so.10.0.4 -CHECKPKG_OVERRIDES += CSWimagemagick|symbol-not-found|ept.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cip.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|otb.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gif.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vid.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pix.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mvg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|palm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|avs.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcd.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|icon.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|magick.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tim.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xc.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps2.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|raw.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xcf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dps.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps3.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpc.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fpx.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pnm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpeg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xwd.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|url.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gray.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ycbcr.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rgb.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tile.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uil.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pwp.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sfw.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|stegano.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pattern.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|txt.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpr.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|html.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|info.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdb.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cut.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|msl.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jp2.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fits.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vicar.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cmyk.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|histogram.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|scr.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|avi.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|label.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|bmp.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|psd.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jbig.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|null.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dcm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tiff.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dot.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sun.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wmf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|x.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ttf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|miff.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xbm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jpeg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|map.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rle.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|art.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xpm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|svg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uyvy.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tga.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dib.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wbmp.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fax.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|clip.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sct.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcl.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mono.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rla.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|matte.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mat.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pict.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|preview.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|viff.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|meta.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gradient.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sgi.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|yuv.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cin.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|plasma.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|png.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mtv.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcx.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|caption.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wpg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dpx.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|analyze.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|inline.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcd.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jpeg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps2.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|miff.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tim.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpc.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xcf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps3.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|raw.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uyvy.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pnm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fpx.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jbig.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cip.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ept.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|label.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|otb.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cmyk.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|thumbnail.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tiff.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gif.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|braille.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|avs.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|null.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pix.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mvg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|exr.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vid.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|txt.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpr.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|x.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|msl.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pdb.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cut.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|plasma.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|jp2.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dds.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|hald.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|caption.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xwd.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|hrz.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|clip.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wbmp.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rgb.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|url.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sfw.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|meta.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|uil.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|viff.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pwp.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|matte.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pict.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|preview.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xps.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mono.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xbm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ttf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sun.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|magick.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wmf.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|art.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rle.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|map.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|icon.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dng.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|svg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xpm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tga.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|xc.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|bmp.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cals.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|scr.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|psd.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dcm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|palm.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dot.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ipl.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ps.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sgi.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gradient.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|info.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|html.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|png.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|stegano.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|djvu.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|cin.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pattern.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|yuv.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcx.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mtv.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|vicar.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fits.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dpx.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|wpg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|ycbcr.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|dib.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|gray.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|sct.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|pcl.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mpeg.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|histogram.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|fax.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mat.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|tile.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|rla.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|convolve.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|analyze.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|libMagick++.so.2.0.1 -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|libWand.so.10.0.4 -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|libMagickWand.so.2.0.1 -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|Magick.so -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|conjure -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|montage -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|animate -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|import -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|display -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|mogrify -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|identify -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|convert -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|compare2 -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|composite -CHECKPKG_OVERRIDES_CSWimagemagick += symbol-not-found|stream - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 @@ -286,7 +62,7 @@ CONFIGURE_ARGS_COMMON += --x-includes=/opt/csw/X11/include CONFIGURE_ARGS_COMMON += --x-libraries=/opt/csw/X11/lib CONFIGURE_ARGS_COMMON += --with-modules=yes -CONFIGURE_ARGS_COMMON += --disable-openmp +#CONFIGURE_ARGS_COMMON += --disable-openmp CONFIGURE_ARGS_COMMON += --disable-silent-rules # Until librsvg,graphviz and perl is 64bit #CONFIGURE_ARGS_isa-amd64 += --without-gvc @@ -299,8 +75,6 @@ CONFIGURE_ARGS = $(CONFIGURE_ARGS_COMMON) $(foreach M,$(MODULATIONS),$(CONFIGURE_ARGS_$M)) PATCHFILES += Makefile.patch -# Temporary patch until upstream make a more permenent fix -#PATCHFILES += djvu.c.diff # Test has to be run *after* install #TEST_TARGET = check @@ -331,27 +105,17 @@ SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV) 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 - @cp $(FILEDIR)/libMagick++.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 ] ; then ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 ; fi ) - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 ] ; then ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 ; fi ) - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 ] ; then ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 ; fi ) @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick - @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(CURDIR)/$(FILEDIR)/lib_6.2.9_s.tar.gz |tar xf -) + @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.2.9.s.tar.bz2 |tar xf -) + @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.5.2.s.tar.bz2 |tar xf -) @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 @$(MAKECOOKIE) post-install-isa-i386: - @cp $(FILEDIR)/libMagick.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 - @cp $(FILEDIR)/libWand.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 - @cp $(FILEDIR)/libMagick++.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 ] ; then ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 ; fi ) - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 ] ; then ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 ; fi ) - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 ] ; then ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 ; fi ) @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick - @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(CURDIR)/$(FILEDIR)/lib_6.2.9_i.tar.gz |tar xf -) + @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.2.9.i.tar.bz2 |tar xf -) + @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.5.2.i.tar.bz2 |tar xf -) @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 @$(MAKECOOKIE) Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2010-03-14 14:46:59 UTC (rev 9164) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2010-03-14 15:27:13 UTC (rev 9165) @@ -1,2 +1,2 @@ -ee8f6c42f982fe785c5df8f89e6deb91 ImageMagick-6.5.9-5.tar.bz2 +fb57509760a902af5bf535b8da15fdc7 ImageMagick-6.6.0-5.tar.bz2 6bd361fe352c7d497d60d8d2cbe7cfd4 Makefile.patch Added: csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.i.tar.bz2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.i.tar.bz2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.s.tar.bz2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.s.tar.bz2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.i.tar.bz2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.i.tar.bz2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.s.tar.bz2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.s.tar.bz2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff 2010-03-14 14:46:59 UTC (rev 9164) +++ csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff 2010-03-14 15:27:13 UTC (rev 9165) @@ -1,32 +0,0 @@ ---- ../build-global/ImageMagick-6.5.1-1/coders/djvu.c 2009-03-31 17:44:40.000000000 +0200 -+++ ImageMagick-6.5.1-1/coders/djvu.c 2009-04-12 11:00:15.678316236 +0200 -@@ -58,6 +58,29 @@ - #if defined(MAGICKCORE_DJVU_DELEGATE) - #include - #endif -+ -+#if defined(__SunOS_5_8) || defined(__SunOS_5_9) -+#define signbit(x) copysign(1, x)<0 -+ -+ -+double -+fmax(double x, double y) -+{ -+ if (isnan(x)) -+ return (y); -+ if (isnan(y)) -+ return (x); -+ -+ if (signbit(x) != signbit(y)) { -+ if (signbit(x)) -+ return (y); -+ else -+ return (x); -+ } -+ -+ return (x > y ? x : y); -+} -+#endif - - /* - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Deleted: csw/mgar/pkg/ImageMagick/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/files/fixme.sh 2010-03-14 14:46:59 UTC (rev 9164) +++ csw/mgar/pkg/ImageMagick/trunk/files/fixme.sh 2010-03-14 15:27:13 UTC (rev 9165) @@ -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 - Deleted: csw/mgar/pkg/ImageMagick/trunk/files/libMagick++.so.10.0.4.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/trunk/files/libMagick++.so.10.0.4.s =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/trunk/files/libMagick.so.10.0.4.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/trunk/files/libMagick.so.10.0.4.s =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/trunk/files/libWand.so.10.0.4.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/trunk/files/libWand.so.10.0.4.s =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_i.tar.gz =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/trunk/files/lib_6.2.9_s.tar.gz =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 14 18:00:50 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 14 Mar 2010 17:00:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9166] csw/mgar/pkg/tiff/trunk/Makefile Message-ID: Revision: 9166 http://gar.svn.sourceforge.net/gar/?rev=9166&view=rev Author: hson Date: 2010-03-14 17:00:50 +0000 (Sun, 14 Mar 2010) Log Message: ----------- tiff: Update of description to pass new checkpkg Modified Paths: -------------- csw/mgar/pkg/tiff/trunk/Makefile Modified: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile 2010-03-14 15:27:13 UTC (rev 9165) +++ csw/mgar/pkg/tiff/trunk/Makefile 2010-03-14 17:00:50 UTC (rev 9166) @@ -2,7 +2,7 @@ GARVERSION = 3.9.2 CATEGORIES = lib -DESCRIPTION = lib and tools for Tag Image File Format +DESCRIPTION = Lib and tools for Tag Image File Format define BLURB endef @@ -16,10 +16,10 @@ CATALOGNAME_CSWtiffdevel = tiff_devel CATALOGNAME_CSWtiffdoc = tiff_doc -SPKG_DESC_CSWtiff += lib and tools for Tag Image File Format -SPKG_DESC_CSWtiffrt += lib and tools for Tag Image File Format - runtime package -SPKG_DESC_CSWtiffdevel += lib and tools for Tag Image File Format - developer package -SPKG_DESC_CSWtiffdoc += lib and tools for Tag Image File Format - documentation +SPKG_DESC_CSWtiff += $(DESCRIPTION) +SPKG_DESC_CSWtiffrt += $(DESCRIPTION) - runtime package +SPKG_DESC_CSWtiffdevel += $(DESCRIPTION) - developer package +SPKG_DESC_CSWtiffdoc += $(DESCRIPTION) - documentation RUNTIME_DEP_PKGS_CSWtiff += CSWtiffrt CSWjbigkit CSWjpeg CSWzlib RUNTIME_DEP_PKGS_CSWtiffrt += CSWjbigkit CSWjpeg CSWzlib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 14 19:43:48 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 14 Mar 2010 18:43:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9167] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 9167 http://gar.svn.sourceforge.net/gar/?rev=9167&view=rev Author: wahwah Date: 2010-03-14 18:43:48 +0000 (Sun, 14 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, better screen output. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-03-14 17:00:50 UTC (rev 9166) +++ csw/mgar/gar/v2/bin/checkpkg 2010-03-14 18:43:48 UTC (rev 9167) @@ -296,7 +296,6 @@ module_name_format="%-40s" md5sums=`gmd5sum "$@" | awk '{print $1}'` if [[ -d "${checkpkg_module_dir}" ]]; then - echo "Running modular tests in ${checkpkg_module_dir}" for plugin in "${checkpkg_module_dir}/${checkpkg_module_tag}"*; do if [[ -x "${plugin}" ]]; then plugin_base_name=`basename ${plugin}` @@ -340,17 +339,17 @@ done # This check is special; it uses one executable for all the checks written in Python. -printf "${BOLD}${module_name_format}${COLOR_RESET} running..." "Python tests" +print "Running Python tests..." ${command_basedir}/checkpkg_run_modules.py \ ${extra_options} \ -b "${checkpkg_stats_basedir}" \ -o "${EXTRACTDIR}/tags.python-checks" \ ${md5sums} if [[ "$?" -ne 0 ]]; then - printf "\r${module_name_format} ${RED}[ERROR]${COLOR_RESET} \\n" "${plugin_name}" + print "There was a problem running Python tests." test_suite_ok=0 else - printf "\r${module_name_format} [Done] \\n" "${plugin_name}" + print "Python tests done." fi if [[ ${test_suite_ok} -ne 1 ]]; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 14 19:44:14 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 14 Mar 2010 18:44:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[9168] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9168 http://gar.svn.sourceforge.net/gar/?rev=9168&view=rev Author: wahwah Date: 2010-03-14 18:44:14 +0000 (Sun, 14 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, throwing an error when linking a shared library against Sun X11. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-14 18:43:48 UTC (rev 9167) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-14 18:44:14 UTC (rev 9168) @@ -46,9 +46,9 @@ ONLY_ALLOWED_IN_PKG = { "CSWcommon": ("/opt", ) } +DO_NOT_LINK_AGAINST_THESE_SONAMES = set(["libX11.so.4", "libXext.so.0"]) - def CatalognameLowercase(pkg_data, error_mgr, logger): catalogname = pkg_data["basic_stats"]["catalogname"] if catalogname != catalogname.lower(): @@ -497,3 +497,13 @@ for disallowed_path in ONLY_ALLOWED_IN_PKG[allowed_pkgname]: if disallowed_path in pkg_paths and pkgname != allowed_pkgname: error_mgr.ReportError("disallowed-path", disallowed_path) + + +def CheckLinkingAgainstSunX11(pkg_data, error_mgr, logger): + for binary_info in pkg_data["binaries_dump_info"]: + for soname in binary_info["needed sonames"]: + if (".so" in binary_info["soname"] + and + soname in DO_NOT_LINK_AGAINST_THESE_SONAMES): + error_mgr.ReportError("linked-against-discouraged-library", + "%s %s" % (binary_info["base_name"], soname)) Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-14 18:43:48 UTC (rev 9167) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-14 18:44:14 UTC (rev 9168) @@ -198,5 +198,36 @@ self.error_mgr_mock.ReportError('rev-tag-missing-in-filename') +class TestCheckLinkingAgainstSunX11(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckLinkingAgainstSunX11' + def CheckpkgTest(self): + self.pkg_data["binaries_dump_info"][0]["needed sonames"].append("libX11.so.4") + +class TestCheckLinkingAgainstSunX11_Bad(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckLinkingAgainstSunX11' + def CheckpkgTest(self): + self.pkg_data["binaries_dump_info"].append({ + 'base_name': 'libImlib2.so.1.4.2', + 'needed sonames': ['libfreetype.so.6', + 'libz.so', + 'libX11.so.4', + 'libXext.so.0', + 'libdl.so.1', + 'libm.so.1', + 'libc.so.1'], + 'path': 'opt/csw/lib/libImlib2.so.1.4.2', + 'runpath': ['/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/usr/lib/$ISALIST', + '/usr/lib', + '/lib/$ISALIST', + '/lib'], + 'soname': 'libImlib2.so.1', + 'soname_guessed': False, + }) + self.error_mgr_mock.ReportError('linked-against-discouraged-library', + 'libImlib2.so.1.4.2 libX11.so.4') + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 14 20:01:26 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 14 Mar 2010 19:01:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[9169] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 9169 http://gar.svn.sourceforge.net/gar/?rev=9169&view=rev Author: wahwah Date: 2010-03-14 19:01:26 +0000 (Sun, 14 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, turns out that CSW libXext is also libXext.so.0 Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-14 18:44:14 UTC (rev 9168) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-14 19:01:26 UTC (rev 9169) @@ -46,7 +46,7 @@ ONLY_ALLOWED_IN_PKG = { "CSWcommon": ("/opt", ) } -DO_NOT_LINK_AGAINST_THESE_SONAMES = set(["libX11.so.4", "libXext.so.0"]) +DO_NOT_LINK_AGAINST_THESE_SONAMES = set(["libX11.so.4"]) def CatalognameLowercase(pkg_data, error_mgr, logger): 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 Mar 14 21:54:57 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 14 Mar 2010 20:54:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[9170] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 9170 http://gar.svn.sourceforge.net/gar/?rev=9170&view=rev Author: dmichelsen Date: 2010-03-14 20:54:56 +0000 (Sun, 14 Mar 2010) Log Message: ----------- giflib: Increase x11 alternative priority to take precedence Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2010-03-14 19:01:26 UTC (rev 9169) +++ csw/mgar/pkg/giflib/trunk/Makefile 2010-03-14 20:54:56 UTC (rev 9170) @@ -87,7 +87,7 @@ ALTERNATIVE_nox11 = $(libdir)/libgif.so.4.1.6 giflib $(libdir)/libgif-nox11.so.4.1.6 100 ALTERNATIVE_nox11 += $(libdir)/$(ISA_DEFAULT64)/libgif.so.4.1.6 giflib64 $(libdir)/$(ISA_DEFAULT64)/libneon-nox11.so.4.1.6 -ALTERNATIVE_cswx11 = $(libdir)/libgif.so.4.1.6 giflib $(libdir)/libgif-cswx11.so.4.1.6 100 +ALTERNATIVE_cswx11 = $(libdir)/libgif.so.4.1.6 giflib $(libdir)/libgif-cswx11.so.4.1.6 200 ALTERNATIVE_cswx11 += $(libdir)/$(ISA_DEFAULT64)/libgif.so.4.1.6 giflib64 $(libdir)/$(ISA_DEFAULT64)/libneon-cswx11.so.4.1.6 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 14 22:24:05 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Mar 2010 21:24:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[9171] csw/mgar/pkg/x11/lib/libxau/trunk/Makefile Message-ID: Revision: 9171 http://gar.svn.sourceforge.net/gar/?rev=9171&view=rev Author: wbonnet Date: 2010-03-14 21:24:05 +0000 (Sun, 14 Mar 2010) Log Message: ----------- Fix dependency on CXWxproto (removed) and CSWx11xproto (aded) Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxau/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxau/trunk/Makefile 2010-03-14 20:54:56 UTC (rev 9170) +++ csw/mgar/pkg/x11/lib/libxau/trunk/Makefile 2010-03-14 21:24:05 UTC (rev 9171) @@ -20,7 +20,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS_CSWlibxau = CSWx11common CSWxproto +RUNTIME_DEP_PKGS_CSWlibxau = CSWx11common CSWx11xproto RUNTIME_DEP_PKGS_CSWlibxaudevel = CSWlibxau CATALOGNAME_CSWlibxau = libxau 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 Mar 14 22:28:16 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 14 Mar 2010 21:28:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9172] csw/mgar/pkg/rrdtool/branches/ihsan/ Message-ID: Revision: 9172 http://gar.svn.sourceforge.net/gar/?rev=9172&view=rev Author: idogan23 Date: 2010-03-14 21:28:16 +0000 (Sun, 14 Mar 2010) Log Message: ----------- rrdtool: own branch Added Paths: ----------- csw/mgar/pkg/rrdtool/branches/ihsan/ 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 Mar 14 22:32:47 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 14 Mar 2010 21:32:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9173] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 9173 http://gar.svn.sourceforge.net/gar/?rev=9173&view=rev Author: dmichelsen Date: 2010-03-14 21:32:47 +0000 (Sun, 14 Mar 2010) Log Message: ----------- giflib: Add gif2x11, which is only in the cswx11 modulation Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2010-03-14 21:28:16 UTC (rev 9172) +++ csw/mgar/pkg/giflib/trunk/Makefile 2010-03-14 21:32:47 UTC (rev 9173) @@ -59,6 +59,7 @@ TEST_TARGET = check EXTRA_PAX_ARGS-32 = -s ",\(\.$(libdir)/libgif\)\(\.so\.4\.1\.6\),\1-$(FEATURES)\2,p" +EXTRA_PAX_ARGS-32 += -s ",\(\.$(bindir)/gif2x11\),\1,p" EXTRA_PAX_ARGS-64 = -s ",\.$(libdir)/libgif\(\.so\.4\.1\.6\),.$(libdir_install)/$(ISA)/libgif-$(FEATURES)\1,p" EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS-$(MEMORYMODEL)) @@ -77,7 +78,7 @@ ARCHALL_CSWungif = 1 PKGFILES_CSWgiflibrt = .*/libgif-nox11\..* -PKGFILES_CSWgiflibrtx11 = .*/libgif-cswx11\..* +PKGFILES_CSWgiflibrtx11 = .*/libgif-cswx11\..* $(bindir)/gif2x11 PKGFILES_CSWgiflibdoc = $(PKGFILES_DOC) PKGFILES_CSWungif = .*/libungif\..* 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 Mar 14 22:45:29 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 14 Mar 2010 21:45:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9174] csw/mgar/pkg/rrdtool/branches/ihsan/Makefile Message-ID: Revision: 9174 http://gar.svn.sourceforge.net/gar/?rev=9174&view=rev Author: idogan23 Date: 2010-03-14 21:45:29 +0000 (Sun, 14 Mar 2010) Log Message: ----------- rrdtool: fixed dependencies Modified Paths: -------------- csw/mgar/pkg/rrdtool/branches/ihsan/Makefile Modified: csw/mgar/pkg/rrdtool/branches/ihsan/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/branches/ihsan/Makefile 2010-03-14 21:32:47 UTC (rev 9173) +++ csw/mgar/pkg/rrdtool/branches/ihsan/Makefile 2010-03-14 21:45:29 UTC (rev 9174) @@ -40,8 +40,8 @@ BUILD_DEP_PKGS += CSWglib2devel BUILD_DEP_PKGS += CSWxproto BUILD_DEP_PKGS += CSWlibxrenderdevel -BUILD_DEP_PKGS += CSWrenderproto -BUILD_DEP_PKGS += CSWkbproto +BUILD_DEP_PKGS += CSWx11renderproto +BUILD_DEP_PKGS += CSWx11kbproto BUILD_DEP_PKGS += CSWpython-devel BUILD_DEP_PKGS += CSWrubydev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Mar 14 22:54:57 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Mar 2010 21:54:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[9175] csw/mgar/pkg/x11/lib/libxau/trunk/Makefile Message-ID: Revision: 9175 http://gar.svn.sourceforge.net/gar/?rev=9175&view=rev Author: wbonnet Date: 2010-03-14 21:54:57 +0000 (Sun, 14 Mar 2010) Log Message: ----------- Fix comment Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxau/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxau/trunk/Makefile 2010-03-14 21:45:29 UTC (rev 9174) +++ csw/mgar/pkg/x11/lib/libxau/trunk/Makefile 2010-03-14 21:54:57 UTC (rev 9175) @@ -13,7 +13,7 @@ DISTFILES = $(DISTNAME).tar.bz2 # BUILD_DEP_PKGS = CSWinputproto CSWxkbproto CSWxrenderproto CSWxcbproto -# BUILD_DEP_PKGS += CSWxextproto CSWxproto CSWxtrans CSWlibpthreadstubs +# BUILD_DEP_PKGS += CSWxextproto CSWx11xproto CSWxtrans CSWlibpthreadstubs PACKAGES = CSWlibxau CSWlibxaudevel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 14 22:59:12 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 14 Mar 2010 21:59:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9176] csw/mgar/pkg/librsvg/trunk/Makefile Message-ID: Revision: 9176 http://gar.svn.sourceforge.net/gar/?rev=9176&view=rev Author: hson Date: 2010-03-14 21:59:12 +0000 (Sun, 14 Mar 2010) Log Message: ----------- librsvg: Further split the package Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2010-03-14 21:54:57 UTC (rev 9175) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2010-03-14 21:59:12 UTC (rev 9176) @@ -26,29 +26,77 @@ LICENSE = COPYING.LIB -PACKAGES = CSWlibrsvg CSWlibrsvgdevel CSWlibrsvgdoc CSWlibrsvgmozilla +PACKAGES = CSWlibrsvg CSWlibrsvgdevel CSWlibrsvgdoc CSWlibrsvgmozilla CSWrsvg CSWlibrsvggnome +CATALOGNAME_CSWrsvg = rsvg CATALOGNAME_CSWlibrsvg = librsvg +CATALOGNAME_CSWlibrsvggnome = librsvg_gnome CATALOGNAME_CSWlibrsvgdevel = librsvg_devel CATALOGNAME_CSWlibrsvgdoc = librsvg_doc CATALOGNAME_CSWlibrsvgmozilla = librsvg_mozilla +SPKG_DESC_CSWrsvg += SVG to raster image conversion utility SPKG_DESC_CSWlibrsvg += Scalable Vector Graphics library SPKG_DESC_CSWlibrsvgdevel += Scalable Vector Graphics library - developer package SPKG_DESC_CSWlibrsvgdoc += Scalable Vector Graphics library - documentation +SPKG_DESC_CSWlibrsvggnome += Scalable Vector Graphics library - Gnome module SPKG_DESC_CSWlibrsvgmozilla += Scalable Vector Graphics library - Mozilla plugin -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWfconfig CSWftype2 CSWggettextrt -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWglib2 CSWgtk2 CSWlibatk -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibcairo CSWlibcroco CSWlibgsf CSWlibx11 -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibxml2 CSWpango CSWpng CSWzlib CSWorbit2 -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWbonobo2 CSWgconf2 CSWgnomevfs2 CSWlibxrender +RUNTIME_DEP_PKGS_CSWrsvg += CSWfconfig +RUNTIME_DEP_PKGS_CSWrsvg += CSWftype2 +RUNTIME_DEP_PKGS_CSWrsvg += CSWggettextrt +RUNTIME_DEP_PKGS_CSWrsvg += CSWglib2 +RUNTIME_DEP_PKGS_CSWrsvg += CSWgtk2 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibatk +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibcairo +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibcroco +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgsf +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibrsvg +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibx11 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWrsvg += CSWpango +RUNTIME_DEP_PKGS_CSWrsvg += CSWpng + +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWbonobo2 +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWgconf2 +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWgnomevfs2 +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWgtk2 RUNTIME_DEP_PKGS_CSWlibrsvg += CSWiconv +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibcairo +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibcroco +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibgsf +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWorbit2 +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWpango +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWpng +RUNTIME_DEP_PKGS_CSWlibrsvg += CSWzlib + +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibatk +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibcairo +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibcroco +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibgsf +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibrsvg +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWpango +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWpng + RUNTIME_DEP_PKGS_CSWlibrsvgdevel += CSWlibrsvg RUNTIME_DEP_PKGS_CSWlibrsvgdoc += RUNTIME_DEP_PKGS_CSWlibrsvgmozilla += CSWggettextrt CSWglib2 +PKGFILES_CSWlibrsvg= $(PKGFILES_RT) PKGFILES_CSWlibrsvgdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibrsvggnome = $(libdir)/gtk-2.0/.* PKGFILES_CSWlibrsvgmozilla = $(libdir)/mozilla/.* PKGFILES_CSWlibrsvgdoc = $(sharedstatedir)/gtk-doc/.* @@ -58,10 +106,6 @@ BUILD_DEP_PKGS += CSWmozilla BUILD_DEP_PKGS += CSWlibxml2devel -CHECKPKG_OVERRIDES_CSWlibrsvg += symbol-not-found|rsvg-convert -CHECKPKG_OVERRIDES_CSWlibrsvg += symbol-not-found|rsvg-view -CHECKPKG_OVERRIDES_CSWlibrsvg += symbol-not-found|libsvg.so - UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 # Upstream develops on gcc only This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 14 23:11:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 14 Mar 2010 22:11:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[9177] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 9177 http://gar.svn.sourceforge.net/gar/?rev=9177&view=rev Author: wahwah Date: 2010-03-14 22:11:55 +0000 (Sun, 14 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, removed the initial extraction of pkginfo files. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-03-14 21:59:12 UTC (rev 9176) +++ csw/mgar/gar/v2/bin/checkpkg 2010-03-14 22:11:55 UTC (rev 9177) @@ -152,8 +152,6 @@ exit 1 fi -printf "Examining pkginfo files: " - for f in "$@" do @@ -190,35 +188,35 @@ [ -d ${EXTRACTDIR} ] || mkdir ${EXTRACTDIR} -# FIXME: This doesn't support multiple packages -TMPFILE=$EXTRACTDIR/pkginfo +# # FIXME: This doesn't support multiple packages +# TMPFILE=$EXTRACTDIR/pkginfo +# +# +# printf "$pkgname " +# dd if=$f skip=1 | (cd $EXTRACTDIR; cpio -ivd $pkgname/pkginfo >/dev/null 2>&1) +# if [[ $? -ne 0 ]] ; then +# print "ERROR: could not extract $f" +# print "with (cd $EXTRACTDIR; cpio -ivd $pkgname/pkginfo)" +# ls -l $EXTRACTDIR +# 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` +# +# rm $TMPFILE - -printf "$pkgname " -dd if=$f skip=1 | (cd $EXTRACTDIR; cpio -ivd $pkgname/pkginfo >/dev/null 2>&1) -if [[ $? -ne 0 ]] ; then - print "ERROR: could not extract $f" - print "with (cd $EXTRACTDIR; cpio -ivd $pkgname/pkginfo)" - ls -l $EXTRACTDIR - 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` - -rm $TMPFILE - # strip out '' chars, because it interferes with mysql -desc=`print $desc | sed "s/'//g"` +# desc=`print $desc | sed "s/'//g"` ############################################################# # We now have the package expanded, in "directory" form, in @@ -256,9 +254,6 @@ tmparchives="$tmparchives $TMPARCHIVE" done -# Terminating the line with pkgnames -echo - # Plugin section. # # Plugins should live in checkpkg.d subdirectory in the same directory in which @@ -303,9 +298,9 @@ log_files="${log_files} ${plugin_log}" plugin_name="`echo ${plugin} | sed -e 's+.*/checkpkg-++' | sed -e 's+\.py$++'`" error_tag_file="tags.${plugin_name}" - printf "${BOLD}${module_name_format}${COLOR_RESET} running..." "${plugin_name}" debugmsg "Executing: ${plugin} $extra_options -b \"${checkpkg_stats_basedir}\"" \ - "-o \"${EXTRACTDIR}/${error_tag_file}\" `echo ${md5sums}`" + "-o \"${EXTRACTDIR}/${error_tag_file}\" `echo ${md5sums}`" + printf "${BOLD}${module_name_format}${COLOR_RESET} running..." "${plugin_name}" ${plugin} \ $extra_options \ -b "${checkpkg_stats_basedir}" \ @@ -313,7 +308,8 @@ ${md5sums} \ > "${plugin_log}" 2>&1 if [[ "$?" -ne 0 ]]; then - printf "\r${module_name_format} ${RED}[ERROR]${COLOR_RESET} \\n" "${plugin_name}" + printf "\r${module_name_format} ${RED}[ERROR]${COLOR_RESET} \\n" \ + "${plugin_name}" test_suite_ok=0 else printf "\r${module_name_format} [Done] \\n" "${plugin_name}" @@ -339,23 +335,19 @@ done # This check is special; it uses one executable for all the checks written in Python. -print "Running Python tests..." +print "Analyzing collected statistics..." ${command_basedir}/checkpkg_run_modules.py \ ${extra_options} \ -b "${checkpkg_stats_basedir}" \ -o "${EXTRACTDIR}/tags.python-checks" \ ${md5sums} if [[ "$?" -ne 0 ]]; then - print "There was a problem running Python tests." + print "There was a problem analyzing package stats." test_suite_ok=0 -else - print "Python tests done." fi if [[ ${test_suite_ok} -ne 1 ]]; then - errmsg "One or more modular tests have finished with an error." -else - print "All modular tests completed. Analyzing the reports." + errmsg "One or more tests have finished with an error." fi if [[ "${DEBUG}" != "" ]]; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Mon Mar 15 02:23:06 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 15 Mar 2010 01:23:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9178] csw/mgar/pkg/wesnoth/trunk Message-ID: Revision: 9178 http://gar.svn.sourceforge.net/gar/?rev=9178&view=rev Author: jake_goerzen Date: 2010-03-15 01:23:06 +0000 (Mon, 15 Mar 2010) Log Message: ----------- add sys\/types.h to time.hpp; add -lresolv to LIBS Modified Paths: -------------- csw/mgar/pkg/wesnoth/trunk/Makefile csw/mgar/pkg/wesnoth/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wesnoth/trunk/files/time.hpp.diff Modified: csw/mgar/pkg/wesnoth/trunk/Makefile =================================================================== --- csw/mgar/pkg/wesnoth/trunk/Makefile 2010-03-14 22:11:55 UTC (rev 9177) +++ csw/mgar/pkg/wesnoth/trunk/Makefile 2010-03-15 01:23:06 UTC (rev 9178) @@ -2,7 +2,7 @@ GARVERSION = 1.6.5 CATEGORIES = apps -DESCRIPTION = a free turn-based strategy game with a fanasy theme +DESCRIPTION = A free turn-based strategy game with a fanasy theme define BLURB Build up a great army, gradually turning raw recruits into hardened veterans. In later games, recall your toughest warriors and form a deadly host against whom none can stand! Choose units from a large pool of specialists, and hand-pick a force with the right strengths to fight well on different terrains against all manner of opposition. endef @@ -22,11 +22,15 @@ PATCHFILES += image.cpp.diff PATCHFILES += marked-up_text.cpp.diff PATCHFILES += simple_wml.cpp.diff +PATCHFILES += time.hpp.diff RUNTIME_DEP_PKGS_CSWwesnoth = CSWboostrt -RUNTIME_DEP_PKGS_CSWwesnoth += CSWftype2 +RUNTIME_DEP_PKGS_CSWwesnoth += CSWfconfig RUNTIME_DEP_PKGS_CSWwesnoth += CSWggettextrt +RUNTIME_DEP_PKGS_CSWwesnoth += CSWglib2 +RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibcairo RUNTIME_DEP_PKGS_CSWwesnoth += CSWlibsdl +RUNTIME_DEP_PKGS_CSWwesnoth += CSWpango RUNTIME_DEP_PKGS_CSWwesnoth += CSWpng RUNTIME_DEP_PKGS_CSWwesnoth += CSWpython RUNTIME_DEP_PKGS_CSWwesnoth += CSWsdlimage @@ -37,12 +41,6 @@ RUNTIME_DEP_PKGS_CSWwesnoth += CSWsunmath RUNTIME_DEP_PKGS_CSWwesnoth += CSWzlib -CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|campaignd -CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|exploder -CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|cutter -CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|wesnoth_editor -CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|wesnoth -CHECKPKG_OVERRIDES_CSWwesnoth += symbol-not-found|wesnothd CHECKPKG_OVERRIDES_CSWwesnoth += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWwesnoth += missing-dependency|CSWruby @@ -51,16 +49,15 @@ CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += PKG_CONFIG_PATH=/opt/csw/X11/lib/pkgconfig CONFIGURE_ARGS += CXXFLAGS='-features=extensions -library=stlport4' -CONFIGURE_ARGS += LIBS='-lstlport -lintl -lsocket -lboost_iostreams -lsunmath -lSDL_ttf -lcairo -lpango-1.0 -lpangocairo-1.0' +CONFIGURE_ARGS += LIBS='-lstlport -lintl -lsocket -lnsl -lresolv -lboost_iostreams -lsunmath -lSDL_ttf -lcairo -lpango-1.0 -lpangocairo-1.0' CONFIGURE_ARGS += PANGO_CFLAGS='-I/opt/csw/include/pango-1.0 -I/opt/csw/include/glib-2.0 -I/opt/csw/lib/glib-2.0/include -I/opt/csw/include/cairo' CONFIGURE_ARGS += PANGO_LIBS='-L/opt/csw/lib -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl' CONFIGURE_ARGS += LUA_CFLAGS=-I/opt/csw/include CONFIGURE_ARGS += LUA_LIBS=-L/opt/csw/lib CONFIGURE_ARGS += --with-fifodir=/var/opt/csw/run -#CONFIGURE_ARGS += --enable-server -#CONFIGURE_ARGS += --enable-campaign-server -#CONFIGURE_ARGS += --enable-tools -#CONFIGURE_ARGS += --enable-editor +CONFIGURE_ARGS += --enable-server +CONFIGURE_ARGS += --enable-tools +CONFIGURE_ARGS += --enable-editor CONFIGURE_ARGS += --with-boost=/opt/csw CONFIGURE_ARGS += --disable-strict-compilation CONFIGURE_ARGS += --with-zlib-prefix=/opt/csw Modified: csw/mgar/pkg/wesnoth/trunk/checksums =================================================================== --- csw/mgar/pkg/wesnoth/trunk/checksums 2010-03-14 22:11:55 UTC (rev 9177) +++ csw/mgar/pkg/wesnoth/trunk/checksums 2010-03-15 01:23:06 UTC (rev 9178) @@ -5,4 +5,5 @@ 59968804e93a18220d7d18e8252fff8d language.cpp.diff 29edd308920e8e44317fffb92eb19eb4 marked-up_text.cpp.diff 3a8d9b365df3c142bac7dd4188e963b5 simple_wml.cpp.diff +57b2396fad674a80f0dd1edab3e3063c time.hpp.diff 493826bbd9ba355930765a7e8fe3749a wesnoth-1.6.5.tar.bz2 Added: csw/mgar/pkg/wesnoth/trunk/files/time.hpp.diff =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/time.hpp.diff (rev 0) +++ csw/mgar/pkg/wesnoth/trunk/files/time.hpp.diff 2010-03-15 01:23:06 UTC (rev 9178) @@ -0,0 +1,13 @@ +--- wesnoth-1.6.5/src/time.hpp 2009-01-01 11:27:41.000000000 +0100 ++++ wesnoth-1.6.5.new/src/time.hpp 2010-03-14 19:17:14.451509148 +0100 +@@ -16,6 +16,10 @@ + #define TIME_HPP_INCLUDED + #include + ++#if defined (__SVR4) && defined (__sun) ++#include ++#endif ++ + namespace ntime { + + const int frames_to_remember = 6; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Mar 15 02:49:47 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 15 Mar 2010 01:49:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9179] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 9179 http://gar.svn.sourceforge.net/gar/?rev=9179&view=rev Author: hson Date: 2010-03-15 01:49:47 +0000 (Mon, 15 Mar 2010) Log Message: ----------- imagemagick: Put docs in version independent dir Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ImageMagick/trunk/files/configure.diff Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-03-15 01:23:06 UTC (rev 9178) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-03-15 01:49:47 UTC (rev 9179) @@ -45,7 +45,7 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxext RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxml2 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxt -RUNTIME_DEP_PKGS_CSWimagemagick += CSWopenexr +RUNTIME_DEP_PKGS_CSWimagemagick += CSWopenexrrt RUNTIME_DEP_PKGS_CSWimagemagick += CSWperl RUNTIME_DEP_PKGS_CSWimagemagick += CSWpng RUNTIME_DEP_PKGS_CSWimagemagick += CSWsunmath @@ -75,6 +75,7 @@ CONFIGURE_ARGS = $(CONFIGURE_ARGS_COMMON) $(foreach M,$(MODULATIONS),$(CONFIGURE_ARGS_$M)) PATCHFILES += Makefile.patch +PATCHFILES += configure.diff # Test has to be run *after* install #TEST_TARGET = check @@ -105,7 +106,6 @@ SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV) post-install-isa-sparcv8: - @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.2.9.s.tar.bz2 |tar xf -) @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.5.2.s.tar.bz2 |tar xf -) @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 @@ -113,7 +113,6 @@ @$(MAKECOOKIE) post-install-isa-i386: - @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.2.9.i.tar.bz2 |tar xf -) @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.5.2.i.tar.bz2 |tar xf -) @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2010-03-15 01:23:06 UTC (rev 9178) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2010-03-15 01:49:47 UTC (rev 9179) @@ -1,2 +1,3 @@ fb57509760a902af5bf535b8da15fdc7 ImageMagick-6.6.0-5.tar.bz2 6bd361fe352c7d497d60d8d2cbe7cfd4 Makefile.patch +6e35e7434941ed6aeeabb03de76288d1 configure.diff Added: csw/mgar/pkg/ImageMagick/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/files/configure.diff (rev 0) +++ csw/mgar/pkg/ImageMagick/trunk/files/configure.diff 2010-03-15 01:49:47 UTC (rev 9179) @@ -0,0 +1,11 @@ +--- ImageMagick-6.6.0-5/configure.orig 2010-03-12 18:57:20.000000000 +0100 ++++ ImageMagick-6.6.0-5/configure 2010-03-14 16:36:37.881895213 +0100 +@@ -28869,7 +28869,7 @@ + + # + # Path to ImageMagick documentation files +-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}" ++DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}" + DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}" + DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/" + case "${build_os}" in 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 Mar 15 09:22:50 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 15 Mar 2010 08:22:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9180] csw/mgar/pkg/irssi/trunk/Makefile Message-ID: Revision: 9180 http://gar.svn.sourceforge.net/gar/?rev=9180&view=rev Author: idogan23 Date: 2010-03-15 08:22:50 +0000 (Mon, 15 Mar 2010) Log Message: ----------- irssi: added PACKAGIN_PLATFORMS Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2010-03-15 01:49:47 UTC (rev 9179) +++ csw/mgar/pkg/irssi/trunk/Makefile 2010-03-15 08:22:50 UTC (rev 9180) @@ -16,6 +16,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 + SAMPLECONF = .*/irssi.conf 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 Mon Mar 15 09:38:28 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Mar 2010 08:38:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[9181] csw/mgar/pkg/cpan/BerkeleyDB/trunk Message-ID: Revision: 9181 http://gar.svn.sourceforge.net/gar/?rev=9181&view=rev Author: dmichelsen Date: 2010-03-15 08:38:28 +0000 (Mon, 15 Mar 2010) Log Message: ----------- cpan/BerkeleyDB: Update to 0.42 and add license Modified Paths: -------------- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2010-03-15 08:22:50 UTC (rev 9180) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2010-03-15 08:38:28 UTC (rev 9181) @@ -1,5 +1,5 @@ GARNAME = BerkeleyDB -GARVERSION = 0.41 +GARVERSION = 0.42 CATEGORIES = cpan AUTHOR = PMQS @@ -8,6 +8,8 @@ Includes BerkeleyDB, BerkeleyDB::Btree, BerkeleyDB::Hash endef +DISTFILES = COPYING + PACKAGES = CSWpmberkeleydb CATALOGNAME = pm_berkeleydb Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums 2010-03-15 08:22:50 UTC (rev 9180) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums 2010-03-15 08:38:28 UTC (rev 9181) @@ -1,2 +1,3 @@ -5941c90783a55ca4280c2963bbe1ac83 BerkeleyDB-0.41.tar.gz +4b9c1f6e62b6ef40e6bdc673a3a30a32 BerkeleyDB-0.42.tar.gz +bf78b3346925446f99c2a7f081322109 COPYING 2061f2f285714a1b6a014c5254e69b92 CSWpmberkeleydb.config.in.diff Added: csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/COPYING 2010-03-15 08:38:28 UTC (rev 9181) @@ -0,0 +1,23 @@ +Copyright (c) 1997-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. + +Although B is covered by the Perl license, the library it +makes use of, namely Berkeley DB, is not. Berkeley DB has its own +copyright and its own license. Please take the time to read it. + +Here are few words taken from the Berkeley DB FAQ (at +F) regarding the license: + + Do I have to license DB to use it in Perl scripts? + + No. The Berkeley DB license requires that software that uses + Berkeley DB be freely redistributable. In the case of Perl, that + software is Perl, and not your scripts. Any Perl scripts that you + write are your property, including scripts that make use of Berkeley + DB. Neither the Perl license nor the Berkeley DB license + place any restriction on what you may do with them. + +If you are in any doubt about the license situation, contact either the +Berkeley DB authors or the author of BerkeleyDB. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Mar 15 09:51:03 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 15 Mar 2010 08:51:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[9182] csw/mgar/pkg/pbzip2/trunk Message-ID: Revision: 9182 http://gar.svn.sourceforge.net/gar/?rev=9182&view=rev Author: bensons Date: 2010-03-15 08:51:03 +0000 (Mon, 15 Mar 2010) Log Message: ----------- pbzip2: bump version to 1.1.0 Modified Paths: -------------- csw/mgar/pkg/pbzip2/trunk/Makefile csw/mgar/pkg/pbzip2/trunk/checksums Modified: csw/mgar/pkg/pbzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pbzip2/trunk/Makefile 2010-03-15 08:38:28 UTC (rev 9181) +++ csw/mgar/pkg/pbzip2/trunk/Makefile 2010-03-15 08:51:03 UTC (rev 9182) @@ -1,5 +1,5 @@ GARNAME = pbzip2 -GARVERSION = 1.0.5 +GARVERSION = 1.1.0 CATEGORIES = utils DESCRIPTION = Parallel BZIP2 Data Compression Software Modified: csw/mgar/pkg/pbzip2/trunk/checksums =================================================================== --- csw/mgar/pkg/pbzip2/trunk/checksums 2010-03-15 08:38:28 UTC (rev 9181) +++ csw/mgar/pkg/pbzip2/trunk/checksums 2010-03-15 08:51:03 UTC (rev 9182) @@ -1 +1 @@ -e2448d22ee29d1e6549ac58b98df11ab download/pbzip2-1.0.5.tar.gz +39cfc2e8c810391b571246e798f7c73a pbzip2-1.1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Mar 15 10:11:22 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 15 Mar 2010 09:11:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[9183] csw/mgar/pkg/pbzip2/trunk/Makefile Message-ID: Revision: 9183 http://gar.svn.sourceforge.net/gar/?rev=9183&view=rev Author: bensons Date: 2010-03-15 09:11:22 +0000 (Mon, 15 Mar 2010) Log Message: ----------- pbzip2: remove the 64 bit build, stick to 32bit only Modified Paths: -------------- csw/mgar/pkg/pbzip2/trunk/Makefile Modified: csw/mgar/pkg/pbzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pbzip2/trunk/Makefile 2010-03-15 08:51:03 UTC (rev 9182) +++ csw/mgar/pkg/pbzip2/trunk/Makefile 2010-03-15 09:11:22 UTC (rev 9183) @@ -26,10 +26,6 @@ # since there is no configure script, this is intentionally left empty CONFIGURE_SCRIPTS = -# build 64bit binary -BUILD64 = 1 -NOISAEXEC = 1 - # no build tests SKIPTEST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Mar 15 10:48:36 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 15 Mar 2010 09:48:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9184] csw/mgar/pkg/transmission/trunk Message-ID: Revision: 9184 http://gar.svn.sourceforge.net/gar/?rev=9184&view=rev Author: janholzh Date: 2010-03-15 09:48:36 +0000 (Mon, 15 Mar 2010) Log Message: ----------- transmission: Update to 1.92 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 2010-03-15 09:11:22 UTC (rev 9183) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-03-15 09:48:36 UTC (rev 9184) @@ -1,5 +1,5 @@ GARNAME = transmission -GARVERSION = 1.91 +GARVERSION = 1.92 CATEGORIES = net DESCRIPTION = Fast, easy, and free multi-platform BitTorrent client Modified: csw/mgar/pkg/transmission/trunk/checksums =================================================================== --- csw/mgar/pkg/transmission/trunk/checksums 2010-03-15 09:11:22 UTC (rev 9183) +++ csw/mgar/pkg/transmission/trunk/checksums 2010-03-15 09:48:36 UTC (rev 9184) @@ -1,2 +1,2 @@ cbdb5cfaf24b68727042c3828b252534 icons-makefile.patch -2c6993300988d5aa2e3fc24a439d3633 transmission-1.91.tar.bz2 +561357621331f294c87f78e22783a283 transmission-1.92.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 Mon Mar 15 14:48:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Mar 2010 13:48:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9185] csw/mgar/pkg/glib/trunk Message-ID: Revision: 9185 http://gar.svn.sourceforge.net/gar/?rev=9185&view=rev Author: dmichelsen Date: 2010-03-15 13:48:52 +0000 (Mon, 15 Mar 2010) Log Message: ----------- glib: Add version modulation, merging tbd 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 2010-03-15 09:48:36 UTC (rev 9184) +++ csw/mgar/pkg/glib/trunk/Makefile 2010-03-15 13:48:52 UTC (rev 9185) @@ -1,30 +1,32 @@ GARNAME = glib -# 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 +GARVERSION = 1.3.15 CATEGORIES = lib -DESCRIPTION = The GLib library of C routines +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 1.2.10 1.3.15 + +DESCRIPTION = Utility library commonly associated with GNOME programs define BLURB GLib is a library containing many useful C routines for things such as trees, hashes, and lists. endef -SPKG_DESC_CSWglib2 = Utility library commonly associated with GNOME programs +GNOME_SUBV_FUNC = $(shell echo $1 | awk -F. '{print $$1"."$$2}') +MASTER_SITES = $(sort $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GNOME_ROOT)/$(GNOME_PROJ)/$(call GNOME_SUBV_FUNC,$(VERSION))/)) +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)-$(VERSION).tar.gz) +DISTFILES = $(SOURCEFILES) +NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) -RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv +DEP_PKGS = CSWggettextrt CSWiconv -MASTER_SITES = $(GNOME_MIRROR) - -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - # glib 1.x doesn't seem to be 64 bit clean #BUILD64 = 1 #NOISAEXEC = 1 # Only needed for 1.3.x -#EXTRA_BUILD_EXPORTS = SGML_CATALOG_FILES -#SGML_CATALOG_FILES = $(sysconfdir)/sgml/catalog +SGML_CATALOG_FILES = $(sysconfdir)/sgml/catalog +EXTRA_BUILD_EXPORT-1.3.15 = SGML_CATALOG_FILES +EXTRA_BUILD_EXPORTS = $(EXTRA_BUILD_EXPORT-$(GARVERSION)) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv Modified: csw/mgar/pkg/glib/trunk/checksums =================================================================== --- csw/mgar/pkg/glib/trunk/checksums 2010-03-15 09:48:36 UTC (rev 9184) +++ csw/mgar/pkg/glib/trunk/checksums 2010-03-15 13:48:52 UTC (rev 9185) @@ -1 +1,2 @@ -6fe30dad87c77b91b632def29dd69ef9 download/glib-1.2.10.tar.gz +6fe30dad87c77b91b632def29dd69ef9 glib-1.2.10.tar.gz +cf44901e30edebe13b32da1bee852193 glib-1.3.15.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 Mon Mar 15 15:45:30 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 15 Mar 2010 14:45:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9186] csw/mgar/pkg/spidermonkey/trunk Message-ID: Revision: 9186 http://gar.svn.sourceforge.net/gar/?rev=9186&view=rev Author: skayser Date: 2010-03-15 14:45:30 +0000 (Mon, 15 Mar 2010) Log Message: ----------- spidermonkey: bumped to 1.7, switched to GARv2 Modified Paths: -------------- csw/mgar/pkg/spidermonkey/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/spidermonkey/trunk/files/CSWspidermonkey.gspec Property Changed: ---------------- csw/mgar/pkg/spidermonkey/trunk/ Property changes on: csw/mgar/pkg/spidermonkey/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/spidermonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/Makefile 2010-03-15 13:48:52 UTC (rev 9185) +++ csw/mgar/pkg/spidermonkey/trunk/Makefile 2010-03-15 14:45:30 UTC (rev 9186) @@ -1,22 +1,21 @@ GARNAME = spidermonkey -GARVERSION = 1.5 +GARVERSION = 1.7.0 CATEGORIES = lib -DESCRIPTION = SpiderMonkey JS library +DESCRIPTION = The Mozilla SpiderMonkey JavaScript interpreter and library define BLURB SpiderMonkey JS library endef +VENDOR_URL = http://www.mozilla.org/js/spidermonkey/ MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/js/ -DISTFILES = js-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWspidermonkey,) +DISTFILES = js-$(GARVERSION).tar.gz +UFILES_REGEX = js-(\d+(?:\.\d+)*).tar.gz + # the sun5.8 x86 config file is missing so # we are using our own -DISTFILES += SunOS5.8_i86pc.mk +#DISTFILES += SunOS5.8_i86pc.mk -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = js-(\d+(?:\.\d+)*).tar.gz - DISTNAME = js # we find the os string used by the makefile by using Deleted: csw/mgar/pkg/spidermonkey/trunk/files/CSWspidermonkey.gspec =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/files/CSWspidermonkey.gspec 2010-03-15 13:48:52 UTC (rev 9185) +++ csw/mgar/pkg/spidermonkey/trunk/files/CSWspidermonkey.gspec 2010-03-15 14:45:30 UTC (rev 9186) @@ -1,38 +0,0 @@ -%var bitname spidermonkey -%var pkgname CSWspidermonkey -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright -Version: MPL 1.1/GPL 2.0/LGPL 2.1 - -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -The Original Code is Mozilla Communicator client code, released -March 31, 1998. - -The Initial Developer of the Original Code is -Netscape Communications Corporation. -Portions created by the Initial Developer are Copyright (C) 1998 -the Initial Developer. All Rights Reserved. - -Contributor(s): - -Alternatively, the contents of this file may be used under the terms of -either of the GNU General Public License Version 2 or later (the "GPL"), -or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. - 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 Mar 15 16:23:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Mar 2010 15:23:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[9187] csw/mgar/pkg/tk Message-ID: Revision: 9187 http://gar.svn.sourceforge.net/gar/?rev=9187&view=rev Author: dmichelsen Date: 2010-03-15 15:23:52 +0000 (Mon, 15 Mar 2010) Log Message: ----------- tk: Move legacy to tags/ Added Paths: ----------- csw/mgar/pkg/tk/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/tk/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 Mon Mar 15 18:40:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Mar 2010 17:40:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9188] csw/mgar/pkg/libtasn1/trunk Message-ID: Revision: 9188 http://gar.svn.sourceforge.net/gar/?rev=9188&view=rev Author: dmichelsen Date: 2010-03-15 17:40:32 +0000 (Mon, 15 Mar 2010) Log Message: ----------- libtasn1: Update to 2.5 Modified Paths: -------------- csw/mgar/pkg/libtasn1/trunk/Makefile csw/mgar/pkg/libtasn1/trunk/checksums Modified: csw/mgar/pkg/libtasn1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtasn1/trunk/Makefile 2010-03-15 15:23:52 UTC (rev 9187) +++ csw/mgar/pkg/libtasn1/trunk/Makefile 2010-03-15 17:40:32 UTC (rev 9188) @@ -1,5 +1,5 @@ GARNAME = libtasn1 -GARVERSION = 2.4 +GARVERSION = 2.5 CATEGORIES = lib DESCRIPTION = GNU ASN1 library Modified: csw/mgar/pkg/libtasn1/trunk/checksums =================================================================== --- csw/mgar/pkg/libtasn1/trunk/checksums 2010-03-15 15:23:52 UTC (rev 9187) +++ csw/mgar/pkg/libtasn1/trunk/checksums 2010-03-15 17:40:32 UTC (rev 9188) @@ -1 +1 @@ -bdfd59d6eb7924350e91367eb8adaa3c libtasn1-2.4.tar.gz +e60b863697713c3d6a59b1e8c6f9b0d1 libtasn1-2.5.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 Mar 15 18:43:29 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Mar 2010 17:43:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9189] csw/mgar/pkg/gnutls/trunk Message-ID: Revision: 9189 http://gar.svn.sourceforge.net/gar/?rev=9189&view=rev Author: dmichelsen Date: 2010-03-15 17:43:29 +0000 (Mon, 15 Mar 2010) Log Message: ----------- gnutls: Update to 2.8.6 Modified Paths: -------------- csw/mgar/pkg/gnutls/trunk/Makefile csw/mgar/pkg/gnutls/trunk/checksums Modified: csw/mgar/pkg/gnutls/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls/trunk/Makefile 2010-03-15 17:40:32 UTC (rev 9188) +++ csw/mgar/pkg/gnutls/trunk/Makefile 2010-03-15 17:43:29 UTC (rev 9189) @@ -1,5 +1,5 @@ GARNAME = gnutls -GARVERSION = 2.9.9 +GARVERSION = 2.8.6 CATEGORIES = lib DESCRIPTION = GNU Transport Layer Security libraries and tools Modified: csw/mgar/pkg/gnutls/trunk/checksums =================================================================== --- csw/mgar/pkg/gnutls/trunk/checksums 2010-03-15 17:40:32 UTC (rev 9188) +++ csw/mgar/pkg/gnutls/trunk/checksums 2010-03-15 17:43:29 UTC (rev 9189) @@ -1,4 +1,4 @@ -0d144230c388b74ba2339ac096e21823 gnutls-2.9.9.tar.bz2 +eb0a6d7d3cb9ac684d971c14f9f6d3ba gnutls-2.8.6.tar.bz2 073c509902375c40b885f5adc9f7dba9 libgnutls-openssl.so.13.i 02e4011d400d262b8d4b5c7311d8a5b0 libgnutls-openssl.so.13.s b0eee0d29e3d260a146e626c6ca75b16 libgnutls.so.13.i 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 Mar 15 20:59:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Mar 2010 19:59:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9190] csw/mgar/pkg/libtasn1/trunk/Makefile Message-ID: Revision: 9190 http://gar.svn.sourceforge.net/gar/?rev=9190&view=rev Author: dmichelsen Date: 2010-03-15 19:59:11 +0000 (Mon, 15 Mar 2010) Log Message: ----------- libtasn1: Split off devel Modified Paths: -------------- csw/mgar/pkg/libtasn1/trunk/Makefile Modified: csw/mgar/pkg/libtasn1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtasn1/trunk/Makefile 2010-03-15 17:43:29 UTC (rev 9189) +++ csw/mgar/pkg/libtasn1/trunk/Makefile 2010-03-15 19:59:11 UTC (rev 9190) @@ -12,19 +12,31 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PACKAGES = CSWlibtasn1 CSWlibtasn1devel + +CATALOGNAME_CSWlibtasn1 = libtasn1 +CATALOGNAME_CSWlibtasn1devel = libtasn1_devel + +SPKG_DESC_CSWlibtasn1 = $(DESCRIPTION) +SPKG_DESC_CSWlibtasn1devel = Development files for libtasn1 + +RUNTIME_DEP_PKGS_CSWlibtasn1devel = CSWlibtasn1 + SPKG_SOURCEURL = http://www.gnu.org/software/gnutls/ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = - BUILD64 = 1 - +NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-static TEST_TARGET = check +MERGE_DIRS_isa-extra = $(libdir) + +PKGFILES_CSWlibtasn1devel = $(PKGFILES_DEVEL) + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Mar 15 22:34:20 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 15 Mar 2010 21:34:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9191] csw/mgar/pkg/poppler/trunk Message-ID: Revision: 9191 http://gar.svn.sourceforge.net/gar/?rev=9191&view=rev Author: hson Date: 2010-03-15 21:34:20 +0000 (Mon, 15 Mar 2010) Log Message: ----------- poppler: Fix for dependency loop Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile csw/mgar/pkg/poppler/trunk/checksums Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2010-03-15 19:59:11 UTC (rev 9190) +++ csw/mgar/pkg/poppler/trunk/Makefile 2010-03-15 21:34:20 UTC (rev 9191) @@ -11,24 +11,63 @@ SPKG_SOURCEURL = http://poppler.freedesktop.org/ MASTER_SITES = http://poppler.freedesktop.org/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += old_libs_i386.tar.bz2 +DISTFILES += old_libs_sparc.tar.bz2 -PATCHFILES += missing-includes.patch +PACKAGES = CSWpoppler CSWlibpoppler CSWlibpopplerdev CSWlibpopplerdoc +CATALOGNAME_CSWpoppler = poppler +CATALOGNAME_CSWlibpoppler = libpoppler +CATALOGNAME_CSWlibpopplerdev = libpoppler_devel +CATALOGNAME_CSWlibpopplerdoc = libpoppler_doc +SPKG_DESC_CSWpoppler = $(DESCRIPTION) - utilities +SPKG_DESC_CSWlibpoppler = $(DESCRIPTION) +SPKG_DESC_CSWlibpopplerdev = $(DESCRIPTION) - developer package +SPKG_DESC_CSWlibpopplerdoc = $(DESCRIPTION) - documentation -# 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 +PKGFILES_CSWlibpoppler= $(PKGFILES_RT) +PKGFILES_CSWlibpopplerdev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibpopplerdoc = $(sharedstatedir)/gtk-doc/.* + +INCOMPATIBLE_PKGS_CSWpoppler = CSWxpdf + +RUNTIME_DEP_PKGS_CSWpoppler += CSWfconfig +RUNTIME_DEP_PKGS_CSWpoppler += CSWftype2 +RUNTIME_DEP_PKGS_CSWpoppler += CSWjpeg +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibxml2 + +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWjpeg +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWlibcairo +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWpango +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWzlib + +CHECKPKG_OVERRIDES_CSWlibpopplerdev += missing-dependency|CSWlibpoppler + +#PATCHFILES += missing-includes.patch + # UPSTREAM_MASTER_SITES = UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz BUILD64 = 1 +# Fix for making sure libtool doesn't pick up libpoppler.so from /opt/csw/lib +# when relinking libpoppler-glib during install phaze +EXTRA_SOS_LD_FLAGS += -L$(abspath $(WORKSRC)/poppler/.libs) + CONFIGURE_ARGS = $(DIRPATHS) -RUNTIME_DEP_PKGS += CSWfconfig -RUNTIME_DEP_PKGS += CSWftype2 -RUNTIME_DEP_PKGS += CSWggettextrt -RUNTIME_DEP_PKGS += CSWglib2 -RUNTIME_DEP_PKGS += CSWjpeg -RUNTIME_DEP_PKGS += CSWlibxml2 -RUNTIME_DEP_PKGS += CSWzlib +include gar/category.mk -include gar/category.mk +post-install-isa-sparcv8: + (cd $(INSTALLISADIR)$(libdir);bzip2 -dc $(CURDIR)/$(DOWNLOADDIR)/old_libs_sparc.tar.bz2|tar xf -) + $(MAKECOOKIE) + +post-install-isa-i386: + (cd $(INSTALLISADIR)$(libdir);bzip2 -dc $(CURDIR)/$(DOWNLOADDIR)/old_libs_i386.tar.bz2|tar xf -) + $(MAKECOOKIE) Modified: csw/mgar/pkg/poppler/trunk/checksums =================================================================== --- csw/mgar/pkg/poppler/trunk/checksums 2010-03-15 19:59:11 UTC (rev 9190) +++ csw/mgar/pkg/poppler/trunk/checksums 2010-03-15 21:34:20 UTC (rev 9191) @@ -1,2 +1,3 @@ -bf4abf5006e4a812d00567eeea42faaa missing-includes.patch -4155346f9369b192569ce9184ff73e43 poppler-0.12.4.tar.gz +776b02d90c238f08b9a8900d8e4a2580 old_libs_i386.tar.bz2 +eabd006c9b65bac874297157c8b774cb old_libs_sparc.tar.bz2 +e1a2d98ba5a4199f20d7637a7d79a829 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 hson at users.sourceforge.net Mon Mar 15 22:38:48 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 15 Mar 2010 21:38:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9192] csw/mgar/pkg/poppler/branches/0.10.6/Makefile Message-ID: Revision: 9192 http://gar.svn.sourceforge.net/gar/?rev=9192&view=rev Author: hson Date: 2010-03-15 21:38:48 +0000 (Mon, 15 Mar 2010) Log Message: ----------- poppler: Add dependency Modified Paths: -------------- csw/mgar/pkg/poppler/branches/0.10.6/Makefile Modified: csw/mgar/pkg/poppler/branches/0.10.6/Makefile =================================================================== --- csw/mgar/pkg/poppler/branches/0.10.6/Makefile 2010-03-15 21:34:20 UTC (rev 9191) +++ csw/mgar/pkg/poppler/branches/0.10.6/Makefile 2010-03-15 21:38:48 UTC (rev 9192) @@ -46,10 +46,9 @@ RUNTIME_DEP_PKGS_CSWlibpoppler += CSWlibcairo RUNTIME_DEP_PKGS_CSWlibpoppler += CSWlibxml2 RUNTIME_DEP_PKGS_CSWlibpoppler += CSWpango -RUNTIME_DEP_PKGS_CSWlibpoppler += CSWpoppler RUNTIME_DEP_PKGS_CSWlibpoppler += CSWzlib -CHECKPKG_OVERRIDES_CSWlibpopplerdev += missing-dependency|CSWlibpoppler +RUNTIME_DEP_PKGS_CSWlibpopplerdev += CSWlibpoppler #PATCHFILES += missing-includes.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 Mon Mar 15 22:48:45 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 15 Mar 2010 21:48:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[9193] csw/mgar/pkg/poppler/branches/0.10.6/Makefile Message-ID: Revision: 9193 http://gar.svn.sourceforge.net/gar/?rev=9193&view=rev Author: hson Date: 2010-03-15 21:48:45 +0000 (Mon, 15 Mar 2010) Log Message: ----------- poppler: Make doc package archall Modified Paths: -------------- csw/mgar/pkg/poppler/branches/0.10.6/Makefile Modified: csw/mgar/pkg/poppler/branches/0.10.6/Makefile =================================================================== --- csw/mgar/pkg/poppler/branches/0.10.6/Makefile 2010-03-15 21:38:48 UTC (rev 9192) +++ csw/mgar/pkg/poppler/branches/0.10.6/Makefile 2010-03-15 21:48:45 UTC (rev 9193) @@ -50,6 +50,8 @@ RUNTIME_DEP_PKGS_CSWlibpopplerdev += CSWlibpoppler +ARCHALL_CSWlibpopplerdoc = 1 + #PATCHFILES += missing-includes.patch # UPSTREAM_MASTER_SITES = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bchill at users.sourceforge.net Tue Mar 16 01:23:30 2010 From: bchill at users.sourceforge.net (bchill at users.sourceforge.net) Date: Tue, 16 Mar 2010 00:23:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9194] csw/mgar/pkg/librsync/trunk/Makefile Message-ID: Revision: 9194 http://gar.svn.sourceforge.net/gar/?rev=9194&view=rev Author: bchill Date: 2010-03-16 00:23:29 +0000 (Tue, 16 Mar 2010) Log Message: ----------- added configure options to force building of shared libraries Modified Paths: -------------- csw/mgar/pkg/librsync/trunk/Makefile Modified: csw/mgar/pkg/librsync/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsync/trunk/Makefile 2010-03-15 21:48:45 UTC (rev 9193) +++ csw/mgar/pkg/librsync/trunk/Makefile 2010-03-16 00:23:29 UTC (rev 9194) @@ -18,7 +18,9 @@ RUNTIME_DEP_PKGS_CSWlibrsync += CSWlibpopt RUNTIME_DEP_PKGS_CSWlibrsync += CSWzlib -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared=yes +CONFIGURE_ARGS += --enable-static=no TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Mar 16 03:02:00 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 16 Mar 2010 02:02:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9195] csw/mgar/pkg/libxml2/trunk Message-ID: Revision: 9195 http://gar.svn.sourceforge.net/gar/?rev=9195&view=rev Author: bdwalton Date: 2010-03-16 02:02:00 +0000 (Tue, 16 Mar 2010) Log Message: ----------- libxml2: version bump Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile csw/mgar/pkg/libxml2/trunk/checksums Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2010-03-16 00:23:29 UTC (rev 9194) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2010-03-16 02:02:00 UTC (rev 9195) @@ -1,5 +1,5 @@ GARNAME = libxml2 -GARVERSION = 2.7.6 +GARVERSION = 2.7.7 CATEGORIES = lib DESCRIPTION = XML Parser Library Modified: csw/mgar/pkg/libxml2/trunk/checksums =================================================================== --- csw/mgar/pkg/libxml2/trunk/checksums 2010-03-16 00:23:29 UTC (rev 9194) +++ csw/mgar/pkg/libxml2/trunk/checksums 2010-03-16 02:02:00 UTC (rev 9195) @@ -1,3 +1,2 @@ -288c7d9bbe8b1a28eab9421493f1186a 0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch 5e371e0f0921fc7b366c34aded6ae993 ld-symbol-handling-fixup.patch -7740a8ec23878a2f50120e1faa2730f2 libxml2-2.7.6.tar.gz +9abc9959823ca9ff904f1fbcf21df066 libxml2-2.7.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Mar 16 03:06:57 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 16 Mar 2010 02:06:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[9196] csw/mgar/pkg/libxml2/trunk Message-ID: Revision: 9196 http://gar.svn.sourceforge.net/gar/?rev=9196&view=rev Author: bdwalton Date: 2010-03-16 02:06:56 +0000 (Tue, 16 Mar 2010) Log Message: ----------- libxml2: drop patch that was accepted upstream Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2010-03-16 02:02:00 UTC (rev 9195) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2010-03-16 02:06:56 UTC (rev 9196) @@ -10,7 +10,6 @@ MASTER_SITES = ftp://xmlsoft.org/libxml2/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = ld-symbol-handling-fixup.patch -PATCHFILES += 0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Deleted: csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch 2010-03-16 02:02:00 UTC (rev 9195) +++ csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch 2010-03-16 02:06:56 UTC (rev 9196) @@ -1,47 +0,0 @@ -From f2cee2dd783b6c71ea3d98ab9701b9b397753f0a Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Sat, 5 Dec 2009 13:32:49 -0500 -Subject: [PATCH] relaxng.c: cast to allow compilation with sun studio 11 - -Sun Studio 11 was failing to compile relaxng.c due to a type mismatch -in a ternary operator used to provide an argument to xmlRngPErr. It -seems that sos11 cc is more pedantic about this part of the C99 -standard. GCC issues a warning but doesn't fail by default. - -After casting the string literal "nothing" to (const xmlChar *) sos11 -cc is happy. GCC no longer issues a warning either. - -Another warning was cleaned up with an identical cast. - -Signed-off-by: Ben Walton ---- - relaxng.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/relaxng.c b/relaxng.c -index 075fc4a..6dbc499 100644 ---- a/relaxng.c -+++ b/relaxng.c -@@ -5369,7 +5369,8 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node, - } else { - xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT, - "expecting name, anyName, nsName or choice : got %s\n", -- (node == NULL ? "nothing" : node->name), NULL); -+ (node == NULL ? (const xmlChar *) "nothing" : node->name), -+ NULL); - return (NULL); - } - if (ret != def) { -@@ -9459,7 +9460,8 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt, - ctxt->states = NULL; - if (found == 0) { - if (cur == NULL) { -- VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname"); -+ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, -+ (const xmlChar *) "noname"); - } else { - VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name); - } --- -1.6.5.3 - 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 Mar 16 07:52:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Mar 2010 06:52:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9197] csw/mgar/pkg/sysstat/trunk Message-ID: Revision: 9197 http://gar.svn.sourceforge.net/gar/?rev=9197&view=rev Author: dmichelsen Date: 2010-03-16 06:52:46 +0000 (Tue, 16 Mar 2010) Log Message: ----------- sysstat: Update to 20100315 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 2010-03-16 02:06:56 UTC (rev 9196) +++ csw/mgar/pkg/sysstat/trunk/Makefile 2010-03-16 06:52:46 UTC (rev 9197) @@ -1,5 +1,5 @@ GARNAME = sysstat -GARVERSION = 20091228a +GARVERSION = 20100315 CATEGORIES = utils DESCRIPTION = Key system statistics at a glance Modified: csw/mgar/pkg/sysstat/trunk/checksums =================================================================== --- csw/mgar/pkg/sysstat/trunk/checksums 2010-03-16 02:06:56 UTC (rev 9196) +++ csw/mgar/pkg/sysstat/trunk/checksums 2010-03-16 06:52:46 UTC (rev 9197) @@ -1,2 +1,2 @@ 7a7f0f67bb68484b56375d4a922fb63f patch-onlyisaexec-sysstatd.diff -c723b839df3aaad9ea19b0d3a1a3aef0 sysstat-20091228a.tgz +8a5d9095ac0648f41333bb60e3d9f5ee sysstat-20100315.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 16 09:11:25 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 16 Mar 2010 08:11:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[9198] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 9198 http://gar.svn.sourceforge.net/gar/?rev=9198&view=rev Author: bonivart Date: 2010-03-16 08:11:25 +0000 (Tue, 16 Mar 2010) Log Message: ----------- clamav: more fixes for 0.96rc1 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamd Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2010-03-16 06:52:46 UTC (rev 9197) +++ csw/mgar/pkg/clamav/trunk/Makefile 2010-03-16 08:11:25 UTC (rev 9198) @@ -46,6 +46,7 @@ # unrecognized by 0.95rc1? CONFIGURE_ARGS += --with-sendmail=$(libdir)/sendmail CONFIGURE_ARGS += --with-dbdir=/var/opt/csw/$(GARNAME)/db CONFIGURE_ARGS += --localstatedir=/var/opt/csw/$(GARNAME) +CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la @@ -58,8 +59,8 @@ PROTOTYPE_CLASS_1 = ugfiles PROTOTYPE_USER_1 = clamav -INITSMF = /etc/opt/csw/init.d/cswclamd -INITSMF += /etc/opt/csw/init.d/cswclamav-milter +INITSMF = /opt/csw/etc/init.d/cswclamd +INITSMF += /opt/csw/etc/init.d/cswclamav-milter SAMPLECONF = /etc/opt/csw/clamd.conf SAMPLECONF += /etc/opt/csw/clamav-milter.conf SAMPLECONF += /etc/opt/csw/freshclam.conf @@ -86,9 +87,9 @@ post-install-modulated: @echo " ==> Post-install for $(GARNAME) (custom)" - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamd $(DESTDIR)/etc/opt/csw/init.d/cswclamd - @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamav-milter $(DESTDIR)/etc/opt/csw/init.d/cswclamav-milter + @ginstall -d $(DESTDIR)/opt/csw/etc/init.d + @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamd $(DESTDIR)/opt/csw/etc/init.d/cswclamd + @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamav-milter $(DESTDIR)/opt/csw/etc/init.d/cswclamav-milter @ginstall -d $(DESTDIR)$(sysconfdir)/pkg/CSWclamav @ginstall -m 644 $(FILEDIR)/CSWclamav.cswusergroup $(DESTDIR)$(sysconfdir)/pkg/CSWclamav/cswusergroup @ginstall -d $(DOCDEST) @@ -100,4 +101,5 @@ # @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(DOCDEST)/contrib @ginstall -d $(DOCDEST)/html @ginstall -m 644 $(WORKSRC)/docs/html/* $(DOCDEST)/html + @chmod 600 $(DESTDIR)$(sysconfdir)/freshclam.conf @$(MAKECOOKIE) Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2010-03-16 06:52:46 UTC (rev 9197) +++ csw/mgar/pkg/clamav/trunk/checksums 2010-03-16 08:11:25 UTC (rev 9198) @@ -1,3 +1,3 @@ -83ab77147b8ff549a371e1042526102c CSWclamav.clamd.conf.p +a3238ed54a098b66a8e3e9f8bb0ca399 CSWclamav.clamd.conf.p 6c37b881661bf28741bb69045a642790 CSWclamav.freshclam.conf.p 6cb3a716f06f00c73def71aa72ff5f41 clamav-0.96rc1.tar.gz Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p 2010-03-16 06:52:46 UTC (rev 9197) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p 2010-03-16 08:11:25 UTC (rev 9198) @@ -1,5 +1,5 @@ ---- /etc/clamd.conf 2008-12-18 10:50:45.033181389 +0100 -+++ /etc/clamd.conf 2008-12-18 10:46:07.995146244 +0100 +--- /etc/clamd.conf 2010-03-12 16:32:28.977878541 +0100 ++++ /etc/clamd.conf 2010-03-12 16:32:23.707431670 +0100 @@ -5,7 +5,7 @@ @@ -9,3 +9,12 @@ # Uncomment this option to enable logging. # LogFile must be writable for the user running daemon. +@@ -73,7 +73,7 @@ + + # Path to a local socket file the daemon will listen on. + # Default: disabled (must be specified by a user) +-#LocalSocket /tmp/clamd.socket ++LocalSocket /tmp/clamd.socket + + # Sets the group ownership on the unix socket. + # Default: disabled (the primary group of the user running clamd) Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamd =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamd 2010-03-16 06:52:46 UTC (rev 9197) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamd 2010-03-16 08:11:25 UTC (rev 9198) @@ -1,51 +1,36 @@ #!/bin/sh -# -# clamd Start/Stop the clam antivirus daemon. -# -# description: clamd is a standard UNIX program that scans for Viruses. -# processname: clamd -# config: /opt/csw/etc/clamd.conf -# pidfile: /var/opt/csw/clamav/clamd.pid -# modified for CSW -# 2007-02-16 Note that the pid file is now in /var/opt/csw/clamav. So, you -# may need to fix permissions on that directory. -# The clamd file (used to send options to clamd) may now be in -# /etc/opt/csw/. Using this file, you may specify a different location -# for the config file. For example, -c /etc/opt/csw/clamd.conf. Put -# all options on one line. -# 2007-04-14 PidFile name and User are obtained from clamd.conf. If -# the directory does not exist, it is created by this script. -# 2007-10-27 Fix restart script -# 2008-12-10 Peter Bonivart +# 2010-03-12 Peter Bonivart + prog="clamd" progdir="/opt/csw/sbin" -pidfile=`grep '^PidFile' /opt/csw/etc/clamd.conf |awk '{print $2;}'` +conffile="/etc/opt/csw/clamd.conf" +if [ ! -f $conffile ]; then + conffile="/opt/csw/etc/clamd.conf" +fi +if [ ! -f "$conffile" ]; then + echo "ERROR: can not find clamd.conf" + exit 1 +fi + +pidfile=`grep '^PidFile' $conffile | awk '{print $2}'` piddir=`dirname $pidfile` if [ ! -d $piddir ]; then - clamuser=`grep '^User' /opt/csw/etc/clamd.conf |awk '{print $2;}'` - mkdir -p $piddir - chown $clamuser $piddir + clamuser=`grep '^User' $conffile | awk '{print $2}'` + mkdir -p $piddir + chown $clamuser $piddir fi -OPTIONS_FILE="/etc/opt/csw/clamd.conf" -if [ ! -f $OPTIONS_FILE ] ; then - OPTIONS_FILE="/opt/csw/etc/clamd.conf" -fi -if [ ! -f "$OPTIONS_FILE" ]; then - exit 0 -fi - PATH=/usr/sbin:/usr/bin:/opt/csw/sbin:/opt/csw/bin case "$1" in start) - echo "Starting $prog " + echo "Starting $prog ..." $progdir/$prog & ;; stop) - echo "Stopping $prog " + echo "Stopping $prog ..." /usr/bin/pkill -x $prog ;; restart) @@ -61,11 +46,11 @@ $0 start ;; refresh|reload) - echo "Reloading clam daemon configuration: " + echo "Reloading $prog configuration ..." /usr/bin/pkill -HUP -x $prog ;; *) - echo $"Usage: $0 { start|stop|refresh|reload|restart }" + echo "Usage: $0 { start|stop|refresh|reload|restart }" exit 1 esac 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 Mar 16 11:15:35 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 16 Mar 2010 10:15:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[9199] csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile Message-ID: Revision: 9199 http://gar.svn.sourceforge.net/gar/?rev=9199&view=rev Author: idogan23 Date: 2010-03-16 10:15:35 +0000 (Tue, 16 Mar 2010) Log Message: ----------- pm_convertuulib: add PACKAGING_PLATFORMS variable Modified Paths: -------------- csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile Modified: csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile 2010-03-16 08:11:25 UTC (rev 9198) +++ csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile 2010-03-16 10:15:35 UTC (rev 9199) @@ -13,4 +13,6 @@ PACKAGES = CSWpmconvertuulib CATALOGNAME = pm_convertuulib +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 16 11:22:29 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 16 Mar 2010 10:22:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9200] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 9200 http://gar.svn.sourceforge.net/gar/?rev=9200&view=rev Author: bonivart Date: 2010-03-16 10:22:29 +0000 (Tue, 16 Mar 2010) Log Message: ----------- pkgutil: 2.0 beta 1 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2010-03-16 10:15:35 UTC (rev 9199) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2010-03-16 10:22:29 UTC (rev 9200) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.10 +GARVERSION = 2.0b1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2010-03-16 10:15:35 UTC (rev 9199) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2010-03-16 10:22:29 UTC (rev 9200) @@ -1,8 +1,8 @@ a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec -53d703bf8258a0667bb0a20dd229ce78 CSWpkgutil.postinstall -2fb6c94a2d212f08b71d462082a2d31a CSWpkgutil.preremove +f5a00bd5eedf3b967fafbf29dc389e4c CSWpkgutil.postinstall +95003b45c574ae06ba92ad0adee1e3dd CSWpkgutil.preremove a0e549282bf18241e4490ed6b051b92a CSWpkgutil.prototype b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py 7ad27336f90e73da3254a61d91025ee5 cswcatalog 3a6b789b3d5e05f41d2363dd26a92acf opencsw.py -e826e72d1e0195ad48b385df5298a98e pkgutil-1.10.zip +79d42025a6c478123f0de319cd4a29fd pkgutil-2.0b1.zip Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall 2010-03-16 10:15:35 UTC (rev 9199) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall 2010-03-16 10:22:29 UTC (rev 9200) @@ -7,21 +7,24 @@ echo if [ ! -f "$ETC1/pkgutil.conf" ]; then + echo "Copying sample pkgutil.conf to /opt/csw/etc." cp -p $ETC1/pkgutil.conf.CSW $ETC1/pkgutil.conf else - echo "pkgutil.conf already exists, will not copy pkgutil.conf.CSW to it." + echo "/opt/csw/etc/pkgutil.conf already exists, will not copy pkgutil.conf.CSW to it." fi if [ ! -f "$ETC2/pkgutil.conf" ]; then + echo "Copying sample pkgutil.conf to /etc/opt/csw." cp -p $ETC2/pkgutil.conf.CSW $ETC2/pkgutil.conf else - echo "pkgutil.conf already exists, will not copy pkgutil.conf.CSW to it." + echo "/etc/opt/csw/pkgutil.conf already exists, will not copy pkgutil.conf.CSW to it." fi if [ ! -f "$VAR/admin" ]; then + echo "Copying sample admin to /var/opt/csw/pkgutil." cp -p $VAR/admin.CSW $VAR/admin else - echo "admin already exists, will not copy admin.CSW to it." + echo "/var/opt/csw/pkutil/admin already exists, will not copy admin.CSW to it." fi echo Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove 2010-03-16 10:15:35 UTC (rev 9199) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove 2010-03-16 10:22:29 UTC (rev 9200) @@ -7,19 +7,19 @@ echo if [ "`cmp "$ETC1/pkgutil.conf" "$ETC1/pkgutil.conf.CSW"`" ]; then - echo "pkgutil.conf modified, will not remove it." + echo "/opt/csw/etc/pkgutil.conf modified, will not remove it." else /bin/rm $ETC1/pkgutil.conf fi if [ "`cmp "$ETC2/pkgutil.conf" "$ETC2/pkgutil.conf.CSW"`" ]; then - echo "pkgutil.conf modified, will not remove it." + echo "/etc/opt/csw/pkgutil.conf modified, will not remove it." else /bin/rm $ETC2/pkgutil.conf fi if [ "`cmp "$VAR/admin" "$VAR/admin.CSW"`" ]; then - echo "admin modified, will not remove it." + echo "/var/opt/csw/pkgutil/admin modified, will not remove it." else /bin/rm $VAR/admin 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 Tue Mar 16 13:52:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Mar 2010 12:52:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9201] csw/mgar/pkg Message-ID: Revision: 9201 http://gar.svn.sourceforge.net/gar/?rev=9201&view=rev Author: dmichelsen Date: 2010-03-16 12:52:37 +0000 (Tue, 16 Mar 2010) Log Message: ----------- ftgl: Initial commit, needs CSWmesa compiled against csw x11 first Added Paths: ----------- csw/mgar/pkg/ftgl/ csw/mgar/pkg/ftgl/branches/ csw/mgar/pkg/ftgl/tags/ csw/mgar/pkg/ftgl/trunk/ csw/mgar/pkg/ftgl/trunk/Makefile csw/mgar/pkg/ftgl/trunk/checksums csw/mgar/pkg/ftgl/trunk/files/ Property changes on: csw/mgar/pkg/ftgl/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/ftgl/trunk/Makefile =================================================================== --- csw/mgar/pkg/ftgl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ftgl/trunk/Makefile 2010-03-16 12:52:37 UTC (rev 9201) @@ -0,0 +1,34 @@ +GARNAME = ftgl +GARVERSION = 2.1.3-rc5 +CATEGORIES = lib + +DESCRIPTION = Library that uses Freetype2 to simplify rendering fonts in OpenGL applications +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +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 + +WORKSRC = $(WORKDIR)/$(GARNAME)-2.1.3~rc5 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +NOISAEXEC = 1 +NOISALIST = 1 +BUILD64 = 1 + +# Remove after rebuild of CSWmesa against OpenCSW X11 +EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so.0 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS += --with-gl-inc=$(includedir) +CONFIGURE_ARGS += --with-gl-lib=$(libdir) + +include gar/category.mk Added: csw/mgar/pkg/ftgl/trunk/checksums =================================================================== --- csw/mgar/pkg/ftgl/trunk/checksums (rev 0) +++ csw/mgar/pkg/ftgl/trunk/checksums 2010-03-16 12:52:37 UTC (rev 9201) @@ -0,0 +1 @@ +c7879018cde844059495b3029b0b6503 ftgl-2.1.3-rc5.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 Tue Mar 16 13:53:28 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Mar 2010 12:53:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[9202] csw/mgar/pkg Message-ID: Revision: 9202 http://gar.svn.sourceforge.net/gar/?rev=9202&view=rev Author: dmichelsen Date: 2010-03-16 12:53:28 +0000 (Tue, 16 Mar 2010) Log Message: ----------- gource: Initial commit, needs ftgl first Added Paths: ----------- csw/mgar/pkg/gource/ csw/mgar/pkg/gource/branches/ csw/mgar/pkg/gource/tags/ csw/mgar/pkg/gource/trunk/ csw/mgar/pkg/gource/trunk/Makefile csw/mgar/pkg/gource/trunk/checksums csw/mgar/pkg/gource/trunk/files/ Property changes on: csw/mgar/pkg/gource/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/gource/trunk/Makefile =================================================================== --- csw/mgar/pkg/gource/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gource/trunk/Makefile 2010-03-16 12:53:28 UTC (rev 9202) @@ -0,0 +1,17 @@ +GARNAME = gource +GARVERSION = 0.26 +CATEGORIES = apps + +DESCRIPTION = Software version control visualization +define BLURB +endef + +MASTER_SITES = $(GOOGLE_MIRROR) +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 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/gource/trunk/checksums =================================================================== --- csw/mgar/pkg/gource/trunk/checksums (rev 0) +++ csw/mgar/pkg/gource/trunk/checksums 2010-03-16 12:53:28 UTC (rev 9202) @@ -0,0 +1 @@ +e5f0b2c1f76d76fef1e318c0a421a111 gource-0.26.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 Mar 16 14:35:08 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Mar 2010 13:35:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9203] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 9203 http://gar.svn.sourceforge.net/gar/?rev=9203&view=rev Author: dmichelsen Date: 2010-03-16 13:35:08 +0000 (Tue, 16 Mar 2010) Log Message: ----------- mGAR v2: Fix collapsed modulations Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-03-16 12:53:28 UTC (rev 9202) +++ csw/mgar/gar/v2/gar.mk 2010-03-16 13:35:08 UTC (rev 9203) @@ -228,8 +228,7 @@ # Instead of $(myvar_$(MODULATION)) $(call modulationvalue,myvar) define modulationvalue $(strip $(or $($(1)_$(MODULATION)),\ - $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisa)),\ - $($(1)_$(call __isacollapsedmodulation,$(strip $(MODULATORS)),__collapsedisaextra))\ + $($(1)_$(MODULATION_ISACOLLAPSED)),\ )) endef @@ -613,7 +612,7 @@ endif # These directories get relocated into their ISA subdirectories -MERGE_DIRS ?= $(MERGE_DIRS_$(MODULATION)) +MERGE_DIRS ?= $(call modulationvalue,MERGE_DIRS) ifneq ($(COMMON_PKG_DEPENDS),) _EXTRA_GAR_PKGS += $(COMMON_PKG_DEPENDS) 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 Mar 16 15:10:15 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Mar 2010 14:10:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9204] csw/mgar/pkg Message-ID: Revision: 9204 http://gar.svn.sourceforge.net/gar/?rev=9204&view=rev Author: dmichelsen Date: 2010-03-16 14:10:14 +0000 (Tue, 16 Mar 2010) Log Message: ----------- svnstat: Initial commit, stub for now, need to figure how out to deploy Java apps best Added Paths: ----------- csw/mgar/pkg/svnstat/ csw/mgar/pkg/svnstat/branches/ csw/mgar/pkg/svnstat/tags/ csw/mgar/pkg/svnstat/trunk/ csw/mgar/pkg/svnstat/trunk/Makefile csw/mgar/pkg/svnstat/trunk/checksums csw/mgar/pkg/svnstat/trunk/files/ Property changes on: csw/mgar/pkg/svnstat/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/svnstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/svnstat/trunk/Makefile (rev 0) +++ csw/mgar/pkg/svnstat/trunk/Makefile 2010-03-16 14:10:14 UTC (rev 9204) @@ -0,0 +1,20 @@ +GARNAME = svnstat +GARVERSION = 1.0 +CATEGORIES = apps + +DESCRIPTION = Statistic reports and report graphs similar to StatCvs from Subversion +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +DISTNAME = SvnStat-$(GARVERSION) +DISTFILES = $(DISTNAME).zip + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = SvnStat-(\d+(?:\.\d+)*).zip + +VENDOR_URL = http://svnstat.sourceforge.net/ + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/svnstat/trunk/checksums =================================================================== --- csw/mgar/pkg/svnstat/trunk/checksums (rev 0) +++ csw/mgar/pkg/svnstat/trunk/checksums 2010-03-16 14:10:14 UTC (rev 9204) @@ -0,0 +1 @@ +2bfc81360a175423c41d8d2d98f90633 SvnStat-1.0.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 Tue Mar 16 15:41:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Mar 2010 14:41:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9205] csw/mgar/pkg/glib/trunk Message-ID: Revision: 9205 http://gar.svn.sourceforge.net/gar/?rev=9205&view=rev Author: dmichelsen Date: 2010-03-16 14:41:58 +0000 (Tue, 16 Mar 2010) Log Message: ----------- glib: Add modulation and split off devel Modified Paths: -------------- csw/mgar/pkg/glib/trunk/Makefile csw/mgar/pkg/glib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/glib/trunk/files/0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch Modified: csw/mgar/pkg/glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib/trunk/Makefile 2010-03-16 14:10:14 UTC (rev 9204) +++ csw/mgar/pkg/glib/trunk/Makefile 2010-03-16 14:41:58 UTC (rev 9205) @@ -5,6 +5,8 @@ EXTRA_MODULATORS = GARVERSION MODULATIONS_GARVERSION = 1.2.10 1.3.15 +SKIP_MODULATIONS = isa-sparcv9-garversion-1.2.10 isa-amd64-garversion-1.2.10 + DESCRIPTION = Utility library commonly associated with GNOME programs define BLURB GLib is a library containing many useful C routines for things such as trees, @@ -16,15 +18,28 @@ SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)-$(VERSION).tar.gz) DISTFILES = $(SOURCEFILES) NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) +PATCHFILES_isa-i386-garversion-1.3.15 = 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch +PATCHFILES_isa-sparcv8-garversion-1.3.15 = 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch +PATCHFILES_isa-sparcv9-garversion-1.3.15 = 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch -DEP_PKGS = CSWggettextrt CSWiconv +PACKAGES = CSWglib CSWglibdevel +CATALOGNAME_CSWglib = glib +CATALOGNAME_CSWglibdevel = glib_devel + +SPKG_DESC_CSWglib = $(DESCRIPTION) +SPKG_DESC_CSWglibdevel = Development files for glib + +RUNTIME_DEP_PKGS_CSWglib = CSWggettextrt CSWiconv +RUNTIME_DEP_PKGS_CSWglibdevel = CSWglib +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWglib) + # glib 1.x doesn't seem to be 64 bit clean -#BUILD64 = 1 -#NOISAEXEC = 1 +BUILD64 = 1 +NOISAEXEC = 1 # Only needed for 1.3.x -SGML_CATALOG_FILES = $(sysconfdir)/sgml/catalog +SGML_CATALOG_FILES = /etc/opt/csw/sgml/catalog EXTRA_BUILD_EXPORT-1.3.15 = SGML_CATALOG_FILES EXTRA_BUILD_EXPORTS = $(EXTRA_BUILD_EXPORT-$(GARVERSION)) @@ -33,9 +48,23 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +# There are three possible harmless tests failing for 1.3.15 64 bit, so skip for now +TEST_SCRIPTS_isa-default-garversion-1.2.10 = $(WORKSRC)/Makefile +TEST_SCRIPTS_isa-default-garversion-1.3.15 = $(WORKSRC)/Makefile +TEST_SCRIPTS = $(call modulationvalue,TEST_SCRIPTS) + TEST_TARGET = check #provided by iconv MERGE_EXCLUDE_FILES = .*/charset.alias +MERGE_SCRIPTS_isa-default-garversion-1.2.10 = copy-only +MERGE_DIRS_isa-default-garversion-1.2.10 = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-1.3.15 = copy-all +MERGE_DIRS_isa-extra-garversion-1.3.15 = $(libdir) +MERGE_SCRIPTS_isa-extra-garversion-1.3.15 = copy-relocated-only + +PKGFILES_CSWglibdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWglibdevel += $(sharedstatedir)/gtk-doc/.* + include gar/category.mk Modified: csw/mgar/pkg/glib/trunk/checksums =================================================================== --- csw/mgar/pkg/glib/trunk/checksums 2010-03-16 14:10:14 UTC (rev 9204) +++ csw/mgar/pkg/glib/trunk/checksums 2010-03-16 14:41:58 UTC (rev 9205) @@ -1,2 +1,3 @@ +59acd3287366b4313eab0eaed5db1459 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch 6fe30dad87c77b91b632def29dd69ef9 glib-1.2.10.tar.gz cf44901e30edebe13b32da1bee852193 glib-1.3.15.tar.gz Added: csw/mgar/pkg/glib/trunk/files/0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch =================================================================== --- csw/mgar/pkg/glib/trunk/files/0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch (rev 0) +++ csw/mgar/pkg/glib/trunk/files/0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch 2010-03-16 14:41:58 UTC (rev 9205) @@ -0,0 +1,67 @@ +From 10920de07030b7407cd5ff9a243e02083a96a2fb Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 15 Mar 2010 16:02:12 +0100 +Subject: [PATCH] gtkdoc-mkhtml returns 1 on warnings + +--- + docs/reference/glib/Makefile.am | 2 +- + docs/reference/glib/Makefile.in | 2 +- + docs/reference/gobject/Makefile.am | 2 +- + docs/reference/gobject/Makefile.in | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am +index e44a3c2..14f9cb1 100644 +--- a/docs/reference/glib/Makefile.am ++++ b/docs/reference/glib/Makefile.am +@@ -148,7 +148,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo '*** Building HTML ***' + rm -rf $(srcdir)/html + mkdir $(srcdir)/html +- cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ -cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo '-- Fixing Crossreferences' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +diff --git a/docs/reference/glib/Makefile.in b/docs/reference/glib/Makefile.in +index 35b867f..3581cae 100644 +--- a/docs/reference/glib/Makefile.in ++++ b/docs/reference/glib/Makefile.in +@@ -400,7 +400,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean + @ENABLE_GTK_DOC_TRUE@ @echo '*** Building HTML ***' + @ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html + @ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html +- at ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ at ENABLE_GTK_DOC_TRUE@ -cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + @ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences' + @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am +index 2462df3..e8fe488 100644 +--- a/docs/reference/gobject/Makefile.am ++++ b/docs/reference/gobject/Makefile.am +@@ -126,7 +126,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo '*** Building HTML ***' + rm -rf $(srcdir)/html + mkdir $(srcdir)/html +- cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ -cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo '-- Fixing Crossreferences' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +diff --git a/docs/reference/gobject/Makefile.in b/docs/reference/gobject/Makefile.in +index 6182c8d..0cb73aa 100644 +--- a/docs/reference/gobject/Makefile.in ++++ b/docs/reference/gobject/Makefile.in +@@ -375,7 +375,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean + @ENABLE_GTK_DOC_TRUE@ @echo '*** Building HTML ***' + @ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html + @ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html +- at ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ at ENABLE_GTK_DOC_TRUE@ -cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + @ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences' + @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +-- +1.7.0 + 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 Mar 16 15:45:20 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 16 Mar 2010 14:45:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9206] csw/mgar/pkg/fftw/trunk/Makefile Message-ID: Revision: 9206 http://gar.svn.sourceforge.net/gar/?rev=9206&view=rev Author: hson Date: 2010-03-16 14:45:14 +0000 (Tue, 16 Mar 2010) Log Message: ----------- fftw: Add configure options for enabling shared lib etc. Modified Paths: -------------- csw/mgar/pkg/fftw/trunk/Makefile Modified: csw/mgar/pkg/fftw/trunk/Makefile =================================================================== --- csw/mgar/pkg/fftw/trunk/Makefile 2010-03-16 14:41:58 UTC (rev 9205) +++ csw/mgar/pkg/fftw/trunk/Makefile 2010-03-16 14:45:14 UTC (rev 9206) @@ -21,7 +21,16 @@ BUILD64 = 1 NOISAEXEC = 1 + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared=yes +CONFIGURE_ARGS += --enable-alloca +CONFIGURE_ARGS += --enable-static=no +#CONFIGURE_ARGS += --enable-mpi +CONFIGURE_ARGS += --enable-portable-binary +CONFIGURE_ARGS += --disable-fortran +#CONFIGURE_ARGS += --enable-openmp +CONFIGURE_ARGS += --enable-threads TEST_TARGET = check 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 Mar 16 16:21:15 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 16 Mar 2010 15:21:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9207] csw/mgar/pkg/liblqr/trunk Message-ID: Revision: 9207 http://gar.svn.sourceforge.net/gar/?rev=9207&view=rev Author: hson Date: 2010-03-16 15:21:15 +0000 (Tue, 16 Mar 2010) Log Message: ----------- liblqr: Fixes for strange link error Modified Paths: -------------- csw/mgar/pkg/liblqr/trunk/Makefile csw/mgar/pkg/liblqr/trunk/checksums Added Paths: ----------- csw/mgar/pkg/liblqr/trunk/files/examples.diff csw/mgar/pkg/liblqr/trunk/files/inline.diff csw/mgar/pkg/liblqr/trunk/files/lqr_carver.c.diff Modified: csw/mgar/pkg/liblqr/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblqr/trunk/Makefile 2010-03-16 14:45:14 UTC (rev 9206) +++ csw/mgar/pkg/liblqr/trunk/Makefile 2010-03-16 15:21:15 UTC (rev 9207) @@ -29,6 +29,10 @@ UFILES_REGEX = $(GARNAME)-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 +PATCHFILES += inline.diff +PATCHFILES += examples.diff +PATCHFILES += lqr_carver.c.diff + CONFIGURE_ARGS = $(DIRPATHS) STRIP_LIBTOOL=1 Modified: csw/mgar/pkg/liblqr/trunk/checksums =================================================================== --- csw/mgar/pkg/liblqr/trunk/checksums 2010-03-16 14:45:14 UTC (rev 9206) +++ csw/mgar/pkg/liblqr/trunk/checksums 2010-03-16 15:21:15 UTC (rev 9207) @@ -1 +1,4 @@ +a72475efd2dff3ea3c1cca64a3f71353 examples.diff +f63660355a974deaa91963b41601685a inline.diff 0e24ed3c9fcdcb111062640764d7b87a liblqr-1-0.4.1.tar.bz2 +f8e1412341efdd975d7a5ee4c034e4f4 lqr_carver.c.diff Added: csw/mgar/pkg/liblqr/trunk/files/examples.diff =================================================================== --- csw/mgar/pkg/liblqr/trunk/files/examples.diff (rev 0) +++ csw/mgar/pkg/liblqr/trunk/files/examples.diff 2010-03-16 15:21:15 UTC (rev 9207) @@ -0,0 +1,143 @@ +diff -Nru ../build-global/liblqr-1-0.4.1/examples/Makefile liblqr-1-0.4.1/examples/Makefile +--- ../build-global/liblqr-1-0.4.1/examples/Makefile 2009-05-09 18:41:30.000000000 +0200 ++++ liblqr-1-0.4.1/examples/Makefile 2010-03-16 03:08:38.227713387 +0100 +@@ -21,7 +21,6 @@ + tt1out = liquidrescale + tt2out = liquidrescale-basic + +- + # collect flags for the compiler for lqr library + LQR_CFLAGS = `pkg-config --cflags lqr-1` + +@@ -51,9 +50,9 @@ + $(GTHREAD_LIBS) + + # define the flags to use in the various compilation steps +-BASE_FLAGS = -Winline -O2 -Wall ++BASE_FLAGS = + OBJ_BUILD_FLAGS = $(BASE_FLAGS) $(INCLUDES) $(LIBDIRS) +-LINKING_FLAGS = $(OBJ_BUILD_FLAGS) $(LIBS) ++LINKING_FLAGS = $(OBJ_BUILD_FLAGS) $(LIBS) -lgnugetopt + + # compilation rules + +@@ -63,17 +62,17 @@ + + # linking + $(tt1out) : $(tt1obj) +- g++ $(LINKING_FLAGS) -o $(tt1out) $(tt1obj) ++ CC $(LINKING_FLAGS) -o $(tt1out) $(tt1obj) + + $(tt2out) : $(tt2obj) +- g++ $(LINKING_FLAGS) -o $(tt2out) $(tt2obj) ++ CC $(LINKING_FLAGS) -o $(tt2out) $(tt2obj) + + # object building + $(tt1).o : $(tt1).cpp $(tt1).h +- g++ -c $(OBJ_BUILD_FLAGS) $(tt1).cpp ++ CC -c -D__STDC__=1 $(OBJ_BUILD_FLAGS) $(tt1).cpp + + $(tt2).o : $(tt2).cpp +- g++ -c $(OBJ_BUILD_FLAGS) $(tt2).cpp ++ CC -c -D__STDC__=1 $(OBJ_BUILD_FLAGS) $(tt2).cpp + + #cleanup + clean: +diff -Nru ../build-global/liblqr-1-0.4.1/examples/Makefile.orig liblqr-1-0.4.1/examples/Makefile.orig +--- ../build-global/liblqr-1-0.4.1/examples/Makefile.orig 1970-01-01 01:00:00.000000000 +0100 ++++ liblqr-1-0.4.1/examples/Makefile.orig 2010-03-16 03:09:48.023084903 +0100 +@@ -0,0 +1,80 @@ ++# ++# Makefile example for liquidrescale (lqr) library ++# ++# This is thought for exemplification purposes. ++# It will only work if you have already installed ++# the lqr library, the pngwriter and all their ++# required dependencies (glib, z, png, freetype). ++# ++# It does not perform any kind of check on the system, ++# and won't report any sensible error message. ++# ++ ++ ++# set the sources file name ++tt1 = liquidrescale ++tt2 = liquidrescale-basic ++# objects to build ++tt1obj = $(tt1).o ++tt2obj = $(tt2).o ++# executable names ++tt1out = liquidrescale ++tt2out = liquidrescale-basic ++ ++# collect flags for the compiler for lqr library ++LQR_CFLAGS = `pkg-config --cflags lqr-1` ++ ++LQR_LIBS = `pkg-config --libs lqr-1` ++ ++LQR_LIBDIR = `pkg-config --variable=libdir lqr-1` ++ ++# collect flags for pngwriter library ++PNGWRITER_CFLAGS = `freetype-config --cflags` ++ ++PNGWRITER_LIBS = -lpng -lpngwriter -lz -lfreetype ++ ++# collect flags for the compiler for glib thread support ++GTHREAD_LIBS = `pkg-config --libs gthread-2.0` ++ ++# join the flags collected above ++INCLUDES = \ ++ $(LQR_CFLAGS) \ ++ $(PNGWRITER_CFLAGS) ++ ++LIBDIRS = \ ++ -L$(LQR_LIBDIR) ++ ++LIBS = \ ++ $(LQR_LIBS) \ ++ $(PNGWRITER_LIBS) \ ++ $(GTHREAD_LIBS) ++ ++# define the flags to use in the various compilation steps ++BASE_FLAGS = ++OBJ_BUILD_FLAGS = $(BASE_FLAGS) $(INCLUDES) $(LIBDIRS) ++LINKING_FLAGS = $(OBJ_BUILD_FLAGS) $(LIBS) -lgnugetopt ++ ++# compilation rules ++ ++.PHONY : all clean ++ ++all: $(tt1out) $(tt2out) ++ ++# linking ++$(tt1out) : $(tt1obj) ++ CC $(LINKING_FLAGS) -o $(tt1out) $(tt1obj) ++ ++$(tt2out) : $(tt2obj) ++ CC $(LINKING_FLAGS) -o $(tt2out) $(tt2obj) ++ ++# object building ++$(tt1).o : $(tt1).cpp $(tt1).h ++ CC -c -D__STDC__=1 $(OBJ_BUILD_FLAGS) $(tt1).cpp ++ ++$(tt2).o : $(tt2).cpp ++ CC -c -D__STDC__=1 $(OBJ_BUILD_FLAGS) $(tt2).cpp ++ ++#cleanup ++clean: ++ rm -f *~ ctags $(tt1obj) $(tt2obj) $(tt1out) $(tt2out) ++ +diff -Nru ../build-global/liblqr-1-0.4.1/examples/liquidrescale.cpp liblqr-1-0.4.1/examples/liquidrescale.cpp +--- ../build-global/liblqr-1-0.4.1/examples/liquidrescale.cpp 2009-05-11 02:11:50.000000000 +0200 ++++ liblqr-1-0.4.1/examples/liquidrescale.cpp 2010-03-16 03:08:38.252945938 +0100 +@@ -15,9 +15,9 @@ + * along with this program; if not, see + */ + ++#include + #include + #include +-#include + #include "liquidrescale.h" + + using namespace std; Added: csw/mgar/pkg/liblqr/trunk/files/inline.diff =================================================================== --- csw/mgar/pkg/liblqr/trunk/files/inline.diff (rev 0) +++ csw/mgar/pkg/liblqr/trunk/files/inline.diff 2010-03-16 15:21:15 UTC (rev 9207) @@ -0,0 +1,89 @@ +diff -Nru ../build-isa-sparcv9/liblqr-1-0.4.1/lqr/lqr_energy.c liblqr-1-0.4.1/lqr/lqr_energy.c +--- ../build-isa-sparcv9/liblqr-1-0.4.1/lqr/lqr_energy.c 2009-05-11 02:08:03.000000000 +0200 ++++ liblqr-1-0.4.1/lqr/lqr_energy.c 2010-03-16 03:02:27.106285715 +0100 +@@ -44,7 +44,7 @@ + + /* read normalised pixel value from + * rgb buffer at the given index */ +-inline gdouble ++extern inline gdouble + lqr_pixel_get_norm(void *rgb, gint rgb_ind, LqrColDepth col_depth) + { + switch (col_depth) { +@@ -66,7 +66,7 @@ + + /* write pixel from normalised value + * in rgb buffer at the given index */ +-inline void ++extern inline void + lqr_pixel_set_norm(gdouble val, void *rgb, gint rgb_ind, LqrColDepth col_depth) + { + switch (col_depth) { +@@ -90,7 +90,7 @@ + } + } + +-inline gdouble ++extern inline gdouble + lqr_pixel_get_rgbcol(void *rgb, gint rgb_ind, LqrColDepth col_depth, LqrImageType image_type, gint channel) + { + gdouble black_fact = 0; +@@ -115,7 +115,7 @@ + } + } + +-inline gdouble ++extern inline gdouble + lqr_carver_read_brightness_grey(LqrCarver *r, gint x, gint y) + { + gint now = r->raw[y][x]; +@@ -123,7 +123,7 @@ + return lqr_pixel_get_norm(r->rgb, rgb_ind, r->col_depth); + } + +-inline gdouble ++extern inline gdouble + lqr_carver_read_brightness_std(LqrCarver *r, gint x, gint y) + { + gdouble red, green, blue; +@@ -205,7 +205,7 @@ + return bright * alpha_fact; + } + +-inline gdouble ++extern inline gdouble + lqr_carver_read_luma_std(LqrCarver *r, gint x, gint y) + { + gdouble red, green, blue; +diff -Nru ../build-isa-sparcv9/liblqr-1-0.4.1/lqr/lqr_energy_priv.h liblqr-1-0.4.1/lqr/lqr_energy_priv.h +--- ../build-isa-sparcv9/liblqr-1-0.4.1/lqr/lqr_energy_priv.h 2009-05-11 02:08:03.000000000 +0200 ++++ liblqr-1-0.4.1/lqr/lqr_energy_priv.h 2010-03-16 03:02:38.451733418 +0100 +@@ -38,18 +38,18 @@ + #define LQR_SATURATE_(x) (1 / (1 + (1 / (x)))) + #define LQR_SATURATE(x) ((x) >= 0 ? LQR_SATURATE_(x) : -LQR_SATURATE_(-x)) + +-inline gdouble lqr_pixel_get_norm(void *src, gint src_ind, LqrColDepth col_depth); +-inline void lqr_pixel_set_norm(gdouble val, void *rgb, gint rgb_ind, LqrColDepth col_depth); +-inline gdouble lqr_pixel_get_rgbcol(void *rgb, gint rgb_ind, LqrColDepth col_depth, LqrImageType image_type, ++extern inline gdouble lqr_pixel_get_norm(void *src, gint src_ind, LqrColDepth col_depth); ++extern inline void lqr_pixel_set_norm(gdouble val, void *rgb, gint rgb_ind, LqrColDepth col_depth); ++extern inline gdouble lqr_pixel_get_rgbcol(void *rgb, gint rgb_ind, LqrColDepth col_depth, LqrImageType image_type, + gint channel); +-inline gdouble lqr_carver_read_brightness_grey(LqrCarver *r, gint x, gint y); +-inline gdouble lqr_carver_read_brightness_std(LqrCarver *r, gint x, gint y); ++extern inline gdouble lqr_carver_read_brightness_grey(LqrCarver *r, gint x, gint y); ++extern inline gdouble lqr_carver_read_brightness_std(LqrCarver *r, gint x, gint y); + gdouble lqr_carver_read_brightness_custom(LqrCarver *r, gint x, gint y); +-inline gdouble lqr_carver_read_brightness(LqrCarver *r, gint x, gint y); +-inline gdouble lqr_carver_read_luma_std(LqrCarver *r, gint x, gint y); +-inline gdouble lqr_carver_read_luma(LqrCarver *r, gint x, gint y); +-inline gdouble lqr_carver_read_rgba(LqrCarver *r, gint x, gint y, gint channel); +-inline gdouble lqr_carver_read_custom(LqrCarver *r, gint x, gint y, gint channel); ++extern inline gdouble lqr_carver_read_brightness(LqrCarver *r, gint x, gint y); ++extern inline gdouble lqr_carver_read_luma_std(LqrCarver *r, gint x, gint y); ++extern inline gdouble lqr_carver_read_luma(LqrCarver *r, gint x, gint y); ++extern inline gdouble lqr_carver_read_rgba(LqrCarver *r, gint x, gint y, gint channel); ++extern inline gdouble lqr_carver_read_custom(LqrCarver *r, gint x, gint y, gint channel); + + gdouble lqr_carver_read_cached_std(LqrCarver *r, gint x, gint y); + gdouble lqr_carver_read_cached_rgba(LqrCarver *r, gint x, gint y, gint channel); Added: csw/mgar/pkg/liblqr/trunk/files/lqr_carver.c.diff =================================================================== --- csw/mgar/pkg/liblqr/trunk/files/lqr_carver.c.diff (rev 0) +++ csw/mgar/pkg/liblqr/trunk/files/lqr_carver.c.diff 2010-03-16 15:21:15 UTC (rev 9207) @@ -0,0 +1,27 @@ +diff -Nru ../build-global/liblqr-1-0.4.1/lqr/lqr_carver.c liblqr-1-0.4.1/lqr/lqr_carver.c +--- ../build-global/liblqr-1-0.4.1/lqr/lqr_carver.c 2009-05-11 02:08:03.000000000 +0200 ++++ liblqr-1-0.4.1/lqr/lqr_carver.c 2010-03-16 06:27:45.765156213 +0100 +@@ -252,7 +252,11 @@ + r->rigidity_map = g_try_new0(gfloat, 2 * r->delta_x + 1); + r->rigidity_map += r->delta_x; + for (x = -r->delta_x; x <= r->delta_x; x++) { ++#if defined(__sun) && defined(__SUNPRO_C) && (defined(__SunOS_5_9) || defined(__SunOS_5_8)) ++ r->rigidity_map[x] = r->rigidity * pow(fabs(x), 1.5) / r->h; ++#else + r->rigidity_map[x] = r->rigidity * powf(fabsf(x), 1.5) / r->h; ++#endif + } + + r->active = TRUE; +@@ -1221,7 +1225,11 @@ + /* reduce the range if there's no (relevant) difference + * with the previous map */ + if (r->least[data] == least) { ++#if defined(__sun) && defined(__SUNPRO_C) && (defined(__SunOS_5_9) || defined(__SunOS_5_8)) ++ if (fabs(r->m[data] - new_m) < UPDATE_TOLERANCE) { ++#else + if (fabsf(r->m[data] - new_m) < UPDATE_TOLERANCE) { ++#endif + if (stop == 0) { + x_stop = x; + } 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 Mar 16 16:32:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Mar 2010 15:32:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9208] csw/mgar/pkg/fftw/trunk/Makefile Message-ID: Revision: 9208 http://gar.svn.sourceforge.net/gar/?rev=9208&view=rev Author: dmichelsen Date: 2010-03-16 15:32:11 +0000 (Tue, 16 Mar 2010) Log Message: ----------- fftw: Update merging Modified Paths: -------------- csw/mgar/pkg/fftw/trunk/Makefile Modified: csw/mgar/pkg/fftw/trunk/Makefile =================================================================== --- csw/mgar/pkg/fftw/trunk/Makefile 2010-03-16 15:21:15 UTC (rev 9207) +++ csw/mgar/pkg/fftw/trunk/Makefile 2010-03-16 15:32:11 UTC (rev 9208) @@ -34,6 +34,6 @@ TEST_TARGET = check -MERGE_DIRS_isa-extra = $(bindir) +MERGE_DIRS_isa-extra = $(bindir) $(libdir) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Mar 16 17:03:55 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 16 Mar 2010 16:03:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[9209] csw/mgar/pkg/pbzip2/trunk/Makefile Message-ID: Revision: 9209 http://gar.svn.sourceforge.net/gar/?rev=9209&view=rev Author: bensons Date: 2010-03-16 16:03:55 +0000 (Tue, 16 Mar 2010) Log Message: ----------- pbzip2: added note about ISA modulation Modified Paths: -------------- csw/mgar/pkg/pbzip2/trunk/Makefile Modified: csw/mgar/pkg/pbzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pbzip2/trunk/Makefile 2010-03-16 15:32:11 UTC (rev 9208) +++ csw/mgar/pkg/pbzip2/trunk/Makefile 2010-03-16 16:03:55 UTC (rev 9209) @@ -32,6 +32,9 @@ # custom install INSTALL_SCRIPTS = custom +# After some testing. Using a special ISA modulation does *not* speed +# up bzip2. Therefor i will just stick to a regular 32bit build here. + include gar/category.mk pre-build-modulated: 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 Mar 16 18:46:11 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 16 Mar 2010 17:46:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9210] csw/mgar/pkg/lcms/trunk/Makefile Message-ID: Revision: 9210 http://gar.svn.sourceforge.net/gar/?rev=9210&view=rev Author: hson Date: 2010-03-16 17:46:11 +0000 (Tue, 16 Mar 2010) Log Message: ----------- lcms: Tiff package isn't split yet Modified Paths: -------------- csw/mgar/pkg/lcms/trunk/Makefile Modified: csw/mgar/pkg/lcms/trunk/Makefile =================================================================== --- csw/mgar/pkg/lcms/trunk/Makefile 2010-03-16 16:03:55 UTC (rev 9209) +++ csw/mgar/pkg/lcms/trunk/Makefile 2010-03-16 17:46:11 UTC (rev 9210) @@ -32,7 +32,7 @@ SPKG_DESC_CSWpy-lcms += The little color management system and tools - python bindings RUNTIME_DEP_PKGS_CSWlcms += CSWlcmsrt CSWjpeg CSWzlib -RUNTIME_DEP_PKGS_CSWlcms += CSWtiffrt +RUNTIME_DEP_PKGS_CSWlcms += CSWtiff RUNTIME_DEP_PKGS_CSWlcmsrt += RUNTIME_DEP_PKGS_CSWlcmsdevel += CSWlcmsrt RUNTIME_DEP_PKGS_CSWpy-lcms += CSWlcmsrt CSWpython 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 Mar 16 18:47:00 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 16 Mar 2010 17:47:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9211] csw/mgar/pkg/djvulibre/trunk/Makefile Message-ID: Revision: 9211 http://gar.svn.sourceforge.net/gar/?rev=9211&view=rev Author: hson Date: 2010-03-16 17:46:59 +0000 (Tue, 16 Mar 2010) Log Message: ----------- Tiff package isn't split yet Checkpkg doesn't check for symbol-not-found any more Modified Paths: -------------- csw/mgar/pkg/djvulibre/trunk/Makefile Modified: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2010-03-16 17:46:11 UTC (rev 9210) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2010-03-16 17:46:59 UTC (rev 9211) @@ -20,7 +20,7 @@ SPKG_DESC_CSWdjvulibredevel += DjVu standalone viewer, browser plug-in, commandline tools - developer package RUNTIME_DEP_PKGS_CSWdjvulibre += CSWdjvulibrert CSWjpeg CSWzlib -RUNTIME_DEP_PKGS_CSWdjvulibre += CSWtiffrt +RUNTIME_DEP_PKGS_CSWdjvulibre += CSWtiff RUNTIME_DEP_PKGS_CSWdjvulibrert += CSWjpeg RUNTIME_DEP_PKGS_CSWdjvulibredevel += CSWdjvulibrert @@ -29,23 +29,6 @@ CHECKPKG_OVERRIDES_CSWdjvulibredevel += missing-dependency|CSWdjvulibre -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvm -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvused -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvups -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvuserve -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|cpaldjvu -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|csepdjvu -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvuextract -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvutxt -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|cjb2 -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvutoxml -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|c44 -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvuxmlparser -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvumake -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvudump -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|bzz -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|djvmcvt -CHECKPKG_OVERRIDES_CSWdjvulibre += symbol-not-found|ddjvu SPKG_SOURCEURL = http://djvu.sourceforge.net/ 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 Mar 16 20:35:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Mar 2010 19:35:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9212] csw/mgar/pkg/freeglut/trunk Message-ID: Revision: 9212 http://gar.svn.sourceforge.net/gar/?rev=9212&view=rev Author: dmichelsen Date: 2010-03-16 19:35:16 +0000 (Tue, 16 Mar 2010) Log Message: ----------- freeglut: Add patches and flags and tweaks Modified Paths: -------------- csw/mgar/pkg/freeglut/trunk/Makefile csw/mgar/pkg/freeglut/trunk/checksums Added Paths: ----------- csw/mgar/pkg/freeglut/trunk/files/0001-Add-support-for-Sun.patch Modified: csw/mgar/pkg/freeglut/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeglut/trunk/Makefile 2010-03-16 17:46:59 UTC (rev 9211) +++ csw/mgar/pkg/freeglut/trunk/Makefile 2010-03-16 19:35:16 UTC (rev 9212) @@ -8,6 +8,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Add-support-for-Sun.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -16,7 +17,24 @@ DEP_PKGS = CSWmesa +# If we put the include into CPPFLAGS it is too ear\xC3ly in the commandline +# and the installed headers take precedence over the newly built. +CPPFLAGS = +EXTRA_CFLAGS = -I/opt/csw/include + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +# Drop after CSWmesa has been rebuild against CSW X11 +# Drats, doesn't work here. Wait for CSWmesa +# EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +TEST_TARGET = check + include gar/category.mk Modified: csw/mgar/pkg/freeglut/trunk/checksums =================================================================== --- csw/mgar/pkg/freeglut/trunk/checksums 2010-03-16 17:46:59 UTC (rev 9211) +++ csw/mgar/pkg/freeglut/trunk/checksums 2010-03-16 19:35:16 UTC (rev 9212) @@ -1 +1,2 @@ +9fc7b274d0c43a9312f19c5d2aee73d9 0001-Add-support-for-Sun.patch 39f0f2de89f399529d2b981188082218 freeglut-2.6.0.tar.gz Added: csw/mgar/pkg/freeglut/trunk/files/0001-Add-support-for-Sun.patch =================================================================== --- csw/mgar/pkg/freeglut/trunk/files/0001-Add-support-for-Sun.patch (rev 0) +++ csw/mgar/pkg/freeglut/trunk/files/0001-Add-support-for-Sun.patch 2010-03-16 19:35:16 UTC (rev 9212) @@ -0,0 +1,25 @@ +From 0694263dbafc44a75be17021bec553c1fcc329ec Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 16 Mar 2010 20:10:19 +0100 +Subject: [PATCH] Add support for Sun + +--- + src/freeglut_internal.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h +index 2d77ab0..34f84bc 100644 +--- a/src/freeglut_internal.h ++++ b/src/freeglut_internal.h +@@ -46,7 +46,7 @@ + || ( defined(__CYGWIN__) && defined(X_DISPLAY_MISSING) ) + # define TARGET_HOST_MS_WINDOWS 1 + +-#elif defined(__posix__) || defined(__unix__) || defined(__linux__) ++#elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun) + # define TARGET_HOST_POSIX_X11 1 + + #elif defined(__APPLE__) +-- +1.7.0 + 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 Mar 16 20:59:39 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 16 Mar 2010 19:59:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9213] csw/mgar/pkg/djvulibre/trunk/Makefile Message-ID: Revision: 9213 http://gar.svn.sourceforge.net/gar/?rev=9213&view=rev Author: hson Date: 2010-03-16 19:59:39 +0000 (Tue, 16 Mar 2010) Log Message: ----------- djvulibre: Add old libraries for compat Modified Paths: -------------- csw/mgar/pkg/djvulibre/trunk/Makefile Modified: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2010-03-16 19:35:16 UTC (rev 9212) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2010-03-16 19:59:39 UTC (rev 9213) @@ -66,3 +66,11 @@ TEST_TARGET = include gar/category.mk + +post-install-isa-sparcv8: + @cp $(FILEDIR)/libdjvulibre.so.15.s $(INSTALLISADIR)$(libdir)/libdjvulibre.so.15 + $(MAKECOOKIE) + +post-install-isa-i386: + @cp $(FILEDIR)/libdjvulibre.so.15.i $(INSTALLISADIR)$(libdir)/libdjvulibre.so.15 + $(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 Mar 16 23:10:48 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 16 Mar 2010 22:10:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9214] csw/mgar/pkg/cpan/File-Tail/trunk/ Message-ID: Revision: 9214 http://gar.svn.sourceforge.net/gar/?rev=9214&view=rev Author: idogan23 Date: 2010-03-16 22:10:48 +0000 (Tue, 16 Mar 2010) Log Message: ----------- pm_filetail: Changed to mGAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/File-Tail/trunk/ Property changes on: csw/mgar/pkg/cpan/File-Tail/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 idogan23 at users.sourceforge.net Tue Mar 16 23:28:37 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 16 Mar 2010 22:28:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9215] csw/mgar/pkg/cpan/File-Tail/trunk Message-ID: Revision: 9215 http://gar.svn.sourceforge.net/gar/?rev=9215&view=rev Author: idogan23 Date: 2010-03-16 22:28:36 +0000 (Tue, 16 Mar 2010) Log Message: ----------- pm_filetail: changes for gar v2 Modified Paths: -------------- csw/mgar/pkg/cpan/File-Tail/trunk/Makefile csw/mgar/pkg/cpan/File-Tail/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/File-Tail/trunk/files/CSWpmfiletail.gspec Modified: csw/mgar/pkg/cpan/File-Tail/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-Tail/trunk/Makefile 2010-03-16 22:10:48 UTC (rev 9214) +++ csw/mgar/pkg/cpan/File-Tail/trunk/Makefile 2010-03-16 22:28:36 UTC (rev 9215) @@ -10,6 +10,8 @@ logging process with a tool like Tobias Oetiker's MRTG. endef -DISTFILES += CSWpmfiletail.gspec +PACKAGES = CSWpmfiletail +CATALOGNAME = pm_filetail +ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/File-Tail/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-Tail/trunk/checksums 2010-03-16 22:10:48 UTC (rev 9214) +++ csw/mgar/pkg/cpan/File-Tail/trunk/checksums 2010-03-16 22:28:36 UTC (rev 9215) @@ -1,2 +1 @@ -4dbd43ef98fd6b7f72fdd6fdf8daaddc download/CSWpmfiletail.gspec -ef0fb7bcb4181ba593f4a09940f61d1c download/File-Tail-0.99.3.tar.gz +ef0fb7bcb4181ba593f4a09940f61d1c File-Tail-0.99.3.tar.gz Deleted: csw/mgar/pkg/cpan/File-Tail/trunk/files/CSWpmfiletail.gspec =================================================================== --- csw/mgar/pkg/cpan/File-Tail/trunk/files/CSWpmfiletail.gspec 2010-03-16 22:10:48 UTC (rev 9214) +++ csw/mgar/pkg/cpan/File-Tail/trunk/files/CSWpmfiletail.gspec 2010-03-16 22:28:36 UTC (rev 9215) @@ -1,9 +0,0 @@ -%var bitname pm_filetail -%var pkgname CSWpmfiletail -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1997,1998,1999 Matija Grabnar. - -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 hson at users.sourceforge.net Wed Mar 17 04:41:16 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 17 Mar 2010 03:41:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9216] csw/mgar/pkg/exiftool/trunk Message-ID: Revision: 9216 http://gar.svn.sourceforge.net/gar/?rev=9216&view=rev Author: hson Date: 2010-03-17 03:41:16 +0000 (Wed, 17 Mar 2010) Log Message: ----------- exiftool: Update to 8.14 Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile csw/mgar/pkg/exiftool/trunk/checksums csw/mgar/pkg/exiftool/trunk/files/COPYING Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2010-03-16 22:28:36 UTC (rev 9215) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2010-03-17 03:41:16 UTC (rev 9216) @@ -1,5 +1,5 @@ GARNAME = exiftool -GARVERSION = 8.13 +GARVERSION = 8.14 CATEGORIES = cpan DESCRIPTION = Read, Write and Edit Image File Meta Information @@ -13,15 +13,13 @@ MASTER_SITES = http://owl.phy.queensu.ca/~phil/exiftool/ MODDIST = DISTFILES = $(DISTNAME).tar.gz +DISTFILES += COPYING RUNTIME_DEP_PKGS += CSWpmiocompress -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = Image-ExifTool-(\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 = +SPKG_SOURCEURL = http://owl.phy.queensu.ca/~phil/exiftool/ CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/exiftool/trunk/checksums =================================================================== --- csw/mgar/pkg/exiftool/trunk/checksums 2010-03-16 22:28:36 UTC (rev 9215) +++ csw/mgar/pkg/exiftool/trunk/checksums 2010-03-17 03:41:16 UTC (rev 9216) @@ -1 +1,2 @@ -643d7a69cf97dabf30cba34426a23048 Image-ExifTool-8.13.tar.gz +51daeaabab952590a76da861c78de042 COPYING +4b7cb346de54d87637fb7652d657bc5f Image-ExifTool-8.14.tar.gz Modified: csw/mgar/pkg/exiftool/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/exiftool/trunk/files/COPYING 2010-03-16 22:28:36 UTC (rev 9215) +++ csw/mgar/pkg/exiftool/trunk/files/COPYING 2010-03-17 03:41:16 UTC (rev 9216) @@ -1,8 +1,3 @@ -%var bitname exiftool -%var pkgname CSWexiftool -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright Copyright 2003-2009, Phil Harvey This is free software; you can redistribute it and/or modify it under the 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 Mar 17 08:42:47 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Mar 2010 07:42:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9217] csw/mgar/pkg/cpan/MIME-Types/trunk Message-ID: Revision: 9217 http://gar.svn.sourceforge.net/gar/?rev=9217&view=rev Author: dmichelsen Date: 2010-03-17 07:42:47 +0000 (Wed, 17 Mar 2010) Log Message: ----------- cpan/MIME-Types: Update to 1.29 Modified Paths: -------------- csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile csw/mgar/pkg/cpan/MIME-Types/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/MIME-Types/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile 2010-03-17 03:41:16 UTC (rev 9216) +++ csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile 2010-03-17 07:42:47 UTC (rev 9217) @@ -1,5 +1,5 @@ GARNAME = MIME-Types -GARVERSION = 1.28 +GARVERSION = 1.29 CATEGORIES = cpan AUTHOR = MARKOV @@ -11,6 +11,8 @@ additional information. endef +DISTFILES = COPYING + PACKAGES = CSWpmmimetypes CATALOGNAME = pm_mimetypes Modified: csw/mgar/pkg/cpan/MIME-Types/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/MIME-Types/trunk/checksums 2010-03-17 03:41:16 UTC (rev 9216) +++ csw/mgar/pkg/cpan/MIME-Types/trunk/checksums 2010-03-17 07:42:47 UTC (rev 9217) @@ -1 +1,2 @@ -5fe537d9d803c43a36c3c55623c2d6da MIME-Types-1.28.tar.gz +b80cd735a88df5731be29b11ecae5497 COPYING +4944fea4b6f2be96745fde90607c43f7 MIME-Types-1.29.tar.gz Copied: csw/mgar/pkg/cpan/MIME-Types/trunk/files/COPYING (from rev 8930, csw/mgar/pkg/cpan/MIME-Types/trunk/files/CSWpmmimetypes.gspec) =================================================================== --- csw/mgar/pkg/cpan/MIME-Types/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/MIME-Types/trunk/files/COPYING 2010-03-17 07:42:47 UTC (rev 9217) @@ -0,0 +1,3 @@ +Copyright (c) 2001-2003 by the author(s). 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 dmichelsen at users.sourceforge.net Wed Mar 17 09:30:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Mar 2010 08:30:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9218] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 9218 http://gar.svn.sourceforge.net/gar/?rev=9218&view=rev Author: dmichelsen Date: 2010-03-17 08:30:54 +0000 (Wed, 17 Mar 2010) Log Message: ----------- giflib: Fix ugly typo rendering sparcv9 broken Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2010-03-17 07:42:47 UTC (rev 9217) +++ csw/mgar/pkg/giflib/trunk/Makefile 2010-03-17 08:30:54 UTC (rev 9218) @@ -86,10 +86,10 @@ ALTERNATIVES_CSWgiflibrtx11 = cswx11 ALTERNATIVE_nox11 = $(libdir)/libgif.so.4.1.6 giflib $(libdir)/libgif-nox11.so.4.1.6 100 -ALTERNATIVE_nox11 += $(libdir)/$(ISA_DEFAULT64)/libgif.so.4.1.6 giflib64 $(libdir)/$(ISA_DEFAULT64)/libneon-nox11.so.4.1.6 +ALTERNATIVE_nox11 += $(libdir)/$(ISA_DEFAULT64)/libgif.so.4.1.6 giflib64 $(libdir)/$(ISA_DEFAULT64)/libgif-nox11.so.4.1.6 ALTERNATIVE_cswx11 = $(libdir)/libgif.so.4.1.6 giflib $(libdir)/libgif-cswx11.so.4.1.6 200 -ALTERNATIVE_cswx11 += $(libdir)/$(ISA_DEFAULT64)/libgif.so.4.1.6 giflib64 $(libdir)/$(ISA_DEFAULT64)/libneon-cswx11.so.4.1.6 +ALTERNATIVE_cswx11 += $(libdir)/$(ISA_DEFAULT64)/libgif.so.4.1.6 giflib64 $(libdir)/$(ISA_DEFAULT64)/libgif-cswx11.so.4.1.6 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 Mar 17 10:35:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Mar 2010 09:35:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[9219] csw/mgar/pkg/imlib2/trunk Message-ID: Revision: 9219 http://gar.svn.sourceforge.net/gar/?rev=9219&view=rev Author: dmichelsen Date: 2010-03-17 09:35:22 +0000 (Wed, 17 Mar 2010) Log Message: ----------- imlib2: Update to 1.4.3 Modified Paths: -------------- csw/mgar/pkg/imlib2/trunk/Makefile csw/mgar/pkg/imlib2/trunk/checksums Modified: csw/mgar/pkg/imlib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/imlib2/trunk/Makefile 2010-03-17 08:30:54 UTC (rev 9218) +++ csw/mgar/pkg/imlib2/trunk/Makefile 2010-03-17 09:35:22 UTC (rev 9219) @@ -1,5 +1,5 @@ GARNAME = imlib2 -GARVERSION = 1.4.2 +GARVERSION = 1.4.3 CATEGORIES = lib DESCRIPTION = Imlib 2 is the successor to Imlib, a powerful graphics library Modified: csw/mgar/pkg/imlib2/trunk/checksums =================================================================== --- csw/mgar/pkg/imlib2/trunk/checksums 2010-03-17 08:30:54 UTC (rev 9218) +++ csw/mgar/pkg/imlib2/trunk/checksums 2010-03-17 09:35:22 UTC (rev 9219) @@ -1,2 +1,2 @@ -9f15568e76ebda9092c571e0df261f54 imlib2-1.4.2.tar.bz2 -972f64c179035014b72243ccd6245c5e imlib2_loaders-1.4.2.tar.bz2 +cdac0d47eca6023e3e2a18584d3f6940 imlib2-1.4.3.tar.bz2 +9dd8f9258b5088e8523e08ac63466ed8 imlib2_loaders-1.4.3.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 Mar 17 10:39:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Mar 2010 09:39:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9220] csw/mgar/pkg/imlib2/trunk Message-ID: Revision: 9220 http://gar.svn.sourceforge.net/gar/?rev=9220&view=rev Author: dmichelsen Date: 2010-03-17 09:39:44 +0000 (Wed, 17 Mar 2010) Log Message: ----------- imlib2: Move imlib2_loaders to separate GAR recipe Modified Paths: -------------- csw/mgar/pkg/imlib2/trunk/Makefile csw/mgar/pkg/imlib2/trunk/checksums Modified: csw/mgar/pkg/imlib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/imlib2/trunk/Makefile 2010-03-17 09:35:22 UTC (rev 9219) +++ csw/mgar/pkg/imlib2/trunk/Makefile 2010-03-17 09:39:44 UTC (rev 9220) @@ -13,7 +13,6 @@ SF_PROJ = enlightenment MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(GARNAME)_loaders-$(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 Modified: csw/mgar/pkg/imlib2/trunk/checksums =================================================================== --- csw/mgar/pkg/imlib2/trunk/checksums 2010-03-17 09:35:22 UTC (rev 9219) +++ csw/mgar/pkg/imlib2/trunk/checksums 2010-03-17 09:39:44 UTC (rev 9220) @@ -1,2 +1 @@ cdac0d47eca6023e3e2a18584d3f6940 imlib2-1.4.3.tar.bz2 -9dd8f9258b5088e8523e08ac63466ed8 imlib2_loaders-1.4.3.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 Mar 17 10:46:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Mar 2010 09:46:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[9221] csw/mgar/pkg Message-ID: Revision: 9221 http://gar.svn.sourceforge.net/gar/?rev=9221&view=rev Author: dmichelsen Date: 2010-03-17 09:46:05 +0000 (Wed, 17 Mar 2010) Log Message: ----------- imlib2_loaders: Initial commit, dependencies EDB and EET still missing Added Paths: ----------- csw/mgar/pkg/imlib2_loaders/ csw/mgar/pkg/imlib2_loaders/trunk/Makefile csw/mgar/pkg/imlib2_loaders/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/imlib2_loaders/trunk/Makefile csw/mgar/pkg/imlib2_loaders/trunk/checksums Deleted: csw/mgar/pkg/imlib2_loaders/trunk/Makefile =================================================================== --- csw/mgar/pkg/imlib2/trunk/Makefile 2010-03-02 00:06:52 UTC (rev 8930) +++ csw/mgar/pkg/imlib2_loaders/trunk/Makefile 2010-03-17 09:46:05 UTC (rev 9221) @@ -1,35 +0,0 @@ -GARNAME = imlib2 -GARVERSION = 1.4.2 -CATEGORIES = lib - -DESCRIPTION = Imlib 2 is the successor to Imlib, a powerful graphics library -define BLURB - Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is a completely new library. - Imlib 2 can be installed alongside Imlib 1.x without any problems since they are effectively - different libraries which have very similar functionality. Please see the homepage for the - long description of the differences. -endef - -SF_PROJ = enlightenment -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(GARNAME)_loaders-$(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 - -RUNTIME_DEP_PKGS = CSWbzip2 CSWftype2 CSWgiflibrt CSWjpeg CSWlibid3tag -RUNTIME_DEP_PKGS += CSWlibxext CSWpng CSWtiff CSWzlib - -#EXTRA_INC = $(prefix)/X11/include -#EXTRA_LIB = $(prefix)/X11/lib -#EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib - -BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) -#CONFIGURE_ARGS += --x-include=$(prefix)/X11/include -#CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) - -TEST_TARGET = check - -include gar/category.mk Copied: csw/mgar/pkg/imlib2_loaders/trunk/Makefile (from rev 9219, csw/mgar/pkg/imlib2/trunk/Makefile) =================================================================== --- csw/mgar/pkg/imlib2_loaders/trunk/Makefile (rev 0) +++ csw/mgar/pkg/imlib2_loaders/trunk/Makefile 2010-03-17 09:46:05 UTC (rev 9221) @@ -0,0 +1,38 @@ +GARNAME = imlib2_loaders +GARVERSION = 1.4.3 +CATEGORIES = lib + +DESCRIPTION = Imlib 2 image loaders for XCF, EDB and EET + +define BLURB + The XCF loader cannot be packaged together with Imlib 2 because Imlib 2 + is distributed under the BSD license, whereas the XCF loader is using + elements of the Gimp's (www.gimp.org) codebase, which is distributed + under the GPL. The XCF loader therefore is GPL'd as well. + 2 other loaders are here too: EDB and EET +endef + +SF_PROJ = enlightenment +MASTER_SITES = $(SF_MIRRORS) +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 + +PACKAGES = CSWimlib2loaders +CATALOGNAME = imlib2_loaders + +DEP_PKGS = CSWimlib2 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +TEST_TARGET = check + +include gar/category.mk Deleted: csw/mgar/pkg/imlib2_loaders/trunk/checksums =================================================================== --- csw/mgar/pkg/imlib2/trunk/checksums 2010-03-02 00:06:52 UTC (rev 8930) +++ csw/mgar/pkg/imlib2_loaders/trunk/checksums 2010-03-17 09:46:05 UTC (rev 9221) @@ -1,2 +0,0 @@ -9f15568e76ebda9092c571e0df261f54 imlib2-1.4.2.tar.bz2 -972f64c179035014b72243ccd6245c5e imlib2_loaders-1.4.2.tar.bz2 Copied: csw/mgar/pkg/imlib2_loaders/trunk/checksums (from rev 9219, csw/mgar/pkg/imlib2/trunk/checksums) =================================================================== --- csw/mgar/pkg/imlib2_loaders/trunk/checksums (rev 0) +++ csw/mgar/pkg/imlib2_loaders/trunk/checksums 2010-03-17 09:46:05 UTC (rev 9221) @@ -0,0 +1 @@ +9dd8f9258b5088e8523e08ac63466ed8 imlib2_loaders-1.4.3.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 Mar 17 11:19:41 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Mar 2010 10:19:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9222] csw/mgar/pkg Message-ID: Revision: 9222 http://gar.svn.sourceforge.net/gar/?rev=9222&view=rev Author: dmichelsen Date: 2010-03-17 10:19:40 +0000 (Wed, 17 Mar 2010) Log Message: ----------- eina: Initial commit, doesn't compile yet Added Paths: ----------- csw/mgar/pkg/eina/ csw/mgar/pkg/eina/branches/ csw/mgar/pkg/eina/tags/ csw/mgar/pkg/eina/trunk/ csw/mgar/pkg/eina/trunk/Makefile csw/mgar/pkg/eina/trunk/checksums csw/mgar/pkg/eina/trunk/files/ Property changes on: csw/mgar/pkg/eina/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/eina/trunk/Makefile =================================================================== --- csw/mgar/pkg/eina/trunk/Makefile (rev 0) +++ csw/mgar/pkg/eina/trunk/Makefile 2010-03-17 10:19:40 UTC (rev 9222) @@ -0,0 +1,25 @@ +GARNAME = eina +GARVERSION = 0.9.9.063 +CATEGORIES = lib + +DESCRIPTION = Provides optimized data types +define BLURB +endef + +MASTER_SITES = http://download.enlightenment.org/snapshots/2009-12-02/ +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 + +PACKAGES = CSWlibeina +CATALOGNAME = libeina + +VENDOR_URL = http://trac.enlightenment.org/e/wiki/Eina + +EXTRA_CPPFLAGS = -D__FUNCTION__= + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/eina/trunk/checksums =================================================================== --- csw/mgar/pkg/eina/trunk/checksums (rev 0) +++ csw/mgar/pkg/eina/trunk/checksums 2010-03-17 10:19:40 UTC (rev 9222) @@ -0,0 +1 @@ +1289ac1d6b1a7a578158f9ff24301f3f eina-0.9.9.063.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 Mar 17 11:24:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Mar 2010 10:24:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9223] csw/mgar/pkg Message-ID: Revision: 9223 http://gar.svn.sourceforge.net/gar/?rev=9223&view=rev Author: dmichelsen Date: 2010-03-17 10:24:53 +0000 (Wed, 17 Mar 2010) Log Message: ----------- eet: Initial commit, dependencies still missing Added Paths: ----------- csw/mgar/pkg/eet/ csw/mgar/pkg/eet/branches/ csw/mgar/pkg/eet/tags/ csw/mgar/pkg/eet/trunk/ csw/mgar/pkg/eet/trunk/Makefile csw/mgar/pkg/eet/trunk/checksums csw/mgar/pkg/eet/trunk/files/ Property changes on: csw/mgar/pkg/eet/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/eet/trunk/Makefile =================================================================== --- csw/mgar/pkg/eet/trunk/Makefile (rev 0) +++ csw/mgar/pkg/eet/trunk/Makefile 2010-03-17 10:24:53 UTC (rev 9223) @@ -0,0 +1,26 @@ +GARNAME = eet +GARVERSION = 1.2.3 +CATEGORIES = lib + +DESCRIPTION = Write an arbitary set of chunks of data to a file and optionally compress each chunk +define BLURB + Eet is a tiny library designed to write an arbitary set of chunks of data to a + file and optionally compress each chunk (very much like a zip file) and allow fast + random-access reading of the file later on. It does not do zip as zip itself has more + complexity than we need, and it was much simpler to implement this once here. +endef + +MASTER_SITES = http://download.enlightenment.org/releases/ +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 + +EXTRA_CPPFLAGS = -D__FUNCTION__= + +CPPFLAGS = abc + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/eet/trunk/checksums =================================================================== --- csw/mgar/pkg/eet/trunk/checksums (rev 0) +++ csw/mgar/pkg/eet/trunk/checksums 2010-03-17 10:24:53 UTC (rev 9223) @@ -0,0 +1 @@ +dac2f538ae15196a0b0b4e5164669be8 eet-1.2.3.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 Mar 17 11:25:15 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Mar 2010 10:25:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9224] csw/mgar/pkg Message-ID: Revision: 9224 http://gar.svn.sourceforge.net/gar/?rev=9224&view=rev Author: dmichelsen Date: 2010-03-17 10:25:15 +0000 (Wed, 17 Mar 2010) Log Message: ----------- eterm: Initial commit, doesn't compile yet Added Paths: ----------- csw/mgar/pkg/eterm/ csw/mgar/pkg/eterm/branches/ csw/mgar/pkg/eterm/tags/ csw/mgar/pkg/eterm/trunk/ csw/mgar/pkg/eterm/trunk/Makefile csw/mgar/pkg/eterm/trunk/checksums csw/mgar/pkg/eterm/trunk/files/ Property changes on: csw/mgar/pkg/eterm/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/eterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/eterm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/eterm/trunk/Makefile 2010-03-17 10:25:15 UTC (rev 9224) @@ -0,0 +1,22 @@ +GARNAME = eterm +GARVERSION = 1.0 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +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 = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/eterm/trunk/checksums =================================================================== 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 Mar 17 12:26:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Mar 2010 11:26:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9225] csw/mgar/pkg/gtk2/trunk/Makefile Message-ID: Revision: 9225 http://gar.svn.sourceforge.net/gar/?rev=9225&view=rev Author: dmichelsen Date: 2010-03-17 11:26:16 +0000 (Wed, 17 Mar 2010) Log Message: ----------- gtk2: Add dependency to CSWlibatkdevel Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2010-03-17 10:25:15 UTC (rev 9224) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2010-03-17 11:26:16 UTC (rev 9225) @@ -37,7 +37,7 @@ RUNTIME_DEP_PKGS_CSWgtk2 = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWjpeg CSWlibatk RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo CSWlibx11 CSWlibxrender CSWpango CSWpng CSWtiff RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibxcomposite CSWlibxcursor CSWlibxdamage CSWlibxext CSWlibxfixes CSWlibxinerama CSWlibxrandr -RUNTIME_DEP_PKGS_CSWgtk2devel = CSWgtk2 CSWglib2devel +RUNTIME_DEP_PKGS_CSWgtk2devel = CSWgtk2 CSWglib2devel CSWatkdevel RUNTIME_DEP_PKGS_CSWgtk2devel += CSWlibcairodevel CSWlibx11devel CSWlibxrenderdevel CSWpangodevel 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 dmichelsen at users.sourceforge.net Wed Mar 17 13:01:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Mar 2010 12:01:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9226] csw/mgar/pkg/imlib2_loaders/trunk/Makefile Message-ID: Revision: 9226 http://gar.svn.sourceforge.net/gar/?rev=9226&view=rev Author: dmichelsen Date: 2010-03-17 12:01:54 +0000 (Wed, 17 Mar 2010) Log Message: ----------- imlib2_loaders: Add tbd Modified Paths: -------------- csw/mgar/pkg/imlib2_loaders/trunk/Makefile Modified: csw/mgar/pkg/imlib2_loaders/trunk/Makefile =================================================================== --- csw/mgar/pkg/imlib2_loaders/trunk/Makefile 2010-03-17 11:26:16 UTC (rev 9225) +++ csw/mgar/pkg/imlib2_loaders/trunk/Makefile 2010-03-17 12:01:54 UTC (rev 9226) @@ -19,6 +19,10 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +# TBD: +# - libeet missing +# - libedb missing + PACKAGES = CSWimlib2loaders CATALOGNAME = imlib2_loaders 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 Mar 17 13:44:45 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Mar 2010 12:44:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[9227] csw/mgar/pkg/tk/trunk Message-ID: Revision: 9227 http://gar.svn.sourceforge.net/gar/?rev=9227&view=rev Author: dmichelsen Date: 2010-03-17 12:44:45 +0000 (Wed, 17 Mar 2010) Log Message: ----------- tk: Add legacy libs Modified Paths: -------------- csw/mgar/pkg/tk/trunk/Makefile csw/mgar/pkg/tk/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tk/trunk/files/libtk8.4.so.i csw/mgar/pkg/tk/trunk/files/libtk8.4.so.s Modified: csw/mgar/pkg/tk/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk/trunk/Makefile 2010-03-17 12:01:54 UTC (rev 9226) +++ csw/mgar/pkg/tk/trunk/Makefile 2010-03-17 12:44:45 UTC (rev 9227) @@ -11,13 +11,10 @@ DISTNAME = $(GARNAME)$(GARVERSION) DISTFILES = $(DISTNAME)-src.tar.gz +DISTFILES += libtk8.4.so.i +DISTFILES += libtk8.4.so.s -RUNTIME_DEP_PKGS_CSWtk += CSWfconfig -RUNTIME_DEP_PKGS_CSWtk += CSWftype2 -RUNTIME_DEP_PKGS_CSWtk += CSWlibx11 -RUNTIME_DEP_PKGS_CSWtk += CSWlibxft2 -RUNTIME_DEP_PKGS_CSWtk += CSWlibxrender -RUNTIME_DEP_PKGS_CSWtk += CSWtcl +DEP_PKGS_CSWtk = CSWfconfig CSWftype2 CSWlibx11 CSWlibxft2 CSWlibxrender CSWtcl SPKG_SOURCEURL = http://www.tcl.tk/ @@ -50,3 +47,15 @@ #CFLAGS := $(filter-out -I%,$(CFLAGS)) #DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS)) + +post-install-i386: + @# Install legacy libs + @# Building them with version modulations would be hard as that would require a full legacy tcl also + ginstall $(WORKDIR)/libtk8.4.so.i $(DESTDIR)$(libdir)/libtk8.4.so + @$(MAKECOOKIE) + +post-install-sparc: + @# Install legacy libs + @# Building them with version modulations would be hard as that would require a full legacy tcl also + ginstall $(WORKDIR)/libtk8.4.so.s $(DESTDIR)$(libdir)/libtk8.4.so + @$(MAKECOOKIE) Modified: csw/mgar/pkg/tk/trunk/checksums =================================================================== --- csw/mgar/pkg/tk/trunk/checksums 2010-03-17 12:01:54 UTC (rev 9226) +++ csw/mgar/pkg/tk/trunk/checksums 2010-03-17 12:44:45 UTC (rev 9227) @@ -1 +1,3 @@ +8295c274c17ffa975bcf623763c77bc6 libtk8.4.so.i +340e9cec53ced4cae6099fdda2cdb0d3 libtk8.4.so.s 0764f63ae2106b4774c4ecb0ef391610 tk8.5.7-src.tar.gz Added: csw/mgar/pkg/tk/trunk/files/libtk8.4.so.i =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/tk/trunk/files/libtk8.4.so.i ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/tk/trunk/files/libtk8.4.so.s =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/tk/trunk/files/libtk8.4.so.s ___________________________________________________________________ Added: svn:executable + * 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 dmichelsen at users.sourceforge.net Wed Mar 17 13:46:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Mar 2010 12:46:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9228] csw/mgar/pkg/expect/trunk Message-ID: Revision: 9228 http://gar.svn.sourceforge.net/gar/?rev=9228&view=rev Author: dmichelsen Date: 2010-03-17 12:46:44 +0000 (Wed, 17 Mar 2010) Log Message: ----------- expect: Add tcl/tk source download Modified Paths: -------------- csw/mgar/pkg/expect/trunk/Makefile csw/mgar/pkg/expect/trunk/checksums Modified: csw/mgar/pkg/expect/trunk/Makefile =================================================================== --- csw/mgar/pkg/expect/trunk/Makefile 2010-03-17 12:44:45 UTC (rev 9227) +++ csw/mgar/pkg/expect/trunk/Makefile 2010-03-17 12:46:44 UTC (rev 9228) @@ -4,18 +4,36 @@ DESCRIPTION = Tool for automating interactive applications define BLURB -Expect is a tool for automating interactive applications such as telnet, ftp, passwd, fsck, rlogin, tip, etc. Expect really makes this stuff trivial. Expect is also useful for testing these same applications. And by adding Tk, you can also wrap interactive applications in X11 GUIs. + Expect is a tool for automating interactive applications such as telnet, + ftp, passwd, fsck, rlogin, tip, etc. Expect really makes this stuff trivial. + Expect is also useful for testing these same applications. And by adding Tk, + you can also wrap interactive applications in X11 GUIs. -Expect can make easy all sorts of tasks that are prohibitively difficult with anything else. You will find that Expect is an absolutely invaluable tool - using it, you will be able to automate tasks that you've never even thought of before - and you'll be able to do this automation quickly and easily. + Expect can make easy all sorts of tasks that are prohibitively difficult with + anything else. You will find that Expect is an absolutely invaluable tool - using it, + you will be able to automate tasks that you've never even thought of before - and + you'll be able to do this automation quickly and easily. endef +# Build and package tcl +# Build and package tk +# "gmake extract" in expect +# "cp -rp ../../tcl/trunk/work/.../tcl8.5.7 work/.../build.../" +# "cp -rp ../../tk/trunk/work/.../tk8.5.7 work/.../build.../" +# "gmake build package repackage" + + # For some reason upstream have recalled 5.44.1 and has 5.43 as primary on # homepage as expect.tar.gz MASTER_SITES = http://expect.nist.gov/ +MASTER_SITES += http://downloads.sourceforge.net/tcl/ DISTNAME = $(GARNAME)-$(GARVERSION) DISTFILES = $(GARNAME).tar.gz DISTFILES += expect.m4 +DISTFILES += tcl8.5.7-src.tar.gz +DISTFILES += tk8.5.7-src.tar.gz + PATCHFILES += expect-5.39.0-libdir.patch #PATCHFILES += expect-5.42.1-missing-includes.patch #PATCHFILES += expect-5.42.1-multilib.patch @@ -27,13 +45,13 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# UPSTREAM_MASTER_SITES = - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --with-tcl=/opt/csw/lib --with-tk=/opt/csw/lib -CONFIGURE_ARGS += --with-tclinclude=$(WORKSRC)/../tcl8.5.7/generic/ -CONFIGURE_ARGS += --with-tkinclude=$(WORKSRC)/../tk8.5.7/generic/ +# CONFIGURE_ARGS += --with-tclinclude=$(WORKSRC)/../tcl8.5.7/generic/ +# CONFIGURE_ARGS += --with-tkinclude=$(WORKSRC)/../tk8.5.7/generic/ +CONFIGURE_ARGS += --with-tclinclude=$(abspath $(WORKDIR)/tcl8.5.7/unix) +CONFIGURE_ARGS += --with-tkinclude=$(abspath $(WORKDIR)/tk8.5.7/unix) TEST_TARGET = Modified: csw/mgar/pkg/expect/trunk/checksums =================================================================== --- csw/mgar/pkg/expect/trunk/checksums 2010-03-17 12:44:45 UTC (rev 9227) +++ csw/mgar/pkg/expect/trunk/checksums 2010-03-17 12:46:44 UTC (rev 9228) @@ -2,6 +2,7 @@ 5661004ca23ddc9592f488142367c2f5 expect-5.43.0-avoid-tcl-internals-1.patch 3d67a79c1d7790c7e49b5df7f57b0290 expect-5.43.0-missing-includes.patch 2103ff302f6e8a0dd748772f6512b3a5 expect-5.43.0-multilib.patch -af7966f18f7ebc7ec48b7a6e095e90ff expect-5.44.1-destdir.patch 595b7a7c63f7ddb42e19c2537bb2891b expect.m4 43e1dc0e0bc9492cf2e1a6f59f276bc3 expect.tar.gz +f70ad8f78b5e4a9f792fe101f22b125f tcl8.5.7-src.tar.gz +0764f63ae2106b4774c4ecb0ef391610 tk8.5.7-src.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 17 14:00:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 17 Mar 2010 13:00:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[9229] csw/mgar/pkg/awesome/trunk/Makefile Message-ID: Revision: 9229 http://gar.svn.sourceforge.net/gar/?rev=9229&view=rev Author: wahwah Date: 2010-03-17 13:00:55 +0000 (Wed, 17 Mar 2010) Log Message: ----------- awsom: Added some missing build dependencies Modified Paths: -------------- csw/mgar/pkg/awesome/trunk/Makefile Modified: csw/mgar/pkg/awesome/trunk/Makefile =================================================================== --- csw/mgar/pkg/awesome/trunk/Makefile 2010-03-17 12:46:44 UTC (rev 9228) +++ csw/mgar/pkg/awesome/trunk/Makefile 2010-03-17 13:00:55 UTC (rev 9229) @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +GARFLAVOR = DBG + GARNAME = awesome GARVERSION = 3.4.4 CATEGORIES = apps @@ -59,10 +61,14 @@ BUILD_DEP_PKGS += CSWimagemagick BUILD_DEP_PKGS += CSWlibcairodevel # Enable when fixed to used gtail +# BUILD_DEP_PKGS += CSWasciidoc # BUILD_DEP_PKGS += CSWxmlto BUILD_DEP_PKGS += CSWxcbproto BUILD_DEP_PKGS += CSWpyxcbproto BUILD_DEP_PKGS += CSWlibxdmcpdevel +BUILD_DEP_PKGS += CSWlibxaudevel +BUILD_DEP_PKGS += CSWlibxrenderdevel +BUILD_DEP_PKGS += CSWlibx11devel 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 Wed Mar 17 14:49:10 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Mar 2010 13:49:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9230] csw/mgar/pkg/imlib/trunk/Makefile Message-ID: Revision: 9230 http://gar.svn.sourceforge.net/gar/?rev=9230&view=rev Author: dmichelsen Date: 2010-03-17 13:49:10 +0000 (Wed, 17 Mar 2010) Log Message: ----------- imlib: Update dependencies Modified Paths: -------------- csw/mgar/pkg/imlib/trunk/Makefile Modified: csw/mgar/pkg/imlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/imlib/trunk/Makefile 2010-03-17 13:00:55 UTC (rev 9229) +++ csw/mgar/pkg/imlib/trunk/Makefile 2010-03-17 13:49:10 UTC (rev 9230) @@ -16,13 +16,22 @@ EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -# EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so +# EXTRA_LINKER_FLAGS = -L$(libdir) -l/usr/openwin/lib/libXext.so +STRIP_LIBTOOL = 1 + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --x-include=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +RUNTIME_DEP_PKGS_CSWimlib = CSWgiflib CSWjpeg CSWpng CSWtiff CSWzlib +RUNTIME_DEP_PKGS_CSWimlib += CSWlibice CSWlibsm CSWlibxext + +# Building the test cases misses -lX11, disable for now +SKIPTEST ?= 1 + 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 Wed Mar 17 16:36:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 17 Mar 2010 15:36:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9231] csw/mgar/pkg/cpan Message-ID: Revision: 9231 http://gar.svn.sourceforge.net/gar/?rev=9231&view=rev Author: dmichelsen Date: 2010-03-17 15:36:14 +0000 (Wed, 17 Mar 2010) Log Message: ----------- cpan/B-Generate Added Paths: ----------- csw/mgar/pkg/cpan/B-Generate/ csw/mgar/pkg/cpan/B-Generate/branches/ csw/mgar/pkg/cpan/B-Generate/tags/ csw/mgar/pkg/cpan/B-Generate/trunk/ csw/mgar/pkg/cpan/B-Generate/trunk/Makefile csw/mgar/pkg/cpan/B-Generate/trunk/checksums csw/mgar/pkg/cpan/B-Generate/trunk/files/ Property changes on: csw/mgar/pkg/cpan/B-Generate/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/B-Generate/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/B-Generate/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/B-Generate/trunk/Makefile 2010-03-17 15:36:14 UTC (rev 9231) @@ -0,0 +1,15 @@ +GARNAME = B-Generate +GARVERSION = 1.26 +CATEGORIES = cpan +AUTHOR = RURBAN + +DESCRIPTION = Create your own op trees +define BLURB +endef + +PACKAGES = CSWpmbgenerate +CATALOGNAME = pm_bgenerate + +LICENSE = Copying + +include gar/category.mk Added: csw/mgar/pkg/cpan/B-Generate/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/B-Generate/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/B-Generate/trunk/checksums 2010-03-17 15:36:14 UTC (rev 9231) @@ -0,0 +1 @@ +2dd63eae8bcd97eeda36a6faedfa854d B-Generate-1.26.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wrightru at users.sourceforge.net Wed Mar 17 17:55:43 2010 From: wrightru at users.sourceforge.net (wrightru at users.sourceforge.net) Date: Wed, 17 Mar 2010 16:55:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9232] csw/mgar/pkg/ganglia/trunk Message-ID: Revision: 9232 http://gar.svn.sourceforge.net/gar/?rev=9232&view=rev Author: wrightru Date: 2010-03-17 16:55:43 +0000 (Wed, 17 Mar 2010) Log Message: ----------- Merge 3.1.7 branch into trunk Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile csw/mgar/pkg/ganglia/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/ganglia/trunk/ Property changes on: csw/mgar/pkg/ganglia/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc:6266-6330 /csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc:6331-6977 /csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc:6978-8434 /csw/mgar/pkg/ganglia/branches/ganglia-3.1.7:8435-9231 Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2010-03-17 15:36:14 UTC (rev 9231) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2010-03-17 16:55:43 UTC (rev 9232) @@ -1,5 +1,5 @@ GARNAME = ganglia -GARVERSION = 3.1.2 +GARVERSION = 3.1.7 CATEGORIES = utils # How should we set this? @@ -24,7 +24,7 @@ DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad -PACKAGES = CSWgangliaagent CSWgangliart CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython +PACKAGES = CSWgangliart CSWgangliaagent CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython CATALOGNAME_CSWganglia = ganglia CATALOGNAME_CSWgangliart = ganglia_rt @@ -42,16 +42,18 @@ SPKG_DESC_CSWgangliagmetad = Ganglia gmetad SPKG_DESC_CSWgangliaweb = Ganglia web -BUILD_DEP_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd +BUILD_DEP_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd CSWpcre RUNTIME_DEP_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt +RUNTIME_DEP_PKGS_CSWgangliart += CSWpcrert RUNTIME_DEP_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt -RUNTIME_DEP_PKGS_CSWgangliaagent += CSWgangliart +RUNTIME_DEP_PKGS_CSWgangliaagent += CSWgangliart CSWpcrert RUNTIME_DEP_PKGS_CSWgangliamodpython = CSWlibconfuse CSWapache2rt CSWgangliart RUNTIME_DEP_PKGS_CSWgangliamodpython += CSWgangliaagent RUNTIME_DEP_PKGS_CSWgangliadevel = CSWexpat CSWlibconfuse CSWapache2rt RUNTIME_DEP_PKGS_CSWgangliagmetad = CSWexpat CSWlibconfuse CSWapache2rt RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWgangliart CSWgangliaagent CSWrrd +RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWpcrert RUNTIME_DEP_PKGS_CSWgangliaweb = CSWgangliagmetad RUNTIME_DEP_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2modphp5 CSWrrd @@ -64,6 +66,10 @@ # http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 #PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris-cc.patch +# Uncomment this if we want to build both 32 bit and 64 bit binaries +# By default, only 32 bit binaries are built +#BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) # Don't build gmetad (not tested yet on Solaris, more deps required to build) @@ -84,22 +90,35 @@ # TODO: define a CSWgangliamodpython package # Depends: some issues exist getting the Python support working on Solaris, # Ganglia's configure.in needs to be further enhanced for this to work -CONFIGURE_ARGS += --without-python +CONFIGURE_ARGS += --disable-python #CONFIGURE_ARGS += --with-python=/opt/csw # For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, # so we skip it. This should be re-assessed with each new release # from upstream. Proposed fixes for the test suite to be submitted # upstream. -ifeq ($(GARVERSION),3.1.2) +ifeq ($(GARVERSION),3.1.3) TEST_SCRIPTS = endif +ifeq ($(GARVERSION),3.1.4) +TEST_SCRIPTS = +endif +ifeq ($(GARVERSION),3.1.5) +TEST_SCRIPTS = +endif +ifeq ($(GARVERSION),3.1.6) +TEST_SCRIPTS = +endif +ifeq ($(GARVERSION),3.1.7) +TEST_SCRIPTS = +endif INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom WWWROOT = /opt/csw/share/www WWWGANGLIA = $(WWWROOT)/ganglia -ETCGANGLIA = /etc/opt/csw/ganglia +sysconfdir = /etc/opt/csw/ganglia +ETCGANGLIA = $(sysconfdir) PKGFILES_CSWganglia = PKGFILES_CSWgangliart = $(libdir)/libganglia.* @@ -109,6 +128,11 @@ PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modgstatus.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modpython.conf.CSW +PRESERVECONF += $(WWWGANGLIA)/conf.php # For gmond INITSMF = /etc/opt/csw/init.d/cswgmond @@ -134,25 +158,26 @@ @cd $(WORKSRC)/web; \ cp -R * $(DESTDIR)$(WWWGANGLIA) @ginstall -D $(FILEDIR)/conf.php \ - $(DESTDIR)$(WWWGANGLIA)/conf.php + $(DESTDIR)$(WWWGANGLIA)/conf.php.CSW @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \ $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ - > $(DESTDIR)$(ETCGANGLIA)/gmond.conf + > $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ - >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf + >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW # @ginstall -D $(FILEDIR)/gmond.conf \ # $(DESTDIR)$(ETCGANGLIA)/gmond.conf @ginstall -D $(FILEDIR)/gmetad.conf \ - $(DESTDIR)$(ETCGANGLIA)/gmetad.conf + $(DESTDIR)$(ETCGANGLIA)/gmetad.conf.CSW @cd $(WORKSRC)/gmond/modules/conf.d; \ - cp -R *.conf $(DESTDIR)$(ETCGANGLIA)/conf.d - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf \ - $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf + for CONF_FILE in *.conf ; \ + do cp -R "$${CONF_FILE}" $(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf.CSW \ + $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf.CSW ifeq ($(GARVERSION),3.1.2) - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf.CSW endif @ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds Modified: csw/mgar/pkg/ganglia/trunk/checksums =================================================================== --- csw/mgar/pkg/ganglia/trunk/checksums 2010-03-17 15:36:14 UTC (rev 9231) +++ csw/mgar/pkg/ganglia/trunk/checksums 2010-03-17 16:55:43 UTC (rev 9232) @@ -1,6 +1,6 @@ -f3436682e339279357aa98473a9f2b8a download/CSWgangliaweb.postinstall -c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove -25d302948e25837bf17757d5e23e4955 download/cswgmetad -c6bb96c949dbb989d06ebb36b6af885d download/cswgmond -aaba09a6fa897ed581789f679f7ca62d download/ganglia-3.1.2.tar.gz -2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.CSW +f3436682e339279357aa98473a9f2b8a CSWgangliaweb.postinstall +c4c333a46db391464e372ad8ede4993c CSWgangliaweb.preremove +25d302948e25837bf17757d5e23e4955 cswgmetad +c6bb96c949dbb989d06ebb36b6af885d cswgmond +6aa5e2109c2cc8007a6def0799cf1b4c ganglia-3.1.7.tar.gz +2ff504ecb546aca2cdd6ee09af9a417e httpd-ganglia.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Mar 17 21:04:30 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 17 Mar 2010 20:04:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9233] csw/mgar/pkg/djvulibre/trunk/Makefile Message-ID: Revision: 9233 http://gar.svn.sourceforge.net/gar/?rev=9233&view=rev Author: hson Date: 2010-03-17 20:04:29 +0000 (Wed, 17 Mar 2010) Log Message: ----------- djvulibre: Fix dependencies Modified Paths: -------------- csw/mgar/pkg/djvulibre/trunk/Makefile Modified: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2010-03-17 16:55:43 UTC (rev 9232) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2010-03-17 20:04:29 UTC (rev 9233) @@ -19,9 +19,10 @@ SPKG_DESC_CSWdjvulibrert += DjVu standalone viewer, browser plug-in, command line tools - runtime package SPKG_DESC_CSWdjvulibredevel += DjVu standalone viewer, browser plug-in, commandline tools - developer package -RUNTIME_DEP_PKGS_CSWdjvulibre += CSWdjvulibrert CSWjpeg CSWzlib +RUNTIME_DEP_PKGS_CSWdjvulibre += CSWdjvulibrert CSWjpeg RUNTIME_DEP_PKGS_CSWdjvulibre += CSWtiff RUNTIME_DEP_PKGS_CSWdjvulibrert += CSWjpeg +RUNTIME_DEP_PKGS_CSWdjvulibrert += CSWiconv RUNTIME_DEP_PKGS_CSWdjvulibredevel += CSWdjvulibrert PKGFILES_CSWdjvulibrert = $(PKGFILES_RT) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Mar 17 21:08:50 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 17 Mar 2010 20:08:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9234] csw/mgar/pkg/libpaper/trunk/Makefile Message-ID: Revision: 9234 http://gar.svn.sourceforge.net/gar/?rev=9234&view=rev Author: hson Date: 2010-03-17 20:08:50 +0000 (Wed, 17 Mar 2010) Log Message: ----------- libpaper: Remerge package again Modified Paths: -------------- csw/mgar/pkg/libpaper/trunk/Makefile Modified: csw/mgar/pkg/libpaper/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpaper/trunk/Makefile 2010-03-17 20:04:29 UTC (rev 9233) +++ csw/mgar/pkg/libpaper/trunk/Makefile 2010-03-17 20:08:50 UTC (rev 9234) @@ -1,6 +1,6 @@ GARNAME = libpaper -GARVERSION = 1.1.23 -GARSUBREV = nmu1 +GARVERSION = 1.1.23+nmu1 +#GARSUBREV = nmu1 CATEGORIES = lib DESCRIPTION = Library and tools for handling papersize @@ -9,20 +9,23 @@ endef MASTER_SITES = http://ftp.us.debian.org/debian/pool/main/libp/libpaper/ -DISTFILES = $(GARNAME)_$(GARVERSION)+$(GARSUBREV).tar.gz -DISTNAME = $(GARNAME)-$(GARVERSION)+$(GARSUBREV) +#DISTFILES = $(GARNAME)_$(GARVERSION)+$(GARSUBREV).tar.gz +DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz +DISTNAME = $(GARNAME)-$(GARVERSION) +#DISTNAME = $(GARNAME)-$(GARVERSION)+$(GARSUBREV) -PACKAGES = CSWlibpaper CSWlibpaperdevel +PACKAGES = CSWlibpaper +#PACKAGES = CSWlibpaper CSWlibpaperdevel CATALOGNAME_CSWlibpaper = libpaper -CATALOGNAME_CSWlibpaperdevel = libpaper_devel +#CATALOGNAME_CSWlibpaperdevel = libpaper_devel -SPKG_DESC_CSWlibpaper += Library and tools for handling papersize -SPKG_DESC_CSWlibpaperdevel += Library and tools for handling papersize - developer package +SPKG_DESC_CSWlibpaper += $(DESCRIPTION) +#SPKG_DESC_CSWlibpaperdevel += $(DESCRIPTION) - developer package RUNTIME_DEP_PKGS_CSWlibpaper = -RUNTIME_DEP_PKGS_CSWlibpaperdevel += CSWlibpaper +#RUNTIME_DEP_PKGS_CSWlibpaperdevel += CSWlibpaper -PKGFILES_CSWlibpaperdevel = $(PKGFILES_DEVEL) +#PKGFILES_CSWlibpaperdevel = $(PKGFILES_DEVEL) UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.gz UPSTREAM_MASTER_SITES = $(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 Wed Mar 17 22:11:15 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 17 Mar 2010 21:11:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9235] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 9235 http://gar.svn.sourceforge.net/gar/?rev=9235&view=rev Author: rthurner Date: 2010-03-17 21:11:15 +0000 (Wed, 17 Mar 2010) Log Message: ----------- sqlite - upgrade to 3.6.23 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2010-03-17 20:08:50 UTC (rev 9234) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2010-03-17 21:11:15 UTC (rev 9235) @@ -1,5 +1,5 @@ GARNAME = sqlite3 -GARVERSION = 3.6.22 +GARVERSION = 3.6.23 CATEGORIES = lib DESCRIPTION = An embeddable SQL engine in a C library Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2010-03-17 20:08:50 UTC (rev 9234) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2010-03-17 21:11:15 UTC (rev 9235) @@ -1,3 +1,3 @@ 80d638505872be7ffa238d43f0e268b2 gar-base.diff 1a2be927ceacfa534501b9f4675bce83 shell.c.diff -a17bd53f1fde11f84adf79c6a1510ce5 sqlite-3.6.22.tar.gz +5ab08907643eda2aa8bf4e72e7eb31e9 sqlite-3.6.23.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 Mar 18 15:06:05 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 18 Mar 2010 14:06:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[9236] csw/mgar/pkg/bind/trunk Message-ID: Revision: 9236 http://gar.svn.sourceforge.net/gar/?rev=9236&view=rev Author: bonivart Date: 2010-03-18 14:06:04 +0000 (Thu, 18 Mar 2010) Log Message: ----------- bind: update to 9.7.0-P1 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2010-03-17 21:11:15 UTC (rev 9235) +++ csw/mgar/pkg/bind/trunk/Makefile 2010-03-18 14:06:04 UTC (rev 9236) @@ -3,11 +3,11 @@ GARNAME = bind GARVERSION = 9.7.0 -#RELEASE = P3 -#DISTVERSION = $(GARVERSION)-$(RELEASE) -#SPKG_VERSION = $(GARVERSION)$(RELEASE) -#DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE) -#WORKSRC = $(WORKDIR)/$(DISTNAME) +RELEASE = P1 +DISTVERSION = $(GARVERSION)-$(RELEASE) +SPKG_VERSION = $(GARVERSION)$(RELEASE) +DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE) +WORKSRC = $(WORKDIR)/$(DISTNAME) CATEGORIES = net DESCRIPTION = ISC BIND DNS reference implementation @@ -18,10 +18,10 @@ high-volume and high-reliability applications. endef -#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/ -#DISTFILES = $(DISTNAME).tar.gz -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/ +DISTFILES = $(DISTNAME).tar.gz +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)/ +#DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWbindchroot.postinstall PACKAGES = CSWbind CSWbinddevel CSWlibbind CSWbindutils CSWbindchroot @@ -58,7 +58,7 @@ CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw CONFIGURE_ARGS += --localstatedir=/var/opt/csw/named -CHECKPKG_OVERRIDES = symbol-not-found +#CHECKPKG_OVERRIDES = symbol-not-found EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la @@ -69,9 +69,11 @@ INSTALL_SCRIPTS = custom -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/var\/opt\/csw\/named/ { $$$$2 = "ugfiles" ; $$$$5 = "named" ; $$$$6 = "named" } \ - { print }' +PROTOTYPE_MODIFIERS = 1 +PROTOTYPE_FILES_1 = /var/opt/csw/named +PROTOTYPE_CLASS_1 = ugfiles +PROTOTYPE_USER_1 = named +PROTOTYPE_GROUP_1 = named INITSMF = /opt/csw/etc/init.d/cswnamed SAMPLECONF = /etc/opt/csw/named.conf @@ -81,10 +83,6 @@ SPKG_SOURCEURL = http://www.isc.org/software/bind -# Still needed because of ugfiles -SPKG_CLASSES_CSWbind = none cswusergroup ugfiles cswcpsampleconf cswinitsmf -SPKG_CLASSES_CSWbindchroot = none ugfiles - include gar/category.mk DOCLIST = README.CSW db.127.0.0 db.localhost named.conf named.root rndc.key Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2010-03-17 21:11:15 UTC (rev 9235) +++ csw/mgar/pkg/bind/trunk/checksums 2010-03-18 14:06:04 UTC (rev 9236) @@ -1,2 +1,2 @@ dbbc839888d11d22aad3ccb65942d2e5 CSWbindchroot.postinstall -c245b5d1aa0a4f53d9538faa1efe2c3f bind-9.7.0.tar.gz +78e3e38c6252e41ded1afa1aeb183622 bind-9.7.0-P1.tar.gz 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 Mar 18 16:07:06 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 18 Mar 2010 15:07:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9237] csw/mgar/pkg/imlib2/branches/csw-x11/ Message-ID: Revision: 9237 http://gar.svn.sourceforge.net/gar/?rev=9237&view=rev Author: wahwah Date: 2010-03-18 15:07:06 +0000 (Thu, 18 Mar 2010) Log Message: ----------- imlib2: Removed an obsolete branch Removed Paths: ------------- csw/mgar/pkg/imlib2/branches/csw-x11/ 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 Mar 18 19:48:26 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 18 Mar 2010 18:48:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[9238] csw/mgar/pkg/cpan/File-Tail/trunk/Makefile Message-ID: Revision: 9238 http://gar.svn.sourceforge.net/gar/?rev=9238&view=rev Author: idogan23 Date: 2010-03-18 18:48:26 +0000 (Thu, 18 Mar 2010) Log Message: ----------- pm_filetail: license is missing Modified Paths: -------------- csw/mgar/pkg/cpan/File-Tail/trunk/Makefile Modified: csw/mgar/pkg/cpan/File-Tail/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-Tail/trunk/Makefile 2010-03-18 15:07:06 UTC (rev 9237) +++ csw/mgar/pkg/cpan/File-Tail/trunk/Makefile 2010-03-18 18:48:26 UTC (rev 9238) @@ -14,4 +14,6 @@ CATALOGNAME = pm_filetail ARCHALL = 1 +CHECKPKG_OVERRIDES_CSWpmfiletail += license-missing + include gar/category.mk 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 Mar 18 20:10:06 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 18 Mar 2010 19:10:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9239] csw/mgar/pkg/cpan/Mail-Tools/trunk Message-ID: Revision: 9239 http://gar.svn.sourceforge.net/gar/?rev=9239&view=rev Author: idogan23 Date: 2010-03-18 19:10:06 +0000 (Thu, 18 Mar 2010) Log Message: ----------- pm_mailtools: switched to dynamic gpsec Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/cpan/Mail-Tools/trunk/files/CSWpmmailtools.gspec csw/mgar/pkg/cpan/Mail-Tools/trunk/files/CSWpmmailtools.prototype Modified: csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile 2010-03-18 18:48:26 UTC (rev 9238) +++ csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile 2010-03-18 19:10:06 UTC (rev 9239) @@ -9,6 +9,10 @@ Mail::Internet, Mail::Mailer, Mail::Send and Mail::Util. endef -DISTFILES += $(call admfiles,CSWpmmailtools,prototype) +PACKAGES = CSWpmmailtools +CATALOGNAME = pm_mailtools +ARCHALL = 1 +CHECKPKG_OVERRIDES_CSWpmmailtools += license-missing + include gar/category.mk Deleted: csw/mgar/pkg/cpan/Mail-Tools/trunk/files/CSWpmmailtools.gspec =================================================================== --- csw/mgar/pkg/cpan/Mail-Tools/trunk/files/CSWpmmailtools.gspec 2010-03-18 18:48:26 UTC (rev 9238) +++ csw/mgar/pkg/cpan/Mail-Tools/trunk/files/CSWpmmailtools.gspec 2010-03-18 19:10:06 UTC (rev 9239) @@ -1,10 +0,0 @@ -%var bitname pm_mailtools -%var pkgname CSWpmmailtools -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -All files contained in this installation are Copyright (c) 1995-2003 -Graham Barr unless otherwise specified. 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/Mail-Tools/trunk/files/CSWpmmailtools.prototype =================================================================== --- csw/mgar/pkg/cpan/Mail-Tools/trunk/files/CSWpmmailtools.prototype 2010-03-18 18:48:26 UTC (rev 9238) +++ csw/mgar/pkg/cpan/Mail-Tools/trunk/files/CSWpmmailtools.prototype 2010-03-18 19:10:06 UTC (rev 9239) @@ -1,49 +0,0 @@ -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/Mail::Address.3perl 0444 root bin -f none /opt/csw/share/man/man3/Mail::Cap.3perl 0444 root bin -f none /opt/csw/share/man/man3/Mail::Field.3perl 0444 root bin -f none /opt/csw/share/man/man3/Mail::Field::AddrList.3perl 0444 root bin -f none /opt/csw/share/man/man3/Mail::Field::Date.3perl 0444 root bin -f none /opt/csw/share/man/man3/Mail::Field::Generic.3perl 0444 root bin -f none /opt/csw/share/man/man3/Mail::Filter.3perl 0444 root bin -f none /opt/csw/share/man/man3/Mail::Header.3perl 0444 root bin -f none /opt/csw/share/man/man3/Mail::Internet.3perl 0444 root bin -f none /opt/csw/share/man/man3/Mail::Mailer.3perl 0444 root bin -f none /opt/csw/share/man/man3/Mail::Send.3perl 0444 root bin -f none /opt/csw/share/man/man3/Mail::Util.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/Mail 0755 root bin -f none /opt/csw/share/perl/csw/Mail/Address.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Address.pod 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Cap.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Cap.pod 0444 root bin -d none /opt/csw/share/perl/csw/Mail/Field 0755 root bin -f none /opt/csw/share/perl/csw/Mail/Field.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Field.pod 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Field/AddrList.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Field/AddrList.pod 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Field/Date.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Field/Date.pod 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Field/Generic.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Field/Generic.pod 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Filter.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Filter.pod 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Header.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Header.pod 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Internet.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Internet.pod 0444 root bin -d none /opt/csw/share/perl/csw/Mail/Mailer 0755 root bin -f none /opt/csw/share/perl/csw/Mail/Mailer.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Mailer.pod 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Mailer/qmail.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Mailer/rfc822.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Mailer/sendmail.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Mailer/smtp.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Mailer/testfile.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Send.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Send.pod 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Util.pm 0444 root bin -f none /opt/csw/share/perl/csw/Mail/Util.pod 0444 root bin 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 Mar 18 20:14:30 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 18 Mar 2010 19:14:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9240] csw/mgar/pkg/cpan/Mail-Tools/trunk Message-ID: Revision: 9240 http://gar.svn.sourceforge.net/gar/?rev=9240&view=rev Author: idogan23 Date: 2010-03-18 19:14:30 +0000 (Thu, 18 Mar 2010) Log Message: ----------- pm_mailtools: bump version to 2.06 Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile csw/mgar/pkg/cpan/Mail-Tools/trunk/checksums Modified: csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile 2010-03-18 19:10:06 UTC (rev 9239) +++ csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile 2010-03-18 19:14:30 UTC (rev 9240) @@ -1,5 +1,5 @@ GARNAME = MailTools -GARVERSION = 2.05 +GARVERSION = 2.06 CATEGORIES = cpan AUTHOR = MARKOV Modified: csw/mgar/pkg/cpan/Mail-Tools/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Mail-Tools/trunk/checksums 2010-03-18 19:10:06 UTC (rev 9239) +++ csw/mgar/pkg/cpan/Mail-Tools/trunk/checksums 2010-03-18 19:14:30 UTC (rev 9240) @@ -1,3 +1 @@ -b25a30ea397a053d8859a08747e5d2e8 CSWpmmailtools.gspec -738cde725b5cfcfc3a0608cd5b359acc CSWpmmailtools.prototype -86a51c5a81a55e555c7a84dfdf6ab270 MailTools-2.05.tar.gz +3f90297c7f566cc0cc9c89ee47906abf MailTools-2.06.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 Thu Mar 18 20:55:15 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 18 Mar 2010 19:55:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9241] csw/mgar/pkg/cpan/MIME-tools/trunk Message-ID: Revision: 9241 http://gar.svn.sourceforge.net/gar/?rev=9241&view=rev Author: idogan23 Date: 2010-03-18 19:55:15 +0000 (Thu, 18 Mar 2010) Log Message: ----------- pm_mimetools: switched to gar v2 Modified Paths: -------------- csw/mgar/pkg/cpan/MIME-tools/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/cpan/MIME-tools/trunk/files/CSWpmmimetools.depend csw/mgar/pkg/cpan/MIME-tools/trunk/files/CSWpmmimetools.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/MIME-tools/trunk/ Property changes on: csw/mgar/pkg/cpan/MIME-tools/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/MIME-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-tools/trunk/Makefile 2010-03-18 19:14:30 UTC (rev 9240) +++ csw/mgar/pkg/cpan/MIME-tools/trunk/Makefile 2010-03-18 19:55:15 UTC (rev 9241) @@ -3,13 +3,17 @@ CATEGORIES = cpan AUTHOR = ERYQ -DESCRIPTION = modules for parsing and creating MIME entities +DESCRIPTION = Modules for parsing and creating MIME entities define BLURB Modules for parsing (and creating!) MIME entities endef -DISTFILES += $(call admfiles,CSWpmmimetools,depend) +DEPENDS += cpan/Mail-Tools cpan/Convert-BinHex cpan/Unix-Syslog cpan/IO-stringy -DEPENDS += cpan/Mail-Tools cpan/Convert-BinHex cpan/Unix-Syslog +PACKAGES = CSWpmmimetools +CATALOGNAME = pm_mimetools +ARCHALL = 1 +COPYING = LICENSE + include gar/category.mk Deleted: csw/mgar/pkg/cpan/MIME-tools/trunk/files/CSWpmmimetools.depend =================================================================== --- csw/mgar/pkg/cpan/MIME-tools/trunk/files/CSWpmmimetools.depend 2010-03-18 19:14:30 UTC (rev 9240) +++ csw/mgar/pkg/cpan/MIME-tools/trunk/files/CSWpmmimetools.depend 2010-03-18 19:55:15 UTC (rev 9241) @@ -1,4 +0,0 @@ -P CSWpmmailtools -P CSWpmconvertbinhex -P CSWpmunixsyslog -P CSWpmiostringy Deleted: csw/mgar/pkg/cpan/MIME-tools/trunk/files/CSWpmmimetools.gspec =================================================================== --- csw/mgar/pkg/cpan/MIME-tools/trunk/files/CSWpmmimetools.gspec 2010-03-18 19:14:30 UTC (rev 9240) +++ csw/mgar/pkg/cpan/MIME-tools/trunk/files/CSWpmmimetools.gspec 2010-03-18 19:55:15 UTC (rev 9241) @@ -1,5 +0,0 @@ -%var bitname pm_mimetools -%var pkgname CSWpmmimetools -%var arch all -%include url file://%{PKGLIB}/csw_cpan.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 idogan23 at users.sourceforge.net Thu Mar 18 21:22:43 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 18 Mar 2010 20:22:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9242] csw/mgar/pkg/mrtg/trunk Message-ID: Revision: 9242 http://gar.svn.sourceforge.net/gar/?rev=9242&view=rev Author: idogan23 Date: 2010-03-18 20:22:43 +0000 (Thu, 18 Mar 2010) Log Message: ----------- mrtg: switched to gar v2 Modified Paths: -------------- csw/mgar/pkg/mrtg/trunk/Makefile csw/mgar/pkg/mrtg/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/mrtg/trunk/files/CSWmrtg.depend csw/mgar/pkg/mrtg/trunk/files/CSWmrtg.gspec Property Changed: ---------------- csw/mgar/pkg/mrtg/trunk/ Property changes on: csw/mgar/pkg/mrtg/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/mrtg/trunk/Makefile =================================================================== --- csw/mgar/pkg/mrtg/trunk/Makefile 2010-03-18 19:55:15 UTC (rev 9241) +++ csw/mgar/pkg/mrtg/trunk/Makefile 2010-03-18 20:22:43 UTC (rev 9242) @@ -1,5 +1,5 @@ GARNAME = mrtg -GARVERSION = 2.16.2 +GARVERSION = 2.16.3 CATEGORIES = utils DESCRIPTION = Multi Router Traffic Grapher (network monitor) @@ -9,19 +9,30 @@ provide a LIVE visual representation of this traffic. endef +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +VENDOR_URL = http://oss.oetiker.ch/mrtg/ MASTER_SITES = http://oss.oetiker.ch/mrtg/pub/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWmrtg, depend) +PACKAGES = CSWmrtg +CATALOGNAME = mrtg + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gd=/opt/csw CONFIGURE_ARGS += --with-gd-lib=/opt/csw/lib CONFIGURE_ARGS += --with-gd-inc=/opt/csw/include -GARCOMPILER = SUN +RUNTIME_DEP_PKGS += CSWperl +RUNTIME_DEP_PKGS += CSWgd +RUNTIME_DEP_PKGS += CSWpng +RUNTIME_DEP_PKGS += CSWzlib + +#GARCOMPILER = SUN TEST_TARGET = include gar/category.mk Modified: csw/mgar/pkg/mrtg/trunk/checksums =================================================================== --- csw/mgar/pkg/mrtg/trunk/checksums 2010-03-18 19:55:15 UTC (rev 9241) +++ csw/mgar/pkg/mrtg/trunk/checksums 2010-03-18 20:22:43 UTC (rev 9242) @@ -1,3 +1 @@ -06de09c0ee0d35a0142afed5b275b4cd download/mrtg-2.16.2.tar.gz -b637f4a20c5502260bd859123d891b60 download/CSWmrtg.gspec -c9941e1d02ce4ac2d0060648d8fec2f3 download/CSWmrtg.depend +dfdda80c1d575081458cede58f979d81 mrtg-2.16.3.tar.gz Deleted: csw/mgar/pkg/mrtg/trunk/files/CSWmrtg.depend =================================================================== --- csw/mgar/pkg/mrtg/trunk/files/CSWmrtg.depend 2010-03-18 19:55:15 UTC (rev 9241) +++ csw/mgar/pkg/mrtg/trunk/files/CSWmrtg.depend 2010-03-18 20:22:43 UTC (rev 9242) @@ -1,4 +0,0 @@ -P CSWperl -P CSWgd -P CSWpng -P CSWzlib Deleted: csw/mgar/pkg/mrtg/trunk/files/CSWmrtg.gspec =================================================================== --- csw/mgar/pkg/mrtg/trunk/files/CSWmrtg.gspec 2010-03-18 19:55:15 UTC (rev 9241) +++ csw/mgar/pkg/mrtg/trunk/files/CSWmrtg.gspec 2010-03-18 20:22:43 UTC (rev 9242) @@ -1,4 +0,0 @@ -%var bitname mrtg -%var pkgname CSWmrtg -%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 idogan23 at users.sourceforge.net Thu Mar 18 22:04:33 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 18 Mar 2010 21:04:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[9243] csw/mgar/pkg/ldns/trunk Message-ID: Revision: 9243 http://gar.svn.sourceforge.net/gar/?rev=9243&view=rev Author: idogan23 Date: 2010-03-18 21:04:33 +0000 (Thu, 18 Mar 2010) Log Message: ----------- ldns: bump version to 1.6.4 Modified Paths: -------------- csw/mgar/pkg/ldns/trunk/Makefile csw/mgar/pkg/ldns/trunk/checksums Modified: csw/mgar/pkg/ldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns/trunk/Makefile 2010-03-18 20:22:43 UTC (rev 9242) +++ csw/mgar/pkg/ldns/trunk/Makefile 2010-03-18 21:04:33 UTC (rev 9243) @@ -1,5 +1,5 @@ GARNAME = ldns -GARVERSION = 1.6.3 +GARVERSION = 1.6.4 CATEGORIES = lib DESCRIPTION = A library for programs conforming to DNS RFCs and drafts @@ -15,6 +15,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWldns.doxyparse.diff +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 + PACKAGES = CSWldns CSWldnsdevel CATALOGNAME_CSWldns = ldns CATALOGNAME_CSWldnsdevel = ldns_devel Modified: csw/mgar/pkg/ldns/trunk/checksums =================================================================== --- csw/mgar/pkg/ldns/trunk/checksums 2010-03-18 20:22:43 UTC (rev 9242) +++ csw/mgar/pkg/ldns/trunk/checksums 2010-03-18 21:04:33 UTC (rev 9243) @@ -1,2 +1,2 @@ b5516aacfa819947cbfb6d0c34f0c546 CSWldns.doxyparse.diff -4234fc56f087d852b2f6d1e6ccd9b7da ldns-1.6.3.tar.gz +6747d7bd96552ee5d8943f3abb24815f ldns-1.6.4.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 Thu Mar 18 23:01:55 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 18 Mar 2010 22:01:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[9244] csw/mgar/pkg/ldns/trunk/Makefile Message-ID: Revision: 9244 http://gar.svn.sourceforge.net/gar/?rev=9244&view=rev Author: idogan23 Date: 2010-03-18 22:01:55 +0000 (Thu, 18 Mar 2010) Log Message: ----------- ldns: added LICENSE Modified Paths: -------------- csw/mgar/pkg/ldns/trunk/Makefile Modified: csw/mgar/pkg/ldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns/trunk/Makefile 2010-03-18 21:04:33 UTC (rev 9243) +++ csw/mgar/pkg/ldns/trunk/Makefile 2010-03-18 22:01:55 UTC (rev 9244) @@ -33,6 +33,8 @@ # 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 +LICENSE = LICENSE + BUILD64 = 1 EXTRA_BUILD_ISAS_i386 = pentium_pro EXTRA_BUILD_ISAS_sparc = sparcv8plus This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Mar 19 05:11:36 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 19 Mar 2010 04:11:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9245] csw/mgar/pkg/zlib/trunk Message-ID: Revision: 9245 http://gar.svn.sourceforge.net/gar/?rev=9245&view=rev Author: hson Date: 2010-03-19 04:11:35 +0000 (Fri, 19 Mar 2010) Log Message: ----------- zlib: Update to 1.2.4 Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/Makefile csw/mgar/pkg/zlib/trunk/checksums csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff csw/mgar/pkg/zlib/trunk/files/configure.diff Added Paths: ----------- csw/mgar/pkg/zlib/trunk/files/license Modified: csw/mgar/pkg/zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2010-03-18 22:01:55 UTC (rev 9244) +++ csw/mgar/pkg/zlib/trunk/Makefile 2010-03-19 04:11:35 UTC (rev 9245) @@ -1,5 +1,5 @@ GARNAME = zlib -GARVERSION = 1.2.3 +GARVERSION = 1.2.4 CATEGORIES = lib DESCRIPTION = Zlib Data Compression Library @@ -18,9 +18,11 @@ SF_PROJ=libpng MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += license SPKG_SOURCEURL = http://www.zlib.net +LICENSE = license # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=5624 UPSTREAM_USE_SF = 1 @@ -33,7 +35,7 @@ #NOISAEXEC = 1 EXTRA_BUILD_ISAS = sparcv8plus sparcv8plus+vis pentium_pro+mmx pentium -CONFIGURE_ARGS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) +CONFIGURE_ARGS = --prefix=$(prefix) --eprefix=$(exec_prefix) CONFIGURE_ARGS += --libdir=$(libdir) --includedir=$(includedir) --shared include gar/category.mk Modified: csw/mgar/pkg/zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/zlib/trunk/checksums 2010-03-18 22:01:55 UTC (rev 9244) +++ csw/mgar/pkg/zlib/trunk/checksums 2010-03-19 04:11:35 UTC (rev 9245) @@ -1,3 +1,4 @@ -dee233bf288ee795ac96a98cc2e369b6 download/zlib-1.2.3.tar.bz2 -7e6ff59ded76dd7d90a5dc10ff25e20a download/Makefile.in.diff -95c0edba1d5160ed41b871f2c83e813a download/configure.diff +f42963676d4ac5dbf75bb9187aadd2a0 Makefile.in.diff +eb5fb03fc91399bb0ad892223d339c09 configure.diff +4f83c4bd64190ba690413ab698861b3f license +763c6a0b4ad1cdf5549e3ab3f140f4cb zlib-1.2.4.tar.bz2 Modified: csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff 2010-03-18 22:01:55 UTC (rev 9244) +++ csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff 2010-03-19 04:11:35 UTC (rev 9245) @@ -9,48 +9,12 @@ man3dir = ${mandir}/man3 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ -@@ -78,7 +78,7 @@ - rm -f _match.s +@@ -134,7 +134,7 @@ + - at mv objs/$*.o $@ - $(SHAREDLIBV): $(OBJS) -- $(LDSHARED) -o $@ $(OBJS) -+ $(LDSHARED) -h $(SHAREDLIBM) -o $@ $(OBJS) + $(SHAREDLIBV): $(PIC_OBJS) +- $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) -lc ++ $(LDSHARED) $(SFLAGS) -h $(SHAREDLIBM) -o $@ $(PIC_OBJS) -lc rm -f $(SHAREDLIB) $(SHAREDLIBM) ln -s $@ $(SHAREDLIB) ln -s $@ $(SHAREDLIBM) -@@ -90,23 +90,23 @@ - $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) - - install: $(LIBS) -- - at if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi -- - at if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi -- - at if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi -- - at if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi -- cp zlib.h zconf.h $(includedir) -- chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h -- cp $(LIBS) $(libdir) -- cd $(libdir); chmod 755 $(LIBS) -- -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 -- cd $(libdir); if test -f $(SHAREDLIBV); then \ -+ - at if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi -+ - at if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi -+ - at if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi -+ - at if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi -+ cp zlib.h zconf.h $(DESTDIR)$(includedir) -+ chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h -+ cp $(LIBS) $(DESTDIR)$(libdir) -+ cd $(DESTDIR)$(libdir); chmod 755 $(LIBS) -+ -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 -+ cd $(DESTDIR)$(libdir); if test -f $(SHAREDLIBV); then \ - rm -f $(SHAREDLIB) $(SHAREDLIBM); \ - ln -s $(SHAREDLIBV) $(SHAREDLIB); \ - ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ - (ldconfig || true) >/dev/null 2>&1; \ - fi -- cp zlib.3 $(man3dir) -- chmod 644 $(man3dir)/zlib.3 -+ cp zlib.3 $(DESTDIR)$(man3dir) -+ chmod 644 $(DESTDIR)$(man3dir)/zlib.3 - # The ranlib in install is needed on NeXTSTEP which checks file times - # ldconfig is for Linux - Modified: csw/mgar/pkg/zlib/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/zlib/trunk/files/configure.diff 2010-03-18 22:01:55 UTC (rev 9244) +++ csw/mgar/pkg/zlib/trunk/files/configure.diff 2010-03-19 04:11:35 UTC (rev 9245) @@ -1,14 +1,5 @@ ---- ../build-global/zlib-1.2.3/configure 2005-07-11 22:11:57.000000000 +0200 -+++ zlib-1.2.3/configure 2009-04-01 00:31:48.271327549 +0200 -@@ -19,7 +19,7 @@ - # an error. - - LIBS=libz.a --LDFLAGS="-L. ${LIBS}" -+#LDFLAGS="-L. ${LIBS}" - VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h` - VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h` - VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h` +--- zlib-1.2.4/configure.orig 2010-03-12 16:06:14.000000000 +0100 ++++ zlib-1.2.4/configure 2010-03-19 03:56:46.336725066 +0100 @@ -29,7 +29,7 @@ exec_prefix=${exec_prefix-'${prefix}'} libdir=${libdir-'${exec_prefix}/lib'} @@ -18,23 +9,19 @@ shared_ext='.so' shared=0 gcc=0 -@@ -132,9 +132,9 @@ - SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "} - CFLAGS=${CFLAGS-"-O3"} - LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};; -- SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."} -+ SunOS\ 5*) SFLAGS="-KPIC $CFLAGS" - CFLAGS=${CFLAGS-"-fast -xcg89"} -- LDSHARED=${LDSHARED-"cc -G"};; -+ LDSHARED=${LDSHARED-"cc -G $LDFLAGS"};; +@@ -154,11 +154,11 @@ + SunOS\ 5*) LDSHARED=${LDSHARED-"cc -G"} + case `(uname -m || echo unknown) 2>/dev/null` in + i86*) +- SFLAGS=${CFLAGS-"-xpentium -fast -KPIC -R."} +- CFLAGS=${CFLAGS-"-xpentium -fast"} ;; ++ SFLAGS="${CFLAGS} -KPIC -L." ++ CFLAGS=${CFLAGS} ;; + *) +- SFLAGS=${CFLAGS-"-fast -xcg92 -KPIC -R."} +- CFLAGS=${CFLAGS-"-fast -xcg92"} ;; ++ SFLAGS="${CFLAGS} -KPIC -L." ++ CFLAGS=${CFLAGS} ;; + esac ;; SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"} CFLAGS=${CFLAGS-"-O2"} - LDSHARED=${LDSHARED-"ld"};; -@@ -187,6 +187,7 @@ - if test $shared -eq 0; then - LDSHARED="$CC" - echo Building static library $LIBS version $VER with $CC. -+ LDFLAGS="-L. ${LIBS}" - else - LDFLAGS="-L. ${SHAREDLIBV}" - fi Added: csw/mgar/pkg/zlib/trunk/files/license =================================================================== --- csw/mgar/pkg/zlib/trunk/files/license (rev 0) +++ csw/mgar/pkg/zlib/trunk/files/license 2010-03-19 04:11:35 UTC (rev 9245) @@ -0,0 +1,32 @@ + +Copyright notice: + + (C) 1995-2010 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup at gzip.org madler at alumni.caltech.edu + +If you use the zlib library in a product, we would appreciate *not* receiving +lengthy legal documents to sign. The sources are provided for free but without +warranty of any kind. The library has been entirely written by Jean-loup +Gailly and Mark Adler; it does not include third-party code. + +If you redistribute modified sources, we would appreciate that you include in +the file ChangeLog history information documenting your changes. Please read +the FAQ for more information on the distribution of modified source versions. 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 Mar 19 10:57:20 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 09:57:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9246] csw/mgar/pkg/tcl/trunk/Makefile Message-ID: Revision: 9246 http://gar.svn.sourceforge.net/gar/?rev=9246&view=rev Author: dmichelsen Date: 2010-03-19 09:57:20 +0000 (Fri, 19 Mar 2010) Log Message: ----------- tcl: Make sure adding static lib works Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-03-19 04:11:35 UTC (rev 9245) +++ csw/mgar/pkg/tcl/trunk/Makefile 2010-03-19 09:57:20 UTC (rev 9246) @@ -45,7 +45,7 @@ CONFIGURE_ARGS = $(DIRPATHS) # tk need the static tclstub library for some reason -EXTRA_MERGE_INCLUDE_FILES = $(libdir)/libtclstub.*\.a +MERGE_EXCLUDE_STATICLIBS = MERGE_SCRIPTS_isa-default-garversion-8.4.19 = copy-lib-only 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 Mar 19 10:58:57 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 09:58:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[9247] csw/mgar/pkg/tk/trunk/Makefile Message-ID: Revision: 9247 http://gar.svn.sourceforge.net/gar/?rev=9247&view=rev Author: dmichelsen Date: 2010-03-19 09:58:56 +0000 (Fri, 19 Mar 2010) Log Message: ----------- tk: Make sure adding static lib works Modified Paths: -------------- csw/mgar/pkg/tk/trunk/Makefile Modified: csw/mgar/pkg/tk/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk/trunk/Makefile 2010-03-19 09:57:20 UTC (rev 9246) +++ csw/mgar/pkg/tk/trunk/Makefile 2010-03-19 09:58:56 UTC (rev 9247) @@ -39,7 +39,8 @@ CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -EXTRA_MERGE_INCLUDE_FILES = $(libdir)/libtkstub.*\.a +# tk need the static tclstub library for some reason +MERGE_EXCLUDE_STATICLIBS = TEST_TARGET = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 19 11:07:39 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 19 Mar 2010 10:07:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9248] csw/mgar/gar/v2 Message-ID: Revision: 9248 http://gar.svn.sourceforge.net/gar/?rev=9248&view=rev Author: wahwah Date: 2010-03-19 10:07:39 +0000 (Fri, 19 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, integrated pkgchk test, integrated bad paths check, added a better test case for SetCheckSharedLibraryConsistency() Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/bin/checkpkg_collect_stats.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py csw/mgar/gar/v2/lib/python/gartest.py csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/tests/overrides_test.py csw/mgar/gar/v2/tests/run_tests.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/bad_paths.yml csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkgchk.yml Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-03-19 09:58:56 UTC (rev 9247) +++ csw/mgar/gar/v2/bin/checkpkg 2010-03-19 10:07:39 UTC (rev 9248) @@ -7,6 +7,10 @@ # diff to 1.46a # - check multiple package files # - checkpkg.d plugin support +# - getopts support for command line options +# - colors +# - modular architecture + unit tests +# - # # This script examines a package that has been put together # for submittal to the CSW archive at opencsw.org @@ -20,6 +24,10 @@ # Be sure to occasionally do a "pkg-get update cswutils" so that # you know you are tracking the most current version. # +# TODOs before commit: +# - bad strings check +# - pkgchk run +# PATH=$PATH:/usr/sbin readonly NAME_MAX_LENGTH=${NAME_MAX_LENGTH:-20} @@ -31,11 +39,8 @@ . "${libshdir}/libcheckpkg.sh" LOCAL_ARCH=`uname -p` -if [[ -z "${CHECKPKG_TMPDIR}" ]]; then - readonly CHECKPKG_TMPDIR="/var/tmp" -else - readonly CHECKPKG_TMPDIR -fi +CHECKPKG_TMPDIR=${CHECKPKG_TMPDIR:-/var/tmp} +readonly CHECKPKG_TMPDIR # Colors only when running interactively if [[ -t 1 ]]; then @@ -92,7 +97,7 @@ cleanup cleanupset print "To run checkpkg in the debug mode, add the '-d' flag, for example:" - print "${selfpath} -d ${selfargs}" + # print "${selfpath} -d ${selfargs}" print "After you modify any overrides, you need to do gmake remerge repackage" print "or gmake platforms-remerge platforms-repackage." exit 1 @@ -104,40 +109,59 @@ fi } -set_variables_for_individual_package_check() { - f=$1 - file $f \ - | sed 's/^[^:]*://' \ - | grep gzip >/dev/null - if [ $? -eq 0 ] ; then - TMPARCHIVE=$CHECKPKG_TMPDIR/`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` - pkgnames="$pkgnames $pkgname" -} +# TODO: Options to add: +# - Use an pre-cached (from a catalog file?) list of md5 sums +# - Don't use the data from /var/sadm/install/contents +SAVE_TAGS=0 +display_help=0 +SKIP_STATS_COLLECTION=0 +MD5_SUMS_CATALOG_FILE="" -if [[ "$1" == "-d" ]] ; then - DEBUG=1 - shift -fi +while getopts hsdNM: opt; do + case "${opt}" in + s) + SAVE_TAGS=1 + SAVED_TAGS_FILE=error-tags.txt + ;; + d) + DEBUG=1 + ;; + e) + quit_on_warn=1 + ;; + h) + display_help=1 + ;; + N) + SKIP_STATS_COLLECTION=1 + ;; + M) + MD5_SUMS_CATALOG_FILE="${OPTARG}" + ;; + *) + echo "Unknown option '${opt}'" + ;; + esac +done +shift $(( $OPTIND -1 )) -if [[ "$1" == "-e" ]] ; then - quit_on_warn=1; - shift -fi -if [[ "$1" == "-h" ]] ; then - print 'Usage: checkpkg [-d] [-e] pkg1 [pkg2 ....]' +readonly SAVE_TAGS SAVED_TAGS_FILE MD5_SUMS_CATALOG_FILE + +if [[ "${display_help}" -eq 1 ]] ; then + print 'Usage: checkpkg [options] pkg1 [pkg2 ....]' + print 'Options:' + print ' -s save error tags on disk' print ' -d display debug messages' print ' -e exit on warnings (soon to be obsolete)' - shift + exit 0 fi +if [[ "${SAVE_TAGS}" -eq 1 ]]; then + if [[ -f "${SAVED_TAGS_FILE}" ]]; then + rm "${SAVED_TAGS_FILE}" + fi +fi + # a unique filename for the list of package deps and libs we see in a 'set' SETINF=$CHECKPKG_TMPDIR/checkpkg.$$.`date +%Y%m%d%H%M%S` SETLIBS=$SETINF.libs @@ -148,87 +172,19 @@ EXTRACTDIR=$CHECKPKG_TMPDIR/dissect.$$ if [ -d $EXTRACTDIR ] ; then - print ERROR: $EXTRACTDIR already exists - exit 1 + errmsg ERROR: $EXTRACTDIR already exists fi for f in "$@" do -if [[ ! -f $f ]] ; then - print ERROR: $f does not exist - exit 1 -fi - - -debugmsg "Examining $f" -debugmsg "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. -# -# Using rot13 so that checkpkg can check itself without reporting -# an error. -badpaths="$(echo /rkcbeg/zrqhfn /bcg/ohvyq | gtr a-mn-z n-za-m)" -for badpath in $badpaths ; 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 + if [[ ! -f $f ]] ; then + errmsg ERROR: $f does not exist fi -done -set_variables_for_individual_package_check "$f" [ -d ${EXTRACTDIR} ] || mkdir ${EXTRACTDIR} -# # FIXME: This doesn't support multiple packages -# TMPFILE=$EXTRACTDIR/pkginfo -# -# -# printf "$pkgname " -# dd if=$f skip=1 | (cd $EXTRACTDIR; cpio -ivd $pkgname/pkginfo >/dev/null 2>&1) -# if [[ $? -ne 0 ]] ; then -# print "ERROR: could not extract $f" -# print "with (cd $EXTRACTDIR; cpio -ivd $pkgname/pkginfo)" -# ls -l $EXTRACTDIR -# 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` -# -# rm $TMPFILE - -# strip out '' chars, because it interferes with mysql -# desc=`print $desc | sed "s/'//g"` - -############################################################# -# 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. - -# TODO: Run this during the stats collection stage. -# /usr/sbin/pkgchk -d $EXTRACTDIR $pkgname || errmsg "Package failed integrity check" -# print "/usr/sbin/pkgchk passed." - - ######################################## # Check for some common errors ######################################### @@ -254,14 +210,14 @@ tmparchives="$tmparchives $TMPARCHIVE" done -# Plugin section. +# Plugin section. This is here for support for other programming languages +# than Python. As of 2010-03-16 there are no checks in there. If this keeps +# empty, if no checks in other languages get written, it could be removed. # # Plugins should live in checkpkg.d subdirectory in the same directory in which # checkpkg is. Each plugin file name should be an executable and begin with # "checkpkg-". -set_variables_for_individual_package_check "$f" - test_suite_ok=1 checkpkg_module_dir=${command_basedir}/../lib/checkpkg.d checkpkg_module_tag="checkpkg-" @@ -283,13 +239,22 @@ # /var/sadm/install/contents cache update ${command_basedir}/update_contents_cache.py -# Collects package stats to be later analyzed -${command_basedir}/checkpkg_collect_stats.py ${extra_options} "$@" +if [[ "${SKIP_STATS_COLLECTION}" -eq 0 ]]; then + # Collects package stats to be later analyzed + ${command_basedir}/checkpkg_collect_stats.py ${extra_options} "$@" + if [[ "$?" -ne 0 ]]; then + errmsg "Stats collection phase has failed." + fi +fi debugmsg "checkpkg_module_dir: '$checkpkg_module_dir'" log_files="" module_name_format="%-40s" +# TODO: A performance problem. The following line means that the md5sums are +# calculated once more. +debugmsg "Calculating md5 sums of all the package files." md5sums=`gmd5sum "$@" | awk '{print $1}'` +debugmsg "All md5 sums: ${md5sums}" if [[ -d "${checkpkg_module_dir}" ]]; then for plugin in "${checkpkg_module_dir}/${checkpkg_module_tag}"*; do if [[ -x "${plugin}" ]]; then @@ -362,6 +327,10 @@ echo "# ${tagfile}:" cat "${tagfile}" fi + if [[ "${SAVE_TAGS}" -eq 1 ]]; then + echo "Saving ${tagfile} to `pwd`/${SAVED_TAGS_FILE}" + cat "${tagfile}" >> "${SAVED_TAGS_FILE}" + fi done fi Modified: csw/mgar/gar/v2/bin/checkpkg_collect_stats.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py 2010-03-19 09:58:56 UTC (rev 9247) +++ csw/mgar/gar/v2/bin/checkpkg_collect_stats.py 2010-03-19 10:07:39 UTC (rev 9248) @@ -5,6 +5,7 @@ # Collects statistics about a package and saves to a directory, for later use # by checkpkg modules. +import itertools import logging import optparse import os @@ -35,8 +36,17 @@ logging.debug("calling: %s, please be patient", args) packages = [opencsw.CswSrv4File(x, options.debug) for x in args] stats_list = [checkpkg.PackageStats(pkg) for pkg in packages] - for pkg_stats in stats_list: - pkg_stats.CollectStats() + del(packages) + stats_list.reverse() + total_packages = len(stats_list) + counter = itertools.count(1) + while stats_list: + # This way objects will get garbage collected as soon as they are removed + # from the list by pop(). The destructor (__del__()) of the srv4 class + # removes the temporary directory from the disk. This allows to process + # the whole catalog. + stats_list.pop().CollectStats() + logging.debug("Collected stats %s of %s.", counter.next(), total_packages) if __name__ == '__main__': main() Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-19 09:58:56 UTC (rev 9247) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-19 10:07:39 UTC (rev 9248) @@ -21,6 +21,8 @@ import opencsw import package_checks +DB_SCHEMA_VERSION = 2L +PACKAGE_STATS_VERSION = 3L SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") NEEDED_SONAMES = "needed sonames" @@ -33,6 +35,11 @@ DUMP_BIN = "/usr/ccs/bin/dump" PSTAMP_RE = r"(?P\w+)@(?P[\w\.-]+)-(?P\d+)" DESCRIPTION_RE = r"^([\S]+) - (.*)$" +BAD_CONTENT_REGEXES = ( + # No need to encode / obfuscate these, as overrides can be used. + r'/export/medusa', + r'/opt/build', +) SYSTEM_SYMLINKS = ( ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), @@ -40,8 +47,6 @@ ("/opt/csw/lib/i386", ["/opt/csw/lib"]), ) INSTALL_CONTENTS_AVG_LINE_LENGTH = 102.09710677919261 -DB_SCHEMA_VERSION = 2L -PACKAGE_STATS_VERSION = 2L # This shared library is present on Solaris 10 on amd64, but it's missing on # Solaris 8 on i386. It's okay if it's missing. @@ -774,6 +779,20 @@ errors["package-set"].append(error) return a_dict + def GetOptimizedAllStats(self, stats_obj_list): + pkgs_data = [] + for stats_obj in stats_obj_list: + # pkg_data = {} + # This bit is tightly tied to the data structures returned by + # PackageStats. + # + # Python strings are already implementing the flyweight pattern. What's + # left is lists and dictionaries. + raw_pkg_data = stats_obj.GetAllStats() + pkg_data = raw_pkg_data + pkgs_data.append(pkg_data) + return pkgs_data + def Run(self): """Runs all the checks @@ -786,6 +805,9 @@ return (exit_code, screen_report, tags_report) +class Flyweight(object): + pass + class CheckInterfaceBase(object): """Base class for check proxies. @@ -863,27 +885,42 @@ logging.debug("Registering set check %s", repr(member_name)) self._RegisterSetCheck(member) - def GetAllTags(self, packages_data): + def GetAllTags(self, stats_obj_list): errors = {} - # TODO: Configure the logger with the logging level. + # TODO: Actually configure the logger with the logging level. logging_level = logging.INFO if self.debug: logging_level = logging.DEBUG pkgmap = SystemPkgmap() + + # TODO: In order to process all the catalog, and load them all into the + # memory, we need to store them more efficiently. Currently, the process + # grows up to 9GB of RAM usage, and it doesn't end there. Some ideas how to + # use less RAM: + # - some values (tuples, lists) repeat, and there's no need to store + # all the copies. Instead, store references. (the Flyweight design + # pattern) + # - enclose data loading in a separate function, which will merge data + # from all the packages. + # + # In other words, the following line needs to be smart: + # pkgs_data = [x.GetAllStats() for x in stats_obj_list] + pkgs_data = self.GetOptimizedAllStats(stats_obj_list) + # Individual checks - for pkg_data in packages_data: + for package_stats_obj in stats_obj_list: + pkg_data = package_stats_obj.GetAllStats() + pkgname = pkg_data["basic_stats"]["pkgname"] + check_interface = IndividualCheckInterface(pkgname, pkgmap) for function in self.individual_checks: - all_stats = pkg_data.GetAllStats() - pkgname = all_stats["basic_stats"]["pkgname"] - check_interface = IndividualCheckInterface(pkgname, pkgmap) logger = logging.getLogger("%s-%s" % (pkgname, function.__name__)) logger.debug("Calling %s", function.__name__) - function(all_stats, check_interface, logger=logger) + function(pkg_data, check_interface, logger=logger) if check_interface.errors: errors[pkgname] = check_interface.errors # Set checks for function in self.set_checks: - pkgs_data = [x.GetAllStats() for x in packages_data] + pkgs_data = [x.GetAllStats() for x in stats_obj_list] logger = logging.getLogger("SetCheck-%s" % (function.__name__,)) check_interface = SetCheckInterface(pkgmap) logger.debug("Calling %s", function.__name__) @@ -1002,6 +1039,7 @@ # This list needs to be synchronized with the CollectStats() method. STAT_FILES = [ "all_filenames", + "bad_paths", "basic_stats", "binaries", "binaries_dump_info", @@ -1010,6 +1048,7 @@ "isalist", # "ldd_dash_r", "overrides", + "pkgchk", "pkginfo", "pkgmap", ] @@ -1026,6 +1065,15 @@ parts = [home, ".checkpkg", "stats"] self.stats_basedir = os.path.join(*parts) + def GetPkgchkData(self): + ret, stdout, stderr = self.srv4_pkg.GetPkgchkOutput() + data = { + 'return_code': ret, + 'stdout_lines': stdout.splitlines(), + 'stderr_lines': stderr.splitlines(), + } + return data + def GetMd5sum(self): if not self.md5sum: self.md5sum = self.srv4_pkg.GetMd5sum() @@ -1059,13 +1107,16 @@ return self.dir_format_pkg def MakeStatsDir(self): + stats_path = self.GetStatsPath() + self._MakeDirP(stats_path) + + def _MakeDirP(self, dir_path): """mkdir -p equivalent. http://stackoverflow.com/questions/600268/mkdir-p-functionality-in-python """ - stats_path = self.GetStatsPath() try: - os.makedirs(stats_path) + os.makedirs(dir_path) except OSError, e: if e.errno == errno.EEXIST: pass @@ -1201,12 +1252,26 @@ return sym def CollectStats(self, force=False): + """Lazy stats collection.""" if not self.StatsDirExists() or force: self._CollectStats() + return + basic_stats_file = in_file_name_pickle = os.path.join( + self.GetStatsPath(), "basic_stats.pickle") + f = open(basic_stats_file, "r") + obj = cPickle.load(f) + f.close() + saved_version = obj["stats_version"] + if saved_version < PACKAGE_STATS_VERSION: + self._CollectStats() def _CollectStats(self): """The list of variables needs to be synchronized with the one at the top of this class. + + TODO: + - Run pkgchk against the package file. + - Grep all the files for bad paths. """ stats_path = self.GetStatsPath() self.MakeStatsDir() @@ -1219,13 +1284,15 @@ self.DumpObject(dir_pkg.GetDependencies(), "depends") self.DumpObject(GetIsalist(), "isalist") self.DumpObject(self.GetOverrides(), "overrides") + self.DumpObject(self.GetPkgchkData(), "pkgchk") self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo") self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap") # This check is currently disabled, let's save time by not collecting # these data. # self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") # self.DumpObject(self.GetDefinedSymbols(), "defined_symbols") - logging.debug("Statistics collected.") + self.DumpObject(dir_pkg.GetFilesContaining(BAD_CONTENT_REGEXES), "bad_paths") + logging.debug("Statistics of %s have been collected.", repr(dir_pkg.pkgname)) def GetAllStats(self): if self.StatsExist(): @@ -1242,10 +1309,7 @@ return overrides def DumpObject(self, obj, name): - """Saves an object. - - TODO(maciej): Implement pickling with cPickle. - """ + """Saves an object.""" stats_path = self.GetStatsPath() # yaml out_file_name = os.path.join(stats_path, "%s.yml" % name) @@ -1266,18 +1330,13 @@ in_file_name = os.path.join(stats_path, "%s.yml" % name) in_file_name_pickle = os.path.join(stats_path, "%s.pickle" % name) if os.path.exists(in_file_name_pickle): - # logging.debug("ReadObject(): reading %s", repr(in_file_name_pickle)) f = open(in_file_name_pickle, "r") obj = cPickle.load(f) f.close() - # logging.debug("ReadObject(): finished reading %s", - # repr(in_file_name_pickle)) else: - # logging.debug("ReadObject(): reading %s", repr(in_file_name)) f = open(in_file_name, "r") obj = yaml.safe_load(f) f.close() - # logging.debug("ReadObject(): finished reading %s", repr(in_file_name)) return obj def ReadSavedStats(self): Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-19 09:58:56 UTC (rev 9247) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-19 10:07:39 UTC (rev 9248) @@ -603,7 +603,7 @@ class CheckpkgTagsUnitTest(unittest.TestCase): def test_1(self): - m = checkpkg.CheckpkgManager("testname", "/tmp", ["CSWfoo"]) + m = checkpkg.CheckpkgManager2("testname", "/tmp", ["CSWfoo"]) tags = { "CSWfoo": [ checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "foo-info"), @@ -614,7 +614,7 @@ self.assertEqual(expected, tags_report) def test_2(self): - m = checkpkg.CheckpkgManager("testname", "/tmp", ["CSWfoo"]) + m = checkpkg.CheckpkgManager2("testname", "/tmp", ["CSWfoo"]) tags = { "CSWfoo": [ checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "foo-info"), Modified: csw/mgar/gar/v2/lib/python/gartest.py =================================================================== --- csw/mgar/gar/v2/lib/python/gartest.py 2010-03-19 09:58:56 UTC (rev 9247) +++ csw/mgar/gar/v2/lib/python/gartest.py 2010-03-19 10:07:39 UTC (rev 9248) @@ -3,13 +3,14 @@ # Style guide: # http://code.google.com/p/soc/wiki/PythonStyleGuide -import Cheetah.Template -import shutil -import tempfile +import logging import os import os.path +import shutil import subprocess +import tempfile import opencsw +import Cheetah.Template """A module used to do end-to-end testing of GAR.""" @@ -177,6 +178,8 @@ if self.cleanup: if os.path.isdir(self.build_dir): shutil.rmtree(self.build_dir) + else: + logging.warn("Not removing files from %s", repr(self.build_dir)) class StaticGarBuild(GarBuild): Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-19 09:58:56 UTC (rev 9247) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-19 10:07:39 UTC (rev 9248) @@ -405,6 +405,7 @@ self.transformed = False self.dir_format_pkg = None self.debug = debug + self.pkgname = None def __repr__(self): return u"CswSrv4File(%s)" % repr(self.pkg_path) @@ -457,14 +458,15 @@ """It's necessary to figure out the pkgname from the .pkg file. # nawk 'NR == 2 {print $1; exit;} $f """ - gunzipped_path = self.GetGunzippedPath() - args = ["nawk", "NR == 2 {print $1; exit;}", gunzipped_path] - nawk_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = nawk_proc.communicate() - ret_code = nawk_proc.wait() - pkgname = stdout.strip() - logging.debug("GetPkgname(): %s", repr(pkgname)) - return pkgname + if not self.pkgname: + gunzipped_path = self.GetGunzippedPath() + args = ["nawk", "NR == 2 {print $1; exit;}", gunzipped_path] + nawk_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = nawk_proc.communicate() + ret_code = nawk_proc.wait() + self.pkgname = stdout.strip() + logging.debug("GetPkgname(): %s", repr(self.pkgname)) + return self.pkgname def TransformToDir(self): """Transforms the file to the directory format. @@ -506,12 +508,21 @@ return dir_format_pkg.GetPkgmap(analyze_permissions, strip) def GetMd5sum(self): + logging.debug("GetMd5sum() (%s)", repr(self.pkg_path)) fp = open(self.pkg_path) hash = hashlib.md5() hash.update(fp.read()) fp.close() return hash.hexdigest() + def GetPkgchkOutput(self): + """Returns: (exit code, stdout, stderr).""" + args = ["pkgchk", "-d", self.GetPkgname()] + pkgchk_proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = pkgchk_proc.communicate() + ret = pkgchk_proc.wait() + return ret, stdout, stderr + def __del__(self): if self.workdir: logging.debug("Removing %s", repr(self.workdir)) @@ -635,6 +646,7 @@ self.pkgpath = self.directory self.pkginfo_dict = None self.binaries = None + self.file_paths = None def GetCatalogname(self): """Returns the catalog name of the package. @@ -741,10 +753,13 @@ self.SetPkginfoEntry("NAME", pkginfo_name) def GetDependencies(self): + depends = [] + depend_file_path = os.path.join(self.directory, "install", "depend") + if not os.path.exists(depend_file_path): + return depends fd = open(os.path.join(self.directory, "install", "depend"), "r") # It needs to be a list because there might be duplicates and it's # necessary to carry that information. - depends = [] for line in fd: fields = re.split(WS_RE, line) if fields[0] == "P": @@ -798,12 +813,20 @@ return self.binaries def GetAllFilenames(self): - self.CheckPkgpathExists() - file_basenames = [] - for root, dirs, files in os.walk(self.pkgpath): - file_basenames.extend(files) - return file_basenames + file_paths = self.GetAllFilePaths() + return [os.path.basename(f) for f in file_paths] + def GetAllFilePaths(self): + """Similar to GetAllFilenames, but returns full paths.""" + if not self.file_paths: + self.CheckPkgpathExists() + remove_prefix = "%s/" % self.pkgpath + self.file_paths = [] + for root, dirs, files in os.walk(os.path.join(self.pkgpath, "root")): + full_paths = [os.path.join(root, f) for f in files] + self.file_paths.extend([f.replace(remove_prefix, "") for f in full_paths]) + return self.file_paths + def _GetOverridesStream(self): catalogname = self.GetCatalogname() file_path = os.path.join(self.directory, @@ -837,13 +860,29 @@ def GetFileContent(self, pkg_file_path): if pkg_file_path.startswith("/"): pkg_file_path = pkg_file_path[1:] + # TODO: Write a unit test for the right path file_path = os.path.join(self.directory, "root", pkg_file_path) - fd = open(file_path, "r") - content = fd.read() - fd.close() - return content + try: + fd = open(file_path, "r") + content = fd.read() + fd.close() + return content + except IOError, e: + raise PackageError(e) + def GetFilesContaining(self, regex_list): + full_paths = self.GetAllFilePaths() + files_by_pattern = {} + for full_path in full_paths: + content = open(os.path.join(self.pkgpath, full_path), "rb").read() + for regex in regex_list: + if re.search(regex, content): + if regex not in files_by_pattern: + files_by_pattern[regex] = [] + files_by_pattern[regex].append(full_path) + return files_by_pattern + class Pkgmap(object): """Represents the pkgmap of the package. Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-19 09:58:56 UTC (rev 9247) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-19 10:07:39 UTC (rev 9248) @@ -15,6 +15,7 @@ import os import checkpkg import opencsw +import textwrap from Cheetah import Template PATHS_ALLOWED_ONLY_IN = { @@ -47,6 +48,7 @@ "CSWcommon": ("/opt", ) } DO_NOT_LINK_AGAINST_THESE_SONAMES = set(["libX11.so.4"]) +DISCOURAGED_FILE_PATTERNS = (r"\.py[co]$",) def CatalognameLowercase(pkg_data, error_mgr, logger): @@ -68,17 +70,20 @@ def CheckDirectoryPermissions(pkg_data, error_mgr, logger): for entry in pkg_data["pkgmap"]: - if entry["type"] == "d": - if entry["mode"][1] == "6": - error_mgr.ReportError("executable-bit-missing-on-a-directory", - entry["path"]) + if (entry["type"] == "d" + and + entry["mode"] != "?" + and + entry["mode"][1] == "6"): + error_mgr.ReportError("executable-bit-missing-on-a-directory", + entry["path"]) def CheckNonCswPathsDirectoryPerms(pkg_data, error_mgr, logger): for entry in pkg_data["pkgmap"]: if entry["user"] == "?" or entry["group"] == "?" or entry["mode"] == "?": if entry["path"].startswith("/opt/csw"): - error_mgr.ReportError("question-mark-perms-in-opt-csw", entry["path"]) + error_mgr.ReportError("pkgmap-question-mark-perms-in-opt-csw", entry["path"]) def CheckPerlLocal(pkg_data, error_mgr, logger): @@ -188,7 +193,7 @@ # same bit of code would do both checking and reporting. # # TODO: Rewrite this using cheetah templates - if False and needed_sonames: + if True and needed_sonames: print "Analysis of sonames needed by the package set:" binaries_with_missing_sonames = set([]) for soname in needed_sonames: @@ -196,7 +201,7 @@ if soname in filenames_by_soname: print "%s is provided by the package itself" % soname elif soname in lines_by_soname: - print ("%s is provided by %s and required by:" + print ("%s is provided by %s and required by:" % (soname, pkgs_by_filename[soname])) filename_lines = " ".join(sorted(binaries_by_soname[soname])) @@ -210,7 +215,7 @@ if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: print "However, it's a whitelisted soname." else: - pass + print "No package seems to be providing %s" % (soname,) # The error checking needs to be unified: done in one place only. # errors.append( # checkpkg.CheckpkgTag( @@ -242,14 +247,16 @@ "surplus_deps": surplus_deps, "orphan_sonames": orphan_sonames, } + for soname in orphan_sonames: + error_mgr.ReportError(pkgname, "orphan-soname", soname) + for missing_dep in missing_deps: + error_mgr.ReportError(pkgname, "missing-dependency", missing_dep) + for surplus_dep in surplus_deps: + error_mgr.ReportError(pkgname, "surplus-dependency", surplus_dep) t = Template.Template(checkpkg.REPORT_TMPL, searchList=[namespace]) report = unicode(t) if report.strip(): print report - for soname in orphan_sonames: - error_mgr.ReportError(pkgname, "orphan-soname", soname) - for missing_dep in missing_deps: - error_mgr.ReportError(pkgname, "missing-dependency", missing_dep) def SetCheckDependencies(pkgs_data, error_mgr, logger): @@ -285,6 +292,8 @@ """Checks the consistency between classes in the prototype and pkginfo.""" pkginfo = pkg_data["pkginfo"] pkgmap = pkg_data["pkgmap"] + if "CLASSES" not in pkginfo: + return pkginfo_classes = set(re.split(opencsw.WS_RE, pkginfo["CLASSES"])) pkgmap_classes = set() for entry in pkgmap: @@ -410,6 +419,10 @@ catalogname = pkg_data["basic_stats"]["catalogname"] pkgname = pkg_data["basic_stats"]["pkgname"] pkginfo = pkg_data["pkginfo"] + # PKG, NAME, ARCH, VERSION and CATEGORY + for parameter in ("PKG", "NAME", "ARCH", "VERSION", "CATEGORY"): + if parameter not in pkginfo: + error_mgr.ReportError("pkginfo-missing-parameter", parameter) if not catalogname: error_mgr.ReportError("pkginfo-empty-catalogname") if not pkgname: @@ -507,3 +520,24 @@ soname in DO_NOT_LINK_AGAINST_THESE_SONAMES): error_mgr.ReportError("linked-against-discouraged-library", "%s %s" % (binary_info["base_name"], soname)) + +def CheckDiscouragedFileNamePatterns(pkg_data, error_mgr, logger): + patterns = [re.compile(x) for x in DISCOURAGED_FILE_PATTERNS] + for entry in pkg_data["pkgmap"]: + if entry["path"]: + for pattern in patterns: + if re.search(pattern, entry["path"]): + error_mgr.ReportError("discouraged-path-in-pkgmap", + entry["path"]) + +def CheckBadPaths(pkg_data, error_mgr, logger): + for regex in pkg_data["bad_paths"]: + for file_name in pkg_data["bad_paths"][regex]: + error_mgr.ReportError("file-with-bad-content", "%s %s" % (regex, file_name)) + +def CheckPkgchk(pkg_data, error_mgr, logger): + if pkg_data["pkgchk"]["return_code"] != 0: + error_mgr.ReportError("pkgchk-failed-with-code", pkg_data["pkgchk"]["return_code"]) + for line in pkg_data["pkgchk"]["stderr_lines"]: + logger.warn(line) + Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-19 09:58:56 UTC (rev 9247) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-19 10:07:39 UTC (rev 9248) @@ -11,6 +11,8 @@ import mox import logging +import testdata.checkpkg_test_data_CSWdjvulibrert as td_1 + BASE_DIR = os.path.dirname(__file__) TESTDATA_DIR = os.path.join(BASE_DIR, "testdata") CHECKPKG_STATS_DIR = os.path.join(TESTDATA_DIR, "stats") @@ -31,12 +33,18 @@ self.mocker = mox.Mox() def testDefault(self): - self.logger_mock = self.mocker.CreateMock(logging.Logger) + class LoggerStub(object): + def debug(self, debug_s, *kwords): + pass + # self.logger_mock = self.mocker.CreateMock(logging.Logger) + self.logger_mock = LoggerStub() self.error_mgr_mock = self.mocker.CreateMock( checkpkg.IndividualCheckInterface) self.CheckpkgTest() self.mocker.ReplayAll() - getattr(pc, self.FUNCTION_NAME)(self.pkg_data, self.error_mgr_mock, self.logger_mock) + getattr(pc, self.FUNCTION_NAME)(self.pkg_data, + self.error_mgr_mock, + self.logger_mock) self.mocker.VerifyAll() @@ -228,6 +236,45 @@ self.error_mgr_mock.ReportError('linked-against-discouraged-library', 'libImlib2.so.1.4.2 libX11.so.4') +class TestSetCheckSharedLibraryConsistency_1(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckSharedLibraryConsistency' + def CheckpkgTest(self): + self.pkg_data = [td_1.pkg_data] + self.error_mgr_mock.GetPkgmapLineByBasename('libiconv.so.2').AndReturn( + {u'/opt/csw/lib': u'/opt/csw/lib/libiconv.so.2=libiconv.so.2.5.0 s none CSWiconv', + u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libiconv.so.2=libiconv.so.2.5.0 s none CSWiconv'}) + self.error_mgr_mock.GetPkgmapLineByBasename('libjpeg.so.62').AndReturn( + {u'/opt/csw/lib': u'/opt/csw/lib/libjpeg.so.62=libjpeg.so.62.0.0 s none CSWjpeg', + u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libjpeg.so.62=libjpeg.so.62.0.0 s none CSWjpeg', + u'/usr/lib': u'/usr/lib/libjpeg.so.62=libjpeg.so.62.0.0 s none SUNWjpg', + u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libjpeg.so.62=libjpeg.so.62.0.0 s none SUNWjpg'}) + self.error_mgr_mock.GetPkgmapLineByBasename('libCrun.so.1').AndReturn( + {u'/usr/lib': u'/usr/lib/libCrun.so.1 f none 0755 root bin 70360 7735 1256313285 *SUNWlibC', + u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libCrun.so.1 f none 0755 root bin 86464 53547 1256313286 *SUNWlibC'}) + self.error_mgr_mock.GetPkgmapLineByBasename('libCstd.so.1').AndReturn( + {u'/usr/lib': u'/usr/lib/libCstd.so.1 f none 0755 root bin 3324372 28085 1256313286 *SUNWlibC', + u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libCstd.so.1 f none 0755 root bin 3773400 36024 1256313286 *SUNWlibC'}) + self.error_mgr_mock.GetPkgmapLineByBasename('libm.so.1').AndReturn( + {u'/lib': u'/lib/libm.so.1 f none 0755 root bin 23828 57225 1106444965 SUNWlibmsr', + u'/lib/sparcv9': u'/lib/sparcv9/libm.so.1 f none 0755 root bin 30656 9035 1106444966 SUNWlibmsr', + u'/usr/lib': u'/usr/lib/libm.so.1=../../lib/libm.so.1 s none *SUNWlibms', + u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libm.so.1=../../../lib/sparcv9/libm.so.1 s none *SUNWlibms'}) + self.error_mgr_mock.GetPkgmapLineByBasename('libpthread.so.1').AndReturn( + {u'/lib': u'/lib/libpthread.so.1 f none 0755 root bin 21472 2539 1106444694 SUNWcslr', + u'/lib/sparcv9': u'/lib/sparcv9/libpthread.so.1 f none 0755 root bin 26960 55139 1106444706 SUNWcslr', + u'/usr/lib': u'/usr/lib/libpthread.so.1=../../lib/libpthread.so.1 s none SUNWcsl', + u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libpthread.so.1=../../../lib/sparcv9/libpthread.so.1 s none SUNWcsl'}) + self.error_mgr_mock.GetPkgmapLineByBasename('libc.so.1').AndReturn( + {u'/lib': u'/lib/libc.so.1 f none 0755 root bin 1639840 9259 1253045976 SUNWcslr', + u'/lib/sparcv9': u'/lib/sparcv9/libc.so.1 f none 0755 root bin 1779120 22330 1253045979 SUNWcslr', + u'/usr/lib': u'/usr/lib/libc.so.1=../../lib/libc.so.1 s none SUNWcsl', + u'/usr/lib/libp': u'/usr/lib/libp/libc.so.1=../../../lib/libc.so.1 s none SUNWdpl', + u'/usr/lib/libp/sparcv9': u'/usr/lib/libp/sparcv9/libc.so.1=../../../../lib/sparcv9/libc.so.1 s none SUNWdpl', + u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libc.so.1=../../../lib/sparcv9/libc.so.1 s none SUNWcsl'}) + self.error_mgr_mock.GetPkgmapLineByBasename('libjpeg.so.7').AndReturn( + {u'/opt/csw/lib': u'/opt/csw/lib/libjpeg.so.7=libjpeg.so.7.0.0 s none CSWjpeg', + u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libjpeg.so.7=libjpeg.so.7.0.0 s none CSWjpeg'}) + self.error_mgr_mock.ReportError('CSWdjvulibrert', 'missing-dependency', u'CSWiconv') if __name__ == '__main__': unittest.main() Added: csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py 2010-03-19 10:07:39 UTC (rev 9248) @@ -0,0 +1,219 @@ +# $Id$ +pkg_data = { + 'all_filenames': ['license', + 'libdjvulibre.so.15', + 'libdjvulibre.so.21.1.0', + 'libdjvulibre.so.21.1.0'], + 'basic_stats': {'catalogname': 'djvulibre_rt', + 'parsed_basename': {'arch': 'sparc', + 'catalogname': 'djvulibre_rt', + 'full_version_string': '3.5.22,REV=2010.03.17', + 'osrel': 'SunOS5.8', + 'revision_info': {'REV': '2010.03.17'}, + 'vendortag': 'CSW', + 'version': '3.5.22', + 'version_info': {'major version': '3', + 'minor version': '5', + 'patchlevel': '22'}}, + 'pkg_basename': 'djvulibre_rt-3.5.22,REV=2010.03.17-SunOS5.8-sparc-CSW.pkg.gz', + 'pkg_path': '/tmp/pkg_60J_Gm/djvulibre_rt-3.5.22,REV=2010.03.17-SunOS5.8-sparc-CSW.pkg.gz', + 'pkgname': 'CSWdjvulibrert', + 'stats_version': 2L}, + 'binaries': ['opt/csw/lib/libdjvulibre.so.15', + 'opt/csw/lib/sparcv9/libdjvulibre.so.21.1.0', + 'opt/csw/lib/libdjvulibre.so.21.1.0'], + 'binaries_dump_info': [{'base_name': 'libdjvulibre.so.15', + 'needed sonames': ['libjpeg.so.62', + 'libpthread.so.1', + 'libiconv.so.2', + 'libm.so.1', + 'libCstd.so.1', + 'libCrun.so.1', + 'libc.so.1'], + 'path': 'opt/csw/lib/libdjvulibre.so.15', + 'runpath': ['/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/SUNWspro/lib/rw7', + '/opt/SUNWspro/lib/v8', + '/opt/SUNWspro/lib', + '/usr/ccs/lib', + '/lib', + '/usr/lib', + '/usr/lib/$ISALIST', + '/usr/lib', + '/lib/$ISALIST', + '/lib'], + 'soname': 'libdjvulibre.so.15', + 'soname_guessed': False}, + {'base_name': 'libdjvulibre.so.21.1.0', + 'needed sonames': ['libjpeg.so.7', + 'libpthread.so.1', + 'libm.so.1', + 'libCstd.so.1', + 'libCrun.so.1', + 'libc.so.1'], + 'path': 'opt/csw/lib/sparcv9/libdjvulibre.so.21.1.0', + 'runpath': ['/opt/csw/X11/lib/$ISALIST', + '/opt/csw/X11/lib/64', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/64', + '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', + '/opt/studio/SOS11/SUNWspro/lib/v9', + '/opt/SUNWspro/lib/v9', + '/usr/ccs/lib/sparcv9', + '/lib/sparcv9', + '/usr/lib/sparcv9', + '/usr/lib/$ISALIST', + '/usr/lib', + '/lib/$ISALIST', + '/lib'], + 'soname': 'libdjvulibre.so.21', + 'soname_guessed': False}, + {'base_name': 'libdjvulibre.so.21.1.0', + 'needed sonames': ['libjpeg.so.7', + 'libpthread.so.1', + 'libm.so.1', + 'libCstd.so.1', + 'libCrun.so.1', + 'libc.so.1'], + 'path': 'opt/csw/lib/libdjvulibre.so.21.1.0', + 'runpath': ['/opt/csw/X11/lib/$ISALIST', + '/opt/csw/X11/lib', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/studio/SOS11/SUNWspro/lib/rw7', + '/opt/studio/SOS11/SUNWspro/lib/v8', + '/opt/studio/SOS11/SUNWspro/lib', + '/opt/SUNWspro/lib/v8', + '/opt/SUNWspro/lib', + '/usr/ccs/lib', + '/lib', + '/usr/lib', + '/usr/lib/$ISALIST', + '/usr/lib', + '/lib/$ISALIST', + '/lib'], + 'soname': 'libdjvulibre.so.21', + 'soname_guessed': False}], + 'depends': [('CSWcommon', + 'CSWcommon common - common files and dirs for CSW packages '), + ('CSWisaexec', + 'CSWisaexec isaexec - sneaky wrapper around Sun isaexec '), + ('CSWjpeg', + 'CSWjpeg jpeg - JPEG library and tools by the Independent JPEG Group ')], + 'isalist': ['sparcv9+vis2', + 'sparcv9+vis', + 'sparcv9', + 'sparcv8plus+vis2', + 'sparcv8plus+vis', + 'sparcv8plus', + 'sparcv8', + 'sparcv8-fsmuld', + 'sparcv7', + 'sparc'], + 'overrides': [], + 'pkginfo': {'ARCH': 'sparc', + 'CATEGORY': 'application', + 'CLASSES': 'none', + 'EMAIL': 'hson at opencsw.org', + 'HOTLINE': 'http://www.opencsw.org/bugtrack/', + 'NAME': 'djvulibre_rt - DjVu standalone viewer, browser plug-in, command line tools - runtime package', + 'OPENCSW_CATALOGNAME': 'djvulibre_rt', + 'OPENCSW_MODE64': '32/64/isaexec', + 'OPENCSW_REPOSITORY': 'https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/djvulibre/trunk at 9213', + 'PKG': 'CSWdjvulibrert', + 'PSTAMP': 'hson at build8s-20100317033724', + 'VENDOR': 'http://djvu.sourceforge.net/ packaged for CSW by Roger Hakansson', + 'VERSION': '3.5.22,REV=2010.03.17', + 'WORKDIR_FIRSTMOD': '../build-isa-sparcv8'}, + 'pkgmap': [{'class': None, + 'group': None, + 'line': ': 1 15667', + 'mode': None, + 'path': None, + 'type': '1', + 'user': None}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/lib/libdjvulibre.so=libdjvulibre.so.21.1.0', + 'mode': None, + 'path': '/opt/csw/lib/libdjvulibre.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/lib/libdjvulibre.so.15 0755 root bin 2179976 17791 1268791023', + 'mode': '0755', + 'path': '/opt/csw/lib/libdjvulibre.so.15', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/lib/libdjvulibre.so.21=libdjvulibre.so.21.1.0', + 'mode': None, + 'path': '/opt/csw/lib/libdjvulibre.so.21', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/lib/libdjvulibre.so.21.1.0 0755 root bin 2316572 5640 1268790998', + 'mode': '0755', + 'path': '/opt/csw/lib/libdjvulibre.so.21.1.0', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/lib/sparcv9/libdjvulibre.so=libdjvulibre.so.21.1.0', + 'mode': None, + 'path': '/opt/csw/lib/sparcv9/libdjvulibre.so', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': None, + 'line': '1 s none /opt/csw/lib/sparcv9/libdjvulibre.so.21=libdjvulibre.so.21.1.0', + 'mode': None, + 'path': '/opt/csw/lib/sparcv9/libdjvulibre.so.21', + 'type': 's', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/lib/sparcv9/libdjvulibre.so.21.1.0 0755 root bin 2950128 36235 1268791033', + 'mode': '0755', + 'path': '/opt/csw/lib/sparcv9/libdjvulibre.so.21.1.0', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /opt/csw/share/doc/djvulibre_rt 0755 root bin', + 'mode': '0755', + 'path': '/opt/csw/share/doc/djvulibre_rt', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/share/doc/djvulibre_rt/license 0644 root bin 17989 29204 1268793418', + 'mode': '0644', + 'path': '/opt/csw/share/doc/djvulibre_rt/license', + 'type': 'f', + 'user': 'root'}, + {'class': None, + 'group': None, + 'line': '1 i copyright 76 7217 1268793418', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}, + {'class': None, + 'group': None, + 'line': '1 i depend 187 16539 1268793444', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}, + {'class': None, + 'group': None, + 'line': '1 i pkginfo 560 47879 1268793447', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}]} Property changes on: csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/bad_paths.yml =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/bad_paths.yml (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/bad_paths.yml 2010-03-19 10:07:39 UTC (rev 9248) @@ -0,0 +1 @@ +{} Added: csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkgchk.yml =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkgchk.yml (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/pkgchk.yml 2010-03-19 10:07:39 UTC (rev 9248) @@ -0,0 +1 @@ +[] Modified: csw/mgar/gar/v2/tests/overrides_test.py =================================================================== --- csw/mgar/gar/v2/tests/overrides_test.py 2010-03-19 09:58:56 UTC (rev 9247) +++ csw/mgar/gar/v2/tests/overrides_test.py 2010-03-19 10:07:39 UTC (rev 9248) @@ -5,6 +5,7 @@ import unittest sys.path.append("../lib/python") import gartest +import opencsw class OverridesUnitTest_1(unittest.TestCase): """Tests CHECKPKG_OVERRIDES support.""" @@ -21,9 +22,13 @@ pkg = mybuild.GetFirstBuiltPackage() overr_file = "/opt/csw/share/checkpkg/overrides/overrides_test" expected = 'CSWoverrides-test: example-tag example-parameter\n' - self.assertEqual(expected, pkg.GetFileContent(overr_file)) - overrides = pkg.GetOverrides() - self.assertEqual(1, len(overrides)) + try: + self.assertEqual(expected, pkg.GetFileContent(overr_file)) + overrides = pkg.GetOverrides() + self.assertEqual(1, len(overrides)) + except opencsw.PackageError, e: + mybuild.cleanup = False + self.fail(e) def testTwoOverriders(self): """Checks that CHECKPKG_OVERRIDES variable creates overrides.""" @@ -79,3 +84,6 @@ # self.assertEqual(expected, pkg.GetFileContent(overr_file_1)) # overrides = pkg.GetOverrides() # self.assertEqual(1, len(overrides)) + +if __name__ == '__main__': + unittest.main() Modified: csw/mgar/gar/v2/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2/tests/run_tests.py 2010-03-19 09:58:56 UTC (rev 9247) +++ csw/mgar/gar/v2/tests/run_tests.py 2010-03-19 10:07:39 UTC (rev 9248) @@ -15,7 +15,6 @@ from opencsw_test import * from overrides_test import * from package_checks_test import * -from package_checks_old_test import * if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Mar 19 12:03:05 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 19 Mar 2010 11:03:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[9249] csw/mgar/pkg/tcl/trunk/Makefile Message-ID: Revision: 9249 http://gar.svn.sourceforge.net/gar/?rev=9249&view=rev Author: hson Date: 2010-03-19 11:03:05 +0000 (Fri, 19 Mar 2010) Log Message: ----------- tcl: Install private header files required for building tk and expect Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-03-19 10:07:39 UTC (rev 9248) +++ csw/mgar/pkg/tcl/trunk/Makefile 2010-03-19 11:03:05 UTC (rev 9249) @@ -44,6 +44,10 @@ CONFIGURE_ARGS = $(DIRPATHS) +INSTALL_ARGS-8.4.19 = install +INSTALL_ARGS-8.5.8 = install install-private-headers install-tzdata install-msgs +INSTALL_ARGS = $(INSTALL_ARGS-$(GARVERSION)) + # tk need the static tclstub library for some reason MERGE_EXCLUDE_STATICLIBS = 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 Mar 19 14:09:34 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 13:09:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[9250] csw/mgar/pkg/pcre/tags/pcre-8.01, REV=2010.01.20/ Message-ID: Revision: 9250 http://gar.svn.sourceforge.net/gar/?rev=9250&view=rev Author: dmichelsen Date: 2010-03-19 13:09:34 +0000 (Fri, 19 Mar 2010) Log Message: ----------- pcre: Tag 8.01,REV=2010.01.20 Added Paths: ----------- csw/mgar/pkg/pcre/tags/pcre-8.01,REV=2010.01.20/ 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 Mar 19 14:13:59 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 13:13:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[9251] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 9251 http://gar.svn.sourceforge.net/gar/?rev=9251&view=rev Author: dmichelsen Date: 2010-03-19 13:13:59 +0000 (Fri, 19 Mar 2010) Log Message: ----------- pcre: Update to 8.02 Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/pcre/trunk/files/0001-Add-missing-inttypes.h.patch Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2010-03-19 13:09:34 UTC (rev 9250) +++ csw/mgar/pkg/pcre/trunk/Makefile 2010-03-19 13:13:59 UTC (rev 9251) @@ -1,5 +1,5 @@ GARNAME = pcre -GARVERSION = 8.01 +GARVERSION = 8.02 CATEGORIES = lib DESCRIPTION = Perl-compatible regular expression tools @@ -12,7 +12,6 @@ MASTER_SITES = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-Add-missing-inttypes.h.patch SPKG_SOURCEURL = http://www.pcre.org Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2010-03-19 13:09:34 UTC (rev 9250) +++ csw/mgar/pkg/pcre/trunk/checksums 2010-03-19 13:13:59 UTC (rev 9251) @@ -1,2 +1 @@ -dc6be5e75d8322e6337161990b8ae424 0001-Add-missing-inttypes.h.patch -def40e944d2c429cbf563357e61c1ad2 pcre-8.01.tar.gz +214462e9718e3f9197cba114dc6b00b8 pcre-8.02.tar.gz Deleted: csw/mgar/pkg/pcre/trunk/files/0001-Add-missing-inttypes.h.patch =================================================================== --- csw/mgar/pkg/pcre/trunk/files/0001-Add-missing-inttypes.h.patch 2010-03-19 13:09:34 UTC (rev 9250) +++ csw/mgar/pkg/pcre/trunk/files/0001-Add-missing-inttypes.h.patch 2010-03-19 13:13:59 UTC (rev 9251) @@ -1,21 +0,0 @@ -From 8d080cb9ee95738c6b446f1a1fcb8cddbbae7559 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 20 Jan 2010 15:55:55 +0100 -Subject: [PATCH] Add missing inttypes.h - ---- - pcre_compile.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/pcre_compile.c b/pcre_compile.c -index beae0e4..8a54b54 100644 ---- a/pcre_compile.c -+++ b/pcre_compile.c -@@ -1,3 +1,4 @@ -+#include - /************************************************* - * Perl-Compatible Regular Expressions * - *************************************************/ --- -1.6.6 - 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 Mar 19 14:18:41 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 13:18:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9252] csw/mgar/pkg/pcre/trunk/Makefile Message-ID: Revision: 9252 http://gar.svn.sourceforge.net/gar/?rev=9252&view=rev Author: dmichelsen Date: 2010-03-19 13:18:41 +0000 (Fri, 19 Mar 2010) Log Message: ----------- pcre: Make sure pcre-config gets added on 64 bit Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2010-03-19 13:13:59 UTC (rev 9251) +++ csw/mgar/pkg/pcre/trunk/Makefile 2010-03-19 13:18:41 UTC (rev 9252) @@ -42,6 +42,7 @@ TEST_TARGET = check +MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only MERGE_DIRS_isa-extra = $(libdir) PKGFILES_CSWpcrert = $(PKGFILES_RT) 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 Mar 19 14:27:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 13:27:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9253] csw/mgar/pkg/cpan/AppConfig/trunk Message-ID: Revision: 9253 http://gar.svn.sourceforge.net/gar/?rev=9253&view=rev Author: dmichelsen Date: 2010-03-19 13:27:05 +0000 (Fri, 19 Mar 2010) Log Message: ----------- cpan/AppConfig: Update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/AppConfig/trunk/Makefile csw/mgar/pkg/cpan/AppConfig/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/AppConfig/trunk/files/COPYING Property Changed: ---------------- csw/mgar/pkg/cpan/AppConfig/trunk/ Property changes on: csw/mgar/pkg/cpan/AppConfig/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/AppConfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/AppConfig/trunk/Makefile 2010-03-19 13:18:41 UTC (rev 9252) +++ csw/mgar/pkg/cpan/AppConfig/trunk/Makefile 2010-03-19 13:27:05 UTC (rev 9253) @@ -11,8 +11,11 @@ script parameters. endef -DISTFILES += CSWpmappconfig.gspec +DISTFILES = COPYING -DEPENDS += cpan/File-HomeDir +PACKAGES = CSWpmappconfig +CATALOGNAME = pm_appconfig +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/AppConfig/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/AppConfig/trunk/checksums 2010-03-19 13:18:41 UTC (rev 9252) +++ csw/mgar/pkg/cpan/AppConfig/trunk/checksums 2010-03-19 13:27:05 UTC (rev 9253) @@ -1,2 +1,2 @@ -31a37ea8173ec6a2ac6130d1c3e73452 download/CSWpmappconfig.gspec -21aa4d1bf70a49a94c2dc9293389b3a0 download/AppConfig-1.66.tar.gz +21aa4d1bf70a49a94c2dc9293389b3a0 AppConfig-1.66.tar.gz +57fb71a11d83e6f389561b0071e19a1f COPYING Copied: csw/mgar/pkg/cpan/AppConfig/trunk/files/COPYING (from rev 9245, csw/mgar/pkg/cpan/AppConfig/trunk/files/CSWpmappconfig.gspec) =================================================================== --- csw/mgar/pkg/cpan/AppConfig/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/AppConfig/trunk/files/COPYING 2010-03-19 13:27:05 UTC (rev 9253) @@ -0,0 +1,6 @@ +Copyright (C) 1997-2004 Andy Wardley. All Rights Reserved. + +Copyright (C) 1997,1998 Canon Research Centre Europe Ltd. + +This module 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 dmichelsen at users.sourceforge.net Fri Mar 19 14:31:24 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 13:31:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9254] csw/mgar/pkg/cpan/Config-General/trunk Message-ID: Revision: 9254 http://gar.svn.sourceforge.net/gar/?rev=9254&view=rev Author: dmichelsen Date: 2010-03-19 13:31:24 +0000 (Fri, 19 Mar 2010) Log Message: ----------- cpan/Config-General: Update to 2.44 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/Config-General/trunk/Makefile csw/mgar/pkg/cpan/Config-General/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Config-General/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Config-General/trunk/files/CSWpmconfiggeneral.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Config-General/trunk/ Property changes on: csw/mgar/pkg/cpan/Config-General/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/Config-General/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Config-General/trunk/Makefile 2010-03-19 13:27:05 UTC (rev 9253) +++ csw/mgar/pkg/cpan/Config-General/trunk/Makefile 2010-03-19 13:31:24 UTC (rev 9254) @@ -1,5 +1,5 @@ GARNAME = Config-General -GARVERSION = 2.40 +GARVERSION = 2.44 CATEGORIES = cpan AUTHOR = TLINDEN @@ -17,8 +17,11 @@ C-style comments or multiline options endef -DISTFILES += CSWpmconfiggeneral.gspec +DISTFILES = COPYING -CONFIGURE_ARGS = +PACKAGES = CSWpmconfiggeneral +CATALOGNAME = pm_configgeneral +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Config-General/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Config-General/trunk/checksums 2010-03-19 13:27:05 UTC (rev 9253) +++ csw/mgar/pkg/cpan/Config-General/trunk/checksums 2010-03-19 13:31:24 UTC (rev 9254) @@ -1,2 +1,2 @@ -299832414172f94ae2e4869908a6bc1b download/CSWpmconfiggeneral.gspec -cbb860739f2097c4202c225981dcbcf0 download/Config-General-2.40.tar.gz +e5faaf3f3e7172225cfba4f1671c1760 COPYING +ad17b4ae5e0142fadd9b81f264deb266 Config-General-2.44.tar.gz Added: csw/mgar/pkg/cpan/Config-General/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Config-General/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Config-General/trunk/files/COPYING 2010-03-19 13:31:24 UTC (rev 9254) @@ -0,0 +1,11 @@ + Config::General + Config::General::Extended + Copyright (c) 2000-2007 by Thomas Linden + + Config::General::Interpolated + Copyright (c) 2001 by Wei-Hon Chen + Copyright (c) 2002-2007 by Thomas Linden . + + 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/Config-General/trunk/files/CSWpmconfiggeneral.gspec =================================================================== --- csw/mgar/pkg/cpan/Config-General/trunk/files/CSWpmconfiggeneral.gspec 2010-03-19 13:27:05 UTC (rev 9253) +++ csw/mgar/pkg/cpan/Config-General/trunk/files/CSWpmconfiggeneral.gspec 2010-03-19 13:31:24 UTC (rev 9254) @@ -1,8 +0,0 @@ -%var bitname pm_configgeneral -%var pkgname CSWpmconfiggeneral -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2000-2007 Thomas Linden - -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 dmichelsen at users.sourceforge.net Fri Mar 19 14:35:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 13:35:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9255] csw/mgar/pkg/cpan/File-Remove/trunk Message-ID: Revision: 9255 http://gar.svn.sourceforge.net/gar/?rev=9255&view=rev Author: dmichelsen Date: 2010-03-19 13:35:21 +0000 (Fri, 19 Mar 2010) Log Message: ----------- cpan/File-Remove: Update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/File-Remove/trunk/Makefile csw/mgar/pkg/cpan/File-Remove/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/File-Remove/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/File-Remove/trunk/files/CSWpmfileremove.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/File-Remove/trunk/ Property changes on: csw/mgar/pkg/cpan/File-Remove/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/File-Remove/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-Remove/trunk/Makefile 2010-03-19 13:31:24 UTC (rev 9254) +++ csw/mgar/pkg/cpan/File-Remove/trunk/Makefile 2010-03-19 13:35:21 UTC (rev 9255) @@ -3,7 +3,7 @@ CATEGORIES = cpan AUTHOR = ADAMK -DESCRIPTION = remove files and directories +DESCRIPTION = Remove files and directories define BLURB File::Remove::remove removes files and directories. It acts like /bin/rm, for the most part. Although unlink can be given a list of files, it will not @@ -11,6 +11,11 @@ and ?, as arguments for filenames. endef -DISTFILES += CSWpmfileremove.gspec +DISTFILES = COPYING +PACKAGES = CSWpmfileremove +CATALOGNAME = pm_fileremove + +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/File-Remove/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-Remove/trunk/checksums 2010-03-19 13:31:24 UTC (rev 9254) +++ csw/mgar/pkg/cpan/File-Remove/trunk/checksums 2010-03-19 13:35:21 UTC (rev 9255) @@ -1,2 +1,2 @@ -06e227150978a171d871e8a6fd4835ca download/CSWpmfileremove.gspec -7eef25044fc3cc60b6faf0522f865ed5 download/File-Remove-1.42.tar.gz +06e227150978a171d871e8a6fd4835ca COPYING +7eef25044fc3cc60b6faf0522f865ed5 File-Remove-1.42.tar.gz Copied: csw/mgar/pkg/cpan/File-Remove/trunk/files/COPYING (from rev 9245, csw/mgar/pkg/cpan/File-Remove/trunk/files/CSWpmfileremove.gspec) =================================================================== --- csw/mgar/pkg/cpan/File-Remove/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/File-Remove/trunk/files/COPYING 2010-03-19 13:35:21 UTC (rev 9255) @@ -0,0 +1,16 @@ +%var bitname pm_fileremove +%var pkgname CSWpmfileremove +%var arch all +%include url file://%{PKGLIB}/csw_cpan.gspec +%copyright +Some parts copyright 2006 - 2008 Adam Kennedy. + +Taken over by Adam Kennedy , to fix the "deep readonly files" bug, and do some more cleaning up. + +Some parts copyright 2004 - 2005 Richard Soderberg. + +Taken over by Richard Soderberg , so as to port it to File::Spec and add tests. + +Original copyright: 1998 by Gabor Egressy, . + +This program is free software; you can redistribute and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/File-Remove/trunk/files/CSWpmfileremove.gspec =================================================================== --- csw/mgar/pkg/cpan/File-Remove/trunk/files/CSWpmfileremove.gspec 2010-03-19 13:31:24 UTC (rev 9254) +++ csw/mgar/pkg/cpan/File-Remove/trunk/files/CSWpmfileremove.gspec 2010-03-19 13:35:21 UTC (rev 9255) @@ -1,16 +0,0 @@ -%var bitname pm_fileremove -%var pkgname CSWpmfileremove -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Some parts copyright 2006 - 2008 Adam Kennedy. - -Taken over by Adam Kennedy , to fix the "deep readonly files" bug, and do some more cleaning up. - -Some parts copyright 2004 - 2005 Richard Soderberg. - -Taken over by Richard Soderberg , so as to port it to File::Spec and add tests. - -Original copyright: 1998 by Gabor Egressy, . - -This program is free software; you can redistribute 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 dmichelsen at users.sourceforge.net Fri Mar 19 14:37:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 13:37:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[9256] csw/mgar/pkg/cpan/File-Remove/trunk/files/COPYING Message-ID: Revision: 9256 http://gar.svn.sourceforge.net/gar/?rev=9256&view=rev Author: dmichelsen Date: 2010-03-19 13:37:24 +0000 (Fri, 19 Mar 2010) Log Message: ----------- cpan/File-Remove: Fix COPYING Modified Paths: -------------- csw/mgar/pkg/cpan/File-Remove/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/File-Remove/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/File-Remove/trunk/files/COPYING 2010-03-19 13:35:21 UTC (rev 9255) +++ csw/mgar/pkg/cpan/File-Remove/trunk/files/COPYING 2010-03-19 13:37:24 UTC (rev 9256) @@ -1,8 +1,3 @@ -%var bitname pm_fileremove -%var pkgname CSWpmfileremove -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright Some parts copyright 2006 - 2008 Adam Kennedy. Taken over by Adam Kennedy , to fix the "deep readonly files" bug, and do some more cleaning up. 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 Mar 19 14:37:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 13:37:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9257] csw/mgar/pkg/cpan/File-Remove/trunk/checksums Message-ID: Revision: 9257 http://gar.svn.sourceforge.net/gar/?rev=9257&view=rev Author: dmichelsen Date: 2010-03-19 13:37:50 +0000 (Fri, 19 Mar 2010) Log Message: ----------- cpan/File-Remove: Fix COPYING Modified Paths: -------------- csw/mgar/pkg/cpan/File-Remove/trunk/checksums Modified: csw/mgar/pkg/cpan/File-Remove/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-Remove/trunk/checksums 2010-03-19 13:37:24 UTC (rev 9256) +++ csw/mgar/pkg/cpan/File-Remove/trunk/checksums 2010-03-19 13:37:50 UTC (rev 9257) @@ -1,2 +1,2 @@ -06e227150978a171d871e8a6fd4835ca COPYING +df809ec9deac3b6514166c8bdec44706 COPYING 7eef25044fc3cc60b6faf0522f865ed5 File-Remove-1.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 Mar 19 14:40:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 13:40:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9258] csw/mgar/pkg/cpan/IO-Multiplex/trunk Message-ID: Revision: 9258 http://gar.svn.sourceforge.net/gar/?rev=9258&view=rev Author: dmichelsen Date: 2010-03-19 13:40:50 +0000 (Fri, 19 Mar 2010) Log Message: ----------- cpan/IO-Multiplex: Update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Multiplex/trunk/Makefile csw/mgar/pkg/cpan/IO-Multiplex/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/IO-Multiplex/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/IO-Multiplex/trunk/files/CSWpmiomultiplex.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/IO-Multiplex/trunk/ Property changes on: csw/mgar/pkg/cpan/IO-Multiplex/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-Multiplex/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Multiplex/trunk/Makefile 2010-03-19 13:37:50 UTC (rev 9257) +++ csw/mgar/pkg/cpan/IO-Multiplex/trunk/Makefile 2010-03-19 13:40:50 UTC (rev 9258) @@ -11,8 +11,11 @@ It can also accept incoming connections on one or more listen sockets. endef -DISTFILES += CSWpmiomultiplex.gspec +DISTFILES = COPYING -CONFIGURE_ARGS = +PACKAGES = CSWpmiomultiplex +CATALOGNAME = pm_iomultiplex +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/IO-Multiplex/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IO-Multiplex/trunk/checksums 2010-03-19 13:37:50 UTC (rev 9257) +++ csw/mgar/pkg/cpan/IO-Multiplex/trunk/checksums 2010-03-19 13:40:50 UTC (rev 9258) @@ -1,2 +1,2 @@ -416c4095a170852cc74146453bc9f559 download/CSWpmiomultiplex.gspec -ce230ee0a4afbff59da66f0c42e0340b download/IO-Multiplex-1.10.tar.gz +97b8a57e464fdbe36243bb4fa76ed839 COPYING +ce230ee0a4afbff59da66f0c42e0340b IO-Multiplex-1.10.tar.gz Copied: csw/mgar/pkg/cpan/IO-Multiplex/trunk/files/COPYING (from rev 9245, csw/mgar/pkg/cpan/IO-Multiplex/trunk/files/CSWpmiomultiplex.gspec) =================================================================== --- csw/mgar/pkg/cpan/IO-Multiplex/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/IO-Multiplex/trunk/files/COPYING 2010-03-19 13:40:50 UTC (rev 9258) @@ -0,0 +1,5 @@ +Copyright 1999 Bruce J Keeler + +Copyright 2001-2008 Rob Brown + +Released under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/IO-Multiplex/trunk/files/CSWpmiomultiplex.gspec =================================================================== --- csw/mgar/pkg/cpan/IO-Multiplex/trunk/files/CSWpmiomultiplex.gspec 2010-03-19 13:37:50 UTC (rev 9257) +++ csw/mgar/pkg/cpan/IO-Multiplex/trunk/files/CSWpmiomultiplex.gspec 2010-03-19 13:40:50 UTC (rev 9258) @@ -1,10 +0,0 @@ -%var bitname pm_iomultiplex -%var pkgname CSWpmiomultiplex -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 1999 Bruce J Keeler - -Copyright 2001-2008 Rob Brown - -Released 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 dmichelsen at users.sourceforge.net Fri Mar 19 14:49:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 13:49:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[9259] csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk Message-ID: Revision: 9259 http://gar.svn.sourceforge.net/gar/?rev=9259&view=rev Author: dmichelsen Date: 2010-03-19 13:49:25 +0000 (Fri, 19 Mar 2010) Log Message: ----------- cpan/Log-Dispatch: Update to 1.03 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/Makefile csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/files/CSWpmlogdispatchconf.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/ Property changes on: csw/mgar/pkg/cpan/Log-Dispatch-Config/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/Log-Dispatch-Config/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/Makefile 2010-03-19 13:40:50 UTC (rev 9258) +++ csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/Makefile 2010-03-19 13:49:25 UTC (rev 9259) @@ -1,19 +1,20 @@ GARNAME = Log-Dispatch-Config -GARVERSION = 1.02 +GARVERSION = 1.03 CATEGORIES = cpan AUTHOR = MIYAGAWA DESCRIPTION = Log4j for Perl define BLURB - Log::Dispatch::Config is a subclass of Log::Dispatch and provides a way to configure - Log::Dispatch object with configulation file (default, in AppConfig format). - I mean, this is log4j for Perl, not with all API compatibility though. + Log::Dispatch::Config is a subclass of Log::Dispatch and provides a way to configure + Log::Dispatch object with configulation file (default, in AppConfig format). + I mean, this is log4j for Perl, not with all API compatibility though. endef -DISTFILES += CSWpmlogdispatchconf.gspec +DISTFILES = COPYING -DEPENDS += cpan/Log-Dispatch +PACKAGES = CSWpmlogdispatchconf +CATALOGNAME = pm_logdispatchconf -CONFIGURE_ARGS = +ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/checksums 2010-03-19 13:40:50 UTC (rev 9258) +++ csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/checksums 2010-03-19 13:49:25 UTC (rev 9259) @@ -1,2 +1,2 @@ -74836bac51f0be339340e4aae6897924 download/CSWpmlogdispatchconf.gspec -9fe652d4c260daf65f703f7aa3b59fcb download/Log-Dispatch-Config-1.02.tar.gz +20e79e5050e5e5523d5c56a6eb535700 COPYING +fc89b4353978f0bc3f26e0cf02d5527b Log-Dispatch-Config-1.03.tar.gz Copied: csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/files/COPYING (from rev 9245, csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/files/CSWpmlogdispatchconf.gspec) =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/files/COPYING 2010-03-19 13:49:25 UTC (rev 9259) @@ -0,0 +1,4 @@ +Tatsuhiko Miyagawa with much help from Matt Sergeant . + +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/Log-Dispatch-Config/trunk/files/CSWpmlogdispatchconf.gspec =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/files/CSWpmlogdispatchconf.gspec 2010-03-19 13:40:50 UTC (rev 9258) +++ csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/files/CSWpmlogdispatchconf.gspec 2010-03-19 13:49:25 UTC (rev 9259) @@ -1,9 +0,0 @@ -%var bitname pm_logdispatchconf -%var pkgname CSWpmlogdispatchconf -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Tatsuhiko Miyagawa with much help from Matt Sergeant . - -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 dmichelsen at users.sourceforge.net Fri Mar 19 14:55:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 13:55:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9260] csw/mgar/pkg/cpan/Mail-Box/trunk Message-ID: Revision: 9260 http://gar.svn.sourceforge.net/gar/?rev=9260&view=rev Author: dmichelsen Date: 2010-03-19 13:55:50 +0000 (Fri, 19 Mar 2010) Log Message: ----------- cpan/Mail-Box: Update to 2.093 and mGAR v2, a ton of dependencies is missing Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-Box/trunk/Makefile csw/mgar/pkg/cpan/Mail-Box/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Mail-Box/trunk/files/CSWpmmailbox.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Mail-Box/trunk/ Property changes on: csw/mgar/pkg/cpan/Mail-Box/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/Mail-Box/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-Box/trunk/Makefile 2010-03-19 13:49:25 UTC (rev 9259) +++ csw/mgar/pkg/cpan/Mail-Box/trunk/Makefile 2010-03-19 13:55:50 UTC (rev 9260) @@ -1,9 +1,9 @@ GARNAME = Mail-Box -GARVERSION = 2.069 +GARVERSION = 2.093 CATEGORIES = cpan AUTHOR = MARKOV -DESCRIPTION = manage a mailbox, a folder with messages +DESCRIPTION = Manage a mailbox, a folder with messages define BLURB Mail::Box is the base class for accessing various types of mailboxes (folders) in a uniform manner. The various folder types vary on how they @@ -13,11 +13,13 @@ same directory. endef -DEPENDS += cpan/Scalar-List-Utils cpan/File-Remove cpan/Object-Realize-Later -DEPENDS += cpan/MailTools cpan/MIME-Types cpan/URI cpan/IO-stringy -DEPENDS += cpan/Digest-HMAC cpan/User-Identity cpan/TimeDate -DEPENDS += cpan/MIME-tools cpan/HTML-Format cpan/Time-HiRes +PACKAGES = CSWpmmailbox +CATALOGNAME = pm_mailbox -DISTFILES += CSWpmmailbox.gspec +LICENSE = LICENSE +# TBD: Add a ton of dependencies, including libdbx from http://sourceforge.net/project/ol2mbox/ + +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Mail-Box/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Mail-Box/trunk/checksums 2010-03-19 13:49:25 UTC (rev 9259) +++ csw/mgar/pkg/cpan/Mail-Box/trunk/checksums 2010-03-19 13:55:50 UTC (rev 9260) @@ -1,2 +1 @@ -8b4b3245b949a747be39f26d19ef2515 download/CSWpmmailbox.gspec -3af6e42fb857d62f1c599d5451a88320 download/Mail-Box-2.069.tar.gz +a13f206901c978d98a4bd6930855cccd Mail-Box-2.093.tar.gz Deleted: csw/mgar/pkg/cpan/Mail-Box/trunk/files/CSWpmmailbox.gspec =================================================================== --- csw/mgar/pkg/cpan/Mail-Box/trunk/files/CSWpmmailbox.gspec 2010-03-19 13:49:25 UTC (rev 9259) +++ csw/mgar/pkg/cpan/Mail-Box/trunk/files/CSWpmmailbox.gspec 2010-03-19 13:55:50 UTC (rev 9260) @@ -1,5 +0,0 @@ -%var bitname pm_mailbox -%var pkgname CSWpmmailbox -%var arch all -%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 wahwah at users.sourceforge.net Fri Mar 19 15:19:39 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 19 Mar 2010 14:19:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9261] csw/mgar/gar/v2/lib/python/opencsw.py Message-ID: Revision: 9261 http://gar.svn.sourceforge.net/gar/?rev=9261&view=rev Author: wahwah Date: 2010-03-19 14:19:38 +0000 (Fri, 19 Mar 2010) Log Message: ----------- mGAR v2: A bugfix for pkgchk command line invocation. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-19 13:55:50 UTC (rev 9260) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-19 14:19:38 UTC (rev 9261) @@ -422,9 +422,9 @@ return os.path.join(self.GetWorkDir(), "admin") def GetGunzippedPath(self): - gzip_suffix = ".gz" - pkg_suffix = ".pkg" if not self.gunzipped_path: + gzip_suffix = ".gz" + pkg_suffix = ".pkg" if self.pkg_path.endswith("%s%s" % (pkg_suffix, gzip_suffix)): base_name_gz = os.path.split(self.pkg_path)[1] shutil.copy(self.pkg_path, self.GetWorkDir()) @@ -517,7 +517,7 @@ def GetPkgchkOutput(self): """Returns: (exit code, stdout, stderr).""" - args = ["pkgchk", "-d", self.GetPkgname()] + args = ["pkgchk", "-d", self.GetGunzippedPath(), "all"] pkgchk_proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = pkgchk_proc.communicate() ret = pkgchk_proc.wait() 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 Mar 19 15:23:30 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 14:23:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9262] csw/mgar/pkg/cpan/Net-Server/trunk Message-ID: Revision: 9262 http://gar.svn.sourceforge.net/gar/?rev=9262&view=rev Author: dmichelsen Date: 2010-03-19 14:23:29 +0000 (Fri, 19 Mar 2010) Log Message: ----------- cpan/Net-Server: Update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/Net-Server/trunk/Makefile csw/mgar/pkg/cpan/Net-Server/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Net-Server/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Net-Server/trunk/files/CSWpmnetserver.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Net-Server/trunk/ Property changes on: csw/mgar/pkg/cpan/Net-Server/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/Net-Server/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Server/trunk/Makefile 2010-03-19 14:19:38 UTC (rev 9261) +++ csw/mgar/pkg/cpan/Net-Server/trunk/Makefile 2010-03-19 14:23:29 UTC (rev 9262) @@ -11,8 +11,11 @@ concepts in the Apache Webserver. endef -DISTFILES += CSWpmnetserver.gspec +DISTFILES = COPYING -CONFIGURE_ARGS = +PACKAGES = CSWpmnetserver +CATALOGNAME = pm_netserver +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Net-Server/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-Server/trunk/checksums 2010-03-19 14:19:38 UTC (rev 9261) +++ csw/mgar/pkg/cpan/Net-Server/trunk/checksums 2010-03-19 14:23:29 UTC (rev 9262) @@ -1,2 +1,2 @@ -4ec0637d523e071e55c7ab813527c7e1 download/CSWpmnetserver.gspec -f884b6c5b1d2698a82bbc7ba659690a1 download/Net-Server-0.97.tar.gz +0b2333ad7bf7e32d5a0c87ecc9c78d6a COPYING +f884b6c5b1d2698a82bbc7ba659690a1 Net-Server-0.97.tar.gz Copied: csw/mgar/pkg/cpan/Net-Server/trunk/files/COPYING (from rev 9245, csw/mgar/pkg/cpan/Net-Server/trunk/files/CSWpmnetserver.gspec) =================================================================== --- csw/mgar/pkg/cpan/Net-Server/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Net-Server/trunk/files/COPYING 2010-03-19 14:23:29 UTC (rev 9262) @@ -0,0 +1,4 @@ +Paul Seamons + http://seamons.com/ + + Rob Brown Deleted: csw/mgar/pkg/cpan/Net-Server/trunk/files/CSWpmnetserver.gspec =================================================================== --- csw/mgar/pkg/cpan/Net-Server/trunk/files/CSWpmnetserver.gspec 2010-03-19 14:19:38 UTC (rev 9261) +++ csw/mgar/pkg/cpan/Net-Server/trunk/files/CSWpmnetserver.gspec 2010-03-19 14:23:29 UTC (rev 9262) @@ -1,9 +0,0 @@ -%var bitname pm_netserver -%var pkgname CSWpmnetserver -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Paul Seamons - http://seamons.com/ - - Rob Brown This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Mar 19 15:32:53 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 19 Mar 2010 14:32:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9263] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 9263 http://gar.svn.sourceforge.net/gar/?rev=9263&view=rev Author: hson Date: 2010-03-19 14:32:52 +0000 (Fri, 19 Mar 2010) Log Message: ----------- mGAR v2: Make sure URLS are calculated correctly under custom-modulator-specific patches Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2010-03-19 14:23:29 UTC (rev 9262) +++ csw/mgar/gar/v2/gar.lib.mk 2010-03-19 14:32:52 UTC (rev 9263) @@ -27,7 +27,7 @@ #################### FETCH RULES #################### -URLS = $(call URLSTRIP,$(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M))))) +URLS = $(call URLSTRIP,$(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(ALLFILES_PATCHFILES)))) # if the caller has defined _postinstall, etc targets for a package, add # these 'dynamic script' targets to our fetch list 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 Mar 19 15:42:19 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 14:42:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9264] csw/mgar/pkg/cpan Message-ID: Revision: 9264 http://gar.svn.sourceforge.net/gar/?rev=9264&view=rev Author: dmichelsen Date: 2010-03-19 14:42:18 +0000 (Fri, 19 Mar 2010) Log Message: ----------- cpan/Net-SSH: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-SSH/ csw/mgar/pkg/cpan/Net-SSH/branches/ csw/mgar/pkg/cpan/Net-SSH/tags/ csw/mgar/pkg/cpan/Net-SSH/trunk/ csw/mgar/pkg/cpan/Net-SSH/trunk/Makefile csw/mgar/pkg/cpan/Net-SSH/trunk/checksums csw/mgar/pkg/cpan/Net-SSH/trunk/files/ csw/mgar/pkg/cpan/Net-SSH/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Net-SSH/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/Net-SSH/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-SSH/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-SSH/trunk/Makefile 2010-03-19 14:42:18 UTC (rev 9264) @@ -0,0 +1,17 @@ +GARNAME = Net-SSH +GARVERSION = 0.09 +CATEGORIES = cpan +AUTHOR = IVAN + +DESCRIPTION = Perl extension for secure shell +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmnetssh +CATALOGNAME = pm_netssh + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-SSH/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-SSH/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-SSH/trunk/checksums 2010-03-19 14:42:18 UTC (rev 9264) @@ -0,0 +1,2 @@ +69b94f6bda19f83e6b455eb89095be99 COPYING +96837a66d0329e49cf5febd8b1ff4315 Net-SSH-0.09.tar.gz Added: csw/mgar/pkg/cpan/Net-SSH/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Net-SSH/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Net-SSH/trunk/files/COPYING 2010-03-19 14:42:18 UTC (rev 9264) @@ -0,0 +1,6 @@ +Copyright (c) 2002 Ivan Kohler +Copyright (c) 2007 Freeside Internet Services, Inc. +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 wahwah at users.sourceforge.net Fri Mar 19 15:49:09 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 19 Mar 2010 14:49:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[9265] csw/mgar/pkg Message-ID: Revision: 9265 http://gar.svn.sourceforge.net/gar/?rev=9265&view=rev Author: wahwah Date: 2010-03-19 14:49:08 +0000 (Fri, 19 Mar 2010) Log Message: ----------- guppy: Initial commit Modified Paths: -------------- csw/mgar/pkg/guppy/trunk/Makefile csw/mgar/pkg/guppy/trunk/checksums Added Paths: ----------- csw/mgar/pkg/guppy/ Modified: csw/mgar/pkg/guppy/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-03-13 18:13:13 UTC (rev 9142) +++ csw/mgar/pkg/guppy/trunk/Makefile 2010-03-19 14:49:08 UTC (rev 9265) @@ -2,184 +2,19 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = guppy +GARVERSION = 0.1.9 +CATEGORIES = python +DESCRIPTION = Programming environment providing object and heap memory sizing, +DESCRIPTION += profiling and analysis define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://guppy-pe.sourceforge.net/ +MASTER_SITES = http://pypi.python.org/packages/source/g/guppy/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release +# guppy-0.1.9.tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +LICENSE = PKG-INFO +include gar/category.mk Modified: csw/mgar/pkg/guppy/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-03-13 18:13:13 UTC (rev 9142) +++ csw/mgar/pkg/guppy/trunk/checksums 2010-03-19 14:49:08 UTC (rev 9265) @@ -0,0 +1 @@ +221c50d574277e4589cc4ae03f76727a guppy-0.1.9.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 Mar 19 15:51:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 14:51:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9266] csw/mgar/pkg/cpan/Object-Realize-Later/trunk Message-ID: Revision: 9266 http://gar.svn.sourceforge.net/gar/?rev=9266&view=rev Author: dmichelsen Date: 2010-03-19 14:51:47 +0000 (Fri, 19 Mar 2010) Log Message: ----------- cpan/Object-Realize-Later: Update to 0.18 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/Object-Realize-Later/trunk/Makefile csw/mgar/pkg/cpan/Object-Realize-Later/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Object-Realize-Later/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Object-Realize-Later/trunk/files/CSWpmobjrelater.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Object-Realize-Later/trunk/ Property changes on: csw/mgar/pkg/cpan/Object-Realize-Later/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/Object-Realize-Later/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Object-Realize-Later/trunk/Makefile 2010-03-19 14:49:08 UTC (rev 9265) +++ csw/mgar/pkg/cpan/Object-Realize-Later/trunk/Makefile 2010-03-19 14:51:47 UTC (rev 9266) @@ -1,9 +1,9 @@ GARNAME = Object-Realize-Later -GARVERSION = 0.15 +GARVERSION = 0.18 CATEGORIES = cpan AUTHOR = MARKOV -DESCRIPTION = delayed creation of objects +DESCRIPTION = Delayed creation of objects define BLURB The Object::Realize::Later class helps with implementing transparent on demand realization of object data. This is related to the tricks on @@ -11,8 +11,11 @@ functionality. endef -DEPENDS += cpan/Scalar-List-Utils +DISTFILES = COPYING -DISTFILES += CSWpmobjrelater.gspec +PACKAGES = CSWpmobjrealizelater +CATALOGNAME = pm_objrealizelater +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Object-Realize-Later/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Object-Realize-Later/trunk/checksums 2010-03-19 14:49:08 UTC (rev 9265) +++ csw/mgar/pkg/cpan/Object-Realize-Later/trunk/checksums 2010-03-19 14:51:47 UTC (rev 9266) @@ -1,2 +1,2 @@ -15f2e3e328187e3fe392354325ee41cc download/CSWpmobjrelater.gspec -d5165034a7cf29c7643456ebec920386 download/Object-Realize-Later-0.15.tar.gz +41b9a0575fc25ba7beeb68900237c957 COPYING +ec109cd68b40cf25090cc52b6cfbabaf Object-Realize-Later-0.18.tar.gz Copied: csw/mgar/pkg/cpan/Object-Realize-Later/trunk/files/COPYING (from rev 9245, csw/mgar/pkg/cpan/Object-Realize-Later/trunk/files/CSWpmobjrelater.gspec) =================================================================== --- csw/mgar/pkg/cpan/Object-Realize-Later/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Object-Realize-Later/trunk/files/COPYING 2010-03-19 14:51:47 UTC (rev 9266) @@ -0,0 +1,6 @@ +Written by Mark Overmeer (mark at overmeer.net). See the ChangeLog for +other contributors. + +Copyright (c) 2003 by the author(s). 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/Object-Realize-Later/trunk/files/CSWpmobjrelater.gspec =================================================================== --- csw/mgar/pkg/cpan/Object-Realize-Later/trunk/files/CSWpmobjrelater.gspec 2010-03-19 14:49:08 UTC (rev 9265) +++ csw/mgar/pkg/cpan/Object-Realize-Later/trunk/files/CSWpmobjrelater.gspec 2010-03-19 14:51:47 UTC (rev 9266) @@ -1,11 +0,0 @@ -%var bitname pm_objrelater -%var pkgname CSWpmobjrelater -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Written by Mark Overmeer (mark at overmeer.net). See the ChangeLog for -other contributors. - -Copyright (c) 2003 by the author(s). 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 dmichelsen at users.sourceforge.net Fri Mar 19 16:15:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 15:15:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9267] csw/mgar/pkg/cpan/User-Identity/trunk Message-ID: Revision: 9267 http://gar.svn.sourceforge.net/gar/?rev=9267&view=rev Author: dmichelsen Date: 2010-03-19 15:15:38 +0000 (Fri, 19 Mar 2010) Log Message: ----------- cpan/User-Identity: Update to 0.93 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/User-Identity/trunk/Makefile csw/mgar/pkg/cpan/User-Identity/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/User-Identity/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/User-Identity/trunk/files/CSWpmuserident.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/User-Identity/trunk/ Property changes on: csw/mgar/pkg/cpan/User-Identity/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/User-Identity/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/User-Identity/trunk/Makefile 2010-03-19 14:51:47 UTC (rev 9266) +++ csw/mgar/pkg/cpan/User-Identity/trunk/Makefile 2010-03-19 15:15:38 UTC (rev 9267) @@ -1,17 +1,20 @@ GARNAME = User-Identity -GARVERSION = 0.91 +GARVERSION = 0.93 CATEGORIES = cpan AUTHOR = MARKOV -DESCRIPTION = maintains info about a physical person +DESCRIPTION = Maintains info about a physical person define BLURB The User::Identity object is created to maintain a set of informational objects which are related to one user. The User::Identity module tries to be smart providing defaults, conversions and often required combinations. endef -DEPENDS += cpan/Geography-Countries +DISTFILES = COPYING -DISTFILES += CSWpmuserident.gspec +PACKAGES = CSWpmuseridentity +CATALOGNAME = pm_useridentity +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/User-Identity/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/User-Identity/trunk/checksums 2010-03-19 14:51:47 UTC (rev 9266) +++ csw/mgar/pkg/cpan/User-Identity/trunk/checksums 2010-03-19 15:15:38 UTC (rev 9267) @@ -1,2 +1,2 @@ -cb43684894b0574168b7026ba9e68cd2 download/CSWpmuserident.gspec -d5929be62a99b90f60b07062ab86a2ec download/User-Identity-0.91.tar.gz +fa1e7f978b9a434f435c2e457d6df01e COPYING +c6efb646ea66ef7c479b0eed2a24480d User-Identity-0.93.tar.gz Copied: csw/mgar/pkg/cpan/User-Identity/trunk/files/COPYING (from rev 9245, csw/mgar/pkg/cpan/User-Identity/trunk/files/CSWpmuserident.gspec) =================================================================== --- csw/mgar/pkg/cpan/User-Identity/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/User-Identity/trunk/files/COPYING 2010-03-19 15:15:38 UTC (rev 9267) @@ -0,0 +1,4 @@ +Copyright (C) 2003 Mark Overmeer + +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/User-Identity/trunk/files/CSWpmuserident.gspec =================================================================== --- csw/mgar/pkg/cpan/User-Identity/trunk/files/CSWpmuserident.gspec 2010-03-19 14:51:47 UTC (rev 9266) +++ csw/mgar/pkg/cpan/User-Identity/trunk/files/CSWpmuserident.gspec 2010-03-19 15:15:38 UTC (rev 9267) @@ -1,9 +0,0 @@ -%var bitname pm_userident -%var pkgname CSWpmuserident -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (C) 2003 Mark Overmeer - -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 dmichelsen at users.sourceforge.net Fri Mar 19 16:17:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 15:17:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[9268] csw/mgar/pkg Message-ID: Revision: 9268 http://gar.svn.sourceforge.net/gar/?rev=9268&view=rev Author: dmichelsen Date: 2010-03-19 15:17:38 +0000 (Fri, 19 Mar 2010) Log Message: ----------- gifsicle: Initial commit Added Paths: ----------- csw/mgar/pkg/gifsicle/ csw/mgar/pkg/gifsicle/branches/ csw/mgar/pkg/gifsicle/tags/ csw/mgar/pkg/gifsicle/trunk/ csw/mgar/pkg/gifsicle/trunk/Makefile csw/mgar/pkg/gifsicle/trunk/checksums csw/mgar/pkg/gifsicle/trunk/files/ Property changes on: csw/mgar/pkg/gifsicle/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/gifsicle/trunk/Makefile =================================================================== --- csw/mgar/pkg/gifsicle/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gifsicle/trunk/Makefile 2010-03-19 15:17:38 UTC (rev 9268) @@ -0,0 +1,20 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = gifsicle +GARVERSION = 1.59 +CATEGORIES = utils + +DESCRIPTION = Tool for creating, editing, and getting information about GIF images +define BLURB +endef + +MASTER_SITES = http://www.lcdf.org/gifsicle/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Property changes on: csw/mgar/pkg/gifsicle/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/gifsicle/trunk/checksums =================================================================== --- csw/mgar/pkg/gifsicle/trunk/checksums (rev 0) +++ csw/mgar/pkg/gifsicle/trunk/checksums 2010-03-19 15:17:38 UTC (rev 9268) @@ -0,0 +1 @@ +e6d21543a37e46e5da181dacf0bf0645 gifsicle-1.59.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 Mar 19 16:26:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 19 Mar 2010 15:26:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9269] csw/mgar/pkg Message-ID: Revision: 9269 http://gar.svn.sourceforge.net/gar/?rev=9269&view=rev Author: dmichelsen Date: 2010-03-19 15:26:12 +0000 (Fri, 19 Mar 2010) Log Message: ----------- ocrad: Initial commit, unfinished Added Paths: ----------- csw/mgar/pkg/ocrad/ csw/mgar/pkg/ocrad/branches/ csw/mgar/pkg/ocrad/tags/ csw/mgar/pkg/ocrad/trunk/ csw/mgar/pkg/ocrad/trunk/Makefile csw/mgar/pkg/ocrad/trunk/checksums csw/mgar/pkg/ocrad/trunk/files/ Property changes on: csw/mgar/pkg/ocrad/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/ocrad/trunk/Makefile =================================================================== --- csw/mgar/pkg/ocrad/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ocrad/trunk/Makefile 2010-03-19 15:26:12 UTC (rev 9269) @@ -0,0 +1,26 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = ocrad +GARVERSION = 0.19 +CATEGORIES = apps + +DESCRIPTION = GNU Optical Character Recognition +define BLURB +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD_OVERRIDE_VARS = CXXFLAGS +BUILD_OVERRIDE_VAR_CXXFLAGS = $(CXXFLAGS) + +include gar/category.mk + +post-extract-modulated: + @# Crappy bashisms + -perl -npe "s,#! /bin/sh,#!/bin/bash," -i $(WORKSRC)/configure + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/ocrad/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/ocrad/trunk/checksums =================================================================== --- csw/mgar/pkg/ocrad/trunk/checksums (rev 0) +++ csw/mgar/pkg/ocrad/trunk/checksums 2010-03-19 15:26:12 UTC (rev 9269) @@ -0,0 +1 @@ +e14dd0bd1fcab4fe9e6928f0f0de2751 ocrad-0.19.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Mar 20 02:24:54 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 20 Mar 2010 01:24:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9270] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9270 http://gar.svn.sourceforge.net/gar/?rev=9270&view=rev Author: bdwalton Date: 2010-03-20 01:24:54 +0000 (Sat, 20 Mar 2010) Log Message: ----------- ruby19: disable tests until next version bump (note help from Jens) Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-19 15:26:12 UTC (rev 9269) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-20 01:24:54 UTC (rev 9270) @@ -3,8 +3,18 @@ PATCHLEVEL = p376 CATEGORIES = lang -# TEST_TARGET = check +# Working with Jens Deppe, we've determined that the two failing tests +# in 1.9.1p376 are bad tests (as documented here[1] and here[2]). +# They make assumptions about kernel behaviour that don't hold for +# solaris. +# +# [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=543805 +# [2] http://redmine.ruby-lang.org/issues/show/2609 +ifneq ($(GARVERSION)$(PATCHLEVEL), 1.9.1p376) +TEST_TARGET = check +else TEST_SCRIPTS = +endif DISTNAME = ruby-$(GARVERSION)-$(PATCHLEVEL) @@ -19,7 +29,8 @@ closures. endef -PACKAGES = CSWruby19 CSWruby19doc CSWruby19tk CSWruby19dev CSWruby19mode CSWruby19modeel +PACKAGES = CSWruby19 CSWruby19doc CSWruby19tk CSWruby19dev +PACKAGES += CSWruby19mode CSWruby19modeel ARCHALL_CSWruby19doc = 1 ARCHALL_CSWruby19mode = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Mar 20 03:09:32 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 20 Mar 2010 02:09:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9271] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9271 http://gar.svn.sourceforge.net/gar/?rev=9271&view=rev Author: bdwalton Date: 2010-03-20 02:09:24 +0000 (Sat, 20 Mar 2010) Log Message: ----------- ruby19: clean up some post install targets for 1.9 Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-20 01:24:54 UTC (rev 9270) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-20 02:09:24 UTC (rev 9271) @@ -92,7 +92,7 @@ COMPILE_ELISP = 1 -PI_TARGETS = samples rbconfig rbscripts rubymode +PI_TARGETS = samples rbconfig rbscripts post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) @@ -102,19 +102,12 @@ @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS11 @gcp $(FILEDIR)/rbconfig.rb.GCC4.$(GARCH) $(DESTDIR)/$(RBCONFIG).GCC4 @gln -n -s $(RBCONFIG).SOS11 $(DESTDIR)$(RBCONFIG) - @gcp $(FILEDIR)/cswrbconfig $(DESTDIR)/opt/csw/bin/ - @chmod 755 $(DESTDIR)/opt/csw/bin/cswrbconfig - @ginstall -c -d -m 0755 $(DESTDIR)$(docdir)/ruby/ - @ginstall -c -m 0644 $(FILEDIR)/README.csw $(DESTDIR)$(docdir)/ruby/ + @gcp $(FILEDIR)/cswrbconfig $(DESTDIR)/opt/csw/bin/cswrbconfig19 + @chmod 755 $(DESTDIR)/opt/csw/bin/cswrbconfig19 + @ginstall -c -d -m 0755 $(DESTDIR)$(docdir)/$(GARNAME)/ + @ginstall -c -m 0644 $(FILEDIR)/README.csw $(DESTDIR)$(docdir)/$(GARNAME)/ @$(MAKECONFIG) -rubymode: RMDIR=$(DESTDIR)/$(datadir)/emacs/site-lisp/ruby-mode -rubymode: - @echo " ===> Installing and Compilingn ruby-mode elisp" - @(mkdir -p $(RMDIR); \ - cp $(WORKSRC)/misc/*el $(RMDIR)) - @$(MAKECOOKIE) - # Fix up rbconfig rbconfig: @gsed -i -e s,$(DESTDIR),, \ @@ -123,10 +116,10 @@ # Copy samples samples: - @mkdir -p $(DESTDIR)$(docdir)/ruby/ - @cp -R $(WORKSRC_FIRSTMOD)/sample $(DESTDIR)$(docdir)/ruby/ + @mkdir -p $(DESTDIR)$(docdir)/$(GARNAME)/ + @cp -R $(WORKSRC_FIRSTMOD)/sample $(DESTDIR)$(docdir)/$(GARNAME)/ @for ext in bigdecimal dl tk ; do \ - cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample $(DESTDIR)$(docdir)/ruby/sample/$$ext ; \ + cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample $(DESTDIR)$(docdir)/$(GARNAME)/sample/$$ext ; \ done @$(MAKECOOKIE) @@ -134,7 +127,7 @@ rbscripts: @echo " ==> Fixing shebang path in distributed ruby scripts" @find $(DESTDIR)$(prefix) -type f -name '*.rb' -exec \ - perl -i -plne "s{^#!/usr/local/bin/ruby}{#!$(bindir)/ruby}g" {} \; + perl -i -plne "s{^#!/usr/local/bin/ruby}{#!$(bindir)/$(GARNAME)}g" {} \; @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Mar 20 07:21:47 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 20 Mar 2010 06:21:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9272] csw/mgar/pkg/tcl/trunk Message-ID: Revision: 9272 http://gar.svn.sourceforge.net/gar/?rev=9272&view=rev Author: hson Date: 2010-03-20 06:21:47 +0000 (Sat, 20 Mar 2010) Log Message: ----------- tcl: Fix tclInt.h needed for building 64-bit expect Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile csw/mgar/pkg/tcl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tcl/trunk/files/tclInt.h.patch Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-03-20 02:09:24 UTC (rev 9271) +++ csw/mgar/pkg/tcl/trunk/Makefile 2010-03-20 06:21:47 UTC (rev 9272) @@ -20,6 +20,7 @@ # Fix for finding libsunmath on i386 and amd64 PATCHFILES-8.5.8 = configure.patch PATCHFILES-8.5.8 += tcl.m4.patch +PATCHFILES-8.5.8 += tclInt.h.patch PATCHFILES = $(PATCHFILES-$(GARVERSION)) ALLFILES_PATCHFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(PATCHFILES-$(VERSION))) Modified: csw/mgar/pkg/tcl/trunk/checksums =================================================================== --- csw/mgar/pkg/tcl/trunk/checksums 2010-03-20 02:09:24 UTC (rev 9271) +++ csw/mgar/pkg/tcl/trunk/checksums 2010-03-20 06:21:47 UTC (rev 9272) @@ -2,3 +2,4 @@ cc9b1bd7ddf8e27e97ef464806885349 tcl.m4.patch ade2c033a7b545ee108f3fdfeb629fcf tcl8.4.19-src.tar.gz 7f123e53b3daaaba2478d3af5a0752e3 tcl8.5.8-src.tar.gz +3c9c100904b6ba774a679ad7f2b4a036 tclInt.h.patch Added: csw/mgar/pkg/tcl/trunk/files/tclInt.h.patch =================================================================== --- csw/mgar/pkg/tcl/trunk/files/tclInt.h.patch (rev 0) +++ csw/mgar/pkg/tcl/trunk/files/tclInt.h.patch 2010-03-20 06:21:47 UTC (rev 9272) @@ -0,0 +1,11 @@ +--- ../build-isa-sparcv8-garversion-8.5.8/tcl8.5.8/generic/tclInt.h 2009-10-18 13:21:38.000000000 +0200 ++++ tcl8.5.8/generic/tclInt.h 2010-03-19 19:06:24.590674715 +0100 +@@ -60,7 +60,7 @@ + #else + #include + #endif +-#ifdef STDC_HEADERS ++#if defined(STDC_HEADERS) || defined(__sun) + #include + #else + typedef int ptrdiff_t; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Mar 20 07:22:30 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 20 Mar 2010 06:22:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9273] csw/mgar/pkg/tk/trunk Message-ID: Revision: 9273 http://gar.svn.sourceforge.net/gar/?rev=9273&view=rev Author: hson Date: 2010-03-20 06:22:30 +0000 (Sat, 20 Mar 2010) Log Message: ----------- tcl: Update to 8.5.8, add correct license file Modified Paths: -------------- csw/mgar/pkg/tk/trunk/Makefile csw/mgar/pkg/tk/trunk/checksums Modified: csw/mgar/pkg/tk/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk/trunk/Makefile 2010-03-20 06:21:47 UTC (rev 9272) +++ csw/mgar/pkg/tk/trunk/Makefile 2010-03-20 06:22:30 UTC (rev 9273) @@ -1,5 +1,5 @@ GARNAME = tk -GARVERSION = 8.5.7 +GARVERSION = 8.5.8 CATEGORIES = lang DESCRIPTION = GUI toolkit for tcl @@ -17,6 +17,7 @@ DEP_PKGS_CSWtk = CSWfconfig CSWftype2 CSWlibx11 CSWlibxft2 CSWlibxrender CSWtcl SPKG_SOURCEURL = http://www.tcl.tk/ +LICENSE = license.terms # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 @@ -49,6 +50,11 @@ #CFLAGS := $(filter-out -I%,$(CFLAGS)) #DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS)) + +pre-configure-modulated: + @(cd $(WORKSRC) ; cp -p ../license.terms .) + @$(MAKECOOKIE) + post-install-i386: @# Install legacy libs @# Building them with version modulations would be hard as that would require a full legacy tcl also Modified: csw/mgar/pkg/tk/trunk/checksums =================================================================== --- csw/mgar/pkg/tk/trunk/checksums 2010-03-20 06:21:47 UTC (rev 9272) +++ csw/mgar/pkg/tk/trunk/checksums 2010-03-20 06:22:30 UTC (rev 9273) @@ -1,3 +1,3 @@ 8295c274c17ffa975bcf623763c77bc6 libtk8.4.so.i 340e9cec53ced4cae6099fdda2cdb0d3 libtk8.4.so.s -0764f63ae2106b4774c4ecb0ef391610 tk8.5.7-src.tar.gz +13bf90602e16fc530e05196431021dc6 tk8.5.8-src.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 20 09:10:56 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 20 Mar 2010 08:10:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[9274] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 9274 http://gar.svn.sourceforge.net/gar/?rev=9274&view=rev Author: wahwah Date: 2010-03-20 08:10:56 +0000 (Sat, 20 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, small style cleanup for lib/python/package_checks.py Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-20 06:22:30 UTC (rev 9273) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-20 08:10:56 UTC (rev 9274) @@ -165,8 +165,8 @@ # These are indexes "by soname". (needed_sonames, binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - needed_sonames_by_binary) + runpath_by_needed_soname + ) = checkpkg.BuildIndexesBySoname(needed_sonames_by_binary) logger.debug("Determining the soname-package relationships.") # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog @@ -176,7 +176,7 @@ lines_by_soname = checkpkg.GetLinesBySoname( runpath_data_by_soname, needed_sonames, runpath_by_needed_soname, isalist) - # Creating a map from files to packages. + logger.debug("Creating a map from files to packages.") pkgs_by_filename = {} for soname, line in lines_by_soname.iteritems(): # TODO: Find all the packages, not just the last field. @@ -185,7 +185,7 @@ pkgname = fields[-1] pkgs_by_filename[soname] = pkgname - # A shared object dependency/provisioning report, plus checking. + # A shared object dependency/provisioning report. # # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), # it has a different purpose: it reports the relationships between shared @@ -216,12 +216,6 @@ print "However, it's a whitelisted soname." else: print "No package seems to be providing %s" % (soname,) - # The error checking needs to be unified: done in one place only. - # errors.append( - # checkpkg.CheckpkgTag( - # "%s is required by %s, but " - # "we don't know what provides it." - # % (soname, binaries_by_soname[soname]))) if binaries_with_missing_sonames: print "The following are binaries with missing sonames:" binary_lines = " ".join(sorted(binaries_with_missing_sonames)) @@ -271,12 +265,14 @@ if depname not in known_pkgs: error_mgr.ReportError(pkgname, "unidentified-dependency", depname) + def CheckDependsOnSelf(pkg_data, error_mgr, logger): pkgname = pkg_data["basic_stats"]["pkgname"] for depname, dep_desc in pkg_data["depends"]: if depname == pkgname: error_mgr.ReportError("depends-on-self") + def CheckArchitectureSanity(pkg_data, error_mgr, logger): basic_stats = pkg_data["basic_stats"] pkgname = basic_stats["pkgname"] @@ -318,6 +314,7 @@ error_mgr.ReportError("license-missing") logger.info("See http://sourceforge.net/apps/trac/gar/wiki/CopyRight") + def CheckObsoleteDeps(pkg_data, error_mgr, logger): """Checks for obsolete dependencies.""" deps = set(pkg_data["depends"]) @@ -445,8 +442,7 @@ if re.search(r"-", pkginfo["VERSION"]): error_mgr.ReportError("pkginfo-minus-in-version") if not re.match(VERSION_RE, pkginfo["VERSION"]): - msg = ("Version regex: %s, version value: %s." - % (repr(VERSION_RE), repr(pkginfo["VERSION"]))) + msg = pkginfo["VERSION"] error_mgr.ReportError("pkginfo-version-wrong-format", msg) if pkginfo["ARCH"] not in ARCH_LIST: error_mgr.ReportError("pkginfo-nonstandard-architecture", pkginfo["ARCH"]) @@ -521,6 +517,7 @@ error_mgr.ReportError("linked-against-discouraged-library", "%s %s" % (binary_info["base_name"], soname)) + def CheckDiscouragedFileNamePatterns(pkg_data, error_mgr, logger): patterns = [re.compile(x) for x in DISCOURAGED_FILE_PATTERNS] for entry in pkg_data["pkgmap"]: @@ -530,14 +527,15 @@ error_mgr.ReportError("discouraged-path-in-pkgmap", entry["path"]) + def CheckBadPaths(pkg_data, error_mgr, logger): for regex in pkg_data["bad_paths"]: for file_name in pkg_data["bad_paths"][regex]: error_mgr.ReportError("file-with-bad-content", "%s %s" % (regex, file_name)) + def CheckPkgchk(pkg_data, error_mgr, logger): if pkg_data["pkgchk"]["return_code"] != 0: error_mgr.ReportError("pkgchk-failed-with-code", pkg_data["pkgchk"]["return_code"]) for line in pkg_data["pkgchk"]["stderr_lines"]: logger.warn(line) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 20 09:12:41 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 20 Mar 2010 08:12:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9275] csw/mgar/gar/v2/lib/python/checkpkg.py Message-ID: Revision: 9275 http://gar.svn.sourceforge.net/gar/?rev=9275&view=rev Author: wahwah Date: 2010-03-20 08:12:41 +0000 (Sat, 20 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, scalability fixes, a stub of messaging API for check interfaces Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-20 08:10:56 UTC (rev 9274) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-20 08:12:41 UTC (rev 9275) @@ -788,6 +788,7 @@ # # Python strings are already implementing the flyweight pattern. What's # left is lists and dictionaries. + logging.debug("Loading stats for %s", stats_obj.md5sum) raw_pkg_data = stats_obj.GetAllStats() pkg_data = raw_pkg_data pkgs_data.append(pkg_data) @@ -818,6 +819,7 @@ self.system_pkgmap = system_pkgmap if not self.system_pkgmap: self.system_pkgmap = SystemPkgmap() + self.messages = [] def GetPkgmapLineByBasename(self, basename): """Proxies calls to self.system_pkgmap.""" @@ -826,7 +828,10 @@ def GetInstalledPackages(self): return self.system_pkgmap.GetInstalledPackages() + def Message(self, msg): + sef.messages.append(msg) + class IndividualCheckInterface(CheckInterfaceBase): """To be passed to the checking functions. @@ -905,11 +910,12 @@ # # In other words, the following line needs to be smart: # pkgs_data = [x.GetAllStats() for x in stats_obj_list] + logging.debug("Loading all package statistics.") pkgs_data = self.GetOptimizedAllStats(stats_obj_list) + logging.debug("All package statistics loaded.") # Individual checks - for package_stats_obj in stats_obj_list: - pkg_data = package_stats_obj.GetAllStats() + for pkg_data in pkgs_data: pkgname = pkg_data["basic_stats"]["pkgname"] check_interface = IndividualCheckInterface(pkgname, pkgmap) for function in self.individual_checks: @@ -920,7 +926,6 @@ errors[pkgname] = check_interface.errors # Set checks for function in self.set_checks: - pkgs_data = [x.GetAllStats() for x in stats_obj_list] logger = logging.getLogger("SetCheck-%s" % (function.__name__,)) check_interface = SetCheckInterface(pkgmap) logger.debug("Calling %s", function.__name__) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 20 09:15:31 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 20 Mar 2010 08:15:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9276] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9276 http://gar.svn.sourceforge.net/gar/?rev=9276&view=rev Author: wahwah Date: 2010-03-20 08:15:31 +0000 (Sat, 20 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, performance fix for the dependency guesser. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-20 08:12:41 UTC (rev 9275) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-20 08:15:31 UTC (rev 9276) @@ -479,16 +479,16 @@ def GuessDepsByFilename(pkgname, pkg_by_any_filename): """Guesses dependencies based on filename regexes.""" guessed_deps = set() - for pattern, dep_pkgname in DEPENDENCY_FILENAME_REGEXES: - # If any file name matches, add the dep, go to the next pattern/pkg - # combination. - pattern_re = re.compile("^%s$" % pattern) - for filename in pkg_by_any_filename: - if (re.match(pattern_re, filename) - and - pkgname == pkg_by_any_filename[filename]): + patterns = [(re.compile(x), y) for x, y in DEPENDENCY_FILENAME_REGEXES] + filenames = [] + # First, find the filenames of interest. + for filename, file_pkgname in pkg_by_any_filename.iteritems(): + if file_pkgname == pkgname: + filenames.append(filename) + for regex, dep_pkgname in patterns: + for filename in filenames: + if regex.match(filename): guessed_deps.add(dep_pkgname) - break return guessed_deps Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-20 08:12:41 UTC (rev 9275) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-20 08:15:31 UTC (rev 9276) @@ -249,6 +249,16 @@ self.assertEqual(expected, checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) + def testGuessDepsByFilename3(self): + expected = set([]) + pkgname = u"CSWfoo" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/lib/foo.so.1": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) + def testGuessDepsByPkgname1(self): expected = set([u"CSWfoo"]) pkgname = u"CSWfoo-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 Sat Mar 20 10:25:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 20 Mar 2010 09:25:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9277] csw/mgar/pkg Message-ID: Revision: 9277 http://gar.svn.sourceforge.net/gar/?rev=9277&view=rev Author: dmichelsen Date: 2010-03-20 09:25:31 +0000 (Sat, 20 Mar 2010) Log Message: ----------- stellarium: Initial commit, it is built with cmake and needs qt4 first Added Paths: ----------- csw/mgar/pkg/stellarium/ csw/mgar/pkg/stellarium/branches/ csw/mgar/pkg/stellarium/tags/ csw/mgar/pkg/stellarium/trunk/ csw/mgar/pkg/stellarium/trunk/Makefile csw/mgar/pkg/stellarium/trunk/checksums csw/mgar/pkg/stellarium/trunk/files/ Property changes on: csw/mgar/pkg/stellarium/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/stellarium/trunk/Makefile =================================================================== --- csw/mgar/pkg/stellarium/trunk/Makefile (rev 0) +++ csw/mgar/pkg/stellarium/trunk/Makefile 2010-03-20 09:25:31 UTC (rev 9277) @@ -0,0 +1,21 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = stellarium +GARVERSION = 0.10.4 +CATEGORIES = apps + +DESCRIPTION = Planetarium with a realistic 3D sky just like seeing with naked eye +define BLURB + Stellarium is a free open source planetarium for your computer. It shows a realistic + sky in 3D, just like what you see with the naked eye, binoculars or a telescope. + It is being used in planetarium projectors. Just set your coordinates and go. +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/stellarium/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/stellarium/trunk/checksums =================================================================== --- csw/mgar/pkg/stellarium/trunk/checksums (rev 0) +++ csw/mgar/pkg/stellarium/trunk/checksums 2010-03-20 09:25:31 UTC (rev 9277) @@ -0,0 +1 @@ +ebb81f609c91be6ecd7e91cf7d3a4afa stellarium-0.10.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 Mar 20 11:49:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 20 Mar 2010 10:49:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9278] csw/mgar/pkg/joe/trunk Message-ID: Revision: 9278 http://gar.svn.sourceforge.net/gar/?rev=9278&view=rev Author: dmichelsen Date: 2010-03-20 10:49:50 +0000 (Sat, 20 Mar 2010) Log Message: ----------- joe: Update to 3.7 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/joe/trunk/Makefile csw/mgar/pkg/joe/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/joe/trunk/files/CSWjoe.gspec csw/mgar/pkg/joe/trunk/files/CSWjoe.prototype Property Changed: ---------------- csw/mgar/pkg/joe/trunk/ Property changes on: csw/mgar/pkg/joe/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/joe/trunk/Makefile =================================================================== --- csw/mgar/pkg/joe/trunk/Makefile 2010-03-20 09:25:31 UTC (rev 9277) +++ csw/mgar/pkg/joe/trunk/Makefile 2010-03-20 10:49:50 UTC (rev 9278) @@ -1,10 +1,7 @@ GARNAME = joe -GARVERSION = 3.3 +GARVERSION = 3.7 CATEGORIES = utils -SPKG_PACKAGER = Markus Mayer -SPKG_EMAIL = mmayer at opencsw.org - DESCRIPTION = Joe's Own Editor define BLURB JOE is the professional freeware ASCII text screen editor for UNIX. @@ -18,18 +15,23 @@ UNIX-integration features of VI. endef -MASTER_SITES = http://superb-west.dl.sourceforge.net/sourceforge/joe-editor/ http://mesh.dl.sourceforge.net/sourceforge/joe-editor/ +SF_PROJ = joe-editor +MASTER_SITES = $(SF_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWjoe,) # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=23475 UPSTREAM_USE_SF = 1 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) +DEP_PKGS = CSWncurses + +sysconfdir = /etc/opt/csw CONFIGURE_ARGS = $(DIRPATHS) -# joe doesn't have a test target -TEST_TARGET = +TEST_TARGET = check +PRESERVECONF = /etc/opt/csw/joe/.* +MIGRATE_FILES = jmacsrc joerc jpicorc jstarrc rjoerc + include gar/category.mk Modified: csw/mgar/pkg/joe/trunk/checksums =================================================================== --- csw/mgar/pkg/joe/trunk/checksums 2010-03-20 09:25:31 UTC (rev 9277) +++ csw/mgar/pkg/joe/trunk/checksums 2010-03-20 10:49:50 UTC (rev 9278) @@ -1,2 +1 @@ -02221716679c039c5da00c275d61dbf4 download/joe-3.3.tar.gz -d3ec9dde66d7bf084e926d254aa4bf63 download/CSWjoe.gspec +66de1b073e869ba12abbfcde3885c577 joe-3.7.tar.gz Deleted: csw/mgar/pkg/joe/trunk/files/CSWjoe.gspec =================================================================== --- csw/mgar/pkg/joe/trunk/files/CSWjoe.gspec 2010-03-20 09:25:31 UTC (rev 9277) +++ csw/mgar/pkg/joe/trunk/files/CSWjoe.gspec 2010-03-20 10:49:50 UTC (rev 9278) @@ -1,4 +0,0 @@ -%var bitname joe -%var pkgname CSWjoe -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/joe/trunk/files/CSWjoe.prototype =================================================================== --- csw/mgar/pkg/joe/trunk/files/CSWjoe.prototype 2010-03-20 09:25:31 UTC (rev 9277) +++ csw/mgar/pkg/joe/trunk/files/CSWjoe.prototype 2010-03-20 10:49:50 UTC (rev 9278) @@ -1,63 +0,0 @@ -i copyright -i pkginfo -d none /opt/csw 0755 root bin -d none /opt/csw/bin 0755 root bin -d none /opt/csw/etc 0755 root bin -d none /opt/csw/etc/joe 0755 root bin -d none /opt/csw/etc/joe/charmaps 0755 root bin -d none /opt/csw/etc/joe/syntax 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/joe 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/bin/joe 0755 root bin -f none /opt/csw/bin/termidx 0755 root bin -f none /opt/csw/etc/joe/charmaps/klingon 0644 root bin -f none /opt/csw/etc/joe/jmacsrc 0644 root bin -f none /opt/csw/etc/joe/joerc 0644 root bin -f none /opt/csw/etc/joe/jpicorc 0644 root bin -f none /opt/csw/etc/joe/jstarrc 0644 root bin -f none /opt/csw/etc/joe/rjoerc 0644 root bin -f none /opt/csw/etc/joe/syntax/4gl.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/ada.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/asm.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/awk.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/c.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/cobol.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/conf.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/csh.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/css.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/diff.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/fortran.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/html.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/java.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/lisp.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/mail.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/mason.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/ocaml.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/pascal.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/perl.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/php.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/ps.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/python.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/sed.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/sh.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/sml.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/sql.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/tcl.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/tex.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/verilog.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/vhdl.jsf 0644 root bin -f none /opt/csw/etc/joe/syntax/xml.jsf 0644 root bin -f none /opt/csw/share/doc/joe/ChangeLog 0644 root bin -f none /opt/csw/share/doc/joe/HACKING 0644 root bin -f none /opt/csw/share/doc/joe/HINTS 0644 root bin -f none /opt/csw/share/doc/joe/LIST 0644 root bin -f none /opt/csw/share/doc/joe/NEWS 0644 root bin -f none /opt/csw/share/doc/joe/README 0644 root bin -f none /opt/csw/share/man/man1/joe.1 0644 root bin -s none /opt/csw/bin/jmacs=joe -s none /opt/csw/bin/jpico=joe -s none /opt/csw/bin/jstar=joe -s none /opt/csw/bin/rjoe=joe This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Mar 20 11:59:19 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 20 Mar 2010 10:59:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9279] csw/mgar/pkg/expect/trunk Message-ID: Revision: 9279 http://gar.svn.sourceforge.net/gar/?rev=9279&view=rev Author: hson Date: 2010-03-20 10:59:18 +0000 (Sat, 20 Mar 2010) Log Message: ----------- Finally figured out how to build expect without having tcl and tk unpacked in the same source tree. Cleaned up Makefile Added patches to get ried of some warnings. Modified Paths: -------------- csw/mgar/pkg/expect/trunk/Makefile csw/mgar/pkg/expect/trunk/checksums Added Paths: ----------- csw/mgar/pkg/expect/trunk/files/Makefile.in.patch csw/mgar/pkg/expect/trunk/files/license csw/mgar/pkg/expect/trunk/files/solaris.patch csw/mgar/pkg/expect/trunk/files/warnings.patch Modified: csw/mgar/pkg/expect/trunk/Makefile =================================================================== --- csw/mgar/pkg/expect/trunk/Makefile 2010-03-20 10:49:50 UTC (rev 9278) +++ csw/mgar/pkg/expect/trunk/Makefile 2010-03-20 10:59:18 UTC (rev 9279) @@ -15,14 +15,6 @@ you'll be able to do this automation quickly and easily. endef -# Build and package tcl -# Build and package tk -# "gmake extract" in expect -# "cp -rp ../../tcl/trunk/work/.../tcl8.5.7 work/.../build.../" -# "cp -rp ../../tk/trunk/work/.../tk8.5.7 work/.../build.../" -# "gmake build package repackage" - - # For some reason upstream have recalled 5.44.1 and has 5.43 as primary on # homepage as expect.tar.gz MASTER_SITES = http://expect.nist.gov/ @@ -30,10 +22,8 @@ DISTNAME = $(GARNAME)-$(GARVERSION) DISTFILES = $(GARNAME).tar.gz DISTFILES += expect.m4 +DISTFILES += license -DISTFILES += tcl8.5.7-src.tar.gz -DISTFILES += tk8.5.7-src.tar.gz - PATCHFILES += expect-5.39.0-libdir.patch #PATCHFILES += expect-5.42.1-missing-includes.patch #PATCHFILES += expect-5.42.1-multilib.patch @@ -42,19 +32,45 @@ PATCHFILES += expect-5.43.0-multilib.patch #PATCHFILES += expect-5.44.1-destdir.patch #PATCHFILES += expect-5.44.1-gfbsd.patch +PATCHFILES += Makefile.in.patch +# Missing include files gives warnings +PATCHFILES += solaris.patch +# Fix some warnings +PATCHFILES += warnings.patch +LICENSE = license + +RUNTIME_DEP_PKGS_CSWexpect += CSWtcl +RUNTIME_DEP_PKGS_CSWexpect += CSWtk +RUNTIME_DEP_PKGS_CSWexpect += CSWfconfig +RUNTIME_DEP_PKGS_CSWexpect += CSWftype2 +RUNTIME_DEP_PKGS_CSWexpect += CSWlibx11 +RUNTIME_DEP_PKGS_CSWexpect += CSWlibxft2 +RUNTIME_DEP_PKGS_CSWexpect += CSWlibxrender + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +#EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +INSTALL_ROOT=$(DESTDIR) +INSTALL_EXPORTS += INSTALL_ROOT +INSTALL_EXPORTS += LD_OPTIONS + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) CONFIGURE_ARGS += --enable-shared -CONFIGURE_ARGS += --with-tcl=/opt/csw/lib --with-tk=/opt/csw/lib -# CONFIGURE_ARGS += --with-tclinclude=$(WORKSRC)/../tcl8.5.7/generic/ -# CONFIGURE_ARGS += --with-tkinclude=$(WORKSRC)/../tk8.5.7/generic/ -CONFIGURE_ARGS += --with-tclinclude=$(abspath $(WORKDIR)/tcl8.5.7/unix) -CONFIGURE_ARGS += --with-tkinclude=$(abspath $(WORKDIR)/tk8.5.7/unix) +CONFIGURE_ARGS += --with-tcl=$(libdir) --with-tk=$(libdir) +CONFIGURE_ARGS += --with-tclinclude=$(includedir) +CONFIGURE_ARGS += --with-tkinclude=$(includedir) TEST_TARGET = +BUILD64 = 1 + include gar/category.mk pre-configure-modulated: Modified: csw/mgar/pkg/expect/trunk/checksums =================================================================== --- csw/mgar/pkg/expect/trunk/checksums 2010-03-20 10:49:50 UTC (rev 9278) +++ csw/mgar/pkg/expect/trunk/checksums 2010-03-20 10:59:18 UTC (rev 9279) @@ -1,3 +1,4 @@ +c488d8e53c265fe25964a274ea4aff1e Makefile.in.patch c458386d5502fab2b49da03d16fb108c expect-5.39.0-libdir.patch 5661004ca23ddc9592f488142367c2f5 expect-5.43.0-avoid-tcl-internals-1.patch 3d67a79c1d7790c7e49b5df7f57b0290 expect-5.43.0-missing-includes.patch @@ -4,5 +5,6 @@ 2103ff302f6e8a0dd748772f6512b3a5 expect-5.43.0-multilib.patch 595b7a7c63f7ddb42e19c2537bb2891b expect.m4 43e1dc0e0bc9492cf2e1a6f59f276bc3 expect.tar.gz -f70ad8f78b5e4a9f792fe101f22b125f tcl8.5.7-src.tar.gz -0764f63ae2106b4774c4ecb0ef391610 tk8.5.7-src.tar.gz +040cd3fa024e1b8fb313da63db17f699 license +9cd31c4268e88029322348a1ac13cffd solaris.patch +21c1566a06d28c027a8cdf632b46fcb8 warnings.patch Added: csw/mgar/pkg/expect/trunk/files/Makefile.in.patch =================================================================== --- csw/mgar/pkg/expect/trunk/files/Makefile.in.patch (rev 0) +++ csw/mgar/pkg/expect/trunk/files/Makefile.in.patch 2010-03-20 10:59:18 UTC (rev 9279) @@ -0,0 +1,55 @@ +--- expect-5.43/Makefile.in.orig 2010-03-18 11:22:26.000000000 +0100 ++++ expect-5.43/Makefile.in 2010-03-18 14:43:07.596140428 +0100 +@@ -101,7 +101,7 @@ + # to be different than those used for actually reference files at + # run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix + # when installing files. +-INSTALL_ROOT = ++#INSTALL_ROOT = + + # The following Expect scripts are not necessary to have installed as + # commands, but are very useful. Edit out what you don't want installed. +@@ -345,7 +345,7 @@ + # build expect binary that does not depend on Expect's shared libs + # IFF static Tcl/Tk libraries are available. + expect: exp_main_exp.o $(EXP_UNSHARED_LIB_FILE) +- $(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expect exp_main_exp.o $(EXP_UNSHARED_LIB_FILE) $(TCLLIB) $(EXP_AND_TCL_LIBS) ++ $(CC) $(XCFLAGS) $(LDFLAGS) -o expect exp_main_exp.o $(EXP_UNSHARED_LIB_FILE) $(TCLLIB) $(EXP_AND_TCL_LIBS) + $(SETUID) expect + + # install Expect library +@@ -372,12 +372,12 @@ + else true; fi + + expect_installed: exp_main_exp.o $(EXP_LIB_FILE) install_shared_lib +- $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expect_installed exp_main_exp.o @EXP_LIB_SPEC@ $(TCLLIB_INSTALLED) $(EXP_AND_TCL_LIBS) ++ $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ $(LDFLAGS) -o expect_installed exp_main_exp.o @EXP_LIB_SPEC@ $(TCLLIB_INSTALLED) $(EXP_AND_TCL_LIBS) + $(SETUID) expect_installed + + # Build Expect with TestCenter + expect.tc: exp_main_exp.o $(OFILES) +- proof $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expect.tc $(OFILES) exp_main_exp.o $(TCLLIB) $(EXP_AND_TCL_LIBS) ++ proof $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ $(LDFLAGS) -o expect.tc $(OFILES) exp_main_exp.o $(TCLLIB) $(EXP_AND_TCL_LIBS) + $(SETUID) expect.tc + + # Build an executable with both Expect and Tk +@@ -388,16 +388,16 @@ + # configure) separately for Expectk, but as far as I know, it doesn't hurt + # anything here, so I'm not worrying about it. + expectk: exp_main_tk.o $(EXP_UNSHARED_LIB_FILE) +- $(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectk exp_main_tk.o $(EXP_UNSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) ++ $(CC) $(XCFLAGS) $(LDFLAGS) -o expectk exp_main_tk.o $(EXP_UNSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) + $(SETUID) expectk + + expectk_installed: exp_main_tk.o $(EXP_LIB_FILE) +- $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expectk_installed exp_main_tk.o @EXP_LIB_SPEC@ $(TKLIB_INSTALLED) $(TCLLIB_INSTALLED) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) ++ $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ $(LDFLAGS) -o expectk_installed exp_main_tk.o @EXP_LIB_SPEC@ $(TKLIB_INSTALLED) $(TCLLIB_INSTALLED) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) + $(SETUID) expectk_installed + + # Build Expectk with TestCenter + expectk.tc: exp_main_tk.o $(OFILES) +- proof $(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectk.tc $(OFILES) exp_main_tk.o $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) ++ proof $(CC) $(XCFLAGS) $(LDFLAGS) -o expectk.tc $(OFILES) exp_main_tk.o $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) + $(SETUID) expectk.tc + + expect-unshared-lib-file :: $(EXP_UNSHARED_LIB_FILE) Added: csw/mgar/pkg/expect/trunk/files/license =================================================================== --- csw/mgar/pkg/expect/trunk/files/license (rev 0) +++ csw/mgar/pkg/expect/trunk/files/license 2010-03-20 10:59:18 UTC (rev 9279) @@ -0,0 +1,35 @@ +Although I can't promise anything in the way of support, I'd be +interested to hear about your experiences using it (good or bad). I'm +also interested in hearing bug reports and suggestions for improvement +even though I can't promise to implement them. + +If you send me a bug, fix, or question, include the version of Expect +(as reported by expect -d), version of Tcl, and name and version of +the OS that you are using. Before sending mail, it may be helpful to +verify that your problem still exists in the latest version. You can +check on the current release and whether it addresses your problems by +retrieving the latest HISTORY file (see "History" above). + + +Awards, love letters, and bug reports may be sent to: + +Don Libes +National Institute of Standards and Technology +Bldg 220, Rm A-127 +Gaithersburg, MD 20899 +(301) 975-3535 +libes at nist.gov + +I hereby place this software in the public domain. NIST and I would +appreciate credit if this program or parts of it are used. + +Design and implementation of this program was funded primarily by +myself. Funding contributors include the NIST Automated Manufacturing +Research Facility (funded by the Navy Manufacturing Technology +Program), the NIST Scientific and Technical Research Services, the +ARPA Persistent Object Bases project and the Computer-aided +Acquisition and the Logistic Support (CALS) program of the Office of +the Secretary of Defense. + +Especially signicant contributions were made by John Ousterhout, Henry +Spencer, and Rob Savoye. See the HISTORY file for others. Added: csw/mgar/pkg/expect/trunk/files/solaris.patch =================================================================== --- csw/mgar/pkg/expect/trunk/files/solaris.patch (rev 0) +++ csw/mgar/pkg/expect/trunk/files/solaris.patch 2010-03-20 10:59:18 UTC (rev 9279) @@ -0,0 +1,77 @@ +diff -Nru expect-5.43.orig/exp_clib.c expect-5.43/exp_clib.c +--- expect-5.43.orig/exp_clib.c 2003-05-05 23:34:18.000000000 +0200 ++++ expect-5.43/exp_clib.c 2010-03-20 06:10:27.258008060 +0100 +@@ -38,6 +38,9 @@ + #endif + + #ifdef HAVE_SYS_FCNTL_H ++#ifdef __sun ++# include ++#endif + # include + #else + # include +@@ -56,6 +59,9 @@ + + #include + ++/* For read, write,execvp... */ ++#include ++ + #ifdef NO_STDLIB_H + + /* +diff -Nru expect-5.43.orig/exp_main_tk.c expect-5.43/exp_main_tk.c +--- expect-5.43.orig/exp_main_tk.c 2003-07-31 20:27:20.000000000 +0200 ++++ expect-5.43/exp_main_tk.c 2010-03-20 06:11:38.913371288 +0100 +@@ -33,6 +33,8 @@ + #endif /* not lint */ + + #include ++/* For strrchr, strcpy */ ++#include + + #include "tk.h" + +diff -Nru expect-5.43.orig/exp_pty.c expect-5.43/exp_pty.c +--- expect-5.43.orig/exp_pty.c 2002-04-08 01:09:00.000000000 +0200 ++++ expect-5.43/exp_pty.c 2010-03-20 06:07:09.035909728 +0100 +@@ -13,6 +13,10 @@ + # include + #endif + #ifdef HAVE_SYS_FCNTL_H ++/* open() is defined in fcntl.h not sys/fcntl.h */ ++#ifdef __sun ++# include ++#endif + # include + #else + # include +diff -Nru expect-5.43.orig/exp_win.c expect-5.43/exp_win.c +--- expect-5.43.orig/exp_win.c 2002-02-12 03:00:55.000000000 +0100 ++++ expect-5.43/exp_win.c 2010-03-20 06:06:24.992305028 +0100 +@@ -10,6 +10,10 @@ + #include "expect_cf.h" + #include "tcl.h" + ++/* Needed for ioctl */ ++#include ++#include ++ + #ifdef NO_STDLIB_H + #include "../compat/stdlib.h" + #else +diff -Nru expect-5.43.orig/pty_termios.c expect-5.43/pty_termios.c +--- expect-5.43.orig/pty_termios.c 2010-03-20 03:14:25.000000000 +0100 ++++ expect-5.43/pty_termios.c 2010-03-20 06:07:23.720256962 +0100 +@@ -10,6 +10,10 @@ + #include + #include + #include ++/* for open() */ ++#include ++#include ++#include + + #if defined(SIGCLD) && !defined(SIGCHLD) + #define SIGCHLD SIGCLD Added: csw/mgar/pkg/expect/trunk/files/warnings.patch =================================================================== --- csw/mgar/pkg/expect/trunk/files/warnings.patch (rev 0) +++ csw/mgar/pkg/expect/trunk/files/warnings.patch 2010-03-20 10:59:18 UTC (rev 9279) @@ -0,0 +1,23 @@ +diff -Nru expect-5.43.orig/exp_command.c expect-5.43/exp_command.c +--- expect-5.43.orig/exp_command.c 2010-03-20 03:14:24.000000000 +0100 ++++ expect-5.43/exp_command.c 2010-03-20 05:44:02.753221464 +0100 +@@ -211,6 +211,7 @@ + char *name; + int open; + int adjust; ++ int any; + char *msg; + { + ExpState *esPtr; +diff -Nru expect-5.43.orig/expect.c expect-5.43/expect.c +--- expect-5.43.orig/expect.c 2004-07-07 01:26:02.000000000 +0200 ++++ expect-5.43/expect.c 2010-03-20 05:45:23.601023932 +0100 +@@ -343,7 +343,7 @@ + /* + * Advance to the next command in the script. + */ +- next = parse.commandStart + parse.commandSize; ++ next = (char *) (parse.commandStart + parse.commandSize); + bytesLeft -= next - p; + p = next; + Tcl_FreeParse(&parse); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Mar 20 13:03:43 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 20 Mar 2010 12:03:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9280] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9280 http://gar.svn.sourceforge.net/gar/?rev=9280&view=rev Author: bdwalton Date: 2010-03-20 12:03:43 +0000 (Sat, 20 Mar 2010) Log Message: ----------- ruby19: tweak pkgfiles for the dev package Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-20 10:59:18 UTC (rev 9279) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-20 12:03:43 UTC (rev 9280) @@ -57,7 +57,7 @@ PKGFILES_CSWruby19tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb -PKGFILES_CSWruby19dev = $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a +PKGFILES_CSWruby19dev = $(includedir)/.*\h $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a PKGFILES_CSWruby19mode = $(datadir)/emacs/site-lisp/.*elc$ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Mar 20 13:07:31 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 20 Mar 2010 12:07:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9281] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9281 http://gar.svn.sourceforge.net/gar/?rev=9281&view=rev Author: bdwalton Date: 2010-03-20 12:07:31 +0000 (Sat, 20 Mar 2010) Log Message: ----------- ruby19: fix regexg in dev pkgfiles Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-20 12:03:43 UTC (rev 9280) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-20 12:07:31 UTC (rev 9281) @@ -57,7 +57,7 @@ PKGFILES_CSWruby19tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb -PKGFILES_CSWruby19dev = $(includedir)/.*\h $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a +PKGFILES_CSWruby19dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a PKGFILES_CSWruby19mode = $(datadir)/emacs/site-lisp/.*elc$ 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 Mar 20 13:17:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 20 Mar 2010 12:17:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9282] csw/mgar/pkg Message-ID: Revision: 9282 http://gar.svn.sourceforge.net/gar/?rev=9282&view=rev Author: dmichelsen Date: 2010-03-20 12:16:59 +0000 (Sat, 20 Mar 2010) Log Message: ----------- nasm: Initial commit Added Paths: ----------- csw/mgar/pkg/nasm/ csw/mgar/pkg/nasm/branches/ csw/mgar/pkg/nasm/tags/ csw/mgar/pkg/nasm/trunk/ csw/mgar/pkg/nasm/trunk/Makefile csw/mgar/pkg/nasm/trunk/checksums csw/mgar/pkg/nasm/trunk/files/ Property changes on: csw/mgar/pkg/nasm/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/nasm/trunk/Makefile =================================================================== --- csw/mgar/pkg/nasm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/nasm/trunk/Makefile 2010-03-20 12:16:59 UTC (rev 9282) @@ -0,0 +1,22 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = nasm +GARVERSION = 2.08.01 +CATEGORIES = utils + +DESCRIPTION = The Netwide Assembler +define BLURB +endef + +MASTER_SITES = http://www.nasm.us/pub/nasm/releasebuilds/$(GARVERSION)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +LICENSE = LICENSE + +CONFIGURE_ARGS = $(DIRPATHS) + +INSTALL_ARGS = INSTALLROOT=$(DESTDIR) + +include gar/category.mk Property changes on: csw/mgar/pkg/nasm/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/nasm/trunk/checksums =================================================================== --- csw/mgar/pkg/nasm/trunk/checksums (rev 0) +++ csw/mgar/pkg/nasm/trunk/checksums 2010-03-20 12:16:59 UTC (rev 9282) @@ -0,0 +1 @@ +1e3ebc1289c2be5963571c0937b7a211 nasm-2.08.01.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 Sat Mar 20 13:25:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 20 Mar 2010 12:25:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[9283] csw/mgar/pkg/nasm/trunk/Makefile Message-ID: Revision: 9283 http://gar.svn.sourceforge.net/gar/?rev=9283&view=rev Author: dmichelsen Date: 2010-03-20 12:25:35 +0000 (Sat, 20 Mar 2010) Log Message: ----------- nasm: Update vendor URL Modified Paths: -------------- csw/mgar/pkg/nasm/trunk/Makefile Modified: csw/mgar/pkg/nasm/trunk/Makefile =================================================================== --- csw/mgar/pkg/nasm/trunk/Makefile 2010-03-20 12:16:59 UTC (rev 9282) +++ csw/mgar/pkg/nasm/trunk/Makefile 2010-03-20 12:25:35 UTC (rev 9283) @@ -15,6 +15,8 @@ LICENSE = LICENSE +VENDOR_URL = http://www.nasm.us/ + CONFIGURE_ARGS = $(DIRPATHS) INSTALL_ARGS = INSTALLROOT=$(DESTDIR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 20 13:35:10 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 20 Mar 2010 12:35:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9284] csw/mgar/gar/v2 Message-ID: Revision: 9284 http://gar.svn.sourceforge.net/gar/?rev=9284&view=rev Author: wahwah Date: 2010-03-20 12:35:10 +0000 (Sat, 20 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, moving ErrorTagsFromFile to the checkpkg library. Ability to use md5sums from a catalog file. Modified Paths: -------------- csw/mgar/gar/v2/bin/analyze_module_results.py csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/bin/analyze_module_results.py =================================================================== --- csw/mgar/gar/v2/bin/analyze_module_results.py 2010-03-20 12:25:35 UTC (rev 9283) +++ csw/mgar/gar/v2/bin/analyze_module_results.py 2010-03-20 12:35:10 UTC (rev 9284) @@ -26,13 +26,8 @@ files = os.listdir(options.extractdir) error_tags = [] for file_name in files: - if file_name.startswith("tags."): - fd = open(os.path.join(options.extractdir, file_name)) - for line in fd: - if line.startswith("#"): - continue - pkgname, tag_name, tag_info = checkpkg.ParseTagLine(line) - error_tags.append(checkpkg.CheckpkgTag(pkgname, tag_name, tag_info)) + full_path = os.path.join(options.extractdir, file_name) + error_tags.extend(checkpkg.ErrorTagsFromFile(full_path)) overrides = reduce(lambda x, y: x + y, overrides_list) (tags_after_overrides, unapplied_overrides) = checkpkg.ApplyOverrides(error_tags, overrides) Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-03-20 12:25:35 UTC (rev 9283) +++ csw/mgar/gar/v2/bin/checkpkg 2010-03-20 12:35:10 UTC (rev 9284) @@ -10,7 +10,7 @@ # - getopts support for command line options # - colors # - modular architecture + unit tests -# - +# - reliable shared library checking # # This script examines a package that has been put together # for submittal to the CSW archive at opencsw.org @@ -24,9 +24,8 @@ # Be sure to occasionally do a "pkg-get update cswutils" so that # you know you are tracking the most current version. # -# TODOs before commit: -# - bad strings check -# - pkgchk run +# TODO: +# - add message handlig to the CheckInterface class. # PATH=$PATH:/usr/sbin @@ -97,6 +96,7 @@ cleanup cleanupset print "To run checkpkg in the debug mode, add the '-d' flag, for example:" + # selfargs can be very, very long. Find a way to truncate it. # print "${selfpath} -d ${selfargs}" print "After you modify any overrides, you need to do gmake remerge repackage" print "or gmake platforms-remerge platforms-repackage." @@ -252,8 +252,15 @@ module_name_format="%-40s" # TODO: A performance problem. The following line means that the md5sums are # calculated once more. -debugmsg "Calculating md5 sums of all the package files." -md5sums=`gmd5sum "$@" | awk '{print $1}'` +if [ "${MD5_SUMS_CATALOG_FILE}" ]; then + debugmsg "Reading md5sums from ${MD5_SUMS_CATALOG_FILE}" + md5sums=`cat "${MD5_SUMS_CATALOG_FILE}" \ + | awk '{print $5}' \ + | ggrep -E '[0-9abcdef]{32}'` +else + debugmsg "Calculating md5 sums of all the package files." + md5sums=`gmd5sum "$@" | awk '{print $1}'` +fi debugmsg "All md5 sums: ${md5sums}" if [[ -d "${checkpkg_module_dir}" ]]; then for plugin in "${checkpkg_module_dir}/${checkpkg_module_tag}"*; do Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-20 12:25:35 UTC (rev 9283) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-20 12:35:10 UTC (rev 9284) @@ -477,7 +477,11 @@ def GuessDepsByFilename(pkgname, pkg_by_any_filename): - """Guesses dependencies based on filename regexes.""" + """Guesses dependencies based on filename regexes. + + This function is still inefficient. It should be getting better data + structures to work with. + """ guessed_deps = set() patterns = [(re.compile(x), y) for x, y in DEPENDENCY_FILENAME_REGEXES] filenames = [] @@ -1386,3 +1390,14 @@ else: raise StdoutSyntaxError("Could not parse %s" % repr(line)) return response + + +def ErrorTagsFromFile(file_name): + fd = open(file_name) + error_tags = [] + for line in fd: + if line.startswith("#"): + continue + pkgname, tag_name, tag_info = ParseTagLine(line) + error_tags.append(CheckpkgTag(pkgname, tag_name, tag_info)) + return error_tags Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-20 12:25:35 UTC (rev 9283) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-20 12:35:10 UTC (rev 9284) @@ -224,9 +224,9 @@ print dependent_pkgs = {} - for checker in pkgs_data: - pkgname = checker["basic_stats"]["pkgname"] - declared_dependencies = dict(checker["depends"]) + for pkg_data in pkgs_data: + pkgname = pkg_data["basic_stats"]["pkgname"] + declared_dependencies = dict(pkg_data["depends"]) missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( pkgname, declared_dependencies, 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 Mar 20 13:54:57 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 20 Mar 2010 12:54:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[9285] csw/mgar/pkg/cpan/DateTime/trunk Message-ID: Revision: 9285 http://gar.svn.sourceforge.net/gar/?rev=9285&view=rev Author: dmichelsen Date: 2010-03-20 12:54:57 +0000 (Sat, 20 Mar 2010) Log Message: ----------- cpan/DateTime: Add Build.PL rules Modified Paths: -------------- csw/mgar/pkg/cpan/DateTime/trunk/Makefile csw/mgar/pkg/cpan/DateTime/trunk/checksums Modified: csw/mgar/pkg/cpan/DateTime/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime/trunk/Makefile 2010-03-20 12:35:10 UTC (rev 9284) +++ csw/mgar/pkg/cpan/DateTime/trunk/Makefile 2010-03-20 12:54:57 UTC (rev 9285) @@ -1,5 +1,5 @@ GARNAME = DateTime -GARVERSION = 0.50 +GARVERSION = 0.55 CATEGORIES = cpan AUTHOR = DROLSKY @@ -14,9 +14,16 @@ PACKAGES = CSWpmdatetime CATALOGNAME = pm_datetime -RUNTIME_DEP_PKGS = CSWpmdatetimetimezone -RUNTIME_DEP_PKGS += CSWpmdatetimelocale +LICENSE = LICENSE +DEP_PKGS = CSWpmdatetimetimezone CSWpmdatetimelocale + +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +INSTALL_SCRIPTS = $(WORKSRC)/Build + +ARCHALL = 1 + include gar/category.mk -LICENSE = LICENSE Modified: csw/mgar/pkg/cpan/DateTime/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DateTime/trunk/checksums 2010-03-20 12:35:10 UTC (rev 9284) +++ csw/mgar/pkg/cpan/DateTime/trunk/checksums 2010-03-20 12:54:57 UTC (rev 9285) @@ -1 +1 @@ -d7cf8bdbb3e55dda31f8bbea6cafad2f download/DateTime-0.50.tar.gz +eb458ff23f5ad612631e428934c26c6c DateTime-0.55.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 Mar 20 13:58:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 20 Mar 2010 12:58:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9286] csw/mgar/pkg/cpan/Class-Singleton/trunk/checksums Message-ID: Revision: 9286 http://gar.svn.sourceforge.net/gar/?rev=9286&view=rev Author: dmichelsen Date: 2010-03-20 12:58:06 +0000 (Sat, 20 Mar 2010) Log Message: ----------- cpan/Class-Singleton: Update checksum Modified Paths: -------------- csw/mgar/pkg/cpan/Class-Singleton/trunk/checksums Modified: csw/mgar/pkg/cpan/Class-Singleton/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Class-Singleton/trunk/checksums 2010-03-20 12:54:57 UTC (rev 9285) +++ csw/mgar/pkg/cpan/Class-Singleton/trunk/checksums 2010-03-20 12:58:06 UTC (rev 9286) @@ -1 +1 @@ -a18b108ab97e2107cbbe816d2b3e2ee3 download/Class-Singleton-1.4.tar.gz +a18b108ab97e2107cbbe816d2b3e2ee3 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 dmichelsen at users.sourceforge.net Sat Mar 20 14:15:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 20 Mar 2010 13:15:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[9287] csw/mgar/pkg Message-ID: Revision: 9287 http://gar.svn.sourceforge.net/gar/?rev=9287&view=rev Author: dmichelsen Date: 2010-03-20 13:15:38 +0000 (Sat, 20 Mar 2010) Log Message: ----------- liferea: Initial commit, webkit is missing Added Paths: ----------- csw/mgar/pkg/liferea/ csw/mgar/pkg/liferea/branches/ csw/mgar/pkg/liferea/tags/ csw/mgar/pkg/liferea/trunk/ csw/mgar/pkg/liferea/trunk/Makefile csw/mgar/pkg/liferea/trunk/checksums csw/mgar/pkg/liferea/trunk/files/ Property changes on: csw/mgar/pkg/liferea/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/liferea/trunk/Makefile =================================================================== --- csw/mgar/pkg/liferea/trunk/Makefile (rev 0) +++ csw/mgar/pkg/liferea/trunk/Makefile 2010-03-20 13:15:38 UTC (rev 9287) @@ -0,0 +1,25 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = liferea +GARVERSION = 1.6.3 +CATEGORIES = apps + +DESCRIPTION = An aggregator for online news feeds +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +# We need GNU msgfont +PATH := /opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/liferea/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/liferea/trunk/checksums =================================================================== --- csw/mgar/pkg/liferea/trunk/checksums (rev 0) +++ csw/mgar/pkg/liferea/trunk/checksums 2010-03-20 13:15:38 UTC (rev 9287) @@ -0,0 +1 @@ +ca354e526bd4e22da0b90083a68b8530 liferea-1.6.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 Sat Mar 20 14:30:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 20 Mar 2010 13:30:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9288] csw/mgar/pkg/neon/tags/neon-0.29.3, REV=2010.02.25/ Message-ID: Revision: 9288 http://gar.svn.sourceforge.net/gar/?rev=9288&view=rev Author: dmichelsen Date: 2010-03-20 13:30:48 +0000 (Sat, 20 Mar 2010) Log Message: ----------- neon: Tag 0.29.3,REV=2010.02.25 Added Paths: ----------- csw/mgar/pkg/neon/tags/neon-0.29.3,REV=2010.02.25/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Mar 20 20:10:08 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 20 Mar 2010 19:10:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9289] csw/mgar/pkg/libxml2/trunk Message-ID: Revision: 9289 http://gar.svn.sourceforge.net/gar/?rev=9289&view=rev Author: bdwalton Date: 2010-03-20 19:10:07 +0000 (Sat, 20 Mar 2010) Log Message: ----------- libxml2: update ld symbol handling patch Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/checksums csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch Modified: csw/mgar/pkg/libxml2/trunk/checksums =================================================================== --- csw/mgar/pkg/libxml2/trunk/checksums 2010-03-20 13:30:48 UTC (rev 9288) +++ csw/mgar/pkg/libxml2/trunk/checksums 2010-03-20 19:10:07 UTC (rev 9289) @@ -1,2 +1,2 @@ -5e371e0f0921fc7b366c34aded6ae993 ld-symbol-handling-fixup.patch +0c68fe5a079c4c6f8188824941bba80d ld-symbol-handling-fixup.patch 9abc9959823ca9ff904f1fbcf21df066 libxml2-2.7.7.tar.gz Modified: csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch 2010-03-20 13:30:48 UTC (rev 9288) +++ csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch 2010-03-20 19:10:07 UTC (rev 9289) @@ -1,11 +1,13 @@ ---- libxml2-2.7.6/configure.orig 2009-12-06 02:38:02.408924064 +0100 -+++ libxml2-2.7.6/configure 2009-12-06 02:38:28.581172792 +0100 -@@ -12150,15 +12150,10 @@ - $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \ - VERSION_SCRIPT_FLAGS=-Wl,--version-script= - test "`uname`" == "SunOS" && \ -- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," -+ VERSION_SCRIPT_FLAGS="-Wl,-M" +--- libxml2-2.7.7/configure.orig 2010-03-16 03:22:07.931504296 +0100 ++++ libxml2-2.7.7/configure 2010-03-16 03:22:59.183232519 +0100 +@@ -12157,17 +12157,12 @@ + VERSION_SCRIPT_FLAGS=-Wl,--version-script= + else + case $host in +- *-*-sunos*) VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,";; ++ *-*-sunos*) VERSION_SCRIPT_FLAGS="-Wl,-M";; + esac + fi - if test -n "$VERSION_SCRIPT_FLAGS"; then - USE_VERSION_SCRIPT_TRUE= 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 Mar 21 00:34:56 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 20 Mar 2010 23:34:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[9290] csw/mgar/pkg/xterm/trunk Message-ID: Revision: 9290 http://gar.svn.sourceforge.net/gar/?rev=9290&view=rev Author: skayser Date: 2010-03-20 23:34:56 +0000 (Sat, 20 Mar 2010) Log Message: ----------- xterm: bump to 256, add license, added X11/bin to PATH for xft-config, re-ordered RPATH Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xterm/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xterm/trunk/files/COPYING Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2010-03-20 19:10:07 UTC (rev 9289) +++ csw/mgar/pkg/xterm/trunk/Makefile 2010-03-20 23:34:56 UTC (rev 9290) @@ -1,8 +1,5 @@ -# TODO -# - Now that we mostly have our own CSW X11 libs, can we place the app-default -# files in a location where they are actually read by default? GARNAME = xterm -GARVERSION = 251 +GARVERSION = 256 CATEGORIES = apps DESCRIPTION = Terminal emulator for the X Window System @@ -14,12 +11,19 @@ the control sequences for VT220. endef -SPKG_SOURCEURL = http://invisible-island.net/xterm/ -MASTER_SITES = ftp://invisible-island.net/xterm/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz +VENDOR_URL = http://invisible-island.net/xterm/ +MASTER_SITES = ftp://invisible-island.net/xterm/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz +DISTFILES += COPYING -RUNTIME_DEP_PKGS = CSWfconfig CSWlibxft2 +RUNTIME_DEP_PKGS = CSWfconfig +RUNTIME_DEP_PKGS += CSWlibxft2 +RUNTIME_DEP_PKGS += CSWlibice +RUNTIME_DEP_PKGS += CSWlibx11 +RUNTIME_DEP_PKGS += CSWlibxaw +RUNTIME_DEP_PKGS += CSWlibxmu +RUNTIME_DEP_PKGS += CSWlibxt # xterm Makefile doesn't have a test target TEST_TARGET = @@ -45,7 +49,7 @@ CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings # Notes on CSW X11 libs: -# xterm depends on Xrender and Xft for freetype font support. Starting with +# Through CSW freetype, xterm depends on Xrender and Xft. Starting with # # libxrender-0.9.4,REV=2009.06.11 # libxft2-2.1.13,REV=2009.06.15 @@ -53,20 +57,17 @@ # these libs moved to the CSW X11 libs prefix (/opt/csw/X11). Accordingly, # we need to build against these X11 libs, otherwise ./configure bails out # when verifying the linkage to freetype. This unfortunatel drags a pile -# of other CSW X11 libs with it ... o_O ... Any caveats? libX11 for -# instance will be run-time linked twice (see ldd output on xterm). -# One from Solaris, another one from us. Time will show how this works out. +# of other CSW X11 libs with it ... o_O ... CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -RUNTIME_DEP_PKGS += CSWlibice CSWlibx11 CSWlibxaw CSWlibxmu CSWlibxt +# Make sure to runtime link the same way that we link edited +# * xterm link edit order is (-L/-R): X11/lib/, lib/ +# * LD_OPTIONS would prepend (-R): lib/ +# -> libs like libXft might be runtime linked from lib/ instead of X11/lib/ +LD_OPTIONS = +EXTRA_LINKER_FLAGS = $(filter-out %ISALIST, $(RUNPATH_LINKER_FLAGS)) -# The need for the explicit -lfontconfig linkage also came along when -# we upgraded from xterm-243 (CSW X11 libs had been introduced in the -# meantime, related? pkgconfig woes?). Without the explicit linkage -# there are implicit symbol dependencies on the final xterm linking run. -EXTRA_LDFLAGS = -L$(libdir) -lfontconfig - # luit comes with snv_85 # http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6662431 #CONFIGURE_ARGS += --enable-luit @@ -74,6 +75,9 @@ include gar/category.mk +# ./configure needs to find xft-config +PATH := /opt/csw/X11/bin:$(PATH) + post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: CSWDOCS=README.CSW changelog.CSW post-install-modulated: DOCS=xterm.log.html ctlseqs.txt Modified: csw/mgar/pkg/xterm/trunk/checksums =================================================================== --- csw/mgar/pkg/xterm/trunk/checksums 2010-03-20 19:10:07 UTC (rev 9289) +++ csw/mgar/pkg/xterm/trunk/checksums 2010-03-20 23:34:56 UTC (rev 9290) @@ -1 +1,2 @@ -343a4ce213f70c53cf65979f163bebc3 xterm-251.tgz +d028c88c07ae91b8367ee76cdcb16cc8 COPYING +6da5c166e1c633fc26917b66d6433f1f xterm-256.tgz Added: csw/mgar/pkg/xterm/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/xterm/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/xterm/trunk/files/COPYING 2010-03-20 23:34:56 UTC (rev 9290) @@ -0,0 +1,27 @@ +Copyright 1999-2009,2010 by Thomas E. Dickey + + All Rights Reserved + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name(s) of the above copyright +holders shall not be used in advertising or otherwise to promote the +sale, use or other dealings in this Software without prior written +authorization. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 21 04:53:43 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 03:53:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9291] csw/mgar/pkg/libproxy/trunk/Makefile Message-ID: Revision: 9291 http://gar.svn.sourceforge.net/gar/?rev=9291&view=rev Author: hson Date: 2010-03-21 03:53:43 +0000 (Sun, 21 Mar 2010) Log Message: ----------- libproxy: GAR changed variable name Modified Paths: -------------- csw/mgar/pkg/libproxy/trunk/Makefile Modified: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-03-20 23:34:56 UTC (rev 9290) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-03-21 03:53:43 UTC (rev 9291) @@ -34,8 +34,8 @@ PATCHFILES_solaris8-i386_isa-i386 += Solaris8-have-no-stdc99-flag.patch PATCHFILES_solaris8-i386_isa-i386 += stdfiles.patch PATCHFILES_solaris8-i386_isa-i386 += proxy.c.patch -PATCHFILES += $(PATCHFILES_$(PLATFORM)) -PATCHFILES += $(PATCHFILES_$(PLATFORM)_$(MODULATION)) +PATCHFILES += $(PATCHFILES_$(GAR_PLATFORM)) +PATCHFILES += $(PATCHFILES_$(GAR_PLATFORM)_$(MODULATION)) PATCHFILES += 0002-Dont-preset-CFLAGS.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 Sun Mar 21 05:49:39 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 04:49:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9292] csw/mgar/pkg/libproxy/trunk/Makefile Message-ID: Revision: 9292 http://gar.svn.sourceforge.net/gar/?rev=9292&view=rev Author: hson Date: 2010-03-21 04:49:39 +0000 (Sun, 21 Mar 2010) Log Message: ----------- libproxy: Move KDE and Gnome modules to separate packages, see issue 4307 Modified Paths: -------------- csw/mgar/pkg/libproxy/trunk/Makefile Modified: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-03-21 03:53:43 UTC (rev 9291) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-03-21 04:49:39 UTC (rev 9292) @@ -40,29 +40,47 @@ PACKAGES = CSWlibproxy CSWlibproxydevel CSWpy-libproxy +PACKAGES += CSWlibproxykde CSWlibproxygnome CATALOGNAME_CSWlibproxy = libproxy CATALOGNAME_CSWlibproxydevel = libproxy_devel CATALOGNAME_CSWpy-libproxy = py_libproxy -SPKG_DESC_CSWlibproxy = A library that provides automatic proxy configuration management -SPKG_DESC_CSWlibproxydevel = A library that provides automatic proxy configuration management - development files -SPKG_DESC_CSWpy-libproxy = A library that provides automatic proxy configuration management - Python bindings +CATALOGNAME_CSWlibproxykde = libproxy_kde +CATALOGNAME_CSWlibproxygnome = libproxy_gnome +SPKG_DESC_CSWlibproxy = $(DESCRIPTION) +SPKG_DESC_CSWlibproxydevel = $(DESCRIPTION) - development files +SPKG_DESC_CSWpy-libproxy = $(DESCRIPTION) - Python bindings +SPKG_DESC_CSWlibproxykde = $(DESCRIPTION) - kde module +SPKG_DESC_CSWlibproxygnome = $(DESCRIPTION) - gnome module -RUNTIME_DEP_PKGS_CSWlibproxy += CSWlibice CSWlibsm CSWlibx11 CSWlibxmu CSWlibxt +RUNTIME_DEP_PKGS_CSWlibproxy += RUNTIME_DEP_PKGS_CSWlibproxydevel += CSWlibproxy RUNTIME_DEP_PKGS_CSWpy-libproxy += CSWpython CSWlibproxy +RUNTIME_DEP_PKGS_CSWlibproxygnome += CSWlibice +RUNTIME_DEP_PKGS_CSWlibproxygnome += CSWlibproxy +RUNTIME_DEP_PKGS_CSWlibproxygnome += CSWlibsm +RUNTIME_DEP_PKGS_CSWlibproxygnome += CSWlibx11 +RUNTIME_DEP_PKGS_CSWlibproxygnome += CSWlibxmu +RUNTIME_DEP_PKGS_CSWlibproxygnome += CSWlibxt +RUNTIME_DEP_PKGS_CSWlibproxykde += CSWlibice +RUNTIME_DEP_PKGS_CSWlibproxykde += CSWlibproxy +RUNTIME_DEP_PKGS_CSWlibproxykde += CSWlibsm +RUNTIME_DEP_PKGS_CSWlibproxykde += CSWlibx11 +RUNTIME_DEP_PKGS_CSWlibproxykde += CSWlibxmu +RUNTIME_DEP_PKGS_CSWlibproxykde += CSWlibxt + BUILD_DEP_PKGS += CSWlibx11devel CSWlibxmudevel CSWlibdbusdev #Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version #BUILD_DEP_PKGS += CSWmozilla CSWseamonkey CSWfirefox PKGFILES_CSWlibproxydevel = $(PKGFILES_DEVEL) PKGFILES_CSWpy-libproxy = $(libdir).*/python/site-packages/.* +PKGFILES_CSWlibproxykde = $(libdir).*/config_kde.so +PKGFILES_CSWlibproxygnome = $(libdir).*/config_gnome.so ARCHALL_CSWpy-libproxy = 1 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - EXTRA_LINKER_FLAGS = -lnsl BUILD64 = 1 @@ -74,7 +92,6 @@ #EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/firefox/lib #EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/seamonkey/lib - CONFIGURE_ARGS = $(DIRPATHS) #Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version CONFIGURE_ARGS += --without-mozjs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 21 07:46:43 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 06:46:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9293] csw/mgar/pkg/poppler/trunk Message-ID: Revision: 9293 http://gar.svn.sourceforge.net/gar/?rev=9293&view=rev Author: hson Date: 2010-03-21 06:46:43 +0000 (Sun, 21 Mar 2010) Log Message: ----------- poppler: Update to 0.12.4 Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile csw/mgar/pkg/poppler/trunk/checksums Added Paths: ----------- csw/mgar/pkg/poppler/trunk/files/old_libs_i386.tar.bz2 csw/mgar/pkg/poppler/trunk/files/old_libs_sparc.tar.bz2 Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2010-03-21 04:49:39 UTC (rev 9292) +++ csw/mgar/pkg/poppler/trunk/Makefile 2010-03-21 06:46:43 UTC (rev 9293) @@ -35,22 +35,29 @@ RUNTIME_DEP_PKGS_CSWpoppler += CSWjpeg RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler RUNTIME_DEP_PKGS_CSWpoppler += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWpoppler += CSWpng +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWpng RUNTIME_DEP_PKGS_CSWlibpoppler += CSWfconfig RUNTIME_DEP_PKGS_CSWlibpoppler += CSWftype2 RUNTIME_DEP_PKGS_CSWlibpoppler += CSWggettextrt RUNTIME_DEP_PKGS_CSWlibpoppler += CSWglib2 RUNTIME_DEP_PKGS_CSWlibpoppler += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibpoppler += CSWiconv RUNTIME_DEP_PKGS_CSWlibpoppler += CSWjpeg RUNTIME_DEP_PKGS_CSWlibpoppler += CSWlibcairo RUNTIME_DEP_PKGS_CSWlibpoppler += CSWlibxml2 RUNTIME_DEP_PKGS_CSWlibpoppler += CSWpango RUNTIME_DEP_PKGS_CSWlibpoppler += CSWzlib -CHECKPKG_OVERRIDES_CSWlibpopplerdev += missing-dependency|CSWlibpoppler +RUNTIME_DEP_PKGS_CSWlibpopplerdev += CSWlibpoppler -#PATCHFILES += missing-includes.patch +ARCHALL_CSWlibpopplerdoc = 1 +PATCHFILES += missing-includes.patch + # UPSTREAM_MASTER_SITES = UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/poppler/trunk/checksums =================================================================== --- csw/mgar/pkg/poppler/trunk/checksums 2010-03-21 04:49:39 UTC (rev 9292) +++ csw/mgar/pkg/poppler/trunk/checksums 2010-03-21 06:46:43 UTC (rev 9293) @@ -1,3 +1,4 @@ +bf4abf5006e4a812d00567eeea42faaa missing-includes.patch 776b02d90c238f08b9a8900d8e4a2580 old_libs_i386.tar.bz2 eabd006c9b65bac874297157c8b774cb old_libs_sparc.tar.bz2 -e1a2d98ba5a4199f20d7637a7d79a829 poppler-0.10.6.tar.gz +4155346f9369b192569ce9184ff73e43 poppler-0.12.4.tar.gz Added: csw/mgar/pkg/poppler/trunk/files/old_libs_i386.tar.bz2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/poppler/trunk/files/old_libs_i386.tar.bz2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/poppler/trunk/files/old_libs_sparc.tar.bz2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/poppler/trunk/files/old_libs_sparc.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 hson at users.sourceforge.net Sun Mar 21 15:52:37 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 14:52:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9294] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 9294 http://gar.svn.sourceforge.net/gar/?rev=9294&view=rev Author: hson Date: 2010-03-21 14:52:37 +0000 (Sun, 21 Mar 2010) Log Message: ----------- imagemagick: Update to 6.6.0-7 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 2010-03-21 06:46:43 UTC (rev 9293) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-03-21 14:52:37 UTC (rev 9294) @@ -1,6 +1,6 @@ GARNAME = imagemagick GARVERSION = 6.6.0 -GARSUBREV = 5 +GARSUBREV = 7 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -49,9 +49,125 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWperl RUNTIME_DEP_PKGS_CSWimagemagick += CSWpng RUNTIME_DEP_PKGS_CSWimagemagick += CSWsunmath -RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiffrt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiff RUNTIME_DEP_PKGS_CSWimagemagick += CSWzlib +# Old modules are linked to libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|xwd.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dps.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|x.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|xwd.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|hrz.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|miff.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|jpeg.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|rgb.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|url.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|sfw.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|uil.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pwp.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|uyvy.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|xps.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pattern.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|stegano.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|vicar.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|txt.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|mpr.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|cmyk.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|msl.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|ycbcr.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pdb.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|cut.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|jbig.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|inline.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|jp2.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|null.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dds.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|tiff.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|thumbnail.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|cip.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|ept.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|otb.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|hald.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|gif.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|avs.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pdf.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pix.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|mvg.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|exr.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|vid.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|wbmp.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pcd.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|ps2.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|clip.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|tim.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|mpc.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|xcf.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dps.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|ps3.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|mono.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|raw.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pict.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pnm.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|plasma.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|meta.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|viff.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|icon.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dib.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|histogram.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|caption.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|sct.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pcl.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|fax.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|mat.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|rla.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|ps.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|preview.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|sgi.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|png.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|cin.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|cals.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|yuv.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pcx.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|mtv.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|magick.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|xc.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dpx.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|matte.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|wpg.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|palm.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|bmp.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|avi.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|scr.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|html.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|psd.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|info.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dcm.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|fits.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dot.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|ipl.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|label.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|xbm.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|braille.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|ttf.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|x.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|sun.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|mpeg.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|gradient.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|rle.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|art.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|gray.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|map.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dng.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|tile.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|xpm.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|tga.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|analyze.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|libMagick.so.10.0.4|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|libMagick++.so.2.0.0|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|libMagickWand.so.2.0.0|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|libMagickCore.so.2.0.0|libX11.so.4 +CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|libWand.so.10.0.4|libX11.so.4 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 @@ -61,6 +177,8 @@ CONFIGURE_ARGS_COMMON += --with-dps=yes --with-gslib=yes CONFIGURE_ARGS_COMMON += --x-includes=/opt/csw/X11/include CONFIGURE_ARGS_COMMON += --x-libraries=/opt/csw/X11/lib +# Solaris 8 and 9 doesn't have complex.h +CONFIGURE_ARGS_COMMON += --without-fftw CONFIGURE_ARGS_COMMON += --with-modules=yes #CONFIGURE_ARGS_COMMON += --disable-openmp CONFIGURE_ARGS_COMMON += --disable-silent-rules Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2010-03-21 06:46:43 UTC (rev 9293) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2010-03-21 14:52:37 UTC (rev 9294) @@ -1,3 +1,3 @@ -fb57509760a902af5bf535b8da15fdc7 ImageMagick-6.6.0-5.tar.bz2 +7e2f1d7512b4d2e41dbbb189e6eef2a0 ImageMagick-6.6.0-7.tar.bz2 6bd361fe352c7d497d60d8d2cbe7cfd4 Makefile.patch 6e35e7434941ed6aeeabb03de76288d1 configure.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 Sun Mar 21 16:10:09 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 21 Mar 2010 15:10:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[9295] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9295 http://gar.svn.sourceforge.net/gar/?rev=9295&view=rev Author: bdwalton Date: 2010-03-21 15:10:09 +0000 (Sun, 21 Mar 2010) Log Message: ----------- ruby19: dev package depends on core package Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-21 14:52:37 UTC (rev 9294) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-21 15:10:09 UTC (rev 9295) @@ -40,6 +40,7 @@ RUNTIME_DEP_PKGS_CSWruby19tk = CSWruby19 CSWtk CSWtcl RUNTIME_DEP_PKGS_CSWruby19mode = CSWemacscommon RUNTIME_DEP_PKGS_CSWruby19modeel = CSWemacscommon +RUNTIME_DEP_PKGS_CSWruby19dev = CSWruby19 CATALOGNAME_CSWruby19modeel = ruby19mode_el This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 21 18:06:16 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 17:06:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9296] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 9296 http://gar.svn.sourceforge.net/gar/?rev=9296&view=rev Author: hson Date: 2010-03-21 17:06:16 +0000 (Sun, 21 Mar 2010) Log Message: ----------- imagemagick: Disable use of gslib until ghostscript is rebuild using CSW X11 Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-03-21 15:10:09 UTC (rev 9295) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-03-21 17:06:16 UTC (rev 9296) @@ -174,7 +174,9 @@ CONFIGURE_ARGS_COMMON = $(DIRPATHS) CONFIGURE_ARGS_COMMON += --with-perl=$(bindir)/perl CONFIGURE_ARGS_COMMON += --enable-shared --disable-static -CONFIGURE_ARGS_COMMON += --with-dps=yes --with-gslib=yes +CONFIGURE_ARGS_COMMON += --with-dps=yes +# Ghostscript lib is linked to Sun X11 +CONFIGURE_ARGS_COMMON += --with-gslib=no CONFIGURE_ARGS_COMMON += --x-includes=/opt/csw/X11/include CONFIGURE_ARGS_COMMON += --x-libraries=/opt/csw/X11/lib # Solaris 8 and 9 doesn't have complex.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 21 19:14:28 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 18:14:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[9297] csw/mgar/pkg/libgsf/trunk/Makefile Message-ID: Revision: 9297 http://gar.svn.sourceforge.net/gar/?rev=9297&view=rev Author: hson Date: 2010-03-21 18:14:15 +0000 (Sun, 21 Mar 2010) Log Message: ----------- libgsf: Change how legacy lib is handled Modified Paths: -------------- csw/mgar/pkg/libgsf/trunk/Makefile Modified: csw/mgar/pkg/libgsf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgsf/trunk/Makefile 2010-03-21 17:06:16 UTC (rev 9296) +++ csw/mgar/pkg/libgsf/trunk/Makefile 2010-03-21 18:14:15 UTC (rev 9297) @@ -16,7 +16,7 @@ BUILD_DEP_PKGS += CSWgnulinks CSWgtk-doc CSWglib2devel CSWlibxml2devel RUNTIME_DEP_PKGS += CSWbonobo2 CSWbzip2 CSWgconf2 CSWggettextrt CSWglib2 -RUNTIME_DEP_PKGS += CSWgnomevfs2 CSWlibxml2 CSWorbit2 CSWzlib CSWiconv +RUNTIME_DEP_PKGS += CSWgnomevfs2 CSWlibxml2 CSWorbit2 CSWzlib UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -40,13 +40,9 @@ PATH := /opt/csw/gnu:$(PATH) post-install-isa-sparcv8: - @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-1.so.1.9.1 - @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1.9.1 - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ] ; then ln -s libgsf-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ; fi ) - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ] ; then ln -s libgsf-gnome-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ; fi ) + @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 + @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 post-install-isa-i386: - @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-1.so.1.9.1 - @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1.9.1 - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ] ; then ln -s libgsf-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ; fi ) - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ] ; then ln -s libgsf-gnome-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ; fi ) + @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 + @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 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 Mar 21 21:13:01 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 21 Mar 2010 20:13:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[9298] csw/mgar/pkg/rrdtool/branches/ihsan/Makefile Message-ID: Revision: 9298 http://gar.svn.sourceforge.net/gar/?rev=9298&view=rev Author: idogan23 Date: 2010-03-21 20:12:41 +0000 (Sun, 21 Mar 2010) Log Message: ----------- rrdtool: only 64-bit libs, no isaexec Modified Paths: -------------- csw/mgar/pkg/rrdtool/branches/ihsan/Makefile Modified: csw/mgar/pkg/rrdtool/branches/ihsan/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/branches/ihsan/Makefile 2010-03-21 18:14:15 UTC (rev 9297) +++ csw/mgar/pkg/rrdtool/branches/ihsan/Makefile 2010-03-21 20:12:41 UTC (rev 9298) @@ -80,6 +80,9 @@ PATCHFILES += patch-bindings-perl-shared-Makefile.PL BUILD64 = 1 +NOISAEXEC = 1 +MERGE_DIRS_isa-sparcv9 = $(libdir) +MERGE_DIRS_isa-amd64 = $(libdir) STRIP_LIBTOOL = 1 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 Mar 21 21:14:30 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 21 Mar 2010 20:14:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9299] csw/mgar/pkg/rrdtool/branches/ihsan/Makefile Message-ID: Revision: 9299 http://gar.svn.sourceforge.net/gar/?rev=9299&view=rev Author: idogan23 Date: 2010-03-21 20:14:30 +0000 (Sun, 21 Mar 2010) Log Message: ----------- rrdtool: added PACKAGING_PLATFORMS Modified Paths: -------------- csw/mgar/pkg/rrdtool/branches/ihsan/Makefile Modified: csw/mgar/pkg/rrdtool/branches/ihsan/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/branches/ihsan/Makefile 2010-03-21 20:12:41 UTC (rev 9298) +++ csw/mgar/pkg/rrdtool/branches/ihsan/Makefile 2010-03-21 20:14:30 UTC (rev 9299) @@ -18,6 +18,8 @@ PACKAGES = CSWrrd CATALOGNAME = rrdtool +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 + RUNTIME_DEP_PKGS += CSWggettextrt RUNTIME_DEP_PKGS += CSWglib2 RUNTIME_DEP_PKGS += CSWiconv This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 21 21:41:24 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 20:41:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9300] csw/mgar/pkg Message-ID: Revision: 9300 http://gar.svn.sourceforge.net/gar/?rev=9300&view=rev Author: hson Date: 2010-03-21 20:41:16 +0000 (Sun, 21 Mar 2010) Log Message: ----------- pngwriter: Initial commit Added Paths: ----------- csw/mgar/pkg/pngwriter/ csw/mgar/pkg/pngwriter/Makefile csw/mgar/pkg/pngwriter/branches/ csw/mgar/pkg/pngwriter/tags/ csw/mgar/pkg/pngwriter/trunk/ csw/mgar/pkg/pngwriter/trunk/Makefile csw/mgar/pkg/pngwriter/trunk/checksums csw/mgar/pkg/pngwriter/trunk/files/ Added: csw/mgar/pkg/pngwriter/Makefile =================================================================== --- csw/mgar/pkg/pngwriter/Makefile (rev 0) +++ csw/mgar/pkg/pngwriter/Makefile 2010-03-21 20:41:16 UTC (rev 9300) @@ -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) Property changes on: csw/mgar/pkg/pngwriter/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/pngwriter/trunk/Makefile =================================================================== --- csw/mgar/pkg/pngwriter/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pngwriter/trunk/Makefile 2010-03-21 20:41:16 UTC (rev 9300) @@ -0,0 +1,52 @@ +GARNAME = pngwriter +GARVERSION = 0.5.4 +CATEGORIES = lib + +DESCRIPTION = A C++ library for creating PNG images +define BLURB + +endef + +MASTER_SITES += $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +SPKG_SOURCEURL = http://pngwriter.sourceforge.net + +LICENSE = doc/english/LICENSE + +PACKAGES = CSWpngwriter CSWpngwriterdevel CSWpngwriterdoc +#PACKAGES += CSWpy-pngwriter +CATALOGNAME_CSWpngwriter = pngwriter +CATALOGNAME_CSWpngwriterdevel = pngwriter_devel +CATALOGNAME_CSWpngwriterdoc = pngwriter_doc +#CATALOGNAME_CSWpy-pngwriter = py_pngwriter +SPKG_DESC_CSWpngwriter = $(DESCRIPTION) +SPKG_DESC_CSWpngwriterdevel = $(DESCRIPTION) - developer package +SPKG_DESC_CSWpngwriterdoc = $(DESCRIPTION) - documentation package +#SPKG_DESC_CSWpy-pngwriter = $(DESCRIPTION) - Python bindings + +RUNTIME_DEP_PKGS_CSWpngwriter = CSWggettextrt CSWiconv +RUNTIME_DEP_PKGS_CSWpngwriterdevel = CSWpngwriter +RUNTIME_DEP_PKGS_CSWpngwriterdoc = CSWpngwriter +#RUNTIME_DEP_PKGS_CSWpy-pngwriter = CSWpngwriter CSWpython + +PKGFILES_CSWpngwriterdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWpngwriterdoc = $(sharedstatedir)/gtk-doc/.* +#PKGFILES_CSWpy-pngwriter = $(libdir).*/python/site-packages/.* + +ARCHALL_CSWpngwriterdoc = 1 + +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=69758 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PATCHFILES = Makefiles.diff + +#BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +CONFIGURE_SCRIPT = +TEST_TARGET = + +include gar/category.mk Added: csw/mgar/pkg/pngwriter/trunk/checksums =================================================================== --- csw/mgar/pkg/pngwriter/trunk/checksums (rev 0) +++ csw/mgar/pkg/pngwriter/trunk/checksums 2010-03-21 20:41:16 UTC (rev 9300) @@ -0,0 +1,2 @@ +6dd01e6664d6c567b0fffca8cf80fc8f Makefiles.diff +842c3b1b2af9a7acc3ac0abc8015ba50 pngwriter-0.5.4.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 Sun Mar 21 21:43:04 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 20:43:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[9301] csw/mgar/pkg Message-ID: Revision: 9301 http://gar.svn.sourceforge.net/gar/?rev=9301&view=rev Author: hson Date: 2010-03-21 20:43:01 +0000 (Sun, 21 Mar 2010) Log Message: ----------- dejagnu: Initial commit Added Paths: ----------- csw/mgar/pkg/dejagnu/ csw/mgar/pkg/dejagnu/branches/ csw/mgar/pkg/dejagnu/tags/ csw/mgar/pkg/dejagnu/trunk/ csw/mgar/pkg/dejagnu/trunk/Makefile csw/mgar/pkg/dejagnu/trunk/checksums csw/mgar/pkg/dejagnu/trunk/files/ Property changes on: csw/mgar/pkg/dejagnu/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/dejagnu/trunk/Makefile =================================================================== --- csw/mgar/pkg/dejagnu/trunk/Makefile (rev 0) +++ csw/mgar/pkg/dejagnu/trunk/Makefile 2010-03-21 20:43:01 UTC (rev 9301) @@ -0,0 +1,28 @@ +GARNAME = dejagnu +GARVERSION = 1.4.4 +CATEGORIES = apps + +DESCRIPTION = GNU auto-configuration tool +define BLURB +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +#PATCHFILES = 0001-Prefer-CSW-tools.patch + +#BUILD_DEP_PKGS = CSWhelp2man +#RUNTIME_DEP_PKGS = CSWgawk CSWgm4 CSWperl + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +# Tests take a loooooonnng time. +#TEST_SCRIPTS = + +#EXTRA_MERGE_EXCLUDE_FILES = $(infodir)/standards.info + +include gar/category.mk Added: csw/mgar/pkg/dejagnu/trunk/checksums =================================================================== --- csw/mgar/pkg/dejagnu/trunk/checksums (rev 0) +++ csw/mgar/pkg/dejagnu/trunk/checksums 2010-03-21 20:43:01 UTC (rev 9301) @@ -0,0 +1 @@ +053f18fd5d00873de365413cab17a666 dejagnu-1.4.4.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 Sun Mar 21 21:44:23 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 20:44:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9302] csw/mgar/pkg Message-ID: Revision: 9302 http://gar.svn.sourceforge.net/gar/?rev=9302&view=rev Author: hson Date: 2010-03-21 20:44:17 +0000 (Sun, 21 Mar 2010) Log Message: ----------- gluezilla: Initial commit Added Paths: ----------- csw/mgar/pkg/gluezilla/ csw/mgar/pkg/gluezilla/branches/ csw/mgar/pkg/gluezilla/tags/ csw/mgar/pkg/gluezilla/trunk/ csw/mgar/pkg/gluezilla/trunk/Makefile csw/mgar/pkg/gluezilla/trunk/checksums csw/mgar/pkg/gluezilla/trunk/files/ Property changes on: csw/mgar/pkg/gluezilla/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/gluezilla/trunk/Makefile =================================================================== --- csw/mgar/pkg/gluezilla/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gluezilla/trunk/Makefile 2010-03-21 20:44:17 UTC (rev 9302) @@ -0,0 +1,23 @@ +GARNAME = gluezilla +GARVERSION = 2.6 +CATEGORIES = apps + +DESCRIPTION = Mono Runtime +define BLURB + Mono is a comprehensive open source development platform based on the .NET + framework that allows developers to build Linux and cross-platform + applications with unprecedented productivity. Mono's .NET implementation is + based on the ECMA standards for C# and the Common Language Infrastructure. +endef + +MASTER_SITES = http://ftp.novell.com/pub/mono/sources/mono/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/gluezilla/trunk/checksums =================================================================== --- csw/mgar/pkg/gluezilla/trunk/checksums (rev 0) +++ csw/mgar/pkg/gluezilla/trunk/checksums 2010-03-21 20:44:17 UTC (rev 9302) @@ -0,0 +1 @@ +bd4eb89747498945227877295fcd36b5 gluezilla-2.6.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 Sun Mar 21 21:45:43 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 20:45:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9303] csw/mgar/pkg Message-ID: Revision: 9303 http://gar.svn.sourceforge.net/gar/?rev=9303&view=rev Author: hson Date: 2010-03-21 20:45:39 +0000 (Sun, 21 Mar 2010) Log Message: ----------- libgdiplus: Initial commit Added Paths: ----------- csw/mgar/pkg/libgdiplus/ csw/mgar/pkg/libgdiplus/branches/ csw/mgar/pkg/libgdiplus/tags/ csw/mgar/pkg/libgdiplus/trunk/ csw/mgar/pkg/libgdiplus/trunk/Makefile csw/mgar/pkg/libgdiplus/trunk/checksums csw/mgar/pkg/libgdiplus/trunk/files/ Property changes on: csw/mgar/pkg/libgdiplus/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/libgdiplus/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgdiplus/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgdiplus/trunk/Makefile 2010-03-21 20:45:39 UTC (rev 9303) @@ -0,0 +1,47 @@ +GARNAME = libgdiplus +GARVERSION = 2.6 +CATEGORIES = lib + +DESCRIPTION = Mono library that provide a GDI+ comptible API +define BLURB + Mono is a comprehensive open source development platform based on the .NET + framework that allows developers to build Linux and cross-platform + applications with unprecedented productivity. Mono's .NET implementation is + based on the ECMA standards for C# and the Common Language Infrastructure. +endef + +MASTER_SITES = http://ftp.novell.com/pub/mono/sources/mono/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +#PATCHFILES += Makefile.in.patch +#PATCHFILES += configure.patch +#PATCHFILES += metafile.c.patch +#PATCHFILES += win32structs.h.patch + +RUNTIME_DEP_PKGS_CSWlibgdiplus += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgdiplus += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibgdiplus += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibgdiplus += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibgdiplus += CSWjpeg +RUNTIME_DEP_PKGS_CSWlibgdiplus += CSWlibcairo +RUNTIME_DEP_PKGS_CSWlibgdiplus += CSWlibexif +RUNTIME_DEP_PKGS_CSWlibgdiplus += CSWlibx11 +RUNTIME_DEP_PKGS_CSWlibgdiplus += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibgdiplus += CSWpango +RUNTIME_DEP_PKGS_CSWlibgdiplus += CSWpng +RUNTIME_DEP_PKGS_CSWlibgdiplus += CSWtiff +RUNTIME_DEP_PKGS_CSWlibgdiplus += CSWgcc4corert + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-pango + +TEST_TARGET = check + +GARCOMPILER = GCC4 +include gar/category.mk Added: csw/mgar/pkg/libgdiplus/trunk/checksums =================================================================== --- csw/mgar/pkg/libgdiplus/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgdiplus/trunk/checksums 2010-03-21 20:45:39 UTC (rev 9303) @@ -0,0 +1,5 @@ +6833fe18e7e46f410c21703bcfac6bb1 Makefile.in.patch +031e8a24073fd02ee1e16e87a63ebcc0 configure.patch +9107b4429fdafde914bd23405544c58d libgdiplus-2.6.tar.bz2 +4b842f78ffee7766f0d686a214fe8760 metafile.c.patch +c20e300bf2b5c5d657ba679bc1d1ddf9 win32structs.h.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 Sun Mar 21 21:47:11 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 20:47:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9304] csw/mgar/pkg/libgnomeprint Message-ID: Revision: 9304 http://gar.svn.sourceforge.net/gar/?rev=9304&view=rev Author: hson Date: 2010-03-21 20:47:09 +0000 (Sun, 21 Mar 2010) Log Message: ----------- libgnomeprint: Initial commit Added Paths: ----------- csw/mgar/pkg/libgnomeprint/branches/ csw/mgar/pkg/libgnomeprint/tags/ csw/mgar/pkg/libgnomeprint/trunk/Makefile csw/mgar/pkg/libgnomeprint/trunk/checksums csw/mgar/pkg/libgnomeprint/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/libgnomeprint/trunk/ Property changes on: csw/mgar/pkg/libgnomeprint/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/libgnomeprint/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnomeprint/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgnomeprint/trunk/Makefile 2010-03-21 20:47:09 UTC (rev 9304) @@ -0,0 +1,61 @@ +GARNAME = libgnomeprint +GARVERSION = 2.18.6 +CATEGORIES = gnome + +DESCRIPTION = TODO +define BLURB +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWlibgnomeprint CSWlibgnomeprintdevel CSWlibgnomeprintdoc +CATALOGNAME_CSWlibgnomeprint = libgnomeprint +CATALOGNAME_CSWlibgnomeprintdevel = libgnomeprint_devel +CATALOGNAME_CSWlibgnomeprintdoc = libgnomeprint_doc + +SPKG_DESC_CSWlibgnomeprint += $(DESCRIPTION) +SPKG_DESC_CSWlibgnomeprintdevel += $(DESCRIPTION) - developer package +SPKG_DESC_CSWlibgnomeprintdoc += $(DESCRIPTION) - documentation + +RUNTIME_DEP_PKGS_CSWlibgnomeprintdevel += CSWlibgnomeprint +RUNTIME_DEP_PKGS_CSWlibgnomeprintdoc += CSWlibgnomeprint + +#BUILD_DEP_PKGS += CSWgnomeicontheme +#BUILD_DEP_PKGS += CSWlibgnomeprint +#BUILD_DEP_PKGS += CSWlibgnomecanvas +BUILD_DEP_PKGS += CSWgtk2devel + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://live.gnome.org/libgnomeprint + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_LDFLAGS = -lm +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +#NOISAEXEC = 1 +#NOISALIST = 1 +#BUILD64 = 1 + +PKGFILES_CSWlibgnomeprintdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibgnomeprintdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWlibgnomeprintdoc = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static=no +CONFIGURE_ARGS += --enable-gtk-doc +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/libgnomeprint/trunk/checksums =================================================================== --- csw/mgar/pkg/libgnomeprint/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgnomeprint/trunk/checksums 2010-03-21 20:47:09 UTC (rev 9304) @@ -0,0 +1 @@ +a5aa248058a07de4b3cf444673cfc683 libgnomeprint-2.18.6.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 Sun Mar 21 21:48:48 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 20:48:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9305] csw/mgar/pkg/libgnomeprintui Message-ID: Revision: 9305 http://gar.svn.sourceforge.net/gar/?rev=9305&view=rev Author: hson Date: 2010-03-21 20:48:45 +0000 (Sun, 21 Mar 2010) Log Message: ----------- libgnomeprintui: Initial commit Added Paths: ----------- csw/mgar/pkg/libgnomeprintui/branches/ csw/mgar/pkg/libgnomeprintui/tags/ csw/mgar/pkg/libgnomeprintui/trunk/Makefile csw/mgar/pkg/libgnomeprintui/trunk/checksums csw/mgar/pkg/libgnomeprintui/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/libgnomeprintui/trunk/ Property changes on: csw/mgar/pkg/libgnomeprintui/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/libgnomeprintui/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnomeprintui/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgnomeprintui/trunk/Makefile 2010-03-21 20:48:45 UTC (rev 9305) @@ -0,0 +1,61 @@ +GARNAME = libgnomeprintui +GARVERSION = 2.18.4 +CATEGORIES = gnome + +DESCRIPTION = TODO +define BLURB +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWlibgnomeprintui CSWlibgnomeprintuidevel CSWlibgnomeprintuidoc +CATALOGNAME_CSWlibgnomeprintui = libgnomeprintui +CATALOGNAME_CSWlibgnomeprintuidevel = libgnomeprintui_devel +CATALOGNAME_CSWlibgnomeprintuidoc = libgnomeprintui_doc + +SPKG_DESC_CSWlibgnomeprintui += $(DESCRIPTION) +SPKG_DESC_CSWlibgnomeprintuidevel += $(DESCRIPTION) - developer package +SPKG_DESC_CSWlibgnomeprintuidoc += $(DESCRIPTION) - documentation + +RUNTIME_DEP_PKGS_CSWlibgnomeprintuidevel += CSWlibgnomeprintui +RUNTIME_DEP_PKGS_CSWlibgnomeprintuidoc += CSWlibgnomeprintui + +BUILD_DEP_PKGS += CSWgnomeicontheme +BUILD_DEP_PKGS += CSWlibgnomeprint +BUILD_DEP_PKGS += CSWlibgnomecanvas +BUILD_DEP_PKGS += CSWgtk2devel + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://live.gnome.org/libgnomeprintui + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_LDFLAGS = -lm +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +#NOISAEXEC = 1 +#NOISALIST = 1 +#BUILD64 = 1 + +PKGFILES_CSWlibgnomeprintuidevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibgnomeprintuidoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWlibgnomeprintuidoc = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static=no +CONFIGURE_ARGS += --enable-gtk-doc +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/libgnomeprintui/trunk/checksums =================================================================== --- csw/mgar/pkg/libgnomeprintui/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgnomeprintui/trunk/checksums 2010-03-21 20:48:45 UTC (rev 9305) @@ -0,0 +1 @@ +e76d763f6279b900a63e5fb2909f8810 libgnomeprintui-2.18.4.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 Sun Mar 21 21:50:03 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 20:50:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[9306] csw/mgar/pkg/libgnomeui Message-ID: Revision: 9306 http://gar.svn.sourceforge.net/gar/?rev=9306&view=rev Author: hson Date: 2010-03-21 20:49:51 +0000 (Sun, 21 Mar 2010) Log Message: ----------- libgnomeui Initial commit Added Paths: ----------- csw/mgar/pkg/libgnomeui/branches/ csw/mgar/pkg/libgnomeui/tags/ csw/mgar/pkg/libgnomeui/trunk/Makefile csw/mgar/pkg/libgnomeui/trunk/checksums csw/mgar/pkg/libgnomeui/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/libgnomeui/trunk/ Property changes on: csw/mgar/pkg/libgnomeui/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/libgnomeui/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnomeui/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgnomeui/trunk/Makefile 2010-03-21 20:49:51 UTC (rev 9306) @@ -0,0 +1,61 @@ +GARNAME = libgnomeprintui +GARVERSION = 2.18.4 +CATEGORIES = gnome + +DESCRIPTION = TODO +define BLURB +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWlibgnomeprintui CSWlibgnomeprintuidevel CSWlibgnomeprintuidoc +CATALOGNAME_CSWlibgnomeprintui = libgnomeprintui +CATALOGNAME_CSWlibgnomeprintuidevel = libgnomeprintui_devel +CATALOGNAME_CSWlibgnomeprintuidoc = libgnomeprintui_doc + +SPKG_DESC_CSWlibgnomeprintui += $(DESCRIPTION) +SPKG_DESC_CSWlibgnomeprintuidevel += $(DESCRIPTION) - developer package +SPKG_DESC_CSWlibgnomeprintuidoc += $(DESCRIPTION) - documentation + +RUNTIME_DEP_PKGS_CSWlibgnomeprintuidevel += CSWlibgnomeprintui +RUNTIME_DEP_PKGS_CSWlibgnomeprintuidoc += CSWlibgnomeprintui + +BUILD_DEP_PKGS += CSWgnomeicontheme +BUILD_DEP_PKGS += CSWlibgnomeprint +BUILD_DEP_PKGS += CSWlibgnomecanvas +BUILD_DEP_PKGS += CSWgtk2devel + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://live.gnome.org/libgnomeprintui + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_LDFLAGS = -lm +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +#NOISAEXEC = 1 +#NOISALIST = 1 +#BUILD64 = 1 + +PKGFILES_CSWlibgnomeprintuidevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibgnomeprintuidoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWlibgnomeprintuidoc = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static=no +CONFIGURE_ARGS += --enable-gtk-doc +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/libgnomeui/trunk/checksums =================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 21 21:52:50 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 20:52:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9307] csw/mgar/pkg Message-ID: Revision: 9307 http://gar.svn.sourceforge.net/gar/?rev=9307&view=rev Author: hson Date: 2010-03-21 20:52:49 +0000 (Sun, 21 Mar 2010) Log Message: ----------- mono-basic: Initial commit Added Paths: ----------- csw/mgar/pkg/mono-basic/ csw/mgar/pkg/mono-basic/Makefile csw/mgar/pkg/mono-basic/branches/ csw/mgar/pkg/mono-basic/tags/ csw/mgar/pkg/mono-basic/trunk/ csw/mgar/pkg/mono-basic/trunk/Makefile csw/mgar/pkg/mono-basic/trunk/checksums csw/mgar/pkg/mono-basic/trunk/files/ Added: csw/mgar/pkg/mono-basic/Makefile =================================================================== --- csw/mgar/pkg/mono-basic/Makefile (rev 0) +++ csw/mgar/pkg/mono-basic/Makefile 2010-03-21 20:52:49 UTC (rev 9307) @@ -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) Property changes on: csw/mgar/pkg/mono-basic/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/mono-basic/trunk/Makefile =================================================================== --- csw/mgar/pkg/mono-basic/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mono-basic/trunk/Makefile 2010-03-21 20:52:49 UTC (rev 9307) @@ -0,0 +1,23 @@ +GARNAME = mono-basic +GARVERSION = 2.6 +CATEGORIES = lang + +DESCRIPTION = Mono Runtime +define BLURB + Mono is a comprehensive open source development platform based on the .NET + framework that allows developers to build Linux and cross-platform + applications with unprecedented productivity. Mono's .NET implementation is + based on the ECMA standards for C# and the Common Language Infrastructure. +endef + +MASTER_SITES = http://ftp.novell.com/pub/mono/sources/mono/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/mono-basic/trunk/checksums =================================================================== --- csw/mgar/pkg/mono-basic/trunk/checksums (rev 0) +++ csw/mgar/pkg/mono-basic/trunk/checksums 2010-03-21 20:52:49 UTC (rev 9307) @@ -0,0 +1 @@ +64248ca51cd09fb53e34b0373f5dfd91 mono-basic-2.6.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 Sun Mar 21 21:54:08 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 20:54:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9308] csw/mgar/pkg Message-ID: Revision: 9308 http://gar.svn.sourceforge.net/gar/?rev=9308&view=rev Author: hson Date: 2010-03-21 20:53:57 +0000 (Sun, 21 Mar 2010) Log Message: ----------- mono-debugger: Initial commit Added Paths: ----------- csw/mgar/pkg/mono-debugger/ csw/mgar/pkg/mono-debugger/Makefile csw/mgar/pkg/mono-debugger/branches/ csw/mgar/pkg/mono-debugger/tags/ csw/mgar/pkg/mono-debugger/trunk/ csw/mgar/pkg/mono-debugger/trunk/Makefile csw/mgar/pkg/mono-debugger/trunk/checksums csw/mgar/pkg/mono-debugger/trunk/files/ Added: csw/mgar/pkg/mono-debugger/Makefile =================================================================== --- csw/mgar/pkg/mono-debugger/Makefile (rev 0) +++ csw/mgar/pkg/mono-debugger/Makefile 2010-03-21 20:53:57 UTC (rev 9308) @@ -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) Property changes on: csw/mgar/pkg/mono-debugger/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/mono-debugger/trunk/Makefile =================================================================== --- csw/mgar/pkg/mono-debugger/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mono-debugger/trunk/Makefile 2010-03-21 20:53:57 UTC (rev 9308) @@ -0,0 +1,23 @@ +GARNAME = mono-debugger +GARVERSION = 2.6 +CATEGORIES = utils + +DESCRIPTION = Mono Runtime +define BLURB + Mono is a comprehensive open source development platform based on the .NET + framework that allows developers to build Linux and cross-platform + applications with unprecedented productivity. Mono's .NET implementation is + based on the ECMA standards for C# and the Common Language Infrastructure. +endef + +MASTER_SITES = http://ftp.novell.com/pub/mono/sources/$(GARNAME)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/mono-debugger/trunk/checksums =================================================================== --- csw/mgar/pkg/mono-debugger/trunk/checksums (rev 0) +++ csw/mgar/pkg/mono-debugger/trunk/checksums 2010-03-21 20:53:57 UTC (rev 9308) @@ -0,0 +1 @@ +a6cac2d8dc8f788a7b2b35cd3f7204dc mono-debugger-2.6.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 Sun Mar 21 22:13:19 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 21 Mar 2010 21:13:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9309] csw/mgar/pkg Message-ID: Revision: 9309 http://gar.svn.sourceforge.net/gar/?rev=9309&view=rev Author: hson Date: 2010-03-21 21:13:19 +0000 (Sun, 21 Mar 2010) Log Message: ----------- mono-tools: Initial commit Added Paths: ----------- csw/mgar/pkg/mono-tools/ csw/mgar/pkg/mono-tools/Makefile csw/mgar/pkg/mono-tools/branches/ csw/mgar/pkg/mono-tools/tags/ csw/mgar/pkg/mono-tools/trunk/ csw/mgar/pkg/mono-tools/trunk/Makefile csw/mgar/pkg/mono-tools/trunk/checksums csw/mgar/pkg/mono-tools/trunk/files/ Added: csw/mgar/pkg/mono-tools/Makefile =================================================================== --- csw/mgar/pkg/mono-tools/Makefile (rev 0) +++ csw/mgar/pkg/mono-tools/Makefile 2010-03-21 21:13:19 UTC (rev 9309) @@ -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) Property changes on: csw/mgar/pkg/mono-tools/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/mono-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/mono-tools/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mono-tools/trunk/Makefile 2010-03-21 21:13:19 UTC (rev 9309) @@ -0,0 +1,23 @@ +GARNAME = mono-tools +GARVERSION = 2.6.1 +CATEGORIES = utils + +DESCRIPTION = Mono Runtime +define BLURB + Mono is a comprehensive open source development platform based on the .NET + framework that allows developers to build Linux and cross-platform + applications with unprecedented productivity. Mono's .NET implementation is + based on the ECMA standards for C# and the Common Language Infrastructure. +endef + +MASTER_SITES = http://ftp.novell.com/pub/mono/sources/$(GARNAME)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/mono-tools/trunk/checksums =================================================================== --- csw/mgar/pkg/mono-tools/trunk/checksums (rev 0) +++ csw/mgar/pkg/mono-tools/trunk/checksums 2010-03-21 21:13:19 UTC (rev 9309) @@ -0,0 +1 @@ +b16305c2dbbc53211018ed07364abccf mono-tools-2.6.1.tar.bz2 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 Mar 21 22:40:23 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 21 Mar 2010 21:40:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9310] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9310 http://gar.svn.sourceforge.net/gar/?rev=9310&view=rev Author: bdwalton Date: 2010-03-21 21:40:23 +0000 (Sun, 21 Mar 2010) Log Message: ----------- ruby19: add checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-21 21:13:19 UTC (rev 9309) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-21 21:40:23 UTC (rev 9310) @@ -3,6 +3,12 @@ PATCHLEVEL = p376 CATEGORIES = lang +# Overrides for checkpkg. These are all false positives or ignorable +# for now. +CHECKPKG_OVERRIDES_CSWruby19tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWruby19tk += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWruby19tk += surplus-dependency|CSWruby19 + # Working with Jens Deppe, we've determined that the two failing tests # in 1.9.1p376 are bad tests (as documented here[1] and here[2]). # They make assumptions about kernel behaviour that don't hold for 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 Mar 21 23:14:23 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 21 Mar 2010 22:14:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9311] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9311 http://gar.svn.sourceforge.net/gar/?rev=9311&view=rev Author: bdwalton Date: 2010-03-21 22:14:23 +0000 (Sun, 21 Mar 2010) Log Message: ----------- ruby19: drop ruby mode elisp packages (same as 1.8) Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-21 21:40:23 UTC (rev 9310) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-21 22:14:23 UTC (rev 9311) @@ -39,37 +39,23 @@ PACKAGES += CSWruby19mode CSWruby19modeel ARCHALL_CSWruby19doc = 1 -ARCHALL_CSWruby19mode = 1 -ARCHALL_CSWruby19modeel = 1 RUNTIME_DEP_PKGS_CSWruby19doc = CSWruby19 RUNTIME_DEP_PKGS_CSWruby19tk = CSWruby19 CSWtk CSWtcl -RUNTIME_DEP_PKGS_CSWruby19mode = CSWemacscommon -RUNTIME_DEP_PKGS_CSWruby19modeel = CSWemacscommon RUNTIME_DEP_PKGS_CSWruby19dev = CSWruby19 -CATALOGNAME_CSWruby19modeel = ruby19mode_el - SPKG_DESC_CSWruby19doc = Documentation for Ruby 1.9 SPKG_DESC_CSWruby19tk = Ruby 1.9 Tcl/TK Extension SPKG_DESC_CSWruby19dev = Ruby 1.9 Extension Development Files -SPKG_DESC_CSWruby19mode = Ruby 1.9 major mode for Emacs - -SPKG_DESC_CSWruby19modeel = Elisp source for ruby 1.9 mode - PKGFILES_CSWruby19doc = $(datadir)/ri/.* $(docdir)/ruby19/sample.* PKGFILES_CSWruby19tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb PKGFILES_CSWruby19dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a -PKGFILES_CSWruby19mode = $(datadir)/emacs/site-lisp/.*elc$ - -PKGFILES_CSWruby19modeel = $(datadir)/emacs/site-lisp/.*el$ - MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/1.9/ DISTFILES = $(DISTNAME).tar.gz @@ -136,5 +122,3 @@ @find $(DESTDIR)$(prefix) -type f -name '*.rb' -exec \ perl -i -plne "s{^#!/usr/local/bin/ruby}{#!$(bindir)/$(GARNAME)}g" {} \; @$(MAKECOOKIE) - - 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 Mar 21 23:15:43 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 21 Mar 2010 22:15:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9312] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9312 http://gar.svn.sourceforge.net/gar/?rev=9312&view=rev Author: bdwalton Date: 2010-03-21 22:15:42 +0000 (Sun, 21 Mar 2010) Log Message: ----------- ruby19: _really_ drop ruby mode packages Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-21 22:14:23 UTC (rev 9311) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-21 22:15:42 UTC (rev 9312) @@ -36,7 +36,6 @@ endef PACKAGES = CSWruby19 CSWruby19doc CSWruby19tk CSWruby19dev -PACKAGES += CSWruby19mode CSWruby19modeel ARCHALL_CSWruby19doc = 1 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 Mar 22 00:58:48 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 21 Mar 2010 23:58:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9313] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9313 http://gar.svn.sourceforge.net/gar/?rev=9313&view=rev Author: bdwalton Date: 2010-03-21 23:58:48 +0000 (Sun, 21 Mar 2010) Log Message: ----------- ruby19: tweak the alternate compiler stuff Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-21 22:15:42 UTC (rev 9312) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-21 23:58:48 UTC (rev 9313) @@ -71,15 +71,15 @@ CONFIGURE_ARGS += --program-suffix=19 CONFIGURE_ARGS += --enable-pthread -include gar/category.mk - ifdef USEGCC -GARCOMPILER = GNU +GARCOMPILER = GCC4 RUNTIME_DEP_PKGS_CSWruby19 += CSWgcc4corert else SOS11_LD_FLAGS = endif +include gar/category.mk + MERGE_EXCLUDE_STATICLIBS = COMPILE_ELISP = 1 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 Mar 22 03:02:57 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 22 Mar 2010 02:02:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[9314] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9314 http://gar.svn.sourceforge.net/gar/?rev=9314&view=rev Author: bdwalton Date: 2010-03-22 02:02:56 +0000 (Mon, 22 Mar 2010) Log Message: ----------- ruby19: tweak gcc4 build settings, deps; add patchlevel to version string Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-21 23:58:48 UTC (rev 9313) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-22 02:02:56 UTC (rev 9314) @@ -74,12 +74,18 @@ ifdef USEGCC GARCOMPILER = GCC4 RUNTIME_DEP_PKGS_CSWruby19 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWruby19dev += CSWgcc4core +# This is for rbconfig.rb: without this, modules built may not get a +# proper setting. +EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR)) else SOS11_LD_FLAGS = endif include gar/category.mk +SPKG_VERSION := $(SPKG_VERSION)$(PATCHLEVEL) + MERGE_EXCLUDE_STATICLIBS = COMPILE_ELISP = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Mar 22 05:15:47 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 22 Mar 2010 04:15:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9315] csw/mgar/pkg/libunique/trunk/Makefile Message-ID: Revision: 9315 http://gar.svn.sourceforge.net/gar/?rev=9315&view=rev Author: hson Date: 2010-03-22 04:15:47 +0000 (Mon, 22 Mar 2010) Log Message: ----------- libunique: PREREQUISITE_PKGS is depricated Modified Paths: -------------- csw/mgar/pkg/libunique/trunk/Makefile Modified: csw/mgar/pkg/libunique/trunk/Makefile =================================================================== --- csw/mgar/pkg/libunique/trunk/Makefile 2010-03-22 02:02:56 UTC (rev 9314) +++ csw/mgar/pkg/libunique/trunk/Makefile 2010-03-22 04:15:47 UTC (rev 9315) @@ -32,7 +32,7 @@ RUNTIME_DEP_PKGS_CSWlibuniquedevel += CSWlibunique RUNTIME_DEP_PKGS_CSWlibuniquedoc += CSWlibunique -PREREQUISITE_PKGS += CSWdbusglibdev +BUILD_DEP_PKGS += CSWdbusglibdev UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Mar 22 08:51:42 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 22 Mar 2010 07:51:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[9316] csw/mgar/pkg Message-ID: Revision: 9316 http://gar.svn.sourceforge.net/gar/?rev=9316&view=rev Author: bensons Date: 2010-03-22 07:51:41 +0000 (Mon, 22 Mar 2010) Log Message: ----------- gnomemedia: GAR recipe for initial release Added Paths: ----------- csw/mgar/pkg/gnomemedia/ csw/mgar/pkg/gnomemedia/branches/ csw/mgar/pkg/gnomemedia/tags/ csw/mgar/pkg/gnomemedia/trunk/ csw/mgar/pkg/gnomemedia/trunk/Makefile csw/mgar/pkg/gnomemedia/trunk/checksums csw/mgar/pkg/gnomemedia/trunk/files/ Property changes on: csw/mgar/pkg/gnomemedia/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/gnomemedia/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnomemedia/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnomemedia/trunk/Makefile 2010-03-22 07:51:41 UTC (rev 9316) @@ -0,0 +1,55 @@ +GARNAME = gnome-media +GARVERSION = 2.28.5 +CATEGORIES = gnome + +DESCRIPTION = Multimedia applications for the GNOME 2 desktop +define BLURB + Multimedia applications for the GNOME 2.0 desktop. + Includes gnome-cd, a CDDB aware CD player; gnome-volume-control, + for controlling the sound card's mixer; and VU-Meter +endef + +MASTER_SITES = http://ftp.acc.umu.se/pub/GNOME/sources/gnome-media/2.28/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PACKAGES = CSWgnomemedia +CATALOGNAME = gnomemedia + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +RUNTIME_DEP_PKGS += CSWftype2 CSWgconf2 CSWggettextrt CSWglib2 CSWgstplugins +RUNTIME_DEP_PKGS += CSWgstreamer CSWgtk2 CSWlibatk CSWlibcairo CSWlibglade2 +RUNTIME_DEP_PKGS += CSWlibxml2 CSWpango +BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) CSWgtk2devel CSWlibxcbdevel CSWlibxcb +BUILD_DEP_PKGS += CSWlibpthreadstubs CSWlibxau CSWlibxaudevel CSWxproto +BUILD_DEP_PKGS += CSWrenderproto CSWkbproto CSWgnomedocutils CSWpylibxml2 +BUILD_DEP_PKGS += CSWscrollkeeper + +CONFIGURE_ARGS += $(DIRPATHS) + +STRIP_LIBTOOL = 1 + +TEST_SCRIPTS = + +ADD_X11_LIB = -L$(prefix)/X11/lib -R$(prefix)/X11/lib +EXTRA_LDFLAGS = -R $(prefix)/X11/lib +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +include gar/category.mk +post-configure-modulated: + gsed -i 's,\tmsgfmt,\t$$(GMSGFMT),' $(WORKSRC)/profiles/help/Makefile + gsed -i 's,\(LIBS =\),\1 -lm,' $(WORKSRC)/grecord/src/Makefile + gsed -i 's,\tmsgfmt,\t$$(GMSGFMT),' $(WORKSRC)/grecord/doc/Makefile + gsed -i 's,\tmsgfmt,\t$$(GMSGFMT),' $(WORKSRC)/gst-mixer/doc/Makefile + gsed -i 's,\tmsgfmt,\t$$(GMSGFMT),' \ + $(WORKSRC)/gstreamer-properties/help/Makefile + gsed -i 's,,,' $(WORKSRC)/gst-mixer/src/main.c + @$(MAKECOOKIE) + +pre-configure-modulated: + # hack until we have fixed our libX11 issue... + gsed -i 's,GMP_LIBS=$$pkg_cv_GMP_LIBS,GMP_LIBS="$(ADD_X11_LIB) $$pkg_cv_GMP_LIBS",' $(WORKSRC)/configure + gsed -i 's,GSR_LIBS=$$pkg_cv_GSR_LIBS,GSR_LIBS="$(ADD_X11_LIB) $$pkg_cv_GSR_LIBS",' $(WORKSRC)/configure + gsed -i 's,GSTMIXER_LIBS=$$pkg_cv_GSTMIXER_LIBS,GSTMIXER_LIBS="$(ADD_X11_LIB) $$pkg_cv_GSTMIXER_LIBS -lm",' $(WORKSRC)/configure + @$(MAKECOOKIE) Added: csw/mgar/pkg/gnomemedia/trunk/checksums =================================================================== --- csw/mgar/pkg/gnomemedia/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnomemedia/trunk/checksums 2010-03-22 07:51:41 UTC (rev 9316) @@ -0,0 +1 @@ +3f07120b75babc7942433c561236d566 gnome-media-2.28.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Mar 22 08:52:51 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 22 Mar 2010 07:52:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[9317] csw/mgar/pkg/gnomemedia/trunk/Makefile Message-ID: Revision: 9317 http://gar.svn.sourceforge.net/gar/?rev=9317&view=rev Author: bensons Date: 2010-03-22 07:52:51 +0000 (Mon, 22 Mar 2010) Log Message: ----------- gnomemedia: added missing dependency Modified Paths: -------------- csw/mgar/pkg/gnomemedia/trunk/Makefile Modified: csw/mgar/pkg/gnomemedia/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnomemedia/trunk/Makefile 2010-03-22 07:51:41 UTC (rev 9316) +++ csw/mgar/pkg/gnomemedia/trunk/Makefile 2010-03-22 07:52:51 UTC (rev 9317) @@ -19,7 +19,7 @@ RUNTIME_DEP_PKGS += CSWftype2 CSWgconf2 CSWggettextrt CSWglib2 CSWgstplugins RUNTIME_DEP_PKGS += CSWgstreamer CSWgtk2 CSWlibatk CSWlibcairo CSWlibglade2 -RUNTIME_DEP_PKGS += CSWlibxml2 CSWpango +RUNTIME_DEP_PKGS += CSWlibxml2 CSWpango CSWfconfig BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) CSWgtk2devel CSWlibxcbdevel CSWlibxcb BUILD_DEP_PKGS += CSWlibpthreadstubs CSWlibxau CSWlibxaudevel CSWxproto BUILD_DEP_PKGS += CSWrenderproto CSWkbproto CSWgnomedocutils CSWpylibxml2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 22 09:11:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Mar 2010 08:11:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9318] csw/mgar/gar/v2/lib/python/opencsw.py Message-ID: Revision: 9318 http://gar.svn.sourceforge.net/gar/?rev=9318&view=rev Author: wahwah Date: 2010-03-22 08:11:58 +0000 (Mon, 22 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, return sorted lists of binaries and all basenames. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-22 07:52:51 UTC (rev 9317) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-22 08:11:58 UTC (rev 9318) @@ -810,11 +810,12 @@ def StripRe(x, strip_re): return re.sub(strip_re, "", x) self.binaries = [StripRe(x, dotslash_re) for x in stdout.splitlines()] + self.binaries = sorted(self.binaries) return self.binaries def GetAllFilenames(self): file_paths = self.GetAllFilePaths() - return [os.path.basename(f) for f in file_paths] + return sorted([os.path.basename(f) for f in file_paths]) def GetAllFilePaths(self): """Similar to GetAllFilenames, but returns full paths.""" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Mar 22 09:45:12 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 22 Mar 2010 08:45:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9319] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 9319 http://gar.svn.sourceforge.net/gar/?rev=9319&view=rev Author: hson Date: 2010-03-22 08:45:12 +0000 (Mon, 22 Mar 2010) Log Message: ----------- imagemagick: Add support for lqr Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-03-22 08:11:58 UTC (rev 9318) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-03-22 08:45:12 UTC (rev 9319) @@ -37,6 +37,7 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcairo RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfpx RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibice +RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblqr RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibsm RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibtoolrt 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 Mar 22 10:01:12 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 22 Mar 2010 09:01:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9320] csw/mgar/pkg/spamassassin/trunk Message-ID: Revision: 9320 http://gar.svn.sourceforge.net/gar/?rev=9320&view=rev Author: bonivart Date: 2010-03-22 09:01:11 +0000 (Mon, 22 Mar 2010) Log Message: ----------- spamassassin: update to 3.3.1 Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/checksums Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2010-03-22 08:45:12 UTC (rev 9319) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2010-03-22 09:01:11 UTC (rev 9320) @@ -1,6 +1,6 @@ GARNAME = spamassassin SPKG_NAME = Mail-SpamAssassin -GARVERSION = 3.3.0 +GARVERSION = 3.3.1 CATEGORIES = net DESCRIPTION = Mail filter with a wide range of tests @@ -37,8 +37,8 @@ CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom -#TEST_SCRIPTS = custom -TEST_SCRIPTS = +TEST_SCRIPTS = custom +#TEST_SCRIPTS = INSTALL_SCRIPTS = custom include gar/category.mk Modified: csw/mgar/pkg/spamassassin/trunk/checksums =================================================================== --- csw/mgar/pkg/spamassassin/trunk/checksums 2010-03-22 08:45:12 UTC (rev 9319) +++ csw/mgar/pkg/spamassassin/trunk/checksums 2010-03-22 09:01:11 UTC (rev 9320) @@ -1,2 +1,2 @@ 3b83ef96387f14655fc854ddc3c6bd57 COPYING -38078b07396c0ab92b46386bc70ef086 Mail-SpamAssassin-3.3.0.tar.gz +5a93f81fda315411560ff5da099382d2 Mail-SpamAssassin-3.3.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Mar 22 12:59:42 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 22 Mar 2010 11:59:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[9321] csw/mgar/pkg/gnomemedia/trunk/Makefile Message-ID: Revision: 9321 http://gar.svn.sourceforge.net/gar/?rev=9321&view=rev Author: bensons Date: 2010-03-22 11:59:42 +0000 (Mon, 22 Mar 2010) Log Message: ----------- gnomemedia: even more dependencies and a fix for the sparc build Modified Paths: -------------- csw/mgar/pkg/gnomemedia/trunk/Makefile Modified: csw/mgar/pkg/gnomemedia/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnomemedia/trunk/Makefile 2010-03-22 09:01:11 UTC (rev 9320) +++ csw/mgar/pkg/gnomemedia/trunk/Makefile 2010-03-22 11:59:42 UTC (rev 9321) @@ -21,9 +21,9 @@ RUNTIME_DEP_PKGS += CSWgstreamer CSWgtk2 CSWlibatk CSWlibcairo CSWlibglade2 RUNTIME_DEP_PKGS += CSWlibxml2 CSWpango CSWfconfig BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) CSWgtk2devel CSWlibxcbdevel CSWlibxcb -BUILD_DEP_PKGS += CSWlibpthreadstubs CSWlibxau CSWlibxaudevel CSWxproto -BUILD_DEP_PKGS += CSWrenderproto CSWkbproto CSWgnomedocutils CSWpylibxml2 -BUILD_DEP_PKGS += CSWscrollkeeper +BUILD_DEP_PKGS += CSWlibpthreadstubs CSWlibxau CSWlibxaudevel CSWx11xproto +BUILD_DEP_PKGS += CSWx11renderproto CSWx11kbproto CSWgnomedocutils CSWpylibxml2 +BUILD_DEP_PKGS += CSWscrollkeeper CSWintltool CSWlibxcbdevel CSWlibxdmcpdevel CONFIGURE_ARGS += $(DIRPATHS) @@ -53,3 +53,10 @@ gsed -i 's,GSR_LIBS=$$pkg_cv_GSR_LIBS,GSR_LIBS="$(ADD_X11_LIB) $$pkg_cv_GSR_LIBS",' $(WORKSRC)/configure gsed -i 's,GSTMIXER_LIBS=$$pkg_cv_GSTMIXER_LIBS,GSTMIXER_LIBS="$(ADD_X11_LIB) $$pkg_cv_GSTMIXER_LIBS -lm",' $(WORKSRC)/configure @$(MAKECOOKIE) + +pre-build-isa-sparcv8: + # why ist sparc 32bit xsltproc broken? just cores... + gsed -i 's,xsltproc,/opt/csw/bin/sparcv9/xsltproc,' $(WORKSRC)/grecord/doc/Makefile + gsed -i 's,xsltproc,/opt/csw/bin/sparcv9/xsltproc,' $(WORKSRC)/gst-mixer/doc/Makefile + gsed -i 's,xsltproc,/opt/csw/bin/sparcv9/xsltproc,' $(WORKSRC)/gstreamer-properties/help/Makefile + gsed -i 's,xsltproc,/opt/csw/bin/sparcv9/xsltproc,' $(WORKSRC)/profiles/help/Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Mar 22 15:02:20 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 22 Mar 2010 14:02:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9322] csw/mgar/pkg/x11/lib Message-ID: Revision: 9322 http://gar.svn.sourceforge.net/gar/?rev=9322&view=rev Author: bensons Date: 2010-03-22 14:02:20 +0000 (Mon, 22 Mar 2010) Log Message: ----------- libxklavier: initial GAR recipe Added Paths: ----------- csw/mgar/pkg/x11/lib/libxklavier/ csw/mgar/pkg/x11/lib/libxklavier/branches/ csw/mgar/pkg/x11/lib/libxklavier/tags/ csw/mgar/pkg/x11/lib/libxklavier/trunk/ csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile csw/mgar/pkg/x11/lib/libxklavier/trunk/checksums csw/mgar/pkg/x11/lib/libxklavier/trunk/files/ Property changes on: csw/mgar/pkg/x11/lib/libxklavier/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/lib/libxklavier/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile 2010-03-22 14:02:20 UTC (rev 9322) @@ -0,0 +1,47 @@ +GARNAME = libxklavier +GARVERSION = 5.0 +CATEGORIES = x11 + +DESCRIPTION = X11 high-level API for X Keyboard Extension +define BLURB + libxklavier is a library providing high-level API for X Keyboard + Extension known as XKB. This library is indended to support XFree86 + and other commercial X servers. It is useful for creating XKB-related + software (layout indicators etc). +endef + +MASTER_SITES = http://downloads.sourceforge.net/project/gswitchit/libxklavier/$(GARVERSION)/ +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 + +CONFIGURE_ARGS = $(DIRPATHS) + +PACKAGES = CSWlibxklavier CSWlibxklavierdevel + +CATALOGNAME_CSWlibxklavier = libxklavier +CATALOGNAME_CSWlibxklavierdevel = libxklavier_devel + +SPKG_DESC_CSWlibxklavier = $(DESCRIPTION) +SPKG_DESC_CSWlibxklavierdevel = $(DESCRIPTION) development files + +BUILD_DEP_PKGS = CSWiso-codes CSWlibxkbfiledevel CSWlibxml2devel CSWgtk-doc +RUNTIME_DEP_PKGS_CSWlibxklavier += CSWggettextrt CSWglib2 CSWlibx11 CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibxklavier += CSWlibxkbfile +RUNTIME_DEP_PKGS_CSWlibxklavierdevel += $(RUNTIME_DEP_PKGS_CSWlibxklavier) +RUNTIME_DEP_PKGS_CSWlibxklavierdevel += CSWlibxklavier + +PKGFILES_CSWlibxrandrdevel = $(PKGFILES_DEVEL) + +BUILD64 = 1 +NOISALIST = 1 +STRIP_LIBTOOL = 1 + +LICENSE = COPYING.LIB + +include gar/category.mk +pre-configure-modulated: + # remove GCCish + gsed -i 's/-Wall//' $(WORKSRC)/libxklavier/Makefile.in + @$(MAKECOOKIE) Added: csw/mgar/pkg/x11/lib/libxklavier/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxklavier/trunk/checksums (rev 0) +++ csw/mgar/pkg/x11/lib/libxklavier/trunk/checksums 2010-03-22 14:02:20 UTC (rev 9322) @@ -0,0 +1 @@ +134c7ea177ff901123b909de77394780 libxklavier-5.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Mar 22 15:25:36 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 22 Mar 2010 14:25:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9323] csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile Message-ID: Revision: 9323 http://gar.svn.sourceforge.net/gar/?rev=9323&view=rev Author: bensons Date: 2010-03-22 14:25:36 +0000 (Mon, 22 Mar 2010) Log Message: ----------- libxklavier: make sure we link against our X11 libraries Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile 2010-03-22 14:02:20 UTC (rev 9322) +++ csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile 2010-03-22 14:25:36 UTC (rev 9323) @@ -16,8 +16,6 @@ # 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) - PACKAGES = CSWlibxklavier CSWlibxklavierdevel CATALOGNAME_CSWlibxklavier = libxklavier @@ -40,6 +38,10 @@ LICENSE = COPYING.LIB +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --x-includes=$(includedir) +CONFIGURE_ARGS += --x-libraries=$(libdir) + include gar/category.mk pre-configure-modulated: # remove GCCish This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Mar 22 16:07:33 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 22 Mar 2010 15:07:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[9324] csw/mgar/pkg/x11/lib/libxklavier/trunk Message-ID: Revision: 9324 http://gar.svn.sourceforge.net/gar/?rev=9324&view=rev Author: bensons Date: 2010-03-22 15:07:32 +0000 (Mon, 22 Mar 2010) Log Message: ----------- libxklavier: downgrade to 4.0, libgnomekbd needs that.. *sigh* Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile csw/mgar/pkg/x11/lib/libxklavier/trunk/checksums Modified: csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile 2010-03-22 14:25:36 UTC (rev 9323) +++ csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile 2010-03-22 15:07:32 UTC (rev 9324) @@ -1,5 +1,5 @@ GARNAME = libxklavier -GARVERSION = 5.0 +GARVERSION = 4.0 CATEGORIES = x11 DESCRIPTION = X11 high-level API for X Keyboard Extension @@ -46,4 +46,8 @@ pre-configure-modulated: # remove GCCish gsed -i 's/-Wall//' $(WORKSRC)/libxklavier/Makefile.in + gsed -i 's/-Wall//' $(WORKSRC)/tests/Makefile.in + gsed -i 's/-Werror//' $(WORKSRC)/tests/Makefile.in + gsed -i 's,,,' $(WORKSRC)/tests/test_config.c + gsed -i 's,,,' $(WORKSRC)/tests/test_monitor.c @$(MAKECOOKIE) Modified: csw/mgar/pkg/x11/lib/libxklavier/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libxklavier/trunk/checksums 2010-03-22 14:25:36 UTC (rev 9323) +++ csw/mgar/pkg/x11/lib/libxklavier/trunk/checksums 2010-03-22 15:07:32 UTC (rev 9324) @@ -1 +1 @@ -134c7ea177ff901123b909de77394780 libxklavier-5.0.tar.bz2 +1b714ba04835fb49511f9e1444a5ea4c libxklavier-4.0.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 Mon Mar 22 21:02:20 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 22 Mar 2010 20:02:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9325] csw/mgar/pkg/joe/trunk/Makefile Message-ID: Revision: 9325 http://gar.svn.sourceforge.net/gar/?rev=9325&view=rev Author: dmichelsen Date: 2010-03-22 20:02:17 +0000 (Mon, 22 Mar 2010) Log Message: ----------- joe: Disable curses Modified Paths: -------------- csw/mgar/pkg/joe/trunk/Makefile Modified: csw/mgar/pkg/joe/trunk/Makefile =================================================================== --- csw/mgar/pkg/joe/trunk/Makefile 2010-03-22 15:07:32 UTC (rev 9324) +++ csw/mgar/pkg/joe/trunk/Makefile 2010-03-22 20:02:17 UTC (rev 9325) @@ -27,7 +27,8 @@ DEP_PKGS = CSWncurses sysconfdir = /etc/opt/csw -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-curses TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 22 21:09:23 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Mar 2010 20:09:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9326] csw/mgar/pkg/ncurses/trunk/Makefile Message-ID: Revision: 9326 http://gar.svn.sourceforge.net/gar/?rev=9326&view=rev Author: wahwah Date: 2010-03-22 20:09:09 +0000 (Mon, 22 Mar 2010) Log Message: ----------- ncurses: Separating CSWterminfo Modified Paths: -------------- csw/mgar/pkg/ncurses/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/ncurses/trunk/Makefile Modified: csw/mgar/pkg/ncurses/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncurses/trunk/Makefile 2010-03-22 20:02:17 UTC (rev 9325) +++ csw/mgar/pkg/ncurses/trunk/Makefile 2010-03-22 20:09:09 UTC (rev 9326) @@ -1,3 +1,5 @@ +# $Id$ + GARNAME = ncurses GARVERSION = 5.7 CATEGORIES = lib @@ -2,3 +4,2 @@ -DESCRIPTION = A free software emulation of curses define BLURB @@ -19,6 +20,11 @@ PATCHFILES = patch-xcode.diff LICENSE = README +PACKAGES = CSWncurses CSWterminfo +SPKG_DESC_CSWncurses = A free software emulation of curses +SPKG_DESC_CSWterminfo = Database of terminal information, part of ncurses +PKGFILES_CSWterminfo = $(datadir)/terminfo.* +ARCHALL_CSWterminfo = 1 SPKG_SOURCEURL = http://www.gnu.org/software/ncurses/ncurses.html @@ -67,6 +73,8 @@ MERGE_SCRIPTS_isa-amd64-widec-enable = copy-relocated-only copy-config-only MERGE_DIRS_isa-amd64-widec-enable = $(libdir) +RUNTIME_DEP_PKGS_CSWncurses = CSWterminfo + include gar/category.mk LDFLAGS := $(filter-out -L%,$(LDFLAGS)) Property changes on: csw/mgar/pkg/ncurses/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id 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 Mar 22 21:26:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 22 Mar 2010 20:26:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9327] csw/mgar/pkg/joe/trunk/Makefile Message-ID: Revision: 9327 http://gar.svn.sourceforge.net/gar/?rev=9327&view=rev Author: dmichelsen Date: 2010-03-22 20:26:43 +0000 (Mon, 22 Mar 2010) Log Message: ----------- joe: Remove ncurses dependency Modified Paths: -------------- csw/mgar/pkg/joe/trunk/Makefile Modified: csw/mgar/pkg/joe/trunk/Makefile =================================================================== --- csw/mgar/pkg/joe/trunk/Makefile 2010-03-22 20:09:09 UTC (rev 9326) +++ csw/mgar/pkg/joe/trunk/Makefile 2010-03-22 20:26:43 UTC (rev 9327) @@ -24,8 +24,6 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) -DEP_PKGS = CSWncurses - sysconfdir = /etc/opt/csw CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-curses This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Mar 23 00:27:13 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 22 Mar 2010 23:27:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9328] csw/mgar/pkg/magit/trunk/Makefile Message-ID: Revision: 9328 http://gar.svn.sourceforge.net/gar/?rev=9328&view=rev Author: bdwalton Date: 2010-03-22 23:27:13 +0000 (Mon, 22 Mar 2010) Log Message: ----------- magit: tweak description, add proper vendor url Modified Paths: -------------- csw/mgar/pkg/magit/trunk/Makefile Modified: csw/mgar/pkg/magit/trunk/Makefile =================================================================== --- csw/mgar/pkg/magit/trunk/Makefile 2010-03-22 20:26:43 UTC (rev 9327) +++ csw/mgar/pkg/magit/trunk/Makefile 2010-03-22 23:27:13 UTC (rev 9328) @@ -5,7 +5,9 @@ ARCHALL = 1 -DESCRIPTION = An Emacs Mode for Git +VENDOR_URL = http://zagadka.vm.bytemark.co.uk/magit/ + +DESCRIPTION = An Git Mode for Emacs define BLURB Magit is an interface to the version control system Git, implemented as an extension to Emacs. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Mar 23 01:49:08 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 23 Mar 2010 00:49:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9329] csw/mgar/pkg/ruby19/trunk Message-ID: Revision: 9329 http://gar.svn.sourceforge.net/gar/?rev=9329&view=rev Author: bdwalton Date: 2010-03-23 00:49:06 +0000 (Tue, 23 Mar 2010) Log Message: ----------- ruby19: tweak postinstall; add gcc4 rbconfig.rb versions Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ruby19/trunk/files/README.csw csw/mgar/pkg/ruby19/trunk/files/cswrbconfig csw/mgar/pkg/ruby19/trunk/files/rbconfig.rb.GCC4.i386 csw/mgar/pkg/ruby19/trunk/files/rbconfig.rb.GCC4.sparc Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-22 23:27:13 UTC (rev 9328) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-23 00:49:06 UTC (rev 9329) @@ -109,7 +109,7 @@ # Fix up rbconfig rbconfig: @gsed -i -e s,$(DESTDIR),, \ - $(DESTDIR)$(libdir)/$(GARNAME)/$(GARVERSION)/$(GARCH)-solaris2.8/rbconfig.rb + $(DESTDIR)$(libdir)/$(GARNAME)/$(GARVERSION)/$(GARCH)-solaris2.9/rbconfig.rb @$(MAKECOOKIE) # Copy samples Added: csw/mgar/pkg/ruby19/trunk/files/README.csw =================================================================== --- csw/mgar/pkg/ruby19/trunk/files/README.csw (rev 0) +++ csw/mgar/pkg/ruby19/trunk/files/README.csw 2010-03-23 00:49:06 UTC (rev 9329) @@ -0,0 +1,11 @@ +It is possible to switch rbconfig.rb files in order to use alternate +compilation options or even compilers. CSWruby19 ships with settings +for Sun Studio 11 (what ruby was built with) and GCC4. Our +distribution of ruby sees rbconfig.rb be a symlink to +rbconfig.rb.SOS11 by default. To switch your settings, use the +cswrbconfig19 tool provided. Running it with no arguments will +provide more details and list available configurations. + +Please file a bug on CSWruby19 if you have problems using this tool. + +Ben Walton Added: csw/mgar/pkg/ruby19/trunk/files/cswrbconfig =================================================================== --- csw/mgar/pkg/ruby19/trunk/files/cswrbconfig (rev 0) +++ csw/mgar/pkg/ruby19/trunk/files/cswrbconfig 2010-03-23 00:49:06 UTC (rev 9329) @@ -0,0 +1,54 @@ +#!/opt/csw/bin/ruby19 -w + +ARCH = %x{uname -p}.chomp +CONFD = "/opt/csw/lib/ruby/1.9.1/#{ARCH}-solaris2.8" +RBC = File.join(CONFD, "rbconfig.rb") +CUR_RBC = File.readlink(RBC).gsub(/.*\./, '') + +CONF_OPTS = Dir.glob("#{CONFD}/rbconfig.rb.*").map! { |c| c.gsub(/.*\./, '') } + +def usage(errstr) + puts "ERROR: #{errstr}" + puts <<-"EOF" + +Usage: #{File.basename($0)} + +This tool allows you to switch rbconfig.rb between options available +on your system. The benefit of this is that you can build native gems +using options other than those used to build Ruby itself (Sun Studio +11 -> sos11), including alternate compilers. + +rbconfig.rb is found in #{CONFD}. + +Existing options are determined by the presence of rbconfig.rb.FOO +files in #{CONFD}. + +The current value is: #{CUR_RBC} + +The options present on your system are: + EOF + + puts CONF_OPTS.join("\n") + exit(1) +end + +if ARGV.size.eql?(0) + usage("No argument specified.") +else + usage("Something is wrong with your rbconfig.rb symlink setup.") unless File.symlink?(RBC) and File.exists?(RBC) + + usage("No action required.") if CUR_RBC.eql?(ARGV[0]) + + usage("Invalid rbconfig option.") unless CONF_OPTS.include?(ARGV[0]) + + opt_rbc = RBC + '.' + ARGV[0] + + usage("Selection option is valid but there's something wrong with the file it refers to (#{opt_rbc}).") unless File.exists?(opt_rbc) and File.file?(opt_rbc) + + begin + File.unlink(RBC) + File.symlink(opt_rbc, RBC) + rescue + usage("Error while switching rbconfig.rb symlink. Please inspect the situation in #{CONFD}.") + end +end Property changes on: csw/mgar/pkg/ruby19/trunk/files/cswrbconfig ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/ruby19/trunk/files/rbconfig.rb.GCC4.i386 =================================================================== --- csw/mgar/pkg/ruby19/trunk/files/rbconfig.rb.GCC4.i386 (rev 0) +++ csw/mgar/pkg/ruby19/trunk/files/rbconfig.rb.GCC4.i386 2010-03-23 00:49:06 UTC (rev 9329) @@ -0,0 +1,196 @@ + +# This file was created by mkconfig.rb when ruby was built. Any +# changes made to this file will be lost the next time ruby is built. + +module RbConfig + RUBY_VERSION == "1.9.1" or + raise "ruby lib version (1.9.1) doesn't match executable version (#{RUBY_VERSION})" + + TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.9.1/i386-solaris2.9") + DESTDIR = '' unless defined? DESTDIR + CONFIG = {} + CONFIG["DESTDIR"] = DESTDIR + CONFIG["INSTALL"] = '/opt/csw/bin/ginstall -c' + CONFIG["EXEEXT"] = "" + CONFIG["prefix"] = (TOPDIR || DESTDIR + "/opt/csw") + CONFIG["ruby_install_name"] = "ruby19" + CONFIG["RUBY_INSTALL_NAME"] = "ruby19" + CONFIG["RUBY_SO_NAME"] = "ruby19" + CONFIG["BUILTIN_TRANSSRCS"] = " newline.c" + CONFIG["MANTYPE"] = "man" + CONFIG["NROFF"] = "/usr/bin/nroff" + CONFIG["vendorhdrdir"] = "$(rubyhdrdir)/vendor_ruby" + CONFIG["sitehdrdir"] = "$(rubyhdrdir)/site_ruby" + CONFIG["rubyhdrdir"] = "$(includedir)/$(RUBY_INSTALL_NAME)-$(ruby_version)" + CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--program-suffix=19' '--enable-pthread' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-mtune=i686 -O2 -pipe -m32 -march=i386' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/include' 'CXX=/opt/csw/gcc4/bin/g++' 'CXXFLAGS=-mtune=i686 -O2 -pipe -m32 -march=i386'" + CONFIG["vendordir"] = "$(libdir)/$(RUBY_INSTALL_NAME)/vendor_ruby" + CONFIG["sitedir"] = "$(libdir)/$(RUBY_INSTALL_NAME)/site_ruby" + CONFIG["ruby_version"] = "1.9.1" + CONFIG["sitearch"] = "i386-solaris2.9" + CONFIG["arch"] = "i386-solaris2.9" + CONFIG["MAKEFILES"] = "Makefile" + CONFIG["THREAD_MODEL"] = "pthread" + CONFIG["EXPORT_PREFIX"] = "" + CONFIG["COMMON_HEADERS"] = "" + CONFIG["COMMON_MACROS"] = "" + CONFIG["COMMON_LIBS"] = "" + CONFIG["MAINLIBS"] = "" + CONFIG["ENABLE_SHARED"] = "no" + CONFIG["DLDLIBS"] = " -lc" + CONFIG["SOLIBS"] = "" + CONFIG["LIBRUBYARG_SHARED"] = "-l$(RUBY_SO_NAME)" + CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static" + CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_STATIC)" + CONFIG["LIBRUBY"] = "$(LIBRUBY_A)" + CONFIG["LIBRUBY_ALIASES"] = "lib$(RUBY_SO_NAME).so" + CONFIG["LIBRUBY_SO"] = "lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY)" + CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a" + CONFIG["RUBYW_INSTALL_NAME"] = "" + CONFIG["rubyw_install_name"] = "" + CONFIG["LIBRUBY_DLDFLAGS"] = "" + CONFIG["LIBRUBY_LDSHARED"] = "$(CC) -shared" + CONFIG["warnflags"] = "-Wall -Wno-parentheses" + CONFIG["debugflags"] = "-g" + CONFIG["optflags"] = "-O2" + CONFIG["cflags"] = "$(optflags) $(debugflags) $(warnflags)" + CONFIG["cppflags"] = "-I/opt/csw/include" + CONFIG["RDOCTARGET"] = "install-doc" + CONFIG["ARCHFILE"] = "" + CONFIG["EXTOUT"] = ".ext" + CONFIG["PREP"] = "miniruby$(EXEEXT)" + CONFIG["setup"] = "Setup" + CONFIG["EXTSTATIC"] = "" + CONFIG["STRIP"] = "strip" + CONFIG["TRY_LINK"] = "" + CONFIG["LIBPATHENV"] = "LD_LIBRARY_PATH" + CONFIG["RPATHFLAG"] = "" + CONFIG["LIBPATHFLAG"] = " -L%s" + CONFIG["LINK_SO"] = "" + CONFIG["LIBEXT"] = "a" + CONFIG["DLEXT2"] = "" + CONFIG["DLEXT"] = "so" + CONFIG["LDSHAREDXX"] = "$(CXX) -shared" + CONFIG["LDSHARED"] = "$(CC) -shared" + CONFIG["CCDLFLAGS"] = " -fPIC" + CONFIG["STATIC"] = "" + CONFIG["ARCH_FLAG"] = "" + CONFIG["DLDFLAGS"] = "" + CONFIG["ALLOCA"] = "" + CONFIG["RMALL"] = "rm -fr" + CONFIG["RMDIRS"] = "$(top_srcdir)/tool/rmdirs" + CONFIG["MAKEDIRS"] = "mkdir -p" + CONFIG["CP"] = "cp" + CONFIG["RM"] = "rm -f" + CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644" + CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)" + CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)" + CONFIG["SET_MAKE"] = "" + CONFIG["LN_S"] = "ln -s" + CONFIG["DLLWRAP"] = "" + CONFIG["WINDRES"] = "" + CONFIG["NM"] = "" + CONFIG["OBJCOPY"] = "gobjcopy" + CONFIG["OBJDUMP"] = "gobjdump" + CONFIG["ASFLAGS"] = "" + CONFIG["AS"] = "as" + CONFIG["AR"] = "ar" + CONFIG["RANLIB"] = "ranlib" + CONFIG["COUTFLAG"] = "-o " + CONFIG["OUTFLAG"] = "-o " + CONFIG["CPPOUTFILE"] = "-o conftest.i" + CONFIG["GNU_LD"] = "no" + CONFIG["EGREP"] = "/opt/csw/bin/ggrep -E" + CONFIG["GREP"] = "/opt/csw/bin/ggrep" + CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E" + CONFIG["CXXFLAGS"] = "-mtune=i686 -O2 -pipe -m32 -march=i386 $(cxxflags)" + CONFIG["CXX"] = "/opt/csw/gcc4/bin/g++" + CONFIG["OBJEXT"] = "o" + CONFIG["CPPFLAGS"] = "-I/opt/csw/include $(DEFS) $(cppflags)" + CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib" + CONFIG["CFLAGS"] = "-mtune=i686 -O2 -pipe -m32 -march=i386 $(cflags)" + CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc" + CONFIG["target_os"] = "solaris2.9" + CONFIG["target_vendor"] = "pc" + CONFIG["target_cpu"] = "i386" + CONFIG["target"] = "i386-pc-solaris2.9" + CONFIG["host_os"] = "solaris2.9" + CONFIG["host_vendor"] = "pc" + CONFIG["host_cpu"] = "i386" + CONFIG["host"] = "i386-pc-solaris2.9" + CONFIG["build_os"] = "solaris2.9" + CONFIG["build_vendor"] = "pc" + CONFIG["build_cpu"] = "i386" + CONFIG["build"] = "i386-pc-solaris2.9" + CONFIG["TEENY"] = "1" + CONFIG["MINOR"] = "9" + CONFIG["MAJOR"] = "1" + CONFIG["BASERUBY"] = "ruby" + CONFIG["target_alias"] = "" + CONFIG["host_alias"] = "" + CONFIG["build_alias"] = "" + CONFIG["LIBS"] = "-lpthread -lrt -lsocket -ldl -lcrypt -lm " + CONFIG["ECHO_T"] = "" + CONFIG["ECHO_N"] = "-n" + CONFIG["ECHO_C"] = "" + CONFIG["DEFS"] = "-D_FILE_OFFSET_BITS=64" + CONFIG["mandir"] = "$(DESTDIR)/opt/csw/share/man" + CONFIG["localedir"] = "$(datarootdir)/locale" + CONFIG["libdir"] = "$(DESTDIR)/opt/csw/lib" + CONFIG["psdir"] = "$(docdir)" + CONFIG["pdfdir"] = "$(docdir)" + CONFIG["dvidir"] = "$(docdir)" + CONFIG["htmldir"] = "$(docdir)" + CONFIG["infodir"] = "$(DESTDIR)/opt/csw/share/info" + CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)" + CONFIG["oldincludedir"] = "/usr/include" + CONFIG["includedir"] = "$(DESTDIR)/opt/csw/include" + CONFIG["localstatedir"] = "$(DESTDIR)/opt/csw/var" + CONFIG["sharedstatedir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["sysconfdir"] = "$(DESTDIR)/opt/csw/etc" + CONFIG["datadir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["datarootdir"] = "$(prefix)/share" + CONFIG["libexecdir"] = "$(DESTDIR)/opt/csw/libexec" + CONFIG["sbindir"] = "$(DESTDIR)/opt/csw/sbin" + CONFIG["bindir"] = "$(DESTDIR)/opt/csw/bin" + CONFIG["exec_prefix"] = "$(DESTDIR)/opt/csw" + CONFIG["PACKAGE_URL"] = "" + CONFIG["PACKAGE_BUGREPORT"] = "" + CONFIG["PACKAGE_STRING"] = "" + CONFIG["PACKAGE_VERSION"] = "" + CONFIG["PACKAGE_TARNAME"] = "" + CONFIG["PACKAGE_NAME"] = "" + CONFIG["PATH_SEPARATOR"] = ":" + CONFIG["SHELL"] = "/bin/bash" + CONFIG["rubylibdir"] = "$(libdir)/$(ruby_install_name)/$(ruby_version)" + CONFIG["archdir"] = "$(rubylibdir)/$(arch)" + CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)" + CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)" + CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)" + CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)" + CONFIG["topdir"] = File.dirname(__FILE__) + MAKEFILE_CONFIG = {} + CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} + def RbConfig::expand(val, config = CONFIG) + val.gsub!(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) do + var = $& + if !(v = $1 || $2) + '$' + elsif key = config[v = v[/\A[^:]+(?=(?::(.*?)=(.*))?\z)/]] + pat, sub = $1, $2 + config[v] = false + RbConfig::expand(key, config) + config[v] = key + key = key.gsub(/#{Regexp.quote(pat)}(?=\s|\z)/n) {sub} if pat + key + else + var + end + end + val + end + CONFIG.each_value do |val| + RbConfig::expand(val) + end +end +Config = RbConfig # compatibility for ruby-1.8.4 and older. +CROSS_COMPILING = nil unless defined? CROSS_COMPILING Added: csw/mgar/pkg/ruby19/trunk/files/rbconfig.rb.GCC4.sparc =================================================================== --- csw/mgar/pkg/ruby19/trunk/files/rbconfig.rb.GCC4.sparc (rev 0) +++ csw/mgar/pkg/ruby19/trunk/files/rbconfig.rb.GCC4.sparc 2010-03-23 00:49:06 UTC (rev 9329) @@ -0,0 +1,196 @@ + +# This file was created by mkconfig.rb when ruby was built. Any +# changes made to this file will be lost the next time ruby is built. + +module RbConfig + RUBY_VERSION == "1.9.1" or + raise "ruby lib version (1.9.1) doesn't match executable version (#{RUBY_VERSION})" + + TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.9.1/sparc-solaris2.9") + DESTDIR = '' unless defined? DESTDIR + CONFIG = {} + CONFIG["DESTDIR"] = DESTDIR + CONFIG["INSTALL"] = '/opt/csw/bin/ginstall -c' + CONFIG["EXEEXT"] = "" + CONFIG["prefix"] = (TOPDIR || DESTDIR + "/opt/csw") + CONFIG["ruby_install_name"] = "ruby19" + CONFIG["RUBY_INSTALL_NAME"] = "ruby19" + CONFIG["RUBY_SO_NAME"] = "ruby19" + CONFIG["BUILTIN_TRANSSRCS"] = " newline.c" + CONFIG["MANTYPE"] = "man" + CONFIG["NROFF"] = "/usr/bin/nroff" + CONFIG["vendorhdrdir"] = "$(rubyhdrdir)/vendor_ruby" + CONFIG["sitehdrdir"] = "$(rubyhdrdir)/site_ruby" + CONFIG["rubyhdrdir"] = "$(includedir)/$(RUBY_INSTALL_NAME)-$(ruby_version)" + CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--program-suffix=19' '--enable-pthread' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-O2 -pipe -mcpu=v8' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/include' 'CXX=/opt/csw/gcc4/bin/g++' 'CXXFLAGS=-O2 -pipe -mcpu=v8'" + CONFIG["vendordir"] = "$(libdir)/$(RUBY_INSTALL_NAME)/vendor_ruby" + CONFIG["sitedir"] = "$(libdir)/$(RUBY_INSTALL_NAME)/site_ruby" + CONFIG["ruby_version"] = "1.9.1" + CONFIG["sitearch"] = "sparc-solaris2.9" + CONFIG["arch"] = "sparc-solaris2.9" + CONFIG["MAKEFILES"] = "Makefile" + CONFIG["THREAD_MODEL"] = "pthread" + CONFIG["EXPORT_PREFIX"] = "" + CONFIG["COMMON_HEADERS"] = "" + CONFIG["COMMON_MACROS"] = "" + CONFIG["COMMON_LIBS"] = "" + CONFIG["MAINLIBS"] = "" + CONFIG["ENABLE_SHARED"] = "no" + CONFIG["DLDLIBS"] = " -lc" + CONFIG["SOLIBS"] = "" + CONFIG["LIBRUBYARG_SHARED"] = "-l$(RUBY_SO_NAME)" + CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static" + CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_STATIC)" + CONFIG["LIBRUBY"] = "$(LIBRUBY_A)" + CONFIG["LIBRUBY_ALIASES"] = "lib$(RUBY_SO_NAME).so" + CONFIG["LIBRUBY_SO"] = "lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY)" + CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a" + CONFIG["RUBYW_INSTALL_NAME"] = "" + CONFIG["rubyw_install_name"] = "" + CONFIG["LIBRUBY_DLDFLAGS"] = "" + CONFIG["LIBRUBY_LDSHARED"] = "$(CC) -shared" + CONFIG["warnflags"] = "-Wall -Wno-parentheses" + CONFIG["debugflags"] = "-g" + CONFIG["optflags"] = "-O2" + CONFIG["cflags"] = "$(optflags) $(debugflags) $(warnflags)" + CONFIG["cppflags"] = "-I/opt/csw/include" + CONFIG["RDOCTARGET"] = "install-doc" + CONFIG["ARCHFILE"] = "" + CONFIG["EXTOUT"] = ".ext" + CONFIG["PREP"] = "miniruby$(EXEEXT)" + CONFIG["setup"] = "Setup" + CONFIG["EXTSTATIC"] = "" + CONFIG["STRIP"] = "strip" + CONFIG["TRY_LINK"] = "" + CONFIG["LIBPATHENV"] = "LD_LIBRARY_PATH" + CONFIG["RPATHFLAG"] = "" + CONFIG["LIBPATHFLAG"] = " -L%s" + CONFIG["LINK_SO"] = "" + CONFIG["LIBEXT"] = "a" + CONFIG["DLEXT2"] = "" + CONFIG["DLEXT"] = "so" + CONFIG["LDSHAREDXX"] = "$(CXX) -shared" + CONFIG["LDSHARED"] = "$(CC) -shared" + CONFIG["CCDLFLAGS"] = " -fPIC" + CONFIG["STATIC"] = "" + CONFIG["ARCH_FLAG"] = "" + CONFIG["DLDFLAGS"] = "" + CONFIG["ALLOCA"] = "" + CONFIG["RMALL"] = "rm -fr" + CONFIG["RMDIRS"] = "$(top_srcdir)/tool/rmdirs" + CONFIG["MAKEDIRS"] = "mkdir -p" + CONFIG["CP"] = "cp" + CONFIG["RM"] = "rm -f" + CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644" + CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)" + CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)" + CONFIG["SET_MAKE"] = "" + CONFIG["LN_S"] = "ln -s" + CONFIG["DLLWRAP"] = "" + CONFIG["WINDRES"] = "" + CONFIG["NM"] = "" + CONFIG["OBJCOPY"] = "gobjcopy" + CONFIG["OBJDUMP"] = "gobjdump" + CONFIG["ASFLAGS"] = "" + CONFIG["AS"] = "as" + CONFIG["AR"] = "ar" + CONFIG["RANLIB"] = "ranlib" + CONFIG["COUTFLAG"] = "-o " + CONFIG["OUTFLAG"] = "-o " + CONFIG["CPPOUTFILE"] = "-o conftest.i" + CONFIG["GNU_LD"] = "no" + CONFIG["EGREP"] = "/opt/csw/bin/ggrep -E" + CONFIG["GREP"] = "/opt/csw/bin/ggrep" + CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E" + CONFIG["CXXFLAGS"] = "-O2 -pipe -mcpu=v8 $(cxxflags)" + CONFIG["CXX"] = "/opt/csw/gcc4/bin/g++" + CONFIG["OBJEXT"] = "o" + CONFIG["CPPFLAGS"] = "-I/opt/csw/include $(DEFS) $(cppflags)" + CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/lib" + CONFIG["CFLAGS"] = "-O2 -pipe -mcpu=v8 $(cflags)" + CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc" + CONFIG["target_os"] = "solaris2.9" + CONFIG["target_vendor"] = "sun" + CONFIG["target_cpu"] = "sparc" + CONFIG["target"] = "sparc-sun-solaris2.9" + CONFIG["host_os"] = "solaris2.9" + CONFIG["host_vendor"] = "sun" + CONFIG["host_cpu"] = "sparc" + CONFIG["host"] = "sparc-sun-solaris2.9" + CONFIG["build_os"] = "solaris2.9" + CONFIG["build_vendor"] = "sun" + CONFIG["build_cpu"] = "sparc" + CONFIG["build"] = "sparc-sun-solaris2.9" + CONFIG["TEENY"] = "1" + CONFIG["MINOR"] = "9" + CONFIG["MAJOR"] = "1" + CONFIG["BASERUBY"] = "ruby" + CONFIG["target_alias"] = "" + CONFIG["host_alias"] = "" + CONFIG["build_alias"] = "" + CONFIG["LIBS"] = "-lpthread -lrt -lsocket -ldl -lcrypt -lm " + CONFIG["ECHO_T"] = "" + CONFIG["ECHO_N"] = "-n" + CONFIG["ECHO_C"] = "" + CONFIG["DEFS"] = "-D_FILE_OFFSET_BITS=64" + CONFIG["mandir"] = "$(DESTDIR)/opt/csw/share/man" + CONFIG["localedir"] = "$(datarootdir)/locale" + CONFIG["libdir"] = "$(DESTDIR)/opt/csw/lib" + CONFIG["psdir"] = "$(docdir)" + CONFIG["pdfdir"] = "$(docdir)" + CONFIG["dvidir"] = "$(docdir)" + CONFIG["htmldir"] = "$(docdir)" + CONFIG["infodir"] = "$(DESTDIR)/opt/csw/share/info" + CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)" + CONFIG["oldincludedir"] = "/usr/include" + CONFIG["includedir"] = "$(DESTDIR)/opt/csw/include" + CONFIG["localstatedir"] = "$(DESTDIR)/opt/csw/var" + CONFIG["sharedstatedir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["sysconfdir"] = "$(DESTDIR)/opt/csw/etc" + CONFIG["datadir"] = "$(DESTDIR)/opt/csw/share" + CONFIG["datarootdir"] = "$(prefix)/share" + CONFIG["libexecdir"] = "$(DESTDIR)/opt/csw/libexec" + CONFIG["sbindir"] = "$(DESTDIR)/opt/csw/sbin" + CONFIG["bindir"] = "$(DESTDIR)/opt/csw/bin" + CONFIG["exec_prefix"] = "$(DESTDIR)/opt/csw" + CONFIG["PACKAGE_URL"] = "" + CONFIG["PACKAGE_BUGREPORT"] = "" + CONFIG["PACKAGE_STRING"] = "" + CONFIG["PACKAGE_VERSION"] = "" + CONFIG["PACKAGE_TARNAME"] = "" + CONFIG["PACKAGE_NAME"] = "" + CONFIG["PATH_SEPARATOR"] = ":" + CONFIG["SHELL"] = "/bin/bash" + CONFIG["rubylibdir"] = "$(libdir)/$(ruby_install_name)/$(ruby_version)" + CONFIG["archdir"] = "$(rubylibdir)/$(arch)" + CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)" + CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)" + CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)" + CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)" + CONFIG["topdir"] = File.dirname(__FILE__) + MAKEFILE_CONFIG = {} + CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} + def RbConfig::expand(val, config = CONFIG) + val.gsub!(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) do + var = $& + if !(v = $1 || $2) + '$' + elsif key = config[v = v[/\A[^:]+(?=(?::(.*?)=(.*))?\z)/]] + pat, sub = $1, $2 + config[v] = false + RbConfig::expand(key, config) + config[v] = key + key = key.gsub(/#{Regexp.quote(pat)}(?=\s|\z)/n) {sub} if pat + key + else + var + end + end + val + end + CONFIG.each_value do |val| + RbConfig::expand(val) + end +end +Config = RbConfig # compatibility for ruby-1.8.4 and older. +CROSS_COMPILING = nil unless defined? CROSS_COMPILING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Mar 23 03:15:38 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 23 Mar 2010 02:15:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[9330] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9330 http://gar.svn.sourceforge.net/gar/?rev=9330&view=rev Author: bdwalton Date: 2010-03-23 02:15:38 +0000 (Tue, 23 Mar 2010) Log Message: ----------- ruby19: use sos12 now that we build on sol9 Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-23 00:49:06 UTC (rev 9329) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-23 02:15:38 UTC (rev 9330) @@ -79,7 +79,8 @@ # proper setting. EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR)) else -SOS11_LD_FLAGS = +GARCOMPILER = SOS12 +SOS12_LD_FLAGS = endif include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 23 10:54:48 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 23 Mar 2010 09:54:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9331] csw/mgar/pkg/twisted/trunk Message-ID: Revision: 9331 http://gar.svn.sourceforge.net/gar/?rev=9331&view=rev Author: wahwah Date: 2010-03-23 09:54:48 +0000 (Tue, 23 Mar 2010) Log Message: ----------- twisted: Upgrade to 9.0 Modified Paths: -------------- csw/mgar/pkg/twisted/trunk/Makefile csw/mgar/pkg/twisted/trunk/checksums Modified: csw/mgar/pkg/twisted/trunk/Makefile =================================================================== --- csw/mgar/pkg/twisted/trunk/Makefile 2010-03-23 02:15:38 UTC (rev 9330) +++ csw/mgar/pkg/twisted/trunk/Makefile 2010-03-23 09:54:48 UTC (rev 9331) @@ -3,10 +3,10 @@ # $Id$ GARNAME = twisted -MAJ_VERSION = 8.2 +MAJ_VERSION = 9.0 PATCHLEVEL = 0 GARVERSION = $(MAJ_VERSION).$(PATCHLEVEL) -CATEGORIES = lib +CATEGORIES = python DESCRIPTION = An event-driven networking engine define BLURB @@ -15,37 +15,12 @@ mail servers, and more. endef -DLOAD_NAME = Twisted +UPSTREAM_NAME = Twisted +DISTNAME = $(UPSTREAM_NAME)-$(GARVERSION) +MASTER_SITES = http://tmrc.mit.edu/mirror/$(GARNAME)/$(UPSTREAM_NAME)/$(MAJ_VERSION)/ +DISTFILES = $(DISTNAME).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +TEST_SCRIPTS = +LICENSE = LICENSE -MASTER_SITES = http://tmrc.mit.edu/mirror/$(GARNAME)/$(DLOAD_NAME)/$(MAJ_VERSION)/ -DISTFILES = $(DLOAD_NAME)-$(GARVERSION).tar.bz2 - -WORKSRC = $(WORKDIR)/$(DLOAD_NAME)-$(GARVERSION) -SPKG_CLASSES = none cswpycompile -RUNTIME_DEP_PKGS = CSWcswclassutils CSWpython CSWpython-rt - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = twisted -TEST_SCRIPTS = -INSTALL_SCRIPTS = twisted - -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } \ - { print }' - -build-twisted: - (cd $(WORKSRC); python setup.py build) - @$(MAKECOOKIE) - -install-twisted: - (cd $(WORKSRC); python setup.py install --root=$(DESTDIR)) - @$(MAKECOOKIE) - -post-install-modulated: - gfind $(DESTDIR) -type f -name '*.pyc' -exec rm {} \; - @$(MAKECOOKIE) - include gar/category.mk Modified: csw/mgar/pkg/twisted/trunk/checksums =================================================================== --- csw/mgar/pkg/twisted/trunk/checksums 2010-03-23 02:15:38 UTC (rev 9330) +++ csw/mgar/pkg/twisted/trunk/checksums 2010-03-23 09:54:48 UTC (rev 9331) @@ -1,2 +1 @@ -c85f151999df3ecf04c49a781b4438d2 download/Twisted-8.2.0.tar.bz2 - +93fc2756a09ffd1350c046cc940e4311 Twisted-9.0.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 23 11:39:28 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 23 Mar 2010 10:39:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[9332] csw/mgar/pkg/pysvn/trunk Message-ID: Revision: 9332 http://gar.svn.sourceforge.net/gar/?rev=9332&view=rev Author: wahwah Date: 2010-03-23 10:39:27 +0000 (Tue, 23 Mar 2010) Log Message: ----------- pysvn: Adding CSWpython dependency, adding license. Modified Paths: -------------- csw/mgar/pkg/pysvn/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/pysvn/trunk/ Property changes on: csw/mgar/pkg/pysvn/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/pysvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysvn/trunk/Makefile 2010-03-23 09:54:48 UTC (rev 9331) +++ csw/mgar/pkg/pysvn/trunk/Makefile 2010-03-23 10:39:27 UTC (rev 9332) @@ -5,7 +5,7 @@ GARNAME = pysvn GARVERSION = 1.7.1 CATEGORIES = lib -DESCRIPTION = python +DESCRIPTION = Python SVN Extension and WorkBench GUI define BLURB The pysvn project's goal is to enable Tools to be written in Python that use @@ -33,10 +33,12 @@ PATCHFILES += 0008-gid-in-two-more-places.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +LICENSE = LICENSE.txt RUNTIME_DEP_PKGS = CSWexpat RUNTIME_DEP_PKGS += CSWgcc4corert RUNTIME_DEP_PKGS += CSWgcc4g++rt RUNTIME_DEP_PKGS += CSWneon +RUNTIME_DEP_PKGS += CSWpython RUNTIME_DEP_PKGS += CSWsvn BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWsvn-devel CSWapache2-devel CSWbash This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 23 11:56:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 23 Mar 2010 10:56:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9333] csw/mgar/pkg Message-ID: Revision: 9333 http://gar.svn.sourceforge.net/gar/?rev=9333&view=rev Author: wahwah Date: 2010-03-23 10:56:44 +0000 (Tue, 23 Mar 2010) Log Message: ----------- progressbar: Initial commit Modified Paths: -------------- csw/mgar/pkg/progressbar/trunk/Makefile csw/mgar/pkg/progressbar/trunk/checksums Added Paths: ----------- csw/mgar/pkg/progressbar/ Modified: csw/mgar/pkg/progressbar/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-03-13 18:13:13 UTC (rev 9142) +++ csw/mgar/pkg/progressbar/trunk/Makefile 2010-03-23 10:56:44 UTC (rev 9333) @@ -2,184 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = progressbar +GARVERSION = 2.2 +CATEGORIES = python +DESCRIPTION = Text progressbar library for Python define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://pypi.python.org/pypi/progressbar +MASTER_SITES = http://pypi.python.org/packages/source/p/progressbar/ 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 -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +LICENSE = LICENSE +TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +PACKAGES = CSWpy-progressbar +CATALOGNAME_CSWpy-progressbar = py_progressbar +ARCHALL_CSWpy-progressbar = 1 +include gar/category.mk Modified: csw/mgar/pkg/progressbar/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-03-13 18:13:13 UTC (rev 9142) +++ csw/mgar/pkg/progressbar/trunk/checksums 2010-03-23 10:56:44 UTC (rev 9333) @@ -0,0 +1 @@ +8ea4e2c17a8ec9e7d153767c5f2a7b28 progressbar-2.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Mar 23 13:31:36 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 23 Mar 2010 12:31:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9334] csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile Message-ID: Revision: 9334 http://gar.svn.sourceforge.net/gar/?rev=9334&view=rev Author: bensons Date: 2010-03-23 12:31:36 +0000 (Tue, 23 Mar 2010) Log Message: ----------- mod_perl2: removed a dependency Modified Paths: -------------- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile Modified: csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-03-23 10:56:44 UTC (rev 9333) +++ csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-03-23 12:31:36 UTC (rev 9334) @@ -27,9 +27,9 @@ PACKAGES = CSWap2modperl CATALOGNAME = ap2_modperl -RUNTIME_DEP_PKGS = CSWapache2 CSWapache2rt CSWexpat CSWiconv +RUNTIME_DEP_PKGS = CSWapache2rt CSWexpat CSWiconv RUNTIME_DEP_PKGS += CSWbdb CSWoldaprt -#BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CONFIGURE_ARGS = MP_APXS=$(prefix)/apache2/sbin/apxs CONFIGURE_ARGS += MP_PROMPT_DEFAULT=1 @@ -43,6 +43,8 @@ INSTALL_SCRIPTS = custom +LICENSE = LICENSE + include gar/category.mk LDFLAGS += -L$(prefix)/bdb44/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Mar 23 13:36:30 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 23 Mar 2010 12:36:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9335] csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile Message-ID: Revision: 9335 http://gar.svn.sourceforge.net/gar/?rev=9335&view=rev Author: bensons Date: 2010-03-23 12:36:29 +0000 (Tue, 23 Mar 2010) Log Message: ----------- mod_perl2: move dependency from CSWbdb to CSWbdb47 Modified Paths: -------------- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile Modified: csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-03-23 12:31:36 UTC (rev 9334) +++ csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-03-23 12:36:29 UTC (rev 9335) @@ -28,7 +28,7 @@ CATALOGNAME = ap2_modperl RUNTIME_DEP_PKGS = CSWapache2rt CSWexpat CSWiconv -RUNTIME_DEP_PKGS += CSWbdb CSWoldaprt +RUNTIME_DEP_PKGS += CSWbdb47 CSWoldaprt BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CONFIGURE_ARGS = MP_APXS=$(prefix)/apache2/sbin/apxs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Mar 23 13:45:30 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 23 Mar 2010 12:45:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9336] csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile Message-ID: Revision: 9336 http://gar.svn.sourceforge.net/gar/?rev=9336&view=rev Author: bensons Date: 2010-03-23 12:45:30 +0000 (Tue, 23 Mar 2010) Log Message: ----------- mod_perl2: well we still need CSWbdb.. Modified Paths: -------------- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile Modified: csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-03-23 12:36:29 UTC (rev 9335) +++ csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-03-23 12:45:30 UTC (rev 9336) @@ -28,7 +28,7 @@ CATALOGNAME = ap2_modperl RUNTIME_DEP_PKGS = CSWapache2rt CSWexpat CSWiconv -RUNTIME_DEP_PKGS += CSWbdb47 CSWoldaprt +RUNTIME_DEP_PKGS += CSWbdb CSWbdb47 CSWoldaprt BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CONFIGURE_ARGS = MP_APXS=$(prefix)/apache2/sbin/apxs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Mar 23 14:22:20 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 23 Mar 2010 13:22:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9337] csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile Message-ID: Revision: 9337 http://gar.svn.sourceforge.net/gar/?rev=9337&view=rev Author: bensons Date: 2010-03-23 13:22:20 +0000 (Tue, 23 Mar 2010) Log Message: ----------- mod_perl2: so removed CSWbdb again, using CSWbdb47 exclusively. Thats the way to go.. Modified Paths: -------------- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile Modified: csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-03-23 12:45:30 UTC (rev 9336) +++ csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile 2010-03-23 13:22:20 UTC (rev 9337) @@ -27,8 +27,8 @@ PACKAGES = CSWap2modperl CATALOGNAME = ap2_modperl -RUNTIME_DEP_PKGS = CSWapache2rt CSWexpat CSWiconv -RUNTIME_DEP_PKGS += CSWbdb CSWbdb47 CSWoldaprt +RUNTIME_DEP_PKGS += CSWapache2rt CSWexpat CSWiconv +RUNTIME_DEP_PKGS += CSWbdb47 CSWoldaprt BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CONFIGURE_ARGS = MP_APXS=$(prefix)/apache2/sbin/apxs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Tue Mar 23 16:19:51 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 23 Mar 2010 15:19:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[9338] csw/mgar/pkg/tkcvs/trunk Message-ID: Revision: 9338 http://gar.svn.sourceforge.net/gar/?rev=9338&view=rev Author: opk Date: 2010-03-23 15:19:51 +0000 (Tue, 23 Mar 2010) Log Message: ----------- update for tkcvs 8.2.1 Modified Paths: -------------- csw/mgar/pkg/tkcvs/trunk/Makefile csw/mgar/pkg/tkcvs/trunk/checksums Modified: csw/mgar/pkg/tkcvs/trunk/Makefile =================================================================== --- csw/mgar/pkg/tkcvs/trunk/Makefile 2010-03-23 13:22:20 UTC (rev 9337) +++ csw/mgar/pkg/tkcvs/trunk/Makefile 2010-03-23 15:19:51 UTC (rev 9338) @@ -1,5 +1,5 @@ GARNAME = tkcvs -GARVERSION = 8.2 +GARVERSION = 8.2.1 CATEGORIES = apps DESCRIPTION = A graphical front-end to CVS and Subversion Modified: csw/mgar/pkg/tkcvs/trunk/checksums =================================================================== --- csw/mgar/pkg/tkcvs/trunk/checksums 2010-03-23 13:22:20 UTC (rev 9337) +++ csw/mgar/pkg/tkcvs/trunk/checksums 2010-03-23 15:19:51 UTC (rev 9338) @@ -1 +1 @@ -f263e59233625145a4efc38b14241e0c download/tkcvs_8_2.tar.gz +7bbe24d80ebd7f0504a5b36e92541f43 download/tkcvs_8_2_1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Mar 23 17:40:11 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 23 Mar 2010 16:40:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9339] csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile Message-ID: Revision: 9339 http://gar.svn.sourceforge.net/gar/?rev=9339&view=rev Author: bensons Date: 2010-03-23 16:40:11 +0000 (Tue, 23 Mar 2010) Log Message: ----------- libxklavier: fixed typo for PKGFILES_DEVEL Modified Paths: -------------- csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile Modified: csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile 2010-03-23 15:19:51 UTC (rev 9338) +++ csw/mgar/pkg/x11/lib/libxklavier/trunk/Makefile 2010-03-23 16:40:11 UTC (rev 9339) @@ -30,7 +30,7 @@ RUNTIME_DEP_PKGS_CSWlibxklavierdevel += $(RUNTIME_DEP_PKGS_CSWlibxklavier) RUNTIME_DEP_PKGS_CSWlibxklavierdevel += CSWlibxklavier -PKGFILES_CSWlibxrandrdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxklavierdevel = $(PKGFILES_DEVEL) BUILD64 = 1 NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Mar 23 17:48:26 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 23 Mar 2010 16:48:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[9340] csw/mgar/pkg Message-ID: Revision: 9340 http://gar.svn.sourceforge.net/gar/?rev=9340&view=rev Author: bensons Date: 2010-03-23 16:48:25 +0000 (Tue, 23 Mar 2010) Log Message: ----------- libgnomekbd: initial GAR recipe Added Paths: ----------- csw/mgar/pkg/libgnomekbd/ csw/mgar/pkg/libgnomekbd/branches/ csw/mgar/pkg/libgnomekbd/tags/ csw/mgar/pkg/libgnomekbd/trunk/ csw/mgar/pkg/libgnomekbd/trunk/Makefile csw/mgar/pkg/libgnomekbd/trunk/checksums csw/mgar/pkg/libgnomekbd/trunk/files/ Property changes on: csw/mgar/pkg/libgnomekbd/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/libgnomekbd/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnomekbd/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgnomekbd/trunk/Makefile 2010-03-23 16:48:25 UTC (rev 9340) @@ -0,0 +1,74 @@ +GARNAME = libgnomekbd +GARVERSION = 2.28.2 +CATEGORIES = gnome + +DESCRIPTION = Package contains xkb hooks used by the GNOME desktop. +define BLURB + blubb +endef + +MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/libgnomekbd/2.28/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PACKAGES = CSWgnomemedia +CATALOGNAME = gnomemedia + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +RUNTIME_DEP_PKGS += CSWdbusglib +RUNTIME_DEP_PKGS += CSWfconfig +RUNTIME_DEP_PKGS += CSWftype2 +RUNTIME_DEP_PKGS += CSWgconf2 +RUNTIME_DEP_PKGS += CSWggettextrt +RUNTIME_DEP_PKGS += CSWglib2 +RUNTIME_DEP_PKGS += CSWgtk2 +RUNTIME_DEP_PKGS += CSWlibatk +RUNTIME_DEP_PKGS += CSWlibcairo +RUNTIME_DEP_PKGS += CSWlibdbus +RUNTIME_DEP_PKGS += CSWlibx11 +RUNTIME_DEP_PKGS += CSWlibxklavier +RUNTIME_DEP_PKGS += CSWlibxml2 +RUNTIME_DEP_PKGS += CSWpango + +BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) +BUILD_DEP_PKGS += CSWlibglade2 +BUILD_DEP_PKGS += CSWgtk2devel +BUILD_DEP_PKGS += CSWlibxcb CSWlibxcbdevel +BUILD_DEP_PKGS += CSWlibpthreadstubs +BUILD_DEP_PKGS += CSWlibxau CSWlibxaudevel +BUILD_DEP_PKGS += CSWxproto +BUILD_DEP_PKGS += CSWlibxklavierdevel +BUILD_DEP_PKGS += CSWkbproto +BUILD_DEP_PKGS += CSWgnomedocutils +BUILD_DEP_PKGS += CSWscrollkeeper + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib/$(MM_LIBDIR) + +STRIP_LIBTOOL = 1 + +TEST_SCRIPTS = + +EXTRA_LIB += /opt/csw/X11/lib + +LICENSE = COPYING.LIB + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) + +pre-configure-modulated: + # patch away GNUish + gsed -i 's,-Wall,,' $(WORKSRC)/libgnomekbd/Makefile.in + gsed -i 's,-Wall,,' $(WORKSRC)/capplet/Makefile.in + gsed -i 's,-Wall,,' $(WORKSRC)/test/Makefile.in + @$(MAKECOOKIE) + +pre-build-modulated: + # add math library + gsed -i 's,^\(LDFLAGS = .*\)$$,\1 -lm,' $(WORKSRC)/libgnomekbd/Makefile + # this is ugly, so is our X11 library problem.... + gsed -i 's,^\(CFLAGS = .*\)$$,\1 -L/opt/csw/X11/lib,' \ + $(WORKSRC)/test/Makefile + @$(MAKECOOKIE) Added: csw/mgar/pkg/libgnomekbd/trunk/checksums =================================================================== --- csw/mgar/pkg/libgnomekbd/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgnomekbd/trunk/checksums 2010-03-23 16:48:25 UTC (rev 9340) @@ -0,0 +1 @@ +28dce813a6c76439a2136fbd2394a058 libgnomekbd-2.28.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Mar 23 17:49:15 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 23 Mar 2010 16:49:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9341] csw/mgar/pkg/libgnomekbd/trunk/Makefile Message-ID: Revision: 9341 http://gar.svn.sourceforge.net/gar/?rev=9341&view=rev Author: bensons Date: 2010-03-23 16:49:15 +0000 (Tue, 23 Mar 2010) Log Message: ----------- libgnomekbd: fixed PACKAGES and CATALOGNAME Modified Paths: -------------- csw/mgar/pkg/libgnomekbd/trunk/Makefile Modified: csw/mgar/pkg/libgnomekbd/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnomekbd/trunk/Makefile 2010-03-23 16:48:25 UTC (rev 9340) +++ csw/mgar/pkg/libgnomekbd/trunk/Makefile 2010-03-23 16:49:15 UTC (rev 9341) @@ -9,8 +9,8 @@ MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/libgnomekbd/2.28/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PACKAGES = CSWgnomemedia -CATALOGNAME = gnomemedia +PACKAGES = CSWlibgnomekbd +CATALOGNAME = libgnomekbd # 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 bensons at users.sourceforge.net Tue Mar 23 18:37:19 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 23 Mar 2010 17:37:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9342] csw/mgar/pkg/libgnomekbd/trunk/Makefile Message-ID: Revision: 9342 http://gar.svn.sourceforge.net/gar/?rev=9342&view=rev Author: bensons Date: 2010-03-23 17:37:18 +0000 (Tue, 23 Mar 2010) Log Message: ----------- libgnomekbd: initial GAR recipe Modified Paths: -------------- csw/mgar/pkg/libgnomekbd/trunk/Makefile Modified: csw/mgar/pkg/libgnomekbd/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnomekbd/trunk/Makefile 2010-03-23 16:49:15 UTC (rev 9341) +++ csw/mgar/pkg/libgnomekbd/trunk/Makefile 2010-03-23 17:37:18 UTC (rev 9342) @@ -9,9 +9,15 @@ MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/libgnomekbd/2.28/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PACKAGES = CSWlibgnomekbd -CATALOGNAME = libgnomekbd +PACKAGES = CSWlibgnomekbd CSWlibgnomekbddevel +CATALOGNAME_CSWlibgnomekbd = libgnomekbd +CATALOGNAME_CSWlibgnomekbddevel = libgnomekbd_devel +SPKG_DESC_CSWlibgnomekbd = $(DESCRIPTION) +SPKG_DESC_CSWlibgnomekbddevel = $(DESCRIPTION) development files + +PKGFILES_CSWlibgnomekbddevel = $(PKGFILES_DEVEL) + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -30,6 +36,8 @@ RUNTIME_DEP_PKGS += CSWlibxml2 RUNTIME_DEP_PKGS += CSWpango +RUNTIME_DEP_PKGS_CSWlibgnomekbddevel += CSWlibgnomekbd + BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) BUILD_DEP_PKGS += CSWlibglade2 BUILD_DEP_PKGS += CSWgtk2devel @@ -41,6 +49,12 @@ BUILD_DEP_PKGS += CSWkbproto BUILD_DEP_PKGS += CSWgnomedocutils BUILD_DEP_PKGS += CSWscrollkeeper +BUILD_DEP_PKGS += CSWintltool +BUILD_DEP_PKGS += CSWgnulinks +BUILD_DEP_PKGS += CSWdbusglibdev +BUILD_DEP_PKGS += CSWlibdbusdev +BUILD_DEP_PKGS += CSWgtk2devel +BUILD_DEP_PKGS += CSWlibatkdevel CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 23 23:32:23 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 23 Mar 2010 22:32:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9343] csw/mgar/gar/v2 Message-ID: Revision: 9343 http://gar.svn.sourceforge.net/gar/?rev=9343&view=rev Author: wahwah Date: 2010-03-23 22:32:23 +0000 (Tue, 23 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, a rewrite of the library checking functions (fixing some problems), removing a lot of obsolete test data, adding a check for runpaths. Modified Paths: -------------- csw/mgar/gar/v2/bin/analyze_module_results.py csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/dependency_checks.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_pkgs_data_minimal.py csw/mgar/gar/v2/lib/python/testdata/dump_output_3.py Removed Paths: ------------- csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWlibpq_84.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWmysql51.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWmysql51client.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWmysql51devel.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWmysql51rt.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWmysql5client_8x.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWpostfix.py Modified: csw/mgar/gar/v2/bin/analyze_module_results.py =================================================================== --- csw/mgar/gar/v2/bin/analyze_module_results.py 2010-03-23 17:37:18 UTC (rev 9342) +++ csw/mgar/gar/v2/bin/analyze_module_results.py 2010-03-23 22:32:23 UTC (rev 9343) @@ -1,6 +1,7 @@ #!/opt/csw/bin/python2.6 # $Id$ +import operator import optparse import os import sys @@ -28,7 +29,7 @@ for file_name in files: full_path = os.path.join(options.extractdir, file_name) error_tags.extend(checkpkg.ErrorTagsFromFile(full_path)) - overrides = reduce(lambda x, y: x + y, overrides_list) + overrides = reduce(operator.add, overrides_list) (tags_after_overrides, unapplied_overrides) = checkpkg.ApplyOverrides(error_tags, overrides) exit_code = bool(tags_after_overrides) Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-03-23 17:37:18 UTC (rev 9342) +++ csw/mgar/gar/v2/bin/checkpkg 2010-03-23 22:32:23 UTC (rev 9343) @@ -113,16 +113,19 @@ # - Use an pre-cached (from a catalog file?) list of md5 sums # - Don't use the data from /var/sadm/install/contents SAVE_TAGS=0 +SAVED_TAGS_FILE=error-tags.txt display_help=0 SKIP_STATS_COLLECTION=0 MD5_SUMS_CATALOG_FILE="" -while getopts hsdNM: opt; do +while getopts hsdNM:o: opt; do case "${opt}" in s) SAVE_TAGS=1 - SAVED_TAGS_FILE=error-tags.txt ;; + o) + SAVED_TAGS_FILE="${OPTARG}" + ;; d) DEBUG=1 ;; Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-23 17:37:18 UTC (rev 9342) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-23 22:32:23 UTC (rev 9343) @@ -8,10 +8,12 @@ import errno import itertools import logging +import operator import optparse import os import os.path import re +import pprint import socket import sqlite3 import subprocess @@ -22,7 +24,7 @@ import package_checks DB_SCHEMA_VERSION = 2L -PACKAGE_STATS_VERSION = 3L +PACKAGE_STATS_VERSION = 4L SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") NEEDED_SONAMES = "needed sonames" @@ -47,7 +49,14 @@ ("/opt/csw/lib/i386", ["/opt/csw/lib"]), ) INSTALL_CONTENTS_AVG_LINE_LENGTH = 102.09710677919261 +SYS_DEFAULT_RUNPATH = [ + "/usr/lib/$ISALIST", + "/usr/lib", + "/lib/$ISALIST", + "/lib", +] + # This shared library is present on Solaris 10 on amd64, but it's missing on # Solaris 8 on i386. It's okay if it's missing. ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) @@ -62,24 +71,22 @@ # $pkgname: #end if #if $missing_deps -# SUGGESTION: you may want to add some or all of the following as depends: -# (Feel free to ignore SUNW or SPRO packages) -#for $pkg in $sorted($missing_deps) +# SUGGESTION: you may want to add some or all of the following as dependencies: +#for $pkg, $reasons in $sorted($missing_deps) +# $pkg, reasons: +#for $reason in $reasons +# - $reason +#end for RUNTIME_DEP_PKGS_$pkgname += $pkg #end for #end if #if $surplus_deps -# The following dependencies might be unnecessary: +# If you don't know of any reasons to include these dependencies, you might +# remove them: #for $pkg in $sorted($surplus_deps) # ? $pkg #end for #end if -#if $orphan_sonames -# The following required sonames would not be found at runtime: -#for $soname in $sorted($orphan_sonames) -# ! $soname -#end for -#end if """ SCREEN_ERROR_REPORT_TMPL = u"""#if $errors and $debug @@ -355,6 +362,25 @@ self.cache[filename] = lines return lines + def _InferPackagesFromPkgmapLine(self, line): + """A stub of a function, to be enhanced.""" + line = line.strip() + parts = re.split(WS_RE, line) + return [parts[-1]] + + def GetPathsAndPkgnamesByBasename(self, filename): + """Returns paths and packages by basename. + + e.g. + {"/opt/csw/lib": ["CSWfoo", "CSWbar"], + "/opt/csw/1/lib": ["CSWfoomore"]} + """ + lines = self.GetPkgmapLineByBasename(filename) + # Infer packages + for file_path in lines: + lines[file_path] = self._InferPackagesFromPkgmapLine(lines[file_path]) + return lines + def GetDatabaseMtime(self): if not self.cache_mtime: sql = """ @@ -447,134 +473,6 @@ return dict(x[0:2] for x in c) -def SharedObjectDependencies(pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - """This is one of the more obscure and more important pieces of code. - - I tried to make it simpler, but given that the operations here involve - whole sets of packages, it's not easy to simplify. - """ - so_dependencies = set() - orphan_sonames = set() - self_provided = set() - for binary in binaries_by_pkgname[pkgname]: - needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] - for soname in needed_sonames: - if soname in filenames_by_soname: - filename = filenames_by_soname[soname] - pkg = pkg_by_any_filename[filename] - self_provided.add(soname) - so_dependencies.add(pkg) - elif soname in pkgs_by_soname: - so_dependencies.add(pkgs_by_soname[soname]) - else: - orphan_sonames.add(soname) - return so_dependencies, self_provided, orphan_sonames - - -def GuessDepsByFilename(pkgname, pkg_by_any_filename): - """Guesses dependencies based on filename regexes. - - This function is still inefficient. It should be getting better data - structures to work with. - """ - guessed_deps = set() - patterns = [(re.compile(x), y) for x, y in DEPENDENCY_FILENAME_REGEXES] - filenames = [] - # First, find the filenames of interest. - for filename, file_pkgname in pkg_by_any_filename.iteritems(): - if file_pkgname == pkgname: - filenames.append(filename) - for regex, dep_pkgname in patterns: - for filename in filenames: - if regex.match(filename): - guessed_deps.add(dep_pkgname) - return guessed_deps - - -def GuessDepsByPkgname(pkgname, pkg_by_any_filename): - # More guessed dependencies: If one package is a substring of another, it - # might be a hint. For example, CSWmysql51test should depend on CSWmysql51. - # However, the rt (runtime) packages should not want to depend on the main - # package. - guessed_deps = set() - all_other_pkgs = set(pkg_by_any_filename.values()) - for other_pkg in all_other_pkgs: - other_pkg = unicode(other_pkg) - if pkgname == other_pkg: - continue - if pkgname.startswith(other_pkg): - endings = ["devel", "test", "bench", "dev"] - for ending in endings: - if pkgname.endswith(ending): - guessed_deps.add(other_pkg) - return guessed_deps - - -def AnalyzeDependencies(pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - """Gathers and merges dependency results from other functions. - - declared_dependencies: Dependencies that the package in question claims to - have. - - binaries_by_pkgname: A dictionary mapping pkgnames (CSWfoo) to binary names - (without paths) - - needed_sonames_by_binary: A dictionary mapping binary file name to - a dictionary containing: "needed sonames", - "soname", "rpath". Based on examining the binary - files within the packages. - - pkgs_by_soname: A dictionary mapping sonames to pkgnames, based on the - contents of the system wide pkgmap - (/var/sadm/install/contents) - - filenames_by_soname: A dictionary mapping shared library sonames to filenames, - based on files within packages - - pkg_by_any_filename: Mapping from file names to packages names, based on the - contents of the packages under examination. - """ - declared_dependencies_set = set(declared_dependencies) - - so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( - pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename) - auto_dependencies = reduce(lambda x, y: x.union(y), - [ - so_dependencies, - GuessDepsByFilename(pkgname, pkg_by_any_filename), - GuessDepsByPkgname(pkgname, pkg_by_any_filename), - ]) - missing_deps = auto_dependencies.difference(declared_dependencies_set) - # Don't report itself as a suggested dependency. - missing_deps = missing_deps.difference(set([pkgname])) - missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) - for re_str in DO_NOT_REPORT_MISSING_RE: - padded_re = "^%s$" % re_str - missing_deps = filter(lambda x: not re.match(padded_re, x), - missing_deps) - missing_deps = set(missing_deps) - surplus_deps = declared_dependencies_set.difference(auto_dependencies) - surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) - orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) - return missing_deps, surplus_deps, orphan_sonames - - def ExpandRunpath(runpath, isalist): # Emulating $ISALIST expansion if '$ISALIST' in runpath: @@ -618,71 +516,45 @@ return runpath -def GetLinesBySoname(runpath_data_by_soname, - needed_sonames, - runpath_by_needed_soname, isalist): - """Works out which system pkgmap lines correspond to given sonames.""" - lines_by_soname = {} - for soname in needed_sonames: - # This is the critical part of the algorithm: it iterates over the - # runpath and finds the first matching one. - runpath_found = False - for runpath in runpath_by_needed_soname[soname]: - runpath = SanitizeRunpath(runpath) - runpath_list = ExpandRunpath(runpath, isalist) - runpath_list = Emulate64BitSymlinks(runpath_list) - # Emulating the install time symlinks, for instance, if the prototype contains - # /opt/csw/lib/i386/foo.so.0 and /opt/csw/lib/i386 is a symlink to ".", - # the shared library ends up in /opt/csw/lib/foo.so.0 and should be - # findable even when RPATH does not contain $ISALIST. - soname_runpath_data = runpath_data_by_soname[soname] - new_soname_runpath_data = {} - for p in soname_runpath_data: - expanded_p_list = Emulate64BitSymlinks([p]) - for expanded_p in expanded_p_list: - new_soname_runpath_data[expanded_p] = soname_runpath_data[p] - soname_runpath_data = new_soname_runpath_data +def ResolveSoname(runpath, soname, isalist, path_list): + """Emulates ldd behavior, minimal implementation. - logging.debug("%s: will be looking for %s in %s" % - (soname, runpath_list, soname_runpath_data.keys())) - for runpath_expanded in runpath_list: - if runpath_expanded in soname_runpath_data: - lines_by_soname[soname] = soname_runpath_data[runpath_expanded] - runpath_found = True - # This break only goes out of the inner loop, - # need another one below to finish the outer loop. - break - if runpath_found: - break - return lines_by_soname + runpath: e.g. ["/opt/csw/lib/$ISALIST", "/usr/lib"] + soname: e.g. "libfoo.so.1" + isalist: e.g. ["sparcv9", "sparcv8"] + path_list: A list of paths where the soname is present, e.g. + ["/opt/csw/lib", "/opt/csw/lib/sparcv9"] - -def BuildIndexesBySoname(needed_sonames_by_binary): - """Builds data structures indexed by soname. - - Building indexes - {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], - ... - } + The function returns the one path. """ - needed_sonames = set() - binaries_by_soname = {} - runpath_by_needed_soname = {} - for binary_name, data in needed_sonames_by_binary.iteritems(): - for soname in data[NEEDED_SONAMES]: - needed_sonames.add(soname) - if soname not in runpath_by_needed_soname: - runpath_by_needed_soname[soname] = [] - runpath_by_needed_soname[soname].extend(data[RUNPATH]) - if soname not in binaries_by_soname: - binaries_by_soname[soname] = set() - binaries_by_soname[soname].add(binary_name) - return needed_sonames, binaries_by_soname, runpath_by_needed_soname + runpath = SanitizeRunpath(runpath) + runpath_list = ExpandRunpath(runpath, isalist) + runpath_list = Emulate64BitSymlinks(runpath_list) + # Emulating the install time symlinks, for instance, if the prototype contains + # /opt/csw/lib/i386/foo.so.0 and /opt/csw/lib/i386 is a symlink to ".", + # the shared library ends up in /opt/csw/lib/foo.so.0 and should be + # findable even when RPATH does not contain $ISALIST. + original_paths_by_expanded_paths = {} + for p in path_list: + expanded_p_list = Emulate64BitSymlinks([p]) + # We can't just expand and return; we need to return one of the paths given + # in the path_list. + for expanded_p in expanded_p_list: + original_paths_by_expanded_paths[expanded_p] = p + logging.debug("%s: looking for %s in %s", + soname, runpath_list, original_paths_by_expanded_paths.keys()) + for runpath_expanded in runpath_list: + if runpath_expanded in original_paths_by_expanded_paths: + logging.debug("Found %s", + original_paths_by_expanded_paths[runpath_expanded]) + return original_paths_by_expanded_paths[runpath_expanded] def ParseDumpOutput(dump_output): binary_data = {RUNPATH: [], NEEDED_SONAMES: []} + runpath = [] + rpath = [] for line in dump_output.splitlines(): fields = re.split(WS_RE, line) # TODO: Make it a unit test @@ -692,14 +564,18 @@ if fields[1] == "NEEDED": binary_data[NEEDED_SONAMES].append(fields[2]) elif fields[1] == "RUNPATH": - binary_data[RUNPATH].extend(fields[2].split(":")) + runpath.extend(fields[2].split(":")) + elif fields[1] == "RPATH": + rpath.extend(fields[2].split(":")) elif fields[1] == "SONAME": binary_data[SONAME] = fields[2] - # Adding the default runtime path search option. - binary_data[RUNPATH].append("/usr/lib/$ISALIST") - binary_data[RUNPATH].append("/usr/lib") - binary_data[RUNPATH].append("/lib/$ISALIST") - binary_data[RUNPATH].append("/lib") + if runpath: + binary_data[RUNPATH].extend(runpath) + elif rpath: + binary_data[RUNPATH].extend(rpath) + binary_data["RUNPATH RPATH the same"] = (runpath == rpath) + binary_data["RPATH set"] = bool(rpath) + binary_data["RUNPATH set"] = bool(runpath) return binary_data @@ -810,11 +686,8 @@ return (exit_code, screen_report, tags_report) -class Flyweight(object): - pass - class CheckInterfaceBase(object): - """Base class for check proxies. + """Proxies interaction with checking functions. It wraps access to the /var/sadm/install/contents cache. """ @@ -827,8 +700,13 @@ def GetPkgmapLineByBasename(self, basename): """Proxies calls to self.system_pkgmap.""" + logging.warning("GetPkgmapLineByBasename(%s): deprecated function", basename) return self.system_pkgmap.GetPkgmapLineByBasename(basename) + def GetPathsAndPkgnamesByBasename(self, basename): + """Proxies calls to self.system_pkgmap.""" + return self.system_pkgmap.GetPathsAndPkgnamesByBasename(basename) + def GetInstalledPackages(self): return self.system_pkgmap.GetInstalledPackages() Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-23 17:37:18 UTC (rev 9342) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-23 22:32:23 UTC (rev 9343) @@ -7,30 +7,18 @@ import difflib import checkpkg import opencsw -import testdata.checkpkg_test_data_CSWmysql51rt as d1 -import testdata.checkpkg_test_data_CSWmysql51client as d2 -import testdata.checkpkg_test_data_CSWmysql51 as d3 -import testdata.checkpkg_test_data_CSWmysql51devel as d4 -import testdata.checkpkg_test_data_CSWlibpq_84 as d5 -import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 -import testdata.checkpkg_test_data_CSWpostfix as d7 import testdata.dump_output_1 as dump_1 import testdata.dump_output_2 as dump_2 +import testdata.dump_output_3 as dump_3 """A set of unit tests for the library checking code. A bunch of lines to test in the interactive Python shell. import sys -sys.path.append("gar/bin/checkpkg.d") +sys.path.append("lib/python") import checkpkg -import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 -checkpkg.SharedObjectDependencies("CSWmysql5client", -d6.DATA_BINARIES_BY_PKGNAME, d6.DATA_NEEDED_SONAMES_BY_BINARY, -d6.DATA_PKGS_BY_FILENAME, d6.DATA_FILENAMES_BY_SONAME, -d6.DATA_PKG_BY_ANY_FILENAME) - sqlite3 ~/.checkpkg/var-sadm-install-contents-cache-build8x SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5'; """ @@ -44,263 +32,6 @@ \tlibXext.so.0 (SUNW_1.1) =>\t (version not found) """ -class DependenciesUnitTest_1(unittest.TestCase): - - def setUp(self): - (self.missing_deps, - self.surplus_deps, - self.orphan_sonames) = checkpkg.AnalyzeDependencies( - d1.DATA_PKGNAME, - d1.DATA_DECLARED_DEPENDENCIES, - d1.DATA_BINARIES_BY_PKGNAME, - d1.DATA_NEEDED_SONAMES_BY_BINARY, - d1.DATA_PKGS_BY_FILENAME, - d1.DATA_FILENAMES_BY_SONAME, - d1.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_2(unittest.TestCase): - - def setUp(self): - (self.missing_deps, - self.surplus_deps, - self.orphan_sonames) = checkpkg.AnalyzeDependencies( - d2.DATA_PKGNAME, - d2.DATA_DECLARED_DEPENDENCIES, - d2.DATA_BINARIES_BY_PKGNAME, - d2.DATA_NEEDED_SONAMES_BY_BINARY, - d2.DATA_PKGS_BY_FILENAME, - d2.DATA_FILENAMES_BY_SONAME, - d2.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_3(unittest.TestCase): - - def setUp(self): - (self.missing_deps, - self.surplus_deps, - self.orphan_sonames) = checkpkg.AnalyzeDependencies( - d3.DATA_PKGNAME, - d3.DATA_DECLARED_DEPENDENCIES, - d3.DATA_BINARIES_BY_PKGNAME, - d3.DATA_NEEDED_SONAMES_BY_BINARY, - d3.DATA_PKGS_BY_FILENAME, - d3.DATA_FILENAMES_BY_SONAME, - d3.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([u'CSWmysql51client']), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set(['CSWmysql51rt']) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_4(unittest.TestCase): - - def setUp(self): - (self.missing_deps, - self.surplus_deps, - self.orphan_sonames) = checkpkg.AnalyzeDependencies( - d4.DATA_PKGNAME, - d4.DATA_DECLARED_DEPENDENCIES, - d4.DATA_BINARIES_BY_PKGNAME, - d4.DATA_NEEDED_SONAMES_BY_BINARY, - d4.DATA_PKGS_BY_FILENAME, - d4.DATA_FILENAMES_BY_SONAME, - d4.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_5(unittest.TestCase): - - def setUp(self): - (self.missing_deps, - self.surplus_deps, - self.orphan_sonames) = checkpkg.AnalyzeDependencies( - d5.DATA_PKGNAME, - d5.DATA_DECLARED_DEPENDENCIES, - d5.DATA_BINARIES_BY_PKGNAME, - d5.DATA_NEEDED_SONAMES_BY_BINARY, - d5.DATA_PKGS_BY_FILENAME, - d5.DATA_FILENAMES_BY_SONAME, - d5.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - # This tends to report itself... - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_6(unittest.TestCase): - - def setUp(self): - (self.missing_deps, - self.surplus_deps, - self.orphan_sonames) = checkpkg.AnalyzeDependencies( - d6.DATA_PKGNAME, - d6.DATA_DECLARED_DEPENDENCIES, - d6.DATA_BINARIES_BY_PKGNAME, - d6.DATA_NEEDED_SONAMES_BY_BINARY, - d6.DATA_PKGS_BY_FILENAME, - d6.DATA_FILENAMES_BY_SONAME, - d6.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_7(unittest.TestCase): - - def setUp(self): - (self.missing_deps, - self.surplus_deps, - self.orphan_sonames) = checkpkg.AnalyzeDependencies( - d7.DATA_PKGNAME, - d7.DATA_DECLARED_DEPENDENCIES, - d7.DATA_BINARIES_BY_PKGNAME, - d7.DATA_NEEDED_SONAMES_BY_BINARY, - d7.DATA_PKGS_BY_FILENAME, - d7.DATA_FILENAMES_BY_SONAME, - d7.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class GuessDepsUnitTest(unittest.TestCase): - - def testGuessDepsByFilename1(self): - expected = set([u"CSWpython"]) - pkgname = u"CSWfoo" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) - - def testGuessDepsByFilename2(self): - expected = set([]) - pkgname = u"CSWfoo" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWbar", - } - self.assertEqual(expected, - checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) - - def testGuessDepsByFilename3(self): - expected = set([]) - pkgname = u"CSWfoo" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/lib/foo.so.1": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname1(self): - expected = set([u"CSWfoo"]) - pkgname = u"CSWfoo-devel" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/bin/barfoo": u"CSWfoobar", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname2(self): - expected = set([]) - pkgname = u"CSWzfoo-devel" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/bin/barfoo": u"CSWfoobar", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname3(self): - self.assertEqual(set([u"CSWmysql51"]), - checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", - d4.DATA_PKG_BY_ANY_FILENAME)) - - def testGuessDepsByPkgname4(self): - data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', - 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) - data2 = dict(((x, x) for x in data1)) - self.assertEqual(set([u"CSWmysql51"]), - checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", data2)) - - def testGuessDepsByPkgname4(self): - data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', - 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) - data2 = dict(((x, x) for x in data1)) - self.assertEqual(set([]), - checkpkg.GuessDepsByPkgname(u"CSWmysql51rt", data2)) - - class GetLinesBySonameUnitTest(unittest.TestCase): def setUp(self): @@ -378,157 +109,6 @@ self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) - def testGetLinesBySoname(self): - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - runpath_data_by_soname = { - "foo.so.1": { - "/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo"}, - } - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(runpath_data_by_soname, needed_sonames, - runpath_by_needed_soname, isalist) - self.assertEqual(expected, result) - - def testGetLinesBySoname_3(self): - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - runpath_data_by_soname = { - "foo.so.1": { - "/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo", - } - } - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = { - "foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(runpath_data_by_soname, needed_sonames, - runpath_by_needed_soname, isalist) - self.assertEqual(expected, result) - - def testGetLinesBySoname_4(self): - """A more complex test, four ISAs.""" - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - runpath_data_by_soname = { - "foo.so.1": { - "/opt/csw/lib/isa-value-1": - "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/mysql5/lib/isa-value-2": - "/opt/csw/mysql5/lib/isa-value-2/foo.so.1 foo", - "/opt/csw/mysql5/lib/isa-value-1": - "/opt/csw/mysql5/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/lib": - "/opt/csw/lib/foo.so.1 foo", - "/usr/lib": - "/usr/lib/foo.so.1 foo" - } - } - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = { - "foo.so.1": ["/opt/csw/mysql5/lib/$ISALIST/mysql", - "/opt/csw/lib/$ISALIST", - "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname( - runpath_data_by_soname, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_5(self): - """Based on CSWmysql5client on build8x (5).""" - soname = u'libm.so.1' - expected = {u'libm.so.1': u'/usr/lib/libm.so.1 f none 0755 root bin ' - u'99844 3884 1050525375 SUNWlibms\n'} - runpath_data_by_soname = d6.DATA_PKGMAP_CACHE - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - d6.DATA_NEEDED_SONAMES_BY_BINARY) - result = checkpkg.GetLinesBySoname( - runpath_data_by_soname, - set([soname]), - runpath_by_needed_soname, - d6.DATA_ISALIST) - self.assertEqual(expected, result) - - def testGetLinesBySoname_6(self): - """Based on CSWmysql5client on build8x (6).""" - soname = u'libz.so.1' - expected = { - u'libz.so.1': u'/opt/csw/lib/pentium_pro+mmx/libz.so.1=libz.so.1.2.3 ' - u's none CSWzlib\n'} - runpath_data_by_soname = d6.DATA_PKGMAP_CACHE - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - d6.DATA_NEEDED_SONAMES_BY_BINARY) - result = checkpkg.GetLinesBySoname( - runpath_data_by_soname, - set([soname]), - runpath_by_needed_soname, - d6.DATA_ISALIST) - self.assertEqual(expected, result) - - def testGetLinesBySoname_7(self): - """A test for 64-bit symlink expansion.""" - soname = u'libncursesw.so.5' - # To test the 64-bit symlink expansion - expected = { - u'libncursesw.so.5': - u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 ' - u's none CSWncurses\n'} - runpath_data_by_soname = d6.DATA_PKGMAP_CACHE - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - d6.DATA_NEEDED_SONAMES_BY_BINARY) - # The original data did not have amd64 in the isalist. - isalist = ['amd64', 'pentium_pro+mmx', 'pentium_pro', 'pentium+mmx', - 'pentium', 'i486', 'i386', 'i86'] - result = checkpkg.GetLinesBySoname( - runpath_data_by_soname, - set([soname]), - runpath_by_needed_soname, - isalist) - self.assertEqual(expected, result) - - def testGetLinesBySoname_8(self): - expected = {'foo.so.1': '/opt/csw/postgresql/lib/foo.so.1 foo'} - runpath_data_by_soname = { - "foo.so.1": { - "/opt/csw/postgresql/lib": "/opt/csw/postgresql/lib/foo.so.1 foo", - } - } - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = { - "foo.so.1": ["/opt/csw/postgresql/lib/", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname( - runpath_data_by_soname, needed_sonames, runpath_by_needed_soname, isalist) - self.assertEqual(expected, result) - - def testGetLinesBySoname_9(self): - """Emulation of binaries installed into /opt/csw/lib/i386. - - The problem is that /opt/csw/lib/i386 is a symlink and the binaries - end up in /opt/csw/lib instead. - """ - expected = {'foo.so.0': '/opt/csw/lib/i386/foo.so.0 foo'} - runpath_data_by_soname = { - "foo.so.0": { - "/opt/csw/lib/i386": "/opt/csw/lib/i386/foo.so.0 foo", - } - } - needed_sonames = set(["foo.so.0"]) - runpath_by_needed_soname = {"foo.so.0": ["/opt/csw/lib", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname( - runpath_data_by_soname, needed_sonames, runpath_by_needed_soname, isalist) - self.assertEqual(expected, result) - def testSanitizeRunpath_1(self): self.assertEqual("/opt/csw/lib", checkpkg.SanitizeRunpath("/opt/csw/lib/")) @@ -543,17 +123,9 @@ def test_1(self): expected = { - 'soname': 'libmysqlclient.so.15', - 'runpath': ['/opt/csw/lib/$ISALIST', - '/opt/csw/lib', - '/opt/csw/mysql5/lib/$ISALIST', - '/opt/csw/mysql5/lib', - '/opt/csw/mysql5/lib/$ISALIST/mysql', - # These four are artificially appended - '/usr/lib/$ISALIST', - '/usr/lib', - '/lib/$ISALIST', - '/lib'], + 'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, 'needed sonames': ['librt.so.1', 'libresolv.so.2', 'libc.so.1', @@ -561,57 +133,50 @@ 'libsocket.so.1', 'libnsl.so.1', 'libm.so.1', - 'libz.so.1']} + 'libz.so.1'], + 'runpath': ['/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/mysql5/lib/$ISALIST', + '/opt/csw/mysql5/lib', + '/opt/csw/mysql5/lib/$ISALIST/mysql'], + 'soname': 'libmysqlclient.so.15', + } self.assertEqual(expected, checkpkg.ParseDumpOutput(dump_1.DATA_DUMP_OUTPUT)) - def test_2(self): - expected_runpath = ['/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', - '/lib'] + def testEmpty(self): + expected_runpath = [] self.assertEqual( expected_runpath, checkpkg.ParseDumpOutput(dump_2.DATA_DUMP_OUTPUT)["runpath"]) + def testRpathOnly(self): + expected = { + 'RPATH set': True, + 'RUNPATH RPATH the same': False, + 'RUNPATH set': False, + 'needed sonames': ['librt.so.1', + 'libresolv.so.2', + 'libc.so.1', + 'libgen.so.1', + 'libsocket.so.1', + 'libnsl.so.1', + 'libm.so.1', + 'libz.so.1'], + 'runpath': ['/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/mysql5/lib/$ISALIST', + '/opt/csw/mysql5/lib', + '/opt/csw/mysql5/lib/$ISALIST/mysql'], + 'soname': 'libmysqlclient.so.15', + } + self.assertEqual( + expected, + checkpkg.ParseDumpOutput(dump_3.DATA_DUMP_OUTPUT)) -class FormatDepsReportUnitTest(unittest.TestCase): - def AssertTextEqual(self, text1, text2): - difference = "\n".join(difflib.context_diff(text2.splitlines(), text1.splitlines())) - self.assertEqual(text1, text2, difference) - - def testAll(self): - missing_deps = set([u'SUNWgss', u'*SUNWlxsl']) - surplus_deps = set(['CSWsudo', 'CSWlibxslt']) - orphan_sonames = set([u'libm.so.2']) - testdata = ("CSWfoo", missing_deps, surplus_deps, orphan_sonames) - checker = opencsw.DirectoryFormatPackage("/tmp/nonexistent/CSWfoo") - expected = u"""# CSWfoo: -# SUGGESTION: you may want to add some or all of the following as depends: -# (Feel free to ignore SUNW or SPRO packages) -RUNTIME_DEP_PKGS_CSWfoo += *SUNWlxsl -RUNTIME_DEP_PKGS_CSWfoo += SUNWgss -# The following dependencies might be unnecessary: -# ? CSWlibxslt -# ? CSWsudo -# The following required sonames would not be found at runtime: -# ! libm.so.2 -""" - result = checkpkg.FormatDepsReport(*testdata) - self.AssertTextEqual(result, expected) - - def testNone(self): - missing_deps = set([]) - surplus_deps = set([]) - orphan_sonames = set([]) - testdata = ("CSWfoo", missing_deps, surplus_deps, orphan_sonames) - checker = opencsw.DirectoryFormatPackage("/tmp/nonexistent/CSWfoo") - expected = u"" - result = checkpkg.FormatDepsReport(*testdata) - self.AssertTextEqual(result, expected) - - class CheckpkgTagsUnitTest(unittest.TestCase): - + def test_1(self): m = checkpkg.CheckpkgManager2("testname", "/tmp", ["CSWfoo"]) tags = { Added: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py (rev 0) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-03-23 22:32:23 UTC (rev 9343) @@ -0,0 +1,64 @@ +# $Id$ + +import checkpkg +import re + +def Libraries(pkg_data, error_mgr, logger, path_and_pkg_by_soname): + pkgname = pkg_data["basic_stats"]["pkgname"] + logger.info("Package %s", pkgname) + orphan_sonames = [] + required_deps = [] + isalist = pkg_data["isalist"] + for binary_info in pkg_data["binaries_dump_info"]: + for soname in binary_info["needed sonames"]: + resolved = False + path_list = path_and_pkg_by_soname[soname].keys() + logger.debug("%s @ %s: looking for %s in %s", + soname, binary_info["path"], binary_info["runpath"], path_list) + for runpath in binary_info["runpath"] + checkpkg.SYS_DEFAULT_RUNPATH: + resolved_path = checkpkg.ResolveSoname(runpath, soname, isalist, path_list) + if resolved_path: + logger.debug("%s needed by %s:", + soname, binary_info["path"]) + # print "%s => %s" % (binary_info["runpath"], resolved_path) + logger.debug("=> %s provided by %s", + resolved_path, path_and_pkg_by_soname[soname][resolved_path]) + resolved = True + req_pkg = path_and_pkg_by_soname[soname][resolved_path][-1] + # TODO: Throw an error when /opt/csw/lib/libdb-4.7.so gets resolved + reason = "provides %s/%s needed by %s" % (resolved_path, soname, binary_info["path"]) + BAD_COMBINATIONS = ( + ("/opt/csw/lib", "libdb-4.7.so", "Deprecated Berkeley DB location"), + ) + for bad_path, bad_soname, msg in BAD_COMBINATIONS: + # print "resolved_path == bad_path", resolved_path, bad_path, resolved_path == bad_path + # print "soname == bad_soname", soname, bad_soname, soname == bad_soname + if resolved_path == bad_path and soname == bad_soname: + logger.debug("Bad lib found: %s/%s", bad_path, bad_soname) + error_mgr.ReportError( + "deprecated-library", + "%s %s %s/%s" % (binary_info["path"], msg, resolved_path, soname)) + required_deps.append((req_pkg, reason)) + break + if not resolved: + orphan_sonames.append((soname, binary_info["path"])) + orphan_sonames = set(orphan_sonames) + for soname, binary_path in orphan_sonames: + error_mgr.ReportError( + pkgname, "soname-not-found", "%s needed by %s" % (soname, binary_path)) + # TODO: Report orphan sonames here + return required_deps + +def ByFilename(pkg_data, error_mgr, logger, path_and_pkg_by_soname): + pkgname = pkg_data["basic_stats"]["pkgname"] + req_pkgs_reasons = [] + dep_regexes = [(re.compile(x), x, y) + for x, y in checkpkg.DEPENDENCY_FILENAME_REGEXES] + for regex, regex_str, dep_pkgname in dep_regexes: + for pkgmap_entry in pkg_data["pkgmap"]: + if pkgmap_entry["path"] and regex.match(pkgmap_entry["path"]): + msg = ("found file(s) matching %s, e.g. %s" + % (regex_str, repr(pkgmap_entry["path"]))) + req_pkgs_reasons.append((dep_pkgname, msg)) + break + return req_pkgs_reasons Property changes on: csw/mgar/gar/v2/lib/python/dependency_checks.py ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-23 17:37:18 UTC (rev 9342) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-23 22:32:23 UTC (rev 9343) @@ -797,6 +797,7 @@ files_root = os.path.join(self.directory, "root") if not os.path.exists(files_root): return [] + # FIXME: It thinks that ELFunctionMapper.html is a binary find_tmpl = "find '%s' -print | xargs file | grep ELF | nawk -F: '{print $1}'" find_proc = subprocess.Popen(find_tmpl % ".", shell=True, Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-23 17:37:18 UTC (rev 9342) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-23 22:32:23 UTC (rev 9343) @@ -15,7 +15,9 @@ import os import checkpkg import opencsw +import pprint import textwrap +import dependency_checks as depchecks from Cheetah import Template PATHS_ALLOWED_ONLY_IN = { @@ -49,6 +51,13 @@ } DO_NOT_LINK_AGAINST_THESE_SONAMES = set(["libX11.so.4"]) DISCOURAGED_FILE_PATTERNS = (r"\.py[co]$",) +BAD_RPATH_LIST = [ + r'/opt/csw/lib/mysql/lib', + r'/opt/csw/lib/mysql/lib/sparcv9', + r'/opt/csw/lib/\$ISALIST', + r'/opt/csw/lib/$$ISALIST', + r'/opt/csw/lib/SALIST', +] def CatalognameLowercase(pkg_data, error_mgr, logger): @@ -59,15 +68,6 @@ error_mgr.ReportError("catalogname-is-not-a-simple-word") -def CheckForbiddenPaths(pkg_data, error_mgr, logger): - for pkgname in PATHS_ALLOWED_ONLY_IN: - if pkgname != pkg_data["basic_stats"]["pkgname"]: - for entry in pkg_data["pkgmap"]: - for forbidden_path in PATHS_ALLOWED_ONLY_IN[pkgname]: - if entry["path"] == forbidden_path: - error_mgr.ReportError("forbidden-path", entry["path"]) - - def CheckDirectoryPermissions(pkg_data, error_mgr, logger): for entry in pkg_data["pkgmap"]: if (entry["type"] == "d" @@ -109,7 +109,7 @@ error_mgr.ReportError("pkginfo-description-missing") else: if len(desc) > MAX_DESCRIPTION_LENGTH: - error_mgr.ReportError("pkginfo-description-too-long") + error_mgr.ReportError("pkginfo-description-too-long", "length=%s" % len(desc)) if not desc[0].isupper(): error_mgr.ReportError("pkginfo-description-not-starting-with-uppercase", desc) @@ -118,7 +118,7 @@ def CheckCatalogname(pkg_data, error_mgr, logger): pkginfo = pkg_data["pkginfo"] catalogname = pkginfo["NAME"].split(" ")[0] - catalogname_re = r"^(\w+)$" + catalogname_re = r"^([\w\+]+)$" if not re.match(catalogname_re, catalogname): error_mgr.ReportError("pkginfo-bad-catalogname", catalogname) @@ -136,117 +136,78 @@ "%s class=%s" % (entry["path"], entry["class"])) -def SetCheckSharedLibraryConsistency(pkgs_data, error_mgr, logger): - ws_re = re.compile(r"\s+") - result_ok = True - binaries = [] - binaries_by_pkgname = {} - sonames_by_pkgname = {} - pkg_by_any_filename = {} - needed_sonames_by_binary = {} - filenames_by_soname = {} +def SetCheckLibraries(pkgs_data, error_mgr, logger): + """Second versionof the library checking code. + + 1. Collect all the data from the FS: + {"": {"/path/1": ["CSWfoo1"], "/path/2": ["CSWfoo2"]}} + 1.1. find all needed sonames + 1.2. get all the data for needed sonames + 2. Construct an overlay by applying data from the package set + 3. For each binary + 3.1. Resolve all NEEDED sonames + """ + needed_sonames = [] for pkg_data in pkgs_data: - binaries_base = [os.path.basename(x) for x in pkg_data["binaries"]] + for binary_info in pkg_data["binaries_dump_info"]: + needed_sonames.extend(binary_info["needed sonames"]) + needed_sonames = sorted(set(needed_sonames)) + # Finding candidate libraries from the filesystem (/var/sadm/install/contents) + path_and_pkg_by_soname = {} + for needed_soname in needed_sonames: + path_and_pkg_by_soname[needed_soname] = error_mgr.GetPathsAndPkgnamesByBasename( + needed_soname) + # Adding overlay based on the given package set + # TODO: Emulate package removal + for pkg_data in pkgs_data: pkgname = pkg_data["basic_stats"]["pkgname"] - binaries_by_pkgname[pkgname] = binaries_base - binaries.extend(pkg_data["binaries"]) - for filename in pkg_data["all_filenames"]: - pkg_by_any_filename[filename] = pkgname - for binary_data in pkg_data["binaries_dump_info"]: - binary_base_name = os.path.basename(binary_data["base_name"]) - needed_sonames_by_binary[binary_base_name] = binary_data - filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name - - # Making the binaries unique - binaries = set(binaries) - isalist = pkg_data["isalist"] - - # Building indexes by soname to simplify further processing - # These are indexes "by soname". - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname - ) = checkpkg.BuildIndexesBySoname(needed_sonames_by_binary) - - logger.debug("Determining the soname-package relationships.") - # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog - runpath_data_by_soname = {} - for soname in needed_sonames: - runpath_data_by_soname[soname] = error_mgr.GetPkgmapLineByBasename(soname) - lines_by_soname = checkpkg.GetLinesBySoname( - runpath_data_by_soname, needed_sonames, runpath_by_needed_soname, isalist) - - logger.debug("Creating a map from files to packages.") - pkgs_by_filename = {} - for soname, line in lines_by_soname.iteritems(): - # TODO: Find all the packages, not just the last field. - fields = re.split(ws_re, line.strip()) - # For now, we'll assume that the last field is the package. - pkgname = fields[-1] - pkgs_by_filename[soname] = pkgname - - # A shared object dependency/provisioning report. - # - # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), - # it has a different purpose: it reports the relationships between shared - # libraries, binaries using them and packages providing them. Ideally, the - # same bit of code would do both checking and reporting. - # - # TODO: Rewrite this using cheetah templates - if True and needed_sonames: - print "Analysis of sonames needed by the package set:" - binaries_with_missing_sonames = set([]) - for soname in needed_sonames: - logger.debug("Analyzing: %s", soname) - if soname in filenames_by_soname: - print "%s is provided by the package itself" % soname - elif soname in lines_by_soname: - print ("%s is provided by %s and required by:" - % (soname, - pkgs_by_filename[soname])) - filename_lines = " ".join(sorted(binaries_by_soname[soname])) - for line in textwrap.wrap(filename_lines, 70): - print " ", line - else: - print ("%s is required by %s, but we don't know what provides it." - % (soname, binaries_by_soname[soname])) - for binary in binaries_by_soname[soname]: - binaries_with_missing_sonames.add(binary) - if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: - print "However, it's a whitelisted soname." - else: - print "No package seems to be providing %s" % (soname,) - if binaries_with_missing_sonames: - print "The following are binaries with missing sonames:" - binary_lines = " ".join(sorted(binaries_with_missing_sonames)) - for line in textwrap.wrap(binary_lines, 70): - print " ", line - print - - dependent_pkgs = {} + for binary_info in pkg_data["binaries_dump_info"]: + soname = binary_info["soname"] + binary_path, basename = os.path.split(binary_info["path"]) + if not binary_path.startswith('/'): + binary_path = "/" + binary_path + if soname not in path_and_pkg_by_soname: + path_and_pkg_by_soname[soname] = {} + path_and_pkg_by_soname[soname][binary_path] = [pkgname] + # Resolving sonames for each binary for pkg_data in pkgs_data: pkgname = pkg_data["basic_stats"]["pkgname"] - declared_dependencies = dict(pkg_data["depends"]) - missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( - pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_filename, - filenames_by_soname, - pkg_by_any_filename) + check_args = (pkg_data, error_mgr, logger, path_and_pkg_by_soname) + req_pkgs_reasons = depchecks.Libraries(*check_args) + req_pkgs_reasons.extend(depchecks.ByFilename(*check_args)) + missing_reasons_by_pkg = {} + for pkg, reason in req_pkgs_reasons: + if pkg not in missing_reasons_by_pkg: + missing_reasons_by_pkg[pkg] = set() + missing_reasons_by_pkg[pkg].add(reason) + declared_deps = pkg_data["depends"] + declared_deps_set = set([x[0] for x in declared_deps]) + req_pkgs_set = set([x[0] for x in req_pkgs_reasons]) + missing_deps = req_pkgs_set.difference(declared_deps_set) + pkgs_to_remove = set() + for regex_str in checkpkg.DO_NOT_REPORT_MISSING_RE: + regex = re.compile(regex_str) + for dep_pkgname in missing_deps: + if re.match(regex, dep_pkgname): + pkgs_to_remove.add(dep_pkgname) + if pkgname in missing_deps: + pkgs_to_remove.add(pkgname) + logger.debug("Removing %s from the list of missing pkgs.", pkgs_to_remove) + missing_deps = missing_deps.difference(pkgs_to_remove) + surplus_deps = declared_deps_set.difference(req_pkgs_set) + surplus_deps = surplus_deps.difference(checkpkg.DO_NOT_REPORT_SURPLUS) + missing_deps_reasons = [] + for missing_dep in missing_deps: + error_mgr.ReportError(pkgname, "missing-dependency", "%s" % (missing_dep)) + missing_deps_reasons.append((missing_dep, missing_reasons_by_pkg[missing_dep])) + for surplus_dep in surplus_deps: + error_mgr.ReportError(pkgname, "surplus-dependency", surplus_dep) namespace = { "pkgname": pkgname, - "missing_deps": missing_deps, + "missing_deps": missing_deps_reasons, "surplus_deps": surplus_deps, - "orphan_sonames": orphan_sonames, + "orphan_sonames": None, } - for soname in orphan_sonames: - error_mgr.ReportError(pkgname, "orphan-soname", soname) - for missing_dep in missing_deps: - error_mgr.ReportError(pkgname, "missing-dependency", missing_dep) - for surplus_dep in surplus_deps: - error_mgr.ReportError(pkgname, "surplus-dependency", surplus_dep) t = Template.Template(checkpkg.REPORT_TMPL, searchList=[namespace]) report = unicode(t) if report.strip(): @@ -281,7 +242,8 @@ arch = pkginfo["ARCH"] filename_re = r"-%s-" % arch if not re.search(filename_re, filename): - error_mgr.ReportError("srv4-filename-architecture-mismatch", arch) + error_mgr.ReportError("srv4-filename-architecture-mismatch", + "pkginfo=%s filename=%s" % (arch, filename)) def CheckActionClasses(pkg_data, error_mgr, logger): @@ -446,6 +408,10 @@ error_mgr.ReportError("pkginfo-version-wrong-format", msg) if pkginfo["ARCH"] not in ARCH_LIST: error_mgr.ReportError("pkginfo-nonstandard-architecture", pkginfo["ARCH"]) + + +def CheckPstamp(pkg_data, error_mgr, logger): + pkginfo = pkg_data["pkginfo"] if "PSTAMP" in pkginfo: if not re.match(checkpkg.PSTAMP_RE, pkginfo["PSTAMP"]): msg=("It should be 'username at hostname-timestamp', " @@ -508,6 +474,16 @@ error_mgr.ReportError("disallowed-path", disallowed_path) +def CheckDisallowedPaths(pkg_data, error_mgr, logger): + """This seems to be a duplicate of CheckPkgmapPaths.""" + for pkgname in PATHS_ALLOWED_ONLY_IN: + if pkgname != pkg_data["basic_stats"]["pkgname"]: + for entry in pkg_data["pkgmap"]: + for forbidden_path in PATHS_ALLOWED_ONLY_IN[pkgname]: + if entry["path"] == forbidden_path: + error_mgr.ReportError("disallowed-path", entry["path"]) + + def CheckLinkingAgainstSunX11(pkg_data, error_mgr, logger): for binary_info in pkg_data["binaries_dump_info"]: for soname in binary_info["needed sonames"]: @@ -539,3 +515,13 @@ error_mgr.ReportError("pkgchk-failed-with-code", pkg_data["pkgchk"]["return_code"]) for line in pkg_data["pkgchk"]["stderr_lines"]: logger.warn(line) + +def CheckRpath(pkg_data, error_mgr, logger): + # for bad_rpath in BAD_RPATH_LIST: + bad_rpath_set = set(BAD_RPATH_LIST) + for binary_info in pkg_data["binaries_dump_info"]: + for actual_rpath in binary_info["runpath"]: + if actual_rpath in bad_rpath_set: + error_mgr.ReportError("bad-rpath-entry", + "%s %s" % (binary_info["path"], actual_rpath)) + Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-23 17:37:18 UTC (rev 9342) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-23 22:32:23 UTC (rev 9343) @@ -10,8 +10,10 @@ import os.path import mox import logging +import pprint import testdata.checkpkg_test_data_CSWdjvulibrert as td_1 +import testdata.checkpkg_pkgs_data_minimal as td_2 BASE_DIR = os.path.dirname(__file__) TESTDATA_DIR = os.path.join(BASE_DIR, "testdata") @@ -33,9 +35,14 @@ self.mocker = mox.Mox() def testDefault(self): + class LoggerStub(object): + def debug(self, debug_s, *kwords): pass + + def info(self, debug_s, *kwords): + pass # self.logger_mock = self.mocker.CreateMock(logging.Logger) self.logger_mock = LoggerStub() self.error_mgr_mock = self.mocker.CreateMock( @@ -66,7 +73,7 @@ FUNCTION_NAME = 'CheckDescription' def CheckpkgTest(self): self.pkg_data["pkginfo"]["NAME"] = 'foo - ' 'A' * 200 - self.error_mgr_mock.ReportError('pkginfo-description-too-long') + self.error_mgr_mock.ReportError('pkginfo-description-too-long', 'length=1394') class TestDescriptionNotCapitalized(CheckpkgUnitTestHelper, unittest.TestCase): @@ -77,13 +84,20 @@ 'lowercase') -class TestCheckCatalogname(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckCatalogname_1(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckCatalogname' def CheckpkgTest(self): self.pkg_data["pkginfo"]["NAME"] = 'foo-bar - This catalog name is bad' - self.error_mgr_mock.ReportError('pkginfo-bad-catalogname') + self.error_mgr_mock.ReportError('pkginfo-bad-catalogname', 'foo-bar') -class TestCheckCatalogname(CheckpkgUnitTestHelper, unittest.TestCase): + +class TestCheckCatalogname_2(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckCatalogname' + def CheckpkgTest(self): + self.pkg_data["pkginfo"]["NAME"] = 'libsigc++_devel - This catalog name is good' + + +class TestCheckSmfIntegration(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckSmfIntegration' def CheckpkgTest(self): self.pkg_data["pkgmap"].append({ @@ -186,7 +200,9 @@ FUNCTION_NAME = 'CheckArchitectureSanity' def CheckpkgTest(self): self.pkg_data["pkginfo"]["ARCH"] = "i386" - self.error_mgr_mock.ReportError('srv4-filename-architecture-mismatch', 'i386') + self.error_mgr_mock.ReportError( + 'srv4-filename-architecture-mismatch', + 'pkginfo=i386 filename=rsync-3.0.7,REV=2010.02.17-SunOS5.8-sparc-CSW.pkg.gz') class TestCheckArchitectureVsContents(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckArchitectureVsContents' @@ -236,45 +252,55 @@ self.error_mgr_mock.ReportError('linked-against-discouraged-library', 'libImlib2.so.1.4.2 libX11.so.4') -class TestSetCheckSharedLibraryConsistency_1(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'SetCheckSharedLibraryConsistency' +class TestSetCheckSharedLibraryConsistency2_1(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckLibraries' def CheckpkgTest(self): self.pkg_data = [td_1.pkg_data] - self.error_mgr_mock.GetPkgmapLineByBasename('libiconv.so.2').AndReturn( - {u'/opt/csw/lib': u'/opt/csw/lib/libiconv.so.2=libiconv.so.2.5.0 s none CSWiconv', - u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libiconv.so.2=libiconv.so.2.5.0 s none CSWiconv'}) - self.error_mgr_mock.GetPkgmapLineByBasename('libjpeg.so.62').AndReturn( - {u'/opt/csw/lib': u'/opt/csw/lib/libjpeg.so.62=libjpeg.so.62.0.0 s none CSWjpeg', - u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libjpeg.so.62=libjpeg.so.62.0.0 s none CSWjpeg', - u'/usr/lib': u'/usr/lib/libjpeg.so.62=libjpeg.so.62.0.0 s none SUNWjpg', - u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libjpeg.so.62=libjpeg.so.62.0.0 s none SUNWjpg'}) - self.error_mgr_mock.GetPkgmapLineByBasename('libCrun.so.1').AndReturn( - {u'/usr/lib': u'/usr/lib/libCrun.so.1 f none 0755 root bin 70360 7735 1256313285 *SUNWlibC', - u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libCrun.so.1 f none 0755 root bin 86464 53547 1256313286 *SUNWlibC'}) - self.error_mgr_mock.GetPkgmapLineByBasename('libCstd.so.1').AndReturn( - {u'/usr/lib': u'/usr/lib/libCstd.so.1 f none 0755 root bin 3324372 28085 1256313286 *SUNWlibC', - u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libCstd.so.1 f none 0755 root bin 3773400 36024 1256313286 *SUNWlibC'}) - self.error_mgr_mock.GetPkgmapLineByBasename('libm.so.1').AndReturn( - {u'/lib': u'/lib/libm.so.1 f none 0755 root bin 23828 57225 1106444965 SUNWlibmsr', - u'/lib/sparcv9': u'/lib/sparcv9/libm.so.1 f none 0755 root bin 30656 9035 1106444966 SUNWlibmsr', - u'/usr/lib': u'/usr/lib/libm.so.1=../../lib/libm.so.1 s none *SUNWlibms', - u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libm.so.1=../../../lib/sparcv9/libm.so.1 s none *SUNWlibms'}) - self.error_mgr_mock.GetPkgmapLineByBasename('libpthread.so.1').AndReturn( - {u'/lib': u'/lib/libpthread.so.1 f none 0755 root bin 21472 2539 1106444694 SUNWcslr', - u'/lib/sparcv9': u'/lib/sparcv9/libpthread.so.1 f none 0755 root bin 26960 55139 1106444706 SUNWcslr', - u'/usr/lib': u'/usr/lib/libpthread.so.1=../../lib/libpthread.so.1 s none SUNWcsl', - u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libpthread.so.1=../../../lib/sparcv9/libpthread.so.1 s none SUNWcsl'}) - self.error_mgr_mock.GetPkgmapLineByBasename('libc.so.1').AndReturn( - {u'/lib': u'/lib/libc.so.1 f none 0755 root bin 1639840 9259 1253045976 SUNWcslr', - u'/lib/sparcv9': u'/lib/sparcv9/libc.so.1 f none 0755 root bin 1779120 22330 1253045979 SUNWcslr', - u'/usr/lib': u'/usr/lib/libc.so.1=../../lib/libc.so.1 s none SUNWcsl', - u'/usr/lib/libp': u'/usr/lib/libp/libc.so.1=../../../lib/libc.so.1 s none SUNWdpl', - u'/usr/lib/libp/sparcv9': u'/usr/lib/libp/sparcv9/libc.so.1=../../../../lib/sparcv9/libc.so.1 s none SUNWdpl', - u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libc.so.1=../../../lib/sparcv9/libc.so.1 s none SUNWcsl'}) - self.error_mgr_mock.GetPkgmapLineByBasename('libjpeg.so.7').AndReturn( - {u'/opt/csw/lib': u'/opt/csw/lib/libjpeg.so.7=libjpeg.so.7.0.0 s none CSWjpeg', - u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libjpeg.so.7=libjpeg.so.7.0.0 s none CSWjpeg'}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libCrun.so.1').AndReturn( + {u'/usr/lib': [u'SUNWlibC'], + u'/usr/lib/sparcv9': [u'SUNWlibC']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libCstd.so.1').AndReturn( + {u'/usr/lib': [u'SUNWlibC'], + u'/usr/lib/sparcv9': [u'SUNWlibC']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn( + {u'/lib': [u'SUNWcslr'], + u'/lib/sparcv9': [u'SUNWcslr'], + u'/usr/lib': [u'SUNWcsl'], + u'/usr/lib/libp': [u'SUNWdpl'], + u'/usr/lib/libp/sparcv9': [u'SUNWdpl'], + u'/usr/lib/sparcv9': [u'SUNWcsl']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libiconv.so.2').AndReturn( + {u'/opt/csw/lib': [u'CSWiconv'], + u'/opt/csw/lib/sparcv9': [u'CSWiconv']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libjpeg.so.62').AndReturn( + {u'/opt/csw/lib': [u'CSWjpeg'], + u'/opt/csw/lib/sparcv9': [u'CSWjpeg'], + u'/usr/lib': [u'SUNWjpg'], + u'/usr/lib/sparcv9': [u'SUNWjpg']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libjpeg.so.7').AndReturn( + {u'/opt/csw/lib': [u'CSWjpeg'], + u'/opt/csw/lib/sparcv9': [u'CSWjpeg']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libm.so.1').AndReturn( + {u'/lib': [u'SUNWlibmsr'], + u'/lib/sparcv9': [u'SUNWlibmsr'], + u'/usr/lib': [u'SUNWlibms'], + u'/usr/lib/sparcv9': [u'SUNWlibms']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libpthread.so.1').AndReturn( + {u'/lib': [u'SUNWcslr'], + u'/lib/sparcv9': [u'SUNWcslr'], + u'/usr/lib': [u'SUNWcsl'], + u'/usr/lib/sparcv9': [u'SUNWcsl']}) self.error_mgr_mock.ReportError('CSWdjvulibrert', 'missing-dependency', u'CSWiconv') + +class TestCheckPstamp(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckPstamp' + def CheckpkgTest(self): + self.pkg_data["pkginfo"]["PSTAMP"] = "build8s20090904191054" + self.error_mgr_mock.ReportError( + 'pkginfo-pstamp-in-wrong-format', 'build8s20090904191054', + "It should be 'username at hostname-timestamp', but it's 'build8s20090904191054'.") + + if __name__ == '__main__': unittest.main() Added: csw/mgar/gar/v2/lib/python/testdata/checkpkg_pkgs_data_minimal.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/checkpkg_pkgs_data_minimal.py (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/checkpkg_pkgs_data_minimal.py 2010-03-23 22:32:23 UTC (rev 9343) @@ -0,0 +1,42 @@ +# $Id: checkpkg_test_data_CSWdjvulibrert.py 9248 2010-03-19 10:07:39Z wahwah $ +pkg_data = { + 'basic_stats': { + 'catalogname': 'foo', + 'pkgname': 'CSWfoo', + 'stats_version': 2L}, + 'binaries': ['opt/csw/bin/foo'], + 'binaries_dump_info': [{'base_name': 'foo', + 'needed sonames': [], + 'path': 'opt/csw/bin/foo', + 'runpath': [ + '/opt/csw/1/lib', + '/opt/csw/lib', + '/lib', + '/usr/lib', + '/usr/lib/$ISALIST', + '/usr/lib', + '/lib/$ISALIST', + '/lib'], + 'soname': 'foo', + 'soname_guessed': True}], + 'depends': [], + 'isalist': ['sparcv9+vis2', 'sparcv9+vis', 'sparcv9', + 'sparcv8plus+vis2', 'sparcv8plus+vis', 'sparcv8plus', 'sparcv8', 'sparcv8-fsmuld', + 'sparcv7', 'sparc'], + 'overrides': [], + 'pkginfo': {'ARCH': 'sparc', + 'CATEGORY': 'application', + 'CLASSES': 'none', + 'NAME': 'djvulibre_rt - DjVu standalone viewer, browser plug-in, command line tools - runtime package', + 'PKG': 'CSWdjvulibrert', + 'VERSION': '3.5.22,REV=2010.03.17', + }, + 'pkgmap': [ + {'class': 'none', + 'group': None, + 'line': None, + 'mode': None, + 'path': '/opt/csw/bin/foo', + 'type': 's', + 'user': None}, + ]} Deleted: csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWlibpq_84.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWlibpq_84.py 2010-03-23 17:37:18 UTC (rev 9342) +++ csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWlibpq_84.py 2010-03-23 22:32:23 UTC (rev 9343) @@ -1,10 +0,0 @@ -# Testing data for CSWlibpq-84 -# $Id$ -DATA_PKGNAME = 'CSWlibpq-84' -DATA_DECLARED_DEPENDENCIES = {'CSWlibxml2': 'CSWlibxml2 libxml2 - XML Parser Library ', 'CSWkrb5lib': 'CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries ', 'CSWlibxslt': 'CSWlibxslt libxslt - XSLT engine runtime package ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages ', 'CSWisaexec': 'CSWisaexec isaexec - sneaky wrapper around Sun isaexec ', 'CSWzlib': 'CSWzlib zlib - Zlib Data Compression Library ', 'CSWosslrt': 'CSWosslrt openssl_rt - Openssl runtime libraries '} -DATA_BINARIES_BY_PKGNAME = {'CSWpostgresql-84-doc': [], 'CSWpostgresql': [], 'CSWpostgresql-84': ['vacuumdb', 'clusterdb', 'vacuumlo', 'initdb', 'reindexdb', 'createdb', 'pg_dump', 'pg_resetxlog', 'pg_config', 'pg_ctl', 'createlang', 'pg_standby', 'oid2name', 'droplang', 'dropdb', 'pgbench', 'createuser', 'pg_controldata', 'postgres', 'pg_dumpall', 'psql', 'dropuser', 'pg_restore', 'ecpg', 'oid2name', 'pg_ctl', 'droplang', 'pg_controldata', 'postgres', 'pg_dump', 'dropuser', 'dropdb', 'initdb', 'vacuumdb', 'pg_config', 'pg_resetxlog', 'createlang', 'createdb', 'vacuumlo', 'pg_standby', 'pgbench', 'reindexdb', 'pg_restore', 'clusterdb', 'ecpg', 'createuser', 'psql', 'pg_dumpall', 'pg_regress', 'pg_regress'], 'CSWpostgresql-84-dev': [], 'CSWlibpq-84': ['fuzzystrmatch.so', 'utf8_and_iso8859.so', 'seg.so', 'utf8_and_gbk.so', 'utf8_and_euc_jis_2004.so', 'cyrillic_and_mic.so', 'btree_gist.so', 'utf8_and_euc_jp.so', 'utf8_and_big5.so', 'cube.so', 'citext.so', 'insert_username.so', 'tsearch2.so', 'pg_stat_statements.so', 'utf8_and_ascii.so', 'lo.so', 'pgxml.so', 'utf8_and_euc_kr.so', 'dict_int.so', 'sslinfo.so', 'btree_gin.so', 'test_parser.so', 'euc_tw_and_big5.so', 'pgcrypto.so', 'latin2_and_win1250.so', 'auto_explain.so', 'tablefunc.so', 'dict_xsyn.so', 'latin_and_mic.so', 'dict_snowball.so', 'euc_jis_2004_and_shift_jis_2004.so', 'chkpass.so', 'utf8_and_shift_jis_2004.so', 'refint.so', 'pgstattuple.so', 'pg_trgm.so', 'utf8_and_uhc.so', 'pgrowlocks.so', 'utf8_and_cyrillic.so', 'pg_freespacemap.so', 'ltree.so', 'libpgtypes.so.3.1', 'libpq.so.5.2', '_int.so', 'utf8_and_win.so', 'pg_buffercache.so', 'euc_jp_and_sjis.so', 'utf8_and_johab.so', 'isn.so', 'timetravel.so', 'earthdistance.so', 'plpgsql.so', 'euc_kr_and_mic.so', 'dblink.so', 'hstore.so', 'pageinspect.so', 'libecpg.so.6.1', 'adminpack.so', 'utf8_and_euc_cn.so', 'utf8_and_sjis.so', 'euc_cn_and_mic.so', 'utf8_and_euc_tw.so', 'autoinc.so', 'libecpg_compat.so.3.1', 'test_parser.so', 'utf8_and_gbk.s o', 'utf8_and_euc_tw.so', 'ltree.so', 'timetravel.so', 'euc_cn_and_mic.so', 'utf8_and_euc_cn.so', 'pgrowlocks.so', 'latin_and_mic.so', 'dict_snowball.so', 'cube.so', 'utf8_and_euc_jis_2004.so', 'utf8_and_shift_jis_2004.so', 'libpgtypes.so.3.1', 'dict_xsyn.so', 'utf8_and_gb18030.so', 'tablefunc.so', 'citext.so', 'isn.so', 'fuzzystrmatch.so', 'pg_freespacemap.so', 'sslinfo.so', 'pg_buffercache.so', 'utf8_and_johab.so', 'euc_jp_and_sjis.so', 'libecpg_compat.so.3.1', 'auto_explain.so', 'btree_gin.so', 'euc_kr_and_mic.so', 'chkpass.so', 'utf8_and_big5.so', 'utf8_and_iso8859_1.so', 'tsearch2.so', 'pg_trgm.so', 'utf8_and_ascii.so', 'btree_gist.so', 'utf8_and_sjis.so', 'euc_jis_2004_and_shift_jis_2004.so', 'utf8_and_win.so', '_int.so', 'libecpg.so.6.1', 'utf8_and_uhc.so', 'pageinspect.so', 'utf8_and_euc_kr.so', 'utf8_and_iso8859.so', 'moddatetime.so', 'pg_stat_statements.so', 'utf8_and_cyrillic.so', 'euc_tw_and_big5.so', 'ascii_and_mic.so', 'libpq.so.5.2', 'cyrillic_and_mic.so', 'db link.so', 'hstore.so', 'plpgsql.so', 'pgxml.so', 'pgcrypto.so', 'lo.so', 'pgstattuple.so', 'autoinc.so', 'dict_int.so', 'earthdistance.so', 'adminpack.so', 'seg.so', 'utf8_and_euc_jp.so', 'latin2_and_win1250.so', 'refint.so', 'insert_username.so', 'ascii_and_mic.so', 'utf8_and_gb18030.so', 'utf8_and_iso8859_1.so', 'moddatetime.so']} @@ 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 skayser at users.sourceforge.net Wed Mar 24 00:42:44 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 23 Mar 2010 23:42:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9344] csw/mgar/pkg/tmpwatch/trunk Message-ID: Revision: 9344 http://gar.svn.sourceforge.net/gar/?rev=9344&view=rev Author: skayser Date: 2010-03-23 23:42:44 +0000 (Tue, 23 Mar 2010) Log Message: ----------- tmpwatch: remove customizations now that Ben's patches have been merged upstream Modified Paths: -------------- csw/mgar/pkg/tmpwatch/trunk/Makefile csw/mgar/pkg/tmpwatch/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/tmpwatch/trunk/files/0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch csw/mgar/pkg/tmpwatch/trunk/files/0002-tmpwatch.c-include-stpcpy.c.patch Modified: csw/mgar/pkg/tmpwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/Makefile 2010-03-23 22:32:23 UTC (rev 9343) +++ csw/mgar/pkg/tmpwatch/trunk/Makefile 2010-03-23 23:42:44 UTC (rev 9344) @@ -1,11 +1,5 @@ -# TODO -# ! strtoimax implementation missing on Solaris 8/9, gnulib provides -# a strtoimax implementation. Relevant bug against tmpwatch: -# https://fedorahosted.org/tmpwatch/ticket/5 -# Any solutions will certainly also be appreciated by the people on the -# bug report. GARNAME = tmpwatch -GARVERSION = 2.9.17 +GARVERSION = 2.10.1 CATEGORIES = apps DESCRIPTION = Removes files which haven't been accessed for a period of time @@ -24,15 +18,7 @@ BUILD_DEP_PKGS = CSWlibgnugetopt RUNTIME_DEP_PKGS = CSWlibgnugetopt -# Taken from libgcrypt's stringhelp.c -DISTFILES += stpcpy.c - -# Tweak Makefile to honor environment variables -PATCHFILES = 0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch -# Include missing stpcpy() implementation -PATCHFILES += 0002-tmpwatch.c-include-stpcpy.c.patch - -CONFIGURE_SCRIPTS = +CONFIGURE_ARGS = $(DIRPATHS) BUILD_ARGS = tmpwatch TEST_SCRIPTS = @@ -40,7 +26,3 @@ EXTRA_LINKER_FLAGS = -lgnugetopt include gar/category.mk - -pre-build-modulated: - cp $(WORKDIR)/stpcpy.c $(WORKSRC) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/tmpwatch/trunk/checksums =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/checksums 2010-03-23 22:32:23 UTC (rev 9343) +++ csw/mgar/pkg/tmpwatch/trunk/checksums 2010-03-23 23:42:44 UTC (rev 9344) @@ -1,4 +1 @@ -9d3371e425a1214f59044487b2cf76b9 0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch -af1b38792e28777a049cbe4ca3dd2132 0002-tmpwatch.c-include-stpcpy.c.patch -6a89324536d839b75ceb2fbdac4bf255 stpcpy.c -7738f5db4ae0ce3795c224f13a597356 tmpwatch-2.9.17.tar.bz2 +c26ac6aef91e230f748b08b066c406d9 tmpwatch-2.10.1.tar.bz2 Deleted: csw/mgar/pkg/tmpwatch/trunk/files/0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/files/0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch 2010-03-23 22:32:23 UTC (rev 9343) +++ csw/mgar/pkg/tmpwatch/trunk/files/0001-Makefile-honor-defaults-and-use-DESTDIR-instead-of-R.patch 2010-03-23 23:42:44 UTC (rev 9344) @@ -1,61 +0,0 @@ -From a6bf87119784e5f4cf2ecfeab171e6b59ce725e1 Mon Sep 17 00:00:00 2001 -From: Sebastian Kayser -Date: Wed, 24 Feb 2010 16:39:37 +0100 -Subject: [PATCH 1/2] Makefile: honor defaults and use DESTDIR instead of ROOT - ---- - Makefile | 24 +++++++++++++----------- - 1 files changed, 13 insertions(+), 11 deletions(-) - -diff --git a/Makefile b/Makefile -index cfb71dd..35297a3 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,7 +2,9 @@ VERSION=2.9.17 - HGTAG = 'tmpwatch-$(VERSION)' - OS_NAME=$(shell uname -s) - --CFLAGS=$(RPM_OPT_FLAGS) -W -Wall -DVERSION=\"$(VERSION)\" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -+CFLAGS ?= $(RPM_OPT_FLAGS) -W -Wall -+CFLAGS += -DVERSION=\"$(VERSION)\" -+CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE - - ifeq ($(OS_NAME),HP-UX) - ROOT=/ -@@ -13,12 +15,12 @@ ifeq ($(OS_NAME),HP-UX) - CC=gcc - endif - ifeq ($(OS_NAME),SunOS) -- ROOT=/ -- PREFIX=/usr/local -- MANDIR=$(PREFIX)/man -- SBINDIR=$(PREFIX)/sbin -- INSTALL=./install-sh -- CC=gcc -+ DESTDIR?=/ -+ PREFIX?=/usr/local -+ MANDIR?=$(PREFIX)/man -+ SBINDIR?=$(PREFIX)/sbin -+ INSTALL?=./install-sh -+ CC?=gcc - endif - ifeq ($(OS_NAME),Linux) - ROOT=/ -@@ -31,10 +33,10 @@ endif - all: tmpwatch - - install: all -- [ -d $(ROOT)$(SBINDIR) ] || mkdir -p $(ROOT)$(SBINDIR) -- [ -d $(ROOT)$(MANDIR)/man8 ] || mkdir -p $(ROOT)$(MANDIR)/man8 -- $(INSTALL) -m 755 tmpwatch $(ROOT)$(SBINDIR)/tmpwatch -- $(INSTALL) -m 644 tmpwatch.8 $(ROOT)$(MANDIR)/man8/tmpwatch.8 -+ [ -d $(DESTDIR)$(SBINDIR) ] || mkdir -p $(DESTDIR)$(SBINDIR) -+ [ -d $(DESTDIR)$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)$(MANDIR)/man8 -+ $(INSTALL) -m 755 tmpwatch $(DESTDIR)$(SBINDIR)/tmpwatch -+ $(INSTALL) -m 644 tmpwatch.8 $(DESTDIR)$(MANDIR)/man8/tmpwatch.8 - - clean: - rm -f tmpwatch --- -1.6.6 - Deleted: csw/mgar/pkg/tmpwatch/trunk/files/0002-tmpwatch.c-include-stpcpy.c.patch =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/files/0002-tmpwatch.c-include-stpcpy.c.patch 2010-03-23 22:32:23 UTC (rev 9343) +++ csw/mgar/pkg/tmpwatch/trunk/files/0002-tmpwatch.c-include-stpcpy.c.patch 2010-03-23 23:42:44 UTC (rev 9344) @@ -1,24 +0,0 @@ -From a04d34c996c8f87f92f96243cd80dd54ff4a9a1a Mon Sep 17 00:00:00 2001 -From: Sebastian Kayser -Date: Wed, 24 Feb 2010 16:42:46 +0100 -Subject: [PATCH 2/2] tmpwatch.c: include stpcpy.c - ---- - tmpwatch.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/tmpwatch.c b/tmpwatch.c -index 4091013..a6b47a1 100644 ---- a/tmpwatch.c -+++ b/tmpwatch.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include "stpcpy.c" - #include - #include - #include --- -1.6.6 - 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 Mar 24 01:54:38 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Mar 2010 00:54:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[9345] csw/mgar/pkg/tmpwatch/trunk/Makefile Message-ID: Revision: 9345 http://gar.svn.sourceforge.net/gar/?rev=9345&view=rev Author: bdwalton Date: 2010-03-24 00:54:36 +0000 (Wed, 24 Mar 2010) Log Message: ----------- tmpwatch: remove gnugetoptstuff; drop BUILD_ARGS Modified Paths: -------------- csw/mgar/pkg/tmpwatch/trunk/Makefile Modified: csw/mgar/pkg/tmpwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/Makefile 2010-03-23 23:42:44 UTC (rev 9344) +++ csw/mgar/pkg/tmpwatch/trunk/Makefile 2010-03-24 00:54:36 UTC (rev 9345) @@ -15,14 +15,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -BUILD_DEP_PKGS = CSWlibgnugetopt -RUNTIME_DEP_PKGS = CSWlibgnugetopt - CONFIGURE_ARGS = $(DIRPATHS) -BUILD_ARGS = tmpwatch TEST_SCRIPTS = -# Link against our OpenCSW getopt lib which has getopt_long -EXTRA_LINKER_FLAGS = -lgnugetopt - include gar/category.mk + 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 Mar 24 04:12:46 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Mar 2010 03:12:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9346] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9346 http://gar.svn.sourceforge.net/gar/?rev=9346&view=rev Author: bdwalton Date: 2010-03-24 03:12:46 +0000 (Wed, 24 Mar 2010) Log Message: ----------- ruby19: make tk/tcl links against csw x11; add deps for base pkg Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-24 00:54:36 UTC (rev 9345) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-24 03:12:46 UTC (rev 9346) @@ -3,12 +3,6 @@ PATCHLEVEL = p376 CATEGORIES = lang -# Overrides for checkpkg. These are all false positives or ignorable -# for now. -CHECKPKG_OVERRIDES_CSWruby19tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWruby19tk += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWruby19tk += surplus-dependency|CSWruby19 - # Working with Jens Deppe, we've determined that the two failing tests # in 1.9.1p376 are bad tests (as documented here[1] and here[2]). # They make assumptions about kernel behaviour that don't hold for @@ -39,6 +33,8 @@ ARCHALL_CSWruby19doc = 1 +RUNTIME_DEP_PKGS_CSWruby19 = CSWgdbm CSWiconv CSWncurses CSWosslrt +RUNTIME_DEP_PKGS_CSWruby19 += CSWreadline CSWzlib RUNTIME_DEP_PKGS_CSWruby19doc = CSWruby19 RUNTIME_DEP_PKGS_CSWruby19tk = CSWruby19 CSWtk CSWtcl RUNTIME_DEP_PKGS_CSWruby19dev = CSWruby19 @@ -71,6 +67,9 @@ CONFIGURE_ARGS += --program-suffix=19 CONFIGURE_ARGS += --enable-pthread +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib + ifdef USEGCC GARCOMPILER = GCC4 RUNTIME_DEP_PKGS_CSWruby19 += CSWgcc4corert This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 24 10:17:49 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 24 Mar 2010 09:17:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9347] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9347 http://gar.svn.sourceforge.net/gar/?rev=9347&view=rev Author: wahwah Date: 2010-03-24 09:17:49 +0000 (Wed, 24 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, commondirs check integrated with GAR. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/dependency_checks.py csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-24 03:12:46 UTC (rev 9346) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-24 09:17:49 UTC (rev 9347) @@ -697,6 +697,7 @@ if not self.system_pkgmap: self.system_pkgmap = SystemPkgmap() self.messages = [] + self.common_paths = {} def GetPkgmapLineByBasename(self, basename): """Proxies calls to self.system_pkgmap.""" @@ -713,7 +714,18 @@ def Message(self, msg): sef.messages.append(msg) + def GetCommonPaths(self, arch): + """Returns a list of paths for architecture, from gar/etc/commondirs*.""" + file_name = os.path.join( + os.path.dirname(__file__), "..", "..", "etc", "commondirs-%s" % arch) + logging.debug("opening %s", file_name) + f = open(file_name, "r") + lines = f.read().splitlines() + f.close() + return lines + + class IndividualCheckInterface(CheckInterfaceBase): """To be passed to the checking functions. Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-03-24 03:12:46 UTC (rev 9346) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-03-24 09:17:49 UTC (rev 9347) @@ -5,7 +5,7 @@ def Libraries(pkg_data, error_mgr, logger, path_and_pkg_by_soname): pkgname = pkg_data["basic_stats"]["pkgname"] - logger.info("Package %s", pkgname) + logger.debug("Package %s", pkgname) orphan_sonames = [] required_deps = [] isalist = pkg_data["isalist"] Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-24 03:12:46 UTC (rev 9346) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-24 09:17:49 UTC (rev 9347) @@ -11,6 +11,7 @@ # logger.debug("Checking something.") # error_mgr.ReportError("something-is-wrong") +import copy import re import os import checkpkg @@ -21,13 +22,14 @@ from Cheetah import Template PATHS_ALLOWED_ONLY_IN = { - "CSWcommon": ["/opt", - "/opt/csw/man", - "/opt/csw/doc", - "/opt/csw/info", - "/opt/csw/share/locale/locale.alias"], - "CSWiconv": ["/opt/csw/lib/charset.alias"], - "CSWtexinfp": ["/opt/csw/share/info/dir"], + # Leading slash must be removed. + "CSWcommon": ["opt", + "opt/csw/man", + "opt/csw/doc", + "opt/csw/info", + "opt/csw/share/locale/locale.alias"], + "CSWiconv": ["opt/csw/lib/charset.alias"], + "CSWtexinfp": ["opt/csw/share/info/dir"], } MAX_DESCRIPTION_LENGTH = 100 LICENSE_TMPL = "/opt/csw/share/doc/%s/license" @@ -46,9 +48,6 @@ MAX_PKGNAME_LENGTH = 20 ARCH_LIST = ["sparc", "i386", "all"] VERSION_RE = r".*,REV=(20[01][0-9]\.[0-9][0-9]\.[0-9][0-9]).*" -ONLY_ALLOWED_IN_PKG = { - "CSWcommon": ("/opt", ) -} DO_NOT_LINK_AGAINST_THESE_SONAMES = set(["libX11.so.4"]) DISCOURAGED_FILE_PATTERNS = (r"\.py[co]$",) BAD_RPATH_LIST = [ @@ -465,23 +464,33 @@ "%s, %s" % (entry["path"], entry["user"])) -def CheckPkgmapPaths(pkg_data, error_mgr, logger): - pkgname = pkg_data["basic_stats"]["pkgname"] - pkg_paths = set([x["path"] for x in pkg_data["pkgmap"]]) - for allowed_pkgname in ONLY_ALLOWED_IN_PKG: - for disallowed_path in ONLY_ALLOWED_IN_PKG[allowed_pkgname]: - if disallowed_path in pkg_paths and pkgname != allowed_pkgname: - error_mgr.ReportError("disallowed-path", disallowed_path) - - def CheckDisallowedPaths(pkg_data, error_mgr, logger): - """This seems to be a duplicate of CheckPkgmapPaths.""" - for pkgname in PATHS_ALLOWED_ONLY_IN: + """Checks for disallowed paths, such as common paths.""" + arch = pkg_data["pkginfo"]["ARCH"] + # Common paths read from the file are absolute, e.g. /opt/csw/lib + # while paths in pkginfo are relative, e.g. opt/csw/lib. + common_paths = [] + for common_path in error_mgr.GetCommonPaths(arch): + if common_path.startswith("/"): + common_path = common_path[1:] + common_paths.append(common_path) + paths_only_allowed_in = copy.copy(PATHS_ALLOWED_ONLY_IN) + paths_only_allowed_in["CSWcommon"] += common_paths + paths_in_pkg = set() + for entry in pkg_data["pkgmap"]: + entry_path = entry["path"] + if not entry_path: + continue + if entry_path.startswith("/"): + entry_path = entry_path[1:] + paths_in_pkg.add(entry_path) + for pkgname in paths_only_allowed_in: if pkgname != pkg_data["basic_stats"]["pkgname"]: - for entry in pkg_data["pkgmap"]: - for forbidden_path in PATHS_ALLOWED_ONLY_IN[pkgname]: - if entry["path"] == forbidden_path: - error_mgr.ReportError("disallowed-path", entry["path"]) + disallowed_paths = set(paths_only_allowed_in[pkgname]) + intersection = disallowed_paths.intersection(paths_in_pkg) + logger.debug("Bad paths found: %s", intersection) + for bad_path in intersection: + error_mgr.ReportError("disallowed-path", bad_path) def CheckLinkingAgainstSunX11(pkg_data, error_mgr, logger): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Mar 24 11:20:23 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 24 Mar 2010 10:20:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9348] csw/mgar/pkg/gnomedesktop/trunk/Makefile Message-ID: Revision: 9348 http://gar.svn.sourceforge.net/gar/?rev=9348&view=rev Author: bensons Date: 2010-03-24 10:20:19 +0000 (Wed, 24 Mar 2010) Log Message: ----------- gnomedesktop: fixed to build fine Modified Paths: -------------- csw/mgar/pkg/gnomedesktop/trunk/Makefile Modified: csw/mgar/pkg/gnomedesktop/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnomedesktop/trunk/Makefile 2010-03-24 09:17:49 UTC (rev 9347) +++ csw/mgar/pkg/gnomedesktop/trunk/Makefile 2010-03-24 10:20:19 UTC (rev 9348) @@ -27,6 +27,9 @@ RUNTIME_DEP_PKGS_CSWgnomedesktopdevel += CSWevolution RUNTIME_DEP_PKGS_CSWgnomedesktopdoc += CSWevolution +BUILD_DEP_PKGS_CSWgnomedesktop += CSWlibxrandrdevel +BUILD_DEP_PKGS_CSWgnomedesktop += CSWx11randrproto + PKGFILES_CSWgnomedesktopdevel = $(PKGFILES_DEVEL) PKGFILES_CSWgnomedesktopdoc = $(sharedstatedir)/gtk-doc/.* @@ -40,7 +43,7 @@ EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -BUILD64 = 1 +# BUILD64 = 1 STRIP_LIBTOOL = 1 @@ -51,3 +54,13 @@ include gar/category.mk PATH := /opt/csw/gnu:$(PATH) + +pre-build-modulated: + gsed -i 's/^\(GNOME_DESKTOP_LIBS = .*\)$$/\1 -lm/' \ + $(WORKSRC)/libgnome-desktop/Makefile + gsed -i 's,\tmsgfmt,\t$$(GMSGFMT),' \ + $(WORKSRC)/desktop-docs/fdl/Makefile + gsed -i 's,\tmsgfmt,\t$$(GMSGFMT),' \ + $(WORKSRC)/desktop-docs/gpl/Makefile + gsed -i 's,\tmsgfmt,\t$$(GMSGFMT),' \ + $(WORKSRC)/desktop-docs/lgpl/Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Wed Mar 24 11:43:02 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Wed, 24 Mar 2010 10:43:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[9349] csw/mgar/pkg/tkcvs/trunk/Makefile Message-ID: Revision: 9349 http://gar.svn.sourceforge.net/gar/?rev=9349&view=rev Author: opk Date: 2010-03-24 10:42:59 +0000 (Wed, 24 Mar 2010) Log Message: ----------- also need to install tclIndex file Modified Paths: -------------- csw/mgar/pkg/tkcvs/trunk/Makefile Modified: csw/mgar/pkg/tkcvs/trunk/Makefile =================================================================== --- csw/mgar/pkg/tkcvs/trunk/Makefile 2010-03-24 10:20:19 UTC (rev 9348) +++ csw/mgar/pkg/tkcvs/trunk/Makefile 2010-03-24 10:42:59 UTC (rev 9349) @@ -46,6 +46,6 @@ @ginstall -D $(WORKSRC)/tkcvs/tkcvs.tcl $(DESTDIR)$(prefix)/bin/tkcvs @ginstall -D $(WORKSRC)/tkcvs/tkcvs.1 $(DESTDIR)$(prefix)/share/man/man1/tkcvs.1 @ginstall -d $(DESTDIR)$(prefix)/lib/tkcvs/bitmaps - @ginstall -m 644 $(TCL_FILES) $(DESTDIR)$(prefix)/lib/tkcvs + @ginstall -m 644 $(TCL_FILES) $(WORKSRC)/tkcvs/tclIndex $(DESTDIR)$(prefix)/lib/tkcvs @ginstall -m 644 $(IMAGE_FILES) $(DESTDIR)$(prefix)/lib/tkcvs/bitmaps @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 24 14:31:54 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 24 Mar 2010 13:31:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9350] csw/mgar/gar/v2/lib/python/checkpkg.py Message-ID: Revision: 9350 http://gar.svn.sourceforge.net/gar/?rev=9350&view=rev Author: wahwah Date: 2010-03-24 13:31:54 +0000 (Wed, 24 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, handle the special case of arch=all in commondirs-%s Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-24 10:42:59 UTC (rev 9349) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-24 13:31:54 UTC (rev 9350) @@ -716,12 +716,19 @@ def GetCommonPaths(self, arch): """Returns a list of paths for architecture, from gar/etc/commondirs*.""" - file_name = os.path.join( - os.path.dirname(__file__), "..", "..", "etc", "commondirs-%s" % arch) - logging.debug("opening %s", file_name) - f = open(file_name, "r") - lines = f.read().splitlines() - f.close() + assert arch in ('i386', 'sparc', 'all'), "Wrong arch: %s" % repr(arch) + if arch == 'all': + archs = ('i386', 'sparc') + else: + archs = [arch] + lines = [] + for arch in archs: + file_name = os.path.join( + os.path.dirname(__file__), "..", "..", "etc", "commondirs-%s" % arch) + logging.debug("opening %s", file_name) + f = open(file_name, "r") + lines.extend(f.read().splitlines()) + f.close() return lines 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 Mar 24 15:11:43 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Mar 2010 14:11:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9351] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 9351 http://gar.svn.sourceforge.net/gar/?rev=9351&view=rev Author: dmichelsen Date: 2010-03-24 14:11:43 +0000 (Wed, 24 Mar 2010) Log Message: ----------- mGAR v2: Raise packaging platforms to Solaris 9 Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-03-24 13:31:54 UTC (rev 9350) +++ csw/mgar/gar/v2/gar.conf.mk 2010-03-24 14:11:43 UTC (rev 9351) @@ -18,7 +18,7 @@ # On these platforms packages are built. # They will include binaries for all ISAs that are specified for the platform. -PACKAGING_PLATFORMS ?= solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 # This is the platform we are currently building. It is either set when # invoked from "gmake platforms" or when you build a package on a host 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 Mar 24 15:13:24 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Mar 2010 14:13:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9352] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 9352 http://gar.svn.sourceforge.net/gar/?rev=9352&view=rev Author: dmichelsen Date: 2010-03-24 14:13:24 +0000 (Wed, 24 Mar 2010) Log Message: ----------- mGAR v2: Raise default Sun compiler to SOS12 Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-03-24 14:11:43 UTC (rev 9351) +++ csw/mgar/gar/v2/gar.conf.mk 2010-03-24 14:13:24 UTC (rev 9352) @@ -86,7 +86,7 @@ GARCOMPILERS = GCC3 GCC4 SOS11 SOS12 ifeq ($(GARCOMPILER),SUN) - GARCOMPILER = SOS11 + GARCOMPILER = SOS12 endif ifeq ($(GARCOMPILER),GNU) 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 Mar 24 17:24:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Mar 2010 16:24:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[9353] csw/mgar/pkg/glib Message-ID: Revision: 9353 http://gar.svn.sourceforge.net/gar/?rev=9353&view=rev Author: dmichelsen Date: 2010-03-24 16:24:33 +0000 (Wed, 24 Mar 2010) Log Message: ----------- glib: Move legacy to tags/ Added Paths: ----------- csw/mgar/pkg/glib/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/glib/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Wed Mar 24 18:11:08 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Wed, 24 Mar 2010 17:11:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9354] csw/mgar/pkg/zsh/trunk/files/_pkgutil Message-ID: Revision: 9354 http://gar.svn.sourceforge.net/gar/?rev=9354&view=rev Author: opk Date: 2010-03-24 17:11:08 +0000 (Wed, 24 Mar 2010) Log Message: ----------- add zsh completion function for pkgutil. still need to change Makefile to include this in the package Added Paths: ----------- csw/mgar/pkg/zsh/trunk/files/_pkgutil Added: csw/mgar/pkg/zsh/trunk/files/_pkgutil =================================================================== --- csw/mgar/pkg/zsh/trunk/files/_pkgutil (rev 0) +++ csw/mgar/pkg/zsh/trunk/files/_pkgutil 2010-03-24 17:11:08 UTC (rev 9354) @@ -0,0 +1,58 @@ +#compdef pkgutil + +local curcontext="$curcontext" state line expl ret=1 +typeset -A opt_args + +local opts='(-i --install -u --upgrade -r --remove -d --download -a --available -c --compare -U --catalog -S --stream -h --help -v --version -V --syscheck)' +local catalog +catalog=( /var/opt/csw/pkgutil/catalog.*_`uname -p`_`uname -r`(N[1]) ) + +_arguments \ + "$opts"{-i,--install}'[install package]' \ + "$opts"{-u,--upgrade}'[upgrade package]' \ + "$opts"{-r,--remove}'[remove package]' \ + "$opts"{-d,--download}'[download only]' \ + "$opts-U[update catalog]" \ + "$opts"{-a,--available}'[show available packages]' \ + "$opts"{-c,--compare}'[compare installed packages to current]' \ + "$opts-C[compare showing only differences]" \ + {-e,--email=}'[send e-mail with available updates]:email:_email_addresses' \ + {-t,--temp}'[specify temporary download site]:site' \ + "$opts"{-s,--stream}'[build package stream]' \ + {-T,--target=}'[specify target arch and release]:arch:->arch' \ + {-o,--output=}'[specify filename for package stream]:file:_files' \ + \*{-x,--exclude=}'[specify package to exclude]:package:->packages' \ + {-W,--workdir}'[path for downloads]:path:_directories' \ + '--config=[specify alternate config file]:file' \ + {-y,--yes}'[answer yes on all prompts]' \ + {-n,--nomod}'[dry run making no modifications]' \ + {-D,--debug}'[enable debug information]' \ + '--trace[set trace mode (-v) for pkgadd/pkgrm]' \ + "$opts"{-h,--help}'[display help information]' \ + "$opts"{-v,--version}'[show pkgutil version]' \ + "$opts"{-V,--syscheck}'[show info about binaries and features used]' \ + '*:: :->packages' && ret=0 + +case $state in + packages) + (( $#catalog )) || return 1 + typeset -A pkgs + pkgs=( ${(s: :)${${${${(f)"$(<$catalog)"[3,-1]}/(#b) [^ ]## ([^ ]##) */ ${match[1]}}:#\#*}[3,(i)-----BEGIN*]}[1,-2]} ) + if (( $+opt_args[-r] + $+opt_args[--remove] + $+opt_args[-u] + $+opt_args[--upgrade])); then + local old=\(${(j.|.)${${${${(f)"$(pkginfo)"}#[^ ]## ##}%% *}}}\) + _wanted packages expl package compadd ${(k)pkgs[(R)$~old]} && ret=0 + else + _wanted packages expl package compadd -k pkgs && ret=0 + fi + ;; + arch) + local suf + if compset -P '*:'; then + _wanted releases expl release compadd 5.{8..10} && ret=0 + else + compset -S ':*' || suf=( -S : ) + _wanted architectures expl arch compadd $suf[@] i386 sparc && ret=0 + fi +esac + +return ret This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Mar 24 22:02:16 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 24 Mar 2010 21:02:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9355] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 9355 http://gar.svn.sourceforge.net/gar/?rev=9355&view=rev Author: chninkel Date: 2010-03-24 21:02:15 +0000 (Wed, 24 Mar 2010) Log Message: ----------- openssh: added derelativise_path_bugfix patch to fix an incorrect usage of getcwd under solaris Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2010-03-24 17:11:08 UTC (rev 9354) +++ csw/mgar/pkg/openssh/trunk/Makefile 2010-03-24 21:02:15 UTC (rev 9355) @@ -73,6 +73,10 @@ # see https://bugzilla.mindrot.org/show_bug.cgi?id=1457 PATCHFILES += no_x_forwarding_bug.patch +# Fix an incorrect usage of getcwd under Solaris +# see https://bugzilla.mindrot.org/show_bug.cgi?id=1739 +PATCHFILES += derelativise_path_bugfix.patch + # documentation files to install (not a gar variable) DOCFILES = CREDITS ChangeLog ChangeLog.gssapi INSTALL LICENCE OVERVIEW README README.dns DOCFILES += README.platform README.privsep README.smartcard README.tun TODO WARNING.RNG Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2010-03-24 17:11:08 UTC (rev 9354) +++ csw/mgar/pkg/openssh/trunk/checksums 2010-03-24 21:02:15 UTC (rev 9355) @@ -5,10 +5,11 @@ 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall 77b86c30c3257fdf014102c8166fab2d CSWosshlpk.prototype -279bdcf587e6191c295c3adc1b0cfb8d changelog.CSW +b888991f715a20842aeb776fe6c71370 changelog.CSW 9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh 8e765642349b6321d01b33e95304e113 cswopenssh.xml +704ad1d3216df8de4d44465006c64c39 derelativise_path_bugfix.patch 4b3e79120b60e8f25be5141eba53cac5 don_t_use_TIOCSCTTY.patch ca5403c8e1539d5ced0573f289ed7aef no_x_forwarding_bug.patch 10e0b84c84ad0dc9c490480aab36be01 openssh-5.4p1-gsskex-all-20100313.patch Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2010-03-24 17:11:08 UTC (rev 9354) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2010-03-24 21:02:15 UTC (rev 9355) @@ -1,3 +1,10 @@ +openssh (5.4p1,REV=2010.03.24) unstable + + * Added derelativise_path_bugfix.patch patch to solve a bug in the + derelativise_path function (Closes: #4367). + + -- Yann Rouillard Wed, 24 Mar 2010 22:00:55 +0100 + openssh (5.4p1,REV=2010.03.13) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Mar 24 22:03:45 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 24 Mar 2010 21:03:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[9356] csw/mgar/pkg/openssh/trunk/Makefile Message-ID: Revision: 9356 http://gar.svn.sourceforge.net/gar/?rev=9356&view=rev Author: chninkel Date: 2010-03-24 21:03:45 +0000 (Wed, 24 Mar 2010) Log Message: ----------- openssh: dropped solaris 8 packaging platforms Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2010-03-24 21:02:15 UTC (rev 9355) +++ csw/mgar/pkg/openssh/trunk/Makefile 2010-03-24 21:03:45 UTC (rev 9356) @@ -43,7 +43,7 @@ RUNTIME_DEP_PKGS_CSWosshclient = CSWosslrt CSWzlib CSWkrb5lib SPKG_CLASSES_CSWosshclient = none cswpreserveconf -PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 ###### Upstream and OpenCSW files information ####### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Mar 24 22:15:58 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 24 Mar 2010 21:15:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9357] csw/mgar/pkg/openssh/trunk/files/ derelativise_path_bugfix.patch Message-ID: Revision: 9357 http://gar.svn.sourceforge.net/gar/?rev=9357&view=rev Author: chninkel Date: 2010-03-24 21:15:58 +0000 (Wed, 24 Mar 2010) Log Message: ----------- openssh: added derelativise_path_bugfix patch (take two) Added Paths: ----------- csw/mgar/pkg/openssh/trunk/files/derelativise_path_bugfix.patch Added: csw/mgar/pkg/openssh/trunk/files/derelativise_path_bugfix.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/derelativise_path_bugfix.patch (rev 0) +++ csw/mgar/pkg/openssh/trunk/files/derelativise_path_bugfix.patch 2010-03-24 21:15:58 UTC (rev 9357) @@ -0,0 +1,11 @@ +--- openssh-5.4p1/servconf.c.orig Wed Mar 24 21:56:53 2010 ++++ openssh-5.4p1/servconf.c Wed Mar 24 21:56:29 2010 +@@ -492,7 +492,7 @@ + expanded = tilde_expand_filename(path, getuid()); + if (*expanded == '/') + return expanded; +- if ((cwd = getcwd(NULL, 0)) == NULL) ++ if ((cwd = getcwd(NULL, PATH_MAX)) == NULL) + fatal("%s: getcwd: %s", __func__, strerror(errno)); + xasprintf(&ret, "%s/%s", cwd, expanded); + xfree(cwd); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Mar 24 23:54:06 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 24 Mar 2010 22:54:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9358] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 9358 http://gar.svn.sourceforge.net/gar/?rev=9358&view=rev Author: chninkel Date: 2010-03-24 22:54:06 +0000 (Wed, 24 Mar 2010) Log Message: ----------- openssl: updated to 0.9.8n Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2010-03-24 21:15:58 UTC (rev 9357) +++ csw/mgar/pkg/openssl/trunk/Makefile 2010-03-24 22:54:06 UTC (rev 9358) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = openssl -GARVERSION = 0.9.8m +GARVERSION = 0.9.8n CATEGORIES = lib DESCRIPTION = The Open Source toolkit for SSL and TLS Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2010-03-24 21:15:58 UTC (rev 9357) +++ csw/mgar/pkg/openssl/trunk/checksums 2010-03-24 22:54:06 UTC (rev 9358) @@ -8,6 +8,6 @@ 2b956d4877de436a584dc6e09574c8d8 CSWosslrt.prototype-sparc 1cb63bd3d00639f0aee05fdf96651d95 CSWosslutils.prototype b78faa440d6f6a2a07663de331678648 README.CSW -9936ba7d9b07b5b5e27369434000413d changelog.CSW +f0d5119652618d956eb24490b7577eb9 changelog.CSW 84830e15846f1b20d8371c1fa375a0b1 more_configure_targets.patch -898bf125370926d5f692a2201124f8ec openssl-0.9.8m.tar.gz +076d8efc3ed93646bd01f04e23c07066 openssl-0.9.8n.tar.gz Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2010-03-24 21:15:58 UTC (rev 9357) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2010-03-24 22:54:06 UTC (rev 9358) @@ -1,3 +1,10 @@ +openssl (0.9.8n,REV=2010.03.24) unstable + + * New upstream version. + * Fixed CVE-2010-0740. + + -- Yann Rouillard Wed, 24 Mar 2010 21:25:41 +0100 + openssl (0.9.8m,REV=2010.03.13) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Mar 25 00:18:37 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 24 Mar 2010 23:18:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9359] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 9359 http://gar.svn.sourceforge.net/gar/?rev=9359&view=rev Author: chninkel Date: 2010-03-24 23:18:37 +0000 (Wed, 24 Mar 2010) Log Message: ----------- openssl: fixed some stuffs detected by checkpkg Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2010-03-24 22:54:06 UTC (rev 9358) +++ csw/mgar/pkg/openssl/trunk/Makefile 2010-03-24 23:18:37 UTC (rev 9359) @@ -45,8 +45,12 @@ SPKG_CLASSES_CSWosslutils = none cswpreserveconf # we use sun perl not csw one -CHECKPKG_OVERRIDES_CSWosslutils = missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWosslutils += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWossldevel += surplus-dependency|CSWosslrt +CHECKPKG_OVERRIDES_CSWosslrt += surplus-dependency|CSWcacertificates + + ###### Upstream and opencsw files information ####### MASTER_SITES = http://www.openssl.org/source/ http://openssl.org/news/ Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2010-03-24 22:54:06 UTC (rev 9358) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2010-03-24 23:18:37 UTC (rev 9359) @@ -81,7 +81,6 @@ f none /opt/csw/lib/pkgconfig/libssl.pc 0644 root bin f none /opt/csw/lib/pkgconfig/openssl.pc 0644 root bin d none /opt/csw/share/doc/openssl_devel 0755 root bin -d none /opt/csw/share/man 0755 root bin d none /opt/csw/share/man/man3 0755 root bin s none /opt/csw/share/man/man3/ASN1_OBJECT_free.3=ASN1_OBJECT_new.3 f none /opt/csw/share/man/man3/ASN1_OBJECT_new.3 0644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2010-03-24 22:54:06 UTC (rev 9358) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2010-03-24 23:18:37 UTC (rev 9359) @@ -70,10 +70,8 @@ f none /opt/csw/include/openssl/x509v3.h 0644 root bin f none /opt/csw/lib/libssl.a 0644 root bin f none /opt/csw/lib/libcrypto.a 0644 root bin -d none /opt/csw/lib/sparcv8plus+vis 0755 root bin f none /opt/csw/lib/sparcv8plus+vis/libcrypto.a 0644 root bin f none /opt/csw/lib/sparcv8plus+vis/libssl.a 0644 root bin -d none /opt/csw/lib/sparcv9 0755 root bin f none /opt/csw/lib/sparcv9/libcrypto.a 0644 root bin f none /opt/csw/lib/sparcv9/libssl.a 0644 root bin d none /opt/csw/lib/pkgconfig 0755 root bin @@ -81,7 +79,6 @@ f none /opt/csw/lib/pkgconfig/libssl.pc 0644 root bin f none /opt/csw/lib/pkgconfig/openssl.pc 0644 root bin d none /opt/csw/share/doc/openssl_devel 0755 root bin -d none /opt/csw/share/man 0755 root bin d none /opt/csw/share/man/man3 0755 root bin s none /opt/csw/share/man/man3/ASN1_OBJECT_free.3=ASN1_OBJECT_new.3 f none /opt/csw/share/man/man3/ASN1_OBJECT_new.3 0644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc 2010-03-24 22:54:06 UTC (rev 9358) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc 2010-03-24 23:18:37 UTC (rev 9359) @@ -14,12 +14,10 @@ s none /opt/csw/lib/libssl.so=libssl.so.0.9.8 f none /opt/csw/lib/libssl.so.0.9.7 0555 root bin f none /opt/csw/lib/libssl.so.0.9.8 0555 root bin -d none /opt/csw/lib/sparcv8plus+vis 0755 root bin f none /opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.7 0755 root bin f none /opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8 0755 root bin f none /opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.7 0755 root bin f none /opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.8 0755 root bin -d none /opt/csw/lib/sparcv9 0755 root bin f none /opt/csw/lib/sparcv9/libcrypto.so.0.9.7 0755 root bin f none /opt/csw/lib/sparcv9/libcrypto.so.0.9.8 0755 root bin s none /opt/csw/lib/sparcv9/libcrypto.so=libcrypto.so.0.9.8 Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype 2010-03-24 22:54:06 UTC (rev 9358) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype 2010-03-24 23:18:37 UTC (rev 9359) @@ -1,7 +1,6 @@ f none /opt/csw/bin/c_rehash 0755 root bin f none /opt/csw/bin/openssl 0755 root bin d none /opt/csw/share/doc/openssl_utils 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/CA.pl.1 0644 root bin f none /opt/csw/share/man/man1/asn1parse.1 0644 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 Thu Mar 25 11:57:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Mar 2010 10:57:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[9360] csw/mgar/gar/v2 Message-ID: Revision: 9360 http://gar.svn.sourceforge.net/gar/?rev=9360&view=rev Author: dmichelsen Date: 2010-03-25 10:57:21 +0000 (Thu, 25 Mar 2010) Log Message: ----------- mGAR v2: Add .xz support Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-03-24 23:18:37 UTC (rev 9359) +++ csw/mgar/gar/v2/gar.conf.mk 2010-03-25 10:57:21 UTC (rev 9360) @@ -169,6 +169,7 @@ # These are the core packages which must be installed for GAR to function correctly +DEF_BASE_PKGS += CSWxz DEF_BASE_PKGS += CSWbzip2 DEF_BASE_PKGS += CSWdiffutils DEF_BASE_PKGS += CSWfindutils Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2010-03-24 23:18:37 UTC (rev 9359) +++ csw/mgar/gar/v2/gar.lib.mk 2010-03-25 10:57:21 UTC (rev 9360) @@ -306,11 +306,17 @@ @bzip2 -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) @$(MAKECOOKIE) +# rule to extract files with tar and xz +tar-xz-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @xz -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + # extract compressed single files -bz-extract-%: +gz-extract-%: @echo " ==> Decompressing $(DOWNLOADDIR)/$*" @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ - @bzip2 -d $(WORKDIR)/$* + @gzip -d $(WORKDIR)/$* @$(MAKECOOKIE) gz-extract-%: @@ -319,6 +325,12 @@ @gzip -d $(WORKDIR)/$* @$(MAKECOOKIE) +xz-extract-%: + @echo " ==> Decompressing $(DOWNLOADDIR)/$*" + @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ + @xz -d $(WORKDIR)/$* + @$(MAKECOOKIE) + # extra dependency rule for git repos, that will allow the user # to supply an alternate target at their discretion git-extract-%: @@ -379,6 +391,9 @@ extract-archive-%.tbz: tar-bz-extract-%.tbz @$(MAKECOOKIE) +extract-archive-%.tar.xz: tar-xz-extract-%.tar.xz + @$(MAKECOOKIE) + extract-archive-%.zip: zip-extract-%.zip @$(MAKECOOKIE) @@ -388,10 +403,13 @@ extract-archive-%.deb: deb-bin-extract-%.deb @$(MAKECOOKIE) +extract-archive-%.gz: gz-extract-%.gz + @$(MAKECOOKIE) + extract-archive-%.bz2: bz-extract-%.bz2 @$(MAKECOOKIE) -extract-archive-%.gz: gz-extract-%.gz +extract-archive-%.xz: xz-extract-%.xz @$(MAKECOOKIE) extract-archive-%.git: git-extract-%.git @@ -413,6 +431,12 @@ GARPATCH = gpatch -d$(PATCHDIR) -p$(PATCHDIRLEVEL) -F$(PATCHDIRFUZZ) BASEWORKSRC = $(shell basename $(WORKSRC)) +# apply xzipped patches +xz-patch-%: + @echo " ==> Applying patch $(DOWNLOADDIR)/$*" + @xz -dc $(DOWNLOADDIR)/$* | $(GARPATCH) + @$(MAKECOOKIE) + # apply bzipped patches bz-patch-%: @echo " ==> Applying patch $(DOWNLOADDIR)/$*" @@ -448,6 +472,9 @@ # file extension. Often support for a given patch format can be handled by # simply adding a rule here. +patch-extract-%.xz: xz-patch-%.xz + @$(MAKECOOKIE) + patch-extract-%.bz: bz-patch-%.bz @$(MAKECOOKIE) @@ -513,7 +540,7 @@ # build from a standard gnu-style makefile's default rule. build-%/Makefile: @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) @$(MAKECOOKIE) build-%/makefile: @@ -568,7 +595,7 @@ # Run tests on pre-built sources test-%/Makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + $(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/makefile: 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 Mar 25 13:41:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Mar 2010 12:41:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[9361] csw/mgar/pkg/grep/trunk Message-ID: Revision: 9361 http://gar.svn.sourceforge.net/gar/?rev=9361&view=rev Author: dmichelsen Date: 2010-03-25 12:41:24 +0000 (Thu, 25 Mar 2010) Log Message: ----------- grep: Update to 2.6 and provide own links to /opt/csw/gnu Modified Paths: -------------- csw/mgar/pkg/grep/trunk/Makefile csw/mgar/pkg/grep/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/grep/trunk/files/gar-base.diff csw/mgar/pkg/grep/trunk/files/install.diff Property Changed: ---------------- csw/mgar/pkg/grep/trunk/ Property changes on: csw/mgar/pkg/grep/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/grep/trunk/Makefile =================================================================== --- csw/mgar/pkg/grep/trunk/Makefile 2010-03-25 10:57:21 UTC (rev 9360) +++ csw/mgar/pkg/grep/trunk/Makefile 2010-03-25 12:41:24 UTC (rev 9361) @@ -1,5 +1,5 @@ GARNAME = grep -GARVERSION = 2.5 +GARVERSION = 2.6 CATEGORIES = utils DESCRIPTION = GNU grep @@ -15,22 +15,28 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = grep-2.6.7-64540 +DISTFILES = $(DISTNAME).tar.xz # 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 -# Patch makefile to honor DESTDIR -PATCHFILES = install.diff +DEP_PKGS_CSWgrep = CSWggettextrt CSWpcrert -CONFIGURE_ARGS = $(DIRPATHS) +# As suggested in +# +EXTRA_CFLAGS = -features=extensions +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --program-prefix=g + TEST_TARGET = check -# Spencer bre test #16 fails -TEST_SCRIPTS = +EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias include gar/category.mk -pre-test: - @( cd $(WORKSRC)/tests ; chmod 555 *.sh *.awk ) +post-install-modulated: + ginstall -d $(DESTDIR)$(prefix)/gnu + $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/grep/trunk/checksums =================================================================== --- csw/mgar/pkg/grep/trunk/checksums 2010-03-25 10:57:21 UTC (rev 9360) +++ csw/mgar/pkg/grep/trunk/checksums 2010-03-25 12:41:24 UTC (rev 9361) @@ -1,2 +1 @@ -5e7bd36e089b637ab3795354ec25dcae download/grep-2.5.tar.bz2 -50d12d2a275ff85cc7a6f85f131b5674 download/install.diff +34ebed3991555c9e0cd484153aad9098 grep-2.6.7-64540.tar.xz Deleted: csw/mgar/pkg/grep/trunk/files/gar-base.diff =================================================================== --- csw/mgar/pkg/grep/trunk/files/gar-base.diff 2010-03-25 10:57:21 UTC (rev 9360) +++ csw/mgar/pkg/grep/trunk/files/gar-base.diff 2010-03-25 12:41:24 UTC (rev 9361) @@ -1,40 +0,0 @@ -diff --speed-large-files --minimal -Nru grep-2.5.orig/po/Makefile.in.in grep-2.5/po/Makefile.in.in ---- grep-2.5.orig/po/Makefile.in.in 1998-11-06 10:19:18.000000000 -0800 -+++ grep-2.5/po/Makefile.in.in 2003-07-28 19:38:17.292352000 -0700 -@@ -111,16 +111,16 @@ - install-data-no: all - install-data-yes: all - if test -r "$(MKINSTALLDIRS)"; then \ -- $(MKINSTALLDIRS) $(datadir); \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ - else \ -- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ -+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ - fi - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - case "$$cat" in \ -- *.gmo) destdir=$(gnulocaledir);; \ -- *) destdir=$(localedir);; \ -+ *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \ -+ *) destdir=$(DESTDIR)$(localedir);; \ - esac; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - dir=$$destdir/$$lang/LC_MESSAGES; \ -@@ -153,12 +153,12 @@ - done - if test "$(PACKAGE)" = "gettext"; then \ - if test -r "$(MKINSTALLDIRS)"; then \ -- $(MKINSTALLDIRS) $(gettextsrcdir); \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ - else \ -- $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ -+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ - fi; \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ -- $(gettextsrcdir)/Makefile.in.in; \ -+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - else \ - : ; \ - fi Deleted: csw/mgar/pkg/grep/trunk/files/install.diff =================================================================== --- csw/mgar/pkg/grep/trunk/files/install.diff 2010-03-25 10:57:21 UTC (rev 9360) +++ csw/mgar/pkg/grep/trunk/files/install.diff 2010-03-25 12:41:24 UTC (rev 9361) @@ -1,40 +0,0 @@ -diff --speed-large-files --minimal -Nru grep-2.5.orig/po/Makefile.in.in grep-2.5/po/Makefile.in.in ---- grep-2.5.orig/po/Makefile.in.in 1998-11-06 10:19:18.000000000 -0800 -+++ grep-2.5/po/Makefile.in.in 2003-07-28 19:38:17.292352000 -0700 -@@ -111,16 +111,16 @@ - install-data-no: all - install-data-yes: all - if test -r "$(MKINSTALLDIRS)"; then \ -- $(MKINSTALLDIRS) $(datadir); \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ - else \ -- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ -+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ - fi - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - case "$$cat" in \ -- *.gmo) destdir=$(gnulocaledir);; \ -- *) destdir=$(localedir);; \ -+ *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \ -+ *) destdir=$(DESTDIR)$(localedir);; \ - esac; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - dir=$$destdir/$$lang/LC_MESSAGES; \ -@@ -153,12 +153,12 @@ - done - if test "$(PACKAGE)" = "gettext"; then \ - if test -r "$(MKINSTALLDIRS)"; then \ -- $(MKINSTALLDIRS) $(gettextsrcdir); \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ - else \ -- $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ -+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ - fi; \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ -- $(gettextsrcdir)/Makefile.in.in; \ -+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - else \ - : ; \ - 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 Thu Mar 25 14:29:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Mar 2010 13:29:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9362] csw/mgar/pkg/gnulinks/trunk Message-ID: Revision: 9362 http://gar.svn.sourceforge.net/gar/?rev=9362&view=rev Author: dmichelsen Date: 2010-03-25 13:29:11 +0000 (Thu, 25 Mar 2010) Log Message: ----------- gnulinks: Move to dynamic gspec and remove CSWggrep as it provides its own links soon Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile csw/mgar/pkg/gnulinks/trunk/checksums csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype Added Paths: ----------- csw/mgar/pkg/gnulinks/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.gspec Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2010-03-25 12:41:24 UTC (rev 9361) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2010-03-25 13:29:11 UTC (rev 9362) @@ -5,7 +5,7 @@ VENDOR_URL = http://opencsw.org GLINKPKGS = CSWdiffutils CSWggettext CSWggettextrt CSWbison CSWbinutils -GLINKPKGS += CSWggrep CSWgawk CSWgsed CSWggetopt CSWfindutils +GLINKPKGS += CSWgawk CSWgsed CSWggetopt CSWfindutils GLINKPKGS += CSWgmake CSWgpatch CSWgm4 CSWgwhois CSWgtar GLINKPKGS += CSWshutils CSWgfile CSWtextutils BUILD_DEP_PKGS = $(GLINKPKGS) CSWpkgutil @@ -16,14 +16,17 @@ /opt/csw/gnu. endef -MASTER_SITES = -DISTFILES = CSWgnulinks.gspec CSWgnulinks.prototype +MASTER_SITES = http://www.opencsw.org +DISTFILES = CSWgnulinks.prototype +DISTFILES += COPYING CONFIGURE_SCRIPTS = BUILD_SCRIPTS = INSTALL_SCRIPTS = TEST_SCRIPTS = +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/gnulinks/trunk/checksums =================================================================== --- csw/mgar/pkg/gnulinks/trunk/checksums 2010-03-25 12:41:24 UTC (rev 9361) +++ csw/mgar/pkg/gnulinks/trunk/checksums 2010-03-25 13:29:11 UTC (rev 9362) @@ -1,2 +1,2 @@ -28514c1726839b6e47728d188d2a1edd CSWgnulinks.gspec -5d3b905f55423ae4f8b034171238a26a CSWgnulinks.prototype +aae0874b7f97b8914b55ce4d72dcac6a COPYING +f551622ed0cbf465e3367e955cbe8e54 CSWgnulinks.prototype Copied: csw/mgar/pkg/gnulinks/trunk/files/COPYING (from rev 9271, csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.gspec) =================================================================== --- csw/mgar/pkg/gnulinks/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/gnulinks/trunk/files/COPYING 2010-03-25 13:29:11 UTC (rev 9362) @@ -0,0 +1,2 @@ +Copyright 2010 OpenCSW.org +This package is in the public domain. Deleted: csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.gspec =================================================================== --- csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.gspec 2010-03-25 12:41:24 UTC (rev 9361) +++ csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.gspec 2010-03-25 13:29:11 UTC (rev 9362) @@ -1,7 +0,0 @@ -%var bitname gnulinks -%var pkgname CSWgnulinks -%var arch all -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright -Copyright 2005 Blastwave.org -This package is in the public domain. Modified: csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype =================================================================== --- csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype 2010-03-25 12:41:24 UTC (rev 9361) +++ csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype 2010-03-25 13:29:11 UTC (rev 9362) @@ -27,14 +27,12 @@ s none /opt/csw/gnu/dirname=../bin/gdirname s none /opt/csw/gnu/du=../bin/gdu s none /opt/csw/gnu/echo=../bin/gecho -s none /opt/csw/gnu/egrep=../bin/gegrep s none /opt/csw/gnu/env=../bin/genv s none /opt/csw/gnu/envsubst=../bin/genvsubst s none /opt/csw/gnu/expand=../bin/gexpand s none /opt/csw/gnu/expr=../bin/gexpr s none /opt/csw/gnu/factor=../bin/gfactor s none /opt/csw/gnu/false=../bin/gfalse -s none /opt/csw/gnu/fgrep=../bin/gfgrep s none /opt/csw/gnu/find=../bin/gfind s none /opt/csw/gnu/fmt=../bin/gfmt s none /opt/csw/gnu/fold=../bin/gfold @@ -43,7 +41,6 @@ s none /opt/csw/gnu/gettext=../bin/ggettext s none /opt/csw/gnu/gettextize=../bin/ggettextize s none /opt/csw/gnu/gprof=../bin/ggprof -s none /opt/csw/gnu/grep=../bin/ggrep s none /opt/csw/gnu/groups=../bin/ggroups s none /opt/csw/gnu/head=../bin/ghead s none /opt/csw/gnu/hostid=../bin/ghostid 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 Mar 25 14:34:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Mar 2010 13:34:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9363] csw/mgar/pkg/glib/trunk Message-ID: Revision: 9363 http://gar.svn.sourceforge.net/gar/?rev=9363&view=rev Author: dmichelsen Date: 2010-03-25 13:34:37 +0000 (Thu, 25 Mar 2010) Log Message: ----------- glib: Add more patches Modified Paths: -------------- csw/mgar/pkg/glib/trunk/Makefile csw/mgar/pkg/glib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/glib/trunk/files/0002-Don-t-break-when-index.sgml-is-not-there.patch Modified: csw/mgar/pkg/glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib/trunk/Makefile 2010-03-25 13:29:11 UTC (rev 9362) +++ csw/mgar/pkg/glib/trunk/Makefile 2010-03-25 13:34:37 UTC (rev 9363) @@ -18,9 +18,11 @@ SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)-$(VERSION).tar.gz) DISTFILES = $(SOURCEFILES) NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) -PATCHFILES_isa-i386-garversion-1.3.15 = 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch -PATCHFILES_isa-sparcv8-garversion-1.3.15 = 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch -PATCHFILES_isa-sparcv9-garversion-1.3.15 = 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch +PATCHFILES-1.3.15 = 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch +PATCHFILES-1.3.15 += 0002-Don-t-break-when-index.sgml-is-not-there.patch +PATCHFILES_isa-i386-garversion-1.3.15 = $(PATCHFILES-1.3.15) +PATCHFILES_isa-sparcv8-garversion-1.3.15 = $(PATCHFILES-1.3.15) +PATCHFILES_isa-sparcv9-garversion-1.3.15 = $(PATCHFILES-1.3.15) PACKAGES = CSWglib CSWglibdevel Modified: csw/mgar/pkg/glib/trunk/checksums =================================================================== --- csw/mgar/pkg/glib/trunk/checksums 2010-03-25 13:29:11 UTC (rev 9362) +++ csw/mgar/pkg/glib/trunk/checksums 2010-03-25 13:34:37 UTC (rev 9363) @@ -1,3 +1,4 @@ 59acd3287366b4313eab0eaed5db1459 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch +7566b5dfaf32ab71ca081aa0e597f1fb 0002-Don-t-break-when-index.sgml-is-not-there.patch 6fe30dad87c77b91b632def29dd69ef9 glib-1.2.10.tar.gz cf44901e30edebe13b32da1bee852193 glib-1.3.15.tar.gz Added: csw/mgar/pkg/glib/trunk/files/0002-Don-t-break-when-index.sgml-is-not-there.patch =================================================================== --- csw/mgar/pkg/glib/trunk/files/0002-Don-t-break-when-index.sgml-is-not-there.patch (rev 0) +++ csw/mgar/pkg/glib/trunk/files/0002-Don-t-break-when-index.sgml-is-not-there.patch 2010-03-25 13:34:37 UTC (rev 9363) @@ -0,0 +1,39 @@ +From 135d620b4b3884a20a37f50b2e10554e763f41cf Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 24 Mar 2010 17:57:23 +0100 +Subject: [PATCH] Don't break when index.sgml is not there + +--- + docs/reference/glib/Makefile.am | 2 +- + docs/reference/glib/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am +index 14f9cb1..cf79f05 100644 +--- a/docs/reference/glib/Makefile.am ++++ b/docs/reference/glib/Makefile.am +@@ -174,7 +174,7 @@ install-data-local: + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ +- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ ++ if [ -f $(srcdir)/html/index.sgml ]; then $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); fi; \ + fi) + + # +diff --git a/docs/reference/glib/Makefile.in b/docs/reference/glib/Makefile.in +index 3581cae..69df35c 100644 +--- a/docs/reference/glib/Makefile.in ++++ b/docs/reference/glib/Makefile.in +@@ -425,7 +425,7 @@ install-data-local: + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ +- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ ++ if [ -f $(srcdir)/html/index.sgml ]; then $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); fi; \ + fi) + + # +-- +1.7.0 + 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 Mar 25 16:08:01 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Mar 2010 15:08:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[9364] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 9364 http://gar.svn.sourceforge.net/gar/?rev=9364&view=rev Author: dmichelsen Date: 2010-03-25 15:08:00 +0000 (Thu, 25 Mar 2010) Log Message: ----------- mGAR v2: Add suport for Sun Studio 12u1 Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-03-25 13:34:37 UTC (rev 9363) +++ csw/mgar/gar/v2/gar.conf.mk 2010-03-25 15:08:00 UTC (rev 9364) @@ -78,12 +78,12 @@ # Select compiler # GARCOMPILER can be either GNU/SUN which selects the default -# Sun or GNU compiler, or the specific verions SOS11/SOS12/GCC3/GCC4 +# Sun or GNU compiler, or the specific verions SOS11/SOS12/SOS12U1/GCC3/GCC4 GARCOMPILER ?= SUN # We have parameters for the following compilers -GARCOMPILERS = GCC3 GCC4 SOS11 SOS12 +GARCOMPILERS = GCC3 GCC4 SOS11 SOS12 SOS12U1 ifeq ($(GARCOMPILER),SUN) GARCOMPILER = SOS12 @@ -207,107 +207,124 @@ # code can not be compiled for the requested architecture. # The MEMORYMODEL_$ARCH is e.g. used for the directoryname to set # libdir/pkgconfdir to /usr/lib/$MEMORYMODEL -ARCHFLAGS_SOS11_sparcv9+fmuladd = ERROR -ARCHFLAGS_SOS12_sparcv9+fmuladd = -m64 -xarch=sparcfmaf -fma=fused - ARCHFLAGS_GCC3_sparcv9+fmuladd = ERROR - ARCHFLAGS_GCC4_sparcv9+fmuladd = ERROR - MEMORYMODEL_sparcv9+fmuladd = 64 + ARCHFLAGS_SOS11_sparcv9+fmuladd = ERROR + ARCHFLAGS_SOS12_sparcv9+fmuladd = -m64 -xarch=sparcfmaf -fma=fused +ARCHFLAGS_SOS12U1_sparcv9+fmuladd = -m64 -xarch=sparcfmaf -fma=fused + ARCHFLAGS_GCC3_sparcv9+fmuladd = ERROR + ARCHFLAGS_GCC4_sparcv9+fmuladd = ERROR + MEMORYMODEL_sparcv9+fmuladd = 64 -ARCHFLAGS_SOS11_sparcv9+vis2 = -xarch=v9b -ARCHFLAGS_SOS12_sparcv9+vis2 = -m64 -xarch=sparcvis2 - ARCHFLAGS_GCC3_sparcv9+vis2 = ERROR - ARCHFLAGS_GCC4_sparcv9+vis2 = ERROR - MEMORYMODEL_sparcv9+vis2 = 64 + ARCHFLAGS_SOS11_sparcv9+vis2 = -xarch=v9b + ARCHFLAGS_SOS12_sparcv9+vis2 = -m64 -xarch=sparcvis2 + ARCHFLAGS_SOS12U1_sparcv9+vis2 = -m64 -xarch=sparcvis2 + ARCHFLAGS_GCC3_sparcv9+vis2 = ERROR + ARCHFLAGS_GCC4_sparcv9+vis2 = ERROR + MEMORYMODEL_sparcv9+vis2 = 64 -ARCHFLAGS_SOS11_sparcv9+vis = -xarch=v9a -ARCHFLAGS_SOS12_sparcv9+vis = -m64 -xarch=sparcvis - ARCHFLAGS_GCC3_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis - ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis - MEMORYMODEL_sparcv9+vis = 64 + ARCHFLAGS_SOS11_sparcv9+vis = -xarch=v9a + ARCHFLAGS_SOS12_sparcv9+vis = -m64 -xarch=sparcvis + ARCHFLAGS_SOS12U1_sparcv9+vis = -m64 -xarch=sparcvis + ARCHFLAGS_GCC3_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis + ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis + MEMORYMODEL_sparcv9+vis = 64 -ARCHFLAGS_SOS11_sparcv9 = -xarch=v9 -ARCHFLAGS_SOS12_sparcv9 = -m64 -xarch=sparc - ARCHFLAGS_GCC3_sparcv9 = -m64 -mcpu=v9 - ARCHFLAGS_GCC4_sparcv9 = -m64 -mcpu=v9 - MEMORYMODEL_sparcv9 = 64 + ARCHFLAGS_SOS11_sparcv9 = -xarch=v9 + ARCHFLAGS_SOS12_sparcv9 = -m64 -xarch=sparc + ARCHFLAGS_SOS12U1_sparcv9 = -m64 -xarch=sparc + ARCHFLAGS_GCC3_sparcv9 = -m64 -mcpu=v9 + ARCHFLAGS_GCC4_sparcv9 = -m64 -mcpu=v9 + MEMORYMODEL_sparcv9 = 64 -ARCHFLAGS_SOS11_sparcv8plus+fmuladd = ERROR -ARCHFLAGS_SOS12_sparcv8plus+fmuladd = -m32 -xarch=xparcfmaf -fma=fused - ARCHFLAGS_GCC3_sparcv8plus+fmuladd = ERROR - ARCHFLAGS_GCC4_sparcv8plus+fmuladd = ERROR - MEMORYMODEL_sparcv8plus+fmuladd = 32 + ARCHFLAGS_SOS11_sparcv8plus+fmuladd = ERROR + ARCHFLAGS_SOS12_sparcv8plus+fmuladd = -m32 -xarch=xparcfmaf -fma=fused +ARCHFLAGS_SOS12U1_sparcv8plus+fmuladd = -m32 -xarch=xparcfmaf -fma=fused + ARCHFLAGS_GCC3_sparcv8plus+fmuladd = ERROR + ARCHFLAGS_GCC4_sparcv8plus+fmuladd = ERROR + MEMORYMODEL_sparcv8plus+fmuladd = 32 -ARCHFLAGS_SOS11_sparcv8plus+vis2 = -xarch=v8plusb -ARCHFLAGS_SOS12_sparcv8plus+vis2 = -m32 -xarch=sparcvis2 - ARCHFLAGS_GCC3_sparcv8plus+vis2 = ERROR - ARCHFLAGS_GCC4_sparcv8plus+vis2 = ERROR - MEMORYMODEL_sparcv8plus+vis2 = 32 + ARCHFLAGS_SOS11_sparcv8plus+vis2 = -xarch=v8plusb + ARCHFLAGS_SOS12_sparcv8plus+vis2 = -m32 -xarch=sparcvis2 +ARCHFLAGS_SOS12U1_sparcv8plus+vis2 = -m32 -xarch=sparcvis2 + ARCHFLAGS_GCC3_sparcv8plus+vis2 = ERROR + ARCHFLAGS_GCC4_sparcv8plus+vis2 = ERROR + MEMORYMODEL_sparcv8plus+vis2 = 32 -ARCHFLAGS_SOS11_sparcv8plus+vis = -xarch=v8plusa -ARCHFLAGS_SOS12_sparcv8plus+vis = -m32 -xarch=sparcvis - ARCHFLAGS_GCC3_sparcv8plus+vis = -mcpu=v8 -mvis - ARCHFLAGS_GCC4_sparcv8plus+vis = -mcpu=v8 -mvis - MEMORYMODEL_sparcv8plus+vis = 32 + ARCHFLAGS_SOS11_sparcv8plus+vis = -xarch=v8plusa + ARCHFLAGS_SOS12_sparcv8plus+vis = -m32 -xarch=sparcvis +ARCHFLAGS_SOS12U1_sparcv8plus+vis = -m32 -xarch=sparcvis + ARCHFLAGS_GCC3_sparcv8plus+vis = -mcpu=v8 -mvis + ARCHFLAGS_GCC4_sparcv8plus+vis = -mcpu=v8 -mvis + MEMORYMODEL_sparcv8plus+vis = 32 -ARCHFLAGS_SOS11_sparcv8plus = -xarch=v8plus -ARCHFLAGS_SOS12_sparcv8plus = -m32 -xarch=v8plus - ARCHFLAGS_GCC3_sparcv8plus = -mcpu=v8 -mv8plus - ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v8 -mv8plus - MEMORYMODEL_sparcv8plus = 32 + ARCHFLAGS_SOS11_sparcv8plus = -xarch=v8plus + ARCHFLAGS_SOS12_sparcv8plus = -m32 -xarch=v8plus + ARCHFLAGS_SOS12U1_sparcv8plus = -m32 -xarch=v8plus + ARCHFLAGS_GCC3_sparcv8plus = -mcpu=v8 -mv8plus + ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v8 -mv8plus + MEMORYMODEL_sparcv8plus = 32 -ARCHFLAGS_SOS11_sparcv8 = -xarch=v8 -ARCHFLAGS_SOS12_sparcv8 = -m32 -xarch=v8 - ARCHFLAGS_GCC3_sparcv8 = -mcpu=v8 - ARCHFLAGS_GCC4_sparcv8 = -mcpu=v8 - MEMORYMODEL_sparcv8 = 32 + ARCHFLAGS_SOS11_sparcv8 = -xarch=v8 + ARCHFLAGS_SOS12_sparcv8 = -m32 -xarch=v8 + ARCHFLAGS_SOS12U1_sparcv8 = -m32 -xarch=v8 + ARCHFLAGS_GCC3_sparcv8 = -mcpu=v8 + ARCHFLAGS_GCC4_sparcv8 = -mcpu=v8 + MEMORYMODEL_sparcv8 = 32 -ARCHFLAGS_SOS11_sparcv8-fsmuld = -xarch=v8a -ARCHFLAGS_SOS12_sparcv8-fsmuld = -m32 -xarch=v8a - ARCHFLAGS_GCC3_sparcv8-fsmuld = ERROR - ARCHFLAGS_GCC4_sparcv8-fsmuld = ERROR - MEMORYMODEL_sparcv8-fsmuld = 32 + ARCHFLAGS_SOS11_sparcv8-fsmuld = -xarch=v8a + ARCHFLAGS_SOS12_sparcv8-fsmuld = -m32 -xarch=v8a + ARCHFLAGS_SOS12U1_sparcv8-fsmuld = -m32 -xarch=v8a + ARCHFLAGS_GCC3_sparcv8-fsmuld = ERROR + ARCHFLAGS_GCC4_sparcv8-fsmuld = ERROR + MEMORYMODEL_sparcv8-fsmuld = 32 -ARCHFLAGS_SOS11_amd64 = -xarch=amd64 -ARCHFLAGS_SOS12_amd64 = -m64 -xarch=sse2 - ARCHFLAGS_GCC3_amd64 = -m64 -march=opteron - ARCHFLAGS_GCC4_amd64 = -m64 -march=opteron - MEMORYMODEL_amd64 = 64 + ARCHFLAGS_SOS11_amd64 = -xarch=amd64 + ARCHFLAGS_SOS12_amd64 = -m64 -xarch=sse2 + ARCHFLAGS_SOS12U1_amd64 = -m64 -xarch=sse2 + ARCHFLAGS_GCC3_amd64 = -m64 -march=opteron + ARCHFLAGS_GCC4_amd64 = -m64 -march=opteron + MEMORYMODEL_amd64 = 64 -ARCHFLAGS_SOS11_pentium_pro+mmx = -xarch=pentium_proa -ARCHFLAGS_SOS12_pentium_pro+mmx = -m32 -xarch=pentium_proa - ARCHFLAGS_GCC3_pentium_pro+mmx = -m32 -march=pentium2 - ARCHFLAGS_GCC4_pentium_pro+mmx = -m32 -march=pentium2 - MEMORYMODEL_pentium_pro+mmx = 32 + ARCHFLAGS_SOS11_pentium_pro+mmx = -xarch=pentium_proa + ARCHFLAGS_SOS12_pentium_pro+mmx = -m32 -xarch=pentium_proa +ARCHFLAGS_SOS12U1_pentium_pro+mmx = -m32 -xarch=pentium_proa + ARCHFLAGS_GCC3_pentium_pro+mmx = -m32 -march=pentium2 + ARCHFLAGS_GCC4_pentium_pro+mmx = -m32 -march=pentium2 + MEMORYMODEL_pentium_pro+mmx = 32 -ARCHFLAGS_SOS11_pentium_pro = -xarch=pentium_pro -xchip=pentium_pro -ARCHFLAGS_SOS12_pentium_pro = -m32 -xarch=pentium_pro -xchip=pentium_pro - ARCHFLAGS_GCC3_pentium_pro = -m32 -march=pentiumpro - ARCHFLAGS_GCC4_pentium_pro = -m32 -march=pentiumpro - MEMORYMODEL_pentium_pro = 32 + ARCHFLAGS_SOS11_pentium_pro = -xarch=pentium_pro -xchip=pentium_pro + ARCHFLAGS_SOS12_pentium_pro = -m32 -xarch=pentium_pro -xchip=pentium_pro + ARCHFLAGS_SOS12U1_pentium_pro = -m32 -xarch=pentium_pro -xchip=pentium_pro + ARCHFLAGS_GCC3_pentium_pro = -m32 -march=pentiumpro + ARCHFLAGS_GCC4_pentium_pro = -m32 -march=pentiumpro + MEMORYMODEL_pentium_pro = 32 -ARCHFLAGS_SOS11_pentium+mmx = ERROR -ARCHFLAGS_SOS12_pentium+mmx = ERROR - ARCHFLAGS_GCC3_pentium+mmx = -m32 -march=pentium-mmx - ARCHFLAGS_GCC4_pentium+mmx = -m32 -march=pentium-mmx - MEMORYMODEL_pentium+mmx = 32 + ARCHFLAGS_SOS11_pentium+mmx = ERROR + ARCHFLAGS_SOS12_pentium+mmx = ERROR + ARCHFLAGS_SOS12U1_pentium+mmx = ERROR + ARCHFLAGS_GCC3_pentium+mmx = -m32 -march=pentium-mmx + ARCHFLAGS_GCC4_pentium+mmx = -m32 -march=pentium-mmx + MEMORYMODEL_pentium+mmx = 32 -ARCHFLAGS_SOS11_pentium = -xchip=pentium -ARCHFLAGS_SOS12_pentium = -m32 -xchip=pentium - ARCHFLAGS_GCC3_pentium = -m32 -march=pentium - ARCHFLAGS_GCC4_pentium = -m32 -march=pentium - MEMORYMODEL_pentium = 32 + ARCHFLAGS_SOS11_pentium = -xchip=pentium + ARCHFLAGS_SOS12_pentium = -m32 -xchip=pentium + ARCHFLAGS_SOS12U1_pentium = -m32 -xchip=pentium + ARCHFLAGS_GCC3_pentium = -m32 -march=pentium + ARCHFLAGS_GCC4_pentium = -m32 -march=pentium + MEMORYMODEL_pentium = 32 -ARCHFLAGS_SOS11_i486 = -xarch=386 -xchip=486 -ARCHFLAGS_SOS12_i486 = -m32 -xarch=386 -xchip=486 - ARCHFLAGS_GCC3_i486 = -m32 -march=i486 - ARCHFLAGS_GCC4_i486 = -m32 -march=i486 - MEMORYMODEL_i486 = 32 + ARCHFLAGS_SOS11_i486 = -xarch=386 -xchip=486 + ARCHFLAGS_SOS12_i486 = -m32 -xarch=386 -xchip=486 + ARCHFLAGS_SOS12U1_i486 = -m32 -xarch=386 -xchip=486 + ARCHFLAGS_GCC3_i486 = -m32 -march=i486 + ARCHFLAGS_GCC4_i486 = -m32 -march=i486 + MEMORYMODEL_i486 = 32 -ARCHFLAGS_SOS11_i386 = -xarch=386 -ARCHFLAGS_SOS12_i386 = -m32 -xarch=386 - ARCHFLAGS_GCC3_i386 = -m32 -march=i386 - ARCHFLAGS_GCC4_i386 = -m32 -march=i386 - MEMORYMODEL_i386 = 32 + ARCHFLAGS_SOS11_i386 = -xarch=386 + ARCHFLAGS_SOS12_i386 = -m32 -xarch=386 + ARCHFLAGS_SOS12U1_i386 = -m32 -xarch=386 + ARCHFLAGS_GCC3_i386 = -m32 -march=i386 + ARCHFLAGS_GCC4_i386 = -m32 -march=i386 + MEMORYMODEL_i386 = 32 # ISALIST_$(GARCOMPILER) contains all ISAs which are compilable with the selected compiler $(foreach C,$(GARCOMPILERS),$(eval ISALIST_$(C) ?= $(foreach I,$(ISALIST),$(if $(filter-out ERROR,$(ARCHFLAGS_$C_$I)),$I)))) @@ -329,19 +346,22 @@ OPT_FLAGS_SOS ?= -xO3 OPT_FLAGS_GCC ?= -O2 -pipe -OPT_FLAGS_SOS11 ?= $(OPT_FLAGS_SOS) -OPT_FLAGS_SOS12 ?= $(OPT_FLAGS_SOS) - OPT_FLAGS_GCC3 ?= $(OPT_FLAGS_GCC) - OPT_FLAGS_GCC4 ?= $(OPT_FLAGS_GCC) + OPT_FLAGS_SOS11 ?= $(OPT_FLAGS_SOS) + OPT_FLAGS_SOS12 ?= $(OPT_FLAGS_SOS) +OPT_FLAGS_SOS12U1 ?= $(OPT_FLAGS_SOS) + OPT_FLAGS_GCC3 ?= $(OPT_FLAGS_GCC) + OPT_FLAGS_GCC4 ?= $(OPT_FLAGS_GCC) -OPT_FLAGS_SOS11_sparc ?= $(OPT_FLAGS_SOS11) -OPT_FLAGS_SOS12_sparc ?= $(OPT_FLAGS_SOS12) - OPT_FLAGS_GCC3_sparc ?= $(OPT_FLAGS_GCC3) - OPT_FLAGS_GCC4_sparc ?= $(OPT_FLAGS_GCC4) - OPT_FLAGS_SOS11_i386 ?= $(OPT_FLAGS_SOS11) - OPT_FLAGS_SOS12_i386 ?= $(OPT_FLAGS_SOS12) - OPT_FLAGS_GCC3_i386 ?= $(OPT_FLAGS_GCC3) - OPT_FLAGS_GCC4_i386 ?= $(OPT_FLAGS_GCC4) + OPT_FLAGS_SOS11_sparc ?= $(OPT_FLAGS_SOS11) + OPT_FLAGS_SOS12_sparc ?= $(OPT_FLAGS_SOS12) +OPT_FLAGS_SOS12U1_sparc ?= $(OPT_FLAGS_SOS12U1) + OPT_FLAGS_GCC3_sparc ?= $(OPT_FLAGS_GCC3) + OPT_FLAGS_GCC4_sparc ?= $(OPT_FLAGS_GCC4) + OPT_FLAGS_SOS11_i386 ?= $(OPT_FLAGS_SOS11) + OPT_FLAGS_SOS12_i386 ?= $(OPT_FLAGS_SOS12) + OPT_FLAGS_SOS12U1_i386 ?= $(OPT_FLAGS_SOS12U1) + OPT_FLAGS_GCC3_i386 ?= $(OPT_FLAGS_GCC3) + OPT_FLAGS_GCC4_i386 ?= $(OPT_FLAGS_GCC4) # Most of these are empty because '-march' implies '-mtune' OPT_ISAFLAGS_GCC3_amd64 ?= @@ -358,14 +378,16 @@ OPT_ISAFLAGS_GCC4_i386 ?= -mtune=i686 -DBG_FLAGS_SOS11_sparc ?= -g -DBG_FLAGS_SOS12_sparc ?= -g - DBG_FLAGS_GCC3_sparc ?= -g - DBG_FLAGS_GCC4_sparc ?= -g - DBG_FLAGS_SOS11_i386 ?= -g - DBG_FLAGS_SOS12_i386 ?= -g - DBG_FLAGS_GCC3_i386 ?= -g - DBG_FLAGS_GCC4_i386 ?= -g + DBG_FLAGS_SOS11_sparc ?= -g + DBG_FLAGS_SOS12_sparc ?= -g +DBG_FLAGS_SOS12U1_sparc ?= -g + DBG_FLAGS_GCC3_sparc ?= -g + DBG_FLAGS_GCC4_sparc ?= -g + DBG_FLAGS_SOS11_i386 ?= -g + DBG_FLAGS_SOS12_i386 ?= -g + DBG_FLAGS_SOS12U1_i386 ?= -g + DBG_FLAGS_GCC3_i386 ?= -g + DBG_FLAGS_GCC4_i386 ?= -g # This variable contains the opt flags for the current compiler on the current architecture FLAVOR_FLAGS ?= $($(GARFLAVOR)_ISAFLAGS_$(GARCOMPILER)_$(ISA)) $($(GARFLAVOR)_FLAGS_$(GARCOMPILER)_$(GARCH)) @@ -426,48 +448,58 @@ # Forte Compiler Configuration # -GCC3_CC_HOME ?= /opt/csw/gcc3 -GCC4_CC_HOME ?= /opt/csw/gcc4 -SOS11_CC_HOME ?= /opt/studio/SOS11/SUNWspro -SOS12_CC_HOME ?= /opt/studio/SOS12/SUNWspro -GCC3_CC ?= $(GCC3_CC_HOME)/bin/gcc -GCC4_CC ?= $(GCC4_CC_HOME)/bin/gcc -SOS11_CC ?= $(SOS11_CC_HOME)/bin/cc -SOS12_CC ?= $(SOS12_CC_HOME)/bin/cc -GCC3_CXX ?= $(GCC3_CC_HOME)/bin/g++ -GCC4_CXX ?= $(GCC4_CC_HOME)/bin/g++ -SOS11_CXX ?= $(SOS11_CC_HOME)/bin/CC -SOS12_CXX ?= $(SOS12_CC_HOME)/bin/CC + GCC3_CC_HOME ?= /opt/csw/gcc3 + GCC4_CC_HOME ?= /opt/csw/gcc4 + SOS11_CC_HOME ?= /opt/studio/SOS11/SUNWspro + SOS12_CC_HOME ?= /opt/studio/SOS12/SUNWspro +SOS12U1_CC_HOME ?= /opt/studio/sunstudio12.1 -GCC3_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) -GCC4_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) -SOS11_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -SOS12_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -GCC3_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -GCC4_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -SOS11_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -SOS12_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -GCC3_AS_FLAGS ?= $(EXTRA_GCC3_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) -GCC4_AS_FLAGS ?= $(EXTRA_GCC4_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) -SOS11_AS_FLAGS ?= $(EXTRA_SOS11_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) -SOS12_AS_FLAGS ?= $(EXTRA_SOS12_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) -GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) -GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) -SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) + GCC3_CC ?= $(GCC3_CC_HOME)/bin/gcc + GCC4_CC ?= $(GCC4_CC_HOME)/bin/gcc + SOS11_CC ?= $(SOS11_CC_HOME)/bin/cc + SOS12_CC ?= $(SOS12_CC_HOME)/bin/cc + SOS12U1_CC ?= $(SOS12U1_CC_HOME)/bin/cc + GCC3_CXX ?= $(GCC3_CC_HOME)/bin/g++ + GCC4_CXX ?= $(GCC4_CC_HOME)/bin/g++ + SOS11_CXX ?= $(SOS11_CC_HOME)/bin/CC + SOS12_CXX ?= $(SOS12_CC_HOME)/bin/CC + SOS12U1_CXX ?= $(SOS12U1_CC_HOME)/bin/CC + GCC3_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) + GCC4_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) + SOS11_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) + SOS12_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) + SOS12U1_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath + GCC3_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) + GCC4_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) + SOS11_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -xnorunpath + SOS12_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -xnorunpath +SOS12U1_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -xnorunpath + GCC3_AS_FLAGS ?= $(EXTRA_GCC3_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) + GCC4_AS_FLAGS ?= $(EXTRA_GCC4_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) + SOS11_AS_FLAGS ?= $(EXTRA_SOS11_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) + SOS12_AS_FLAGS ?= $(EXTRA_SOS12_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) + SOS12U1_AS_FLAGS ?= $(EXTRA_SOS12U1_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) + GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) + GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) + SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) + SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) + SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) + # Compiler version -GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version) -GCC3_CXX_VERSION = $(shell $(GCC3_CXX) -v 2>&1| ggrep version) -GCC4_CC_VERSION = $(shell $(GCC4_CC) -v 2>&1| ggrep version) -GCC4_CXX_VERSION = $(shell $(GCC4_CXX) -v 2>&1| ggrep version) + GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version) + GCC3_CXX_VERSION = $(shell $(GCC3_CXX) -v 2>&1| ggrep version) + GCC4_CC_VERSION = $(shell $(GCC4_CC) -v 2>&1| ggrep version) + GCC4_CXX_VERSION = $(shell $(GCC4_CXX) -v 2>&1| ggrep version) -SOS11_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //') -SOS11_CXX_VERSION = $(shell $(SOS11_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //') -SOS12_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //') -SOS12_CXX_VERSION = $(shell $(SOS11_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //') + SOS11_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //') + SOS11_CXX_VERSION = $(shell $(SOS11_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //') + SOS12_CC_VERSION = $(shell $(SOS12_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //') + SOS12_CXX_VERSION = $(shell $(SOS12_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //') + SOS12U1_CC_VERSION = $(shell $(SOS12U1_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //') +SOS12U1_CXX_VERSION = $(shell $(SOS12U1_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //') -CC_VERSION = $($(GARCOMPILER)_CC_VERSION) + CC_VERSION = $($(GARCOMPILER)_CC_VERSION) CXX_VERSION = $($(GARCOMPILER)_CXX_VERSION) # @@ -526,6 +558,7 @@ GCC4_LD_OPTIONS = -R$(abspath $(GCC4_CC_HOME)/lib/$(MM_LIBDIR)) $(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) +SOS12U1_LD_OPTIONS = $(EXTRA_SOS12U1_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) $(EXTRA_LD_OPTIONS) $(_CATEGORY_LD_OPTIONS)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Mar 25 19:17:07 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 25 Mar 2010 18:17:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[9365] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 9365 http://gar.svn.sourceforge.net/gar/?rev=9365&view=rev Author: chninkel Date: 2010-03-25 18:17:07 +0000 (Thu, 25 Mar 2010) Log Message: ----------- openssh: added dont_derelativise_authorizedkeysfile_option.patch Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/openssh/trunk/files/dont_derelativise_authorizedkeysfile_option.patch Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2010-03-25 15:08:00 UTC (rev 9364) +++ csw/mgar/pkg/openssh/trunk/Makefile 2010-03-25 18:17:07 UTC (rev 9365) @@ -77,6 +77,10 @@ # see https://bugzilla.mindrot.org/show_bug.cgi?id=1739 PATCHFILES += derelativise_path_bugfix.patch +# AuthorizedKeysFile option value should not be derelativized !! +# see https://bugzilla.mindrot.org/show_bug.cgi?id=1739 +PATCHFILES += dont_derelativise_authorizedkeysfile_option.patch + # documentation files to install (not a gar variable) DOCFILES = CREDITS ChangeLog ChangeLog.gssapi INSTALL LICENCE OVERVIEW README README.dns DOCFILES += README.platform README.privsep README.smartcard README.tun TODO WARNING.RNG Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2010-03-25 15:08:00 UTC (rev 9364) +++ csw/mgar/pkg/openssh/trunk/checksums 2010-03-25 18:17:07 UTC (rev 9365) @@ -5,12 +5,13 @@ 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall 77b86c30c3257fdf014102c8166fab2d CSWosshlpk.prototype -b888991f715a20842aeb776fe6c71370 changelog.CSW +3344f6f17e6d75e8e135b8366e64a7ee changelog.CSW 9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh 8e765642349b6321d01b33e95304e113 cswopenssh.xml 704ad1d3216df8de4d44465006c64c39 derelativise_path_bugfix.patch 4b3e79120b60e8f25be5141eba53cac5 don_t_use_TIOCSCTTY.patch +72c46751eba8f77b53b1ee7cb801bfd7 dont_derelativise_authorizedkeysfile_option.patch ca5403c8e1539d5ced0573f289ed7aef no_x_forwarding_bug.patch 10e0b84c84ad0dc9c490480aab36be01 openssh-5.4p1-gsskex-all-20100313.patch da10af8a789fa2e83e3635f3a1b76f5e openssh-5.4p1.tar.gz Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2010-03-25 15:08:00 UTC (rev 9364) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2010-03-25 18:17:07 UTC (rev 9365) @@ -1,9 +1,11 @@ -openssh (5.4p1,REV=2010.03.24) unstable +openssh (5.4p1,REV=2010.03.25) unstable * Added derelativise_path_bugfix.patch patch to solve a bug in the derelativise_path function (Closes: #4367). + * Added dont_derelativise_authorizedkeysfile_option.patch so the + AuthorizedKeysFile option can be relative as explained in the man page. - -- Yann Rouillard Wed, 24 Mar 2010 22:00:55 +0100 + -- Yann Rouillard Wed, 25 Mar 2010 19:15:55 +0100 openssh (5.4p1,REV=2010.03.13) unstable Added: csw/mgar/pkg/openssh/trunk/files/dont_derelativise_authorizedkeysfile_option.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/dont_derelativise_authorizedkeysfile_option.patch (rev 0) +++ csw/mgar/pkg/openssh/trunk/files/dont_derelativise_authorizedkeysfile_option.patch 2010-03-25 18:17:07 UTC (rev 9365) @@ -0,0 +1,22 @@ +--- openssh-5.4p1/servconf.c.orig 2010-03-25 19:10:47.783942371 +0100 ++++ openssh-5.4p1/servconf.c 2010-03-25 19:10:52.526955504 +0100 +@@ -1223,7 +1252,18 @@ + charptr = (opcode == sAuthorizedKeysFile) ? + &options->authorized_keys_file : + &options->authorized_keys_file2; +- goto parse_filename; ++ ++ arg = strdelim(&cp); ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing file name.", ++ filename, linenum); ++ if (*activep && *charptr == NULL) { ++ *charptr = xstrdup(arg); ++ /* increase optional counter */ ++ if (intptr != NULL) ++ *intptr = *intptr + 1; ++ } ++ break; + + case sClientAliveInterval: + intptr = &options->client_alive_interval; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Mar 25 19:20:43 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 25 Mar 2010 18:20:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9366] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 9366 http://gar.svn.sourceforge.net/gar/?rev=9366&view=rev Author: chninkel Date: 2010-03-25 18:20:43 +0000 (Thu, 25 Mar 2010) Log Message: ----------- openssl: removed library path not allowed in prototype Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2010-03-25 18:17:07 UTC (rev 9365) +++ csw/mgar/pkg/openssl/trunk/checksums 2010-03-25 18:20:43 UTC (rev 9366) @@ -1,12 +1,12 @@ 88d71b493eb56f5a1ebf67cf33c70b9a CSWossl.prototype -2e4bcd020bc30e6eff133c7080ae1d45 CSWossldevel.prototype-i386 -d540546aeb138172a4f6b27a576f8059 CSWossldevel.prototype-sparc +f293ba8ca08b0a5fd391dcf3c7b29539 CSWossldevel.prototype-i386 +1f491e2f0c0f26fdc0b93fcebfc77613 CSWossldevel.prototype-sparc 05ace5330714d6cd9c0e076b6ae2518f CSWosslrt.checkinstall 1c3f600eaf942a18ecab3637e1fc32bd CSWosslrt.postinstall c9de908daad1a31fca20329cb043ad3c CSWosslrt.preinstall -b2fb1179d94e57e9c0127c987613d5fb CSWosslrt.prototype-i386 -2b956d4877de436a584dc6e09574c8d8 CSWosslrt.prototype-sparc -1cb63bd3d00639f0aee05fdf96651d95 CSWosslutils.prototype +7535e5b5b281adb5c13bf9ad878b5cf1 CSWosslrt.prototype-i386 +0fcaed441f7527bdeda410a70bb60f6f CSWosslrt.prototype-sparc +07b1ad34d1f742052460e4655eccb41f CSWosslutils.prototype b78faa440d6f6a2a07663de331678648 README.CSW f0d5119652618d956eb24490b7577eb9 changelog.CSW 84830e15846f1b20d8371c1fa375a0b1 more_configure_targets.patch Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2010-03-25 18:17:07 UTC (rev 9365) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2010-03-25 18:20:43 UTC (rev 9366) @@ -73,7 +73,6 @@ d none /opt/csw/lib/pentium_pro 0755 root bin f none /opt/csw/lib/pentium_pro/libcrypto.a 0644 root bin f none /opt/csw/lib/pentium_pro/libssl.a 0644 root bin -d none /opt/csw/lib/amd64 0755 root bin f none /opt/csw/lib/amd64/libcrypto.a 0644 root bin f none /opt/csw/lib/amd64/libssl.a 0644 root bin d none /opt/csw/lib/pkgconfig 0755 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 2010-03-25 18:17:07 UTC (rev 9365) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 2010-03-25 18:20:43 UTC (rev 9366) @@ -1,4 +1,3 @@ -d none /opt/csw/lib/amd64 0755 root bin s none /opt/csw/lib/amd64/libcrypto.so=libcrypto.so.0.9.8 f none /opt/csw/lib/amd64/libcrypto.so.0.9.8 0755 root bin s none /opt/csw/lib/amd64/libssl.so=libssl.so.0.9.8 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 Mar 25 23:05:02 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 25 Mar 2010 22:05:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[9367] csw/mgar/pkg Message-ID: Revision: 9367 http://gar.svn.sourceforge.net/gar/?rev=9367&view=rev Author: wahwah Date: 2010-03-25 22:04:59 +0000 (Thu, 25 Mar 2010) Log Message: ----------- ncsa-mosaic: Initial commit Modified Paths: -------------- csw/mgar/pkg/ncsa-mosaic/trunk/Makefile csw/mgar/pkg/ncsa-mosaic/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ncsa-mosaic/ csw/mgar/pkg/ncsa-mosaic/trunk/files/0001-Copying-Makefile.linux-to-Makefile.sun.patch csw/mgar/pkg/ncsa-mosaic/trunk/files/0002-Got-it-to-build-with-gnulib-stuff.patch csw/mgar/pkg/ncsa-mosaic/trunk/files/0003-set-runtime-lib-search-path.patch Modified: csw/mgar/pkg/ncsa-mosaic/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-03-10 12:18:39 UTC (rev 9077) +++ csw/mgar/pkg/ncsa-mosaic/trunk/Makefile 2010-03-25 22:04:59 UTC (rev 9367) @@ -2,184 +2,46 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = ncsa-mosaic +GARVERSION = 2.7b6 +PACKAGES = CSWncsa-mosaic +CATALOGNAME_CSWncsa-mosaic = ncsa_mosaic +CATEGORIES = apps +GIT_REPOS = git://github.com/alandipert/ncsa-mosaic.git +DESCRIPTION = The web browser credited with popularizing the World Wide Web define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). +SPKG_SOURCEURL = http://github.com/alandipert/ncsa-mosaic MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release +PATCHFILES += 0001-Copying-Makefile.linux-to-Makefile.sun.patch +PATCHFILES += 0002-Got-it-to-build-with-gnulib-stuff.patch +PATCHFILES += 0003-set-runtime-lib-search-path.patch + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = mosaic +INSTALL_SCRIPTS = mosaic +TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true -#include gar/category.mk +RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibice +RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibsm +RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibx11 +RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibxext +RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibxmu +RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibxpm +RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibxt + +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWncsa-mosaic) +LICENSE = COPYRIGHT + +include gar/category.mk + +build-mosaic: + (cd $(WORKSRC); gmake sun) + @$(MAKECOOKIE) + +install-mosaic: + ginstall -m 755 -d $(DESTDIR)$(bindir) + ginstall -m 755 $(WORKSRC)/src/Mosaic $(DESTDIR)$(bindir) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/ncsa-mosaic/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-03-10 12:18:39 UTC (rev 9077) +++ csw/mgar/pkg/ncsa-mosaic/trunk/checksums 2010-03-25 22:04:59 UTC (rev 9367) @@ -0,0 +1,3 @@ +04606d65883504febd6a014b4a7ad953 0001-Copying-Makefile.linux-to-Makefile.sun.patch +6cf4ba26d7380243062e0592aadc4ff5 0002-Got-it-to-build-with-gnulib-stuff.patch +7321d5ef003731325e6e2b4d5f8003d4 0003-set-runtime-lib-search-path.patch Added: csw/mgar/pkg/ncsa-mosaic/trunk/files/0001-Copying-Makefile.linux-to-Makefile.sun.patch =================================================================== --- csw/mgar/pkg/ncsa-mosaic/trunk/files/0001-Copying-Makefile.linux-to-Makefile.sun.patch (rev 0) +++ csw/mgar/pkg/ncsa-mosaic/trunk/files/0001-Copying-Makefile.linux-to-Makefile.sun.patch 2010-03-25 22:04:59 UTC (rev 9367) @@ -0,0 +1,362 @@ +From cf84264a0bf2653f9abee344239c12fcc5fc22a4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Thu, 25 Mar 2010 20:31:22 +0000 +Subject: [PATCH 1/3] Copying Makefile.linux to Makefile.sun + +--- + makefiles/Makefile.sun | 343 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 343 insertions(+), 0 deletions(-) + create mode 100755 makefiles/Makefile.sun + +diff --git a/makefiles/Makefile.sun b/makefiles/Makefile.sun +new file mode 100755 +index 0000000..2cea009 +--- /dev/null ++++ b/makefiles/Makefile.sun +@@ -0,0 +1,343 @@ ++# Toplevel Makefile for NCSA Mosaic. ++ ++# You shouldn't need to touch any of the Makefiles in the various ++# subdirectories if you configure this Makefile correctly. ++ ++# If you need to make serious changes to get Mosaic to compile on your ++# platform, send context diffs to mosaic-x at ncsa.uiuc.edu. ++ ++# -------------------------- CUSTOMIZABLE OPTIONS ---------------------------- ++ ++#prereleaseflags = -DPRERELEASE ++prereleaseflags = -DPRERELEASE ++ ++#RANLIB = /bin/true ++#### On non-SGI's, this should be ranlib. ++RANLIB = ranlib ++ ++#CC = cc ++#### On Sun's, this should be gcc (ANSI required). ++CC = gcc ++ ++#### Linker Flags ++ldflags = ++ ++#### For a few files in the source, some compilers may need to be kicked ++#### in K&R mode. E.g., on SGI's, -cckr does this. ++#knrflag = -cckr ++#### On most systems, no flag is needed. ++knrflag = ++ ++ ++#### Random system configuration flags. ++#### --> *** For Motif 1.2 ON ANY PLATFORM, do -DMOTIF1_2 *** <-- ++#### For IBM AIX 3.2, do -D_BSD ++#### For NeXT, do -DNEXT ++#### For HP/UX, do -Aa -D_HPUX_SOURCE ++#### For Dell SVR4, do -DSVR4 ++#### For Solaris, do -DSVR4 ++#### For Esix 4.0.4 and Solaris x86 2.1, do -DSVR4 ++#### For Convex whatever, do -DCONVEX ++#### For SCO ODT 3.0, do -DSCO -DSVR4 -DMOTIF1_2 ++#### For Motorola SVR4, do -DSVR4 -DMOTOROLA -DMOTIF1_2 ++sysconfigflags = -DMOTIF1_2 -DLINUX ++ ++#### System libraries. ++# syslibs = -lPW -lsun -lmalloc ++#### For AIX 3.2 ++# syslibs = -lPW -lbsd ++#### For most other Motif platforms: ++# syslibs = -lPW ++#### For Sun's and Ultrix and HP and BSD/386: ++# syslibs = ++#### For Sun's with no DNS: ++# syslibs = -lresolv ++#### For SCO ODT: ++# syslibs = -lPW -lsocket -lmalloc ++#### For Dell SVR4: ++# syslibs = -lnsl -lsocket -lc -lucb ++#### For Solaris (?) ++# syslibs = -lnsl -lsocket -lgen ++#### For Motorola SVR4: ++# syslibs = -lnsl -lsocket -lgen ++ ++syslibs = -lc ++ ++#### X include file locations -- if your platform puts the X include ++#### files in a strange place, set this variable appropriately. Else ++#### don't worry about it. ++#### HP X11R4 version: ++# xinc = -I/usr/include/Motif1.1 -I/usr/include/X11R4 ++#### HP X11R5 version: ++# xinc = -I/usr/include/Motif1.2 -I/usr/local/X11R5/include ++#### NeXT version: ++# xinc = -I/usr/include/X11 ++#### BSD/386 ++# xinc = -I/usr/X11/include ++ ++xinc = -I/usr/X11R6/include ++ ++#### X library locations. ++# xlibs = -lXm_s -lXmu -lXt_s -lX11_s ++#### For Sun's (at least running stock X/Motif as installed on our machines): ++# xlibs = /usr/lib/libXm.a /usr/lib/libXmu.a /usr/lib/libXt.a /usr/lib/libXext.a /usr/lib/libX11.a -lm #### For HP-UX 8.00: ++# xlibs = -L/usr/lib/Motif1.1 -lXm -L/usr/lib/X11R4 -lXmu -lXt -lX11 ++#### For HP-UX 9.01: The X11R5 libraries are here on our systems ++# xlibs = -L/usr/lib/Motif1.2 -lXm -L/usr/lib/X11R5 -L/usr/lib/X11R4 -lXmu -lXt -lX11 ++#### For NeXT: ++# xlibs = -L/usr/lib/X11 -lXm -lXmu -lXt -lX11 ++#### For Dell SVR4: ++# xlibs = -L/usr/X5/lib -lXm -lXmu -lXt -lXext -lX11 ++#### For Solaris (?) ++# xlibs = -lXm -lXmu -lXt -lXext -lX11 -lm ++#### For SCO ODT 3.0 (I'm told that -lXtXm_s is *not* a typo :-): ++# xlibs = -lXtXm_s -lXmu -lX11_s ++#### For nearly everyone else: ++# xlibs = -lXm -lXmu -lXt -lX11 ++#### For Linux -- You must set "LD_LIBRARY_PATH" to include the path to ++#### your X libs, or some may not be found by the loader. Check the ++#### loader with "ldd Mosaic" after you build. ++xlibs = -L/usr/X11R6/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM ++static_motif_xlibs = -L/usr/X11R6/lib -lXext -lXpm /usr/X11R6/lib/libXm.a -lXmu -lXt -lX11 -lICE -lSM ++static_xlibs = /usr/X11R6/lib/libXpm.a /usr/X11R6/lib/libXm.a /usr/X11R6/lib/libXmu.a /usr/X11R6/lib/libXt.a /usr/X11R6/lib/libXext.a /usr/X11R6/lib/libX11.a /usr/X11R6/lib/libSM.a /usr/X11R6/lib/libICE.a ++#### For BSD/386: ++# xlibs = -L/usr/X11/lib -lXm -lXmu -lXt -lX11 ++#### For Motorola SVR4: ++# xlibs = -lXm -lXmu -lXt -lXext -lX11 -lm ++ ++ ++#### DTM AND HDF SUPPORT; READ CAREFULLY ++ ++#### If you want to compile with DTM and HDF support, you should leave ++#### the following lines uncommented and make sure you have a copy of ++#### HDF 3.3 (r1 or later) installed and ready. You can find HDF on ++#### ftp.ncsa.uiuc.edu in /HDF. ++ ++#### If you do not want to compile with DTM and HDF support, comment ++#### the following lines out. (If you are compiling from source for ++#### the first time, you should probably not bother with HDF and DTM ++#### support.) ++ ++#### dtmmachtype needs to be set to one of the following: ++#### sun, sgi, dec, ibm, next, cray, convex ++#### If your platform is not one of the above, then either do not compile ++#### with HDF/DTM support or try hacking libdtm/makefile. ++ ++#dtmmachtype = sun ++#dtmdirs = libdtm libnet ++#dtmlibs = ../libnet/libnet.a ../libdtm/libdtm.a ++#dtmflags = -DHAVE_DTM -I.. -I../libnet ++#hdfdir = /hdf2/install/linux ++#hdflibs = $(hdfdir)/lib/libnetcdf.a $(hdfdir)/lib/libdf.a ++#hdfflags = -DHAVE_HDF -I$(hdfdir)/include ++ ++#### PNG SUPPORT ++#### For inline PNG support, the following should be defined: ++#### The libraries currently used are PNGLIB 0.81 and ZLIB 0.95 ++ ++# SAM pngdir = /xdev/mosaic/libpng/linux ++# SAM pnglibdir = $(pngdir)/lib ++# SAM pngincludedir = $(pngdir)/include ++# SAM pnglibs = $(pnglibdir)/libpng.a $(pnglibdir)/libz.a /usr/lib/libm.a ++# SAM pngflags = -I$(pngincludedir) -DHAVE_PNG ++pnglibs = -lpng -lz -lm ++pngflags = -DHAVE_PNG ++ ++#### JPEG SUPPORT ++#### For inline JPEG support, the following should be defined: ++#### The library used is Independent JPEG Group (IJG's) 5.0a. ++ ++# SAM jpegdir = /xdev/mosaic/libjpeg/linux ++# SAM jpeglibs = $(jpegdir)/lib/libjpeg.a ++ #SAM jpegflags = -I$(jpegdir)/include -DHAVE_JPEG ++jpeglibs = -ljpeg ++jpegflags = -DHAVE_JPEG ++ ++ ++#### KERBEROS SUPPORT ++#### ++#### If you want Mosaic to support Kerberos authentication, set the ++#### following flags appropriately. You can support Kerberos V4 and/or V5, ++#### although it's most likely that your realm supports one or the other. ++#### To enable DES-encryption of HTTP messages via Kerberos key exchange, ++#### define the KRB-ENCRYPT flag. ++ ++##krb4dir = /usr/athena ++#krb4dir = /xdev/mosaic/libkrb4/linux ++#krb4libs = $(krb4dir)/lib/libkrb.a $(krb4dir)/lib/libdes.a ++#krb4flags = -DKRB4 -I$(krb4dir)/include ++ ++##krb5dir = /krb5 ++#krb5dir = /xdev/mosaic/libkrb5/linux ++#krb5libs = $(krb5dir)/lib/libkrb5.a $(krb5dir)/lib/libcrypto.a $(krb5dir)/util/et/libcom_err.a ++#krb5flags = -DKRB5 -I$(krb5dir)/include -I$(krb5dir)/include/krb5 ++ ++#Do not comment out. ++krbflags = $(krb4flags) $(krb5flags) ++krblibs = $(krb4libs) $(krb5libs) ++ ++ ++#### DIRECT WAIS SUPPORT ++ ++#### If you want to have Mosaic be able to communicate directly with ++#### WAIS servers, do set the following flags appropriately. We ++#### recommend linking with CNIDR's freeWAIS 0.5 distribution; other ++#### WAIS distributions may work but we have not tested them with ++#### Mosaic. freeWAIS 0.5 can currently (Sept.1995) be found at ++#### ftp://sunsite.unc.edu/pub/wais/servers/freeWAIS ++ ++#### If you do not wish to link to the WAIS libraries, then comment ++#### the following lines out. Mosaic will then communicate with WAIS ++#### servers via a HTTP gateway. ++ ++#### -lm is required for freeWAIS 0.5, as ceil() is used. ++ ++#waisroot = /xdev/mosaic/freeWAIS/linux ++#waisflags = -DDIRECT_WAIS -I$(waisroot)/include ++#waislibdir = $(waisroot)/bin ++#waislibs = $(waislibdir)/inv.a $(waislibdir)/wais.a $(waislibdir)/libftw.a -lm ++ ++ ++#### Customization flags: ++#### . If you want Mosaic to come up with monochrome colors by default, ++#### use -DMONO_DEFAULT ++#### . If you want to define the default Mosaic home page, set ++#### -DHOME_PAGE_DEFAULT=\\\"url\\\" ++#### . If you want to define the default Mosaic documentation directory ++#### (should be a URL), set -DDOCS_DIRECTORY_DEFAULT=\\\"url\\\" ++#### . Other things you can define are spelled out in src/mosaic.h. ++customflags = ++ ++ ++ ++ ++######## ++######## ++#### NOTE! If you get errors because of the following line, it means ++#### you are NOT using GNUs Make program. The following line is basically ++#### for the developers at NCSA to customize the build process without ++#### modifying the Makefiles, so you may comment it out without harm. ++######## ++######## ++-include local-defines/$(DEV_ARCH) ++ ++ ++ ++# ---------------------- END OF CUSTOMIZABLE OPTIONS ------------------------- ++ ++CFLAGS = -g $(sysconfigflags) $(prereleaseflags) ++ ++# Don't worry about these -- for development purposes only. ++PURIFY = purify ++QUANTIFY = quantify ++ ++default: $(dtmdirs) libwww2 libXmx libhtmlw libnut src ++ @echo \*\*\* Welcome to NCSA Mosaic. ++purifyd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-purifyd ++ @echo \*\*\* Welcome to Purify'd NCSA Mosaic. ++quantifyd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-quantifyd ++ @echo \*\*\* Welcome to Quantify'd NCSA Mosaic. ++staticd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static ++ @echo \*\*\* Welcome to NCSA Mosaic linked static. ++static_motifd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-motif ++ @echo \*\*\* Welcome to NCSA Mosaic linked static for motif. ++p_staticd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-purifyd ++ @echo \*\*\* Welcome to Purify'd NCSA Mosaic linked static. ++p_static_motifd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-motif-purifyd ++ @echo \*\*\* Welcome to Purify'd NCSA Mosaic linked static for motif. ++q_staticd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-quantifyd ++ @echo \*\*\* Welcome to Quantify'd NCSA Mosaic linked static. ++q_static_motifd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-motif-quantifyd ++ @echo \*\*\* Welcome to Quantify'd NCSA Mosaic linked static for motif. ++ ++libXmx:: ++ @echo --- Building libXmx ++ cd libXmx; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(xinc)" ++ ++libhtmlw:: ++ @echo --- Building libhtmlw ++ cd libhtmlw; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(knrflag) $(xinc) -DMOTIF -DXMOSAIC" ++ ++libwww2:: ++ @echo --- Building libwww2 ++ cd libwww2; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(knrflag) $(waisflags) $(krbflags) $(xinc)" ++ ++libnut:: ++ @echo --- Building libnut ++ cd libnut; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(knrflag)" ++ ++src:: ++ @echo --- Building src ++ cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic" ++ ++src-purifyd:: ++ @echo --- Building Purify'd src ++ cd src; $(MAKE) PURIFY=$(PURIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-p" ++ ++src-quantifyd:: ++ @echo --- Building Quantify'd src ++ cd src; $(MAKE) PURIFY=$(QUANTIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-q" ++ ++src-static:: ++ @echo --- Building src-static ++ cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags) -static" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic" ++ ++src-static-motif:: ++ @echo --- Building src-static-motif ++ cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_motif_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic" ++ ++src-static-purifyd:: ++ @echo --- Building src-static-purifyd ++ cd src; $(MAKE) PURIFY=$(PURIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags) -static" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-p" ++ ++src-static-motif-purifyd:: ++ @echo --- Building src-static-motif-purifyd ++ cd src; $(MAKE) PURIFY=$(PURIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_motif_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-p" ++ ++src-static-quantifyd:: ++ @echo --- Building src-static-quantifyd ++ cd src; $(MAKE) PURIFY=$(QUANTIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags) -static" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-q" ++ ++src-static-motif-quantifyd:: ++ @echo --- Building src-static-motif-quantifyd ++ cd src; $(MAKE) PURIFY=$(QUANTIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_motif_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-q" ++ ++libnet:: ++ @echo --- Building libnet ++ cd libnet; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(dtmflags)" ++ ++libdtm:: ++ @echo --- Building libdtm ++ cd libdtm; $(MAKE) $(dtmmachtype) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(dtmflags)" ++ ++clean: ++ cd libXmx; $(MAKE) $@ ++ cd libhtmlw; $(MAKE) $@ ++ cd libwww2; $(MAKE) $@ ++ cd src; $(MAKE) MOSAIC="Mosaic" $@ ++ cd libnet; $(MAKE) $@ ++ cd libdtm; $(MAKE) $@ ++ cd libnut; $(MAKE) $@ ++ ++wclean: ++ cd libhtmlw; $(MAKE) $@ ++ cd src; $(MAKE) MOSAIC="Mosaic" $@ ++ ++commit: ++ cvs commit ++update: ++ cvs update ++countlines: ++ wc libdtm/*.[ch] libnet/*.[ch] libXmx/*.[ch] libhtmlw/*.[ch] libwww2/*.[ch] src/*.[ch] ++replicate: ++ cp Makefile Makefile.sun ++ cp Makefile Makefile.ibm ++ cp Makefile Makefile.dec ++ cp Makefile Makefile.alpha ++ cp Makefile Makefile.hp ++prune: ++ mv Makefile.sun Makefile.sun.old ++ mv Makefile.ibm Makefile.ibm.old ++ mv Makefile.dec Makefile.dec.old ++ mv Makefile.alpha Makefile.alpha.old ++ mv Makefile.hp Makefile.hp.old +-- +1.6.5.1 + Added: csw/mgar/pkg/ncsa-mosaic/trunk/files/0002-Got-it-to-build-with-gnulib-stuff.patch =================================================================== --- csw/mgar/pkg/ncsa-mosaic/trunk/files/0002-Got-it-to-build-with-gnulib-stuff.patch (rev 0) +++ csw/mgar/pkg/ncsa-mosaic/trunk/files/0002-Got-it-to-build-with-gnulib-stuff.patch 2010-03-25 22:04:59 UTC (rev 9367) @@ -0,0 +1,319 @@ +From dad464664df6bd6c80bccfe89c6ebefec09d141d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Thu, 25 Mar 2010 21:36:28 +0000 +Subject: [PATCH 2/3] Got it to build with gnulib stuff. + +--- + libwww2/HTUtils.h | 5 ++ + makefiles/Makefile.sun | 21 +++++--- + src/Makefile | 7 ++- + src/accept.h | 3 +- + src/getdelim.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/getline.c | 30 +++++++++++ + 6 files changed, 194 insertions(+), 9 deletions(-) + create mode 100644 src/getdelim.c + create mode 100644 src/getline.c + +diff --git a/libwww2/HTUtils.h b/libwww2/HTUtils.h +index 74f0e5f..a3c05a6 100644 +--- a/libwww2/HTUtils.h ++++ b/libwww2/HTUtils.h +@@ -28,6 +28,11 @@ Debug message control. + #define STDIO_H + #endif + ++/* ++ * for FIONBIO on Solaris ++ */ ++#include ++ + /* + * Tracing now works as a boolean from a resource. No, there are no + * more if's than before... +diff --git a/makefiles/Makefile.sun b/makefiles/Makefile.sun +index 2cea009..287c54e 100755 +--- a/makefiles/Makefile.sun ++++ b/makefiles/Makefile.sun +@@ -8,6 +8,8 @@ + + # -------------------------- CUSTOMIZABLE OPTIONS ---------------------------- + ++PATH := /opt/studio/SOS12/SUNWspro/bin:$(PATH) ++ + #prereleaseflags = -DPRERELEASE + prereleaseflags = -DPRERELEASE + +@@ -17,7 +19,7 @@ RANLIB = ranlib + + #CC = cc + #### On Sun's, this should be gcc (ANSI required). +-CC = gcc ++CC = cc + + #### Linker Flags + ldflags = +@@ -40,7 +42,7 @@ knrflag = + #### For Convex whatever, do -DCONVEX + #### For SCO ODT 3.0, do -DSCO -DSVR4 -DMOTIF1_2 + #### For Motorola SVR4, do -DSVR4 -DMOTOROLA -DMOTIF1_2 +-sysconfigflags = -DMOTIF1_2 -DLINUX ++sysconfigflags = -DMOTIF1_2 -DLINUX -DUSE_DIRENT + + #### System libraries. + # syslibs = -lPW -lsun -lmalloc +@@ -61,7 +63,7 @@ sysconfigflags = -DMOTIF1_2 -DLINUX + #### For Motorola SVR4: + # syslibs = -lnsl -lsocket -lgen + +-syslibs = -lc ++syslibs = -lc -lsocket -lnsl + + #### X include file locations -- if your platform puts the X include + #### files in a strange place, set this variable appropriately. Else +@@ -74,8 +76,10 @@ syslibs = -lc + # xinc = -I/usr/include/X11 + #### BSD/386 + # xinc = -I/usr/X11/include ++#### Solaris ++xing = -I/opt/csw/X11/include + +-xinc = -I/usr/X11R6/include ++# xinc = -I/usr/X11R6/include + + #### X library locations. + # xlibs = -lXm_s -lXmu -lXt_s -lX11_s +@@ -97,9 +101,12 @@ xinc = -I/usr/X11R6/include + #### For Linux -- You must set "LD_LIBRARY_PATH" to include the path to + #### your X libs, or some may not be found by the loader. Check the + #### loader with "ldd Mosaic" after you build. +-xlibs = -L/usr/X11R6/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM +-static_motif_xlibs = -L/usr/X11R6/lib -lXext -lXpm /usr/X11R6/lib/libXm.a -lXmu -lXt -lX11 -lICE -lSM +-static_xlibs = /usr/X11R6/lib/libXpm.a /usr/X11R6/lib/libXm.a /usr/X11R6/lib/libXmu.a /usr/X11R6/lib/libXt.a /usr/X11R6/lib/libXext.a /usr/X11R6/lib/libX11.a /usr/X11R6/lib/libSM.a /usr/X11R6/lib/libICE.a ++# xlibs = -L/usr/X11R6/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM ++ ++# Solaris ++xlibs = -L/opt/csw/X11/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM ++static_motif_xlibs = -L/opt/csw/X11/lib -lXext -lXpm /opt/csw/X11/lib/libXm.a -lXmu -lXt -lX11 -lICE -lSM ++static_xlibs = /opt/csw/X11/lib/libXpm.a /opt/csw/X11/lib/libXm.a /opt/csw/X11/lib/libXmu.a /opt/csw/X11/lib/libXt.a /opt/csw/X11/lib/libXext.a /opt/csw/X11/lib/libX11.a /opt/csw/X11/lib/libSM.a /opt/csw/X11/lib/libICE.a + #### For BSD/386: + # xlibs = -L/usr/X11/lib -lXm -lXmu -lXt -lX11 + #### For Motorola SVR4: +diff --git a/src/Makefile b/src/Makefile +index 04ab35b..7d461b0 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -26,7 +26,9 @@ OBJS = main.o gui.o gui-dialogs.o gui-menubar.o gui-documents.o gui-news.o\ + medcut.o mo-hdf.o hotfile.o child.o mailto.o readJPEG.o readPNG.o\ + accept.o cciServer.o cciBindings.o cciBindings2.o support.o bla.o\ + kcms.o md5.o proxy-dialogs.o proxy-misc.o gui-popup.o gui-ftp.o\ +- prefs.o ++ prefs.o \ ++ getline.o \ ++ getdelim.o + + AUXCFILES = hdf-browse.c + AUXOBJS = hdf-browse.o +@@ -226,3 +228,6 @@ gui-ftp.o: prefs.h prefs_defs.h gui.h gui-ftp.h gui-popup.h + gui-ftp.o: ../libhtmlw/HTML.h hotlist.h ../libnut/system.h + + prefs.o: mosaic.h ../libXmx/Xmx.h toolbar.h prefs.h prefs_defs.h ++ ++getline.o: getline.c ++getdelim.o: getdelim.c +diff --git a/src/accept.h b/src/accept.h +index 6470b5f..4db5725 100644 +--- a/src/accept.h ++++ b/src/accept.h +@@ -1,3 +1,5 @@ ++#include ++ + typedef int ListenAddress; + + extern ListenAddress NetServerInitSocket(); +@@ -6,4 +8,3 @@ extern int NetRead(); + extern int NetServerWrite(); + extern int NetCloseConnection(); + extern int NetIsThereInput(); +- +diff --git a/src/getdelim.c b/src/getdelim.c +new file mode 100644 +index 0000000..c024090 +--- /dev/null ++++ b/src/getdelim.c +@@ -0,0 +1,137 @@ ++/* getdelim.c --- Implementation of replacement getdelim function. ++ Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005, 2006, 2007, 2008, ++ 2009, 2010 Free Software Foundation, Inc. ++ ++ 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, 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., 51 Franklin Street, Fifth Floor, Boston, MA ++ 02110-1301, USA. */ ++ ++/* Ported from glibc by Simon Josefsson. */ ++ ++#include ++ ++/* Don't use __attribute__ __nonnull__ in this compilation unit. Otherwise gcc ++ optimizes away the lineptr == NULL || n == NULL || fp == NULL tests below. */ ++#define _GL_ARG_NONNULL(params) ++ ++#include ++ ++#include ++#include ++#include ++#include ++ ++#ifndef SSIZE_MAX ++# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) ++#endif ++ ++#if USE_UNLOCKED_IO ++# include "unlocked-io.h" ++# define getc_maybe_unlocked(fp) getc(fp) ++#elif !HAVE_FLOCKFILE || !HAVE_FUNLOCKFILE || !HAVE_DECL_GETC_UNLOCKED ++# undef flockfile ++# undef funlockfile ++# define flockfile(x) ((void) 0) ++# define funlockfile(x) ((void) 0) ++# define getc_maybe_unlocked(fp) getc(fp) ++#else ++# define getc_maybe_unlocked(fp) getc_unlocked(fp) ++#endif ++ ++/* Read up to (and including) a DELIMITER from FP into *LINEPTR (and ++ NUL-terminate it). *LINEPTR is a pointer returned from malloc (or ++ NULL), pointing to *N characters of space. It is realloc'ed as ++ necessary. Returns the number of characters read (not including ++ the null terminator), or -1 on error or EOF. */ ++ ++ssize_t ++getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp) ++{ ++ ssize_t result; ++ size_t cur_len = 0; ++ ++ if (lineptr == NULL || n == NULL || fp == NULL) ++ { ++ errno = EINVAL; ++ return -1; ++ } ++ ++ flockfile (fp); ++ ++ if (*lineptr == NULL || *n == 0) ++ { ++ char *new_lineptr; ++ *n = 120; ++ new_lineptr = (char *) realloc (*lineptr, *n); ++ if (new_lineptr == NULL) ++ { ++ result = -1; ++ goto unlock_return; ++ } ++ *lineptr = new_lineptr; ++ } ++ ++ for (;;) ++ { ++ int i; ++ ++ i = getc_maybe_unlocked (fp); ++ if (i == EOF) ++ { ++ result = -1; ++ break; ++ } ++ ++ /* Make enough space for len+1 (for final NUL) bytes. */ ++ if (cur_len + 1 >= *n) ++ { ++ size_t needed_max = ++ SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX; ++ size_t needed = 2 * *n + 1; /* Be generous. */ ++ char *new_lineptr; ++ ++ if (needed_max < needed) ++ needed = needed_max; ++ if (cur_len + 1 >= needed) ++ { ++ result = -1; ++ errno = EOVERFLOW; ++ goto unlock_return; ++ } ++ ++ new_lineptr = (char *) realloc (*lineptr, needed); ++ if (new_lineptr == NULL) ++ { ++ result = -1; ++ goto unlock_return; ++ } ++ ++ *lineptr = new_lineptr; ++ *n = needed; ++ } ++ ++ (*lineptr)[cur_len] = i; ++ cur_len++; ++ ++ if (i == delimiter) ++ break; ++ } ++ (*lineptr)[cur_len] = '\0'; ++ result = cur_len ? cur_len : result; ++ ++ unlock_return: ++ funlockfile (fp); /* doesn't set errno */ ++ ++ return result; ++} +diff --git a/src/getline.c b/src/getline.c +new file mode 100644 +index 0000000..e9a87db +--- /dev/null ++++ b/src/getline.c +@@ -0,0 +1,30 @@ ++/* getline.c --- Implementation of replacement getline function. ++ Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. ++ ++ 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, 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., 51 Franklin Street, Fifth Floor, Boston, MA ++ 02110-1301, USA. */ ++ ++/* Written by Simon Josefsson. */ ++ ++#include ++ ++#include ++#include ++ ++ssize_t ++getline (char **lineptr, size_t *n, FILE *stream) ++{ ++ return getdelim (lineptr, n, '\n', stream); ++} +-- +1.6.5.1 + Added: csw/mgar/pkg/ncsa-mosaic/trunk/files/0003-set-runtime-lib-search-path.patch =================================================================== --- csw/mgar/pkg/ncsa-mosaic/trunk/files/0003-set-runtime-lib-search-path.patch (rev 0) +++ csw/mgar/pkg/ncsa-mosaic/trunk/files/0003-set-runtime-lib-search-path.patch 2010-03-25 22:04:59 UTC (rev 9367) @@ -0,0 +1,25 @@ +From d4d9ab253882c1fe3ca58f60cefc45f2947f9493 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Thu, 25 Mar 2010 21:54:35 +0000 +Subject: [PATCH 3/3] set runtime lib search path + +--- + makefiles/Makefile.sun | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/makefiles/Makefile.sun b/makefiles/Makefile.sun +index 287c54e..363e050 100755 +--- a/makefiles/Makefile.sun ++++ b/makefiles/Makefile.sun +@@ -104,7 +104,7 @@ xing = -I/opt/csw/X11/include + # xlibs = -L/usr/X11R6/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM + + # Solaris +-xlibs = -L/opt/csw/X11/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM ++xlibs = -L/opt/csw/X11/lib -R/opt/csw/X11/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM + static_motif_xlibs = -L/opt/csw/X11/lib -lXext -lXpm /opt/csw/X11/lib/libXm.a -lXmu -lXt -lX11 -lICE -lSM + static_xlibs = /opt/csw/X11/lib/libXpm.a /opt/csw/X11/lib/libXm.a /opt/csw/X11/lib/libXmu.a /opt/csw/X11/lib/libXt.a /opt/csw/X11/lib/libXext.a /opt/csw/X11/lib/libX11.a /opt/csw/X11/lib/libSM.a /opt/csw/X11/lib/libICE.a + #### For BSD/386: +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 26 00:28:39 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 25 Mar 2010 23:28:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9368] csw/mgar/pkg/ncsa-mosaic/trunk Message-ID: Revision: 9368 http://gar.svn.sourceforge.net/gar/?rev=9368&view=rev Author: wahwah Date: 2010-03-25 23:28:38 +0000 (Thu, 25 Mar 2010) Log Message: ----------- ncsa-mosaic: Builds on the buildfarm now. Modified Paths: -------------- csw/mgar/pkg/ncsa-mosaic/trunk/Makefile csw/mgar/pkg/ncsa-mosaic/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ncsa-mosaic/trunk/files/0005-Adding-opt-csw-include-lib-for-png.h.patch csw/mgar/pkg/ncsa-mosaic/trunk/files/0006-sys-inttypes.h-instead-of-stdint.h.patch csw/mgar/pkg/ncsa-mosaic/trunk/files/0007-Adding-opt-csw-include-for-png.patch Modified: csw/mgar/pkg/ncsa-mosaic/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncsa-mosaic/trunk/Makefile 2010-03-25 22:04:59 UTC (rev 9367) +++ csw/mgar/pkg/ncsa-mosaic/trunk/Makefile 2010-03-25 23:28:38 UTC (rev 9368) @@ -9,6 +9,7 @@ CATEGORIES = apps GIT_REPOS = git://github.com/alandipert/ncsa-mosaic.git DESCRIPTION = The web browser credited with popularizing the World Wide Web +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 define BLURB endef SPKG_SOURCEURL = http://github.com/alandipert/ncsa-mosaic @@ -16,6 +17,9 @@ PATCHFILES += 0001-Copying-Makefile.linux-to-Makefile.sun.patch PATCHFILES += 0002-Got-it-to-build-with-gnulib-stuff.patch PATCHFILES += 0003-set-runtime-lib-search-path.patch +PATCHFILES += 0005-Adding-opt-csw-include-lib-for-png.h.patch +PATCHFILES += 0006-sys-inttypes.h-instead-of-stdint.h.patch +PATCHFILES += 0007-Adding-opt-csw-include-for-png.patch UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_SCRIPTS = @@ -31,6 +35,9 @@ RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibxmu RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibxpm RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibxt +RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWjpeg +RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWpng +RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWzlib BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWncsa-mosaic) LICENSE = COPYRIGHT Modified: csw/mgar/pkg/ncsa-mosaic/trunk/checksums =================================================================== --- csw/mgar/pkg/ncsa-mosaic/trunk/checksums 2010-03-25 22:04:59 UTC (rev 9367) +++ csw/mgar/pkg/ncsa-mosaic/trunk/checksums 2010-03-25 23:28:38 UTC (rev 9368) @@ -1,3 +1,6 @@ 04606d65883504febd6a014b4a7ad953 0001-Copying-Makefile.linux-to-Makefile.sun.patch 6cf4ba26d7380243062e0592aadc4ff5 0002-Got-it-to-build-with-gnulib-stuff.patch 7321d5ef003731325e6e2b4d5f8003d4 0003-set-runtime-lib-search-path.patch +0db9261981aecbb3bc66a67a2173b62b 0005-Adding-opt-csw-include-lib-for-png.h.patch +852e7506b0029270fb29c9104e871dec 0006-sys-inttypes.h-instead-of-stdint.h.patch +fdca926326cc4afe632a10d6f666a0fb 0007-Adding-opt-csw-include-for-png.patch Added: csw/mgar/pkg/ncsa-mosaic/trunk/files/0005-Adding-opt-csw-include-lib-for-png.h.patch =================================================================== --- csw/mgar/pkg/ncsa-mosaic/trunk/files/0005-Adding-opt-csw-include-lib-for-png.h.patch (rev 0) +++ csw/mgar/pkg/ncsa-mosaic/trunk/files/0005-Adding-opt-csw-include-lib-for-png.h.patch 2010-03-25 23:28:38 UTC (rev 9368) @@ -0,0 +1,25 @@ +From 21b0b966b2aeb5b01de5bbe942eec7a84ce1c9c8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Thu, 25 Mar 2010 22:38:56 +0000 +Subject: [PATCH 5/6] Adding /opt/csw/{include,lib} for png.h. + +--- + makefiles/Makefile.sun | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/makefiles/Makefile.sun b/makefiles/Makefile.sun +index 6b4018e..71e9e85 100755 +--- a/makefiles/Makefile.sun ++++ b/makefiles/Makefile.sun +@@ -148,7 +148,7 @@ static_xlibs = /opt/csw/X11/lib/libXpm.a /opt/csw/X11/lib/libXm.a /opt/csw/X11/l + # SAM pngincludedir = $(pngdir)/include + # SAM pnglibs = $(pnglibdir)/libpng.a $(pnglibdir)/libz.a /usr/lib/libm.a + # SAM pngflags = -I$(pngincludedir) -DHAVE_PNG +-pnglibs = -lpng -lz -lm ++pnglibs = -L/opt/csw/lib -R/opt/csw/lib -lpng -lz -lm + pngflags = -DHAVE_PNG + + #### JPEG SUPPORT +-- +1.6.5.1 + Added: csw/mgar/pkg/ncsa-mosaic/trunk/files/0006-sys-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/ncsa-mosaic/trunk/files/0006-sys-inttypes.h-instead-of-stdint.h.patch (rev 0) +++ csw/mgar/pkg/ncsa-mosaic/trunk/files/0006-sys-inttypes.h-instead-of-stdint.h.patch 2010-03-25 23:28:38 UTC (rev 9368) @@ -0,0 +1,25 @@ +From 5e86e2da62182be4bcf794961e5ba5ea42b340c6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Thu, 25 Mar 2010 22:49:31 +0000 +Subject: [PATCH 6/6] sys/inttypes.h instead of stdint.h + +--- + src/getdelim.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/getdelim.c b/src/getdelim.c +index c024090..a20b6be 100644 +--- a/src/getdelim.c ++++ b/src/getdelim.c +@@ -28,7 +28,7 @@ + #include + + #include +-#include ++#include + #include + #include + +-- +1.6.5.1 + Added: csw/mgar/pkg/ncsa-mosaic/trunk/files/0007-Adding-opt-csw-include-for-png.patch =================================================================== --- csw/mgar/pkg/ncsa-mosaic/trunk/files/0007-Adding-opt-csw-include-for-png.patch (rev 0) +++ csw/mgar/pkg/ncsa-mosaic/trunk/files/0007-Adding-opt-csw-include-for-png.patch 2010-03-25 23:28:38 UTC (rev 9368) @@ -0,0 +1,25 @@ +From 404a6dec66c2370877644b17ce3091fffffad306 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Thu, 25 Mar 2010 22:58:56 +0000 +Subject: [PATCH 7/7] Adding /opt/csw/include for png + +--- + makefiles/Makefile.sun | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/makefiles/Makefile.sun b/makefiles/Makefile.sun +index 71e9e85..c7a7fc5 100755 +--- a/makefiles/Makefile.sun ++++ b/makefiles/Makefile.sun +@@ -149,7 +149,7 @@ static_xlibs = /opt/csw/X11/lib/libXpm.a /opt/csw/X11/lib/libXm.a /opt/csw/X11/l + # SAM pnglibs = $(pnglibdir)/libpng.a $(pnglibdir)/libz.a /usr/lib/libm.a + # SAM pngflags = -I$(pngincludedir) -DHAVE_PNG + pnglibs = -L/opt/csw/lib -R/opt/csw/lib -lpng -lz -lm +-pngflags = -DHAVE_PNG ++pngflags = -DHAVE_PNG -I/opt/csw/include + + #### JPEG SUPPORT + #### For inline JPEG support, the following should be defined: +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 26 01:26:07 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 26 Mar 2010 00:26:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[9369] csw/mgar/pkg/evince/trunk/Makefile Message-ID: Revision: 9369 http://gar.svn.sourceforge.net/gar/?rev=9369&view=rev Author: wahwah Date: 2010-03-26 00:26:07 +0000 (Fri, 26 Mar 2010) Log Message: ----------- evince: Added BUILD_DEP_PKGS Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2010-03-25 23:28:38 UTC (rev 9368) +++ csw/mgar/pkg/evince/trunk/Makefile 2010-03-26 00:26:07 UTC (rev 9369) @@ -50,4 +50,5 @@ RUNTIME_DEP_PKGS_CSWevince += CSWpoppler RUNTIME_DEP_PKGS_CSWevince += CSWtiff RUNTIME_DEP_PKGS_CSWevince += CSWzlib +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWevince) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 26 01:51:12 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 26 Mar 2010 00:51:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9370] csw/mgar/pkg/guppy/trunk/Makefile Message-ID: Revision: 9370 http://gar.svn.sourceforge.net/gar/?rev=9370&view=rev Author: wahwah Date: 2010-03-26 00:51:11 +0000 (Fri, 26 Mar 2010) Log Message: ----------- guppy: Added the py- prefix. Modified Paths: -------------- csw/mgar/pkg/guppy/trunk/Makefile Modified: csw/mgar/pkg/guppy/trunk/Makefile =================================================================== --- csw/mgar/pkg/guppy/trunk/Makefile 2010-03-26 00:26:07 UTC (rev 9369) +++ csw/mgar/pkg/guppy/trunk/Makefile 2010-03-26 00:51:11 UTC (rev 9370) @@ -12,8 +12,9 @@ SPKG_SOURCEURL = http://guppy-pe.sourceforge.net/ MASTER_SITES = http://pypi.python.org/packages/source/g/guppy/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -# guppy-0.1.9.tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWpy-guppy +CATALOGNAME_CSWpy-guppy = py_guppy TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) LICENSE = PKG-INFO This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 26 02:56:41 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 26 Mar 2010 01:56:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9371] csw/mgar/pkg/gnulinks/trunk Message-ID: Revision: 9371 http://gar.svn.sourceforge.net/gar/?rev=9371&view=rev Author: bdwalton Date: 2010-03-26 01:56:41 +0000 (Fri, 26 Mar 2010) Log Message: ----------- gnulinks: convert to dynamic prototype; drop old static copy. Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2010-03-26 00:51:11 UTC (rev 9370) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2010-03-26 01:56:41 UTC (rev 9371) @@ -8,7 +8,7 @@ GLINKPKGS += CSWgawk CSWgsed CSWggetopt CSWfindutils GLINKPKGS += CSWgmake CSWgpatch CSWgm4 CSWgwhois CSWgtar GLINKPKGS += CSWshutils CSWgfile CSWtextutils -BUILD_DEP_PKGS = $(GLINKPKGS) CSWpkgutil +BUILD_DEP_PKGS = $(GLINKPKGS) CSWpkgutil CSWbash DESCRIPTION = Creates native symlinks for GNU tools in /opt/csw/gnu define BLURB @@ -17,20 +17,38 @@ endef MASTER_SITES = http://www.opencsw.org -DISTFILES = CSWgnulinks.prototype DISTFILES += COPYING CONFIGURE_SCRIPTS = BUILD_SCRIPTS = -INSTALL_SCRIPTS = +INSTALL_SCRIPTS = custom TEST_SCRIPTS = ARCHALL = 1 +SHELL = /opt/csw/bin/bash + include gar/category.mk +pre-build-modulated: + @(cd $(WORKSRC); cp ../COPYING .; ) +install-custom: + @mkdir -p $(DESTDIR) + ( cd $(DESTDIR); pwd; mkdir -p opt/csw/gnu; cd opt/csw/gnu; pwd; \ + for p in $(GLINKPKGS); do \ + echo Creating links for $$p; \ + for f in $$(pkgutil -L $$p | grep /opt/csw/bin/g); do \ + base=$$(basename $$f); \ + basenog=$${base/g/}; \ + gln -sf ../bin/$$base $$basenog; \ + done; \ + done; \ + rm -f descriptions* catalog* ) + @$(MAKECOOKIE) +# this shouldn't be used now, but is helpful if you ever want to +# generate a manual prototype file for this package newproto: @echo Generating new prototype... @( { echo /opt/csw/gnu; \ Deleted: csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype =================================================================== --- csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype 2010-03-26 00:51:11 UTC (rev 9370) +++ csw/mgar/pkg/gnulinks/trunk/files/CSWgnulinks.prototype 2010-03-26 01:56:41 UTC (rev 9371) @@ -1,139 +0,0 @@ -d none /opt/csw/gnu 0755 root bin -s none /opt/csw/gnu/addr2line=../bin/gaddr2line -s none /opt/csw/gnu/ar=../bin/gar -s none /opt/csw/gnu/as=../bin/gas -s none /opt/csw/gnu/autopoint=../bin/gautopoint -s none /opt/csw/gnu/awk=../bin/gawk -s none /opt/csw/gnu/basename=../bin/gbasename -s none /opt/csw/gnu/c++filt=../bin/gc++filt -s none /opt/csw/gnu/cat=../bin/gcat -s none /opt/csw/gnu/chgrp=../bin/gchgrp -s none /opt/csw/gnu/chmod=../bin/gchmod -s none /opt/csw/gnu/chown=../bin/gchown -s none /opt/csw/gnu/chroot=../bin/gchroot -s none /opt/csw/gnu/cksum=../bin/gcksum -s none /opt/csw/gnu/cmp=../bin/gcmp -s none /opt/csw/gnu/comm=../bin/gcomm -s none /opt/csw/gnu/cp=../bin/gcp -s none /opt/csw/gnu/csplit=../bin/gcsplit -s none /opt/csw/gnu/cut=../bin/gcut -s none /opt/csw/gnu/date=../bin/gdate -s none /opt/csw/gnu/dd=../bin/gdd -s none /opt/csw/gnu/df=../bin/gdf -s none /opt/csw/gnu/diff3=../bin/gdiff3 -s none /opt/csw/gnu/diff=../bin/gdiff -s none /opt/csw/gnu/dir=../bin/gdir -s none /opt/csw/gnu/dircolors=../bin/gdircolors -s none /opt/csw/gnu/dirname=../bin/gdirname -s none /opt/csw/gnu/du=../bin/gdu -s none /opt/csw/gnu/echo=../bin/gecho -s none /opt/csw/gnu/env=../bin/genv -s none /opt/csw/gnu/envsubst=../bin/genvsubst -s none /opt/csw/gnu/expand=../bin/gexpand -s none /opt/csw/gnu/expr=../bin/gexpr -s none /opt/csw/gnu/factor=../bin/gfactor -s none /opt/csw/gnu/false=../bin/gfalse -s none /opt/csw/gnu/find=../bin/gfind -s none /opt/csw/gnu/fmt=../bin/gfmt -s none /opt/csw/gnu/fold=../bin/gfold -s none /opt/csw/gnu/getopt=../bin/ggetopt -s none /opt/csw/gnu/gettext.sh=../bin/ggettext.sh -s none /opt/csw/gnu/gettext=../bin/ggettext -s none /opt/csw/gnu/gettextize=../bin/ggettextize -s none /opt/csw/gnu/gprof=../bin/ggprof -s none /opt/csw/gnu/groups=../bin/ggroups -s none /opt/csw/gnu/head=../bin/ghead -s none /opt/csw/gnu/hostid=../bin/ghostid -s none /opt/csw/gnu/hostname=../bin/ghostname -s none /opt/csw/gnu/id=../bin/gid -s none /opt/csw/gnu/install=../bin/ginstall -s none /opt/csw/gnu/join=../bin/gjoin -s none /opt/csw/gnu/ld=../bin/gld -s none /opt/csw/gnu/ln=../bin/gln -s none /opt/csw/gnu/locate=../bin/glocate -s none /opt/csw/gnu/logname=../bin/glogname -s none /opt/csw/gnu/ls=../bin/gls -s none /opt/csw/gnu/m4=../bin/gm4 -s none /opt/csw/gnu/make=../bin/gmake -s none /opt/csw/gnu/md5sum=../bin/gmd5sum -s none /opt/csw/gnu/mkdir=../bin/gmkdir -s none /opt/csw/gnu/mkfifo=../bin/gmkfifo -s none /opt/csw/gnu/mknod=../bin/gmknod -s none /opt/csw/gnu/msgattrib=../bin/gmsgattrib -s none /opt/csw/gnu/msgcat=../bin/gmsgcat -s none /opt/csw/gnu/msgcmp=../bin/gmsgcmp -s none /opt/csw/gnu/msgcomm=../bin/gmsgcomm -s none /opt/csw/gnu/msgconv=../bin/gmsgconv -s none /opt/csw/gnu/msgen=../bin/gmsgen -s none /opt/csw/gnu/msgexec=../bin/gmsgexec -s none /opt/csw/gnu/msgfilter=../bin/gmsgfilter -s none /opt/csw/gnu/msgfmt=../bin/gmsgfmt -s none /opt/csw/gnu/msggrep=../bin/gmsggrep -s none /opt/csw/gnu/msginit=../bin/gmsginit -s none /opt/csw/gnu/msgmerge=../bin/gmsgmerge -s none /opt/csw/gnu/msgunfmt=../bin/gmsgunfmt -s none /opt/csw/gnu/msguniq=../bin/gmsguniq -s none /opt/csw/gnu/mv=../bin/gmv -s none /opt/csw/gnu/ngettext=../bin/gngettext -s none /opt/csw/gnu/nice=../bin/gnice -s none /opt/csw/gnu/nl=../bin/gnl -s none /opt/csw/gnu/nm=../bin/gnm -s none /opt/csw/gnu/nohup=../bin/gnohup -s none /opt/csw/gnu/objcopy=../bin/gobjcopy -s none /opt/csw/gnu/objdump=../bin/gobjdump -s none /opt/csw/gnu/od=../bin/god -s none /opt/csw/gnu/oldfind=../bin/goldfind -s none /opt/csw/gnu/paste=../bin/gpaste -s none /opt/csw/gnu/patch=../bin/gpatch -s none /opt/csw/gnu/pathchk=../bin/gpathchk -s none /opt/csw/gnu/pinky=../bin/gpinky -s none /opt/csw/gnu/pr=../bin/gpr -s none /opt/csw/gnu/printenv=../bin/gprintenv -s none /opt/csw/gnu/printf=../bin/gprintf -s none /opt/csw/gnu/ptx=../bin/gptx -s none /opt/csw/gnu/pwd=../bin/gpwd -s none /opt/csw/gnu/ranlib=../bin/granlib -s none /opt/csw/gnu/readelf=../bin/greadelf -s none /opt/csw/gnu/recode-sr-latin=../bin/grecode-sr-latin -s none /opt/csw/gnu/rm=../bin/grm -s none /opt/csw/gnu/rmdir=../bin/grmdir -s none /opt/csw/gnu/sdiff=../bin/gsdiff -s none /opt/csw/gnu/sed=../bin/gsed -s none /opt/csw/gnu/seq=../bin/gseq -s none /opt/csw/gnu/sha1sum=../bin/gsha1sum -s none /opt/csw/gnu/shred=../bin/gshred -s none /opt/csw/gnu/size=../bin/gsize -s none /opt/csw/gnu/sleep=../bin/gsleep -s none /opt/csw/gnu/sort=../bin/gsort -s none /opt/csw/gnu/split=../bin/gsplit -s none /opt/csw/gnu/strings=../bin/gstrings -s none /opt/csw/gnu/strip=../bin/gstrip -s none /opt/csw/gnu/stty=../bin/gstty -s none /opt/csw/gnu/su=../bin/gsu -s none /opt/csw/gnu/sum=../bin/gsum -s none /opt/csw/gnu/sync=../bin/gsync -s none /opt/csw/gnu/tac=../bin/gtac -s none /opt/csw/gnu/tail=../bin/gtail -s none /opt/csw/gnu/tar=../bin/gtar -s none /opt/csw/gnu/tee=../bin/gtee -s none /opt/csw/gnu/test=../bin/gtest -s none /opt/csw/gnu/touch=../bin/gtouch -s none /opt/csw/gnu/tr=../bin/gtr -s none /opt/csw/gnu/true=../bin/gtrue -s none /opt/csw/gnu/tsort=../bin/gtsort -s none /opt/csw/gnu/tty=../bin/gtty -s none /opt/csw/gnu/uname=../bin/guname -s none /opt/csw/gnu/unexpand=../bin/gunexpand -s none /opt/csw/gnu/uniq=../bin/guniq -s none /opt/csw/gnu/updatedb=../bin/gupdatedb -s none /opt/csw/gnu/uptime=../bin/guptime -s none /opt/csw/gnu/users=../bin/gusers -s none /opt/csw/gnu/vdir=../bin/gvdir -s none /opt/csw/gnu/wc=../bin/gwc -s none /opt/csw/gnu/who=../bin/gwho -s none /opt/csw/gnu/whoami=../bin/gwhoami -s none /opt/csw/gnu/whois=../bin/gwhois -s none /opt/csw/gnu/xargs=../bin/gxargs -s none /opt/csw/gnu/xgettext=../bin/gxgettext -s none /opt/csw/gnu/yacc=../bin/gyacc -s none /opt/csw/gnu/yes=../bin/gyes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 26 03:22:19 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 26 Mar 2010 02:22:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9372] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9372 http://gar.svn.sourceforge.net/gar/?rev=9372&view=rev Author: bdwalton Date: 2010-03-26 02:22:19 +0000 (Fri, 26 Mar 2010) Log Message: ----------- ruby19: carve out a separat ri package Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-26 01:56:41 UTC (rev 9371) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-26 02:22:19 UTC (rev 9372) @@ -29,24 +29,30 @@ closures. endef -PACKAGES = CSWruby19 CSWruby19doc CSWruby19tk CSWruby19dev +PACKAGES = CSWruby19 CSWruby19doc CSWruby19ri CSWruby19tk CSWruby19dev ARCHALL_CSWruby19doc = 1 +ARCHALL_CSWruby19ri = 1 RUNTIME_DEP_PKGS_CSWruby19 = CSWgdbm CSWiconv CSWncurses CSWosslrt RUNTIME_DEP_PKGS_CSWruby19 += CSWreadline CSWzlib RUNTIME_DEP_PKGS_CSWruby19doc = CSWruby19 RUNTIME_DEP_PKGS_CSWruby19tk = CSWruby19 CSWtk CSWtcl RUNTIME_DEP_PKGS_CSWruby19dev = CSWruby19 +RUNTIME_DEP_PKGS_CSWruby19ri = CSWruby19 SPKG_DESC_CSWruby19doc = Documentation for Ruby 1.9 +SPKG_DESC_CSWruby19ri = Ruby 1.9 Interactive Reference + SPKG_DESC_CSWruby19tk = Ruby 1.9 Tcl/TK Extension SPKG_DESC_CSWruby19dev = Ruby 1.9 Extension Development Files -PKGFILES_CSWruby19doc = $(datadir)/ri/.* $(docdir)/ruby19/sample.* +PKGFILES_CSWruby19doc = $(docdir)/ruby19/sample.* +PKGFILES_CSWruby19ri = $(sharedir)/ri19.* $(bindir)/ri19 + PKGFILES_CSWruby19tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb PKGFILES_CSWruby19dev = $(includedir)/.*\.h $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 26 03:42:07 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 26 Mar 2010 02:42:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[9373] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 9373 http://gar.svn.sourceforge.net/gar/?rev=9373&view=rev Author: bdwalton Date: 2010-03-26 02:42:06 +0000 (Fri, 26 Mar 2010) Log Message: ----------- gnulinks: bump version since ggrep is no longer included Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2010-03-26 02:22:19 UTC (rev 9372) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2010-03-26 02:42:06 UTC (rev 9373) @@ -1,5 +1,5 @@ GARNAME = gnulinks -GARVERSION = 1.2 +GARVERSION = 1.3 CATEGORIES = xtra VENDOR_URL = http://opencsw.org This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Mar 26 03:55:08 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 26 Mar 2010 02:55:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9374] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 9374 http://gar.svn.sourceforge.net/gar/?rev=9374&view=rev Author: bdwalton Date: 2010-03-26 02:55:08 +0000 (Fri, 26 Mar 2010) Log Message: ----------- ruby: link against our x11 Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2010-03-26 02:42:06 UTC (rev 9373) +++ csw/mgar/pkg/ruby/trunk/Makefile 2010-03-26 02:55:08 UTC (rev 9374) @@ -99,6 +99,9 @@ COMPILE_ELISP = 1 +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib + ifdef USEGCC GARCOMPILER = GNU RUNTIME_DEP_PKGS_CSWruby += CSWgcc4corert 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 Mar 26 08:50:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Mar 2010 07:50:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9375] csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile Message-ID: Revision: 9375 http://gar.svn.sourceforge.net/gar/?rev=9375&view=rev Author: dmichelsen Date: 2010-03-26 07:50:21 +0000 (Fri, 26 Mar 2010) Log Message: ----------- cpan/XML-Parser: Make description start uppercase Modified Paths: -------------- csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile Modified: csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile 2010-03-26 02:55:08 UTC (rev 9374) +++ csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile 2010-03-26 07:50:21 UTC (rev 9375) @@ -3,7 +3,7 @@ CATEGORIES = cpan AUTHOR = MSERGEANT -DESCRIPTION = a module for parsing XML documents +DESCRIPTION = A module for parsing XML documents define BLURB This module provides ways to parse XML documents. It is built on top of XML::Parser::Expat, which is a lower level interface to James Clarks expat 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 Mar 26 09:03:34 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Mar 2010 08:03:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[9376] csw/mgar/pkg/libao/trunk Message-ID: Revision: 9376 http://gar.svn.sourceforge.net/gar/?rev=9376&view=rev Author: dmichelsen Date: 2010-03-26 08:03:34 +0000 (Fri, 26 Mar 2010) Log Message: ----------- libao: Update to 1.0.0 Modified Paths: -------------- csw/mgar/pkg/libao/trunk/Makefile csw/mgar/pkg/libao/trunk/checksums Modified: csw/mgar/pkg/libao/trunk/Makefile =================================================================== --- csw/mgar/pkg/libao/trunk/Makefile 2010-03-26 07:50:21 UTC (rev 9375) +++ csw/mgar/pkg/libao/trunk/Makefile 2010-03-26 08:03:34 UTC (rev 9376) @@ -1,5 +1,5 @@ GARNAME = libao -GARVERSION = 0.8.8 +GARVERSION = 1.0.0 CATEGORIES = lib DESCRIPTION = Cross-platform audio library Modified: csw/mgar/pkg/libao/trunk/checksums =================================================================== --- csw/mgar/pkg/libao/trunk/checksums 2010-03-26 07:50:21 UTC (rev 9375) +++ csw/mgar/pkg/libao/trunk/checksums 2010-03-26 08:03:34 UTC (rev 9376) @@ -1 +1 @@ -b92cba3cbcf1ee9bc221118a85d23dcd download/libao-0.8.8.tar.gz +08283fbe1f587619053a156254afecec libao-1.0.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 Mar 26 09:08:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Mar 2010 08:08:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[9377] csw/mgar/pkg/libao/trunk/Makefile Message-ID: Revision: 9377 http://gar.svn.sourceforge.net/gar/?rev=9377&view=rev Author: dmichelsen Date: 2010-03-26 08:08:07 +0000 (Fri, 26 Mar 2010) Log Message: ----------- libao: Remove unnecessary dependency CSWaudiofile Modified Paths: -------------- csw/mgar/pkg/libao/trunk/Makefile Modified: csw/mgar/pkg/libao/trunk/Makefile =================================================================== --- csw/mgar/pkg/libao/trunk/Makefile 2010-03-26 08:03:34 UTC (rev 9376) +++ csw/mgar/pkg/libao/trunk/Makefile 2010-03-26 08:08:07 UTC (rev 9377) @@ -14,7 +14,7 @@ SPKG_SOURCEURL = http://www.xiph.org/ao/ -RUNTIME_DEP_PKGS = CSWaudiofile CSWesound +DEP_PKGS = CSWesound # 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 wahwah at users.sourceforge.net Fri Mar 26 09:42:10 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 26 Mar 2010 08:42:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9379] csw/mgar/gar/v2/lib Message-ID: Revision: 9379 http://gar.svn.sourceforge.net/gar/?rev=9379&view=rev Author: wahwah Date: 2010-03-26 08:42:10 +0000 (Fri, 26 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, check symbols for Perl modules. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/package_checks.py Removed Paths: ------------- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py Deleted: csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py =================================================================== --- csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py 2010-03-26 08:42:03 UTC (rev 9378) +++ csw/mgar/gar/v2/lib/checkpkg.d/checkpkg-missing-symbols.py 2010-03-26 08:42:10 UTC (rev 9379) @@ -1,47 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""Check for missing symbols in binaries. - -http://sourceforge.net/tracker/?func=detail&aid=2939416&group_id=229205&atid=1075770 -""" - -import os.path -import re -import sys -import subprocess - -CHECKPKG_MODULE_NAME = "missing symbols" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import package_checks_old - -# Defining checking functions. - -def main(): - options, args = checkpkg.GetOptions() - md5sums = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - # Registering functions defined above. - check_manager.RegisterSetCheck(package_checks_old.CheckForMissingSymbols) - # Running the checks, reporting and exiting. - exit_code, screen_report, tags_report = check_manager.Run() - f = open(options.output, "w") - f.write(tags_report) - f.close() - print screen_report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-26 08:42:03 UTC (rev 9378) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-26 08:42:10 UTC (rev 9379) @@ -24,7 +24,7 @@ import package_checks DB_SCHEMA_VERSION = 2L -PACKAGE_STATS_VERSION = 4L +PACKAGE_STATS_VERSION = 5L SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") NEEDED_SONAMES = "needed sonames" @@ -952,7 +952,7 @@ # "defined_symbols", "depends", "isalist", - # "ldd_dash_r", + "ldd_dash_r", "overrides", "pkgchk", "pkginfo", @@ -1193,9 +1193,10 @@ self.DumpObject(self.GetPkgchkData(), "pkgchk") self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo") self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap") + # To be used with Perl modules + self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") # This check is currently disabled, let's save time by not collecting # these data. - # self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") # self.DumpObject(self.GetDefinedSymbols(), "defined_symbols") self.DumpObject(dir_pkg.GetFilesContaining(BAD_CONTENT_REGEXES), "bad_paths") logging.debug("Statistics of %s have been collected.", repr(dir_pkg.pkgname)) Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-26 08:42:03 UTC (rev 9378) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-26 08:42:10 UTC (rev 9379) @@ -57,6 +57,8 @@ r'/opt/csw/lib/$$ISALIST', r'/opt/csw/lib/SALIST', ] +# Check ldd -r only for Perl modules +SYMBOLS_CHECK_ONLY_FOR = r"^CSWpm.*$" def CatalognameLowercase(pkg_data, error_mgr, logger): @@ -534,3 +536,60 @@ error_mgr.ReportError("bad-rpath-entry", "%s %s" % (binary_info["path"], actual_rpath)) + +def DisabledCheckForMissingSymbols(pkgs_data, debug): + """Analyzes missing symbols reported by ldd -r. + + 1. Collect triplets: pkgname, binary, missing symbol + 2. If there are any missing symbols, collect all the symbols that are provided + by the set of packages. + 3. From the list of missing symbols, remove all symbols that are provided + by the set of packages. + 4. Report any remaining symbols as errors. + + What indexes do we need? + + symbol -> (pkgname, binary) + set(allsymbols) + """ + errors = [] + missing_symbols = [] + all_symbols = set() + for pkg_data in pkgs_data: + pkgname = pkg_data["basic_stats"]["pkgname"] + binaries = pkg_data["binaries"] + for binary in binaries: + for ldd_elem in pkg_data["ldd_dash_r"][binary]: + if ldd_elem["state"] == "symbol-not-found": + missing_symbols.append((pkgname, + binary, + ldd_elem["symbol"])) + for symbol in pkg_data["defined_symbols"][binary]: + all_symbols.add(symbol) + # Remove symbols defined elsewhere. + while missing_symbols: + ms_pkgname, ms_binary, ms_symbol = missing_symbols.pop() + if ms_symbol not in all_symbols: + errors.append(checkpkg.CheckpkgTag( + ms_pkgname, "symbol-not-found", "%s %s" % (ms_binary, ms_symbol))) + return errors + + +def CheckForMissingSymbolsDumb(pkg_data, error_mgr, logger): + """Analyzes missing symbols reported by ldd -r. + + Only makes sense for perl modules. + """ + pkgname = pkg_data["basic_stats"]["pkgname"] + if not re.match(SYMBOLS_CHECK_ONLY_FOR, pkgname): + return + found = False + for binary_info in pkg_data["binaries_dump_info"]: + for ldd_elem in pkg_data["ldd_dash_r"][binary_info["path"]]: + if ldd_elem["state"] == "symbol-not-found": + error_mgr.ReportError("symbol-not-found", + "e.g. %s misses %s" % (binary_info["path"], ldd_elem["symbol"])) + found = True + break + if found: + break 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 Mar 26 09:42:04 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Mar 2010 08:42:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[9378] csw/mgar/gar/v2/categories/cpan/category.mk Message-ID: Revision: 9378 http://gar.svn.sourceforge.net/gar/?rev=9378&view=rev Author: dmichelsen Date: 2010-03-26 08:42:03 +0000 (Fri, 26 Mar 2010) Log Message: ----------- mGAR v2: Take out unused stuff from cpan category Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2010-03-26 08:08:07 UTC (rev 9377) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2010-03-26 08:42:03 UTC (rev 9378) @@ -38,24 +38,6 @@ include gar/gar.mk -# Canned commands for finding packlist files -find_packlist = $(shell find $(1) -type f -name .packlist | head -1) -find_newest_packlist = $(shell find $(1) -type f -name .packlist -cnewer $(TIMESTAMP)) - -# Fix package packlist for installation -PERL_PACKLIST ?= $(call find_newest_packlist $(DESTDIR)$(perlpackroot)) -pre-package: - @if test -n "$(PERL_PACKLIST)" && test -f "$(PERL_PACKLIST)" ; then \ - echo " ==> Fixing Perl Packlist: $(PERL_PACKLIST)" ; \ - gsed -i -e s,$(DESTDIR),,g $(PERL_PACKLIST) ; \ - fi - @$(MAKECOOKIE) - -# Enable scripts to see prereqs -PERL5LIB = $(DESTDIR)$(libdir)/perl/csw -PERL5LIB := $(PERL5LIB):$(DESTDIR)$(datadir)/perl/csw -export PERL5LIB - CONFIGURE_ENV += PERL5LIB=$(PERL5LIB) BUILD_ENV += PERL5LIB=$(PERL5LIB) TEST_ENV += PERL5LIB=$(PERL5LIB) 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 Mar 26 13:38:20 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Mar 2010 12:38:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9380] csw/mgar/pkg/libogg/trunk Message-ID: Revision: 9380 http://gar.svn.sourceforge.net/gar/?rev=9380&view=rev Author: dmichelsen Date: 2010-03-26 12:38:20 +0000 (Fri, 26 Mar 2010) Log Message: ----------- libogg: Update to 1.2.0 Modified Paths: -------------- csw/mgar/pkg/libogg/trunk/Makefile csw/mgar/pkg/libogg/trunk/checksums Modified: csw/mgar/pkg/libogg/trunk/Makefile =================================================================== --- csw/mgar/pkg/libogg/trunk/Makefile 2010-03-26 08:42:10 UTC (rev 9379) +++ csw/mgar/pkg/libogg/trunk/Makefile 2010-03-26 12:38:20 UTC (rev 9380) @@ -1,5 +1,5 @@ GARNAME = libogg -GARVERSION = 1.1.4 +GARVERSION = 1.2.0 CATEGORIES = lib DESCRIPTION = Ogg bitstream format support library Modified: csw/mgar/pkg/libogg/trunk/checksums =================================================================== --- csw/mgar/pkg/libogg/trunk/checksums 2010-03-26 08:42:10 UTC (rev 9379) +++ csw/mgar/pkg/libogg/trunk/checksums 2010-03-26 12:38:20 UTC (rev 9380) @@ -1 +1 @@ -10200ec22543841d9d1c23e0aed4e5e9 download/libogg-1.1.4.tar.gz +c95b73759acfc30712beef6ce4e88efa libogg-1.2.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 Mar 26 14:02:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Mar 2010 13:02:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[9381] csw/mgar/pkg/libvorbis/trunk Message-ID: Revision: 9381 http://gar.svn.sourceforge.net/gar/?rev=9381&view=rev Author: dmichelsen Date: 2010-03-26 13:02:08 +0000 (Fri, 26 Mar 2010) Log Message: ----------- libvorbis: Update to 1.3.1 Modified Paths: -------------- csw/mgar/pkg/libvorbis/trunk/Makefile csw/mgar/pkg/libvorbis/trunk/checksums Modified: csw/mgar/pkg/libvorbis/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvorbis/trunk/Makefile 2010-03-26 12:38:20 UTC (rev 9380) +++ csw/mgar/pkg/libvorbis/trunk/Makefile 2010-03-26 13:02:08 UTC (rev 9381) @@ -1,5 +1,5 @@ GARNAME = libvorbis -GARVERSION = 1.2.3 +GARVERSION = 1.3.1 CATEGORIES = lib DESCRIPTION = Vorbis codec library. @@ -23,7 +23,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -EXTRA_LD_FLAGS = -L$(libdir) -lsunmath +EXTRA_LD_FLAGS = -L$(libdir) -lsunmath -lm CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libvorbis/trunk/checksums =================================================================== --- csw/mgar/pkg/libvorbis/trunk/checksums 2010-03-26 12:38:20 UTC (rev 9380) +++ csw/mgar/pkg/libvorbis/trunk/checksums 2010-03-26 13:02:08 UTC (rev 9381) @@ -1 +1 @@ -5aa77f55c0e0aab8eb8ed982335daac8 download/libvorbis-1.2.3.tar.gz +016e523fac70bdd786258a9d15fd36e9 libvorbis-1.3.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 Fri Mar 26 14:09:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Mar 2010 13:09:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9382] csw/mgar/gar/v2 Message-ID: Revision: 9382 http://gar.svn.sourceforge.net/gar/?rev=9382&view=rev Author: dmichelsen Date: 2010-03-26 13:09:58 +0000 (Fri, 26 Mar 2010) Log Message: ----------- mGAR v2: Add Perl module name to package description and add PERL_MODULE_NAME to pkginfo Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2010-03-26 13:02:08 UTC (rev 9381) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2010-03-26 13:09:58 UTC (rev 9382) @@ -31,6 +31,9 @@ UFILES_REGEX ?= $(GARNAME)-(\d+(?:\.\d+)*).tar.gz USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL) +_CATEGORY_SPKG_DESC = $(GARNAME): $(SPKG_DESC) +_CATEGORY_PKGINFO = echo "PERL_MODULE_NAME=$(GARNAME)"; + SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME) _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-03-26 13:02:08 UTC (rev 9381) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-03-26 13:09:58 UTC (rev 9382) @@ -537,7 +537,7 @@ endef define pkgvar -$(strip $(if $($(1)_$(2)),$($(1)_$(2)),$($(1)))) +$(strip $(or $(_CATEGORY_$(1)_$(2)),$(_CATEGORY_$(1)),$($(1)_$(2)),$($(1)))) endef # Make sure every producable package contains specific descriptions. @@ -569,6 +569,7 @@ echo "OPENCSW_CATALOGNAME=$(call catalogname,$*)"; \ echo "OPENCSW_MODE64=$(call mode64,$*)"; \ echo "OPENCSW_REPOSITORY=$(call _URL)@$(call _REVISION)"; \ + $(_CATEGORY_PKGINFO) \ ) >$@ 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 Mar 26 16:58:10 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Mar 2010 15:58:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9383] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 9383 http://gar.svn.sourceforge.net/gar/?rev=9383&view=rev Author: dmichelsen Date: 2010-03-26 15:58:10 +0000 (Fri, 26 Mar 2010) Log Message: ----------- mGAR v2: Update norunpath flags Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-03-26 13:09:58 UTC (rev 9382) +++ csw/mgar/gar/v2/gar.conf.mk 2010-03-26 15:58:10 UTC (rev 9383) @@ -468,13 +468,13 @@ GCC3_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) GCC4_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) SOS11_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) - SOS12_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) + SOS12_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath SOS12U1_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath GCC3_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) GCC4_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) - SOS11_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -xnorunpath - SOS12_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -xnorunpath -SOS12U1_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -xnorunpath + SOS11_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -norunpath + SOS12_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -norunpath +SOS12U1_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -norunpath GCC3_AS_FLAGS ?= $(EXTRA_GCC3_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) GCC4_AS_FLAGS ?= $(EXTRA_GCC4_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) SOS11_AS_FLAGS ?= $(EXTRA_SOS11_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) 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 Mar 26 17:11:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 26 Mar 2010 16:11:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[9384] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 9384 http://gar.svn.sourceforge.net/gar/?rev=9384&view=rev Author: dmichelsen Date: 2010-03-26 16:11:33 +0000 (Fri, 26 Mar 2010) Log Message: ----------- mGAR v2: Add norunpath for SOS11. It is only in cc -flags, not the manpage Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-03-26 15:58:10 UTC (rev 9383) +++ csw/mgar/gar/v2/gar.conf.mk 2010-03-26 16:11:33 UTC (rev 9384) @@ -467,7 +467,7 @@ GCC3_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) GCC4_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) - SOS11_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) + SOS11_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath SOS12_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath SOS12U1_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath GCC3_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 26 17:14:27 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 26 Mar 2010 16:14:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[9385] csw/mgar/pkg/python/branches Message-ID: Revision: 9385 http://gar.svn.sourceforge.net/gar/?rev=9385&view=rev Author: wahwah Date: 2010-03-26 16:14:27 +0000 (Fri, 26 Mar 2010) Log Message: ----------- python: Upgrade to 2.6.5, using CSW X11, using the right Berkeley DB library path (/opt/csw/bdb47/lib instead of the legacy link /opt/csw/lib) Modified Paths: -------------- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile csw/mgar/pkg/python/branches/python-2.6.4+patch7242/checksums Property Changed: ---------------- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile Modified: csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile =================================================================== --- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile 2010-03-26 16:11:33 UTC (rev 9384) +++ csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile 2010-03-26 16:14:27 UTC (rev 9385) @@ -1,5 +1,7 @@ +# $Id$ + GARNAME = Python -GARVERSION = 2.6.4 +GARVERSION = 2.6.5 CATEGORIES = lang # Known issues: @@ -42,16 +44,16 @@ PATCHFILES += site.diff PATCHFILES += python-config-in.diff PATCHFILES += setup.diff -PATCHFILES += getpass.patch -# Fix for Python bug 7242: Forking in a thread raises RuntimeError -# http://bugs.python.org/issue7242 -# This shows up in failing tests on Mercurial -PATCHFILES += patch_2.diff.txt - # Test for sunaudiodev fails. SKIPTEST = 1 +EXTRA_INC += $(prefix)/X11/include +EXTRA_LIB += $(prefix)/X11/lib +EXTRA_LIB += $(prefix)/bdb47/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS @@ -74,7 +76,6 @@ PACKAGES = CSWidle PACKAGES += CSWpython PACKAGES += CSWpython-devel -PACKAGES += CSWpython-rt PACKAGES += CSWpython-test PACKAGES += CSWpython-tk @@ -88,7 +89,6 @@ # No idea why would this be in CSWpython, and no good idea for a better package # to put it. PKGFILES_CSWpython-devel += $(bindir)/smtpd.py -PKGFILES_CSWpython-rt = non-existing PKGFILES_CSWpython-tk = $(libdir)/.*/lib-tk/.* PKGFILES_CSWpython-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* PKGFILES_CSWpython-test = $(libdir)/python/test/.* @@ -100,46 +100,49 @@ PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.* PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.* -ARCHALL_CSWpython-rt = 1 ARCHALL_CSWpython-test = 1 ARCHALL_CSWidle = 1 -RUNTIME_DEP_PKGS_CSWidle = CSWpython CSWpython-tk -RUNTIME_DEP_PKGS_CSWpython = CSWbdb47 CSWbzip2 CSWgdbm CSWggettextrt -RUNTIME_DEP_PKGS_CSWpython += CSWncurses CSWosslrt CSWreadline -RUNTIME_DEP_PKGS_CSWpython += CSWsqlite3rt CSWzlib -RUNTIME_DEP_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk -RUNTIME_DEP_PKGS_CSWpython-devel = CSWpython -RUNTIME_DEP_PKGS_CSWpython-test = CSWpython -RUNTIME_DEP_PKGS_CSWpython-rt = CSWpython +RUNTIME_DEP_PKGS_CSWidle = CSWpython CSWpython-tk +RUNTIME_DEP_PKGS_CSWpython += CSWbdb47 +RUNTIME_DEP_PKGS_CSWpython += CSWbzip2 +RUNTIME_DEP_PKGS_CSWpython += CSWgdbm +RUNTIME_DEP_PKGS_CSWpython += CSWggettextrt +RUNTIME_DEP_PKGS_CSWpython += CSWncurses +RUNTIME_DEP_PKGS_CSWpython += CSWosslrt +RUNTIME_DEP_PKGS_CSWpython += CSWreadline +RUNTIME_DEP_PKGS_CSWpython += CSWsqlite3rt CSWzlib +RUNTIME_DEP_PKGS_CSWpython-tk += CSWpython +RUNTIME_DEP_PKGS_CSWpython-tk += CSWtcl +RUNTIME_DEP_PKGS_CSWpython-tk += CSWtk +RUNTIME_DEP_PKGS_CSWpython-tk += CSWlibx11 +RUNTIME_DEP_PKGS_CSWpython-devel = CSWpython +RUNTIME_DEP_PKGS_CSWpython-test += CSWpython -CATALOGNAME_CSWidle = idle -CATALOGNAME_CSWpython = python +CATALOGNAME_CSWidle = idle +CATALOGNAME_CSWpython = python CATALOGNAME_CSWpython-devel = python_devel -CATALOGNAME_CSWpython-rt = python_rt -CATALOGNAME_CSWpython-tk = python_tk -CATALOGNAME_CSWpython-test = python_test +CATALOGNAME_CSWpython-tk = python_tk +CATALOGNAME_CSWpython-test = python_test -SPKG_DESC_CSWidle = Python IDE -SPKG_DESC_CSWpython = A high-level scripting language. +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 = An empty, obsolete package -SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) -SPKG_DESC_CSWpython-test = Python Test modules +SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) +SPKG_DESC_CSWpython-test = Python Test modules LICENSE = LICENSE -# Checkpkg should be able to guess that, perhaps symlink information is -# missing? -CHECKPKG_OVERRIDES_CSWpython += missing-dependency|CSWbdb -CHECKPKG_OVERRIDES_CSWpython += symbol-not-found|_curses_panel.so -CHECKPKG_OVERRIDES_CSWpython += symbol-not-found|_cursesmodule.so -CHECKPKG_OVERRIDES_CSWpython += symbol-not-found|xxsubtype.so -CHECKPKG_OVERRIDES_CSWpython-devel = symbol-not-found|python.o +# Need to adjust the RPATH: +# CHECKPKG_OVERRIDES_CSWpython += missing-dependency|CSWbdb +# CHECKPKG_OVERRIDES_CSWpython += surplus-dependency|CSWbdb47 -# Dago: This override line doesn't make it to the override file. Can you look -# into it? -CHECKPKG_OVERRIDES_CSWpython-rt = action-class-only-in-pkginfo|cswpycompile +# These won't be fixed. +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/export/medusa|root/opt/csw/lib/libpython2.5.so.1.0 +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/opt/build|root/opt/csw/lib/libpython2.5.so.1.0 +# Amusingly, now the overrides file contains the bad data. +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/python +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/opt/build|root/opt/csw/share/checkpkg/overrides/python include gar/category.mk Property changes on: csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/python/branches/python-2.6.4+patch7242/checksums =================================================================== --- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/checksums 2010-03-26 16:11:33 UTC (rev 9384) +++ csw/mgar/pkg/python/branches/python-2.6.4+patch7242/checksums 2010-03-26 16:14:27 UTC (rev 9385) @@ -1,12 +1,10 @@ -fee5408634a54e721a93531aba37f8c1 Python-2.6.4.tar.bz2 +6bef0417e71a1a1737ccf5750420fdb3 Python-2.6.5.tar.bz2 42dd6523beb94a805d5764ae1276091c faqwiz.diff -88e213f865894051cdd8d3247502d612 getpass.patch 5664b3970307d7d39d8d4061e7dccbb0 libpython2.5.so.1.0-isa-i386 a87896c48b2f61b32053e6d02b07b022 libpython2.5.so.1.0-isa-sparcv8 33f4094ee46ce865d3973a197f3fb4a0 makesetup.diff 22c5f741b1744213eaef0818ab280ad5 modules.diff afcc79a94e2f8a576c7906a9700e35a0 multiprocess.diff -851c64bcab0b4d91d2c14f7f63d53500 patch_2.diff.txt 05724da367b025ce525de2bb704af6e3 pyport.diff a1d114e8a20870675649aeef007a9cac python-config-in.diff 1d2763e140ff30a491b3ce11d1a44f97 setup.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 26 17:20:38 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 26 Mar 2010 16:20:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[9386] csw/mgar/pkg/python/trunk Message-ID: Revision: 9386 http://gar.svn.sourceforge.net/gar/?rev=9386&view=rev Author: wahwah Date: 2010-03-26 16:20:38 +0000 (Fri, 26 Mar 2010) Log Message: ----------- python: merging the branch to the trunk. Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile csw/mgar/pkg/python/trunk/checksums Added Paths: ----------- csw/mgar/pkg/python/trunk/files/patch_2.diff.txt Property Changed: ---------------- csw/mgar/pkg/python/trunk/ csw/mgar/pkg/python/trunk/Makefile Property changes on: csw/mgar/pkg/python/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/python/branches/python-2.6.4+patch7242:8407-9385 Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2010-03-26 16:14:27 UTC (rev 9385) +++ csw/mgar/pkg/python/trunk/Makefile 2010-03-26 16:20:38 UTC (rev 9386) @@ -1,5 +1,7 @@ +# $Id$ + GARNAME = Python -GARVERSION = 2.6.4 +GARVERSION = 2.6.5 CATEGORIES = lang # Known issues: @@ -9,7 +11,6 @@ # - http://forums.sun.com/thread.jspa?threadID=5148204 SPKG_SOURCEURL = http://python.org/download/releases/$(GARVERSION) -SPKG_CLASSES = none cswpycompile DESCRIPTION = A high-level scripting language. define BLURB @@ -43,31 +44,20 @@ PATCHFILES += site.diff PATCHFILES += python-config-in.diff PATCHFILES += setup.diff -PATCHFILES += getpass.patch # Test for sunaudiodev fails. SKIPTEST = 1 -DEPENDS += lib/expat -DEPENDS += lib/openssl -DEPENDS += lib/db -DEPENDS += lib/gdbm +EXTRA_INC += $(prefix)/X11/include +EXTRA_LIB += $(prefix)/X11/lib +EXTRA_LIB += $(prefix)/bdb47/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -ifeq ($(shell uname -p), i386) - BASECFLAGS = -xO3 -xarch=386 -else - BASECFLAGS = -xO3 -xarch=v8 -endif +BASECFLAGS = $(CFLAGS) +EXTRA_COMMON_EXPORTS = BASECFLAGS -COMPILER_EXPORTS += BASECFLAGS - -ifneq ($(shell uname -r), 5.8) - GARCOMPILER = SOS12 -endif - NOISALIST = 1 -LD_OPTIONS = -R/opt/csw/lib -export LD_OPTIONS CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --enable-ipv6 @@ -76,8 +66,9 @@ 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' +# This doesn't work here, as _PYCOMPILE_FILES is not the directory Python uses. +# PYCOMPILE = 1 EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc # use prototype filters to set the class PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' @@ -85,7 +76,6 @@ PACKAGES = CSWidle PACKAGES += CSWpython PACKAGES += CSWpython-devel -PACKAGES += CSWpython-rt PACKAGES += CSWpython-test PACKAGES += CSWpython-tk @@ -99,7 +89,6 @@ # No idea why would this be in CSWpython, and no good idea for a better package # to put it. PKGFILES_CSWpython-devel += $(bindir)/smtpd.py -PKGFILES_CSWpython-rt = non-existing PKGFILES_CSWpython-tk = $(libdir)/.*/lib-tk/.* PKGFILES_CSWpython-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* PKGFILES_CSWpython-test = $(libdir)/python/test/.* @@ -111,31 +100,50 @@ PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.* PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.* -ARCHALL_CSWpython-rt = 1 +ARCHALL_CSWpython-test = 1 +ARCHALL_CSWidle = 1 -RUNTIME_DEP_PKGS_CSWidle = CSWpython CSWpython-tk -RUNTIME_DEP_PKGS_CSWpython = CSWbdb47 CSWbzip2 CSWgdbm CSWggettextrt -RUNTIME_DEP_PKGS_CSWpython += CSWncurses CSWosslrt CSWreadline -RUNTIME_DEP_PKGS_CSWpython += CSWsqlite3rt CSWzlib -RUNTIME_DEP_PKGS_CSWpython-tk = CSWpython CSWtcl CSWtk -RUNTIME_DEP_PKGS_CSWpython-devel = CSWpython -RUNTIME_DEP_PKGS_CSWpython-test = CSWpython -RUNTIME_DEP_PKGS_CSWpython-rt = CSWpython +RUNTIME_DEP_PKGS_CSWidle = CSWpython CSWpython-tk +RUNTIME_DEP_PKGS_CSWpython += CSWbdb47 +RUNTIME_DEP_PKGS_CSWpython += CSWbzip2 +RUNTIME_DEP_PKGS_CSWpython += CSWgdbm +RUNTIME_DEP_PKGS_CSWpython += CSWggettextrt +RUNTIME_DEP_PKGS_CSWpython += CSWncurses +RUNTIME_DEP_PKGS_CSWpython += CSWosslrt +RUNTIME_DEP_PKGS_CSWpython += CSWreadline +RUNTIME_DEP_PKGS_CSWpython += CSWsqlite3rt CSWzlib +RUNTIME_DEP_PKGS_CSWpython-tk += CSWpython +RUNTIME_DEP_PKGS_CSWpython-tk += CSWtcl +RUNTIME_DEP_PKGS_CSWpython-tk += CSWtk +RUNTIME_DEP_PKGS_CSWpython-tk += CSWlibx11 +RUNTIME_DEP_PKGS_CSWpython-devel = CSWpython +RUNTIME_DEP_PKGS_CSWpython-test += CSWpython -CATALOGNAME_CSWidle = idle -CATALOGNAME_CSWpython = python +CATALOGNAME_CSWidle = idle +CATALOGNAME_CSWpython = python CATALOGNAME_CSWpython-devel = python_devel -CATALOGNAME_CSWpython-rt = python_rt -CATALOGNAME_CSWpython-tk = python_tk -CATALOGNAME_CSWpython-test = python_test +CATALOGNAME_CSWpython-tk = python_tk +CATALOGNAME_CSWpython-test = python_test -SPKG_DESC_CSWidle = Python IDE -SPKG_DESC_CSWpython = A high-level scripting language. +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 = An empty, obsolete package -SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) -SPKG_DESC_CSWpython-test = Python Test modules +SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) +SPKG_DESC_CSWpython-test = Python Test modules +LICENSE = LICENSE + +# Need to adjust the RPATH: +# CHECKPKG_OVERRIDES_CSWpython += missing-dependency|CSWbdb +# CHECKPKG_OVERRIDES_CSWpython += surplus-dependency|CSWbdb47 + +# These won't be fixed. +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/export/medusa|root/opt/csw/lib/libpython2.5.so.1.0 +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/opt/build|root/opt/csw/lib/libpython2.5.so.1.0 +# Amusingly, now the overrides file contains the bad data. +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/python +CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/opt/build|root/opt/csw/share/checkpkg/overrides/python + include gar/category.mk post-install-modulated: install-deprecated-libs Property changes on: csw/mgar/pkg/python/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/python/trunk/checksums =================================================================== --- csw/mgar/pkg/python/trunk/checksums 2010-03-26 16:14:27 UTC (rev 9385) +++ csw/mgar/pkg/python/trunk/checksums 2010-03-26 16:20:38 UTC (rev 9386) @@ -1,6 +1,5 @@ -fee5408634a54e721a93531aba37f8c1 Python-2.6.4.tar.bz2 +6bef0417e71a1a1737ccf5750420fdb3 Python-2.6.5.tar.bz2 42dd6523beb94a805d5764ae1276091c faqwiz.diff -88e213f865894051cdd8d3247502d612 getpass.patch 5664b3970307d7d39d8d4061e7dccbb0 libpython2.5.so.1.0-isa-i386 a87896c48b2f61b32053e6d02b07b022 libpython2.5.so.1.0-isa-sparcv8 33f4094ee46ce865d3973a197f3fb4a0 makesetup.diff Copied: csw/mgar/pkg/python/trunk/files/patch_2.diff.txt (from rev 9385, csw/mgar/pkg/python/branches/python-2.6.4+patch7242/files/patch_2.diff.txt) =================================================================== --- csw/mgar/pkg/python/trunk/files/patch_2.diff.txt (rev 0) +++ csw/mgar/pkg/python/trunk/files/patch_2.diff.txt 2010-03-26 16:20:38 UTC (rev 9386) @@ -0,0 +1,63 @@ +diff -ur Python-2.6.4/Modules/posixmodule.c Python-2.6.4.patched/Modules/posixmodule.c +--- Python-2.6.4/Modules/posixmodule.c 2009-09-16 16:06:36.000000000 -0400 ++++ Python-2.6.4.patched/Modules/posixmodule.c 2010-01-22 10:00:18.000000000 -0500 +@@ -3634,11 +3634,12 @@ + int result; + _PyImport_AcquireLock(); + pid = fork1(); ++ if (pid == 0) ++ PyOS_AfterFork(); ++ + result = _PyImport_ReleaseLock(); + if (pid == -1) + return posix_error(); +- if (pid == 0) +- PyOS_AfterFork(); + if (result < 0) { + /* Don't clobber the OSError if the fork failed. */ + PyErr_SetString(PyExc_RuntimeError, +@@ -3663,11 +3664,12 @@ + int result; + _PyImport_AcquireLock(); + pid = fork(); ++ if (pid == 0) ++ PyOS_AfterFork(); ++ + result = _PyImport_ReleaseLock(); + if (pid == -1) + return posix_error(); +- if (pid == 0) +- PyOS_AfterFork(); + if (result < 0) { + /* Don't clobber the OSError if the fork failed. */ + PyErr_SetString(PyExc_RuntimeError, +@@ -3781,11 +3783,12 @@ + + _PyImport_AcquireLock(); + pid = forkpty(&master_fd, NULL, NULL, NULL); ++ if (pid == 0) ++ PyOS_AfterFork(); ++ + result = _PyImport_ReleaseLock(); + if (pid == -1) + return posix_error(); +- if (pid == 0) +- PyOS_AfterFork(); + if (result < 0) { + /* Don't clobber the OSError if the fork failed. */ + PyErr_SetString(PyExc_RuntimeError, +diff -ur Python-2.6.4/Python/import.c Python-2.6.4.patched/Python/import.c +--- Python-2.6.4/Python/import.c 2009-09-16 16:06:36.000000000 -0400 ++++ Python-2.6.4.patched/Python/import.c 2010-01-26 07:03:14.000000000 -0500 +@@ -303,10 +303,9 @@ + void + _PyImport_ReInitLock(void) + { +-#ifdef _AIX + if (import_lock != NULL) + import_lock = PyThread_allocate_lock(); +-#endif ++ import_lock_thread = PyThread_get_thread_ident(); + } + + #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 26 21:27:19 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 26 Mar 2010 20:27:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9387] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9387 http://gar.svn.sourceforge.net/gar/?rev=9387&view=rev Author: wahwah Date: 2010-03-26 20:27:18 +0000 (Fri, 26 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, fixed a but causing set error tags to disappear. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/dependency_checks.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-26 16:20:38 UTC (rev 9386) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-26 20:27:18 UTC (rev 9387) @@ -657,7 +657,7 @@ if "package-set" not in errors: errors["package-set"] = [] errors["package-set"].append(error) - return a_dict + return errors def GetOptimizedAllStats(self, stats_obj_list): pkgs_data = [] @@ -798,23 +798,9 @@ if self.debug: logging_level = logging.DEBUG pkgmap = SystemPkgmap() - - # TODO: In order to process all the catalog, and load them all into the - # memory, we need to store them more efficiently. Currently, the process - # grows up to 9GB of RAM usage, and it doesn't end there. Some ideas how to - # use less RAM: - # - some values (tuples, lists) repeat, and there's no need to store - # all the copies. Instead, store references. (the Flyweight design - # pattern) - # - enclose data loading in a separate function, which will merge data - # from all the packages. - # - # In other words, the following line needs to be smart: - # pkgs_data = [x.GetAllStats() for x in stats_obj_list] logging.debug("Loading all package statistics.") pkgs_data = self.GetOptimizedAllStats(stats_obj_list) logging.debug("All package statistics loaded.") - # Individual checks for pkg_data in pkgs_data: pkgname = pkg_data["basic_stats"]["pkgname"] Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-03-26 16:20:38 UTC (rev 9386) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-03-26 20:27:18 UTC (rev 9387) @@ -30,12 +30,14 @@ BAD_COMBINATIONS = ( ("/opt/csw/lib", "libdb-4.7.so", "Deprecated Berkeley DB location"), ) + logger.debug("Checking deprecated library locations.") for bad_path, bad_soname, msg in BAD_COMBINATIONS: # print "resolved_path == bad_path", resolved_path, bad_path, resolved_path == bad_path # print "soname == bad_soname", soname, bad_soname, soname == bad_soname if resolved_path == bad_path and soname == bad_soname: logger.debug("Bad lib found: %s/%s", bad_path, bad_soname) error_mgr.ReportError( + pkgname, "deprecated-library", "%s %s %s/%s" % (binary_info["path"], msg, resolved_path, soname)) required_deps.append((req_pkg, reason)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Mar 26 21:41:42 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 26 Mar 2010 20:41:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[9388] csw/mgar/pkg/mplayer/trunk Message-ID: Revision: 9388 http://gar.svn.sourceforge.net/gar/?rev=9388&view=rev Author: wahwah Date: 2010-03-26 20:41:42 +0000 (Fri, 26 Mar 2010) Log Message: ----------- mplayer: Some work towards the update to GAR v2. Modified Paths: -------------- csw/mgar/pkg/mplayer/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/mplayer/trunk/files/CSWmplayer.depend csw/mgar/pkg/mplayer/trunk/files/CSWmplayer.gspec Property Changed: ---------------- csw/mgar/pkg/mplayer/trunk/ Property changes on: csw/mgar/pkg/mplayer/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/mplayer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mplayer/trunk/Makefile 2010-03-26 20:27:18 UTC (rev 9387) +++ csw/mgar/pkg/mplayer/trunk/Makefile 2010-03-26 20:41:42 UTC (rev 9388) @@ -1,3 +1,5 @@ +# $Id$ +# ##Mplayer and $ISAEXEC makefile example### # # This makefile has a lot of notes and extra information in it, as I've been @@ -6,39 +8,94 @@ GARNAME = MPlayer GARVERSION = 1.0rc2 -SPKG_REVSTAMP = ,REV=$(shell date '+%Y.%m.%d').rc2 +GARVERSION_Blue = 1.7 CATEGORIES = apps DESCRIPTION = MPlayer is a movie player which runs on many systems define BLURB -MPlayer is a movie player which runs on many systems (see the documentation). It plays most MPEG/VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, RealMedia, Matroska, NUT, NuppelVideo, FLI, YUV4MPEG, FILM, RoQ, PVA files, supported by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD, SVCD, DVD, 3ivx, DivX 3/4/5 and even WMV movies.. + + MPlayer is a movie player which runs on many systems (see the documentation). + It plays most MPEG/VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, + RealMedia, Matroska, NUT, NuppelVideo, FLI, YUV4MPEG, FILM, RoQ, PVA files, + supported by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD, + SVCD, DVD, 3ivx, DivX 3/4/5 and even WMV movies.. + endef MASTER_SITES = http://www3.mplayerhq.hu/MPlayer/releases/ http://www3.mplayerhq.hu/MPlayer/skins/ -GARCOMPILER = GNU +GARCOMPILER = GCC4 GNU_CC_HOME = /opt/csw/gcc4 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += Blue-1.7.tar.bz2 -DISTFILES += $(call admfiles,CSWmplayer,depend) +DISTFILES += Blue-$(GARVERSION_Blue).tar.bz2 -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +LICENSE = LICENSE -PATCHFILES = fix-configure.diff +PACKAGES = CSWmplayer +CATALOGNAME_CSWmplayer = mplayer + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib + +RUNTIME_DEP_PKGS_CSWmplayer += CSWaalib +RUNTIME_DEP_PKGS_CSWmplayer += CSWesound +RUNTIME_DEP_PKGS_CSWmplayer += CSWfaac +RUNTIME_DEP_PKGS_CSWmplayer += CSWfconfig +RUNTIME_DEP_PKGS_CSWmplayer += CSWftype2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWgiflibrt +RUNTIME_DEP_PKGS_CSWmplayer += CSWglib +RUNTIME_DEP_PKGS_CSWmplayer += CSWgtk +RUNTIME_DEP_PKGS_CSWmplayer += CSWiconv +RUNTIME_DEP_PKGS_CSWmplayer += CSWjpeg +RUNTIME_DEP_PKGS_CSWmplayer += CSWlame +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmad +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibogg +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibx11 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibxext +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibxt +RUNTIME_DEP_PKGS_CSWmplayer += CSWmesa +RUNTIME_DEP_PKGS_CSWmplayer += CSWnas +RUNTIME_DEP_PKGS_CSWmplayer += CSWncurses +RUNTIME_DEP_PKGS_CSWmplayer += CSWopenal +RUNTIME_DEP_PKGS_CSWmplayer += CSWpng +RUNTIME_DEP_PKGS_CSWmplayer += CSWspeex +RUNTIME_DEP_PKGS_CSWmplayer += CSWtheora +RUNTIME_DEP_PKGS_CSWmplayer += CSWzlib + +BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWmplayer) +BUILD_DEP_PKGS += CSWgnulinks + +PATCHFILES = fix-configure.diff PATCHFILES += fix-libavcodec-gcc-bug.diff PATCHFILES += fix-manpage-macros.diff PATCHFILES += sparc-v8-novis.diff #Sol8 only PATCHFILES += stdint-wrapper.diff -CONFIGURE_ARGS = --prefix=/opt/csw -CONFIGURE_ARGS += --with-extraincdir=/usr/X11/include -CONFIGURE_ARGS += --with-extraincdir=/usr/include +UNWANTED_CONF_ARGS = --sysconfdir=/opt/csw/etc --sbindir=/opt/csw/sbin --exec_prefix=/opt/csw --libexecdir=/opt/csw/libexec +UNWANTED_CONF_ARGS += --sharedstatedir=/opt/csw/share +UNWANTED_CONF_ARGS += --localstatedir=/opt/csw/var +UNWANTED_CONF_ARGS += --infodir=/opt/csw/share/info +UNWANTED_CONF_ARGS += --includedir=/opt/csw/include +UNWANTED_CONF_ARGS += --sbindir=/opt/csw/sbin/amd64 +UNWANTED_CONF_ARGS += --libexecdir=/opt/csw/libexec/amd64 + +CONFIGURE_ARGS = $(filter-out $(UNWANTED_CONF_ARGS),$(DIRPATHS)) +CONFIGURE_ARGS += --with-extraincdir=/opt/csw/X11/include CONFIGURE_ARGS += --mandir=$(BUILD_PREFIX)/share/man CONFIGURE_ARGS += --enable-gui CONFIGURE_ARGS += --disable-win32dll CONFIGURE_ARGS += --disable-libvorbis #Having trouble compiling it + +NO_MMX_ARGS += --disable-sse +NO_MMX_ARGS += --disable-sse2 +NO_MMX_ARGS += --disable-ssse3 +NO_MMX_ARGS += --disable-mmx +NO_MMX_ARGS += --disable-mmxext +CONFIGURE_ARGS_isa-i386 += $(NO_MMX_ARGS) +CONFIGURE_ARGS_isa-amd64 += $(NO_MMX_ARGS) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) #CONFIGURE_ARGS += --disable-libcdio #CONFIGURE_ARGS += --disable-iconv #Solaris libc has iconv already @@ -50,6 +107,11 @@ CONFIGURE_ARGS += --disable-gl endif +# Fails in amd64 +# BUILD64 = 1 + +TEST_SCRIPTS = + ###Framework for an $ISAEXEC optimised build### # To allow for the same build to run multiple times without each version # clobbering the non-unique work/cookie folders each time, we append the @@ -142,13 +204,13 @@ # In theory, I should be able to just use the first string in $ISATARGET. # Need to work out if Makefiles support this function. -ifeq ($(shell uname -p),i386) - ISATARGETS ?= pentium pentium-mmx pentium2 - BASEISA ?= pentium -else - ISATARGETS ?= v8 ultrasparc ultrasparc3 - BASEISA ?= v8 -endif +# ifeq ($(shell uname -p),i386) +# ISATARGETS ?= pentium pentium-mmx pentium2 +# BASEISA ?= pentium +# else +# ISATARGETS ?= v8 ultrasparc ultrasparc3 +# BASEISA ?= v8 +# endif # Mapping # Do Makefiles have a concept of a hash table for matching these? @@ -158,49 +220,53 @@ # pentium_pro+mmx=pentium2 # 64-bit is athlon=amd64 but I expect -m64 will be what we're after. -#If statement for gcc needed here! -pentium_dir = pentium -pentium-mmx_dir = pentium+mmx -pentium2_dir = pentium_pro+mmx +## #If statement for gcc needed here! +## pentium_dir = pentium +## pentium-mmx_dir = pentium+mmx +## pentium2_dir = pentium_pro+mmx +## +## #Sparc +## v8_dir = sparcv8 +## # ?? = sparcv8plus +## # ?? = sparcv8plus+vis +## ultrasparc_dir = sparcv9 +## ultrasparc3_dir = sparcv9+vis +## #v9_dir = sparcv9+vis2 -#Sparc -v8_dir = sparcv8 -# ?? = sparcv8plus -# ?? = sparcv8plus+vis -ultrasparc_dir = sparcv9 -ultrasparc3_dir = sparcv9+vis -#v9_dir = sparcv9+vis2 +# ISAEXEC_DIR = $($(ISA)_dir) -ISAEXEC_DIR = $($(ISA)_dir) - # If you just typed gmake, this will build the stardard BASEISA build. # For a single optimised build use gmake ISA=your-target-here. # For all optimised versions ($ISAEXEC), use gmake optbuild -ISA ?= $(BASEISA) +# ISA ?= $(BASEISA) #Which binaries do you want to use $ISAEXEC for? # Note: These must be the full paths! -ISAEXEC_BINS = opt/csw/bin/mplayer opt/csw/bin/mencoder +# ISAEXEC_BINS = opt/csw/bin/mplayer opt/csw/bin/mencoder # Inclue all standard GAR variables and functionality from here onward: include gar/category.mk # See earlier, we needed to set this VAR _after_ the category.mk include -BASE_DESTDIR :=$(DESTDIR)-$(BASEISA) -DESTDIR := $(DESTDIR)-$(ISA) +# BASE_DESTDIR :=$(DESTDIR)-$(BASEISA) +# DESTDIR := $(DESTDIR)-$(ISA) ####Mplayer specific optimisation notes#### # Mplayer uses -mtune, not -march -# Compiler options -ifeq ($(GARCH),i386) - CFLAGS = -O2 -pipe -mtune=$(ISA) -else # I.E sparc -CFLAGS = -O2 -pipe -mcpu=$(ISA) -endif +## # Compiler options +## ifeq ($(GARCH),i386) +## ifeq ($(ISA),amd64) +## CFLAGS = -O2 -pipe -mtune=opteron +## else +## CFLAGS = -O2 -pipe -mtune=$(ISA) +## endif +## else # I.E sparc +## CFLAGS = -O2 -pipe -mcpu=$(ISA) +## endif #CPPFLAGS = $(CFLAGS) #CXXFLAGS = $(CFLAGS) @@ -226,21 +292,21 @@ # to build a package at the end. Actually, no, I just define it manually... # I've created a full-package: target which runs $(FULL_PACKAGE). This will be the final step -PLAIN_PACKAGE := $(POST_INSTALL_TARGETS) -POST_INSTALL_TARGETS := strip fixconfig +# PLAIN_PACKAGE := $(POST_INSTALL_TARGETS) +# POST_INSTALL_TARGETS := strip fixconfig # This is the main target used by this Makefile for creating $ISAEXEC format pkgs. # This for loop is very important for handling the $DESTDIR var as it applies in # the post-install steps (I.E the ISA-specific dirs) -optbuild: - (for TARGET in $(ISATARGETS); do \ - gmake -e ISA=$$TARGET build only-install; done) +# optbuild: +# (for TARGET in $(ISATARGETS); do \ +# gmake -e ISA=$$TARGET build only-install; done) # This target is copied from gar.pkg.mk, just with $(POST_INSTALL_TARGETS) stripped # from the end. This prevents the install target from kicking off the packaging step. -only-install: $(addprefix dep-$(GARDIR)/,$(INSTALLDEPS)) test $(INSTALL_DIRS) $(PRE_INSTALL_TARGETS) pre-install $(INSTALL_TARGETS) isa-post-install +# only-install: $(addprefix dep-$(GARDIR)/,$(INSTALLDEPS)) test $(INSTALL_DIRS) $(PRE_INSTALL_TARGETS) pre-install $(INSTALL_TARGETS) isa-post-install ###Tidy ups and files below @@ -249,11 +315,8 @@ # Finally, merge in all the optimised binaries #Isaexec version -isa-post-install: skins fonts merge-opt-bins +post-install-modulated: skins fonts merge-opt-bins -#Standard package version -post-install: skins fonts - #### Skins, Fonts, Codecs and below all need to be run from optbuild to inherit # the expanded $(DESTDIR) variable which includes their expanded path # In Mplayer's case we don't actually need the skins/fonts in each ISA build @@ -261,8 +324,8 @@ skins: - (mkdir -p $(DESTDIR)$(BUILD_PREFIX)/share/mplayer/skins/default) - (cp -r $(WORKSRC)/../Blue/* $(DESTDIR)$(BUILD_PREFIX)/share/mplayer/skins/default) + ginstall -m 755 -d $(DESTDIR)$(datadir)/mplayer/skins/default + (cp -r $(WORKSRC)/../Blue/* $(DESTDIR)$(datadir)/mplayer/skins/default) fonts: (ln -f -s /usr/openwin/lib/X11/fonts/TrueType/Arial.ttf $(DESTDIR)$(BUILD_PREFIX)/share/mplayer/subfont.ttf) @@ -277,37 +340,10 @@ (mkdir -p $(BASE_DESTDIR)$(BUILD_PREFIX)/bin/$(ISAEXEC_DIR)) (cd $(DESTDIR); if test ! -f $(BASE_DESTDIR)$(BUILD_PREFIX)/bin/$(ISAEXEC_DIR)/* ; then mv $(ISAEXEC_BINS) $(BASE_DESTDIR)$(BUILD_PREFIX)/bin/$(ISAEXEC_DIR); fi ) - - -# This sets up the protype file correctly, but you'll have to do the depend manually. -# In Mplayer's case, I have to hard code the filename, as the tarball has it -# as "MPlayer", not "mplayer", so I can't simply use $(GARNAME) -# - -#Should be able to use the ISA_BINS var here, maybe a foreach loop? -isa-post-package: - @echo " ===> Starting Mplayer post-package phase <===" - @if test ! -f $(COOKIEDIR)/post-package ; then \ - echo "l none /opt/csw/bin/mplayer=isaexec" >> $(WORKSRC)/../CSWmplayer.prototype; \ - echo "l none /opt/csw/bin/mencoder=isaexec" >> $(WORKSRC)/../CSWmplayer.prototype; \ - touch $(COOKIEDIR)/post-package; fi - #Sneaky wrapper to re-run package-create with our newly added isaexecs! - rm $(COOKIEDIR)/package-create - @echo " Running gmake package-create for a second time" - gmake package-create - - -#A edited packaging target that doesn't re-run all the install steps. -only-package: - gmake pre-package package-create isa-post-package package-check - - -#The whole shabang! Start to finish, in one line: gmake all-in-one -all-in-one: optbuild only-package - - ###not yet implemented, mplayer specific ## --enable-runtime-cpudetection allows the binary to run anywhere, use for i386? #run-anywhere-build: # (gmake ISA=pentium) #CONFIGURE_ARGS += --enable-runtime-cpudetection + +PATH := /opt/csw/gnu:$(PATH) Deleted: csw/mgar/pkg/mplayer/trunk/files/CSWmplayer.depend =================================================================== --- csw/mgar/pkg/mplayer/trunk/files/CSWmplayer.depend 2010-03-26 20:27:18 UTC (rev 9387) +++ csw/mgar/pkg/mplayer/trunk/files/CSWmplayer.depend 2010-03-26 20:41:42 UTC (rev 9388) @@ -1,30 +0,0 @@ -P CSWcommon common - common files and dirs for CSW packages -P CSWaalib aalib - Ascii art graphics library -P CSWaudiofile audiofile - Silicon Graphics Audio File Library -P CSWesound esound - EsounD, The Enlightened Sound Daemon -P CSWfaac libfaac - AAC encoder library and tool -P CSWfconfig fontconfig - A library for configuring and customizing font access. -P CSWfribidi fribidi - The Unicode 4.1.0 Bidirectional Algorithm API -P CSWftype2 freetype2 - The free and portable high quality font engine -P CSWggettext ggettext - GNU gettext -P CSWglib2 glib2 - the low-level core library for GTK+ and GNOME -P CSWgtk2 gtk2 - GTK+, The multi-platform toolkit for GUI development -P CSWiconv libiconv - GNU iconv library -P CSWjpeg jpeg - JPEG library and tools by the Independent JPEG Group -P CSWlibatk libatk - Accessibility toolkit for GNOME -P CSWlibcairo libcairo - The Cairo 2D Graphics Library -P CSWlibmad libmad - MPEG Audio Decoder -P CSWlibogg libogg - Ogg bitstream format support library -P CSWlibsdl libsdl - Simple DirectMedia Layer library -P CSWmesa mesalibs - Mesa 3D OpenGL graphics library -P CSWnas nas - Network Audio System -P CSWncurses ncurses - ncurses library and utilities -P CSWopenal openal - A 3D positional spatialized sound library (gcc3) -P CSWpango libpango - library for laying out and rendering international text -P CSWpng png - library for Portable Network Graphics format (PNG) -P CSWsambalib samba_lib - Tools to access a server's filespace and printers via SMB (lib) -P CSWsdlimage sdlimage - SDL image file loading library -P CSWspeex libspeex - Speex audio codec support library -P CSWtheora libtheora - Theora video codec support library -P CSWungif libungif - library for manipulation of GIF images -P CSWzlib zlib - Zlib Data Compression Library Deleted: csw/mgar/pkg/mplayer/trunk/files/CSWmplayer.gspec =================================================================== --- csw/mgar/pkg/mplayer/trunk/files/CSWmplayer.gspec 2010-03-26 20:27:18 UTC (rev 9387) +++ csw/mgar/pkg/mplayer/trunk/files/CSWmplayer.gspec 2010-03-26 20:41:42 UTC (rev 9388) @@ -1,5 +0,0 @@ -%var bitname mplayer -%var pkgname CSWmplayer -%var SPKG_VERSION 1.0.0 -%include url file://%{PKGLIB}/csw_standard.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 chninkel at users.sourceforge.net Fri Mar 26 22:04:16 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 26 Mar 2010 21:04:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9389] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 9389 http://gar.svn.sourceforge.net/gar/?rev=9389&view=rev Author: chninkel Date: 2010-03-26 21:04:16 +0000 (Fri, 26 Mar 2010) Log Message: ----------- lftp: updated to 4.0.6 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 2010-03-26 20:41:42 UTC (rev 9388) +++ csw/mgar/pkg/lftp/trunk/Makefile 2010-03-26 21:04:16 UTC (rev 9389) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = lftp -GARVERSION = 4.0.5 +GARVERSION = 4.0.6 CATEGORIES = net DESCRIPTION = sophisticated command-line ftp/http client @@ -53,7 +53,7 @@ CONFIGURE_ARGS = $(DIRPATHS) # previous maintainer compiled with openssl # instead of gnutls, no need to change that -CONFIGURE_ARGS += --without-gnutls --with-openssl=/opt/csw +#CONFIGURE_ARGS += --without-gnutls --with-openssl=/opt/csw TEST_SCRIPTS = Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2010-03-26 20:41:42 UTC (rev 9388) +++ csw/mgar/pkg/lftp/trunk/checksums 2010-03-26 21:04:16 UTC (rev 9389) @@ -1,3 +1,3 @@ 5bc881a13c106b1c97f2137ff1755817 CSWlftp.prototype -31fd702308b4cd4042d3ddb043f83a9c changelog.CSW -73ea519c9e9cdfa47b714c5c91093a0d lftp-4.0.5.tar.gz +7b975100c5923f126f82db6c5acb1da3 changelog.CSW +42f31ca6b10d7bc4e9cd7408b476ee9b lftp-4.0.6.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2010-03-26 20:41:42 UTC (rev 9388) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2010-03-26 21:04:16 UTC (rev 9389) @@ -1,3 +1,9 @@ +lftp (4.0.6,REV=2010.03.26) unstable + + * New upstream release. + + -- Yann Rouillard Fri, 26 Mar 2010 22:03:15 +0100 + lftp (4.0.5,REV=2009.12.23) unstable * New upstream release. 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 Mar 26 22:48:19 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 26 Mar 2010 21:48:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9390] csw/mgar/pkg/rlwrap/trunk/Makefile Message-ID: Revision: 9390 http://gar.svn.sourceforge.net/gar/?rev=9390&view=rev Author: chninkel Date: 2010-03-26 21:48:19 +0000 (Fri, 26 Mar 2010) Log Message: ----------- rlwrap: fixed checkpkg error Modified Paths: -------------- csw/mgar/pkg/rlwrap/trunk/Makefile Modified: csw/mgar/pkg/rlwrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/rlwrap/trunk/Makefile 2010-03-26 21:04:16 UTC (rev 9389) +++ csw/mgar/pkg/rlwrap/trunk/Makefile 2010-03-26 21:48:19 UTC (rev 9390) @@ -25,6 +25,9 @@ RUNTIME_DEP_PKGS = CSWreadline +# We don't want to depend on OpenCSW perl +CHECKPKG_OVERRIDES_CSWrlwrap += missing-dependency|CSWperl + ###### Upstream and opencsw files information ####### MASTER_SITES = http://utopia.knoware.nl/~hlub/uck/rlwrap/ 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 Mar 26 23:56:03 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 26 Mar 2010 22:56:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[9391] csw/mgar/pkg/imapproxy/trunk Message-ID: Revision: 9391 http://gar.svn.sourceforge.net/gar/?rev=9391&view=rev Author: chninkel Date: 2010-03-26 22:56:02 +0000 (Fri, 26 Mar 2010) Log Message: ----------- imapproxy: updated to 1.2.7 and switched to dynamic prototype and license Modified Paths: -------------- csw/mgar/pkg/imapproxy/trunk/Makefile csw/mgar/pkg/imapproxy/trunk/checksums csw/mgar/pkg/imapproxy/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/imapproxy/trunk/files/CSWimapproxy.prototype Modified: csw/mgar/pkg/imapproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapproxy/trunk/Makefile 2010-03-26 21:48:19 UTC (rev 9390) +++ csw/mgar/pkg/imapproxy/trunk/Makefile 2010-03-26 22:56:02 UTC (rev 9391) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = imapproxy -GARVERSION = 1.2.6 +GARVERSION = 1.2.7 CATEGORIES = server DESCRIPTION = A caching IMAP proxy server @@ -29,8 +29,9 @@ RUNTIME_DEP_PKGS = CSWtcpwrap RUNTIME_DEP_PKGS += CSWosslrt -RUNTIME_DEP_PKGS += CSWcswclassutils +# adding configuration handling classes +SPKG_CLASSES = none cswpreserveconf cswinitsmf ###### Upstream and opencsw files information ####### @@ -41,13 +42,13 @@ UFILES_REGEX = up-$(GARNAME)-(\d+(?:\.\d+)*).tar.gz DISTFILES = up-$(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWimapproxy.prototype DISTFILES += imapproxy.conf DISTFILES += changelog.CSW README.CSW # init and smf stuffs -DISTFILES += cswimapproxy.init cswimapproxy.xml svc-cswimapproxy -DISTFILES += i.smf r.smf +DISTFILES += cswimapproxy.init cswimapproxy.xml +DISTNAME = up-$(GARNAME)-$(GARVERSION) + # imapproxy lacks include of openssl/md5.h # PATCHFILES += md5_include.patch @@ -59,14 +60,8 @@ # imapproxy makefile PATCHFILES += destdir.patch - ##### Build and installation information ##### -# files are extracted in up-imapproxy-version -# not imapproxy-version -WORKSRC = $(WORKDIR)/up-$(GARNAME)-$(GARVERSION) -WORKSRC_FIRSTMOD = $(WORKDIR_FIRSTMOD)/up-$(GARNAME)-$(GARVERSION) - CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = @@ -82,6 +77,7 @@ ginstall -D $(WORKSRC_FIRSTMOD)/README.known_issues $(PKGROOT)$(docdir)/$(GARNAME)/README.known_issues ginstall -D $(WORKSRC_FIRSTMOD)/README.ssl $(PKGROOT)$(docdir)/$(GARNAME)/README.ssl ginstall -D $(WORKDIR_FIRSTMOD)/imapproxy.conf $(PKGROOT)$(sysconfdir)/imapproxy.conf.CSW + ginstall -D "$(WORKDIR_FIRSTMOD)/cswimapproxy.xml" "$(PKGROOT)/var/opt/csw/svc/manifest/network/cswimapproxy.xml" @$(MAKECOOKIE) Modified: csw/mgar/pkg/imapproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/imapproxy/trunk/checksums 2010-03-26 21:48:19 UTC (rev 9390) +++ csw/mgar/pkg/imapproxy/trunk/checksums 2010-03-26 22:56:02 UTC (rev 9391) @@ -1,12 +1,9 @@ -23859aebc8a16c66e190ddc4cfac79b3 download/CSWimapproxy.prototype -05c9327816e6c24ba9fe253c6e76c71a download/README.CSW -8c5dd936bd2a71686c22fb1c54f02c39 download/changelog.CSW -c70c04af058e01012ef1beb8caaeb296 download/conf_file_location.patch -78549b892d38abf3e86cc29e39777bd6 download/cswimapproxy.init -2d586e6018bd82b6ac4c49b75ff837ad download/cswimapproxy.xml -497ca80cf7e1ccbb4caac0319533a17e download/destdir.patch -3113a92e6a9296c1d41a3816ef618b85 download/i.smf -5d51df28803c859277b7f6c3b68acf9e download/imapproxy.conf -c1303341cc11640a4433a22b9abd3241 download/r.smf -78549b892d38abf3e86cc29e39777bd6 download/svc-cswimapproxy -decc6693a1497e5a1bc5704e5ed28c9b download/up-imapproxy-1.2.6.tar.gz +d185afd650ebb8c7dac35fdf54b8f319 CSWimapproxy.prototype +05c9327816e6c24ba9fe253c6e76c71a README.CSW +f7a91b2816c12035ab08f355a1d44881 changelog.CSW +c70c04af058e01012ef1beb8caaeb296 conf_file_location.patch +645dbf4681fba2e3430b4bdfb28cb540 cswimapproxy.init +2d586e6018bd82b6ac4c49b75ff837ad cswimapproxy.xml +497ca80cf7e1ccbb4caac0319533a17e destdir.patch +5d51df28803c859277b7f6c3b68acf9e imapproxy.conf +036b487a9a6d2b955f81eb80bd9faee0 up-imapproxy-1.2.7.tar.gz Deleted: csw/mgar/pkg/imapproxy/trunk/files/CSWimapproxy.prototype =================================================================== --- csw/mgar/pkg/imapproxy/trunk/files/CSWimapproxy.prototype 2010-03-26 21:48:19 UTC (rev 9390) +++ csw/mgar/pkg/imapproxy/trunk/files/CSWimapproxy.prototype 2010-03-26 22:56:02 UTC (rev 9391) @@ -1,10 +0,0 @@ -f none /opt/csw/etc/imapproxy.conf.CSW 0644 root bin -d none /opt/csw/share/doc/doc/imapproxy 0755 root bin -f none /opt/csw/share/doc/imapproxy/ChangeLog 0644 root bin -f none /opt/csw/share/doc/imapproxy/README.CSW 0644 root bin -f none /opt/csw/share/doc/imapproxy/README 0644 root bin -f none /opt/csw/share/doc/imapproxy/README.ssl 0644 root bin -f none /opt/csw/share/doc/imapproxy/README.known_issues 0644 root bin -f none /opt/csw/share/doc/imapproxy/changelog.CSW 0644 root bin -f none /opt/csw/sbin/in.imapproxyd 0755 root bin -f none /opt/csw/sbin/pimpstat 0755 root bin Modified: csw/mgar/pkg/imapproxy/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/imapproxy/trunk/files/changelog.CSW 2010-03-26 21:48:19 UTC (rev 9390) +++ csw/mgar/pkg/imapproxy/trunk/files/changelog.CSW 2010-03-26 22:56:02 UTC (rev 9391) @@ -1,3 +1,9 @@ +imapproxy (1.2.7,REV=2010.02.28) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 28 Feb 2010 17:24:21 +0100 + imapproxy (1.2.6,REV=2008.02.15) unstable * New upstream version. 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 Mar 27 00:42:28 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 26 Mar 2010 23:42:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[9392] csw/mgar/pkg/imapproxy/trunk Message-ID: Revision: 9392 http://gar.svn.sourceforge.net/gar/?rev=9392&view=rev Author: chninkel Date: 2010-03-26 23:42:28 +0000 (Fri, 26 Mar 2010) Log Message: ----------- imapproxy: switched to cswclassutils for SMF and conf handling Modified Paths: -------------- csw/mgar/pkg/imapproxy/trunk/Makefile csw/mgar/pkg/imapproxy/trunk/checksums Added Paths: ----------- csw/mgar/pkg/imapproxy/trunk/files/cswimapproxy Removed Paths: ------------- csw/mgar/pkg/imapproxy/trunk/files/CSWimapproxy.depend csw/mgar/pkg/imapproxy/trunk/files/CSWimapproxy.gspec csw/mgar/pkg/imapproxy/trunk/files/cswimapproxy.init csw/mgar/pkg/imapproxy/trunk/files/i.init csw/mgar/pkg/imapproxy/trunk/files/i.smf csw/mgar/pkg/imapproxy/trunk/files/r.init csw/mgar/pkg/imapproxy/trunk/files/r.smf csw/mgar/pkg/imapproxy/trunk/files/svc-cswimapproxy Modified: csw/mgar/pkg/imapproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapproxy/trunk/Makefile 2010-03-26 22:56:02 UTC (rev 9391) +++ csw/mgar/pkg/imapproxy/trunk/Makefile 2010-03-26 23:42:28 UTC (rev 9392) @@ -30,10 +30,8 @@ RUNTIME_DEP_PKGS = CSWtcpwrap RUNTIME_DEP_PKGS += CSWosslrt -# adding configuration handling classes SPKG_CLASSES = none cswpreserveconf cswinitsmf - ###### Upstream and opencsw files information ####### MASTER_SITES = http://www.imapproxy.org/downloads/ @@ -45,10 +43,13 @@ DISTFILES += imapproxy.conf DISTFILES += changelog.CSW README.CSW # init and smf stuffs -DISTFILES += cswimapproxy.init cswimapproxy.xml +DISTFILES += cswimapproxy cswimapproxy.xml DISTNAME = up-$(GARNAME)-$(GARVERSION) +INITSMF = /etc/init.d/cswimapproxy +PRESERVECONF = /opt/csw/etc/imapproxy.conf + # imapproxy lacks include of openssl/md5.h # PATCHFILES += md5_include.patch @@ -78,6 +79,7 @@ ginstall -D $(WORKSRC_FIRSTMOD)/README.ssl $(PKGROOT)$(docdir)/$(GARNAME)/README.ssl ginstall -D $(WORKDIR_FIRSTMOD)/imapproxy.conf $(PKGROOT)$(sysconfdir)/imapproxy.conf.CSW ginstall -D "$(WORKDIR_FIRSTMOD)/cswimapproxy.xml" "$(PKGROOT)/var/opt/csw/svc/manifest/network/cswimapproxy.xml" + ginstall -D "$(WORKDIR_FIRSTMOD)/cswimapproxy" "$(PKGROOT)/etc/init.d/cswimapproxy" @$(MAKECOOKIE) Modified: csw/mgar/pkg/imapproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/imapproxy/trunk/checksums 2010-03-26 22:56:02 UTC (rev 9391) +++ csw/mgar/pkg/imapproxy/trunk/checksums 2010-03-26 23:42:28 UTC (rev 9392) @@ -1,8 +1,7 @@ -d185afd650ebb8c7dac35fdf54b8f319 CSWimapproxy.prototype 05c9327816e6c24ba9fe253c6e76c71a README.CSW f7a91b2816c12035ab08f355a1d44881 changelog.CSW c70c04af058e01012ef1beb8caaeb296 conf_file_location.patch -645dbf4681fba2e3430b4bdfb28cb540 cswimapproxy.init +645dbf4681fba2e3430b4bdfb28cb540 cswimapproxy 2d586e6018bd82b6ac4c49b75ff837ad cswimapproxy.xml 497ca80cf7e1ccbb4caac0319533a17e destdir.patch 5d51df28803c859277b7f6c3b68acf9e imapproxy.conf Deleted: csw/mgar/pkg/imapproxy/trunk/files/CSWimapproxy.depend =================================================================== --- csw/mgar/pkg/imapproxy/trunk/files/CSWimapproxy.depend 2010-03-26 22:56:02 UTC (rev 9391) +++ csw/mgar/pkg/imapproxy/trunk/files/CSWimapproxy.depend 2010-03-26 23:42:28 UTC (rev 9392) @@ -1,2 +0,0 @@ -P CSWosslrt openssl_rt - Openssl runtime libraries -P CSWtcpwrap tcpwrappers Deleted: csw/mgar/pkg/imapproxy/trunk/files/CSWimapproxy.gspec =================================================================== --- csw/mgar/pkg/imapproxy/trunk/files/CSWimapproxy.gspec 2010-03-26 22:56:02 UTC (rev 9391) +++ csw/mgar/pkg/imapproxy/trunk/files/CSWimapproxy.gspec 2010-03-26 23:42:28 UTC (rev 9392) @@ -1,11 +0,0 @@ -%var bitname imapproxy -%var pkgname CSWimapproxy -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING -%var RC_INIT_SCRIPT cswimapproxy.init -%var INIT_KILL_PRIO 99 -%var INIT_START_PRIO 10 -%var CAN_BE_AUTOENABLED no -%var SERVICE_CONF_FILES /opt/csw/etc/imapproxy.conf -%var SERVICE_NAME imapproxy -%include url file://%{PKGLIB}/smf_enabled.gspec Copied: csw/mgar/pkg/imapproxy/trunk/files/cswimapproxy (from rev 9389, csw/mgar/pkg/imapproxy/trunk/files/cswimapproxy.init) =================================================================== --- csw/mgar/pkg/imapproxy/trunk/files/cswimapproxy (rev 0) +++ csw/mgar/pkg/imapproxy/trunk/files/cswimapproxy 2010-03-26 23:42:28 UTC (rev 9392) @@ -0,0 +1,103 @@ +#!/bin/sh +# /etc/init.d/imapproxy +# + +#RC_KNUM 99 +#RC_SNUM 10 +#RC_KLEV 0,1,2,S +#RC_SLEV 3 +#MANIFEST /var/opt/csw/svc/manifest/network/cswimapproxy.xml +#AUTOENABLE no + + +################################ +# Variable initialization # +################################ +PROGNAME=in.imapproxyd +BINPATH=/opt/csw/sbin +INIT_FILE=/etc/init.d/cswimapproxy +CONF_DIR=/opt/csw/etc +CONF_FILE=$CONF_DIR/imapproxy.conf +OPTIONS="" + + +#################### +# Useful functions # +#################### + +start() +{ + if pgrep -f "^$BINPATH/$PROGNAME -f $CONF_FILE$" >/dev/null; then + /usr/bin/echo "$PROGNAME is already running." + else + /usr/bin/echo "Starting $PROGNAME: \c" + # imapproxy can be stuck if some case. + # For example if it can't resolve the imap server name at startup + # it will not fork and will retry to resolve the name (for a long time) + # so we launch it in background, we wait and then we test if + # the process has not died + $BINPATH/$PROGNAME -f $CONF_FILE & + sleep 1 + # if the fork occured the backgrounded process shouldn't + # exist anymore + if pgrep -f "^$BINPATH/$PROGNAME -f $CONF_FILE$" >/dev/null; then + /usr/bin/echo "OK." + else + /usr/bin/echo "Failed." + fi + fi +} + + +stop() +{ + if pgrep -f "^$BINPATH/$PROGNAME -f $CONF_FILE$" >/dev/null; then + /usr/bin/echo "Stopping $PROGNAME: \c" + pkill -15 -f "^$BINPATH/$PROGNAME -f $CONF_FILE$" + /usr/bin/echo "OK." + else + /usr/bin/echo "$PROGNAME is not running." + fi +} + + +restart() +{ + stop + start +} + + +status() +{ + + pgrep -f "^$BINPATH/$PROGNAME -f $CONF_FILE$" >/dev/null + RET=$? + + if [ "$RET" -eq 0 ]; then + /usr/bin/echo "$PROGNAME is running." + else + /usr/bin/echo "$PROGNAME is not running." + fi + + return $RET +} + + +[ -x ${BINPATH}/${PROGNAME} ] || exit 5 + +# We don't do anything if configuration file +# is not present +[ -f "$CONF_FILE" ] || exit 0 + +case "$1" in + start) start ;; + stop) stop ;; + restart) restart ;; + reload) reload ;; + status) status ;; + *) + /usr/bin/echo "Usage: $INIT_FILE {start|stop|restart|reload|status}" + exit 1 + ;; +esac Deleted: csw/mgar/pkg/imapproxy/trunk/files/cswimapproxy.init =================================================================== --- csw/mgar/pkg/imapproxy/trunk/files/cswimapproxy.init 2010-03-26 22:56:02 UTC (rev 9391) +++ csw/mgar/pkg/imapproxy/trunk/files/cswimapproxy.init 2010-03-26 23:42:28 UTC (rev 9392) @@ -1,99 +0,0 @@ -#!/bin/sh -# /etc/init.d/imapproxy -# - -# chkconfig stuff -# chkconfig: 3 99 10 -# description: A caching IMAP proxy server - -################################ -# Variable initialization # -################################ -PROGNAME=in.imapproxyd -BINPATH=/opt/csw/sbin -INIT_FILE=/etc/init.d/cswimapproxy -CONF_DIR=/opt/csw/etc -CONF_FILE=$CONF_DIR/imapproxy.conf -OPTIONS="" - - -#################### -# Useful functions # -#################### - -start() -{ - if pgrep -f "^$BINPATH/$PROGNAME -f $CONF_FILE$" >/dev/null; then - /usr/bin/echo "$PROGNAME is already running." - else - /usr/bin/echo "Starting $PROGNAME: \c" - # imapproxy can be stuck if some case. - # For example if it can't resolve the imap server name at startup - # it will not fork and will retry to resolve the name (for a long time) - # so we launch it in background, we wait and then we test if - # the process has not died - $BINPATH/$PROGNAME -f $CONF_FILE & - sleep 1 - # if the fork occured the backgrounded process shouldn't - # exist anymore - if pgrep -f "^$BINPATH/$PROGNAME -f $CONF_FILE$" >/dev/null; then - /usr/bin/echo "OK." - else - /usr/bin/echo "Failed." - fi - fi -} - - -stop() -{ - if pgrep -f "^$BINPATH/$PROGNAME -f $CONF_FILE$" >/dev/null; then - /usr/bin/echo "Stopping $PROGNAME: \c" - pkill -15 -f "^$BINPATH/$PROGNAME -f $CONF_FILE$" - /usr/bin/echo "OK." - else - /usr/bin/echo "$PROGNAME is not running." - fi -} - - -restart() -{ - stop - start -} - - -status() -{ - - pgrep -f "^$BINPATH/$PROGNAME -f $CONF_FILE$" >/dev/null - RET=$? - - if [ "$RET" -eq 0 ]; then - /usr/bin/echo "$PROGNAME is running." - else - /usr/bin/echo "$PROGNAME is not running." - fi - - return $RET -} - - -[ -x ${BINPATH}/${PROGNAME} ] || exit 5 - -# We don't do anything if configuration file -# is not present -[ -f "$CONF_FILE" ] || exit 0 - -case "$1" in - start) start ;; - stop) stop ;; - restart) restart ;; - reload) reload ;; - status) status ;; - *) - /usr/bin/echo "Usage: $INIT_FILE {start|stop|restart|reload|status}" - exit 1 - ;; -esac Deleted: csw/mgar/pkg/imapproxy/trunk/files/i.init =================================================================== --- csw/mgar/pkg/imapproxy/trunk/files/i.init 2010-03-26 22:56:02 UTC (rev 9391) +++ csw/mgar/pkg/imapproxy/trunk/files/i.init 2010-03-26 23:42:28 UTC (rev 9392) @@ -1,88 +0,0 @@ -# -# 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.init - class script which install init.d script and runlevels -# symlinks -# -umask 0022 -LANG=C -export LANG - -read_conf_value () -{ - _VAR="$1" - _FILE="$2" - eval ${_VAR}=\"`/usr/bin/sed -n -e "/^# *$_VAR:/ s/^.*$_VAR: *\(.*[^ ]\) *$/\1/p" ${_FILE}`\" -} - - -# retrieve the state of a service -load_init_info () -{ - _INIT_FILE="$1" - _INIT_INFO="" - if [ -f "$INIT_INFO_FILE" ]; then - INIT_INFO="`awk \" \\\$1 == \\\"$_INIT_FILE\\\" { print \\\$2,\\\$3,\\\$4,\\\$5,\\\$6,\\\$7,\\\$8,\\\$9,\\\$10,\\\$11,\\\$12,\\\$13,\\\$14,\\\$15,\\\$16,\\\$17 }\" "$INIT_INFO_FILE"`" - return 0 - fi - if [ -z "$INIT_INFO" ]; then - # No previous init info saved, we find the init info - # from the chkconfig info in the init file - read_conf_value chkconfig "$SRC" - set -- $chkconfig - - RUNLEVEL="$1" - START_PRIORITY_LEVEL="$2" - STOP_PRIORITY_LEVEL="$3" - - for LEVEL in 0 1 2 3 S; do - if echo "${RUNLEVEL}" | grep "${LEVEL}" >/dev/null; then - # if service was started in level 2, we do not need - # to create the start link in level 3 - [ "${LEVEL}" = "3" ] && echo "${RUNLEVEL}" | grep "2" >/dev/null - if [ $? -ne 0 ]; then - INIT_INFO="$INIT_INFO $LEVEL S$START_PRIORITY_LEVEL" - fi - else - INIT_INFO="$INIT_INFO $LEVEL K$STOP_PRIORITY_LEVEL" - fi - done - fi -} - - -restore_runlevel_symlinks () -{ - _INIT_FILE="$1" - _INIT_INFO="$2" - _SERVICE_NAME="`basename \"$_INIT_FILE\"`" - while [ -n "$_INIT_INFO" ]; do - read _LEVEL _PRIORITY _INIT_INFO < -# 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.smf - class script which install smf related files -# This class will simply copy file except for the -# manifest file which, in addition, will imported -# in the svc repository -# -# use this class for the following files: -# /opt/csw/var/svc -# /opt/csw/var/svc/manifest -# /opt/csw/var/svc/manifest/network -# /opt/csw/var/svc/manifest/network/softname.xml=/softname.xml -# /opt/csw/lib/svc -# /opt/csw/lib/svc/method -# /opt/csw/lib/svc/method/svc-softname -# -if [ -z "$PKG_INSTALL_ROOT" ]; then - PKG_INSTALL_ROOT="/" -fi - -while read SRC DEST; do - EXT="`/usr/bin/echo $DEST | /usr/bin/awk -F. '{ print $(NF) }'`" - "$BASEDIR/usr/bin/cp" "$SRC" "$DEST" || exit 2 - # the .xml file is the manifest file - if [ "$EXT" = "xml" ]; then - chroot "$PKG_INSTALL_ROOT" /usr/sbin/svccfg import "$DEST" - fi -done - -exit 0 - Deleted: csw/mgar/pkg/imapproxy/trunk/files/r.init =================================================================== --- csw/mgar/pkg/imapproxy/trunk/files/r.init 2010-03-26 22:56:02 UTC (rev 9391) +++ csw/mgar/pkg/imapproxy/trunk/files/r.init 2010-03-26 23:42:28 UTC (rev 9392) @@ -1,93 +0,0 @@ -# -# 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. -# -# r.init - class script which remove init.d script and runlevels -# symlinks and save symlinks modification if any -# -umask 0022 -LANG=C -export LANG - - -read_conf_value () -{ - _VAR="$1" - _FILE="$2" - eval ${_VAR}=\"`/usr/bin/sed -n -e "/^# *$_VAR:/ s/^.*$_VAR: *\(.*[^ ]\) *$/\1/p" ${_FILE}`\" -} - - -read_init_info () -{ - _INIT_FILE="$1" - # we just search for all files referencing the init scripts - _INUM=`ls -i "$_INIT_FILE" | /usr/bin/awk '{ print $1 }'` - /usr/bin/find /etc/rc[S0-6].d -follow -inum "$_INUM" | while read _RCLINK; do - _LEVEL=`echo $_RCLINK | cut -b8` - _PRIORITY=`echo $_RCLINK | cut -b12-14` - printf "$_LEVEL $_PRIORITY " - done - printf "\n" -} - -# save the state of a service -save_init_info () -{ - _INIT_FILE="$1" - _INIT_INFO_FILE="$2" - - _DEFAULT_INIT_INFO="" - _INIT_INFO="" - - # we read chkconfig init info to check if runlevels symlinks - # have been changed from the default setup - read_conf_value chkconfig "$_INIT_FILE" - set -- $chkconfig - - RUNLEVEL="$1" - START_PRIORITY_LEVEL="$2" - STOP_PRIORITY_LEVEL="$3" - - for _LEVEL in 0 1 2 3 S; do - if echo "${RUNLEVEL}" | grep "${_LEVEL}" >/dev/null; then - _DEFAULT_INIT_INFO="$_DEFAULT_INIT_INFO $_LEVEL S$START_PRIORITY_LEVEL" - else - _DEFAULT_INIT_INFO="$_DEFAULT_INIT_INFO $_LEVEL K$START_PRIORITY_LEVEL" - fi - done - - _INIT_INFO="`read_init_info \"$_INIT_FILE\"`" - - if [ " $_INIT_INFO" != "$_DEFAULT_INIT_INFO " ]; then - echo "$_INIT_FILE $_INIT_INFO" >> "$_INIT_INFO_FILE" - fi -} - -# delete all runlevels symlinks for the given init script -delete_runlevel_symlinks () -{ - _INIT_FILE="$1" - - _INUM=`ls -i "$_INIT_FILE" | /usr/bin/awk '{ print $1 }'` - /usr/bin/find /etc/rc[S0-6].d -follow -inum "$_INUM" -exec rm '{}' ';' -} - -INIT_INFO_FILE="${PKG_INSTALL_ROOT}/tmp/$PKG.initinfo" -rm -f "$INIT_INFO_FILE" - -while read DEST; do - if [ -z "$DEST" ]; then - continue - fi - - save_init_info "$DEST" "$INIT_INFO_FILE" - delete_runlevel_symlinks "$DEST" - - rm "$DEST" -done Deleted: csw/mgar/pkg/imapproxy/trunk/files/r.smf =================================================================== --- csw/mgar/pkg/imapproxy/trunk/files/r.smf 2010-03-26 22:56:02 UTC (rev 9391) +++ csw/mgar/pkg/imapproxy/trunk/files/r.smf 2010-03-26 23:42:28 UTC (rev 9392) @@ -1,38 +0,0 @@ -# -# 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. -# -# r.smf - class script which removes smf related files -# -# use this class for the following files: -# /opt/csw/var/svc -# /opt/csw/var/svc/manifest -# /opt/csw/var/svc/manifest/network -# /opt/csw/var/svc/manifest/network/softname.xml=/softname.xml -# /opt/csw/lib/svc -# /opt/csw/lib/svc/method -# /opt/csw/lib/svc/method/svc-softname - -if [ -z "$PKG_INSTALL_ROOT" ]; then - PKG_INSTALL_ROOT="/" -fi - -while read DEST; do - EXT="`/usr/bin/echo $DEST | /usr/bin/awk -F. '{ print $(NF) }'`" - if [ "$EXT" = "xml" ]; then - for FRMI in `chroot "$PKG_INSTALL_ROOT" /usr/sbin/svccfg inventory "$DEST"`; do - chroot "$PKG_INSTALL_ROOT" /usr/sbin/svccfg delete "$FRMI" >/dev/null 2>&1 - done - fi - if [ ! -d "$DEST" ]; then - "$BASEDIR/usr/bin/rm" "$DEST" || exit 2 - fi -done - -exit 0 - Deleted: csw/mgar/pkg/imapproxy/trunk/files/svc-cswimapproxy =================================================================== --- csw/mgar/pkg/imapproxy/trunk/files/svc-cswimapproxy 2010-03-26 22:56:02 UTC (rev 9391) +++ csw/mgar/pkg/imapproxy/trunk/files/svc-cswimapproxy 2010-03-26 23:42:28 UTC (rev 9392) @@ -1,99 +0,0 @@ -#!/bin/sh -# /etc/init.d/imapproxy -# - -# chkconfig stuff -# chkconfig: 3 99 10 -# description: A caching IMAP proxy server - -################################ -# Variable initialization # -################################ -PROGNAME=in.imapproxyd -BINPATH=/opt/csw/sbin -INIT_FILE=/etc/init.d/cswimapproxy -CONF_DIR=/opt/csw/etc -CONF_FILE=$CONF_DIR/imapproxy.conf -OPTIONS="" - - -#################### -# Useful functions # -#################### - -start() -{ - if pgrep -f "^$BINPATH/$PROGNAME -f $CONF_FILE$" >/dev/null; then - /usr/bin/echo "$PROGNAME is already running." - else - /usr/bin/echo "Starting $PROGNAME: \c" - # imapproxy can be stuck if some case. - # For example if it can't resolve the imap server name at startup - # it will not fork and will retry to resolve the name (for a long time) - # so we launch it in background, we wait and then we test if - # the process has not died - $BINPATH/$PROGNAME -f $CONF_FILE & - sleep 1 - # if the fork occured the backgrounded process shouldn't - # exist anymore - if pgrep -f "^$BINPATH/$PROGNAME -f $CONF_FILE$" >/dev/null; then - /usr/bin/echo "OK." - else - /usr/bin/echo "Failed." - fi - fi -} - - -stop() -{ - if pgrep -f "^$BINPATH/$PROGNAME -f $CONF_FILE$" >/dev/null; then - /usr/bin/echo "Stopping $PROGNAME: \c" - pkill -15 -f "^$BINPATH/$PROGNAME -f $CONF_FILE$" - /usr/bin/echo "OK." - else - /usr/bin/echo "$PROGNAME is not running." - fi -} - - -restart() -{ - stop - start -} - - -status() -{ - - pgrep -f "^$BINPATH/$PROGNAME -f $CONF_FILE$" >/dev/null - RET=$? - - if [ "$RET" -eq 0 ]; then - /usr/bin/echo "$PROGNAME is running." - else - /usr/bin/echo "$PROGNAME is not running." - fi - - return $RET -} - - -[ -x ${BINPATH}/${PROGNAME} ] || exit 5 - -# We don't do anything if configuration file -# is not present -[ -f "$CONF_FILE" ] || exit 0 - -case "$1" in - start) start ;; - stop) stop ;; - restart) restart ;; - reload) reload ;; - status) status ;; - *) - /usr/bin/echo "Usage: $INIT_FILE {start|stop|restart|reload|status}" - exit 1 - ;; -esac 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 Mar 27 00:44:19 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 26 Mar 2010 23:44:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9393] csw/mgar/pkg/imapproxy/trunk Message-ID: Revision: 9393 http://gar.svn.sourceforge.net/gar/?rev=9393&view=rev Author: chninkel Date: 2010-03-26 23:44:18 +0000 (Fri, 26 Mar 2010) Log Message: ----------- imapproxy: updated changelog Modified Paths: -------------- csw/mgar/pkg/imapproxy/trunk/checksums csw/mgar/pkg/imapproxy/trunk/files/changelog.CSW Modified: csw/mgar/pkg/imapproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/imapproxy/trunk/checksums 2010-03-26 23:42:28 UTC (rev 9392) +++ csw/mgar/pkg/imapproxy/trunk/checksums 2010-03-26 23:44:18 UTC (rev 9393) @@ -1,5 +1,5 @@ 05c9327816e6c24ba9fe253c6e76c71a README.CSW -f7a91b2816c12035ab08f355a1d44881 changelog.CSW +a782ea33ea43ac1859cd27679bc1bf9a changelog.CSW c70c04af058e01012ef1beb8caaeb296 conf_file_location.patch 645dbf4681fba2e3430b4bdfb28cb540 cswimapproxy 2d586e6018bd82b6ac4c49b75ff837ad cswimapproxy.xml Modified: csw/mgar/pkg/imapproxy/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/imapproxy/trunk/files/changelog.CSW 2010-03-26 23:42:28 UTC (rev 9392) +++ csw/mgar/pkg/imapproxy/trunk/files/changelog.CSW 2010-03-26 23:44:18 UTC (rev 9393) @@ -1,6 +1,8 @@ imapproxy (1.2.7,REV=2010.02.28) unstable * New upstream version. + * Now uses cswclassutils class action scripts for SMF support and + configuration handling. -- Yann Rouillard Sun, 28 Feb 2010 17:24:21 +0100 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 Mar 27 00:50:41 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 26 Mar 2010 23:50:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9394] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 9394 http://gar.svn.sourceforge.net/gar/?rev=9394&view=rev Author: chninkel Date: 2010-03-26 23:50:40 +0000 (Fri, 26 Mar 2010) Log Message: ----------- lftp: modified lftp m4 macros to prevent the configure script from incorrectly thinking that Sun Studio 12 CC supports the __restrict__ keyword Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/lftp/trunk/files/sun_cc_no_restrict.patch Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2010-03-26 23:44:18 UTC (rev 9393) +++ csw/mgar/pkg/lftp/trunk/Makefile 2010-03-26 23:50:40 UTC (rev 9394) @@ -42,14 +42,21 @@ DISTFILES += CSWlftp.prototype DISTFILES += changelog.CSW - -##### Build and installation information ##### - # do some type conversion before munmap call # so lftp can be compiled with sun cc # (patch only mandatory to compile with gnutls) #PATCHFILES = munmap.patch +# Sun Studio 12 cc supports the __restrict__ keyword +# but CC doesn't, that disturbs autoconf. +# so we have to apply the following modification to +# lftp-provided autoconf m4 macros +# http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=aa30765d64d4a50ad7ce83e78b5699223571ef36 +PATCHFILES += sun_cc_no_restrict.patch + +##### Build and installation information ##### + + CONFIGURE_ARGS = $(DIRPATHS) # previous maintainer compiled with openssl # instead of gnutls, no need to change that Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2010-03-26 23:44:18 UTC (rev 9393) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2010-03-26 23:50:40 UTC (rev 9394) @@ -1,6 +1,9 @@ lftp (4.0.6,REV=2010.03.26) unstable * New upstream release. + * Applied sun_cc_no_restrict.patch to prevent the configure script + from incorrectly thinking that Sun Studio 12 CC supports the __restrict__ + keyword. -- Yann Rouillard Fri, 26 Mar 2010 22:03:15 +0100 Added: csw/mgar/pkg/lftp/trunk/files/sun_cc_no_restrict.patch =================================================================== --- csw/mgar/pkg/lftp/trunk/files/sun_cc_no_restrict.patch (rev 0) +++ csw/mgar/pkg/lftp/trunk/files/sun_cc_no_restrict.patch 2010-03-26 23:50:40 UTC (rev 9394) @@ -0,0 +1,22 @@ +--- lftp-4.0.6/m4/gnulib-common.m4.orig 2010-03-27 00:36:17.789995812 +0100 ++++ lftp-4.0.6/m4/gnulib-common.m4 2010-03-27 00:37:09.978083148 +0100 +@@ -104,13 +104,14 @@ + nothing if this is not supported. Do not define if restrict is + supported directly. */ + #undef restrict +-/* Work around a bug in Sun C++: it does not support _Restrict, even +- though the corresponding Sun C compiler does, which causes +- "#define restrict _Restrict" in the previous line. Perhaps some future +- version of Sun C++ will work with _Restrict; if so, it'll probably +- define __RESTRICT, just as Sun C does. */ ++/* Work around a bug in Sun C++: it does not support _Restrict or ++ __restrict__, even though the corresponding Sun C compiler ends up with ++ "#define restrict _Restrict" or "#define restrict __restrict__" in the ++ previous line. Perhaps some future version of Sun C++ will work with ++ restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ + #if defined __SUNPRO_CC && !defined __RESTRICT + # define _Restrict ++# define __restrict__ + #endif]) + case $ac_cv_c_restrict in + restrict) ;; 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 Mar 27 00:52:15 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 26 Mar 2010 23:52:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9395] csw/mgar/pkg/lftp/trunk/checksums Message-ID: Revision: 9395 http://gar.svn.sourceforge.net/gar/?rev=9395&view=rev Author: chninkel Date: 2010-03-26 23:52:15 +0000 (Fri, 26 Mar 2010) Log Message: ----------- lftp: updated checksum Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/checksums Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2010-03-26 23:50:40 UTC (rev 9394) +++ csw/mgar/pkg/lftp/trunk/checksums 2010-03-26 23:52:15 UTC (rev 9395) @@ -1,3 +1,4 @@ 5bc881a13c106b1c97f2137ff1755817 CSWlftp.prototype -7b975100c5923f126f82db6c5acb1da3 changelog.CSW +9762d1259c88dd7dac2f9206a39e7cf5 changelog.CSW 42f31ca6b10d7bc4e9cd7408b476ee9b lftp-4.0.6.tar.gz +1a9dd9857cef5453fc14102dbc2e7713 sun_cc_no_restrict.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 27 03:29:30 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 27 Mar 2010 02:29:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9396] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9396 http://gar.svn.sourceforge.net/gar/?rev=9396&view=rev Author: wahwah Date: 2010-03-27 02:29:30 +0000 (Sat, 27 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, better RPATH handling, added unit tests. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py csw/mgar/gar/v2/lib/python/dependency_checks.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/testdata/rpaths.py csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/ldd_dash_r.yml Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-26 23:52:15 UTC (rev 9395) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-27 02:29:30 UTC (rev 9396) @@ -938,7 +938,7 @@ # "defined_symbols", "depends", "isalist", - "ldd_dash_r", + # "ldd_dash_r", "overrides", "pkgchk", "pkginfo", @@ -1179,8 +1179,8 @@ self.DumpObject(self.GetPkgchkData(), "pkgchk") self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo") self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap") - # To be used with Perl modules - self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") + # The ldd -r reporting breaks on bigger packages during yaml saving. + # self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") # This check is currently disabled, let's save time by not collecting # these data. # self.DumpObject(self.GetDefinedSymbols(), "defined_symbols") @@ -1243,7 +1243,12 @@ symbol_not_found_re = r"^\tsymbol not found:\s(?P\S+)\s+\((?P\S+)\)" only_so = r"^\t(?P\S+)$" version_so = r'^\t(?P\S+) \((?P\S+)\) =>\t \(version not found\)' - common_re = r"(%s|%s|%s|%s)" % (found_re, symbol_not_found_re, only_so, version_so) + stv_protected = (r'^\trelocation \S+ symbol: (?P\S+): ' + r'file (?P\S+): ' + r'relocation bound to a symbol with STV_PROTECTED visibility$') + common_re = (r"(%s|%s|%s|%s|%s)" + % (found_re, symbol_not_found_re, only_so, version_so, + stv_protected)) m = re.match(common_re, line) response = {} if m: @@ -1269,10 +1274,17 @@ response["soname"] = d["soname_version_not_found"] response["path"] = None response["symbol"] = None + elif d["relocation_symbol"]: + response["state"] = 'relocation-bound-to-a-symbol-with-STV_PROTECTED-visibility' + response["soname"] = None + response["path"] = d["relocation_path"] + response["symbol"] = d["relocation_symbol"] else: - raise StdoutSyntaxError("Could not parse %s" % repr(line)) + raise StdoutSyntaxError("Could not parse %s with %s" + % (repr(line), common_re)) else: - raise StdoutSyntaxError("Could not parse %s" % repr(line)) + raise StdoutSyntaxError("Could not parse %s with %s" + % (repr(line), common_re)) return response Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-26 23:52:15 UTC (rev 9395) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-27 02:29:30 UTC (rev 9396) @@ -379,6 +379,18 @@ } self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + def test_ParseLdd_StvProtectedVisibility(self): + line = ('\trelocation R_SPARC_COPY symbol: ASN1_OCTET_STRING_it: ' + 'file /opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8: ' + 'relocation bound to a symbol with STV_PROTECTED visibility') + expected = { + 'symbol': 'ASN1_OCTET_STRING_it', + 'soname': None, + 'path': '/opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8', + 'state': 'relocation-bound-to-a-symbol-with-STV_PROTECTED-visibility', + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + def test_ParseLddDashRlineManyLines(self): for line in LDD_R_OUTPUT_1.splitlines(): parsed = self.pkgstats._ParseLddDashRline(line) Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-03-26 23:52:15 UTC (rev 9395) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-03-27 02:29:30 UTC (rev 9396) @@ -3,6 +3,14 @@ import checkpkg import re +DEPRECATED_LIBRARY_LOCATIONS = ( + ("/opt/csw/lib", "libdb-4.7.so", "Deprecated Berkeley DB location"), + ("/opt/csw/lib/mysql", "libmysqlclient_r.so.15", + "Please use /opt/csw/mysql5/..."), + ("/opt/csw/lib/mysql", "libmysqlclient.so.15", + "Please use /opt/csw/mysql5/..."), +) + def Libraries(pkg_data, error_mgr, logger, path_and_pkg_by_soname): pkgname = pkg_data["basic_stats"]["pkgname"] logger.debug("Package %s", pkgname) @@ -25,15 +33,8 @@ resolved_path, path_and_pkg_by_soname[soname][resolved_path]) resolved = True req_pkg = path_and_pkg_by_soname[soname][resolved_path][-1] - # TODO: Throw an error when /opt/csw/lib/libdb-4.7.so gets resolved reason = "provides %s/%s needed by %s" % (resolved_path, soname, binary_info["path"]) - BAD_COMBINATIONS = ( - ("/opt/csw/lib", "libdb-4.7.so", "Deprecated Berkeley DB location"), - ) - logger.debug("Checking deprecated library locations.") - for bad_path, bad_soname, msg in BAD_COMBINATIONS: - # print "resolved_path == bad_path", resolved_path, bad_path, resolved_path == bad_path - # print "soname == bad_soname", soname, bad_soname, soname == bad_soname + for bad_path, bad_soname, msg in DEPRECATED_LIBRARY_LOCATIONS: if resolved_path == bad_path and soname == bad_soname: logger.debug("Bad lib found: %s/%s", bad_path, bad_soname) error_mgr.ReportError( Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-26 23:52:15 UTC (rev 9395) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-27 02:29:30 UTC (rev 9396) @@ -49,13 +49,28 @@ ARCH_LIST = ["sparc", "i386", "all"] VERSION_RE = r".*,REV=(20[01][0-9]\.[0-9][0-9]\.[0-9][0-9]).*" DO_NOT_LINK_AGAINST_THESE_SONAMES = set(["libX11.so.4"]) -DISCOURAGED_FILE_PATTERNS = (r"\.py[co]$",) -BAD_RPATH_LIST = [ - r'/opt/csw/lib/mysql/lib', - r'/opt/csw/lib/mysql/lib/sparcv9', - r'/opt/csw/lib/\$ISALIST', - r'/opt/csw/lib/$$ISALIST', - r'/opt/csw/lib/SALIST', +DISCOURAGED_FILE_PATTERNS = ( + r"\.py[co]$", + r"/lib\w+\.l?a$", +) +RPATH_PARTS = { + 'prefix': r"(?P/opt/csw)", + 'prefix_extra': r"(?P(/(?!lib)[\w-]+)*)", + 'subdirs': r"(?P(/(?!-R)[\w\-\.]+)*)", + 'isalist': r"(?P/(\$ISALIST|64))", + 'subdir2': r"(?P/[\w\-\.]+)", +} +RPATH_WHITELIST = [ + ("^" + "%(prefix)s" + "%(prefix_extra)s" + "/(lib|libexec)" + "%(subdirs)s" + "%(isalist)s?" + "%(subdir2)s?" + "$") % RPATH_PARTS, + r"^\$ORIGIN$", + r"^/usr(/(ccs|dt|openwin))?/lib(/sparcv9)?$", ] # Check ldd -r only for Perl modules SYMBOLS_CHECK_ONLY_FOR = r"^CSWpm.*$" @@ -490,9 +505,10 @@ if pkgname != pkg_data["basic_stats"]["pkgname"]: disallowed_paths = set(paths_only_allowed_in[pkgname]) intersection = disallowed_paths.intersection(paths_in_pkg) - logger.debug("Bad paths found: %s", intersection) - for bad_path in intersection: - error_mgr.ReportError("disallowed-path", bad_path) + if intersection: + logger.debug("Bad paths found: %s", intersection) + for bad_path in intersection: + error_mgr.ReportError("disallowed-path", bad_path) def CheckLinkingAgainstSunX11(pkg_data, error_mgr, logger): @@ -528,15 +544,29 @@ logger.warn(line) def CheckRpath(pkg_data, error_mgr, logger): - # for bad_rpath in BAD_RPATH_LIST: - bad_rpath_set = set(BAD_RPATH_LIST) + regex_whitelist = [re.compile(x) for x in RPATH_WHITELIST] for binary_info in pkg_data["binaries_dump_info"]: - for actual_rpath in binary_info["runpath"]: - if actual_rpath in bad_rpath_set: - error_mgr.ReportError("bad-rpath-entry", - "%s %s" % (binary_info["path"], actual_rpath)) + actual_rpaths = binary_info["runpath"] + matching = [] + not_matching = [] + for rpath in actual_rpaths: + matched = False + for white_re in regex_whitelist: + m = white_re.match(rpath) + if m: + matching.append((rpath, m.groupdict())) + matched = True + break + if matched: + matching.append(rpath) + else: + not_matching.append(rpath) + for bad in sorted(not_matching): + logger.debug("Bad rpath: %s", bad) + error_mgr.ReportError("bad-rpath-entry", bad) + def DisabledCheckForMissingSymbols(pkgs_data, debug): """Analyzes missing symbols reported by ldd -r. @@ -575,21 +605,28 @@ return errors -def CheckForMissingSymbolsDumb(pkg_data, error_mgr, logger): +def DisableCheckForMissingSymbolsDumb(pkg_data, error_mgr, logger): """Analyzes missing symbols reported by ldd -r. - Only makes sense for perl modules. + So far only made sense for perl modules. Disables because it falls over on + big KDE packages. """ pkgname = pkg_data["basic_stats"]["pkgname"] if not re.match(SYMBOLS_CHECK_ONLY_FOR, pkgname): return - found = False + symbol_not_found_was_seen = False + relocation_was_seen = False for binary_info in pkg_data["binaries_dump_info"]: for ldd_elem in pkg_data["ldd_dash_r"][binary_info["path"]]: - if ldd_elem["state"] == "symbol-not-found": + if not symbol_not_found_was_seen and ldd_elem["state"] == "symbol-not-found": error_mgr.ReportError("symbol-not-found", "e.g. %s misses %s" % (binary_info["path"], ldd_elem["symbol"])) - found = True - break - if found: - break + symbol_not_found_was_seen = True + if (not relocation_was_seen + and + ldd_elem["state"] == 'relocation-bound-to-a-symbol-with-STV_PROTECTED-visibility'): + error_mgr.ReportError(ldd_elem["state"], + "e.g. symbol: %s file: %s " + "relocation bound to a symbol with STV_PROTECTED visibility" + % (ldd_elem["symbol"], ldd_elem["path"])) + Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-26 23:52:15 UTC (rev 9395) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-27 02:29:30 UTC (rev 9396) @@ -14,6 +14,7 @@ import testdata.checkpkg_test_data_CSWdjvulibrert as td_1 import testdata.checkpkg_pkgs_data_minimal as td_2 +import testdata.rpaths BASE_DIR = os.path.dirname(__file__) TESTDATA_DIR = os.path.join(BASE_DIR, "testdata") @@ -302,5 +303,119 @@ "It should be 'username at hostname-timestamp', but it's 'build8s20090904191054'.") +class TestCheckRpath(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckRpath' + def CheckpkgTest(self): + binaries_dump_info = self.pkg_data["binaries_dump_info"] + binaries_dump_info[0]["runpath"] = testdata.rpaths.all_rpaths + self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.error_mgr_mock.ReportError('bad-rpath-entry', '$ORIGIN/..') + self.error_mgr_mock.ReportError('bad-rpath-entry', '$ORIGIN/../../../usr/lib/v9') + self.error_mgr_mock.ReportError('bad-rpath-entry', '$ORIGIN/../../usr/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '$ORIGIN/../lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '$ORIGIN/../ure-link/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '../../../../../dist/bin') + self.error_mgr_mock.ReportError('bad-rpath-entry', '../../../../dist/bin') + self.error_mgr_mock.ReportError('bad-rpath-entry', '../../../dist/bin') + self.error_mgr_mock.ReportError('bad-rpath-entry', '../../dist/bin') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/bin') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/export/home/buysse/build/expect-5.42.1/cswstage/opt/csw/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/export/home/phil/build/gettext-0.14.1/gettext-tools/intl/.libs') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/export/medusa/kenmays/build/qt-x11-free-3.3.3/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/export/medusa/kenmays/build/s_qt/qt-x11-free-3.3.3/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/export/medusa/kenmays/build/sparc_qt/qt-x11-free-3.3.4/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/export/medusa/kenmays/build/sparc_qt/qt-x11-free-3.3.4/plugins/designer') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/export/medusa/kenmays/build/sparc_qt/qt-x11-free-3.3.4/plugins/sqldrivers') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/home/harpchad/local/sparc/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/lib/sparcv9') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWcluster/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWmlib/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib/rw7') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib/stlport4') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib/v8') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib/v8plus') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib/v8plusa') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib/v8plusb') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/SUNWspro/lib/v9') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/build/michael/synce-0.8.9-buildroot/opt/csw/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/$ISALIST') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw//lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/X11/lib/') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/bdb4/lib/') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/lib/') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/lib/$') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/lib/$$ISALIST') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/lib/-R/opt/csw/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/lib/\\$ISALIST') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/lib/\\SALIST') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/lib/sparcv8plus+vis') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/mysql4//lib/mysql') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/nagios/lib/\\$ISALIST') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/openoffice.org/basis3.1/program') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/csw/openoffice.org/ure/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/cw/gcc3/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/forte8/SUNWspro/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/forte8/SUNWspro/lib/rw7') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/forte8/SUNWspro/lib/rw7/v9') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/forte8/SUNWspro/lib/v8') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/forte8/SUNWspro/lib/v9') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/schily/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/sfw/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS10/SUNWspro/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS10/SUNWspro/lib/rw7') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS10/SUNWspro/lib/v8') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS10/SUNWspro/lib/v8plus') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib/rw7') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib/rw7/v9') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib/stlport4') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib/stlport4/v9') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib/v8') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib/v8plus') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS11/SUNWspro/lib/v9') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS8/SUNWspro/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS8/SUNWspro/lib/rw7') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS8/SUNWspro/lib/rw7/v9') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS8/SUNWspro/lib/v8') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS8/SUNWspro/lib/v8plusa') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio/SOS8/SUNWspro/lib/v9') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio10/SUNWspro/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio10/SUNWspro/lib/rw7') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio10/SUNWspro/lib/rw7/v9') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio10/SUNWspro/lib/stlport4') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio10/SUNWspro/lib/stlport4/v9') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio10/SUNWspro/lib/v8') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/opt/studio10/SUNWspro/lib/v9') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/oracle/product/9.2.0/lib32') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/usr/X/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/usr/local/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/usr/local/openldap-2.3/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/usr/sfw/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/usr/ucblib') + self.error_mgr_mock.ReportError('bad-rpath-entry', '/usr/xpg4/lib') + self.error_mgr_mock.ReportError('bad-rpath-entry', 'RIGIN/../lib') + + +class TestCheckRpathBadPath(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckLibraries' + def CheckpkgTest(self): + binaries_dump_info = self.pkg_data["binaries_dump_info"] + binaries_dump_info[0]["runpath"] = ["/opt/csw/lib"] + binaries_dump_info[0]["needed sonames"] = ["libdb-4.7.so"] + self.pkg_data["depends"] = (("CSWfoo", None),) + self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({ + u'/opt/csw/lib': [u'CSWfoo'], + u'/opt/csw/lib/sparcv9': [u'CSWfoo'], + }) + self.error_mgr_mock.ReportError( + 'deprecated-library', + u'opt/csw/bin/sparcv9/rsync Deprecated Berkeley DB location ' + u'/opt/csw/lib/libdb-4.7.so') + self.pkg_data = [self.pkg_data] + + if __name__ == '__main__': unittest.main() Added: csw/mgar/gar/v2/lib/python/testdata/rpaths.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/rpaths.py (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/rpaths.py 2010-03-27 02:29:30 UTC (rev 9396) @@ -0,0 +1,187 @@ +all_rpaths = set([ + '$ORIGIN', + '$ORIGIN/..', + '$ORIGIN/../../../usr/lib/v9', + '$ORIGIN/../../usr/lib', + '$ORIGIN/../lib', + '$ORIGIN/../ure-link/lib', + '../../../../../dist/bin', + '../../../../dist/bin', + '../../../dist/bin', + '../../dist/bin', + '/bin', + '/export/home/buysse/build/expect-5.42.1/cswstage/opt/csw/lib', + '/export/home/phil/build/gettext-0.14.1/gettext-tools/intl/.libs', + '/export/medusa/kenmays/build/qt-x11-free-3.3.3/lib', + '/export/medusa/kenmays/build/s_qt/qt-x11-free-3.3.3/lib', + '/export/medusa/kenmays/build/sparc_qt/qt-x11-free-3.3.4/lib', + '/export/medusa/kenmays/build/sparc_qt/qt-x11-free-3.3.4/plugins/designer', + '/export/medusa/kenmays/build/sparc_qt/qt-x11-free-3.3.4/plugins/sqldrivers', + '/home/harpchad/local/sparc/lib', + '/lib', + '/lib/sparcv9', + '/opt/SUNWcluster/lib', + '/opt/SUNWmlib/lib', + '/opt/SUNWspro/lib', + '/opt/SUNWspro/lib/rw7', + '/opt/SUNWspro/lib/stlport4', + '/opt/SUNWspro/lib/v8', + '/opt/SUNWspro/lib/v8plus', + '/opt/SUNWspro/lib/v8plusa', + '/opt/SUNWspro/lib/v8plusb', + '/opt/SUNWspro/lib/v9', + '/opt/build/michael/synce-0.8.9-buildroot/opt/csw/lib', + '/opt/csw/$ISALIST', + '/opt/csw//lib', + '/opt/csw/X11/lib', + '/opt/csw/X11/lib/', + '/opt/csw/X11/lib/$ISALIST', + '/opt/csw/X11/lib/64', + '/opt/csw/apache2/lib', + '/opt/csw/apache2/lib/$ISALIST', + '/opt/csw/bdb33/lib', + '/opt/csw/bdb33/lib/$ISALIST', + '/opt/csw/bdb4/lib', + '/opt/csw/bdb4/lib/', + '/opt/csw/bdb4/lib/$ISALIST', + '/opt/csw/bdb42/lib', + '/opt/csw/bdb42/lib/$ISALIST', + '/opt/csw/bdb42/lib/64', + '/opt/csw/bdb43/lib', + '/opt/csw/bdb43/lib/$ISALIST', + '/opt/csw/bdb43/lib/64', + '/opt/csw/bdb44/lib', + '/opt/csw/bdb44/lib/$ISALIST', + '/opt/csw/bdb44/lib/64', + '/opt/csw/bdb47/lib', + '/opt/csw/bdb47/lib/$ISALIST', + '/opt/csw/bdb47/lib/64', + '/opt/csw/bdb48/lib', + '/opt/csw/bdb48/lib/$ISALIST', + '/opt/csw/bdb48/lib/64', + '/opt/csw/gcc3/lib', + '/opt/csw/gcc3/lib/$ISALIST', + '/opt/csw/gcc3/lib/.', + '/opt/csw/gcc3/lib/sparcv9', + '/opt/csw/gcc4/lib', + '/opt/csw/gcc4/lib/$ISALIST', + '/opt/csw/gcc4/lib/64', + '/opt/csw/gcc4/lib/gcj-4.3.3-9', + '/opt/csw/gcc4/lib/sparcv9', + '/opt/csw/kde-gcc/lib', + '/opt/csw/kde-gcc/lib/kde3', + '/opt/csw/kde/lib', + '/opt/csw/lib', + '/opt/csw/lib/', + '/opt/csw/lib/$', + '/opt/csw/lib/$$ISALIST', + '/opt/csw/lib/$ISALIST', + '/opt/csw/lib/$ISALIST/ogle', + '/opt/csw/lib/-R/opt/csw/lib', + '/opt/csw/lib/.', + '/opt/csw/lib/32', + '/opt/csw/lib/64', + '/opt/csw/lib/SALIST', + '/opt/csw/lib/X11', + '/opt/csw/lib/\\$ISALIST', + '/opt/csw/lib/\\SALIST', + '/opt/csw/lib/amanda', + '/opt/csw/lib/courier-authlib', + '/opt/csw/lib/dia', + '/opt/csw/lib/evolution/1.4', + '/opt/csw/lib/evolution/2.2', + '/opt/csw/lib/evolution/2.6', + '/opt/csw/lib/evolution/2.8', + '/opt/csw/lib/evolution/2.8/components', + '/opt/csw/lib/evolution/nss/lib', + '/opt/csw/lib/gnopernicus-1.0', + '/opt/csw/lib/gnucash', + '/opt/csw/lib/graphviz', + '/opt/csw/lib/htdig', + '/opt/csw/lib/htdig_db', + '/opt/csw/lib/lib', + '/opt/csw/lib/libsunmath.so', + '/opt/csw/lib/mozilla', + '/opt/csw/lib/mysql', + '/opt/csw/lib/octave-3.0.0', + '/opt/csw/lib/ogle', + '/opt/csw/lib/perl/5.8.8/CORE', + '/opt/csw/lib/purple-2', + '/opt/csw/lib/sasl2', + '/opt/csw/lib/sparcv8', + '/opt/csw/lib/sparcv8plus', + '/opt/csw/lib/sparcv8plus+vis', + '/opt/csw/lib/sparcv9', + '/opt/csw/lib/svn', + '/opt/csw/lib/xfce4/modules', + '/opt/csw/libexec/firefox/lib/firefox-1.5.0.6', + '/opt/csw/libexec/firefox/lib/firefox-1.5.0.7', + '/opt/csw/mozilla/firefox/lib', + '/opt/csw/mozilla/thunderbird/lib', + '/opt/csw/mysql4//lib/mysql', + '/opt/csw/mysql4/lib/mysql', + '/opt/csw/mysql4/lib/mysql/$ISALIST', + '/opt/csw/mysql4/lib/mysql/sparcv9', + '/opt/csw/mysql5/lib', + '/opt/csw/mysql5/lib/$ISALIST', + '/opt/csw/mysql5/lib/$ISALIST/mysql', + '/opt/csw/mysql5/lib/64', + '/opt/csw/mysql5/lib/64/$ISALIST/mysql', + '/opt/csw/mysql5/lib/64/mysql', + '/opt/csw/mysql5/lib/mysql', + '/opt/csw/mysql5/lib/mysql/$ISALIST', + '/opt/csw/nagios/lib', + '/opt/csw/nagios/lib/\\$ISALIST', + '/opt/csw/openoffice.org/basis3.1/program', + '/opt/csw/openoffice.org/ure/lib', + '/opt/csw/postgresql/lib', + '/opt/csw/postgresql/lib/$ISALIST', + '/opt/csw/postgresql/lib/sparcv9', + '/opt/csw/ssl/lib', + '/opt/cw/gcc3/lib', + '/opt/forte8/SUNWspro/lib', + '/opt/forte8/SUNWspro/lib/rw7', + '/opt/forte8/SUNWspro/lib/rw7/v9', + '/opt/forte8/SUNWspro/lib/v8', + '/opt/forte8/SUNWspro/lib/v9', + '/opt/schily/lib', + '/opt/sfw/lib', + '/opt/studio/SOS10/SUNWspro/lib', + '/opt/studio/SOS10/SUNWspro/lib/rw7', + '/opt/studio/SOS10/SUNWspro/lib/v8', + '/opt/studio/SOS10/SUNWspro/lib/v8plus', + '/opt/studio/SOS11/SUNWspro/lib', + '/opt/studio/SOS11/SUNWspro/lib/rw7', + '/opt/studio/SOS11/SUNWspro/lib/rw7/v9', + '/opt/studio/SOS11/SUNWspro/lib/stlport4', + '/opt/studio/SOS11/SUNWspro/lib/stlport4/v9', + '/opt/studio/SOS11/SUNWspro/lib/v8', + '/opt/studio/SOS11/SUNWspro/lib/v8plus', + '/opt/studio/SOS11/SUNWspro/lib/v9', + '/opt/studio/SOS8/SUNWspro/lib', + '/opt/studio/SOS8/SUNWspro/lib/rw7', + '/opt/studio/SOS8/SUNWspro/lib/rw7/v9', + '/opt/studio/SOS8/SUNWspro/lib/v8', + '/opt/studio/SOS8/SUNWspro/lib/v8plusa', + '/opt/studio/SOS8/SUNWspro/lib/v9', + '/opt/studio10/SUNWspro/lib', + '/opt/studio10/SUNWspro/lib/rw7', + '/opt/studio10/SUNWspro/lib/rw7/v9', + '/opt/studio10/SUNWspro/lib/stlport4', + '/opt/studio10/SUNWspro/lib/stlport4/v9', + '/opt/studio10/SUNWspro/lib/v8', + '/opt/studio10/SUNWspro/lib/v9', + '/oracle/product/9.2.0/lib32', + '/usr/X/lib', + '/usr/ccs/lib', + '/usr/ccs/lib/sparcv9', + '/usr/dt/lib', + '/usr/lib', + '/usr/lib/sparcv9', + '/usr/local/lib', + '/usr/local/openldap-2.3/lib', + '/usr/openwin/lib', + '/usr/sfw/lib', + '/usr/ucblib', + '/usr/xpg4/lib', + 'RIGIN/../lib']) Added: csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/ldd_dash_r.yml =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/ldd_dash_r.yml (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/ldd_dash_r.yml 2010-03-27 02:29:30 UTC (rev 9396) @@ -0,0 +1 @@ +[] 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 Mar 27 14:54:45 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 27 Mar 2010 13:54:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[9397] csw/mgar/pkg/bash/trunk Message-ID: Revision: 9397 http://gar.svn.sourceforge.net/gar/?rev=9397&view=rev Author: chninkel Date: 2010-03-27 13:54:37 +0000 (Sat, 27 Mar 2010) Log Message: ----------- bash: updated to patch level 05 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 2010-03-27 02:29:30 UTC (rev 9396) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-03-27 13:54:37 UTC (rev 9397) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = bash -GARVERSION = 4.1.2 +GARVERSION = 4.1.5 CATEGORIES = devel DESCRIPTION = A sh-compatible command language interpreter Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2010-03-27 02:29:30 UTC (rev 9396) +++ csw/mgar/pkg/bash/trunk/checksums 2010-03-27 13:54:37 UTC (rev 9397) @@ -1,6 +1,9 @@ 9800d8724815fd84994d9be65ab5e7b8 bash-4.1.tar.gz 582dea5671b557f783e18629c2f77b68 bash41-001 118d465095d4a4706eb1d34696a2666a bash41-002 -5e391cd68f85c1af76bddf7b7b84549b changelog.CSW +120f7cf039a40d35fe375e59d6f17adc bash41-003 +336ee037fc2cc1e2350b05097fbdc87c bash41-004 +9471e666797f0b03eb2175ed752a9550 bash41-005 +f5809f583f627d95c5803560805316ca changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-03-27 02:29:30 UTC (rev 9396) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-03-27 13:54:37 UTC (rev 9397) @@ -1,3 +1,9 @@ +bash (4.1.04,REV=2010.03.27) unstable + + * Added bash patches bash41-003 and bash41-005. + + -- Yann Rouillard Sat, 27 Mar 2010 13:57:16 +0100 + bash (4.1.02,REV=2010.03.13) unstable * Added bash patches bash41-001 and bash41-002. 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 Mar 27 15:36:36 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 27 Mar 2010 14:36:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9398] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 9398 http://gar.svn.sourceforge.net/gar/?rev=9398&view=rev Author: chninkel Date: 2010-03-27 14:36:32 +0000 (Sat, 27 Mar 2010) Log Message: ----------- lftp: don't use opencsw getopt.h as it breaks the compilation Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2010-03-27 13:54:37 UTC (rev 9397) +++ csw/mgar/pkg/lftp/trunk/Makefile 2010-03-27 14:36:32 UTC (rev 9398) @@ -54,13 +54,15 @@ # http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=aa30765d64d4a50ad7ce83e78b5699223571ef36 PATCHFILES += sun_cc_no_restrict.patch +PATCHFILES += dont_use_csw_getopt_h.patch + ##### Build and installation information ##### CONFIGURE_ARGS = $(DIRPATHS) # previous maintainer compiled with openssl # instead of gnutls, no need to change that -#CONFIGURE_ARGS += --without-gnutls --with-openssl=/opt/csw +CONFIGURE_ARGS += --without-gnutls --with-openssl=/opt/csw TEST_SCRIPTS = Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2010-03-27 13:54:37 UTC (rev 9397) +++ csw/mgar/pkg/lftp/trunk/checksums 2010-03-27 14:36:32 UTC (rev 9398) @@ -1,4 +1,5 @@ 5bc881a13c106b1c97f2137ff1755817 CSWlftp.prototype 9762d1259c88dd7dac2f9206a39e7cf5 changelog.CSW +a8baca88197dfe533c639c1fe866fa5c dont_use_csw_getopt_h.patch 42f31ca6b10d7bc4e9cd7408b476ee9b lftp-4.0.6.tar.gz 1a9dd9857cef5453fc14102dbc2e7713 sun_cc_no_restrict.patch 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 Mar 27 16:37:14 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 27 Mar 2010 15:37:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[9399] csw/mgar/pkg/lftp/trunk/files/dont_use_csw_getopt_h. patch Message-ID: Revision: 9399 http://gar.svn.sourceforge.net/gar/?rev=9399&view=rev Author: chninkel Date: 2010-03-27 15:37:14 +0000 (Sat, 27 Mar 2010) Log Message: ----------- lftp: oups, I forgot the patch Added Paths: ----------- csw/mgar/pkg/lftp/trunk/files/dont_use_csw_getopt_h.patch Added: csw/mgar/pkg/lftp/trunk/files/dont_use_csw_getopt_h.patch =================================================================== --- csw/mgar/pkg/lftp/trunk/files/dont_use_csw_getopt_h.patch (rev 0) +++ csw/mgar/pkg/lftp/trunk/files/dont_use_csw_getopt_h.patch 2010-03-27 15:37:14 UTC (rev 9399) @@ -0,0 +1,26 @@ +--- lftp-4.0.6/m4/getopt.m4.orig Sat Mar 27 14:36:10 2010 ++++ lftp-4.0.6/m4/getopt.m4 Sat Mar 27 14:39:57 2010 +@@ -57,7 +57,7 @@ + gl_CHECK_NEXT_HEADERS([getopt.h]) + AC_CHECK_HEADERS_ONCE([getopt.h]) + if test $ac_cv_header_getopt_h = yes; then +- HAVE_GETOPT_H=1 ++ HAVE_GETOPT_H=0 + else + HAVE_GETOPT_H=0 + fi +@@ -67,12 +67,12 @@ + + dnl Test whether is available. + if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then +- AC_CHECK_HEADERS([getopt.h], [], [gl_replace_getopt=yes]) ++ AC_CHECK_HEADERS([getopt.h], [gl_replace_getopt=yes], [gl_replace_getopt=yes]) + fi + + dnl Test whether the function getopt_long is available. + if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then +- AC_CHECK_FUNCS([getopt_long_only], [], [gl_replace_getopt=yes]) ++ AC_CHECK_FUNCS([getopt_long_only], [gl_replace_getopt=yes], [gl_replace_getopt=yes]) + fi + + dnl BSD getopt_long uses an incompatible method to reset option processing. 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 Mar 27 16:38:41 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 27 Mar 2010 15:38:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9400] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 9400 http://gar.svn.sourceforge.net/gar/?rev=9400&view=rev Author: chninkel Date: 2010-03-27 15:38:41 +0000 (Sat, 27 Mar 2010) Log Message: ----------- lftp: switched to dynamic prototype Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/lftp/trunk/files/CSWlftp.prototype Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2010-03-27 15:37:14 UTC (rev 9399) +++ csw/mgar/pkg/lftp/trunk/Makefile 2010-03-27 15:38:41 UTC (rev 9400) @@ -16,7 +16,7 @@ GARVERSION = 4.0.6 CATEGORIES = net -DESCRIPTION = sophisticated command-line ftp/http client +DESCRIPTION = A sophisticated command-line ftp/http client define BLURB lftp is a sophisticated command line based file transfer program. Supported protocols include FTP, HTTP, SFTP, and FISH. It has a multithreaded design allowing you to issue and execute multiple commands simultaneously or in the background. It also features mirroring capabilities and will reconnect and continue transfers in the event of a disconnection. Also, if you quit the program while transfers are still in progress, it will switch to nohup mode and finish the transfers in the background. Additional protocols supported: FTP over HTTP proxy, HTTPS and FTP over SSL. There are lots of tunable parameters, including rate limitation, number of connections limitation and more. endef @@ -26,11 +26,7 @@ RUNTIME_DEP_PKGS = CSWexpat CSWggettextrt CSWiconv CSWosslrt CSWreadline -# we're using conf handling class from the cswclassutils package -RUNTIME_DEP_PKGS += CSWcswclassutils -SPKG_CLASSES = none cswpreserveconf - ###### Upstream and opencsw files information ####### MASTER_SITES = http://ftp.yars.free.net/pub/source/lftp/ @@ -39,7 +35,6 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWlftp.prototype DISTFILES += changelog.CSW # do some type conversion before munmap call @@ -56,6 +51,8 @@ PATCHFILES += dont_use_csw_getopt_h.patch +PRESERVECONF = /opt/csw/etc/lftp.conf + ##### Build and installation information ##### @@ -69,7 +66,7 @@ include gar/category.mk post-merge: - @ginstall -D $(PKGROOT)/$(sysconfdir)/lftp.conf $(PKGROOT)/$(sysconfdir)/lftp.conf.CSW @ginstall -D $(DOWNLOADDIR)/changelog.CSW $(PKGROOT)/$(docdir)/lftp/changelog.CSW + @rm $(PKGROOT)/$(libdir)/charset.alias @$(MAKECOOKIE) Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2010-03-27 15:37:14 UTC (rev 9399) +++ csw/mgar/pkg/lftp/trunk/checksums 2010-03-27 15:38:41 UTC (rev 9400) @@ -1,5 +1,4 @@ -5bc881a13c106b1c97f2137ff1755817 CSWlftp.prototype -9762d1259c88dd7dac2f9206a39e7cf5 changelog.CSW +8d5bb5bcf431f9e256836bbfa95ea374 changelog.CSW a8baca88197dfe533c639c1fe866fa5c dont_use_csw_getopt_h.patch 42f31ca6b10d7bc4e9cd7408b476ee9b lftp-4.0.6.tar.gz 1a9dd9857cef5453fc14102dbc2e7713 sun_cc_no_restrict.patch Deleted: csw/mgar/pkg/lftp/trunk/files/CSWlftp.prototype =================================================================== --- csw/mgar/pkg/lftp/trunk/files/CSWlftp.prototype 2010-03-27 15:37:14 UTC (rev 9399) +++ csw/mgar/pkg/lftp/trunk/files/CSWlftp.prototype 2010-03-27 15:38:41 UTC (rev 9400) @@ -1,50 +0,0 @@ -f none /opt/csw/bin/lftp 0755 root bin -f none /opt/csw/bin/lftpget 0755 root bin -f cswpreserveconf /opt/csw/etc/lftp.conf.CSW 0644 root bin -d none /opt/csw/lib/lftp 0755 root bin -d none /opt/csw/share/doc/lftp 0755 root bin -f none /opt/csw/share/doc/lftp/changelog.CSW 0644 root bin -d none /opt/csw/share/lftp 0755 root bin -f none /opt/csw/share/lftp/convert-netscape-cookies 0755 root bin -f none /opt/csw/share/lftp/import-ncftp 0755 root bin -f none /opt/csw/share/lftp/import-netscape 0755 root bin -f none /opt/csw/share/lftp/verify-file 0755 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/lftp.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/lftp.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/lftp.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/lftp.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/lftp.mo 0644 root bin -d none /opt/csw/share/locale/ko 0755 root bin -d none /opt/csw/share/locale/ko/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/ko/LC_MESSAGES/lftp.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/lftp.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/lftp.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/lftp.mo 0644 root bin -d none /opt/csw/share/locale/zh_CN 0755 root bin -d none /opt/csw/share/locale/zh_CN/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/zh_CN/LC_MESSAGES/lftp.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/lftp.mo 0644 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/lftp.1 0644 root bin -f none /opt/csw/share/man/man1/lftpget.1 0644 root bin -i copyright=CSWlftp.copyright -i depend=CSWlftp.depend -i pkginfo=CSWlftp.pkginfo Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2010-03-27 15:37:14 UTC (rev 9399) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2010-03-27 15:38:41 UTC (rev 9400) @@ -4,6 +4,9 @@ * Applied sun_cc_no_restrict.patch to prevent the configure script from incorrectly thinking that Sun Studio 12 CC supports the __restrict__ keyword. + * Applied dont_use_csw_getopt_h.patch to prevent lftp from using opencsw + getopt.h as it breaks the build. + * Switched to gar dynamic prototype. -- Yann Rouillard Fri, 26 Mar 2010 22:03:15 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Mar 27 16:49:36 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 27 Mar 2010 15:49:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9401] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9401 http://gar.svn.sourceforge.net/gar/?rev=9401&view=rev Author: wahwah Date: 2010-03-27 15:49:35 +0000 (Sat, 27 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, fixed a bug with a tag parameter containing colons. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-27 15:38:41 UTC (rev 9400) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-27 15:49:35 UTC (rev 9401) @@ -833,7 +833,7 @@ """ level_1 = line.strip().split(":") if len(level_1) > 1: - data_1 = level_1[1] + data_1 = ":".join(level_1[1:]) pkgname = level_1[0] else: data_1 = level_1[0] Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-27 15:38:41 UTC (rev 9400) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-27 15:49:35 UTC (rev 9401) @@ -222,7 +222,12 @@ self.assertEquals(("CSWfoo", "foo-tag", "foo-info1 foo-info2"), checkpkg.ParseTagLine(line)) + def testParseTagLine_WithUrl(self): + line = "CSWfoo: tag-with-an-url http://www.example.com/" + self.assertEquals(("CSWfoo", "tag-with-an-url", "http://www.example.com/"), + checkpkg.ParseTagLine(line)) + class ParseOverrideLineUnitTest(unittest.TestCase): def setUp(self): 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 Mar 27 16:52:39 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 27 Mar 2010 15:52:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9402] csw/mgar/pkg/bash/trunk/Makefile Message-ID: Revision: 9402 http://gar.svn.sourceforge.net/gar/?rev=9402&view=rev Author: chninkel Date: 2010-03-27 15:52:39 +0000 (Sat, 27 Mar 2010) Log Message: ----------- bash: added dependancy on texinfo Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-03-27 15:49:35 UTC (rev 9401) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-03-27 15:52:39 UTC (rev 9402) @@ -28,6 +28,7 @@ RUNTIME_DEP_PKGS = CSWggettextrt RUNTIME_DEP_PKGS += CSWiconv +RUNTIME_DEP_PKGS += CSWtexinfo SPKG_SOURCEURL = http://tiswww.case.edu/php/chet/bash/bashtop.html 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 Mar 27 17:03:21 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 27 Mar 2010 16:03:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9403] csw/mgar/pkg/bash/trunk/Makefile Message-ID: Revision: 9403 http://gar.svn.sourceforge.net/gar/?rev=9403&view=rev Author: chninkel Date: 2010-03-27 16:03:21 +0000 (Sat, 27 Mar 2010) Log Message: ----------- bash: overrides checkpkg check Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-03-27 15:52:39 UTC (rev 9402) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-03-27 16:03:21 UTC (rev 9403) @@ -34,6 +34,8 @@ SPKG_CLASSES = none build +CHECKPKG_OVERRIDES_CSWbash += surplus-dependency|CSWtexinfo + ###### Upstream and opencsw files information ####### # 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 hson at users.sourceforge.net Sat Mar 27 17:23:04 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 27 Mar 2010 16:23:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[9404] csw/mgar/pkg/tcl/tags Message-ID: Revision: 9404 http://gar.svn.sourceforge.net/gar/?rev=9404&view=rev Author: hson Date: 2010-03-27 16:23:04 +0000 (Sat, 27 Mar 2010) Log Message: ----------- tcl: Keep split-modulated version for future use Added Paths: ----------- csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/ csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/Makefile csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/checksums csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/files/tclInt.h.patch Removed Paths: ------------- csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/Makefile csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/checksums Deleted: csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-03-19 10:07:39 UTC (rev 9248) +++ csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/Makefile 2010-03-27 16:23:04 UTC (rev 9404) @@ -1,69 +0,0 @@ -GARNAME = tcl -GARVERSION = 8.5.8 -CATEGORIES = lang - -EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 8.4.19 8.5.8 -# The legacy library was not available in 64 bit, so don't bother compiling it -SKIP_MODULATIONS = isa-sparcv9-garversion-8.4.19 isa-amd64-garversion-8.4.19 - -DESCRIPTION = Tcl programming language -define BLURB -endef - -SF_PROJ = tcl -MASTER_SITES = $(SF_MIRRORS) -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)$(VERSION)-src.tar.gz) -DISTFILES = $(SOURCEFILES) -NOEXTRACT = $(filter-out $(GARNAME)$(GARVERSION)-src.tar.gz,$(SOURCEFILES)) - -# Fix for finding libsunmath on i386 and amd64 -PATCHFILES-8.5.8 = configure.patch -PATCHFILES-8.5.8 += tcl.m4.patch - -PATCHFILES = $(PATCHFILES-$(GARVERSION)) -ALLFILES_PATCHFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(PATCHFILES-$(VERSION))) - -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = $(GARNAME)(\d+(?:\.\d+)*)-src.tar.gz - -VENDOR_URL = http://www.tcl.tk/ -LICENSE = license.terms - -DISTNAME = $(GARNAME)$(GARVERSION) -PATCHDIR = $(WORKDIR)/$(DISTNAME) -WORKSRC = $(WORKDIR)/$(DISTNAME)/unix - -BUILD64-8.5.8 = 1 -BUILD64 = $(BUILD64-$(GARVERSION)) -NOISAEXEC = 1 - -INCLUDE_FLAGS = - -CONFIGURE_ARGS = $(DIRPATHS) - -# tk need the static tclstub library for some reason -MERGE_EXCLUDE_STATICLIBS = - -MERGE_SCRIPTS_isa-default-garversion-8.4.19 = copy-lib-only - -MERGE_SCRIPTS_isa-default-garversion-8.5.8 = copy-all -MERGE_SCRIPTS_isa-extra-garversion-8.5.8 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-8.5.8 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - -include gar/category.mk - -# CFLAGS := $(filter-out -I%,$(CFLAGS)) -DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS)) - -pre-configure-modulated: - @echo " ==> Regenerating build tools..." - @(cd $(WORKSRC) ; cp -p ../license.terms .; autoconf) - @$(MAKECOOKIE) - -merge-copy-lib-only: - ginstall -d $(PKGROOT)$(libdir) - ginstall $(INSTALLISADIR)$(libdir)/*.so $(PKGROOT)$(libdir) - @$(MAKECOOKIE) Copied: csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/Makefile (from rev 9272, csw/mgar/pkg/tcl/trunk/Makefile) =================================================================== --- csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/Makefile (rev 0) +++ csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/Makefile 2010-03-27 16:23:04 UTC (rev 9404) @@ -0,0 +1,74 @@ +GARNAME = tcl +GARVERSION = 8.5.8 +CATEGORIES = lang + +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 8.4.19 8.5.8 +# The legacy library was not available in 64 bit, so don't bother compiling it +SKIP_MODULATIONS = isa-sparcv9-garversion-8.4.19 isa-amd64-garversion-8.4.19 + +DESCRIPTION = Tcl programming language +define BLURB +endef + +SF_PROJ = tcl +MASTER_SITES = $(SF_MIRRORS) +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)$(VERSION)-src.tar.gz) +DISTFILES = $(SOURCEFILES) +NOEXTRACT = $(filter-out $(GARNAME)$(GARVERSION)-src.tar.gz,$(SOURCEFILES)) + +# Fix for finding libsunmath on i386 and amd64 +PATCHFILES-8.5.8 = configure.patch +PATCHFILES-8.5.8 += tcl.m4.patch +PATCHFILES-8.5.8 += tclInt.h.patch + +PATCHFILES = $(PATCHFILES-$(GARVERSION)) +ALLFILES_PATCHFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(PATCHFILES-$(VERSION))) + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = $(GARNAME)(\d+(?:\.\d+)*)-src.tar.gz + +VENDOR_URL = http://www.tcl.tk/ +LICENSE = license.terms + +DISTNAME = $(GARNAME)$(GARVERSION) +PATCHDIR = $(WORKDIR)/$(DISTNAME) +WORKSRC = $(WORKDIR)/$(DISTNAME)/unix + +BUILD64-8.5.8 = 1 +BUILD64 = $(BUILD64-$(GARVERSION)) +NOISAEXEC = 1 + +INCLUDE_FLAGS = + +CONFIGURE_ARGS = $(DIRPATHS) + +INSTALL_ARGS-8.4.19 = install +INSTALL_ARGS-8.5.8 = install install-private-headers install-tzdata install-msgs +INSTALL_ARGS = $(INSTALL_ARGS-$(GARVERSION)) + +# tk need the static tclstub library for some reason +MERGE_EXCLUDE_STATICLIBS = + +MERGE_SCRIPTS_isa-default-garversion-8.4.19 = copy-lib-only + +MERGE_SCRIPTS_isa-default-garversion-8.5.8 = copy-all +MERGE_SCRIPTS_isa-extra-garversion-8.5.8 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-8.5.8 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + +include gar/category.mk + +# CFLAGS := $(filter-out -I%,$(CFLAGS)) +DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS)) + +pre-configure-modulated: + @echo " ==> Regenerating build tools..." + @(cd $(WORKSRC) ; cp -p ../license.terms .; autoconf) + @$(MAKECOOKIE) + +merge-copy-lib-only: + ginstall -d $(PKGROOT)$(libdir) + ginstall $(INSTALLISADIR)$(libdir)/*.so $(PKGROOT)$(libdir) + @$(MAKECOOKIE) Deleted: csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/checksums =================================================================== --- csw/mgar/pkg/tcl/trunk/checksums 2010-03-19 10:07:39 UTC (rev 9248) +++ csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/checksums 2010-03-27 16:23:04 UTC (rev 9404) @@ -1,4 +0,0 @@ -dc8664f3dc92693aaaad68785e4426ae configure.patch -cc9b1bd7ddf8e27e97ef464806885349 tcl.m4.patch -ade2c033a7b545ee108f3fdfeb629fcf tcl8.4.19-src.tar.gz -7f123e53b3daaaba2478d3af5a0752e3 tcl8.5.8-src.tar.gz Copied: csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/checksums (from rev 9272, csw/mgar/pkg/tcl/trunk/checksums) =================================================================== --- csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/checksums (rev 0) +++ csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/checksums 2010-03-27 16:23:04 UTC (rev 9404) @@ -0,0 +1,5 @@ +dc8664f3dc92693aaaad68785e4426ae configure.patch +cc9b1bd7ddf8e27e97ef464806885349 tcl.m4.patch +ade2c033a7b545ee108f3fdfeb629fcf tcl8.4.19-src.tar.gz +7f123e53b3daaaba2478d3af5a0752e3 tcl8.5.8-src.tar.gz +3c9c100904b6ba774a679ad7f2b4a036 tclInt.h.patch Copied: csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/files/tclInt.h.patch (from rev 9272, csw/mgar/pkg/tcl/trunk/files/tclInt.h.patch) =================================================================== --- csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/files/tclInt.h.patch (rev 0) +++ csw/mgar/pkg/tcl/tags/tcl-8.5.8-with-8.4/files/tclInt.h.patch 2010-03-27 16:23:04 UTC (rev 9404) @@ -0,0 +1,11 @@ +--- ../build-isa-sparcv8-garversion-8.5.8/tcl8.5.8/generic/tclInt.h 2009-10-18 13:21:38.000000000 +0200 ++++ tcl8.5.8/generic/tclInt.h 2010-03-19 19:06:24.590674715 +0100 +@@ -60,7 +60,7 @@ + #else + #include + #endif +-#ifdef STDC_HEADERS ++#if defined(STDC_HEADERS) || defined(__sun) + #include + #else + typedef int ptrdiff_t; 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 Mar 27 17:36:10 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 27 Mar 2010 16:36:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9405] csw/mgar/pkg/bash/trunk/Makefile Message-ID: Revision: 9405 http://gar.svn.sourceforge.net/gar/?rev=9405&view=rev Author: chninkel Date: 2010-03-27 16:36:10 +0000 (Sat, 27 Mar 2010) Log Message: ----------- bash: dont depend on texinfo for now Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-03-27 16:23:04 UTC (rev 9404) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-03-27 16:36:10 UTC (rev 9405) @@ -28,7 +28,6 @@ RUNTIME_DEP_PKGS = CSWggettextrt RUNTIME_DEP_PKGS += CSWiconv -RUNTIME_DEP_PKGS += CSWtexinfo SPKG_SOURCEURL = http://tiswww.case.edu/php/chet/bash/bashtop.html @@ -103,3 +102,4 @@ done ) ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)$(docdir)/$(GARNAME)/changelog.CSW ginstall -D $(WORKDIR_FIRSTMOD)/shells $(PKGROOT)/etc/shells + rm -f $(PKGROOT)/$(infodir)/bash.info 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 Mar 27 18:18:01 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 27 Mar 2010 17:18:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[9406] csw/mgar/pkg/bash/trunk/Makefile Message-ID: Revision: 9406 http://gar.svn.sourceforge.net/gar/?rev=9406&view=rev Author: chninkel Date: 2010-03-27 17:17:56 +0000 (Sat, 27 Mar 2010) Log Message: ----------- bash: deleted checkpkg override Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-03-27 16:36:10 UTC (rev 9405) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-03-27 17:17:56 UTC (rev 9406) @@ -33,8 +33,6 @@ SPKG_CLASSES = none build -CHECKPKG_OVERRIDES_CSWbash += surplus-dependency|CSWtexinfo - ###### Upstream and opencsw files information ####### # 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 wahwah at users.sourceforge.net Sun Mar 28 13:32:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 28 Mar 2010 11:32:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9407] csw/mgar/gar/v2/lib/python/package_checks_test.py Message-ID: Revision: 9407 http://gar.svn.sourceforge.net/gar/?rev=9407&view=rev Author: wahwah Date: 2010-03-28 11:32:00 +0000 (Sun, 28 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, adjusting the unit test for the library check, deprecated-library error tag. In the set check functions, the pkgname needs to be included in the arguments. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-27 17:17:56 UTC (rev 9406) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-28 11:32:00 UTC (rev 9407) @@ -411,6 +411,7 @@ u'/opt/csw/lib/sparcv9': [u'CSWfoo'], }) self.error_mgr_mock.ReportError( + 'CSWrsync', 'deprecated-library', u'opt/csw/bin/sparcv9/rsync Deprecated Berkeley DB location ' u'/opt/csw/lib/libdb-4.7.so') 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 Mar 28 14:04:52 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 28 Mar 2010 12:04:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9408] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9408 http://gar.svn.sourceforge.net/gar/?rev=9408&view=rev Author: bdwalton Date: 2010-03-28 12:04:52 +0000 (Sun, 28 Mar 2010) Log Message: ----------- gar: checkpkg: add test to catch invalid vendor urls in pkginfo Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-28 11:32:00 UTC (rev 9407) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-28 12:04:52 UTC (rev 9408) @@ -130,6 +130,11 @@ error_mgr.ReportError("pkginfo-description-not-starting-with-uppercase", desc) +def CheckVendorURL(pkg_data, error_mgr, logger): + vendorurl = pkg_data["pkginfo"]["VENDOR"].split(" ")[0] + vendorurl_re = r"^(http|ftp)\://.+\..+$" + if not re.match(vendorurl_re, vendorurl): + error_mgr.ReportError("pkginfo-bad-vendorurl", vendorurl, "Solution: add VENDOR_URL to GAR Recipe") def CheckCatalogname(pkg_data, error_mgr, logger): pkginfo = pkg_data["pkginfo"] Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-28 11:32:00 UTC (rev 9407) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-28 12:04:52 UTC (rev 9408) @@ -418,5 +418,25 @@ self.pkg_data = [self.pkg_data] +class TestCheckVendorURL_BadUrl(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = "CheckVendorURL" + def CheckpkgTest(self): + # Injecting the data to be examined. + self.pkg_data["pkginfo"]["VENDOR"] = "badurl" + # Expecting the following method to be called. + self.error_mgr_mock.ReportError( + "pkginfo-bad-vendorurl", + "badurl", + "Solution: add VENDOR_URL to GAR Recipe") + + +class TestCheckVendorURL_Good(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = "CheckVendorURL" + def CheckpkgTest(self): + self.pkg_data["pkginfo"]["VENDOR"] = "http://www.example.com/" + # No call to error_mgr_mock means that no errors should be reported: the + # URL is okay. + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Mar 28 15:11:34 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 28 Mar 2010 13:11:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[9409] csw/mgar/gar/v2 Message-ID: Revision: 9409 http://gar.svn.sourceforge.net/gar/?rev=9409&view=rev Author: wahwah Date: 2010-03-28 13:11:34 +0000 (Sun, 28 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, better message handling, added CheckpkgMessenger class. Printing GAR line suggestions together near the end of the output. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg_run_modules.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py csw/mgar/gar/v2/lib/python/gartest.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/tests/static/example/checksums Modified: csw/mgar/gar/v2/bin/checkpkg_run_modules.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg_run_modules.py 2010-03-28 12:04:52 UTC (rev 9408) +++ csw/mgar/gar/v2/bin/checkpkg_run_modules.py 2010-03-28 13:11:34 UTC (rev 9409) @@ -39,6 +39,8 @@ f.close() if screen_report: sys.stdout.write(screen_report) + else: + logging.debug("No screen report.") sys.exit(exit_code) Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-28 12:04:52 UTC (rev 9408) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-28 13:11:34 UTC (rev 9409) @@ -68,33 +68,39 @@ ) REPORT_TMPL = u"""#if $missing_deps or $surplus_deps or $orphan_sonames -# $pkgname: +Missing dependencies of $pkgname: #end if #if $missing_deps -# SUGGESTION: you may want to add some or all of the following as dependencies: #for $pkg, $reasons in $sorted($missing_deps) -# $pkg, reasons: +$pkg, reasons: #for $reason in $reasons -# - $reason + - $reason #end for RUNTIME_DEP_PKGS_$pkgname += $pkg #end for #end if #if $surplus_deps -# If you don't know of any reasons to include these dependencies, you might -# remove them: +If you don't know of any reasons to include these dependencies, you might remove them: #for $pkg in $sorted($surplus_deps) -# ? $pkg +? $pkg #end for #end if """ -SCREEN_ERROR_REPORT_TMPL = u"""#if $errors and $debug +SCREEN_ERROR_REPORT_TMPL = u"""#if $errors +#if $debug ERROR: One or more errors have been found by $name. +#end if #for $pkgname in $errors $pkgname: #for $error in $errors[$pkgname] +#if $debug $repr($error) +#elif $error.msg +$textwrap.fill($error.msg, 78, initial_indent="# ", subsequent_indent="# ") +# -> $repr($error) + +#end if #end for #end for #else @@ -102,6 +108,19 @@ OK: $repr($name) module found no problems. #end if #end if +#if $messages +#for $msg in $messages +$textwrap.fill($msg, 78, initial_indent="# ", subsequent_indent="# ") +#end for +#end if +#if $gar_lines + +# Checkpkg suggests adding the following lines to the GAR recipe, +# see above for details: +#for $line in $gar_lines +$line +#end for +#end if """ # http://www.cheetahtemplate.org/docs/users_guide_html_multipage/language.directives.closures.html @@ -154,18 +173,6 @@ return options, set(args) -def FormatDepsReport(pkgname, missing_deps, surplus_deps, orphan_sonames): - """To be removed.""" - namespace = { - "pkgname": pkgname, - "missing_deps": missing_deps, - "surplus_deps": surplus_deps, - "orphan_sonames": orphan_sonames, - } - t = Template.Template(REPORT_TMPL, searchList=[namespace]) - return unicode(t) - - def ExtractDescription(pkginfo): desc_re = re.compile(DESCRIPTION_RE) m = re.match(desc_re, pkginfo["NAME"]) @@ -590,11 +597,10 @@ self.msg = msg def __repr__(self): - return (u"CheckpkgTag(%s, %s, %s, %s)" + return (u"CheckpkgTag(%s, %s, %s)" % (repr(self.pkgname), repr(self.tag_name), - repr(self.tag_info), - repr(self.msg))) + repr(self.tag_info))) def ToGarSyntax(self): msg_lines = [] @@ -611,7 +617,6 @@ return "\n".join(msg_lines) - class CheckpkgManagerBase(object): """Common functions between the older and newer calling functions.""" @@ -631,12 +636,14 @@ stats_list.append(PackageStats(None, self.stats_basedir, md5sum)) return stats_list - def FormatReports(self, errors): + def FormatReports(self, errors, messages, gar_lines): namespace = { "name": self.name, "errors": errors, "debug": self.debug, "textwrap": textwrap, + "messages": messages, + "gar_lines": gar_lines, } screen_t = Template.Template(SCREEN_ERROR_REPORT_TMPL, searchList=[namespace]) tags_report_t = Template.Template(TAG_REPORT_TMPL, searchList=[namespace]) @@ -680,8 +687,8 @@ Returns a tuple of an exit code and a report. """ packages_data = self.GetPackageStatsList() - errors = self.GetAllTags(packages_data) - screen_report, tags_report = self.FormatReports(errors) + errors, messages, gar_lines = self.GetAllTags(packages_data) + screen_report, tags_report = self.FormatReports(errors, messages, gar_lines) exit_code = 0 return (exit_code, screen_report, tags_report) @@ -696,12 +703,12 @@ self.system_pkgmap = system_pkgmap if not self.system_pkgmap: self.system_pkgmap = SystemPkgmap() - self.messages = [] self.common_paths = {} def GetPkgmapLineByBasename(self, basename): """Proxies calls to self.system_pkgmap.""" - logging.warning("GetPkgmapLineByBasename(%s): deprecated function", basename) + logging.warning("GetPkgmapLineByBasename(%s): deprecated function", + basename) return self.system_pkgmap.GetPkgmapLineByBasename(basename) def GetPathsAndPkgnamesByBasename(self, basename): @@ -711,9 +718,6 @@ def GetInstalledPackages(self): return self.system_pkgmap.GetInstalledPackages() - def Message(self, msg): - sef.messages.append(msg) - def GetCommonPaths(self, arch): """Returns a list of paths for architecture, from gar/etc/commondirs*.""" assert arch in ('i386', 'sparc', 'all'), "Wrong arch: %s" % repr(arch) @@ -732,7 +736,6 @@ return lines - class IndividualCheckInterface(CheckInterfaceBase): """To be passed to the checking functions. @@ -745,7 +748,7 @@ self.errors = [] def ReportError(self, tag_name, tag_info=None, msg=None): - tag = CheckpkgTag(self.pkgname, tag_name, tag_info, msg) + tag = CheckpkgTag(self.pkgname, tag_name, tag_info, msg=msg) self.errors.append(tag) @@ -757,10 +760,23 @@ self.errors = [] def ReportError(self, pkgname, tag_name, tag_info=None, msg=None): - tag = CheckpkgTag(pkgname, tag_name, tag_info, msg) + tag = CheckpkgTag(pkgname, tag_name, tag_info, msg=msg) self.errors.append(tag) +class CheckpkgMessenger(object): + """Class responsible for passing messages from checks to the user.""" + def __init__(self): + self.messages = [] + self.gar_lines = [] + + def Message(self, m): + self.messages.append(m) + + def SuggestGarLine(self, m): + self.gar_lines.append(m) + + class CheckpkgManager2(CheckpkgManagerBase): """The second incarnation of the checkpkg manager. @@ -781,7 +797,7 @@ checkpkg_module = package_checks members = dir(checkpkg_module) for member_name in members: - logging.debug("member_name: %s", repr(member_name)) + logging.debug("Examining module member: %s", repr(member_name)) member = getattr(checkpkg_module, member_name) if callable(member): if member_name.startswith("Check"): @@ -793,14 +809,11 @@ def GetAllTags(self, stats_obj_list): errors = {} - # TODO: Actually configure the logger with the logging level. - logging_level = logging.INFO - if self.debug: - logging_level = logging.DEBUG pkgmap = SystemPkgmap() logging.debug("Loading all package statistics.") pkgs_data = self.GetOptimizedAllStats(stats_obj_list) logging.debug("All package statistics loaded.") + messenger = CheckpkgMessenger() # Individual checks for pkg_data in pkgs_data: pkgname = pkg_data["basic_stats"]["pkgname"] @@ -808,18 +821,18 @@ for function in self.individual_checks: logger = logging.getLogger("%s-%s" % (pkgname, function.__name__)) logger.debug("Calling %s", function.__name__) - function(pkg_data, check_interface, logger=logger) + function(pkg_data, check_interface, logger=logger, messenger=messenger) if check_interface.errors: errors[pkgname] = check_interface.errors # Set checks for function in self.set_checks: - logger = logging.getLogger("SetCheck-%s" % (function.__name__,)) + logger = logging.getLogger(function.__name__) check_interface = SetCheckInterface(pkgmap) logger.debug("Calling %s", function.__name__) - function(pkgs_data, check_interface, logger) + function(pkgs_data, check_interface, logger=logger, messenger=messenger) if check_interface.errors: errors = self.SetErrorsToDict(check_interface.errors, errors) - return errors + return errors, messenger.messages, messenger.gar_lines def Run(self): self._AutoregisterChecks() @@ -1170,7 +1183,6 @@ dir_pkg = self.GetDirFormatPkg() logging.info("Collecting %s package statistics.", repr(dir_pkg.pkgname)) self.DumpObject(dir_pkg.GetAllFilenames(), "all_filenames") - self.DumpObject(self.GetBasicStats(), "basic_stats") self.DumpObject(dir_pkg.ListBinaries(), "binaries") self.DumpObject(self.GetBinaryDumpInfo(), "binaries_dump_info") self.DumpObject(dir_pkg.GetDependencies(), "depends") @@ -1185,6 +1197,10 @@ # these data. # self.DumpObject(self.GetDefinedSymbols(), "defined_symbols") self.DumpObject(dir_pkg.GetFilesContaining(BAD_CONTENT_REGEXES), "bad_paths") + # This one should be last, so that if the collection is interrupted + # in one of the previous runs, the basic_stats.pickle file is not there + # or not updated, and the collection is started again. + self.DumpObject(self.GetBasicStats(), "basic_stats") logging.debug("Statistics of %s have been collected.", repr(dir_pkg.pkgname)) def GetAllStats(self): Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-28 12:04:52 UTC (rev 9408) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-28 13:11:34 UTC (rev 9409) @@ -184,7 +184,7 @@ checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "foo-info"), ], } - screen_report, tags_report = m.FormatReports(tags) + screen_report, tags_report = m.FormatReports(tags, []) expected = u'# Tags reported by testname module\nCSWfoo: foo-tag foo-info\n' self.assertEqual(expected, tags_report) @@ -197,7 +197,7 @@ checkpkg.CheckpkgTag("CSWfoo", "baz-tag"), ], } - screen_report, tags_report = m.FormatReports(tags) + screen_report, tags_report = m.FormatReports(tags, []) expected = (u'# Tags reported by testname module\n' u'CSWfoo: foo-tag foo-info\n' u'CSWfoo: bar-tag bar-info\n' Modified: csw/mgar/gar/v2/lib/python/gartest.py =================================================================== --- csw/mgar/gar/v2/lib/python/gartest.py 2010-03-28 12:04:52 UTC (rev 9408) +++ csw/mgar/gar/v2/lib/python/gartest.py 2010-03-28 13:11:34 UTC (rev 9409) @@ -35,7 +35,7 @@ """ TMPDIR_PREFIX = "gartest-" # FIXME: This information should be pulled out from GAR -DIR_PKG_OUT_DIR = os.path.join(os.environ["HOME"], "spool.5.8-sparc") +DIR_PKG_OUT_DIR = os.path.join(os.environ["HOME"], "spool.5.9-sparc") class Error(Exception): Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-28 12:04:52 UTC (rev 9408) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-28 13:11:34 UTC (rev 9409) @@ -7,7 +7,7 @@ # Individual checks need to be named "Check", while set checks are named # "SetCheck". # -# def CheckSomething(pkg_data, error_mgr, logger): +# def CheckSomething(pkg_data, error_mgr, logger, messenger): # logger.debug("Checking something.") # error_mgr.ReportError("something-is-wrong") @@ -76,7 +76,7 @@ SYMBOLS_CHECK_ONLY_FOR = r"^CSWpm.*$" -def CatalognameLowercase(pkg_data, error_mgr, logger): +def CatalognameLowercase(pkg_data, error_mgr, logger, messenger): catalogname = pkg_data["basic_stats"]["catalogname"] if catalogname != catalogname.lower(): error_mgr.ReportError("catalogname-not-lowercase") @@ -84,7 +84,7 @@ error_mgr.ReportError("catalogname-is-not-a-simple-word") -def CheckDirectoryPermissions(pkg_data, error_mgr, logger): +def CheckDirectoryPermissions(pkg_data, error_mgr, logger, messenger): for entry in pkg_data["pkgmap"]: if (entry["type"] == "d" and @@ -95,14 +95,14 @@ entry["path"]) -def CheckNonCswPathsDirectoryPerms(pkg_data, error_mgr, logger): +def CheckNonCswPathsDirectoryPerms(pkg_data, error_mgr, logger, messenger): for entry in pkg_data["pkgmap"]: if entry["user"] == "?" or entry["group"] == "?" or entry["mode"] == "?": if entry["path"].startswith("/opt/csw"): error_mgr.ReportError("pkgmap-question-mark-perms-in-opt-csw", entry["path"]) -def CheckPerlLocal(pkg_data, error_mgr, logger): +def CheckPerlLocal(pkg_data, error_mgr, logger, messenger): perllocal_re = re.compile(r'/perllocal.pod') for entry in pkg_data["pkgmap"]: if entry["path"]: @@ -110,7 +110,7 @@ error_mgr.ReportError("perllocal-pod-in-pkgmap", entry["path"]) -def CheckMultipleDepends(pkg_data, error_mgr, logger): +def CheckMultipleDepends(pkg_data, error_mgr, logger, messenger): new_depends = set() for pkgname, desc in pkg_data["depends"]: if pkgname in new_depends: @@ -118,7 +118,7 @@ new_depends.add(pkgname) -def CheckDescription(pkg_data, error_mgr, logger): +def CheckDescription(pkg_data, error_mgr, logger, messenger): pkginfo = pkg_data["pkginfo"] desc = checkpkg.ExtractDescription(pkginfo) if not desc: @@ -130,13 +130,13 @@ error_mgr.ReportError("pkginfo-description-not-starting-with-uppercase", desc) -def CheckVendorURL(pkg_data, error_mgr, logger): +def CheckVendorURL(pkg_data, error_mgr, logger, messenger): vendorurl = pkg_data["pkginfo"]["VENDOR"].split(" ")[0] vendorurl_re = r"^(http|ftp)\://.+\..+$" if not re.match(vendorurl_re, vendorurl): error_mgr.ReportError("pkginfo-bad-vendorurl", vendorurl, "Solution: add VENDOR_URL to GAR Recipe") -def CheckCatalogname(pkg_data, error_mgr, logger): +def CheckCatalogname(pkg_data, error_mgr, logger, messenger): pkginfo = pkg_data["pkginfo"] catalogname = pkginfo["NAME"].split(" ")[0] catalogname_re = r"^([\w\+]+)$" @@ -144,7 +144,7 @@ error_mgr.ReportError("pkginfo-bad-catalogname", catalogname) -def CheckSmfIntegration(pkg_data, error_mgr, logger): +def CheckSmfIntegration(pkg_data, error_mgr, logger, messenger): init_re = re.compile(r"/init\.d/") for entry in pkg_data["pkgmap"]: if not entry["path"]: @@ -157,7 +157,7 @@ "%s class=%s" % (entry["path"], entry["class"])) -def SetCheckLibraries(pkgs_data, error_mgr, logger): +def SetCheckLibraries(pkgs_data, error_mgr, logger, messenger): """Second versionof the library checking code. 1. Collect all the data from the FS: @@ -232,10 +232,14 @@ t = Template.Template(checkpkg.REPORT_TMPL, searchList=[namespace]) report = unicode(t) if report.strip(): - print report + for line in report.splitlines(): + messenger.Message(line) + for missing_dep in missing_deps: + messenger.SuggestGarLine( + "RUNTIME_DEP_PKGS_%s = %s" % (pkgname, missing_dep)) -def SetCheckDependencies(pkgs_data, error_mgr, logger): +def SetCheckDependencies(pkgs_data, error_mgr, logger, messenger): """Dependencies must be either installed in the system, or in the set.""" known_pkgs = set(error_mgr.GetInstalledPackages()) pkgs_under_check = [x["basic_stats"]["pkgname"] for x in pkgs_data] @@ -248,14 +252,14 @@ error_mgr.ReportError(pkgname, "unidentified-dependency", depname) -def CheckDependsOnSelf(pkg_data, error_mgr, logger): +def CheckDependsOnSelf(pkg_data, error_mgr, logger, messenger): pkgname = pkg_data["basic_stats"]["pkgname"] for depname, dep_desc in pkg_data["depends"]: if depname == pkgname: error_mgr.ReportError("depends-on-self") -def CheckArchitectureSanity(pkg_data, error_mgr, logger): +def CheckArchitectureSanity(pkg_data, error_mgr, logger, messenger): basic_stats = pkg_data["basic_stats"] pkgname = basic_stats["pkgname"] pkginfo = pkg_data["pkginfo"] @@ -267,7 +271,7 @@ "pkginfo=%s filename=%s" % (arch, filename)) -def CheckActionClasses(pkg_data, error_mgr, logger): +def CheckActionClasses(pkg_data, error_mgr, logger, messenger): """Checks the consistency between classes in the prototype and pkginfo.""" pkginfo = pkg_data["pkginfo"] pkgmap = pkg_data["pkgmap"] @@ -286,7 +290,7 @@ error_mgr.ReportError("action-class-only-in-pkgmap", action_class) -def CheckLicenseFile(pkg_data, error_mgr, logger): +def CheckLicenseFile(pkg_data, error_mgr, logger, messenger): """Checks for the presence of the license file.""" # TODO: Write a unit test pkgmap = pkg_data["pkgmap"] @@ -294,11 +298,12 @@ license_path = LICENSE_TMPL % catalogname pkgmap_paths = [x["path"] for x in pkgmap] if license_path not in pkgmap_paths: - error_mgr.ReportError("license-missing") - logger.info("See http://sourceforge.net/apps/trac/gar/wiki/CopyRight") + error_mgr.ReportError( + "license-missing", license_path, + "See http://sourceforge.net/apps/trac/gar/wiki/CopyRight") -def CheckObsoleteDeps(pkg_data, error_mgr, logger): +def CheckObsoleteDeps(pkg_data, error_mgr, logger, messenger): """Checks for obsolete dependencies.""" deps = set(pkg_data["depends"]) obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) @@ -317,7 +322,7 @@ logger.info(msg) -def CheckArchitectureVsContents(pkg_data, error_mgr, logger): +def CheckArchitectureVsContents(pkg_data, error_mgr, logger, messenger): """Verifies the relationship between package contents and architecture.""" binaries = pkg_data["binaries"] pkginfo = pkg_data["pkginfo"] @@ -341,13 +346,14 @@ for tag, param, desc in reasons_to_be_arch_specific: error_mgr.ReportError(tag, param, desc) elif not reasons_to_be_arch_specific: - logger.info("Package %s does not contain any binaries.", pkgname) - logger.info("Consider making it ARCHALL = 1 instead of %s:", arch) - logger.info("ARCHALL_%s = 1", pkgname) - logger.info("However, be aware that there might be other reasons " - "to keep it architecture-specific.") + messenger.Message("Package %s does not contain any binaries. " + "Consider making it ARCHALL = 1 instead of %s. " + "However, be aware that there might be other reasons " + "to keep it architecture-specific." + % (pkgname, arch)) + messenger.SuggestGarLine("ARCHALL_%s = 1" % pkgname) -def CheckFileNameSanity(pkg_data, error_mgr, logger): +def CheckFileNameSanity(pkg_data, error_mgr, logger, messenger): basic_stats = pkg_data["basic_stats"] revision_info = basic_stats["parsed_basename"]["revision_info"] catalogname = pkg_data["basic_stats"]["catalogname"] @@ -362,7 +368,7 @@ error_mgr.ReportError("osrel-tag-not-specified") -def CheckPkginfoSanity(pkg_data, error_mgr, logger): +def CheckPkginfoSanity(pkg_data, error_mgr, logger, messenger): """pkginfo sanity checks. if [ "$maintname" = "" ] ; then @@ -415,23 +421,30 @@ error_mgr.ReportError("pkginfo-maintainer-name-not-set") # email if not pkginfo["EMAIL"]: - error_mgr.ReportError("pkginfo-blank-email") + error_mgr.ReportError("pkginfo-email-blank") # hotline if not pkginfo["HOTLINE"]: error_mgr.ReportError("pkginfo-hotline-blank") pkginfo_version = pkg_data["basic_stats"]["parsed_basename"]["full_version_string"] if pkginfo_version != pkginfo["VERSION"]: - error_mgr.ReportError("filename-version-does-not-match-pkginfo-version") + error_mgr.ReportError("filename-version-does-not-match-pkginfo-version", + "filename=%s pkginfo=%s" + % (pkginfo_version, pkginfo["VERSION"])) if re.search(r"-", pkginfo["VERSION"]): - error_mgr.ReportError("pkginfo-minus-in-version") + error_mgr.ReportError("pkginfo-minus-in-version", pkginfo["VERSION"]) if not re.match(VERSION_RE, pkginfo["VERSION"]): - msg = pkginfo["VERSION"] - error_mgr.ReportError("pkginfo-version-wrong-format", msg) + msg = "Should match %s" % VERSION_RE + error_mgr.ReportError("pkginfo-version-wrong-format", + pkginfo["VERSION"], + msg) if pkginfo["ARCH"] not in ARCH_LIST: - error_mgr.ReportError("pkginfo-nonstandard-architecture", pkginfo["ARCH"]) + error_mgr.ReportError( + "pkginfo-nonstandard-architecture", + pkginfo["ARCH"], + "known architectures: %s" % ARCH_LIST) -def CheckPstamp(pkg_data, error_mgr, logger): +def CheckPstamp(pkg_data, error_mgr, logger, messenger): pkginfo = pkg_data["pkginfo"] if "PSTAMP" in pkginfo: if not re.match(checkpkg.PSTAMP_RE, pkginfo["PSTAMP"]): @@ -442,7 +455,7 @@ error_mgr.ReportError("pkginfo-pstamp-missing") -def DisabledCheckMissingSymbols(pkgs_data, error_mgr, logger): +def DisabledCheckMissingSymbols(pkgs_data, error_mgr, logger, messenger): """Analyzes missing symbols reported by ldd -r. 1. Collect triplets: pkgname, binary, missing symbol @@ -477,7 +490,7 @@ error_mgr.ReportError("symbol-not-found", "%s %s" % (ms_binary, ms_symbol)) -def CheckBuildingUser(pkg_data, error_mgr, logger): +def CheckBuildingUser(pkg_data, error_mgr, logger, messenger): pkgname = pkg_data["basic_stats"]["pkgname"] username = checkpkg.ExtractBuildUsername(pkg_data["pkginfo"]) for entry in pkg_data["pkgmap"]: @@ -486,7 +499,7 @@ "%s, %s" % (entry["path"], entry["user"])) -def CheckDisallowedPaths(pkg_data, error_mgr, logger): +def CheckDisallowedPaths(pkg_data, error_mgr, logger, messenger): """Checks for disallowed paths, such as common paths.""" arch = pkg_data["pkginfo"]["ARCH"] # Common paths read from the file are absolute, e.g. /opt/csw/lib @@ -513,10 +526,13 @@ if intersection: logger.debug("Bad paths found: %s", intersection) for bad_path in intersection: - error_mgr.ReportError("disallowed-path", bad_path) + error_mgr.ReportError( + "disallowed-path", bad_path, + "This path is already provided by CSWcommon " + "or is not allowed for other reasons.") -def CheckLinkingAgainstSunX11(pkg_data, error_mgr, logger): +def CheckLinkingAgainstSunX11(pkg_data, error_mgr, logger, messenger): for binary_info in pkg_data["binaries_dump_info"]: for soname in binary_info["needed sonames"]: if (".so" in binary_info["soname"] @@ -526,7 +542,7 @@ "%s %s" % (binary_info["base_name"], soname)) -def CheckDiscouragedFileNamePatterns(pkg_data, error_mgr, logger): +def CheckDiscouragedFileNamePatterns(pkg_data, error_mgr, logger, messenger): patterns = [re.compile(x) for x in DISCOURAGED_FILE_PATTERNS] for entry in pkg_data["pkgmap"]: if entry["path"]: @@ -536,19 +552,19 @@ entry["path"]) -def CheckBadPaths(pkg_data, error_mgr, logger): +def CheckBadPaths(pkg_data, error_mgr, logger, messenger): for regex in pkg_data["bad_paths"]: for file_name in pkg_data["bad_paths"][regex]: error_mgr.ReportError("file-with-bad-content", "%s %s" % (regex, file_name)) -def CheckPkgchk(pkg_data, error_mgr, logger): +def CheckPkgchk(pkg_data, error_mgr, logger, messenger): if pkg_data["pkgchk"]["return_code"] != 0: error_mgr.ReportError("pkgchk-failed-with-code", pkg_data["pkgchk"]["return_code"]) for line in pkg_data["pkgchk"]["stderr_lines"]: logger.warn(line) -def CheckRpath(pkg_data, error_mgr, logger): +def CheckRpath(pkg_data, error_mgr, logger, messenger): regex_whitelist = [re.compile(x) for x in RPATH_WHITELIST] for binary_info in pkg_data["binaries_dump_info"]: actual_rpaths = binary_info["runpath"] @@ -610,7 +626,7 @@ return errors -def DisableCheckForMissingSymbolsDumb(pkg_data, error_mgr, logger): +def DisableCheckForMissingSymbolsDumb(pkg_data, error_mgr, logger, messenger): """Analyzes missing symbols reported by ldd -r. So far only made sense for perl modules. Disables because it falls over on Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-28 12:04:52 UTC (rev 9408) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-28 13:11:34 UTC (rev 9409) @@ -27,32 +27,33 @@ """Wraps common components of checkpkg tests.""" def setUp(self): - # This is slow. Let's speed it up somehow. Move away from yaml and create - # a Python module with the data. self.pkg_stats = DEFAULT_PKG_STATS - self.pkg_data = self.pkg_stats.GetAllStats() + # self.pkg_data = self.pkg_stats.GetAllStats() # This makes one of the test break. To be investigated. - # self.pkg_data = DEFAULT_PKG_DATA + self.pkg_data = copy.deepcopy(DEFAULT_PKG_DATA) self.mocker = mox.Mox() def testDefault(self): class LoggerStub(object): - def debug(self, debug_s, *kwords): pass - def info(self, debug_s, *kwords): pass + class MessengerStub(object): + def Message(self, m): + pass # self.logger_mock = self.mocker.CreateMock(logging.Logger) self.logger_mock = LoggerStub() self.error_mgr_mock = self.mocker.CreateMock( checkpkg.IndividualCheckInterface) + self.messenger = MessengerStub() self.CheckpkgTest() self.mocker.ReplayAll() getattr(pc, self.FUNCTION_NAME)(self.pkg_data, self.error_mgr_mock, - self.logger_mock) + self.logger_mock, + self.messenger) self.mocker.VerifyAll() Modified: csw/mgar/gar/v2/tests/static/example/checksums =================================================================== --- csw/mgar/gar/v2/tests/static/example/checksums 2010-03-28 12:04:52 UTC (rev 9408) +++ csw/mgar/gar/v2/tests/static/example/checksums 2010-03-28 13:11:34 UTC (rev 9409) @@ -1,2 +1,2 @@ d388c5613c830fb4571d0457f53580a0 curses.h -492eba390abe4fe74c185d0d343c2b81 grep +11e8e7146ab016deabbe8e1fd21c956e grep This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Mar 28 17:47:20 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 28 Mar 2010 15:47:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9410] csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile Message-ID: Revision: 9410 http://gar.svn.sourceforge.net/gar/?rev=9410&view=rev Author: bensons Date: 2010-03-28 15:47:20 +0000 (Sun, 28 Mar 2010) Log Message: ----------- cpan Net-Pcap: ready for release with perl 5.10 Modified Paths: -------------- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile Modified: csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-03-28 13:11:34 UTC (rev 9409) +++ csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-03-28 15:47:20 UTC (rev 9410) @@ -14,6 +14,8 @@ # depends RUNTIME_DEP_PKGS = CSWlibpcap -BUILD_DEP_PKGS = CSWlibpcap CSWlibpcapdevel +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWlibpcapdevel +LICENSE = README + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 28 18:02:13 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 28 Mar 2010 16:02:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9411] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 9411 http://gar.svn.sourceforge.net/gar/?rev=9411&view=rev Author: hson Date: 2010-03-28 16:02:13 +0000 (Sun, 28 Mar 2010) Log Message: ----------- imagemagick: Update to 6.6.0-9, add some build dependencies 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 2010-03-28 15:47:20 UTC (rev 9410) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-03-28 16:02:13 UTC (rev 9411) @@ -1,6 +1,6 @@ GARNAME = imagemagick GARVERSION = 6.6.0 -GARSUBREV = 7 +GARSUBREV = 9 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -53,6 +53,17 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiff RUNTIME_DEP_PKGS_CSWimagemagick += CSWzlib +BUILD_DEP_PKGS += CSWdjvulibredevel +BUILD_DEP_PKGS += CSWgraphvizdevel +BUILD_DEP_PKGS += CSWilmbasedevel +BUILD_DEP_PKGS += CSWlcmsdevel +BUILD_DEP_PKGS += CSWlibcairodevel +BUILD_DEP_PKGS += CSWlibcairodevel +BUILD_DEP_PKGS += CSWliblqrdevel +BUILD_DEP_PKGS += CSWlibwmfdevel +BUILD_DEP_PKGS += CSWopenexrdevel +BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWimagemagick) + # Old modules are linked to libX11.so.4 CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|xwd.so|libX11.so.4 CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dps.so|libX11.so.4 @@ -183,6 +194,7 @@ # Solaris 8 and 9 doesn't have complex.h CONFIGURE_ARGS_COMMON += --without-fftw CONFIGURE_ARGS_COMMON += --with-modules=yes +# Let's try to use openmp and see what it does for performance #CONFIGURE_ARGS_COMMON += --disable-openmp CONFIGURE_ARGS_COMMON += --disable-silent-rules # Until librsvg,graphviz and perl is 64bit Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2010-03-28 15:47:20 UTC (rev 9410) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2010-03-28 16:02:13 UTC (rev 9411) @@ -1,3 +1,3 @@ -7e2f1d7512b4d2e41dbbb189e6eef2a0 ImageMagick-6.6.0-7.tar.bz2 +c04030c3d4649bee4d6a891a16e031a3 ImageMagick-6.6.0-9.tar.bz2 6bd361fe352c7d497d60d8d2cbe7cfd4 Makefile.patch 6e35e7434941ed6aeeabb03de76288d1 configure.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Mar 28 18:12:55 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 28 Mar 2010 16:12:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[9412] csw/mgar/pkg/cpan/NetPacket/trunk/Makefile Message-ID: Revision: 9412 http://gar.svn.sourceforge.net/gar/?rev=9412&view=rev Author: bensons Date: 2010-03-28 16:12:55 +0000 (Sun, 28 Mar 2010) Log Message: ----------- cpan NetPacket: ready for release Modified Paths: -------------- csw/mgar/pkg/cpan/NetPacket/trunk/Makefile Modified: csw/mgar/pkg/cpan/NetPacket/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/NetPacket/trunk/Makefile 2010-03-28 16:02:13 UTC (rev 9411) +++ csw/mgar/pkg/cpan/NetPacket/trunk/Makefile 2010-03-28 16:12:55 UTC (rev 9412) @@ -14,4 +14,8 @@ PACKAGES = CSWpmnetpacket CATALOGNAME = pm_netpacket +CHECKPKG_OVERRIDES = license-missing + +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 hson at users.sourceforge.net Sun Mar 28 18:16:49 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 28 Mar 2010 16:16:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9413] csw/mgar/pkg/tcl/trunk Message-ID: Revision: 9413 http://gar.svn.sourceforge.net/gar/?rev=9413&view=rev Author: hson Date: 2010-03-28 16:16:49 +0000 (Sun, 28 Mar 2010) Log Message: ----------- Removed the modulation for 8.4 since tk 8.4 cant be rebuilt and packaged with 8.5. Instead package legacy lib files. Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile csw/mgar/pkg/tcl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tcl/trunk/files/8.4.i386.tar.xz csw/mgar/pkg/tcl/trunk/files/8.4.sparc.tar.xz Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-03-28 16:12:55 UTC (rev 9412) +++ csw/mgar/pkg/tcl/trunk/Makefile 2010-03-28 16:16:49 UTC (rev 9413) @@ -2,29 +2,25 @@ GARVERSION = 8.5.8 CATEGORIES = lang -EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 8.4.19 8.5.8 -# The legacy library was not available in 64 bit, so don't bother compiling it -SKIP_MODULATIONS = isa-sparcv9-garversion-8.4.19 isa-amd64-garversion-8.4.19 - DESCRIPTION = Tcl programming language define BLURB endef SF_PROJ = tcl MASTER_SITES = $(SF_MIRRORS) -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)$(VERSION)-src.tar.gz) -DISTFILES = $(SOURCEFILES) -NOEXTRACT = $(filter-out $(GARNAME)$(GARVERSION)-src.tar.gz,$(SOURCEFILES)) +DISTNAME = $(GARNAME)$(GARVERSION) +DISTFILES = $(DISTNAME)-src.tar.gz -# Fix for finding libsunmath on i386 and amd64 -PATCHFILES-8.5.8 = configure.patch -PATCHFILES-8.5.8 += tcl.m4.patch -PATCHFILES-8.5.8 += tclInt.h.patch +WORKSRC = $(WORKDIR)/$(DISTNAME)/unix -PATCHFILES = $(PATCHFILES-$(GARVERSION)) -ALLFILES_PATCHFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(PATCHFILES-$(VERSION))) +RUNTIME_DEP_PKGS_CSWtcl += CSWsunmath +# Fix for finding libsunmath on i386 and amd64 +PATCHFILES = configure.patch +PATCHFILES += tcl.m4.patch +PATCHFILES += tclInt.h.patch + +PATCHDIR = $(WORKDIR)/$(DISTNAME) # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 UPSTREAM_USE_SF = 1 @@ -33,31 +29,18 @@ VENDOR_URL = http://www.tcl.tk/ LICENSE = license.terms -DISTNAME = $(GARNAME)$(GARVERSION) -PATCHDIR = $(WORKDIR)/$(DISTNAME) -WORKSRC = $(WORKDIR)/$(DISTNAME)/unix - -BUILD64-8.5.8 = 1 -BUILD64 = $(BUILD64-$(GARVERSION)) +BUILD64 = 1 NOISAEXEC = 1 INCLUDE_FLAGS = CONFIGURE_ARGS = $(DIRPATHS) -INSTALL_ARGS-8.4.19 = install -INSTALL_ARGS-8.5.8 = install install-private-headers install-tzdata install-msgs -INSTALL_ARGS = $(INSTALL_ARGS-$(GARVERSION)) +INSTALL_ARGS = install install-private-headers install-tzdata install-msgs # tk need the static tclstub library for some reason MERGE_EXCLUDE_STATICLIBS = -MERGE_SCRIPTS_isa-default-garversion-8.4.19 = copy-lib-only - -MERGE_SCRIPTS_isa-default-garversion-8.5.8 = copy-all -MERGE_SCRIPTS_isa-extra-garversion-8.5.8 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-8.5.8 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - include gar/category.mk # CFLAGS := $(filter-out -I%,$(CFLAGS)) @@ -68,7 +51,10 @@ @(cd $(WORKSRC) ; cp -p ../license.terms .; autoconf) @$(MAKECOOKIE) -merge-copy-lib-only: - ginstall -d $(PKGROOT)$(libdir) - ginstall $(INSTALLISADIR)$(libdir)/*.so $(PKGROOT)$(libdir) +post-install-isa-sparcv8: + @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.sparc.tar.xz | tar xf -) @$(MAKECOOKIE) + +post-install-isa-i386: + @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.i386.tar.xz | tar xf -) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/tcl/trunk/checksums =================================================================== --- csw/mgar/pkg/tcl/trunk/checksums 2010-03-28 16:12:55 UTC (rev 9412) +++ csw/mgar/pkg/tcl/trunk/checksums 2010-03-28 16:16:49 UTC (rev 9413) @@ -1,5 +1,4 @@ dc8664f3dc92693aaaad68785e4426ae configure.patch cc9b1bd7ddf8e27e97ef464806885349 tcl.m4.patch -ade2c033a7b545ee108f3fdfeb629fcf tcl8.4.19-src.tar.gz 7f123e53b3daaaba2478d3af5a0752e3 tcl8.5.8-src.tar.gz 3c9c100904b6ba774a679ad7f2b4a036 tclInt.h.patch Added: csw/mgar/pkg/tcl/trunk/files/8.4.i386.tar.xz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/tcl/trunk/files/8.4.i386.tar.xz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/tcl/trunk/files/8.4.sparc.tar.xz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/tcl/trunk/files/8.4.sparc.tar.xz ___________________________________________________________________ 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 hson at users.sourceforge.net Sun Mar 28 18:22:20 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 28 Mar 2010 16:22:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9414] csw/mgar/pkg/tk/trunk Message-ID: Revision: 9414 http://gar.svn.sourceforge.net/gar/?rev=9414&view=rev Author: hson Date: 2010-03-28 16:22:20 +0000 (Sun, 28 Mar 2010) Log Message: ----------- tk: Need to patch Makefile.in so tk.h from build dir gets picked up instead of /opt/csw/include. Add legacy stuff to package Modified Paths: -------------- csw/mgar/pkg/tk/trunk/Makefile csw/mgar/pkg/tk/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tk/trunk/files/8.4.i386.tar.xz csw/mgar/pkg/tk/trunk/files/8.4.sparc.tar.xz csw/mgar/pkg/tk/trunk/files/Makefile.in.diff Removed Paths: ------------- csw/mgar/pkg/tk/trunk/files/CSWtk.gspec csw/mgar/pkg/tk/trunk/files/libtk8.4.so.i csw/mgar/pkg/tk/trunk/files/libtk8.4.so.s Modified: csw/mgar/pkg/tk/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk/trunk/Makefile 2010-03-28 16:16:49 UTC (rev 9413) +++ csw/mgar/pkg/tk/trunk/Makefile 2010-03-28 16:22:20 UTC (rev 9414) @@ -11,12 +11,16 @@ DISTNAME = $(GARNAME)$(GARVERSION) DISTFILES = $(DISTNAME)-src.tar.gz -DISTFILES += libtk8.4.so.i -DISTFILES += libtk8.4.so.s +PATCHFILES = Makefile.in.diff +PATCHDIR = $(WORKDIR)/$(DISTNAME) + DEP_PKGS_CSWtk = CSWfconfig CSWftype2 CSWlibx11 CSWlibxft2 CSWlibxrender CSWtcl +DEP_PKGS_CSWtk += CSWlibxext +DEP_PKGS_CSWtk += CSWlibxscrnsaver +DEP_PKGS_CSWtk += CSWsunmath -SPKG_SOURCEURL = http://www.tcl.tk/ +VENDOR_URL = http://www.tcl.tk/ LICENSE = license.terms # We define upstream file regex so we can be notifed of new upstream software release @@ -58,11 +62,11 @@ post-install-i386: @# Install legacy libs @# Building them with version modulations would be hard as that would require a full legacy tcl also - ginstall $(WORKDIR)/libtk8.4.so.i $(DESTDIR)$(libdir)/libtk8.4.so + @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.i386.tar.xz | tar xf -) @$(MAKECOOKIE) post-install-sparc: @# Install legacy libs @# Building them with version modulations would be hard as that would require a full legacy tcl also - ginstall $(WORKDIR)/libtk8.4.so.s $(DESTDIR)$(libdir)/libtk8.4.so + @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.sparc.tar.xz | tar xf -) @$(MAKECOOKIE) Modified: csw/mgar/pkg/tk/trunk/checksums =================================================================== --- csw/mgar/pkg/tk/trunk/checksums 2010-03-28 16:16:49 UTC (rev 9413) +++ csw/mgar/pkg/tk/trunk/checksums 2010-03-28 16:22:20 UTC (rev 9414) @@ -1,3 +1,2 @@ -8295c274c17ffa975bcf623763c77bc6 libtk8.4.so.i -340e9cec53ced4cae6099fdda2cdb0d3 libtk8.4.so.s +5db325a0c9285adb2f2d8a7157dc132a Makefile.in.diff 13bf90602e16fc530e05196431021dc6 tk8.5.8-src.tar.gz Added: csw/mgar/pkg/tk/trunk/files/8.4.i386.tar.xz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/tk/trunk/files/8.4.i386.tar.xz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/tk/trunk/files/8.4.sparc.tar.xz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/tk/trunk/files/8.4.sparc.tar.xz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: csw/mgar/pkg/tk/trunk/files/CSWtk.gspec =================================================================== --- csw/mgar/pkg/tk/trunk/files/CSWtk.gspec 2010-03-28 16:16:49 UTC (rev 9413) +++ csw/mgar/pkg/tk/trunk/files/CSWtk.gspec 2010-03-28 16:22:20 UTC (rev 9414) @@ -1,4 +0,0 @@ -%var bitname tk -%var pkgname CSWtk -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/license.terms Added: csw/mgar/pkg/tk/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/tk/trunk/files/Makefile.in.diff (rev 0) +++ csw/mgar/pkg/tk/trunk/files/Makefile.in.diff 2010-03-28 16:22:20 UTC (rev 9414) @@ -0,0 +1,27 @@ +--- tk8.5.8/unix/Makefile.in.orig 2009-11-13 19:38:48.000000000 +0100 ++++ tk8.5.8/unix/Makefile.in 2010-03-28 15:44:27.880721334 +0200 +@@ -326,20 +326,20 @@ + + CC = @CC@ + +-CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ ++CC_SWITCHES_NO_STUBS = ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ + -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \ + -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM at _INCLUDES} ${AC_FLAGS} \ + ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \ +-${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@ ++${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@ ${CFLAGS} + + CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS} + + APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @EXTRA_APP_CC_SWITCHES@ + +-DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \ ++DEPEND_SWITCHES = -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \ + -I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM at _INCLUDES} \ + ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \ +-${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@ ++${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@ ${CFLAGS} + + WISH_OBJS = tkAppInit.o + Deleted: csw/mgar/pkg/tk/trunk/files/libtk8.4.so.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/tk/trunk/files/libtk8.4.so.s =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 28 18:25:38 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 28 Mar 2010 16:25:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[9415] csw/mgar/pkg/expect/trunk Message-ID: Revision: 9415 http://gar.svn.sourceforge.net/gar/?rev=9415&view=rev Author: hson Date: 2010-03-28 16:25:38 +0000 (Sun, 28 Mar 2010) Log Message: ----------- expect: Add missing dependencies. Add legacy files to package Modified Paths: -------------- csw/mgar/pkg/expect/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/expect/trunk/files/5.42.i386.tar.xz csw/mgar/pkg/expect/trunk/files/5.42.sparc.tar.xz Modified: csw/mgar/pkg/expect/trunk/Makefile =================================================================== --- csw/mgar/pkg/expect/trunk/Makefile 2010-03-28 16:22:20 UTC (rev 9414) +++ csw/mgar/pkg/expect/trunk/Makefile 2010-03-28 16:25:38 UTC (rev 9415) @@ -47,6 +47,9 @@ RUNTIME_DEP_PKGS_CSWexpect += CSWlibx11 RUNTIME_DEP_PKGS_CSWexpect += CSWlibxft2 RUNTIME_DEP_PKGS_CSWexpect += CSWlibxrender +RUNTIME_DEP_PKGS_CSWexpect += CSWlibxext +RUNTIME_DEP_PKGS_CSWexpect += CSWlibxscrnsaver +RUNTIME_DEP_PKGS_CSWexpect += CSWsunmath UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -98,3 +101,11 @@ ) # @( cd $(WORKSRC); aclocal;autoconf) @$(MAKECOOKIE) + +post-install-isa-sparcv8: + @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/5.42.sparc.tar.xz | tar xf -) + @$(MAKECOOKIE) + +post-install-isa-i386: + @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/5.42.i386.tar.xz | tar xf -) + @$(MAKECOOKIE) Added: csw/mgar/pkg/expect/trunk/files/5.42.i386.tar.xz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/expect/trunk/files/5.42.i386.tar.xz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/expect/trunk/files/5.42.sparc.tar.xz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/expect/trunk/files/5.42.sparc.tar.xz ___________________________________________________________________ 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 hson at users.sourceforge.net Sun Mar 28 21:10:43 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 28 Mar 2010 19:10:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9416] csw/mgar/pkg/tcl/trunk/files Message-ID: Revision: 9416 http://gar.svn.sourceforge.net/gar/?rev=9416&view=rev Author: hson Date: 2010-03-28 19:10:43 +0000 (Sun, 28 Mar 2010) Log Message: ----------- tcl: Update legacy files Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/files/8.4.i386.tar.xz csw/mgar/pkg/tcl/trunk/files/8.4.sparc.tar.xz Modified: csw/mgar/pkg/tcl/trunk/files/8.4.i386.tar.xz =================================================================== (Binary files differ) Modified: csw/mgar/pkg/tcl/trunk/files/8.4.sparc.tar.xz =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 28 21:18:35 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 28 Mar 2010 19:18:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[9417] csw/mgar/pkg/tk/trunk/files Message-ID: Revision: 9417 http://gar.svn.sourceforge.net/gar/?rev=9417&view=rev Author: hson Date: 2010-03-28 19:18:34 +0000 (Sun, 28 Mar 2010) Log Message: ----------- tk: Update legacy files Modified Paths: -------------- csw/mgar/pkg/tk/trunk/files/8.4.i386.tar.xz csw/mgar/pkg/tk/trunk/files/8.4.sparc.tar.xz Modified: csw/mgar/pkg/tk/trunk/files/8.4.i386.tar.xz =================================================================== (Binary files differ) Modified: csw/mgar/pkg/tk/trunk/files/8.4.sparc.tar.xz =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Mar 28 21:32:17 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 28 Mar 2010 19:32:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9418] csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile Message-ID: Revision: 9418 http://gar.svn.sourceforge.net/gar/?rev=9418&view=rev Author: bensons Date: 2010-03-28 19:32:14 +0000 (Sun, 28 Mar 2010) Log Message: ----------- cpan Test-Exception: ready for release Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile Modified: csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile 2010-03-28 19:18:34 UTC (rev 9417) +++ csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile 2010-03-28 19:32:14 UTC (rev 9418) @@ -15,8 +15,12 @@ # depends RUNTIME_DEP_PKGS = CSWpmsubuplevel -BUILD_DEP_PKGS = CSWpmsubuplevel +BUILD_DEP_PKGS = CSWpmsubuplevel ARCHALL = 1 +CHECKPKG_OVERRIDES_CSWpmtstexception += license-missing +# what is this? +CHECKPKG_OVERRIDES_CSWpmtstexception += surplus-dependency|CSWpmsubuplevel + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 28 21:35:32 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 28 Mar 2010 19:35:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9419] csw/mgar/pkg/tcl/trunk/Makefile Message-ID: Revision: 9419 http://gar.svn.sourceforge.net/gar/?rev=9419&view=rev Author: hson Date: 2010-03-28 19:35:32 +0000 (Sun, 28 Mar 2010) Log Message: ----------- tcl:Add checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-03-28 19:32:14 UTC (rev 9418) +++ csw/mgar/pkg/tcl/trunk/Makefile 2010-03-28 19:35:32 UTC (rev 9419) @@ -21,6 +21,11 @@ PATCHFILES += tclInt.h.patch PATCHDIR = $(WORKDIR)/$(DISTNAME) + +CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtclstub8.4.a +CHECKPKG_OVERRIDES_CSWtcl += soname-not-found|libm.so.2|needed|by|opt/csw/lib/amd64/libtcl8.5.so +CHECKPKG_OVERRIDES_CSWtcl += soname-not-found|libm.so.2|needed|by|opt/csw/bin/amd64/tclsh8.5 + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 UPSTREAM_USE_SF = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Mar 28 21:38:42 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 28 Mar 2010 19:38:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[9420] csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile Message-ID: Revision: 9420 http://gar.svn.sourceforge.net/gar/?rev=9420&view=rev Author: bensons Date: 2010-03-28 19:38:39 +0000 (Sun, 28 Mar 2010) Log Message: ----------- cpan UNIVERSAL-isa: ready for release Modified Paths: -------------- csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile Modified: csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile 2010-03-28 19:35:32 UTC (rev 9419) +++ csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile 2010-03-28 19:38:39 UTC (rev 9420) @@ -18,11 +18,14 @@ PACKAGES = CSWpmuniversalisa CATALOGNAME = pm_universalisa -RUNTIME_DEP_PKGS = CSWpmmodulebuild +BUILD_DEP_PKGS = CSWpmmodulebuild CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL BUILD_SCRIPTS = $(WORKSRC)/Build TEST_SCRIPTS = $(WORKSRC)/Build INSTALL_SCRIPTS = $(WORKSRC)/Build +ARCHALL = 1 +CHECKPKG_OVERRIDES = license-missing + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 28 21:39:30 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 28 Mar 2010 19:39:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9421] csw/mgar/pkg/tcl/trunk/Makefile Message-ID: Revision: 9421 http://gar.svn.sourceforge.net/gar/?rev=9421&view=rev Author: hson Date: 2010-03-28 19:39:30 +0000 (Sun, 28 Mar 2010) Log Message: ----------- tcl: Workaround for checkpkg bug Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-03-28 19:38:39 UTC (rev 9420) +++ csw/mgar/pkg/tcl/trunk/Makefile 2010-03-28 19:39:30 UTC (rev 9421) @@ -25,6 +25,7 @@ CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtclstub8.4.a CHECKPKG_OVERRIDES_CSWtcl += soname-not-found|libm.so.2|needed|by|opt/csw/lib/amd64/libtcl8.5.so CHECKPKG_OVERRIDES_CSWtcl += soname-not-found|libm.so.2|needed|by|opt/csw/bin/amd64/tclsh8.5 +CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/tcl # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Mar 28 21:43:43 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 28 Mar 2010 19:43:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9422] csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile Message-ID: Revision: 9422 http://gar.svn.sourceforge.net/gar/?rev=9422&view=rev Author: bensons Date: 2010-03-28 19:43:43 +0000 (Sun, 28 Mar 2010) Log Message: ----------- cpan UNIVERSAL-can: ready for release Modified Paths: -------------- csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile Modified: csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile 2010-03-28 19:39:30 UTC (rev 9421) +++ csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile 2010-03-28 19:43:43 UTC (rev 9422) @@ -24,4 +24,8 @@ TEST_SCRIPTS = $(WORKSRC)/Build INSTALL_SCRIPTS = $(WORKSRC)/Build +ARCHALL_CSWpmuniversalcan += 1 +CHECKPKG_OVERRIDES_CSWpmuniversalcan += license-missing +CHECKPKG_OVERRIDES_CSWpmuniversalcan += surplus-dependency|CSWpmmodulebuild + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 28 21:51:24 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 28 Mar 2010 19:51:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9423] csw/mgar/pkg/tcl/trunk/Makefile Message-ID: Revision: 9423 http://gar.svn.sourceforge.net/gar/?rev=9423&view=rev Author: hson Date: 2010-03-28 19:51:24 +0000 (Sun, 28 Mar 2010) Log Message: ----------- tcl:Add checkpkg override Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-03-28 19:43:43 UTC (rev 9422) +++ csw/mgar/pkg/tcl/trunk/Makefile 2010-03-28 19:51:24 UTC (rev 9423) @@ -25,7 +25,7 @@ CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtclstub8.4.a CHECKPKG_OVERRIDES_CSWtcl += soname-not-found|libm.so.2|needed|by|opt/csw/lib/amd64/libtcl8.5.so CHECKPKG_OVERRIDES_CSWtcl += soname-not-found|libm.so.2|needed|by|opt/csw/bin/amd64/tclsh8.5 -CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/tcl +CHECKPKG_OVERRIDES_CSWtcl += surplus-dependency|CSWsunmath # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Mar 28 22:01:21 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 28 Mar 2010 20:01:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9424] csw/mgar/pkg/tcl/trunk/Makefile Message-ID: Revision: 9424 http://gar.svn.sourceforge.net/gar/?rev=9424&view=rev Author: hson Date: 2010-03-28 20:01:21 +0000 (Sun, 28 Mar 2010) Log Message: ----------- tcl: Readd workaround for checkpkg bug Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-03-28 19:51:24 UTC (rev 9423) +++ csw/mgar/pkg/tcl/trunk/Makefile 2010-03-28 20:01:21 UTC (rev 9424) @@ -26,6 +26,7 @@ CHECKPKG_OVERRIDES_CSWtcl += soname-not-found|libm.so.2|needed|by|opt/csw/lib/amd64/libtcl8.5.so CHECKPKG_OVERRIDES_CSWtcl += soname-not-found|libm.so.2|needed|by|opt/csw/bin/amd64/tclsh8.5 CHECKPKG_OVERRIDES_CSWtcl += surplus-dependency|CSWsunmath +CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/tcl # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 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 Mar 29 02:38:52 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 29 Mar 2010 00:38:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9425] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 9425 http://gar.svn.sourceforge.net/gar/?rev=9425&view=rev Author: bdwalton Date: 2010-03-29 00:38:51 +0000 (Mon, 29 Mar 2010) Log Message: ----------- libxml2: drop python-rt dep, allow dev package to depend on primary Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2010-03-28 20:01:21 UTC (rev 9424) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2010-03-29 00:38:51 UTC (rev 9425) @@ -26,7 +26,7 @@ RUNTIME_DEP_PKGS_CSWlibxml2 = CSWiconv CSWzlib RUNTIME_DEP_PKGS_CSWlibxml2devel = CSWlibxml2 -RUNTIME_DEP_PKGS_CSWpylibxml2 = CSWpython CSWpython-rt CSWlibxml2 CSWiconv CSWzlib +RUNTIME_DEP_PKGS_CSWpylibxml2 = CSWpython CSWlibxml2 CSWiconv CSWzlib # We don't have 64 bit Python yet CONFIGURE_ARGS_32 = --with-python=$(prefix) @@ -64,5 +64,8 @@ sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw +# override checkpkg for this +CHECKPKG_OVERRIDES_CSWlibxml2devel += surplus-dependency|CSWlibxml2 + 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 Mon Mar 29 10:22:28 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 29 Mar 2010 08:22:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[9426] csw/mgar/pkg/cpan/Inline/trunk Message-ID: Revision: 9426 http://gar.svn.sourceforge.net/gar/?rev=9426&view=rev Author: dmichelsen Date: 2010-03-29 08:22:27 +0000 (Mon, 29 Mar 2010) Log Message: ----------- cpan/Inline: Update license Modified Paths: -------------- csw/mgar/pkg/cpan/Inline/trunk/Makefile csw/mgar/pkg/cpan/Inline/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Inline/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/Inline/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Inline/trunk/Makefile 2010-03-29 00:38:51 UTC (rev 9425) +++ csw/mgar/pkg/cpan/Inline/trunk/Makefile 2010-03-29 08:22:27 UTC (rev 9426) @@ -11,14 +11,12 @@ Perl. endef +DISTFILES = COPYING PATCHFILES = 0001-Skip-question-on-install.patch -ARCHALL_CSWpminline = 1 - PACKAGES = CSWpminline CATALOGNAME = pm_inline -# The current licensing is unknown as is stated on CPAN -CHECKPKG_OVERRIDES = license-missing +ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/Inline/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Inline/trunk/checksums 2010-03-29 00:38:51 UTC (rev 9425) +++ csw/mgar/pkg/cpan/Inline/trunk/checksums 2010-03-29 08:22:27 UTC (rev 9426) @@ -1,2 +1,3 @@ dff49e669277ead83e6e855394578c99 0001-Skip-question-on-install.patch +960408afb5916ccb6b971d3d4724990d COPYING 4c2f14829fbe83cb456e9c5c0dac06b3 Inline-0.46.tar.gz Added: csw/mgar/pkg/cpan/Inline/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Inline/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Inline/trunk/files/COPYING 2010-03-29 08:22:27 UTC (rev 9426) @@ -0,0 +1,6 @@ +Copyright (c) 2000, 2001, 2002. Brian Ingerson. All rights reserved. + +This program is free software; you can redistribute it and/or modify it +under the same terms as Perl itself. + +See http://www.perl.com/perl/misc/Artistic.html 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 Mar 29 10:25:51 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 29 Mar 2010 08:25:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[9427] csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile Message-ID: Revision: 9427 http://gar.svn.sourceforge.net/gar/?rev=9427&view=rev Author: dmichelsen Date: 2010-03-29 08:25:50 +0000 (Mon, 29 Mar 2010) Log Message: ----------- cpan/Params-Validate: Fix description Modified Paths: -------------- csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile Modified: csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile 2010-03-29 08:22:27 UTC (rev 9426) +++ csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile 2010-03-29 08:25:50 UTC (rev 9427) @@ -3,7 +3,7 @@ CATEGORIES = cpan AUTHOR = DROLSKY -DESCRIPTION = $(GARNAME): validate method/function parameters +DESCRIPTION = Validate method/function parameters define BLURB The Params::Validate module allows you to validate method or function call parameters to an arbitrary level of specificity. At the simplest level, 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 Mon Mar 29 11:25:14 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 29 Mar 2010 09:25:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[9428] csw/mgar/pkg/cpan Message-ID: Revision: 9428 http://gar.svn.sourceforge.net/gar/?rev=9428&view=rev Author: dmichelsen Date: 2010-03-29 09:25:14 +0000 (Mon, 29 Mar 2010) Log Message: ----------- cpan//Class-XSAccessor: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Class-XSAccessor/ csw/mgar/pkg/cpan/Class-XSAccessor/branches/ csw/mgar/pkg/cpan/Class-XSAccessor/tags/ csw/mgar/pkg/cpan/Class-XSAccessor/trunk/ csw/mgar/pkg/cpan/Class-XSAccessor/trunk/Makefile csw/mgar/pkg/cpan/Class-XSAccessor/trunk/checksums csw/mgar/pkg/cpan/Class-XSAccessor/trunk/files/ csw/mgar/pkg/cpan/Class-XSAccessor/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Class-XSAccessor/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-XSAccessor/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-XSAccessor/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Class-XSAccessor/trunk/Makefile 2010-03-29 09:25:14 UTC (rev 9428) @@ -0,0 +1,15 @@ +GARNAME = Class-XSAccessor +GARVERSION = 1.05 +CATEGORIES = cpan +AUTHOR = SMUELLER + +DESCRIPTION = Generate fast XS accessors without runtime compilation +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmclassxsaccessor +CATALOGNAME = pm_classxsaccessor + +include gar/category.mk Added: csw/mgar/pkg/cpan/Class-XSAccessor/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Class-XSAccessor/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Class-XSAccessor/trunk/checksums 2010-03-29 09:25:14 UTC (rev 9428) @@ -0,0 +1,2 @@ +3d2d27fe675e8f013f4d83ffc867b76c COPYING +e2df66a3dc04f3b0b0b35dedcd702818 Class-XSAccessor-1.05.tar.gz Added: csw/mgar/pkg/cpan/Class-XSAccessor/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Class-XSAccessor/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Class-XSAccessor/trunk/files/COPYING 2010-03-29 09:25:14 UTC (rev 9428) @@ -0,0 +1,6 @@ + Copyright (C) 2008-2009 by Steffen Mueller + + 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 or, at your + option, any later version of Perl 5 you may have available. + 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 Mar 29 11:38:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 29 Mar 2010 09:38:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[9429] csw/mgar/pkg/cpan Message-ID: Revision: 9429 http://gar.svn.sourceforge.net/gar/?rev=9429&view=rev Author: dmichelsen Date: 2010-03-29 09:38:27 +0000 (Mon, 29 Mar 2010) Log Message: ----------- cpan/AutoXS-Header: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/AutoXS-Header/ csw/mgar/pkg/cpan/AutoXS-Header/branches/ csw/mgar/pkg/cpan/AutoXS-Header/tags/ csw/mgar/pkg/cpan/AutoXS-Header/trunk/ csw/mgar/pkg/cpan/AutoXS-Header/trunk/Makefile csw/mgar/pkg/cpan/AutoXS-Header/trunk/checksums csw/mgar/pkg/cpan/AutoXS-Header/trunk/files/ csw/mgar/pkg/cpan/AutoXS-Header/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/AutoXS-Header/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/AutoXS-Header/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/AutoXS-Header/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/AutoXS-Header/trunk/Makefile 2010-03-29 09:38:27 UTC (rev 9429) @@ -0,0 +1,17 @@ +GARNAME = AutoXS-Header +GARVERSION = 1.02 +CATEGORIES = cpan +AUTHOR = SMUELLER + +DESCRIPTION = Container for the AutoXS header files +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmautoxsheader +CATALOGNAME = pm_autoxsheader + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/AutoXS-Header/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/AutoXS-Header/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/AutoXS-Header/trunk/checksums 2010-03-29 09:38:27 UTC (rev 9429) @@ -0,0 +1,2 @@ +bfed85ce503f6a2222b6ddd5cf7c41bc AutoXS-Header-1.02.tar.gz +3d2d27fe675e8f013f4d83ffc867b76c COPYING Added: csw/mgar/pkg/cpan/AutoXS-Header/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/AutoXS-Header/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/AutoXS-Header/trunk/files/COPYING 2010-03-29 09:38:27 UTC (rev 9429) @@ -0,0 +1,6 @@ + Copyright (C) 2008-2009 by Steffen Mueller + + 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 or, at your + option, any later version of Perl 5 you may have available. + 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 Mar 29 11:54:18 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 29 Mar 2010 09:54:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[9430] csw/mgar/pkg/cpan Message-ID: Revision: 9430 http://gar.svn.sourceforge.net/gar/?rev=9430&view=rev Author: dmichelsen Date: 2010-03-29 09:54:18 +0000 (Mon, 29 Mar 2010) Log Message: ----------- cpan/common-sense: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/common-sense/ csw/mgar/pkg/cpan/common-sense/branches/ csw/mgar/pkg/cpan/common-sense/tags/ csw/mgar/pkg/cpan/common-sense/trunk/ csw/mgar/pkg/cpan/common-sense/trunk/Makefile csw/mgar/pkg/cpan/common-sense/trunk/checksums csw/mgar/pkg/cpan/common-sense/trunk/files/ Property changes on: csw/mgar/pkg/cpan/common-sense/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/common-sense/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/common-sense/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/common-sense/trunk/Makefile 2010-03-29 09:54:18 UTC (rev 9430) @@ -0,0 +1,17 @@ +GARNAME = common-sense +GARVERSION = 3.0 +CATEGORIES = cpan +AUTHOR = MLEHMANN + +DESCRIPTION = Some sane defaults for Perl programs +define BLURB +endef + +PACKAGES = CSWpmcommonsense +CATALOGNAME = pm_commonsense + +LICENSE = LICENSE + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/common-sense/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/common-sense/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/common-sense/trunk/checksums 2010-03-29 09:54:18 UTC (rev 9430) @@ -0,0 +1 @@ +43e50e48f465f616b82837a09101a566 common-sense-3.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 Mon Mar 29 11:57:02 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 29 Mar 2010 09:57:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[9431] csw/mgar/pkg/cpan/common-sense/trunk/Makefile Message-ID: Revision: 9431 http://gar.svn.sourceforge.net/gar/?rev=9431&view=rev Author: dmichelsen Date: 2010-03-29 09:57:02 +0000 (Mon, 29 Mar 2010) Log Message: ----------- cpan/common-sense: Add override Modified Paths: -------------- csw/mgar/pkg/cpan/common-sense/trunk/Makefile Modified: csw/mgar/pkg/cpan/common-sense/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/common-sense/trunk/Makefile 2010-03-29 09:54:18 UTC (rev 9430) +++ csw/mgar/pkg/cpan/common-sense/trunk/Makefile 2010-03-29 09:57:02 UTC (rev 9431) @@ -14,4 +14,6 @@ ARCHALL = 1 +CHECKPKG_OVERRIDES_CSWpmcommonsense += pkginfo-description-not-starting-with-uppercase|common-sense:|Some|sane|defaults|for|Perl|programs + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 29 12:35:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 29 Mar 2010 10:35:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9432] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 9432 http://gar.svn.sourceforge.net/gar/?rev=9432&view=rev Author: wahwah Date: 2010-03-29 10:35:00 +0000 (Mon, 29 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, use += when suggesting RUNTIME_DEP_PKGS. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-29 09:57:02 UTC (rev 9431) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-29 10:35:00 UTC (rev 9432) @@ -236,7 +236,7 @@ messenger.Message(line) for missing_dep in missing_deps: messenger.SuggestGarLine( - "RUNTIME_DEP_PKGS_%s = %s" % (pkgname, missing_dep)) + "RUNTIME_DEP_PKGS_%s += %s" % (pkgname, missing_dep)) def SetCheckDependencies(pkgs_data, error_mgr, logger, messenger): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 29 12:46:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 29 Mar 2010 10:46:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9433] csw/mgar/pkg/evince/trunk/Makefile Message-ID: Revision: 9433 http://gar.svn.sourceforge.net/gar/?rev=9433&view=rev Author: wahwah Date: 2010-03-29 10:46:43 +0000 (Mon, 29 Mar 2010) Log Message: ----------- evince: Updated dependencies Modified Paths: -------------- csw/mgar/pkg/evince/trunk/Makefile Modified: csw/mgar/pkg/evince/trunk/Makefile =================================================================== --- csw/mgar/pkg/evince/trunk/Makefile 2010-03-29 10:35:00 UTC (rev 9432) +++ csw/mgar/pkg/evince/trunk/Makefile 2010-03-29 10:46:43 UTC (rev 9433) @@ -24,20 +24,22 @@ # There are no shared-object dependencies on CSWdbus, but it's required for # evince to work. RUNTIME_DEP_PKGS_CSWevince += CSWdbus +CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWdbus # Shared MIME info is needed to detect file types RUNTIME_DEP_PKGS_CSWevince += CSWsharedmimeinfo +CHECKPKG_OVERRIDES_CSWevince += surplus-dependency|CSWsharedmimeinfo +# Shared libraries RUNTIME_DEP_PKGS_CSWevince += CSWdbusglib -RUNTIME_DEP_PKGS_CSWevince += CSWdjvulibre +RUNTIME_DEP_PKGS_CSWevince += CSWdjvulibrert RUNTIME_DEP_PKGS_CSWevince += CSWfconfig RUNTIME_DEP_PKGS_CSWevince += CSWftype2 RUNTIME_DEP_PKGS_CSWevince += CSWgconf2 RUNTIME_DEP_PKGS_CSWevince += CSWggettextrt RUNTIME_DEP_PKGS_CSWevince += CSWglib2 RUNTIME_DEP_PKGS_CSWevince += CSWgnomekeyring +RUNTIME_DEP_PKGS_CSWevince += CSWgnomevfs2 RUNTIME_DEP_PKGS_CSWevince += CSWgtk2 -RUNTIME_DEP_PKGS_CSWevince += CSWiconv -RUNTIME_DEP_PKGS_CSWevince += CSWjpeg RUNTIME_DEP_PKGS_CSWevince += CSWlibatk RUNTIME_DEP_PKGS_CSWevince += CSWlibcairo RUNTIME_DEP_PKGS_CSWevince += CSWlibdbus @@ -46,9 +48,10 @@ RUNTIME_DEP_PKGS_CSWevince += CSWlibsm RUNTIME_DEP_PKGS_CSWevince += CSWlibx11 RUNTIME_DEP_PKGS_CSWevince += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWevince += CSWnautilus RUNTIME_DEP_PKGS_CSWevince += CSWpango -RUNTIME_DEP_PKGS_CSWevince += CSWpoppler RUNTIME_DEP_PKGS_CSWevince += CSWtiff RUNTIME_DEP_PKGS_CSWevince += CSWzlib + BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWevince) 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 Mon Mar 29 13:10:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 29 Mar 2010 11:10:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9434] csw/mgar/pkg/cpan/common-sense/trunk/Makefile Message-ID: Revision: 9434 http://gar.svn.sourceforge.net/gar/?rev=9434&view=rev Author: dmichelsen Date: 2010-03-29 11:10:42 +0000 (Mon, 29 Mar 2010) Log Message: ----------- cpan/common-sense: Adjust override Modified Paths: -------------- csw/mgar/pkg/cpan/common-sense/trunk/Makefile Modified: csw/mgar/pkg/cpan/common-sense/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/common-sense/trunk/Makefile 2010-03-29 10:46:43 UTC (rev 9433) +++ csw/mgar/pkg/cpan/common-sense/trunk/Makefile 2010-03-29 11:10:42 UTC (rev 9434) @@ -14,6 +14,6 @@ ARCHALL = 1 -CHECKPKG_OVERRIDES_CSWpmcommonsense += pkginfo-description-not-starting-with-uppercase|common-sense:|Some|sane|defaults|for|Perl|programs +CHECKPKG_OVERRIDES = pkginfo-description-not-starting-with-uppercase include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 29 13:36:27 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 29 Mar 2010 11:36:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[9435] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9435 http://gar.svn.sourceforge.net/gar/?rev=9435&view=rev Author: wahwah Date: 2010-03-29 11:36:26 +0000 (Mon, 29 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, fixed a bug with overrides with colons. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-29 11:10:42 UTC (rev 9434) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-29 11:36:26 UTC (rev 9435) @@ -894,7 +894,7 @@ level_1 = line.split(":") if len(level_1) > 1: pkgname = level_1[0] - data_1 = level_1[1] + data_1 = ":".join(level_1[1:]) else: pkgname = None data_1 = level_1[0] Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-29 11:10:42 UTC (rev 9434) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-29 11:36:26 UTC (rev 9435) @@ -184,7 +184,7 @@ checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "foo-info"), ], } - screen_report, tags_report = m.FormatReports(tags, []) + screen_report, tags_report = m.FormatReports(tags, [], []) expected = u'# Tags reported by testname module\nCSWfoo: foo-tag foo-info\n' self.assertEqual(expected, tags_report) @@ -197,7 +197,7 @@ checkpkg.CheckpkgTag("CSWfoo", "baz-tag"), ], } - screen_report, tags_report = m.FormatReports(tags, []) + screen_report, tags_report = m.FormatReports(tags, [], []) expected = (u'# Tags reported by testname module\n' u'CSWfoo: foo-tag foo-info\n' u'CSWfoo: bar-tag bar-info\n' @@ -234,9 +234,13 @@ line1 = "CSWfoo: foo-override" line2 = "CSWfoo: foo-override foo-info" line3 = "CSWfoo: foo-override foo-info-1 foo-info-2" + line4 = ("CSWpmcommonsense: " + "pkginfo-description-not-starting-with-uppercase " + "common-sense: Some sane defaults for Perl programs") self.o1 = checkpkg.ParseOverrideLine(line1) self.o2 = checkpkg.ParseOverrideLine(line2) self.o3 = checkpkg.ParseOverrideLine(line3) + self.o4 = checkpkg.ParseOverrideLine(line4) def test_ParseOverridesLine1(self): self.assertEqual("CSWfoo", self.o1.pkgname) @@ -259,7 +263,20 @@ def test_ParseOverridesLine7(self): self.assertEqual("foo-info-1 foo-info-2", self.o3.tag_info) + def test_ParseOverridesLine_4_1(self): + self.assertEqual("CSWpmcommonsense", self.o4.pkgname) + def test_ParseOverridesLine_4_2(self): + self.assertEqual( + "pkginfo-description-not-starting-with-uppercase", + self.o4.tag_name) + + def test_ParseOverridesLine_4_3(self): + self.assertEqual( + "common-sense: Some sane defaults for Perl programs", + self.o4.tag_info) + + class ApplyOverridesUnitTest(unittest.TestCase): # This would be better, more terse. But requires metaclasses. 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 Mar 29 13:55:36 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 29 Mar 2010 11:55:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9436] csw/mgar/pkg/qhull/trunk Message-ID: Revision: 9436 http://gar.svn.sourceforge.net/gar/?rev=9436&view=rev Author: dmichelsen Date: 2010-03-29 11:55:35 +0000 (Mon, 29 Mar 2010) Log Message: ----------- qhull: Add patch and license Modified Paths: -------------- csw/mgar/pkg/qhull/trunk/Makefile csw/mgar/pkg/qhull/trunk/checksums Added Paths: ----------- csw/mgar/pkg/qhull/trunk/files/poly.c-qh_gethash.patch Modified: csw/mgar/pkg/qhull/trunk/Makefile =================================================================== --- csw/mgar/pkg/qhull/trunk/Makefile 2010-03-29 11:36:26 UTC (rev 9435) +++ csw/mgar/pkg/qhull/trunk/Makefile 2010-03-29 11:55:35 UTC (rev 9436) @@ -2,7 +2,7 @@ GARVERSION = 2003.1 CATEGORIES = lib -DESCRIPTION = Qhull computes the convex hull and other hulls +DESCRIPTION = Qhull computes the convex hull and other hulls (with poly.c-qh_gethash.patch) define BLURB Qhull computes the convex hull, Delaunay triangulation, Voronoi diagram, halfspace intersection about a point, furthest-site Delaunay triangulation, @@ -18,9 +18,15 @@ MASTER_SITES = http://www.qhull.org/download/ DISTFILES = $(DISTNAME).tar.gz +# From http://www.qhull.org/download/ +PATCHDIRLEVEL = 2 +PATCHFILES = poly.c-qh_gethash.patch + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +LICENSE = COPYING.txt + PACKAGES = CSWqhull CSWqhullrt CATALOGNAME_CSWqhull = qhull Modified: csw/mgar/pkg/qhull/trunk/checksums =================================================================== --- csw/mgar/pkg/qhull/trunk/checksums 2010-03-29 11:36:26 UTC (rev 9435) +++ csw/mgar/pkg/qhull/trunk/checksums 2010-03-29 11:55:35 UTC (rev 9436) @@ -1 +1,2 @@ +2545ef6e268e41e31d52685c08c778e5 poly.c-qh_gethash.patch 48228e26422bff85ef1f45df5b6e3314 qhull-2003.1.tar.gz Added: csw/mgar/pkg/qhull/trunk/files/poly.c-qh_gethash.patch =================================================================== --- csw/mgar/pkg/qhull/trunk/files/poly.c-qh_gethash.patch (rev 0) +++ csw/mgar/pkg/qhull/trunk/files/poly.c-qh_gethash.patch 2010-03-29 11:55:35 UTC (rev 9436) @@ -0,0 +1,23 @@ +--- a/qhull-2003.1/src/poly.c ++++ b/qhull-2003.1/src/poly.c +@@ -403,6 +403,7 @@ unsigned qh_gethash (int hashsize, setT *set, int size, int firstindex, void *sk + void **elemp= SETelemaddr_(set, firstindex, void); + ptr_intT hash = 0, elem; + int i; ++ unsigned result; + + switch (size-firstindex) { + case 1: +@@ -441,7 +442,8 @@ unsigned qh_gethash (int hashsize, setT *set, int size, int firstindex, void *sk + }while(*elemp); + break; + } +- hash %= (ptr_intT) hashsize; +- /* hash= 0; for debugging purposes */ +- return hash; ++ result= (unsigned)hash; ++ result %= (unsigned)hashsize; ++ /* result= 0; for debugging purposes */ ++ return result; + } /* gethash */ + 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 Mar 29 14:07:23 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 29 Mar 2010 12:07:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9437] csw/mgar/pkg/qhull/trunk/Makefile Message-ID: Revision: 9437 http://gar.svn.sourceforge.net/gar/?rev=9437&view=rev Author: dmichelsen Date: 2010-03-29 12:07:23 +0000 (Mon, 29 Mar 2010) Log Message: ----------- qhull: Ignore amd64 linkage errors on i386 Modified Paths: -------------- csw/mgar/pkg/qhull/trunk/Makefile Modified: csw/mgar/pkg/qhull/trunk/Makefile =================================================================== --- csw/mgar/pkg/qhull/trunk/Makefile 2010-03-29 11:55:35 UTC (rev 9436) +++ csw/mgar/pkg/qhull/trunk/Makefile 2010-03-29 12:07:23 UTC (rev 9437) @@ -44,6 +44,9 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +# This is for amd64 checked on i386 +CHECKPKG_OVERRIDES = soname-not-found|libm.so.2 + 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 wahwah at users.sourceforge.net Mon Mar 29 14:29:05 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 29 Mar 2010 12:29:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[9438] csw/mgar/gar/v2/lib/python/dependency_checks.py Message-ID: Revision: 9438 http://gar.svn.sourceforge.net/gar/?rev=9438&view=rev Author: wahwah Date: 2010-03-29 12:29:03 +0000 (Mon, 29 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, only including the soname in the error tag parameter, moving the path to the message part Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-03-29 12:07:23 UTC (rev 9437) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-03-29 12:29:03 UTC (rev 9438) @@ -48,7 +48,8 @@ orphan_sonames = set(orphan_sonames) for soname, binary_path in orphan_sonames: error_mgr.ReportError( - pkgname, "soname-not-found", "%s needed by %s" % (soname, binary_path)) + pkgname, "soname-not-found", soname, + "%s is needed by %s" % (soname, binary_path)) # TODO: Report orphan sonames here return required_deps This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 29 14:32:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 29 Mar 2010 12:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9439] csw/mgar/gar/v2/lib/python/package_checks_test.py Message-ID: Revision: 9439 http://gar.svn.sourceforge.net/gar/?rev=9439&view=rev Author: wahwah Date: 2010-03-29 12:32:13 +0000 (Mon, 29 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, adding SuggestGarLine() to MessengerStub in unit tests. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-29 12:29:03 UTC (rev 9438) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-29 12:32:13 UTC (rev 9439) @@ -43,6 +43,8 @@ class MessengerStub(object): def Message(self, m): pass + def SuggestGarLine(self, m): + pass # self.logger_mock = self.mocker.CreateMock(logging.Logger) self.logger_mock = LoggerStub() self.error_mgr_mock = self.mocker.CreateMock( 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 Mar 29 16:00:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 29 Mar 2010 14:00:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9440] csw/mgar/pkg Message-ID: Revision: 9440 http://gar.svn.sourceforge.net/gar/?rev=9440&view=rev Author: dmichelsen Date: 2010-03-29 14:00:32 +0000 (Mon, 29 Mar 2010) Log Message: ----------- rc: Initial commit Added Paths: ----------- csw/mgar/pkg/rc/ csw/mgar/pkg/rc/branches/ csw/mgar/pkg/rc/tags/ csw/mgar/pkg/rc/trunk/ csw/mgar/pkg/rc/trunk/Makefile csw/mgar/pkg/rc/trunk/checksums csw/mgar/pkg/rc/trunk/files/ Property changes on: csw/mgar/pkg/rc/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/rc/trunk/Makefile =================================================================== --- csw/mgar/pkg/rc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rc/trunk/Makefile 2010-03-29 14:00:32 UTC (rev 9440) @@ -0,0 +1,25 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = rc +GARVERSION = 1.7.1 +CATEGORIES = apps + +DESCRIPTION = A reimplementation of the Plan 9 shell +define BLURB +endef + +MASTER_SITES = http://www.libra-aries-books.co.uk/software/download/ +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://www.libra-aries-books.co.uk/software/rc + +DEP_PKGS = CSWreadline + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-readline + +TEST_TARGET = check + +include gar/category.mk Property changes on: csw/mgar/pkg/rc/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/rc/trunk/checksums =================================================================== --- csw/mgar/pkg/rc/trunk/checksums (rev 0) +++ csw/mgar/pkg/rc/trunk/checksums 2010-03-29 14:00:32 UTC (rev 9440) @@ -0,0 +1 @@ +7253e1c853824cf27edb2166214f0511 rc-1.7.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 29 16:24:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 29 Mar 2010 14:24:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9441] csw/mgar/pkg/python/branches/python-2.6.4+patch7242/ Message-ID: Revision: 9441 http://gar.svn.sourceforge.net/gar/?rev=9441&view=rev Author: wahwah Date: 2010-03-29 14:24:58 +0000 (Mon, 29 Mar 2010) Log Message: ----------- python: Removing old branch Removed Paths: ------------- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/ 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 Mar 29 16:39:13 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 29 Mar 2010 14:39:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9442] csw/mgar/pkg/miltergreylist/trunk Message-ID: Revision: 9442 http://gar.svn.sourceforge.net/gar/?rev=9442&view=rev Author: bonivart Date: 2010-03-29 14:39:13 +0000 (Mon, 29 Mar 2010) Log Message: ----------- milter-greylist: some fixes Modified Paths: -------------- csw/mgar/pkg/miltergreylist/trunk/Makefile csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/Makefile 2010-03-29 14:24:58 UTC (rev 9441) +++ csw/mgar/pkg/miltergreylist/trunk/Makefile 2010-03-29 14:39:13 UTC (rev 9442) @@ -16,7 +16,7 @@ DISTFILES = milter-greylist-$(DISTVERSION).tgz DISTFILES += COPYING -RUNTIME_DEP_PKGS = CSWsendmail CSWcurlrt CSWgeoip +REQUIRED_PKGS = CSWcurlrt CSWgeoip # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz @@ -29,23 +29,29 @@ CONFIGURE_ARGS += --with-conffile=/etc/opt/csw/greylist.conf CONFIGURE_ARGS += --enable-dnsrbl CONFIGURE_ARGS += --enable-stdio-hack -CONFIGURE_ARGS += --localstatedir=/var/opt/csw/milter-greylist +CONFIGURE_ARGS += --localstatedir=/var/opt/csw/miltergreylist CONFIGURE_ARGS += --with-libGeoIP=/opt/csw/lib CONFIGURE_ARGS += --with-libcurl=/opt/csw/lib CONFIGURE_ARGS += --mandir=/opt/csw/share/man -#SPKG_CLASSES = none cswusergroup cswcpsampleconf cswinitsmf +#SPKG_CLASSES = none cswusergroup ugfiles cswcpsampleconf cswinitsmf TEST_SCRIPTS = INSTALL_SCRIPTS = custom USERGROUP = /opt/csw/etc/pkg/miltergreylist/cswusergroup -SAMPLECONF = /etc/opt/csw/greylist.conf.CSW +SAMPLECONF = /etc/opt/csw/greylist.conf INITSMF = /etc/opt/csw/init.d/cswmiltergreylist -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/var\/opt\/csw\/miltergreylist/ { $$$$4 = "0700" ; $$$$5 = "greylist" } \ - { print }' +PROTOTYPE_MODIFIERS = 1 +PROTOTYPE_FILES_1 = /var/opt/csw/miltergreylist +PROTOTYPE_CLASS_1 = ugfiles +PROTOTYPE_PERMS_1 = 0700 +PROTOTYPE_USER_1 = greylist +#PROTOTYPE_FILTER = awk ' \ +# $$$$3 ~ /\/var\/opt\/csw\/miltergreylist/ { $$$$2 = "ugfiles" ; $$$$4 = "0700" ; $$$$5 = "greylist" } \ +# { print }' + include gar/category.mk #WORKSRC := $(WORKDIR)/$(GARNAME)-$(GARVERSION)b1 @@ -59,7 +65,7 @@ @( cd $(WORKSRC) ; \ gmake DESTDIR=$(DESTDIR) install ) @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw - @mv $(DESTDIR)/etc/mail/greylist.conf $(DESTDIR)/etc/opt/csw/greylist.conf.CSW + @mv $(DESTDIR)/etc/mail/greylist.conf $(DESTDIR)/etc/opt/csw/greylist.conf @rmdir $(DESTDIR)/etc/mail @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(GARNAME) @$(foreach DOC,$(DOCLIST),cp $(WORKSRC)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) @@ -69,5 +75,6 @@ @cp $(FILEDIR)/CSWmiltergreylist.ug $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME)/cswusergroup @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/init.d @cp $(FILEDIR)/CSWmiltergreylist.init $(DESTDIR)/etc/opt/csw/init.d/cswmiltergreylist - @cp $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)$(GARNAME) + @chmod 755 $(DESTDIR)/etc/opt/csw/init.d/cswmiltergreylist + @cp $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(GARNAME) @$(MAKECOOKIE) Modified: csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug 2010-03-29 14:24:58 UTC (rev 9441) +++ csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug 2010-03-29 14:39:13 UTC (rev 9442) @@ -1 +1 @@ -greylist:greylist:CSW Milter-Greylist:/bin/false:/false::NP +greylist:greylist:CSW Milter-Greylist:/false:/bin/false:::NP 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 Mar 29 16:50:37 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 29 Mar 2010 14:50:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9443] csw/mgar/pkg/geolitedb/trunk Message-ID: Revision: 9443 http://gar.svn.sourceforge.net/gar/?rev=9443&view=rev Author: bonivart Date: 2010-03-29 14:50:36 +0000 (Mon, 29 Mar 2010) Log Message: ----------- geolitedb: update to 100302 Modified Paths: -------------- csw/mgar/pkg/geolitedb/trunk/Makefile csw/mgar/pkg/geolitedb/trunk/checksums Modified: csw/mgar/pkg/geolitedb/trunk/Makefile =================================================================== --- csw/mgar/pkg/geolitedb/trunk/Makefile 2010-03-29 14:39:13 UTC (rev 9442) +++ csw/mgar/pkg/geolitedb/trunk/Makefile 2010-03-29 14:50:36 UTC (rev 9443) @@ -1,8 +1,8 @@ GARNAME = geolitedb -GARVERSION = 091001 +GARVERSION = 100302 CATEGORIES = net -DESCRIPTION = geolite country database +DESCRIPTION = Geolite country database MASTER_SITES = http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/ DISTFILES = GeoIP.dat.gz Modified: csw/mgar/pkg/geolitedb/trunk/checksums =================================================================== --- csw/mgar/pkg/geolitedb/trunk/checksums 2010-03-29 14:39:13 UTC (rev 9442) +++ csw/mgar/pkg/geolitedb/trunk/checksums 2010-03-29 14:50:36 UTC (rev 9443) @@ -1,2 +1,2 @@ -ed834df1fb6cb5056f5310b98fc71811 download/COPYING -a8430b5dc9dee5ff81ac3ff1745097c6 download/GeoIP.dat.gz +ed834df1fb6cb5056f5310b98fc71811 COPYING +9096cf88a707dea9b8063b5abab60dbb GeoIP.dat.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 Mon Mar 29 17:35:39 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 29 Mar 2010 15:35:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9444] csw/mgar/pkg/phpsysinfo/trunk Message-ID: Revision: 9444 http://gar.svn.sourceforge.net/gar/?rev=9444&view=rev Author: bonivart Date: 2010-03-29 15:35:39 +0000 (Mon, 29 Mar 2010) Log Message: ----------- phpsysinfo: update to 3.0.4 Modified Paths: -------------- csw/mgar/pkg/phpsysinfo/trunk/Makefile csw/mgar/pkg/phpsysinfo/trunk/checksums Modified: csw/mgar/pkg/phpsysinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpsysinfo/trunk/Makefile 2010-03-29 14:50:36 UTC (rev 9443) +++ csw/mgar/pkg/phpsysinfo/trunk/Makefile 2010-03-29 15:35:39 UTC (rev 9444) @@ -1,5 +1,5 @@ GARNAME = phpsysinfo -GARVERSION = 2.5.4 +GARVERSION = 3.0.4 CATEGORIES = utils DESCRIPTION = Displays information about the host being accessed @@ -32,6 +32,10 @@ SAMPLECONF = .*config.php +CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWap2modphp5 +CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWapache2 + include gar/category.mk install-custom: @@ -43,6 +47,6 @@ @( cd $(DESTDIR)$(prefix)/share/www/phpsysinfo ; \ mv config.php.new config.php ; \ mv COPYING $(DESTDIR)$(docdir)/$(GARNAME)/license ) - @( cd $(DESTDIR)$(prefix)/share/www/phpsysinfo/includes/os ; \ - gpatch < ../../../../../../../../../$(FILEDIR)/CSWphpsysinfo.class.SunOS.inc.php.p ) +# @( cd $(DESTDIR)$(prefix)/share/www/phpsysinfo/includes/os ; \ +# gpatch < ../../../../../../../../../$(FILEDIR)/CSWphpsysinfo.class.SunOS.inc.php.p ) @$(MAKECOOKIE) Modified: csw/mgar/pkg/phpsysinfo/trunk/checksums =================================================================== --- csw/mgar/pkg/phpsysinfo/trunk/checksums 2010-03-29 14:50:36 UTC (rev 9443) +++ csw/mgar/pkg/phpsysinfo/trunk/checksums 2010-03-29 15:35:39 UTC (rev 9444) @@ -1 +1 @@ -5bf79793255ff24d5f9cbc6a62705aa7 download/phpsysinfo-2.5.4.tar.gz +a9a3819dec3a91b802ffb871a02704a1 phpsysinfo-3.0.4.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 Mon Mar 29 17:48:56 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 29 Mar 2010 15:48:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[9445] csw/mgar/pkg/cpan/App-CLI/trunk Message-ID: Revision: 9445 http://gar.svn.sourceforge.net/gar/?rev=9445&view=rev Author: bonivart Date: 2010-03-29 15:48:55 +0000 (Mon, 29 Mar 2010) Log Message: ----------- pm_appcli: some fixes Modified Paths: -------------- csw/mgar/pkg/cpan/App-CLI/trunk/Makefile csw/mgar/pkg/cpan/App-CLI/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/App-CLI/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/App-CLI/trunk/files/CSWpmappcli.gspec Modified: csw/mgar/pkg/cpan/App-CLI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/App-CLI/trunk/Makefile 2010-03-29 15:35:39 UTC (rev 9444) +++ csw/mgar/pkg/cpan/App-CLI/trunk/Makefile 2010-03-29 15:48:55 UTC (rev 9445) @@ -10,14 +10,15 @@ endef DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWpmappcli,) +DISTFILES += COPYING +PACKAGES = CSWpmappcli +CATALOGNAME = pm_appcli +ARCHALL = 1 + RUNTIME_DEP_PKGS = CSWpmlclemktxtsimple CSWpmpodsimple -DEPENDS += cpan/Locale-Maketext-Simple -DEPENDS += cpan/Pod-Simple -DEPENDS += cpan/Getopt-Long +CHECKPKG_OVERRIDES_CSWpmappcli += surplus-dependency|CSWpmpodsimple +CHECKPKG_OVERRIDES_CSWpmappcli += surplus-dependency|CSWpmlclemktxtsimple -EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod - include gar/category.mk Modified: csw/mgar/pkg/cpan/App-CLI/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/App-CLI/trunk/checksums 2010-03-29 15:35:39 UTC (rev 9444) +++ csw/mgar/pkg/cpan/App-CLI/trunk/checksums 2010-03-29 15:48:55 UTC (rev 9445) @@ -1,3 +1,2 @@ -dc376fad10f1d2457571a0e52158ff17 download/App-CLI-0.08.tar.gz -2887bfa6873bb556886bba007893979f download/CSWpmappcli.gspec -dc376fad10f1d2457571a0e52158ff17 download/App-CLI-0.08.tar.gz +dc376fad10f1d2457571a0e52158ff17 App-CLI-0.08.tar.gz +27698f516ae4dc71414205c2b635c231 COPYING Added: csw/mgar/pkg/cpan/App-CLI/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/App-CLI/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/App-CLI/trunk/files/COPYING 2010-03-29 15:48:55 UTC (rev 9445) @@ -0,0 +1,6 @@ +Copyright 2005-2006 by Chia-liang Kao . + +This program is free software; you can redistribute it and/or modify it +under the same terms as Perl itself. + +See http://www.perl.com/perl/misc/Artistic.html Deleted: csw/mgar/pkg/cpan/App-CLI/trunk/files/CSWpmappcli.gspec =================================================================== --- csw/mgar/pkg/cpan/App-CLI/trunk/files/CSWpmappcli.gspec 2010-03-29 15:35:39 UTC (rev 9444) +++ csw/mgar/pkg/cpan/App-CLI/trunk/files/CSWpmappcli.gspec 2010-03-29 15:48:55 UTC (rev 9445) @@ -1,11 +0,0 @@ -%var bitname pm_appcli -%var pkgname CSWpmappcli -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 2005-2006 by Chia-liang Kao Eclkao at clkao.orgE. - -This program is free software; you can redistribute it and/or modify it -under the same terms as Perl itself. - -See http://www.perl.com/perl/misc/Artistic.html 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 Mar 29 17:56:55 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 29 Mar 2010 15:56:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[9446] csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile Message-ID: Revision: 9446 http://gar.svn.sourceforge.net/gar/?rev=9446&view=rev Author: bonivart Date: 2010-03-29 15:56:54 +0000 (Mon, 29 Mar 2010) Log Message: ----------- pm_dbdsqlite: description fix Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile Modified: csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2010-03-29 15:48:55 UTC (rev 9445) +++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2010-03-29 15:56:54 UTC (rev 9446) @@ -3,7 +3,7 @@ CATEGORIES = cpan AUTHOR = ADAMK -DESCRIPTION = self contained RDBMS in a DBI driver +DESCRIPTION = Self contained RDBMS in a DBI driver define BLURB DBD::SQLite is a Perl DBI driver for SQLite, that includes the entire thing in the distribution. So in order to get a fast transaction capable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Mar 29 18:44:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 29 Mar 2010 16:44:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9447] csw/mgar/gar/v2 Message-ID: Revision: 9447 http://gar.svn.sourceforge.net/gar/?rev=9447&view=rev Author: wahwah Date: 2010-03-29 16:44:43 +0000 (Mon, 29 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, optimizations for the whole catalog run. More parsing capabilities for ldd -r, but it still can't handle KDE packages. Modified Paths: -------------- csw/mgar/gar/v2/bin/analyze_module_results.py csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/bin/checkpkg_collect_stats.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/bin/analyze_module_results.py =================================================================== --- csw/mgar/gar/v2/bin/analyze_module_results.py 2010-03-29 15:56:54 UTC (rev 9446) +++ csw/mgar/gar/v2/bin/analyze_module_results.py 2010-03-29 16:44:43 UTC (rev 9447) @@ -34,8 +34,8 @@ unapplied_overrides) = checkpkg.ApplyOverrides(error_tags, overrides) exit_code = bool(tags_after_overrides) if tags_after_overrides: - print "There were errors reported." - print "If you know they are false positives, you can override them:" + print "If any of the reported errors were false positives, you can" + print "override them pasting the lines below to the GAR recipe." for tag in tags_after_overrides: print tag.ToGarSyntax() if unapplied_overrides: Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-03-29 15:56:54 UTC (rev 9446) +++ csw/mgar/gar/v2/bin/checkpkg 2010-03-29 16:44:43 UTC (rev 9447) @@ -240,11 +240,20 @@ extra_options="--debug" fi +if [[ -n "${MD5_SUMS_CATALOG_FILE}" ]]; then + catalog_options="--catalog=${MD5_SUMS_CATALOG_FILE}" +else + catalog_options="" +fi + # /var/sadm/install/contents cache update ${command_basedir}/update_contents_cache.py if [[ "${SKIP_STATS_COLLECTION}" -eq 0 ]]; then - # Collects package stats to be later analyzed - ${command_basedir}/checkpkg_collect_stats.py ${extra_options} "$@" + # Collects package stats to be analyzed later + ${command_basedir}/checkpkg_collect_stats.py \ + ${catalog_options} \ + ${extra_options} \ + "$@" if [[ "$?" -ne 0 ]]; then errmsg "Stats collection phase has failed." fi Modified: csw/mgar/gar/v2/bin/checkpkg_collect_stats.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py 2010-03-29 15:56:54 UTC (rev 9446) +++ csw/mgar/gar/v2/bin/checkpkg_collect_stats.py 2010-03-29 16:44:43 UTC (rev 9447) @@ -27,15 +27,30 @@ parser.add_option("-d", "--debug", dest="debug", default=False, action="store_true", help="Turn on debugging messages") + parser.add_option("-c", "--catalog", dest="catalog_file", + help="Catalog file") options, args = parser.parse_args() if options.debug: logging.basicConfig(level=logging.DEBUG) else: logging.basicConfig(level=logging.INFO) logging.debug("Collecting statistics about given package files.") - logging.debug("calling: %s, please be patient", args) + args_display = args + if len(args_display) > 5: + args_display = args_display[:5] + ["...more..."] + logging.debug("Calling: %s, please be patient", args_display) packages = [opencsw.CswSrv4File(x, options.debug) for x in args] + if options.catalog_file: + # Using cached md5sums to save time: injecting md5sums + # from the catalog. + catalog = opencsw.OpencswCatalog(options.catalog_file) + md5s_by_basename = catalog.GetDataByBasename() + for pkg in packages: + basename = os.path.basename(pkg.pkg_path) + pkg.md5sum = md5s_by_basename[basename]["md5sum"] stats_list = [checkpkg.PackageStats(pkg) for pkg in packages] + md5s_by_basename = None # To free memory + catalog = None # To free memory del(packages) stats_list.reverse() total_packages = len(stats_list) Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-29 15:56:54 UTC (rev 9446) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-03-29 16:44:43 UTC (rev 9447) @@ -31,6 +31,7 @@ RUNPATH = "runpath" SONAME = "soname" CONFIG_MTIME = "mtime" +WRITE_YAML = False DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) DO_NOT_REPORT_MISSING = set([]) DO_NOT_REPORT_MISSING_RE = [r"SUNW.*", r"\*SUNW.*"] @@ -115,8 +116,8 @@ #end if #if $gar_lines -# Checkpkg suggests adding the following lines to the GAR recipe, -# see above for details: +# Checkpkg suggests adding the following lines to the GAR recipe: +# This is a summary; see above for details. #for $line in $gar_lines $line #end for @@ -603,6 +604,7 @@ repr(self.tag_info))) def ToGarSyntax(self): + """Presents the error tag using GAR syntax.""" msg_lines = [] if self.msg: msg_lines.extend(textwrap(self.msg, 70, @@ -945,7 +947,6 @@ STAT_FILES = [ "all_filenames", "bad_paths", - "basic_stats", "binaries", "binaries_dump_info", # "defined_symbols", @@ -956,6 +957,9 @@ "pkgchk", "pkginfo", "pkgmap", + # This entry needs to be last because of the assumption in the + # CollectStats() function. + "basic_stats", ] def __init__(self, srv4_pkg, stats_basedir=None, md5sum=None): @@ -1161,9 +1165,13 @@ if not self.StatsDirExists() or force: self._CollectStats() return - basic_stats_file = in_file_name_pickle = os.path.join( - self.GetStatsPath(), "basic_stats.pickle") - f = open(basic_stats_file, "r") + for stats_name in self.STAT_FILES + ["basic_stats"]: + file_name = in_file_name_pickle = os.path.join( + self.GetStatsPath(), "%s.pickle" % stats_name) + if not os.path.exists(file_name): + self._CollectStats() + return + f = open(file_name, "r") obj = cPickle.load(f) f.close() saved_version = obj["stats_version"] @@ -1192,6 +1200,7 @@ self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo") self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap") # The ldd -r reporting breaks on bigger packages during yaml saving. + # It might work when yaml is disabled # self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") # This check is currently disabled, let's save time by not collecting # these data. @@ -1221,13 +1230,15 @@ """Saves an object.""" stats_path = self.GetStatsPath() # yaml - out_file_name = os.path.join(stats_path, "%s.yml" % name) - logging.debug("DumpObject(): writing %s", repr(out_file_name)) - f = open(out_file_name, "w") - f.write(yaml.safe_dump(obj)) - f.close() + if WRITE_YAML: + out_file_name = os.path.join(stats_path, "%s.yml" % name) + logging.debug("DumpObject(): writing %s", repr(out_file_name)) + f = open(out_file_name, "w") + f.write(yaml.safe_dump(obj)) + f.close() # pickle out_file_name_pickle = os.path.join(stats_path, "%s.pickle" % name) + logging.debug("DumpObject(): writing %s", repr(out_file_name_pickle)) f = open(out_file_name_pickle, "wb") cPickle.dump(obj, f) f.close() @@ -1242,10 +1253,13 @@ f = open(in_file_name_pickle, "r") obj = cPickle.load(f) f.close() - else: + elif os.path.exists(in_file_name): f = open(in_file_name, "r") obj = yaml.safe_load(f) f.close() + else: + raise PackageError("Can't read %s nor %s." + % (in_file_name, in_file_name_pickle)) return obj def ReadSavedStats(self): @@ -1262,9 +1276,15 @@ stv_protected = (r'^\trelocation \S+ symbol: (?P\S+): ' r'file (?P\S+): ' r'relocation bound to a symbol with STV_PROTECTED visibility$') - common_re = (r"(%s|%s|%s|%s|%s)" + sizes_differ = (r'^\trelocation \S+ sizes differ: (?P\S+)$') + sizes_info = (r'^\t\t\(file (?P\S+) size=(?P0x\w+); ' + r'file (?P\S+) size=(?P0x\w+)\)$') + sizes_one_used = ( + r'^\t\t(?P\S+) size used; ' + 'possible insufficient data copied$') + common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s)" % (found_re, symbol_not_found_re, only_so, version_so, - stv_protected)) + stv_protected, sizes_differ, sizes_info, sizes_one_used)) m = re.match(common_re, line) response = {} if m: @@ -1295,6 +1315,21 @@ response["soname"] = None response["path"] = d["relocation_path"] response["symbol"] = d["relocation_symbol"] + elif d["sizes_differ_symbol"]: + response["state"] = 'sizes-differ' + response["soname"] = None + response["path"] = None + response["symbol"] = d["sizes_differ_symbol"] + elif d["sizediff_file1"]: + response["state"] = 'sizes-diff-info' + response["soname"] = None + response["path"] = "%s %s" % (d["sizediff_file1"], d["sizediff_file2"]) + response["symbol"] = None + elif d["sizediffused_file"]: + response["state"] = 'sizes-diff-one-used' + response["soname"] = None + response["path"] = "%s %s" % (d["sizediff_file1"], d["sizediff_file2"]) + response["symbol"] = None else: raise StdoutSyntaxError("Could not parse %s with %s" % (repr(line), common_re)) Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-29 15:56:54 UTC (rev 9446) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-03-29 16:44:43 UTC (rev 9447) @@ -30,6 +30,9 @@ \tlibm.so.2 => /lib/libm.so.2 \t/usr/lib/secure/s8_preload.so.1 \tlibXext.so.0 (SUNW_1.1) =>\t (version not found) +\trelocation R_SPARC_COPY symbol: ASN1_OCTET_STRING_it: file /opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8: relocation bound to a symbol with STV_PROTECTED visibility +\trelocation R_SPARC_COPY sizes differ: _ZTI7QWidget +\t\t(file /tmp/pkg_GqCk0P/CSWkdeartworkgcc/root/opt/csw/kde-gcc/bin/kslideshow.kss size=0x28; file /opt/csw/kde-gcc/lib/libqt-mt.so.3 size=0x20) """ class GetLinesBySonameUnitTest(unittest.TestCase): @@ -413,6 +416,40 @@ } self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + def test_ParseLdd_SizesDiffer(self): + line = '\trelocation R_SPARC_COPY sizes differ: _ZTI7QWidget' + expected = { + 'symbol': '_ZTI7QWidget', + 'soname': None, + 'path': None, + 'state': 'sizes-differ', + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + + def test_ParseLdd_SizesDifferInfo(self): + line = ('\t\t(file /tmp/pkg_GqCk0P/CSWkdeartworkgcc/root/opt/csw/kde-gcc/bin/' + 'kslideshow.kss size=0x28; ' + 'file /opt/csw/kde-gcc/lib/libqt-mt.so.3 size=0x20)') + expected = { + 'symbol': None, + 'path': ('/tmp/pkg_GqCk0P/CSWkdeartworkgcc/root/opt/csw/kde-gcc/' + 'bin/kslideshow.kss /opt/csw/kde-gcc/lib/libqt-mt.so.3'), + 'state': 'sizes-diff-info', + 'soname': None, + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + + def test_ParseLdd_SizesDifferOneUsed(self): + line = ('\t\t/opt/csw/kde-gcc/lib/libqt-mt.so.3 size used; ' + 'possible insufficient data copied') + expected = { + 'symbol': None, + 'path': '/opt/csw/kde-gcc/lib/libqt-mt.so.3', + 'state': 'sizes-diff-one-used', + 'soname': None, + } + self.assertEqual(expected, self.pkgstats._ParseLddDashRline(line)) + def test_ParseLddDashRlineManyLines(self): for line in LDD_R_OUTPUT_1.splitlines(): parsed = self.pkgstats._ParseLddDashRline(line) Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-29 15:56:54 UTC (rev 9446) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-03-29 16:44:43 UTC (rev 9447) @@ -406,6 +406,7 @@ self.dir_format_pkg = None self.debug = debug self.pkgname = None + self.md5sum = None def __repr__(self): return u"CswSrv4File(%s)" % repr(self.pkg_path) @@ -508,12 +509,14 @@ return dir_format_pkg.GetPkgmap(analyze_permissions, strip) def GetMd5sum(self): - logging.debug("GetMd5sum() (%s)", repr(self.pkg_path)) - fp = open(self.pkg_path) - hash = hashlib.md5() - hash.update(fp.read()) - fp.close() - return hash.hexdigest() + if not self.md5sum: + logging.debug("GetMd5sum() reading file %s", repr(self.pkg_path)) + fp = open(self.pkg_path) + hash = hashlib.md5() + hash.update(fp.read()) + fp.close() + self.md5sum = hash.hexdigest() + return self.md5sum def GetPkgchkOutput(self): """Returns: (exit code, stdout, stderr).""" @@ -1046,3 +1049,53 @@ result = os.path.exists(srv4_path) logging.debug("Srv4Exists(%s) => %s, %s", pkg_dir, repr(srv4_path), result) return result + + +class OpencswCatalog(object): + """Represents a catalog file.""" + + def __init__(self, file_name): + self.file_name = file_name + self.by_basename = {} + self.catalog_data = [] + + def _GetCatalogData(self, fd): + cline_re_str = ( + r"^" + r"(?P\S+)" + r"\s+" + r"(?P\S+)" + r"\s+" + r"(?P\S+)" + r"\s+" + r"(?P\S+)" + r"\s+" + r"(?P\S+)" + r"\s+" + r"(?P\S+)" + r"\s+" + r"(?P\S+)" + r"\s+" + r"(?P\S+)$" + ) + cline_re = re.compile(cline_re_str) + for line in fd: + m = cline_re.match(line) + if m: + d = m.groupdict() + self.catalog_data.append(d) + else: + logging.debug("%s did not match the regex", repr(line)) + + def GetCatalogData(self): + if not self.catalog_data: + fd = open(self.file_name, "r") + self._GetCatalogData(fd) + return self.catalog_data + + def GetDataByBasename(self): + if not self.by_basename: + cd = self.GetCatalogData() + for d in cd: + self.by_basename[d["file_basename"]] = d + return self.by_basename Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-29 15:56:54 UTC (rev 9446) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-29 16:44:43 UTC (rev 9447) @@ -626,11 +626,11 @@ return errors -def DisableCheckForMissingSymbolsDumb(pkg_data, error_mgr, logger, messenger): +def DisabledCheckForMissingSymbolsDumb(pkg_data, error_mgr, logger, messenger): """Analyzes missing symbols reported by ldd -r. So far only made sense for perl modules. Disables because it falls over on - big KDE packages. + big KDE packages. During pickling (serialization), Python runs out of memory. """ pkgname = pkg_data["basic_stats"]["pkgname"] if not re.match(SYMBOLS_CHECK_ONLY_FOR, pkgname): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Mar 29 19:09:53 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 29 Mar 2010 17:09:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9448] csw/mgar/pkg/tk/trunk/Makefile Message-ID: Revision: 9448 http://gar.svn.sourceforge.net/gar/?rev=9448&view=rev Author: hson Date: 2010-03-29 17:09:53 +0000 (Mon, 29 Mar 2010) Log Message: ----------- tk: Create symlink to wish8.5. Add some checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/tk/trunk/Makefile Modified: csw/mgar/pkg/tk/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk/trunk/Makefile 2010-03-29 16:44:43 UTC (rev 9447) +++ csw/mgar/pkg/tk/trunk/Makefile 2010-03-29 17:09:53 UTC (rev 9448) @@ -23,6 +23,13 @@ VENDOR_URL = http://www.tcl.tk/ LICENSE = license.terms +CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtk8.4.so +CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtkstub8.4.a +CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/tk +CHECKPKG_OVERRIDES_CSWtk += linked-against-discouraged-library|libtk8.4.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWtk += surplus-dependency|CSWsunmath +CHECKPKG_OVERRIDES_CSWtk += soname-not-found|libm.so.2 + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 UPSTREAM_USE_SF = 1 @@ -59,14 +66,34 @@ @(cd $(WORKSRC) ; cp -p ../license.terms .) @$(MAKECOOKIE) -post-install-i386: +post-install-isa-i386: @# Install legacy libs @# Building them with version modulations would be hard as that would require a full legacy tcl also + @echo Installing legacy files @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.i386.tar.xz | tar xf -) + @# Need to manually create symlink to latest version + @echo Creating link to wish8.5 + @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish @$(MAKECOOKIE) -post-install-sparc: +post-install-isa-amd64: + @# Need to manually create symlink to latest version + @echo Creating link to wish8.5 + @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish + @$(MAKECOOKIE) + +post-install-isa-sparcv8: @# Install legacy libs @# Building them with version modulations would be hard as that would require a full legacy tcl also + @echo Installing legacy files @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.sparc.tar.xz | tar xf -) + @# Need to manually create symlink to latest version + @echo Creating link to wish8.5 + @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish @$(MAKECOOKIE) + +post-install-isa-sparcv9: + @# Need to manually create symlink to latest version + @echo Creating link to wish8.5 + @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Mar 29 20:07:03 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 29 Mar 2010 18:07:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[9449] csw/mgar/pkg/tcl/trunk/Makefile Message-ID: Revision: 9449 http://gar.svn.sourceforge.net/gar/?rev=9449&view=rev Author: hson Date: 2010-03-29 18:07:03 +0000 (Mon, 29 Mar 2010) Log Message: ----------- tcl: Create symlink to tcl8.5. Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-03-29 17:09:53 UTC (rev 9448) +++ csw/mgar/pkg/tcl/trunk/Makefile 2010-03-29 18:07:03 UTC (rev 9449) @@ -59,9 +59,31 @@ @$(MAKECOOKIE) post-install-isa-sparcv8: + @# Install legacy libs + @echo Installing legacy files @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.sparc.tar.xz | tar xf -) + @# Need to manually create symlink to latest version + @echo Creating tclsh link + @ln -s tclsh.5 $(INSTALLISADIR)/$(bindir)/tclsh @$(MAKECOOKIE) +post-install-isa-sparcv9: + @# Need to manually create symlink to latest version + @echo Creating tclsh link + @ln -s tclsh.5 $(INSTALLISADIR)/$(bindir)/tclsh + @$(MAKECOOKIE) + post-install-isa-i386: + @# Install legacy libs + @echo Installing legacy files @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.i386.tar.xz | tar xf -) + @# Need to manually create symlink to latest version + @echo Creating tclsh link + @ln -s tclsh.5 $(INSTALLISADIR)/$(bindir)/tclsh @$(MAKECOOKIE) + +post-install-isa-amd64: + @# Need to manually create symlink to latest version + @echo Creating tclsh link + @ln -s tclsh.5 $(INSTALLISADIR)/$(bindir)/tclsh + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Mar 29 20:45:28 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 29 Mar 2010 18:45:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[9450] csw/mgar/pkg/tcl/trunk/Makefile Message-ID: Revision: 9450 http://gar.svn.sourceforge.net/gar/?rev=9450&view=rev Author: hson Date: 2010-03-29 18:45:28 +0000 (Mon, 29 Mar 2010) Log Message: ----------- tcl: Another checkpkg override Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-03-29 18:07:03 UTC (rev 9449) +++ csw/mgar/pkg/tcl/trunk/Makefile 2010-03-29 18:45:28 UTC (rev 9450) @@ -23,8 +23,7 @@ PATCHDIR = $(WORKDIR)/$(DISTNAME) CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtclstub8.4.a -CHECKPKG_OVERRIDES_CSWtcl += soname-not-found|libm.so.2|needed|by|opt/csw/lib/amd64/libtcl8.5.so -CHECKPKG_OVERRIDES_CSWtcl += soname-not-found|libm.so.2|needed|by|opt/csw/bin/amd64/tclsh8.5 +CHECKPKG_OVERRIDES_CSWtcl += soname-not-found|libm.so.2 CHECKPKG_OVERRIDES_CSWtcl += surplus-dependency|CSWsunmath CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/tcl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Mar 29 21:07:39 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 29 Mar 2010 19:07:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9451] csw/mgar/pkg/tcl/trunk/Makefile Message-ID: Revision: 9451 http://gar.svn.sourceforge.net/gar/?rev=9451&view=rev Author: hson Date: 2010-03-29 19:07:39 +0000 (Mon, 29 Mar 2010) Log Message: ----------- tcl: Fix symlink Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-03-29 18:45:28 UTC (rev 9450) +++ csw/mgar/pkg/tcl/trunk/Makefile 2010-03-29 19:07:39 UTC (rev 9451) @@ -63,13 +63,13 @@ @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.sparc.tar.xz | tar xf -) @# Need to manually create symlink to latest version @echo Creating tclsh link - @ln -s tclsh.5 $(INSTALLISADIR)/$(bindir)/tclsh + @ln -s tclsh8.5 $(INSTALLISADIR)/$(bindir)/tclsh @$(MAKECOOKIE) post-install-isa-sparcv9: @# Need to manually create symlink to latest version @echo Creating tclsh link - @ln -s tclsh.5 $(INSTALLISADIR)/$(bindir)/tclsh + @ln -s tclsh8.5 $(INSTALLISADIR)/$(bindir)/tclsh @$(MAKECOOKIE) post-install-isa-i386: @@ -78,11 +78,11 @@ @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.i386.tar.xz | tar xf -) @# Need to manually create symlink to latest version @echo Creating tclsh link - @ln -s tclsh.5 $(INSTALLISADIR)/$(bindir)/tclsh + @ln -s tclsh8.5 $(INSTALLISADIR)/$(bindir)/tclsh @$(MAKECOOKIE) post-install-isa-amd64: @# Need to manually create symlink to latest version @echo Creating tclsh link - @ln -s tclsh.5 $(INSTALLISADIR)/$(bindir)/tclsh + @ln -s tclsh8.5 $(INSTALLISADIR)/$(bindir)/tclsh @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Mar 30 04:07:04 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Mar 2010 02:07:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[9452] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 9452 http://gar.svn.sourceforge.net/gar/?rev=9452&view=rev Author: bdwalton Date: 2010-03-30 02:07:03 +0000 (Tue, 30 Mar 2010) Log Message: ----------- ruby: update for solaris 2.9 Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2010-03-29 19:07:39 UTC (rev 9451) +++ csw/mgar/pkg/ruby/trunk/Makefile 2010-03-30 02:07:03 UTC (rev 9452) @@ -110,14 +110,14 @@ # setting. EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR)) else -SOS11_LD_FLAGS = +SOS12_LD_FLAGS = endif include gar/category.mk SPKG_VERSION := $(SPKG_VERSION)$(PATCHLEVEL) -RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.8/rbconfig.rb +RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb PI_TARGETS = samples rbconfig rbscripts rubymode multiconfig @@ -145,7 +145,7 @@ # Fix up rbconfig rbconfig: @gsed -i -e s,$(DESTDIR),, \ - $(DESTDIR)$(libdir)/ruby/1.8/$(GARCH)-solaris2.8/rbconfig.rb + $(DESTDIR)$(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb @$(MAKECOOKIE) # Copy samples This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 30 09:54:59 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 30 Mar 2010 07:54:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[9453] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9453 http://gar.svn.sourceforge.net/gar/?rev=9453&view=rev Author: wahwah Date: 2010-03-30 07:54:59 +0000 (Tue, 30 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, allowing https in pkginfo VENDOR. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-30 02:07:03 UTC (rev 9452) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-30 07:54:59 UTC (rev 9453) @@ -132,7 +132,7 @@ def CheckVendorURL(pkg_data, error_mgr, logger, messenger): vendorurl = pkg_data["pkginfo"]["VENDOR"].split(" ")[0] - vendorurl_re = r"^(http|ftp)\://.+\..+$" + vendorurl_re = r"^(http|ftp)s?\://.+\..+$" if not re.match(vendorurl_re, vendorurl): error_mgr.ReportError("pkginfo-bad-vendorurl", vendorurl, "Solution: add VENDOR_URL to GAR Recipe") Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-30 02:07:03 UTC (rev 9452) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-03-30 07:54:59 UTC (rev 9453) @@ -441,5 +441,11 @@ # URL is okay. +class TestCheckVendorURL_Https(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = "CheckVendorURL" + def CheckpkgTest(self): + self.pkg_data["pkginfo"]["VENDOR"] = "https://www.example.com/" + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 30 10:06:31 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 30 Mar 2010 08:06:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9454] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 9454 http://gar.svn.sourceforge.net/gar/?rev=9454&view=rev Author: wahwah Date: 2010-03-30 08:06:31 +0000 (Tue, 30 Mar 2010) Log Message: ----------- mGAR v2: checkpkg, CheckVendorURL: Moved the regex to the top section of the file, used a regex to split the VENDOR field. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-30 07:54:59 UTC (rev 9453) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-03-30 08:06:31 UTC (rev 9454) @@ -75,7 +75,10 @@ # Check ldd -r only for Perl modules SYMBOLS_CHECK_ONLY_FOR = r"^CSWpm.*$" +# Valid URLs in the VENDOR field in pkginfo +VENDORURL_RE = r"^(http|ftp)s?\://.+\..+$" + def CatalognameLowercase(pkg_data, error_mgr, logger, messenger): catalogname = pkg_data["basic_stats"]["catalogname"] if catalogname != catalogname.lower(): @@ -130,12 +133,14 @@ error_mgr.ReportError("pkginfo-description-not-starting-with-uppercase", desc) + def CheckVendorURL(pkg_data, error_mgr, logger, messenger): - vendorurl = pkg_data["pkginfo"]["VENDOR"].split(" ")[0] - vendorurl_re = r"^(http|ftp)s?\://.+\..+$" - if not re.match(vendorurl_re, vendorurl): - error_mgr.ReportError("pkginfo-bad-vendorurl", vendorurl, "Solution: add VENDOR_URL to GAR Recipe") + vendorurl = opencsw.WS_RE.split(pkg_data["pkginfo"]["VENDOR"])[0] + if not re.match(VENDORURL_RE, vendorurl): + error_mgr.ReportError("pkginfo-bad-vendorurl", vendorurl, + "Solution: add VENDOR_URL to GAR Recipe") + def CheckCatalogname(pkg_data, error_mgr, logger, messenger): pkginfo = pkg_data["pkginfo"] catalogname = pkginfo["NAME"].split(" ")[0] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 30 10:47:55 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 30 Mar 2010 08:47:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[9455] csw/mgar/pkg/cpan/Module-Load/trunk Message-ID: Revision: 9455 http://gar.svn.sourceforge.net/gar/?rev=9455&view=rev Author: bonivart Date: 2010-03-30 08:47:54 +0000 (Tue, 30 Mar 2010) Log Message: ----------- pm_modload: update to 0.18 Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Load/trunk/Makefile csw/mgar/pkg/cpan/Module-Load/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Module-Load/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Module-Load/trunk/files/CSWpmmodload.gspec Modified: csw/mgar/pkg/cpan/Module-Load/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load/trunk/Makefile 2010-03-30 08:06:31 UTC (rev 9454) +++ csw/mgar/pkg/cpan/Module-Load/trunk/Makefile 2010-03-30 08:47:54 UTC (rev 9455) @@ -1,7 +1,7 @@ GARNAME = Module-Load -GARVERSION = 0.14 +GARVERSION = 0.18 CATEGORIES = cpan -AUTHOR = KANE +AUTHOR = BINGOS DESCRIPTION = Runtime require of both modules and files define BLURB @@ -9,10 +9,13 @@ or a module. endef -DISTFILES += $(call admfiles,CSWpmmodload,) +DISTFILES += COPYING -#SKIPTEST = 1 +PACKAGES = CSWpmmodload +CATALOGNAME = pm_modload +ARCHALL = 1 + EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Load/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Load/trunk/checksums 2010-03-30 08:06:31 UTC (rev 9454) +++ csw/mgar/pkg/cpan/Module-Load/trunk/checksums 2010-03-30 08:47:54 UTC (rev 9455) @@ -1,2 +1,2 @@ -6e4e4023477a104e96c1145551065db5 download/CSWpmmodload.gspec -f797f2f2f4018c3fafabfcfb72137cf1 download/Module-Load-0.14.tar.gz +722b591573eae09d26997366cd63125d COPYING +3c8b06ecccef2741167e5dd4bd1e0095 Module-Load-0.18.tar.gz Added: csw/mgar/pkg/cpan/Module-Load/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Module-Load/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Module-Load/trunk/files/COPYING 2010-03-30 08:47:54 UTC (rev 9455) @@ -0,0 +1,6 @@ +COPYRIGHT + This module is copyright (c) 2002 Jos Boumans . All + rights reserved. + + This library is free software; you may redistribute and/or modify it + under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Module-Load/trunk/files/CSWpmmodload.gspec =================================================================== --- csw/mgar/pkg/cpan/Module-Load/trunk/files/CSWpmmodload.gspec 2010-03-30 08:06:31 UTC (rev 9454) +++ csw/mgar/pkg/cpan/Module-Load/trunk/files/CSWpmmodload.gspec 2010-03-30 08:47:54 UTC (rev 9455) @@ -1,10 +0,0 @@ -%var bitname pm_modload -%var pkgname CSWpmmodload -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -This module is copyright (c) 2002 Jos Boumans . All -rights reserved. - -This library is free software; you may redistribute 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 dmichelsen at users.sourceforge.net Tue Mar 30 13:26:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 30 Mar 2010 11:26:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9456] csw/mgar/pkg/grep/trunk Message-ID: Revision: 9456 http://gar.svn.sourceforge.net/gar/?rev=9456&view=rev Author: dmichelsen Date: 2010-03-30 11:26:46 +0000 (Tue, 30 Mar 2010) Log Message: ----------- grep: Update to 2.6.2 Modified Paths: -------------- csw/mgar/pkg/grep/trunk/Makefile csw/mgar/pkg/grep/trunk/checksums Added Paths: ----------- csw/mgar/pkg/grep/trunk/files/0001-Force-bash-on-specific-tests.patch Modified: csw/mgar/pkg/grep/trunk/Makefile =================================================================== --- csw/mgar/pkg/grep/trunk/Makefile 2010-03-30 08:47:54 UTC (rev 9455) +++ csw/mgar/pkg/grep/trunk/Makefile 2010-03-30 11:26:46 UTC (rev 9456) @@ -1,5 +1,5 @@ GARNAME = grep -GARVERSION = 2.6 +GARVERSION = 2.6.2 CATEGORIES = utils DESCRIPTION = GNU grep @@ -15,21 +15,24 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTNAME = grep-2.6.7-64540 DISTFILES = $(DISTNAME).tar.xz +# Force bash until this is fixed: +# http://savannah.gnu.org/bugs/?29381 +PATCHFILES = 0001-Force-bash-on-specific-tests.patch + # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.xz -DEP_PKGS_CSWgrep = CSWggettextrt CSWpcrert +DEP_PKGS = CSWggettextrt CSWpcrert -# As suggested in -# -EXTRA_CFLAGS = -features=extensions - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g +# Skip tests as they fail only in gnulib and are probably harmless: +# https://savannah.gnu.org/bugs/?29380 +SKIPTEST ?= 1 + TEST_TARGET = check EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias Modified: csw/mgar/pkg/grep/trunk/checksums =================================================================== --- csw/mgar/pkg/grep/trunk/checksums 2010-03-30 08:47:54 UTC (rev 9455) +++ csw/mgar/pkg/grep/trunk/checksums 2010-03-30 11:26:46 UTC (rev 9456) @@ -1 +1,2 @@ -34ebed3991555c9e0cd484153aad9098 grep-2.6.7-64540.tar.xz +ec7aaf616278291af91f582d9bcfa64f 0001-Force-bash-on-specific-tests.patch +b2d5841757ab065b28d0ff4c7ca2eca8 grep-2.6.2.tar.xz Added: csw/mgar/pkg/grep/trunk/files/0001-Force-bash-on-specific-tests.patch =================================================================== --- csw/mgar/pkg/grep/trunk/files/0001-Force-bash-on-specific-tests.patch (rev 0) +++ csw/mgar/pkg/grep/trunk/files/0001-Force-bash-on-specific-tests.patch 2010-03-30 11:26:46 UTC (rev 9456) @@ -0,0 +1,60 @@ +From 6a802824b4484fb354caf9ece683f9b83f65d648 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 30 Mar 2010 10:01:44 +0200 +Subject: [PATCH] Force bash on specific tests + +--- + tests/bre.sh | 2 +- + tests/ere.sh | 2 +- + tests/spencer1-locale | 2 +- + tests/spencer1.sh | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/bre.sh b/tests/bre.sh +index 0a1153b..e511805 100755 +--- a/tests/bre.sh ++++ b/tests/bre.sh +@@ -14,5 +14,5 @@ failures=0 + + ${AWK-awk} -f $srcdir/bre.awk $srcdir/bre.tests > bre.script + +-sh bre.script && exit $failures ++bash bre.script && exit $failures + exit 1 +diff --git a/tests/ere.sh b/tests/ere.sh +index 2ebdc63..208582b 100755 +--- a/tests/ere.sh ++++ b/tests/ere.sh +@@ -15,5 +15,5 @@ failures=0 + + ${AWK-awk} -f $srcdir/ere.awk $srcdir/ere.tests > ere.script + +-sh ere.script && exit $failures ++bash ere.script && exit $failures + exit 1 +diff --git a/tests/spencer1-locale b/tests/spencer1-locale +index fa9909d..6da7165 100755 +--- a/tests/spencer1-locale ++++ b/tests/spencer1-locale +@@ -19,6 +19,6 @@ ${AWK-awk} -v extra_locale=$LOCALE_FR_UTF8 \ + -f "$abs_srcdir/spencer1-locale.awk" "$abs_srcdir/spencer1.tests" \ + > spencer1-locale.script || fail=1 + +-sh spencer1-locale.script || fail=1 ++bash spencer1-locale.script || fail=1 + + Exit $fail +diff --git a/tests/spencer1.sh b/tests/spencer1.sh +index 0bd6bd1..47325d2 100755 +--- a/tests/spencer1.sh ++++ b/tests/spencer1.sh +@@ -15,5 +15,5 @@ failures=0 + + ${AWK-awk} -f $srcdir/spencer1.awk $srcdir/spencer1.tests > spencer1.script + +-sh spencer1.script && exit $failures ++bash spencer1.script && exit $failures + exit 1 +-- +1.7.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 30 13:28:46 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 30 Mar 2010 11:28:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9457] csw/mgar/pkg/cpan/Module-Load-Conditional/trunk Message-ID: Revision: 9457 http://gar.svn.sourceforge.net/gar/?rev=9457&view=rev Author: bonivart Date: 2010-03-30 11:28:46 +0000 (Tue, 30 Mar 2010) Log Message: ----------- pm_modloadcond: update to 0.36 Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.gspec Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2010-03-30 11:26:46 UTC (rev 9456) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2010-03-30 11:28:46 UTC (rev 9457) @@ -1,7 +1,7 @@ GARNAME = Module-Load-Conditional -GARVERSION = 0.30 +GARVERSION = 0.36 CATEGORIES = cpan -AUTHOR = KANE +AUTHOR = BINGOS DESCRIPTION = Query module information and load at runtime define BLURB @@ -9,17 +9,21 @@ any of the modules you have installed on your system during runtime. endef -DISTFILES += $(call admfiles,CSWpmmodloadcond,) +DISTFILES += COPYING +PACKAGES = CSWpmmodloadcond +CATALOGNAME = pm_modloadcond +ARCHALL = 1 + RUNTIME_DEP_PKGS = CSWpmprmscheck CSWpmmodload CSWpmlclemktxtsimple -#SKIPTEST = 1 +CHECKPKG_OVERRIDES_CSWpmmodloadcond += surplus-dependency|CSWpmprmscheck +CHECKPKG_OVERRIDES_CSWpmmodloadcond += surplus-dependency|CSWpmmodload +CHECKPKG_OVERRIDES_CSWpmmodloadcond += surplus-dependency|CSWpmlclemktxtsimple DEPENDS += cpan/Params-Check DEPENDS += cpan/Module-Load DEPENDS += cpan/Locale-Maketext-Simple DEPENDS += cpan/version -EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod - include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums 2010-03-30 11:26:46 UTC (rev 9456) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums 2010-03-30 11:28:46 UTC (rev 9457) @@ -1,2 +1,2 @@ -e912706042be78943b1af9a349378bbd download/CSWpmmodloadcond.gspec -280cbd331a1b2705d24a0b25c7cda4c6 download/Module-Load-Conditional-0.30.tar.gz +2a16d727d63d609f1c4aa4b6db4707c8 COPYING +aef549c57ce295f2c5ae826db645a9de Module-Load-Conditional-0.36.tar.gz Added: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/COPYING 2010-03-30 11:28:46 UTC (rev 9457) @@ -0,0 +1,5 @@ +This module is copyright (c) 2002 Jos Boumans . All +rights reserved. + +This library is free software; you may redistribute and/or modify it +under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.gspec =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.gspec 2010-03-30 11:26:46 UTC (rev 9456) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.gspec 2010-03-30 11:28:46 UTC (rev 9457) @@ -1,10 +0,0 @@ -%var bitname pm_modloadcond -%var pkgname CSWpmmodloadcond -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -This module is copyright (c) 2002 Jos Boumans . All -rights reserved. - -This library is free software; you may redistribute 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 Tue Mar 30 13:44:29 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 30 Mar 2010 11:44:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9458] csw/mgar/pkg/cpan/Module-CoreList/trunk Message-ID: Revision: 9458 http://gar.svn.sourceforge.net/gar/?rev=9458&view=rev Author: bonivart Date: 2010-03-30 11:44:29 +0000 (Tue, 30 Mar 2010) Log Message: ----------- pm_modcorelist: update to 2.26 Modified Paths: -------------- csw/mgar/pkg/cpan/Module-CoreList/trunk/Makefile csw/mgar/pkg/cpan/Module-CoreList/trunk/checksums csw/mgar/pkg/cpan/Module-CoreList/trunk/files/changelog.CSW Modified: csw/mgar/pkg/cpan/Module-CoreList/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-CoreList/trunk/Makefile 2010-03-30 11:28:46 UTC (rev 9457) +++ csw/mgar/pkg/cpan/Module-CoreList/trunk/Makefile 2010-03-30 11:44:29 UTC (rev 9458) @@ -1,13 +1,15 @@ GARNAME = Module-CoreList -GARVERSION = 2.17 +GARVERSION = 2.26 CATEGORIES = cpan -AUTHOR = RGARCIA +AUTHOR = BINGOS DESCRIPTION = What modules shipped with versions of Perl define BLURB What modules shipped with versions of Perl endef +DISTFILES += COPYING + PACKAGES = CSWpmmodcorelist CATALOGNAME = pm_modcorelist ARCHALL = 1 Modified: csw/mgar/pkg/cpan/Module-CoreList/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-CoreList/trunk/checksums 2010-03-30 11:28:46 UTC (rev 9457) +++ csw/mgar/pkg/cpan/Module-CoreList/trunk/checksums 2010-03-30 11:44:29 UTC (rev 9458) @@ -1 +1,2 @@ -a006aa836dcc584acfbf3422df62f739 download/Module-CoreList-2.17.tar.gz +aa5ba7b74bce277d6646c7f82550b7a8 COPYING +491c80dfea9a80a757974bacee8aeba3 Module-CoreList-2.26.tar.gz Modified: csw/mgar/pkg/cpan/Module-CoreList/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cpan/Module-CoreList/trunk/files/changelog.CSW 2010-03-30 11:28:46 UTC (rev 9457) +++ csw/mgar/pkg/cpan/Module-CoreList/trunk/files/changelog.CSW 2010-03-30 11:44:29 UTC (rev 9458) @@ -1,3 +1,9 @@ +pm_modcorelist (2.26,REV=2010.03.30) + + * Updated to 2.26 + + -- Peter Bonivart Tue, 30 Mar 2010 11:41:45 +0200 + pm_modcorelist (2.17,REV=2009.08.08) * Adopted and updated to 2.17 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 30 13:45:14 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 30 Mar 2010 11:45:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[9459] csw/mgar/pkg/cpan/Module-CoreList/trunk/files/ COPYING Message-ID: Revision: 9459 http://gar.svn.sourceforge.net/gar/?rev=9459&view=rev Author: bonivart Date: 2010-03-30 11:45:14 +0000 (Tue, 30 Mar 2010) Log Message: ----------- pm_modcorelist: add license Added Paths: ----------- csw/mgar/pkg/cpan/Module-CoreList/trunk/files/COPYING Added: csw/mgar/pkg/cpan/Module-CoreList/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Module-CoreList/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Module-CoreList/trunk/files/COPYING 2010-03-30 11:45:14 UTC (rev 9459) @@ -0,0 +1,4 @@ +Copyright (C) 2002-2009 Richard Clamp. All Rights Reserved. + +This module 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 Tue Mar 30 13:55:12 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 30 Mar 2010 11:55:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9460] csw/mgar/pkg/cpan/Net-IP/trunk/checksums Message-ID: Revision: 9460 http://gar.svn.sourceforge.net/gar/?rev=9460&view=rev Author: bonivart Date: 2010-03-30 11:55:12 +0000 (Tue, 30 Mar 2010) Log Message: ----------- pm_netip: respin to fix packaging issues Modified Paths: -------------- csw/mgar/pkg/cpan/Net-IP/trunk/checksums Modified: csw/mgar/pkg/cpan/Net-IP/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-IP/trunk/checksums 2010-03-30 11:45:14 UTC (rev 9459) +++ csw/mgar/pkg/cpan/Net-IP/trunk/checksums 2010-03-30 11:55:12 UTC (rev 9460) @@ -1 +1 @@ -a49c0b02a9b793ff60191cdafc0c202e download/Net-IP-1.25.tar.gz +a49c0b02a9b793ff60191cdafc0c202e Net-IP-1.25.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 Tue Mar 30 14:02:18 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 30 Mar 2010 12:02:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[9461] csw/mgar/pkg/cpan/Number-Format/trunk Message-ID: Revision: 9461 http://gar.svn.sourceforge.net/gar/?rev=9461&view=rev Author: bonivart Date: 2010-03-30 12:02:18 +0000 (Tue, 30 Mar 2010) Log Message: ----------- pm_numberformat: update to 1.73 Modified Paths: -------------- csw/mgar/pkg/cpan/Number-Format/trunk/Makefile csw/mgar/pkg/cpan/Number-Format/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Number-Format/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Number-Format/trunk/files/CSWpmnumberformat.gspec Modified: csw/mgar/pkg/cpan/Number-Format/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Number-Format/trunk/Makefile 2010-03-30 11:55:12 UTC (rev 9460) +++ csw/mgar/pkg/cpan/Number-Format/trunk/Makefile 2010-03-30 12:02:18 UTC (rev 9461) @@ -1,5 +1,5 @@ GARNAME = Number-Format -GARVERSION = 1.70 +GARVERSION = 1.73 CATEGORIES = cpan AUTHOR = WRW @@ -14,14 +14,10 @@ user. endef -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWpmnumberformat,) +DISTFILES += COPYING -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWpmnumberformat +CATALOGNAME = pm_numberformat +ARCHALL = 1 -#CONFIGURE_ARGS = $(DIRPATHS) - -EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod - include gar/category.mk Modified: csw/mgar/pkg/cpan/Number-Format/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Number-Format/trunk/checksums 2010-03-30 11:55:12 UTC (rev 9460) +++ csw/mgar/pkg/cpan/Number-Format/trunk/checksums 2010-03-30 12:02:18 UTC (rev 9461) @@ -1,3 +1,2 @@ -72fd7eb99086208404b743f53e3e2e12 download/Number-Format-1.70.tar.gz -97cffeda96d92672f2f16da1d999438c download/CSWpmnumberformat.gspec -72fd7eb99086208404b743f53e3e2e12 download/Number-Format-1.70.tar.gz +ce58fcb3384810e6b99f173363004894 COPYING +3a4188de6e84b04361def285b93dc240 Number-Format-1.73.tar.gz Added: csw/mgar/pkg/cpan/Number-Format/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Number-Format/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Number-Format/trunk/files/COPYING 2010-03-30 12:02:18 UTC (rev 9461) @@ -0,0 +1,4 @@ +This package is copyright 1997-2008 by William R. Ward et al., and may +be distributed under the same terms as cover Perl itself (your choice +of Artistic or GPL). See http://dev.perl.org/licenses/ for more +information. Deleted: csw/mgar/pkg/cpan/Number-Format/trunk/files/CSWpmnumberformat.gspec =================================================================== --- csw/mgar/pkg/cpan/Number-Format/trunk/files/CSWpmnumberformat.gspec 2010-03-30 11:55:12 UTC (rev 9460) +++ csw/mgar/pkg/cpan/Number-Format/trunk/files/CSWpmnumberformat.gspec 2010-03-30 12:02:18 UTC (rev 9461) @@ -1,10 +0,0 @@ -%var bitname pm_numberformat -%var pkgname CSWpmnumberformat -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright - -This package is copyright 1997-2008 by William R. Ward et al., and may -be distributed under the same terms as cover Perl itself (your choice -of Artistic or GPL). See http://dev.perl.org/licenses/ for more -information. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 30 14:08:47 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 30 Mar 2010 12:08:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9462] csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk Message-ID: Revision: 9462 http://gar.svn.sourceforge.net/gar/?rev=9462&view=rev Author: bonivart Date: 2010-03-30 12:08:47 +0000 (Tue, 30 Mar 2010) Log Message: ----------- pm_olestoragelite: update to 0.19 Modified Paths: -------------- csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/Makefile csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/CSWpmolestoragelite.gspec Modified: csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/Makefile 2010-03-30 12:02:18 UTC (rev 9461) +++ csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/Makefile 2010-03-30 12:08:47 UTC (rev 9462) @@ -1,5 +1,5 @@ GARNAME = OLE-Storage_Lite -GARVERSION = 0.18 +GARVERSION = 0.19 CATEGORIES = cpan AUTHOR = JMCNAMARA @@ -8,12 +8,10 @@ This module allows you to read and write an OLE-Structured file. endef -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWpmolestoragelite,) +DISTFILES += COPYING -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWpmolestoragelite +CATALOGNAME = pm_olestoragelite +ARCHALL = 1 -EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod - include gar/category.mk Modified: csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/checksums 2010-03-30 12:02:18 UTC (rev 9461) +++ csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/checksums 2010-03-30 12:08:47 UTC (rev 9462) @@ -1,3 +1,2 @@ -dcde0c0feeffdef3727f81a2f8844eca download/OLE-Storage_Lite-0.18.tar.gz -c28d2147b197dda73648c4218cc18de3 download/CSWpmolestoragelite.gspec -dcde0c0feeffdef3727f81a2f8844eca download/OLE-Storage_Lite-0.18.tar.gz +62178a1a8d0ce7d28a3e42018ae8dba4 COPYING +1a713f5342c7d90e54ab0d9659650296 OLE-Storage_Lite-0.19.tar.gz Added: csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/COPYING 2010-03-30 12:08:47 UTC (rev 9462) @@ -0,0 +1,5 @@ +The OLE::Storage_Lite module is Copyright (c) 2000,2001 Kawai Takanori. Japan. All +rights reserved. + +You may distribute under the terms of either the GNU General Public License or the +Artistic License, as specified in the Perl README file. Deleted: csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/CSWpmolestoragelite.gspec =================================================================== --- csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/CSWpmolestoragelite.gspec 2010-03-30 12:02:18 UTC (rev 9461) +++ csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/files/CSWpmolestoragelite.gspec 2010-03-30 12:08:47 UTC (rev 9462) @@ -1,11 +0,0 @@ -%var bitname pm_olestoragelite -%var pkgname CSWpmolestoragelite -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright - -The OLE::Storage_Lite module is Copyright (c) 2000,2001 Kawai Takanori. Japan. All -rights reserved. - -You may distribute under the terms of either the GNU General Public License or the -Artistic License, as specified in the Perl README file. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 30 14:29:38 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 30 Mar 2010 12:29:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[9463] csw/mgar/pkg/cpan/Test-Builder-Tester/trunk Message-ID: Revision: 9463 http://gar.svn.sourceforge.net/gar/?rev=9463&view=rev Author: bonivart Date: 2010-03-30 12:29:38 +0000 (Tue, 30 Mar 2010) Log Message: ----------- pm_tstbldrtester: fix packaging issues Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Builder-Tester/trunk/Makefile csw/mgar/pkg/cpan/Test-Builder-Tester/trunk/checksums Modified: csw/mgar/pkg/cpan/Test-Builder-Tester/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Builder-Tester/trunk/Makefile 2010-03-30 12:08:47 UTC (rev 9462) +++ csw/mgar/pkg/cpan/Test-Builder-Tester/trunk/Makefile 2010-03-30 12:29:38 UTC (rev 9463) @@ -3,7 +3,7 @@ CATEGORIES = cpan AUTHOR = MARKF -DESCRIPTION = test testsuites built with Test::Builder +DESCRIPTION = Test testsuites built with Test::Builder define BLURB The testing system is designed to be used by performing a three step process for each test you wish to test. This process starts with using test_out and @@ -15,13 +15,10 @@ PACKAGES = CSWpmtstbldrtester CATALOGNAME = pm_tstbldrtester - ARCHALL = 1 # Seems that tests might assume a newer version of Test-Simple than is # provided with Perl 5.8.8. TEST_SCRIPTS = -EXTRA_MERGE_EXCLUDE_FILES = .*\.3perl - include gar/category.mk Modified: csw/mgar/pkg/cpan/Test-Builder-Tester/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-Builder-Tester/trunk/checksums 2010-03-30 12:08:47 UTC (rev 9462) +++ csw/mgar/pkg/cpan/Test-Builder-Tester/trunk/checksums 2010-03-30 12:29:38 UTC (rev 9463) @@ -1,2 +1,2 @@ -8911ed04eb985a8b313c881d492e0072 download/COPYING -4751252f1e33af4f582c8af4c7b7666f download/Test-Builder-Tester-1.01.tar.gz +8911ed04eb985a8b313c881d492e0072 COPYING +4751252f1e33af4f582c8af4c7b7666f Test-Builder-Tester-1.01.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 Mar 30 14:33:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 30 Mar 2010 12:33:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9464] csw/mgar/pkg/neon/trunk/Makefile Message-ID: Revision: 9464 http://gar.svn.sourceforge.net/gar/?rev=9464&view=rev Author: dmichelsen Date: 2010-03-30 12:33:39 +0000 (Tue, 30 Mar 2010) Log Message: ----------- neon: Move from alternatives to AUXILIARY in the linker Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2010-03-30 12:29:38 UTC (rev 9463) +++ csw/mgar/pkg/neon/trunk/Makefile 2010-03-30 12:33:39 UTC (rev 9464) @@ -92,22 +92,62 @@ PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL) PKGFILES_CSWneon-devel += $(docdir)/.* -ALTERNATIVES_CSWneon = minimal -ALTERNATIVES_CSWneonfull = full -ALTERNATIVE_minimal = $(libdir)/libneon.so.27.2.3 neon $(libdir)/libneon-minimal.so.27.2.3 100 -ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27.2.3 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-minimal.so.27.2.3 -ALTERNATIVE_minimal += $(libdir)/libneon.so.26.0.4 neon.26 $(libdir)/libneon-minimal.so.26.0.4 -ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libneon.so.26.0.4 neon64.26 $(libdir)/$(ISA_DEFAULT64)/libneon-minimal.so.26.0.4 +# ALTERNATIVES_CSWneon = minimal +# ALTERNATIVES_CSWneonfull = full -ALTERNATIVE_full = $(libdir)/libneon.so.27.2.3 neon $(libdir)/libneon-full.so.27.2.3 200 -ALTERNATIVE_full += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27.2.3 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-full.so.27.2.3 -ALTERNATIVE_full += $(libdir)/libneon.so.26.0.4 neon.26 $(libdir)/libneon-full.so.26.0.4 -ALTERNATIVE_full += $(libdir)/$(ISA_DEFAULT64)/libneon.so.26.0.4 neon64.26 $(libdir)/$(ISA_DEFAULT64)/libneon-full.so.26.0.4 +# ALTERNATIVE_minimal = $(libdir)/libneon.so.27.2.3 neon $(libdir)/libneon-minimal.so.27.2.3 100 +# ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27.2.3 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-minimal.so.27.2.3 +# ALTERNATIVE_minimal += $(libdir)/libneon.so.26.0.4 neon.26 $(libdir)/libneon-minimal.so.26.0.4 +# ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libneon.so.26.0.4 neon64.26 $(libdir)/$(ISA_DEFAULT64)/libneon-minimal.so.26.0.4 +# ALTERNATIVE_full = $(libdir)/libneon.so.27.2.3 neon $(libdir)/libneon-full.so.27.2.3 200 +# ALTERNATIVE_full += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27.2.3 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-full.so.27.2.3 +# ALTERNATIVE_full += $(libdir)/libneon.so.26.0.4 neon.26 $(libdir)/libneon-full.so.26.0.4 +# ALTERNATIVE_full += $(libdir)/$(ISA_DEFAULT64)/libneon.so.26.0.4 neon64.26 $(libdir)/$(ISA_DEFAULT64)/libneon-full.so.26.0.4 + +FEATURE_LIBRARIES = libneon.26 libneon64.26 +FEATURE_LIBRARIES += libneon.27 libneon64.27 +FEATURES_libneon.26 = $(libdir)/libneon.so.26.0.4 +FEATURES_libneon.26 += libneon-minimal.so.26.0.4 +FEATURES_libneon.26 += libneon-full.so.26.0.4 +FEATURES_libneon64.26 = $(libdir)/$(ISA_DEFAULT64)/libneon.so.26.0.4 +FEATURES_libneon64.26 += libneon-minimal.so.26.0.4 +FEATURES_libneon64.26 += libneon-full.so.26.0.4 +FEATURES_libneon.27 = $(libdir)/libneon.so.27.2.3 +FEATURES_libneon.27 += libneon-minimal.so.27.2.3 +FEATURES_libneon.27 += libneon-full.so.27.2.3 +FEATURES_libneon64.27 = $(libdir)/$(ISA_DEFAULT64)/libneon.so.27.2.3 +FEATURES_libneon64.27 += libneon-minimal.so.27.2.3 +FEATURES_libneon64.27 += libneon-full.so.27.2.3 + include gar/category.mk #post-install-modulated: # rm -f $(DESTDIR)$(libdir)/libneon.so # gln -s libneon.so.27 $(DESTDIR)$(libdir)/libneon.so # @$(MAKECOOKIE) + +# cc -G -c empty.c +# ld -G -h libneon-minimal.so.26 -o stub-libneon.so.26 empty.o +# ld -R /opt/csw/lib -G -h libneon.so.26 -o libneon.so.26 -f libneon-full.so.26 -f libneon-max.so.26 stub-libneon.so.26 + +# 32/64 bit detection is done by looking at the last directory component and +# guessing by ISA if it is 32 or 64 bit + +post-merge: _LDFLAGS-32= +post-merge: _LDFLAGS-64=-64 +post-merge: +post-merge: + cd $(WORKDIR); touch empty.c; $(CC) -G -c empty.c + cd $(WORKDIR); touch empty64.c; $(CC) -m64 -G -c empty64.c + $(foreach L,$(FEATURE_LIBRARIES),\ + ld $(_LDFLAGS-$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L))))))) \ + -G -h $(word 2,$(FEATURES_$L)) -o $(WORKDIR)/stub-$(notdir $(firstword $(FEATURES_$L))) $(WORKDIR)/empty$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L)))))).o;\ + ld $(_LDFLAGS-$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L))))))) \ + -G -h `/usr/ccs/bin/dump -Lv $(dir $(firstword $(FEATURES_$L)))/$(word 2,$(FEATURES_$L)) | awk '$$2 == "SONAME" { print $$3 }'` \ + -o $(PKGROOT)$(firstword $(FEATURES_$L)) \ + $(foreach F,$(wordlist 3,$(words $(FEATURES_$L)),$(FEATURES_$L)),-f $F) \ + $(WORKDIR)/stub-$(notdir $(firstword $(FEATURES_$L))); \ + ) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 30 14:40:39 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 30 Mar 2010 12:40:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9465] csw/mgar/pkg/cpan/Text-Reform/trunk Message-ID: Revision: 9465 http://gar.svn.sourceforge.net/gar/?rev=9465&view=rev Author: bonivart Date: 2010-03-30 12:40:39 +0000 (Tue, 30 Mar 2010) Log Message: ----------- pm_txtreform: update to 1.20 Modified Paths: -------------- csw/mgar/pkg/cpan/Text-Reform/trunk/Makefile csw/mgar/pkg/cpan/Text-Reform/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Text-Reform/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Text-Reform/trunk/files/CSWpmtxtreform.gspec csw/mgar/pkg/cpan/Text-Reform/trunk/files/CSWpmtxtreform.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Text-Reform/trunk/ Property changes on: csw/mgar/pkg/cpan/Text-Reform/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/Text-Reform/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-Reform/trunk/Makefile 2010-03-30 12:33:39 UTC (rev 9464) +++ csw/mgar/pkg/cpan/Text-Reform/trunk/Makefile 2010-03-30 12:40:39 UTC (rev 9465) @@ -1,19 +1,26 @@ GARNAME = Text-Reform -SPKG_VERSION = 1.12.2 -GARVERSION = v$(SPKG_VERSION) +#SPKG_VERSION = 1.12.2 +#GARVERSION = v$(SPKG_VERSION) +GARVERSION = 1.20 CATEGORIES = cpan -AUTHOR = DCONWAY +AUTHOR = CHORNY -DESCRIPTION = manual text wrapping and reformatting +DESCRIPTION = Manual text wrapping and reformatting define BLURB + Manual text wrapping and reformatting endef -DISTFILES += CSWpmtxtreform.gspec -DISTFILES += $(call admfiles,CSWpmtxtreform,prototype) +#DISTFILES += CSWpmtxtreform.gspec +#DISTFILES += $(call admfiles,CSWpmtxtreform,prototype) +DISTFILES += COPYING +PACKAGES = CSWpmtxtreform +CATALOGNAME = pm_txtreform +ARCHALL = 1 + include gar/category.mk -post-install: - @echo " ==> Copying demo files" - @cp $(WORKDIR)/$(GARNAME)-$(GARVERSION)/demo/* $(DESTDIR)/$(sharedstatedir)/perl/csw/Text/ - @$(MAKECOOKIE) +#post-install: +# @echo " ==> Copying demo files" +# @cp $(WORKDIR)/$(GARNAME)-$(GARVERSION)/demo/* $(DESTDIR)/$(sharedstatedir)/perl/csw/Text/ +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/cpan/Text-Reform/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-Reform/trunk/checksums 2010-03-30 12:33:39 UTC (rev 9464) +++ csw/mgar/pkg/cpan/Text-Reform/trunk/checksums 2010-03-30 12:40:39 UTC (rev 9465) @@ -1,4 +1,2 @@ -af550edb33c81ae2541222af4247e142 download/CSWpmtxtreform.gspec -af550edb33c81ae2541222af4247e142 download/CSWpmtxtreform.gspec -1dfd066a493d62b0c9fe445b98ce3e73 download/CSWpmtxtreform.prototype -c2dc7c1d885e5d977831d798dd31e99b download/Text-Reform-v1.12.2.tar.gz +55a32e2cebc0de91d5256f54c291e632 COPYING +f37f5834f3dc221eacd09bdfcfe40918 Text-Reform-1.20.tar.gz Added: csw/mgar/pkg/cpan/Text-Reform/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Text-Reform/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Text-Reform/trunk/files/COPYING 2010-03-30 12:40:39 UTC (rev 9465) @@ -0,0 +1,4 @@ +Copyright (C) 2000-2007, Damian Conway + +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/Text-Reform/trunk/files/CSWpmtxtreform.gspec =================================================================== --- csw/mgar/pkg/cpan/Text-Reform/trunk/files/CSWpmtxtreform.gspec 2010-03-30 12:33:39 UTC (rev 9464) +++ csw/mgar/pkg/cpan/Text-Reform/trunk/files/CSWpmtxtreform.gspec 2010-03-30 12:40:39 UTC (rev 9465) @@ -1,9 +0,0 @@ -%var bitname pm_txtreform -%var pkgname CSWpmtxtreform -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1997-2001, Damian Conway. All Rights Reserved. -This module is free software. It may be used, redistributed -and/or modified under the terms of the Perl Artistic License -(see http://www.perl.com/perl/misc/Artistic.html) Deleted: csw/mgar/pkg/cpan/Text-Reform/trunk/files/CSWpmtxtreform.prototype =================================================================== --- csw/mgar/pkg/cpan/Text-Reform/trunk/files/CSWpmtxtreform.prototype 2010-03-30 12:33:39 UTC (rev 9464) +++ csw/mgar/pkg/cpan/Text-Reform/trunk/files/CSWpmtxtreform.prototype 2010-03-30 12:40:39 UTC (rev 9465) @@ -1,21 +0,0 @@ -d none /opt/csw/share/perl/csw/Text 0755 root bin -f none /opt/csw/share/perl/csw/Text/demo.pl 0755 root bin -f none /opt/csw/share/perl/csw/Text/demo_badheader.pl 0755 root bin -f none /opt/csw/share/perl/csw/Text/demo_cols.pl 0755 root bin -f none /opt/csw/share/perl/csw/Text/demo_columns.pl 0755 root bin -f none /opt/csw/share/perl/csw/Text/demo_filler.pl 0755 root bin -f none /opt/csw/share/perl/csw/Text/demo_footer.pl 0755 root bin -f none /opt/csw/share/perl/csw/Text/demo_leader1.pl 0755 root bin -f none /opt/csw/share/perl/csw/Text/demo_locale.pl 0755 root bin -f none /opt/csw/share/perl/csw/Text/demo_reentrant.pl 0755 root bin -f none /opt/csw/share/perl/csw/Text/demo_simple.pl 0755 root bin -f none /opt/csw/share/perl/csw/Text/demo_single.pl 0755 root bin -f none /opt/csw/share/perl/csw/Text/demo_table.pl 0755 root bin -f none /opt/csw/share/perl/csw/Text/demo_warnings.pl 0755 root bin -f none /opt/csw/share/perl/csw/Text/demo_ws.pl 0755 root bin -f none /opt/csw/share/perl/csw/Text/Reform.pm 0444 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Text::Reform.3perl 0644 root bin -i copyright=CSWpmtxtreform.copyright -i depend=CSWpmtxtreform.depend -i pkginfo=CSWpmtxtreform.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 30 14:42:50 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 30 Mar 2010 12:42:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9466] csw/mgar/pkg/cpan/Text-Reform/trunk/Makefile Message-ID: Revision: 9466 http://gar.svn.sourceforge.net/gar/?rev=9466&view=rev Author: bonivart Date: 2010-03-30 12:42:50 +0000 (Tue, 30 Mar 2010) Log Message: ----------- pm_txtreform: fix makefile Modified Paths: -------------- csw/mgar/pkg/cpan/Text-Reform/trunk/Makefile Modified: csw/mgar/pkg/cpan/Text-Reform/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-Reform/trunk/Makefile 2010-03-30 12:40:39 UTC (rev 9465) +++ csw/mgar/pkg/cpan/Text-Reform/trunk/Makefile 2010-03-30 12:42:50 UTC (rev 9466) @@ -1,6 +1,4 @@ GARNAME = Text-Reform -#SPKG_VERSION = 1.12.2 -#GARVERSION = v$(SPKG_VERSION) GARVERSION = 1.20 CATEGORIES = cpan AUTHOR = CHORNY @@ -10,8 +8,6 @@ Manual text wrapping and reformatting endef -#DISTFILES += CSWpmtxtreform.gspec -#DISTFILES += $(call admfiles,CSWpmtxtreform,prototype) DISTFILES += COPYING PACKAGES = CSWpmtxtreform @@ -19,8 +15,3 @@ ARCHALL = 1 include gar/category.mk - -#post-install: -# @echo " ==> Copying demo files" -# @cp $(WORKDIR)/$(GARNAME)-$(GARVERSION)/demo/* $(DESTDIR)/$(sharedstatedir)/perl/csw/Text/ -# @$(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 Mar 30 14:55:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 30 Mar 2010 12:55:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[9467] csw/mgar/pkg/fam/trunk/Makefile Message-ID: Revision: 9467 http://gar.svn.sourceforge.net/gar/?rev=9467&view=rev Author: dmichelsen Date: 2010-03-30 12:55:07 +0000 (Tue, 30 Mar 2010) Log Message: ----------- fam: Update new locations Modified Paths: -------------- csw/mgar/pkg/fam/trunk/Makefile Modified: csw/mgar/pkg/fam/trunk/Makefile =================================================================== --- csw/mgar/pkg/fam/trunk/Makefile 2010-03-30 12:42:50 UTC (rev 9466) +++ csw/mgar/pkg/fam/trunk/Makefile 2010-03-30 12:55:07 UTC (rev 9467) @@ -19,8 +19,12 @@ SPKG_SOURCEURL = http://oss.sgi.com/projects/fam/ +sysconfdir = /etc/opt/csw +sharedstatedir = /var/opt/csw CONFIGURE_ARGS = $(DIRPATHS) +MIFRATE_FILES = fam.conf + CSWfam_etcrpc = "sgi_fam 391002" CSWfam_inetdconf = "sgi_fam/1-2 stream rpc/tcp wait root $(bindir)/fam fam" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 30 14:59:36 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 30 Mar 2010 12:59:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9468] csw/mgar/pkg/qpopper/trunk Message-ID: Revision: 9468 http://gar.svn.sourceforge.net/gar/?rev=9468&view=rev Author: bonivart Date: 2010-03-30 12:59:36 +0000 (Tue, 30 Mar 2010) Log Message: ----------- qpopper: update to 4.0.19 Modified Paths: -------------- csw/mgar/pkg/qpopper/trunk/Makefile csw/mgar/pkg/qpopper/trunk/checksums Modified: csw/mgar/pkg/qpopper/trunk/Makefile =================================================================== --- csw/mgar/pkg/qpopper/trunk/Makefile 2010-03-30 12:55:07 UTC (rev 9467) +++ csw/mgar/pkg/qpopper/trunk/Makefile 2010-03-30 12:59:36 UTC (rev 9468) @@ -1,9 +1,9 @@ GARNAME = qpopper -GARVERSION = 4.0.16 +GARVERSION = 4.0.19 WORKSRC = $(WORKDIR)/$(GARNAME)$(GARVERSION) CATEGORIES = apps -DESCRIPTION = the most widely-used POP3 server for Unix +DESCRIPTION = The most widely-used POP3 server for Unix define BLURB Qpopper supports the widely used POP3 protocol for downloading Internet e-mail used by many popular e-mail clients. Qpopper does not include a Modified: csw/mgar/pkg/qpopper/trunk/checksums =================================================================== --- csw/mgar/pkg/qpopper/trunk/checksums 2010-03-30 12:55:07 UTC (rev 9467) +++ csw/mgar/pkg/qpopper/trunk/checksums 2010-03-30 12:59:36 UTC (rev 9468) @@ -1,2 +1,2 @@ -1282219a4e315069b7c422b05d171fab download/qpopper4.0.16.tar.gz -26d16c0e628390b36a49fa459e252db8 download/README.CSW +26d16c0e628390b36a49fa459e252db8 README.CSW +91059c5cc320df8267eac1b9c27ff3ea qpopper4.0.19.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 Tue Mar 30 15:10:31 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 30 Mar 2010 13:10:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9469] csw/mgar/pkg/qpopper/trunk Message-ID: Revision: 9469 http://gar.svn.sourceforge.net/gar/?rev=9469&view=rev Author: bonivart Date: 2010-03-30 13:10:31 +0000 (Tue, 30 Mar 2010) Log Message: ----------- qpopper: add inetd helper Modified Paths: -------------- csw/mgar/pkg/qpopper/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/qpopper/trunk/files/inetd.conf Modified: csw/mgar/pkg/qpopper/trunk/Makefile =================================================================== --- csw/mgar/pkg/qpopper/trunk/Makefile 2010-03-30 12:59:36 UTC (rev 9468) +++ csw/mgar/pkg/qpopper/trunk/Makefile 2010-03-30 13:10:31 UTC (rev 9469) @@ -22,6 +22,8 @@ CATALOGNAME_CSWqpopper = qpopper SPKG_DESC_CSWqpopper = $(DESCRIPTION) +INETDCONF = /etc/opt/csw/pkg/CSWqpopper/inetd.conf + SPKG_SOURCEURL = http://www.eudora.com/qpopper CONFIGURE_ARGS = $(DIRPATHS) @@ -32,6 +34,8 @@ install-custom: @echo " ==> Install for $(GARNAME) (custom)" + @ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSW$(GARNAME) + @cp $(FILEDIR)/inetd.conf $(DESTDIR)/etc/opt/csw/pkg/CSW$(GARNAME) @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @ginstall -d $(DESTDIR)$(sbindir) @ginstall -d $(DESTDIR)$(mandir)/man8 Added: csw/mgar/pkg/qpopper/trunk/files/inetd.conf =================================================================== --- csw/mgar/pkg/qpopper/trunk/files/inetd.conf (rev 0) +++ csw/mgar/pkg/qpopper/trunk/files/inetd.conf 2010-03-30 13:10:31 UTC (rev 9469) @@ -0,0 +1 @@ +pop3 stream tcp nowait root /opt/csw/sbin/popper popper -s 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 Mar 30 15:14:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 30 Mar 2010 13:14:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9470] csw/mgar/pkg/neon/trunk/Makefile Message-ID: Revision: 9470 http://gar.svn.sourceforge.net/gar/?rev=9470&view=rev Author: dmichelsen Date: 2010-03-30 13:14:43 +0000 (Tue, 30 Mar 2010) Log Message: ----------- neon: Add overrides Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2010-03-30 13:10:31 UTC (rev 9469) +++ csw/mgar/pkg/neon/trunk/Makefile 2010-03-30 13:14:43 UTC (rev 9470) @@ -121,6 +121,17 @@ FEATURES_libneon64.27 += libneon-minimal.so.27.2.3 FEATURES_libneon64.27 += libneon-full.so.27.2.3 +# This is ok as the AUX pulls in the specific lib which returns the generic SONAME +CHECKPKG_OVERRIDES_CSWneon += soname-not-found|libneon-minimal.so.27.2.3 +CHECKPKG_OVERRIDES_CSWneon += soname-not-found|libneon-minimal.so.27.2.3 +CHECKPKG_OVERRIDES_CSWneon += soname-not-found|libneon-minimal.so.26.0.4 +CHECKPKG_OVERRIDES_CSWneon += soname-not-found|libneon-minimal.so.26.0.4 + +# This comes from krb5-config --libs +CHECKPKG_OVERRIDES_CSWneonfull += bad-rpath-entry|/opt/csw/lib/ + +CHECKPKG_OVERRIDES_CSWneon-devel += surplus-dependency|CSWneon + include gar/category.mk #post-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Mar 30 15:15:37 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 30 Mar 2010 13:15:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9471] csw/mgar/pkg/python/trunk/Makefile Message-ID: Revision: 9471 http://gar.svn.sourceforge.net/gar/?rev=9471&view=rev Author: wahwah Date: 2010-03-30 13:15:37 +0000 (Tue, 30 Mar 2010) Log Message: ----------- python: +CHECKPKG_OVERRIDES_CSWidle += surplus-dependency|CSWpython-tk Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2010-03-30 13:14:43 UTC (rev 9470) +++ csw/mgar/pkg/python/trunk/Makefile 2010-03-30 13:15:37 UTC (rev 9471) @@ -119,6 +119,9 @@ RUNTIME_DEP_PKGS_CSWpython-devel = CSWpython RUNTIME_DEP_PKGS_CSWpython-test += CSWpython +# This could be handled by automatic dependency detection +CHECKPKG_OVERRIDES_CSWidle += surplus-dependency|CSWpython-tk + CATALOGNAME_CSWidle = idle CATALOGNAME_CSWpython = python CATALOGNAME_CSWpython-devel = python_devel @@ -133,10 +136,6 @@ LICENSE = LICENSE -# Need to adjust the RPATH: -# CHECKPKG_OVERRIDES_CSWpython += missing-dependency|CSWbdb -# CHECKPKG_OVERRIDES_CSWpython += surplus-dependency|CSWbdb47 - # These won't be fixed. CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/export/medusa|root/opt/csw/lib/libpython2.5.so.1.0 CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/opt/build|root/opt/csw/lib/libpython2.5.so.1.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Mar 30 15:57:07 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 30 Mar 2010 13:57:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[9472] csw/mgar/pkg/bind/trunk/Makefile Message-ID: Revision: 9472 http://gar.svn.sourceforge.net/gar/?rev=9472&view=rev Author: bonivart Date: 2010-03-30 13:57:07 +0000 (Tue, 30 Mar 2010) Log Message: ----------- bind: packaging issues Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2010-03-30 13:15:37 UTC (rev 9471) +++ csw/mgar/pkg/bind/trunk/Makefile 2010-03-30 13:57:07 UTC (rev 9472) @@ -70,7 +70,7 @@ INSTALL_SCRIPTS = custom PROTOTYPE_MODIFIERS = 1 -PROTOTYPE_FILES_1 = /var/opt/csw/named +PROTOTYPE_FILES_1 = /var/opt/csw/named.* PROTOTYPE_CLASS_1 = ugfiles PROTOTYPE_USER_1 = named PROTOTYPE_GROUP_1 = named @@ -83,6 +83,10 @@ SPKG_SOURCEURL = http://www.isc.org/software/bind +CHECKPKG_OVERRIDES_CSWbinddevel += surplus-dependency|CSWbind +CHECKPKG_OVERRIDES_CSWbind += surplus-dependency|CSWbindutils +CHECKPKG_OVERRIDES_CSWbindchroot += surplus-dependency|CSWbind + include gar/category.mk DOCLIST = README.CSW db.127.0.0 db.localhost named.conf named.root rndc.key 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 Mar 30 16:23:59 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 30 Mar 2010 14:23:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[9473] csw/mgar/pkg/neon/trunk/Makefile Message-ID: Revision: 9473 http://gar.svn.sourceforge.net/gar/?rev=9473&view=rev Author: dmichelsen Date: 2010-03-30 14:23:59 +0000 (Tue, 30 Mar 2010) Log Message: ----------- neon: Readd runtime path Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2010-03-30 13:57:07 UTC (rev 9472) +++ csw/mgar/pkg/neon/trunk/Makefile 2010-03-30 14:23:59 UTC (rev 9473) @@ -121,12 +121,6 @@ FEATURES_libneon64.27 += libneon-minimal.so.27.2.3 FEATURES_libneon64.27 += libneon-full.so.27.2.3 -# This is ok as the AUX pulls in the specific lib which returns the generic SONAME -CHECKPKG_OVERRIDES_CSWneon += soname-not-found|libneon-minimal.so.27.2.3 -CHECKPKG_OVERRIDES_CSWneon += soname-not-found|libneon-minimal.so.27.2.3 -CHECKPKG_OVERRIDES_CSWneon += soname-not-found|libneon-minimal.so.26.0.4 -CHECKPKG_OVERRIDES_CSWneon += soname-not-found|libneon-minimal.so.26.0.4 - # This comes from krb5-config --libs CHECKPKG_OVERRIDES_CSWneonfull += bad-rpath-entry|/opt/csw/lib/ @@ -156,6 +150,7 @@ ld $(_LDFLAGS-$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L))))))) \ -G -h $(word 2,$(FEATURES_$L)) -o $(WORKDIR)/stub-$(notdir $(firstword $(FEATURES_$L))) $(WORKDIR)/empty$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L)))))).o;\ ld $(_LDFLAGS-$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L))))))) \ + -R $(patsubst %/,%,$(dir $(firstword $(FEATURES_$L)))) \ -G -h `/usr/ccs/bin/dump -Lv $(dir $(firstword $(FEATURES_$L)))/$(word 2,$(FEATURES_$L)) | awk '$$2 == "SONAME" { print $$3 }'` \ -o $(PKGROOT)$(firstword $(FEATURES_$L)) \ $(foreach F,$(wordlist 3,$(words $(FEATURES_$L)),$(FEATURES_$L)),-f $F) \ 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 Mar 30 19:33:11 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 30 Mar 2010 17:33:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9475] csw/mgar/pkg/libffi/trunk/Makefile Message-ID: Revision: 9475 http://gar.svn.sourceforge.net/gar/?rev=9475&view=rev Author: hson Date: 2010-03-30 17:33:11 +0000 (Tue, 30 Mar 2010) Log Message: ----------- libffi: Switch to gcc due to problems on amd64 Modified Paths: -------------- csw/mgar/pkg/libffi/trunk/Makefile Modified: csw/mgar/pkg/libffi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libffi/trunk/Makefile 2010-03-30 17:32:05 UTC (rev 9474) +++ csw/mgar/pkg/libffi/trunk/Makefile 2010-03-30 17:33:11 UTC (rev 9475) @@ -16,7 +16,8 @@ MASTER_SITES = ftp://sourceware.org/pub/libffi/ SPKG_SOURCEURL = http://sourceware.org/libffi/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = sun.patch +# Not needed unless using SOS12 compiler +#PATCHFILES = sun.patch PACKAGES = CSWlibffi CSWlibffidevel CATALOGNAME_CSWlibffi = libffi @@ -29,16 +30,19 @@ LICENSE = LICENSE RUNTIME_DEP_PKGS_CSWlibffidevel += CSWlibffi -#RUNTIME_DEP_PKGS_CSWlibffi = CSWgcc4corert +RUNTIME_DEP_PKGS_CSWlibffi = CSWgcc4corert +CHECKPKG_OVERRIDES_CSWlibffidevel += surplus-dependency|CSWlibffi + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -GARCOMPILER = SOS12 +GARCOMPILER = GCC4 BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -# Tests fail since they are written for gcc only +# Tests fail since they are written for gcc only if using SOS12 compiler +# But they also fails on 64-bit #TEST_TARGET = check TEST_TARGET = @@ -56,3 +60,4 @@ @( cd $(WORKSRC); gsed -e "s|src/sparc/v8.S||" -e "s/AM_CFLAGS = .*/AM_CFLAGS = /" -i Makefile.am ; \ aclocal; \ automake) + $(MAKECOOKIE) 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 Mar 30 19:32:05 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 30 Mar 2010 17:32:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[9474] csw/mgar/pkg/libffi/trunk/files/sun.patch Message-ID: Revision: 9474 http://gar.svn.sourceforge.net/gar/?rev=9474&view=rev Author: hson Date: 2010-03-30 17:32:05 +0000 (Tue, 30 Mar 2010) Log Message: ----------- libffi: Remove MacOS only patch Modified Paths: -------------- csw/mgar/pkg/libffi/trunk/files/sun.patch Modified: csw/mgar/pkg/libffi/trunk/files/sun.patch =================================================================== --- csw/mgar/pkg/libffi/trunk/files/sun.patch 2010-03-30 14:23:59 UTC (rev 9473) +++ csw/mgar/pkg/libffi/trunk/files/sun.patch 2010-03-30 17:32:05 UTC (rev 9474) @@ -47,12 +47,3 @@ FFI_DEFAULT_ABI = FFI_SYSV, #else FFI_DEFAULT_ABI = FFI_UNIX64, -@@ -96,7 +96,7 @@ - #define FFI_TYPE_SMALL_STRUCT_2B (FFI_TYPE_LAST + 2) - #define FFI_TYPE_SMALL_STRUCT_4B (FFI_TYPE_LAST + 3) - --#if defined (X86_64) || (defined (__x86_64__) && defined (X86_DARWIN)) -+#if defined (X86_64) || ((defined (__x86_64__) || defined (__x86_64)) && defined (X86_DARWIN)) - #define FFI_TRAMPOLINE_SIZE 24 - #define FFI_NATIVE_RAW_API 0 - #else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Mar 30 21:06:49 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Mar 2010 19:06:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9476] csw/mgar/pkg/cswpkgloghooks/trunk Message-ID: Revision: 9476 http://gar.svn.sourceforge.net/gar/?rev=9476&view=rev Author: bdwalton Date: 2010-03-30 19:06:49 +0000 (Tue, 30 Mar 2010) Log Message: ----------- cswpkgloghooks: do not depend on CSWbash. hashbang with env bash Modified Paths: -------------- csw/mgar/pkg/cswpkgloghooks/trunk/Makefile csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-postupgrade csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade Modified: csw/mgar/pkg/cswpkgloghooks/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/Makefile 2010-03-30 17:33:11 UTC (rev 9475) +++ csw/mgar/pkg/cswpkgloghooks/trunk/Makefile 2010-03-30 19:06:49 UTC (rev 9476) @@ -1,5 +1,5 @@ GARNAME = cswpkgloghooks -GARVERSION = 1.0 +GARVERSION = 1.1 CATEGORIES = utils VENDOR_URL = http://opencsw.org @@ -12,7 +12,7 @@ failure. Currently, the default of user.notice is used. endef -RUNTIME_DEP_PKGS = CSWbash +VENDOR_URL = http://www.opencsw.org/ MASTER_SITES = DISTFILES = Modified: csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-postupgrade =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-postupgrade 2010-03-30 17:33:11 UTC (rev 9475) +++ csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-postupgrade 2010-03-30 19:06:49 UTC (rev 9476) @@ -1,4 +1,4 @@ -#!/opt/csw/bin/bash +#!/usr/bin/env bash script=$0 Modified: csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade 2010-03-30 17:33:11 UTC (rev 9475) +++ csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade 2010-03-30 19:06:49 UTC (rev 9476) @@ -1,4 +1,4 @@ -#!/opt/csw/bin/bash +#!env bash set -- ${1/-/ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 31 00:43:50 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 30 Mar 2010 22:43:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9477] csw/mgar/pkg/python/branches/python-3.1/ Message-ID: Revision: 9477 http://gar.svn.sourceforge.net/gar/?rev=9477&view=rev Author: wahwah Date: 2010-03-30 22:43:50 +0000 (Tue, 30 Mar 2010) Log Message: ----------- python: A branch for experimentation with 3.1 Added Paths: ----------- csw/mgar/pkg/python/branches/python-3.1/ Property changes on: csw/mgar/pkg/python/branches/python-3.1 ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: svn:mergeinfo + /csw/mgar/pkg/python/branches/python-2.6.4+patch7242:8407-9385 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 Mar 31 04:24:46 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 31 Mar 2010 02:24:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9478] csw/mgar/pkg/cswpkgloghooks/trunk Message-ID: Revision: 9478 http://gar.svn.sourceforge.net/gar/?rev=9478&view=rev Author: bdwalton Date: 2010-03-31 02:24:46 +0000 (Wed, 31 Mar 2010) Log Message: ----------- cswpkgloghooks: fix typo in new hashbang; patchlevel version bump Modified Paths: -------------- csw/mgar/pkg/cswpkgloghooks/trunk/Makefile csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade Modified: csw/mgar/pkg/cswpkgloghooks/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/Makefile 2010-03-30 22:43:50 UTC (rev 9477) +++ csw/mgar/pkg/cswpkgloghooks/trunk/Makefile 2010-03-31 02:24:46 UTC (rev 9478) @@ -1,5 +1,5 @@ GARNAME = cswpkgloghooks -GARVERSION = 1.1 +GARVERSION = 1.1.1 CATEGORIES = utils VENDOR_URL = http://opencsw.org Modified: csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade 2010-03-30 22:43:50 UTC (rev 9477) +++ csw/mgar/pkg/cswpkgloghooks/trunk/files/01-CSWcswpkgloghooks-preupgrade 2010-03-31 02:24:46 UTC (rev 9478) @@ -1,4 +1,4 @@ -#!env bash +#!/usr/bin/env bash set -- ${1/-/ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Mar 31 06:30:32 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 31 Mar 2010 04:30:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9479] csw/mgar/pkg/python/branches/python-3.1 Message-ID: Revision: 9479 http://gar.svn.sourceforge.net/gar/?rev=9479&view=rev Author: wahwah Date: 2010-03-31 04:30:32 +0000 (Wed, 31 Mar 2010) Log Message: ----------- python: Version 3.1 compiles, except for the OSS module. Modified Paths: -------------- csw/mgar/pkg/python/branches/python-3.1/Makefile csw/mgar/pkg/python/branches/python-3.1/checksums Modified: csw/mgar/pkg/python/branches/python-3.1/Makefile =================================================================== --- csw/mgar/pkg/python/branches/python-3.1/Makefile 2010-03-31 02:24:46 UTC (rev 9478) +++ csw/mgar/pkg/python/branches/python-3.1/Makefile 2010-03-31 04:30:32 UTC (rev 9479) @@ -1,7 +1,7 @@ # $Id$ GARNAME = Python -GARVERSION = 2.6.5 +GARVERSION = 3.1.2 CATEGORIES = lang # Known issues: @@ -28,11 +28,6 @@ DISTFILES = $(DISTNAME).tar.bz2 -# Previous Library for compatability -DISTFILES += libpython2.5.so.1.0-isa-sparcv8 -DISTFILES += libpython2.5.so.1.0-isa-i386 - -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 # Patches @@ -40,17 +35,16 @@ PATCHFILES += makesetup.diff PATCHFILES += modules.diff PATCHFILES += multiprocess.diff -PATCHFILES += pyport.diff -PATCHFILES += site.diff -PATCHFILES += python-config-in.diff -PATCHFILES += setup.diff +# PATCHFILES += pyport.diff +# PATCHFILES += site.diff +# PATCHFILES += python-config-in.diff +# PATCHFILES += setup.diff # Test for sunaudiodev fails. SKIPTEST = 1 EXTRA_INC += $(prefix)/X11/include EXTRA_LIB += $(prefix)/X11/lib -EXTRA_LIB += $(prefix)/bdb47/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) @@ -73,84 +67,74 @@ # use prototype filters to set the class PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -PACKAGES = CSWidle -PACKAGES += CSWpython -PACKAGES += CSWpython-devel -PACKAGES += CSWpython-test -PACKAGES += CSWpython-tk +PACKAGES = CSWidle31 +PACKAGES += CSWpython31 +PACKAGES += CSWpython31-devel +PACKAGES += CSWpython31-test +PACKAGES += CSWpython31-tk -INCOMPATIBLE_PKGS_CSWpython = CSWpydistutils +INCOMPATIBLE_PKGS_CSWpython31 = CSWpydistutils -PKGFILES_CSWidle = $(libdir)/.*/idlelib/.* -PKGFILES_CSWidle += $(bindir)/idle -PKGFILES_CSWpython-devel = $(includedir)/.* -PKGFILES_CSWpython-devel += $(libdir)/.*/config/.* -PKGFILES_CSWpython-devel += $(bindir)/.*config.* -# No idea why would this be in CSWpython, and no good idea for a better package +PKGFILES_CSWidle31 = $(libdir)/.*/idlelib/.* +PKGFILES_CSWidle31 += $(bindir)/idle +PKGFILES_CSWpython31-devel = $(includedir)/.* +PKGFILES_CSWpython31-devel += $(libdir)/.*/config/.* +PKGFILES_CSWpython31-devel += $(bindir)/.*config.* +# No idea why would this be in CSWpython31, and no good idea for a better package # to put it. -PKGFILES_CSWpython-devel += $(bindir)/smtpd.py -PKGFILES_CSWpython-tk = $(libdir)/.*/lib-tk/.* -PKGFILES_CSWpython-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* -PKGFILES_CSWpython-test = $(libdir)/python/test/.* -PKGFILES_CSWpython-test += $(libdir)/python/bsddb/test.* -PKGFILES_CSWpython-test += $(libdir)/python/ctypes/test.* -PKGFILES_CSWpython-test += $(libdir)/python/email/test.* -PKGFILES_CSWpython-test += $(libdir)/python/distutils/tests.* -PKGFILES_CSWpython-test += $(libdir)/python/json/tests.* -PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.* -PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.* +PKGFILES_CSWpython31-devel += $(bindir)/smtpd.py +PKGFILES_CSWpython31-tk = $(libdir)/.*/lib-tk/.* +PKGFILES_CSWpython31-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* +PKGFILES_CSWpython31-test = $(libdir)/python/test/.* +PKGFILES_CSWpython31-test += $(libdir)/python/bsddb/test.* +PKGFILES_CSWpython31-test += $(libdir)/python/ctypes/test.* +PKGFILES_CSWpython31-test += $(libdir)/python/email/test.* +PKGFILES_CSWpython31-test += $(libdir)/python/distutils/tests.* +PKGFILES_CSWpython31-test += $(libdir)/python/json/tests.* +PKGFILES_CSWpython31-test += $(libdir)/python/lib2to3/tests.* +PKGFILES_CSWpython31-test += $(libdir)/python/sqlite3/test.* -ARCHALL_CSWpython-test = 1 -ARCHALL_CSWidle = 1 +ARCHALL_CSWpython31-test = 1 +ARCHALL_CSWidle31 = 1 -RUNTIME_DEP_PKGS_CSWidle = CSWpython CSWpython-tk -RUNTIME_DEP_PKGS_CSWpython += CSWbdb47 -RUNTIME_DEP_PKGS_CSWpython += CSWbzip2 -RUNTIME_DEP_PKGS_CSWpython += CSWgdbm -RUNTIME_DEP_PKGS_CSWpython += CSWggettextrt -RUNTIME_DEP_PKGS_CSWpython += CSWncurses -RUNTIME_DEP_PKGS_CSWpython += CSWosslrt -RUNTIME_DEP_PKGS_CSWpython += CSWreadline -RUNTIME_DEP_PKGS_CSWpython += CSWsqlite3rt CSWzlib -RUNTIME_DEP_PKGS_CSWpython-tk += CSWpython -RUNTIME_DEP_PKGS_CSWpython-tk += CSWtcl -RUNTIME_DEP_PKGS_CSWpython-tk += CSWtk -RUNTIME_DEP_PKGS_CSWpython-tk += CSWlibx11 -RUNTIME_DEP_PKGS_CSWpython-devel = CSWpython -RUNTIME_DEP_PKGS_CSWpython-test += CSWpython +RUNTIME_DEP_PKGS_CSWidle31 += CSWpython31 +RUNTIME_DEP_PKGS_CSWidle31 += CSWpython31-tk +RUNTIME_DEP_PKGS_CSWpython31 += CSWbzip2 +RUNTIME_DEP_PKGS_CSWpython31 += CSWgdbm +RUNTIME_DEP_PKGS_CSWpython31 += CSWggettextrt +RUNTIME_DEP_PKGS_CSWpython31 += CSWncurses +RUNTIME_DEP_PKGS_CSWpython31 += CSWosslrt +RUNTIME_DEP_PKGS_CSWpython31 += CSWreadline +RUNTIME_DEP_PKGS_CSWpython31 += CSWsqlite3rt CSWzlib +RUNTIME_DEP_PKGS_CSWpython31-tk += CSWpython31 +RUNTIME_DEP_PKGS_CSWpython31-tk += CSWtcl +RUNTIME_DEP_PKGS_CSWpython31-tk += CSWtk +RUNTIME_DEP_PKGS_CSWpython31-tk += CSWlibx11 +RUNTIME_DEP_PKGS_CSWpython31-devel += CSWpython31 +RUNTIME_DEP_PKGS_CSWpython31-test += CSWpython31 # This could be handled by automatic dependency detection -CHECKPKG_OVERRIDES_CSWidle += surplus-dependency|CSWpython-tk +CHECKPKG_OVERRIDES_CSWidle31 += surplus-dependency|CSWpython31-tk -CATALOGNAME_CSWidle = idle -CATALOGNAME_CSWpython = python -CATALOGNAME_CSWpython-devel = python_devel -CATALOGNAME_CSWpython-tk = python_tk -CATALOGNAME_CSWpython-test = python_test +CATALOGNAME_CSWidle31 = idle_31 +CATALOGNAME_CSWpython31 = python_31 +CATALOGNAME_CSWpython31-devel = python_31_devel +CATALOGNAME_CSWpython31-tk = python_31_tk +CATALOGNAME_CSWpython31-test = python_31_test -SPKG_DESC_CSWidle = Python IDE -SPKG_DESC_CSWpython = A high-level scripting language. -SPKG_DESC_CSWpython-devel = Development Files for Python -SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter) -SPKG_DESC_CSWpython-test = Python Test modules +SPKG_DESC_CSWidle31 = Python IDE +SPKG_DESC_CSWpython31 = A high-level scripting language, 3.1 series +SPKG_DESC_CSWpython31-devel = Development Files for Python +SPKG_DESC_CSWpython31-tk = Python Tk Interface (TkInter) +SPKG_DESC_CSWpython31-test = Python Test modules +CHECKPKG_OVERRIDES_CSWpython31 += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython31-test += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython31-test += surplus-dependency|CSWpython31 +CHECKPKG_OVERRIDES_CSWidle31 += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWidle31 += surplus-dependency|CSWpython31 +CHECKPKG_OVERRIDES_CSWpython31-devel += surplus-dependency|CSWpython31 + LICENSE = LICENSE -# These won't be fixed. -CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/export/medusa|root/opt/csw/lib/libpython2.5.so.1.0 -CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/opt/build|root/opt/csw/lib/libpython2.5.so.1.0 -# Amusingly, now the overrides file contains the bad data. -CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/python -CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/opt/build|root/opt/csw/share/checkpkg/overrides/python - include gar/category.mk - -post-install-modulated: install-deprecated-libs - @$(MAKECOOKIE) - -install-deprecated-libs: - echo "===> Installing deprecated Libraries into $(libdir)" - 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 - @$(MAKECOOKIE) Modified: csw/mgar/pkg/python/branches/python-3.1/checksums =================================================================== --- csw/mgar/pkg/python/branches/python-3.1/checksums 2010-03-31 02:24:46 UTC (rev 9478) +++ csw/mgar/pkg/python/branches/python-3.1/checksums 2010-03-31 04:30:32 UTC (rev 9479) @@ -1,7 +1,5 @@ -6bef0417e71a1a1737ccf5750420fdb3 Python-2.6.5.tar.bz2 +45350b51b58a46b029fb06c61257e350 Python-3.1.2.tar.bz2 42dd6523beb94a805d5764ae1276091c faqwiz.diff -5664b3970307d7d39d8d4061e7dccbb0 libpython2.5.so.1.0-isa-i386 -a87896c48b2f61b32053e6d02b07b022 libpython2.5.so.1.0-isa-sparcv8 33f4094ee46ce865d3973a197f3fb4a0 makesetup.diff 22c5f741b1744213eaef0818ab280ad5 modules.diff afcc79a94e2f8a576c7906a9700e35a0 multiprocess.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 Wed Mar 31 09:00:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 31 Mar 2010 07:00:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9480] csw/mgar/pkg/libidl/trunk Message-ID: Revision: 9480 http://gar.svn.sourceforge.net/gar/?rev=9480&view=rev Author: dmichelsen Date: 2010-03-31 07:00:16 +0000 (Wed, 31 Mar 2010) Log Message: ----------- libidl: Update to 0.8.14 Modified Paths: -------------- csw/mgar/pkg/libidl/trunk/Makefile csw/mgar/pkg/libidl/trunk/checksums Modified: csw/mgar/pkg/libidl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidl/trunk/Makefile 2010-03-31 04:30:32 UTC (rev 9479) +++ csw/mgar/pkg/libidl/trunk/Makefile 2010-03-31 07:00:16 UTC (rev 9480) @@ -1,5 +1,5 @@ GARNAME = libIDL -GARVERSION = 0.8.13 +GARVERSION = 0.8.14 CATEGORIES = lib DESCRIPTION = Library for handling CORBA IDL Modified: csw/mgar/pkg/libidl/trunk/checksums =================================================================== --- csw/mgar/pkg/libidl/trunk/checksums 2010-03-31 04:30:32 UTC (rev 9479) +++ csw/mgar/pkg/libidl/trunk/checksums 2010-03-31 07:00:16 UTC (rev 9480) @@ -1 +1 @@ -b43b289a859eb38a710f70622c46e571 download/libIDL-0.8.13.tar.bz2 +bb8e10a218fac793a52d404d14adedcb libIDL-0.8.14.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Mar 31 09:53:04 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 31 Mar 2010 07:53:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[9481] csw/mgar/pkg/cpan/Module-Signature/trunk Message-ID: Revision: 9481 http://gar.svn.sourceforge.net/gar/?rev=9481&view=rev Author: bonivart Date: 2010-03-31 07:53:04 +0000 (Wed, 31 Mar 2010) Log Message: ----------- pm_modulesign: update to 0.63 Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile csw/mgar/pkg/cpan/Module-Signature/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Module-Signature/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Module-Signature/trunk/files/CSWpmmodulesignature.depend csw/mgar/pkg/cpan/Module-Signature/trunk/files/CSWpmmodulesignature.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Module-Signature/trunk/ Property changes on: csw/mgar/pkg/cpan/Module-Signature/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/Module-Signature/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile 2010-03-31 07:00:16 UTC (rev 9480) +++ csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile 2010-03-31 07:53:04 UTC (rev 9481) @@ -1,16 +1,26 @@ GARNAME = Module-Signature -GARVERSION = 0.54 +GARVERSION = 0.63 CATEGORIES = cpan -AUTHOR = AUTRIJUS +AUTHOR = FLORA -DESCRIPTION = module signature file manipulation +DESCRIPTION = Module signature file manipulation define BLURB Module::Signature adds cryptographic authentications to CPAN distributions, via the special SIGNATURE file. endef -DISTFILES += CSWpmmodulesignature.gspec CSWpmmodulesignature.depend +DISTFILES += COPYING -DEPENDS += cpan/Text-Diff cpan/Crypt-OpenPGP cpan/PAR-Dist +PACKAGES = CSWpmmodulesign +CATALOGNAME = pm_modulesign +ARCHALL = 1 +RUNTIME_DEP_PKGS += CSWgnupg +RUNTIME_DEP_PKGS += CSWpmpardist +RUNTIME_DEP_PKGS += CSWpmtextdiff + +CHECKPKG_OVERRIDES_CSWpmmodulesign += surplus-dependency|CSWpmpardist +CHECKPKG_OVERRIDES_CSWpmmodulesign += surplus-dependency|CSWgnupg +CHECKPKG_OVERRIDES_CSWpmmodulesign += surplus-dependency|CSWpmtextdiff + include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Signature/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Signature/trunk/checksums 2010-03-31 07:00:16 UTC (rev 9480) +++ csw/mgar/pkg/cpan/Module-Signature/trunk/checksums 2010-03-31 07:53:04 UTC (rev 9481) @@ -1,3 +1,2 @@ -8e0d41a1f77d7aea5d144ad6bc67ae3b download/CSWpmmodulesignature.gspec -15663caee5e8d951aadf656ea1d1c048 download/CSWpmmodulesignature.depend -f77964f0d5deb98ea7c1050a8b6a21a5 download/Module-Signature-0.54.tar.gz +dbdbae43103a35e96797f75082852bda COPYING +49a961502c0786797dabfea9c7fd30c3 Module-Signature-0.63.tar.gz Added: csw/mgar/pkg/cpan/Module-Signature/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Module-Signature/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Module-Signature/trunk/files/COPYING 2010-03-31 07:53:04 UTC (rev 9481) @@ -0,0 +1,6 @@ +Copyright 2002, 2003, 2004 by Autrijus Tang . + +All rights reserved. You can redistribute and/or modify +this bundle under the same terms as Perl itself. + +See . Deleted: csw/mgar/pkg/cpan/Module-Signature/trunk/files/CSWpmmodulesignature.depend =================================================================== --- csw/mgar/pkg/cpan/Module-Signature/trunk/files/CSWpmmodulesignature.depend 2010-03-31 07:00:16 UTC (rev 9480) +++ csw/mgar/pkg/cpan/Module-Signature/trunk/files/CSWpmmodulesignature.depend 2010-03-31 07:53:04 UTC (rev 9481) @@ -1,3 +0,0 @@ -P CSWpmcryptopenpgp pm_cryptopenpgp - pure-Perl OpenPGP implementation -P CSWpmpardist pm_pardist - create and manipulate PAR distributions -P CSWpmtextdiff pm_textdiff - perform diffs on files and record sets Deleted: csw/mgar/pkg/cpan/Module-Signature/trunk/files/CSWpmmodulesignature.gspec =================================================================== --- csw/mgar/pkg/cpan/Module-Signature/trunk/files/CSWpmmodulesignature.gspec 2010-03-31 07:00:16 UTC (rev 9480) +++ csw/mgar/pkg/cpan/Module-Signature/trunk/files/CSWpmmodulesignature.gspec 2010-03-31 07:53:04 UTC (rev 9481) @@ -1,11 +0,0 @@ -%var bitname pm_modulesignature -%var pkgname CSWpmmodulesignature -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 2002, 2003, 2004 by Autrijus Tang . - -All rights reserved. You can redistribute and/or modify -this bundle under the same terms as Perl itself. - -See . 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 Mar 31 11:01:15 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 31 Mar 2010 09:01:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9482] csw/mgar/pkg/audiofile/trunk Message-ID: Revision: 9482 http://gar.svn.sourceforge.net/gar/?rev=9482&view=rev Author: dmichelsen Date: 2010-03-31 09:01:14 +0000 (Wed, 31 Mar 2010) Log Message: ----------- audiofile: Update to 0.2.7 Modified Paths: -------------- csw/mgar/pkg/audiofile/trunk/Makefile csw/mgar/pkg/audiofile/trunk/checksums Added Paths: ----------- csw/mgar/pkg/audiofile/trunk/files/0001-Add-missing-headers-for-C99.patch csw/mgar/pkg/audiofile/trunk/files/audiofile-0.2.7-solaris9.patch Modified: csw/mgar/pkg/audiofile/trunk/Makefile =================================================================== --- csw/mgar/pkg/audiofile/trunk/Makefile 2010-03-31 07:53:04 UTC (rev 9481) +++ csw/mgar/pkg/audiofile/trunk/Makefile 2010-03-31 09:01:14 UTC (rev 9482) @@ -1,5 +1,5 @@ GARNAME = audiofile -GARVERSION = 0.2.6 +GARVERSION = 0.2.7 CATEGORIES = lib DESCRIPTION = Silicon Graphics Audio File Library @@ -15,6 +15,9 @@ MASTER_SITES = http://www.68k.org/~michael/audiofile/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# Delivered from the Michael Pruett (upstream author) +PATCHFILES = 0001-Add-missing-headers-for-C99.patch + # 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/audiofile/trunk/checksums =================================================================== --- csw/mgar/pkg/audiofile/trunk/checksums 2010-03-31 07:53:04 UTC (rev 9481) +++ csw/mgar/pkg/audiofile/trunk/checksums 2010-03-31 09:01:14 UTC (rev 9482) @@ -1 +1,2 @@ -9c1049876cd51c0f1b12c2886cce4d42 download/audiofile-0.2.6.tar.gz +70963dd33ff7d1586491815669a38d36 0001-Add-missing-headers-for-C99.patch +a39be317a7b1971b408805dc5e371862 audiofile-0.2.7.tar.gz Added: csw/mgar/pkg/audiofile/trunk/files/0001-Add-missing-headers-for-C99.patch =================================================================== --- csw/mgar/pkg/audiofile/trunk/files/0001-Add-missing-headers-for-C99.patch (rev 0) +++ csw/mgar/pkg/audiofile/trunk/files/0001-Add-missing-headers-for-C99.patch 2010-03-31 09:01:14 UTC (rev 9482) @@ -0,0 +1,121 @@ +From 25c928419abb78f3836a52cb80db5bdd79dd6b52 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 31 Mar 2010 10:37:31 +0200 +Subject: [PATCH] Add missing headers for C99 + +--- + libaudiofile/Makefile.am | 3 +++ + libaudiofile/Makefile.in | 1 + + libaudiofile/modules/Makefile.am | 2 +- + libaudiofile/modules/Makefile.in | 2 +- + solaris9/stdbool.h | 9 +++++++++ + solaris9/stdint.h | 6 ++++++ + test/Makefile.am | 2 +- + test/Makefile.in | 2 +- + 8 files changed, 23 insertions(+), 4 deletions(-) + create mode 100644 solaris9/stdbool.h + create mode 100644 solaris9/stdint.h + +diff --git a/libaudiofile/Makefile.am b/libaudiofile/Makefile.am +index 9481114..22429b9 100644 +--- a/libaudiofile/Makefile.am ++++ b/libaudiofile/Makefile.am +@@ -1,5 +1,8 @@ + ## Process this file with automake to produce Makefile.in + ++ ++INCLUDES = -I$(srcdir)/../solaris9 ++ + SUBDIRS = modules + + lib_LTLIBRARIES = libaudiofile.la +diff --git a/libaudiofile/Makefile.in b/libaudiofile/Makefile.in +index 60ac924..9754369 100644 +--- a/libaudiofile/Makefile.in ++++ b/libaudiofile/Makefile.in +@@ -203,6 +203,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++INCLUDES = -I$(srcdir)/../solaris9 + SUBDIRS = modules + lib_LTLIBRARIES = libaudiofile.la + EXTRA_DIST = audiofile.exports +diff --git a/libaudiofile/modules/Makefile.am b/libaudiofile/modules/Makefile.am +index 02b8f91..8d853c2 100644 +--- a/libaudiofile/modules/Makefile.am ++++ b/libaudiofile/modules/Makefile.am +@@ -1,6 +1,6 @@ + noinst_LTLIBRARIES = libmodules.la + +-INCLUDES = -I$(srcdir)/.. ++INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../solaris9 + + libmodules_la_SOURCES = \ + g711.c g711.h \ +diff --git a/libaudiofile/modules/Makefile.in b/libaudiofile/modules/Makefile.in +index d9b4a21..1e0462e 100644 +--- a/libaudiofile/modules/Makefile.in ++++ b/libaudiofile/modules/Makefile.in +@@ -180,7 +180,7 @@ sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + noinst_LTLIBRARIES = libmodules.la +-INCLUDES = -I$(srcdir)/.. ++INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../solaris9 + libmodules_la_SOURCES = \ + g711.c g711.h \ + pcm.c pcm.h \ +diff --git a/solaris9/stdbool.h b/solaris9/stdbool.h +new file mode 100644 +index 0000000..ba8c753 +--- /dev/null ++++ b/solaris9/stdbool.h +@@ -0,0 +1,9 @@ ++#ifndef REPLACEMENT_STDBOOL_H ++#define REPLACEMENT_STDBOOL_H ++ ++typedef int bool; ++ ++#define true 1 ++#define false 0 ++ ++#endif +diff --git a/solaris9/stdint.h b/solaris9/stdint.h +new file mode 100644 +index 0000000..0dafabc +--- /dev/null ++++ b/solaris9/stdint.h +@@ -0,0 +1,6 @@ ++#ifndef REPLACEMENT_STDINT_H ++#define REPLACEMENT_STDINT_H ++ ++#include ++ ++#endif +diff --git a/test/Makefile.am b/test/Makefile.am +index f0b0dcb..7374653 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -1,4 +1,4 @@ +-INCLUDES = -I$(top_srcdir)/libaudiofile ++INCLUDES = -I$(top_srcdir)/libaudiofile -I$(top_srcdir)/solaris9 + + noinst_PROGRAMS = \ + error \ +diff --git a/test/Makefile.in b/test/Makefile.in +index 92e6ec2..bdd7e18 100644 +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -333,7 +333,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-INCLUDES = -I$(top_srcdir)/libaudiofile ++INCLUDES = -I$(top_srcdir)/libaudiofile -I$(top_srcdir)/solaris9 + EXTRA_DIST = transparency.sh misc.sh pipe.sh + TESTS = error writeaiff writeircam writenext writewave writeraw \ + writeavr writeiff writenist \ +-- +1.7.0 + Added: csw/mgar/pkg/audiofile/trunk/files/audiofile-0.2.7-solaris9.patch =================================================================== --- csw/mgar/pkg/audiofile/trunk/files/audiofile-0.2.7-solaris9.patch (rev 0) +++ csw/mgar/pkg/audiofile/trunk/files/audiofile-0.2.7-solaris9.patch 2010-03-31 09:01:14 UTC (rev 9482) @@ -0,0 +1,126 @@ +diff -rNc -x Makefile -x .deps -x 'config.*' -x autom4te.cache audiofile-0.2.7/libaudiofile/Makefile.am audiofile-0.2.7-solaris9/libaudiofile/Makefile.am +*** audiofile-0.2.7/libaudiofile/Makefile.am 2010-03-12 00:57:54.000000000 -0800 +--- audiofile-0.2.7-solaris9/libaudiofile/Makefile.am 2010-03-30 22:09:59.000000000 -0700 +*************** +*** 1,5 **** +--- 1,8 ---- + ## Process this file with automake to produce Makefile.in + ++ ++ INCLUDES = -I$(srcdir)/../solaris9 ++ + SUBDIRS = modules + + lib_LTLIBRARIES = libaudiofile.la +diff -rNc -x Makefile -x .deps -x 'config.*' -x autom4te.cache audiofile-0.2.7/libaudiofile/Makefile.in audiofile-0.2.7-solaris9/libaudiofile/Makefile.in +*** audiofile-0.2.7/libaudiofile/Makefile.in 2010-03-30 22:43:55.000000000 -0700 +--- audiofile-0.2.7-solaris9/libaudiofile/Makefile.in 2010-03-30 22:43:41.000000000 -0700 +*************** +*** 258,263 **** +--- 258,264 ---- + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ ++ INCLUDES = -I$(srcdir)/../solaris9 + SUBDIRS = modules + lib_LTLIBRARIES = libaudiofile.la + EXTRA_DIST = audiofile.exports +diff -rNc -x Makefile -x .deps -x 'config.*' -x autom4te.cache audiofile-0.2.7/libaudiofile/modules/Makefile.am audiofile-0.2.7-solaris9/libaudiofile/modules/Makefile.am +*** audiofile-0.2.7/libaudiofile/modules/Makefile.am 2010-03-12 00:57:54.000000000 -0800 +--- audiofile-0.2.7-solaris9/libaudiofile/modules/Makefile.am 2010-03-30 22:12:22.000000000 -0700 +*************** +*** 1,6 **** + noinst_LTLIBRARIES = libmodules.la + +! INCLUDES = -I$(srcdir)/.. + + libmodules_la_SOURCES = \ + g711.c g711.h \ +--- 1,6 ---- + noinst_LTLIBRARIES = libmodules.la + +! INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../solaris9 + + libmodules_la_SOURCES = \ + g711.c g711.h \ +diff -rNc -x Makefile -x .deps -x 'config.*' -x autom4te.cache audiofile-0.2.7/libaudiofile/modules/Makefile.in audiofile-0.2.7-solaris9/libaudiofile/modules/Makefile.in +*** audiofile-0.2.7/libaudiofile/modules/Makefile.in 2010-03-30 22:43:55.000000000 -0700 +--- audiofile-0.2.7-solaris9/libaudiofile/modules/Makefile.in 2010-03-30 22:43:41.000000000 -0700 +*************** +*** 188,194 **** + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + noinst_LTLIBRARIES = libmodules.la +! INCLUDES = -I$(srcdir)/.. + libmodules_la_SOURCES = \ + g711.c g711.h \ + pcm.c pcm.h \ +--- 188,194 ---- + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + noinst_LTLIBRARIES = libmodules.la +! INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../solaris9 + libmodules_la_SOURCES = \ + g711.c g711.h \ + pcm.c pcm.h \ +diff -rNc -x Makefile -x .deps -x 'config.*' -x autom4te.cache audiofile-0.2.7/solaris9/stdbool.h audiofile-0.2.7-solaris9/solaris9/stdbool.h +*** audiofile-0.2.7/solaris9/stdbool.h 1969-12-31 16:00:00.000000000 -0800 +--- audiofile-0.2.7-solaris9/solaris9/stdbool.h 2010-03-30 22:01:04.000000000 -0700 +*************** +*** 0 **** +--- 1,9 ---- ++ #ifndef REPLACEMENT_STDBOOL_H ++ #define REPLACEMENT_STDBOOL_H ++ ++ typedef int bool; ++ ++ #define true 1 ++ #define false 0 ++ ++ #endif +diff -rNc -x Makefile -x .deps -x 'config.*' -x autom4te.cache audiofile-0.2.7/solaris9/stdint.h audiofile-0.2.7-solaris9/solaris9/stdint.h +*** audiofile-0.2.7/solaris9/stdint.h 1969-12-31 16:00:00.000000000 -0800 +--- audiofile-0.2.7-solaris9/solaris9/stdint.h 2010-03-30 22:14:13.000000000 -0700 +*************** +*** 0 **** +--- 1,6 ---- ++ #ifndef REPLACEMENT_STDINT_H ++ #define REPLACEMENT_STDINT_H ++ ++ #include ++ ++ #endif +diff -rNc -x Makefile -x .deps -x 'config.*' -x autom4te.cache audiofile-0.2.7/test/Makefile.am audiofile-0.2.7-solaris9/test/Makefile.am +*** audiofile-0.2.7/test/Makefile.am 2010-03-18 23:48:34.000000000 -0700 +--- audiofile-0.2.7-solaris9/test/Makefile.am 2010-03-30 22:15:23.000000000 -0700 +*************** +*** 1,4 **** +! INCLUDES = -I$(top_srcdir)/libaudiofile + + noinst_PROGRAMS = \ + error \ +--- 1,4 ---- +! INCLUDES = -I$(top_srcdir)/libaudiofile -I$(top_srcdir)/solaris9 + + noinst_PROGRAMS = \ + error \ +diff -rNc -x Makefile -x .deps -x 'config.*' -x autom4te.cache audiofile-0.2.7/test/Makefile.in audiofile-0.2.7-solaris9/test/Makefile.in +*** audiofile-0.2.7/test/Makefile.in 2010-03-30 22:43:56.000000000 -0700 +--- audiofile-0.2.7-solaris9/test/Makefile.in 2010-03-30 22:43:41.000000000 -0700 +*************** +*** 351,357 **** + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +! INCLUDES = -I$(top_srcdir)/libaudiofile + EXTRA_DIST = transparency.sh misc.sh pipe.sh + LDADD = $(top_builddir)/libaudiofile/libaudiofile.la + DEPENDENCIES = $(top_builddir)/libaudiofile/libaudiofile.la +--- 351,357 ---- + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +! INCLUDES = -I$(top_srcdir)/libaudiofile -I$(top_srcdir)/solaris9 + EXTRA_DIST = transparency.sh misc.sh pipe.sh + LDADD = $(top_builddir)/libaudiofile/libaudiofile.la + DEPENDENCIES = $(top_builddir)/libaudiofile/libaudiofile.la 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 Mar 31 11:23:20 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 31 Mar 2010 09:23:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9483] csw/mgar/pkg/audiofile/trunk/Makefile Message-ID: Revision: 9483 http://gar.svn.sourceforge.net/gar/?rev=9483&view=rev Author: dmichelsen Date: 2010-03-31 09:23:20 +0000 (Wed, 31 Mar 2010) Log Message: ----------- audiofile: Add overrides Modified Paths: -------------- csw/mgar/pkg/audiofile/trunk/Makefile Modified: csw/mgar/pkg/audiofile/trunk/Makefile =================================================================== --- csw/mgar/pkg/audiofile/trunk/Makefile 2010-03-31 09:01:14 UTC (rev 9482) +++ csw/mgar/pkg/audiofile/trunk/Makefile 2010-03-31 09:23:20 UTC (rev 9483) @@ -27,4 +27,9 @@ TEST_TARGET = check +# amd64 on i386 +CHECKPKG_OVERRIDES_CSWaudiofile += soname-not-found|libm.so.2 +CHECKPKG_OVERRIDES_CSWaudiofile += soname-not-found|libm.so.2 +CHECKPKG_OVERRIDES_CSWaudiofile += soname-not-found|libm.so.2 + 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 Mar 31 13:49:15 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 31 Mar 2010 11:49:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9484] csw/mgar/pkg/libpcap/tags/libpcap-1.0.0, REV=2009.10. 01/ Message-ID: Revision: 9484 http://gar.svn.sourceforge.net/gar/?rev=9484&view=rev Author: dmichelsen Date: 2010-03-31 11:49:15 +0000 (Wed, 31 Mar 2010) Log Message: ----------- libpcap: Tag 1.0.0,REV=2009.10.01 Added Paths: ----------- csw/mgar/pkg/libpcap/tags/libpcap-1.0.0,REV=2009.10.01/ 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 Mar 31 14:11:47 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 31 Mar 2010 12:11:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9485] csw/mgar/pkg/libpcap/trunk Message-ID: Revision: 9485 http://gar.svn.sourceforge.net/gar/?rev=9485&view=rev Author: dmichelsen Date: 2010-03-31 12:11:47 +0000 (Wed, 31 Mar 2010) Log Message: ----------- libpcap: Update to 1.1 Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile csw/mgar/pkg/libpcap/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff csw/mgar/pkg/libpcap/trunk/files/shared-library.diff Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2010-03-31 11:49:15 UTC (rev 9484) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2010-03-31 12:11:47 UTC (rev 9485) @@ -1,5 +1,5 @@ GARNAME = libpcap -GARVERSION = 1.0.0 +GARVERSION = 1.1 CATEGORIES = lib DESCRIPTION = System-independent interface for user-level packet capture @@ -15,9 +15,9 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES = sf-bugtrack-2224954-fix-autoconf-header.diff -PATCHFILES += sf-bugtrack-2504874-create-dir-patch.diff -PATCHFILES += shared-library.diff +# PATCHFILES = sf-bugtrack-2224954-fix-autoconf-header.diff +# PATCHFILES += sf-bugtrack-2504874-create-dir-patch.diff +# PATCHFILES += shared-library.diff PACKAGES = CSWlibpcap CSWlibpcapdevel @@ -25,8 +25,10 @@ CATALOGNAME_CSWlibpcapdevel = libpcap_devel SPKG_DESC_CSWlibpcap = System-independent interface for user-level packet capture -SPKG_DESC_CSWlibpcapdevel = libpcap development files +SPKG_DESC_CSWlibpcapdevel = Development files for libpcap +RUNTIME_DEP_PKGS_CSWlibpcapdevel = CSWlibpcap + BUILD64 = 1 EXTRA_BUILD_ISAS_sparc = sparcv8plus @@ -55,10 +57,10 @@ PKGFILES_CSWlibpcapdevel = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibpcapdevel = CSWlibpcap +CHECKPKG_OVERRIDES_CSWlibpcapdevel += surplus-dependency|CSWlibpcap include gar/category.mk -post-install-modulated: - ln -s libpcap.so.1.0.0 $(DESTDIR)$(libdir)/libpcap.so - @$(MAKECOOKIE) +#post-install-modulated: +# ln -s libpcap.so.1.0.0 $(DESTDIR)$(libdir)/libpcap.so +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/libpcap/trunk/checksums =================================================================== --- csw/mgar/pkg/libpcap/trunk/checksums 2010-03-31 11:49:15 UTC (rev 9484) +++ csw/mgar/pkg/libpcap/trunk/checksums 2010-03-31 12:11:47 UTC (rev 9485) @@ -1,4 +1,2 @@ -9ad1358c5dec48456405eac197a46d3d download/libpcap-1.0.0.tar.gz -4b3aba885cc3a967721616419e1b17d1 download/sf-bugtrack-2224954-fix-autoconf-header.diff -10f021b867602038e71a48f5662467bc download/sf-bugtrack-2504874-create-dir-patch.diff -3115b52dbe16ed2b4174ed19fb63f2d6 download/shared-library.diff +534cd879be5bd19e4927441402df945d libpcap-1.1.tar.gz +3115b52dbe16ed2b4174ed19fb63f2d6 shared-library.diff Deleted: csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff 2010-03-31 11:49:15 UTC (rev 9484) +++ csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2224954-fix-autoconf-header.diff 2010-03-31 12:11:47 UTC (rev 9485) @@ -1,160 +0,0 @@ -diff -Naur libpcap-1.0.0.orig/configure libpcap-1.0.0.patched/configure ---- libpcap-1.0.0.orig/configure 2008-10-28 02:26:13.000000000 +0100 -+++ libpcap-1.0.0.patched/configure 2009-09-28 16:32:19.576622377 +0200 -@@ -6655,145 +6655,6 @@ - - done - -- for ac_header in --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --else -- # Is the header compilable? --{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_compiler=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -- --# Is the header present? --{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi -- --rm -f conftest.err conftest.$ac_ext --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- -- ;; --esac --{ echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- - { echo "$as_me:$LINENO: checking if if_packet.h has tpacket_stats defined" >&5 - echo $ECHO_N "checking if if_packet.h has tpacket_stats defined... $ECHO_C" >&6; } - if test "${ac_cv_lbl_tpacket_stats+set}" = set; then -diff -Naur libpcap-1.0.0.orig/configure.in libpcap-1.0.0.patched/configure.in ---- libpcap-1.0.0.orig/configure.in 2008-10-28 02:26:13.000000000 +0100 -+++ libpcap-1.0.0.patched/configure.in 2009-09-28 16:32:39.158704830 +0200 -@@ -358,7 +358,6 @@ - #include - #include - ]) -- AC_CHECK_HEADERS() - AC_LBL_TPACKET_STATS - AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI - ;; Deleted: csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff 2010-03-31 11:49:15 UTC (rev 9484) +++ csw/mgar/pkg/libpcap/trunk/files/sf-bugtrack-2504874-create-dir-patch.diff 2010-03-31 12:11:47 UTC (rev 9485) @@ -1,47 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 5c4d679..f2717d5 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -445,11 +445,17 @@ install: libpcap.a pcap-config - $(DESTDIR)$(includedir)/pcap-bpf.h - $(INSTALL_DATA) $(srcdir)/pcap-namedb.h \ - $(DESTDIR)$(includedir)/pcap-namedb.h -+ [ -d $(DESTDIR)$(bindir) ] || \ -+ (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir)) - $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config - for i in $(MAN1); do \ -+ [ -d $(DESTDIR)$(mandir)/man1 ] || \ -+ (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1); \ - $(INSTALL_DATA) $(srcdir)/$$i \ - $(DESTDIR)$(mandir)/man1/$$i; done - for i in $(MAN3PCAP); do \ -+ [ -d $(DESTDIR)$(mandir)/man3 ] || \ -+ (mkdir -p $(DESTDIR)$(mandir)/man3; chmod 755 $(DESTDIR)$(mandir)/man3); \ - $(INSTALL_DATA) $(srcdir)/$$i \ - $(DESTDIR)$(mandir)/man3/$$i; done - ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \ -@@ -471,16 +477,24 @@ install: libpcap.a pcap-config - ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \ - $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap - for i in $(MANFILE); do \ -+ [ -d $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@ ] || \ -+ (mkdir -p $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@); \ - $(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manfile.in/.manfile/'` \ - $(DESTDIR)$(mandir)/man at MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/. at MAN_FILE_FORMATS@/'`; done - for i in $(MANMISC); do \ -+ [ -d $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@ ] || \ -+ (mkdir -p $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@); \ - $(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manmisc.in/.manmisc/'` \ - $(DESTDIR)$(mandir)/man at MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/. at MAN_MISC_INFO@/'`; done - - install-shared: install-shared-$(DYEXT) - install-shared-so: libpcap.so -+ [ -d $(DESTDIR)$(libdir) ] || \ -+ (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) - $(INSTALL_PROGRAM) libpcap.so.`cat VERSION` $(DESTDIR)$(libdir)/libpcap.so.`cat VERSION` - install-shared-dylib: libpcap.dylib -+ [ -d $(DESTDIR)$(libdir) ] || \ -+ (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) - $(INSTALL_PROGRAM) libpcap.`cat VERSION`.dylib $(DESTDIR)$(libdir)/libpcap.`cat VERSION`.dylib - VER=`cat VERSION`; cd $(DESTDIR)$(libdir) && ln -sf libpcap.$$VER.dylib libpcap.A.dylib; ln -sf libpcap.A.dylib libpcap.dylib - Deleted: csw/mgar/pkg/libpcap/trunk/files/shared-library.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/shared-library.diff 2010-03-31 11:49:15 UTC (rev 9484) +++ csw/mgar/pkg/libpcap/trunk/files/shared-library.diff 2010-03-31 12:11:47 UTC (rev 9485) @@ -1,12 +0,0 @@ -diff -Naur libpcap-1.0.0.orig/Makefile.in libpcap-1.0.0.patched/Makefile.in ---- libpcap-1.0.0.orig/Makefile.in 2008-10-28 02:26:13.000000000 +0100 -+++ libpcap-1.0.0.patched/Makefile.in 2009-09-28 21:54:53.647596468 +0200 -@@ -326,7 +326,7 @@ - # - libpcap.so: $(OBJ) - @rm -f $@ -- $(CC) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS) -+ $(CC) -G -o $@.`cat $(srcdir)/VERSION` $(LDFLAGS) $(OBJ) $(DAGLIBS) - - # - # The following rule succeeds, but the result is untested. 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 Mar 31 14:22:43 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 31 Mar 2010 12:22:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9486] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 9486 http://gar.svn.sourceforge.net/gar/?rev=9486&view=rev Author: dmichelsen Date: 2010-03-31 12:22:43 +0000 (Wed, 31 Mar 2010) Log Message: ----------- mGAR v2: Make sure EXTRA_MERGE_INCLUDE_FILES is processed before exclusion Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-03-31 12:11:47 UTC (rev 9485) +++ csw/mgar/gar/v2/gar.mk 2010-03-31 12:22:43 UTC (rev 9486) @@ -627,7 +627,6 @@ else _MERGE_INCLUDE_FILES = $(MERGE_INCLUDE_FILES_$(MODULATION)) endif -_MERGE_INCLUDE_FILES += $(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION)) # This can be defined in category.mk MERGE_EXCLUDE_CATEGORY ?= $(_MERGE_EXCLUDE_CATEGORY) @@ -654,8 +653,10 @@ _MERGE_EXCLUDE_FILES += $(EXTRA_MERGE_EXCLUDE_FILES) $(EXTRA_MERGE_EXCLUDE_FILES_$(MODULATION)) $(MERGE_EXCLUDE_DEFAULT) # This variable contains parameter for pax to honor global file inclusion/exclusion +# Make sure include overrides are processed first +_INC_EXT_RULE = $(foreach F,$(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION)),-s ",^\(\.$F\)$$,\1,") # Exclude by replacing files with the empty string -_INC_EXT_RULE = $(foreach F,$(_MERGE_EXCLUDE_FILES),-s ',^\.$F$$,,') +_INC_EXT_RULE += $(foreach F,$(_MERGE_EXCLUDE_FILES),-s ',^\.$F$$,,') # Replace files by itself terminating on first match _INC_EXT_RULE += $(foreach F,$(_MERGE_INCLUDE_FILES),-s ",^\(\.$F\)$$,\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 Wed Mar 31 14:29:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 31 Mar 2010 12:29:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9487] csw/mgar/pkg/orbit2/trunk Message-ID: Revision: 9487 http://gar.svn.sourceforge.net/gar/?rev=9487&view=rev Author: dmichelsen Date: 2010-03-31 12:29:31 +0000 (Wed, 31 Mar 2010) Log Message: ----------- orbit2: Update to 2.14.18 Modified Paths: -------------- csw/mgar/pkg/orbit2/trunk/Makefile csw/mgar/pkg/orbit2/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff Modified: csw/mgar/pkg/orbit2/trunk/Makefile =================================================================== --- csw/mgar/pkg/orbit2/trunk/Makefile 2010-03-31 12:22:43 UTC (rev 9486) +++ csw/mgar/pkg/orbit2/trunk/Makefile 2010-03-31 12:29:31 UTC (rev 9487) @@ -1,5 +1,5 @@ GARNAME = ORBit2 -GARVERSION = 2.14.17 +GARVERSION = 2.14.18 CATEGORIES = lib DESCRIPTION = ORBit 2.x CORBA tools and libs @@ -18,13 +18,6 @@ SPKG_SOURCEURL = http://projects.gnome.org/ORBit2/ -# Patch from -# https://bugzilla.gnome.org/show_bug.cgi?id=563046 -# This also solves -# https://bugzilla.gnome.org/show_bug.cgi?id=558796 -PATCHFILES = patch-test-foo.diff -PATCHDIRLEVEL = 0 - CONFIGURE_ARGS = $(DIRPATHS) STRIP_LIBTOOL = 1 @@ -38,8 +31,7 @@ EXTRA_MERGE_INCLUDE_FILES = $(libdir)/libname-server-2.a CPP = /usr/lib/cpp -EXTRA_COMMON_EXPORTS += CPP CXXCPP = /usr/lib/cpp -EXTRA_COMMON_EXPORTS += CXXCPP +EXTRA_COMMON_EXPORTS = CPP CXXCPP include gar/category.mk Modified: csw/mgar/pkg/orbit2/trunk/checksums =================================================================== --- csw/mgar/pkg/orbit2/trunk/checksums 2010-03-31 12:22:43 UTC (rev 9486) +++ csw/mgar/pkg/orbit2/trunk/checksums 2010-03-31 12:29:31 UTC (rev 9487) @@ -1,2 +1 @@ -10bfb957fa4a8935a0b4afaee7d71df7 download/ORBit2-2.14.17.tar.bz2 -f0854ac5f081775fc2b7c8afbf769843 download/patch-test-foo.diff +3e80596171b1ea652707219c7144ff53 ORBit2-2.14.18.tar.bz2 Deleted: csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff =================================================================== --- csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff 2010-03-31 12:22:43 UTC (rev 9486) +++ csw/mgar/pkg/orbit2/trunk/files/patch-test-foo.diff 2010-03-31 12:29:31 UTC (rev 9487) @@ -1,46 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2009/03/06 14:02:32 wiz Exp $ - ---- src/idl-compiler/orbit-idl-c-headers.c.orig 2008-08-31 14:04:43.000000000 +0000 -+++ src/idl-compiler/orbit-idl-c-headers.c -@@ -574,21 +574,29 @@ static void - ch_output_codefrag(IDL_tree tree, OIDL_Run_Info *rinfo, OIDL_C_Info *ci) - { - GSList *list; -+ char *ctmp; - - for(list = IDL_CODEFRAG(tree).lines; list; - list = g_slist_next(list)) { -- if(!strncmp(list->data, -- "#pragma include_defs", -- sizeof("#pragma include_defs")-1)) { -- char *ctmp, *cte; -- ctmp = ((char *)list->data) + sizeof("#pragma include_defs"); -- while(*ctmp && (isspace((int)*ctmp) || *ctmp == '"')) ctmp++; -- cte = ctmp; -- while(*cte && !isspace((int)*cte) && *cte != '"') cte++; -- *cte = '\0'; -- fprintf(ci->fh, "#include <%s>\n", ctmp); -- } else -- fprintf(ci->fh, "%s\n", (char *)list->data); -+ ctmp = list->data; -+ if(!strncmp(ctmp, "#pragma", sizeof("#pragma")-1)) { -+ ctmp += sizeof("#pragma")-1; -+ if (*ctmp && (isspace((int)*ctmp))) { -+ while(*ctmp && (isspace((int)*ctmp))) ctmp++; -+ if(!strncmp(ctmp, "include_defs", sizeof("include_defs")-1)) { -+ char *cte; -+ -+ ctmp += sizeof("include_defs")-1; -+ while(*ctmp && (isspace((int)*ctmp) || *ctmp == '"')) ctmp++; -+ cte = ctmp; -+ while(*cte && !isspace((int)*cte) && *cte != '"') cte++; -+ *cte = '\0'; -+ fprintf(ci->fh, "#include <%s>\n", ctmp); -+ continue; -+ } -+ } -+ } -+ fprintf(ci->fh, "%s\n", (char *)list->data); - } - } - 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 Mar 31 15:08:49 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 31 Mar 2010 13:08:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9488] csw/mgar/pkg/tcpdump/trunk Message-ID: Revision: 9488 http://gar.svn.sourceforge.net/gar/?rev=9488&view=rev Author: dmichelsen Date: 2010-03-31 13:08:48 +0000 (Wed, 31 Mar 2010) Log Message: ----------- tcpdump: Update to 4.1, fix support for SSL and libsmi Modified Paths: -------------- csw/mgar/pkg/tcpdump/trunk/Makefile csw/mgar/pkg/tcpdump/trunk/checksums Modified: csw/mgar/pkg/tcpdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpdump/trunk/Makefile 2010-03-31 12:29:31 UTC (rev 9487) +++ csw/mgar/pkg/tcpdump/trunk/Makefile 2010-03-31 13:08:48 UTC (rev 9488) @@ -1,8 +1,8 @@ GARNAME = tcpdump -GARVERSION = 4.0.0 +GARVERSION = 4.1 CATEGORIES = utils -DESCRIPTION = tcpdump allows you to dump the traffic on a network +DESCRIPTION = Dump network traffic define BLURB endef @@ -11,8 +11,8 @@ LICENSE = LICENSE -BUILD_DEP_PKGS = CSWlibpcap CSWosslrt CSWossldevel -RUNTIME_DEP_PKGS = CSWlibpcap CSWosslrt +BUILD_DEP_PKGS = CSWlibpcap CSWosslrt CSWossldevel CSWlibsmi +RUNTIME_DEP_PKGS = CSWlibpcap CSWosslrt CSWlibsmi # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -24,7 +24,10 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-ipv6 +CONFIGURE_ARGS += --with-crypto=$(prefix) +CONFIGURE_ARGS += --with-smi +# There is a versioned tcpdump, which is not a hardlink. No need for that. EXTRA_MERGE_EXCLUDE_FILES = $(sbindir)/tcpdump\..* include gar/category.mk Modified: csw/mgar/pkg/tcpdump/trunk/checksums =================================================================== --- csw/mgar/pkg/tcpdump/trunk/checksums 2010-03-31 12:29:31 UTC (rev 9487) +++ csw/mgar/pkg/tcpdump/trunk/checksums 2010-03-31 13:08:48 UTC (rev 9488) @@ -1 +1 @@ -b22ca72890df2301d922c9f2d17867f9 download/tcpdump-4.0.0.tar.gz +949d4661a7501cfedf7b1eb858302c9c tcpdump-4.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 Mar 31 15:11:23 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 31 Mar 2010 13:11:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9489] csw/mgar/pkg/orbit2/trunk/Makefile Message-ID: Revision: 9489 http://gar.svn.sourceforge.net/gar/?rev=9489&view=rev Author: dmichelsen Date: 2010-03-31 13:11:23 +0000 (Wed, 31 Mar 2010) Log Message: ----------- orbit2: Skip test per default Modified Paths: -------------- csw/mgar/pkg/orbit2/trunk/Makefile Modified: csw/mgar/pkg/orbit2/trunk/Makefile =================================================================== --- csw/mgar/pkg/orbit2/trunk/Makefile 2010-03-31 13:08:48 UTC (rev 9488) +++ csw/mgar/pkg/orbit2/trunk/Makefile 2010-03-31 13:11:23 UTC (rev 9489) @@ -26,6 +26,8 @@ BUILD64 = 1 NOISAEXEC = 1 +# The test involves one manual step, skip for automatic building +SKIPTEST ?= 1 TEST_TARGET = check EXTRA_MERGE_INCLUDE_FILES = $(libdir)/libname-server-2.a 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 Mar 31 15:25:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 31 Mar 2010 13:25:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9490] csw/mgar/pkg/orbit2/trunk/Makefile Message-ID: Revision: 9490 http://gar.svn.sourceforge.net/gar/?rev=9490&view=rev Author: dmichelsen Date: 2010-03-31 13:25:36 +0000 (Wed, 31 Mar 2010) Log Message: ----------- orbit2: Add override, reorder Modified Paths: -------------- csw/mgar/pkg/orbit2/trunk/Makefile Modified: csw/mgar/pkg/orbit2/trunk/Makefile =================================================================== --- csw/mgar/pkg/orbit2/trunk/Makefile 2010-03-31 13:11:23 UTC (rev 9489) +++ csw/mgar/pkg/orbit2/trunk/Makefile 2010-03-31 13:25:36 UTC (rev 9490) @@ -11,6 +11,8 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PACKAGES = CSWorbit2 CATALOGNAME = orbit2 @@ -18,11 +20,13 @@ SPKG_SOURCEURL = http://projects.gnome.org/ORBit2/ +CPP = /usr/lib/cpp +CXXCPP = /usr/lib/cpp +EXTRA_COMMON_EXPORTS = CPP CXXCPP + CONFIGURE_ARGS = $(DIRPATHS) STRIP_LIBTOOL = 1 -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 - BUILD64 = 1 NOISAEXEC = 1 @@ -32,8 +36,6 @@ EXTRA_MERGE_INCLUDE_FILES = $(libdir)/libname-server-2.a -CPP = /usr/lib/cpp -CXXCPP = /usr/lib/cpp -EXTRA_COMMON_EXPORTS = CPP CXXCPP +CHECKPKG_OVERRIDES_CSWorbit2 += soname-not-found|libm.so.2 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Mar 31 19:36:16 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 31 Mar 2010 17:36:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9491] csw/mgar/pkg/cpan/Net-Pcap/trunk Message-ID: Revision: 9491 http://gar.svn.sourceforge.net/gar/?rev=9491&view=rev Author: bensons Date: 2010-03-31 17:36:16 +0000 (Wed, 31 Mar 2010) Log Message: ----------- cpan Net-Pcap: add LICENSE Modified Paths: -------------- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cpan/Net-Pcap/trunk/files/LICENSE Modified: csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-03-31 13:25:36 UTC (rev 9490) +++ csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-03-31 17:36:16 UTC (rev 9491) @@ -12,10 +12,11 @@ PACKAGES = CSWpmnetpcap CATALOGNAME = pm_netpcap +# add a proper license + LICENSE = $(FILEDIR)/LICENSE + # depends RUNTIME_DEP_PKGS = CSWlibpcap BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWlibpcapdevel -LICENSE = README - include gar/category.mk Added: csw/mgar/pkg/cpan/Net-Pcap/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/cpan/Net-Pcap/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/cpan/Net-Pcap/trunk/files/LICENSE 2010-03-31 17:36:16 UTC (rev 9491) @@ -0,0 +1,10 @@ +COPYRIGHT AND LICENCE + + Copyright (C) 2005 Sbastien Aperghis-Tramoni. All rights reserved. + Copyright (c) 2003 Marco Carnut. All rights reserved. + Copyright (c) 1999-2000 Tim Potter. All rights reserved. + Copyright (c) 1998 Bo Adler. All rights reserved. + Copyright (c) 1997 Peter Lister. 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 bensons at users.sourceforge.net Wed Mar 31 19:46:44 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 31 Mar 2010 17:46:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9492] csw/mgar/pkg/cpan/NetPacket/trunk Message-ID: Revision: 9492 http://gar.svn.sourceforge.net/gar/?rev=9492&view=rev Author: bensons Date: 2010-03-31 17:46:43 +0000 (Wed, 31 Mar 2010) Log Message: ----------- cpan NetPacket: add proper LICENSE Modified Paths: -------------- csw/mgar/pkg/cpan/NetPacket/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cpan/NetPacket/trunk/files/LICENSE Modified: csw/mgar/pkg/cpan/NetPacket/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/NetPacket/trunk/Makefile 2010-03-31 17:36:16 UTC (rev 9491) +++ csw/mgar/pkg/cpan/NetPacket/trunk/Makefile 2010-03-31 17:46:43 UTC (rev 9492) @@ -14,8 +14,8 @@ PACKAGES = CSWpmnetpacket CATALOGNAME = pm_netpacket -CHECKPKG_OVERRIDES = license-missing - ARCHALL = 1 +LICENSE = $(FILEDIR)/LICENSE + include gar/category.mk Added: csw/mgar/pkg/cpan/NetPacket/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/cpan/NetPacket/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/cpan/NetPacket/trunk/files/LICENSE 2010-03-31 17:46:43 UTC (rev 9492) @@ -0,0 +1,10 @@ +COPYRIGHT AND LICENCE + + Copyright (C) 2005 Sbastien Aperghis-Tramoni. All rights reserved. + Copyright (c) 2003 Marco Carnut. All rights reserved. + Copyright (c) 1999-2000 Tim Potter. All rights reserved. + Copyright (c) 1998 Bo Adler. All rights reserved. + Copyright (c) 1997 Peter Lister. 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 bensons at users.sourceforge.net Wed Mar 31 19:49:35 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 31 Mar 2010 17:49:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[9493] csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile Message-ID: Revision: 9493 http://gar.svn.sourceforge.net/gar/?rev=9493&view=rev Author: bensons Date: 2010-03-31 17:49:35 +0000 (Wed, 31 Mar 2010) Log Message: ----------- cpan Test-Exception: add proper LICENSE Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile Modified: csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile 2010-03-31 17:46:43 UTC (rev 9492) +++ csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile 2010-03-31 17:49:35 UTC (rev 9493) @@ -13,14 +13,8 @@ PACKAGES = CSWpmtstexception CATALOGNAME = pm_tstexception -# depends -RUNTIME_DEP_PKGS = CSWpmsubuplevel -BUILD_DEP_PKGS = CSWpmsubuplevel - ARCHALL = 1 -CHECKPKG_OVERRIDES_CSWpmtstexception += license-missing -# what is this? -CHECKPKG_OVERRIDES_CSWpmtstexception += surplus-dependency|CSWpmsubuplevel +LICENSE = $(FILEDIR)/LICENSE include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Mar 31 19:51:11 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 31 Mar 2010 17:51:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9494] csw/mgar/pkg/cpan/Test-Exception/trunk/files/LICENSE Message-ID: Revision: 9494 http://gar.svn.sourceforge.net/gar/?rev=9494&view=rev Author: bensons Date: 2010-03-31 17:51:10 +0000 (Wed, 31 Mar 2010) Log Message: ----------- cpan Test-Exception: LICENSE file was missing.. Added Paths: ----------- csw/mgar/pkg/cpan/Test-Exception/trunk/files/LICENSE Added: csw/mgar/pkg/cpan/Test-Exception/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/cpan/Test-Exception/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/cpan/Test-Exception/trunk/files/LICENSE 2010-03-31 17:51:10 UTC (rev 9494) @@ -0,0 +1,10 @@ +COPYRIGHT AND LICENCE + + Copyright (C) 2005 Sbastien Aperghis-Tramoni. All rights reserved. + Copyright (c) 2003 Marco Carnut. All rights reserved. + Copyright (c) 1999-2000 Tim Potter. All rights reserved. + Copyright (c) 1998 Bo Adler. All rights reserved. + Copyright (c) 1997 Peter Lister. 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 bensons at users.sourceforge.net Wed Mar 31 19:55:20 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 31 Mar 2010 17:55:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9495] csw/mgar/pkg/cpan/UNIVERSAL-can/trunk Message-ID: Revision: 9495 http://gar.svn.sourceforge.net/gar/?rev=9495&view=rev Author: bensons Date: 2010-03-31 17:55:20 +0000 (Wed, 31 Mar 2010) Log Message: ----------- cpan UNIVERSAL-can: added proper LICENSE Modified Paths: -------------- csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/files/LICENSE Modified: csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile 2010-03-31 17:51:10 UTC (rev 9494) +++ csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile 2010-03-31 17:55:20 UTC (rev 9495) @@ -17,15 +17,13 @@ PACKAGES = CSWpmuniversalcan CATALOGNAME = pm_universalcan -RUNTIME_DEP_PKGS = CSWpmmodulebuild - CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL BUILD_SCRIPTS = $(WORKSRC)/Build TEST_SCRIPTS = $(WORKSRC)/Build INSTALL_SCRIPTS = $(WORKSRC)/Build -ARCHALL_CSWpmuniversalcan += 1 -CHECKPKG_OVERRIDES_CSWpmuniversalcan += license-missing -CHECKPKG_OVERRIDES_CSWpmuniversalcan += surplus-dependency|CSWpmmodulebuild +LICENSE = $(FILEDIR)/LICENSE +ARCHALL = 1 + include gar/category.mk Added: csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/files/LICENSE 2010-03-31 17:55:20 UTC (rev 9495) @@ -0,0 +1,3 @@ +COPYRIGHT AND LICENCE + + Artistic License 2.0, Copyright (c) chromatic 2005 - 2010. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Mar 31 19:57:07 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 31 Mar 2010 17:57:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[9496] csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk Message-ID: Revision: 9496 http://gar.svn.sourceforge.net/gar/?rev=9496&view=rev Author: bensons Date: 2010-03-31 17:57:07 +0000 (Wed, 31 Mar 2010) Log Message: ----------- cpan UNIVERSAL-isa: added proper LICENSE Modified Paths: -------------- csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/files/LICENSE Modified: csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile 2010-03-31 17:55:20 UTC (rev 9495) +++ csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile 2010-03-31 17:57:07 UTC (rev 9496) @@ -26,6 +26,7 @@ INSTALL_SCRIPTS = $(WORKSRC)/Build ARCHALL = 1 -CHECKPKG_OVERRIDES = license-missing +LICENSE = $(FILEDIR)/LICENSE + include gar/category.mk Added: csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/files/LICENSE 2010-03-31 17:57:07 UTC (rev 9496) @@ -0,0 +1,3 @@ +COPYRIGHT AND LICENCE + + Artistic License 2.0, Copyright (c) chromatic 2005 - 2010. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Mar 31 19:58:36 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 31 Mar 2010 17:58:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9497] csw/mgar/pkg/cpan/Test-Exception/trunk/files/LICENSE Message-ID: Revision: 9497 http://gar.svn.sourceforge.net/gar/?rev=9497&view=rev Author: bensons Date: 2010-03-31 17:58:36 +0000 (Wed, 31 Mar 2010) Log Message: ----------- cpan Test-Exception: adjust lic Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Exception/trunk/files/LICENSE Modified: csw/mgar/pkg/cpan/Test-Exception/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/cpan/Test-Exception/trunk/files/LICENSE 2010-03-31 17:57:07 UTC (rev 9496) +++ csw/mgar/pkg/cpan/Test-Exception/trunk/files/LICENSE 2010-03-31 17:58:36 UTC (rev 9497) @@ -1,10 +1,5 @@ -COPYRIGHT AND LICENCE +LICENCE + Copyright 2002-2007 Adrian Howard, All Rights Reserved. - Copyright (C) 2005 Sbastien Aperghis-Tramoni. All rights reserved. - Copyright (c) 2003 Marco Carnut. All rights reserved. - Copyright (c) 1999-2000 Tim Potter. All rights reserved. - Copyright (c) 1998 Bo Adler. All rights reserved. - Copyright (c) 1997 Peter Lister. All rights reserved. - - This library is free software; you can redistribute it and/or modify - it under the same terms as Perl itself. + 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 bensons at users.sourceforge.net Wed Mar 31 20:15:15 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 31 Mar 2010 18:15:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9498] csw/mgar/pkg/cpan/Test-MockObject/trunk Message-ID: Revision: 9498 http://gar.svn.sourceforge.net/gar/?rev=9498&view=rev Author: bensons Date: 2010-03-31 18:15:14 +0000 (Wed, 31 Mar 2010) Log Message: ----------- cpan Test-MockObject: add proper LICENSE and dependency Modified Paths: -------------- csw/mgar/pkg/cpan/Test-MockObject/trunk/Makefile csw/mgar/pkg/cpan/Test-MockObject/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Test-MockObject/trunk/files/LICENSE Removed Paths: ------------- csw/mgar/pkg/cpan/Test-MockObject/trunk/files/CSWpmtstmockobject.gspec Modified: csw/mgar/pkg/cpan/Test-MockObject/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-MockObject/trunk/Makefile 2010-03-31 17:58:36 UTC (rev 9497) +++ csw/mgar/pkg/cpan/Test-MockObject/trunk/Makefile 2010-03-31 18:15:14 UTC (rev 9498) @@ -1,5 +1,5 @@ GARNAME = Test-MockObject -GARVERSION = 1.07 +GARVERSION = 1.09 CATEGORIES = cpan AUTHOR = CHROMATIC @@ -11,6 +11,17 @@ supposed to be testing anyway. endef -DISTFILES += CSWpmtstmockobject.gspec +PACKAGES = CSWpmtstmockobject +CATALOGNAME = pm_tstmockobject +DEP_PKGS = CSWpmtstexception CSWpmuniversalisa CSWpmuniversalcan + +ARCHALL = 1 + +LICENSE = $(FILEDIR)/LICENSE + +CHECKPKG_OVERRIDES_CSWpmtstmockobject += surplus-dependency|CSWpmtstexception +CHECKPKG_OVERRIDES_CSWpmtstmockobject += surplus-dependency|CSWpmuniversalisa +CHECKPKG_OVERRIDES_CSWpmtstmockobject += surplus-dependency|CSWpmuniversalcan + include gar/category.mk Modified: csw/mgar/pkg/cpan/Test-MockObject/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-MockObject/trunk/checksums 2010-03-31 17:58:36 UTC (rev 9497) +++ csw/mgar/pkg/cpan/Test-MockObject/trunk/checksums 2010-03-31 18:15:14 UTC (rev 9498) @@ -1,2 +1 @@ -117708d9548c8d3fc67e5e89eea1a077 download/CSWpmtstmockobject.gspec -197af22ac675405199693ed68f0959e1 download/Test-MockObject-1.07.tar.gz +3c9c2842d40fa8c389563c227804d7d8 Test-MockObject-1.09.tar.gz Deleted: csw/mgar/pkg/cpan/Test-MockObject/trunk/files/CSWpmtstmockobject.gspec =================================================================== --- csw/mgar/pkg/cpan/Test-MockObject/trunk/files/CSWpmtstmockobject.gspec 2010-03-31 17:58:36 UTC (rev 9497) +++ csw/mgar/pkg/cpan/Test-MockObject/trunk/files/CSWpmtstmockobject.gspec 2010-03-31 18:15:14 UTC (rev 9498) @@ -1,8 +0,0 @@ -%var bitname pm_tstmockobject -%var pkgname CSWpmtstmockobject -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2002 - 2004 chromatic. All rights reserved. This program is free -software; you can redistribute it and/or modify it under the same terms as Perl -itself. Added: csw/mgar/pkg/cpan/Test-MockObject/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/cpan/Test-MockObject/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/cpan/Test-MockObject/trunk/files/LICENSE 2010-03-31 18:15:14 UTC (rev 9498) @@ -0,0 +1,5 @@ +COPYRIGHT AND LICENCE + +Copyright (c) 2002 - 2008 chromatic. All rights reserved. This program is free +software; you can redistribute it and/or modify it under the same terms as Perl +5.10.x itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Mar 31 20:30:15 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 31 Mar 2010 18:30:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9499] csw/mgar/pkg/cpan/Net-Analysis/trunk Message-ID: Revision: 9499 http://gar.svn.sourceforge.net/gar/?rev=9499&view=rev Author: bensons Date: 2010-03-31 18:30:14 +0000 (Wed, 31 Mar 2010) Log Message: ----------- cpan Net-Analysis: finished GAR recipe Modified Paths: -------------- csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cpan/Net-Analysis/trunk/files/LICENSE Modified: csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile 2010-03-31 18:15:14 UTC (rev 9498) +++ csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile 2010-03-31 18:30:14 UTC (rev 9499) @@ -14,6 +14,14 @@ CATALOGNAME = pm_netanalysis # depends -BUILD_DEP_PKGS = CSWpmnetpcap CSWpmnetpacket CSWpmtstmockobject +DEP_PKGS = CSWpmnetpcap CSWpmnetpacket CSWpmtstmockobject +LICENSE = $(FILEDIR)/LICENSE + +ARCHALL = 1 + +CHECKPKG_OVERRIDES_CSWpmnetanalysis += surplus-dependency|CSWpmtstmockobject +CHECKPKG_OVERRIDES_CSWpmnetanalysis += surplus-dependency|CSWpmnetpcap +CHECKPKG_OVERRIDES_CSWpmnetanalysis += surplus-dependency|CSWpmnetpacket + include gar/category.mk Added: csw/mgar/pkg/cpan/Net-Analysis/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/cpan/Net-Analysis/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/cpan/Net-Analysis/trunk/files/LICENSE 2010-03-31 18:30:14 UTC (rev 9499) @@ -0,0 +1,7 @@ +COPYRIGHT AND LICENCE + +Copyright (C) 2004 by A. B. Worrall. + +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.5 or, +at your option, any later version of Perl 5 you may have available. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.