From bdwalton at users.sourceforge.net Sun Aug 1 02:52:43 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 01 Aug 2010 00:52:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[10679] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 10679 http://gar.svn.sourceforge.net/gar/?rev=10679&view=rev Author: bdwalton Date: 2010-08-01 00:52:43 +0000 (Sun, 01 Aug 2010) Log Message: ----------- git: version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-07-30 14:17:00 UTC (rev 10678) +++ csw/mgar/pkg/git/trunk/Makefile 2010-08-01 00:52:43 UTC (rev 10679) @@ -1,5 +1,5 @@ GARNAME = git -GARVERSION = 1.7.2 +GARVERSION = 1.7.2.1 #PATCHLEVEL = rc1 CATEGORIES = devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Aug 2 13:33:01 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Aug 2010 11:33:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[10680] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 10680 http://gar.svn.sourceforge.net/gar/?rev=10680&view=rev Author: dmichelsen Date: 2010-08-02 11:33:01 +0000 (Mon, 02 Aug 2010) Log Message: ----------- mGAR v2: Fix minor issue with gmake 3.82, may investigate later Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-08-01 00:52:43 UTC (rev 10679) +++ csw/mgar/gar/v2/gar.mk 2010-08-02 11:33:01 UTC (rev 10680) @@ -237,12 +237,18 @@ #################### DIRECTORY MAKERS #################### # This is to make dirs as needed by the base rules -$(sort $(DOWNLOADDIR) $(PARTIALDIR) $(COOKIEDIR) $(WORKSRC) $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(PKGROOT) $(INSTALL_DIRS) $(INSTALLISADIR) $(GARCHIVEDIR) $(GARPKGDIR) $(STAGINGDIR)) $(COOKIEDIR)/%: +$(sort $(DOWNLOADDIR) $(PARTIALDIR) $(COOKIEDIR) $(WORKSRC) $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(PKGROOT) $(INSTALL_DIRS) $(INSTALLISADIR) $(GARCHIVEDIR) $(GARPKGDIR) $(STAGINGDIR)): @if test -d $@; then : ; else \ ginstall -d $@; \ echo "ginstall -d $@"; \ fi +$(COOKIEDIR)/%: + @if test -d $@; then : ; else \ + ginstall -d $@; \ + echo "ginstall -d $@"; \ + fi + # These stubs are wildcarded, so that the port maintainer can # define something like "pre-configure" and it won't conflict, # while the configure target can call "pre-configure" safely even This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Aug 2 15:29:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Aug 2010 13:29:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[10681] csw/mgar/pkg/mpeg4ip/trunk Message-ID: Revision: 10681 http://gar.svn.sourceforge.net/gar/?rev=10681&view=rev Author: dmichelsen Date: 2010-08-02 13:29:46 +0000 (Mon, 02 Aug 2010) Log Message: ----------- mpeg4ip: Add some more patches Modified Paths: -------------- csw/mgar/pkg/mpeg4ip/trunk/Makefile csw/mgar/pkg/mpeg4ip/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mpeg4ip/trunk/files/0002-Move-external-function-definition-out-of-function.patch csw/mgar/pkg/mpeg4ip/trunk/files/0003-Change-type-from-Void-to-void.patch csw/mgar/pkg/mpeg4ip/trunk/files/0004-Add-one-more-scratch-channel-or-compilation-fails.patch Modified: csw/mgar/pkg/mpeg4ip/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-08-02 11:33:01 UTC (rev 10680) +++ csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-08-02 13:29:46 UTC (rev 10681) @@ -23,6 +23,10 @@ # PATCHFILES += 0001-Bootstrap-again.patch +PATCHFILES = 0002-Move-external-function-definition-out-of-function.patch +PATCHFILES += 0003-Change-type-from-Void-to-void.patch +PATCHFILES += 0004-Add-one-more-scratch-channel-or-compilation-fails.patch + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/mpeg4ip/trunk/checksums =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-08-02 11:33:01 UTC (rev 10680) +++ csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-08-02 13:29:46 UTC (rev 10681) @@ -1,3 +1,4 @@ -a4a8aebe0781d30df528d53fea11fdcf SDL_sunaudio.c.diff -0ae174e13da77a783e636aa2904b7c90 mpeg4ip-1.6.1-mjj.patch +9b430ffe944b42f73dce89c0d9b03b07 0002-Move-external-function-definition-out-of-function.patch +d05631e273402d4b1f7a99bb96099cf8 0003-Change-type-from-Void-to-void.patch +9379c5f5331a18f163f64ff32f6feffd 0004-Add-one-more-scratch-channel-or-compilation-fails.patch cd81b566cf2fafc7318f58be8998182c mpeg4ip-1.6.1.tar.gz Added: csw/mgar/pkg/mpeg4ip/trunk/files/0002-Move-external-function-definition-out-of-function.patch =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/files/0002-Move-external-function-definition-out-of-function.patch (rev 0) +++ csw/mgar/pkg/mpeg4ip/trunk/files/0002-Move-external-function-definition-out-of-function.patch 2010-08-02 13:29:46 UTC (rev 10681) @@ -0,0 +1,27 @@ +From cc938eabcd2d71d827d01250f843b11becd8e385 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 2 Aug 2010 15:25:06 +0200 +Subject: [PATCH 2/4] Move external function definition out of function + +--- + lib/SDLAudio/src/audio/sun/SDL_sunaudio.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c b/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c +index 670aeb2..5a321d5 100644 +--- a/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c ++++ b/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c +@@ -163,9 +163,9 @@ void DSP_WaitAudio(_THIS) + #endif + } + ++static Uint8 snd2au(int sample); + void DSP_PlayAudio(_THIS) + { +- static Uint8 snd2au(int sample); + /* Write the audio data */ + if ( ulaw_only ) { + /* Assuming that this->spec.freq >= 8000 Hz */ +-- +1.7.1 + Added: csw/mgar/pkg/mpeg4ip/trunk/files/0003-Change-type-from-Void-to-void.patch =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/files/0003-Change-type-from-Void-to-void.patch (rev 0) +++ csw/mgar/pkg/mpeg4ip/trunk/files/0003-Change-type-from-Void-to-void.patch 2010-08-02 13:29:46 UTC (rev 10681) @@ -0,0 +1,25 @@ +From d2a7cdb5c15f21c7a6d8bf3f8ea18255579afe56 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 2 Aug 2010 15:26:10 +0200 +Subject: [PATCH 3/4] Change type from Void to void + +--- + common/video/iso-mpeg4/src/type_basic.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/common/video/iso-mpeg4/src/type_basic.cpp b/common/video/iso-mpeg4/src/type_basic.cpp +index 8739ad6..7ef1575 100644 +--- a/common/video/iso-mpeg4/src/type_basic.cpp ++++ b/common/video/iso-mpeg4/src/type_basic.cpp +@@ -317,7 +317,7 @@ Void CMotionVector::computeMV () + iHalfY = m_vctTrueHalfPel.y - iMVY * 2; + } + +-Void CMotionVector::setToZero (Void) ++Void CMotionVector::setToZero (void) + { + memset (this, 0, sizeof (*this)); + } +-- +1.7.1 + Added: csw/mgar/pkg/mpeg4ip/trunk/files/0004-Add-one-more-scratch-channel-or-compilation-fails.patch =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/files/0004-Add-one-more-scratch-channel-or-compilation-fails.patch (rev 0) +++ csw/mgar/pkg/mpeg4ip/trunk/files/0004-Add-one-more-scratch-channel-or-compilation-fails.patch 2010-08-02 13:29:46 UTC (rev 10681) @@ -0,0 +1,25 @@ +From 71226a11a4f50d7f8466e9cf4b12c81fbd914e01 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 2 Aug 2010 15:27:04 +0200 +Subject: [PATCH 4/4] Add one more scratch channel or compilation fails + +--- + player/lib/audio/faad/all.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/player/lib/audio/faad/all.h b/player/lib/audio/faad/all.h +index 95e3379..eed2896 100644 +--- a/player/lib/audio/faad/all.h ++++ b/player/lib/audio/faad/all.h +@@ -67,7 +67,7 @@ enum + BChans = 1, /* back channels: left surround, right surround */ + BCenter = 0, /* 1 if decoder has back center channel */ + LChans = 1, /* LFE channels */ +- XChans = 1, /* scratch space for parsing unused channels */ ++ XChans = 2, /* scratch space for parsing unused channels */ + #endif + + Chans = FChans + SChans + BChans + LChans + XChans +-- +1.7.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 Mon Aug 2 21:56:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Aug 2010 19:56:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[10682] csw/mgar/pkg/autoconf/tags/autoconf-2.66, REV=2010. 07.26/ Message-ID: Revision: 10682 http://gar.svn.sourceforge.net/gar/?rev=10682&view=rev Author: dmichelsen Date: 2010-08-02 19:56:30 +0000 (Mon, 02 Aug 2010) Log Message: ----------- autoconf: Tag 2.66,REV=2010.07.26 Added Paths: ----------- csw/mgar/pkg/autoconf/tags/autoconf-2.66,REV=2010.07.26/ 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 Aug 2 22:16:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 02 Aug 2010 20:16:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[10683] csw/mgar/pkg/autoconf/trunk Message-ID: Revision: 10683 http://gar.svn.sourceforge.net/gar/?rev=10683&view=rev Author: dmichelsen Date: 2010-08-02 20:16:48 +0000 (Mon, 02 Aug 2010) Log Message: ----------- autoconf: Update to 2.67 Modified Paths: -------------- csw/mgar/pkg/autoconf/trunk/Makefile csw/mgar/pkg/autoconf/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/autoconf/trunk/files/0002-Add-patches-from-https-trac.macports.org-changeset-6.patch Modified: csw/mgar/pkg/autoconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/autoconf/trunk/Makefile 2010-08-02 19:56:30 UTC (rev 10682) +++ csw/mgar/pkg/autoconf/trunk/Makefile 2010-08-02 20:16:48 UTC (rev 10683) @@ -1,5 +1,5 @@ GARNAME = autoconf -GARVERSION = 2.66 +GARVERSION = 2.67 CATEGORIES = devel DESCRIPTION = GNU auto-configuration tool @@ -17,12 +17,11 @@ PATCHFILES = 0001-Prefer-CSW-tools.patch -# Unified patches From https://trac.macports.org/changeset/69401 -PATCHFILES += 0002-Add-patches-from-https-trac.macports.org-changeset-6.patch - BUILD_DEP_PKGS = CSWhelp2man RUNTIME_DEP_PKGS = CSWgawk CSWgm4 CSWperl +VENDOR_URL = http://www.gnu.org/software/autoconf/ + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/autoconf/trunk/checksums =================================================================== --- csw/mgar/pkg/autoconf/trunk/checksums 2010-08-02 19:56:30 UTC (rev 10682) +++ csw/mgar/pkg/autoconf/trunk/checksums 2010-08-02 20:16:48 UTC (rev 10683) @@ -1,3 +1,2 @@ ac233d38923d5bebe91a64d68983c3c0 0001-Prefer-CSW-tools.patch -c342d7f0533a6a18f7c3d7c3e4c47af6 0002-Add-patches-from-https-trac.macports.org-changeset-6.patch -fb00d77cbc468994c55919298af1ff02 autoconf-2.66.tar.gz +6078f53dfda911bdfb523e39f4d7fb2d autoconf-2.67.tar.gz Deleted: csw/mgar/pkg/autoconf/trunk/files/0002-Add-patches-from-https-trac.macports.org-changeset-6.patch =================================================================== --- csw/mgar/pkg/autoconf/trunk/files/0002-Add-patches-from-https-trac.macports.org-changeset-6.patch 2010-08-02 19:56:30 UTC (rev 10682) +++ csw/mgar/pkg/autoconf/trunk/files/0002-Add-patches-from-https-trac.macports.org-changeset-6.patch 2010-08-02 20:16:48 UTC (rev 10683) @@ -1,39 +0,0 @@ -From 941b4239da457a3a285cdca3e18c90056b2ba629 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Mon, 26 Jul 2010 11:03:50 +0200 -Subject: [PATCH] Add patches from https://trac.macports.org/changeset/69401 - ---- - lib/autoconf/status.m4 | 2 +- - lib/autoconf/types.m4 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4 -index 52b7a3d..b9e7026 100644 ---- a/lib/autoconf/status.m4 -+++ b/lib/autoconf/status.m4 -@@ -1102,7 +1102,7 @@ AC_DEFUN([AC_CONFIG_SUBDIRS], - _AC_CONFIG_COMPUTE_DEST(], [))])]dnl - [m4_append([_AC_LIST_SUBDIRS], [$1], [ - ])]dnl --[AS_LITERAL_WORD_IF([$1], [], -+[AS_LITERAL_IF([$1], [], - [AC_DIAGNOSE([syntax], [$0: you should use literals])])]dnl - [AC_SUBST([subdirs], ["$subdirs m4_normalize([$1])"])]) - -diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4 -index ee07148..9f482da 100644 ---- a/lib/autoconf/types.m4 -+++ b/lib/autoconf/types.m4 -@@ -763,7 +763,7 @@ Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.]) - # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES]) - # --------------------------------------------------------------- - AC_DEFUN([AC_CHECK_SIZEOF], --[AS_LITERAL_IF([$1], [], -+[AS_LITERAL_IF(m4_translit([[$1]], [*], [p]), [], - [m4_fatal([$0: requires literal arguments])])]dnl - [# The cast to long int works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects --- -1.7.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue Aug 3 07:29:33 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 03 Aug 2010 05:29:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[10684] csw/mgar/pkg/nsd/trunk Message-ID: Revision: 10684 http://gar.svn.sourceforge.net/gar/?rev=10684&view=rev Author: idogan23 Date: 2010-08-03 05:29:33 +0000 (Tue, 03 Aug 2010) Log Message: ----------- nsd: bump version to 3.2.6 Modified Paths: -------------- csw/mgar/pkg/nsd/trunk/Makefile csw/mgar/pkg/nsd/trunk/checksums Modified: csw/mgar/pkg/nsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsd/trunk/Makefile 2010-08-02 20:16:48 UTC (rev 10683) +++ csw/mgar/pkg/nsd/trunk/Makefile 2010-08-03 05:29:33 UTC (rev 10684) @@ -1,5 +1,5 @@ GARNAME = nsd -GARVERSION = 3.2.5 +GARVERSION = 3.2.6 CATEGORIES = server DESCRIPTION = An authoritative only non-recursive name server @@ -42,9 +42,9 @@ post-install-modulated: @ginstall -d $(DESTDIR)/var/opt/csw/nsd - @ginstall -d $(DESTDIR)/opt/csw/etc/init.d + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWnsd - @ginstall -m 755 $(FILEDIR)/cswnsd $(DESTDIR)/opt/csw/etc/init.d/cswnsd + @ginstall -m 755 $(FILEDIR)/cswnsd $(DESTDIR)/etc/opt/csw/init.d/cswnsd @mv $(DESTDIR)/etc/opt/csw/nsd/nsd.conf.sample $(DESTDIR)/etc/opt/csw/nsd/nsd.conf.CSW @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWnsd/cswusergroup Modified: csw/mgar/pkg/nsd/trunk/checksums =================================================================== --- csw/mgar/pkg/nsd/trunk/checksums 2010-08-02 20:16:48 UTC (rev 10683) +++ csw/mgar/pkg/nsd/trunk/checksums 2010-08-03 05:29:33 UTC (rev 10684) @@ -1,3 +1,3 @@ 0eece57abde9d1cef8a962461b453d03 cswnsd 7a7560acb5d56847ea16fb8cd77b6ca5 cswusergroup -73d60d82854609ca705bf48500fb14e6 nsd-3.2.5.tar.gz +f29abd647c70a35e0f52607440c66b1a nsd-3.2.6.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 Tue Aug 3 11:56:01 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 03 Aug 2010 09:56:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[10685] csw/mgar/pkg/multitail/trunk Message-ID: Revision: 10685 http://gar.svn.sourceforge.net/gar/?rev=10685&view=rev Author: skayser Date: 2010-08-03 09:56:01 +0000 (Tue, 03 Aug 2010) Log Message: ----------- multitail: update changelog.CSW, tweak Makefile Modified Paths: -------------- csw/mgar/pkg/multitail/trunk/Makefile csw/mgar/pkg/multitail/trunk/files/changelog.CSW Modified: csw/mgar/pkg/multitail/trunk/Makefile =================================================================== --- csw/mgar/pkg/multitail/trunk/Makefile 2010-08-03 05:29:33 UTC (rev 10684) +++ csw/mgar/pkg/multitail/trunk/Makefile 2010-08-03 09:56:01 UTC (rev 10685) @@ -33,7 +33,7 @@ # Use provided Solaris Makefile BUILD_ARGS = -f makefile.solaris_sunwspro -PRESERVECONF = .*/multitail\.conf\.CSW +PRESERVECONF = .*/multitail\.conf MIGRATE_FILES = multitail.conf CHECKPKG_OVERRIDES_CSWmultitail += missing-dependency|CSWperl @@ -46,15 +46,15 @@ install-custom: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) install-custom: DATADEST = $(DESTDIR)$(datadir)/$(GARNAME) install-custom: - @ginstall -d $(DESTDIR)$(bindir) - @ginstall -d $(DESTDIR)$(mandir)/man1 - @ginstall -d $(DESTDIR)$(sysconfdir) - @ginstall -m 755 $(WORKSRC)/multitail $(DESTDIR)$(bindir) - @ginstall -m 644 $(WORKSRC)/multitail.1 $(DESTDIR)$(mandir)/man1 - @ginstall -m 644 $(WORKSRC)/multitail.conf \ - $(DESTDIR)$(sysconfdir)/multitail.conf.CSW - @ginstall -d $(DATADEST) $(DOCDEST) - @(cd $(WORKSRC); ginstall -m 644 $(EXTRA_DATA) $(DATADEST)) - @(cd $(WORKSRC); ginstall -m 644 $(EXTRA_DOCS) $(DOCDEST)) - @cp $(FILEDIR)/changelog.CSW $(DOCDEST) + ginstall -d $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall -d $(DESTDIR)$(sysconfdir) + ginstall -m 755 $(WORKSRC)/multitail $(DESTDIR)$(bindir) + ginstall -m 644 $(WORKSRC)/multitail.1 $(DESTDIR)$(mandir)/man1 + ginstall -m 644 $(WORKSRC)/multitail.conf \ + $(DESTDIR)$(sysconfdir)/multitail.conf + ginstall -d $(DATADEST) $(DOCDEST) + (cd $(WORKSRC); ginstall -m 644 $(EXTRA_DATA) $(DATADEST)) + (cd $(WORKSRC); ginstall -m 644 $(EXTRA_DOCS) $(DOCDEST)) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) @$(MAKECOOKIE) Modified: csw/mgar/pkg/multitail/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/multitail/trunk/files/changelog.CSW 2010-08-03 05:29:33 UTC (rev 10684) +++ csw/mgar/pkg/multitail/trunk/files/changelog.CSW 2010-08-03 09:56:01 UTC (rev 10685) @@ -1,3 +1,10 @@ +multitail (5.2.6,REV=2010.08.03) + + * Version bump to 5.2.6. + * Moved configuration directory from /opt/csw/etc to /etc/opt/csw. + + -- Sebastian Kayser Tue, 3 Aug 2010 11:39:40 +0200 + multitail (5.2.2,REV=2009.05.20) * Initial release. 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 Aug 3 12:21:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Aug 2010 10:21:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[10686] csw/mgar/pkg Message-ID: Revision: 10686 http://gar.svn.sourceforge.net/gar/?rev=10686&view=rev Author: dmichelsen Date: 2010-08-03 10:21:36 +0000 (Tue, 03 Aug 2010) Log Message: ----------- liborc: Initial commit, most tests fail Added Paths: ----------- csw/mgar/pkg/liborc/ csw/mgar/pkg/liborc/branches/ csw/mgar/pkg/liborc/tags/ csw/mgar/pkg/liborc/trunk/ csw/mgar/pkg/liborc/trunk/Makefile csw/mgar/pkg/liborc/trunk/checksums csw/mgar/pkg/liborc/trunk/files/ csw/mgar/pkg/liborc/trunk/files/0001-Use-getisax-on-Solaris-only-when-available-not-avail.patch Property changes on: csw/mgar/pkg/liborc/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/liborc/trunk/Makefile =================================================================== --- csw/mgar/pkg/liborc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/liborc/trunk/Makefile 2010-08-03 10:21:36 UTC (rev 10686) @@ -0,0 +1,29 @@ +# $Id$ +GARNAME = liborc +GARVERSION = 0.4.6 +CATEGORIES = lib + +DESCRIPTION = The Oil Runtime Compiler +define BLURB + Orc is a library and set of tools for compiling and executing very simple programs that operate on arrays of data. + The language is a generic assembly language that represents many of the features available in SIMD architectures, + including saturated addition and subtraction, and many arithmetic operations. +endef + +MASTER_SITES = http://code.entropywave.com/download/orc/ +DISTNAME = orc-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://code.entropywave.com/projects/orc/ + +BUILD64 = 1 +NOISAEXEC = 1 +NOISALIST = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Property changes on: csw/mgar/pkg/liborc/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/liborc/trunk/checksums =================================================================== --- csw/mgar/pkg/liborc/trunk/checksums (rev 0) +++ csw/mgar/pkg/liborc/trunk/checksums 2010-08-03 10:21:36 UTC (rev 10686) @@ -0,0 +1 @@ +98e0a61bbfee84a0a6dfd8f7e5600d5c orc-0.4.6.tar.gz Added: csw/mgar/pkg/liborc/trunk/files/0001-Use-getisax-on-Solaris-only-when-available-not-avail.patch =================================================================== --- csw/mgar/pkg/liborc/trunk/files/0001-Use-getisax-on-Solaris-only-when-available-not-avail.patch (rev 0) +++ csw/mgar/pkg/liborc/trunk/files/0001-Use-getisax-on-Solaris-only-when-available-not-avail.patch 2010-08-03 10:21:36 UTC (rev 10686) @@ -0,0 +1,26 @@ +From 7dea861f0db034574600ce648c173dd1a359e61c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 3 Aug 2010 10:28:33 +0200 +Subject: [PATCH] Use getisax on Solaris only when available (not available before Solaris 10) + +--- + orc/orccpu-x86.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/orc/orccpu-x86.c b/orc/orccpu-x86.c +index a63e8db..8e62ed3 100644 +--- a/orc/orccpu-x86.c ++++ b/orc/orccpu-x86.c +@@ -54,7 +54,9 @@ + /***** i386, amd64 *****/ + + #if defined(__sun) ++#if defined(_SYS_AUXV_386_H) + #define USE_I386_GETISAX ++#endif + #else + #define USE_I386_CPUID + #endif +-- +1.7.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 Tue Aug 3 21:58:20 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 03 Aug 2010 19:58:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[10687] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: Revision: 10687 http://gar.svn.sourceforge.net/gar/?rev=10687&view=rev Author: dmichelsen Date: 2010-08-03 19:58:20 +0000 (Tue, 03 Aug 2010) Log Message: ----------- graphviz: Remove binding to OpenCSW X11 Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2010-08-03 10:21:36 UTC (rev 10686) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2010-08-03 19:58:20 UTC (rev 10687) @@ -220,11 +220,7 @@ CONFIGURE_ARGS += --enable-static --enable-shared -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib EXTRA_LD_FLAGS = -lm -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) STRIP_LIBTOOL=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 Aug 3 23:43:17 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 03 Aug 2010 21:43:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[10688] csw/mgar/pkg/multitail/trunk Message-ID: Revision: 10688 http://gar.svn.sourceforge.net/gar/?rev=10688&view=rev Author: skayser Date: 2010-08-03 21:43:17 +0000 (Tue, 03 Aug 2010) Log Message: ----------- multitail: adjust CONFIG_FILE location to sysconfdir Modified Paths: -------------- csw/mgar/pkg/multitail/trunk/checksums csw/mgar/pkg/multitail/trunk/files/changelog.CSW csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff Modified: csw/mgar/pkg/multitail/trunk/checksums =================================================================== --- csw/mgar/pkg/multitail/trunk/checksums 2010-08-03 19:58:20 UTC (rev 10687) +++ csw/mgar/pkg/multitail/trunk/checksums 2010-08-03 21:43:17 UTC (rev 10688) @@ -1,2 +1,2 @@ 6496b3d78660ff8d11c743a0d03cca34 multitail-5.2.6.tgz -bc0570a9338aec684a8789056ac598a3 patch-CSW.diff +b9c523f87ec50251e0737f2ce870fb48 patch-CSW.diff Modified: csw/mgar/pkg/multitail/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/multitail/trunk/files/changelog.CSW 2010-08-03 19:58:20 UTC (rev 10687) +++ csw/mgar/pkg/multitail/trunk/files/changelog.CSW 2010-08-03 21:43:17 UTC (rev 10688) @@ -3,7 +3,7 @@ * Version bump to 5.2.6. * Moved configuration directory from /opt/csw/etc to /etc/opt/csw. - -- Sebastian Kayser Tue, 3 Aug 2010 11:39:40 +0200 + -- Sebastian Kayser Tue, 3 Aug 2010 23:41:44 +0200 multitail (5.2.2,REV=2009.05.20) Modified: csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff =================================================================== --- csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff 2010-08-03 19:58:20 UTC (rev 10687) +++ csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff 2010-08-03 21:43:17 UTC (rev 10688) @@ -20,7 +20,7 @@ -DESTDIR=/ -CONFIG_FILE=$(DESTDIR)/etc/multitail.conf -+CONFIG_FILE=$(prefix)/etc/multitail.conf ++CONFIG_FILE=$(sysconfdir)/multitail.conf -DEBUG=#-g -D_DEBUG #-pg #-fprofile-arcs -CFLAGS=${EXTRA_CFLAGS} -O2 -I/usr/local/include/ -D_STDC_C99 -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\" 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 Aug 4 10:38:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Aug 2010 08:38:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[10689] csw/mgar/pkg/glib2/branches Message-ID: Revision: 10689 http://gar.svn.sourceforge.net/gar/?rev=10689&view=rev Author: dmichelsen Date: 2010-08-04 08:38:16 +0000 (Wed, 04 Aug 2010) Log Message: ----------- glib2: Create glib2-2.23.x branch Modified Paths: -------------- csw/mgar/pkg/glib2/branches/glib2-2.23.x/Makefile csw/mgar/pkg/glib2/branches/glib2-2.23.x/checksums Added Paths: ----------- csw/mgar/pkg/glib2/branches/glib2-2.23.x/ Modified: csw/mgar/pkg/glib2/branches/glib2-2.23.x/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2010-07-06 20:37:05 UTC (rev 10463) +++ csw/mgar/pkg/glib2/branches/glib2-2.23.x/Makefile 2010-08-04 08:38:16 UTC (rev 10689) @@ -1,8 +1,8 @@ GARNAME = glib -GARVERSION = 2.25.10 +GARVERSION = 2.23.6 CATEGORIES = lib -DESCRIPTION = The GLib library of C routines. +DESCRIPTION = The GLib library of C routines define BLURB GLib is a library containing many useful C routines for things such as trees, hashes, and lists. GLib was previously distributed with the GTK toolkit, but @@ -20,17 +20,17 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 PATCHFILES = glib-typedetect.patch -# PATCHFILES += FIXED_STR.patch +PATCHFILES += FIXED_STR.patch PATCHFILES += gsize.patch -# PATCHFILES += gconverter.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 -PATCHFILES += 0001-Make-sure-we-have-the-include-for-major-minor.patch -PATCHFILES += 0001-Replace-.-not-understood-by-Sun-Studio.patch +# PATCHFILES += 0001-Make-sure-we-have-the-include-for-major-minor.patch +# PATCHFILES += 0001-Replace-.-not-understood-by-Sun-Studio.patch # We don't need it and if defined the test breaks LD_OPTIONS = Modified: csw/mgar/pkg/glib2/branches/glib2-2.23.x/checksums =================================================================== --- csw/mgar/pkg/glib2/trunk/checksums 2010-07-06 20:37:05 UTC (rev 10463) +++ csw/mgar/pkg/glib2/branches/glib2-2.23.x/checksums 2010-08-04 08:38:16 UTC (rev 10689) @@ -1,7 +1,8 @@ 39b575a4c1dd2234a88d755a13332458 0001-Make-sure-we-have-the-include-for-major-minor.patch -77188ce430577f5db01ba9d73aed5bcd 0001-Replace-.-not-understood-by-Sun-Studio.patch +a87638e0505b6ff29efd8130450003c5 0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch 9f66027a275eb34d80a68ec8927bf66e CMSG_LEN.patch f1f3c182f64be06ab57d8b01016af074 FIXED_STR.patch -cdbe09f15536b526e19f06893e9b64ef glib-2.25.10.tar.bz2 +ed4a6616a70705b56babe709787431d4 gconverter.patch +72e6eadc16d7022376ecef12c6fe905e glib-2.23.6.tar.bz2 8f683820d9ecab1abd9dbe81997ab9eb glib-typedetect.patch bb2fb8eef43c995fea6c08563487ace6 gsize.patch 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 Aug 4 10:39:15 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Aug 2010 08:39:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[10690] csw/mgar/pkg/glib2 Message-ID: Revision: 10690 http://gar.svn.sourceforge.net/gar/?rev=10690&view=rev Author: dmichelsen Date: 2010-08-04 08:39:14 +0000 (Wed, 04 Aug 2010) Log Message: ----------- glib2: Add build time dependency to CSWperl fixing #4327 Modified Paths: -------------- csw/mgar/pkg/glib2/branches/glib2-2.23.x/Makefile csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/branches/glib2-2.23.x/Makefile =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2.23.x/Makefile 2010-08-04 08:38:16 UTC (rev 10689) +++ csw/mgar/pkg/glib2/branches/glib2-2.23.x/Makefile 2010-08-04 08:39:14 UTC (rev 10690) @@ -48,7 +48,7 @@ BUILD64 = 1 NOISAEXEC = 1 -BUILD_DEP_PKGS = CSWggettext +BUILD_DEP_PKGS = CSWggettext CSWperl RUNTIME_DEP_PKGS_CSWglib2 += CSWggettextrt RUNTIME_DEP_PKGS_CSWglib2 += CSWiconv Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2010-08-04 08:38:16 UTC (rev 10689) +++ csw/mgar/pkg/glib2/trunk/Makefile 2010-08-04 08:39:14 UTC (rev 10690) @@ -48,7 +48,7 @@ BUILD64 = 1 NOISAEXEC = 1 -BUILD_DEP_PKGS = CSWggettext +BUILD_DEP_PKGS = CSWggettext CSWperl RUNTIME_DEP_PKGS_CSWglib2 += CSWggettextrt RUNTIME_DEP_PKGS_CSWglib2 += CSWiconv 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 Aug 4 10:41:41 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Aug 2010 08:41:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[10691] csw/mgar/pkg/glib2 Message-ID: Revision: 10691 http://gar.svn.sourceforge.net/gar/?rev=10691&view=rev Author: dmichelsen Date: 2010-08-04 08:41:40 +0000 (Wed, 04 Aug 2010) Log Message: ----------- glib2: Add runtime dependency from CSWglib2devel to CSWperl now really fixing #4327 (misread bug report) Modified Paths: -------------- csw/mgar/pkg/glib2/branches/glib2-2.23.x/Makefile csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/branches/glib2-2.23.x/Makefile =================================================================== --- csw/mgar/pkg/glib2/branches/glib2-2.23.x/Makefile 2010-08-04 08:39:14 UTC (rev 10690) +++ csw/mgar/pkg/glib2/branches/glib2-2.23.x/Makefile 2010-08-04 08:41:40 UTC (rev 10691) @@ -48,7 +48,7 @@ BUILD64 = 1 NOISAEXEC = 1 -BUILD_DEP_PKGS = CSWggettext CSWperl +BUILD_DEP_PKGS = CSWggettext RUNTIME_DEP_PKGS_CSWglib2 += CSWggettextrt RUNTIME_DEP_PKGS_CSWglib2 += CSWiconv @@ -59,6 +59,7 @@ RUNTIME_DEP_PKGS_CSWglib2devel += CSWiconv RUNTIME_DEP_PKGS_CSWglib2devel += CSWpython RUNTIME_DEP_PKGS_CSWglib2devel += CSWzlib +RUNTIME_DEP_PKGS_CSWglib2devel += CSWperl # Some tests fail, they may be harmless, disable for now, but check later! SKIPTEST ?= 1 Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2010-08-04 08:39:14 UTC (rev 10690) +++ csw/mgar/pkg/glib2/trunk/Makefile 2010-08-04 08:41:40 UTC (rev 10691) @@ -48,7 +48,7 @@ BUILD64 = 1 NOISAEXEC = 1 -BUILD_DEP_PKGS = CSWggettext CSWperl +BUILD_DEP_PKGS = CSWggettext RUNTIME_DEP_PKGS_CSWglib2 += CSWggettextrt RUNTIME_DEP_PKGS_CSWglib2 += CSWiconv @@ -59,6 +59,7 @@ RUNTIME_DEP_PKGS_CSWglib2devel += CSWiconv RUNTIME_DEP_PKGS_CSWglib2devel += CSWpython RUNTIME_DEP_PKGS_CSWglib2devel += CSWzlib +RUNTIME_DEP_PKGS_CSWglib2devel += CSWperl # Some tests fail, they may be harmless, disable for now, but check later! SKIPTEST ?= 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Aug 4 10:53:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Aug 2010 08:53:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[10692] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 10692 http://gar.svn.sourceforge.net/gar/?rev=10692&view=rev Author: dmichelsen Date: 2010-08-04 08:53:00 +0000 (Wed, 04 Aug 2010) Log Message: ----------- curl: Use LDAP on all builds, including amd64. This fixes #4274 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-08-04 08:41:40 UTC (rev 10691) +++ csw/mgar/pkg/curl/trunk/Makefile 2010-08-04 08:53:00 UTC (rev 10692) @@ -39,15 +39,9 @@ EXTRA_MODULATORS = FEATURES MODULATIONS_FEATURES = minimal full -# amd64 is built without openldap because there are no libs available right now (Mantis 3028) -EXTRA_CONFIGURE_ARGS_LDAP_isa-sparcv8 = --enable-ldap --enable-ldaps -EXTRA_CONFIGURE_ARGS_LDAP_isa-sparcv9 = --enable-ldap --enable-ldaps -EXTRA_CONFIGURE_ARGS_LDAP_isa-i386 = --enable-ldap --enable-ldaps -EXTRA_CONFIGURE_ARGS_LDAP_isa-amd64 = --disable-ldap - EXTRA_CONFIGURE_ARGS_features-minimal = --disable-ldap --without-libssh2 --disable-ares EXTRA_CONFIGURE_ARGS_features-full = --enable-ares --with-spnego=$(libdir) -EXTRA_CONFIGURE_ARGS_features-full += $(EXTRA_CONFIGURE_ARGS_LDAP_isa-$(ISA)) +EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap --enable-ldaps CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl 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 Aug 4 11:02:23 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Aug 2010 09:02:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[10693] csw/mgar/pkg/orca/trunk Message-ID: Revision: 10693 http://gar.svn.sourceforge.net/gar/?rev=10693&view=rev Author: dmichelsen Date: 2010-08-04 09:02:23 +0000 (Wed, 04 Aug 2010) Log Message: ----------- orca: Apply fix from #4505 incorrectly preventing restart after crash Modified Paths: -------------- csw/mgar/pkg/orca/trunk/checksums csw/mgar/pkg/orca/trunk/files/csworca Modified: csw/mgar/pkg/orca/trunk/checksums =================================================================== --- csw/mgar/pkg/orca/trunk/checksums 2010-08-04 08:53:00 UTC (rev 10692) +++ csw/mgar/pkg/orca/trunk/checksums 2010-08-04 09:02:23 UTC (rev 10693) @@ -1,4 +1,4 @@ -dcb171adb47a8a7d8c55ec4b7f9b5218 csworca +40a01bc6854c77a39c00014e72cae252 csworca 4c74f4f1449fabd0838d0cd71678144c csworca_services 72c1eaa8d3f1ab48363e7ed5792e2855 csworcallator a99644ffcc9164d9d0f4df2b44c61917 csworcallator.xml Modified: csw/mgar/pkg/orca/trunk/files/csworca =================================================================== --- csw/mgar/pkg/orca/trunk/files/csworca 2010-08-04 08:53:00 UTC (rev 10692) +++ csw/mgar/pkg/orca/trunk/files/csworca 2010-08-04 09:02:23 UTC (rev 10693) @@ -18,6 +18,7 @@ ;; stop) + rmdir /etc/opt/csw/orcallator.cfg.lock if test -f /var/run/orca.pid; then kill `cat /var/run/orca.pid` rm -f /var/run/orca.pid 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 Aug 4 11:08:40 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Aug 2010 09:08:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[10694] csw/mgar/pkg/orca/trunk/Makefile Message-ID: Revision: 10694 http://gar.svn.sourceforge.net/gar/?rev=10694&view=rev Author: dmichelsen Date: 2010-08-04 09:08:40 +0000 (Wed, 04 Aug 2010) Log Message: ----------- orca: Apply latest checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/orca/trunk/Makefile Modified: csw/mgar/pkg/orca/trunk/Makefile =================================================================== --- csw/mgar/pkg/orca/trunk/Makefile 2010-08-04 09:02:23 UTC (rev 10693) +++ csw/mgar/pkg/orca/trunk/Makefile 2010-08-04 09:08:40 UTC (rev 10694) @@ -85,6 +85,22 @@ PKGFILES_CSWorcaweb += /var/opt/csw/.* PKGFILES_CSWorcaweb += /etc/opt/csw/init.d/csworca +# This one is purely optional +CHECKPKG_OVERRIDES_CSWorca += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/csworca_services|class=none + +# Checkpkg can't track Perl dependencies +CHECKPKG_OVERRIDES_CSWorca += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWorca += surplus-dependency|CSWgawk +CHECKPKG_OVERRIDES_CSWorca += surplus-dependency|CSWrrd +CHECKPKG_OVERRIDES_CSWorca += surplus-dependency|CSWpmtimedate +CHECKPKG_OVERRIDES_CSWorca += surplus-dependency|CSWpmmathinterpolate +CHECKPKG_OVERRIDES_CSWorca += surplus-dependency|CSWbzip2 +CHECKPKG_OVERRIDES_CSWorca += surplus-dependency|CSWsetoolkit +CHECKPKG_OVERRIDES_CSWorcaweb += surplus-dependency|CSWrrd +CHECKPKG_OVERRIDES_CSWorcaweb += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWorcaweb += surplus-dependency|CSWpmtimedate +CHECKPKG_OVERRIDES_CSWorcaweb += surplus-dependency|CSWpmmathinterpolate + 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 opk at users.sourceforge.net Wed Aug 4 11:53:03 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Wed, 04 Aug 2010 09:53:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[10695] csw/mgar/pkg/pycairo/trunk Message-ID: Revision: 10695 http://gar.svn.sourceforge.net/gar/?rev=10695&view=rev Author: opk Date: 2010-08-04 09:53:03 +0000 (Wed, 04 Aug 2010) Log Message: ----------- upgrade to 1.8.10 Modified Paths: -------------- csw/mgar/pkg/pycairo/trunk/Makefile csw/mgar/pkg/pycairo/trunk/checksums Modified: csw/mgar/pkg/pycairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/pycairo/trunk/Makefile 2010-08-04 09:08:40 UTC (rev 10694) +++ csw/mgar/pkg/pycairo/trunk/Makefile 2010-08-04 09:53:03 UTC (rev 10695) @@ -1,5 +1,5 @@ GARNAME = pycairo -GARVERSION = 1.8.8 +GARVERSION = 1.8.10 CATEGORIES = lib DESCRIPTION = Python binding for Cairo library @@ -9,7 +9,7 @@ endef MASTER_SITES = http://www.cairographics.org/releases/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = py2cairo-$(GARVERSION).tar.gz EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' @@ -18,7 +18,7 @@ # We define upstream file regex so we can be notifed of # new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = py2cairo-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWpy-cairo CATALOGNAME_CSWpy-cairo = py_cairo Modified: csw/mgar/pkg/pycairo/trunk/checksums =================================================================== --- csw/mgar/pkg/pycairo/trunk/checksums 2010-08-04 09:08:40 UTC (rev 10694) +++ csw/mgar/pkg/pycairo/trunk/checksums 2010-08-04 09:53:03 UTC (rev 10695) @@ -1 +1 @@ -054da6c125cb427a003f5fd6c54f853e pycairo-1.8.8.tar.gz +87421a6a70304120555ba7ba238f3dc3 py2cairo-1.8.10.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Wed Aug 4 12:42:51 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Wed, 04 Aug 2010 10:42:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[10696] csw/mgar/pkg/pycairo/trunk/Makefile Message-ID: Revision: 10696 http://gar.svn.sourceforge.net/gar/?rev=10696&view=rev Author: opk Date: 2010-08-04 10:42:51 +0000 (Wed, 04 Aug 2010) Log Message: ----------- fix problem which meant it was losing default CFLAGS Modified Paths: -------------- csw/mgar/pkg/pycairo/trunk/Makefile Modified: csw/mgar/pkg/pycairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/pycairo/trunk/Makefile 2010-08-04 09:53:03 UTC (rev 10695) +++ csw/mgar/pkg/pycairo/trunk/Makefile 2010-08-04 10:42:51 UTC (rev 10696) @@ -28,7 +28,7 @@ CAIRO_LIBS = -L/opt/csw/lib -R/opt/csw/lib/$$ISALIST -lcairo CAIRO_CFLAGS = -I/opt/csw/include -I/opt/csw/include/cairo -COMPILER_EXPORTS += CAIRO_LIBS CAIRO_CFLAGS +EXTRA_CONFIGURE_EXPORTS += CAIRO_LIBS CAIRO_CFLAGS 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 dmichelsen at users.sourceforge.net Wed Aug 4 14:21:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Aug 2010 12:21:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[10697] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 10697 http://gar.svn.sourceforge.net/gar/?rev=10697&view=rev Author: dmichelsen Date: 2010-08-04 12:21:16 +0000 (Wed, 04 Aug 2010) Log Message: ----------- mGAR v2: Fix bug when both LICENSE and LICENSE_ are specified 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-08-04 10:42:51 UTC (rev 10696) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-08-04 12:21:16 UTC (rev 10697) @@ -587,8 +587,8 @@ define licensefile $(strip $(or - $(call findlicensefile,$(or $(LICENSE_$(1)),$(LICENSE_FULL_$(1)))) - $(call findlicensefile,$(or $(LICENSE),$(LICENSE_FULL))), + $(call findlicensefile,$(or $(LICENSE_$(1)),$(LICENSE_FULL_$(1)))), + $(call findlicensefile,$(or $(LICENSE),$(LICENSE_FULL))), ) ) endef 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 Aug 4 14:25:24 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 04 Aug 2010 12:25:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[10698] csw/mgar/pkg/mtx/trunk/Makefile Message-ID: Revision: 10698 http://gar.svn.sourceforge.net/gar/?rev=10698&view=rev Author: dmichelsen Date: 2010-08-04 12:25:23 +0000 (Wed, 04 Aug 2010) Log Message: ----------- mtx: Add contrib scripts in CSWmtxcontrib as requested in #900 Modified Paths: -------------- csw/mgar/pkg/mtx/trunk/Makefile Modified: csw/mgar/pkg/mtx/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtx/trunk/Makefile 2010-08-04 12:21:16 UTC (rev 10697) +++ csw/mgar/pkg/mtx/trunk/Makefile 2010-08-04 12:25:23 UTC (rev 10698) @@ -19,22 +19,48 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -# TODO: -# - Add stuff from contrib - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://mtx.opensource-sw.net/ +LICENSE = LICENSE +LICENSE_CSWmtxcontrib = contrib/README +PACKAGES = CSWmtx CSWmtxcontrib + +CATALOGNAME_CSWmtx = mtx +CATALOGNAME_CSWmtxcontrib = mtx_contrib + +SPKG_DESC_CSWmtx = Control tape autoloaders +SPKG_DESC_CSWmtxcontrib = MTX contributed scripts + +RUNTIME_DEP_PKGS_CSWmtxcontrib = CSWmtx CSWtk + +VENDOR_URL = http://mtx.opensource-sw.net/ + +CONTRIBDIR = $(sharedstatedir)/mtx/contrib + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = INSTALL_OVERRIDE_DIRS = sbindir mandir +ARCHALL_CSWmtxcontrib = 1 + +PKGFILES_CSWmtxcontrib = $(CONTRIBDIR)/.* + +CHECKPKG_OVERRIDES_CSWmtxcontrib += surplus-dependency|CSWtk +CHECKPKG_OVERRIDES_CSWmtxcontrib += surplus-dependency|CSWmtx + include gar/category.mk +post-extract-modulated: + -cd $(WORKSRC)/contrib; gzip -c -d mtxctl-0.0.2.tar.gz | tar xvf - + @$(MAKECOOKIE) + post-install-modulated: - ginstall $(WORKSRC)/contrib/config_sgen_solaris.sh $(DESTDIR)$(sbindir) + ginstall -d $(DESTDIR)$(CONTRIBDIR) + ginstall $(WORKSRC)/contrib/config_sgen_solaris.sh $(DESTDIR)$(CONTRIBDIR)/ + ginstall $(WORKSRC)/contrib/mtxctl/mtxctl.tk $(DESTDIR)$(CONTRIBDIR)/mtxctl + perl -pi -e 's,#!/usr/freeware/bin/wish -f,#!/opt/csw/bin/wish -f,' $(DESTDIR)$(CONTRIBDIR)/mtxctl @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Wed Aug 4 15:30:57 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Wed, 04 Aug 2010 13:30:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[10699] csw/mgar/pkg/pycairo/trunk/Makefile Message-ID: Revision: 10699 http://gar.svn.sourceforge.net/gar/?rev=10699&view=rev Author: opk Date: 2010-08-04 13:30:57 +0000 (Wed, 04 Aug 2010) Log Message: ----------- fix rpath issue found by checkpkg Modified Paths: -------------- csw/mgar/pkg/pycairo/trunk/Makefile Modified: csw/mgar/pkg/pycairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/pycairo/trunk/Makefile 2010-08-04 12:25:23 UTC (rev 10698) +++ csw/mgar/pkg/pycairo/trunk/Makefile 2010-08-04 13:30:57 UTC (rev 10699) @@ -26,7 +26,7 @@ RUNTIME_DEP_PKGS_CSWpy-cairo = CSWlibcairo CSWpython -CAIRO_LIBS = -L/opt/csw/lib -R/opt/csw/lib/$$ISALIST -lcairo +CAIRO_LIBS = -L/opt/csw/lib -R/opt/csw/lib/\$$ISALIST -lcairo CAIRO_CFLAGS = -I/opt/csw/include -I/opt/csw/include/cairo EXTRA_CONFIGURE_EXPORTS += CAIRO_LIBS CAIRO_CFLAGS CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Aug 5 03:38:49 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 05 Aug 2010 01:38:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[10700] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 10700 http://gar.svn.sourceforge.net/gar/?rev=10700&view=rev Author: bdwalton Date: 2010-08-05 01:38:49 +0000 (Thu, 05 Aug 2010) Log Message: ----------- git: disable tests until next version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-08-04 13:30:57 UTC (rev 10699) +++ csw/mgar/pkg/git/trunk/Makefile 2010-08-05 01:38:49 UTC (rev 10700) @@ -6,7 +6,9 @@ VENDOR_URL = http://git-scm.org/ # disable tests until next version bump (at the top so it stands out) -# TEST_SCRIPTS = +# 1.7.2.1 has a failure on current9s when fr.UFT-8 is detected as the +# first available utf8 locale. the failure is harmless though. +TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc PACKAGES += CSWgitcompletion CSWgitdevel 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 Aug 5 08:44:10 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 05 Aug 2010 06:44:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[10701] csw/mgar/pkg/xjobs/trunk/checksums Message-ID: Revision: 10701 http://gar.svn.sourceforge.net/gar/?rev=10701&view=rev Author: dmichelsen Date: 2010-08-05 06:44:09 +0000 (Thu, 05 Aug 2010) Log Message: ----------- xjobs: Updated checksum due to new upstream release (previous tgz was somewahet broken) Modified Paths: -------------- csw/mgar/pkg/xjobs/trunk/checksums Modified: csw/mgar/pkg/xjobs/trunk/checksums =================================================================== --- csw/mgar/pkg/xjobs/trunk/checksums 2010-08-05 01:38:49 UTC (rev 10700) +++ csw/mgar/pkg/xjobs/trunk/checksums 2010-08-05 06:44:09 UTC (rev 10701) @@ -1 +1 @@ -f20ce2b9df520a278db2c8482fb17009 xjobs-20100311.tgz +28c89f1d944f0d44b2014475a0763027 xjobs-20100311.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Aug 5 12:15:10 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 05 Aug 2010 10:15:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[10702] csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile Message-ID: Revision: 10702 http://gar.svn.sourceforge.net/gar/?rev=10702&view=rev Author: bonivart Date: 2010-08-05 10:15:10 +0000 (Thu, 05 Aug 2010) Log Message: ----------- perl: update to bdb48, respin to use new compiler location Modified Paths: -------------- csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile Modified: csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile =================================================================== --- csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile 2010-08-05 06:44:09 UTC (rev 10701) +++ csw/mgar/pkg/perl/branches/perl-5.10.1/Makefile 2010-08-05 10:15:10 UTC (rev 10702) @@ -19,7 +19,7 @@ PACKAGES = CSWperl CSWperldoc ARCHALL_CSWperldoc = 1 -RUNTIME_DEP_PKGS_CSWperl = CSWbdb47 CSWgdbm +RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWgdbm RUNTIME_DEP_PKGS_CSWperldoc = CSWperl INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags @@ -28,6 +28,8 @@ LICENSE = Copying +CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl + # Core module updates #MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ #CORE_UPDATES += PathTools-3.30 @@ -69,8 +71,8 @@ # Compatable with all prior patch revs INC_COMPAT = 5.8.0 5.8.2 5.8.4 5.8.6 5.8.7 5.8.8 5.10.0 -# Force use of db-4.7 -PERL_LIBS += -lsocket -lnsl -lgdbm -ldb-4.7 -ldl -lm -lpthread -lc -lperl +# Force use of db-4.8 +PERL_LIBS += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -lperl # Configuration flags CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(GARVERSION) @@ -101,6 +103,7 @@ CONFIGURE_ARGS += -Duseshrplib CONFIGURE_ARGS += -Dusesitecustomize CONFIGURE_ARGS += -Dusethreads +#CONFIGURE_ARGS += -Dusedtrace CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw CONFIGURE_ARGS += -Dvendorprefix=$(prefix) @@ -108,8 +111,8 @@ CONFIGURE_ARGS += -Dlibsdirs=" /usr/lib /opt/csw/lib" CONFIGURE_ARGS += -Dsed=$(bindir)/gsed -EXTRA_LIB += $(prefix)/bdb47/lib -EXTRA_INC += $(prefix)/bdb47/include +EXTRA_LIB += $(prefix)/bdb48/lib +EXTRA_INC += $(prefix)/bdb48/include #EXTRA_LDFLAGS = -lperl EXTRA_LDFLAGS = -L$(libdir) -lperl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Thu Aug 5 12:20:46 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Thu, 05 Aug 2010 10:20:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[10703] csw/mgar/pkg/ipython/trunk/Makefile Message-ID: Revision: 10703 http://gar.svn.sourceforge.net/gar/?rev=10703&view=rev Author: opk Date: 2010-08-05 10:20:46 +0000 (Thu, 05 Aug 2010) Log Message: ----------- download location has changed. setup.py still seg faults so this isn't much use Modified Paths: -------------- csw/mgar/pkg/ipython/trunk/Makefile Modified: csw/mgar/pkg/ipython/trunk/Makefile =================================================================== --- csw/mgar/pkg/ipython/trunk/Makefile 2010-08-05 10:15:10 UTC (rev 10702) +++ csw/mgar/pkg/ipython/trunk/Makefile 2010-08-05 10:20:46 UTC (rev 10703) @@ -9,7 +9,7 @@ or other textual content for output generation on the web endef -MASTER_SITES = http://ipython.scipy.org/dist/ +MASTER_SITES = http://ipython.scipy.org/dist/$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz ARCHALL_CSWipython = 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 Fri Aug 6 13:36:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Aug 2010 11:36:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[10704] csw/mgar/pkg/mtx/trunk/Makefile Message-ID: Revision: 10704 http://gar.svn.sourceforge.net/gar/?rev=10704&view=rev Author: dmichelsen Date: 2010-08-06 11:36:16 +0000 (Fri, 06 Aug 2010) Log Message: ----------- mtx: Correct path in mtxctl Modified Paths: -------------- csw/mgar/pkg/mtx/trunk/Makefile Modified: csw/mgar/pkg/mtx/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtx/trunk/Makefile 2010-08-05 10:20:46 UTC (rev 10703) +++ csw/mgar/pkg/mtx/trunk/Makefile 2010-08-06 11:36:16 UTC (rev 10704) @@ -62,5 +62,6 @@ ginstall -d $(DESTDIR)$(CONTRIBDIR) ginstall $(WORKSRC)/contrib/config_sgen_solaris.sh $(DESTDIR)$(CONTRIBDIR)/ ginstall $(WORKSRC)/contrib/mtxctl/mtxctl.tk $(DESTDIR)$(CONTRIBDIR)/mtxctl - perl -pi -e 's,#!/usr/freeware/bin/wish -f,#!/opt/csw/bin/wish -f,' $(DESTDIR)$(CONTRIBDIR)/mtxctl + ginstall $(WORKSRC)/contrib/mtxctl/README $(DESTDIR)$(CONTRIBDIR)/README.mtxctl + perl -pi -e 's,#!/usr/freeware/bin/wish -f,#!/opt/csw/bin/wish -f,; s,/usr/freeware/bin/mtx,/opt/csw/sbin/mtx,' $(DESTDIR)$(CONTRIBDIR)/mtxctl @$(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 Fri Aug 6 16:42:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Aug 2010 14:42:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[10705] csw/mgar/pkg Message-ID: Revision: 10705 http://gar.svn.sourceforge.net/gar/?rev=10705&view=rev Author: dmichelsen Date: 2010-08-06 14:42:11 +0000 (Fri, 06 Aug 2010) Log Message: ----------- bitlbee: Initial commit Added Paths: ----------- csw/mgar/pkg/bitlbee/ csw/mgar/pkg/bitlbee/branches/ csw/mgar/pkg/bitlbee/tags/ csw/mgar/pkg/bitlbee/trunk/ csw/mgar/pkg/bitlbee/trunk/Makefile csw/mgar/pkg/bitlbee/trunk/checksums csw/mgar/pkg/bitlbee/trunk/files/ csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch Property changes on: csw/mgar/pkg/bitlbee/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/bitlbee/trunk/Makefile =================================================================== --- csw/mgar/pkg/bitlbee/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bitlbee/trunk/Makefile 2010-08-06 14:42:11 UTC (rev 10705) @@ -0,0 +1,68 @@ +# $Id$ +GARNAME = bitlbee +GARVERSION = 1.2.8 +CATEGORIES = apps + +DESCRIPTION = An IRC to other chat networks gateway +define BLURB + BitlBee brings IM (instant messaging) to IRC clients. It's a great solution for people who have an + IRC client running all the time and don't want to run an additional MSN/AIM/whatever client. + BitlBee currently supports the following IM networks/protocols: XMPP/Jabber (including Google Talk), + MSN Messenger, Yahoo! Messenger, AIM and ICQ. +endef + +MASTER_SITES = http://get.bitlbee.org/src/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PATCHFILES = 0001-Do-not-use-gcc-specific-Wall.patch +PATCHFILES += 0002-Use-putenv-instead-of-setenv.patch +PATCHFILES += 0003-Remove-more-GCC-specific-Wall.patch +PATCHFILES += 0004-Use-inttypes.h-instead-of-stdint.h.patch +PATCHFILES += 0005-Do-not-return-values-in-void-functions-and-make-seco.patch +PATCHFILES += 0006-Remove-definition-on-Solaris-confusing-includes.patch + +# This must be patched in at this place as the includes of the local dirs must come before +# the one we set for OpenCSW +PATCHFILES += 0007-Honour-CPPFLAGS.patch + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# Build mechanism ignores CPPFLAGS +# EXTRA_CFLAGS = $(CPPFLAGS) + +BUILD_DEP_PKGS = CSWossldevel CSWlibevent-devel CSWggettext CSWglib2devel +RUNTIME_DEP_PKGS = CSWosslrt CSWlibevent CSWggettextrt CSWglib2 + +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + +# bash configure --prefix=/opt/csw --ssl=openssl --events=libevent +CONFIGURE_SCRIPTS = custom +CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += --etcdir=$(sysconfdir) +CONFIGURE_ARGS += --pidfile=/var/run/bitlbee.pid +CONFIGURE_ARGS += --config=$(localstatedir)/bitlbee/ +CONFIGURE_ARGS += --ipcsocket=/var/run/bitlbee.sock +CONFIGURE_ARGS += --ssl=openssl --events=libevent + +# Critical check.h is missing on Solaris +SKIPTEST ?= 1 +TEST_TARGET = check + +PRESERVECONF = $(sysconfdir)/bitlbee.conf + +include gar/category.mk + +configure-custom: + @echo " ==> Running configure in $*" + cd $(WORKSRC) && $(CONFIGURE_ENV) bash ./configure $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + +# Make sure the right install is in place +install-%/Makefile: PATH:=/usr/ucb:$(PATH) + +post-install-modulated: + ginstall -d $(DESTDIR)$(sysconfdir) + ginstall $(WORKSRC)/bitlbee.conf $(DESTDIR)$(sysconfdir)/bitlbee.conf.CSW + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/bitlbee/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/bitlbee/trunk/checksums =================================================================== --- csw/mgar/pkg/bitlbee/trunk/checksums (rev 0) +++ csw/mgar/pkg/bitlbee/trunk/checksums 2010-08-06 14:42:11 UTC (rev 10705) @@ -0,0 +1,8 @@ +86455864950f3515af0aa3139261116d 0001-Do-not-use-gcc-specific-Wall.patch +eb620e3a4a5039257e82e5b79b11a53e 0002-Use-putenv-instead-of-setenv.patch +35de44f17737a50ef0a76116244eae9e 0003-Remove-more-GCC-specific-Wall.patch +16477a0ba0a265d4d36bfbed00a5018d 0004-Use-inttypes.h-instead-of-stdint.h.patch +bbeb1ac0c41643a7f0a90e81a7cc0f18 0005-Do-not-return-values-in-void-functions-and-make-seco.patch +a019ebad5677f5f85a4c18e3ad584bb0 0006-Remove-definition-on-Solaris-confusing-includes.patch +f370d257f076fbd269edbff912d281d1 0007-Honour-CPPFLAGS.patch +e1fbbd9d96ec7c2377b1b286689c1b83 bitlbee-1.2.8.tar.gz Added: csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch =================================================================== --- csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch (rev 0) +++ csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch 2010-08-06 14:42:11 UTC (rev 10705) @@ -0,0 +1,37 @@ +From 7069c4750ecf45a92810d9610ee040206b8afc41 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 6 Aug 2010 14:49:34 +0200 +Subject: [PATCH 1/6] Do not use gcc-specific -Wall + +--- + Makefile | 1 - + lib/Makefile | 1 - + 2 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 15db509..fd49aef 100644 +--- a/Makefile ++++ b/Makefile +@@ -25,7 +25,6 @@ endif + + # Expansion of variables + subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o) +-CFLAGS += -Wall + + all: $(OUTFILE) + $(MAKE) -C doc +diff --git a/lib/Makefile b/lib/Makefile +index 441634c..d1149b0 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -11,7 +11,6 @@ + # [SH] Program variables + objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o oauth.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o + +-CFLAGS += -Wall + LFLAGS += -r + + # [SH] Phony targets +-- +1.7.1 + Added: csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch =================================================================== --- csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch (rev 0) +++ csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch 2010-08-06 14:42:11 UTC (rev 10705) @@ -0,0 +1,49 @@ +From c876a8c9db773cccaf4da87a7a30d95bff0e42d9 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 6 Aug 2010 15:32:10 +0200 +Subject: [PATCH 2/6] Use putenv instead of setenv + +--- + conf.c | 6 ++++++ + unix.c | 6 ++++++ + 2 files changed, 12 insertions(+), 0 deletions(-) + +diff --git a/conf.c b/conf.c +index 337d0cf..21802b8 100644 +--- a/conf.c ++++ b/conf.c +@@ -159,7 +159,13 @@ conf_t *conf_load( int argc, char *argv[] ) + /* Backward compatibility; older BitlBees passed this + info using a command-line flag. Allow people to + upgrade from such a version for now. */ ++#if(__sun) ++ char dummy[100]; ++ g_snprintf( dummy, sizeof( dummy ), "_BITLBEE_RESTART_STATE=%s", optarg ); ++ putenv( dummy ); ++#else + setenv( "_BITLBEE_RESTART_STATE", optarg, 0 ); ++#endif + } + else if( opt == 'u' ) + { +diff --git a/unix.c b/unix.c +index d58395a..fbf64ef 100644 +--- a/unix.c ++++ b/unix.c +@@ -155,7 +155,13 @@ int main( int argc, char *argv[] ) + + chdir( old_cwd ); + ++#if(__sun) ++ char dummy[100]; ++ g_snprintf( dummy, sizeof( dummy ), "_BITLBEE_RESTART_STATE=%s", fn ); ++ putenv( dummy ); ++#else + setenv( "_BITLBEE_RESTART_STATE", fn, 1 ); ++#endif + g_free( fn ); + + close( global.listen_socket ); +-- +1.7.1 + Added: csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch =================================================================== --- csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch (rev 0) +++ csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch 2010-08-06 14:42:11 UTC (rev 10705) @@ -0,0 +1,90 @@ +From cdcf79c13688a644aa23d8421a43f93f00386d69 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 6 Aug 2010 15:33:32 +0200 +Subject: [PATCH 3/6] Remove more GCC specific -Wall + +--- + protocols/Makefile | 1 - + protocols/jabber/Makefile | 1 - + protocols/msn/Makefile | 1 - + protocols/oscar/Makefile | 1 - + protocols/twitter/Makefile | 1 - + protocols/yahoo/Makefile | 2 +- + 6 files changed, 1 insertions(+), 6 deletions(-) + +diff --git a/protocols/Makefile b/protocols/Makefile +index 18d79e8..b360808 100644 +--- a/protocols/Makefile ++++ b/protocols/Makefile +@@ -20,7 +20,6 @@ subdirobjs = $(PROTOOBJS) + + # Expansion of variables + subdirobjs := $(join $(subdirs),$(addprefix /,$(subdirobjs))) +-CFLAGS += -Wall + LFLAGS += -r + + # [SH] Phony targets +diff --git a/protocols/jabber/Makefile b/protocols/jabber/Makefile +index e7a505b..f41e616 100644 +--- a/protocols/jabber/Makefile ++++ b/protocols/jabber/Makefile +@@ -11,7 +11,6 @@ + # [SH] Program variables + objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o + +-CFLAGS += -Wall + LFLAGS += -r + + # [SH] Phony targets +diff --git a/protocols/msn/Makefile b/protocols/msn/Makefile +index 6a58861..4089eda 100644 +--- a/protocols/msn/Makefile ++++ b/protocols/msn/Makefile +@@ -11,7 +11,6 @@ + # [SH] Program variables + objects = msn.o msn_util.o ns.o passport.o sb.o tables.o + +-CFLAGS += -Wall + LFLAGS += -r + + # [SH] Phony targets +diff --git a/protocols/oscar/Makefile b/protocols/oscar/Makefile +index 2792f22..5e9307d 100644 +--- a/protocols/oscar/Makefile ++++ b/protocols/oscar/Makefile +@@ -11,7 +11,6 @@ + # [SH] Program variables + objects = admin.o auth.o bos.o buddylist.o chat.o chatnav.o conn.o icq.o im.o info.o misc.o msgcookie.o rxhandlers.o rxqueue.o search.o service.o snac.o ssi.o stats.o tlv.o txqueue.o oscar_util.o oscar.o + +-CFLAGS += -Wall + LFLAGS += -r + + # [SH] Phony targets +diff --git a/protocols/twitter/Makefile b/protocols/twitter/Makefile +index ca1e469..111ae4b 100644 +--- a/protocols/twitter/Makefile ++++ b/protocols/twitter/Makefile +@@ -11,7 +11,6 @@ + # [SH] Program variables + objects = twitter.o twitter_http.o twitter_lib.o + +-CFLAGS += -Wall + LFLAGS += -r + + # [SH] Phony targets +diff --git a/protocols/yahoo/Makefile b/protocols/yahoo/Makefile +index b4fe56e..a38a1cb 100644 +--- a/protocols/yahoo/Makefile ++++ b/protocols/yahoo/Makefile +@@ -11,7 +11,7 @@ + # [SH] Program variables + objects = yahoo.o crypt.o libyahoo2.o yahoo_fn.o yahoo_httplib.o yahoo_util.o + +-CFLAGS += -Wall -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB ++CFLAGS += -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB + LFLAGS += -r + + # [SH] Phony targets +-- +1.7.1 + Added: csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch (rev 0) +++ csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch 2010-08-06 14:42:11 UTC (rev 10705) @@ -0,0 +1,64 @@ +From 389ee34d25b02a9ad2df1da49d9f6035766f3c45 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 6 Aug 2010 15:34:40 +0200 +Subject: [PATCH 4/6] Use inttypes.h instead of stdint.h + +--- + lib/md5.h | 4 ++++ + lib/sha1.h | 4 ++++ + protocols/nogaim.h | 6 ++++++ + 3 files changed, 14 insertions(+), 0 deletions(-) + +diff --git a/lib/md5.h b/lib/md5.h +index 094507b..3ba2858 100644 +--- a/lib/md5.h ++++ b/lib/md5.h +@@ -26,7 +26,11 @@ + + #include + #include ++#if(__sun) ++#include ++#else + #include ++#endif + + typedef uint8_t md5_byte_t; + typedef struct MD5Context { +diff --git a/lib/sha1.h b/lib/sha1.h +index 368c066..4ef8ac9 100644 +--- a/lib/sha1.h ++++ b/lib/sha1.h +@@ -23,7 +23,11 @@ + #ifndef _SHA1_H_ + #define _SHA1_H_ + ++#if(__sun) ++#include ++#else + #include ++#endif + #include + + #ifndef _SHA_enum_ +diff --git a/protocols/nogaim.h b/protocols/nogaim.h +index 48a8041..27ef511 100644 +--- a/protocols/nogaim.h ++++ b/protocols/nogaim.h +@@ -38,7 +38,13 @@ + #ifndef _NOGAIM_H + #define _NOGAIM_H + ++#if(__sun) ++#include ++#else + #include ++#endif ++ ++#include "lib/events.h" + + #include "bitlbee.h" + #include "account.h" +-- +1.7.1 + Added: csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch =================================================================== --- csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch (rev 0) +++ csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch 2010-08-06 14:42:11 UTC (rev 10705) @@ -0,0 +1,209 @@ +From 858b58c86e8a1150d7ca3ab3f8ae5c8b83ad5f36 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 6 Aug 2010 15:37:29 +0200 +Subject: [PATCH 5/6] Do not return values in void functions and make second argument in ternary explicit + +--- + irc_commands.c | 3 ++- + lib/oauth.c | 2 +- + lib/xmltree.c | 3 ++- + protocols/jabber/jabber.c | 4 ++-- + protocols/jabber/message.c | 4 ++-- + protocols/msn/msn.c | 2 +- + protocols/nogaim.c | 13 +++++++------ + protocols/yahoo/libyahoo2.c | 9 +++++---- + 8 files changed, 22 insertions(+), 18 deletions(-) + +diff --git a/irc_commands.c b/irc_commands.c +index 7a286ce..e1a2201 100644 +--- a/irc_commands.c ++++ b/irc_commands.c +@@ -38,7 +38,8 @@ static void irc_cmd_pass( irc_t *irc, char **cmd ) + command last. (Possibly it won't send it at all if it turns + out we don't require it, which will break this feature.) + Try to identify using the given password. */ +- return root_command( irc, send_cmd ); ++ root_command( irc, send_cmd ); ++ return; + } + /* Handling in pre-logged-in state, first see if this server is + password-protected: */ +diff --git a/lib/oauth.c b/lib/oauth.c +index c60a5a5..57dd10f 100644 +--- a/lib/oauth.c ++++ b/lib/oauth.c +@@ -59,7 +59,7 @@ static char *oauth_sign( const char *method, const char *url, + else + { + g_snprintf( (gchar*) key, HMAC_BLOCK_SIZE + 1, "%s&%s", +- oi->sp->consumer_secret, oi->token_secret ? : "" ); ++ oi->sp->consumer_secret, oi->token_secret ? oi->token_secret : "" ); + } + + /* Inner part: H(K XOR 0x36, text) */ +diff --git a/lib/xmltree.c b/lib/xmltree.c +index 31f8ee9..3da6e42 100644 +--- a/lib/xmltree.c ++++ b/lib/xmltree.c +@@ -214,7 +214,8 @@ void xt_cleanup( struct xt_parser *xt, struct xt_node *node, int depth ) + return; + + if( node == NULL ) +- return xt_cleanup( xt, xt->root, depth ); ++ xt_cleanup( xt, xt->root, depth ); ++ return; + + if( node->flags & XT_SEEN && node == xt->root ) + { +diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c +index 75351d0..c24d231 100644 +--- a/protocols/jabber/jabber.c ++++ b/protocols/jabber/jabber.c +@@ -366,7 +366,7 @@ static void jabber_get_info( struct im_connection *ic, char *who ) + imcb_log( ic, "Buddy %s (%d) information:", bud->full_jid, bud->priority ); + if( bud->away_state ) + imcb_log( ic, "Away state: %s", bud->away_state->full_name ); +- imcb_log( ic, "Status message: %s", bud->away_message ? : "(none)" ); ++ imcb_log( ic, "Status message: %s", bud->away_message ? bud->away_message : "(none)" ); + + bud = bud->next; + } +@@ -381,7 +381,7 @@ static void jabber_set_away( struct im_connection *ic, char *state_txt, char *me + /* state_txt == NULL -> Not away. + Unknown state -> fall back to the first defined away state. */ + jd->away_state = state_txt ? jabber_away_state_by_name( state_txt ) +- ? : jabber_away_state_list : NULL; ++ ? jabber_away_state_by_name( state_txt ) : jabber_away_state_list : NULL; + + g_free( jd->away_message ); + jd->away_message = ( message && *message ) ? g_strdup( message ) : NULL; +diff --git a/protocols/jabber/message.c b/protocols/jabber/message.c +index fa915bd..86dd6f5 100644 +--- a/protocols/jabber/message.c ++++ b/protocols/jabber/message.c +@@ -58,7 +58,7 @@ xt_status jabber_pkt_message( struct xt_node *node, gpointer data ) + ( inv = xt_find_node( c->children, "invite" ) ) ) + { + room = from; +- from = xt_find_attr( inv, "from" ) ? : from; ++ from = xt_find_attr( inv, "from" ) ? xt_find_attr( inv, "from" ) : from; + + g_string_append_printf( fullmsg, "<< \002BitlBee\002 - Invitation to chatroom %s >>\n", room ); + if( ( reason = xt_find_node( inv->children, "reason" ) ) && reason->text_len > 0 ) +@@ -71,7 +71,7 @@ xt_status jabber_pkt_message( struct xt_node *node, gpointer data ) + if( bud ) + { + bud->last_msg = time( NULL ); +- from = bud->ext_jid ? : bud->bare_jid; ++ from = bud->ext_jid ? bud->ext_jid : bud->bare_jid; + } + else + *s = 0; /* We need to generate a bare JID now. */ +diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c +index 7dbdb9d..0e7e73c 100644 +--- a/protocols/msn/msn.c ++++ b/protocols/msn/msn.c +@@ -153,7 +153,7 @@ static void msn_set_away( struct im_connection *ic, char *state, char *message ) + struct msn_data *md = ic->proto_data; + + if( state ) +- md->away_state = msn_away_state_by_name( state ) ? : ++ md->away_state = msn_away_state_by_name( state ) ? msn_away_state_by_name( state ) : + msn_away_state_list + 1; + else + md->away_state = msn_away_state_list; +diff --git a/protocols/nogaim.c b/protocols/nogaim.c +index 2248d11..12940a3 100644 +--- a/protocols/nogaim.c ++++ b/protocols/nogaim.c +@@ -578,7 +578,7 @@ void imcb_ask_auth( struct im_connection *ic, const char *handle, const char *re + realname_ = g_strdup_printf( " (%s)", realname ); + + s = g_strdup_printf( "The user %s%s wants to add you to his/her buddy list.", +- handle, realname_ ?: "" ); ++ handle, realname_ ? realname_ : "" ); + + g_free( realname_ ); + +@@ -600,7 +600,8 @@ static void imcb_ask_add_cb_yes( void *data ) + + cbd->ic->acc->prpl->add_buddy( cbd->ic, cbd->handle, NULL ); + +- return imcb_ask_add_cb_no( data ); ++ imcb_ask_add_cb_no( data ); ++ return; + } + + void imcb_ask_add( struct im_connection *ic, const char *handle, const char *realname ) +@@ -971,7 +972,7 @@ void imcb_chat_msg( struct groupchat *c, const char *who, char *msg, uint32_t fl + char *ts = NULL; + if( set_getbool( &ic->irc->set, "display_timestamps" ) ) + ts = format_timestamp( ic->irc, sent_at ); +- irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, ts ? : "", wrapped ); ++ irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, ts ? ts : "", wrapped ); + g_free( ts ); + } + else +@@ -1302,17 +1303,17 @@ int imc_away_send_update( struct im_connection *ic ) + return 0; + + away = set_getstr( &ic->acc->set, "away" ) ? +- : set_getstr( &ic->irc->set, "away" ); ++ set_getstr( &ic->acc->set, "away" ) : set_getstr( &ic->irc->set, "away" ); + if( away && *away ) + { + GList *m = ic->acc->prpl->away_states( ic ); + msg = ic->acc->flags & ACC_FLAG_AWAY_MESSAGE ? away : NULL; +- away = imc_away_state_find( m, away, &msg ) ? : m->data; ++ away = imc_away_state_find( m, away, &msg ) ? imc_away_state_find( m, away, &msg ) : m->data; + } + else if( ic->acc->flags & ACC_FLAG_STATUS_MESSAGE ) + { + away = NULL; +- msg = set_getstr( &ic->acc->set, "status" ) ? ++ msg = set_getstr( &ic->acc->set, "status" ) ? set_getstr( &ic->acc->set, "status" ) + : set_getstr( &ic->irc->set, "status" ); + } + +diff --git a/protocols/yahoo/libyahoo2.c b/protocols/yahoo/libyahoo2.c +index 1bfc2e5..eeab5a1 100644 +--- a/protocols/yahoo/libyahoo2.c ++++ b/protocols/yahoo/libyahoo2.c +@@ -2366,7 +2366,8 @@ static void yahoo_https_auth_token_finish(struct http_request *req) + goto fail; + } + +- return yahoo_https_auth_init(had); ++ yahoo_https_auth_init(had); ++ return; + + fail: + g_free(had->token); +@@ -4369,7 +4370,7 @@ void yahoo_accept_buddy_ymsg13(int id,const char* me,const char* who){ + struct yahoo_packet* pkt=NULL; + pkt= yahoo_packet_new(YAHOO_SERVICE_CONTACT_YMSG13,YAHOO_STATUS_AVAILABLE,0); + +- yahoo_packet_hash(pkt,1,me ?: yd->user); ++ yahoo_packet_hash(pkt,1,me ? me : yd->user); + yahoo_packet_hash(pkt,5,who); + yahoo_packet_hash(pkt,13,"1"); + yahoo_packet_hash(pkt,334,"0"); +@@ -4388,13 +4389,13 @@ void yahoo_reject_buddy_ymsg13(int id,const char* me,const char* who,const char* + struct yahoo_packet* pkt=NULL; + pkt= yahoo_packet_new(YAHOO_SERVICE_CONTACT_YMSG13,YAHOO_STATUS_AVAILABLE,0); + +- yahoo_packet_hash(pkt,1,me ?: yd->user); ++ yahoo_packet_hash(pkt,1,me ? me : yd->user); + yahoo_packet_hash(pkt,5,who); + // yahoo_packet_hash(pkt,241,YAHOO_PROTO_VER); + yahoo_packet_hash(pkt,13,"2"); + yahoo_packet_hash(pkt,334,"0"); + yahoo_packet_hash(pkt,97,"1"); +- yahoo_packet_hash(pkt,14,msg?:""); ++ yahoo_packet_hash(pkt,14,msg? msg :""); + + yahoo_send_packet(yid, pkt, 0); + yahoo_packet_free(pkt); +-- +1.7.1 + Added: csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch =================================================================== --- csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch (rev 0) +++ csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch 2010-08-06 14:42:11 UTC (rev 10705) @@ -0,0 +1,34 @@ +From 442db668872dfbe469e8b272a86109511f45523f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 6 Aug 2010 15:38:01 +0200 +Subject: [PATCH 6/6] Remove definition on Solaris confusing includes + +--- + protocols/twitter/twitter_lib.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/protocols/twitter/twitter_lib.c b/protocols/twitter/twitter_lib.c +index d1b65c2..8e9c5af 100644 +--- a/protocols/twitter/twitter_lib.c ++++ b/protocols/twitter/twitter_lib.c +@@ -22,7 +22,10 @@ + ****************************************************************************/ + + /* For strptime(): */ ++#if(__sun) ++#else + #define _XOPEN_SOURCE ++#endif + + #include "twitter_http.h" + #include "twitter.h" +@@ -735,4 +738,4 @@ void twitter_friendships_create_destroy(struct im_connection *ic, char *who, int + args[0] = "screen_name"; + args[1] = who; + twitter_http(ic, create ? TWITTER_FRIENDSHIPS_CREATE_URL : TWITTER_FRIENDSHIPS_DESTROY_URL, twitter_http_post, ic, 1, args, 2); +-} +\ No newline at end of file ++} +-- +1.7.1 + Added: csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch =================================================================== --- csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch (rev 0) +++ csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch 2010-08-06 14:42:11 UTC (rev 10705) @@ -0,0 +1,25 @@ +From 484c67ccecd26bde8992d79a8a2260fa91bfef40 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 6 Aug 2010 16:00:48 +0200 +Subject: [PATCH] Honour CPPFLAGS + +--- + configure | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/configure b/configure +index 24f60d7..756d144 100755 +--- a/configure ++++ b/configure +@@ -159,6 +159,8 @@ fi + echo CFLAGS=$CFLAGS >> Makefile.settings + echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings + ++echo CFLAGS+=$CPPFLAGS >> Makefile.settings ++ + echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings + + if [ -n "$CC" ]; then +-- +1.7.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 Fri Aug 6 17:48:08 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 06 Aug 2010 15:48:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[10706] csw/mgar/pkg/bitlbee/trunk/Makefile Message-ID: Revision: 10706 http://gar.svn.sourceforge.net/gar/?rev=10706&view=rev Author: dmichelsen Date: 2010-08-06 15:48:08 +0000 (Fri, 06 Aug 2010) Log Message: ----------- bitlbee: Add comment about upstream bug report Modified Paths: -------------- csw/mgar/pkg/bitlbee/trunk/Makefile Modified: csw/mgar/pkg/bitlbee/trunk/Makefile =================================================================== --- csw/mgar/pkg/bitlbee/trunk/Makefile 2010-08-06 14:42:11 UTC (rev 10705) +++ csw/mgar/pkg/bitlbee/trunk/Makefile 2010-08-06 15:48:08 UTC (rev 10706) @@ -14,6 +14,8 @@ MASTER_SITES = http://get.bitlbee.org/src/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# Use these patches until this is fixed: +# http://bugs.bitlbee.org/bitlbee/ticket/667 PATCHFILES = 0001-Do-not-use-gcc-specific-Wall.patch PATCHFILES += 0002-Use-putenv-instead-of-setenv.patch PATCHFILES += 0003-Remove-more-GCC-specific-Wall.patch @@ -28,16 +30,12 @@ # File name regex to get notifications about upstream software releases UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# Build mechanism ignores CPPFLAGS -# EXTRA_CFLAGS = $(CPPFLAGS) - BUILD_DEP_PKGS = CSWossldevel CSWlibevent-devel CSWggettext CSWglib2devel RUNTIME_DEP_PKGS = CSWosslrt CSWlibevent CSWggettextrt CSWglib2 sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw -# bash configure --prefix=/opt/csw --ssl=openssl --events=libevent CONFIGURE_SCRIPTS = custom CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += --etcdir=$(sysconfdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Aug 7 22:02:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 07 Aug 2010 20:02:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[10707] csw/mgar/pkg/cpan/Authen-PAM/trunk Message-ID: Revision: 10707 http://gar.svn.sourceforge.net/gar/?rev=10707&view=rev Author: dmichelsen Date: 2010-08-07 20:02:48 +0000 (Sat, 07 Aug 2010) Log Message: ----------- cpan/Authen-PAM: Move to mGAR v2 and add copyright Modified Paths: -------------- csw/mgar/pkg/cpan/Authen-PAM/trunk/Makefile csw/mgar/pkg/cpan/Authen-PAM/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Authen-PAM/trunk/files/COPYING Property Changed: ---------------- csw/mgar/pkg/cpan/Authen-PAM/trunk/ Property changes on: csw/mgar/pkg/cpan/Authen-PAM/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/Authen-PAM/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Authen-PAM/trunk/Makefile 2010-08-06 15:48:08 UTC (rev 10706) +++ csw/mgar/pkg/cpan/Authen-PAM/trunk/Makefile 2010-08-07 20:02:48 UTC (rev 10707) @@ -13,8 +13,11 @@ conversation function is used (Authen::PAM::pam_default_conv). endef +DISTFILES = COPYING + # Disable interactive tests PATCHFILES = itest.diff + # Fix names PACKAGES = CSWpmauthenpam CATALOGNAME = pm_authenpam Modified: csw/mgar/pkg/cpan/Authen-PAM/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Authen-PAM/trunk/checksums 2010-08-06 15:48:08 UTC (rev 10706) +++ csw/mgar/pkg/cpan/Authen-PAM/trunk/checksums 2010-08-07 20:02:48 UTC (rev 10707) @@ -1,2 +1,3 @@ -7278471dfa694d9ef312bc92d7099af2 download/Authen-PAM-0.16.tar.gz -fd6a276dbc9e14fb54a2bfc4138ffd94 download/itest.diff +7278471dfa694d9ef312bc92d7099af2 Authen-PAM-0.16.tar.gz +27d5bc1a7587a17a4439b5bf69325cae COPYING +fd6a276dbc9e14fb54a2bfc4138ffd94 itest.diff Added: csw/mgar/pkg/cpan/Authen-PAM/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Authen-PAM/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Authen-PAM/trunk/files/COPYING 2010-08-07 20:02:48 UTC (rev 10707) @@ -0,0 +1,3 @@ +Copyright (c) 1998-2005 Nikolay Pelov. All rights reserved. This +program is free software; you can redistribute it and/or modify it +under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Aug 9 10:57:19 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 09 Aug 2010 08:57:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[10708] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 10708 http://gar.svn.sourceforge.net/gar/?rev=10708&view=rev Author: bonivart Date: 2010-08-09 08:57:19 +0000 (Mon, 09 Aug 2010) Log Message: ----------- memconf: update to 2.16 Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile csw/mgar/pkg/memconf/trunk/checksums Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2010-08-07 20:02:48 UTC (rev 10707) +++ csw/mgar/pkg/memconf/trunk/Makefile 2010-08-09 08:57:19 UTC (rev 10708) @@ -1,5 +1,5 @@ GARNAME = memconf -GARVERSION = 2.15 +GARVERSION = 2.16 CATEGORIES = utils DESCRIPTION = Perl script that displays memory modules installed Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2010-08-07 20:02:48 UTC (rev 10707) +++ csw/mgar/pkg/memconf/trunk/checksums 2010-08-09 08:57:19 UTC (rev 10708) @@ -1,3 +1,3 @@ 818efbe29da417ad462e3f6345690c3d COPYING -d723f5c6a0a8971d2e8f21d73f162784 memconf.gz -8f0a2f7685b8dfeeb506ed28bdd7e364 memconf.man +53e202902c198e56d9223803e4e857be memconf.gz +5e13adbfce546b47d8cc84261c3738e2 memconf.man This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Aug 9 11:44:07 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 09 Aug 2010 09:44:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[10709] csw/mgar/pkg/powerdns/branches Message-ID: Revision: 10709 http://gar.svn.sourceforge.net/gar/?rev=10709&view=rev Author: idogan23 Date: 2010-08-09 09:44:06 +0000 (Mon, 09 Aug 2010) Log Message: ----------- powerdns: oracle backend Modified Paths: -------------- csw/mgar/pkg/powerdns/branches/oracle/Makefile csw/mgar/pkg/powerdns/branches/oracle/checksums Added Paths: ----------- csw/mgar/pkg/powerdns/branches/oracle/ csw/mgar/pkg/powerdns/branches/oracle/gar Modified: csw/mgar/pkg/powerdns/branches/oracle/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2010-08-05 06:44:09 UTC (rev 10701) +++ csw/mgar/pkg/powerdns/branches/oracle/Makefile 2010-08-09 09:44:06 UTC (rev 10709) @@ -27,12 +27,16 @@ GARCOMPILER = GCC3 PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 SKIPTEST = 1 -EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/mysql +#EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/mysql +EXTRA_LIB = /opt/csw/instantclient_10_2 +EXTRA_INC = /opt/csw/instantclient_10_2/sdk/include CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw/pdns -CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql5 +#CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql5 +CONFIGURE_ARGS += --with-dynmodules=goracle RUNTIME_DEP_PKGS_CSWpdns += CSWzlib RUNTIME_DEP_PKGS_CSWpdns += CSWgcc3core Modified: csw/mgar/pkg/powerdns/branches/oracle/checksums =================================================================== --- csw/mgar/pkg/powerdns/trunk/checksums 2010-08-05 06:44:09 UTC (rev 10701) +++ csw/mgar/pkg/powerdns/branches/oracle/checksums 2010-08-09 09:44:06 UTC (rev 10709) @@ -1,4 +1,5 @@ 532949f5046c424fc6e8970e0e269d24 0001-stdint.h-patch.patch +047735b398e5fa1e064f9223825e0797 0002-Oraclebackend-Makefile.patch b234ee4d69f5fce4486a80fdaf4a4263 LICENSE 8bf1c6c58ca47f3accb98b71e9af8024 cswpdns 8a6ff842733aca885577eb54e983a1ff pdns-2.9.22.tar.gz Added: csw/mgar/pkg/powerdns/branches/oracle/gar =================================================================== --- csw/mgar/pkg/powerdns/branches/oracle/gar (rev 0) +++ csw/mgar/pkg/powerdns/branches/oracle/gar 2010-08-09 09:44:06 UTC (rev 10709) @@ -0,0 +1 @@ +link ../../../gar/v2 \ No newline at end of file Property changes on: csw/mgar/pkg/powerdns/branches/oracle/gar ___________________________________________________________________ Added: svn:special + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Aug 9 11:48:03 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 09 Aug 2010 09:48:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[10710] csw/mgar/pkg/powerdns/branches Message-ID: Revision: 10710 http://gar.svn.sourceforge.net/gar/?rev=10710&view=rev Author: idogan23 Date: 2010-08-09 09:48:03 +0000 (Mon, 09 Aug 2010) Log Message: ----------- powerdns: opendbx backend Modified Paths: -------------- csw/mgar/pkg/powerdns/branches/opendbx/Makefile Added Paths: ----------- csw/mgar/pkg/powerdns/branches/opendbx/ Modified: csw/mgar/pkg/powerdns/branches/opendbx/Makefile =================================================================== --- csw/mgar/pkg/powerdns/trunk/Makefile 2010-08-05 06:44:09 UTC (rev 10701) +++ csw/mgar/pkg/powerdns/branches/opendbx/Makefile 2010-08-09 09:48:03 UTC (rev 10710) @@ -27,17 +27,17 @@ GARCOMPILER = GCC3 PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 SKIPTEST = 1 -EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/mysql CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw/pdns -CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql5 +CONFIGURE_ARGS += --with-modules="" +CONFIGURE_ARGS += --with-dynmodules=opendbx RUNTIME_DEP_PKGS_CSWpdns += CSWzlib RUNTIME_DEP_PKGS_CSWpdns += CSWgcc3core RUNTIME_DEP_PKGS_CSWpdns += CSWgcc3g++ -RUNTIME_DEP_PKGS_CSWpdns += CSWmysql5rt INITSMF = /etc/opt/csw/init.d/cswpdns PRESERVECONF = /etc/opt/csw/pdns/pdns.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Aug 9 11:48:33 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 09 Aug 2010 09:48:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[10711] csw/mgar/pkg/powerdns/branches/opendbx/gar Message-ID: Revision: 10711 http://gar.svn.sourceforge.net/gar/?rev=10711&view=rev Author: idogan23 Date: 2010-08-09 09:48:33 +0000 (Mon, 09 Aug 2010) Log Message: ----------- powerdns: opendbx backend Added Paths: ----------- csw/mgar/pkg/powerdns/branches/opendbx/gar Added: csw/mgar/pkg/powerdns/branches/opendbx/gar =================================================================== --- csw/mgar/pkg/powerdns/branches/opendbx/gar (rev 0) +++ csw/mgar/pkg/powerdns/branches/opendbx/gar 2010-08-09 09:48:33 UTC (rev 10711) @@ -0,0 +1 @@ +link ../../../gar/v2 \ No newline at end of file Property changes on: csw/mgar/pkg/powerdns/branches/opendbx/gar ___________________________________________________________________ Added: svn:special + * 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 Aug 9 13:24:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 09 Aug 2010 11:24:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[10712] csw/mgar/pkg/bitlbee/trunk Message-ID: Revision: 10712 http://gar.svn.sourceforge.net/gar/?rev=10712&view=rev Author: dmichelsen Date: 2010-08-09 11:24:31 +0000 (Mon, 09 Aug 2010) Log Message: ----------- bitlbee: Update patches Modified Paths: -------------- csw/mgar/pkg/bitlbee/trunk/checksums csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch Modified: csw/mgar/pkg/bitlbee/trunk/checksums =================================================================== --- csw/mgar/pkg/bitlbee/trunk/checksums 2010-08-09 09:48:33 UTC (rev 10711) +++ csw/mgar/pkg/bitlbee/trunk/checksums 2010-08-09 11:24:31 UTC (rev 10712) @@ -1,8 +1,8 @@ -86455864950f3515af0aa3139261116d 0001-Do-not-use-gcc-specific-Wall.patch -eb620e3a4a5039257e82e5b79b11a53e 0002-Use-putenv-instead-of-setenv.patch -35de44f17737a50ef0a76116244eae9e 0003-Remove-more-GCC-specific-Wall.patch -16477a0ba0a265d4d36bfbed00a5018d 0004-Use-inttypes.h-instead-of-stdint.h.patch -bbeb1ac0c41643a7f0a90e81a7cc0f18 0005-Do-not-return-values-in-void-functions-and-make-seco.patch -a019ebad5677f5f85a4c18e3ad584bb0 0006-Remove-definition-on-Solaris-confusing-includes.patch -f370d257f076fbd269edbff912d281d1 0007-Honour-CPPFLAGS.patch +ae9718936480f859cf6b0d39ec93e04f 0001-Do-not-use-gcc-specific-Wall.patch +6fb308585251a3ec0e251609e1128952 0002-Use-putenv-instead-of-setenv.patch +0a8b0c91ad0798dbc04b30fd507939ca 0003-Remove-more-GCC-specific-Wall.patch +923dcd920f8b344cef23f885dda940bf 0004-Use-inttypes.h-instead-of-stdint.h.patch +a13a0dc7e11f2b7ba8910177b6f1ee82 0005-Do-not-return-values-in-void-functions-and-make-seco.patch +b4cf29e2d43be14af89df872f56c0aa4 0006-Remove-definition-on-Solaris-confusing-includes.patch +9b14d3589eebd1302b1882dfd4f237d2 0007-Honour-CPPFLAGS.patch e1fbbd9d96ec7c2377b1b286689c1b83 bitlbee-1.2.8.tar.gz Modified: csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch =================================================================== --- csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch 2010-08-09 09:48:33 UTC (rev 10711) +++ csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch 2010-08-09 11:24:31 UTC (rev 10712) @@ -1,7 +1,7 @@ -From 7069c4750ecf45a92810d9610ee040206b8afc41 Mon Sep 17 00:00:00 2001 +From 86659ed531ff3ca4fa2e208af33112253629842e Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen Date: Fri, 6 Aug 2010 14:49:34 +0200 -Subject: [PATCH 1/6] Do not use gcc-specific -Wall +Subject: [PATCH 1/7] Do not use gcc-specific -Wall --- Makefile | 1 - Modified: csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch =================================================================== --- csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch 2010-08-09 09:48:33 UTC (rev 10711) +++ csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch 2010-08-09 11:24:31 UTC (rev 10712) @@ -1,7 +1,7 @@ -From c876a8c9db773cccaf4da87a7a30d95bff0e42d9 Mon Sep 17 00:00:00 2001 +From ea865e1a0ea5f1b863726932b9e1b5e3b7a68fb1 Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen Date: Fri, 6 Aug 2010 15:32:10 +0200 -Subject: [PATCH 2/6] Use putenv instead of setenv +Subject: [PATCH 2/7] Use putenv instead of setenv --- conf.c | 6 ++++++ Modified: csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch =================================================================== --- csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch 2010-08-09 09:48:33 UTC (rev 10711) +++ csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch 2010-08-09 11:24:31 UTC (rev 10712) @@ -1,7 +1,7 @@ -From cdcf79c13688a644aa23d8421a43f93f00386d69 Mon Sep 17 00:00:00 2001 +From b09578c0ef70005711273da60809f3a0c1773e80 Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen Date: Fri, 6 Aug 2010 15:33:32 +0200 -Subject: [PATCH 3/6] Remove more GCC specific -Wall +Subject: [PATCH 3/7] Remove more GCC specific -Wall --- protocols/Makefile | 1 - Modified: csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch 2010-08-09 09:48:33 UTC (rev 10711) +++ csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch 2010-08-09 11:24:31 UTC (rev 10712) @@ -1,7 +1,7 @@ -From 389ee34d25b02a9ad2df1da49d9f6035766f3c45 Mon Sep 17 00:00:00 2001 +From a4e33ef8a76bde2a9d4644fb584d79a7d05cfffb Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen Date: Fri, 6 Aug 2010 15:34:40 +0200 -Subject: [PATCH 4/6] Use inttypes.h instead of stdint.h +Subject: [PATCH 4/7] Use inttypes.h instead of stdint.h --- lib/md5.h | 4 ++++ Modified: csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch =================================================================== --- csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch 2010-08-09 09:48:33 UTC (rev 10711) +++ csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch 2010-08-09 11:24:31 UTC (rev 10712) @@ -1,18 +1,18 @@ -From 858b58c86e8a1150d7ca3ab3f8ae5c8b83ad5f36 Mon Sep 17 00:00:00 2001 +From 5c47bf0d30984ad5197eac31cc8132c537d23e0b Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Fri, 6 Aug 2010 15:37:29 +0200 -Subject: [PATCH 5/6] Do not return values in void functions and make second argument in ternary explicit +Date: Mon, 9 Aug 2010 13:17:38 +0200 +Subject: [PATCH 5/7] Do not return values in void functions and make second argument in ternary explicit --- irc_commands.c | 3 ++- lib/oauth.c | 2 +- - lib/xmltree.c | 3 ++- + lib/xmltree.c | 5 ++++- protocols/jabber/jabber.c | 4 ++-- protocols/jabber/message.c | 4 ++-- protocols/msn/msn.c | 2 +- protocols/nogaim.c | 13 +++++++------ protocols/yahoo/libyahoo2.c | 9 +++++---- - 8 files changed, 22 insertions(+), 18 deletions(-) + 8 files changed, 24 insertions(+), 18 deletions(-) diff --git a/irc_commands.c b/irc_commands.c index 7a286ce..e1a2201 100644 @@ -42,16 +42,18 @@ /* Inner part: H(K XOR 0x36, text) */ diff --git a/lib/xmltree.c b/lib/xmltree.c -index 31f8ee9..3da6e42 100644 +index 31f8ee9..b0a945c 100644 --- a/lib/xmltree.c +++ b/lib/xmltree.c -@@ -214,7 +214,8 @@ void xt_cleanup( struct xt_parser *xt, struct xt_node *node, int depth ) +@@ -214,7 +214,10 @@ void xt_cleanup( struct xt_parser *xt, struct xt_node *node, int depth ) return; if( node == NULL ) - return xt_cleanup( xt, xt->root, depth ); ++ { + xt_cleanup( xt, xt->root, depth ); + return; ++ } if( node->flags & XT_SEEN && node == xt->root ) { Modified: csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch =================================================================== --- csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch 2010-08-09 09:48:33 UTC (rev 10711) +++ csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch 2010-08-09 11:24:31 UTC (rev 10712) @@ -1,7 +1,7 @@ -From 442db668872dfbe469e8b272a86109511f45523f Mon Sep 17 00:00:00 2001 +From 980174d20a57b873612760176c750a8ff70c769b Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen Date: Fri, 6 Aug 2010 15:38:01 +0200 -Subject: [PATCH 6/6] Remove definition on Solaris confusing includes +Subject: [PATCH 6/7] Remove definition on Solaris confusing includes --- protocols/twitter/twitter_lib.c | 5 ++++- Modified: csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch =================================================================== --- csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch 2010-08-09 09:48:33 UTC (rev 10711) +++ csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch 2010-08-09 11:24:31 UTC (rev 10712) @@ -1,14 +1,14 @@ -From 484c67ccecd26bde8992d79a8a2260fa91bfef40 Mon Sep 17 00:00:00 2001 +From 640bf1ba78d06215f0e7141fd50ddba0b58b350b Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen Date: Fri, 6 Aug 2010 16:00:48 +0200 -Subject: [PATCH] Honour CPPFLAGS +Subject: [PATCH 7/7] Honour CPPFLAGS --- configure | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure b/configure -index 24f60d7..756d144 100755 +index 24f60d7..4232a2c 100755 --- a/configure +++ b/configure @@ -159,6 +159,8 @@ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Aug 9 13:40:18 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 09 Aug 2010 11:40:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[10713] csw/mgar/pkg Message-ID: Revision: 10713 http://gar.svn.sourceforge.net/gar/?rev=10713&view=rev Author: idogan23 Date: 2010-08-09 11:40:18 +0000 (Mon, 09 Aug 2010) Log Message: ----------- opendbx: initial commit Added Paths: ----------- csw/mgar/pkg/opendbx/ csw/mgar/pkg/opendbx/branches/ csw/mgar/pkg/opendbx/tags/ csw/mgar/pkg/opendbx/trunk/ csw/mgar/pkg/opendbx/trunk/Makefile csw/mgar/pkg/opendbx/trunk/checksums csw/mgar/pkg/opendbx/trunk/files/ Property changes on: csw/mgar/pkg/opendbx/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/opendbx/trunk/Makefile =================================================================== --- csw/mgar/pkg/opendbx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/opendbx/trunk/Makefile 2010-08-09 11:40:18 UTC (rev 10713) @@ -0,0 +1,66 @@ +GARNAME = opendbx +GARVERSION = 1.4.5 +CATEGORIES = lib + +DESCRIPTION = A C library for accessing databases with a single API +define BLURB + OpenDBX is an extremely lightweight but extensible C library for + accessing databases with a single API. It provides a clean and simple + interface across all supported databases that leads to an elegant + code design automatically. Currently MySQL, PostgreSQL, SQLite + (v2 & 3), MSSQL and Sybase are supported and backends for more native + database APIs can be written easily. If you want your application to + support different databases with little effort, this is definitively + the right thing for you! +endef + +MASTER_SITES = http://www.linuxnetworks.de/opendbx/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWopendbx CSWopendbxdevel +CATALOGNAME_CSWopendbx = opendbx +CATALOGNAME_CSWopendbxdevel = opendbx_devel + +SPKG_DESC_CSWopendbx = $(DESCRIPTION) +SPKG_DESC_CSWopendbxdevel = $(DESCRIPTION) development package + +# File name regex to get notifications about upstream software releases +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 = + +GARCOMPILER = GCC4 +BUILD64 = 1 +#EXTRA_BUILD_ISAS_i386 = pentium_pro +#EXTRA_BUILD_ISAS_sparc = sparcv8plus +EXTRA_LIB = /opt/csw/mysql5/lib/mysql +EXTRA_INC = /opt/csw/mysql5/include/mysql + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-utils +CONFIGURE_ARGS += --with-backends=mysql + +PKGFILES_CSWopendbxdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWopendbx = $(PKGFILES_RT) + +#CONFIGURE_ARGS += --with-backends=oracle +#EXTRA_LIB = /opt/csw/instantclient_10_2 +#EXTRA_INC = /opt/csw/instantclient_10_2/sdk/include +#RUNTIME_DEP_PKGS_CSWopendbx += CSWorainstclient102 +#CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/libopendbx.so.1.2.0 +#CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/$ISALIST|opt/csw/lib/libopendbx.so.1.2.0 +#CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/libopendbxplus.so.1.0.0 +#CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/$ISALIST|opt/csw/lib/libopendbxplus.so.1.0.0 +#CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/opendbx/liboraclebackend.so.1.2.0 +#CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/$ISALIST|opt/csw/lib/opendbx/liboraclebackend.so.1.2.0 + +CHECKPKG_OVERRIDES_CSWopendbxdevel += surplus-dependency|CSWopendbx + +RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWopendbx += CSWggettextrt +RUNTIME_DEP_PKGS_CSWopendbxdevel += CSWopendbx + +include gar/category.mk Property changes on: csw/mgar/pkg/opendbx/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/opendbx/trunk/checksums =================================================================== --- csw/mgar/pkg/opendbx/trunk/checksums (rev 0) +++ csw/mgar/pkg/opendbx/trunk/checksums 2010-08-09 11:40:18 UTC (rev 10713) @@ -0,0 +1 @@ +8347e9583d83c5186dea14f992c19dec opendbx-1.4.5.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 Wed Aug 11 02:54:45 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 11 Aug 2010 00:54:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[10714] csw/mgar/gar/v2/bin/gem2pkg Message-ID: Revision: 10714 http://gar.svn.sourceforge.net/gar/?rev=10714&view=rev Author: bdwalton Date: 2010-08-11 00:54:45 +0000 (Wed, 11 Aug 2010) Log Message: ----------- gar/v2: add gem2pkg. next step is to integrate it Added Paths: ----------- csw/mgar/gar/v2/bin/gem2pkg Added: csw/mgar/gar/v2/bin/gem2pkg =================================================================== --- csw/mgar/gar/v2/bin/gem2pkg (rev 0) +++ csw/mgar/gar/v2/bin/gem2pkg 2010-08-11 00:54:45 UTC (rev 10714) @@ -0,0 +1,40 @@ +#!/opt/csw/bin/ruby -w + +require 'rubygems' +require 'rubygems/format' + +unless File.exists?(ARGV[0]) + $stderr.puts "Pass path to a valid .gem file as first argument. You gave: #{ARGV[0]}" + exit 1 +end + +begin + spec = Gem::Format.from_file_by_path(File.expand_path(ARGV[0])).spec + + blurb = spec.description.gsub("\n", ' ').squeeze.lstrip + + puts <<"EOF" +GARNAME = #{spec.name} +GARVERSION = #{spec.version} +CATEGORIES = rbgems + +DESCRIPTION = #{spec.summary} + +define BLURB +#{blurb.gsub(/(.{1,70})( +|$\n?)|(.{1,70})/, "\\1\\3\n")} +endef + +EOF + + spec.dependencies.each do |d| + puts "RUNTIME_DEP_PKGS += CSWgem-#{d.name}" + end + + puts "\nARCHALL = 1" if spec.extensions.size.eql?(0) + + puts "include gar/category.mk" +rescue Exception => e + # we could be more selective, but this catches _everything_ + $stderr.puts "Rescued exception of type #{e.class}" + $stderr.puts "Exception text: #{e.message}" +end Property changes on: csw/mgar/gar/v2/bin/gem2pkg ___________________________________________________________________ Added: svn:executable + * 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 Aug 11 04:19:58 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 11 Aug 2010 02:19:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[10715] csw/mgar/pkg/rbgems/Makefile Message-ID: Revision: 10715 http://gar.svn.sourceforge.net/gar/?rev=10715&view=rev Author: bdwalton Date: 2010-08-11 02:19:57 +0000 (Wed, 11 Aug 2010) Log Message: ----------- rbgems category: integrate gem2pkg script in newpkg target Modified Paths: -------------- csw/mgar/pkg/rbgems/Makefile Modified: csw/mgar/pkg/rbgems/Makefile =================================================================== --- csw/mgar/pkg/rbgems/Makefile 2010-08-11 00:54:45 UTC (rev 10714) +++ csw/mgar/pkg/rbgems/Makefile 2010-08-11 02:19:57 UTC (rev 10715) @@ -36,29 +36,20 @@ newpkg-%: dir = $(subst ::,-,$*) newpkg-%: @svn mkdir $(dir) $(dir)/tags $(dir)/branches $(dir)/trunk $(dir)/trunk/files - @(echo "GARNAME = $(dir)"; \ - echo "GARVERSION = 1.0"; \ - echo "CATEGORIES = rbgems"; \ - echo "AUTHOR = MYSELF"; \ - echo ""; \ - echo "DESCRIPTION = Brief description"; \ - echo "define BLURB"; \ - echo " Long description"; \ - echo "endef"; \ - echo ""; \ - echo "PACKAGES = CSW$(catalogname)"; \ - echo "CATALOGNAME = rb_$(catalogname)"; \ - echo ""; \ - echo "include gar/category.mk"; \ - ) > $(dir)/trunk/Makefile - @touch $(dir)/trunk/checksums - @svn add $(dir)/trunk/Makefile $(dir)/trunk/checksums - @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $(dir)/trunk - @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $(dir)/trunk + @if [ -d ../../gar/v2 ]; then \ ln -s ../../../../gar/v2 $(dir)/trunk/gar; \ + cd $(dir)/trunk/gar; svn update; \ else \ svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $(dir)/trunk/gar; \ fi + @echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $(dir)/trunk + @(cd $(dir)/trunk/; gem fetch $*; gar/bin/gem2pkg *gem > Makefile; rm *gem) + @( cd $(dir)/trunk; gmake fetch; gmake makesums; gmake garchive ); + @svn add $(dir)/trunk/Makefile $(dir)/trunk/checksums + @echo "work\n" | svn propset svn:ignore -F /dev/fd/0 $(dir)/trunk @echo @echo "Your package is set up for editing at $(dir)/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 Wed Aug 11 18:25:36 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 11 Aug 2010 16:25:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[10716] csw/mgar/pkg/cpan Message-ID: Revision: 10716 http://gar.svn.sourceforge.net/gar/?rev=10716&view=rev Author: bonivart Date: 2010-08-11 16:25:36 +0000 (Wed, 11 Aug 2010) Log Message: ----------- pm_xmlxslt: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/XML-XSLT/ csw/mgar/pkg/cpan/XML-XSLT/branches/ csw/mgar/pkg/cpan/XML-XSLT/tags/ csw/mgar/pkg/cpan/XML-XSLT/trunk/ csw/mgar/pkg/cpan/XML-XSLT/trunk/Makefile csw/mgar/pkg/cpan/XML-XSLT/trunk/checksums csw/mgar/pkg/cpan/XML-XSLT/trunk/files/ csw/mgar/pkg/cpan/XML-XSLT/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/XML-XSLT/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/XML-XSLT/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-XSLT/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/XML-XSLT/trunk/Makefile 2010-08-11 16:25:36 UTC (rev 10716) @@ -0,0 +1,19 @@ +GARNAME = XML-XSLT +GARVERSION = 0.48 +CATEGORIES = cpan +AUTHOR = JSTOWE + +DESCRIPTION = A perl module for processing XSLT +define BLURB + A perl module for processing XSLT +endef + +DISTFILES += COPYING + +PACKAGES = CSWpmxmlxslt +CATALOGNAME = pm_xmlxslt +ARCHALL = 1 + +RUNTIME_DEP_PKGS += CSWpmxmldom + +include gar/category.mk Added: csw/mgar/pkg/cpan/XML-XSLT/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-XSLT/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/XML-XSLT/trunk/checksums 2010-08-11 16:25:36 UTC (rev 10716) @@ -0,0 +1,2 @@ +de42f7b134d5b881b65dece0e42a060d COPYING +44d6d9e183d5c49c5d422ae42e7a9f68 XML-XSLT-0.48.tar.gz Added: csw/mgar/pkg/cpan/XML-XSLT/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/XML-XSLT/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/XML-XSLT/trunk/files/COPYING 2010-08-11 16:25:36 UTC (rev 10716) @@ -0,0 +1,10 @@ +Copyright (c) 1999 Geert Josten & Egon Willighagen. +Copyright (c) 2001 Mark A. Hershberger + +All rights reserved. + +This program is free software; you can redistribute it and/or modify it +under the same terms as Perl itself. + +The Perl licence can be found in the README file in the Perl source +distribution. 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 Aug 11 23:41:24 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 11 Aug 2010 21:41:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[10717] csw/mgar/pkg/nano/trunk Message-ID: Revision: 10717 http://gar.svn.sourceforge.net/gar/?rev=10717&view=rev Author: skayser Date: 2010-08-11 21:41:24 +0000 (Wed, 11 Aug 2010) Log Message: ----------- nano: version bump to 2.2.5 Modified Paths: -------------- csw/mgar/pkg/nano/trunk/Makefile csw/mgar/pkg/nano/trunk/files/changelog.CSW Modified: csw/mgar/pkg/nano/trunk/Makefile =================================================================== --- csw/mgar/pkg/nano/trunk/Makefile 2010-08-11 16:25:36 UTC (rev 10716) +++ csw/mgar/pkg/nano/trunk/Makefile 2010-08-11 21:41:24 UTC (rev 10717) @@ -1,5 +1,5 @@ GARNAME = nano -GARVERSION = 2.2.4 +GARVERSION = 2.2.5 CATEGORIES = utils DESCRIPTION = Enhanced clone of the Pico text editor Modified: csw/mgar/pkg/nano/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/nano/trunk/files/changelog.CSW 2010-08-11 16:25:36 UTC (rev 10716) +++ csw/mgar/pkg/nano/trunk/files/changelog.CSW 2010-08-11 21:41:24 UTC (rev 10717) @@ -1,3 +1,9 @@ +nano (2.2.5,REV=2010.08.11) + + * Version bump to 2.2.5. + + -- Sebastian Kayser Wed, 11 Aug 2010 23:40:47 +0200 + nano (2.2.4,REV=2010.07.30) * Version bump to 2.2.4. 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 Aug 11 23:54:47 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 11 Aug 2010 21:54:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[10718] csw/mgar/pkg/nano/trunk/checksums Message-ID: Revision: 10718 http://gar.svn.sourceforge.net/gar/?rev=10718&view=rev Author: skayser Date: 2010-08-11 21:54:47 +0000 (Wed, 11 Aug 2010) Log Message: ----------- nano: version bump to 2.2.5 Modified Paths: -------------- csw/mgar/pkg/nano/trunk/checksums Modified: csw/mgar/pkg/nano/trunk/checksums =================================================================== --- csw/mgar/pkg/nano/trunk/checksums 2010-08-11 21:41:24 UTC (rev 10717) +++ csw/mgar/pkg/nano/trunk/checksums 2010-08-11 21:54:47 UTC (rev 10718) @@ -1 +1 @@ -6304308afb1f7ef4a5e93eb99206632a nano-2.2.4.tar.gz +77a10a49589f975ce98350a4527a2ebf nano-2.2.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Aug 12 00:00:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 11 Aug 2010 22:00:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[10719] csw/mgar/pkg/mysql5/branches/mysql-5.1.x Message-ID: Revision: 10719 http://gar.svn.sourceforge.net/gar/?rev=10719&view=rev Author: wahwah Date: 2010-08-11 22:00:44 +0000 (Wed, 11 Aug 2010) Log Message: ----------- Setting MYSQLDATADIR=/var/opt/csw/mysql51 in the postinstall script. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.postinstall Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2010-08-11 21:54:47 UTC (rev 10718) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2010-08-11 22:00:44 UTC (rev 10719) @@ -2,7 +2,7 @@ 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 -16ec677592108d1eec22ca4f9f3d09e2 CSWmysql51.postinstall +07d91851bd734c60ad98dc2b39fafe0b CSWmysql51.postinstall 615c16877afb48ce809a849c1c5dbc35 CSWmysql51.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.postinstall 2010-08-11 21:54:47 UTC (rev 10718) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.postinstall 2010-08-11 22:00:44 UTC (rev 10719) @@ -3,7 +3,7 @@ # $Id$ # -MYSQLDATADIR=/var/opt/csw/mysql5 +MYSQLDATADIR=/var/opt/csw/mysql51 if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then echo "No database directory found in the default location:" echo "${MYSQLDATADIR}/mysql" 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 Aug 12 08:44:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Aug 2010 06:44:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[10720] csw/mgar/pkg/rbgems Message-ID: Revision: 10720 http://gar.svn.sourceforge.net/gar/?rev=10720&view=rev Author: dmichelsen Date: 2010-08-12 06:44:06 +0000 (Thu, 12 Aug 2010) Log Message: ----------- rbgems/ar-extensions: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/ar-extensions/ csw/mgar/pkg/rbgems/ar-extensions/branches/ csw/mgar/pkg/rbgems/ar-extensions/tags/ csw/mgar/pkg/rbgems/ar-extensions/trunk/ csw/mgar/pkg/rbgems/ar-extensions/trunk/Makefile csw/mgar/pkg/rbgems/ar-extensions/trunk/checksums csw/mgar/pkg/rbgems/ar-extensions/trunk/files/ Property changes on: csw/mgar/pkg/rbgems/ar-extensions/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/rbgems/ar-extensions/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/ar-extensions/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/ar-extensions/trunk/Makefile 2010-08-12 06:44:06 UTC (rev 10720) @@ -0,0 +1,18 @@ +GARNAME = ar-extensions +GARVERSION = 0.9.2 +CATEGORIES = rbgems + +DESCRIPTION = Extends ActiveRecord functionality +define BLURB + Extends ActiveRecord functionality by adding better finder/query support, as well as supporting mass data import, + foreign key, CSV and temporary tables. +endef + +PACKAGES = CSWgem-arextensions +CATALOGNAME = gem_arextensions + +LICENSE = README + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/rbgems/ar-extensions/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/ar-extensions/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/ar-extensions/trunk/checksums 2010-08-12 06:44:06 UTC (rev 10720) @@ -0,0 +1 @@ +6b8a7de439271327fb0b996e0d77bfd2 ar-extensions-0.9.2.gem 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 Aug 12 09:00:47 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Aug 2010 07:00:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[10721] csw/mgar/pkg/libevent/tags/libevent-1.4.13, REV=2009 .12.28/ Message-ID: Revision: 10721 http://gar.svn.sourceforge.net/gar/?rev=10721&view=rev Author: dmichelsen Date: 2010-08-12 07:00:47 +0000 (Thu, 12 Aug 2010) Log Message: ----------- libevent: Tag 1.4.13,REV=2009.12.28 Added Paths: ----------- csw/mgar/pkg/libevent/tags/libevent-1.4.13,REV=2009.12.28/ 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 Aug 12 09:01:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Aug 2010 07:01:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[10722] csw/mgar/pkg/libevent/trunk Message-ID: Revision: 10722 http://gar.svn.sourceforge.net/gar/?rev=10722&view=rev Author: dmichelsen Date: 2010-08-12 07:01:24 +0000 (Thu, 12 Aug 2010) Log Message: ----------- libevent: Update to 1.4.14b and add LICENSE Modified Paths: -------------- csw/mgar/pkg/libevent/trunk/Makefile csw/mgar/pkg/libevent/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libevent/trunk/files/LICENSE Modified: csw/mgar/pkg/libevent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent/trunk/Makefile 2010-08-12 07:00:47 UTC (rev 10721) +++ csw/mgar/pkg/libevent/trunk/Makefile 2010-08-12 07:01:24 UTC (rev 10722) @@ -1,15 +1,15 @@ GARNAME = libevent -GARVERSION = 1.4.13 +GARVERSION = 1.4.14b CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 1.1a 1.4.13 +MODULATIONS_GARVERSION = 1.1a 1.4.14b SKIP_MODULATIONS = isa-sparcv9-garversion-1.1a SKIP_MODULATIONS += isa-amd64-garversion-1.1a DISTVERSION-1.1a = 1.1a -DISTVERSION-1.4.13 = 1.4.13-stable +DISTVERSION-1.4.14b = 1.4.14b-stable DESCRIPTION = Event notification library define BLURB @@ -23,6 +23,10 @@ SOURCEFILES = $(foreach V,$(MODULATIONS_GARVERSION),$(GARNAME)-$(DISTVERSION-$V).tar.gz) DISTFILES += $(SOURCEFILES) +# From http://www.monkey.org/~provos/libevent/LICENSE +DISTFILES += LICENSE +LICENSE = LICENSE + NOEXTRACT = $(filter-out $(GARNAME)-$(DISTVERSION-$(GARVERSION)).tar.gz,$(SOURCEFILES)) PACKAGES = CSWlibevent CSWlibevent-devel @@ -53,13 +57,18 @@ MERGE_SCRIPTS_isa-extra-garversion-1.1a = copy-relocated-only MERGE_DIRS_isa-extra-garversion-1.1a = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-1.4.13 = copy-all -MERGE_SCRIPTS_isa-extra-garversion-1.4.13 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.4.13 = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-1.4.14b = copy-all +MERGE_SCRIPTS_isa-extra-garversion-1.4.14b = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.4.14b = $(libdir) PKGFILES_CSWlibevent-devel = $(PKGFILES_DEVEL) PKGFILES_CSWlibevent-devel += $(bindir)/.* +# This is just for the rpcgen +CHECKPKG_OVERRIDES_CSWlibevent-devel += missing-dependency|CSWpython + +CHECKPKG_OVERRIDES_CSWlibevent-devel += surplus-dependency|CSWlibevent + include gar/category.mk #LIBS += -lresolv -lnsl Modified: csw/mgar/pkg/libevent/trunk/checksums =================================================================== --- csw/mgar/pkg/libevent/trunk/checksums 2010-08-12 07:00:47 UTC (rev 10721) +++ csw/mgar/pkg/libevent/trunk/checksums 2010-08-12 07:01:24 UTC (rev 10722) @@ -1,2 +1,3 @@ +4d8463a40469ce2e4dfd89b9657fd993 LICENSE 6cc776458ecaf9247550863702a44d7c libevent-1.1a.tar.gz -0b3ea18c634072d12b3c1ee734263664 libevent-1.4.13-stable.tar.gz +a00e037e4d3f9e4fe9893e8a2d27918c libevent-1.4.14b-stable.tar.gz Added: csw/mgar/pkg/libevent/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/libevent/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/libevent/trunk/files/LICENSE 2010-08-12 07:01:24 UTC (rev 10722) @@ -0,0 +1,28 @@ +Libevent is covered by a 3-clause BSD license. Below is an example. Individual files may have different authors. + +/* + * Copyright (c) 2000-2007 Niels Provos + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ 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 Aug 12 09:56:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Aug 2010 07:56:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[10723] csw/mgar/pkg Message-ID: Revision: 10723 http://gar.svn.sourceforge.net/gar/?rev=10723&view=rev Author: dmichelsen Date: 2010-08-12 07:56:45 +0000 (Thu, 12 Aug 2010) Log Message: ----------- rssh: Initial commit Added Paths: ----------- csw/mgar/pkg/rssh/ csw/mgar/pkg/rssh/branches/ csw/mgar/pkg/rssh/tags/ csw/mgar/pkg/rssh/trunk/ csw/mgar/pkg/rssh/trunk/Makefile csw/mgar/pkg/rssh/trunk/checksums csw/mgar/pkg/rssh/trunk/files/ csw/mgar/pkg/rssh/trunk/files/0001-Use-DESTDIR-on-install-libexec-hook.patch Property changes on: csw/mgar/pkg/rssh/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/rssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/rssh/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rssh/trunk/Makefile 2010-08-12 07:56:45 UTC (rev 10723) @@ -0,0 +1,41 @@ +# $Id$ +GARNAME = rssh +GARVERSION = 2.3.3 +CATEGORIES = utils + +DESCRIPTION = A restricted shell for use with OpenSSH +define BLURB + rssh is a restricted shell for use with OpenSSH, allowing only scp and/or sftp. + It now also includes support for rdist, rsync, and cvs. For example, if you have + a server which you only want to allow users to copy files off of via scp, without + providing shell access, you can use rssh to do that. For a list of platforms on + which rssh is known to work, see the Platform Support Page. +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PATCHFILES = 0001-Use-DESTDIR-on-install-libexec-hook.patch + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://www.pizzashack.org/rssh/ + +sysconfdir = /etc/opt/csw +MIGRATE_FILES = rssh.conf + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +PROTOTYPE_MODIFIERS = makesuid +PROTOTYPE_FILES_makesuid = $(libexecdir)/rssh_chroot_helper +PROTOTYPE_PERMS_makesuid = 4755 + +include gar/category.mk + +post-install-modulated: + ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + cd $(WORKSRC) && ginstall -m 0644 CHROOT INSTALL README SECURITY $(DESTDIR)$(docdir)/$(GARNAME) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/rssh/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/rssh/trunk/checksums =================================================================== --- csw/mgar/pkg/rssh/trunk/checksums (rev 0) +++ csw/mgar/pkg/rssh/trunk/checksums 2010-08-12 07:56:45 UTC (rev 10723) @@ -0,0 +1,2 @@ +6117db209b029647769f115625366f8a 0001-Use-DESTDIR-on-install-libexec-hook.patch +b0c147602fcc95737ed50573b92fc468 rssh-2.3.3.tar.gz Added: csw/mgar/pkg/rssh/trunk/files/0001-Use-DESTDIR-on-install-libexec-hook.patch =================================================================== --- csw/mgar/pkg/rssh/trunk/files/0001-Use-DESTDIR-on-install-libexec-hook.patch (rev 0) +++ csw/mgar/pkg/rssh/trunk/files/0001-Use-DESTDIR-on-install-libexec-hook.patch 2010-08-12 07:56:45 UTC (rev 10723) @@ -0,0 +1,39 @@ +From a30ed2e3fe48241790889fc5bdc831e2a79caa67 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 12 Aug 2010 09:40:15 +0200 +Subject: [PATCH] Use DESTDIR on install-libexec-hook + +--- + Makefile.am | 2 +- + Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 5c1be5f..018ea4b 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -16,7 +16,7 @@ base=`echo @PACKAGE_STRING@|tr " " "-"` + $(CC) -c $(DEFS) $(ourdefs) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< + + install-exec-hook: +- chmod u+s $(libexecdir)/rssh_chroot_helper ++ chmod u+s $(DESTDIR)$(libexecdir)/rssh_chroot_helper + + rpm: dist + rpmbuild -ta --sign $(base).tar.gz +diff --git a/Makefile.in b/Makefile.in +index 790c780..515affd 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -830,7 +830,7 @@ uninstall-man: uninstall-man1 uninstall-man5 + $(CC) -c $(DEFS) $(ourdefs) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< + + install-exec-hook: +- chmod u+s $(libexecdir)/rssh_chroot_helper ++ chmod u+s $(DESTDIR)$(libexecdir)/rssh_chroot_helper + + rpm: dist + rpmbuild -ta --sign $(base).tar.gz +-- +1.7.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 Thu Aug 12 10:15:41 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Aug 2010 08:15:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[10724] csw/mgar/pkg/mysql5/branches/mysql-5.1.x Message-ID: Revision: 10724 http://gar.svn.sourceforge.net/gar/?rev=10724&view=rev Author: wahwah Date: 2010-08-12 08:15:40 +0000 (Thu, 12 Aug 2010) Log Message: ----------- mysql-5.1: Updates from Derek Harland Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/README.CSW csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51 csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswusergroup csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/quick_start-csw Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2010-08-12 07:56:45 UTC (rev 10723) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2010-08-12 08:15:40 UTC (rev 10724) @@ -1,12 +1,12 @@ 8940e0673e599689932e94fec906aec9 0001-Use-libc-not-libcrypt.patch 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 -07d91851bd734c60ad98dc2b39fafe0b CSWmysql51.postinstall -615c16877afb48ce809a849c1c5dbc35 CSWmysql51.preinstall +8303cd39dd86f9f01f1f0f01b15fe37d 0004-basedir-and-datadir-in-the-cnf-files.patch +a1008df3aee0528449eb18f39bc21603 CSWmysql51.postinstall +94f878853bc991655c1d4cd9c3c129af CSWmysql51.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog -e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW -ac9af0e13c6e075ac87f19fdf171776d cswmysql51 -67228e1f096fe08a94f4267439a4ec36 cswusergroup +59f9d5aa04d8e8d3806bec666d01e096 README.CSW +47af0fcc5dbb231501ba5722b3357bec cswmysql51 +e3000190fef8aa4cfbd527bb5e40d9a6 cswusergroup a90d87a71fa3c23dff6d78afc8e3184c mysql-5.1.49.tar.gz -90b7cfcd11ab56e021a195a6a085fa21 quick_start-csw +8700dc15628995b6f037af0fe9b55b54 quick_start-csw Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch 2010-08-12 07:56:45 UTC (rev 10723) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch 2010-08-12 08:15:40 UTC (rev 10724) @@ -19,8 +19,8 @@ # The MySQL server [mysqld] -+basedir = /opt/csw/mysql5 -+datadir = /var/opt/csw/mysql5 ++basedir = /opt/csw/mysql51 ++datadir = /var/opt/csw/mysql51 port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ skip-locking @@ -32,8 +32,8 @@ # The MySQL server # [mysqld] -+basedir = /opt/csw/mysql5 -+datadir = /var/opt/csw/mysql5 ++basedir = /opt/csw/mysql51 ++datadir = /var/opt/csw/mysql51 # generic configuration options port = @MYSQL_TCP_PORT@ @@ -45,8 +45,8 @@ # The MySQL server [mysqld] -+basedir = /opt/csw/mysql5 -+datadir = /var/opt/csw/mysql5 ++basedir = /opt/csw/mysql51 ++datadir = /var/opt/csw/mysql51 port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ skip-locking @@ -58,8 +58,8 @@ # The MySQL server [mysqld] -+basedir = /opt/csw/mysql5 -+datadir = /var/opt/csw/mysql5 ++basedir = /opt/csw/mysql51 ++datadir = /var/opt/csw/mysql51 port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ skip-locking @@ -67,12 +67,12 @@ index 24c0840..89299dd 100644 --- a/support-files/my-small.cnf.sh +++ b/support-files/my-small.cnf.sh -@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ +@@ -24,7 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ # The MySQL server [mysqld] -+basedir = /opt/csw/mysql5 -+datadir = /var/opt/csw/mysql5 ++basedir = /opt/csw/mysql51 ++datadir = /var/opt/csw/mysql51 port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ skip-locking Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall 2010-08-12 07:56:45 UTC (rev 10723) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall 2010-08-12 08:15:40 UTC (rev 10724) @@ -4,7 +4,7 @@ # $Id$ # -obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5" +obsolete_directories="/opt/csw/mysql51/var:/var/opt/csw/mysql51" obsolete_dir_information=" This directory is obsolete. Files in this directory are going to be ignored. Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/README.CSW =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/README.CSW 2010-08-12 07:56:45 UTC (rev 10723) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/README.CSW 2010-08-12 08:15:40 UTC (rev 10724) @@ -1,7 +1,7 @@ -MySQL 5 OpenCSW package +MySQL 5.1 OpenCSW package ======================= -* http://www.opencsw.org/packages/mysql5 +* http://www.opencsw.org/packages/mysql51 The package has been reworked from the ground up, using GAR. Up until this moment, the mysql5 package was in the version from before the fork. The new @@ -12,7 +12,7 @@ * Read only /opt/csw support - data in /var/opt/csw - configuration in /etc/opt/csw -* The prefix is still /opt/csw/mysql5, but all the binaries are now linked from +* The prefix is still /opt/csw/mysql51, but all the binaries are now linked from /opt/csw, so that the standard PATH setting allows to use them * The startup script is now in /etc/opt/csw/init.d * SMF support is handled by cswclassutils Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51 2010-08-12 07:56:45 UTC (rev 10723) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51 2010-08-12 08:15:40 UTC (rev 10724) @@ -7,30 +7,30 @@ # 700. # # First time installation can use quick_start-csw in -# /opt/csw/mysql5/share/mysql to build the mysql database for the +# /opt/csw/mysql51/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. +# Support for mysql51rc still remains in this startup script. # RETVAL=0 -MYSQLHOME=/opt/csw/mysql5 -MYSQL_VAR=/var/opt/csw/mysql5 +MYSQLHOME=/opt/csw/mysql51 +MYSQL_VAR=/var/opt/csw/mysql51 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 +[ -r /opt/csw/mysql51/etc/mysql51rc ] && . /opt/csw/mysql51/etc/mysql51rc +[ -r /etc/opt/csw/mysql51rc ] && . /etc/opt/csw/mysql51rc # 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 +# cp /opt/csw/mysql51/share/mysql/my-medium.cnf /opt/csw/mysql51/var/my.cnf # # Or, manually follow the database creation steps below, and have # mysql just use defaults for everything. @@ -72,7 +72,7 @@ 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 +# default database manually or use /opt/csw/mysql51/share/mysql/quick_start-csw # if [ ! -d "$MYSQLHOME/var/mysql" ] ; then # echo MySQL core database has not been created. # echo Creating it now... Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswusergroup =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswusergroup 2010-08-12 07:56:45 UTC (rev 10723) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswusergroup 2010-08-12 08:15:40 UTC (rev 10724) @@ -1 +1 @@ -mysql:mysql:MySQL database user:/var/opt/csw/mysql5:/bin/false:: +mysql:mysql:MySQL database user:/var/opt/csw/mysql51:/bin/false:: Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/quick_start-csw =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/quick_start-csw 2010-08-12 07:56:45 UTC (rev 10723) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/quick_start-csw 2010-08-12 08:15:40 UTC (rev 10724) @@ -8,8 +8,8 @@ # This script creates a default database with the small-memory footprint. # Input may be provided for DATADIR and DEFAULTS_FILE # -BASEDIR=/opt/csw/mysql5 -MYSQL_VAR=/var/opt/csw/mysql5 +BASEDIR=/opt/csw/mysql51 +MYSQL_VAR=/var/opt/csw/mysql51 DEFAULTS_FILE=$BASEDIR/my.cnf SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf MYSQLD_USER=mysql @@ -115,7 +115,7 @@ # # 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 + sed -e "s|/var/opt/csw/mysql51|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new mv $DEFAULTS_FILE.new $DEFAULTS_FILE fi @@ -123,17 +123,17 @@ # Ending message echo echo "### The following messages are from quick_start-csw." -echo "See /opt/csw/mysql5/share/mysql/doc/README.CSW for packaging changes." +echo "See /opt/csw/mysql51/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." +echo " for starting CSWmysql51." smf=no if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi if [ $smf = yes ] then - echo "To start mysqld; run \`svcadm enable cswmysql5\` on Solaris 10 or later" + echo "To start mysqld; run \`svcadm enable cswmysql51\` on Solaris 10 or later" else - echo "To start mysqld; run \`/etc/opt/csw/init.d/cswmysql start\` on Solaris 9 or earlier" + echo "To start mysqld; run \`/etc/opt/csw/init.d/cswmysql51 start\` on Solaris 9 or earlier" fi exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Aug 12 10:16:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 12 Aug 2010 08:16:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[10725] csw/mgar/pkg/rssh/trunk/Makefile Message-ID: Revision: 10725 http://gar.svn.sourceforge.net/gar/?rev=10725&view=rev Author: dmichelsen Date: 2010-08-12 08:16:16 +0000 (Thu, 12 Aug 2010) Log Message: ----------- rssh: Add dependencies Modified Paths: -------------- csw/mgar/pkg/rssh/trunk/Makefile Modified: csw/mgar/pkg/rssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/rssh/trunk/Makefile 2010-08-12 08:15:40 UTC (rev 10724) +++ csw/mgar/pkg/rssh/trunk/Makefile 2010-08-12 08:16:16 UTC (rev 10725) @@ -22,10 +22,20 @@ VENDOR_URL = http://www.pizzashack.org/rssh/ +BUILD_DEP_PKGS = CSWossh CSWcvs CSWrdist CSWrsync + +# We need at least OpenSSH, the other programs are optional +RUNTIME_DEP_PKGS = CSWossh + sysconfdir = /etc/opt/csw MIGRATE_FILES = rssh.conf CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-scp=$(bindir)/scp +CONFIGURE_ARGS += --with-sftp-server=$(libexecdir)/sftp-server +CONFIGURE_ARGS += --with-cvs=$(bindir)/cvs +CONFIGURE_ARGS += --with-rdist=$(bindir)/rdist +CONFIGURE_ARGS += --with-rsync=$(bindir)/rsync TEST_TARGET = check @@ -33,6 +43,8 @@ PROTOTYPE_FILES_makesuid = $(libexecdir)/rssh_chroot_helper PROTOTYPE_PERMS_makesuid = 4755 +CHECKPKG_OVERRIDES_CSWrssh += surplus-dependency|CSWossh + 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 Aug 12 10:21:26 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Aug 2010 08:21:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[10726] csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums Message-ID: Revision: 10726 http://gar.svn.sourceforge.net/gar/?rev=10726&view=rev Author: wahwah Date: 2010-08-12 08:21:26 +0000 (Thu, 12 Aug 2010) Log Message: ----------- mysql-5.1: Checksums for files with the Id tags. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2010-08-12 08:16:16 UTC (rev 10725) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2010-08-12 08:21:26 UTC (rev 10726) @@ -3,10 +3,10 @@ 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8303cd39dd86f9f01f1f0f01b15fe37d 0004-basedir-and-datadir-in-the-cnf-files.patch a1008df3aee0528449eb18f39bc21603 CSWmysql51.postinstall -94f878853bc991655c1d4cd9c3c129af CSWmysql51.preinstall +fe58fe0af20a51143893495b56964682 CSWmysql51.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog 59f9d5aa04d8e8d3806bec666d01e096 README.CSW -47af0fcc5dbb231501ba5722b3357bec cswmysql51 +22a8164a101fa7e4be35fd6aa674d272 cswmysql51 e3000190fef8aa4cfbd527bb5e40d9a6 cswusergroup a90d87a71fa3c23dff6d78afc8e3184c mysql-5.1.49.tar.gz -8700dc15628995b6f037af0fe9b55b54 quick_start-csw +028a9f9167edee23d2e946239af5a2fb quick_start-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 Thu Aug 12 12:06:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 12 Aug 2010 10:06:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[10727] csw/mgar/pkg/mysql5/branches/mysql-5.1.x Message-ID: Revision: 10727 http://gar.svn.sourceforge.net/gar/?rev=10727&view=rev Author: wahwah Date: 2010-08-12 10:06:43 +0000 (Thu, 12 Aug 2010) Log Message: ----------- mysql-5.1: Update to the my.cnf patch. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch Removed Paths: ------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2010-08-12 08:21:26 UTC (rev 10726) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile 2010-08-12 10:06:43 UTC (rev 10727) @@ -42,7 +42,7 @@ PATCHFILES = 0001-Use-libc-not-libcrypt.patch PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch PATCHFILES += 0003-OpenCSW-perl-for-tests.patch -PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch +PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch SPKG_DESC_CSW$(GARNAME) = Multithreaded SQL database SPKG_DESC_CSW$(GARNAME)bench = MySQL $(BASE_VERSION) benchmarking Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2010-08-12 08:21:26 UTC (rev 10726) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums 2010-08-12 10:06:43 UTC (rev 10727) @@ -1,7 +1,7 @@ 8940e0673e599689932e94fec906aec9 0001-Use-libc-not-libcrypt.patch 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch -8303cd39dd86f9f01f1f0f01b15fe37d 0004-basedir-and-datadir-in-the-cnf-files.patch +0cea0d771ff324ccdd31de4b6311b12f 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch a1008df3aee0528449eb18f39bc21603 CSWmysql51.postinstall fe58fe0af20a51143893495b56964682 CSWmysql51.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch 2010-08-12 08:21:26 UTC (rev 10726) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-basedir-and-datadir-in-the-cnf-files.patch 2010-08-12 10:06:43 UTC (rev 10727) @@ -1,81 +0,0 @@ -From 194dbf9ff230f747bb093970831fbdf4cb0f0674 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= -Date: Wed, 16 Sep 2009 01:38:35 +0100 -Subject: [PATCH 4/4] basedir and datadir in the cnf files - ---- - support-files/my-huge.cnf.sh | 2 ++ - support-files/my-innodb-heavy-4G.cnf.sh | 2 ++ - support-files/my-large.cnf.sh | 2 ++ - support-files/my-medium.cnf.sh | 2 ++ - support-files/my-small.cnf.sh | 2 ++ - 5 files changed, 10 insertions(+), 0 deletions(-) - -diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh -index e4747ac..907b41d 100644 ---- a/support-files/my-huge.cnf.sh -+++ b/support-files/my-huge.cnf.sh -@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@ - - # The MySQL server - [mysqld] -+basedir = /opt/csw/mysql51 -+datadir = /var/opt/csw/mysql51 - port = @MYSQL_TCP_PORT@ - socket = @MYSQL_UNIX_ADDR@ - skip-locking -diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh -index cda11d6..a9d5514 100644 ---- a/support-files/my-innodb-heavy-4G.cnf.sh -+++ b/support-files/my-innodb-heavy-4G.cnf.sh -@@ -39,6 +39,8 @@ socket = @MYSQL_UNIX_ADDR@ - # The MySQL server - # - [mysqld] -+basedir = /opt/csw/mysql51 -+datadir = /var/opt/csw/mysql51 - - # generic configuration options - port = @MYSQL_TCP_PORT@ -diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh -index 981b137..8b890fb 100644 ---- a/support-files/my-large.cnf.sh -+++ b/support-files/my-large.cnf.sh -@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@ - - # The MySQL server - [mysqld] -+basedir = /opt/csw/mysql51 -+datadir = /var/opt/csw/mysql51 - port = @MYSQL_TCP_PORT@ - socket = @MYSQL_UNIX_ADDR@ - skip-locking -diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh -index c3135ea..ef841db 100644 ---- a/support-files/my-medium.cnf.sh -+++ b/support-files/my-medium.cnf.sh -@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ - - # The MySQL server - [mysqld] -+basedir = /opt/csw/mysql51 -+datadir = /var/opt/csw/mysql51 - port = @MYSQL_TCP_PORT@ - socket = @MYSQL_UNIX_ADDR@ - skip-locking -diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh -index 24c0840..89299dd 100644 ---- a/support-files/my-small.cnf.sh -+++ b/support-files/my-small.cnf.sh -@@ -24,7 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ - - # The MySQL server - [mysqld] -+basedir = /opt/csw/mysql51 -+datadir = /var/opt/csw/mysql51 - port = @MYSQL_TCP_PORT@ - socket = @MYSQL_UNIX_ADDR@ - skip-locking --- -1.6.3.2 - Added: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch 2010-08-12 10:06:43 UTC (rev 10727) @@ -0,0 +1,81 @@ +From b46fd72320554ec86a256a859006a04de8e68564 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 12 Aug 2010 12:00:14 +0200 +Subject: [PATCH] /var/opt/csw/mysql51 for datadir in my-*.cnf + +--- + support-files/my-huge.cnf.sh | 2 ++ + support-files/my-innodb-heavy-4G.cnf.sh | 2 ++ + support-files/my-large.cnf.sh | 2 ++ + support-files/my-medium.cnf.sh | 2 ++ + support-files/my-small.cnf.sh | 2 ++ + 5 files changed, 10 insertions(+), 0 deletions(-) + +diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh +index 17a7ddb..51c0531 100644 +--- a/support-files/my-huge.cnf.sh ++++ b/support-files/my-huge.cnf.sh +@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql51 ++datadir = /var/opt/csw/mysql51 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh +index e9390a5..fb62231 100644 +--- a/support-files/my-innodb-heavy-4G.cnf.sh ++++ b/support-files/my-innodb-heavy-4G.cnf.sh +@@ -39,6 +39,8 @@ socket = @MYSQL_UNIX_ADDR@ + # The MySQL server + # + [mysqld] ++basedir = /opt/csw/mysql51 ++datadir = /var/opt/csw/mysql51 + + # generic configuration options + port = @MYSQL_TCP_PORT@ +diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh +index bbdfdb3..f3dec5d 100644 +--- a/support-files/my-large.cnf.sh ++++ b/support-files/my-large.cnf.sh +@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql51 ++datadir = /var/opt/csw/mysql51 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh +index 88113d0..18f6405 100644 +--- a/support-files/my-medium.cnf.sh ++++ b/support-files/my-medium.cnf.sh +@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql51 ++datadir = /var/opt/csw/mysql51 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh +index 3bfa08d..a20fdc5 100644 +--- a/support-files/my-small.cnf.sh ++++ b/support-files/my-small.cnf.sh +@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++basedir = /opt/csw/mysql51 ++datadir = /var/opt/csw/mysql51 + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-locking +-- +1.7.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Aug 13 12:33:13 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 13 Aug 2010 10:33:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[10728] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 10728 http://gar.svn.sourceforge.net/gar/?rev=10728&view=rev Author: bonivart Date: 2010-08-13 10:33:13 +0000 (Fri, 13 Aug 2010) Log Message: ----------- clamav: update to 0.96.2 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-08-12 10:06:43 UTC (rev 10727) +++ csw/mgar/pkg/clamav/trunk/Makefile 2010-08-13 10:33:13 UTC (rev 10728) @@ -1,5 +1,5 @@ GARNAME = clamav -GARVERSION = 0.96.1 +GARVERSION = 0.96.2 #DISTNAME = $(GARNAME)-devel-latest CATEGORIES = apps @@ -34,8 +34,8 @@ PATCHFILES += CSWclamav.clamd.conf.p #BUILD64 = 1 -#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 #GARCOMPILER = GCC4 @@ -68,8 +68,8 @@ PROTOTYPE_CLASS_1 = ugfiles PROTOTYPE_USER_1 = clamav -INITSMF = /opt/csw/etc/init.d/cswclamd -INITSMF += /opt/csw/etc/init.d/cswclamav-milter +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 @@ -96,9 +96,9 @@ post-install-modulated: @echo " ==> Post-install for $(GARNAME) (custom)" - @ginstall -d $(DESTDIR)/opt/csw/etc/init.d - @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamd $(DESTDIR)/opt/csw/etc/init.d/cswclamd - @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamav-milter $(DESTDIR)/opt/csw/etc/init.d/cswclamav-milter + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamd $(DESTDIR)/etc/opt/csw/init.d/cswclamd + @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamav-milter $(DESTDIR)/etc/opt/csw/init.d/cswclamav-milter @ginstall -d $(DESTDIR)$(sysconfdir)/pkg/CSWclamav @ginstall -m 644 $(FILEDIR)/CSWclamav.cswusergroup $(DESTDIR)$(sysconfdir)/pkg/CSWclamav/cswusergroup @ginstall -d $(DOCDEST) Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2010-08-12 10:06:43 UTC (rev 10727) +++ csw/mgar/pkg/clamav/trunk/checksums 2010-08-13 10:33:13 UTC (rev 10728) @@ -1,3 +1,3 @@ a3238ed54a098b66a8e3e9f8bb0ca399 CSWclamav.clamd.conf.p 6c37b881661bf28741bb69045a642790 CSWclamav.freshclam.conf.p -38e7870db6e9ad0e569518499a6f3651 clamav-0.96.1.tar.gz +a2c2555d86868f91a01d0e2c2403bbec clamav-0.96.2.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 Fri Aug 13 19:45:38 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 13 Aug 2010 17:45:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[10729] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 10729 http://gar.svn.sourceforge.net/gar/?rev=10729&view=rev Author: rthurner Date: 2010-08-13 17:45:38 +0000 (Fri, 13 Aug 2010) Log Message: ----------- mercurial: update to hg-1.6.2 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-08-13 10:33:13 UTC (rev 10728) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-08-13 17:45:38 UTC (rev 10729) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.6 +GARVERSION = 1.6.2 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2010-08-13 10:33:13 UTC (rev 10728) +++ csw/mgar/pkg/mercurial/trunk/checksums 2010-08-13 17:45:38 UTC (rev 10729) @@ -1 +1 @@ -e97772cb424d29d9382c41daafa6f92d mercurial-1.6.tar.gz +847359d7488caf8074a69d4b87ca64d2 mercurial-1.6.2.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 Fri Aug 13 19:51:28 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 13 Aug 2010 17:51:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[10730] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 10730 http://gar.svn.sourceforge.net/gar/?rev=10730&view=rev Author: rthurner Date: 2010-08-13 17:51:28 +0000 (Fri, 13 Aug 2010) Log Message: ----------- apache2: upgrade to http-2.2.16 Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/checksums Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-08-13 17:45:38 UTC (rev 10729) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-08-13 17:51:28 UTC (rev 10730) @@ -1,7 +1,7 @@ # $Id$ GARNAME = httpd -GARVERSION = 2.2.15 +GARVERSION = 2.2.16 CATEGORIES = server DESCRIPTION = A high performance HTTP server. Modified: csw/mgar/pkg/apache2/trunk/checksums =================================================================== --- csw/mgar/pkg/apache2/trunk/checksums 2010-08-13 17:45:38 UTC (rev 10729) +++ csw/mgar/pkg/apache2/trunk/checksums 2010-08-13 17:51:28 UTC (rev 10730) @@ -2,7 +2,7 @@ 308836569bf0cc1be27ac45e3123e0c2 apu-iconv.diff a7467a756cbd980d4cfe3c2cfb6a9e35 config.layout b3c2086facecc3f898d29f3c8c74da11 cswapache2 -31fa022dc3c0908c6eaafe73c81c65df httpd-2.2.15.tar.gz +7f33f2c8b213ad758c009ae46d2795ed httpd-2.2.16.tar.gz d9d1abded665674800f3e5c246a4163f httpd-mpm.conf.CSW 796a7d5095ce154c274a2ccfd60ec753 httpd-ssl.conf.CSW f0941e5782e4bee45c2c95bd9460796b httpd.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat Aug 14 18:33:46 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 14 Aug 2010 16:33:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[10731] csw/mgar/pkg/opendbx/trunk/Makefile Message-ID: Revision: 10731 http://gar.svn.sourceforge.net/gar/?rev=10731&view=rev Author: idogan23 Date: 2010-08-14 16:33:46 +0000 (Sat, 14 Aug 2010) Log Message: ----------- opendbx: Updates for 64 bit and splitting Modified Paths: -------------- csw/mgar/pkg/opendbx/trunk/Makefile Modified: csw/mgar/pkg/opendbx/trunk/Makefile =================================================================== --- csw/mgar/pkg/opendbx/trunk/Makefile 2010-08-13 17:51:28 UTC (rev 10730) +++ csw/mgar/pkg/opendbx/trunk/Makefile 2010-08-14 16:33:46 UTC (rev 10731) @@ -17,12 +17,14 @@ MASTER_SITES = http://www.linuxnetworks.de/opendbx/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWopendbx CSWopendbxdevel +PACKAGES = CSWopendbx CSWopendbxdevel CSWopendbxmysql CATALOGNAME_CSWopendbx = opendbx CATALOGNAME_CSWopendbxdevel = opendbx_devel +CATALOGNAME_CSWopendbxmysql = opendbx_mysql SPKG_DESC_CSWopendbx = $(DESCRIPTION) -SPKG_DESC_CSWopendbxdevel = $(DESCRIPTION) development package +SPKG_DESC_CSWopendbxdevel = $(DESCRIPTION), development package +SPKG_DESC_CSWopendbxmysql = $(DESCRIPTION), mysql backend package # File name regex to get notifications about upstream software releases UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -35,7 +37,7 @@ BUILD64 = 1 #EXTRA_BUILD_ISAS_i386 = pentium_pro #EXTRA_BUILD_ISAS_sparc = sparcv8plus -EXTRA_LIB = /opt/csw/mysql5/lib/mysql +EXTRA_LIB = $(abspath $(prefix)/mysql5/lib/$(MM_LIBDIR)/mysql) EXTRA_INC = /opt/csw/mysql5/include/mysql CONFIGURE_ARGS = $(DIRPATHS) @@ -43,7 +45,7 @@ CONFIGURE_ARGS += --with-backends=mysql PKGFILES_CSWopendbxdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWopendbx = $(PKGFILES_RT) +PKGFILES_CSWopendbxmysql = $(call baseisadirs,$(libdir),opendbx/libmysqlbackend.*) #CONFIGURE_ARGS += --with-backends=oracle #EXTRA_LIB = /opt/csw/instantclient_10_2 @@ -57,10 +59,14 @@ #CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/$ISALIST|opt/csw/lib/opendbx/liboraclebackend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbxdevel += surplus-dependency|CSWopendbx +CHECKPKG_OVERRIDES_CSWopendbxmysql += surplus-dependency|CSWopendbx RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc4corert RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWopendbx += CSWggettextrt RUNTIME_DEP_PKGS_CSWopendbxdevel += CSWopendbx +RUNTIME_DEP_PKGS_CSWopendbxmysql += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWopendbxmysql += CSWzlib +RUNTIME_DEP_PKGS_CSWopendbxmysql += CSWmysql5rt include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat Aug 14 18:42:30 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 14 Aug 2010 16:42:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[10732] csw/mgar/pkg/opendbx/trunk/Makefile Message-ID: Revision: 10732 http://gar.svn.sourceforge.net/gar/?rev=10732&view=rev Author: idogan23 Date: 2010-08-14 16:42:30 +0000 (Sat, 14 Aug 2010) Log Message: ----------- opendbx: Fix mysql 64 bit linkage Modified Paths: -------------- csw/mgar/pkg/opendbx/trunk/Makefile Modified: csw/mgar/pkg/opendbx/trunk/Makefile =================================================================== --- csw/mgar/pkg/opendbx/trunk/Makefile 2010-08-14 16:33:46 UTC (rev 10731) +++ csw/mgar/pkg/opendbx/trunk/Makefile 2010-08-14 16:42:30 UTC (rev 10732) @@ -37,8 +37,12 @@ BUILD64 = 1 #EXTRA_BUILD_ISAS_i386 = pentium_pro #EXTRA_BUILD_ISAS_sparc = sparcv8plus -EXTRA_LIB = $(abspath $(prefix)/mysql5/lib/$(MM_LIBDIR)/mysql) + EXTRA_INC = /opt/csw/mysql5/include/mysql +EXTRA_LINKER_DIRS_32 = $(prefix)/mysql5/lib/mysql +EXTRA_LINKER_DIRS_64 = $(prefix)/mysql5/lib/64/mysql +EXTRA_LINKER_FLAGS = -L$(EXTRA_LINKER_DIRS_$(MEMORYMODEL)) +EXTRA_RUNPATH_LINKER_FLAGS = -R$(EXTRA_LINKER_DIRS_$(MEMORYMODEL)) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-utils 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 Aug 14 18:46:29 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Aug 2010 16:46:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[10733] csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py Message-ID: Revision: 10733 http://gar.svn.sourceforge.net/gar/?rev=10733&view=rev Author: wahwah Date: 2010-08-14 16:46:29 +0000 (Sat, 14 Aug 2010) Log Message: ----------- mGAR v2: checkpkg, bugfixes for checkpkg_inspect_stats.py Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py Modified: csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py 2010-08-14 16:42:30 UTC (rev 10732) +++ csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py 2010-08-14 16:46:29 UTC (rev 10733) @@ -35,7 +35,7 @@ logging.debug("Collecting statistics about given package files.") filenames = [] md5s = [] - md5_re = re.compile(r"[0123456789abcdef]{32}") + md5_re = re.compile(r"^[0123456789abcdef]{32}$") for arg in args: if md5_re.match(arg): md5s.append(arg) @@ -48,7 +48,7 @@ bar.start() counter = itertools.count() for pkg in srv4_pkgs: - pkgstat_objs.append(checkpkg.PackageStats(x, debug=options.debug)) + pkgstat_objs.append(checkpkg.PackageStats(pkg, debug=options.debug)) bar.update(counter.next()) for md5 in md5s: pkgstat_objs.append(checkpkg.PackageStats(None, md5sum=md5, debug=options.debug)) @@ -66,7 +66,7 @@ if options.print_stats: print "import datetime" print "pkgstat_objs = ", - pprint.pprint(pkgstat_objs) + pprint.pprint(pkgstats) else: code.interact(local=locals()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Aug 14 20:47:41 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Aug 2010 18:47:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[10734] csw/mgar/pkg/oracle-instantclient/trunk/Makefile Message-ID: Revision: 10734 http://gar.svn.sourceforge.net/gar/?rev=10734&view=rev Author: dmichelsen Date: 2010-08-14 18:47:41 +0000 (Sat, 14 Aug 2010) Log Message: ----------- oracle-instantclient: Update checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/oracle-instantclient/trunk/Makefile Modified: csw/mgar/pkg/oracle-instantclient/trunk/Makefile =================================================================== --- csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-08-14 16:46:29 UTC (rev 10733) +++ csw/mgar/pkg/oracle-instantclient/trunk/Makefile 2010-08-14 18:47:41 UTC (rev 10734) @@ -72,9 +72,15 @@ MERGE_SCRIPTS_isa-default = copy-all MERGE_SCRIPTS_isa-default64 = copy-all +# Libraries are cluttered all over the place, we can't change that. +CHECKPKG_OVERRIDES_CSWorainstclient102 += binary-architecture-does-not-match-placement + +# The runpath entries are for Oracle- and Sun-Cluster and therefor don't conform to OpenCSW specs. +CHECKPKG_OVERRIDES_CSWorainstclient102 += bad-rpath-entry + # The libraries are relocated. It is expected from the client to set # LD_LIBRARY_PATH as described by Oracle. -CHECKPKG_OVERRIDES = symbol-not-found +CHECKPKG_OVERRIDES_CSWorainstclient102 += soname-not-found 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 Aug 14 20:56:18 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Aug 2010 18:56:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[10735] csw/mgar/gar/v2-checkpkg-override-relocation Message-ID: Revision: 10735 http://gar.svn.sourceforge.net/gar/?rev=10735&view=rev Author: wahwah Date: 2010-08-14 18:56:18 +0000 (Sat, 14 Aug 2010) Log Message: ----------- mGAR v2-checkpkg-override-relocation: Merging changes from v2 Modified Paths: -------------- csw/mgar/gar/v2-checkpkg-override-relocation/bin/checkpkg_inspect_stats.py csw/mgar/gar/v2-checkpkg-override-relocation/gar.mk csw/mgar/gar/v2-checkpkg-override-relocation/gar.pkg.mk Added Paths: ----------- csw/mgar/gar/v2-checkpkg-override-relocation/bin/gem2pkg csw/mgar/gar/v2-checkpkg-override-relocation/bin/gemdeps.rb csw/mgar/gar/v2-checkpkg-override-relocation/categories/rbgems/ csw/mgar/gar/v2-checkpkg-override-relocation/categories/rbgems/category.mk csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw/depend.ruby csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw_rbgems_dyngspec.gspec Removed Paths: ------------- csw/mgar/gar/v2-checkpkg-override-relocation/categories/rbgems/category.mk Property Changed: ---------------- csw/mgar/gar/v2-checkpkg-override-relocation/ csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw/depend Property changes on: csw/mgar/gar/v2-checkpkg-override-relocation ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /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-sqlite:10434-10449 + /csw/mgar/gar/v2:4936-6678,10586-10734 /csw/mgar/gar/v2-bwalton:9784-10011 /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-sqlite:10434-10449 Modified: csw/mgar/gar/v2-checkpkg-override-relocation/bin/checkpkg_inspect_stats.py =================================================================== --- csw/mgar/gar/v2-checkpkg-override-relocation/bin/checkpkg_inspect_stats.py 2010-08-14 18:47:41 UTC (rev 10734) +++ csw/mgar/gar/v2-checkpkg-override-relocation/bin/checkpkg_inspect_stats.py 2010-08-14 18:56:18 UTC (rev 10735) @@ -35,7 +35,7 @@ logging.debug("Collecting statistics about given package files.") filenames = [] md5s = [] - md5_re = re.compile(r"[0123456789abcdef]{32}") + md5_re = re.compile(r"^[0123456789abcdef]{32}$") for arg in args: if md5_re.match(arg): md5s.append(arg) @@ -48,7 +48,7 @@ bar.start() counter = itertools.count() for pkg in srv4_pkgs: - pkgstat_objs.append(checkpkg.PackageStats(x, debug=options.debug)) + pkgstat_objs.append(checkpkg.PackageStats(pkg, debug=options.debug)) bar.update(counter.next()) for md5 in md5s: pkgstat_objs.append(checkpkg.PackageStats(None, md5sum=md5, debug=options.debug)) @@ -66,7 +66,7 @@ if options.print_stats: print "import datetime" print "pkgstat_objs = ", - pprint.pprint(pkgstat_objs) + pprint.pprint(pkgstats) else: code.interact(local=locals()) Copied: csw/mgar/gar/v2-checkpkg-override-relocation/bin/gem2pkg (from rev 10734, csw/mgar/gar/v2/bin/gem2pkg) =================================================================== --- csw/mgar/gar/v2-checkpkg-override-relocation/bin/gem2pkg (rev 0) +++ csw/mgar/gar/v2-checkpkg-override-relocation/bin/gem2pkg 2010-08-14 18:56:18 UTC (rev 10735) @@ -0,0 +1,40 @@ +#!/opt/csw/bin/ruby -w + +require 'rubygems' +require 'rubygems/format' + +unless File.exists?(ARGV[0]) + $stderr.puts "Pass path to a valid .gem file as first argument. You gave: #{ARGV[0]}" + exit 1 +end + +begin + spec = Gem::Format.from_file_by_path(File.expand_path(ARGV[0])).spec + + blurb = spec.description.gsub("\n", ' ').squeeze.lstrip + + puts <<"EOF" +GARNAME = #{spec.name} +GARVERSION = #{spec.version} +CATEGORIES = rbgems + +DESCRIPTION = #{spec.summary} + +define BLURB +#{blurb.gsub(/(.{1,70})( +|$\n?)|(.{1,70})/, "\\1\\3\n")} +endef + +EOF + + spec.dependencies.each do |d| + puts "RUNTIME_DEP_PKGS += CSWgem-#{d.name}" + end + + puts "\nARCHALL = 1" if spec.extensions.size.eql?(0) + + puts "include gar/category.mk" +rescue Exception => e + # we could be more selective, but this catches _everything_ + $stderr.puts "Rescued exception of type #{e.class}" + $stderr.puts "Exception text: #{e.message}" +end Copied: csw/mgar/gar/v2-checkpkg-override-relocation/bin/gemdeps.rb (from rev 10734, csw/mgar/gar/v2/bin/gemdeps.rb) =================================================================== --- csw/mgar/gar/v2-checkpkg-override-relocation/bin/gemdeps.rb (rev 0) +++ csw/mgar/gar/v2-checkpkg-override-relocation/bin/gemdeps.rb 2010-08-14 18:56:18 UTC (rev 10735) @@ -0,0 +1,7 @@ +#!/opt/csw/bin/ruby +require 'yaml' +require 'rubygems' +spec = YAML::load(STDIN) +spec.dependencies.each do |dep| + printf "%s\n", dep.name if dep.type == :runtime +end Deleted: csw/mgar/gar/v2-checkpkg-override-relocation/categories/rbgems/category.mk =================================================================== --- csw/mgar/gar/v2/categories/rbgems/category.mk 2010-08-14 18:47:41 UTC (rev 10734) +++ csw/mgar/gar/v2-checkpkg-override-relocation/categories/rbgems/category.mk 2010-08-14 18:56:18 UTC (rev 10735) @@ -1,83 +0,0 @@ -# We must have rubygems (and hence ruby) installed to package a gem. -DEF_BASE_PKGS += CSWrubygems - -MASTER_SITES ?= http://rubygems.org/downloads/ - -# This is common to most modules - override in module makefile if different -GEMNAME ?= $(GARNAME) -GEMVERSION ?= $(GARVERSION) -GEMFILE ?= $(GEMNAME)-$(GEMVERSION).gem -DISTFILES += $(GEMFILE) - -GEMPKGNAME ?= $(GEMNAME) -GEMCATALOGNAME ?= $(GEMPKGNAME) - -# PACKAGES ?= CSWgem-$(GEMPKGNAME) CSWgem-$(GEMPKGNAME)-doc -PACKAGES ?= CSWgem-$(GEMPKGNAME) -CATALOGNAME_CSWgem-$(GEMPKGNAME) ?= gem_$(GEMCATALOGNAME) -CATALOGNAME_CSWgem-$(GEMPKGNAME)-doc ?= gem_$(GEMCATALOGNAME)_doc - -SPKG_DESC_CSWgem-$(GEMPKGNAME)-doc ?= $(or $(SPKG_DESC_CSWgem-$(GEMPKGNAME)),$(SPKG_DESC)) documentation - -# RUNTIME_DEP_PKGS_CSWgem-$(GEMPKGNAME) ?= $(shell gem specification $(DOWNLOADDIR)/$(GEMFILE) | $(GARBIN)/gemdeps.rb) - -# GEM_DEPENDENCY_PKGS ?= $(RUNTIME_DEP_PKGS_CSWgem-$(GEMPKGNAME)) - -# Tests are enabled by default, unless overridden at the test level -ENABLE_TEST ?= 1 - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX ?= $(GEMNAME)-(\d+(?:\.\d+)*).gem -USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL) - -_CATEGORY_PKGINFO = echo "RUBY_GEM_NAME=$(GEMNAME)"; - -# _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist -_CATEGORY_GSPEC_INCLUDE ?= csw_rbgems_dyngspec.gspec - -# Ruby module dependencies can not be properly tracked right now -_CATEGORY_CHECKPKG_OVERRIDES = surplus-dependency - -# gem specification actionmailer-2.3.8.gem -# -> YAML for -# - dependency generation -# - link to rubyforge - -LICENSE ?= MIT-LICENSE - -GEMDIR ?= $(shell ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) - -CONFIGURE_SCRIPTS ?= check-gem-deps -BUILD_SCRIPTS ?= -TEST_SCRIPTS ?= -INSTALL_SCRIPTS ?= rbgem - -# Allow splitting of documentation automatically -PKGFILES_CSWgem-$(GEMPKGNAME)-doc ?= $(GEMDIR)/doc/.* - -gem-extract-%: - @echo " ==> Decompressing $(DOWNLOADDIR)/$*" - gem unpack $(DOWNLOADDIR)/$* --target $(WORKDIR) - @$(MAKECOOKIE) - -extract-archive-%.gem: gem-extract-%.gem - @$(MAKECOOKIE) - -include gar/gar.mk - -# During the configure phase we check that all dependend modules are available -configure-check-gem-deps: GEM_DEPS?=$(addprefix CSWgem-,$(shell gem specification $(DOWNLOADDIR)/$(GEMFILE) | $(GARBIN)/gemdeps.rb)) -configure-check-gem-deps: - @echo "=== Checking dependencies of GEM $(GEMFILE) ===" - @$(GARBIN)/check_for_deps $(GEM_DEPS) - @$(MAKECOOKIE) - -install-rbgem: - gem install --ignore-dependencies --local --no-test --install-dir $(DESTDIR)$(GEMDIR) $(DOWNLOADDIR)/$(GEMFILE) - @$(MAKECOOKIE) - -# Check for a CPAN module version update -update-check: - @# TBD! - @echo " ==> Update Check: $(GARNAME) $(GARVERSION)" - @echo " ==> AUTO UPDATE CHECK FOR $(GARNAME) IS DISABLED" Copied: csw/mgar/gar/v2-checkpkg-override-relocation/categories/rbgems/category.mk (from rev 10734, csw/mgar/gar/v2/categories/rbgems/category.mk) =================================================================== --- csw/mgar/gar/v2-checkpkg-override-relocation/categories/rbgems/category.mk (rev 0) +++ csw/mgar/gar/v2-checkpkg-override-relocation/categories/rbgems/category.mk 2010-08-14 18:56:18 UTC (rev 10735) @@ -0,0 +1,83 @@ +# We must have rubygems (and hence ruby) installed to package a gem. +DEF_BASE_PKGS += CSWrubygems + +MASTER_SITES ?= http://rubygems.org/downloads/ + +# This is common to most modules - override in module makefile if different +GEMNAME ?= $(GARNAME) +GEMVERSION ?= $(GARVERSION) +GEMFILE ?= $(GEMNAME)-$(GEMVERSION).gem +DISTFILES += $(GEMFILE) + +GEMPKGNAME ?= $(GEMNAME) +GEMCATALOGNAME ?= $(GEMPKGNAME) + +# PACKAGES ?= CSWgem-$(GEMPKGNAME) CSWgem-$(GEMPKGNAME)-doc +PACKAGES ?= CSWgem-$(GEMPKGNAME) +CATALOGNAME_CSWgem-$(GEMPKGNAME) ?= gem_$(GEMCATALOGNAME) +CATALOGNAME_CSWgem-$(GEMPKGNAME)-doc ?= gem_$(GEMCATALOGNAME)_doc + +SPKG_DESC_CSWgem-$(GEMPKGNAME)-doc ?= $(or $(SPKG_DESC_CSWgem-$(GEMPKGNAME)),$(SPKG_DESC)) documentation + +# RUNTIME_DEP_PKGS_CSWgem-$(GEMPKGNAME) ?= $(shell gem specification $(DOWNLOADDIR)/$(GEMFILE) | $(GARBIN)/gemdeps.rb) + +# GEM_DEPENDENCY_PKGS ?= $(RUNTIME_DEP_PKGS_CSWgem-$(GEMPKGNAME)) + +# Tests are enabled by default, unless overridden at the test level +ENABLE_TEST ?= 1 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX ?= $(GEMNAME)-(\d+(?:\.\d+)*).gem +USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL) + +_CATEGORY_PKGINFO = echo "RUBY_GEM_NAME=$(GEMNAME)"; + +# _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist +_CATEGORY_GSPEC_INCLUDE ?= csw_rbgems_dyngspec.gspec + +# Ruby module dependencies can not be properly tracked right now +_CATEGORY_CHECKPKG_OVERRIDES = surplus-dependency + +# gem specification actionmailer-2.3.8.gem +# -> YAML for +# - dependency generation +# - link to rubyforge + +LICENSE ?= MIT-LICENSE + +GEMDIR ?= $(shell ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) + +CONFIGURE_SCRIPTS ?= check-gem-deps +BUILD_SCRIPTS ?= +TEST_SCRIPTS ?= +INSTALL_SCRIPTS ?= rbgem + +# Allow splitting of documentation automatically +PKGFILES_CSWgem-$(GEMPKGNAME)-doc ?= $(GEMDIR)/doc/.* + +gem-extract-%: + @echo " ==> Decompressing $(DOWNLOADDIR)/$*" + gem unpack $(DOWNLOADDIR)/$* --target $(WORKDIR) + @$(MAKECOOKIE) + +extract-archive-%.gem: gem-extract-%.gem + @$(MAKECOOKIE) + +include gar/gar.mk + +# During the configure phase we check that all dependend modules are available +configure-check-gem-deps: GEM_DEPS?=$(addprefix CSWgem-,$(shell gem specification $(DOWNLOADDIR)/$(GEMFILE) | $(GARBIN)/gemdeps.rb)) +configure-check-gem-deps: + @echo "=== Checking dependencies of GEM $(GEMFILE) ===" + @$(GARBIN)/check_for_deps $(GEM_DEPS) + @$(MAKECOOKIE) + +install-rbgem: + gem install --ignore-dependencies --local --no-test --install-dir $(DESTDIR)$(GEMDIR) $(DOWNLOADDIR)/$(GEMFILE) + @$(MAKECOOKIE) + +# Check for a CPAN module version update +update-check: + @# TBD! + @echo " ==> Update Check: $(GARNAME) $(GARVERSION)" + @echo " ==> AUTO UPDATE CHECK FOR $(GARNAME) IS DISABLED" Modified: csw/mgar/gar/v2-checkpkg-override-relocation/gar.mk =================================================================== --- csw/mgar/gar/v2-checkpkg-override-relocation/gar.mk 2010-08-14 18:47:41 UTC (rev 10734) +++ csw/mgar/gar/v2-checkpkg-override-relocation/gar.mk 2010-08-14 18:56:18 UTC (rev 10735) @@ -237,12 +237,18 @@ #################### DIRECTORY MAKERS #################### # This is to make dirs as needed by the base rules -$(sort $(DOWNLOADDIR) $(PARTIALDIR) $(COOKIEDIR) $(WORKSRC) $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(PKGROOT) $(INSTALL_DIRS) $(INSTALLISADIR) $(GARCHIVEDIR) $(GARPKGDIR) $(STAGINGDIR)) $(COOKIEDIR)/%: +$(sort $(DOWNLOADDIR) $(PARTIALDIR) $(COOKIEDIR) $(WORKSRC) $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS)) $(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(PKGROOT) $(INSTALL_DIRS) $(INSTALLISADIR) $(GARCHIVEDIR) $(GARPKGDIR) $(STAGINGDIR)): @if test -d $@; then : ; else \ ginstall -d $@; \ echo "ginstall -d $@"; \ fi +$(COOKIEDIR)/%: + @if test -d $@; then : ; else \ + ginstall -d $@; \ + echo "ginstall -d $@"; \ + fi + # These stubs are wildcarded, so that the port maintainer can # define something like "pre-configure" and it won't conflict, # while the configure target can call "pre-configure" safely even Modified: csw/mgar/gar/v2-checkpkg-override-relocation/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-checkpkg-override-relocation/gar.pkg.mk 2010-08-14 18:47:41 UTC (rev 10734) +++ csw/mgar/gar/v2-checkpkg-override-relocation/gar.pkg.mk 2010-08-14 18:56:18 UTC (rev 10735) @@ -590,8 +590,8 @@ define licensefile $(strip $(or - $(call findlicensefile,$(or $(LICENSE_$(1)),$(LICENSE_FULL_$(1)))) - $(call findlicensefile,$(or $(LICENSE),$(LICENSE_FULL))), + $(call findlicensefile,$(or $(LICENSE_$(1)),$(LICENSE_FULL_$(1)))), + $(call findlicensefile,$(or $(LICENSE),$(LICENSE_FULL))), ) ) endef Property changes on: csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw/depend ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678 /csw/mgar/gar/v2-bwalton/pkglib/csw/depend:9784-10011 /csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855 /csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649 /csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895 /csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180 /csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132 /csw/mgar/gar/v2-sqlite/pkglib/csw/depend:10434-10449 + /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678,10586-10734 /csw/mgar/gar/v2-bwalton/pkglib/csw/depend:9784-10011 /csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855 /csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649 /csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895 /csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180 /csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132 /csw/mgar/gar/v2-sqlite/pkglib/csw/depend:10434-10449 Copied: csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw/depend.ruby (from rev 10734, csw/mgar/gar/v2/pkglib/csw/depend.ruby) =================================================================== --- csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw/depend.ruby (rev 0) +++ csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw/depend.ruby 2010-08-14 18:56:18 UTC (rev 10735) @@ -0,0 +1,2 @@ +P CSWruby ruby - An object-oriented language for quick and easy programming +P CSWrubygems rubygems - Ruby package manager Copied: csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw_rbgems_dyngspec.gspec (from rev 10734, csw/mgar/gar/v2/pkglib/csw_rbgems_dyngspec.gspec) =================================================================== --- csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw_rbgems_dyngspec.gspec (rev 0) +++ csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw_rbgems_dyngspec.gspec 2010-08-14 18:56:18 UTC (rev 10735) @@ -0,0 +1,5 @@ +%include url file://%{PKGLIB}/csw_vars.gspec +%pkginfo url file://%{PKGLIB}/csw/pkginfo +%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} +%depend:merge url file://%{PKGLIB}/csw/depend.ruby +%depend exec gawk '$1 ~ /f/{print $3}' %{prototype} | depmaker --root %{DESTDIR} --nodep %{pkgname} %{DEPMAKER_EXTRA_ARGS} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat Aug 14 21:09:22 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 14 Aug 2010 19:09:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[10736] csw/mgar/pkg/opendbx/trunk/Makefile Message-ID: Revision: 10736 http://gar.svn.sourceforge.net/gar/?rev=10736&view=rev Author: idogan23 Date: 2010-08-14 19:09:22 +0000 (Sat, 14 Aug 2010) Log Message: ----------- opendbx: added sqlite3 support Modified Paths: -------------- csw/mgar/pkg/opendbx/trunk/Makefile Modified: csw/mgar/pkg/opendbx/trunk/Makefile =================================================================== --- csw/mgar/pkg/opendbx/trunk/Makefile 2010-08-14 18:56:18 UTC (rev 10735) +++ csw/mgar/pkg/opendbx/trunk/Makefile 2010-08-14 19:09:22 UTC (rev 10736) @@ -17,14 +17,16 @@ MASTER_SITES = http://www.linuxnetworks.de/opendbx/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWopendbx CSWopendbxdevel CSWopendbxmysql +PACKAGES = CSWopendbx CSWopendbxdevel CSWopendbxmysql CSWopendbxsqlite3 CATALOGNAME_CSWopendbx = opendbx CATALOGNAME_CSWopendbxdevel = opendbx_devel CATALOGNAME_CSWopendbxmysql = opendbx_mysql +CATALOGNAME_CSWopendbxsqlite3 = opendbx_sqlite3 SPKG_DESC_CSWopendbx = $(DESCRIPTION) SPKG_DESC_CSWopendbxdevel = $(DESCRIPTION), development package SPKG_DESC_CSWopendbxmysql = $(DESCRIPTION), mysql backend package +SPKG_DESC_CSWopendbxsqlite3 = $(DESCRIPTION), sqlite3 backend package # File name regex to get notifications about upstream software releases UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -46,10 +48,11 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-utils -CONFIGURE_ARGS += --with-backends=mysql +CONFIGURE_ARGS += --with-backends="mysql sqlite3" PKGFILES_CSWopendbxdevel = $(PKGFILES_DEVEL) PKGFILES_CSWopendbxmysql = $(call baseisadirs,$(libdir),opendbx/libmysqlbackend.*) +PKGFILES_CSWopendbxsqlite3 = $(call baseisadirs,$(libdir),opendbx/libsqlite3backend.*) #CONFIGURE_ARGS += --with-backends=oracle #EXTRA_LIB = /opt/csw/instantclient_10_2 @@ -64,6 +67,7 @@ CHECKPKG_OVERRIDES_CSWopendbxdevel += surplus-dependency|CSWopendbx CHECKPKG_OVERRIDES_CSWopendbxmysql += surplus-dependency|CSWopendbx +CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += surplus-dependency|CSWopendbx RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc4corert RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc4g++rt @@ -72,5 +76,7 @@ RUNTIME_DEP_PKGS_CSWopendbxmysql += CSWgcc4corert RUNTIME_DEP_PKGS_CSWopendbxmysql += CSWzlib RUNTIME_DEP_PKGS_CSWopendbxmysql += CSWmysql5rt +RUNTIME_DEP_PKGS_CSWopendbxsqlite3 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWopendbxsqlite3 += CSWsqlite3rt 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 Aug 14 21:50:59 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Aug 2010 19:50:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[10737] csw/mgar/gar/v2-checkpkg-override-relocation/lib/ python/opencsw.py Message-ID: Revision: 10737 http://gar.svn.sourceforge.net/gar/?rev=10737&view=rev Author: wahwah Date: 2010-08-14 19:50:59 +0000 (Sat, 14 Aug 2010) Log Message: ----------- mGAR v2-checkpkg-override-relocation: checking the new overrides location. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg-override-relocation/lib/python/opencsw.py Modified: csw/mgar/gar/v2-checkpkg-override-relocation/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2-checkpkg-override-relocation/lib/python/opencsw.py 2010-08-14 19:09:22 UTC (rev 10736) +++ csw/mgar/gar/v2-checkpkg-override-relocation/lib/python/opencsw.py 2010-08-14 19:50:59 UTC (rev 10737) @@ -917,17 +917,18 @@ self.file_paths.extend([f.replace(remove_prefix, "") for f in full_paths]) return self.file_paths - def _GetOverridesStream(self): - catalogname = self.GetCatalogname() - file_path = os.path.join(self.directory, - "root", - "opt/csw/share/checkpkg/overrides", - catalogname) + def _GetOverridesStream(self, file_path): # This might potentially cause a file descriptor leak, but I'm not going to # worry about that at this stage. + # NB, the whole catalog run doesn't seem to be suffering. (~2500 packages) + # + # There is a race condition here, but it's executing sequentially, I don't + # expect any concurrency problems. if os.path.isfile(file_path): + logging.debug("Opening %s override file." % repr(file_path)) return open(file_path, "r") else: + logging.debug("Override file %s not found." % repr(file_path)) return None def _ParseOverridesStream(self, stream): @@ -940,11 +941,22 @@ def GetOverrides(self): """Returns overrides, a list of overrides.Override instances.""" - stream = self._GetOverridesStream() - if stream: - return self._ParseOverridesStream(stream) - else: - return list() + overrides = [] + catalogname = self.GetCatalogname() + override_paths = ( + [self.directory, + "root", + "opt/csw/share/checkpkg/overrides", catalogname], + [self.directory, + "install", + "checkpkg_override"], + ) + for override_path in override_paths: + file_path = os.path.join(*override_path) + stream = self._GetOverridesStream(file_path) + if stream: + overrides.extend(self._ParseOverridesStream(stream)) + return overrides def GetFileContent(self, pkg_file_path): if pkg_file_path.startswith("/"): 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 Aug 14 22:04:26 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Aug 2010 20:04:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[10738] csw/mgar/gar/v2 Message-ID: Revision: 10738 http://gar.svn.sourceforge.net/gar/?rev=10738&view=rev Author: wahwah Date: 2010-08-14 20:04:26 +0000 (Sat, 14 Aug 2010) Log Message: ----------- mGAR v2: merging in the checkpkg overrride file location change. Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.pkg.mk csw/mgar/gar/v2/lib/python/opencsw.py Property Changed: ---------------- csw/mgar/gar/v2/ csw/mgar/gar/v2/pkglib/csw/depend Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /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-sqlite:10434-10449 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /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-sqlite:10434-10449 Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-08-14 19:50:59 UTC (rev 10737) +++ csw/mgar/gar/v2/gar.conf.mk 2010-08-14 20:04:26 UTC (rev 10738) @@ -31,6 +31,7 @@ WORKROOTDIR ?= $(if $(GAR_PLATFORM),work/$(GAR_PLATFORM),work) WORKDIR ?= $(WORKROOTDIR)/build-$(MODULATION) WORKDIR_FIRSTMOD ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS)) +WORKDIR_GLOBAL ?= $(WORKROOTDIR)/build-global DOWNLOADDIR ?= $(WORKROOTDIR)/download PARTIALDIR ?= $(DOWNLOADDIR)/partial COOKIEROOTDIR ?= $(WORKROOTDIR)/cookies @@ -492,7 +493,7 @@ SOS12U1_AS_FLAGS ?= $(EXTRA_SOS12U1_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) - SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath + SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath -xnorunpath SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-08-14 19:50:59 UTC (rev 10737) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-08-14 20:04:26 UTC (rev 10738) @@ -366,7 +366,10 @@ $$F[1] = "cswalternatives" if( $$F[2] =~ m,^/opt/csw/share/alternatives/[^/]+$$, );\ print join(" ", at F),"\n";' +_PROTOTYPE_MODIFIERS += | ( cat; \ + $(foreach SPEC,$(_PKG_SPECS),if test -f "$(WORKDIR_GLOBAL)/checkpkg_override.$(SPEC)";then echo "i checkpkg_override=checkpkg_override.$(SPEC)"; fi;)) + # This file contains all installed pathes. This can be used as a starting point # for distributing files to individual packages. PROTOTYPE = $(WORKDIR)/prototype @@ -682,7 +685,7 @@ $(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/checkpkg/overrides $(_DBG)($(foreach O,$(or $(CHECKPKG_OVERRIDES_$*),$(CHECKPKG_OVERRIDES)) $(_CATEGORY_CHECKPKG_OVERRIDES),echo "$O";)) | \ perl -F'\|' -ane 'unshift @F,"$*"; $$F[0].=":"; print join(" ", at F );' \ - > $(PKGROOT)/opt/csw/share/checkpkg/overrides/$(call catalogname,$*) + > $(WORKDIR_GLOBAL)/checkpkg_override.$* @$(MAKECOOKIE) merge-checkpkgoverrides: $(foreach S,$(SPKG_SPECS),$(if $(or $(CHECKPKG_OVERRIDES_$S),$(CHECKPKG_OVERRIDES),$(_CATEGORY_CHECKPKG_OVERRIDES)),merge-checkpkgoverrides-$S)) Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-08-14 19:50:59 UTC (rev 10737) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-08-14 20:04:26 UTC (rev 10738) @@ -917,17 +917,18 @@ self.file_paths.extend([f.replace(remove_prefix, "") for f in full_paths]) return self.file_paths - def _GetOverridesStream(self): - catalogname = self.GetCatalogname() - file_path = os.path.join(self.directory, - "root", - "opt/csw/share/checkpkg/overrides", - catalogname) + def _GetOverridesStream(self, file_path): # This might potentially cause a file descriptor leak, but I'm not going to # worry about that at this stage. + # NB, the whole catalog run doesn't seem to be suffering. (~2500 packages) + # + # There is a race condition here, but it's executing sequentially, I don't + # expect any concurrency problems. if os.path.isfile(file_path): + logging.debug("Opening %s override file." % repr(file_path)) return open(file_path, "r") else: + logging.debug("Override file %s not found." % repr(file_path)) return None def _ParseOverridesStream(self, stream): @@ -940,11 +941,22 @@ def GetOverrides(self): """Returns overrides, a list of overrides.Override instances.""" - stream = self._GetOverridesStream() - if stream: - return self._ParseOverridesStream(stream) - else: - return list() + overrides = [] + catalogname = self.GetCatalogname() + override_paths = ( + [self.directory, + "root", + "opt/csw/share/checkpkg/overrides", catalogname], + [self.directory, + "install", + "checkpkg_override"], + ) + for override_path in override_paths: + file_path = os.path.join(*override_path) + stream = self._GetOverridesStream(file_path) + if stream: + overrides.extend(self._ParseOverridesStream(stream)) + return overrides def GetFileContent(self, pkg_file_path): if pkg_file_path.startswith("/"): Property changes on: csw/mgar/gar/v2/pkglib/csw/depend ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678 /csw/mgar/gar/v2-bwalton/pkglib/csw/depend:9784-10011 /csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855 /csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649 /csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895 /csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180 /csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132 /csw/mgar/gar/v2-sqlite/pkglib/csw/depend:10434-10449 + /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678 /csw/mgar/gar/v2-bwalton/pkglib/csw/depend:9784-10011 /csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw/depend:10585-10737 /csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649 /csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895 /csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180 /csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132 /csw/mgar/gar/v2-sqlite/pkglib/csw/depend:10434-10449 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat Aug 14 22:25:35 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 14 Aug 2010 20:25:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[10739] csw/mgar/pkg/opendbx/trunk/Makefile Message-ID: Revision: 10739 http://gar.svn.sourceforge.net/gar/?rev=10739&view=rev Author: idogan23 Date: 2010-08-14 20:25:35 +0000 (Sat, 14 Aug 2010) Log Message: ----------- opendbx: added oracle support Modified Paths: -------------- csw/mgar/pkg/opendbx/trunk/Makefile Modified: csw/mgar/pkg/opendbx/trunk/Makefile =================================================================== --- csw/mgar/pkg/opendbx/trunk/Makefile 2010-08-14 20:04:26 UTC (rev 10738) +++ csw/mgar/pkg/opendbx/trunk/Makefile 2010-08-14 20:25:35 UTC (rev 10739) @@ -17,16 +17,18 @@ MASTER_SITES = http://www.linuxnetworks.de/opendbx/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWopendbx CSWopendbxdevel CSWopendbxmysql CSWopendbxsqlite3 +PACKAGES = CSWopendbx CSWopendbxdevel CSWopendbxmysql CSWopendbxsqlite3 CSWopendbxoracle CATALOGNAME_CSWopendbx = opendbx CATALOGNAME_CSWopendbxdevel = opendbx_devel CATALOGNAME_CSWopendbxmysql = opendbx_mysql CATALOGNAME_CSWopendbxsqlite3 = opendbx_sqlite3 +CATALOGNAME_CSWopendbxoracle = opendbx_oracle SPKG_DESC_CSWopendbx = $(DESCRIPTION) SPKG_DESC_CSWopendbxdevel = $(DESCRIPTION), development package SPKG_DESC_CSWopendbxmysql = $(DESCRIPTION), mysql backend package SPKG_DESC_CSWopendbxsqlite3 = $(DESCRIPTION), sqlite3 backend package +SPKG_DESC_CSWopendbxsoracle = $(DESCRIPTION), oracle backend package # File name regex to get notifications about upstream software releases UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -37,38 +39,41 @@ GARCOMPILER = GCC4 BUILD64 = 1 -#EXTRA_BUILD_ISAS_i386 = pentium_pro -#EXTRA_BUILD_ISAS_sparc = sparcv8plus -EXTRA_INC = /opt/csw/mysql5/include/mysql -EXTRA_LINKER_DIRS_32 = $(prefix)/mysql5/lib/mysql -EXTRA_LINKER_DIRS_64 = $(prefix)/mysql5/lib/64/mysql -EXTRA_LINKER_FLAGS = -L$(EXTRA_LINKER_DIRS_$(MEMORYMODEL)) -EXTRA_RUNPATH_LINKER_FLAGS = -R$(EXTRA_LINKER_DIRS_$(MEMORYMODEL)) +EXTRA_INC = $(prefix)/mysql5/include/mysql $(prefix)/instantclient_10_2/sdk/include +EXTRA_LINKER_DIRS_MYSQL_32 = $(prefix)/mysql5/lib/mysql +EXTRA_LINKER_DIRS_ORACLE_32 += $(prefix)/instantclient_10_2 +EXTRA_LINKER_DIRS_MYSQL_64 = $(prefix)/mysql5/lib/64/mysql +EXTRA_LINKER_DIRS_ORACLE_64 += $(prefix)/instantclient_10_2/64 +EXTRA_LINKER_FLAGS = -L$(EXTRA_LINKER_DIRS_MYSQL_$(MEMORYMODEL)) -L$(EXTRA_LINKER_DIRS_ORACLE_$(MEMORYMODEL)) +EXTRA_RUNPATH_LINKER_FLAGS = -R$(EXTRA_LINKER_DIRS_MYSQL_$(MEMORYMODEL)) -R$(EXTRA_LINKER_DIRS_ORACLE_$(MEMORYMODEL)) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-utils -CONFIGURE_ARGS += --with-backends="mysql sqlite3" +CONFIGURE_ARGS += --with-backends="mysql sqlite3 oracle" PKGFILES_CSWopendbxdevel = $(PKGFILES_DEVEL) PKGFILES_CSWopendbxmysql = $(call baseisadirs,$(libdir),opendbx/libmysqlbackend.*) PKGFILES_CSWopendbxsqlite3 = $(call baseisadirs,$(libdir),opendbx/libsqlite3backend.*) +PKGFILES_CSWopendbxoracle = $(call baseisadirs,$(libdir),opendbx/liboraclebackend.*) -#CONFIGURE_ARGS += --with-backends=oracle -#EXTRA_LIB = /opt/csw/instantclient_10_2 -#EXTRA_INC = /opt/csw/instantclient_10_2/sdk/include -#RUNTIME_DEP_PKGS_CSWopendbx += CSWorainstclient102 -#CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/libopendbx.so.1.2.0 -#CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/$ISALIST|opt/csw/lib/libopendbx.so.1.2.0 -#CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/libopendbxplus.so.1.0.0 -#CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/$ISALIST|opt/csw/lib/libopendbxplus.so.1.0.0 -#CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/opendbx/liboraclebackend.so.1.2.0 -#CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/$ISALIST|opt/csw/lib/opendbx/liboraclebackend.so.1.2.0 - CHECKPKG_OVERRIDES_CSWopendbxdevel += surplus-dependency|CSWopendbx CHECKPKG_OVERRIDES_CSWopendbxmysql += surplus-dependency|CSWopendbx CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += surplus-dependency|CSWopendbx +CHECKPKG_OVERRIDES_CSWopendbxoracle += surplus-dependency|CSWopendbx +CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/opendbx/libsqlite3backend.so.1.2.0 +CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/opendbx/libsqlite3backend.so.1.2.0 +CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/libopendbx.so.1.2.0 +CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/libopendbxplus.so.1.0.0 +CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/libopendbx.so.1.2.0 +CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/libopendbxplus.so.1.0.0 +CHECKPKG_OVERRIDES_CSWopendbxmysql += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/opendbx/libmysqlbackend.so.1.2.0 +CHECKPKG_OVERRIDES_CSWopendbxmysql += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/opendbx/libmysqlbackend.so.1.2.0 +CHECKPKG_OVERRIDES_CSWopendbxoracle += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/opendbx/liboraclebackend.so.1.2.0 +CHECKPKG_OVERRIDES_CSWopendbxoracle += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/opendbx/liboraclebackend.so.1.2.0 +CHECKPKG_OVERRIDES_CSWopendbxoracle += missing-dependency|CSWorainstclient102 + RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc4corert RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWopendbx += CSWggettextrt @@ -78,5 +83,7 @@ RUNTIME_DEP_PKGS_CSWopendbxmysql += CSWmysql5rt RUNTIME_DEP_PKGS_CSWopendbxsqlite3 += CSWgcc4corert RUNTIME_DEP_PKGS_CSWopendbxsqlite3 += CSWsqlite3rt +RUNTIME_DEP_PKGS_CSWopendbxoracle += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWopendbxoracle += CSWopendbx include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat Aug 14 22:26:44 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 14 Aug 2010 20:26:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[10740] csw/mgar/pkg/opendbx/trunk/Makefile Message-ID: Revision: 10740 http://gar.svn.sourceforge.net/gar/?rev=10740&view=rev Author: idogan23 Date: 2010-08-14 20:26:44 +0000 (Sat, 14 Aug 2010) Log Message: ----------- opendbx: added PACKAGING_PLATFORMS variable Modified Paths: -------------- csw/mgar/pkg/opendbx/trunk/Makefile Modified: csw/mgar/pkg/opendbx/trunk/Makefile =================================================================== --- csw/mgar/pkg/opendbx/trunk/Makefile 2010-08-14 20:25:35 UTC (rev 10739) +++ csw/mgar/pkg/opendbx/trunk/Makefile 2010-08-14 20:26:44 UTC (rev 10740) @@ -39,6 +39,7 @@ GARCOMPILER = GCC4 BUILD64 = 1 +PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 EXTRA_INC = $(prefix)/mysql5/include/mysql $(prefix)/instantclient_10_2/sdk/include EXTRA_LINKER_DIRS_MYSQL_32 = $(prefix)/mysql5/lib/mysql This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Aug 14 23:36:55 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Aug 2010 21:36:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[10741] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 10741 http://gar.svn.sourceforge.net/gar/?rev=10741&view=rev Author: dmichelsen Date: 2010-08-14 21:36:55 +0000 (Sat, 14 Aug 2010) Log Message: ----------- mGAR v2: Make GIT snapshot after post-extract-modulated to allow extra extaction steps Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-08-14 20:26:44 UTC (rev 10740) +++ csw/mgar/gar/v2/gar.mk 2010-08-14 21:36:55 UTC (rev 10741) @@ -403,7 +403,7 @@ extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ announce-modulation \ - pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) $(if $(filter global,$(MODULATION)),,post-extract-gitsnap) post-extract-$(MODULATION) post-extract-modulated + pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated $(if $(filter global,$(MODULATION)),,post-extract-gitsnap) @$(DONADA) # This target ensures that the values used by git when making a commit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Aug 14 23:50:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Aug 2010 21:50:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[10742] csw/mgar/pkg/apr/trunk Message-ID: Revision: 10742 http://gar.svn.sourceforge.net/gar/?rev=10742&view=rev Author: dmichelsen Date: 2010-08-14 21:50:53 +0000 (Sat, 14 Aug 2010) Log Message: ----------- apr: Fix 64 bit testcase to link testsuite against newly built lib Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile csw/mgar/pkg/apr/trunk/checksums Added Paths: ----------- csw/mgar/pkg/apr/trunk/files/0001-Force-newly-built-libs-in-testsuite.patch Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2010-08-14 21:36:55 UTC (rev 10741) +++ csw/mgar/pkg/apr/trunk/Makefile 2010-08-14 21:50:53 UTC (rev 10742) @@ -11,6 +11,9 @@ MASTER_SITES = http://apache.crihan.fr/dist/apr/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PATCHFILES = 0001-Force-newly-built-libs-in-testsuite.patch + LICENSE = LICENSE # We define upstream file regex so we can be notifed of new upstream software release @@ -24,4 +27,19 @@ TEST_TARGET = check +# Make sure for the tests the local libs are preferred, especially for 'testall'. +# Otherwise these tests are failing: +# +# testfmt : \Line 52: expected <0>, but saw <%ld> +# \Line 74: expected <0>, but saw <%ld> +# /Line 85: expected <14000000>, but saw <%lu> +# \Line 96: expected , but saw <%lx> +# |Line 108: expected <-42>, but saw <%ld> +# FAILED 5 of 9 + +LD_LIBRARY_PATH=../.lib +export LD_LIBRARY_PATH +EXTRA_TEST_EXPORTS = LD_LIBRARY_PATH + include gar/category.mk + Modified: csw/mgar/pkg/apr/trunk/checksums =================================================================== --- csw/mgar/pkg/apr/trunk/checksums 2010-08-14 21:36:55 UTC (rev 10741) +++ csw/mgar/pkg/apr/trunk/checksums 2010-08-14 21:50:53 UTC (rev 10742) @@ -1 +1,2 @@ +700afb2b78a496891aa1243ad6830a15 0001-Force-newly-built-libs-in-testsuite.patch fc80cb54f158c2674f9eeb47a1f672cd apr-1.4.2.tar.gz Added: csw/mgar/pkg/apr/trunk/files/0001-Force-newly-built-libs-in-testsuite.patch =================================================================== --- csw/mgar/pkg/apr/trunk/files/0001-Force-newly-built-libs-in-testsuite.patch (rev 0) +++ csw/mgar/pkg/apr/trunk/files/0001-Force-newly-built-libs-in-testsuite.patch 2010-08-14 21:50:53 UTC (rev 10742) @@ -0,0 +1,25 @@ +From 7cb4c8dbf352acddec4c68d53cfa4633ba80c61d Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 14 Aug 2010 23:27:50 +0200 +Subject: [PATCH] Force newly built libs in testsuite + +--- + test/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/test/Makefile.in b/test/Makefile.in +index b371074..63b3d35 100644 +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -162,7 +162,7 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) + teststatus=0; \ + progfailed=""; \ + for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \ +- ./$$prog; \ ++ LD_LIBRARY_PATH=../.libs ./$$prog; \ + status=$$?; \ + if test $$status != 0; then \ + teststatus=$$status; \ +-- +1.7.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 Sun Aug 15 10:47:48 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Aug 2010 08:47:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[10743] csw/mgar/gar/v2/lib/python/package_checks_test.py Message-ID: Revision: 10743 http://gar.svn.sourceforge.net/gar/?rev=10743&view=rev Author: wahwah Date: 2010-08-15 08:47:48 +0000 (Sun, 15 Aug 2010) Log Message: ----------- mGAR v2: checkpkg, better test data length. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-08-14 21:50:53 UTC (rev 10742) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-08-15 08:47:48 UTC (rev 10743) @@ -70,8 +70,8 @@ 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', 'length=1394') + self.pkg_data["pkginfo"]["NAME"] = 'foo - ' + ('A' * 200) + self.error_mgr_mock.ReportError('pkginfo-description-too-long', 'length=200') class TestDescriptionNotCapitalized(CheckpkgUnitTestHelper, unittest.TestCase): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Aug 15 11:55:16 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 15 Aug 2010 09:55:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[10744] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 10744 http://gar.svn.sourceforge.net/gar/?rev=10744&view=rev Author: idogan23 Date: 2010-08-15 09:55:16 +0000 (Sun, 15 Aug 2010) Log Message: ----------- unbound: bump version to 1.4.6 Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile csw/mgar/pkg/unbound/trunk/checksums Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2010-08-15 08:47:48 UTC (rev 10743) +++ csw/mgar/pkg/unbound/trunk/Makefile 2010-08-15 09:55:16 UTC (rev 10744) @@ -1,5 +1,5 @@ GARNAME = unbound -GARVERSION = 1.4.5 +GARVERSION = 1.4.6 CATEGORIES = server DESCRIPTION = A validating, recursive, and caching DNS resolver @@ -44,12 +44,6 @@ RUNTIME_DEP_PKGS += CSWldns RUNTIME_DEP_PKGS += CSWlibevent -CHECKPKG_OVERRIDES_CSWunbound += binary-architecture-does-not-match-placement|file=opt/csw/lib/libunbound.so.2.5.0|arch_id=18|arch_name=sparcv8+ -CHECKPKG_OVERRIDES_CSWunbound += binary-architecture-does-not-match-placement|file=opt/csw/sbin/unbound|arch_id=18|arch_name=sparcv8+ -CHECKPKG_OVERRIDES_CSWunbound += binary-architecture-does-not-match-placement|file=opt/csw/sbin/unbound-host|arch_id=18|arch_name=sparcv8+ -CHECKPKG_OVERRIDES_CSWunbound += binary-architecture-does-not-match-placement|file=opt/csw/sbin/unbound-control|arch_id=18|arch_name=sparcv8+ -CHECKPKG_OVERRIDES_CSWunbound += binary-architecture-does-not-match-placement|file=opt/csw/sbin/unbound-checkconf|arch_id=18|arch_name=sparcv8+ - # make test doesn't work for the moment on Solaris SKIPTEST = 1 Modified: csw/mgar/pkg/unbound/trunk/checksums =================================================================== --- csw/mgar/pkg/unbound/trunk/checksums 2010-08-15 08:47:48 UTC (rev 10743) +++ csw/mgar/pkg/unbound/trunk/checksums 2010-08-15 09:55:16 UTC (rev 10744) @@ -1,3 +1,3 @@ 75867432e238f5afd48dfe5d138097e9 cswunbound 601effee1051487655f66790762b66fd cswusergroup -f1f6c97b90b15ca503a80b888c311d6c unbound-1.4.5.tar.gz +2cdcfe0ca45373c6b22e274560ae9943 unbound-1.4.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Aug 15 14:38:42 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Aug 2010 12:38:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[10745] csw/mgar/pkg/krb5/trunk Message-ID: Revision: 10745 http://gar.svn.sourceforge.net/gar/?rev=10745&view=rev Author: dmichelsen Date: 2010-08-15 12:38:42 +0000 (Sun, 15 Aug 2010) Log Message: ----------- krb5: Update to 1.8.3, some tests failing Modified Paths: -------------- csw/mgar/pkg/krb5/trunk/Makefile csw/mgar/pkg/krb5/trunk/checksums csw/mgar/pkg/krb5/trunk/files/0002-libintl-for-kproplog.patch Added Paths: ----------- csw/mgar/pkg/krb5/trunk/files/0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch Modified: csw/mgar/pkg/krb5/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5/trunk/Makefile 2010-08-15 09:55:16 UTC (rev 10744) +++ csw/mgar/pkg/krb5/trunk/Makefile 2010-08-15 12:38:42 UTC (rev 10745) @@ -1,5 +1,5 @@ GARNAME = krb5 -GARVERSION = 1.7 +GARVERSION = 1.8.3 CATEGORIES = server DESCRIPTION = MIT Kerberos 5 @@ -11,16 +11,19 @@ Kerberos is available in many commercial products as well. endef -MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/1.7/ +MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/1.8/ +MASTER_SITES += http://web.mit.edu/kerberos/dist/krb5-appl/1.0/ DISTFILES = $(GARNAME)-$(GARVERSION)-signed.tar +# DISTFILES += krb5-appl-1.0.1-signed.tar # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-signed.tar PATCHFILES = patch-man2html-perl.patch PATCHFILES += 0002-libintl-for-kproplog.patch -PATCHFILES += 0003-local-libraries-first-when-linking.patch +#PATCHFILES += 0003-local-libraries-first-when-linking.patch PATCHFILES += 0004-libkdb_ldap-isblank-define.patch +PATCHFILES += 0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch BUILD_DEP_PKGS = CSWtcl @@ -106,12 +109,13 @@ CXXFLAGS := $(strip $(CXXFLAGS) -D__EXTENSIONS__) #LDFLAGS := $(strip $(LDFLAGS)) -EXTRA_LINKER_FLAGS := $(LD_OPTIONS) +EXTRA_LINKER_FLAGS := $(LD_OPTIONS) -llber LD_OPTIONS := post-extract-modulated: @# TODO: Check signature - @cd $(WORKDIR) && (gzip -c -d $(GARNAME)-$(GARVERSION).tar.gz | tar xf -) + -cd $(WORKDIR) && (gzip -c -d $(GARNAME)-$(GARVERSION).tar.gz | tar xf -) + #-cd $(WORKDIR) && (gzip -c -d krb5-appl-1.0.1.tar.gz | tar xf -) @$(MAKECOOKIE) install-custom: Modified: csw/mgar/pkg/krb5/trunk/checksums =================================================================== --- csw/mgar/pkg/krb5/trunk/checksums 2010-08-15 09:55:16 UTC (rev 10744) +++ csw/mgar/pkg/krb5/trunk/checksums 2010-08-15 12:38:42 UTC (rev 10745) @@ -1,5 +1,5 @@ -ddcb250250f96a457798b469b3a813e8 0002-libintl-for-kproplog.patch -2f4671672bce98d1157b49ba7b6846c3 0003-local-libraries-first-when-linking.patch +50aadae110cba9faba35db3edaa43677 0002-libintl-for-kproplog.patch f0bec7c3f02810838559e1dd764b111e 0004-libkdb_ldap-isblank-define.patch -9f7b3402b4731a7fa543db193bf1b564 krb5-1.7-signed.tar +fb6826ccfffde6e51a8c5ac73ed2266a 0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch +7c5f38e31ee744cb538eed2301096b93 krb5-1.8.3-signed.tar 6c2c7718f024c85f66fdc26398090c23 patch-man2html-perl.patch Modified: csw/mgar/pkg/krb5/trunk/files/0002-libintl-for-kproplog.patch =================================================================== --- csw/mgar/pkg/krb5/trunk/files/0002-libintl-for-kproplog.patch 2010-08-15 09:55:16 UTC (rev 10744) +++ csw/mgar/pkg/krb5/trunk/files/0002-libintl-for-kproplog.patch 2010-08-15 12:38:42 UTC (rev 10745) @@ -1,18 +1,18 @@ -From 7aa639db0238c894c12d8d9728e684b3ddbdc5dc Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Fri, 5 Feb 2010 10:31:20 +0100 -Subject: [PATCH 2/4] libintl for kproplog +From 94e59f7701fdf0e2b93796f16864aadaaaa14669 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sun, 15 Aug 2010 12:34:41 +0200 +Subject: [PATCH] libintl for kproplog --- src/slave/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in -index 6ff3c71..31f6844 100644 +index 20bef7c..a9e1988 100644 --- a/src/slave/Makefile.in +++ b/src/slave/Makefile.in -@@ -27,7 +27,7 @@ kpropd: $(SERVEROBJS) $(KADMCLNT_DEPLIBS) $(KDB5_DEPLIB) $(KRB5_BASE_DEPLIBS) $( - $(CC_LINK) -o kpropd $(SERVEROBJS) $(KADMCLNT_LIBS) $(KDB5_LIB) $(KRB5_BASE_LIBS) $(APPUTILS_LIB) @LIBUTIL@ +@@ -25,7 +25,7 @@ kpropd: $(SERVEROBJS) $(KDB5_DEPLIB) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS) $( + $(CC_LINK) -o kpropd $(SERVEROBJS) $(KDB5_LIB) $(KADMCLNT_LIBS) $(KRB5_BASE_LIBS) $(APPUTILS_LIB) @LIBUTIL@ kproplog: $(LOGOBJS) - $(CC_LINK) -o kproplog $(LOGOBJS) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS) @@ -21,5 +21,5 @@ install:: for f in kprop kpropd kproplog; do \ -- -1.6.6 +1.7.1 Added: csw/mgar/pkg/krb5/trunk/files/0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch =================================================================== --- csw/mgar/pkg/krb5/trunk/files/0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch (rev 0) +++ csw/mgar/pkg/krb5/trunk/files/0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch 2010-08-15 12:38:42 UTC (rev 10745) @@ -0,0 +1,24 @@ +From 2827729c42021ec00658d7836e981e4b02f837be Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sun, 15 Aug 2010 00:10:24 +0200 +Subject: [PATCH] Add strings.h to setenv.c for strlen and other stuff + +--- + src/clients/ksu/setenv.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/clients/ksu/setenv.c b/src/clients/ksu/setenv.c +index 6e8710d..9658ee7 100644 +--- a/src/clients/ksu/setenv.c ++++ b/src/clients/ksu/setenv.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include "autoconf.h" + + static char *_findenv(char *, int *); +-- +1.7.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 Sun Aug 15 16:55:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Aug 2010 14:55:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[10746] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 10746 http://gar.svn.sourceforge.net/gar/?rev=10746&view=rev Author: dmichelsen Date: 2010-08-15 14:55:05 +0000 (Sun, 15 Aug 2010) Log Message: ----------- mGAR v2: Fix checkpkg_overrides for multiple package generation 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-08-15 12:38:42 UTC (rev 10745) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-08-15 14:55:05 UTC (rev 10746) @@ -366,10 +366,10 @@ $$F[1] = "cswalternatives" if( $$F[2] =~ m,^/opt/csw/share/alternatives/[^/]+$$, );\ print join(" ", at F),"\n";' -_PROTOTYPE_MODIFIERS += | ( cat; \ - $(foreach SPEC,$(_PKG_SPECS),if test -f "$(WORKDIR_GLOBAL)/checkpkg_override.$(SPEC)";then echo "i checkpkg_override=checkpkg_override.$(SPEC)"; fi;)) +define checkpkg_override_filter + | ( cat; if test -f "$(WORKDIR_GLOBAL)/checkpkg_override.$(1)";then echo "i checkpkg_override=checkpkg_override.$(1)"; fi) +endef - # This file contains all installed pathes. This can be used as a starting point # for distributing files to individual packages. PROTOTYPE = $(WORKDIR)/prototype @@ -401,13 +401,11 @@ -I $(call licensedir,$*)/license \ -I /etc/opt/csw/pkg/$*/cswmigrateconf \ -I /opt/csw/share/alternatives/$(call catalogname,$*) \ - -I /opt/csw/share/checkpkg/overrides/$(call catalogname,$*) \ )\ $(foreach S,$(filter-out $*,$(SPKG_SPECS)),\ -X $(call licensedir,$S)/license \ -X /etc/opt/csw/pkg/$S/cswmigrateconf \ -X /opt/csw/share/alternatives/$(call catalogname,$S) \ - -X /opt/csw/share/checkpkg/overrides/$(call catalogname,$S) \ ) \ $(foreach I,$(EXTRA_PKGFILES_INCLUDED) $(EXTRA_PKGFILES_INCLUDED_$*),-i '$I') \ $(foreach X,$(EXTRA_PKGFILES_EXCLUDED) $(EXTRA_PKGFILES_EXCLUDED_$*),-x '$X') \ @@ -418,9 +416,9 @@ ) \ <$(PROTOTYPE); \ if [ -n "$(EXTRA_PKGFILES_$*)" ]; then echo "$(EXTRA_PKGFILES_$*)"; fi \ - ) $(_CSWCLASS_FILTER) $(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \ + ) $(call checkpkg_override_filter,$*) $(_CSWCLASS_FILTER) $(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \ else \ - cat $(PROTOTYPE) $(_CSWCLASS_FILTER) $(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \ + cat $(PROTOTYPE) $(call checkpkg_override_filter,$*) $(_CSWCLASS_FILTER) $(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \ fi $(WORKDIR)/%.prototype-$(GARCH): | $(WORKDIR)/%.prototype This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Aug 15 16:55:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Aug 2010 14:55:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[10747] csw/mgar/gar/v2/categories/rbgems/category.mk Message-ID: Revision: 10747 http://gar.svn.sourceforge.net/gar/?rev=10747&view=rev Author: dmichelsen Date: 2010-08-15 14:55:33 +0000 (Sun, 15 Aug 2010) Log Message: ----------- mGAR v2: Enhance rbgems category Modified Paths: -------------- csw/mgar/gar/v2/categories/rbgems/category.mk Modified: csw/mgar/gar/v2/categories/rbgems/category.mk =================================================================== --- csw/mgar/gar/v2/categories/rbgems/category.mk 2010-08-15 14:55:05 UTC (rev 10746) +++ csw/mgar/gar/v2/categories/rbgems/category.mk 2010-08-15 14:55:33 UTC (rev 10747) @@ -73,7 +73,14 @@ @$(MAKECOOKIE) install-rbgem: - gem install --ignore-dependencies --local --no-test --install-dir $(DESTDIR)$(GEMDIR) $(DOWNLOADDIR)/$(GEMFILE) + gem install \ + --ignore-dependencies \ + --local \ + --no-test \ + --install-dir $(DESTDIR)$(GEMDIR) \ + $(EXTRA_GEM_INSTALL_ARGS) \ + $(DOWNLOADDIR)/$(GEMFILE) \ + $(if $(GEM_BUILD_FLAGS),-- --build-flags $(GEM_BUILD_FLAGS)) @$(MAKECOOKIE) # Check for a CPAN module version update This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Aug 15 16:56:14 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Aug 2010 14:56:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[10748] csw/mgar/pkg/krb5/trunk/Makefile Message-ID: Revision: 10748 http://gar.svn.sourceforge.net/gar/?rev=10748&view=rev Author: dmichelsen Date: 2010-08-15 14:56:14 +0000 (Sun, 15 Aug 2010) Log Message: ----------- krb5: Add checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/krb5/trunk/Makefile Modified: csw/mgar/pkg/krb5/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5/trunk/Makefile 2010-08-15 14:55:33 UTC (rev 10747) +++ csw/mgar/pkg/krb5/trunk/Makefile 2010-08-15 14:56:14 UTC (rev 10748) @@ -44,9 +44,14 @@ SPKG_DESC_CSWkrb5user = MIT Kerberos 5 user tools RUNTIME_DEP_PKGS_CSWkrb5adminserver = CSWkrb5kdc CSWkrb5lib +RUNTIME_DEP_PKGS_CSWkrb5adminserver += CSWoldaprt RUNTIME_DEP_PKGS_CSWkrb5kdc = CSWkrb5lib CSWkrb5user +RUNTIME_DEP_PKGS_CSWkrb5kdc += CSWoldaprt +RUNTIME_DEP_PKGS_CSWkrb5lib += CSWoldaprt RUNTIME_DEP_PKGS_CSWkrb5libdev = CSWkrb5lib +RUNTIME_DEP_PKGS_CSWkrb5libdev += CSWoldaprt RUNTIME_DEP_PKGS_CSWkrb5user = CSWkrb5lib +RUNTIME_DEP_PKGS_CSWkrb5user += CSWosslrt CSWoldaprt CSWggettextrt LICENSE = doc/copyright.texinfo @@ -64,6 +69,7 @@ CONFIGURE_ARGS += --with-ldap BUILD64 = 1 +NOISAEXEC = 1 BUILD_SCRIPTS = $(WORKSRC)/src/Makefile BUILD_SCRIPTS += $(WORKSRC)/doc/Makefile @@ -102,6 +108,10 @@ #PKGFILES_CSWkrb5user += $(sharedstatedir)/examples/krb5/krb5.conf #PKGFILES_CSWkrb5user += $(bindir)/($(USER_BINS)) +CHECKPKG_OVERRIDES_CSWkrb5adminserver += surplus-dependency|CSWkrb5kdc +CHECKPKG_OVERRIDES_CSWkrb5kdc += surplus-dependency|CSWkrb5user +CHECKPKG_OVERRIDES_CSWkrb5user += discouraged-path-in-pkgmap|/opt/csw/var/krb5kdc + include gar/category.mk # The flags must not contain additional spaces or the build freaks out 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 Aug 16 09:43:45 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 16 Aug 2010 07:43:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[10749] csw/mgar/gar/v2 Message-ID: Revision: 10749 http://gar.svn.sourceforge.net/gar/?rev=10749&view=rev Author: wahwah Date: 2010-08-16 07:43:44 +0000 (Mon, 16 Aug 2010) Log Message: ----------- mGAR v2: bug fixes for checkpkg_inspect_stats and pkgdb. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py 2010-08-15 14:56:14 UTC (rev 10748) +++ csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py 2010-08-16 07:43:44 UTC (rev 10749) @@ -33,28 +33,10 @@ else: logging.basicConfig(level=logging.INFO) logging.debug("Collecting statistics about given package files.") - filenames = [] - md5s = [] - md5_re = re.compile(r"^[0123456789abcdef]{32}$") - for arg in args: - if md5_re.match(arg): - md5s.append(arg) - else: - filenames.append(arg) - srv4_pkgs = [opencsw.CswSrv4File(x) for x in filenames] - pkgstat_objs = [] + pkgstat_objs = checkpkg.GetPackageStatsByFilenamesOrMd5s( + args, + options.debug) bar = progressbar.ProgressBar() - bar.maxval = len(md5s) + len(srv4_pkgs) - bar.start() - counter = itertools.count() - for pkg in srv4_pkgs: - pkgstat_objs.append(checkpkg.PackageStats(pkg, debug=options.debug)) - bar.update(counter.next()) - for md5 in md5s: - pkgstat_objs.append(checkpkg.PackageStats(None, md5sum=md5, debug=options.debug)) - bar.update(counter.next()) - bar.finish() - bar = progressbar.ProgressBar() bar.maxval = len(pkgstat_objs) bar.start() counter = itertools.count() Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-08-15 14:56:14 UTC (rev 10748) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-08-16 07:43:44 UTC (rev 10749) @@ -67,6 +67,7 @@ ] CONTENT_PKG_RE = r"^\*?(CSW|SUNW)[0-9a-zA-Z\-]?[0-9a-z\-]+$" +MD5_RE = r"^[0123456789abcdef]{32}$" REPORT_TMPL = u"""#if $missing_deps or $surplus_deps or $orphan_sonames Dependency issues of $pkgname: @@ -1527,3 +1528,31 @@ idxes = xrange(0, len(l), size) sliced = [l[i:i+size] for i in idxes] return sliced + +def IsMd5(s): + # For optimization, move the compilation elsewhere. + md5_re = re.compile(MD5_RE) + return md5_re.match(s) + +def GetPackageStatsByFilenamesOrMd5s(args, debug=False): + filenames = [] + md5s = [] + for arg in args: + if IsMd5(arg): + md5s.append(arg) + else: + filenames.append(arg) + srv4_pkgs = [opencsw.CswSrv4File(x) for x in filenames] + pkgstat_objs = [] + bar = progressbar.ProgressBar() + bar.maxval = len(md5s) + len(srv4_pkgs) + bar.start() + counter = itertools.count() + for pkg in srv4_pkgs: + pkgstat_objs.append(PackageStats(pkg, debug=debug)) + bar.update(counter.next()) + for md5 in md5s: + pkgstat_objs.append(PackageStats(None, md5sum=md5, debug=debug)) + bar.update(counter.next()) + bar.finish() + return pkgstat_objs Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2010-08-15 14:56:14 UTC (rev 10748) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2010-08-16 07:43:44 UTC (rev 10749) @@ -8,6 +8,9 @@ import sqlobject import logging import code +import os +import os.path +import socket import sys from Cheetah.Template import Template @@ -28,7 +31,7 @@ """ def GetPkg(some_id): - logging.debug("Selecting from db: %s", some_id) + logging.debug("Selecting from db: %s", repr(some_id)) res = m.Srv4FileStats.select( sqlobject.OR( m.Srv4FileStats.q.md5_sum==some_id, @@ -60,7 +63,11 @@ args = args[1:] # db_path = checkpkg.DatabaseClient.GetDatabasePath() - db_path = '/home/maciej/.checkpkg/checkpkg-db-current9s' + # db_path = '/home/maciej/.checkpkg/checkpkg-db-current9s' + db_path = os.path.join( + os.environ["HOME"], + ".checkpkg", + "checkpkg-db-%s" % socket.getfqdn()) sqo_conn = sqlobject.connectionForURI('sqlite:%s' % db_path) sqlobject.sqlhub.processConnection = sqo_conn 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 Aug 16 09:44:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 16 Aug 2010 07:44:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[10750] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: Revision: 10750 http://gar.svn.sourceforge.net/gar/?rev=10750&view=rev Author: wahwah Date: 2010-08-16 07:44:57 +0000 (Mon, 16 Aug 2010) Log Message: ----------- mGAR v2: pkgdb, added gen-html function, with a prototype template. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2010-08-16 07:43:44 UTC (rev 10749) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2010-08-16 07:44:57 UTC (rev 10750) @@ -6,6 +6,7 @@ import optparse import models as m import sqlobject +import cPickle import logging import code import os @@ -15,7 +16,9 @@ from Cheetah.Template import Template USAGE = """usage: %prog show errors [ ... ] - %prog show pkg [ ... ]""" + %prog show pkg [ ... ] + %prog gen-html [ ... ] + """ SHOW_PKG_TMPL = """catalogname: $catalogname pkgname: $pkginst.pkgname basename: $basename @@ -30,6 +33,150 @@ stats_version: $stats_version """ +REVIEW_REQ_TMPL = """ +#import pprint + + +#for pkg in $pkgstats +$pkg.pkginfo.PKG +#end for + + + + + +#for pkg in $pkgstats +

$pkg.basic_stats.pkg_basename

+

Basic stats

+ +#for key in ('md5_sum', 'pkgname', 'stats_version', 'pkg_basename', 'catalogname') + + + + +#end for +
+ $key + + $pkg.basic_stats[$key] +
+

parsed basename

+ 
+$pprint.pformat($pkg.basic_stats.parsed_basename)
+
+

pkginfo

+ +#for key, val in $pkg.pkginfo.iteritems + + + + +#end for +
$key$val
+#if $pkg.binaries_dump_info +

binaries_dump_info

+
    +#for bin in $pkg["binaries_dump_info"] +
  • + $bin.path +## ['base_name', 'RUNPATH RPATH the same', 'runpath', 'RPATH set', 'needed sonames', 'path', 'RUNPATH set'] +
      +
    • runpath: $bin.runpath
      • +
    • needed sonames: $bin["needed sonames"]
      • +
    +
    • +#end for +
+#end if +#if $pkg.depends +

depends

+
    +#for depend_pkg, depend_desc in $pkg.depends +
  • + $depend_desc +
    • +#end for +
+#end if +#if $pkg.files_metadata +

files metadata

+ +#for md in $pkg.files_metadata + + + + +#end for +
$md.path $md.mime_type
+#end if +#if $pkg.isalist +

isalist

+

$pkg.isalist

+#end if +#if $pkg.mtime +

mtime

+

+ $pkg.mtime +

+#end if +#if $pkg.overrides +

overrides

+
    +#for override in $pkg.overrides +
  • + $override.pkgname + $override.tag_name + $override.tag_info +
    • +#end for +
+#end if +

pkgchk

+

stdout

+ 
+#for l in $pkg.pkgchk.stdout_lines
+$l
+#end for
+
+

stderr

+ 
+#for l in $pkg.pkgchk.stderr_lines
+$l
+#end for
+
+

pkgmap

+
    +#for entry in $pkg.pkgmap +
  • + $entry.line +
    • +#end for +
+#end for + + +""" + def GetPkg(some_id): logging.debug("Selecting from db: %s", repr(some_id)) res = m.Srv4FileStats.select( @@ -61,9 +208,9 @@ if command == 'show': subcommand = args[0] args = args[1:] + else: + subcommand = None - # db_path = checkpkg.DatabaseClient.GetDatabasePath() - # db_path = '/home/maciej/.checkpkg/checkpkg-db-current9s' db_path = os.path.join( os.environ["HOME"], ".checkpkg", @@ -90,8 +237,14 @@ srv4 = GetPkg(md5_sum) t = Template(SHOW_PKG_TMPL, searchList=[srv4]) sys.stdout.write(unicode(t)) + if command == 'gen-html': + pkgstats = [] + for md5_sum in md5_sums: + srv4 = GetPkg(md5_sum) + pkgstats.append(cPickle.loads(str(srv4.data))) + t = Template(REVIEW_REQ_TMPL, searchList=[srv4, {"pkgstats": pkgstats}]) + sys.stdout.write(unicode(t)) - if __name__ == '__main__': 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 Aug 16 13:32:27 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 16 Aug 2010 11:32:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[10751] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: Revision: 10751 http://gar.svn.sourceforge.net/gar/?rev=10751&view=rev Author: wahwah Date: 2010-08-16 11:32:27 +0000 (Mon, 16 Aug 2010) Log Message: ----------- mGAR v2: pkgdb, improvements to the HTML template. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2010-08-16 07:44:57 UTC (rev 10750) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2010-08-16 11:32:27 UTC (rev 10751) @@ -11,8 +11,10 @@ import code import os import os.path +import re import socket import sys +import package_checks from Cheetah.Template import Template USAGE = """usage: %prog show errors [ ... ] @@ -44,7 +46,7 @@ #for pkg in $pkgstats

$pkg.basic_stats.pkg_basename

+

Build source code

+#if $pkg.build_src +

+ + $pkg.build_src + +

+#else +

+ + Build source (OPENCSW_REPOSITORY) not specified in pkginfo. + +

+#end if +

+ + $pkg.basic_stats.pkgname + on the website. +

Basic stats

#for key in ('md5_sum', 'pkgname', 'stats_version', 'pkg_basename', 'catalogname') @@ -77,7 +101,7 @@ #end for
-

parsed basename

+

parsed basename

 $pprint.pformat($pkg.basic_stats.parsed_basename)
@@ -86,9 +110,9 @@ #for key, val in $pkg.pkginfo.iteritems $key - $val #end for @@ -97,23 +121,48 @@

binaries_dump_info

    #for bin in $pkg["binaries_dump_info"] -
  • - $bin.path +
  • + $bin.path ## ['base_name', 'RUNPATH RPATH the same', 'runpath', 'RPATH set', 'needed sonames', 'path', 'RUNPATH set'] -
      -
    • runpath: $bin.runpath
      • -
    • needed sonames: $bin["needed sonames"]
      • +
        +
      • + base name: $bin.base_name +
        • +
      • runpath: +
          +#for runpath_el in $bin.runpath +
        • + + $runpath_el + +
          • +#end for +
        +
      • needed sonames: +
          +#for soname in $bin["needed sonames"] +
        • + + + $soname + + +
          • +#end for +
      - + #end for -
    +
#end if #if $pkg.depends

depends

@@ -121,10 +170,38 @@ #if $pkg.files_metadata

files metadata

+ + + + + + + #for md in $pkg.files_metadata + + + #end for
pathmimetypemachine_idmachine nameendian
$md.path $md.mime_type +#if "machine_id" in $md + $md.machine_id +#else +   +#end if + +#if "machine_id" in $md + $hachoir_machines[$md.machine_id].name +#else +   +#end if + +#if "endian" in $md + $md.endian +#else +   +#end if +
@@ -143,11 +220,11 @@

overrides

    #for override in $pkg.overrides -
  • - $override.pkgname - $override.tag_name +
  • + $override.pkgname + $override.tag_name $override.tag_info -
    • + #end for
#end if @@ -167,9 +244,9 @@

pkgmap

    #for entry in $pkg.pkgmap -
  • - $entry.line -
    • +
  • + $entry.line +
    • #end for
#end for @@ -239,10 +316,21 @@ sys.stdout.write(unicode(t)) if command == 'gen-html': pkgstats = [] + # Add error tags for md5_sum in md5_sums: srv4 = GetPkg(md5_sum) - pkgstats.append(cPickle.loads(str(srv4.data))) - t = Template(REVIEW_REQ_TMPL, searchList=[srv4, {"pkgstats": pkgstats}]) + data = cPickle.loads(str(srv4.data)) + if "OPENCSW_REPOSITORY" in data["pkginfo"]: + build_src = data["pkginfo"]["OPENCSW_REPOSITORY"] + build_src = re.sub(r"@(\d+)$", r"?rev=\1", build_src) + else: + build_src = None + data["build_src"] = build_src + pkgstats.append(data) + t = Template(REVIEW_REQ_TMPL, searchList=[{ + "pkgstats": pkgstats, + "hachoir_machines": package_checks.HACHOIR_MACHINES, + }]) sys.stdout.write(unicode(t)) 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 Aug 16 17:47:21 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 16 Aug 2010 15:47:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[10752] csw/mgar/pkg Message-ID: Revision: 10752 http://gar.svn.sourceforge.net/gar/?rev=10752&view=rev Author: wahwah Date: 2010-08-16 15:47:21 +0000 (Mon, 16 Aug 2010) Log Message: ----------- thrift: Initial commit. Started working on the package, needs more patches. Modified Paths: -------------- csw/mgar/pkg/thrift/trunk/Makefile csw/mgar/pkg/thrift/trunk/checksums Added Paths: ----------- csw/mgar/pkg/thrift/ csw/mgar/pkg/thrift/trunk/files/0001-sys-inttypes.h-instead-of-stdint.h.patch Modified: csw/mgar/pkg/thrift/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-08-12 08:21:26 UTC (rev 10726) +++ csw/mgar/pkg/thrift/trunk/Makefile 2010-08-16 15:47:21 UTC (rev 10752) @@ -11,8 +11,8 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = thrift +GARVERSION = 0.3.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 @@ -25,21 +25,20 @@ CATEGORIES = lib ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = Software framework for scalable cross-language services development ## ## 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 = +SPKG_SOURCEURL = http://incubator.apache.org/thrift/ ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +MASTER_SITES = http://apache.mirrors.esat.net/incubator/thrift/$(GARVERSION)-incubating/ ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -176,10 +175,5 @@ ## 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 +PATCHFILES += 0001-sys-inttypes.h-instead-of-stdint.h.patch +include gar/category.mk Modified: csw/mgar/pkg/thrift/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-08-12 08:21:26 UTC (rev 10726) +++ csw/mgar/pkg/thrift/trunk/checksums 2010-08-16 15:47:21 UTC (rev 10752) @@ -0,0 +1 @@ +a6c80ab3d8c7827365a9b40f5c9d66a3 thrift-0.3.0.tar.gz Added: csw/mgar/pkg/thrift/trunk/files/0001-sys-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/thrift/trunk/files/0001-sys-inttypes.h-instead-of-stdint.h.patch (rev 0) +++ csw/mgar/pkg/thrift/trunk/files/0001-sys-inttypes.h-instead-of-stdint.h.patch 2010-08-16 15:47:21 UTC (rev 10752) @@ -0,0 +1,39 @@ +From 3463cbf826b2ac1eb4e96d997e1830e7af0a495b Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 16 Aug 2010 17:05:23 +0200 +Subject: [PATCH] sys/inttypes.h instead of stdint.h + +--- + compiler/cpp/src/parse/t_const_value.h | 2 +- + compiler/cpp/src/parse/t_type.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/compiler/cpp/src/parse/t_const_value.h b/compiler/cpp/src/parse/t_const_value.h +index 5bfaeb2..e975571 100644 +--- a/compiler/cpp/src/parse/t_const_value.h ++++ b/compiler/cpp/src/parse/t_const_value.h +@@ -21,7 +21,7 @@ + #define T_CONST_VALUE_H + + #include "t_enum.h" +-#include ++#include + #include + #include + +diff --git a/compiler/cpp/src/parse/t_type.h b/compiler/cpp/src/parse/t_type.h +index 4ce2eda..93ff2ff 100644 +--- a/compiler/cpp/src/parse/t_type.h ++++ b/compiler/cpp/src/parse/t_type.h +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + #include "t_doc.h" + + // What's worse? This, or making a src/parse/non_inlined.cc? +-- +1.7.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 Tue Aug 17 08:04:19 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Aug 2010 06:04:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[10753] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: Revision: 10753 http://gar.svn.sourceforge.net/gar/?rev=10753&view=rev Author: wahwah Date: 2010-08-17 06:04:18 +0000 (Tue, 17 Aug 2010) Log Message: ----------- mGAR v2: gen-htm, template updates, readabilityfication. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2010-08-16 15:47:21 UTC (rev 10752) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2010-08-17 06:04:18 UTC (rev 10753) @@ -61,9 +61,30 @@ font-family: monospace; background-color: #EEE; } +ul.clean { + list-style: none; + padding: 0px; + margin: 0px; +} span.warning { background-color: #DDF; } +table.framed td { + border: 1px solid #DDD; +} +td.numeric { + text-align: right; +} +table.gently-lined td { + border-bottom: 1px solid #DDD; + margin: 0px; + padding: 2px; +} +table.gently-lined th { + border-bottom: 2px solid black; + margin: 0px; + padding: 2px; +} @@ -102,18 +123,67 @@ #end for

parsed basename

- 
-$pprint.pformat($pkg.basic_stats.parsed_basename)
-
+ + + + + + + + + + + + + + + + + + + + + + +
catalognamefull_version_string(version)(version_info)(revision_info)osrelarchvendortag
$pkg.basic_stats.parsed_basename.catalogname$pkg.basic_stats.parsed_basename.full_version_string$pkg.basic_stats.parsed_basename.version +
    +#for key, val in $pkg.basic_stats.parsed_basename.version_info.iteritems +
  • $key: $val
    • +#end for +
+ 		+
    +#for key, val in $pkg.basic_stats.parsed_basename.revision_info.iteritems +
  • $key: $val
    • +#end for +
+ 		$pkg.basic_stats.parsed_basename.osrel$pkg.basic_stats.parsed_basename.arch$pkg.basic_stats.parsed_basename.vendortag

pkginfo

- +
+ + + + #for key, val in $pkg.pkginfo.iteritems - + #end for
KeyValue
$key$val$val
@@ -169,32 +239,27 @@ #end if #if $pkg.files_metadata

files metadata

- +
- + #for md in $pkg.files_metadata - - + #end for
path mimetypemachine_id machine name
$md.path $md.mime_type + #if "machine_id" in $md - $md.machine_id -#else -   -#end if - -#if "machine_id" in $md $hachoir_machines[$md.machine_id].name #else   #end if
#end if #if $pkg.isalist

isalist

-

$pkg.isalist

+
    +#for isa in $pkg.isalist +
  • + $isa +
    • +#end for +
#end if #if $pkg.mtime

mtime

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 Aug 17 10:12:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Aug 2010 08:12:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[10754] csw/mgar/pkg/libspectre/trunk Message-ID: Revision: 10754 http://gar.svn.sourceforge.net/gar/?rev=10754&view=rev Author: dmichelsen Date: 2010-08-17 08:12:45 +0000 (Tue, 17 Aug 2010) Log Message: ----------- libspectre: Update to 0.2.6 Modified Paths: -------------- csw/mgar/pkg/libspectre/trunk/Makefile csw/mgar/pkg/libspectre/trunk/checksums Modified: csw/mgar/pkg/libspectre/trunk/Makefile =================================================================== --- csw/mgar/pkg/libspectre/trunk/Makefile 2010-08-17 06:04:18 UTC (rev 10753) +++ csw/mgar/pkg/libspectre/trunk/Makefile 2010-08-17 08:12:45 UTC (rev 10754) @@ -1,5 +1,5 @@ GARNAME = libspectre -GARVERSION = 0.2.5 +GARVERSION = 0.2.6 CATEGORIES = lib DESCRIPTION = A small library for rendering Postscript documents Modified: csw/mgar/pkg/libspectre/trunk/checksums =================================================================== --- csw/mgar/pkg/libspectre/trunk/checksums 2010-08-17 06:04:18 UTC (rev 10753) +++ csw/mgar/pkg/libspectre/trunk/checksums 2010-08-17 08:12:45 UTC (rev 10754) @@ -1,2 +1,2 @@ -56ed626fdf430039f1285e869b8fb3b6 libspectre-0.2.5.tar.gz +5c6db35f2097c3a04c48c7f435d4b507 libspectre-0.2.6.tar.gz 7f3edd354885de75d806dfd740a23881 patch-stdint.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Aug 17 10:32:13 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Aug 2010 08:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[10755] csw/mgar/pkg/rrdtool/trunk/ Message-ID: Revision: 10755 http://gar.svn.sourceforge.net/gar/?rev=10755&view=rev Author: dmichelsen Date: 2010-08-17 08:32:12 +0000 (Tue, 17 Aug 2010) Log Message: ----------- rrdtool: Make x11-reloaded new trunk Removed Paths: ------------- csw/mgar/pkg/rrdtool/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 Tue Aug 17 10:32:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Aug 2010 08:32:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[10756] csw/mgar/pkg/rrdtool Message-ID: Revision: 10756 http://gar.svn.sourceforge.net/gar/?rev=10756&view=rev Author: dmichelsen Date: 2010-08-17 08:32:49 +0000 (Tue, 17 Aug 2010) Log Message: ----------- rrdtool: Make x11-reloaded new trunk Added Paths: ----------- csw/mgar/pkg/rrdtool/trunk/ Removed Paths: ------------- csw/mgar/pkg/rrdtool/branches/x11-reloaded/ 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 Aug 17 10:56:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Aug 2010 08:56:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[10757] csw/mgar/gar/v2/lib/python Message-ID: Revision: 10757 http://gar.svn.sourceforge.net/gar/?rev=10757&view=rev Author: wahwah Date: 2010-08-17 08:56:12 +0000 (Tue, 17 Aug 2010) Log Message: ----------- mGAR v2: pkgdb, the HTML template split out to a separate file. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/pkg-review-template.html Added: csw/mgar/gar/v2/lib/python/pkg-review-template.html =================================================================== --- csw/mgar/gar/v2/lib/python/pkg-review-template.html (rev 0) +++ csw/mgar/gar/v2/lib/python/pkg-review-template.html 2010-08-17 08:56:12 UTC (rev 10757) @@ -0,0 +1,290 @@ + +#import pprint + + +#for pkg in $pkgstats +$pkg.pkginfo.PKG +#end for + + + + + +#for pkg in $pkgstats +

$pkg.basic_stats.pkg_basename

+

Build source code

+#if $pkg.build_src +

+ + $pkg.build_src + +

+#else +

+ + Build source (OPENCSW_REPOSITORY) not specified in pkginfo. + +

+#end if +

+ + $pkg.basic_stats.pkgname + on the website. +

+

Basic stats

+ +#for key in ('md5_sum', 'pkgname', 'stats_version', 'pkg_basename', 'catalogname') + + + + +#end for +
+ $key + + $pkg.basic_stats[$key] +
+

parsed basename

+ + + + + + + + + + + + + + + + + + + + + + +
catalognamefull_version_string(version)(version_info)(revision_info)osrelarchvendortag
$pkg.basic_stats.parsed_basename.catalogname$pkg.basic_stats.parsed_basename.full_version_string$pkg.basic_stats.parsed_basename.version +
    +#for key, val in $pkg.basic_stats.parsed_basename.version_info.iteritems +
  • $key: $val
    • +#end for +
+ 		+
    +#for key, val in $pkg.basic_stats.parsed_basename.revision_info.iteritems +
  • $key: $val
    • +#end for +
+ 		$pkg.basic_stats.parsed_basename.osrel$pkg.basic_stats.parsed_basename.arch$pkg.basic_stats.parsed_basename.vendortag
+

pkginfo

+ + + + + +#for key, val in $pkg.pkginfo.iteritems + + + + +#end for +
KeyValue
$key$val
+#if $pkg.binaries_dump_info +

binaries_dump_info

+
    +#for bin in $pkg["binaries_dump_info"] +
  • + $bin.path +## ['base_name', 'RUNPATH RPATH the same', 'runpath', 'RPATH set', 'needed sonames', 'path', 'RUNPATH set'] +
      +
    • + base name: $bin.base_name +
      • +
    • runpath: +
        +#for runpath_el in $bin.runpath +
      • + + $runpath_el + +
        • +#end for +
      +
    • needed sonames: +
        +#for soname in $bin["needed sonames"] +
      • + + + $soname + + +
        • +#end for +
      +
    +
    • +#end for +
+#end if +#if $pkg.depends +

depends

+ +#end if +#if $pkg.files_metadata +

files metadata

+ + + + + + + +#for md in $pkg.files_metadata + + + + + + +#end for +
pathmimetypemachine name
$md.path $md.mime_type +#if "machine_id" in $md + $hachoir_machines[$md.machine_id].name +#else +   +#end if +
+#end if +#if $pkg.isalist +

isalist

+
    +#for isa in $pkg.isalist +
  • + $isa +
    • +#end for +
+#end if +#if $pkg.mtime +

mtime

+

+ $pkg.mtime +

+#end if +#if $pkg.overrides +

overrides

+
    +#for override in $pkg.overrides +
  • + $override.pkgname + $override.tag_name + $override.tag_info +
    • +#end for +
+#end if +

pkgchk

+

stdout

+ 
+#for l in $pkg.pkgchk.stdout_lines
+$l
+#end for
+
+

stderr

+ 
+#for l in $pkg.pkgchk.stderr_lines
+$l
+#end for
+
+

pkgmap

+
    +#for entry in $pkg.pkgmap +
  • + $entry.line +
    • +#end for +
+#end for + + + Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2010-08-17 08:32:49 UTC (rev 10756) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2010-08-17 08:56:12 UTC (rev 10757) @@ -35,297 +35,7 @@ stats_version: $stats_version """ -REVIEW_REQ_TMPL = """ -#import pprint - - -#for pkg in $pkgstats -$pkg.pkginfo.PKG -#end for - - - - - -#for pkg in $pkgstats -

$pkg.basic_stats.pkg_basename

-

Build source code

-#if $pkg.build_src -

- - $pkg.build_src - -

-#else -

- - Build source (OPENCSW_REPOSITORY) not specified in pkginfo. - -

-#end if -

- - $pkg.basic_stats.pkgname - on the website. -

-

Basic stats

- -#for key in ('md5_sum', 'pkgname', 'stats_version', 'pkg_basename', 'catalogname') - - - - -#end for -
- $key - - $pkg.basic_stats[$key] -
-

parsed basename

- - - - - - - - - - - - - - - - - - - - - - -
catalognamefull_version_string(version)(version_info)(revision_info)osrelarchvendortag
$pkg.basic_stats.parsed_basename.catalogname$pkg.basic_stats.parsed_basename.full_version_string$pkg.basic_stats.parsed_basename.version -
    -#for key, val in $pkg.basic_stats.parsed_basename.version_info.iteritems -
  • $key: $val
    • -#end for -
- 		-
    -#for key, val in $pkg.basic_stats.parsed_basename.revision_info.iteritems -
  • $key: $val
    • -#end for -
- 		$pkg.basic_stats.parsed_basename.osrel$pkg.basic_stats.parsed_basename.arch$pkg.basic_stats.parsed_basename.vendortag
-

pkginfo

- - - - - -#for key, val in $pkg.pkginfo.iteritems - - - - -#end for -
KeyValue
$key$val
-#if $pkg.binaries_dump_info -

binaries_dump_info

-
    -#for bin in $pkg["binaries_dump_info"] -
  • - $bin.path -## ['base_name', 'RUNPATH RPATH the same', 'runpath', 'RPATH set', 'needed sonames', 'path', 'RUNPATH set'] -
      -
    • - base name: $bin.base_name -
      • -
    • runpath: -
        -#for runpath_el in $bin.runpath -
      • - - $runpath_el - -
        • -#end for -
      -
    • needed sonames: -
        -#for soname in $bin["needed sonames"] -
      • - - - $soname - - -
        • -#end for -
      -
    -
    • -#end for -
-#end if -#if $pkg.depends -

depends

- -#end if -#if $pkg.files_metadata -

files metadata

- - - - - - - -#for md in $pkg.files_metadata - - - - - - -#end for -
pathmimetypemachine name
$md.path $md.mime_type -#if "machine_id" in $md - $hachoir_machines[$md.machine_id].name -#else -   -#end if -
-#end if -#if $pkg.isalist -

isalist

-
    -#for isa in $pkg.isalist -
  • - $isa -
    • -#end for -
-#end if -#if $pkg.mtime -

mtime

-

- $pkg.mtime -

-#end if -#if $pkg.overrides -

overrides

-
    -#for override in $pkg.overrides -
  • - $override.pkgname - $override.tag_name - $override.tag_info -
    • -#end for -
-#end if -

pkgchk

-

stdout

- 
-#for l in $pkg.pkgchk.stdout_lines
-$l
-#end for
-
-

stderr

- 
-#for l in $pkg.pkgchk.stderr_lines
-$l
-#end for
-
-

pkgmap

-
    -#for entry in $pkg.pkgmap -
  • - $entry.line -
    • -#end for -
-#end for - - -""" - def GetPkg(some_id): logging.debug("Selecting from db: %s", repr(some_id)) res = m.Srv4FileStats.select( @@ -399,7 +109,14 @@ build_src = None data["build_src"] = build_src pkgstats.append(data) - t = Template(REVIEW_REQ_TMPL, searchList=[{ + # This assumes the program is run as "bin/pkgdb", and not "lib/python/pkgdb.py". + tmpl_filename = os.path.join(os.path.split(__file__)[0], + "..", + "lib", + "python", + "pkg-review-template.html") + tmpl_str = open(tmpl_filename, "r").read() + t = Template(tmpl_str, searchList=[{ "pkgstats": pkgstats, "hachoir_machines": package_checks.HACHOIR_MACHINES, }]) 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 Aug 17 10:57:07 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Aug 2010 08:57:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[10758] csw/mgar/gar/v2/lib/python/pkg-review-template.html Message-ID: Revision: 10758 http://gar.svn.sourceforge.net/gar/?rev=10758&view=rev Author: wahwah Date: 2010-08-17 08:57:07 +0000 (Tue, 17 Aug 2010) Log Message: ----------- mGAR v2: gen-html, added the table of contents. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkg-review-template.html Modified: csw/mgar/gar/v2/lib/python/pkg-review-template.html =================================================================== --- csw/mgar/gar/v2/lib/python/pkg-review-template.html 2010-08-17 08:56:12 UTC (rev 10757) +++ csw/mgar/gar/v2/lib/python/pkg-review-template.html 2010-08-17 08:57:07 UTC (rev 10758) @@ -1,5 +1,6 @@ +## This is a Cheetah template + -#import pprint #for pkg in $pkgstats @@ -51,9 +52,36 @@ </style> </head> <body> + <h1><a name="toc">Table of contents</a></h1> + <ul class="toc"> #for pkg in $pkgstats - <h1>$pkg.basic_stats.pkg_basename</h1> - <h2>Build source code</h2> + <li> + <a href="#${pkg.basic_stats.md5_sum}"> + ${pkg.basic_stats.pkg_basename} + </a> + <ul> + <li><a href="#${pkg.basic_stats.md5_sum}-pkginfo">pkginfo</a></li> + <li><a href="#${pkg.basic_stats.md5_sum}-binaries_dump_info">binaries_dump_info</a></li> + <li><a href="#${pkg.basic_stats.md5_sum}-depends">depends</a></li> + <li><a href="#${pkg.basic_stats.md5_sum}-files_metadata">files_metadata</a></li> + <li><a href="#${pkg.basic_stats.md5_sum}-overrides">overrides</a></li> + <li><a href="#${pkg.basic_stats.md5_sum}-pkgmap">pkgmap</a></li> + </ul> + </li> +#end for + </ul> + +#for pkg in $pkgstats + <h1> + ${pkg.basic_stats.pkgname} + — + <a name="${pkg.basic_stats.md5_sum}">${pkg.basic_stats.pkg_basename}</a> + </h1> + <h2> + <a name="${pkg.basic_stats.md5_sum}-source"> + Build source code + </a> + </h2> #if $pkg.build_src <p> <a href="$pkg.build_src"> @@ -80,7 +108,7 @@ $key </td> <td> - <code>$pkg.basic_stats[$key]</code> + <code style="font-weight: bold;">$pkg.basic_stats[$key]</code> </td> </tr> #end for @@ -135,7 +163,11 @@ <td>$pkg.basic_stats.parsed_basename.vendortag</td> </tr> </table> - <h2>pkginfo</h2> + <h2> + <a name="${pkg.basic_stats.md5_sum}-pkginfo"> + pkginfo + </a> + </h2> <table class="gently-lined"> <tr> <th>Key</th> @@ -151,7 +183,11 @@ #end for </table> #if $pkg.binaries_dump_info - <h2>binaries_dump_info</h2> + <h2> + <a name="${pkg.basic_stats.md5_sum}-binaries_dump_info"> + binaries_dump_info + </a> + </h2> <ul> #for bin in $pkg["binaries_dump_info"] <li> @@ -189,7 +225,11 @@ </ul> #end if #if $pkg.depends - <h2>depends</h2> + <h2> + <a name="${pkg.basic_stats.md5_sum}-depends"> + depends + </a> + </h2> <ul> #for depend_pkg, depend_desc in $pkg.depends <li> @@ -201,7 +241,11 @@ </ul> #end if #if $pkg.files_metadata - <h2>files metadata</h2> + <h2> + <a name="${pkg.basic_stats.md5_sum}-files_metadata"> + files metadata + </a> + </h2> <table class="gently-lined"> <tr> <th>path</th> @@ -252,7 +296,11 @@ </p> #end if #if $pkg.overrides - <h2>overrides</h2> + <h2> + <a name="${pkg.basic_stats.md5_sum}-overrides"> + overrides + </a> + </h2> <ul> #for override in $pkg.overrides <li> @@ -276,7 +324,11 @@ $l #end for </pre> - <h2>pkgmap</h2> + <h2> + <a name="${pkg.basic_stats.md5_sum}-pkgmap"> + pkgmap + </a> + </h2> <ul class="code"> #for entry in $pkg.pkgmap <li> 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 Aug 17 11:52:27 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Aug 2010 09:52:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[10759] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: <E1OlIqJ-0007vL-9e@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 10759 http://gar.svn.sourceforge.net/gar/?rev=10759&view=rev Author: wahwah Date: 2010-08-17 09:52:27 +0000 (Tue, 17 Aug 2010) Log Message: ----------- mGAR v2: pkgdb, added a parameter to specify the template. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2010-08-17 08:57:07 UTC (rev 10758) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2010-08-17 09:52:27 UTC (rev 10759) @@ -57,6 +57,8 @@ parser.add_option("-d", "--debug", dest="debug", default=False, action="store_true", help="Turn on debugging messages") + parser.add_option("-t", "--pkg-review-template", dest="pkg_review_template", + help="A Cheetah template used for package review reports.") options, args = parser.parse_args() if options.debug: logging.basicConfig(level=logging.DEBUG) @@ -104,17 +106,20 @@ data = cPickle.loads(str(srv4.data)) if "OPENCSW_REPOSITORY" in data["pkginfo"]: build_src = data["pkginfo"]["OPENCSW_REPOSITORY"] - build_src = re.sub(r"@(\d+)$", r"?rev=\1", build_src) + build_src = re.sub(r"@(\d+)$", r"", build_src) else: build_src = None data["build_src"] = build_src pkgstats.append(data) # This assumes the program is run as "bin/pkgdb", and not "lib/python/pkgdb.py". - tmpl_filename = os.path.join(os.path.split(__file__)[0], - "..", - "lib", - "python", - "pkg-review-template.html") + if not options.pkg_review_template: + tmpl_filename = os.path.join(os.path.split(__file__)[0], + "..", + "lib", + "python", + "pkg-review-template.html") + else: + tmpl_filename = options.pkg_review_template tmpl_str = open(tmpl_filename, "r").read() t = Template(tmpl_str, searchList=[{ "pkgstats": pkgstats, 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 Aug 17 14:17:20 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 17 Aug 2010 12:17:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[10760] csw/mgar/pkg/postfix/branches/postfix-2.7 Message-ID: <E1OlL6W-0003nv-LA@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10760 http://gar.svn.sourceforge.net/gar/?rev=10760&view=rev Author: skayser Date: 2010-08-17 12:17:20 +0000 (Tue, 17 Aug 2010) Log Message: ----------- postfix 2.7: comment build peculiarities, add confirmation step to migrate-queuefiles.sh script Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh Modified: csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile 2010-08-17 09:52:27 UTC (rev 10759) +++ csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile 2010-08-17 12:17:20 UTC (rev 10760) @@ -1,3 +1,14 @@ +# +# +# !!! This package can be built in two flavors, a regular one with full +# !!! features enabled and one with a core feature set, i.e. reduced +# !!! dependencies (package name suffix: -simple). +# !!! To build the simplified set, the whole build needs to run with +# !!! BUILDTYPE=simple. Further details below. By now this needs to be +# !!! carried out manually. Ideas to automate the process of building +# !!! the two packages are welcome. +# +# # TODO (release-critical prefixed with !, non release-critical with *) # ! Build, install and test package (works? spool permissions ok?) # WRT to permissions, run "postfix set-permissions" and compare @@ -154,7 +165,11 @@ RUNTIME_DEP_PKGS += CSWpcrert # Activate support for hash and btree lookup tables -# http://www.postfix.org/DB_README.html +# http://www.postfix.org/DB_README.html. !! Takeaway: Use same DB as SASL !! +# "If you compile Postfix with a different Berkeley DB implementation, +# then every Postfix program will dump core because either the system library, +# the SASL library, or Postfix itself ends up using the wrong version." +# FEATURES += -DHAS_DB INCLUDES += -I/opt/csw/bdb42/include AUXLIBS += -L/opt/csw/bdb42/lib -R/opt/csw/bdb42/lib -ldb-4.2 Modified: csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh 2010-08-17 09:52:27 UTC (rev 10759) +++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh 2010-08-17 12:17:20 UTC (rev 10760) @@ -1,16 +1,25 @@ #!/bin/bash # -# move-spool.sh: +# migrate-queuefiles.sh: # helper script to move possible queue files from the CSWpostfix 2.4.x # spool location to the CSWpostfix >= 2.6.x spool location. # # $Id$ - SPOOL_OLD=/opt/csw/var/spool/postfix SPOOL_NEW=/var/opt/csw/spool/postfix QDIRS="incoming active deferred corrupt hold bounce defer trace" +if [ "$1" != "-y" ]; then + echo "This helper script will move leftover postfix email queue files from " + echo + echo " $SPOOL_OLD to $SPOOL_NEW" + echo + echo "Please make sure to understand what it does, backup your queue files" + echo "in advance, and re-run this script with -y to start the process." + exit 1 +fi + [ -x /usr/bin/zonename ] && ZONEOPT="-z `/usr/bin/zonename`" if pgrep $ZONEOPT -lf /opt/csw/libexec/postfix/master; then echo "Make sure postfix is not running! Exiting." @@ -19,7 +28,7 @@ for qdir in $QDIRS; do [ -d ${SPOOL_OLD}/$qdir ] || continue - echo "Moving from ${SPOOL_OLD}/$qdir to ${SPOOL_NEW}/$qdir" + echo "Moving files from ${SPOOL_OLD}/$qdir to ${SPOOL_NEW}/$qdir" cd ${SPOOLDIR_NEW}/$qdir && \ find ${SPOOLDIR_OLD}/$qdir -type f -exec mv '{}' . + 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 Tue Aug 17 14:52:38 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 17 Aug 2010 12:52:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[10761] csw/mgar/pkg/sudo/trunk Message-ID: <E1OlLeg-0004ZR-MM@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10761 http://gar.svn.sourceforge.net/gar/?rev=10761&view=rev Author: wahwah Date: 2010-08-17 12:52:38 +0000 (Tue, 17 Aug 2010) Log Message: ----------- sudo: Version bump to 1.7.4p2 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2010-08-17 12:17:20 UTC (rev 10760) +++ csw/mgar/pkg/sudo/trunk/Makefile 2010-08-17 12:52:38 UTC (rev 10761) @@ -1,7 +1,7 @@ # $Id$ GARNAME = sudo -GARVERSION = 1.7.3 +GARVERSION = 1.7.4p2 CATEGORIES = utils DESCRIPTION = Provides limited super user privileges Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2010-08-17 12:17:20 UTC (rev 10760) +++ csw/mgar/pkg/sudo/trunk/checksums 2010-08-17 12:52:38 UTC (rev 10761) @@ -1,3 +1,3 @@ 955d99eda1432c7b7e00d98b91e35a79 CSWsudo-common.postinstall 157b2e5e38ca54eb36e0364706bd0292 install.diff -c22115b47cb2591bceedb914b673f031 sudo-1.7.3.tar.gz +80f3a2506f0ec3e2d75e7d17d95f5341 sudo-1.7.4p2.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 Tue Aug 17 15:18:36 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 17 Aug 2010 13:18:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[10762] csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile Message-ID: <E1OlM3o-00058F-3y@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10762 http://gar.svn.sourceforge.net/gar/?rev=10762&view=rev Author: skayser Date: 2010-08-17 13:18:35 +0000 (Tue, 17 Aug 2010) Log Message: ----------- postfix 2.7: add ugfiles class for postdrop files Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile Modified: csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile 2010-08-17 12:52:38 UTC (rev 10761) +++ csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile 2010-08-17 13:18:35 UTC (rev 10762) @@ -73,6 +73,7 @@ PROTOTYPE_FILES_makesgid = $(sbindir)/post(drop|queue) PROTOTYPE_GROUP_makesgid = postdrop PROTOTYPE_PERMS_makesgid = 2755 +PROTOTYPE_CLASS_makesgid = ugfiles # Make $(DEF_QUEUE_DIR) subdirs accessible/writable to postfix only PROTOTYPE_MODIFIERS += spooldir 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 Aug 17 16:27:38 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 17 Aug 2010 14:27:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[10763] csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile Message-ID: <E1OlN8c-0008UB-5L@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 10763 http://gar.svn.sourceforge.net/gar/?rev=10763&view=rev Author: skayser Date: 2010-08-17 14:27:37 +0000 (Tue, 17 Aug 2010) Log Message: ----------- postfix 2.7: fix lockdir permissions Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile Modified: csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile 2010-08-17 13:18:35 UTC (rev 10762) +++ csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile 2010-08-17 14:27:37 UTC (rev 10763) @@ -82,6 +82,13 @@ PROTOTYPE_PERMS_spooldir = 0700 PROTOTYPE_CLASS_spooldir = ugfiles +# Make $(DEF_DATA_DIR) writable by postfix (used for master.lock) +PROTOTYPE_MODIFIERS += lockdir +PROTOTYPE_FILES_lockdir = $(DEF_DATA_DIR) +PROTOTYPE_USER_lockdir = postfix +PROTOTYPE_PERMS_lockdir = 0700 +PROTOTYPE_CLASS_lockdir = ugfiles + # Make $(DEF_QUEUE_DIR)/maildrop accessible by postdrop group PROTOTYPE_MODIFIERS += maildrop PROTOTYPE_FILES_maildrop = $(DEF_QUEUE_DIR)/maildrop 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 Aug 17 16:43:04 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 17 Aug 2010 14:43:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[10764] csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile Message-ID: <E1OlNNY-0005Tt-F2@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 10764 http://gar.svn.sourceforge.net/gar/?rev=10764&view=rev Author: skayser Date: 2010-08-17 14:43:04 +0000 (Tue, 17 Aug 2010) Log Message: ----------- postfix 2.7: ship upgrade notice, add future TODOs Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile Modified: csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile 2010-08-17 14:27:37 UTC (rev 10763) +++ csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile 2010-08-17 14:43:04 UTC (rev 10764) @@ -12,7 +12,9 @@ # TODO (release-critical prefixed with !, non release-critical with *) # ! Build, install and test package (works? spool permissions ok?) # WRT to permissions, run "postfix set-permissions" and compare -# * Ship simple default configuration +# * Ship simple default configuration (restrict mynetworks to 127.0.0.1?) +# * alias_database points to /etc/mail/aliases, symlink +# /etc/opt/csw/postfix/aliases to /etc/mail/aliases? # # NICE TO KNOW # - 2.4.6,REV=2008.05.28 preserves modified configuration files via @@ -283,6 +285,10 @@ # Helper script for spool location migration (2.4.x -> 2.6.x) ginstall -Dm 755 $(FILEDIR)/migrate-queuefiles.sh \ $(DESTDIR)$(docdir)/$(GARNAME)/scripts/migrate-queuefiles.sh + + # Upgrade notice for users upgrading from the 2.4 package + ginstall -Dm 644 $(FILEDIR)/README.upgradefrom.24 \ + $(DESTDIR)$(docdir)/$(GARNAME)/README.upgradefrom.24 @$(MAKECOOKIE) # Fails. A subsequent manual verify-config run is successfull, 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 Aug 17 17:21:20 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 17 Aug 2010 15:21:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[10765] csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile Message-ID: <E1OlNya-0007xR-PU@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10765 http://gar.svn.sourceforge.net/gar/?rev=10765&view=rev Author: skayser Date: 2010-08-17 15:21:20 +0000 (Tue, 17 Aug 2010) Log Message: ----------- postfix 2.7: fix path for POSTMSG file Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile Modified: csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile 2010-08-17 14:43:04 UTC (rev 10764) +++ csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile 2010-08-17 15:21:20 UTC (rev 10765) @@ -62,7 +62,7 @@ # For the sake of simplicity and user choice we dropped the automatic # replacement of the /usr/{lib,bin} sendmail binaries. Ref. # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313 -POSTMSG = $(DOCDIR)/$(GARNAME)/README.upgradefrom.24 +POSTMSG = $(docdir)/$(GARNAME)/README.upgradefrom.24 # For file permissions reference and verification purposes, postfix ships # /opt/csw/libexec/postfix/postfix-files which contains a list of the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Aug 17 22:34:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Aug 2010 20:34:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[10766] csw/mgar/pkg/hdf5/trunk Message-ID: <E1OlSrZ-0003BE-5q@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 10766 http://gar.svn.sourceforge.net/gar/?rev=10766&view=rev Author: dmichelsen Date: 2010-08-17 20:34:24 +0000 (Tue, 17 Aug 2010) Log Message: ----------- hdf5: Update to 1.8.5 Modified Paths: -------------- csw/mgar/pkg/hdf5/trunk/Makefile csw/mgar/pkg/hdf5/trunk/checksums Modified: csw/mgar/pkg/hdf5/trunk/Makefile =================================================================== --- csw/mgar/pkg/hdf5/trunk/Makefile 2010-08-17 15:21:20 UTC (rev 10765) +++ csw/mgar/pkg/hdf5/trunk/Makefile 2010-08-17 20:34:24 UTC (rev 10766) @@ -1,9 +1,9 @@ GARNAME = hdf5 -GARVERSION = 1.8.4 +GARVERSION = 1.8.5 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 1.6.10 1.8.4 +MODULATIONS_GARVERSION = 1.6.10 1.8.5 SKIP_MODULATIONS = isa-sparcv9-garversion-1.6.10 SKIP_MODULATIONS += isa-amd64-garversion-1.6.10 @@ -50,9 +50,9 @@ MERGE_SCRIPTS_isa-extra-garversion-1.6.10 = copy-relocated-only MERGE_DIRS_isa-extra-garversion-1.6.10 = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-1.8.4 = copy-all -MERGE_SCRIPTS_isa-extra-garversion-1.8.4 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.8.4 = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-1.8.5 = copy-all +MERGE_SCRIPTS_isa-extra-garversion-1.8.5 = copy-relocated-only +MERGE_DIRS_isa-extra-garversion-1.8.5 = $(libdir) PKGFILES_CSWhdf5rt = $(PKGFILES_RT) Modified: csw/mgar/pkg/hdf5/trunk/checksums =================================================================== --- csw/mgar/pkg/hdf5/trunk/checksums 2010-08-17 15:21:20 UTC (rev 10765) +++ csw/mgar/pkg/hdf5/trunk/checksums 2010-08-17 20:34:24 UTC (rev 10766) @@ -1,2 +1,2 @@ 6e207a95d22e9e9ffdfaecdd580cd1b3 hdf5-1.6.10.tar.gz -971cc81ef10f50d2bb63cd6879fca7bc hdf5-1.8.4.tar.gz +85d1cea1de32019bf85e484ce83f8bd9 hdf5-1.8.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Aug 19 08:59:30 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Aug 2010 06:59:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[10767] csw/mgar/pkg/tcsh/tags/tcsh-6.17.00, REV=2009.09.10/ Message-ID: <E1Olz62-0002Of-ER@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 10767 http://gar.svn.sourceforge.net/gar/?rev=10767&view=rev Author: dmichelsen Date: 2010-08-19 06:59:29 +0000 (Thu, 19 Aug 2010) Log Message: ----------- tcsh: Tag 6.17.00,REV=2009.09.10 Added Paths: ----------- csw/mgar/pkg/tcsh/tags/tcsh-6.17.00,REV=2009.09.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 Thu Aug 19 09:06:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Aug 2010 07:06:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[10768] csw/mgar/pkg/tcsh/trunk/Makefile Message-ID: <E1OlzCb-0006pc-LQ@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 10768 http://gar.svn.sourceforge.net/gar/?rev=10768&view=rev Author: dmichelsen Date: 2010-08-19 07:06:17 +0000 (Thu, 19 Aug 2010) Log Message: ----------- tcsh: Add flag to allow working with files >2GB Modified Paths: -------------- csw/mgar/pkg/tcsh/trunk/Makefile Modified: csw/mgar/pkg/tcsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcsh/trunk/Makefile 2010-08-19 06:59:29 UTC (rev 10767) +++ csw/mgar/pkg/tcsh/trunk/Makefile 2010-08-19 07:06:17 UTC (rev 10768) @@ -18,10 +18,14 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +LICENSE = Copyright + RUNTIME_DEP_PKGS = CSWiconv -SPKG_SOURCEURL = http://www.tcsh.org/ +VENDOR_URL = http://www.tcsh.org/ +EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 + 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 dmichelsen at users.sourceforge.net Thu Aug 19 15:25:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Aug 2010 13:25:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[10769] csw/mgar/pkg/freetype/trunk Message-ID: <E1Om57X-0000lP-6V@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10769 http://gar.svn.sourceforge.net/gar/?rev=10769&view=rev Author: dmichelsen Date: 2010-08-19 13:25:26 +0000 (Thu, 19 Aug 2010) Log Message: ----------- freetype: Update to 2.4.2 Modified Paths: -------------- csw/mgar/pkg/freetype/trunk/Makefile csw/mgar/pkg/freetype/trunk/checksums Modified: csw/mgar/pkg/freetype/trunk/Makefile =================================================================== --- csw/mgar/pkg/freetype/trunk/Makefile 2010-08-19 07:06:17 UTC (rev 10768) +++ csw/mgar/pkg/freetype/trunk/Makefile 2010-08-19 13:25:26 UTC (rev 10769) @@ -1,5 +1,5 @@ GARNAME = freetype -GARVERSION = 2.3.12 +GARVERSION = 2.4.2 CATEGORIES = lib DESCRIPTION = A free and portable TrueType font rendering engine Modified: csw/mgar/pkg/freetype/trunk/checksums =================================================================== --- csw/mgar/pkg/freetype/trunk/checksums 2010-08-19 07:06:17 UTC (rev 10768) +++ csw/mgar/pkg/freetype/trunk/checksums 2010-08-19 13:25:26 UTC (rev 10769) @@ -1 +1 @@ -e974a82e5939be8e05ee65f07275d7c5 freetype-2.3.12.tar.bz2 +647ee8ed266f9a4117c8d0a4855b3d3e freetype-2.4.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Aug 19 15:25:41 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Aug 2010 13:25:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[10770] csw/mgar/pkg/unrar/trunk Message-ID: <E1Om57l-0004WA-5V@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 10770 http://gar.svn.sourceforge.net/gar/?rev=10770&view=rev Author: dmichelsen Date: 2010-08-19 13:25:40 +0000 (Thu, 19 Aug 2010) Log Message: ----------- unrar: Update to 3.9.10 Modified Paths: -------------- csw/mgar/pkg/unrar/trunk/Makefile csw/mgar/pkg/unrar/trunk/checksums Modified: csw/mgar/pkg/unrar/trunk/Makefile =================================================================== --- csw/mgar/pkg/unrar/trunk/Makefile 2010-08-19 13:25:26 UTC (rev 10769) +++ csw/mgar/pkg/unrar/trunk/Makefile 2010-08-19 13:25:40 UTC (rev 10770) @@ -1,5 +1,5 @@ GARNAME = unrar -GARVERSION = 3.9.7 +GARVERSION = 3.9.10 CATEGORIES = utils DESCRIPTION = RAR archive extractor Modified: csw/mgar/pkg/unrar/trunk/checksums =================================================================== --- csw/mgar/pkg/unrar/trunk/checksums 2010-08-19 13:25:26 UTC (rev 10769) +++ csw/mgar/pkg/unrar/trunk/checksums 2010-08-19 13:25:40 UTC (rev 10770) @@ -1,2 +1,2 @@ 594b777453751ee331ef241160f31499 unrar.1 -3222f3e6a8c1b79b4f60086d2af3727a unrarsrc-3.9.7.tar.gz +3c130ae52ff9fece50af988c343e396d unrarsrc-3.9.10.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 Aug 19 15:33:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Aug 2010 13:33:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[10771] csw/mgar/pkg/libgcrypt/trunk Message-ID: <E1Om5FF-0000zM-Ne@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10771 http://gar.svn.sourceforge.net/gar/?rev=10771&view=rev Author: dmichelsen Date: 2010-08-19 13:33:25 +0000 (Thu, 19 Aug 2010) Log Message: ----------- libgcrypt: Update to 1.4.6 Modified Paths: -------------- csw/mgar/pkg/libgcrypt/trunk/Makefile csw/mgar/pkg/libgcrypt/trunk/checksums Modified: csw/mgar/pkg/libgcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/Makefile 2010-08-19 13:25:40 UTC (rev 10770) +++ csw/mgar/pkg/libgcrypt/trunk/Makefile 2010-08-19 13:33:25 UTC (rev 10771) @@ -1,5 +1,5 @@ GARNAME = libgcrypt -GARVERSION = 1.4.5 +GARVERSION = 1.4.6 CATEGORIES = lib DESCRIPTION = GNU libgcrypt Modified: csw/mgar/pkg/libgcrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/checksums 2010-08-19 13:25:40 UTC (rev 10770) +++ csw/mgar/pkg/libgcrypt/trunk/checksums 2010-08-19 13:33:25 UTC (rev 10771) @@ -1 +1 @@ -cc2017ad09b4543f8b3b5e9a53cfd89d libgcrypt-1.4.5.tar.bz2 +dbf99425a4fe9217c84ce3a35d938634 libgcrypt-1.4.6.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 Thu Aug 19 15:53:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Aug 2010 13:53:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[10772] csw/mgar/pkg/cpan Message-ID: <E1Om5Yc-0004ym-O4@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 10772 http://gar.svn.sourceforge.net/gar/?rev=10772&view=rev Author: dmichelsen Date: 2010-08-19 13:53:26 +0000 (Thu, 19 Aug 2010) Log Message: ----------- cpan/Graphics-ColorNames: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Graphics-ColorNames/ csw/mgar/pkg/cpan/Graphics-ColorNames/branches/ csw/mgar/pkg/cpan/Graphics-ColorNames/tags/ csw/mgar/pkg/cpan/Graphics-ColorNames/trunk/ csw/mgar/pkg/cpan/Graphics-ColorNames/trunk/Makefile csw/mgar/pkg/cpan/Graphics-ColorNames/trunk/checksums csw/mgar/pkg/cpan/Graphics-ColorNames/trunk/files/ csw/mgar/pkg/cpan/Graphics-ColorNames/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Graphics-ColorNames/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/Graphics-ColorNames/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Graphics-ColorNames/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Graphics-ColorNames/trunk/Makefile 2010-08-19 13:53:26 UTC (rev 10772) @@ -0,0 +1,17 @@ +GARNAME = Graphics-ColorNames +GARVERSION = 2.11 +CATEGORIES = cpan +AUTHOR = RRWO + +DESCRIPTION = Defines RGB values for common color names +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmgraphicscolornm +CATALOGNAME = pm_graphicscolornm + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Graphics-ColorNames/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Graphics-ColorNames/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Graphics-ColorNames/trunk/checksums 2010-08-19 13:53:26 UTC (rev 10772) @@ -0,0 +1,2 @@ +d60f808f602da930671cd5eb304d6dc4 COPYING +047eabbb48d7c29cfebac6f9da8478f6 Graphics-ColorNames-2.11.tar.gz Added: csw/mgar/pkg/cpan/Graphics-ColorNames/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Graphics-ColorNames/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Graphics-ColorNames/trunk/files/COPYING 2010-08-19 13:53:26 UTC (rev 10772) @@ -0,0 +1,5 @@ +LICENSE + Copyright (c) 2001-2008 Robert Rothenberg. All rights reserved. This + program is free software; you can redistribute it and/or modify it under + the same terms as Perl itself. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Aug 19 15:54:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Aug 2010 13:54:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[10773] csw/mgar/pkg/cpan Message-ID: <E1Om5Zg-0001iy-5b@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10773 http://gar.svn.sourceforge.net/gar/?rev=10773&view=rev Author: dmichelsen Date: 2010-08-19 13:54:31 +0000 (Thu, 19 Aug 2010) Log Message: ----------- cpan/Tie-Util: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Tie-Util/ csw/mgar/pkg/cpan/Tie-Util/branches/ csw/mgar/pkg/cpan/Tie-Util/tags/ csw/mgar/pkg/cpan/Tie-Util/trunk/ csw/mgar/pkg/cpan/Tie-Util/trunk/Makefile csw/mgar/pkg/cpan/Tie-Util/trunk/checksums csw/mgar/pkg/cpan/Tie-Util/trunk/files/ csw/mgar/pkg/cpan/Tie-Util/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Tie-Util/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Tie-Util/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Tie-Util/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Tie-Util/trunk/Makefile 2010-08-19 13:54:31 UTC (rev 10773) @@ -0,0 +1,17 @@ +GARNAME = Tie-Util +GARVERSION = 0.03 +CATEGORIES = cpan +AUTHOR = SPROUT + +DESCRIPTION = Utility functions for fiddling with tied variables +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmtieutil +CATALOGNAME = pm_tieutil + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Tie-Util/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Tie-Util/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Tie-Util/trunk/checksums 2010-08-19 13:54:31 UTC (rev 10773) @@ -0,0 +1,2 @@ +80dd4b55a89083966b6e1085cd2bd8a8 COPYING +c382e610dca33ce8f1318b14c4d3673f Tie-Util-0.03.tar.gz Added: csw/mgar/pkg/cpan/Tie-Util/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Tie-Util/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Tie-Util/trunk/files/COPYING 2010-08-19 13:54:31 UTC (rev 10773) @@ -0,0 +1,7 @@ +COPYRIGHT AND LICENCE + +Copyright (C) 2007-10 Father Chrysostomos + +This program is free software; you may redistribute it and/or modify +it under the same terms as perl. + 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 Aug 19 16:11:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Aug 2010 14:11:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[10774] csw/mgar/pkg/cpan Message-ID: <E1Om5ps-0002Hi-Fe@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10774 http://gar.svn.sourceforge.net/gar/?rev=10774&view=rev Author: dmichelsen Date: 2010-08-19 14:11:16 +0000 (Thu, 19 Aug 2010) Log Message: ----------- cpan/Graphics-ColorNames-WWW: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/ csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/branches/ csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/tags/ csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/trunk/ csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/trunk/Makefile csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/trunk/checksums csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/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/Graphics-ColorNames-WWW/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/trunk/Makefile 2010-08-19 14:11:16 UTC (rev 10774) @@ -0,0 +1,19 @@ +GARNAME = Graphics-ColorNames-WWW +GARVERSION = 1.13 +CATEGORIES = cpan +AUTHOR = CFAERBER + +DESCRIPTION = WWW color names and equivalent RGB values +define BLURB +endef + +PACKAGES = CSWpmgraphicscolornw +CATALOGNAME = pm_graphicscolornw + +DEP_PKGS = CSWpmgraphicscolornm + +LICENSE = LICENSE + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/trunk/checksums 2010-08-19 14:11:16 UTC (rev 10774) @@ -0,0 +1 @@ +c518859fd8797927481e2318bff362e0 Graphics-ColorNames-WWW-1.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Aug 19 16:25:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Aug 2010 14:25:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[10775] csw/mgar/pkg/cpan Message-ID: <E1Om646-0005XQ-FI@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 10775 http://gar.svn.sourceforge.net/gar/?rev=10775&view=rev Author: dmichelsen Date: 2010-08-19 14:25:58 +0000 (Thu, 19 Aug 2010) Log Message: ----------- cpan/Sub-Delete: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Sub-Delete/ csw/mgar/pkg/cpan/Sub-Delete/branches/ csw/mgar/pkg/cpan/Sub-Delete/tags/ csw/mgar/pkg/cpan/Sub-Delete/trunk/ csw/mgar/pkg/cpan/Sub-Delete/trunk/Makefile csw/mgar/pkg/cpan/Sub-Delete/trunk/checksums csw/mgar/pkg/cpan/Sub-Delete/trunk/files/ csw/mgar/pkg/cpan/Sub-Delete/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Sub-Delete/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/Sub-Delete/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Sub-Delete/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Sub-Delete/trunk/Makefile 2010-08-19 14:25:58 UTC (rev 10775) @@ -0,0 +1,17 @@ +GARNAME = Sub-Delete +GARVERSION = 1.00002 +CATEGORIES = cpan +AUTHOR = SPROUT + +DESCRIPTION = Perl module enabling one to delete subroutines +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmsubdelete +CATALOGNAME = pm_subdelete + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Sub-Delete/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Sub-Delete/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Sub-Delete/trunk/checksums 2010-08-19 14:25:58 UTC (rev 10775) @@ -0,0 +1,2 @@ +00f40d073b2198a7f3574c9bc45a305d COPYING +3c0b6adb2a241f626245b72688efd5aa Sub-Delete-1.00002.tar.gz Added: csw/mgar/pkg/cpan/Sub-Delete/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Sub-Delete/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Sub-Delete/trunk/files/COPYING 2010-08-19 14:25:58 UTC (rev 10775) @@ -0,0 +1,7 @@ +COPYRIGHT AND LICENCE + +Copyright ? 2008-10 Father Chrysostomos + +This program is free software; you may redistribute it and/or modify +it under the same terms as perl. + 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 Aug 19 16:35:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Aug 2010 14:35:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[10776] csw/mgar/gar/v2/categories/cpan/category.mk Message-ID: <E1Om6DF-0005hI-VJ@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 10776 http://gar.svn.sourceforge.net/gar/?rev=10776&view=rev Author: dmichelsen Date: 2010-08-19 14:35:25 +0000 (Thu, 19 Aug 2010) Log Message: ----------- mGAR v2: Add upstream override to cpan category Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2010-08-19 14:25:58 UTC (rev 10775) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2010-08-19 14:35:25 UTC (rev 10776) @@ -42,6 +42,10 @@ # Perl module dependencies can not be properly tracked right now _CATEGORY_CHECKPKG_OVERRIDES = surplus-dependency +# The string starts with the module name - the maintainer has no influence if +# upstream chose uppercase or not as case must match. +_CATEGORY_CHECKPKG_OVERRIDES += pkginfo-description-not-starting-with-uppercase + include gar/gar.mk CONFIGURE_ENV += PERL5LIB=$(PERL5LIB) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Aug 19 16:37:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Aug 2010 14:37:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[10777] csw/mgar/pkg/cpan Message-ID: <E1Om6Es-0003BG-Vg@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10777 http://gar.svn.sourceforge.net/gar/?rev=10777&view=rev Author: dmichelsen Date: 2010-08-19 14:37:06 +0000 (Thu, 19 Aug 2010) Log Message: ----------- cpan/constant-lexical: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/constant-lexical/ csw/mgar/pkg/cpan/constant-lexical/branches/ csw/mgar/pkg/cpan/constant-lexical/tags/ csw/mgar/pkg/cpan/constant-lexical/trunk/ csw/mgar/pkg/cpan/constant-lexical/trunk/Makefile csw/mgar/pkg/cpan/constant-lexical/trunk/checksums csw/mgar/pkg/cpan/constant-lexical/trunk/files/ csw/mgar/pkg/cpan/constant-lexical/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/constant-lexical/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/constant-lexical/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/constant-lexical/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/constant-lexical/trunk/Makefile 2010-08-19 14:37:06 UTC (rev 10777) @@ -0,0 +1,19 @@ +GARNAME = constant-lexical +GARVERSION = 2 +CATEGORIES = cpan +AUTHOR = SPROUT + +DESCRIPTION = Perl pragma to declare lexical compile-time constants +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmconstantlexical +CATALOGNAME = pm_constantlexical + +DEP_PKGS = CSWpmsubdelete + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/constant-lexical/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/constant-lexical/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/constant-lexical/trunk/checksums 2010-08-19 14:37:06 UTC (rev 10777) @@ -0,0 +1,2 @@ +d35b0170051b782886727218bbb0fc80 COPYING +b80916a698324b591af70cd2d7354129 constant-lexical-2.tar.gz Added: csw/mgar/pkg/cpan/constant-lexical/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/constant-lexical/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/constant-lexical/trunk/files/COPYING 2010-08-19 14:37:06 UTC (rev 10777) @@ -0,0 +1,7 @@ +COPYRIGHT AND LICENCE + +Copyright (C) 2008, 2010 Father Chrysostomos + +This program is free software; you may redistribute it, modify it, or +both, under the same terms as perl. + 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 Aug 19 16:54:47 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 19 Aug 2010 14:54:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[10778] csw/mgar/pkg/cpan Message-ID: <E1Om6Vz-000634-To@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 10778 http://gar.svn.sourceforge.net/gar/?rev=10778&view=rev Author: dmichelsen Date: 2010-08-19 14:54:47 +0000 (Thu, 19 Aug 2010) Log Message: ----------- cpan/CSS-DOM: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/CSS-DOM/ csw/mgar/pkg/cpan/CSS-DOM/branches/ csw/mgar/pkg/cpan/CSS-DOM/tags/ csw/mgar/pkg/cpan/CSS-DOM/trunk/ csw/mgar/pkg/cpan/CSS-DOM/trunk/Makefile csw/mgar/pkg/cpan/CSS-DOM/trunk/checksums csw/mgar/pkg/cpan/CSS-DOM/trunk/files/ csw/mgar/pkg/cpan/CSS-DOM/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/CSS-DOM/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/CSS-DOM/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/CSS-DOM/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/CSS-DOM/trunk/Makefile 2010-08-19 14:54:47 UTC (rev 10778) @@ -0,0 +1,19 @@ +GARNAME = CSS-DOM +GARVERSION = 0.11 +CATEGORIES = cpan +AUTHOR = SPROUT + +DESCRIPTION = Document Object Model for Cascading Style Sheets +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmcssdom +CATALOGNAME = pm_cssdom + +DEP_PKGS = CSWpmtieutil CSWpmgraphicscolornw CSWpmconstantlexical + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/CSS-DOM/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/CSS-DOM/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/CSS-DOM/trunk/checksums 2010-08-19 14:54:47 UTC (rev 10778) @@ -0,0 +1,2 @@ +80dd4b55a89083966b6e1085cd2bd8a8 COPYING +2a618b38418616cc1c4a33b2f3d20091 CSS-DOM-0.11.tar.gz Added: csw/mgar/pkg/cpan/CSS-DOM/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/CSS-DOM/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/CSS-DOM/trunk/files/COPYING 2010-08-19 14:54:47 UTC (rev 10778) @@ -0,0 +1,7 @@ +COPYRIGHT AND LICENCE + +Copyright (C) 2007-10 Father Chrysostomos + +This program is free software; you may redistribute it and/or modify +it under the same terms as perl. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gmarler at users.sourceforge.net Thu Aug 19 21:42:17 2010 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Thu, 19 Aug 2010 19:42:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[10779] csw/mgar/pkg/bzip2/ Message-ID: <E1OmB0D-00047w-Hh@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10779 http://gar.svn.sourceforge.net/gar/?rev=10779&view=rev Author: gmarler Date: 2010-08-19 19:42:17 +0000 (Thu, 19 Aug 2010) Log Message: ----------- Add placeholder dir for bzip2 Added Paths: ----------- csw/mgar/pkg/bzip2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gmarler at users.sourceforge.net Thu Aug 19 21:46:56 2010 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Thu, 19 Aug 2010 19:46:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[10780] csw/mgar/pkg/bzip2 Message-ID: <E1OmB4i-0004Gy-6Q@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10780 http://gar.svn.sourceforge.net/gar/?rev=10780&view=rev Author: gmarler Date: 2010-08-19 19:46:55 +0000 (Thu, 19 Aug 2010) Log Message: ----------- Add normal SVN infrastructure Added Paths: ----------- csw/mgar/pkg/bzip2/Makefile csw/mgar/pkg/bzip2/branches/ csw/mgar/pkg/bzip2/tags/ csw/mgar/pkg/bzip2/trunk/ Added: csw/mgar/pkg/bzip2/Makefile =================================================================== --- csw/mgar/pkg/bzip2/Makefile (rev 0) +++ csw/mgar/pkg/bzip2/Makefile 2010-08-19 19:46:55 UTC (rev 10780) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gmarler at users.sourceforge.net Thu Aug 19 22:06:06 2010 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Thu, 19 Aug 2010 20:06:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[10781] csw/mgar/pkg/bzip2/trunk/ Message-ID: <E1OmBNG-00038a-K4@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 10781 http://gar.svn.sourceforge.net/gar/?rev=10781&view=rev Author: gmarler Date: 2010-08-19 20:06:06 +0000 (Thu, 19 Aug 2010) Log Message: ----------- add necessary SVN properties Property Changed: ---------------- csw/mgar/pkg/bzip2/trunk/ Property changes on: csw/mgar/pkg/bzip2/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work 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 gmarler at users.sourceforge.net Thu Aug 19 22:15:58 2010 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Thu, 19 Aug 2010 20:15:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[10782] csw/mgar/pkg/bzip2/trunk/Makefile Message-ID: <E1OmBWo-0003JN-1i@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 10782 http://gar.svn.sourceforge.net/gar/?rev=10782&view=rev Author: gmarler Date: 2010-08-19 20:15:57 +0000 (Thu, 19 Aug 2010) Log Message: ----------- Add first pass at Makefile Added Paths: ----------- csw/mgar/pkg/bzip2/trunk/Makefile Added: csw/mgar/pkg/bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/bzip2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bzip2/trunk/Makefile 2010-08-19 20:15:57 UTC (rev 10782) @@ -0,0 +1,40 @@ +GARNAME = bzip2 +GARVERSION = 1.0.5 +CATEGORIES = utils + +# BUILD_DEP_PKGS = CSWggettext CSWgit + +# RUNTIME_DEP_PKGS = CSWiconv CSWggettextrt + +# INCOMPATIBLE_PKGS = + +DESCRIPTION = bzip2 Compressiion Utility +define BLURB +bzip2 is a freely available, patent free, high-quality data compressor. It typically +compresses files to within 10% to 15% of the best available techniques (the PPM family of +statistical compressors), whilst being around twice as fast at compression and six +times faster at decompression. +endef + +MASTER_SITES = http://www.bzip.org/$(GARVERSION) +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 + +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw +CONFIGURE_ARGS = $(DIRPATHS) +# TODO: Check if these might be needed +# CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw +# CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw + +ifneq ($(GARVERSION), 8.4) +TEST_TARGET = check +else +TEST_SCRIPTS = +endif + +include gar/category.mk + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gmarler at users.sourceforge.net Fri Aug 20 05:58:58 2010 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Fri, 20 Aug 2010 03:58:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[10783] csw/mgar/pkg/bzip2/trunk Message-ID: <E1OmIks-0006ZR-3m@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 10783 http://gar.svn.sourceforge.net/gar/?rev=10783&view=rev Author: gmarler Date: 2010-08-20 03:58:57 +0000 (Fri, 20 Aug 2010) Log Message: ----------- Now builds 32 and 64 bit binaries and shared libraries tests run successfully Modified Paths: -------------- csw/mgar/pkg/bzip2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bzip2/trunk/checksums csw/mgar/pkg/bzip2/trunk/files/ csw/mgar/pkg/bzip2/trunk/files/0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch csw/mgar/pkg/bzip2/trunk/files/0002-test-should-depend-on-bzip2.patch Modified: csw/mgar/pkg/bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/bzip2/trunk/Makefile 2010-08-19 20:15:57 UTC (rev 10782) +++ csw/mgar/pkg/bzip2/trunk/Makefile 2010-08-20 03:58:57 UTC (rev 10783) @@ -16,25 +16,45 @@ times faster at decompression. endef -MASTER_SITES = http://www.bzip.org/$(GARVERSION) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = http://www.bzip.org/$(GARVERSION)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch +PATCHFILES += 0002-test-should-depend-on-bzip2.patch # We define upstream file regex so we can be notifed of new upstream # software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -sysconfdir = /etc/opt/csw -localstatedir = /var/opt/csw -CONFIGURE_ARGS = $(DIRPATHS) -# TODO: Check if these might be needed -# CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw -# CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw +PACKAGES = CSWbzip2 +CATALOGNAME = bzip2 -ifneq ($(GARVERSION), 8.4) -TEST_TARGET = check -else -TEST_SCRIPTS = -endif +BUILD64 = 1 +GARCOMPILER = SOS12 +CFLAGS += -KPIC -D_FILE_OFFSET_BITS=64 -fast $(SOS12_CC_FLAGS) +LDFLAGS += $(SOS12_LD_FLAGS) $(RUNPATH_LINKER_FLAGS) + +BUILD_ARGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" + +BUILD_SCRIPTS = custom +TEST_SCRIPTS = custom +CONFIGURE_SCRIPTS = +INSTALL_SCRIPTS = custom + +LD_LIBRARY_PATH=. +export LD_LIBRARY_PATH +EXTRA_TEST_EXPORTS = LD_LIBRARY_PATH + include gar/category.mk +build-custom: + $(MAKE) -C $(WORKSRC) -f Makefile-libbz2_so $(BUILD_ARGS) + @$(MAKECOOKIE) + +test-custom: + $(MAKE) -C $(WORKSRC) -f Makefile-libbz2_so test + @$(MAKECOOKIE) + +install-custom: + @echo " => Installing $(CATALOGNAME)" + @$(MAKECOOKIE) Added: csw/mgar/pkg/bzip2/trunk/checksums =================================================================== --- csw/mgar/pkg/bzip2/trunk/checksums (rev 0) +++ csw/mgar/pkg/bzip2/trunk/checksums 2010-08-20 03:58:57 UTC (rev 10783) @@ -0,0 +1,3 @@ +e75c460d8ff1a91bd295277824b4f080 0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch +989947c7661176ad26174bf5b65f4ee0 0002-test-should-depend-on-bzip2.patch +3c15a0c8d1d3ee1c46a1634d00617b1a bzip2-1.0.5.tar.gz Added: csw/mgar/pkg/bzip2/trunk/files/0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch =================================================================== --- csw/mgar/pkg/bzip2/trunk/files/0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch (rev 0) +++ csw/mgar/pkg/bzip2/trunk/files/0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch 2010-08-20 03:58:57 UTC (rev 10783) @@ -0,0 +1,77 @@ +From 35021e8f149f06a789417a41bbc784182910ec18 Mon Sep 17 00:00:00 2001 +From: Gordon Marler <gmarler at opencsw.org> +Date: Fri, 20 Aug 2010 05:19:08 +0200 +Subject: [PATCH] CFLAGS LDFLAGS for SOS12 shared lib + +--- + Makefile-libbz2_so | 34 ++++++++++++++++++++++++++-------- + 1 files changed, 26 insertions(+), 8 deletions(-) + +diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so +index 9a13c77..23c1a12 100644 +--- a/Makefile-libbz2_so ++++ b/Makefile-libbz2_so +@@ -1,6 +1,6 @@ + + # This Makefile builds a shared version of the library, +-# libbz2.so.1.0.4, with soname libbz2.so.1.0, ++# libbz2.so.1.0.5, with soname libbz2.so.1.0, + # at least on x86-Linux (RedHat 7.2), + # with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98). + # Please see the README file for some important info +@@ -22,9 +22,8 @@ + + + SHELL=/bin/sh +-CC=gcc +-BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++ ++ + + OBJS= blocksort.o \ + huffman.o \ +@@ -35,13 +34,13 @@ OBJS= blocksort.o \ + bzlib.o + + all: $(OBJS) +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) +- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 ++ $(CC) -G $(CFLAGS) $(LDFLAGS) -o libbz2.so.1.0.5 $(OBJS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.c libbz2.so.1.0.5 + rm -f libbz2.so.1.0 +- ln -s libbz2.so.1.0.4 libbz2.so.1.0 ++ ln -s libbz2.so.1.0.5 libbz2.so.1.0 + + clean: +- rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared ++ rm -f $(OBJS) bzip2.o libbz2.so.1.0.5 libbz2.so.1.0 bzip2 + + blocksort.o: blocksort.c + $(CC) $(CFLAGS) -c blocksort.c +@@ -57,3 +56,22 @@ decompress.o: decompress.c + $(CC) $(CFLAGS) -c decompress.c + bzlib.o: bzlib.c + $(CC) $(CFLAGS) -c bzlib.c ++ ++check: test ++ ++test: all ++ @cat words1 ++ ./bzip2 -1 < sample1.ref > sample1.rb2 ++ ./bzip2 -2 < sample2.ref > sample2.rb2 ++ ./bzip2 -3 < sample3.ref > sample3.rb2 ++ ./bzip2 -d < sample1.bz2 > sample1.tst ++ ./bzip2 -d < sample2.bz2 > sample2.tst ++ ./bzip2 -ds < sample3.bz2 > sample3.tst ++ cmp sample1.bz2 sample1.rb2 ++ cmp sample2.bz2 sample2.rb2 ++ cmp sample3.bz2 sample3.rb2 ++ cmp sample1.tst sample1.ref ++ cmp sample2.tst sample2.ref ++ cmp sample3.tst sample3.ref ++ @cat words3 ++ +-- +1.7.1 + Added: csw/mgar/pkg/bzip2/trunk/files/0002-test-should-depend-on-bzip2.patch =================================================================== --- csw/mgar/pkg/bzip2/trunk/files/0002-test-should-depend-on-bzip2.patch (rev 0) +++ csw/mgar/pkg/bzip2/trunk/files/0002-test-should-depend-on-bzip2.patch 2010-08-20 03:58:57 UTC (rev 10783) @@ -0,0 +1,25 @@ +From 9ee98dbae36b812549127094a4140f1278d67ecf Mon Sep 17 00:00:00 2001 +From: Gordon Marler <gmarler at opencsw.org> +Date: Fri, 20 Aug 2010 05:47:48 +0200 +Subject: [PATCH] test should depend on bzip2 + +--- + Makefile-libbz2_so | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so +index 1494abd..b980404 100644 +--- a/Makefile-libbz2_so ++++ b/Makefile-libbz2_so +@@ -59,7 +59,7 @@ bzlib.o: bzlib.c + + check: test + +-test: all ++test: bzip2 + @cat words1 + ./bzip2 -1 < sample1.ref > sample1.rb2 + ./bzip2 -2 < sample2.ref > sample2.rb2 +-- +1.7.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gmarler at users.sourceforge.net Fri Aug 20 07:06:26 2010 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Fri, 20 Aug 2010 05:06:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[10784] csw/mgar/pkg/bzip2/trunk Message-ID: <E1OmJoA-0007ci-QL@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 10784 http://gar.svn.sourceforge.net/gar/?rev=10784&view=rev Author: gmarler Date: 2010-08-20 05:06:26 +0000 (Fri, 20 Aug 2010) Log Message: ----------- packaging for SPARC now works - need to add LICENSE Modified Paths: -------------- csw/mgar/pkg/bzip2/trunk/Makefile csw/mgar/pkg/bzip2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch Modified: csw/mgar/pkg/bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/bzip2/trunk/Makefile 2010-08-20 03:58:57 UTC (rev 10783) +++ csw/mgar/pkg/bzip2/trunk/Makefile 2010-08-20 05:06:26 UTC (rev 10784) @@ -20,6 +20,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch PATCHFILES += 0002-test-should-depend-on-bzip2.patch +PATCHFILES += 0003-generate-bzip2recover.patch # We define upstream file regex so we can be notifed of new upstream # software release @@ -47,6 +48,13 @@ include gar/category.mk +PLATFORM = $(shell if [ `uname -i` = "i86pc" ] ; then echo i86pc ; else echo sun4 ; fi ) +OBJDIR = $(WORKDIR)/$(DISTNAME) +DOCFILES = CHANGES LICENSE README manual.html manual.pdf manual.xml +BINFILES = bzip2 bzdiff bzgrep bzip2recover bzmore +LIBFILES = libbz2.so.1.0.5 +INCFILES = bzlib.h + build-custom: $(MAKE) -C $(WORKSRC) -f Makefile-libbz2_so $(BUILD_ARGS) @$(MAKECOOKIE) @@ -57,4 +65,32 @@ install-custom: @echo " => Installing $(CATALOGNAME)" + @ginstall -d $(DESTDIR)$(includedir) + @ginstall -d $(DESTDIR)$(libdir) + @ginstall -d $(DESTDIR)$(bindir) + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @# install the libraries + @( for file in $(LIBFILES) ; do \ + ginstall -c -m 755 $(OBJDIR)/$$file $(DESTDIR)$(libdir) ; \ + done ) + @ln -s -f $(DESTDIR)$(libdir)/libbz2.so.1.0.5 $(DESTDIR)$(libdir)/libbz2.so + @ln -s -f $(DESTDIR)$(libdir)/libbz2.so.1.0.5 $(DESTDIR)$(libdir)/libbz2.so.1.0 + @# install the binaries + @( for file in $(BINFILES) ; do \ + ginstall -m 755 $(OBJDIR)/$$file $(DESTDIR)$(bindir) ; \ + done ) + @ginstall -m 755 $(OBJDIR)/bzip2 $(DESTDIR)$(bindir)/bunzip2 + @ginstall -m 755 $(OBJDIR)/bzip2 $(DESTDIR)$(bindir)/bzcat + @ln -s -f $(DESTDIR)$(bindir)/bzgrep $(DESTDIR)$(bindir)/bzegrep + @ln -s -f $(DESTDIR)$(bindir)/bzgrep $(DESTDIR)$(bindir)/bzfgrep + @ln -s -f $(DESTDIR)$(bindir)/bzmore $(DESTDIR)$(bindir)/bzless + @ln -s -f $(DESTDIR)$(bindir)/bzdiff $(DESTDIR)$(bindir)/bzcmp + @# install the include files + @( for file in $(INCFILES) ; do \ + ginstall -m 644 $(OBJDIR)/$$file $(DESTDIR)$(includedir) ; \ + done ) + @# install the doc files + @( for file in $(DOCFILES) ; do \ + ginstall -m 644 $(OBJDIR)/$$file $(DESTDIR)$(docdir)/$(GARNAME) ; \ + done ) @$(MAKECOOKIE) Modified: csw/mgar/pkg/bzip2/trunk/checksums =================================================================== --- csw/mgar/pkg/bzip2/trunk/checksums 2010-08-20 03:58:57 UTC (rev 10783) +++ csw/mgar/pkg/bzip2/trunk/checksums 2010-08-20 05:06:26 UTC (rev 10784) @@ -1,3 +1,4 @@ e75c460d8ff1a91bd295277824b4f080 0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch 989947c7661176ad26174bf5b65f4ee0 0002-test-should-depend-on-bzip2.patch +f76155cd90d532f21ea33d5e681ba3a9 0003-generate-bzip2recover.patch 3c15a0c8d1d3ee1c46a1634d00617b1a bzip2-1.0.5.tar.gz Added: csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch =================================================================== --- csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch (rev 0) +++ csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch 2010-08-20 05:06:26 UTC (rev 10784) @@ -0,0 +1,35 @@ +From 8c2999a502b88621e39ec11e9cc60106236b5bd6 Mon Sep 17 00:00:00 2001 +From: Gordon Marler <gmarler at opencsw.org> +Date: Fri, 20 Aug 2010 06:55:05 +0200 +Subject: [PATCH] generate bzip2recover + +--- + Makefile-libbz2_so | 11 +++++++++-- + 1 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so +index b980404..2eeea45 100644 +--- a/Makefile-libbz2_so ++++ b/Makefile-libbz2_so +@@ -33,9 +33,16 @@ OBJS= blocksort.o \ + decompress.o \ + bzlib.o + +-all: $(OBJS) +- $(CC) -G $(CFLAGS) $(LDFLAGS) -o libbz2.so.1.0.5 $(OBJS) ++all: libbz2.so.1.0.5 bzip2 bzip2recover ++ ++bzip2: libbz2.so.1.0.5 + $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.c libbz2.so.1.0.5 ++ ++bzip2recover: bzip2recover.o ++ $(CC) $(CFLAGS) -o bzip2recover bzip2recover.o ++ ++libbz2.so.1.0.5: $(OBJS) ++ $(CC) -G $(CFLAGS) $(LDFLAGS) -o libbz2.so.1.0.5 $(OBJS) + rm -f libbz2.so.1.0 + ln -s libbz2.so.1.0.5 libbz2.so.1.0 + +-- +1.7.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gmarler at users.sourceforge.net Fri Aug 20 07:13:58 2010 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Fri, 20 Aug 2010 05:13:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[10785] csw/mgar/pkg/bzip2/trunk/Makefile Message-ID: <E1OmJvS-00008c-VL@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10785 http://gar.svn.sourceforge.net/gar/?rev=10785&view=rev Author: gmarler Date: 2010-08-20 05:13:58 +0000 (Fri, 20 Aug 2010) Log Message: ----------- Add LICENSE and fix to pass pkgcheck Modified Paths: -------------- csw/mgar/pkg/bzip2/trunk/Makefile Modified: csw/mgar/pkg/bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/bzip2/trunk/Makefile 2010-08-20 05:06:26 UTC (rev 10784) +++ csw/mgar/pkg/bzip2/trunk/Makefile 2010-08-20 05:13:58 UTC (rev 10785) @@ -2,13 +2,7 @@ GARVERSION = 1.0.5 CATEGORIES = utils -# BUILD_DEP_PKGS = CSWggettext CSWgit - -# RUNTIME_DEP_PKGS = CSWiconv CSWggettextrt - -# INCOMPATIBLE_PKGS = - -DESCRIPTION = bzip2 Compressiion Utility +DESCRIPTION = bzip2 Compression Utility define BLURB bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of @@ -29,6 +23,10 @@ PACKAGES = CSWbzip2 CATALOGNAME = bzip2 +LICENSE = LICENSE + +CHECKPKG_OVERRIDES_CSWbzip2 += pkginfo-description-not-starting-with-uppercase|bzip2|Compression|Utility + BUILD64 = 1 GARCOMPILER = SOS12 @@ -50,7 +48,7 @@ PLATFORM = $(shell if [ `uname -i` = "i86pc" ] ; then echo i86pc ; else echo sun4 ; fi ) OBJDIR = $(WORKDIR)/$(DISTNAME) -DOCFILES = CHANGES LICENSE README manual.html manual.pdf manual.xml +DOCFILES = CHANGES README manual.html manual.pdf manual.xml BINFILES = bzip2 bzdiff bzgrep bzip2recover bzmore LIBFILES = libbz2.so.1.0.5 INCFILES = bzlib.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Aug 20 11:06:30 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Aug 2010 09:06:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[10786] csw/mgar/pkg Message-ID: <E1OmNYU-0004TH-VB@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 10786 http://gar.svn.sourceforge.net/gar/?rev=10786&view=rev Author: dmichelsen Date: 2010-08-20 09:06:30 +0000 (Fri, 20 Aug 2010) Log Message: ----------- adobereader: Initial commit Added Paths: ----------- csw/mgar/pkg/adobereader/ csw/mgar/pkg/adobereader/branches/ csw/mgar/pkg/adobereader/tags/ csw/mgar/pkg/adobereader/trunk/ csw/mgar/pkg/adobereader/trunk/Makefile csw/mgar/pkg/adobereader/trunk/checksums csw/mgar/pkg/adobereader/trunk/files/ Property changes on: csw/mgar/pkg/adobereader/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/adobereader/trunk/Makefile =================================================================== --- csw/mgar/pkg/adobereader/trunk/Makefile (rev 0) +++ csw/mgar/pkg/adobereader/trunk/Makefile 2010-08-20 09:06:30 UTC (rev 10786) @@ -0,0 +1,36 @@ +# $Id$ +GARNAME = adobereader +GARVERSION = 9.3.4 +CATEGORIES = apps + +DESCRIPTION = Adobe Acrobat Reader +define BLURB + Long description +endef + +MASTER_SITES = ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/$(GARVERSION)/enu/ +DISTFILES = AdbeRdr$(GARVERSION)-1_i486solaris_enu.tar.bz2 +DISTNAME = AdobeReader + +# File name regex to get notifications about upstream software releases +# 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 = + +LICENSE = AdobeReader/ReadMe.htm + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(sharedstatedir) + cd $(WORKSRC) && ./INSTALL --install_path=$(DESTDIR)$(sharedstatedir) + ginstall -d $(DESTDIR)$(bindir) + ln -s ../share/Adobe/Reader9/bin/acroread $(DESTDIR)$(bindir)/acroread + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/adobereader/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/adobereader/trunk/checksums =================================================================== --- csw/mgar/pkg/adobereader/trunk/checksums (rev 0) +++ csw/mgar/pkg/adobereader/trunk/checksums 2010-08-20 09:06:30 UTC (rev 10786) @@ -0,0 +1 @@ +e9148b76a646d43aae30457dceeaee37 AdbeRdr9.3.4-1_i486solaris_enu.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 Fri Aug 20 11:17:21 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Aug 2010 09:17:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[10787] csw/mgar/pkg/adobereader/trunk/Makefile Message-ID: <E1OmNiz-00070N-KP@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10787 http://gar.svn.sourceforge.net/gar/?rev=10787&view=rev Author: dmichelsen Date: 2010-08-20 09:17:21 +0000 (Fri, 20 Aug 2010) Log Message: ----------- adobereader: Adjust overrides Modified Paths: -------------- csw/mgar/pkg/adobereader/trunk/Makefile Modified: csw/mgar/pkg/adobereader/trunk/Makefile =================================================================== --- csw/mgar/pkg/adobereader/trunk/Makefile 2010-08-20 09:06:30 UTC (rev 10786) +++ csw/mgar/pkg/adobereader/trunk/Makefile 2010-08-20 09:17:21 UTC (rev 10787) @@ -26,6 +26,11 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom +# They have strange pathes all over the place and fix it with LD_LIBRARY_PATH during execution +CHECKPKG_OVERRIDES = binary-architecture-does-not-match-placement +CHECKPKG_OVERRIDES += bad-rpath-entry +CHECKPKG_OVERRIDES += soname-not-found + 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 dmichelsen at users.sourceforge.net Sat Aug 21 13:29:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 21 Aug 2010 11:29:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[10788] csw/mgar/pkg/rssh/trunk/Makefile Message-ID: <E1OmmG1-0001cT-3a@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 10788 http://gar.svn.sourceforge.net/gar/?rev=10788&view=rev Author: dmichelsen Date: 2010-08-21 11:29:04 +0000 (Sat, 21 Aug 2010) Log Message: ----------- rssh: Make sure to preserve rssh.conf Modified Paths: -------------- csw/mgar/pkg/rssh/trunk/Makefile Modified: csw/mgar/pkg/rssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/rssh/trunk/Makefile 2010-08-20 09:17:21 UTC (rev 10787) +++ csw/mgar/pkg/rssh/trunk/Makefile 2010-08-21 11:29:04 UTC (rev 10788) @@ -29,6 +29,7 @@ sysconfdir = /etc/opt/csw MIGRATE_FILES = rssh.conf +PRESERVECONF = $(sysconfdir)/rssh.conf CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-scp=$(bindir)/scp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gmarler at users.sourceforge.net Sun Aug 22 15:45:14 2010 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Sun, 22 Aug 2010 13:45:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[10789] csw/mgar/pkg/bzip2/trunk/Makefile Message-ID: <E1OnArK-0003df-F3@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10789 http://gar.svn.sourceforge.net/gar/?rev=10789&view=rev Author: gmarler Date: 2010-08-22 13:45:13 +0000 (Sun, 22 Aug 2010) Log Message: ----------- Eliminate use of GARCOMPILER - let it default Add NOISAEXEC and MERGE_DIRS_isa-extra to BUILD64 to indicate that only the libraries need to be 64-bit Replace CFLAGS with EXTRA_CFLAGS Set LD_FLAGS from LD_OPTIONS Eliminate PLATFORM and OBJDIR (redundant) Replace all uses of OBJDIR with WORKSRC Make links in the same dir hard links rather than symlinks Explain setting of LD_LIBRARY_PATH for testing purposes Modified Paths: -------------- csw/mgar/pkg/bzip2/trunk/Makefile Modified: csw/mgar/pkg/bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/bzip2/trunk/Makefile 2010-08-21 11:29:04 UTC (rev 10788) +++ csw/mgar/pkg/bzip2/trunk/Makefile 2010-08-22 13:45:13 UTC (rev 10789) @@ -27,11 +27,14 @@ CHECKPKG_OVERRIDES_CSWbzip2 += pkginfo-description-not-starting-with-uppercase|bzip2|Compression|Utility -BUILD64 = 1 -GARCOMPILER = SOS12 +BUILD64 = 1 +NOISAEXEC = 1 +MERGE_DIRS_isa-extra = $(libdir) -CFLAGS += -KPIC -D_FILE_OFFSET_BITS=64 -fast $(SOS12_CC_FLAGS) -LDFLAGS += $(SOS12_LD_FLAGS) $(RUNPATH_LINKER_FLAGS) +EXTRA_CFLAGS += -KPIC -D_FILE_OFFSET_BITS=64 +LDFLAGS += $(LD_OPTIONS) +# CFLAGS += -KPIC -D_FILE_OFFSET_BITS=64 -fast $(SOS12_CC_FLAGS) +# LDFLAGS += $(SOS12_LD_FLAGS) $(RUNPATH_LINKER_FLAGS) BUILD_ARGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" @@ -40,14 +43,16 @@ CONFIGURE_SCRIPTS = INSTALL_SCRIPTS = custom +# The tests will fail if CSWbzip2 isn't already installed, since the runpath for +# bzip2 goes through /opt/csw/lib/... instead of . - just help it out here. LD_LIBRARY_PATH=. export LD_LIBRARY_PATH EXTRA_TEST_EXPORTS = LD_LIBRARY_PATH include gar/category.mk -PLATFORM = $(shell if [ `uname -i` = "i86pc" ] ; then echo i86pc ; else echo sun4 ; fi ) -OBJDIR = $(WORKDIR)/$(DISTNAME) +#PLATFORM = $(shell if [ `uname -i` = "i86pc" ] ; then echo i86pc ; else echo sun4 ; fi ) +#OBJDIR = $(WORKDIR)/$(DISTNAME) DOCFILES = CHANGES README manual.html manual.pdf manual.xml BINFILES = bzip2 bzdiff bzgrep bzip2recover bzmore LIBFILES = libbz2.so.1.0.5 @@ -69,26 +74,26 @@ @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @# install the libraries @( for file in $(LIBFILES) ; do \ - ginstall -c -m 755 $(OBJDIR)/$$file $(DESTDIR)$(libdir) ; \ + ginstall -c -m 755 $(WORKSRC)/$$file $(DESTDIR)$(libdir) ; \ done ) @ln -s -f $(DESTDIR)$(libdir)/libbz2.so.1.0.5 $(DESTDIR)$(libdir)/libbz2.so @ln -s -f $(DESTDIR)$(libdir)/libbz2.so.1.0.5 $(DESTDIR)$(libdir)/libbz2.so.1.0 @# install the binaries @( for file in $(BINFILES) ; do \ - ginstall -m 755 $(OBJDIR)/$$file $(DESTDIR)$(bindir) ; \ + ginstall -m 755 $(WORKSRC)/$$file $(DESTDIR)$(bindir) ; \ done ) - @ginstall -m 755 $(OBJDIR)/bzip2 $(DESTDIR)$(bindir)/bunzip2 - @ginstall -m 755 $(OBJDIR)/bzip2 $(DESTDIR)$(bindir)/bzcat - @ln -s -f $(DESTDIR)$(bindir)/bzgrep $(DESTDIR)$(bindir)/bzegrep - @ln -s -f $(DESTDIR)$(bindir)/bzgrep $(DESTDIR)$(bindir)/bzfgrep - @ln -s -f $(DESTDIR)$(bindir)/bzmore $(DESTDIR)$(bindir)/bzless - @ln -s -f $(DESTDIR)$(bindir)/bzdiff $(DESTDIR)$(bindir)/bzcmp + @ginstall -m 755 $(WORKSRC)/bzip2 $(DESTDIR)$(bindir)/bunzip2 + @ginstall -m 755 $(WORKSRC)/bzip2 $(DESTDIR)$(bindir)/bzcat + @ln -f $(DESTDIR)$(bindir)/bzgrep $(DESTDIR)$(bindir)/bzegrep + @ln -f $(DESTDIR)$(bindir)/bzgrep $(DESTDIR)$(bindir)/bzfgrep + @ln -f $(DESTDIR)$(bindir)/bzmore $(DESTDIR)$(bindir)/bzless + @ln -f $(DESTDIR)$(bindir)/bzdiff $(DESTDIR)$(bindir)/bzcmp @# install the include files @( for file in $(INCFILES) ; do \ - ginstall -m 644 $(OBJDIR)/$$file $(DESTDIR)$(includedir) ; \ + ginstall -m 644 $(WORKSRC)/$$file $(DESTDIR)$(includedir) ; \ done ) @# install the doc files @( for file in $(DOCFILES) ; do \ - ginstall -m 644 $(OBJDIR)/$$file $(DESTDIR)$(docdir)/$(GARNAME) ; \ + ginstall -m 644 $(WORKSRC)/$$file $(DESTDIR)$(docdir)/$(GARNAME) ; \ done ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gmarler at users.sourceforge.net Sun Aug 22 15:54:13 2010 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Sun, 22 Aug 2010 13:54:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[10790] csw/mgar/pkg/bzip2/trunk/Makefile Message-ID: <E1OnB01-0003n3-5j@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10790 http://gar.svn.sourceforge.net/gar/?rev=10790&view=rev Author: gmarler Date: 2010-08-22 13:54:12 +0000 (Sun, 22 Aug 2010) Log Message: ----------- Cleanup of comments describing previous build attempts Modified Paths: -------------- csw/mgar/pkg/bzip2/trunk/Makefile Modified: csw/mgar/pkg/bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/bzip2/trunk/Makefile 2010-08-22 13:45:13 UTC (rev 10789) +++ csw/mgar/pkg/bzip2/trunk/Makefile 2010-08-22 13:54:12 UTC (rev 10790) @@ -33,8 +33,6 @@ EXTRA_CFLAGS += -KPIC -D_FILE_OFFSET_BITS=64 LDFLAGS += $(LD_OPTIONS) -# CFLAGS += -KPIC -D_FILE_OFFSET_BITS=64 -fast $(SOS12_CC_FLAGS) -# LDFLAGS += $(SOS12_LD_FLAGS) $(RUNPATH_LINKER_FLAGS) BUILD_ARGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" @@ -51,8 +49,6 @@ include gar/category.mk -#PLATFORM = $(shell if [ `uname -i` = "i86pc" ] ; then echo i86pc ; else echo sun4 ; fi ) -#OBJDIR = $(WORKDIR)/$(DISTNAME) DOCFILES = CHANGES README manual.html manual.pdf manual.xml BINFILES = bzip2 bzdiff bzgrep bzip2recover bzmore LIBFILES = libbz2.so.1.0.5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gmarler at users.sourceforge.net Sun Aug 22 16:34:34 2010 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Sun, 22 Aug 2010 14:34:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[10791] csw/mgar/pkg/findutils/trunk/Makefile Message-ID: <E1OnBd4-0004tJ-Qn@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 10791 http://gar.svn.sourceforge.net/gar/?rev=10791&view=rev Author: gmarler Date: 2010-08-22 14:34:34 +0000 (Sun, 22 Aug 2010) Log Message: ----------- correct handling of the optimization flags, so we actually get ISA specific modulations add optimizations for 32-bit sparc as a test determine which tests are failing, and document them until they're fixed Modified Paths: -------------- csw/mgar/pkg/findutils/trunk/Makefile Modified: csw/mgar/pkg/findutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/findutils/trunk/Makefile 2010-08-22 13:54:12 UTC (rev 10790) +++ csw/mgar/pkg/findutils/trunk/Makefile 2010-08-22 14:34:34 UTC (rev 10791) @@ -31,13 +31,37 @@ CONFIGURE_ARGS += --program-prefix=g CONFIGURE_ARGS += --localstatedir=/var/opt/csw -EXTRA_CFLAGS = -fast -xnolibmopt +# Use OPT_FLAGS_SOS instead instead of CFLAGS_EXTRA, because we want -fast +# to be first, and to have portions of it overridden by the ISA specific +# items per modulation. Otherwise, we end up with everything being 'native', +# because that's what -fast does if it's last in the list. +OPT_FLAGS_SOS = -fast -xnolibmopt +EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis +## EXTRA_BUILD_ISAS_i386 = ??? + +# CHECKPKG_OVERRIDES_CSWfindutils += surplus-dependency|CSWiconv + # Test target requires GNU diff TEST_TARGET = check TEST_ARGS = "PATH=/opt/csw/gnu:$$PATH" -# Few of the tests fail, not yet further investigated +# 12 of the tests fail: +# iregex1.old-O0 +# iregex1.new-O0 +# iregex1.old-O1 +# iregex1.new-O1 +# iregex1.old-O2 +# iregex1.new-O2 +# iregex1.old-O3 +# iregex1.new-O3 +# +# FAIL: parent.old-O0, /home/gmarler/svnwork/findutils/trunk/work/solaris9-sparc/build-isa-sparcv8/findutils-4.4.2/find/testsuite/../oldfind: .: Permission denied +# FAIL: parent.old-O1, /home/gmarler/svnwork/findutils/trunk/work/solaris9-sparc/build-isa-sparcv8/findutils-4.4.2/find/testsuite/../oldfind: .: Permission denied +# FAIL: parent.old-O2, /home/gmarler/svnwork/findutils/trunk/work/solaris9-sparc/build-isa-sparcv8/findutils-4.4.2/find/testsuite/../oldfind: .: Permission denied +# FAIL: parent.old-O3, /home/gmarler/svnwork/findutils/trunk/work/solaris9-sparc/build-isa-sparcv8/findutils-4.4.2/find/testsuite/../oldfind: .: Permission denied + +# Skipping until the above are rectified SKIPTEST = 1 include gar/category.mk @@ -50,6 +74,8 @@ # configure:37775: checking how to link with libintl # configure:37777: result: /opt/csw/lib/libintl.so -R/opt/csw/lib # + post-configure-modulated: @perl -pi -e 's|-R/opt/csw/lib||' $(WORKSRC)/*/Makefile @$(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 Aug 23 12:45:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 23 Aug 2010 10:45:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[10792] csw/mgar/pkg/sqlite3/trunk Message-ID: <E1OnUXJ-00085i-Q5@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 10792 http://gar.svn.sourceforge.net/gar/?rev=10792&view=rev Author: dmichelsen Date: 2010-08-23 10:45:53 +0000 (Mon, 23 Aug 2010) Log Message: ----------- sqlite3: Update to 3.7.1 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2010-08-22 14:34:34 UTC (rev 10791) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2010-08-23 10:45:53 UTC (rev 10792) @@ -1,5 +1,5 @@ GARNAME = sqlite3 -GARVERSION = 3.6.23.1 +GARVERSION = 3.7.1 CATEGORIES = lib DESCRIPTION = An embeddable SQL engine in a C library @@ -12,7 +12,10 @@ MASTER_SITES = http://sqlite.org/ DISTNAME = sqlite-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz +DISTFILES += copyright-release.html +LICENSE = copyright-release.html + PATCHFILES = gar-base.diff PATCHFILES += shell.c.diff @@ -36,12 +39,6 @@ RUNTIME_DEP_PKGS_CSWsqlite3 += CSWreadline RUNTIME_DEP_PKGS_CSWsqlite3 += CSWncurses -CHECKPKG_OVERRIDES_CSWsqlite3devel += license-missing|/opt/csw/share/doc/sqlite3_devel/license -CHECKPKG_OVERRIDES_CSWsqlite3rt += license-missing|/opt/csw/share/doc/sqlite3_rt/license -CHECKPKG_OVERRIDES_CSWsqlite3 += license-missing|/opt/csw/share/doc/sqlite3/license -CHECKPKG_OVERRIDES_CSWsqlite3rt += file-with-bad-content|/export/medusa|root/opt/csw/lib/tcl8.4/sqlite3/libtclsqlite3.so -CHECKPKG_OVERRIDES_CSWsqlite3rt += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/sqlite3_rt - BUILD_DEP_PKGS = CSWreadline CSWncurses BUILD64 = 1 Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2010-08-22 14:34:34 UTC (rev 10791) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2010-08-23 10:45:53 UTC (rev 10792) @@ -1,3 +1,4 @@ +fc9432136482bcde03102bc3e06dd413 copyright-release.html 80d638505872be7ffa238d43f0e268b2 gar-base.diff 1a2be927ceacfa534501b9f4675bce83 shell.c.diff -d99f1b31da0eb33271464bee15cec701 sqlite-3.6.23.1.tar.gz +96bebad5f9009f0437d9878b8728dab6 sqlite-3.7.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Aug 23 14:30:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 23 Aug 2010 12:30:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[10793] csw/mgar/pkg/libssh2/trunk Message-ID: <E1OnWAu-0004mt-Je@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10793 http://gar.svn.sourceforge.net/gar/?rev=10793&view=rev Author: dmichelsen Date: 2010-08-23 12:30:52 +0000 (Mon, 23 Aug 2010) Log Message: ----------- libssh2: Update to 1.2.7 Modified Paths: -------------- csw/mgar/pkg/libssh2/trunk/Makefile csw/mgar/pkg/libssh2/trunk/checksums Modified: csw/mgar/pkg/libssh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libssh2/trunk/Makefile 2010-08-23 10:45:53 UTC (rev 10792) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2010-08-23 12:30:52 UTC (rev 10793) @@ -1,5 +1,5 @@ GARNAME = libssh2 -GARVERSION = 1.2.5 +GARVERSION = 1.2.7 CATEGORIES = lib DESCRIPTION = A Library Implementing the SSH2 Protocol @@ -13,6 +13,7 @@ MASTER_SITES = http://www.libssh2.org/download/ SPKG_SOURCEURL = http://www.libssh2.org DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# PATCHFILES = 0001-_libssh2_wait_socket-select-on-separate-fd_sets-for-.patch # We define upstream file regex so we can be notifed of # new upstream software release Modified: csw/mgar/pkg/libssh2/trunk/checksums =================================================================== --- csw/mgar/pkg/libssh2/trunk/checksums 2010-08-23 10:45:53 UTC (rev 10792) +++ csw/mgar/pkg/libssh2/trunk/checksums 2010-08-23 12:30:52 UTC (rev 10793) @@ -1 +1 @@ -9c4ccd6a078c465179bb70fcf5a704d8 libssh2-1.2.5.tar.gz +a5d78344886f1282e4008c09bf568076 libssh2-1.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 Mon Aug 23 14:47:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 23 Aug 2010 12:47:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[10794] csw/mgar/pkg/libssh2/trunk/Makefile Message-ID: <E1OnWQf-0002MY-DQ@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 10794 http://gar.svn.sourceforge.net/gar/?rev=10794&view=rev Author: dmichelsen Date: 2010-08-23 12:47:09 +0000 (Mon, 23 Aug 2010) Log Message: ----------- libssh2: Remove defunct patch Modified Paths: -------------- csw/mgar/pkg/libssh2/trunk/Makefile Modified: csw/mgar/pkg/libssh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libssh2/trunk/Makefile 2010-08-23 12:30:52 UTC (rev 10793) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2010-08-23 12:47:09 UTC (rev 10794) @@ -13,7 +13,7 @@ MASTER_SITES = http://www.libssh2.org/download/ SPKG_SOURCEURL = http://www.libssh2.org DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -# PATCHFILES = 0001-_libssh2_wait_socket-select-on-separate-fd_sets-for-.patch +PATCHFILES = 0001-_libssh2_wait_socket-select-on-separate-fd_sets-for-.patch # 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 dmichelsen at users.sourceforge.net Mon Aug 23 14:49:42 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 23 Aug 2010 12:49:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[10795] csw/mgar/pkg/libssh2/trunk/Makefile Message-ID: <E1OnWT8-00058K-L0@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10795 http://gar.svn.sourceforge.net/gar/?rev=10795&view=rev Author: dmichelsen Date: 2010-08-23 12:49:42 +0000 (Mon, 23 Aug 2010) Log Message: ----------- libssh2: Remove defunct patch Modified Paths: -------------- csw/mgar/pkg/libssh2/trunk/Makefile Modified: csw/mgar/pkg/libssh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libssh2/trunk/Makefile 2010-08-23 12:47:09 UTC (rev 10794) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2010-08-23 12:49:42 UTC (rev 10795) @@ -13,7 +13,6 @@ MASTER_SITES = http://www.libssh2.org/download/ SPKG_SOURCEURL = http://www.libssh2.org DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-_libssh2_wait_socket-select-on-separate-fd_sets-for-.patch # 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 dmichelsen at users.sourceforge.net Mon Aug 23 15:32:19 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 23 Aug 2010 13:32:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[10796] csw/mgar/pkg/adobereader/trunk Message-ID: <E1OnX8N-0004zW-3v@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10796 http://gar.svn.sourceforge.net/gar/?rev=10796&view=rev Author: dmichelsen Date: 2010-08-23 13:32:18 +0000 (Mon, 23 Aug 2010) Log Message: ----------- adobereader: Add sparc version Modified Paths: -------------- csw/mgar/pkg/adobereader/trunk/Makefile csw/mgar/pkg/adobereader/trunk/checksums Modified: csw/mgar/pkg/adobereader/trunk/Makefile =================================================================== --- csw/mgar/pkg/adobereader/trunk/Makefile 2010-08-23 12:49:42 UTC (rev 10795) +++ csw/mgar/pkg/adobereader/trunk/Makefile 2010-08-23 13:32:18 UTC (rev 10796) @@ -1,15 +1,20 @@ # $Id$ GARNAME = adobereader -GARVERSION = 9.3.4 +GARVERSION_sparc = 8.1.7 +GARVERSION_i386 = 9.3.4 +GARVERSION = $(GARVERSION_$(GARCH)) CATEGORIES = apps DESCRIPTION = Adobe Acrobat Reader define BLURB - Long description endef -MASTER_SITES = ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/$(GARVERSION)/enu/ -DISTFILES = AdbeRdr$(GARVERSION)-1_i486solaris_enu.tar.bz2 +MASTER_SITES = ftp://ftp.adobe.com/pub/adobe/reader/unix/$(shell echo $(GARVERSION_sparc) | cut -d. -f1).x/$(GARVERSION_sparc)/enu/ +MASTER_SITES += ftp://ftp.adobe.com/pub/adobe/reader/unix/$(shell echo $(GARVERSION_i386) | cut -d. -f1).x/$(GARVERSION_i386)/enu/ +DISTFILES_sparc = AdobeReader_enu-$(GARVERSION_sparc)-1.sparc.tar.bz2 +DISTFILES_i386 = AdbeRdr$(GARVERSION_i386)-1_i486solaris_enu.tar.bz2 +DISTFILES = $(DISTFILES_sparc) $(DISTFILES_i386) +NOEXTRACT = $(filter-out $(DISTFILES_$(GARCH)),$(DISTFILES)) DISTNAME = AdobeReader # File name regex to get notifications about upstream software releases @@ -39,3 +44,16 @@ ginstall -d $(DESTDIR)$(bindir) ln -s ../share/Adobe/Reader9/bin/acroread $(DESTDIR)$(bindir)/acroread @$(MAKECOOKIE) + +post-install-modulated: + cd $(DESTDIR); find . -type d -name "* *" | \ + while read F; do \ + N=`echo $$F | tr ' ' '_'`; \ + mv "$$F" $$N; \ + done; + cd $(DESTDIR); find . -type f -name "* *" | \ + while read F; do \ + N=`echo $$F | tr ' ' '_'`; \ + mv "$$F" $$N; \ + done; + @$(MAKECOOKIE) Modified: csw/mgar/pkg/adobereader/trunk/checksums =================================================================== --- csw/mgar/pkg/adobereader/trunk/checksums 2010-08-23 12:49:42 UTC (rev 10795) +++ csw/mgar/pkg/adobereader/trunk/checksums 2010-08-23 13:32:18 UTC (rev 10796) @@ -1 +1,2 @@ e9148b76a646d43aae30457dceeaee37 AdbeRdr9.3.4-1_i486solaris_enu.tar.bz2 +44aea1ffcf857b2ef8ed36a659b32390 AdobeReader_enu-8.1.7-1.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 Aug 23 16:32:57 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 23 Aug 2010 14:32:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[10797] csw/mgar/pkg/apr/trunk/Makefile Message-ID: <E1OnY53-0006op-Ld@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10797 http://gar.svn.sourceforge.net/gar/?rev=10797&view=rev Author: dmichelsen Date: 2010-08-23 14:32:57 +0000 (Mon, 23 Aug 2010) Log Message: ----------- apr: Add important comment about 64 bit Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2010-08-23 13:32:18 UTC (rev 10796) +++ csw/mgar/pkg/apr/trunk/Makefile 2010-08-23 14:32:57 UTC (rev 10797) @@ -41,5 +41,8 @@ export LD_LIBRARY_PATH EXTRA_TEST_EXPORTS = LD_LIBRARY_PATH +# TBD: This is dependent on 32/64, make sure to have both in separate pathes: +# /opt/csw/share/build-1/apr_rules.mk + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Aug 23 16:47:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 23 Aug 2010 14:47:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[10798] csw/mgar/pkg/curl/trunk Message-ID: <E1OnYJM-0007wm-5P@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 10798 http://gar.svn.sourceforge.net/gar/?rev=10798&view=rev Author: dmichelsen Date: 2010-08-23 14:47:43 +0000 (Mon, 23 Aug 2010) Log Message: ----------- curl: Update to 7.21.0 and add curlbuild.h inspiration Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-08-23 14:32:57 UTC (rev 10797) +++ csw/mgar/pkg/curl/trunk/Makefile 2010-08-23 14:47:43 UTC (rev 10798) @@ -1,5 +1,5 @@ GARNAME = curl -GARVERSION = 7.20.0 +GARVERSION = 7.21.0 CATEGORIES = net DESCRIPTION = Command line tool and library for client-side URL transfers. @@ -65,6 +65,8 @@ # isa-sparcv8-features-minimal isa-sparcv8-features-full isa-sparcv9-features-minimal isa-sparcv9-features-full +# TBD: Unify curlbuild.h with something like diff -D (sparcv9|amd64) curlbuild-32.h curlbuild-64.h > curlbuild.h +# Inspired from http://cvs.opensolaris.org/source/xref/sfw/usr/src/cmd/apr/apr-1.3/Makefile.sfw EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-32.h,p" EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-64.h,p" EXTRA_PAX_ARGS_32 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/libcurl-$(FEATURES).so.4.2.0,p" Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2010-08-23 14:32:57 UTC (rev 10797) +++ csw/mgar/pkg/curl/trunk/checksums 2010-08-23 14:47:43 UTC (rev 10798) @@ -1,4 +1,4 @@ -3dda78c4a808d9a779dc3a2ae81b47d8 curl-7.20.0.tar.bz2 +e1a2a773e93a39f3c04cab92c55bf197 curl-7.21.0.tar.bz2 f6e1a6d234d7f6811bb1c598ba9b7c8f curlbuild.h a09fcad6dfcd9636061dfab7598357be libcurl.so.2.0.2.i b46b41659b805013740eeb76e759af4b libcurl.so.2.0.2.s This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Aug 23 18:32:40 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 23 Aug 2010 16:32:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[10799] csw/mgar/pkg/opendbx/trunk/Makefile Message-ID: <E1OnZwu-0001WR-G4@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10799 http://gar.svn.sourceforge.net/gar/?rev=10799&view=rev Author: idogan23 Date: 2010-08-23 16:32:40 +0000 (Mon, 23 Aug 2010) Log Message: ----------- opendbx: switched to gcc3, adjusted CHECKPKG_OVERRIDES for sparc Modified Paths: -------------- csw/mgar/pkg/opendbx/trunk/Makefile Modified: csw/mgar/pkg/opendbx/trunk/Makefile =================================================================== --- csw/mgar/pkg/opendbx/trunk/Makefile 2010-08-23 14:47:43 UTC (rev 10798) +++ csw/mgar/pkg/opendbx/trunk/Makefile 2010-08-23 16:32:40 UTC (rev 10799) @@ -37,7 +37,7 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -GARCOMPILER = GCC4 +GARCOMPILER = GCC3 BUILD64 = 1 PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 @@ -64,27 +64,34 @@ CHECKPKG_OVERRIDES_CSWopendbxoracle += surplus-dependency|CSWopendbx CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/opendbx/libsqlite3backend.so.1.2.0 +CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/opendbx/libsqlite3backend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/opendbx/libsqlite3backend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/libopendbx.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/libopendbxplus.so.1.0.0 CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/libopendbx.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/libopendbxplus.so.1.0.0 +CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/libopendbx.so.1.2.0 +CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/libopendbxplus.so.1.0. +CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/libopendbxplus.so.1.0.0 CHECKPKG_OVERRIDES_CSWopendbxmysql += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/opendbx/libmysqlbackend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbxmysql += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/opendbx/libmysqlbackend.so.1.2.0 +CHECKPKG_OVERRIDES_CSWopendbxmysql += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/opendbx/libmysqlbackend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbxoracle += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/opendbx/liboraclebackend.so.1.2.0 +CHECKPKG_OVERRIDES_CSWopendbxoracle += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/opendbx/liboraclebackend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbxoracle += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/opendbx/liboraclebackend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbxoracle += missing-dependency|CSWorainstclient102 -RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc3corert +RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc3g++rt RUNTIME_DEP_PKGS_CSWopendbx += CSWggettextrt RUNTIME_DEP_PKGS_CSWopendbxdevel += CSWopendbx -RUNTIME_DEP_PKGS_CSWopendbxmysql += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWopendbxmysql += CSWgcc3corert RUNTIME_DEP_PKGS_CSWopendbxmysql += CSWzlib RUNTIME_DEP_PKGS_CSWopendbxmysql += CSWmysql5rt -RUNTIME_DEP_PKGS_CSWopendbxsqlite3 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWopendbxsqlite3 += CSWgcc3corert RUNTIME_DEP_PKGS_CSWopendbxsqlite3 += CSWsqlite3rt -RUNTIME_DEP_PKGS_CSWopendbxoracle += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWopendbxoracle += CSWgcc3corert RUNTIME_DEP_PKGS_CSWopendbxoracle += CSWopendbx +RUNTIME_DEP_PKGS_CSWopendbxoracle += CSWorainstclient102 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Aug 23 19:13:28 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 23 Aug 2010 17:13:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[10800] csw/mgar/pkg Message-ID: <E1OnaaO-0002Fy-2J@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10800 http://gar.svn.sourceforge.net/gar/?rev=10800&view=rev Author: bonivart Date: 2010-08-23 17:13:27 +0000 (Mon, 23 Aug 2010) Log Message: ----------- webmin: initial commit Added Paths: ----------- csw/mgar/pkg/webmin/ csw/mgar/pkg/webmin/branches/ csw/mgar/pkg/webmin/tags/ csw/mgar/pkg/webmin/trunk/ csw/mgar/pkg/webmin/trunk/Makefile csw/mgar/pkg/webmin/trunk/checksums csw/mgar/pkg/webmin/trunk/files/ Property changes on: csw/mgar/pkg/webmin/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/webmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/webmin/trunk/Makefile (rev 0) +++ csw/mgar/pkg/webmin/trunk/Makefile 2010-08-23 17:13:27 UTC (rev 10800) @@ -0,0 +1,24 @@ +GARNAME = webmin +GARVERSION = 1.510 +CATEGORIES = utils + +DESCRIPTION = Web-based interface for system administration +define BLURB + Web-based interface for system administration +endef + +MASTER_SITES = http://prdownloads.sourceforge.net/webadmin/ +DISTFILES = $(GARNAME)-$(GARVERSION)-minimal.tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +LICENSE = LICENSE + +ARCHALL = 1 + +SPKG_SOURCEURL = http://www.webmin.com + +RUNTIME_DEP_PKGS += CSWperl CSWpmnetssleay + +include gar/category.mk Added: csw/mgar/pkg/webmin/trunk/checksums =================================================================== --- csw/mgar/pkg/webmin/trunk/checksums (rev 0) +++ csw/mgar/pkg/webmin/trunk/checksums 2010-08-23 17:13:27 UTC (rev 10800) @@ -0,0 +1 @@ +c0ea92dfc502bebcceb6415ab6dc487d webmin-1.510-minimal.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Aug 23 19:40:20 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 23 Aug 2010 17:40:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[10801] csw/mgar/pkg/opendbx/trunk/Makefile Message-ID: <E1Onb0O-0008OH-Ec@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 10801 http://gar.svn.sourceforge.net/gar/?rev=10801&view=rev Author: idogan23 Date: 2010-08-23 17:40:20 +0000 (Mon, 23 Aug 2010) Log Message: ----------- opendbx: added extra ISAs Modified Paths: -------------- csw/mgar/pkg/opendbx/trunk/Makefile Modified: csw/mgar/pkg/opendbx/trunk/Makefile =================================================================== --- csw/mgar/pkg/opendbx/trunk/Makefile 2010-08-23 17:13:27 UTC (rev 10800) +++ csw/mgar/pkg/opendbx/trunk/Makefile 2010-08-23 17:40:20 UTC (rev 10801) @@ -39,6 +39,10 @@ GARCOMPILER = GCC3 BUILD64 = 1 + +EXTRA_BUILD_ISAS_i386 = pentium_pro +EXTRA_BUILD_ISAS_sparc = sparcv8plus + PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 EXTRA_INC = $(prefix)/mysql5/include/mysql $(prefix)/instantclient_10_2/sdk/include @@ -66,6 +70,7 @@ CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/opendbx/libsqlite3backend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/opendbx/libsqlite3backend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/opendbx/libsqlite3backend.so.1.2.0 +CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/sparcv8plus/opendbx/libsqlite3backend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/libopendbx.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/libopendbxplus.so.1.0.0 CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/libopendbx.so.1.2.0 @@ -73,13 +78,17 @@ CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/libopendbx.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/libopendbxplus.so.1.0. CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/libopendbxplus.so.1.0.0 +CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/sparcv8plus/libopendbx.so.1.2.0 +CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/sparcv8plus/libopendbxplus.so.1.0.0 CHECKPKG_OVERRIDES_CSWopendbxmysql += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/opendbx/libmysqlbackend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbxmysql += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/opendbx/libmysqlbackend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbxmysql += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/opendbx/libmysqlbackend.so.1.2.0 +CHECKPKG_OVERRIDES_CSWopendbxmysql += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/sparcv8plus/opendbx/libmysqlbackend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbxoracle += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/opendbx/liboraclebackend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbxoracle += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/opendbx/liboraclebackend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbxoracle += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/opendbx/liboraclebackend.so.1.2.0 CHECKPKG_OVERRIDES_CSWopendbxoracle += missing-dependency|CSWorainstclient102 +CHECKPKG_OVERRIDES_CSWopendbxoracle += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/sparcv8plus/opendbx/liboraclebackend.so.1.2.0 RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc3corert RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc3g++rt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Tue Aug 24 00:37:01 2010 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 23 Aug 2010 22:37:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[10802] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: <E1OnfdV-00056s-3y@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10802 http://gar.svn.sourceforge.net/gar/?rev=10802&view=rev Author: theferret Date: 2010-08-23 22:37:00 +0000 (Mon, 23 Aug 2010) Log Message: ----------- cswclassutils: Added support for CSWDESTDIR to cswpreserveconf Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpreserveconf Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2010-08-23 17:40:20 UTC (rev 10801) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswpreserveconf 2010-08-23 22:37:00 UTC (rev 10802) @@ -10,12 +10,30 @@ # May be used/copied freely # +# extra checks and warnings to help people run this manually +if [ "$PKG" = "" ] ; then + echo ERROR: PKG env variable must be set + exit 1 +fi while read src dest ; do cp $src $dest - + if [ $? -ne 0 ] ; then + # It's technically "okay" if the copy fails in some situations. + # For example, if we have shared root and the file is already + # there. Except I dont think we would be run in that case + # anyway. erm.. + if [ ! -f $src ] ; then + echo ERROR: src $src does not exist + exit 1 + fi + fi # reminder: $dest will already have $PKG_INSTALL_ROOT prepended for us + # We always copy to $dest. However, the purpose of this script + # is to make a second copy of this "sample" config, + # to the "real" location + case $dest in *.csw) confdest=`echo $dest |sed 's/.csw$//'` @@ -28,10 +46,17 @@ exit 1 ;; esac + preservedir=$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG confbasename=`basename $confdest` preservedconf=$preservedir/$confbasename + overridedir=`sed -n 's/.*CSWDESTDIR=\([^ ]*\).*/\1/p' $src` + if [ "$overridedir" != "" ] ; then + # basename will not change so dont need to reset that + confdest=$PKG_INSTALL_ROOT/$overridedir/$basename + fi + if [ -f $preservedconf ] ; then echo Restoring $preservedconf cp -p $preservedconf $confdest @@ -55,7 +80,16 @@ chown $user:$group $confdest fi fi + copied="done" done +if [ "$copied" = "" ] ; then + echo WARNING: we were called, but no filenames were given. + echo "You may have to manually run this script ( $0 )" + echo "and pass it the name of the config files in the package." + echo "Or, copy over the appropriate config files by hand yourself," + echo "to their proper destinations . +fi + echo "" Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpreserveconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpreserveconf 2010-08-23 17:40:20 UTC (rev 10801) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswpreserveconf 2010-08-23 22:37:00 UTC (rev 10802) @@ -4,6 +4,12 @@ # May be used/copied freely # +# extra checks and warnings to help people run this manually +if [ "$PKG" = "" ] ; then + echo ERROR: PKG env variable must be set + exit 1 +fi + while read dest ; do # reminder: $dest will already have $PKG_INSTALL_ROOT prepended for us @@ -24,6 +30,12 @@ confbasename=`basename $confdest` preservedconf=$preservedir/$confbasename + overridedir=`sed -n 's/.*CSWDESTDIR=\([^ ]*\).*/\1/p' $src` + if [ "$overridedir" != "" ] ; then + # basename will not change so dont need to reset that + confdest=$PKG_INSTALL_ROOT/$overridedir/$basename + fi + if [ -f $confdest ] ; then if cmp $confdest $dest >/dev/null ; then echo $confdest is identical to sample config file $dest This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Aug 24 01:56:56 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 23 Aug 2010 23:56:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[10803] csw/mgar/pkg/cswclassutils/trunk Message-ID: <E1Ongsq-0001ff-O6@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10803 http://gar.svn.sourceforge.net/gar/?rev=10803&view=rev Author: bdwalton Date: 2010-08-23 23:56:56 +0000 (Mon, 23 Aug 2010) Log Message: ----------- cswclassutils: update makesums (preserveconf changes); bump version Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-08-23 22:37:00 UTC (rev 10802) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-08-23 23:56:56 UTC (rev 10803) @@ -1,7 +1,7 @@ # $HeadURL$ GARNAME = cswclassutils -GARVERSION = 1.39 +GARVERSION = 1.40 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2010-08-23 22:37:00 UTC (rev 10802) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2010-08-23 23:56:56 UTC (rev 10803) @@ -6,7 +6,7 @@ daa26170a5c468775e2687fe15881b40 CSWcswclassutils.i.cswinitsmf a667515489aafc81d41159765faf698f CSWcswclassutils.i.cswmigrateconf 8ab721535d43dcef702538d394e7a2ce CSWcswclassutils.i.cswpostmsg -0fc6128391af4c9aebf72b84755532cb CSWcswclassutils.i.cswpreserveconf +e5d23f8e6b81728205604d74ca40ad19 CSWcswclassutils.i.cswpreserveconf 9018419febe06c12e89d66cc76e7261f CSWcswclassutils.i.cswpycompile 4f816acb06e8f95add6faf8607859da2 CSWcswclassutils.i.cswtexinfo e906a50bc2d82e341f78d582f32ecb88 CSWcswclassutils.i.cswusergroup @@ -17,7 +17,7 @@ 397c444e9da4c6281c657822a4963cb8 CSWcswclassutils.r.cswinitsmf f7a2a10bbf0f88c1909a31141e6d83ce CSWcswclassutils.r.cswmigrateconf 76a18fed9174724f866ede53edda41fc CSWcswclassutils.r.cswpostmsg -96453922952c92c6c5a024e54ed8525f CSWcswclassutils.r.cswpreserveconf +936abe5afed3bac7dff49366bf92e02d CSWcswclassutils.r.cswpreserveconf 02326250b63d3c75c45a8ff81768e923 CSWcswclassutils.r.cswpycompile ed76f47b045b000ab78154a90cf90ed4 CSWcswclassutils.r.cswtexinfo 752c74048ee18ae3a3c2c7b1d15e40f2 CSWcswclassutils.r.cswusergroup 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 Tue Aug 24 06:41:45 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 24 Aug 2010 04:41:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[10804] csw/mgar/pkg/libmikmod/trunk Message-ID: <E1OnlKT-0004ff-Fz@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10804 http://gar.svn.sourceforge.net/gar/?rev=10804&view=rev Author: jake_goerzen Date: 2010-08-24 04:41:45 +0000 (Tue, 24 Aug 2010) Log Message: ----------- downgrade to 3.1.11 for compatibility Modified Paths: -------------- csw/mgar/pkg/libmikmod/trunk/Makefile csw/mgar/pkg/libmikmod/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libmikmod/trunk/files/0001-fix-compiling-on-Solaris.patch Modified: csw/mgar/pkg/libmikmod/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmikmod/trunk/Makefile 2010-08-23 23:56:56 UTC (rev 10803) +++ csw/mgar/pkg/libmikmod/trunk/Makefile 2010-08-24 04:41:45 UTC (rev 10804) @@ -1,16 +1,18 @@ GARNAME = libmikmod -GARVERSION = 3.2.0 -RELEASE = beta2 -DISTVERSION = $(GARVERSION)-$(RELEASE) +GARVERSION = 3.1.11 +DISTVERSION = $(GARVERSION) DISTNAME = $(GARNAME)-$(DISTVERSION) CATEGORIES = lib -DESCRIPTION = library for MOD audio files and other types +DESCRIPTION = Library for MOD audio files and other types define BLURB - library supporting many formats, including mod, s3m, it, and xm. Originally a player for MS-DOS, + Library supporting many formats, including mod, s3m, it, and xm. Originally a player for MS-DOS, endef MASTER_SITES = http://mikmod.raphnet.net/files/ -DISTFILES = $(GARNAME)-$(GARVERSION)-$(RELEASE).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = libmikmod-3.1.11-a.diff +PATCHFILES += 0001-fix-compiling-on-Solaris.patch +LICENSE = COPYING.LIB # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/libmikmod/trunk/checksums =================================================================== --- csw/mgar/pkg/libmikmod/trunk/checksums 2010-08-23 23:56:56 UTC (rev 10803) +++ csw/mgar/pkg/libmikmod/trunk/checksums 2010-08-24 04:41:45 UTC (rev 10804) @@ -1 +1,3 @@ -19fc0879aebd1610813a23bd84726362 libmikmod-3.2.0-beta2.tar.gz +622ea40e54c8fbd371eb9d8943f17b37 0001-fix-compiling-on-Solaris.patch +5e56be5a32eecf3cfa195379a5ecb0ef libmikmod-3.1.11-a.diff +705106da305e8de191549f1e7393185c libmikmod-3.1.11.tar.gz Added: csw/mgar/pkg/libmikmod/trunk/files/0001-fix-compiling-on-Solaris.patch =================================================================== --- csw/mgar/pkg/libmikmod/trunk/files/0001-fix-compiling-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/libmikmod/trunk/files/0001-fix-compiling-on-Solaris.patch 2010-08-24 04:41:45 UTC (rev 10804) @@ -0,0 +1,29 @@ +From 3f19c6f14fe8ea820abbc632e547d6301241aba7 Mon Sep 17 00:00:00 2001 +From: Jake Goerzen <jgoerzen at opencsw.org> +Date: Tue, 24 Aug 2010 05:34:17 +0200 +Subject: [PATCH] fix compiling on Solaris + +--- + drivers/drv_sun.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/drivers/drv_sun.c b/drivers/drv_sun.c +index cc99488..11b824c 100644 +--- a/drivers/drv_sun.c ++++ b/drivers/drv_sun.c +@@ -85,6 +85,12 @@ extern int fputs(const char *, FILE *); + #define SOUNDDEVICE "/dev/audio" + #endif + ++/* Solaris doesn't have these */ ++#ifdef SOLARIS ++#define AUDIO_ENCODING_SLINEAR AUDIO_ENCODING_LINEAR ++#define AUDIO_ENCODING_ULINEAR AUDIO_ENCODING_LINEAR8 ++#endif ++ + /* Compatibility defines, for old *BSD or SunOS systems */ + #ifndef AUDIO_ENCODING_PCM16 + #define AUDIO_ENCODING_PCM16 AUDIO_ENCODING_LINEAR +-- +1.7.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Aug 25 11:36:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Aug 2010 09:36:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[10805] csw/mgar/pkg/cpan Message-ID: <E1OoCPD-0008BW-ES@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 10805 http://gar.svn.sourceforge.net/gar/?rev=10805&view=rev Author: dmichelsen Date: 2010-08-25 09:36:27 +0000 (Wed, 25 Aug 2010) Log Message: ----------- cpan/JIRA-Client: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/JIRA-Client/ csw/mgar/pkg/cpan/JIRA-Client/branches/ csw/mgar/pkg/cpan/JIRA-Client/tags/ csw/mgar/pkg/cpan/JIRA-Client/trunk/ csw/mgar/pkg/cpan/JIRA-Client/trunk/Makefile csw/mgar/pkg/cpan/JIRA-Client/trunk/checksums csw/mgar/pkg/cpan/JIRA-Client/trunk/files/ csw/mgar/pkg/cpan/JIRA-Client/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/JIRA-Client/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/JIRA-Client/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/JIRA-Client/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/JIRA-Client/trunk/Makefile 2010-08-25 09:36:27 UTC (rev 10805) @@ -0,0 +1,20 @@ +GARNAME = JIRA-Client +GARVERSION = 0.24 +CATEGORIES = cpan +AUTHOR = GNUSTAVO + +DESCRIPTION = An extended interface to JIRA's SOAP API +define BLURB +endef + +MASTER_SITES = $(addsuffix modules/,$(CPAN_MIRRORS)) +DISTFILES = COPYING + +PACKAGES = CSWpmjiraclient +CATALOGNAME = pm_jiraclient + +DEP_PKGS = CSWpmsoaplite + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/JIRA-Client/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/JIRA-Client/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/JIRA-Client/trunk/checksums 2010-08-25 09:36:27 UTC (rev 10805) @@ -0,0 +1,2 @@ +6f599fbedbdd4bb66be527a87bde83e3 COPYING +98aaafac5af48eaec8eb097f02a8975f JIRA-Client-0.24.tar.gz Added: csw/mgar/pkg/cpan/JIRA-Client/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/JIRA-Client/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/JIRA-Client/trunk/files/COPYING 2010-08-25 09:36:27 UTC (rev 10805) @@ -0,0 +1,7 @@ +COPYRIGHT AND LICENCE + +Copyright (C) 2009 CPqD (http://www.cpqd.com.br/) + +This program is free software; you can redistribute it and/or modify it +under the same terms as Perl itself. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Aug 25 15:39:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Aug 2010 13:39:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[10806] csw/mgar/gar/v2/gar.pkg.mk Message-ID: <E1OoGCM-00007i-VN@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 10806 http://gar.svn.sourceforge.net/gar/?rev=10806&view=rev Author: dmichelsen Date: 2010-08-25 13:39:26 +0000 (Wed, 25 Aug 2010) Log Message: ----------- mGAR v2: Add OPENCSW_BUNDLE to pkginfo 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-08-25 09:36:27 UTC (rev 10805) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-08-25 13:39:26 UTC (rev 10806) @@ -78,6 +78,8 @@ _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) +BUNDLE ?= $(GARNAME) + # pkgname - Get the name of a package from a gspec-name or package-name # # This is a safety function. In sane settings it should return the name @@ -570,6 +572,7 @@ echo "OPENCSW_CATALOGNAME=$(call catalogname,$*)"; \ echo "OPENCSW_MODE64=$(call mode64,$*)"; \ echo "OPENCSW_REPOSITORY=$(call _URL)@$(call _REVISION)"; \ + echo "OPENCSW_BUNDLE=$(BUNDLE)"; \ $(_CATEGORY_PKGINFO) \ ) >$@ 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 Aug 25 22:17:06 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 25 Aug 2010 20:17:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[10807] csw/mgar/pkg/gettext/trunk Message-ID: <E1OoMPC-00087C-7p@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 10807 http://gar.svn.sourceforge.net/gar/?rev=10807&view=rev Author: bdwalton Date: 2010-08-25 20:17:05 +0000 (Wed, 25 Aug 2010) Log Message: ----------- gettext: version bump, makesums Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile csw/mgar/pkg/gettext/trunk/checksums Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2010-08-25 13:39:26 UTC (rev 10806) +++ csw/mgar/pkg/gettext/trunk/Makefile 2010-08-25 20:17:05 UTC (rev 10807) @@ -1,5 +1,5 @@ GARNAME = gettext -GARVERSION = 0.17 +GARVERSION = 0.18.1.1 CATEGORIES = lib DESCRIPTION = GNU locale utilities Modified: csw/mgar/pkg/gettext/trunk/checksums =================================================================== --- csw/mgar/pkg/gettext/trunk/checksums 2010-08-25 13:39:26 UTC (rev 10806) +++ csw/mgar/pkg/gettext/trunk/checksums 2010-08-25 20:17:05 UTC (rev 10807) @@ -1,8 +1,8 @@ -58a2bc6d39c0ba57823034d55d65d606 download/gettext-0.17.tar.gz -d44a9a6ec0952bad7ad07026ccb42a10 download/libgettextlib-0.14.1.so.i -ff0219d47dbc11034b55872172488e01 download/libgettextlib-0.14.1.so.s -80123ce62a2ef58afb3f6f07a12bd1c1 download/libintl.so.2.i -3ab768083f6ecc5cada151e49be21aa0 download/libintl.so.2.s -ceb5de2326a4726d3710fe1512b84592 download/libintl.so.3.i -88db7322e263a00f24269a7f364fdc2d download/libintl.so.3.s -710effbaef82fd7db1d807e5aa46154a download/test-wcwidth.patch +3dd55b952826d2b32f51308f2f91aa89 gettext-0.18.1.1.tar.gz +d44a9a6ec0952bad7ad07026ccb42a10 libgettextlib-0.14.1.so.i +ff0219d47dbc11034b55872172488e01 libgettextlib-0.14.1.so.s +80123ce62a2ef58afb3f6f07a12bd1c1 libintl.so.2.i +3ab768083f6ecc5cada151e49be21aa0 libintl.so.2.s +ceb5de2326a4726d3710fe1512b84592 libintl.so.3.i +88db7322e263a00f24269a7f364fdc2d libintl.so.3.s +710effbaef82fd7db1d807e5aa46154a test-wcwidth.patch 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 Wed Aug 25 23:19:10 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 25 Aug 2010 21:19:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[10808] csw/mgar/pkg/xmms/trunk/Makefile Message-ID: <E1OoNNF-00013t-W8@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 10808 http://gar.svn.sourceforge.net/gar/?rev=10808&view=rev Author: jake_goerzen Date: 2010-08-25 21:19:09 +0000 (Wed, 25 Aug 2010) Log Message: ----------- removing dependencies CSWlibx11 CSWlibice CSWlibsm CSWlibxext see project x11-reloaded Modified Paths: -------------- csw/mgar/pkg/xmms/trunk/Makefile Modified: csw/mgar/pkg/xmms/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmms/trunk/Makefile 2010-08-25 20:17:05 UTC (rev 10807) +++ csw/mgar/pkg/xmms/trunk/Makefile 2010-08-25 21:19:09 UTC (rev 10808) @@ -27,19 +27,15 @@ # No test suite TEST_SCRIPTS = -DEP_PKGS_CSWxmms += CSWesound -DEP_PKGS_CSWxmms += CSWmesa -DEP_PKGS_CSWxmms += CSWlibx11 -DEP_PKGS_CSWxmms += CSWlibice -DEP_PKGS_CSWxmms += CSWlibsm -DEP_PKGS_CSWxmms += CSWlibogg -DEP_PKGS_CSWxmms += CSWvorbis -DEP_PKGS_CSWxmms += CSWiconv -DEP_PKGS_CSWxmms += CSWlibxext -DEP_PKGS_CSWxmms += CSWggettextrt -DEP_PKGS_CSWxmms += CSWglib -DEP_PKGS_CSWxmms += CSWzlib -DEP_PKGS_CSWxmms += CSWgtk -DEP_PKGS_CSWxmms += CSWmikmod +RUNTIME_DEP_PKGS_CSWxmms += CSWglib +RUNTIME_DEP_PKGS_CSWxmms += CSWmesa +RUNTIME_DEP_PKGS_CSWxmms += CSWesound +RUNTIME_DEP_PKGS_CSWxmms += CSWvorbis +RUNTIME_DEP_PKGS_CSWxmms += CSWlibogg +RUNTIME_DEP_PKGS_CSWxmms += CSWmikmod +RUNTIME_DEP_PKGS_CSWxmms += CSWiconv +RUNTIME_DEP_PKGS_CSWxmms += CSWgtk +RUNTIME_DEP_PKGS_CSWxmms += CSWzlib +RUNTIME_DEP_PKGS_CSWxmms += CSWggettextrt include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gmarler at users.sourceforge.net Thu Aug 26 02:14:33 2010 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Thu, 26 Aug 2010 00:14:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[10809] csw/mgar/pkg/findutils/trunk/Makefile Message-ID: <E1OoQ6z-0001Zv-St@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10809 http://gar.svn.sourceforge.net/gar/?rev=10809&view=rev Author: gmarler Date: 2010-08-26 00:14:33 +0000 (Thu, 26 Aug 2010) Log Message: ----------- Eliminate testing for the moment add extra ISA for i386 Modified Paths: -------------- csw/mgar/pkg/findutils/trunk/Makefile Modified: csw/mgar/pkg/findutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/findutils/trunk/Makefile 2010-08-25 21:19:09 UTC (rev 10808) +++ csw/mgar/pkg/findutils/trunk/Makefile 2010-08-26 00:14:33 UTC (rev 10809) @@ -30,6 +30,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g CONFIGURE_ARGS += --localstatedir=/var/opt/csw +CONFIGURE_ARGS += --without-included-regex # Use OPT_FLAGS_SOS instead instead of CFLAGS_EXTRA, because we want -fast # to be first, and to have portions of it overridden by the ISA specific @@ -38,9 +39,9 @@ OPT_FLAGS_SOS = -fast -xnolibmopt EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis -## EXTRA_BUILD_ISAS_i386 = ??? +EXTRA_BUILD_ISAS_i386 = pentium_pro -# CHECKPKG_OVERRIDES_CSWfindutils += surplus-dependency|CSWiconv +CHECKPKG_OVERRIDES_CSWfindutils += surplus-dependency|CSWiconv # Test target requires GNU diff TEST_TARGET = check @@ -61,7 +62,7 @@ # FAIL: parent.old-O2, /home/gmarler/svnwork/findutils/trunk/work/solaris9-sparc/build-isa-sparcv8/findutils-4.4.2/find/testsuite/../oldfind: .: Permission denied # FAIL: parent.old-O3, /home/gmarler/svnwork/findutils/trunk/work/solaris9-sparc/build-isa-sparcv8/findutils-4.4.2/find/testsuite/../oldfind: .: Permission denied -# Skipping until the above are rectified +# Skipping until the above are rectified - if they ever are SKIPTEST = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gmarler at users.sourceforge.net Thu Aug 26 04:03:56 2010 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Thu, 26 Aug 2010 02:03:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[10810] csw/mgar/pkg/findutils/trunk/Makefile Message-ID: <E1OoRoq-0000Wy-4Y@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 10810 http://gar.svn.sourceforge.net/gar/?rev=10810&view=rev Author: gmarler Date: 2010-08-26 02:03:55 +0000 (Thu, 26 Aug 2010) Log Message: ----------- eliminate use of --without-included-regex configuration flag Modified Paths: -------------- csw/mgar/pkg/findutils/trunk/Makefile Modified: csw/mgar/pkg/findutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/findutils/trunk/Makefile 2010-08-26 00:14:33 UTC (rev 10809) +++ csw/mgar/pkg/findutils/trunk/Makefile 2010-08-26 02:03:55 UTC (rev 10810) @@ -30,7 +30,6 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g CONFIGURE_ARGS += --localstatedir=/var/opt/csw -CONFIGURE_ARGS += --without-included-regex # Use OPT_FLAGS_SOS instead instead of CFLAGS_EXTRA, because we want -fast # to be first, and to have portions of it overridden by the ISA specific 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 Aug 26 08:15:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 26 Aug 2010 06:15:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[10811] csw/mgar/pkg/ufraw/trunk Message-ID: <E1OoVkV-0006Wi-Sv@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 10811 http://gar.svn.sourceforge.net/gar/?rev=10811&view=rev Author: wahwah Date: 2010-08-26 06:15:43 +0000 (Thu, 26 Aug 2010) Log Message: ----------- ufraw: configure: error: Package requirements (gtkimageview >= 1.6) were not met: No package 'gtkimageview' found Modified Paths: -------------- csw/mgar/pkg/ufraw/trunk/Makefile csw/mgar/pkg/ufraw/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/ufraw/trunk/Makefile Modified: csw/mgar/pkg/ufraw/trunk/Makefile =================================================================== --- csw/mgar/pkg/ufraw/trunk/Makefile 2010-08-26 02:03:55 UTC (rev 10810) +++ csw/mgar/pkg/ufraw/trunk/Makefile 2010-08-26 06:15:43 UTC (rev 10811) @@ -1,5 +1,7 @@ +# $Id$ + GARNAME = ufraw -GARVERSION = 0.16 +GARVERSION = 0.17 CATEGORIES = apps DESCRIPTION = A tool for reading and manipulating raw images from digital cameras Property changes on: csw/mgar/pkg/ufraw/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/ufraw/trunk/checksums =================================================================== --- csw/mgar/pkg/ufraw/trunk/checksums 2010-08-26 02:03:55 UTC (rev 10810) +++ csw/mgar/pkg/ufraw/trunk/checksums 2010-08-26 06:15:43 UTC (rev 10811) @@ -1 +1 @@ -61e100e42f17e3a7fcfae64506eebd14 ufraw-0.16.tar.gz +5e2c2b4adaea1f6d03eac66e11747fc6 ufraw-0.17.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Aug 26 09:08:15 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 26 Aug 2010 07:08:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[10812] csw/mgar/pkg Message-ID: <E1OoWZL-0003jA-AT@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 10812 http://gar.svn.sourceforge.net/gar/?rev=10812&view=rev Author: wahwah Date: 2010-08-26 07:08:15 +0000 (Thu, 26 Aug 2010) Log Message: ----------- debian-vote: Initial commit Modified Paths: -------------- csw/mgar/pkg/debian-vote/trunk/Makefile csw/mgar/pkg/debian-vote/trunk/checksums Added Paths: ----------- csw/mgar/pkg/debian-vote/ Modified: csw/mgar/pkg/debian-vote/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-08-25 13:39:26 UTC (rev 10806) +++ csw/mgar/pkg/debian-vote/trunk/Makefile 2010-08-26 07:08:15 UTC (rev 10812) @@ -2,184 +2,19 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = <please fill in> -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = debian-vote +GARVERSION = 0.8 +PACKAGES = CSWdebian-vote +CATALOGNAME_CSWdebian-vote = debian_vote +CATEGORIES = apps +DESCRIPTION = Condorcet voting algorithm define BLURB - <please fill in> endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/<packagename>. -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://seehuhn.de/pages/vote +MASTER_SITES = http://seehuhn.de/media/programs/ 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 <pkgname>. -## 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 = <file containing an entry for /etc/services> -## INETDCONF = <file containing an inetd.conf formatted entry> -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +ARCHALL_CSWdebian-vote = 1 +include gar/category.mk Modified: csw/mgar/pkg/debian-vote/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-08-25 13:39:26 UTC (rev 10806) +++ csw/mgar/pkg/debian-vote/trunk/checksums 2010-08-26 07:08:15 UTC (rev 10812) @@ -0,0 +1 @@ +216282debefb9358b008777280fe3094 debian-vote-0.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Aug 26 11:24:37 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 26 Aug 2010 09:24:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[10813] csw/mgar/pkg Message-ID: <E1OoYhJ-0003J5-MH@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 10813 http://gar.svn.sourceforge.net/gar/?rev=10813&view=rev Author: wahwah Date: 2010-08-26 09:24:37 +0000 (Thu, 26 Aug 2010) Log Message: ----------- python-pexpect: Initial commit Modified Paths: -------------- csw/mgar/pkg/python-pexpect/trunk/Makefile csw/mgar/pkg/python-pexpect/trunk/checksums Added Paths: ----------- csw/mgar/pkg/python-pexpect/ Modified: csw/mgar/pkg/python-pexpect/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-08-25 13:39:26 UTC (rev 10806) +++ csw/mgar/pkg/python-pexpect/trunk/Makefile 2010-08-26 09:24:37 UTC (rev 10813) @@ -2,184 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = <please fill in> -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = pexpect +GARVERSION = 2.3 +PACKAGES = CSWpy-pexpect +CATALOGNAME_CSWpy-pexpect = py_pexpect +ARCHALL_CSWpy-pexpect = 1 +CATEGORIES = python +DESCRIPTION = A module for spawning child processes and interacting with them define BLURB - <please fill in> endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/<packagename>. -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.noah.org/wiki/Pexpect +MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i <pkgname>. -## 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 = <file containing an entry for /etc/services> -## INETDCONF = <file containing an inetd.conf formatted entry> -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +LICENSE = LICENSE +TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/python-pexpect/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-08-25 13:39:26 UTC (rev 10806) +++ csw/mgar/pkg/python-pexpect/trunk/checksums 2010-08-26 09:24:37 UTC (rev 10813) @@ -0,0 +1 @@ +bf107cf54e67bc6dec5bea1f3e6a65c3 pexpect-2.3.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 Aug 26 17:03:05 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 26 Aug 2010 15:03:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[10814] csw/mgar/pkg Message-ID: <E1Oodyr-0000bP-V5@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 10814 http://gar.svn.sourceforge.net/gar/?rev=10814&view=rev Author: bonivart Date: 2010-08-26 15:03:05 +0000 (Thu, 26 Aug 2010) Log Message: ----------- clamavsigs: initial commit Added Paths: ----------- csw/mgar/pkg/clamavsigs/ csw/mgar/pkg/clamavsigs/branches/ csw/mgar/pkg/clamavsigs/tags/ csw/mgar/pkg/clamavsigs/trunk/ csw/mgar/pkg/clamavsigs/trunk/Makefile csw/mgar/pkg/clamavsigs/trunk/checksums csw/mgar/pkg/clamavsigs/trunk/files/ csw/mgar/pkg/clamavsigs/trunk/files/0001-use-ksh-instead-of-sh-on-solaris.patch csw/mgar/pkg/clamavsigs/trunk/files/README.CSW csw/mgar/pkg/clamavsigs/trunk/files/crontab.root Property changes on: csw/mgar/pkg/clamavsigs/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/clamavsigs/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamavsigs/trunk/Makefile (rev 0) +++ csw/mgar/pkg/clamavsigs/trunk/Makefile 2010-08-26 15:03:05 UTC (rev 10814) @@ -0,0 +1,54 @@ +GARNAME = clamavsigs +GARVERSION = 3.7.1 +DISTNAME = clamav-unofficial-sigs-$(GARVERSION) +WORKSRC = $(WORKDIR)/$(DISTNAME) +CATEGORIES = utils + +DESCRIPTION = ClamAV Unofficial Signature Databases Update Script +define BLURB + ClamAV Unofficial Signature Databases Update Script +endef + +MASTER_SITES = http://www.inetmsg.com/pub/ +DISTFILES = clamav-unofficial-sigs-$(GARVERSION).tar.gz +PATCHFILES = 0001-use-ksh-instead-of-sh-on-solaris.patch + +LICENSE = LICENSE +ARCHALL = 1 + +#RUNTIME_DEP_PKGS = CSWgnupg CSWrsync CSWsocat +RUNTIME_DEP_PKGS = CSWgnupg CSWrsync + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWrsync +CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWgnupg +CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWsocat + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +SAMPLECONF = /etc/opt/csw/clamav-unofficial-sigs.conf +POSTMSG = /opt/csw/share/doc/clamavsigs/README.CSW + +include gar/category.mk + +DOCLIST = CHANGELOG INSTALL README + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @echo worksrc: $(WORKSRC) + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/CSWclamavsigs/crontabs + @ginstall -m 644 $(WORKSRC)/clamav-unofficial-sigs.conf $(DESTDIR)/etc/opt/csw + @ginstall -m 644 $(FILEDIR)/crontab.root $(DESTDIR)/etc/opt/csw/CSWclamavsigs/crontabs/root + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) + @$(foreach DOC,$(DOCLIST),cp $(WORKSRC)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) + @ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 755 -d $(DESTDIR)$(bindir) + @ginstall -m 755 $(WORKSRC)/clamav-unofficial-sigs.sh $(DESTDIR)$(bindir) + @ginstall -m 755 -d $(DESTDIR)$(mandir)/man8 + @ginstall -m 755 $(WORKSRC)/clamav-unofficial-sigs.8 $(DESTDIR)$(mandir)/man8 + @$(MAKECOOKIE) Added: csw/mgar/pkg/clamavsigs/trunk/checksums =================================================================== --- csw/mgar/pkg/clamavsigs/trunk/checksums (rev 0) +++ csw/mgar/pkg/clamavsigs/trunk/checksums 2010-08-26 15:03:05 UTC (rev 10814) @@ -0,0 +1,2 @@ +94eb4d03fefa038bc05c404e631464f4 0001-use-ksh-instead-of-sh-on-solaris.patch +c00f38cd0ff51672e3cbb638aec8d124 clamav-unofficial-sigs-3.7.1.tar.gz Added: csw/mgar/pkg/clamavsigs/trunk/files/0001-use-ksh-instead-of-sh-on-solaris.patch =================================================================== --- csw/mgar/pkg/clamavsigs/trunk/files/0001-use-ksh-instead-of-sh-on-solaris.patch (rev 0) +++ csw/mgar/pkg/clamavsigs/trunk/files/0001-use-ksh-instead-of-sh-on-solaris.patch 2010-08-26 15:03:05 UTC (rev 10814) @@ -0,0 +1,22 @@ +From 94a7fce468968cbf1d23619408c72ec57f73404c Mon Sep 17 00:00:00 2001 +From: Peter Bonivart <bonivart at opencsw.org> +Date: Thu, 26 Aug 2010 16:25:41 +0200 +Subject: [PATCH] use-ksh-instead-of-sh-on-solaris + +--- + clamav-unofficial-sigs.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh +index fa801f4..9d4aafc 100755 +--- a/clamav-unofficial-sigs.sh ++++ b/clamav-unofficial-sigs.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/ksh + + # This script freely provided by Bill Landry (bill at inetmsg.com). + # Comments, suggestions, and recommendations for improving this +-- +1.7.1 + Added: csw/mgar/pkg/clamavsigs/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/clamavsigs/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/clamavsigs/trunk/files/README.CSW 2010-08-26 15:03:05 UTC (rev 10814) @@ -0,0 +1,11 @@ +README.CSW +========== +- You can find signature databases to download at http://sanesecurity.co.uk. + +- You can adjust the time of the download to ease the load on the servers. + Please do not use even hours since so many others already do, use a random + minute every hour instead. DO NOT DOWNLOAD MORE THAN ONCE EVERY HOUR! + +- You should probably set up log rotation. + +2010-08-26/Peter Bonivart, OpenCSW Added: csw/mgar/pkg/clamavsigs/trunk/files/crontab.root =================================================================== --- csw/mgar/pkg/clamavsigs/trunk/files/crontab.root (rev 0) +++ csw/mgar/pkg/clamavsigs/trunk/files/crontab.root 2010-08-26 15:03:05 UTC (rev 10814) @@ -0,0 +1 @@ +33 * * * * /opt/csw/bin/clamav-unofficial-sigs.sh -c /etc/opt/csw/clamav-unofficial-sigs.conf 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 Aug 26 17:35:34 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 26 Aug 2010 15:35:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[10815] csw/mgar/pkg/clamavsigs/trunk Message-ID: <E1OoeUI-0007Ab-5m@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 10815 http://gar.svn.sourceforge.net/gar/?rev=10815&view=rev Author: bonivart Date: 2010-08-26 15:35:33 +0000 (Thu, 26 Aug 2010) Log Message: ----------- clamavsigs: fix crontab class Modified Paths: -------------- csw/mgar/pkg/clamavsigs/trunk/Makefile csw/mgar/pkg/clamavsigs/trunk/files/README.CSW Modified: csw/mgar/pkg/clamavsigs/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamavsigs/trunk/Makefile 2010-08-26 15:03:05 UTC (rev 10814) +++ csw/mgar/pkg/clamavsigs/trunk/Makefile 2010-08-26 15:35:33 UTC (rev 10815) @@ -24,7 +24,7 @@ CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWrsync CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWgnupg -CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWsocat +#CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWsocat CONFIGURE_SCRIPTS = BUILD_SCRIPTS = @@ -33,6 +33,7 @@ SAMPLECONF = /etc/opt/csw/clamav-unofficial-sigs.conf POSTMSG = /opt/csw/share/doc/clamavsigs/README.CSW +CRONTABS = /etc/opt/csw/pkg/CSWclamavsigs/crontabs/root include gar/category.mk @@ -41,9 +42,9 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" @echo worksrc: $(WORKSRC) - @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/CSWclamavsigs/crontabs + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWclamavsigs/crontabs @ginstall -m 644 $(WORKSRC)/clamav-unofficial-sigs.conf $(DESTDIR)/etc/opt/csw - @ginstall -m 644 $(FILEDIR)/crontab.root $(DESTDIR)/etc/opt/csw/CSWclamavsigs/crontabs/root + @ginstall -m 644 $(FILEDIR)/crontab.root $(DESTDIR)/etc/opt/csw/pkg/CSWclamavsigs/crontabs/root @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) @$(foreach DOC,$(DOCLIST),cp $(WORKSRC)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);) @ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(GARNAME) Modified: csw/mgar/pkg/clamavsigs/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/clamavsigs/trunk/files/README.CSW 2010-08-26 15:03:05 UTC (rev 10814) +++ csw/mgar/pkg/clamavsigs/trunk/files/README.CSW 2010-08-26 15:35:33 UTC (rev 10815) @@ -1,3 +1,4 @@ + README.CSW ========== - You can find signature databases to download at http://sanesecurity.co.uk. @@ -9,3 +10,4 @@ - You should probably set up log rotation. 2010-08-26/Peter Bonivart, OpenCSW + 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 Aug 26 19:10:22 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 26 Aug 2010 17:10:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[10816] csw/mgar/pkg/libmikmod/trunk/Makefile Message-ID: <E1Oofy2-000769-Hf@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10816 http://gar.svn.sourceforge.net/gar/?rev=10816&view=rev Author: jake_goerzen Date: 2010-08-26 17:10:22 +0000 (Thu, 26 Aug 2010) Log Message: ----------- libmikmod: name package CSWmikmod instead of CSWlibmikmod for compatibilty Modified Paths: -------------- csw/mgar/pkg/libmikmod/trunk/Makefile Modified: csw/mgar/pkg/libmikmod/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmikmod/trunk/Makefile 2010-08-26 15:35:33 UTC (rev 10815) +++ csw/mgar/pkg/libmikmod/trunk/Makefile 2010-08-26 17:10:22 UTC (rev 10816) @@ -8,6 +8,7 @@ Library supporting many formats, including mod, s3m, it, and xm. Originally a player for MS-DOS, endef +PACKAGES = CSWmikmod MASTER_SITES = http://mikmod.raphnet.net/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = libmikmod-3.1.11-a.diff 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 Aug 26 23:14:18 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 26 Aug 2010 21:14:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[10817] csw/mgar/pkg/xmms/trunk/Makefile Message-ID: <E1Oojm6-0006Oc-6e@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 10817 http://gar.svn.sourceforge.net/gar/?rev=10817&view=rev Author: jake_goerzen Date: 2010-08-26 21:14:17 +0000 (Thu, 26 Aug 2010) Log Message: ----------- xmms: add EXTRA_CPPFLAGS = -DSUN_OGL_NO_VERTEX_MACROS to recipe Modified Paths: -------------- csw/mgar/pkg/xmms/trunk/Makefile Modified: csw/mgar/pkg/xmms/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmms/trunk/Makefile 2010-08-26 17:10:22 UTC (rev 10816) +++ csw/mgar/pkg/xmms/trunk/Makefile 2010-08-26 21:14:17 UTC (rev 10817) @@ -24,6 +24,9 @@ CONFIGURE_ARGS += --with-ogg=$(prefix) CONFIGURE_ARGS += --with-vorbis=$(prefix) +# Needed for opengl plugin +EXTRA_CPPFLAGS = -DSUN_OGL_NO_VERTEX_MACROS + # No test suite TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Aug 27 00:45:40 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 26 Aug 2010 22:45:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[10818] csw/mgar/pkg/gettext/trunk Message-ID: <E1OolCW-0006dW-Bx@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10818 http://gar.svn.sourceforge.net/gar/?rev=10818&view=rev Author: bdwalton Date: 2010-08-26 22:45:40 +0000 (Thu, 26 Aug 2010) Log Message: ----------- gettext: update patches; drop extra ld_flags Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile csw/mgar/pkg/gettext/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2010-08-26 21:14:17 UTC (rev 10817) +++ csw/mgar/pkg/gettext/trunk/Makefile 2010-08-26 22:45:40 UTC (rev 10818) @@ -27,10 +27,7 @@ DISTFILES += libintl.so.3.i DISTFILES += libintl.so.3.s -#Apply two bug fixes from gnulib, retrieved from: -#http://git.savannah.gnu.org/cgit/gnulib.git/tree/tests/test-wcwidth.c -#blob: 582a8aa2e87a8235186aa3b1e402bbf03e6646a7 -PATCHFILES = test-wcwidth.patch +PATCHFILES += 0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g @@ -40,9 +37,6 @@ #No glibc CONFIGURE_ARGS += --with-included-gettext -#Fix acl bug http://savannah.gnu.org/bugs/?21604 -EXTRA_LD_FLAGS = -lsec - UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz BUILD64 = 1 Modified: csw/mgar/pkg/gettext/trunk/checksums =================================================================== --- csw/mgar/pkg/gettext/trunk/checksums 2010-08-26 21:14:17 UTC (rev 10817) +++ csw/mgar/pkg/gettext/trunk/checksums 2010-08-26 22:45:40 UTC (rev 10818) @@ -1,3 +1,4 @@ +a772021542b5c511ea9542a06996ed64 0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch 3dd55b952826d2b32f51308f2f91aa89 gettext-0.18.1.1.tar.gz d44a9a6ec0952bad7ad07026ccb42a10 libgettextlib-0.14.1.so.i ff0219d47dbc11034b55872172488e01 libgettextlib-0.14.1.so.s @@ -5,4 +6,3 @@ 3ab768083f6ecc5cada151e49be21aa0 libintl.so.2.s ceb5de2326a4726d3710fe1512b84592 libintl.so.3.i 88db7322e263a00f24269a7f364fdc2d libintl.so.3.s -710effbaef82fd7db1d807e5aa46154a test-wcwidth.patch Added: csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch =================================================================== --- csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch (rev 0) +++ csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch 2010-08-26 22:45:40 UTC (rev 10818) @@ -0,0 +1,39 @@ +From 5ab8effba3fe58f3adf06190be6e27ada75f2658 Mon Sep 17 00:00:00 2001 +From: Ben Walton <bwalton at opencsw.org> +Date: Thu, 26 Aug 2010 03:44:59 +0200 +Subject: [PATCH] Use the auto-detected SHELL to run convert-archive + +The convert-archive script was failing on Solaris due to a nested {} +construct that it's broken /bin/sh couldn't handle. We now force the +use of the auto-detected POSIX-compliant SHELL to run that script. + +Signed-off-by: Ben Walton <bwalton at opencsw.org> +--- + gettext-tools/misc/Makefile.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gettext-tools/misc/Makefile.in b/gettext-tools/misc/Makefile.in +index 8d2b112..bc42b35 100644 +--- a/gettext-tools/misc/Makefile.in ++++ b/gettext-tools/misc/Makefile.in +@@ -1533,7 +1533,7 @@ archive.git.tar.gz: archive.dir.tar.gz + else \ + inputfile='$(srcdir)'/archive.dir.tar.gz; \ + fi; \ +- ./convert-archive dir git "$$inputfile" $@ ++ $(SHELL) ./convert-archive dir git "$$inputfile" $@ + + # The archive.cvs.tar.gz is generated from archive.dir.tar.gz. + archive.cvs.tar.gz: archive.dir.tar.gz +@@ -1542,7 +1542,7 @@ archive.cvs.tar.gz: archive.dir.tar.gz + else \ + inputfile='$(srcdir)'/archive.dir.tar.gz; \ + fi; \ +- ./convert-archive dir cvs "$$inputfile" $@ ++ $(SHELL) ./convert-archive dir cvs "$$inputfile" $@ + + # 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. +-- +1.7.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Aug 27 01:59:02 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 26 Aug 2010 23:59:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[10819] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: <E1OomLW-0007Bc-U3@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 10819 http://gar.svn.sourceforge.net/gar/?rev=10819&view=rev Author: bdwalton Date: 2010-08-26 23:59:02 +0000 (Thu, 26 Aug 2010) Log Message: ----------- gettext: a few overrides that make sense initially; more left to handle properly Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2010-08-26 22:45:40 UTC (rev 10818) +++ csw/mgar/pkg/gettext/trunk/Makefile 2010-08-26 23:59:02 UTC (rev 10819) @@ -67,6 +67,9 @@ PKGFILES_CSWggettextrt += /opt/csw/share/locale/.* PKGFILES_CSWggettextdoc = $(PKGFILES_DOC) +CHECKPKG_OVERRIDES_CSWggettextdoc += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWggettextdoc += surplus-dependency|CSWggettext + include gar/category.mk #Include old libraries for compatibility with existing packages 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 Aug 27 11:10:27 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 27 Aug 2010 09:10:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[10820] csw/mgar/gar/v2/lib/python Message-ID: <E1Ooux9-0005aB-KK@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 10820 http://gar.svn.sourceforge.net/gar/?rev=10820&view=rev Author: wahwah Date: 2010-08-27 09:10:27 +0000 (Fri, 27 Aug 2010) Log Message: ----------- mGAR v2: pkgdb gen-html, moved regex processing from the template to the main program. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkg-review-template.html csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkg-review-template.html =================================================================== --- csw/mgar/gar/v2/lib/python/pkg-review-template.html 2010-08-26 23:59:02 UTC (rev 10819) +++ csw/mgar/gar/v2/lib/python/pkg-review-template.html 2010-08-27 09:10:27 UTC (rev 10820) @@ -1,4 +1,5 @@ ## This is a Cheetah template +## $Id$ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> @@ -59,14 +60,6 @@ <a href="#${pkg.basic_stats.md5_sum}"> ${pkg.basic_stats.pkg_basename} </a> - <ul> - <li><a href="#${pkg.basic_stats.md5_sum}-pkginfo">pkginfo</a></li> - <li><a href="#${pkg.basic_stats.md5_sum}-binaries_dump_info">binaries_dump_info</a></li> - <li><a href="#${pkg.basic_stats.md5_sum}-depends">depends</a></li> - <li><a href="#${pkg.basic_stats.md5_sum}-files_metadata">files_metadata</a></li> - <li><a href="#${pkg.basic_stats.md5_sum}-overrides">overrides</a></li> - <li><a href="#${pkg.basic_stats.md5_sum}-pkgmap">pkgmap</a></li> - </ul> </li> #end for </ul> @@ -78,16 +71,33 @@ <a name="${pkg.basic_stats.md5_sum}">${pkg.basic_stats.pkg_basename}</a> </h1> <h2> + Sections + </h2> + <ul> + <li><a href="#${pkg.basic_stats.md5_sum}-pkginfo">pkginfo</a></li> + <li><a href="#${pkg.basic_stats.md5_sum}-binaries_dump_info">binaries_dump_info</a></li> + <li><a href="#${pkg.basic_stats.md5_sum}-depends">depends</a></li> + <li><a href="#${pkg.basic_stats.md5_sum}-files_metadata">files_metadata</a></li> + <li><a href="#${pkg.basic_stats.md5_sum}-overrides">overrides</a></li> + <li><a href="#${pkg.basic_stats.md5_sum}-pkgmap">pkgmap</a></li> + </ul> + <h2> <a name="${pkg.basic_stats.md5_sum}-source"> Build source code </a> </h2> #if $pkg.build_src - <p> - <a href="$pkg.build_src"> - $pkg.build_src - </a> - </p> + <ul> + <li>$pkg.build_src</li> + <li> + <a href="$pkg.build_src_url_svn">Makefile</a> + (in Subversion, may link to a later revision) + </li> + <li> + <a href="$pkg.build_src_url_trac">Makefile</a> + (in Trac view, always links to the correct file revision) + </li> + </ul> #else <p> <span style="warning"> Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2010-08-26 23:59:02 UTC (rev 10819) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2010-08-27 09:10:27 UTC (rev 10820) @@ -106,10 +106,18 @@ data = cPickle.loads(str(srv4.data)) if "OPENCSW_REPOSITORY" in data["pkginfo"]: build_src = data["pkginfo"]["OPENCSW_REPOSITORY"] - build_src = re.sub(r"@(\d+)$", r"", build_src) + build_src_url_svn = re.sub(r'([^@]*).*', r'\1/Makefile', build_src) + build_src_url_trac = re.sub( + r'https://gar.svn.(sf|sourceforge).net/svnroot/gar/([^@]+)@(.*)', + r'http://sourceforge.net/apps/trac/gar/browser/\2/Makefile?rev=\3', + build_src) else: build_src = None + build_src_url_svn = None + build_src_url_trac = None data["build_src"] = build_src + data["build_src_url_svn"] = build_src_url_svn + data["build_src_url_trac"] = build_src_url_trac pkgstats.append(data) # This assumes the program is run as "bin/pkgdb", and not "lib/python/pkgdb.py". if not options.pkg_review_template: 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 Aug 27 11:57:43 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Aug 2010 09:57:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[10821] csw/mgar/pkg/apr-util/trunk Message-ID: <E1Oovgt-0006to-68@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 10821 http://gar.svn.sourceforge.net/gar/?rev=10821&view=rev Author: dmichelsen Date: 2010-08-27 09:57:42 +0000 (Fri, 27 Aug 2010) Log Message: ----------- apr-util: More work towards 32/64 Modified Paths: -------------- csw/mgar/pkg/apr-util/trunk/Makefile csw/mgar/pkg/apr-util/trunk/checksums Added Paths: ----------- csw/mgar/pkg/apr-util/trunk/files/0001-Make-sure-to-find-newly-built-libs-earlier.patch Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2010-08-27 09:10:27 UTC (rev 10820) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2010-08-27 09:57:42 UTC (rev 10821) @@ -11,29 +11,43 @@ MASTER_SITES = http://apache.crihan.fr/dist/apr/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -LICENSE = LICENSE + +PATCHFILES = 0001-Make-sure-to-find-newly-built-libs-earlier.patch + +PACKAGES = CSWar-util CATALOGNAME = apr_util +LICENSE = LICENSE + RUNTIME_DEP_PKGS = CSWapr CSWiconv CSWsqlite3rt CSWunixodbc CSWexpat -RUNTIME_DEP_PKGS += CSWbdb48 CSWoldaprt +RUNTIME_DEP_PKGS += CSWbdb47 CSWoldaprt CSWosslrt CSWsasl CSWlibnet # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# We need this to get bdb48/lib into the runpath -EXTRA_LIB = $(prefix)/bdb48/lib +# We need this to get bdb47/lib into the runpath +EXTRA_LIB = $(prefix)/bdb47/lib +# It looks like Solars 9 x86 has a problem with libuuid, investigate later: +# testing9x# cd /usr/lib +# testing9x# ls -l libuuid* +# -rwxr-xr-x 1 root bin 22344 Dec 23 2004 libuuid.so.1 +# testing9x# ln -s libuuid.so.1 libuuid.so + +NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config +CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config CONFIGURE_ARGS += --with-ldap -CONFIGURE_ARGS += --with-berkeley-db=/opt/csw/bdb48 +CONFIGURE_ARGS += --with-berkeley-db=/opt/csw/bdb47 CONFIGURE_ARGS += --without-freetds --without-sqlite2 #BUILD64 = 1 #reason is that no sparcv9 binaries are built for some reason and checkpkg suggests: #CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/libaprutil-1.so.0.3.9|arch_id=2|arch_name=sparcv8|bad_path=sparcv9 +# dam: The reason is the files are actually built as sparcv8, because we don't have a separate +# /opt/csw/share/build-1/apr_rules.mk +# for 32 and 64 bit. We need to inspire us from +# http://cvs.opensolaris.org/source/xref/sfw/usr/src/cmd/apr/apr-1.3/Makefile.sfw +# for some unification. - -STRIP_LIBTOOL = 1 - include gar/category.mk Modified: csw/mgar/pkg/apr-util/trunk/checksums =================================================================== --- csw/mgar/pkg/apr-util/trunk/checksums 2010-08-27 09:10:27 UTC (rev 10820) +++ csw/mgar/pkg/apr-util/trunk/checksums 2010-08-27 09:57:42 UTC (rev 10821) @@ -1,9 +1,2 @@ -d35666b332b173698383deec8e56e1b3 CSWaprutil-devel.depend -963516b990780cf17616ba32673443a6 CSWaprutil-devel.gspec -094f42b8b66199c1047d9828a82249e4 CSWaprutil-devel.prototype -4447f1d66b43786a4c123f75c1d16962 CSWaprutil.depend -1e0b81300c99eacfda07803e345ac3d7 CSWaprutil.gspec -d1a6d531eef93140a3aebe1e96803b09 CSWaprutil.prototype +aed0c105d6c9c1afb7a14bd80ed0c173 0001-Make-sure-to-find-newly-built-libs-earlier.patch cc2ec0ba4f01d88375f1170f762518fa apr-util-1.3.9.tar.gz -f25418280a6214bcf0af804fcef4c950 config.layout -2aec82eff00f526a0f2e4c1380a3541e iconv.diff Added: csw/mgar/pkg/apr-util/trunk/files/0001-Make-sure-to-find-newly-built-libs-earlier.patch =================================================================== --- csw/mgar/pkg/apr-util/trunk/files/0001-Make-sure-to-find-newly-built-libs-earlier.patch (rev 0) +++ csw/mgar/pkg/apr-util/trunk/files/0001-Make-sure-to-find-newly-built-libs-earlier.patch 2010-08-27 09:57:42 UTC (rev 10821) @@ -0,0 +1,25 @@ +From 616e65579de39c6065233d09837bc84e747dd2b5 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen <dam at opencsw.org> +Date: Mon, 23 Aug 2010 11:24:04 +0200 +Subject: [PATCH] Make sure to find newly built libs earlier + +--- + test/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/test/Makefile.in b/test/Makefile.in +index 97ff49b..55d254a 100644 +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -73,7 +73,7 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) + fi; \ + done; \ + else \ +- @apr_shlibpath_var@="`echo "../dbm/.libs:../dbd/.libs:../ldap/.libs:$$@apr_shlibpath_var@" | sed -e 's/::*$$//'`" \ ++ @apr_shlibpath_var@="`echo "../.libs:../dbm/.libs:../dbd/.libs:../ldap/.libs:$$@apr_shlibpath_var@" | sed -e 's/::*$$//'`" \ + ./$$prog; \ + status=$$?; \ + if test $$status != 0; then \ +-- +1.7.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Aug 27 12:54:45 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 27 Aug 2010 10:54:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[10822] csw/mgar/pkg/clamavsigs/trunk Message-ID: <E1Oowa5-0005s2-LB@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10822 http://gar.svn.sourceforge.net/gar/?rev=10822&view=rev Author: bonivart Date: 2010-08-27 10:54:45 +0000 (Fri, 27 Aug 2010) Log Message: ----------- clamavsigs: fix defaults Modified Paths: -------------- csw/mgar/pkg/clamavsigs/trunk/Makefile csw/mgar/pkg/clamavsigs/trunk/checksums Added Paths: ----------- csw/mgar/pkg/clamavsigs/trunk/files/0002-make-defaults-match-csw-clamav.patch Modified: csw/mgar/pkg/clamavsigs/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamavsigs/trunk/Makefile 2010-08-27 09:57:42 UTC (rev 10821) +++ csw/mgar/pkg/clamavsigs/trunk/Makefile 2010-08-27 10:54:45 UTC (rev 10822) @@ -12,19 +12,20 @@ MASTER_SITES = http://www.inetmsg.com/pub/ DISTFILES = clamav-unofficial-sigs-$(GARVERSION).tar.gz PATCHFILES = 0001-use-ksh-instead-of-sh-on-solaris.patch +PATCHFILES += 0002-make-defaults-match-csw-clamav.patch LICENSE = LICENSE ARCHALL = 1 -#RUNTIME_DEP_PKGS = CSWgnupg CSWrsync CSWsocat -RUNTIME_DEP_PKGS = CSWgnupg CSWrsync +RUNTIME_DEP_PKGS = CSWgnupg CSWrsync CSWcurl CSWsocat # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWrsync CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWgnupg -#CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWsocat +CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWsocat +CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWcurl CONFIGURE_SCRIPTS = BUILD_SCRIPTS = Modified: csw/mgar/pkg/clamavsigs/trunk/checksums =================================================================== --- csw/mgar/pkg/clamavsigs/trunk/checksums 2010-08-27 09:57:42 UTC (rev 10821) +++ csw/mgar/pkg/clamavsigs/trunk/checksums 2010-08-27 10:54:45 UTC (rev 10822) @@ -1,2 +1,3 @@ 94eb4d03fefa038bc05c404e631464f4 0001-use-ksh-instead-of-sh-on-solaris.patch +e5ec9ce29aab113c74ad01d11fd774a0 0002-make-defaults-match-csw-clamav.patch c00f38cd0ff51672e3cbb638aec8d124 clamav-unofficial-sigs-3.7.1.tar.gz Added: csw/mgar/pkg/clamavsigs/trunk/files/0002-make-defaults-match-csw-clamav.patch =================================================================== --- csw/mgar/pkg/clamavsigs/trunk/files/0002-make-defaults-match-csw-clamav.patch (rev 0) +++ csw/mgar/pkg/clamavsigs/trunk/files/0002-make-defaults-match-csw-clamav.patch 2010-08-27 10:54:45 UTC (rev 10822) @@ -0,0 +1,56 @@ +From 67723bc685d6e163406f95665b1046d583177b22 Mon Sep 17 00:00:00 2001 +From: Peter Bonivart <bonivart at opencsw.org> +Date: Fri, 27 Aug 2010 12:40:16 +0200 +Subject: [PATCH] make-defaults-match-csw-clamav + +--- + clamav-unofficial-sigs.conf | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/clamav-unofficial-sigs.conf b/clamav-unofficial-sigs.conf +index d18f2c4..3267f04 100644 +--- a/clamav-unofficial-sigs.conf ++++ b/clamav-unofficial-sigs.conf +@@ -31,7 +31,7 @@ + # and optionally socat. It's been reported that on Sun systems, the GNU utilities + # should be used rather than the default Sun OS versions of these utilities. + +-PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" ++PATH="/opt/csw/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" + export PATH + + # Set the appropriate ClamD user and group accounts for your system. +@@ -42,10 +42,10 @@ clam_group="clamav" + + # Set path to ClamAV database files location. If unsure, check + # your clamd.conf file for the "DatabaseDirectory" path setting. +-clam_dbs="/var/lib/clamav" ++clam_dbs="/var/opt/csw/clamav/db" + + # Set path to clamd.pid file (see clamd.conf for path location). +-clamd_pid="/var/run/clamd.pid" ++clamd_pid="/var/opt/csw/clamav/clamd.pid" + + # To enable "ham" (non-spam) directory scanning and removal of + # signatures that trigger on ham messages, uncomment the following +@@ -76,7 +76,7 @@ reload_opt="clamdscan --reload" # Default + # the script will still run). You will also need to set the correct + # path to your clamd socket file (if unsure of the path, check the + # "LocalSocket" setting in your clamd.conf file for socket location). +-#clamd_socket="/var/run/clamd.socket" ++clamd_socket="/tmp/clamd.socket" + + # If you would like to attempt to restart ClamD if detected not running, + # uncomment the next 2 lines. Confirm the path to the "clamd_lock" file +@@ -256,7 +256,7 @@ curl_proxy="" + + # After you have completed the configuration of this file, set the + # following variable to "yes". +-user_configuration_complete="no" ++user_configuration_complete="yes" + + ################################################################################ + # END OF USER CONFIGURATION # +-- +1.7.1 + 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 Aug 27 17:37:55 2010 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 27 Aug 2010 15:37:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[10823] csw/mgar/pkg/libmikmod/trunk/Makefile Message-ID: <E1Op107-0000WW-Pb@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10823 http://gar.svn.sourceforge.net/gar/?rev=10823&view=rev Author: jake_goerzen Date: 2010-08-27 15:37:55 +0000 (Fri, 27 Aug 2010) Log Message: ----------- libmikmod: adding CATALOGNAME = libmikmod Modified Paths: -------------- csw/mgar/pkg/libmikmod/trunk/Makefile Modified: csw/mgar/pkg/libmikmod/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmikmod/trunk/Makefile 2010-08-27 10:54:45 UTC (rev 10822) +++ csw/mgar/pkg/libmikmod/trunk/Makefile 2010-08-27 15:37:55 UTC (rev 10823) @@ -9,6 +9,7 @@ endef PACKAGES = CSWmikmod +CATALOGNAME = libmikmod MASTER_SITES = http://mikmod.raphnet.net/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = libmikmod-3.1.11-a.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Aug 28 01:11:44 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Aug 2010 23:11:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[10824] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: <E1Op85I-0007vo-2x@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 10824 http://gar.svn.sourceforge.net/gar/?rev=10824&view=rev Author: bdwalton Date: 2010-08-27 23:11:43 +0000 (Fri, 27 Aug 2010) Log Message: ----------- gettext: drop useless old library copy; prepend gnulinks path Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2010-08-27 15:37:55 UTC (rev 10823) +++ csw/mgar/pkg/gettext/trunk/Makefile 2010-08-27 23:11:43 UTC (rev 10824) @@ -72,6 +72,8 @@ include gar/category.mk +PATH := /opt/csw/gnu:$(PATH) + #Include old libraries for compatibility with existing packages # TODO: Convert to modulated builds post-install-isa-sparcv8: @@ -92,7 +94,6 @@ post-install-isa-i386: @mkdir $(INSTALLISADIR)/opt/csw/share/java @mv $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar $(INSTALLISADIR)/opt/csw/share/java - @cp $(FILEDIR)/libgettextlib-0.14.1.so.s $(INSTALLISADIR)/opt/csw/lib/libgettextlib-0.14.1.so @cp $(FILEDIR)/libgettextlib-0.14.1.so.i $(INSTALLISADIR)/opt/csw/lib/libgettextlib-0.14.1.so @cp $(FILEDIR)/libintl.so.2.i $(INSTALLISADIR)/opt/csw/lib/libintl.so.2 @cp $(FILEDIR)/libintl.so.3.i $(INSTALLISADIR)/opt/csw/lib/libintl.so.3 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 Aug 28 01:22:59 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 27 Aug 2010 23:22:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[10825] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: <E1Op8GB-0004eR-Nm@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 10825 http://gar.svn.sourceforge.net/gar/?rev=10825&view=rev Author: bdwalton Date: 2010-08-27 23:22:59 +0000 (Fri, 27 Aug 2010) Log Message: ----------- gettext: strip libtool! Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2010-08-27 23:11:43 UTC (rev 10824) +++ csw/mgar/pkg/gettext/trunk/Makefile 2010-08-27 23:22:59 UTC (rev 10825) @@ -41,6 +41,7 @@ BUILD64 = 1 NOISAEXEC = 1 +STRIP_LIBTOOL = 1 RUNTIME_DEP_PKGS_CSWggettextrt = CSWiconv RUNTIME_DEP_PKGS_CSWggettext = CSWggettextrt CSWiconv CSWexpat CSWncurses 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 Aug 28 03:50:26 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Aug 2010 01:50:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[10826] csw/mgar/pkg/sed/trunk/Makefile Message-ID: <E1OpAYs-0003lk-MI@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 10826 http://gar.svn.sourceforge.net/gar/?rev=10826&view=rev Author: bdwalton Date: 2010-08-28 01:50:26 +0000 (Sat, 28 Aug 2010) Log Message: ----------- sed: add gnulinks; move a few lines before the include; use bash for the shell Modified Paths: -------------- csw/mgar/pkg/sed/trunk/Makefile Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2010-08-27 23:22:59 UTC (rev 10825) +++ csw/mgar/pkg/sed/trunk/Makefile 2010-08-28 01:50:26 UTC (rev 10826) @@ -35,11 +35,23 @@ TEST_TARGET = check +SHELL = /bin/bash + +EXTRA_MERGE_EXCLUDE_FILES = $(sharedstatedir)/.*locale.alias +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/charset.alias + include gar/category.mk # Make sure we are using gnu tools (esp. sed) PATH := /opt/csw/gnu:$(PATH) -EXTRA_MERGE_EXCLUDE_FILES = $(sharedstatedir)/.*locale.alias -EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/charset.alias +post-merge: + @(cd $(PKGROOT)$(prefix); \ + mkdir gnu; cd gnu; \ + for f in ../bin/g*; do \ + echo Linking $$f; \ + base=$$(basename $$f); \ + gln -s $$f ./$${base/g/}; \ + done ) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Aug 28 04:03:31 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Aug 2010 02:03:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[10827] csw/mgar/pkg/sed/trunk/Makefile Message-ID: <E1OpAlX-0006qC-ME@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10827 http://gar.svn.sourceforge.net/gar/?rev=10827&view=rev Author: bdwalton Date: 2010-08-28 02:03:31 +0000 (Sat, 28 Aug 2010) Log Message: ----------- sed: temporary (i think) checkpkg override Modified Paths: -------------- csw/mgar/pkg/sed/trunk/Makefile Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2010-08-28 01:50:26 UTC (rev 10826) +++ csw/mgar/pkg/sed/trunk/Makefile 2010-08-28 02:03:31 UTC (rev 10827) @@ -40,6 +40,10 @@ EXTRA_MERGE_EXCLUDE_FILES = $(sharedstatedir)/.*locale.alias EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/charset.alias +# this shouldn't be required, but until I know why checkpkg isn't happy, +# i'll put it here so I can get this going... +CHECKPKG_OVERRIDES_CSWgsed += surplus-dependency|CSWiconv + include gar/category.mk # Make sure we are using gnu tools (esp. sed) 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 Aug 28 04:21:19 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Aug 2010 02:21:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[10828] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: <E1OpB2l-0007No-6l@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10828 http://gar.svn.sourceforge.net/gar/?rev=10828&view=rev Author: bdwalton Date: 2010-08-28 02:21:19 +0000 (Sat, 28 Aug 2010) Log Message: ----------- gnulinks: drop links for gsed Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2010-08-28 02:03:31 UTC (rev 10827) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2010-08-28 02:21:19 UTC (rev 10828) @@ -5,7 +5,7 @@ VENDOR_URL = http://opencsw.org GLINKPKGS = CSWggettext CSWggettextrt CSWbison CSWbinutils -GLINKPKGS += CSWgsed CSWggetopt CSWfindutils CSWgwhois +GLINKPKGS += CSWggetopt CSWfindutils CSWgwhois BUILD_DEP_PKGS = $(GLINKPKGS) CSWpkgutil CSWbash DESCRIPTION = Creates native symlinks for GNU tools in /opt/csw/gnu 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 Aug 28 04:43:49 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Aug 2010 02:43:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[10829] csw/mgar/pkg/git/trunk/Makefile Message-ID: <E1OpBOX-00058k-3C@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 10829 http://gar.svn.sourceforge.net/gar/?rev=10829&view=rev Author: bdwalton Date: 2010-08-28 02:43:48 +0000 (Sat, 28 Aug 2010) Log Message: ----------- git: version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-08-28 02:21:19 UTC (rev 10828) +++ csw/mgar/pkg/git/trunk/Makefile 2010-08-28 02:43:48 UTC (rev 10829) @@ -1,5 +1,5 @@ GARNAME = git -GARVERSION = 1.7.2.1 +GARVERSION = 1.7.2.2 #PATCHLEVEL = rc1 CATEGORIES = devel 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 Aug 28 13:39:21 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Aug 2010 11:39:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[10830] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: <E1OpJkn-0003tb-OP@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 10830 http://gar.svn.sourceforge.net/gar/?rev=10830&view=rev Author: bdwalton Date: 2010-08-28 11:39:21 +0000 (Sat, 28 Aug 2010) Log Message: ----------- gettext: depend on libxml2 Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2010-08-28 02:43:48 UTC (rev 10829) +++ csw/mgar/pkg/gettext/trunk/Makefile 2010-08-28 11:39:21 UTC (rev 10830) @@ -45,6 +45,7 @@ RUNTIME_DEP_PKGS_CSWggettextrt = CSWiconv RUNTIME_DEP_PKGS_CSWggettext = CSWggettextrt CSWiconv CSWexpat CSWncurses +RUNTIME_DEP_PKGS_CSWggettext = CSWlibxml2 RUNTIME_DEP_PKGS_CSWggettextdoc = CSWggettext #NOTE: gettext tests are sensitive to bash environment variables, make sure This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Aug 28 14:34:04 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Aug 2010 12:34:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[10831] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: <E1OpKbk-00024t-Es@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10831 http://gar.svn.sourceforge.net/gar/?rev=10831&view=rev Author: bdwalton Date: 2010-08-28 12:34:04 +0000 (Sat, 28 Aug 2010) Log Message: ----------- gettext: split out an el package to avoid dragging in emacscommon all the time Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2010-08-28 11:39:21 UTC (rev 10830) +++ csw/mgar/pkg/gettext/trunk/Makefile 2010-08-28 12:34:04 UTC (rev 10831) @@ -7,15 +7,19 @@ GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages endef -PACKAGES = CSWggettextrt CSWggettextdoc CSWggettext +PACKAGES = CSWggettextrt CSWggettextdoc CSWggettext CSWggettext_el CATALOGNAME_CSWggettext = ggettext CATALOGNAME_CSWggettextdoc = ggettextdoc CATALOGNAME_CSWggettextrt = ggettextrt +CATALOGNAME_CSWggettextel = ggettext_el SPKG_DESC_CSWggettext = GNU locale utilities and development headers SPKG_DESC_CSWggettextdoc = GNU locale documentation SPKG_DESC_CSWggettextrt = GNU locale runtime +SPKG_DESC_CSWggettextel = Emacs support for po file editting ARCHALL_CSWggettextdoc = 1 +COMPILE_ELISP = 1 + MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz @@ -47,6 +51,7 @@ RUNTIME_DEP_PKGS_CSWggettext = CSWggettextrt CSWiconv CSWexpat CSWncurses RUNTIME_DEP_PKGS_CSWggettext = CSWlibxml2 RUNTIME_DEP_PKGS_CSWggettextdoc = CSWggettext +RUNTIME_DEP_PKGS_CSWggettextel = CSWggettext CSWemacscommon #NOTE: gettext tests are sensitive to bash environment variables, make sure # custom paths are prefixed by $PATH, may be better to set aside @@ -68,6 +73,7 @@ PKGFILES_CSWggettextrt += /opt/csw/bin/ggettext.sh /opt/csw/share/java/libintl.jar PKGFILES_CSWggettextrt += /opt/csw/share/locale/.* PKGFILES_CSWggettextdoc = $(PKGFILES_DOC) +PKGFILES_CSWggettextel = .*site-lisp.* CHECKPKG_OVERRIDES_CSWggettextdoc += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWggettextdoc += surplus-dependency|CSWggettext 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 Aug 28 20:29:19 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Aug 2010 18:29:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[10832] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: <E1OpQ9X-0007hY-4v@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 10832 http://gar.svn.sourceforge.net/gar/?rev=10832&view=rev Author: bdwalton Date: 2010-08-28 18:29:18 +0000 (Sat, 28 Aug 2010) Log Message: ----------- gettext: correct name of _el package; set _el package to ARCHALL Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2010-08-28 12:34:04 UTC (rev 10831) +++ csw/mgar/pkg/gettext/trunk/Makefile 2010-08-28 18:29:18 UTC (rev 10832) @@ -7,15 +7,18 @@ GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages endef -PACKAGES = CSWggettextrt CSWggettextdoc CSWggettext CSWggettext_el +PACKAGES = CSWggettextrt CSWggettextdoc CSWggettext CSWggettextel + +ARCHALL_CSWggettextel = 1 + CATALOGNAME_CSWggettext = ggettext CATALOGNAME_CSWggettextdoc = ggettextdoc CATALOGNAME_CSWggettextrt = ggettextrt -CATALOGNAME_CSWggettextel = ggettext_el +CATALOGNAME_CSWggettextel = ggettextel SPKG_DESC_CSWggettext = GNU locale utilities and development headers SPKG_DESC_CSWggettextdoc = GNU locale documentation SPKG_DESC_CSWggettextrt = GNU locale runtime -SPKG_DESC_CSWggettextel = Emacs support for po file editting +SPKG_DESC_CSWggettextel = Emacs support for gettext po file editting ARCHALL_CSWggettextdoc = 1 COMPILE_ELISP = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Aug 28 23:26:45 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Aug 2010 21:26:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[10833] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: <E1OpSvF-0004hz-3M@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10833 http://gar.svn.sourceforge.net/gar/?rev=10833&view=rev Author: bdwalton Date: 2010-08-28 21:26:44 +0000 (Sat, 28 Aug 2010) Log Message: ----------- gettext: drop ^A mistakenly added to dep name Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2010-08-28 18:29:18 UTC (rev 10832) +++ csw/mgar/pkg/gettext/trunk/Makefile 2010-08-28 21:26:44 UTC (rev 10833) @@ -54,7 +54,7 @@ RUNTIME_DEP_PKGS_CSWggettext = CSWggettextrt CSWiconv CSWexpat CSWncurses RUNTIME_DEP_PKGS_CSWggettext = CSWlibxml2 RUNTIME_DEP_PKGS_CSWggettextdoc = CSWggettext -RUNTIME_DEP_PKGS_CSWggettextel = CSWggettext CSWemacscommon +RUNTIME_DEP_PKGS_CSWggettextel = CSWggettext CSWemacscommon #NOTE: gettext tests are sensitive to bash environment variables, make sure # custom paths are prefixed by $PATH, may be better to set aside This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Aug 29 00:08:33 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Aug 2010 22:08:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[10834] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: <E1OpTZh-0002aB-8E@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 10834 http://gar.svn.sourceforge.net/gar/?rev=10834&view=rev Author: bdwalton Date: 2010-08-28 22:08:32 +0000 (Sat, 28 Aug 2010) Log Message: ----------- gettext: use += instead of = for line wrapped dep list Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2010-08-28 21:26:44 UTC (rev 10833) +++ csw/mgar/pkg/gettext/trunk/Makefile 2010-08-28 22:08:32 UTC (rev 10834) @@ -52,7 +52,7 @@ RUNTIME_DEP_PKGS_CSWggettextrt = CSWiconv RUNTIME_DEP_PKGS_CSWggettext = CSWggettextrt CSWiconv CSWexpat CSWncurses -RUNTIME_DEP_PKGS_CSWggettext = CSWlibxml2 +RUNTIME_DEP_PKGS_CSWggettext += CSWlibxml2 RUNTIME_DEP_PKGS_CSWggettextdoc = CSWggettext RUNTIME_DEP_PKGS_CSWggettextel = CSWggettext CSWemacscommon This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Aug 29 00:19:51 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Aug 2010 22:19:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[10835] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: <E1OpTkd-0000LS-8S@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 10835 http://gar.svn.sourceforge.net/gar/?rev=10835&view=rev Author: bdwalton Date: 2010-08-28 22:19:51 +0000 (Sat, 28 Aug 2010) Log Message: ----------- gettext: doc package should not depend on perl Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2010-08-28 22:08:32 UTC (rev 10834) +++ csw/mgar/pkg/gettext/trunk/Makefile 2010-08-28 22:19:51 UTC (rev 10835) @@ -80,6 +80,7 @@ CHECKPKG_OVERRIDES_CSWggettextdoc += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWggettextdoc += surplus-dependency|CSWggettext +CHECKPKG_OVERRIDES_CSWggettextel += surplus-dependency|CSWggettext include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Aug 29 00:30:38 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 28 Aug 2010 22:30:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[10836] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: <E1OpTv4-0000gi-IL@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 10836 http://gar.svn.sourceforge.net/gar/?rev=10836&view=rev Author: bdwalton Date: 2010-08-28 22:30:38 +0000 (Sat, 28 Aug 2010) Log Message: ----------- gettext: override checkpkg on manually included legacy lib Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2010-08-28 22:19:51 UTC (rev 10835) +++ csw/mgar/pkg/gettext/trunk/Makefile 2010-08-28 22:30:38 UTC (rev 10836) @@ -81,6 +81,8 @@ CHECKPKG_OVERRIDES_CSWggettextdoc += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWggettextdoc += surplus-dependency|CSWggettext CHECKPKG_OVERRIDES_CSWggettextel += surplus-dependency|CSWggettext +# This lib is legacy from the old versions and can't be updated (easily) +CHECKPKG_OVERRIDES_CSWggettext += bad-rpath-entry|/export/home/phil/build/gettext-0.14.1/gettext-tools/intl/.libs|opt/csw/lib/sparcv9/libgettextlib-0.14.1.so include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Aug 30 04:23:36 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 30 Aug 2010 02:23:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[10837] csw/mgar/pkg/gettext/trunk Message-ID: <E1Opu24-0002vt-Qr@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10837 http://gar.svn.sourceforge.net/gar/?rev=10837&view=rev Author: bdwalton Date: 2010-08-30 02:23:36 +0000 (Mon, 30 Aug 2010) Log Message: ----------- gettext: patch libtool to not strip runpath args (thx Dago) Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile csw/mgar/pkg/gettext/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gettext/trunk/files/0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2010-08-28 22:30:38 UTC (rev 10836) +++ csw/mgar/pkg/gettext/trunk/Makefile 2010-08-30 02:23:36 UTC (rev 10837) @@ -35,6 +35,7 @@ DISTFILES += libintl.so.3.s PATCHFILES += 0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch +PATCHFILES += 0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g Modified: csw/mgar/pkg/gettext/trunk/checksums =================================================================== --- csw/mgar/pkg/gettext/trunk/checksums 2010-08-28 22:30:38 UTC (rev 10836) +++ csw/mgar/pkg/gettext/trunk/checksums 2010-08-30 02:23:36 UTC (rev 10837) @@ -1,4 +1,5 @@ a772021542b5c511ea9542a06996ed64 0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch +56f02edaf64175e69988f78bb53c8753 0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch 3dd55b952826d2b32f51308f2f91aa89 gettext-0.18.1.1.tar.gz d44a9a6ec0952bad7ad07026ccb42a10 libgettextlib-0.14.1.so.i ff0219d47dbc11034b55872172488e01 libgettextlib-0.14.1.so.s Added: csw/mgar/pkg/gettext/trunk/files/0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch =================================================================== --- csw/mgar/pkg/gettext/trunk/files/0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch (rev 0) +++ csw/mgar/pkg/gettext/trunk/files/0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch 2010-08-30 02:23:36 UTC (rev 10837) @@ -0,0 +1,32 @@ +From f07d0231074a94edc074f4732d4fd979faad3829 Mon Sep 17 00:00:00 2001 +From: Ben Walton <bwalton at opencsw.org> +Date: Mon, 30 Aug 2010 02:48:17 +0200 +Subject: [PATCH] Update ltmain.sh to prevent libtool stripping runpath options + +Libtool was stripping some or all of the -xnorunpath and -norunpath +options at various points during the compilation of libasprintf. +This prevents that from happening so we don't get things like: +/opt/SUNWspro/lib/rw7:/opt/SUNWspro/lib/v8:/opt/SUNWspro/lib in the +R{,UN}PATH variables of the library header. + +Signed-off-by: Ben Walton <bwalton at opencsw.org> +--- + build-aux/ltmain.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh +index 0dd6f3a..5cab855 100644 +--- a/build-aux/ltmain.sh ++++ b/build-aux/ltmain.sh +@@ -4901,7 +4901,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-xnorunpath|-norunpath) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +-- +1.7.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 Mon Aug 30 13:46:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 30 Aug 2010 11:46:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[10838] csw/mgar/pkg Message-ID: <E1Oq2oK-0003eG-8D@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 10838 http://gar.svn.sourceforge.net/gar/?rev=10838&view=rev Author: dmichelsen Date: 2010-08-30 11:46:00 +0000 (Mon, 30 Aug 2010) Log Message: ----------- libdnet: Initial commit Added Paths: ----------- csw/mgar/pkg/libdnet/ csw/mgar/pkg/libdnet/branches/ csw/mgar/pkg/libdnet/tags/ csw/mgar/pkg/libdnet/trunk/ csw/mgar/pkg/libdnet/trunk/Makefile csw/mgar/pkg/libdnet/trunk/checksums csw/mgar/pkg/libdnet/trunk/files/ Property changes on: csw/mgar/pkg/libdnet/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/libdnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdnet/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libdnet/trunk/Makefile 2010-08-30 11:46:00 UTC (rev 10838) @@ -0,0 +1,24 @@ +# $Id$ +GARNAME = libdnet +GARVERSION = 1.11 +CATEGORIES = lib + +DESCRIPTION = A simplified, portable interface to several low-level networking routines +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +LICENSE = LICENSE + +BUILD64 = 1 +NOISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +MERGE_DIRS_isa-extra = $(libdir) + +include gar/category.mk Property changes on: csw/mgar/pkg/libdnet/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libdnet/trunk/checksums =================================================================== --- csw/mgar/pkg/libdnet/trunk/checksums (rev 0) +++ csw/mgar/pkg/libdnet/trunk/checksums 2010-08-30 11:46:00 UTC (rev 10838) @@ -0,0 +1 @@ +04c394ed8e1e7fc455456e79e908916d libdnet-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 Mon Aug 30 14:14:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 30 Aug 2010 12:14:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[10839] csw/mgar/pkg Message-ID: <E1Oq3G8-0004SL-7J@sfp-svn-2.v30.ch3.sourceforge.com> Revision: 10839 http://gar.svn.sourceforge.net/gar/?rev=10839&view=rev Author: dmichelsen Date: 2010-08-30 12:14:43 +0000 (Mon, 30 Aug 2010) Log Message: ----------- ddrescue: Initial commit, does not yet compile due to hardcoded gcc flags Added Paths: ----------- csw/mgar/pkg/ddrescue/ csw/mgar/pkg/ddrescue/branches/ csw/mgar/pkg/ddrescue/tags/ csw/mgar/pkg/ddrescue/trunk/ csw/mgar/pkg/ddrescue/trunk/Makefile csw/mgar/pkg/ddrescue/trunk/checksums csw/mgar/pkg/ddrescue/trunk/files/ Property changes on: csw/mgar/pkg/ddrescue/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/ddrescue/trunk/Makefile =================================================================== --- csw/mgar/pkg/ddrescue/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ddrescue/trunk/Makefile 2010-08-30 12:14:43 UTC (rev 10839) @@ -0,0 +1,20 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = ddrescue +GARVERSION = 1.13 +CATEGORIES = utils + +DESCRIPTION = A data recovery tool +define BLURB + GNU ddrescue is a data recovery tool. It copies data from one file or block device + (hard disc, cdrom, etc) to another, trying hard to rescue data in case of read errors. +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.lz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.lz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/ddrescue/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/ddrescue/trunk/checksums =================================================================== --- csw/mgar/pkg/ddrescue/trunk/checksums (rev 0) +++ csw/mgar/pkg/ddrescue/trunk/checksums 2010-08-30 12:14:43 UTC (rev 10839) @@ -0,0 +1 @@ +00cd788fbd6bc5a6205c3199f7557fda ddrescue-1.13.tar.lz 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 Aug 30 14:25:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 30 Aug 2010 12:25:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[10840] csw/mgar/pkg/ddrescue/trunk/Makefile Message-ID: <E1Oq3Qo-000235-0i@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10840 http://gar.svn.sourceforge.net/gar/?rev=10840&view=rev Author: dmichelsen Date: 2010-08-30 12:25:45 +0000 (Mon, 30 Aug 2010) Log Message: ----------- ddrescue: Add tweaks Modified Paths: -------------- csw/mgar/pkg/ddrescue/trunk/Makefile Modified: csw/mgar/pkg/ddrescue/trunk/Makefile =================================================================== --- csw/mgar/pkg/ddrescue/trunk/Makefile 2010-08-30 12:14:43 UTC (rev 10839) +++ csw/mgar/pkg/ddrescue/trunk/Makefile 2010-08-30 12:25:45 UTC (rev 10840) @@ -15,6 +15,12 @@ # File name regex to get notifications about upstream software releases UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.lz -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += CXX="$(CXX)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" +TEST_TARGET = check + +INSTALL_OVERRIDE_VARS = INSTALL +INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Aug 30 16:19:03 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 30 Aug 2010 14:19:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[10841] csw/mgar/gar/v2/gar.lib.mk Message-ID: <E1Oq5CR-0005aH-HB@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10841 http://gar.svn.sourceforge.net/gar/?rev=10841&view=rev Author: dmichelsen Date: 2010-08-30 14:19:03 +0000 (Mon, 30 Aug 2010) Log Message: ----------- mGAR v2: Make sure copying during extract phase keeps symlinks Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2010-08-30 12:25:45 UTC (rev 10840) +++ csw/mgar/gar/v2/gar.lib.mk 2010-08-30 14:19:03 UTC (rev 10841) @@ -381,7 +381,8 @@ # unchanged (not archives) cp-extract-%: @echo " ==> Copying $(DOWNLOADDIR)/$*" - @cp -rp $(DOWNLOADDIR)/$* $(WORKDIR)/ + @# Make sure to keep symlinks and don't traverse recursive ones + @(cd $(DOWNLOADDIR); tar cf - $*) | (cd $(WORKDIR); tar xf -) @$(MAKECOOKIE) #gets the meat of a .deb into $(WORKSRC) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Aug 31 03:22:59 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 31 Aug 2010 01:22:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[10842] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: <E1OqFYx-0000Ap-3W@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10842 http://gar.svn.sourceforge.net/gar/?rev=10842&view=rev Author: bdwalton Date: 2010-08-31 01:22:58 +0000 (Tue, 31 Aug 2010) Log Message: ----------- gettext: drop el package, quiet checkpkg about it Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2010-08-30 14:19:03 UTC (rev 10841) +++ csw/mgar/pkg/gettext/trunk/Makefile 2010-08-31 01:22:58 UTC (rev 10842) @@ -7,18 +7,16 @@ GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages endef -PACKAGES = CSWggettextrt CSWggettextdoc CSWggettext CSWggettextel +PACKAGES = CSWggettextrt CSWggettextdoc CSWggettext ARCHALL_CSWggettextel = 1 CATALOGNAME_CSWggettext = ggettext CATALOGNAME_CSWggettextdoc = ggettextdoc CATALOGNAME_CSWggettextrt = ggettextrt -CATALOGNAME_CSWggettextel = ggettextel SPKG_DESC_CSWggettext = GNU locale utilities and development headers SPKG_DESC_CSWggettextdoc = GNU locale documentation SPKG_DESC_CSWggettextrt = GNU locale runtime -SPKG_DESC_CSWggettextel = Emacs support for gettext po file editting ARCHALL_CSWggettextdoc = 1 COMPILE_ELISP = 1 @@ -55,7 +53,6 @@ RUNTIME_DEP_PKGS_CSWggettext = CSWggettextrt CSWiconv CSWexpat CSWncurses RUNTIME_DEP_PKGS_CSWggettext += CSWlibxml2 RUNTIME_DEP_PKGS_CSWggettextdoc = CSWggettext -RUNTIME_DEP_PKGS_CSWggettextel = CSWggettext CSWemacscommon #NOTE: gettext tests are sensitive to bash environment variables, make sure # custom paths are prefixed by $PATH, may be better to set aside @@ -77,13 +74,14 @@ PKGFILES_CSWggettextrt += /opt/csw/bin/ggettext.sh /opt/csw/share/java/libintl.jar PKGFILES_CSWggettextrt += /opt/csw/share/locale/.* PKGFILES_CSWggettextdoc = $(PKGFILES_DOC) -PKGFILES_CSWggettextel = .*site-lisp.* CHECKPKG_OVERRIDES_CSWggettextdoc += missing-dependency|CSWperl CHECKPKG_OVERRIDES_CSWggettextdoc += surplus-dependency|CSWggettext CHECKPKG_OVERRIDES_CSWggettextel += surplus-dependency|CSWggettext # This lib is legacy from the old versions and can't be updated (easily) CHECKPKG_OVERRIDES_CSWggettext += bad-rpath-entry|/export/home/phil/build/gettext-0.14.1/gettext-tools/intl/.libs|opt/csw/lib/sparcv9/libgettextlib-0.14.1.so +# just until checkpkg doesn't squawk about this. +CHECKPKG_OVERRIDES_CSWggettext += missing-dependency|CSWemacscommon include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Aug 31 12:28:20 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 31 Aug 2010 10:28:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[10843] csw/mgar/pkg/pius/trunk Message-ID: <E1OqO4i-0003Nx-Gl@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 10843 http://gar.svn.sourceforge.net/gar/?rev=10843&view=rev Author: wahwah Date: 2010-08-31 10:28:20 +0000 (Tue, 31 Aug 2010) Log Message: ----------- pius: Version bump to 2.0.7, fixing paths (bug https://www.opencsw.org/mantis/view.php?id=4522) Modified Paths: -------------- csw/mgar/pkg/pius/trunk/Makefile csw/mgar/pkg/pius/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pius/trunk/files/0001-Using-opt-csw-paths.patch Modified: csw/mgar/pkg/pius/trunk/Makefile =================================================================== --- csw/mgar/pkg/pius/trunk/Makefile 2010-08-31 01:22:58 UTC (rev 10842) +++ csw/mgar/pkg/pius/trunk/Makefile 2010-08-31 10:28:20 UTC (rev 10843) @@ -3,7 +3,7 @@ # $Id$ GARNAME = pius -GARVERSION = 2.0.3 +GARVERSION = 2.0.7 CATEGORIES = apps DESCRIPTION = A tool for signing and email all UIDs on a set of PGP keys. define BLURB @@ -20,6 +20,7 @@ BUILD_SCRIPTS = INSTALL_SCRIPTS = pius TEST_SCRIPTS = +PATCHFILES += 0001-Using-opt-csw-paths.patch include gar/category.mk Modified: csw/mgar/pkg/pius/trunk/checksums =================================================================== --- csw/mgar/pkg/pius/trunk/checksums 2010-08-31 01:22:58 UTC (rev 10842) +++ csw/mgar/pkg/pius/trunk/checksums 2010-08-31 10:28:20 UTC (rev 10843) @@ -1 +1,2 @@ -081aecec3d47c6e860e9cb5644e95cb3 pius-2.0.3.tar.bz2 +614a0f958ba698a9ac3c173ac1b6c4b6 0001-Using-opt-csw-paths.patch +285701ac118812f8fe00773938eae289 pius-2.0.7.tar.bz2 Added: csw/mgar/pkg/pius/trunk/files/0001-Using-opt-csw-paths.patch =================================================================== --- csw/mgar/pkg/pius/trunk/files/0001-Using-opt-csw-paths.patch (rev 0) +++ csw/mgar/pkg/pius/trunk/files/0001-Using-opt-csw-paths.patch 2010-08-31 10:28:20 UTC (rev 10843) @@ -0,0 +1,31 @@ +From c61133192236ba6fe94b82d9402488ae40048f4f Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski <maciej at opencsw.org> +Date: Tue, 31 Aug 2010 12:19:11 +0200 +Subject: [PATCH] Using /opt/csw paths. + +--- + pius | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pius b/pius +index b8ea27a..ed79f26 100755 +--- a/pius ++++ b/pius +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/opt/csw/bin/python + """A utility to sign all UIDs on a list of PGP keys and PGP/Mime encrypt-email + them to the respective emails.""" + +@@ -43,7 +43,7 @@ MODE_AGENT = 2 + + HOME = os.environ.get('HOME') + GNUPGHOME = os.environ.get('GNUPGHOME', os.path.join(HOME, '.gnupg')) +-DEFAULT_GPG_PATH = '/usr/bin/gpg' ++DEFAULT_GPG_PATH = '/opt/csw/bin/gpg' + DEFAULT_KEYRING = os.path.join(GNUPGHOME, 'pubring.gpg') + DEFAULT_TMP_DIR = '/tmp/pius_tmp' + DEFAULT_OUT_DIR = '/tmp/pius_out' +-- +1.7.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 Tue Aug 31 12:29:38 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 31 Aug 2010 10:29:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[10844] csw/mgar/pkg/pius/trunk/Makefile Message-ID: <E1OqO5y-0000TT-3Q@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 10844 http://gar.svn.sourceforge.net/gar/?rev=10844&view=rev Author: wahwah Date: 2010-08-31 10:29:37 +0000 (Tue, 31 Aug 2010) Log Message: ----------- pius: Adding the dependency on CSWgnupg Modified Paths: -------------- csw/mgar/pkg/pius/trunk/Makefile Modified: csw/mgar/pkg/pius/trunk/Makefile =================================================================== --- csw/mgar/pkg/pius/trunk/Makefile 2010-08-31 10:28:20 UTC (rev 10843) +++ csw/mgar/pkg/pius/trunk/Makefile 2010-08-31 10:29:37 UTC (rev 10844) @@ -13,7 +13,8 @@ SF_PROJ = pgpius DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -RUNTIME_DEP_PKGS = CSWpython +# What about CSWgnupg2? +RUNTIME_DEP_PKGS = CSWpython CSWgnupg ARCHALL = 1 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CONFIGURE_SCRIPTS = 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 Aug 31 13:09:37 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 31 Aug 2010 11:09:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[10845] csw/mgar/pkg/pius/trunk/Makefile Message-ID: <E1OqOif-0001eg-6A@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10845 http://gar.svn.sourceforge.net/gar/?rev=10845&view=rev Author: wahwah Date: 2010-08-31 11:09:36 +0000 (Tue, 31 Aug 2010) Log Message: ----------- pius: Adding overrides for dependencies. Modified Paths: -------------- csw/mgar/pkg/pius/trunk/Makefile Modified: csw/mgar/pkg/pius/trunk/Makefile =================================================================== --- csw/mgar/pkg/pius/trunk/Makefile 2010-08-31 10:29:37 UTC (rev 10844) +++ csw/mgar/pkg/pius/trunk/Makefile 2010-08-31 11:09:36 UTC (rev 10845) @@ -22,6 +22,8 @@ INSTALL_SCRIPTS = pius TEST_SCRIPTS = PATCHFILES += 0001-Using-opt-csw-paths.patch +CHECKPKG_OVERRIDES_CSWpius += surplus-dependency|CSWgnupg +CHECKPKG_OVERRIDES_CSWpius += surplus-dependency|CSWpython 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 Tue Aug 31 15:17:30 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 31 Aug 2010 13:17:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[10846] csw/mgar/pkg/dante/trunk Message-ID: <E1OqQiQ-0005MD-Ie@sfp-svn-6.v30.ch3.sourceforge.com> Revision: 10846 http://gar.svn.sourceforge.net/gar/?rev=10846&view=rev Author: skayser Date: 2010-08-31 13:17:30 +0000 (Tue, 31 Aug 2010) Log Message: ----------- dante: bump to 1.2.1 Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile csw/mgar/pkg/dante/trunk/checksums Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-08-31 11:09:36 UTC (rev 10845) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-08-31 13:17:30 UTC (rev 10846) @@ -13,7 +13,7 @@ # originate in our downrev Kerberos libs. # GARNAME = dante -GARVERSION = 1.2.0 +GARVERSION = 1.2.1 CATEGORIES = net DESCRIPTION = Dante SOCKS packages @@ -85,6 +85,7 @@ # Kerberos linking fails with the shipped libtool, so make ./configure # use /opt/csw/bin/libtool (similar to what Debian does). See # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5275 + # Disabled for now, c.f. "Known issues" at the top of this Makefile #gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ # $(WORKSRC)/configure @$(MAKECOOKIE) @@ -109,7 +110,8 @@ cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir)/socks.conf # /bin/sh doesn't understand "if ! test", reported to dante-bugs at inet.no - # Should be fixed in the next release, so upon version bump, verify and drop + # for 1.2.0. Should have be fixed in the next release, but wasn't with 1.2.1. + # Upon version bump, verify and drop if obsolete. gsed -i -e 's,/bin/sh,/usr/bin/bash,' $(DESTDIR)$(bindir)/socksify @$(MAKECOOKIE) Modified: csw/mgar/pkg/dante/trunk/checksums =================================================================== --- csw/mgar/pkg/dante/trunk/checksums 2010-08-31 11:09:36 UTC (rev 10845) +++ csw/mgar/pkg/dante/trunk/checksums 2010-08-31 13:17:30 UTC (rev 10846) @@ -1,2 +1 @@ -af00063243cc94e524497342982615cd dante-1.2.0.tar.gz -a38ad03fa8cc40b0ee527cb15e41fa9c man-conflocations.diff +8faa404af6e42c4bf9b784492c6041d7 dante-1.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Aug 31 15:40:18 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 31 Aug 2010 13:40:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[10847] csw/mgar/pkg/vsftpd/trunk Message-ID: <E1OqR4U-0004tb-AF@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 10847 http://gar.svn.sourceforge.net/gar/?rev=10847&view=rev Author: chninkel Date: 2010-08-31 13:40:17 +0000 (Tue, 31 Aug 2010) Log Message: ----------- vsftpd: updated to 2.3.2 and switched to GAR dynamic prototype Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW csw/mgar/pkg/vsftpd/trunk/files/destdir.patch Removed Paths: ------------- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2010-08-31 13:17:30 UTC (rev 10846) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2010-08-31 13:40:17 UTC (rev 10847) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = vsftpd -GARVERSION = 2.2.2 +GARVERSION = 2.3.2 CATEGORIES = server DESCRIPTION = A very secure and fast FTP server. @@ -31,11 +31,10 @@ RUNTIME_DEP_PKGS = CSWtcpwrap RUNTIME_DEP_PKGS += CSWosslrt -RUNTIME_DEP_PKGS += CSWcswclassutils # adding configuration handling classes # (init/smf classes are dynamically added in checkinstall) -SPKG_CLASSES = none cswpreserveconf cswusergroup cswinitsmf +#SPKG_CLASSES = none cswpreserveconf cswusergroup cswinitsmf ###### Upstream and opencsw files information ####### @@ -44,12 +43,16 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWvsftpd.prototype CSWvsftpd.preinstall +DISTFILES += CSWvsftpd.preinstall DISTFILES += changelog.CSW README.CSW DISTFILES += vsftpd.conf vsftpd.userlist DISTFILES += cswvsftpd cswvsftpd.xml vsftpd.smf_wrapper DISTFILES += cswusergroup +PRESERVECONF = /opt/csw/etc/vsftpd/vsftpd.conf /opt/csw/etc/vsftpd/vsftpd.userlist +USERGROUP = /opt/csw/etc/pkg/CSWvsftpd/cswusergroup +INITSMF = /etc/opt/csw/init.d/cswvsftpd + # build options are set by modifying # builddefs.h, so we patch it to enable # ssl and tcp wrapper support @@ -93,6 +96,10 @@ include gar/category.mk +# /opt/csw/include is not take in account +# by vsftp build system +CFLAGS += -I$(includedir) + # dummyinc must be the last include directory # to search ifeq ($(GARCOMPILER),GNU) @@ -110,7 +117,6 @@ ( ginstall -d $(DESTDIR)$(sbindir); \ ginstall -d $(DESTDIR)$(mandir)/man5; \ ginstall -d $(DESTDIR)$(mandir)/man8; \ - ln -sf $(DESTDIR)$(mandir) $(DESTDIR)$(prefix)/man; \ ginstall -d $(DESTDIR)$(docdir)/vsftpd ) @@ -132,3 +138,4 @@ done ginstall -D "$(WORKDIR_FIRSTMOD)/changelog.CSW" "$(PKGROOT)$(docdir)/vsftpd/changelog.CSW" ginstall -D "$(WORKDIR_FIRSTMOD)/README.CSW" "$(PKGROOT)$(docdir)/vsftpd/README.CSW" + Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2010-08-31 13:17:30 UTC (rev 10846) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2010-08-31 13:40:17 UTC (rev 10847) @@ -1,16 +1,15 @@ a2f5b70fe49839b0463c9d90af0f11dd CSWvsftpd.preinstall -8944fcd302add66d5b2b287d390b9c91 CSWvsftpd.prototype eeaf77528b2da0c7730323838f30b7ef README.CSW 281c51282cabd9475cceef363bbc699b build_options.patch -eb30bdbd51e7226289cf9606c318608b changelog.CSW +778420c7a9c47afb78eff3957f5d07a5 changelog.CSW 54c1c39c6bfa8747a4457f135fd5bca1 csw_build_system.patch a9e994d2b57999b76a0e03503745c01a csw_paths.patch 98e1d831801985daf5ce2ed01fbc0efd cswusergroup 796d46089f9e9c25c897a34e0dcfadc8 cswvsftpd 93173edf9931b8eb835c6d0177a7c6bd cswvsftpd.xml -73e59f9ada47d3d20199f7c97849fb13 destdir.patch +83d13bd15ec4c0de2695640b7407c700 destdir.patch a9a65f55cbfd01f9d72d1de25e67148d set_priv_sep_user.patch -6d6bc136af14c23f8fef6f1a51f55418 vsftpd-2.2.2.tar.gz +bad7b117d737a738738836041edc00db vsftpd-2.3.2.tar.gz f6ce22a6959b93e500a4ae800295c2ee vsftpd.conf 0d4a1cf36560892adb9eb9410a01c522 vsftpd.smf_wrapper 60c736802e2ce00c531953b01e4a26f6 vsftpd.userlist Deleted: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype 2010-08-31 13:17:30 UTC (rev 10846) +++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype 2010-08-31 13:40:17 UTC (rev 10847) @@ -1,62 +0,0 @@ -d none /opt/csw/etc/pkg/CSWvsftpd 0755 root bin -f cswinitsmf /etc/opt/csw/init.d/cswvsftpd 0755 root bin -d none /opt/csw/etc/vsftpd 0755 root bin -f cswpreserveconf /opt/csw/etc/vsftpd/vsftpd.conf.CSW 0644 root bin -f cswpreserveconf /opt/csw/etc/vsftpd/vsftpd.userlist.CSW 0644 root bin -f cswusergroup /opt/csw/etc/pkg/CSWvsftpd/cswusergroup 0644 root bin -f none /opt/csw/sbin/vsftpd 0755 root bin -f none /opt/csw/sbin/vsftpd.smf_wrapper 0755 root bin -d none /opt/csw/share/doc/vsftpd 0755 root bin -d none /opt/csw/share/doc/vsftpd/EXAMPLE 0755 root bin -d none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD 0755 root bin -f none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD/README 0644 root bin -f none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf 0644 root bin -d none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS_2 0755 root bin -f none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS_2/README 0644 root bin -d none /opt/csw/share/doc/vsftpd/EXAMPLE/PER_IP_CONFIG 0755 root bin -f none /opt/csw/share/doc/vsftpd/EXAMPLE/PER_IP_CONFIG/README 0644 root bin -f none /opt/csw/share/doc/vsftpd/EXAMPLE/PER_IP_CONFIG/hosts.allow 0644 root bin -d none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_HOSTS 0755 root bin -f none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_HOSTS/README 0644 root bin -d none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS 0755 root bin -f none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/logins.txt 0644 root bin -f none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/vsftpd.pam 0644 root bin -f none /opt/csw/share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/vsftpd.conf 0644 root bin -d none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE 0755 root bin -f none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.xinetd 0644 root bin -f none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/README 0644 root bin -f none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.conf 0644 root bin -f none /opt/csw/share/doc/vsftpd/README.CSW 0755 root bin -f none /opt/csw/share/doc/vsftpd/changelog.CSW 0644 root bin -f none /opt/csw/share/doc/vsftpd/AUDIT 0644 root bin -f none /opt/csw/share/doc/vsftpd/BENCHMARKS 0644 root bin -f none /opt/csw/share/doc/vsftpd/BUGS 0644 root bin -f none /opt/csw/share/doc/vsftpd/COPYING 0644 root bin -f none /opt/csw/share/doc/vsftpd/COPYRIGHT 0644 root bin -f none /opt/csw/share/doc/vsftpd/Changelog 0644 root bin -f none /opt/csw/share/doc/vsftpd/FAQ 0644 root bin -f none /opt/csw/share/doc/vsftpd/INSTALL 0644 root bin -f none /opt/csw/share/doc/vsftpd/LICENSE 0644 root bin -f none /opt/csw/share/doc/vsftpd/REFS 0644 root bin -f none /opt/csw/share/doc/vsftpd/REWARD 0644 root bin -d none /opt/csw/share/doc/vsftpd/SECURITY 0755 root bin -f none /opt/csw/share/doc/vsftpd/SECURITY/DESIGN 0644 root bin -f none /opt/csw/share/doc/vsftpd/SECURITY/IMPLEMENTATION 0644 root bin -f none /opt/csw/share/doc/vsftpd/SECURITY/OVERVIEW 0644 root bin -f none /opt/csw/share/doc/vsftpd/SECURITY/TRUST 0644 root bin -f none /opt/csw/share/doc/vsftpd/SIZE 0644 root bin -f none /opt/csw/share/doc/vsftpd/SPEED 0644 root bin -f none /opt/csw/share/doc/vsftpd/TODO 0644 root bin -f none /opt/csw/share/doc/vsftpd/TUNING 0644 root bin -f none /opt/csw/share/doc/vsftpd/README 0644 root bin -f none /opt/csw/share/doc/vsftpd/README.ssl 0644 root bin -f none /opt/csw/share/doc/vsftpd/README.security 0644 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -d none /opt/csw/share/man/man5 0755 root bin -f none /opt/csw/share/man/man5/vsftpd.conf.5 0644 root bin -d none /opt/csw/share/man/man8 0755 root bin -f none /opt/csw/share/man/man8/vsftpd.8 0644 root bin -d none /opt/csw/var/empty/vsftpd 0700 root sys -d none /opt/csw/var/ftp 0755 root sys -f none /var/opt/csw/svc/manifest/network/cswvsftpd.xml 0644 root sys Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2010-08-31 13:17:30 UTC (rev 10846) +++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2010-08-31 13:40:17 UTC (rev 10847) @@ -1,3 +1,10 @@ +vsftpd (2.3.2,REV=2010.08.31) unstable + + * New upstream version. + * [Build system] Switched to GAR dynamic prototype. + + -- Yann Rouillard <yann at opencsw.org> Tue, 31 Aug 2010 15:39:11 +0200 + vsftpd (2.2.2,REV=2009.12.04) unstable * New upstream version. Modified: csw/mgar/pkg/vsftpd/trunk/files/destdir.patch =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/destdir.patch 2010-08-31 13:17:30 UTC (rev 10846) +++ csw/mgar/pkg/vsftpd/trunk/files/destdir.patch 2010-08-31 13:40:17 UTC (rev 10847) @@ -14,9 +14,9 @@ - if [ -x /usr/local/man ]; then \ - $(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \ - $(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \ -+ if [ -x $(DESTDIR)/$(prefix)/man ]; then \ -+ $(INSTALL) -m 644 vsftpd.8 $(DESTDIR)/$(prefix)/man/man8/vsftpd.8; \ -+ $(INSTALL) -m 644 vsftpd.conf.5 $(DESTDIR)/$(prefix)/man/man5/vsftpd.conf.5; \ ++ if [ -x $(DESTDIR)/$(mandir) ]; then \ ++ $(INSTALL) -m 644 vsftpd.8 $(DESTDIR)/$(mandir)/man8/vsftpd.8; \ ++ $(INSTALL) -m 644 vsftpd.conf.5 $(DESTDIR)/$(mandir)/man5/vsftpd.conf.5; \ elif [ -x /usr/share/man ]; then \ $(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \ $(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \ 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 Aug 31 17:51:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 31 Aug 2010 15:51:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[10848] csw/mgar/pkg/sqlite3/trunk Message-ID: <E1OqT7Z-0003e4-5n@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 10848 http://gar.svn.sourceforge.net/gar/?rev=10848&view=rev Author: dmichelsen Date: 2010-08-31 15:51:36 +0000 (Tue, 31 Aug 2010) Log Message: ----------- sqlite3: Update to 3.7.2 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2010-08-31 13:40:17 UTC (rev 10847) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2010-08-31 15:51:36 UTC (rev 10848) @@ -1,5 +1,5 @@ GARNAME = sqlite3 -GARVERSION = 3.7.1 +GARVERSION = 3.7.2 CATEGORIES = lib DESCRIPTION = An embeddable SQL engine in a C library Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2010-08-31 13:40:17 UTC (rev 10847) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2010-08-31 15:51:36 UTC (rev 10848) @@ -1,4 +1,4 @@ fc9432136482bcde03102bc3e06dd413 copyright-release.html 80d638505872be7ffa238d43f0e268b2 gar-base.diff 1a2be927ceacfa534501b9f4675bce83 shell.c.diff -96bebad5f9009f0437d9878b8728dab6 sqlite-3.7.1.tar.gz +5f1853c4c1eba3330b6104f274918673 sqlite-3.7.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 Aug 31 18:09:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 31 Aug 2010 16:09:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[10849] csw/mgar/pkg/m4/trunk Message-ID: <E1OqTOZ-0000OC-6S@sfp-svn-5.v30.ch3.sourceforge.com> Revision: 10849 http://gar.svn.sourceforge.net/gar/?rev=10849&view=rev Author: dmichelsen Date: 2010-08-31 16:09:10 +0000 (Tue, 31 Aug 2010) Log Message: ----------- m4: Update to 1.4.15 Modified Paths: -------------- csw/mgar/pkg/m4/trunk/Makefile csw/mgar/pkg/m4/trunk/checksums Modified: csw/mgar/pkg/m4/trunk/Makefile =================================================================== --- csw/mgar/pkg/m4/trunk/Makefile 2010-08-31 15:51:36 UTC (rev 10848) +++ csw/mgar/pkg/m4/trunk/Makefile 2010-08-31 16:09:10 UTC (rev 10849) @@ -1,5 +1,5 @@ GARNAME = m4 -GARVERSION = 1.4.14 +GARVERSION = 1.4.15 CATEGORIES = utils DESCRIPTION = GNU m4 Unix macro processor Modified: csw/mgar/pkg/m4/trunk/checksums =================================================================== --- csw/mgar/pkg/m4/trunk/checksums 2010-08-31 15:51:36 UTC (rev 10848) +++ csw/mgar/pkg/m4/trunk/checksums 2010-08-31 16:09:10 UTC (rev 10849) @@ -1 +1 @@ -f0542d58f94c7d0ce0d01224e447be66 m4-1.4.14.tar.gz +5649a2e593b6c639deae9e72ede777dd m4-1.4.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Aug 31 18:28:51 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 31 Aug 2010 16:28:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[10850] csw/mgar/pkg/dante/trunk/files/changelog.CSW Message-ID: <E1OqThb-0004bd-2v@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 10850 http://gar.svn.sourceforge.net/gar/?rev=10850&view=rev Author: skayser Date: 2010-08-31 16:28:50 +0000 (Tue, 31 Aug 2010) Log Message: ----------- dante: update changelog.CSW Modified Paths: -------------- csw/mgar/pkg/dante/trunk/files/changelog.CSW Modified: csw/mgar/pkg/dante/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-08-31 16:09:10 UTC (rev 10849) +++ csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-08-31 16:28:50 UTC (rev 10850) @@ -1,3 +1,9 @@ +dante (1.2.1,REV=2010.08.31) + + * Version bump to 1.2.1. (Closes #4536) + + -- Sebastian Kayser <skayser at opencsw.org> Tue, 31 Aug 2010 18:27:54 +0200 + dante (1.2.0,REV=2010.01.12) * Updated libsocks package description This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Aug 31 18:59:37 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 31 Aug 2010 16:59:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[10852] csw/mgar/pkg/mercurial/trunk Message-ID: <E1OqUBN-0003GA-MJ@sfp-svn-4.v30.ch3.sourceforge.com> Revision: 10852 http://gar.svn.sourceforge.net/gar/?rev=10852&view=rev Author: rthurner Date: 2010-08-31 16:59:37 +0000 (Tue, 31 Aug 2010) Log Message: ----------- mercurial: upgrade to hg-1.6.3 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-08-31 16:57:22 UTC (rev 10851) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-08-31 16:59:37 UTC (rev 10852) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.6.2 +GARVERSION = 1.6.3 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2010-08-31 16:57:22 UTC (rev 10851) +++ csw/mgar/pkg/mercurial/trunk/checksums 2010-08-31 16:59:37 UTC (rev 10852) @@ -1 +1 @@ -847359d7488caf8074a69d4b87ca64d2 mercurial-1.6.2.tar.gz +fcd61edc488d1b9aa831dde6f14d9a13 mercurial-1.6.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Aug 31 23:56:32 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 31 Aug 2010 21:56:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[10854] csw/mgar/pkg/vsftpd/trunk Message-ID: <E1OqYoi-0007iJ-V4@sfp-svn-1.v30.ch3.sourceforge.com> Revision: 10854 http://gar.svn.sourceforge.net/gar/?rev=10854&view=rev Author: chninkel Date: 2010-08-31 21:56:32 +0000 (Tue, 31 Aug 2010) Log Message: ----------- vsftpd: fixed missing /var/empty directory in prototype Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums csw/mgar/pkg/vsftpd/trunk/files/cswusergroup Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2010-08-31 17:12:16 UTC (rev 10853) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2010-08-31 21:56:32 UTC (rev 10854) @@ -53,6 +53,13 @@ USERGROUP = /opt/csw/etc/pkg/CSWvsftpd/cswusergroup INITSMF = /etc/opt/csw/init.d/cswvsftpd +# The vsftpd user home directory has special rights +PROTOTYPE_MODIFIERS = empty +PROTOTYPE_FILES_empty = \/opt\/csw\/var\/empty\/vsftpd +PROTOTYPE_PERMS_empty = 0700 +PROTOTYPE_USER_empty = root +PROTOTYPE_GROUP_empty = sys + # build options are set by modifying # builddefs.h, so we patch it to enable # ssl and tcp wrapper support @@ -120,7 +127,7 @@ ginstall -d $(DESTDIR)$(docdir)/vsftpd ) -post-merge: merge-doc-files merge-config-files merge-init-file +post-merge: merge-doc-files merge-config-files merge-init-file merge-empty-directory merge-init-file: ginstall -D "$(WORKDIR_FIRSTMOD)/cswvsftpd" "$(PKGROOT)/etc/opt/csw/init.d/cswvsftpd" @@ -139,3 +146,5 @@ ginstall -D "$(WORKDIR_FIRSTMOD)/changelog.CSW" "$(PKGROOT)$(docdir)/vsftpd/changelog.CSW" ginstall -D "$(WORKDIR_FIRSTMOD)/README.CSW" "$(PKGROOT)$(docdir)/vsftpd/README.CSW" +merge-empty-directory: + ginstall -d "$(PKGROOT)$(localstatedir)/empty/vsftpd" Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2010-08-31 17:12:16 UTC (rev 10853) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2010-08-31 21:56:32 UTC (rev 10854) @@ -4,7 +4,7 @@ 778420c7a9c47afb78eff3957f5d07a5 changelog.CSW 54c1c39c6bfa8747a4457f135fd5bca1 csw_build_system.patch a9e994d2b57999b76a0e03503745c01a csw_paths.patch -98e1d831801985daf5ce2ed01fbc0efd cswusergroup +3dc08f17f383de22b400f1af00ff7ef6 cswusergroup 796d46089f9e9c25c897a34e0dcfadc8 cswvsftpd 93173edf9931b8eb835c6d0177a7c6bd cswvsftpd.xml 83d13bd15ec4c0de2695640b7407c700 destdir.patch Modified: csw/mgar/pkg/vsftpd/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/cswusergroup 2010-08-31 17:12:16 UTC (rev 10853) +++ csw/mgar/pkg/vsftpd/trunk/files/cswusergroup 2010-08-31 21:56:32 UTC (rev 10854) @@ -1,2 +1,2 @@ -vsftpd:vsftpd:vsftpd privsep user:/opt/csw/var/empty/vsftpd:/bin/false:: -ftp:nogroup:ftp user for anonymous access:/opt/csw/var/ftp:/bin/false:: +vsftpd:vsftpd:vsftpd privsep user:/opt/csw/var/empty/vsftpd:/bin/false:::NP +ftp:nogroup:ftp user for anonymous access:/opt/csw/var/ftp:/bin/false:y::NP This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Aug 31 18:57:22 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 31 Aug 2010 16:57:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[10851] csw/mgar/pkg/apr-util/trunk/Makefile Message-ID: <E1OqU9C-0005NX-Me@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 10851 http://gar.svn.sourceforge.net/gar/?rev=10851&view=rev Author: rthurner Date: 2010-08-31 16:57:22 +0000 (Tue, 31 Aug 2010) Log Message: ----------- apr-util - upgrade to bdb48 to make it compatible with subversion Modified Paths: -------------- csw/mgar/pkg/apr-util/trunk/Makefile Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2010-08-31 16:28:50 UTC (rev 10850) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2010-08-31 16:57:22 UTC (rev 10851) @@ -20,13 +20,13 @@ LICENSE = LICENSE RUNTIME_DEP_PKGS = CSWapr CSWiconv CSWsqlite3rt CSWunixodbc CSWexpat -RUNTIME_DEP_PKGS += CSWbdb47 CSWoldaprt CSWosslrt CSWsasl CSWlibnet +RUNTIME_DEP_PKGS += CSWbdb48 CSWoldaprt CSWosslrt CSWsasl CSWlibnet # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# We need this to get bdb47/lib into the runpath -EXTRA_LIB = $(prefix)/bdb47/lib +# We need this to get bdb48/lib into the runpath +EXTRA_LIB = $(prefix)/bdb48/lib # It looks like Solars 9 x86 has a problem with libuuid, investigate later: # testing9x# cd /usr/lib @@ -38,7 +38,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config CONFIGURE_ARGS += --with-ldap -CONFIGURE_ARGS += --with-berkeley-db=/opt/csw/bdb47 +CONFIGURE_ARGS += --with-berkeley-db=/opt/csw/bdb48 CONFIGURE_ARGS += --without-freetds --without-sqlite2 #BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Aug 31 19:12:16 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 31 Aug 2010 17:12:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[10853] csw/mgar/pkg/apr-util/trunk/Makefile Message-ID: <E1OqUNc-0005mD-LC@sfp-svn-3.v30.ch3.sourceforge.com> Revision: 10853 http://gar.svn.sourceforge.net/gar/?rev=10853&view=rev Author: rthurner Date: 2010-08-31 17:12:16 +0000 (Tue, 31 Aug 2010) Log Message: ----------- apr-util: remove surplus dependencies Modified Paths: -------------- csw/mgar/pkg/apr-util/trunk/Makefile Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2010-08-31 16:59:37 UTC (rev 10852) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2010-08-31 17:12:16 UTC (rev 10853) @@ -20,7 +20,7 @@ LICENSE = LICENSE RUNTIME_DEP_PKGS = CSWapr CSWiconv CSWsqlite3rt CSWunixodbc CSWexpat -RUNTIME_DEP_PKGS += CSWbdb48 CSWoldaprt CSWosslrt CSWsasl CSWlibnet +RUNTIME_DEP_PKGS += CSWbdb48 CSWoldaprt # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.