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 betwee