From bdwalton at users.sourceforge.net Thu Apr 1 03:40:36 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 01 Apr 2010 01:40:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9500] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9500 http://gar.svn.sourceforge.net/gar/?rev=9500&view=rev Author: bdwalton Date: 2010-04-01 01:40:36 +0000 (Thu, 01 Apr 2010) Log Message: ----------- ruby19: add checkpkg overrides for ruby vs ruby19 Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-03-31 18:30:14 UTC (rev 9499) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-04-01 01:40:36 UTC (rev 9500) @@ -34,6 +34,18 @@ ARCHALL_CSWruby19doc = 1 ARCHALL_CSWruby19ri = 1 +# checkpkg overrides +CHECKPKG_OVERRIDES_CSWruby19dev += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWruby19dev += surplus-dependency|CSWruby19 +CHECKPKG_OVERRIDES_CSWruby19doc += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWruby19doc += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWruby19doc += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWruby19doc += surplus-dependency|CSWruby19 +CHECKPKG_OVERRIDES_CSWruby19tk += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWruby19tk += surplus-dependency|CSWruby19 +CHECKPKG_OVERRIDES_CSWruby19 += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWruby19ri += surplus-dependency|CSWruby19 + RUNTIME_DEP_PKGS_CSWruby19 = CSWgdbm CSWiconv CSWncurses CSWosslrt RUNTIME_DEP_PKGS_CSWruby19 += CSWreadline CSWzlib RUNTIME_DEP_PKGS_CSWruby19doc = CSWruby19 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 Apr 1 04:04:49 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 01 Apr 2010 02:04:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9501] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9501 http://gar.svn.sourceforge.net/gar/?rev=9501&view=rev Author: bdwalton Date: 2010-04-01 02:04:48 +0000 (Thu, 01 Apr 2010) Log Message: ----------- ruby19: override libX11.so.4 linking via tk.so Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-04-01 01:40:36 UTC (rev 9500) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-04-01 02:04:48 UTC (rev 9501) @@ -45,6 +45,7 @@ CHECKPKG_OVERRIDES_CSWruby19tk += surplus-dependency|CSWruby19 CHECKPKG_OVERRIDES_CSWruby19 += missing-dependency|CSWruby CHECKPKG_OVERRIDES_CSWruby19ri += surplus-dependency|CSWruby19 +CHECKPKG_OVERRIDES_CSWruby19tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 RUNTIME_DEP_PKGS_CSWruby19 = CSWgdbm CSWiconv CSWncurses CSWosslrt RUNTIME_DEP_PKGS_CSWruby19 += CSWreadline CSWzlib 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 Apr 1 04:52:15 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 01 Apr 2010 02:52:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9502] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9502 http://gar.svn.sourceforge.net/gar/?rev=9502&view=rev Author: bdwalton Date: 2010-04-01 02:52:14 +0000 (Thu, 01 Apr 2010) Log Message: ----------- ruby19: correct the pkgfiles split for the ri package Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-04-01 02:04:48 UTC (rev 9501) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-04-01 02:52:14 UTC (rev 9502) @@ -64,7 +64,7 @@ PKGFILES_CSWruby19doc = $(docdir)/ruby19/sample.* -PKGFILES_CSWruby19ri = $(sharedir)/ri19.* $(bindir)/ri19 +PKGFILES_CSWruby19ri = $(datadir)/ri19.* $(bindir)/ri19 PKGFILES_CSWruby19tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb 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 Apr 1 11:13:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Apr 2010 09:13:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[9503] csw/mgar/pkg/libpcap/trunk Message-ID: Revision: 9503 http://gar.svn.sourceforge.net/gar/?rev=9503&view=rev Author: dmichelsen Date: 2010-04-01 09:13:38 +0000 (Thu, 01 Apr 2010) Log Message: ----------- libpcap: Update to 1.1.0 and throw out stuff no longer needed Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile csw/mgar/pkg/libpcap/trunk/checksums Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2010-04-01 02:52:14 UTC (rev 9502) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2010-04-01 09:13:38 UTC (rev 9503) @@ -1,5 +1,5 @@ GARNAME = libpcap -GARVERSION = 1.1 +GARVERSION = 1.1.0 CATEGORIES = lib DESCRIPTION = System-independent interface for user-level packet capture @@ -9,16 +9,13 @@ MASTER_SITES = http://www.tcpdump.org/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = $(GARNAME)-1.1 LICENSE = LICENSE # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# PATCHFILES = sf-bugtrack-2224954-fix-autoconf-header.diff -# PATCHFILES += sf-bugtrack-2504874-create-dir-patch.diff -# PATCHFILES += shared-library.diff - PACKAGES = CSWlibpcap CSWlibpcapdevel CATALOGNAME_CSWlibpcap = libpcap @@ -36,12 +33,6 @@ TEST_TARGET = check -EXTRA_CFLAGS = -I. - -EXTRA_CFLAGS_isa-sparcv9 = -xcode=pic32 -EXTRA_CFLAGS_isa-amd64 = -xcode=pic32 -EXTRA_CFLAGS += $(EXTRA_CFLAGS_isa-$(ISA)) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-ipv6 @@ -60,7 +51,3 @@ CHECKPKG_OVERRIDES_CSWlibpcapdevel += surplus-dependency|CSWlibpcap include gar/category.mk - -#post-install-modulated: -# ln -s libpcap.so.1.0.0 $(DESTDIR)$(libdir)/libpcap.so -# @$(MAKECOOKIE) Modified: csw/mgar/pkg/libpcap/trunk/checksums =================================================================== --- csw/mgar/pkg/libpcap/trunk/checksums 2010-04-01 02:52:14 UTC (rev 9502) +++ csw/mgar/pkg/libpcap/trunk/checksums 2010-04-01 09:13:38 UTC (rev 9503) @@ -1,2 +1 @@ -534cd879be5bd19e4927441402df945d libpcap-1.1.tar.gz -3115b52dbe16ed2b4174ed19fb63f2d6 shared-library.diff +534cd879be5bd19e4927441402df945d libpcap-1.1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Apr 1 11:17:49 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 01 Apr 2010 09:17:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9504] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 9504 http://gar.svn.sourceforge.net/gar/?rev=9504&view=rev Author: bonivart Date: 2010-04-01 09:17:48 +0000 (Thu, 01 Apr 2010) Log Message: ----------- clamav: update to 0.96 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-04-01 09:13:38 UTC (rev 9503) +++ csw/mgar/pkg/clamav/trunk/Makefile 2010-04-01 09:17:48 UTC (rev 9504) @@ -1,5 +1,5 @@ GARNAME = clamav -GARVERSION = 0.96rc1 +GARVERSION = 0.96 #DISTNAME = $(GARNAME)-devel-latest CATEGORIES = apps @@ -33,6 +33,8 @@ PATCHFILES = CSWclamav.freshclam.conf.p PATCHFILES += CSWclamav.clamd.conf.p +#GARCOMPILER = GCC4 + # Seems to be a compiler bug forcing us to use -xO2 instead of -xO3 # http://bugs.sun.com/view_bug.do?bug_id=6683773 # New bug filed since the above one isn't really solved, no bug id yet @@ -42,11 +44,15 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-clamav -CONFIGURE_ARGS += --enable-milter # unrecognized by 0.95rc1? CONFIGURE_ARGS += --with-sendmail=$(libdir)/sendmail CONFIGURE_ARGS += --with-dbdir=/var/opt/csw/$(GARNAME)/db CONFIGURE_ARGS += --localstatedir=/var/opt/csw/$(GARNAME) CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) +CONFIGURE_ARGS += --enable-milter +#CONFIGURE_ARGS += --enable-llvm +CONFIGURE_ARGS += --disable-llvm +#CONFIGURE_ARGS += --enable-check +CONFIGURE_ARGS += --enable-clamdtop EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2010-04-01 09:13:38 UTC (rev 9503) +++ csw/mgar/pkg/clamav/trunk/checksums 2010-04-01 09:17:48 UTC (rev 9504) @@ -1,3 +1,3 @@ a3238ed54a098b66a8e3e9f8bb0ca399 CSWclamav.clamd.conf.p 6c37b881661bf28741bb69045a642790 CSWclamav.freshclam.conf.p -6cb3a716f06f00c73def71aa72ff5f41 clamav-0.96rc1.tar.gz +28ac7bec4cc03627a8e2d6e8647ee661 clamav-0.96.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 Apr 1 12:13:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 01 Apr 2010 10:13:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[9505] csw/mgar/pkg/tcpdump/trunk Message-ID: Revision: 9505 http://gar.svn.sourceforge.net/gar/?rev=9505&view=rev Author: dmichelsen Date: 2010-04-01 10:13:22 +0000 (Thu, 01 Apr 2010) Log Message: ----------- tcpdump: Bump version to 4.1.0 Modified Paths: -------------- csw/mgar/pkg/tcpdump/trunk/Makefile csw/mgar/pkg/tcpdump/trunk/checksums Modified: csw/mgar/pkg/tcpdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpdump/trunk/Makefile 2010-04-01 09:17:48 UTC (rev 9504) +++ csw/mgar/pkg/tcpdump/trunk/Makefile 2010-04-01 10:13:22 UTC (rev 9505) @@ -1,5 +1,5 @@ GARNAME = tcpdump -GARVERSION = 4.1 +GARVERSION = 4.1.0 CATEGORIES = utils DESCRIPTION = Dump network traffic @@ -8,6 +8,7 @@ MASTER_SITES = http://www.tcpdump.org/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = $(GARNAME)-4.1 LICENSE = LICENSE Modified: csw/mgar/pkg/tcpdump/trunk/checksums =================================================================== --- csw/mgar/pkg/tcpdump/trunk/checksums 2010-04-01 09:17:48 UTC (rev 9504) +++ csw/mgar/pkg/tcpdump/trunk/checksums 2010-04-01 10:13:22 UTC (rev 9505) @@ -1 +1 @@ -949d4661a7501cfedf7b1eb858302c9c tcpdump-4.1.tar.gz +949d4661a7501cfedf7b1eb858302c9c tcpdump-4.1.0.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 Thu Apr 1 14:24:31 2010 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Thu, 01 Apr 2010 12:24:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9506] csw/mgar/pkg/tkcvs/trunk/Makefile Message-ID: Revision: 9506 http://gar.svn.sourceforge.net/gar/?rev=9506&view=rev Author: opk Date: 2010-04-01 12:24:31 +0000 (Thu, 01 Apr 2010) Log Message: ----------- fix script directly in the install-custom target as suggested by Dago Modified Paths: -------------- csw/mgar/pkg/tkcvs/trunk/Makefile Modified: csw/mgar/pkg/tkcvs/trunk/Makefile =================================================================== --- csw/mgar/pkg/tkcvs/trunk/Makefile 2010-04-01 10:13:22 UTC (rev 9505) +++ csw/mgar/pkg/tkcvs/trunk/Makefile 2010-04-01 12:24:31 UTC (rev 9506) @@ -29,13 +29,7 @@ LICENSE = COPYING ARCHALL = 1 RUNTIME_DEP_PKGS = CSWtcl CSWtk CSWtkdiff -POST_INSTALL_TARGETS := fixscript -# Script needs to run wish from /opt/csw -fixscript: - @echo " ==> Fixing wish path in tkcvs script" - perl -i -plne "s{^exec wish}{exec ${bindir}/wish}g" $(DESTDIR)$(prefix)/bin/tkcvs - include gar/category.mk TCL_FILES = $(filter-out %/tkcvs.tcl,$(wildcard $(WORKSRC)/tkcvs/*.tcl)) @@ -44,6 +38,7 @@ install-custom: @echo " ==> Installing $(GARNAME)" @ginstall -D $(WORKSRC)/tkcvs/tkcvs.tcl $(DESTDIR)$(prefix)/bin/tkcvs + perl -i -plne "s{^exec wish}{exec ${bindir}/wish}g" $(DESTDIR)$(prefix)/bin/tkcvs @ginstall -D $(WORKSRC)/tkcvs/tkcvs.1 $(DESTDIR)$(prefix)/share/man/man1/tkcvs.1 @ginstall -d $(DESTDIR)$(prefix)/lib/tkcvs/bitmaps @ginstall -m 644 $(TCL_FILES) $(WORKSRC)/tkcvs/tclIndex $(DESTDIR)$(prefix)/lib/tkcvs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Apr 1 18:50:10 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 01 Apr 2010 16:50:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9507] csw/mgar/pkg/mod_wsgi/trunk Message-ID: Revision: 9507 http://gar.svn.sourceforge.net/gar/?rev=9507&view=rev Author: rthurner Date: 2010-04-01 16:50:07 +0000 (Thu, 01 Apr 2010) Log Message: ----------- mod_wsgi-3.2 upgrade from mod_wsgi-3.1 Modified Paths: -------------- csw/mgar/pkg/mod_wsgi/trunk/Makefile csw/mgar/pkg/mod_wsgi/trunk/checksums Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/Makefile 2010-04-01 12:24:31 UTC (rev 9506) +++ csw/mgar/pkg/mod_wsgi/trunk/Makefile 2010-04-01 16:50:07 UTC (rev 9507) @@ -1,5 +1,5 @@ GARNAME = mod_wsgi -GARVERSION = 3.1 +GARVERSION = 3.2 CATEGORIES = lib DESCRIPTION = an Apache/Python WSGI adapter module Modified: csw/mgar/pkg/mod_wsgi/trunk/checksums =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/checksums 2010-04-01 12:24:31 UTC (rev 9506) +++ csw/mgar/pkg/mod_wsgi/trunk/checksums 2010-04-01 16:50:07 UTC (rev 9507) @@ -1,4 +1,4 @@ -f9aabdcd7a3f66a2319d10793477f9e9 mod_wsgi-3.1.tar.gz +7e4f7f443f562f21f61d1bd06defa1d8 mod_wsgi-3.2.tar.gz a2e8679f45232e56efbc352597ffe456 postinstall a67766841dedbaba0d7b15e7f08c8658 preremove 0dd379f20ceb32fc77bb3a9bf045097f space This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Apr 1 19:24:24 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 01 Apr 2010 17:24:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[9508] csw/mgar/pkg/mod_wsgi/trunk/Makefile Message-ID: Revision: 9508 http://gar.svn.sourceforge.net/gar/?rev=9508&view=rev Author: rthurner Date: 2010-04-01 17:24:23 +0000 (Thu, 01 Apr 2010) Log Message: ----------- mod_wsgi - update dependencies Modified Paths: -------------- csw/mgar/pkg/mod_wsgi/trunk/Makefile Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/Makefile 2010-04-01 16:50:07 UTC (rev 9507) +++ csw/mgar/pkg/mod_wsgi/trunk/Makefile 2010-04-01 17:24:23 UTC (rev 9508) @@ -13,7 +13,7 @@ PACKAGES = CSWap2modwsgi -RUNTIME_DEP_PKGS_CSWap2modwsgi = CSWap2prefork CSWpython-rt +RUNTIME_DEP_PKGS_CSWap2modwsgi = CSWpython CATALOGNAME_CSWap2modwsgi = ap2_modwsgi SPKG_DESC_CSWap2modwsgi = an Apache/Python WSGI adapter module This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Apr 1 21:17:58 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 01 Apr 2010 19:17:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9509] csw/mgar/pkg/mod_wsgi/trunk/Makefile Message-ID: Revision: 9509 http://gar.svn.sourceforge.net/gar/?rev=9509&view=rev Author: rthurner Date: 2010-04-01 19:17:58 +0000 (Thu, 01 Apr 2010) Log Message: ----------- mod_wsgi - declare license file Modified Paths: -------------- csw/mgar/pkg/mod_wsgi/trunk/Makefile Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/Makefile 2010-04-01 17:24:23 UTC (rev 9508) +++ csw/mgar/pkg/mod_wsgi/trunk/Makefile 2010-04-01 19:17:58 UTC (rev 9509) @@ -2,6 +2,7 @@ GARVERSION = 3.2 CATEGORIES = lib + DESCRIPTION = an Apache/Python WSGI adapter module define BLURB Mod_wsgi is a python WSGI adapter module for Apache. @@ -10,6 +11,7 @@ MASTER_SITES = http://modwsgi.googlecode.com/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += postinstall preremove space +LICENSE = LICENCE PACKAGES = CSWap2modwsgi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Apr 1 21:37:32 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 01 Apr 2010 19:37:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9510] csw/mgar/pkg/mod_wsgi/trunk/Makefile Message-ID: Revision: 9510 http://gar.svn.sourceforge.net/gar/?rev=9510&view=rev Author: rthurner Date: 2010-04-01 19:37:32 +0000 (Thu, 01 Apr 2010) Log Message: ----------- mod_wsgi - upercase test Modified Paths: -------------- csw/mgar/pkg/mod_wsgi/trunk/Makefile Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/Makefile 2010-04-01 19:17:58 UTC (rev 9509) +++ csw/mgar/pkg/mod_wsgi/trunk/Makefile 2010-04-01 19:37:32 UTC (rev 9510) @@ -3,7 +3,7 @@ CATEGORIES = lib -DESCRIPTION = an Apache/Python WSGI adapter module +DESCRIPTION = Apache/Python WSGI adapter module. define BLURB Mod_wsgi is a python WSGI adapter module for Apache. endef This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Apr 1 22:37:25 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 01 Apr 2010 20:37:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[9511] csw/mgar/pkg/mod_wsgi/trunk/Makefile Message-ID: Revision: 9511 http://gar.svn.sourceforge.net/gar/?rev=9511&view=rev Author: rthurner Date: 2010-04-01 20:37:25 +0000 (Thu, 01 Apr 2010) Log Message: ----------- mod_wsgi - remove unecessary things ... Modified Paths: -------------- csw/mgar/pkg/mod_wsgi/trunk/Makefile Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/Makefile 2010-04-01 19:37:32 UTC (rev 9510) +++ csw/mgar/pkg/mod_wsgi/trunk/Makefile 2010-04-01 20:37:25 UTC (rev 9511) @@ -17,11 +17,7 @@ RUNTIME_DEP_PKGS_CSWap2modwsgi = CSWpython CATALOGNAME_CSWap2modwsgi = ap2_modwsgi -SPKG_DESC_CSWap2modwsgi = an Apache/Python WSGI adapter module -#PATCHFILES = configure.diff -#PATCHFILES += connobject.diff - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Apr 1 23:22:30 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 01 Apr 2010 21:22:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9512] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 9512 http://gar.svn.sourceforge.net/gar/?rev=9512&view=rev Author: rthurner Date: 2010-04-01 21:22:30 +0000 (Thu, 01 Apr 2010) Log Message: ----------- apache2 upgrade to 2.2.15, and remove variables gmake was complaining 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-04-01 20:37:25 UTC (rev 9511) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-04-01 21:22:30 UTC (rev 9512) @@ -1,7 +1,7 @@ # $Id$ GARNAME = httpd -GARVERSION = 2.2.14 +GARVERSION = 2.2.15 CATEGORIES = server DESCRIPTION = A high performance HTTP server. @@ -15,13 +15,18 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # The PACKAGES variable tell GAR which packages to build -PACKAGES = CSWapache2 -# packages with dashes need this so gar does not thing -devel is a version number -# CATALOGNAME_CSWapache2-devel = apache2_devel +PACKAGES = CSWapache2 CSWapache2-devel # Descriptions for every package # SPKG_DESC_CSWapache2 = $(DESCRIPTION) +SPKG_DESC_CSWapache2-devel = Apache2 Development Support +CATALOGNAME_CSWapache2-devel = apache2_devel +ARCHALL_CSWapache2-devel = 1 +#PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWapache2-devel = $(APACHE_ROOT)/*.h + + # Contents for every package. # You don't define PKGFILES_CSWapache2, it's going to be the default, # catch-all package. Modified: csw/mgar/pkg/apache2/trunk/checksums =================================================================== --- csw/mgar/pkg/apache2/trunk/checksums 2010-04-01 20:37:25 UTC (rev 9511) +++ csw/mgar/pkg/apache2/trunk/checksums 2010-04-01 21:22:30 UTC (rev 9512) @@ -1,30 +1,8 @@ -03b893953995a59649b9afbc5253f9e1 CSWap2prefork.gspec -b30329626b94f5e22447c7032c4735b3 CSWap2prefork.postinstall -9df2944f619992604f78f477ff5e8c1f CSWap2prefork.postremove -f02746d1ed7d57d1171fc4c536451fdb CSWap2prefork.prototype -0dd379f20ceb32fc77bb3a9bf045097f CSWap2prefork.space -f90d0488f01ba57bffa88a4c1897ca28 CSWap2suexec.gspec -405bc4df4662e9faebe34f9b6a093d14 CSWap2suexec.postinstall -36128341749fa79f9942f4156b85f5b6 CSWap2suexec.preremove -27cc92536c2335868e727f4517a967db CSWap2suexec.prototype -020f593630a0d59a4e398814e0e02c0f CSWapache2-devel.gspec -557c1d7fea8d6cd6674be399c0ab10d5 CSWapache2-devel.prototype -cb25d4b9c4e32f9e308c84824a4ca8f3 CSWapache2-manual.gspec -03d560ad0cd320ead33dc6fa2e72ad4c CSWapache2-manual.prototype -1b57e8fd32556ee3a3d9fb2a908ddc6c CSWapache2.gspec 61b6b11aa70677da9386e90c3b5ba21c CSWapache2.killproc -d41d8cd98f00b204e9800998ecf8427e CSWapache2.prototype -68cf0129905c2aae52cd23e614a05eb6 CSWapache2c.gspec -e629a549294b2d91e8a0365c43d097cd CSWapache2c.postinstall -e9af24bf68414f2c1c571e344cc1227a CSWapache2c.prototype -0dd379f20ceb32fc77bb3a9bf045097f CSWapache2c.space -523b1f316a67090dfc08fe7506cb1aa0 CSWapache2rt.checkinstall -7546bc4336d9656e5b02e392264ce114 CSWapache2rt.gspec -602b5bc079c3dbf441e9d0b4e1bc3fc7 CSWapache2rt.prototype 308836569bf0cc1be27ac45e3123e0c2 apu-iconv.diff a7467a756cbd980d4cfe3c2cfb6a9e35 config.layout b3c2086facecc3f898d29f3c8c74da11 cswapache2 -2c1e3c7ba00bcaa0163da7b3e66aaa1e httpd-2.2.14.tar.gz +31fa022dc3c0908c6eaafe73c81c65df httpd-2.2.15.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 rthurner at users.sourceforge.net Thu Apr 1 23:58:44 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 01 Apr 2010 21:58:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9513] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 9513 http://gar.svn.sourceforge.net/gar/?rev=9513&view=rev Author: rthurner Date: 2010-04-01 21:58:44 +0000 (Thu, 01 Apr 2010) Log Message: ----------- apache2 - remove unnecessary depencencies, try to make checkpkg happy Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-04-01 21:22:30 UTC (rev 9512) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-04-01 21:58:44 UTC (rev 9513) @@ -10,6 +10,9 @@ best around in terms of functionality, efficiency, security and speed. endef +# work around dumb checkpkg not recognizing the license file ... +LICENSE = LICENCSE + include files/config.mk UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -41,11 +44,9 @@ DISTFILES += httpd-ssl.conf.CSW DISTFILES += update20to22 -RUNTIME_DEP_PKGS_CSWapache2 = CSWbdb CSWexpat CSWgdbm CSWiconv +RUNTIME_DEP_PKGS_CSWapache2 = CSWexpat CSWiconv RUNTIME_DEP_PKGS_CSWapache2 += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib -RUNTIME_DEP_PKGS_CSWapache2 += CSWsqlite3rt CSWsqlite3 CSWcswclassutils -RUNTIME_DEP_PKGS_CSWapache2 += CSWggettextrt CSWgsed -RUNTIME_DEP_PKGS_CSWapache2 += CSWperl +RUNTIME_DEP_PKGS_CSWapache2 += CSWsqlite3rt CSWcswclassutils # The SMF support: you don't need to specify cswinitsmf any more. You need to # make sure the the /etc/opt/csw/init.d/cswapache file gets installed during 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 Apr 2 00:39:20 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 01 Apr 2010 22:39:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9514] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 9514 http://gar.svn.sourceforge.net/gar/?rev=9514&view=rev Author: rthurner Date: 2010-04-01 22:39:20 +0000 (Thu, 01 Apr 2010) Log Message: ----------- apache2 - type in license file Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-04-01 21:58:44 UTC (rev 9513) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-04-01 22:39:20 UTC (rev 9514) @@ -11,7 +11,7 @@ endef # work around dumb checkpkg not recognizing the license file ... -LICENSE = LICENCSE +LICENSE = LICENSE include files/config.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Apr 2 10:00:15 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 02 Apr 2010 08:00:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9515] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 9515 http://gar.svn.sourceforge.net/gar/?rev=9515&view=rev Author: rthurner Date: 2010-04-02 08:00:15 +0000 (Fri, 02 Apr 2010) Log Message: ----------- mercurial - upgrade to hg-1.5.1 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-04-01 22:39:20 UTC (rev 9514) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-04-02 08:00:15 UTC (rev 9515) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.5 +GARVERSION = 1.5.1 CATEGORIES = devel DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2010-04-01 22:39:20 UTC (rev 9514) +++ csw/mgar/pkg/mercurial/trunk/checksums 2010-04-02 08:00:15 UTC (rev 9515) @@ -1 +1 @@ -6e31357ada35fe20557f08a4e89f9c42 mercurial-1.5.tar.gz +22eac5602d777f9601e23700e641503f mercurial-1.5.1.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 Apr 2 10:21:44 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 02 Apr 2010 08:21:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9516] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: Revision: 9516 http://gar.svn.sourceforge.net/gar/?rev=9516&view=rev Author: rthurner Date: 2010-04-02 08:21:43 +0000 (Fri, 02 Apr 2010) Log Message: ----------- mercurial - gar again changed so adjust ... Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-04-02 08:00:15 UTC (rev 9515) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-04-02 08:21:43 UTC (rev 9516) @@ -1,6 +1,6 @@ GARNAME = mercurial GARVERSION = 1.5.1 -CATEGORIES = devel +CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system #define BLURB @@ -11,18 +11,14 @@ SPKG_DESC_CSWmercurial = Mercurial -RUNTIME_DEP_PKGS_CSWmercurial = CSWpython - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py # Some tests fail, but manual inspection of the failures show no significant failures. -TEST_TARGET = #tests +TEST_SCRIPTS = +#TEST_TARGET = #tests -INSTALL_SCRIPTS = $(WORKSRC)/setup.py -INSTALL_ARGS += --root=$(DESTDIR) --prefix=/opt/csw - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Fri Apr 2 16:21:25 2010 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Fri, 02 Apr 2010 14:21:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[9517] csw/mgar/pkg/nagios/trunk Message-ID: Revision: 9517 http://gar.svn.sourceforge.net/gar/?rev=9517&view=rev Author: j_arndt Date: 2010-04-02 14:21:25 +0000 (Fri, 02 Apr 2010) Log Message: ----------- nagios: update to version 3.2.1 Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/Makefile csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype Added Paths: ----------- csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall Modified: csw/mgar/pkg/nagios/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios/trunk/Makefile 2010-04-02 08:21:43 UTC (rev 9516) +++ csw/mgar/pkg/nagios/trunk/Makefile 2010-04-02 14:21:25 UTC (rev 9517) @@ -1,5 +1,5 @@ GARNAME = nagios -GARVERSION = 3.2.0 +GARVERSION = 3.2.1 CATEGORIES = apps DESCRIPTION = nagios network monitoring base package (no plugins) @@ -9,20 +9,21 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -#DISTFILES += $(call admfiles,CSWnagios,checkinstall preinstall preremove prototype ) -DISTFILES += CSWnagios.checkinstall CSWnagios.preinstall CSWnagios.preremove CSWnagios.prototype +DISTFILES += CSWnagios.checkinstall CSWnagios.preinstall CSWnagios.preremove CSWnagios.prototype CSWnagios.postinstall DISTFILES += cswnagios PATCHFILES = patch.diff # cgi/cmd.c - GNU macro __attribute__ unknown to compiler # http://article.gmane.org/gmane.network.nagios.devel/4726 # (Error 2) -PATCHFILES += configure.diff # configure PATCHFILES += install-opts.diff # sets in every Makefile.in "INSTALL_OPT="" (empty) # necessary, so ginstall doesn't get -o and -g options PACKAGES = CSWnagios CATALOGNAME = nagios +PACKAGING_PLATFORMS = solaris9-sparc +PACKAGING_PLATFORMS += solaris9-i386 + RUNTIME_DEP_PKGS_CSWnagios = CSWapache2 CSWgd CSWglib2 CSWiconv CSWjpeg CSWlibtoolrt CSWggettextrt RUNTIME_DEP_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWap2modphp5 CSWcswclassutils @@ -48,7 +49,6 @@ CONFIGURE_ARGS += --localstatedir=/var$(prefix) EXTRA_LIB = $(BUILD_PREFIX)/lib -EXTRA_INC = $(BUILD_PREFIX)/include BUILD_ARGS = all Added: csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall (rev 0) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall 2010-04-02 14:21:25 UTC (rev 9517) @@ -0,0 +1,28 @@ +# +# just print out the warning because of the new config directory +# + +cat << EOF + +======================================================================= + +From Nagios 3.2.1 on the configuration and log files for this package +are stored in /etc/opt/csw/nagios/ and /var/opt/csw/nagios/. + +The standard config files will be moved automatically to the new +location. Files made by your own will remain in /opt/csw/nagios/etc/ +and have to be moved manually by you. + +Don't forget to change the pathes in your config files. Verify the +new config with the following command: + + /opt/csw/nagios/bin/nagios -v /etc/opt/csw/nagios/nagios.cfg + +You can find additional information at: + + http://wiki.opencsw.org/nagios + +======================================================================= +EOF + + Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2010-04-02 08:21:43 UTC (rev 9516) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2010-04-02 14:21:25 UTC (rev 9517) @@ -11,17 +11,23 @@ ======================================================================= -From Nagios 3.2.0 on the configuration and log files for the OpenCSW -package are stored in /etc/opt/csw/nagios/ and /var/opt/csw/nagios/. +From Nagios 3.2.1 on the configuration and log files for this package +are stored in /etc/opt/csw/nagios/ and /var/opt/csw/nagios/. -Changes you made to your existing config will automatically -moved to the new location. +The standard config files will be moved automatically to the new +location. Files made by your own will remain in /opt/csw/nagios/etc/ +and have to be moved manually by you. +Don't forget to change the pathes in your config files. Verify the +new config with the following command: -Please be aware, that it's very likely that you have to change your -nagios.cfg to that changes. + /opt/csw/nagios/bin/nagios -v /etc/opt/csw/nagios/nagios.cfg - Installation will proceed in 30 seconds. +You can find additional information at: + + http://wiki.opencsw.org/nagios + + The installation will proceed in 30 seconds. Press CTRL+C if you want to stop now. ======================================================================= Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2010-04-02 08:21:43 UTC (rev 9516) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2010-04-02 14:21:25 UTC (rev 9517) @@ -1,10 +1,7 @@ -d none /opt/csw/libexec 0755 root bin -d none /opt/csw/libexec/nagios-plugins 0755 nagios nagios -d none /opt/csw/nagios 0755 root bin -d none /opt/csw/nagios/bin 0755 nagios nagios -f none /opt/csw/nagios/bin/nagios 0754 nagios nagios -f none /opt/csw/nagios/bin/nagiostats 0754 nagios nagios -f none /opt/csw/nagios/bin/p1.pl 0754 nagios nagios +d none /etc/init.d 0755 nagios nagios +f none /etc/init.d/nagios 0755 nagios nagios +d none /etc/opt/csw/init.d 0755 nagios nagios +f cswinitsmf /etc/opt/csw/init.d/cswnagios 0755 root bin d none /etc/opt/csw/nagios 0755 nagios nagios f cswpreserveconf /etc/opt/csw/nagios/cgi.cfg.CSW 0644 nagios nagios f none /etc/opt/csw/nagios/httpd-nagios.conf 0644 nagios nagios @@ -19,6 +16,13 @@ f cswpreserveconf /etc/opt/csw/nagios/objects/timeperiods.cfg.CSW 0644 nagios nagios f cswpreserveconf /etc/opt/csw/nagios/objects/windows.cfg.CSW 0644 nagios nagios f cswpreserveconf /etc/opt/csw/nagios/resource.cfg.CSW 0640 nagios nagios +d none /opt/csw/libexec 0755 root bin +d none /opt/csw/libexec/nagios-plugins 0755 root bin +d none /opt/csw/nagios 0755 nagios nagios +d none /opt/csw/nagios/bin 0755 nagios nagios +f none /opt/csw/nagios/bin/nagios 0754 nagios nagios +f none /opt/csw/nagios/bin/nagiostats 0754 nagios nagios +f none /opt/csw/nagios/bin/p1.pl 0644 nagios nagios d none /opt/csw/nagios/sbin 0755 nagios nagios f none /opt/csw/nagios/sbin/avail.cgi 0755 nagios nagios f none /opt/csw/nagios/sbin/cmd.cgi 0755 nagios nagios @@ -384,15 +388,14 @@ f none /opt/csw/nagios/share/stylesheets/summary.css 0644 nagios nagios f none /opt/csw/nagios/share/stylesheets/tac.css 0644 nagios nagios f none /opt/csw/nagios/share/stylesheets/trends.css 0644 nagios nagios -d none /var/opt/csw/nagios 0755 nagios nagios -d none /var/opt/csw/nagios/archives 0755 nagios nagios -d none /var/opt/csw/nagios/rw 0755 nagios nagios -d none /var/opt/csw/nagios/spool 0755 nagios nagios -d none /var/opt/csw/nagios/spool/checkresults 0755 nagios nagios d none /opt/csw/share/doc/nagios 0755 root bin f none /opt/csw/share/doc/nagios/Changelog 0644 root bin f none /opt/csw/share/doc/nagios/INSTALLING 0644 root bin f none /opt/csw/share/doc/nagios/LICENSE 0644 root bin f none /opt/csw/share/doc/nagios/README 0644 root bin f none /opt/csw/share/doc/nagios/UPGRADING 0644 root bin -f cswinitsmf /etc/opt/csw/init.d/cswnagios 0755 root bin +d none /var/opt/csw/nagios 0755 nagios nagios +d none /var/opt/csw/nagios/archives 0755 nagios nagios +d none /var/opt/csw/nagios/rw 0755 nagios nagios +d none /var/opt/csw/nagios/spool 0755 nagios nagios +d none /var/opt/csw/nagios/spool/checkresults 0755 nagios nagios This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Fri Apr 2 16:26:44 2010 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Fri, 02 Apr 2010 14:26:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9518] csw/mgar/pkg/nagios/trunk/checksums Message-ID: Revision: 9518 http://gar.svn.sourceforge.net/gar/?rev=9518&view=rev Author: j_arndt Date: 2010-04-02 14:26:44 +0000 (Fri, 02 Apr 2010) Log Message: ----------- nagios: corrected checksums Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/checksums Modified: csw/mgar/pkg/nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios/trunk/checksums 2010-04-02 14:21:25 UTC (rev 9517) +++ csw/mgar/pkg/nagios/trunk/checksums 2010-04-02 14:26:44 UTC (rev 9518) @@ -1,9 +1,9 @@ -e407a4b179bd7de72b3e8c21f309f9b7 download/CSWnagios.checkinstall -5185cf1fded86e414e134710f075f4ed download/CSWnagios.preinstall -92437323de0cceaa58c6238ec9e6c954 download/CSWnagios.preremove -4aa71b54c0fa268116a41abc7f3f2b5d download/CSWnagios.prototype -e493345589ac2c592c2b958499bc8c20 download/configure.diff -0c26e222285ad2666ca0ecf6c85cebf8 download/cswnagios -f3161bcb7c65f89707ee37b0a8d861d5 download/install-opts.diff -3566167cc60ddeaad34e7d2e26ed4a58 download/nagios-3.2.0.tar.gz -91407bdea2047b6ff5a1542550933144 download/patch.diff +e407a4b179bd7de72b3e8c21f309f9b7 CSWnagios.checkinstall +e131ac989a8b7f10de8eb40fdd0b4120 CSWnagios.postinstall +7926d365165ee1ad76a7ddb5308bdbff CSWnagios.preinstall +92437323de0cceaa58c6238ec9e6c954 CSWnagios.preremove +7517d8088f0fbc36e37583aff84e3b31 CSWnagios.prototype +0c26e222285ad2666ca0ecf6c85cebf8 cswnagios +f3161bcb7c65f89707ee37b0a8d861d5 install-opts.diff +d4655ee8c95c9679fd4fd53dac34bbe3 nagios-3.2.1.tar.gz +91407bdea2047b6ff5a1542550933144 patch.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 Fri Apr 2 18:54:57 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 02 Apr 2010 16:54:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[9519] csw/mgar/pkg/ruby19/trunk Message-ID: Revision: 9519 http://gar.svn.sourceforge.net/gar/?rev=9519&view=rev Author: bdwalton Date: 2010-04-02 16:54:57 +0000 (Fri, 02 Apr 2010) Log Message: ----------- ruby19: reinstate multiconfig with updates for SOS12 instead of 11 Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile csw/mgar/pkg/ruby19/trunk/files/README.csw Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-04-02 14:26:44 UTC (rev 9518) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-04-02 16:54:57 UTC (rev 9519) @@ -109,16 +109,17 @@ COMPILE_ELISP = 1 -PI_TARGETS = samples rbconfig rbscripts +PI_TARGETS = samples rbconfig rbscripts multiconfig post-install-modulated: $(PI_TARGETS) @$(MAKECOOKIE) +multiconfig: RBCONFIG=/opt/csw/lib/ruby19/1.9.1/$(GARCH)-solaris2.9/rbconfig.rb multiconfig: @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" - @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS11 + @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS12 @gcp $(FILEDIR)/rbconfig.rb.GCC4.$(GARCH) $(DESTDIR)/$(RBCONFIG).GCC4 - @gln -n -s $(RBCONFIG).SOS11 $(DESTDIR)$(RBCONFIG) + @gln -n -s $(RBCONFIG).SOS12 $(DESTDIR)$(RBCONFIG) @gcp $(FILEDIR)/cswrbconfig $(DESTDIR)/opt/csw/bin/cswrbconfig19 @chmod 755 $(DESTDIR)/opt/csw/bin/cswrbconfig19 @ginstall -c -d -m 0755 $(DESTDIR)$(docdir)/$(GARNAME)/ Modified: csw/mgar/pkg/ruby19/trunk/files/README.csw =================================================================== --- csw/mgar/pkg/ruby19/trunk/files/README.csw 2010-04-02 14:26:44 UTC (rev 9518) +++ csw/mgar/pkg/ruby19/trunk/files/README.csw 2010-04-02 16:54:57 UTC (rev 9519) @@ -1,11 +1,13 @@ It is possible to switch rbconfig.rb files in order to use alternate compilation options or even compilers. CSWruby19 ships with settings -for Sun Studio 11 (what ruby was built with) and GCC4. Our +for Sun Studio 12 (what ruby was built with) and GCC4. Our distribution of ruby sees rbconfig.rb be a symlink to -rbconfig.rb.SOS11 by default. To switch your settings, use the -cswrbconfig19 tool provided. Running it with no arguments will -provide more details and list available configurations. +rbconfig.rb.SOS12 by default. +To switch your settings, use the cswrbconfig19 tool provided. Running +it with no arguments will provide more details and list available +configurations. + Please file a bug on CSWruby19 if you have problems using this tool. Ben Walton 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 Apr 2 21:18:35 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 02 Apr 2010 19:18:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[9520] csw/mgar/pkg/ruby19/trunk/files/cswrbconfig Message-ID: Revision: 9520 http://gar.svn.sourceforge.net/gar/?rev=9520&view=rev Author: bdwalton Date: 2010-04-02 19:18:35 +0000 (Fri, 02 Apr 2010) Log Message: ----------- ruby19: correct cswrbconfig for solaris 9 build Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/files/cswrbconfig Modified: csw/mgar/pkg/ruby19/trunk/files/cswrbconfig =================================================================== --- csw/mgar/pkg/ruby19/trunk/files/cswrbconfig 2010-04-02 16:54:57 UTC (rev 9519) +++ csw/mgar/pkg/ruby19/trunk/files/cswrbconfig 2010-04-02 19:18:35 UTC (rev 9520) @@ -1,7 +1,7 @@ #!/opt/csw/bin/ruby19 -w ARCH = %x{uname -p}.chomp -CONFD = "/opt/csw/lib/ruby/1.9.1/#{ARCH}-solaris2.8" +CONFD = "/opt/csw/lib/ruby/1.9.1/#{ARCH}-solaris2.9" RBC = File.join(CONFD, "rbconfig.rb") CUR_RBC = File.readlink(RBC).gsub(/.*\./, '') 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 Apr 3 00:04:56 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 02 Apr 2010 22:04:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[9521] csw/mgar/pkg/ruby19/trunk/files/cswrbconfig Message-ID: Revision: 9521 http://gar.svn.sourceforge.net/gar/?rev=9521&view=rev Author: bdwalton Date: 2010-04-02 22:04:56 +0000 (Fri, 02 Apr 2010) Log Message: ----------- ruby19: one more 1.9 specific tweak to cswrbconfig19 Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/files/cswrbconfig Modified: csw/mgar/pkg/ruby19/trunk/files/cswrbconfig =================================================================== --- csw/mgar/pkg/ruby19/trunk/files/cswrbconfig 2010-04-02 19:18:35 UTC (rev 9520) +++ csw/mgar/pkg/ruby19/trunk/files/cswrbconfig 2010-04-02 22:04:56 UTC (rev 9521) @@ -1,7 +1,7 @@ #!/opt/csw/bin/ruby19 -w ARCH = %x{uname -p}.chomp -CONFD = "/opt/csw/lib/ruby/1.9.1/#{ARCH}-solaris2.9" +CONFD = "/opt/csw/lib/ruby19/1.9.1/#{ARCH}-solaris2.9" RBC = File.join(CONFD, "rbconfig.rb") CUR_RBC = File.readlink(RBC).gsub(/.*\./, '') 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 Apr 3 04:25:09 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 03 Apr 2010 02:25:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[9522] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9522 http://gar.svn.sourceforge.net/gar/?rev=9522&view=rev Author: bdwalton Date: 2010-04-03 02:25:09 +0000 (Sat, 03 Apr 2010) Log Message: ----------- ruby19: tweak the sample code installation Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-04-02 22:04:56 UTC (rev 9521) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-04-03 02:25:09 UTC (rev 9522) @@ -136,7 +136,7 @@ samples: @mkdir -p $(DESTDIR)$(docdir)/$(GARNAME)/ @cp -R $(WORKSRC_FIRSTMOD)/sample $(DESTDIR)$(docdir)/$(GARNAME)/ - @for ext in bigdecimal dl tk ; do \ + @for ext in bigdecimal tk win32ole ; do \ cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample $(DESTDIR)$(docdir)/$(GARNAME)/sample/$$ext ; \ done @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Apr 3 11:13:12 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 03 Apr 2010 09:13:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9523] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 9523 http://gar.svn.sourceforge.net/gar/?rev=9523&view=rev Author: skayser Date: 2010-04-03 09:13:11 +0000 (Sat, 03 Apr 2010) Log Message: ----------- gar: tweak file download process (display URLs with colon, filter make errors - GAR does error handling anyway) 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-04-03 02:25:09 UTC (rev 9522) +++ csw/mgar/gar/v2/gar.lib.mk 2010-04-03 09:13:11 UTC (rev 9523) @@ -27,28 +27,32 @@ #################### FETCH RULES #################### -URLS = $(call URLSTRIP,$(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(ALLFILES_PATCHFILES)))) +URLS = $(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(ALLFILES_PATCHFILES))) # if the caller has defined _postinstall, etc targets for a package, add # these 'dynamic script' targets to our fetch list -URLS += $(foreach DYN,$(DYNSCRIPTS),dynscr//$(DYN)) +URLS += $(foreach DYN,$(DYNSCRIPTS),dynscr://$(DYN)) ifdef GIT_REPOS -URLS += $(foreach R,$(GIT_REPOS),gitrepo//$(call GITPROJ,$(R)) $(subst http,git-http,$(call URLSTRIP,$(R)))) +URLS += $(foreach R,$(GIT_REPOS),gitrepo://$(call GITPROJ,$(R)) $(subst http,git-http,$(call URLSTRIP,$(R)))) endif # Download the file if and only if it doesn't have a preexisting # checksum file. Loop through available URLs and stop when you # get one that doesn't return an error code. +# Note that GAR targets are used to download the URLs, thus: +# 1) we have to strip the colon from the URLs +# 2) the download is very costly with bigger Makefiles as they will be +# re-evaluated for every URL (nested gmake invocation, room for improvement) $(DOWNLOADDIR)/%: @if test -f $(COOKIEDIR)/checksum-$*; then : ; else \ echo " ==> Grabbing $@"; \ - for i in $(filter %/$*,$(URLS)); do \ + ( for i in $(filter %/$*,$(URLS)); do \ echo " ==> Trying $$i"; \ - $(MAKE) -s $$i || continue; \ + $(MAKE) -s `echo $$i | tr -d :` || continue; \ mv $(PARTIALDIR)/$* $@; \ break; \ - done; \ + done; ) 2>&1 | grep -v '^$(MAKE)'; \ if test -r $@ ; then : ; else \ echo '(!!!) Failed to download $@!' 1>&2; \ false; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Apr 3 14:44:05 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 03 Apr 2010 12:44:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[9524] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 9524 http://gar.svn.sourceforge.net/gar/?rev=9524&view=rev Author: rthurner Date: 2010-04-03 12:44:05 +0000 (Sat, 03 Apr 2010) Log Message: ----------- apache2 - initsmf file Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-04-03 09:13:11 UTC (rev 9523) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-04-03 12:44:05 UTC (rev 9524) @@ -52,6 +52,7 @@ # make sure the the /etc/opt/csw/init.d/cswapache file gets installed during # the post-install stage, and add "INITSMF = /etc/opt/csw/init.d/cswapache" to # the Makefile. +INITSMF = /etc/opt/csw/init.d/cswapache2 pre-configure-modulated: (cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); ./buildconf) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Apr 3 15:14:27 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 03 Apr 2010 13:14:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[9525] csw/mgar/pkg Message-ID: Revision: 9525 http://gar.svn.sourceforge.net/gar/?rev=9525&view=rev Author: rthurner Date: 2010-04-03 13:14:25 +0000 (Sat, 03 Apr 2010) Log Message: ----------- bdb50 - first try of berkely db 5.0 with sqlite like interface Added Paths: ----------- csw/mgar/pkg/bdb50/ csw/mgar/pkg/bdb50/branches/ csw/mgar/pkg/bdb50/tags/ csw/mgar/pkg/bdb50/trunk/ csw/mgar/pkg/bdb50/trunk/Makefile csw/mgar/pkg/bdb50/trunk/checksums csw/mgar/pkg/bdb50/trunk/files/ Property changes on: csw/mgar/pkg/bdb50/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/bdb50/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb50/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bdb50/trunk/Makefile 2010-04-03 13:14:25 UTC (rev 9525) @@ -0,0 +1,99 @@ +GARNAME = db +GARVERSION = 5.0.21 +CATEGORIES = lib + +DESCRIPTION = Berkeley DB 5.0 +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +MASTER_SITES = http://download.oracle.com/berkeley-db/ +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 + +WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix + +PATCHDIR = $(WORKSRC)/.. +PATCHDIRLEVEL = 0 +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(GARVERSION).%,$(PATCHFILES))) + +BUILD64 = 1 +NOISAEXEC = 1 + +CONFIGURE_SCRIPTS = dist + +prefix = $(BUILD_PREFIX)/bdb50 +docdir = $(BUILD_PREFIX)/share/doc + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-compat185 +CONFIGURE_ARGS += --enable-o_direct +# No longer there in 4.8 +#CONFIGURE_ARGS += --enable-rpc +CONFIGURE_ARGS += --enable-cxx +CONFIGURE_ARGS += --enable-java + +# Exclude TCL support for 64 bit until we have a 64 bit TCL +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) + +# bdb tests are *very* time consuming +TEST_SCRIPTS = + +PACKAGES = CSWbdb50 CSWbdb50devel CSWbdb50doc + +CATALOGNAME_CSWbdb50 = berkeleydb50 +CATALOGNAME_CSWbdb50devel = berkeleydb50_devel +CATALOGNAME_CSWbdb50doc = berkeleydb50_doc + +ARCHALL_CSWbdb50doc = 1 + +SPKG_DESC_CSWbdb50 = BerkeleyDB 5.0 embedded database libraries and utilities +SPKG_DESC_CSWbdb50devel = BerkeleyDB 5.0 development support +SPKG_DESC_CSWbdb50doc = BerkeleyDB 5.0 documentation + +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html + +RUNTIME_DEP_PKGS_CSWbdb50devel = CSWbdb50 + +LICENSE = LICENSE + +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb50),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar + +# Remove the license from share/doc/berkeleydb/license/.* +# because GAR expects license to be a file instead of a directory +EXTRA_MERGE_EXCLUDE_FILES = .*/license.* + +PKGFILES_CSWbdb50doc = $(PKGFILES_DOC) +PKGFILES_CSWbdb50devel = $(PKGFILES_DEVEL) + +include gar/category.mk + +LIBS += -lnsl +export LIBS + +PATH := /usr/jdk1.6.0_07/bin:$(PATH) +export PATH + +configure-dist: + @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) + @$(MAKECOOKIE) + +post-merge: + gln -s . $(PKGROOT)$(libdir)/32 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + Property changes on: csw/mgar/pkg/bdb50/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/bdb50/trunk/checksums =================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Apr 3 15:17:31 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 03 Apr 2010 13:17:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9526] csw/mgar/pkg/bdb50/trunk/checksums Message-ID: Revision: 9526 http://gar.svn.sourceforge.net/gar/?rev=9526&view=rev Author: rthurner Date: 2010-04-03 13:17:31 +0000 (Sat, 03 Apr 2010) Log Message: ----------- bdb50 - checksums Modified Paths: -------------- csw/mgar/pkg/bdb50/trunk/checksums Modified: csw/mgar/pkg/bdb50/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb50/trunk/checksums 2010-04-03 13:14:25 UTC (rev 9525) +++ csw/mgar/pkg/bdb50/trunk/checksums 2010-04-03 13:17:31 UTC (rev 9526) @@ -0,0 +1 @@ +9a749fd2e98fe15840493ddc34cc66d8 db-5.0.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Apr 3 15:39:33 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 03 Apr 2010 13:39:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[9527] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: Revision: 9527 http://gar.svn.sourceforge.net/gar/?rev=9527&view=rev Author: rthurner Date: 2010-04-03 13:39:33 +0000 (Sat, 03 Apr 2010) Log Message: ----------- hg-1.5.1 - change testsuite to use bash instead of sh, acc to ben walton and mads kiilerich Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-04-03 13:17:31 UTC (rev 9526) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-04-03 13:39:33 UTC (rev 9527) @@ -22,3 +22,9 @@ include gar/category.mk +pre-build-modulated: + @echo "Changing /bin/sh to /opt/csw/bin/bash in test scripts..." + @(cd $(WORKSRC)/tests; \ + ggrep -rl '#!/bin/sh' * | \ + xargs perl -pi -e 's|#!/bin/sh|#!/opt/csw/bin/bash|' ) + @$(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 Apr 3 17:04:47 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 03 Apr 2010 15:04:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9528] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9528 http://gar.svn.sourceforge.net/gar/?rev=9528&view=rev Author: bdwalton Date: 2010-04-03 15:04:47 +0000 (Sat, 03 Apr 2010) Log Message: ----------- ruby19: s/ruby19doc/ruby19samples/; update ruby19samples description Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-04-03 13:39:33 UTC (rev 9527) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-04-03 15:04:47 UTC (rev 9528) @@ -29,18 +29,18 @@ closures. endef -PACKAGES = CSWruby19 CSWruby19doc CSWruby19ri CSWruby19tk CSWruby19dev +PACKAGES = CSWruby19 CSWruby19samples CSWruby19ri CSWruby19tk CSWruby19dev -ARCHALL_CSWruby19doc = 1 +ARCHALL_CSWruby19samples = 1 ARCHALL_CSWruby19ri = 1 # checkpkg overrides CHECKPKG_OVERRIDES_CSWruby19dev += missing-dependency|CSWruby CHECKPKG_OVERRIDES_CSWruby19dev += surplus-dependency|CSWruby19 -CHECKPKG_OVERRIDES_CSWruby19doc += missing-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWruby19doc += missing-dependency|CSWruby -CHECKPKG_OVERRIDES_CSWruby19doc += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWruby19doc += surplus-dependency|CSWruby19 +CHECKPKG_OVERRIDES_CSWruby19samples += missing-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWruby19samples += missing-dependency|CSWruby +CHECKPKG_OVERRIDES_CSWruby19samples += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWruby19samples += surplus-dependency|CSWruby19 CHECKPKG_OVERRIDES_CSWruby19tk += missing-dependency|CSWruby CHECKPKG_OVERRIDES_CSWruby19tk += surplus-dependency|CSWruby19 CHECKPKG_OVERRIDES_CSWruby19 += missing-dependency|CSWruby @@ -49,12 +49,12 @@ RUNTIME_DEP_PKGS_CSWruby19 = CSWgdbm CSWiconv CSWncurses CSWosslrt RUNTIME_DEP_PKGS_CSWruby19 += CSWreadline CSWzlib -RUNTIME_DEP_PKGS_CSWruby19doc = CSWruby19 +RUNTIME_DEP_PKGS_CSWruby19samples = CSWruby19 RUNTIME_DEP_PKGS_CSWruby19tk = CSWruby19 CSWtk CSWtcl RUNTIME_DEP_PKGS_CSWruby19dev = CSWruby19 RUNTIME_DEP_PKGS_CSWruby19ri = CSWruby19 -SPKG_DESC_CSWruby19doc = Documentation for Ruby 1.9 +SPKG_DESC_CSWruby19samples = Example programs for Ruby 1.9 SPKG_DESC_CSWruby19ri = Ruby 1.9 Interactive Reference @@ -62,7 +62,7 @@ SPKG_DESC_CSWruby19dev = Ruby 1.9 Extension Development Files -PKGFILES_CSWruby19doc = $(docdir)/ruby19/sample.* +PKGFILES_CSWruby19samples = $(docdir)/ruby19/sample.* PKGFILES_CSWruby19ri = $(datadir)/ri19.* $(bindir)/ri19 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 Apr 3 19:00:12 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 03 Apr 2010 17:00:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9529] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9529 http://gar.svn.sourceforge.net/gar/?rev=9529&view=rev Author: bdwalton Date: 2010-04-03 17:00:12 +0000 (Sat, 03 Apr 2010) Log Message: ----------- ruby19: build the shared libraries Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-04-03 15:04:47 UTC (rev 9528) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-04-03 17:00:12 UTC (rev 9529) @@ -85,6 +85,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-suffix=19 CONFIGURE_ARGS += --enable-pthread +CONFIGURE_ARGS += --enable-shared EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib 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 Apr 3 21:09:00 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 03 Apr 2010 19:09:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9530] csw/mgar/pkg/ruby19/trunk/Makefile Message-ID: Revision: 9530 http://gar.svn.sourceforge.net/gar/?rev=9530&view=rev Author: bdwalton Date: 2010-04-03 19:09:00 +0000 (Sat, 03 Apr 2010) Log Message: ----------- ruby19: checkpkg: override missing soname for libruby19.so Modified Paths: -------------- csw/mgar/pkg/ruby19/trunk/Makefile Modified: csw/mgar/pkg/ruby19/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby19/trunk/Makefile 2010-04-03 17:00:12 UTC (rev 9529) +++ csw/mgar/pkg/ruby19/trunk/Makefile 2010-04-03 19:09:00 UTC (rev 9530) @@ -46,6 +46,8 @@ CHECKPKG_OVERRIDES_CSWruby19 += missing-dependency|CSWruby CHECKPKG_OVERRIDES_CSWruby19ri += surplus-dependency|CSWruby19 CHECKPKG_OVERRIDES_CSWruby19tk += linked-against-discouraged-library|tcltklib.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWruby19tk += soname-not-found|libruby19.so +CHECKPKG_OVERRIDES_CSWruby19 += soname-not-found|libruby19.so RUNTIME_DEP_PKGS_CSWruby19 = CSWgdbm CSWiconv CSWncurses CSWosslrt RUNTIME_DEP_PKGS_CSWruby19 += CSWreadline CSWzlib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Apr 3 22:58:25 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 03 Apr 2010 20:58:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[9531] csw/mgar/pkg/libproxy/trunk/Makefile Message-ID: Revision: 9531 http://gar.svn.sourceforge.net/gar/?rev=9531&view=rev Author: hson Date: 2010-04-03 20:58:25 +0000 (Sat, 03 Apr 2010) Log Message: ----------- Add support for Solaris 9 Add some checkpkg overrides Remove 64-bit binaries from package but keep 64-bit libraries. Modified Paths: -------------- csw/mgar/pkg/libproxy/trunk/Makefile Modified: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-04-03 19:09:00 UTC (rev 9530) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-04-03 20:58:25 UTC (rev 9531) @@ -20,9 +20,9 @@ DISTFILES += 0002-Dont-preset-CFLAGS.patch PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -#PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch # For Solaris 10 targets PATCHFILES_solaris10-sparc += SunStudio-have-no-stdc99-flag.patch PATCHFILES_solaris10-i386 += SunStudio-have-no-stdc99-flag.patch @@ -34,9 +34,19 @@ PATCHFILES_solaris8-i386_isa-i386 += Solaris8-have-no-stdc99-flag.patch PATCHFILES_solaris8-i386_isa-i386 += stdfiles.patch PATCHFILES_solaris8-i386_isa-i386 += proxy.c.patch +#For Solaris 9 targets +PATCHFILES_solaris9-sparc += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_solaris9-sparc += proxy.c.patch +PATCHFILES_solaris9-sparc += stdfiles.patch +PATCHFILES_solaris9-i386_isa-amd64 += SunStudio-have-no-stdc99-flag.patch +PATCHFILES_solaris9-i386_isa-i386 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_solaris9-i386_isa-i386 += stdfiles.patch +PATCHFILES_solaris9-i386_isa-i386 += proxy.c.patch +#For all targets +PATCHFILES += 0002-Dont-preset-CFLAGS.patch +# Merge them all together PATCHFILES += $(PATCHFILES_$(GAR_PLATFORM)) PATCHFILES += $(PATCHFILES_$(GAR_PLATFORM)_$(MODULATION)) -PATCHFILES += 0002-Dont-preset-CFLAGS.patch PACKAGES = CSWlibproxy CSWlibproxydevel CSWpy-libproxy @@ -53,14 +63,18 @@ SPKG_DESC_CSWlibproxygnome = $(DESCRIPTION) - gnome module RUNTIME_DEP_PKGS_CSWlibproxy += + RUNTIME_DEP_PKGS_CSWlibproxydevel += CSWlibproxy + RUNTIME_DEP_PKGS_CSWpy-libproxy += CSWpython CSWlibproxy + RUNTIME_DEP_PKGS_CSWlibproxygnome += CSWlibice RUNTIME_DEP_PKGS_CSWlibproxygnome += CSWlibproxy RUNTIME_DEP_PKGS_CSWlibproxygnome += CSWlibsm RUNTIME_DEP_PKGS_CSWlibproxygnome += CSWlibx11 RUNTIME_DEP_PKGS_CSWlibproxygnome += CSWlibxmu RUNTIME_DEP_PKGS_CSWlibproxygnome += CSWlibxt + RUNTIME_DEP_PKGS_CSWlibproxykde += CSWlibice RUNTIME_DEP_PKGS_CSWlibproxykde += CSWlibproxy RUNTIME_DEP_PKGS_CSWlibproxykde += CSWlibsm @@ -69,6 +83,13 @@ RUNTIME_DEP_PKGS_CSWlibproxykde += CSWlibxt BUILD_DEP_PKGS += CSWlibx11devel CSWlibxmudevel CSWlibdbusdev + +CHECKPKG_OVERRIDES_CSWpy-libproxy += surplus-dependency|CSWlibproxy +CHECKPKG_OVERRIDES_CSWlibproxy += soname-not-found|libm.so.2 +CHECKPKG_OVERRIDES_CSWlibproxykde += soname-not-found|libm.so.2 +CHECKPKG_OVERRIDES_CSWlibproxydevel += surplus-dependency|CSWlibproxy +CHECKPKG_OVERRIDES_CSWlibproxygnome += soname-not-found|libm.so.2 + #Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version #BUILD_DEP_PKGS += CSWmozilla CSWseamonkey CSWfirefox @@ -84,6 +105,9 @@ EXTRA_LINKER_FLAGS = -lnsl BUILD64 = 1 +# Skip 64 bit binaries - they are just big and gain nothing +MERGE_DIRS_isa-extra = $(libdir) + EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Apr 3 23:25:33 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 03 Apr 2010 21:25:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[9532] csw/mgar/pkg/libproxy/trunk/Makefile Message-ID: Revision: 9532 http://gar.svn.sourceforge.net/gar/?rev=9532&view=rev Author: hson Date: 2010-04-03 21:25:33 +0000 (Sat, 03 Apr 2010) Log Message: ----------- libproxy: Add NOISAEXEC Modified Paths: -------------- csw/mgar/pkg/libproxy/trunk/Makefile Modified: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-04-03 20:58:25 UTC (rev 9531) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-04-03 21:25:33 UTC (rev 9532) @@ -103,7 +103,9 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz EXTRA_LINKER_FLAGS = -lnsl + BUILD64 = 1 +NOISAEXEC = 1 # Skip 64 bit binaries - they are just big and gain nothing MERGE_DIRS_isa-extra = $(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Apr 4 09:41:08 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 04 Apr 2010 07:41:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9533] csw/mgar/pkg/xpdf/trunk/Makefile Message-ID: Revision: 9533 http://gar.svn.sourceforge.net/gar/?rev=9533&view=rev Author: hson Date: 2010-04-04 07:41:08 +0000 (Sun, 04 Apr 2010) Log Message: ----------- xpdf: xpdf and poppler is not compatible Modified Paths: -------------- csw/mgar/pkg/xpdf/trunk/Makefile Modified: csw/mgar/pkg/xpdf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xpdf/trunk/Makefile 2010-04-03 21:25:33 UTC (rev 9532) +++ csw/mgar/pkg/xpdf/trunk/Makefile 2010-04-04 07:41:08 UTC (rev 9533) @@ -13,6 +13,7 @@ or standard X fonts. endef +VENDOR_URL = http://www.foolabs.com/xpdf MASTER_SITES = ftp://ftp.foolabs.com/pub/xpdf/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz @@ -22,6 +23,9 @@ # we require RUNTIME_DEP_PKGS = CSWftype2 CSWt1lib CSWgsfonts +# poppler also has pdffonts, pdfimages et al. +INCOMPATIBLE_PKGS = CSWpoppler + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-t1-library=$(libdir) CONFIGURE_ARGS += --with-t1-includes=$(includedir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Apr 4 15:42:16 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 04 Apr 2010 13:42:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9534] csw/mgar/pkg/pixman/trunk Message-ID: Revision: 9534 http://gar.svn.sourceforge.net/gar/?rev=9534&view=rev Author: wbonnet Date: 2010-04-04 13:42:16 +0000 (Sun, 04 Apr 2010) Log Message: ----------- Upgrade to 0.18.0 Modified Paths: -------------- csw/mgar/pkg/pixman/trunk/Makefile csw/mgar/pkg/pixman/trunk/checksums Modified: csw/mgar/pkg/pixman/trunk/Makefile =================================================================== --- csw/mgar/pkg/pixman/trunk/Makefile 2010-04-04 07:41:08 UTC (rev 9533) +++ csw/mgar/pkg/pixman/trunk/Makefile 2010-04-04 13:42:16 UTC (rev 9534) @@ -1,5 +1,5 @@ GARNAME = pixman -GARVERSION = 0.17.10 +GARVERSION = 0.18.0 CATEGORIES = lib DESCRIPTION = The pixel-manipulation library for X and cairo Modified: csw/mgar/pkg/pixman/trunk/checksums =================================================================== --- csw/mgar/pkg/pixman/trunk/checksums 2010-04-04 07:41:08 UTC (rev 9533) +++ csw/mgar/pkg/pixman/trunk/checksums 2010-04-04 13:42:16 UTC (rev 9534) @@ -1,2 +1,2 @@ -6041fe8982cc4d1323adc47e629c7d13 pixman-0.17.10.tar.gz +a4fb870fc325be258089f1683642e976 pixman-0.18.0.tar.gz f78d71433a7d574ff66b7d2bf3ea2a49 pixman-private.h.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Apr 4 20:21:00 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 04 Apr 2010 18:21:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9535] csw/mgar/pkg/libbonobo2/trunk/Makefile Message-ID: Revision: 9535 http://gar.svn.sourceforge.net/gar/?rev=9535&view=rev Author: hson Date: 2010-04-04 18:20:59 +0000 (Sun, 04 Apr 2010) Log Message: ----------- libbonobo: Rename package, create stub package for legacy Modified Paths: -------------- csw/mgar/pkg/libbonobo2/trunk/Makefile Modified: csw/mgar/pkg/libbonobo2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libbonobo2/trunk/Makefile 2010-04-04 13:42:16 UTC (rev 9534) +++ csw/mgar/pkg/libbonobo2/trunk/Makefile 2010-04-04 18:20:59 UTC (rev 9535) @@ -6,13 +6,34 @@ define BLURB endef +VENDOR_URL = http://live.gnome.org/Bonobo MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PACKAGES = CSWlibbonobo CSWlibbonobo2 +CATALOGNAME_CSWlibbonobo = libbonobo +CATALOGNAME_CSWlibbonobo2 = libbonobo2 +SPKG_DESC_CSWlibbonobo = $(DESCRIPTION) +SPKG_DESC_CSWlibbonobo2 = $(DESCRIPTION) - stub package for legacy + +RUNTIME_DEP_PKGS_CSWlibbonobo += CSWdbusglib +RUNTIME_DEP_PKGS_CSWlibbonobo += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibbonobo += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibbonobo += CSWlibdbus +RUNTIME_DEP_PKGS_CSWlibbonobo += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibbonobo += CSWorbit2 + + +# Create a empty libbonobo2 packaage just for legacy purpose +RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibbonobo +PKGFILES_CSWlibbonobo2 = no files +ARCHALL_CSWlibbonobo2 = 1 +CHECKPKG_OVERRIDES_CSWlibbonobo2 += surplus-dependency|CSWlibbonobo + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -BUILD64 = 1 +#BUILD64 = 1 EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib @@ -21,7 +42,9 @@ CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check +# Tests fail for som unknown reason +#TEST_TARGET = check +TEST_TARGET = CPP = /usr/lib/cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Apr 4 21:02:47 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 04 Apr 2010 19:02:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9536] csw/mgar/pkg Message-ID: Revision: 9536 http://gar.svn.sourceforge.net/gar/?rev=9536&view=rev Author: hson Date: 2010-04-04 19:02:47 +0000 (Sun, 04 Apr 2010) Log Message: ----------- gconf-editor: Initial commit Added Paths: ----------- csw/mgar/pkg/gconf-editor/ csw/mgar/pkg/gconf-editor/branches/ csw/mgar/pkg/gconf-editor/tags/ csw/mgar/pkg/gconf-editor/trunk/ csw/mgar/pkg/gconf-editor/trunk/Makefile csw/mgar/pkg/gconf-editor/trunk/checksums csw/mgar/pkg/gconf-editor/trunk/files/ Property changes on: csw/mgar/pkg/gconf-editor/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/gconf-editor/trunk/Makefile =================================================================== --- csw/mgar/pkg/gconf-editor/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gconf-editor/trunk/Makefile 2010-04-04 19:02:47 UTC (rev 9536) @@ -0,0 +1,38 @@ +GARNAME = gconfeditor +GNOME_PROJ = gconf-editor +GARVERSION = 2.30.0 +CATEGORIES = gnome + +DESCRIPTION = GNOME configuration system editor +define BLURB +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GNOME_PROJ)-$(GARVERSION).tar.bz2 +DISTNAME = $(GNOME_PROJ)-$(GARVERSION) + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +#SPKG_SOURCEURL = http://projects.gnome.org/gconf/ + +BUILD64 = 1 +NOISAEXEC = 1 + +TEST_TARGET = check + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static=no +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/gconf-editor/trunk/checksums =================================================================== --- csw/mgar/pkg/gconf-editor/trunk/checksums (rev 0) +++ csw/mgar/pkg/gconf-editor/trunk/checksums 2010-04-04 19:02:47 UTC (rev 9536) @@ -0,0 +1 @@ +2a941e3c64843be69190f38891470580 gconf-editor-2.30.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Apr 4 21:12:22 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 04 Apr 2010 19:12:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[9537] csw/mgar/pkg Message-ID: Revision: 9537 http://gar.svn.sourceforge.net/gar/?rev=9537&view=rev Author: hson Date: 2010-04-04 19:12:22 +0000 (Sun, 04 Apr 2010) Log Message: ----------- taglib: Initial commit Added Paths: ----------- csw/mgar/pkg/taglib/ csw/mgar/pkg/taglib/Makefile csw/mgar/pkg/taglib/branches/ csw/mgar/pkg/taglib/tags/ csw/mgar/pkg/taglib/trunk/ csw/mgar/pkg/taglib/trunk/Makefile csw/mgar/pkg/taglib/trunk/checksums csw/mgar/pkg/taglib/trunk/files/ Added: csw/mgar/pkg/taglib/Makefile =================================================================== --- csw/mgar/pkg/taglib/Makefile (rev 0) +++ csw/mgar/pkg/taglib/Makefile 2010-04-04 19:12:22 UTC (rev 9537) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/taglib/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/taglib/trunk/Makefile =================================================================== --- csw/mgar/pkg/taglib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/taglib/trunk/Makefile 2010-04-04 19:12:22 UTC (rev 9537) @@ -0,0 +1,27 @@ +GARNAME = taglib +GARVERSION = 1.6.1 +CATEGORIES = lib + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://developer.kde.org/~wheeler/files/src/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +LICENSE = COPYING.MPL + +RUNTIME_DEP_PKGS_CSWtaglib += CSWzlib + +# UPSTREAM_MASTER_SITES = + +EXTRA_LD_FLAGS += -lCstd -lCrun -lc -lm + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/taglib/trunk/checksums =================================================================== --- csw/mgar/pkg/taglib/trunk/checksums (rev 0) +++ csw/mgar/pkg/taglib/trunk/checksums 2010-04-04 19:12:22 UTC (rev 9537) @@ -0,0 +1 @@ +db0502b3c3448ff1f1f9b090c1daa5f7 taglib-1.6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Apr 4 21:51:21 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 04 Apr 2010 19:51:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9538] csw/mgar/pkg/libgpod/trunk Message-ID: Revision: 9538 http://gar.svn.sourceforge.net/gar/?rev=9538&view=rev Author: hson Date: 2010-04-04 19:51:20 +0000 (Sun, 04 Apr 2010) Log Message: ----------- Update to 0.7.2 Switch to GAR v2 Switch from GCC to SOS12 Modified Paths: -------------- csw/mgar/pkg/libgpod/trunk/Makefile csw/mgar/pkg/libgpod/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/libgpod/trunk/ Property changes on: csw/mgar/pkg/libgpod/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/libgpod/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgpod/trunk/Makefile 2010-04-04 19:12:22 UTC (rev 9537) +++ csw/mgar/pkg/libgpod/trunk/Makefile 2010-04-04 19:51:20 UTC (rev 9538) @@ -1,5 +1,5 @@ GARNAME = libgpod -GARVERSION = 0.6.0 +GARVERSION = 0.7.2 CATEGORIES = lib DESCRIPTION = Interface to Apple iPods @@ -13,24 +13,35 @@ SF_PROJ = gtkpod MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibgpod,depend) +RUNTIME_DEP_PKGS_CSWlibgpod += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibgpod += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibgpod += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibgpod += CSWlibxml2 + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=67873 UPSTREAM_USE_SF = 1 UFILES_REGEX = $(GARNAME).(\d+(?:\.\d+)*) -GARCOMPILER = GNU +GARCOMPILER = SOS12 +#GARCOMPILER = GNU #GCC4 won't work. There are too many libtool deps using GCC3 -GNU_CC_HOME = /opt/csw/gcc3 +#GNU_CC_HOME = /opt/csw/gcc3 CONFIGURE_ARGS = $(DIRPATHS) --includedir=/opt/csw/include + TEST_SCRIPTS = -include gar/category.mk +STRIP_LIBTOOL=1 -post-install: remove-libtool-files +MSGFMT= /opt/csw/bin/gmsgfmt +MSGMERGE= /opt/csw/bin/gmsgmerge +XGETTEXT = /opt/csw/bin/gxgettext +GETTEXT = /opt/csw/bin/ggettext +export MSGMERGE +export MSGFMT +export XGETTEXT +export GETTEXT -remove-libtool-files: - (gfind $(DESTDIR)/opt/csw/lib -name \*.la -exec rm {} \;) - (gfind $(DESTDIR)/opt/csw/lib -name \*.a -exec rm {} \;) +include gar/category.mk Modified: csw/mgar/pkg/libgpod/trunk/checksums =================================================================== --- csw/mgar/pkg/libgpod/trunk/checksums 2010-04-04 19:12:22 UTC (rev 9537) +++ csw/mgar/pkg/libgpod/trunk/checksums 2010-04-04 19:51:20 UTC (rev 9538) @@ -1,3 +1 @@ -b44d8aee3f6610370b6faf61770c5f3c download/libgpod-0.6.0.tar.gz -c24b831ff31a6675b53bdba73705a3e4 download/CSWlibgpod.gspec -86df25973a5119c4e23136f14c9712fc download/CSWlibgpod.depend +1ec69c3a19fb071b1639cdcaf68463c1 libgpod-0.7.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Apr 4 22:03:00 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 04 Apr 2010 20:03:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9539] csw/mgar/pkg/gtkpod/trunk Message-ID: Revision: 9539 http://gar.svn.sourceforge.net/gar/?rev=9539&view=rev Author: hson Date: 2010-04-04 20:03:00 +0000 (Sun, 04 Apr 2010) Log Message: ----------- Update to 0.99.14 Switch to GAR v2 Modified Paths: -------------- csw/mgar/pkg/gtkpod/trunk/Makefile csw/mgar/pkg/gtkpod/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/gtkpod/trunk/ Property changes on: csw/mgar/pkg/gtkpod/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/gtkpod/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtkpod/trunk/Makefile 2010-04-04 19:51:20 UTC (rev 9538) +++ csw/mgar/pkg/gtkpod/trunk/Makefile 2010-04-04 20:03:00 UTC (rev 9539) @@ -1,5 +1,5 @@ GARNAME = gtkpod -GARVERSION = 0.99.12 +GARVERSION = 0.99.14 CATEGORIES = apps DESCRIPTION = gtk2 application for Apple iPods @@ -11,27 +11,59 @@ Video. endef +VENDOR_URL = http://www.gtkpod.org SF_PROJ = gtkpod MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWgtkpod) -PATCHFILES = file_convert.diff +#PATCHFILES = file_convert.diff +PATCHFILES = configure.in.diff -# We define upstream file regex so we can be notifed of new upstream software release +RUNTIME_DEP_PKGS_CSWgtkpod += CSWcurlrt +RUNTIME_DEP_PKGS_CSWgtkpod += CSWfconfig +RUNTIME_DEP_PKGS_CSWgtkpod += CSWflac +RUNTIME_DEP_PKGS_CSWgtkpod += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtkpod += CSWgconf2 +RUNTIME_DEP_PKGS_CSWgtkpod += CSWggettextrt +RUNTIME_DEP_PKGS_CSWgtkpod += CSWglib2 +RUNTIME_DEP_PKGS_CSWgtkpod += CSWgnomevfs2 +RUNTIME_DEP_PKGS_CSWgtkpod += CSWgtk2 +RUNTIME_DEP_PKGS_CSWgtkpod += CSWlibatk +RUNTIME_DEP_PKGS_CSWgtkpod += CSWlibcairo +RUNTIME_DEP_PKGS_CSWgtkpod += CSWlibglade2 +RUNTIME_DEP_PKGS_CSWgtkpod += CSWlibgpod +RUNTIME_DEP_PKGS_CSWgtkpod += CSWlibid3tag +RUNTIME_DEP_PKGS_CSWgtkpod += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWgtkpod += CSWpango +RUNTIME_DEP_PKGS_CSWgtkpod += CSWpython +RUNTIME_DEP_PKGS_CSWgtkpod += CSWvorbis + UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=67873 UPSTREAM_USE_SF = 1 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) -GARCOMPILER = GNU +#GARCOMPILER = GNU -LIBDEPS += lib/libgpod - #libgpod uses a non-standard include path -EXTRA_INC=$(DESTDIR)/opt/csw/include/gpod-1.0 +#EXTRA_INC=$(DESTDIR)/opt/csw/include/gpod-1.0 +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_LDFLAGS = -lm + +CONFIGURE_SCRIPTS = $(WORKSRC)/autogen.sh $(WORKSRC)/configure + CONFIGURE_ARGS = $(DIRPATHS) -TEST_SCRIPTS = +TEST_TARGET = check +MSGFMT= /opt/csw/bin/gmsgfmt +MSGMERGE= /opt/csw/bin/gmsgmerge +XGETTEXT = /opt/csw/bin/gxgettext +GETTEXT = /opt/csw/bin/ggettext +export MSGMERGE +export MSGFMT +export XGETTEXT +export GETTEXT + include gar/category.mk -LDFLAGS += -lvorbis Modified: csw/mgar/pkg/gtkpod/trunk/checksums =================================================================== --- csw/mgar/pkg/gtkpod/trunk/checksums 2010-04-04 19:51:20 UTC (rev 9538) +++ csw/mgar/pkg/gtkpod/trunk/checksums 2010-04-04 20:03:00 UTC (rev 9539) @@ -1,3 +1,2 @@ -13162a7e9912028922aafcf81d908394 download/gtkpod-0.99.12.tar.gz -841ed864508a52ef5b9c816c5172cd5e download/CSWgtkpod.gspec -6d4e3a003fb0d814a9957be6c39c969a download/file_convert.diff +f128f33140221897a56ccdb0571d085f configure.in.diff +f7948eceb955b302f4c47da4c0e1ec12 gtkpod-0.99.14.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 Sun Apr 4 23:34:32 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 04 Apr 2010 21:34:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9540] csw/mgar/pkg/ruby/trunk Message-ID: Revision: 9540 http://gar.svn.sourceforge.net/gar/?rev=9540&view=rev Author: bdwalton Date: 2010-04-04 21:34:32 +0000 (Sun, 04 Apr 2010) Log Message: ----------- ruby: patchlevel bump 174 -> 249 Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile csw/mgar/pkg/ruby/trunk/checksums Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2010-04-04 20:03:00 UTC (rev 9539) +++ csw/mgar/pkg/ruby/trunk/Makefile 2010-04-04 21:34:32 UTC (rev 9540) @@ -1,6 +1,6 @@ GARNAME = ruby DISTVERSION = 1.8.7 -PATCHLEVEL = p174 +PATCHLEVEL = p249 GARVERSION = $(DISTVERSION) CATEGORIES = lang Modified: csw/mgar/pkg/ruby/trunk/checksums =================================================================== --- csw/mgar/pkg/ruby/trunk/checksums 2010-04-04 20:03:00 UTC (rev 9539) +++ csw/mgar/pkg/ruby/trunk/checksums 2010-04-04 21:34:32 UTC (rev 9540) @@ -1,2 +1,2 @@ -36460ea6a145017c3ddd1173e903a511 download/rdoc_parse_order_fix.patch -88c45aaf627b4404e5e4273cb03ba2ee download/ruby-1.8.7-p174.tar.bz2 +36460ea6a145017c3ddd1173e903a511 rdoc_parse_order_fix.patch +37200cc956a16996bbfd25bb4068f242 ruby-1.8.7-p249.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Apr 5 01:38:43 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 04 Apr 2010 23:38:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9541] csw/mgar/pkg/gobject-introspection/trunk/Makefile Message-ID: Revision: 9541 http://gar.svn.sourceforge.net/gar/?rev=9541&view=rev Author: hson Date: 2010-04-04 23:38:43 +0000 (Sun, 04 Apr 2010) Log Message: ----------- gobject-introspection: Change package name, disable 64-bit until we have a 64-bit python Modified Paths: -------------- csw/mgar/pkg/gobject-introspection/trunk/Makefile Modified: csw/mgar/pkg/gobject-introspection/trunk/Makefile =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/Makefile 2010-04-04 21:34:32 UTC (rev 9540) +++ csw/mgar/pkg/gobject-introspection/trunk/Makefile 2010-04-04 23:38:43 UTC (rev 9541) @@ -12,18 +12,30 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -#PACKAGES = CSWgobjectintrospection CSWgobjectintrospectiondevel CSWjsonglibdoc -#CATALOGNAME_CSWgobjectintrospection = gobject_introspection -#CATALOGNAME_CSWgobjectintrospectiondevel = gobject_introspection_devel -#CATALOGNAME_CSWgobjectintrospectiondoc = gobject_introspection_doc +PACKAGES = CSWgobjintrospect CSWgobjintrospectdev +CATALOGNAME_CSWgobjintrospect = gobject_introspection +CATALOGNAME_CSWgobjintrospectdev = gobject_introspection_devel -#PKGFILES_CSWgobjectintrospectiondevel = $(PKGFILES_DEVEL) -#PKGFILES_CSWgobjectintrospectiondoc = $(sharedstatedir)/gtk-doc/.* +SPKG_DESC_CSWgobjintrospect = $(DESCRIPTION) +SPKG_DESC_CSWgobjintrospectdev = $(DESCRIPTION) - developer package -#ARCHALL_CSWgobjectintrospectiondoc = 1 +PKGFILES_CSWgobjintrospectdev = $(PKGFILES_DEVEL) +ARCHALL_CSWgobjintrospectdoc = 1 + BUILD_DEP_PKGS += CSWbison CSWlibffi +RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWggettextrt +RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWglib2 +RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWlibffi +RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWpython +RUNTIME_DEP_PKGS_CSWgobjintrospectdev += CSWgobjintrospect + +CHECKPKG_OVERRIDES_CSWgobjintrospect += symbol-not-found|g-ir-compiler +CHECKPKG_OVERRIDES_CSWgobjintrospect += symbol-not-found|g-ir-generate +CHECKPKG_OVERRIDES_CSWgobjintrospect += symbol-not-found|_giscanner.so + + PATCHFILES += gobject-introspection-01-ginvoke.diff PATCHFILES += gobject-introspection-02-glib-compilation.diff PATCHFILES += gobject-introspection-03-ginfo.diff @@ -38,8 +50,9 @@ EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -NOISAEXEC = 1 -BUILD64 = 1 +#NOISAEXEC = 1 +# Python isn't 64-bit yet +#BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --x-include=$(prefix)/X11/include @@ -49,6 +62,8 @@ CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + include gar/category.mk pre-configure-modulated: @@ -64,3 +79,4 @@ automake -a -c -f ; \ autoconf ; \ ) + $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Apr 5 02:18:02 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 05 Apr 2010 00:18:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[9542] csw/mgar/pkg/libffi/trunk Message-ID: Revision: 9542 http://gar.svn.sourceforge.net/gar/?rev=9542&view=rev Author: hson Date: 2010-04-05 00:18:02 +0000 (Mon, 05 Apr 2010) Log Message: ----------- libffi: Add patches Modified Paths: -------------- csw/mgar/pkg/libffi/trunk/Makefile csw/mgar/pkg/libffi/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libffi/trunk/files/Makefile.in.patch csw/mgar/pkg/libffi/trunk/files/ffi_common.h.patch csw/mgar/pkg/libffi/trunk/files/ffi_target.h.patch Removed Paths: ------------- csw/mgar/pkg/libffi/trunk/files/sun.patch Modified: csw/mgar/pkg/libffi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libffi/trunk/Makefile 2010-04-04 23:38:43 UTC (rev 9541) +++ csw/mgar/pkg/libffi/trunk/Makefile 2010-04-05 00:18:02 UTC (rev 9542) @@ -16,8 +16,11 @@ MASTER_SITES = ftp://sourceware.org/pub/libffi/ SPKG_SOURCEURL = http://sourceware.org/libffi/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -# Not needed unless using SOS12 compiler -#PATCHFILES = sun.patch +# Not needed unless using SOS compiler +#PATCHFILE += Makefile.in.patch +# Not really needed for build, but for SOS compiler using libffi +PATCHFILE += ffi_common.h.patch +PATCHFILE += ffi_target.h.patch PACKAGES = CSWlibffi CSWlibffidevel CATALOGNAME_CSWlibffi = libffi Modified: csw/mgar/pkg/libffi/trunk/checksums =================================================================== --- csw/mgar/pkg/libffi/trunk/checksums 2010-04-04 23:38:43 UTC (rev 9541) +++ csw/mgar/pkg/libffi/trunk/checksums 2010-04-05 00:18:02 UTC (rev 9542) @@ -1,2 +1 @@ 1f300a7a7f975d4046f51c3022fa5ff1 libffi-3.0.9.tar.gz -e888c31e7320d06c4268f3e3d90394a7 sun.patch Added: csw/mgar/pkg/libffi/trunk/files/Makefile.in.patch =================================================================== --- csw/mgar/pkg/libffi/trunk/files/Makefile.in.patch (rev 0) +++ csw/mgar/pkg/libffi/trunk/files/Makefile.in.patch 2010-04-05 00:18:02 UTC (rev 9542) @@ -0,0 +1,12 @@ +diff -Nru libffi-3.0.9.orig/Makefile.in libffi-3.0.9/Makefile.in +--- libffi-3.0.9.orig/Makefile.in 2009-12-31 13:41:43.000000000 +0100 ++++ libffi-3.0.9/Makefile.in 2010-01-30 08:19:09.733833212 +0100 +@@ -478,7 +478,7 @@ + $(am__append_24) $(am__append_25) + libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) + nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) +-AM_CFLAGS = -Wall -g -fexceptions ++AM_CFLAGS = + libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(AM_LTLDFLAGS) + AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src + AM_CCASFLAGS = $(AM_CPPFLAGS) Added: csw/mgar/pkg/libffi/trunk/files/ffi_common.h.patch =================================================================== --- csw/mgar/pkg/libffi/trunk/files/ffi_common.h.patch (rev 0) +++ csw/mgar/pkg/libffi/trunk/files/ffi_common.h.patch 2010-04-05 00:18:02 UTC (rev 9542) @@ -0,0 +1,12 @@ +diff -Nru libffi-3.0.9.orig/include/ffi_common.h libffi-3.0.9/include/ffi_common.h +--- libffi-3.0.9.orig/include/ffi_common.h 2009-12-29 16:22:26.000000000 +0100 ++++ libffi-3.0.9/include/ffi_common.h 2010-01-30 08:20:33.829433399 +0100 +@@ -84,7 +84,7 @@ + } extended_cif; + + /* Terse sized type definitions. */ +-#if defined(_MSC_VER) || defined(__sgi) ++#if defined(_MSC_VER) || defined(__sgi) || defined(__sun) + typedef unsigned char UINT8; + typedef signed char SINT8; + typedef unsigned short UINT16; Added: csw/mgar/pkg/libffi/trunk/files/ffi_target.h.patch =================================================================== --- csw/mgar/pkg/libffi/trunk/files/ffi_target.h.patch (rev 0) +++ csw/mgar/pkg/libffi/trunk/files/ffi_target.h.patch 2010-04-05 00:18:02 UTC (rev 9542) @@ -0,0 +1,25 @@ +diff -Nru libffi-3.0.9.orig/src/x86/ffitarget.h libffi-3.0.9/src/x86/ffitarget.h +--- libffi-3.0.9.orig/src/x86/ffitarget.h 2009-12-29 16:22:26.000000000 +0100 ++++ libffi-3.0.9/src/x86/ffitarget.h 2010-01-30 08:23:16.480398204 +0100 +@@ -31,7 +31,7 @@ + + /* ---- System specific configurations ----------------------------------- */ + +-#if defined (X86_64) && defined (__i386__) ++#if defined (X86_64) && (defined (__i386__) || defined (__i386)) + #undef X86_64 + #define X86 + #endif +@@ -74,10 +74,10 @@ + #else + + /* ---- Intel x86 and AMD x86-64 - */ +-#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__)) ++#if !defined(X86_WIN32) && (defined(__i386__) || defined(__i386) || defined(__x86_64__) || defined(__x86_64)) + FFI_SYSV, + FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */ +-#ifdef __i386__ ++#if defined(__i386__) || defined(__i386) + FFI_DEFAULT_ABI = FFI_SYSV, + #else + FFI_DEFAULT_ABI = FFI_UNIX64, Deleted: csw/mgar/pkg/libffi/trunk/files/sun.patch =================================================================== --- csw/mgar/pkg/libffi/trunk/files/sun.patch 2010-04-04 23:38:43 UTC (rev 9541) +++ csw/mgar/pkg/libffi/trunk/files/sun.patch 2010-04-05 00:18:02 UTC (rev 9542) @@ -1,49 +0,0 @@ -diff -Nru libffi-3.0.9.orig/Makefile.in libffi-3.0.9/Makefile.in ---- libffi-3.0.9.orig/Makefile.in 2009-12-31 13:41:43.000000000 +0100 -+++ libffi-3.0.9/Makefile.in 2010-01-30 08:19:09.733833212 +0100 -@@ -478,7 +478,7 @@ - $(am__append_24) $(am__append_25) - libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) - nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) --AM_CFLAGS = -Wall -g -fexceptions -+AM_CFLAGS = - libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(AM_LTLDFLAGS) - AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src - AM_CCASFLAGS = $(AM_CPPFLAGS) -diff -Nru libffi-3.0.9.orig/include/ffi_common.h libffi-3.0.9/include/ffi_common.h ---- libffi-3.0.9.orig/include/ffi_common.h 2009-12-29 16:22:26.000000000 +0100 -+++ libffi-3.0.9/include/ffi_common.h 2010-01-30 08:20:33.829433399 +0100 -@@ -84,7 +84,7 @@ - } extended_cif; - - /* Terse sized type definitions. */ --#if defined(_MSC_VER) || defined(__sgi) -+#if defined(_MSC_VER) || defined(__sgi) || defined(__sun) - typedef unsigned char UINT8; - typedef signed char SINT8; - typedef unsigned short UINT16; -diff -Nru libffi-3.0.9.orig/src/x86/ffitarget.h libffi-3.0.9/src/x86/ffitarget.h ---- libffi-3.0.9.orig/src/x86/ffitarget.h 2009-12-29 16:22:26.000000000 +0100 -+++ libffi-3.0.9/src/x86/ffitarget.h 2010-01-30 08:23:16.480398204 +0100 -@@ -31,7 +31,7 @@ - - /* ---- System specific configurations ----------------------------------- */ - --#if defined (X86_64) && defined (__i386__) -+#if defined (X86_64) && (defined (__i386__) || defined (__i386)) - #undef X86_64 - #define X86 - #endif -@@ -74,10 +74,10 @@ - #else - - /* ---- Intel x86 and AMD x86-64 - */ --#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__)) -+#if !defined(X86_WIN32) && (defined(__i386__) || defined(__i386) || defined(__x86_64__) || defined(__x86_64)) - FFI_SYSV, - FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */ --#ifdef __i386__ -+#if defined(__i386__) || defined(__i386) - FFI_DEFAULT_ABI = FFI_SYSV, - #else - FFI_DEFAULT_ABI = FFI_UNIX64, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Apr 5 11:11:17 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 05 Apr 2010 09:11:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9543] csw/mgar/pkg/libffi/trunk Message-ID: Revision: 9543 http://gar.svn.sourceforge.net/gar/?rev=9543&view=rev Author: hson Date: 2010-04-05 09:11:17 +0000 (Mon, 05 Apr 2010) Log Message: ----------- libffi:Move include files to devel package Modified Paths: -------------- csw/mgar/pkg/libffi/trunk/Makefile csw/mgar/pkg/libffi/trunk/checksums Modified: csw/mgar/pkg/libffi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libffi/trunk/Makefile 2010-04-05 00:18:02 UTC (rev 9542) +++ csw/mgar/pkg/libffi/trunk/Makefile 2010-04-05 09:11:17 UTC (rev 9543) @@ -17,10 +17,10 @@ SPKG_SOURCEURL = http://sourceware.org/libffi/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # Not needed unless using SOS compiler -#PATCHFILE += Makefile.in.patch +#PATCHFILES += Makefile.in.patch # Not really needed for build, but for SOS compiler using libffi -PATCHFILE += ffi_common.h.patch -PATCHFILE += ffi_target.h.patch +PATCHFILES += ffi_common.h.patch +PATCHFILES += ffi_target.h.patch PACKAGES = CSWlibffi CSWlibffidevel CATALOGNAME_CSWlibffi = libffi @@ -28,7 +28,8 @@ SPKG_DESC_CSWlibffi = $(DESCRIPTION) SPKG_DESC_CSWlibffidevel = $(DESCRIPTION) - developer package -PKGFILES_CSWlibffidevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibffidevel += $(PKGFILES_DEVEL) +PKGFILES_CSWlibffidevel += $(libdir)/.*/include/.* LICENSE = LICENSE Modified: csw/mgar/pkg/libffi/trunk/checksums =================================================================== --- csw/mgar/pkg/libffi/trunk/checksums 2010-04-05 00:18:02 UTC (rev 9542) +++ csw/mgar/pkg/libffi/trunk/checksums 2010-04-05 09:11:17 UTC (rev 9543) @@ -1 +1,3 @@ +c280f263ff0eab3248ea8abd9d0be21c ffi_common.h.patch +0e72bc1c6b8f797377f502e36b8df294 ffi_target.h.patch 1f300a7a7f975d4046f51c3022fa5ff1 libffi-3.0.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Apr 5 11:50:20 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 05 Apr 2010 09:50:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9544] csw/mgar/pkg/xpdf/trunk/Makefile Message-ID: Revision: 9544 http://gar.svn.sourceforge.net/gar/?rev=9544&view=rev Author: hson Date: 2010-04-05 09:50:19 +0000 (Mon, 05 Apr 2010) Log Message: ----------- xpdf: Split out utils colliding with poppler to separate package Modified Paths: -------------- csw/mgar/pkg/xpdf/trunk/Makefile Modified: csw/mgar/pkg/xpdf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xpdf/trunk/Makefile 2010-04-05 09:11:17 UTC (rev 9543) +++ csw/mgar/pkg/xpdf/trunk/Makefile 2010-04-05 09:50:19 UTC (rev 9544) @@ -20,12 +20,26 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWxpdf CSWxpdfutils +CATALOGNAME_CSWxpdf = xpdf +CATALOGNAME_CSWxpdfutils = xpdf_utils +SPKG_DESC_CSWxpdf = $(DESCRIPTION) +SPKG_DESC_CSWxpdfutils = $(DESCRIPTION) - utils + # we require RUNTIME_DEP_PKGS = CSWftype2 CSWt1lib CSWgsfonts # poppler also has pdffonts, pdfimages et al. -INCOMPATIBLE_PKGS = CSWpoppler +INCOMPATIBLE_PKGS_CSWxpdfutils = CSWpoppler +PKGFILES_CSWxpdf += $(call baseisadirs,$(bindir),[^/]*xpdf) +PKGFILES_CSWxpdf += $(sysconfdir)/.* +PKGFILES_CSWxpdf += $(mandir)/man.*/xpdf.* + +# Yes, we need gsfonts +CHECKPKG_OVERRIDES_CSWxpdfutils += surplus-dependency|CSWgsfonts +CHECKPKG_OVERRIDES_CSWxpdf += surplus-dependency|CSWgsfonts + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-t1-library=$(libdir) CONFIGURE_ARGS += --with-t1-includes=$(includedir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Mon Apr 5 14:29:09 2010 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Mon, 05 Apr 2010 12:29:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[9545] csw/mgar/pkg/nrpe/trunk Message-ID: Revision: 9545 http://gar.svn.sourceforge.net/gar/?rev=9545&view=rev Author: j_arndt Date: 2010-04-05 12:29:09 +0000 (Mon, 05 Apr 2010) Log Message: ----------- nrpe: fixed issues to pass checkpkg Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile csw/mgar/pkg/nrpe/trunk/checksums csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.prototype Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2010-04-05 09:50:19 UTC (rev 9544) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2010-04-05 12:29:09 UTC (rev 9545) @@ -2,8 +2,8 @@ GARVERSION = 2.12 CATEGORIES = apps -SPKG_DESC_CSWnrpe = nagios remote plugin executor -SPKG_DESC_CSWnrpeplugin = nagios plugin that connects to nrpe demon +SPKG_DESC_CSWnrpe = Nagios remote plugin executor +SPKG_DESC_CSWnrpeplugin = Nagios plugin that connects to nrpe demon define BLURB NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines. This allows you to monitor remote machine metrics (disk usage, CPU load, etc.). NRPE can also communicate with some of the Windows agent addons, so you can execute scripts and check metrics on remote Windows machines as well. @@ -32,7 +32,7 @@ CATALOGNAME_CSWnrpe = nrpe CATALOGNAME_CSWnrpeplugin = nrpe_plugin -RUNTIME_DEP_PKGS_CSWnrpe = CSWosslrt CSWtcpwrap CSWcswclassutils +RUNTIME_DEP_PKGS_CSWnrpe = CSWosslrt CSWtcpwrap RUNTIME_DEP_PKGS_CSWnrpeplugin = CSWosslrt SPKG_CLASSES_CSWnrpe = none cswusergroup cswpreserveconf cswinitsmf @@ -40,6 +40,8 @@ EXTRA_MODULATORS = SIZE MODULATIONS_SIZE = 1k 8k +LICENSE = LEGAL + NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/nrpe/trunk/checksums =================================================================== --- csw/mgar/pkg/nrpe/trunk/checksums 2010-04-05 09:50:19 UTC (rev 9544) +++ csw/mgar/pkg/nrpe/trunk/checksums 2010-04-05 12:29:09 UTC (rev 9545) @@ -1,10 +1,10 @@ -afe807962bd3d189e78a92f040b10eff download/CSWnrpe.preinstall -67dc14268283a23ac8ee9ae29614b6dc download/CSWnrpe.prototype -6eafe4b86758d91ac3fc4c0e759f25a0 download/CSWnrpeplugin.prototype -3bb2fbb228a6e2d0a99d981d82610d9a download/README_8k -36b85dd37d47a3813bfef5dee5804b61 download/common.h.diff -4b51476c782d2c5764d10f8ed530ada0 download/configure.diff -f7b166f02aa2cefb76fc235f6edd1745 download/cswnrpe -0a98ba4dd462e50f23239433117bae5e download/cswusergroup -b2d75e2962f1e3151ef58794d60c9e97 download/nrpe-2.12.tar.gz -5b02d4385daaea2a8c13903539aa6189 download/patch.diff +afe807962bd3d189e78a92f040b10eff CSWnrpe.preinstall +5e3db7d856aa07719aef0fcac537ad7f CSWnrpe.prototype +5598cf47118a6e8d2e8bdcd4a2c3ee16 CSWnrpeplugin.prototype +3bb2fbb228a6e2d0a99d981d82610d9a README_8k +36b85dd37d47a3813bfef5dee5804b61 common.h.diff +4b51476c782d2c5764d10f8ed530ada0 configure.diff +f7b166f02aa2cefb76fc235f6edd1745 cswnrpe +0a98ba4dd462e50f23239433117bae5e cswusergroup +b2d75e2962f1e3151ef58794d60c9e97 nrpe-2.12.tar.gz +5b02d4385daaea2a8c13903539aa6189 patch.diff Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype 2010-04-05 09:50:19 UTC (rev 9544) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype 2010-04-05 12:29:09 UTC (rev 9545) @@ -1,12 +1,11 @@ -d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/nrpe_1k 0775 root bin f none /opt/csw/bin/nrpe_8k 0775 root bin s none /opt/csw/bin/nrpe=/opt/csw/bin/nrpe_1k -d none /opt/csw/etc 0755 root bin f cswpreserveconf /etc/opt/csw/nrpe.cfg.CSW 0644 root bin d none /opt/csw/share/doc/nrpe 0755 root bin f none /opt/csw/share/doc/nrpe/NRPE.pdf 0644 root bin f none /opt/csw/share/doc/nrpe/LEGAL 0644 root bin +f none /opt/csw/share/doc/nrpe/license 0644 root bin f none /opt/csw/share/doc/nrpe/README 0644 root bin f none /opt/csw/share/doc/nrpe/README_8k 0644 root bin f none /opt/csw/share/doc/nrpe/README.SSL 0644 root bin @@ -15,5 +14,3 @@ f cswinitsmf /etc/opt/csw/init.d/cswnrpe 0755 root bin d none /opt/csw/etc/pkg/CSWnrpe 0755 root bin f cswusergroup /opt/csw/etc/pkg/CSWnrpe/cswusergroup 0644 root bin -i depend=CSWnrpe.depend -i pkginfo=CSWnrpe.pkginfo Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.prototype =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.prototype 2010-04-05 09:50:19 UTC (rev 9544) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.prototype 2010-04-05 12:29:09 UTC (rev 9545) @@ -3,5 +3,5 @@ f none /opt/csw/libexec/nagios-plugins/check_nrpe_8k 0775 root bin d none /opt/csw/share/doc/nrpe 0755 root bin f none /opt/csw/share/doc/nrpe/README_8k 0644 root bin -i depend=CSWnrpeplugin.depend -i pkginfo=CSWnrpeplugin.pkginfo +d none /opt/csw/share/doc/nrpe_plugin 0755 root bin +f none /opt/csw/share/doc/nrpe_plugin/license 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Mon Apr 5 14:37:57 2010 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Mon, 05 Apr 2010 12:37:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[9546] csw/mgar/pkg/nsca/trunk Message-ID: Revision: 9546 http://gar.svn.sourceforge.net/gar/?rev=9546&view=rev Author: j_arndt Date: 2010-04-05 12:37:57 +0000 (Mon, 05 Apr 2010) Log Message: ----------- nsca: fixed issues to pass checkpkg Modified Paths: -------------- csw/mgar/pkg/nsca/trunk/Makefile csw/mgar/pkg/nsca/trunk/checksums csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype Modified: csw/mgar/pkg/nsca/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsca/trunk/Makefile 2010-04-05 12:29:09 UTC (rev 9545) +++ csw/mgar/pkg/nsca/trunk/Makefile 2010-04-05 12:37:57 UTC (rev 9546) @@ -2,8 +2,8 @@ GARVERSION = 2.7.2 CATEGORIES = apps -SPKG_DESC_CSWnsca = nagios service check acceptor -SPKG_DESC_CSWsendnsca = sends check results to nsca daemon +SPKG_DESC_CSWnsca = Nagios service check acceptor +SPKG_DESC_CSWsendnsca = Sends check results to nsca daemon define BLURB NSCA allows you to integrate passive alerts and checks from remote machines and applications with Nagios. Useful for processing security alerts, as well as redundant and distributed Nagios setups. @@ -32,8 +32,8 @@ CATALOGNAME_CSWnsca = nsca CATALOGNAME_CSWsendnsca = send_nsca -RUNTIME_DEP_PKGS_CSWnsca = CSWlibmcrypt CSWlibtoolrt CSWcswclassutils -RUNTIME_DEP_PKGS_CSWsendnsca = CSWlibmcrypt CSWlibtoolrt CSWcswclassutils +RUNTIME_DEP_PKGS_CSWnsca = CSWlibmcrypt CSWlibtoolrt +RUNTIME_DEP_PKGS_CSWsendnsca = CSWlibmcrypt CSWlibtoolrt SPKG_CLASSES_CSWnsca = none cswusergroup cswpreserveconf cswinitsmf SPKG_CLASSES_CSWsendnsca = none cswusergroup cswpreserveconf @@ -44,6 +44,8 @@ CONFIGURE_ARGS += --with-nsca-port=5667 CONFIGURE_ARGS += --localstatedir=/var/opt/csw/nagios +LICENSE = LEGAL + BUILD_TARGETS = nsca SKIPTEST = 1 Modified: csw/mgar/pkg/nsca/trunk/checksums =================================================================== --- csw/mgar/pkg/nsca/trunk/checksums 2010-04-05 12:29:09 UTC (rev 9545) +++ csw/mgar/pkg/nsca/trunk/checksums 2010-04-05 12:37:57 UTC (rev 9546) @@ -1,9 +1,9 @@ -e9ed8b90404f0aebfc6f77355d8c9bbe download/CSWnsca.cswusergroup -ec54b953469889200d99a86669653173 download/CSWnsca.preinstall -c9578d6892ce725133fcef365adcc6fe download/CSWnsca.prototype -0a98ba4dd462e50f23239433117bae5e download/CSWsendnsca.cswusergroup -e275462ffbf488fe5f7e29dd3abab0ae download/CSWsendnsca.preinstall -d8d3eeee6cb8fbc3534734590d83a13b download/CSWsendnsca.prototype -55a1c5523b2fe1ee66b45a2807e80bd6 download/cswnsca -33a98e7975f633a9489d7a8938ed6131 download/nsca-2.7.2.tar.gz -cbb38cacd3ca318f00dfa0877b6017df download/submit_check_results.diff +e9ed8b90404f0aebfc6f77355d8c9bbe CSWnsca.cswusergroup +ec54b953469889200d99a86669653173 CSWnsca.preinstall +42ca77e782a25c8354df8f53eb769ae6 CSWnsca.prototype +0a98ba4dd462e50f23239433117bae5e CSWsendnsca.cswusergroup +e275462ffbf488fe5f7e29dd3abab0ae CSWsendnsca.preinstall +3e2a2fa1f5209b3bbee1b3822164e7f6 CSWsendnsca.prototype +55a1c5523b2fe1ee66b45a2807e80bd6 cswnsca +33a98e7975f633a9489d7a8938ed6131 nsca-2.7.2.tar.gz +cbb38cacd3ca318f00dfa0877b6017df submit_check_results.diff Modified: csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype 2010-04-05 12:29:09 UTC (rev 9545) +++ csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype 2010-04-05 12:37:57 UTC (rev 9546) @@ -1,6 +1,7 @@ 1 f none /opt/csw/nagios/bin/nsca 0755 root bin 1 f cswpreserveconf /etc/opt/csw/nagios/nsca.cfg.CSW 0644 root bin 1 d none /opt/csw/share/doc/nsca 0755 root bin +1 f none /opt/csw/share/doc/nsca/license 0644 root bin 1 f none /opt/csw/share/doc/nsca/Changelog 0644 root bin 1 f none /opt/csw/share/doc/nsca/LEGAL 0644 root bin 1 f none /opt/csw/share/doc/nsca/README 0644 root bin Modified: csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype 2010-04-05 12:29:09 UTC (rev 9545) +++ csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.prototype 2010-04-05 12:37:57 UTC (rev 9546) @@ -1,8 +1,8 @@ -d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/send_nsca 0755 root bin -d none /opt/csw/etc 0755 root bin +d none /etc/opt/csw/nagios 0755 root bin f cswpreserveconf /etc/opt/csw/nagios/send_nsca.cfg.CSW 0644 root bin d none /opt/csw/share/doc/send_nsca 0755 root bin +f none /opt/csw/share/doc/send_nsca/license 0644 root bin f none /opt/csw/share/doc/send_nsca/Changelog 0644 root bin f none /opt/csw/share/doc/send_nsca/LEGAL 0644 root bin f none /opt/csw/share/doc/send_nsca/README 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Mon Apr 5 16:07:51 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Mon, 05 Apr 2010 14:07:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[9547] csw/mgar/pkg/xpdf/trunk/Makefile Message-ID: Revision: 9547 http://gar.svn.sourceforge.net/gar/?rev=9547&view=rev Author: bensons Date: 2010-04-05 14:07:51 +0000 (Mon, 05 Apr 2010) Log Message: ----------- xpdf: make sure we are using /usr/openwin/lib for libXpm Modified Paths: -------------- csw/mgar/pkg/xpdf/trunk/Makefile Modified: csw/mgar/pkg/xpdf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xpdf/trunk/Makefile 2010-04-05 12:37:57 UTC (rev 9546) +++ csw/mgar/pkg/xpdf/trunk/Makefile 2010-04-05 14:07:51 UTC (rev 9547) @@ -45,7 +45,12 @@ CONFIGURE_ARGS += --with-t1-includes=$(includedir) CONFIGURE_ARGS += --with-freetype2-library=$(libdir) CONFIGURE_ARGS += --with-freetype2-includes=$(includedir)/freetype2 +CONFIGURE_ARGS += --with-Xpm-library=/usr/openwin/lib +CONFIGURE_ARGS += --with-Xpm-includes=/usr/openwin/include +EXTRA_SOS_LD_FLAGS = -L/usr/openwin/lib +EXTRA_SOS_LD_OPTIONS = -R/usr/openwin/lib + # apply patches PATCHFILES = xpdf-3.02pl1.patch PATCHFILES += xpdf-3.02pl2.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Apr 6 02:51:57 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 06 Apr 2010 00:51:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[9548] csw/mgar/gar/v2/lib/python/checkpkg.py Message-ID: Revision: 9548 http://gar.svn.sourceforge.net/gar/?rev=9548&view=rev Author: bdwalton Date: 2010-04-06 00:51:57 +0000 (Tue, 06 Apr 2010) Log Message: ----------- gar: checkpkg: packages with .el/.elc can depend on CSWemacscommon Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-04-05 14:07:51 UTC (rev 9547) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-04-06 00:51:57 UTC (rev 9548) @@ -66,6 +66,8 @@ (r".*\.pm$", u"CSWperl"), (r".*\.py$", u"CSWpython"), (r".*\.rb$", u"CSWruby"), + (r".*\.el$", u"CSWemacscommon"), + (r".*\.elc$", u"CSWemacscommon"), ) REPORT_TMPL = u"""#if $missing_deps or $surplus_deps or $orphan_sonames 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 Apr 6 03:36:49 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 06 Apr 2010 01:36:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9549] csw/mgar/pkg Message-ID: Revision: 9549 http://gar.svn.sourceforge.net/gar/?rev=9549&view=rev Author: bdwalton Date: 2010-04-06 01:36:49 +0000 (Tue, 06 Apr 2010) Log Message: ----------- emacs_sitestart: emacs site start plugin functionality Added Paths: ----------- csw/mgar/pkg/emacs_sitestart/ csw/mgar/pkg/emacs_sitestart/branches/ csw/mgar/pkg/emacs_sitestart/tags/ csw/mgar/pkg/emacs_sitestart/trunk/ csw/mgar/pkg/emacs_sitestart/trunk/Makefile csw/mgar/pkg/emacs_sitestart/trunk/checksums csw/mgar/pkg/emacs_sitestart/trunk/files/ csw/mgar/pkg/emacs_sitestart/trunk/files/COPYING csw/mgar/pkg/emacs_sitestart/trunk/files/site-start.el Property changes on: csw/mgar/pkg/emacs_sitestart/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/emacs_sitestart/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs_sitestart/trunk/Makefile (rev 0) +++ csw/mgar/pkg/emacs_sitestart/trunk/Makefile 2010-04-06 01:36:49 UTC (rev 9549) @@ -0,0 +1,44 @@ +GARNAME = emacs_sitestart +GARVERSION = 1.0 +CATEGORIES = xtra + +PACKAGES = CSWemacssitestart +CATALOGNAME = $(GARNAME) + +DESCRIPTION = Emacs support for autoloading functionality at startup + +VENDOR_URL = "http://www.opencsw.org" + +MASTER_SITES = +DISTFILES = COPYING site-start.el + +# We define upstream file regex so we can be notifed of new upstream +# software r elease +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 = + +ARCHALL = 1 + +COMPILE_ELISP = 1 + +RUNTIME_DEP_PKGS = CSWemacscommon + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +pre-build-modulated: + @(cd $(WORKSRC); cp ../COPYING ../site-start.el .; ) + +install-custom: LISPDIR=opt/csw/share/emacs/site-lisp +install-custom: $(INSTALLISADIR) + @( cd $(WORKSRC); \ + mkdir -p $(DESTDIR)/$(LISPDIR)/site-start.d; \ + cp site-start.el $(DESTDIR)/$(LISPDIR); ) Added: csw/mgar/pkg/emacs_sitestart/trunk/checksums =================================================================== --- csw/mgar/pkg/emacs_sitestart/trunk/checksums (rev 0) +++ csw/mgar/pkg/emacs_sitestart/trunk/checksums 2010-04-06 01:36:49 UTC (rev 9549) @@ -0,0 +1,2 @@ +d916bc06a2cb77dfcafb85c76efaf826 COPYING +1c0535bd4a34b7e844f7cb0b7c7155e5 site-start.el Added: csw/mgar/pkg/emacs_sitestart/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/emacs_sitestart/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/emacs_sitestart/trunk/files/COPYING 2010-04-06 01:36:49 UTC (rev 9549) @@ -0,0 +1,2 @@ +Copyright 2010 Ben Walton. +This package is licensed under the same terms as GNU Emacs. Added: csw/mgar/pkg/emacs_sitestart/trunk/files/site-start.el =================================================================== --- csw/mgar/pkg/emacs_sitestart/trunk/files/site-start.el (rev 0) +++ csw/mgar/pkg/emacs_sitestart/trunk/files/site-start.el 2010-04-06 01:36:49 UTC (rev 9549) @@ -0,0 +1,4 @@ +;;; load each file in site-start.d/ at startup; this happens prior to +;;; the load of both .emacs and default.el +(mapc 'load + (directory-files "/opt/csw/share/emacs/site-lisp/site-start.d" t "\\.el\\'")) 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 Apr 6 11:02:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Apr 2010 09:02:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[9550] csw/mgar/pkg/grep/trunk Message-ID: Revision: 9550 http://gar.svn.sourceforge.net/gar/?rev=9550&view=rev Author: dmichelsen Date: 2010-04-06 09:02:05 +0000 (Tue, 06 Apr 2010) Log Message: ----------- grep: Update to 2.6.3 after patch has been accepted upstream Modified Paths: -------------- csw/mgar/pkg/grep/trunk/Makefile csw/mgar/pkg/grep/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/grep/trunk/files/0001-Force-bash-on-specific-tests.patch Modified: csw/mgar/pkg/grep/trunk/Makefile =================================================================== --- csw/mgar/pkg/grep/trunk/Makefile 2010-04-06 01:36:49 UTC (rev 9549) +++ csw/mgar/pkg/grep/trunk/Makefile 2010-04-06 09:02:05 UTC (rev 9550) @@ -1,5 +1,5 @@ GARNAME = grep -GARVERSION = 2.6.2 +GARVERSION = 2.6.3 CATEGORIES = utils DESCRIPTION = GNU grep @@ -17,10 +17,6 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(DISTNAME).tar.xz -# Force bash until this is fixed: -# http://savannah.gnu.org/bugs/?29381 -PATCHFILES = 0001-Force-bash-on-specific-tests.patch - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.xz Modified: csw/mgar/pkg/grep/trunk/checksums =================================================================== --- csw/mgar/pkg/grep/trunk/checksums 2010-04-06 01:36:49 UTC (rev 9549) +++ csw/mgar/pkg/grep/trunk/checksums 2010-04-06 09:02:05 UTC (rev 9550) @@ -1,2 +1 @@ -ec7aaf616278291af91f582d9bcfa64f 0001-Force-bash-on-specific-tests.patch -b2d5841757ab065b28d0ff4c7ca2eca8 grep-2.6.2.tar.xz +69a3bf508a3f14d12369e0e1c7a92763 grep-2.6.3.tar.xz Deleted: csw/mgar/pkg/grep/trunk/files/0001-Force-bash-on-specific-tests.patch =================================================================== --- csw/mgar/pkg/grep/trunk/files/0001-Force-bash-on-specific-tests.patch 2010-04-06 01:36:49 UTC (rev 9549) +++ csw/mgar/pkg/grep/trunk/files/0001-Force-bash-on-specific-tests.patch 2010-04-06 09:02:05 UTC (rev 9550) @@ -1,60 +0,0 @@ -From 6a802824b4484fb354caf9ece683f9b83f65d648 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 30 Mar 2010 10:01:44 +0200 -Subject: [PATCH] Force bash on specific tests - ---- - tests/bre.sh | 2 +- - tests/ere.sh | 2 +- - tests/spencer1-locale | 2 +- - tests/spencer1.sh | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tests/bre.sh b/tests/bre.sh -index 0a1153b..e511805 100755 ---- a/tests/bre.sh -+++ b/tests/bre.sh -@@ -14,5 +14,5 @@ failures=0 - - ${AWK-awk} -f $srcdir/bre.awk $srcdir/bre.tests > bre.script - --sh bre.script && exit $failures -+bash bre.script && exit $failures - exit 1 -diff --git a/tests/ere.sh b/tests/ere.sh -index 2ebdc63..208582b 100755 ---- a/tests/ere.sh -+++ b/tests/ere.sh -@@ -15,5 +15,5 @@ failures=0 - - ${AWK-awk} -f $srcdir/ere.awk $srcdir/ere.tests > ere.script - --sh ere.script && exit $failures -+bash ere.script && exit $failures - exit 1 -diff --git a/tests/spencer1-locale b/tests/spencer1-locale -index fa9909d..6da7165 100755 ---- a/tests/spencer1-locale -+++ b/tests/spencer1-locale -@@ -19,6 +19,6 @@ ${AWK-awk} -v extra_locale=$LOCALE_FR_UTF8 \ - -f "$abs_srcdir/spencer1-locale.awk" "$abs_srcdir/spencer1.tests" \ - > spencer1-locale.script || fail=1 - --sh spencer1-locale.script || fail=1 -+bash spencer1-locale.script || fail=1 - - Exit $fail -diff --git a/tests/spencer1.sh b/tests/spencer1.sh -index 0bd6bd1..47325d2 100755 ---- a/tests/spencer1.sh -+++ b/tests/spencer1.sh -@@ -15,5 +15,5 @@ failures=0 - - ${AWK-awk} -f $srcdir/spencer1.awk $srcdir/spencer1.tests > spencer1.script - --sh spencer1.script && exit $failures -+bash spencer1.script && exit $failures - exit 1 --- -1.7.0 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 6 11:13:34 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Apr 2010 09:13:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[9551] csw/mgar/pkg Message-ID: Revision: 9551 http://gar.svn.sourceforge.net/gar/?rev=9551&view=rev Author: dmichelsen Date: 2010-04-06 09:13:33 +0000 (Tue, 06 Apr 2010) Log Message: ----------- wdiff: Initial commit Added Paths: ----------- csw/mgar/pkg/wdiff/ csw/mgar/pkg/wdiff/branches/ csw/mgar/pkg/wdiff/tags/ csw/mgar/pkg/wdiff/trunk/ csw/mgar/pkg/wdiff/trunk/Makefile csw/mgar/pkg/wdiff/trunk/checksums csw/mgar/pkg/wdiff/trunk/files/ Property changes on: csw/mgar/pkg/wdiff/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/wdiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/wdiff/trunk/Makefile (rev 0) +++ csw/mgar/pkg/wdiff/trunk/Makefile 2010-04-06 09:13:33 UTC (rev 9551) @@ -0,0 +1,24 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = wdiff +GARVERSION = 0.6.1 +CATEGORIES = utils + +DESCRIPTION = A front end to diff for comparing files on a word per word basis +define BLURB +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +DEP_PKGS = CSWggettextrt + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias + +include gar/category.mk Property changes on: csw/mgar/pkg/wdiff/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/wdiff/trunk/checksums =================================================================== --- csw/mgar/pkg/wdiff/trunk/checksums (rev 0) +++ csw/mgar/pkg/wdiff/trunk/checksums 2010-04-06 09:13:33 UTC (rev 9551) @@ -0,0 +1 @@ +cb8ed3569f9c020edbfbc145df6ba602 wdiff-0.6.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 Tue Apr 6 11:51:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Apr 2010 09:51:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[9552] csw/mgar/pkg/libpcap/trunk Message-ID: Revision: 9552 http://gar.svn.sourceforge.net/gar/?rev=9552&view=rev Author: dmichelsen Date: 2010-04-06 09:51:26 +0000 (Tue, 06 Apr 2010) Log Message: ----------- libpcap: Update to 1.1.1 Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile csw/mgar/pkg/libpcap/trunk/checksums Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2010-04-06 09:13:33 UTC (rev 9551) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2010-04-06 09:51:26 UTC (rev 9552) @@ -1,5 +1,5 @@ GARNAME = libpcap -GARVERSION = 1.1.0 +GARVERSION = 1.1.1 CATEGORIES = lib DESCRIPTION = System-independent interface for user-level packet capture @@ -9,7 +9,6 @@ MASTER_SITES = http://www.tcpdump.org/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTNAME = $(GARNAME)-1.1 LICENSE = LICENSE Modified: csw/mgar/pkg/libpcap/trunk/checksums =================================================================== --- csw/mgar/pkg/libpcap/trunk/checksums 2010-04-06 09:13:33 UTC (rev 9551) +++ csw/mgar/pkg/libpcap/trunk/checksums 2010-04-06 09:51:26 UTC (rev 9552) @@ -1 +1 @@ -534cd879be5bd19e4927441402df945d libpcap-1.1.0.tar.gz +1bca27d206970badae248cfa471bbb47 libpcap-1.1.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 Tue Apr 6 11:51:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Apr 2010 09:51:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9553] csw/mgar/pkg/tcpdump/trunk Message-ID: Revision: 9553 http://gar.svn.sourceforge.net/gar/?rev=9553&view=rev Author: dmichelsen Date: 2010-04-06 09:51:43 +0000 (Tue, 06 Apr 2010) Log Message: ----------- tcpdump: Update to 4.1.1 Modified Paths: -------------- csw/mgar/pkg/tcpdump/trunk/Makefile csw/mgar/pkg/tcpdump/trunk/checksums Modified: csw/mgar/pkg/tcpdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpdump/trunk/Makefile 2010-04-06 09:51:26 UTC (rev 9552) +++ csw/mgar/pkg/tcpdump/trunk/Makefile 2010-04-06 09:51:43 UTC (rev 9553) @@ -1,5 +1,5 @@ GARNAME = tcpdump -GARVERSION = 4.1.0 +GARVERSION = 4.1.1 CATEGORIES = utils DESCRIPTION = Dump network traffic @@ -8,7 +8,6 @@ MASTER_SITES = http://www.tcpdump.org/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTNAME = $(GARNAME)-4.1 LICENSE = LICENSE Modified: csw/mgar/pkg/tcpdump/trunk/checksums =================================================================== --- csw/mgar/pkg/tcpdump/trunk/checksums 2010-04-06 09:51:26 UTC (rev 9552) +++ csw/mgar/pkg/tcpdump/trunk/checksums 2010-04-06 09:51:43 UTC (rev 9553) @@ -1 +1 @@ -949d4661a7501cfedf7b1eb858302c9c tcpdump-4.1.0.tar.gz +d0dd58bbd6cd36795e05c6f1f74420b0 tcpdump-4.1.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 Tue Apr 6 12:15:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Apr 2010 10:15:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9554] csw/mgar/pkg/giflib/tags/giflib-4.1.6, REV=2010.03. 17-alternatives/ Message-ID: Revision: 9554 http://gar.svn.sourceforge.net/gar/?rev=9554&view=rev Author: dmichelsen Date: 2010-04-06 10:15:11 +0000 (Tue, 06 Apr 2010) Log Message: ----------- giflib: Tag 4.1.6,REV=2010.03.17-alternatives Added Paths: ----------- csw/mgar/pkg/giflib/tags/giflib-4.1.6,REV=2010.03.17-alternatives/ 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 Apr 6 14:24:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Apr 2010 12:24:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9555] csw/mgar/pkg/m4/trunk/Makefile Message-ID: Revision: 9555 http://gar.svn.sourceforge.net/gar/?rev=9555&view=rev Author: dmichelsen Date: 2010-04-06 12:24:53 +0000 (Tue, 06 Apr 2010) Log Message: ----------- m4: Add gnulinks Modified Paths: -------------- csw/mgar/pkg/m4/trunk/Makefile Modified: csw/mgar/pkg/m4/trunk/Makefile =================================================================== --- csw/mgar/pkg/m4/trunk/Makefile 2010-04-06 10:15:11 UTC (rev 9554) +++ csw/mgar/pkg/m4/trunk/Makefile 2010-04-06 12:24:53 UTC (rev 9555) @@ -28,3 +28,9 @@ EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias include gar/category.mk + +post-install-modulated: + ginstall -d $(DESTDIR)$(prefix)/gnu + $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);) + @$(MAKECOOKIE) + 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 Apr 6 15:03:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Apr 2010 13:03:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[9556] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 9556 http://gar.svn.sourceforge.net/gar/?rev=9556&view=rev Author: dmichelsen Date: 2010-04-06 13:03:25 +0000 (Tue, 06 Apr 2010) Log Message: ----------- giflib: Split off CSW X11 and SUNW X11 Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2010-04-06 12:24:53 UTC (rev 9555) +++ csw/mgar/pkg/giflib/trunk/Makefile 2010-04-06 13:03:25 UTC (rev 9556) @@ -24,9 +24,9 @@ CATALOGNAME_CSWungif = libungif SPKG_DESC_CSWgiflib = A library for reading and writing gif images -SPKG_DESC_CSWgiflibrt = giflib runtime libraries (minimal alternative without X11 support) -SPKG_DESC_CSWgiflibrtx11 = giflib runtime libraries (full alternative with support for CSW X11) -SPKG_DESC_CSWgiflibdoc = giflib documentation +SPKG_DESC_CSWgiflibrt = Runtime library for giflib (Sun X11 binding) +SPKG_DESC_CSWgiflibrtx11 = Runtime library for giflib (OpenCSW X11 binding) +SPKG_DESC_CSWgiflibdoc = Documentation for giflib SPKG_DESC_CSWungif = Stub which links to giflib now the patent is dropped SPKG_SOURCEURL = http://giflib.sourceforge.net/ @@ -38,70 +38,71 @@ RUNTIME_DEP_PKGS_CSWgiflib = CSWgiflibrt RUNTIME_DEP_PKGS_CSWungif = CSWgiflib -EXTRA_MODULATORS = FEATURES -MODULATIONS_FEATURES = nox11 cswx11 +EXTRA_MODULATORS = X11 +MODULATIONS_X11 = sunwx11 cswx11 -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_INC_cswx11 = $(prefix)/X11/include +EXTRA_LIB_cswx11 = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS_cswx11 = $(prefix)/X11/lib +EXTRA_INC = $(EXTRA_INC_$(X11)) +EXTRA_LIB = $(EXTRA_LIB_$(X11)) +EXTRA_PKG_CONFIG_DIRS = $(EXTRA_PKG_CONFIG_DIRS_$(X11)) + STRIP_LIBTOOL = 1 BUILD64 = 1 +prefix_cswx11 = $(BUILD_PREFIX)/X11 +prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX)) + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS_nox11 = --disable-x11 +CONFIGURE_ARGS_sunwx11 = --x-includes=/usr/openwin/include +CONFIGURE_ARGS_sunwx11 += --x-libraries=$(abspath /usr/openwin/lib/$(MM_LIBDIR)) CONFIGURE_ARGS_cswx11 = --x-include=$(prefix)/X11/include CONFIGURE_ARGS_cswx11 += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(FEATURES)) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(X11)) TEST_TARGET = check -EXTRA_PAX_ARGS-32 = -s ",\(\.$(libdir)/libgif\)\(\.so\.4\.1\.6\),\1-$(FEATURES)\2,p" -EXTRA_PAX_ARGS-32 += -s ",\(\.$(bindir)/gif2x11\),\1,p" -EXTRA_PAX_ARGS-64 = -s ",\.$(libdir)/libgif\(\.so\.4\.1\.6\),.$(libdir_install)/$(ISA)/libgif-$(FEATURES)\1,p" -EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS-$(MEMORYMODEL)) - # We don't want 64 bit executables as they gain no speed NOISAEXEC = 1 -MERGE_SCRIPTS_isa-default-features-nox11 = copy-all -MERGE_SCRIPTS_isa-default64-features-nox11 = copy-relocated-only -MERGE_DIRS_isa-default64-features-nox11 = $(libdir) -MERGE_SCRIPTS_isa-default-features-cswx11 = copy-only -MERGE_DIRS_isa-default-features-cswx11 = $(libdir) -MERGE_SCRIPTS_isa-default64-features-cswx11 = copy-relocated-only -MERGE_DIRS_isa-default64-features-cswx11 = $(libdir) +MERGE_SCRIPTS_isa-default-x11-sunwx11 = copy-all +MERGE_SCRIPTS_isa-default64-x11-sunwx11 = copy-relocated-only +MERGE_DIRS_isa-default64-x11-sunwx11 = $(libdir) +MERGE_SCRIPTS_isa-default-x11-cswx11 = copy-only +MERGE_DIRS_isa-default-x11-cswx11 = $(libdir) +MERGE_SCRIPTS_isa-default64-x11-cswx11 = copy-relocated-only +MERGE_DIRS_isa-default64-x11-cswx11 = $(libdir) ARCHALL_CSWgiflibdoc = 1 ARCHALL_CSWungif = 1 -PKGFILES_CSWgiflibrt = .*/libgif-nox11\..* -PKGFILES_CSWgiflibrtx11 = .*/libgif-cswx11\..* $(bindir)/gif2x11 +PKGFILES_CSWgiflibrt = $(PKGFILES_RT) +PKGFILES_CSWgiflibrtx11 = $(prefix)/X11/.* PKGFILES_CSWgiflibdoc = $(PKGFILES_DOC) PKGFILES_CSWungif = .*/libungif\..* -ALTERNATIVES_CSWgiflibrt = nox11 -ALTERNATIVES_CSWgiflibrtx11 = cswx11 +CHECKPKG_OVERRIDES_CSWgiflib += linked-against-discouraged-library|libgif.so.4.1.6|libX11.so.4 +CHECKPKG_OVERRIDES_CSWgiflib += bad-rpath-entry|/usr/openwin/lib/64 +CHECKPKG_OVERRIDES_CSWgiflib += surplus-dependency|CSWgiflibrt +CHECKPKG_OVERRIDES_CSWgiflibrt += linked-against-discouraged-library|libgif.so.4.1.6|libX11.so.4 +CHECKPKG_OVERRIDES_CSWungif += surplus-dependency|CSWgiflib -ALTERNATIVE_nox11 = $(libdir)/libgif.so.4.1.6 giflib $(libdir)/libgif-nox11.so.4.1.6 100 -ALTERNATIVE_nox11 += $(libdir)/$(ISA_DEFAULT64)/libgif.so.4.1.6 giflib64 $(libdir)/$(ISA_DEFAULT64)/libgif-nox11.so.4.1.6 - -ALTERNATIVE_cswx11 = $(libdir)/libgif.so.4.1.6 giflib $(libdir)/libgif-cswx11.so.4.1.6 200 -ALTERNATIVE_cswx11 += $(libdir)/$(ISA_DEFAULT64)/libgif.so.4.1.6 giflib64 $(libdir)/$(ISA_DEFAULT64)/libgif-cswx11.so.4.1.6 - include gar/category.mk DOCFILES = AUTHORS BUGS COPYING ChangeLog DEVELOPERS INSTALL NEWS ONEWS README TODO post-install-modulated: - @mkdir -p $(DESTDIR)$(docdir)/giflib + mkdir -p $(DESTDIR)$(docdir)/giflib cd $(WORKSRC) && cp $(DOCFILES) $(DESTDIR)$(docdir)/giflib cd $(WORKSRC)/doc && cp *.html *.png *.txt $(DESTDIR)$(docdir)/giflib @$(MAKECOOKIE) post-merge: + mkdir -p $(PKGROOT)$(libdir) gln -s libgif.so.4 $(PKGROOT)$(libdir)/libungif.so.4 gln -s libgif.so $(PKGROOT)$(libdir)/libungif.so @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 6 15:15:45 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Apr 2010 13:15:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[9557] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 9557 http://gar.svn.sourceforge.net/gar/?rev=9557&view=rev Author: dmichelsen Date: 2010-04-06 13:15:45 +0000 (Tue, 06 Apr 2010) Log Message: ----------- giflib: Update overrides Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2010-04-06 13:03:25 UTC (rev 9556) +++ csw/mgar/pkg/giflib/trunk/Makefile 2010-04-06 13:15:45 UTC (rev 9557) @@ -85,11 +85,9 @@ PKGFILES_CSWgiflibdoc = $(PKGFILES_DOC) PKGFILES_CSWungif = .*/libungif\..* -CHECKPKG_OVERRIDES_CSWgiflib += linked-against-discouraged-library|libgif.so.4.1.6|libX11.so.4 -CHECKPKG_OVERRIDES_CSWgiflib += bad-rpath-entry|/usr/openwin/lib/64 -CHECKPKG_OVERRIDES_CSWgiflib += surplus-dependency|CSWgiflibrt -CHECKPKG_OVERRIDES_CSWgiflibrt += linked-against-discouraged-library|libgif.so.4.1.6|libX11.so.4 CHECKPKG_OVERRIDES_CSWungif += surplus-dependency|CSWgiflib +CHECKPKG_OVERRIDES_CSWgiflibrt += bad-rpath-entry|/usr/openwin/lib/64 +CHECKPKG_OVERRIDES_CSWgiflibrt += linked-against-discouraged-library|libgif.so.4.1.6|libX11.so.4 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 6 15:39:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 06 Apr 2010 13:39:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9558] csw/mgar/pkg/giflib/trunk/Makefile Message-ID: Revision: 9558 http://gar.svn.sourceforge.net/gar/?rev=9558&view=rev Author: dmichelsen Date: 2010-04-06 13:39:12 +0000 (Tue, 06 Apr 2010) Log Message: ----------- giflib: Add extra packages for OpenCSW X11 prefixed CSWx11_ Modified Paths: -------------- csw/mgar/pkg/giflib/trunk/Makefile Modified: csw/mgar/pkg/giflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/giflib/trunk/Makefile 2010-04-06 13:15:45 UTC (rev 9557) +++ csw/mgar/pkg/giflib/trunk/Makefile 2010-04-06 13:39:12 UTC (rev 9558) @@ -15,17 +15,19 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PACKAGES = CSWgiflib CSWgiflibrt CSWgiflibrtx11 CSWgiflibdoc CSWungif +PACKAGES = CSWgiflib CSWgiflibrt CSWx11giflib CSWx11giflibrt CSWgiflibdoc CSWungif CATALOGNAME_CSWgiflib = giflib CATALOGNAME_CSWgiflibrt = giflib_rt -CATALOGNAME_CSWgiflibrtx11 = giflib_rt_x11 +CATALOGNAME_CSWx11giflib = x11_giflib +CATALOGNAME_CSWx11giflibrt = x11_giflib_rt CATALOGNAME_CSWgiflibdoc = giflib_doc CATALOGNAME_CSWungif = libungif SPKG_DESC_CSWgiflib = A library for reading and writing gif images SPKG_DESC_CSWgiflibrt = Runtime library for giflib (Sun X11 binding) -SPKG_DESC_CSWgiflibrtx11 = Runtime library for giflib (OpenCSW X11 binding) +SPKG_DESC_CSWx11giflib = Package for giflib bound against OpenCSW X11 +SPKG_DESC_CSWx11giflibrt = Runtime libraries for giflib bound against OpenCSW X11 SPKG_DESC_CSWgiflibdoc = Documentation for giflib SPKG_DESC_CSWungif = Stub which links to giflib now the patent is dropped @@ -33,21 +35,22 @@ BUILD_DEP_PKGS = CSWlibicedevel CSWlibsmdevel CSWlibx11devel -RUNTIME_DEP_PKGS_CSWgiflibrt = -RUNTIME_DEP_PKGS_CSWgiflibrtx11 = CSWlibice CSWlibsm CSWlibx11 +RUNTIME_DEP_PKGS_CSWx11giflibrt = CSWlibice CSWlibsm CSWlibx11 +RUNTIME_DEP_PKGS_CSWx11giflib = CSWlibice CSWlibsm CSWlibx11 CSWx11giflibrt RUNTIME_DEP_PKGS_CSWgiflib = CSWgiflibrt RUNTIME_DEP_PKGS_CSWungif = CSWgiflib + EXTRA_MODULATORS = X11 MODULATIONS_X11 = sunwx11 cswx11 -EXTRA_INC_cswx11 = $(prefix)/X11/include -EXTRA_LIB_cswx11 = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS_cswx11 = $(prefix)/X11/lib +# EXTRA_INC_cswx11 = $(prefix)/X11/include +# EXTRA_LIB_cswx11 = $(prefix)/X11/lib +# EXTRA_PKG_CONFIG_DIRS_cswx11 = $(prefix)/X11/lib -EXTRA_INC = $(EXTRA_INC_$(X11)) -EXTRA_LIB = $(EXTRA_LIB_$(X11)) -EXTRA_PKG_CONFIG_DIRS = $(EXTRA_PKG_CONFIG_DIRS_$(X11)) +# EXTRA_INC = $(EXTRA_INC_$(X11)) +# EXTRA_LIB = $(EXTRA_LIB_$(X11)) +# EXTRA_PKG_CONFIG_DIRS = $(EXTRA_PKG_CONFIG_DIRS_$(X11)) STRIP_LIBTOOL = 1 @@ -60,8 +63,8 @@ CONFIGURE_ARGS_sunwx11 = --x-includes=/usr/openwin/include CONFIGURE_ARGS_sunwx11 += --x-libraries=$(abspath /usr/openwin/lib/$(MM_LIBDIR)) -CONFIGURE_ARGS_cswx11 = --x-include=$(prefix)/X11/include -CONFIGURE_ARGS_cswx11 += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS_cswx11 = --x-include=$(prefix)/include +CONFIGURE_ARGS_cswx11 += --x-libraries=$(abspath $(prefix)/lib/$(MM_LIBDIR)) CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(X11)) TEST_TARGET = check @@ -73,7 +76,7 @@ MERGE_SCRIPTS_isa-default64-x11-sunwx11 = copy-relocated-only MERGE_DIRS_isa-default64-x11-sunwx11 = $(libdir) MERGE_SCRIPTS_isa-default-x11-cswx11 = copy-only -MERGE_DIRS_isa-default-x11-cswx11 = $(libdir) +MERGE_DIRS_isa-default-x11-cswx11 = $(libdir) $(bindir) MERGE_SCRIPTS_isa-default64-x11-cswx11 = copy-relocated-only MERGE_DIRS_isa-default64-x11-cswx11 = $(libdir) @@ -81,7 +84,8 @@ ARCHALL_CSWungif = 1 PKGFILES_CSWgiflibrt = $(PKGFILES_RT) -PKGFILES_CSWgiflibrtx11 = $(prefix)/X11/.* +PKGFILES_CSWx11giflibrt = $(call baseisadirs,$(prefix)/X11/lib,[^/]*\.so(\.\d+)*) +PKGFILES_CSWx11giflib = $(prefix)/X11/bin/.* PKGFILES_CSWgiflibdoc = $(PKGFILES_DOC) PKGFILES_CSWungif = .*/libungif\..* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Apr 7 20:59:01 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 07 Apr 2010 18:59:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[9559] csw/mgar/pkg Message-ID: Revision: 9559 http://gar.svn.sourceforge.net/gar/?rev=9559&view=rev Author: bonivart Date: 2010-04-07 18:59:00 +0000 (Wed, 07 Apr 2010) Log Message: ----------- rdiff-backup: initial commit Added Paths: ----------- csw/mgar/pkg/rdiff-backup/ csw/mgar/pkg/rdiff-backup/branches/ csw/mgar/pkg/rdiff-backup/tags/ csw/mgar/pkg/rdiff-backup/trunk/ csw/mgar/pkg/rdiff-backup/trunk/Makefile csw/mgar/pkg/rdiff-backup/trunk/checksums csw/mgar/pkg/rdiff-backup/trunk/files/ Property changes on: csw/mgar/pkg/rdiff-backup/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/rdiff-backup/trunk/Makefile =================================================================== --- csw/mgar/pkg/rdiff-backup/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rdiff-backup/trunk/Makefile 2010-04-07 18:59:00 UTC (rev 9559) @@ -0,0 +1,25 @@ +GARNAME = rdiff-backup +GARVERSION = 1.2.8 +CATEGORIES = python + +DESCRIPTION = Remote incremental backup +define BLURB + Remote incremental backup +endef + +MASTER_SITES = http://savannah.nongnu.org/download/rdiff-backup/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWrdiffbackup +CATALOGNAME = rdiffbackup + +RUNTIME_DEP_PKGS_CSWrdiffbackup += CSWlibrsync + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SKIPTEST = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/rdiff-backup/trunk/checksums =================================================================== --- csw/mgar/pkg/rdiff-backup/trunk/checksums (rev 0) +++ csw/mgar/pkg/rdiff-backup/trunk/checksums 2010-04-07 18:59:00 UTC (rev 9559) @@ -0,0 +1 @@ +1a94dc537fcf74d6a3a80bd27808e77b rdiff-backup-1.2.8.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 Apr 8 09:44:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Apr 2010 07:44:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9560] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 9560 http://gar.svn.sourceforge.net/gar/?rev=9560&view=rev Author: dmichelsen Date: 2010-04-08 07:44:37 +0000 (Thu, 08 Apr 2010) Log Message: ----------- mGAR v2: Add lzip support 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-04-07 18:59:00 UTC (rev 9559) +++ csw/mgar/gar/v2/gar.lib.mk 2010-04-08 07:44:37 UTC (rev 9560) @@ -316,6 +316,12 @@ @xz -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) @$(MAKECOOKIE) +# rule to extract files with tar and lz +tar-lz-extract-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @lzip -dc $(DOWNLOADDIR)/$* | gtar $(TAR_ARGS) -xf - -C $(EXTRACTDIR) + @$(MAKECOOKIE) + # extract compressed single files gz-extract-%: @echo " ==> Decompressing $(DOWNLOADDIR)/$*" @@ -335,6 +341,12 @@ @xz -d $(WORKDIR)/$* @$(MAKECOOKIE) +lz-extract-%: + @echo " ==> Decompressing $(DOWNLOADDIR)/$*" + @cp $(DOWNLOADDIR)/$* $(WORKDIR)/ + @lzip -d $(WORKDIR)/$* + @$(MAKECOOKIE) + # extra dependency rule for git repos, that will allow the user # to supply an alternate target at their discretion git-extract-%: @@ -398,6 +410,9 @@ extract-archive-%.tar.xz: tar-xz-extract-%.tar.xz @$(MAKECOOKIE) +extract-archive-%.tar.lz: tar-lz-extract-%.tar.lz + @$(MAKECOOKIE) + extract-archive-%.zip: zip-extract-%.zip @$(MAKECOOKIE) @@ -416,6 +431,9 @@ extract-archive-%.xz: xz-extract-%.xz @$(MAKECOOKIE) +extract-archive-%.lz: lz-extract-%.lz + @$(MAKECOOKIE) + extract-archive-%.git: git-extract-%.git @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 8 09:57:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Apr 2010 07:57:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9561] csw/mgar/pkg/grep/trunk/Makefile Message-ID: Revision: 9561 http://gar.svn.sourceforge.net/gar/?rev=9561&view=rev Author: dmichelsen Date: 2010-04-08 07:57:44 +0000 (Thu, 08 Apr 2010) Log Message: ----------- grep: Adjust catalog name Modified Paths: -------------- csw/mgar/pkg/grep/trunk/Makefile Modified: csw/mgar/pkg/grep/trunk/Makefile =================================================================== --- csw/mgar/pkg/grep/trunk/Makefile 2010-04-08 07:44:37 UTC (rev 9560) +++ csw/mgar/pkg/grep/trunk/Makefile 2010-04-08 07:57:44 UTC (rev 9561) @@ -20,6 +20,9 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.xz +PACKAGES = CSWgrep +CATALOGNAME = ggrep + DEP_PKGS = CSWggettextrt CSWpcrert CONFIGURE_ARGS = $(DIRPATHS) 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 Apr 8 11:09:27 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 08 Apr 2010 09:09:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[9562] csw/mgar/pkg/qpopper/trunk/Makefile Message-ID: Revision: 9562 http://gar.svn.sourceforge.net/gar/?rev=9562&view=rev Author: bonivart Date: 2010-04-08 09:09:26 +0000 (Thu, 08 Apr 2010) Log Message: ----------- qpopper: add specialauth to configure args Modified Paths: -------------- csw/mgar/pkg/qpopper/trunk/Makefile Modified: csw/mgar/pkg/qpopper/trunk/Makefile =================================================================== --- csw/mgar/pkg/qpopper/trunk/Makefile 2010-04-08 07:57:44 UTC (rev 9561) +++ csw/mgar/pkg/qpopper/trunk/Makefile 2010-04-08 09:09:26 UTC (rev 9562) @@ -26,7 +26,8 @@ SPKG_SOURCEURL = http://www.eudora.com/qpopper -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-specialauth INSTALL_SCRIPTS = 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 Thu Apr 8 13:09:13 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Apr 2010 11:09:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9563] csw/mgar/pkg/ncftp/trunk Message-ID: Revision: 9563 http://gar.svn.sourceforge.net/gar/?rev=9563&view=rev Author: dmichelsen Date: 2010-04-08 11:09:12 +0000 (Thu, 08 Apr 2010) Log Message: ----------- ncftp: Update to 3.2.4 Modified Paths: -------------- csw/mgar/pkg/ncftp/trunk/Makefile csw/mgar/pkg/ncftp/trunk/checksums Modified: csw/mgar/pkg/ncftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncftp/trunk/Makefile 2010-04-08 09:09:26 UTC (rev 9562) +++ csw/mgar/pkg/ncftp/trunk/Makefile 2010-04-08 11:09:12 UTC (rev 9563) @@ -1,5 +1,5 @@ GARNAME = ncftp -GARVERSION = 3.2.3 +GARVERSION = 3.2.4 CATEGORIES = net DESCRIPTION = File Transfer Protocol (FTP) client applications. @@ -26,4 +26,7 @@ # No test target in the makefile TEST_SCRIPTS = +# gtar *is* needed +CHECKPKG_OVERRIDES_CSWncftp += surplus-dependency|CSWgtar + include gar/category.mk Modified: csw/mgar/pkg/ncftp/trunk/checksums =================================================================== --- csw/mgar/pkg/ncftp/trunk/checksums 2010-04-08 09:09:26 UTC (rev 9562) +++ csw/mgar/pkg/ncftp/trunk/checksums 2010-04-08 11:09:12 UTC (rev 9563) @@ -1 +1 @@ -fac4aa169e1734e8d9617afd4a9b51e5 ncftp-3.2.3-src.tar.bz2 +bfb7c5a29d769cc1054ae9cbbabd9e94 ncftp-3.2.4-src.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 Apr 8 17:39:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Apr 2010 15:39:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9564] csw/mgar/pkg/xmlstarlet/tags/xmlstarlet-1.0.1, REV= 2009.04.09/ Message-ID: Revision: 9564 http://gar.svn.sourceforge.net/gar/?rev=9564&view=rev Author: dmichelsen Date: 2010-04-08 15:39:10 +0000 (Thu, 08 Apr 2010) Log Message: ----------- xmlstarlet: Tag 1.0.1,REV=2009.04.09 Added Paths: ----------- csw/mgar/pkg/xmlstarlet/tags/xmlstarlet-1.0.1,REV=2009.04.09/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Apr 8 17:43:32 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 08 Apr 2010 15:43:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9565] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 9565 http://gar.svn.sourceforge.net/gar/?rev=9565&view=rev Author: idogan23 Date: 2010-04-08 15:43:32 +0000 (Thu, 08 Apr 2010) Log Message: ----------- unbound: removing entries for Solaris 8 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-04-08 15:39:10 UTC (rev 9564) +++ csw/mgar/pkg/unbound/trunk/Makefile 2010-04-08 15:43:32 UTC (rev 9565) @@ -1,5 +1,5 @@ GARNAME = unbound -GARVERSION = 1.4.1 +GARVERSION = 1.4.3 CATEGORIES = server DESCRIPTION = A validating, recursive, and caching DNS resolver @@ -28,22 +28,13 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 -ifeq ($(shell uname -r),5.8) - GARCOMPILER = GCC4 - RUNTIME_DEP_PKGS += CSWgcc4corert - DESCRIPTION = A validating, recursive, and caching DNS resolver (gcc) -endif -ifeq ($(shell uname -r),5.10) - GARCOMPILER = SOS12 -endif - CONFIGURE_ARGS = $(DIRPATHS) CONFIGUTE_ARGS += --with-solaris-threads CONFIGURE_ARGS += --with-ldns=/opt/csw CONFIGURE_ARGS += --with-ssl=/opt/csw +CONFIGURE_ARGS += --with-libevent=/opt/csw CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw Modified: csw/mgar/pkg/unbound/trunk/checksums =================================================================== --- csw/mgar/pkg/unbound/trunk/checksums 2010-04-08 15:39:10 UTC (rev 9564) +++ csw/mgar/pkg/unbound/trunk/checksums 2010-04-08 15:43:32 UTC (rev 9565) @@ -1,3 +1,3 @@ 75867432e238f5afd48dfe5d138097e9 cswunbound 601effee1051487655f66790762b66fd cswusergroup -1e03ef9618e4bca02005bd99bc6af75c unbound-1.4.1.tar.gz +2dffdd42f94b8238447a41835439d129 unbound-1.4.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 8 17:45:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Apr 2010 15:45:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9566] csw/mgar/pkg/xmlstarlet/trunk Message-ID: Revision: 9566 http://gar.svn.sourceforge.net/gar/?rev=9566&view=rev Author: dmichelsen Date: 2010-04-08 15:45:06 +0000 (Thu, 08 Apr 2010) Log Message: ----------- xmlstarlet: Update to unofficial 1.0.2 Modified Paths: -------------- csw/mgar/pkg/xmlstarlet/trunk/Makefile csw/mgar/pkg/xmlstarlet/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/xmlstarlet/trunk/files/xmlstarlet-1.0.1-cc.patch Modified: csw/mgar/pkg/xmlstarlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/Makefile 2010-04-08 15:43:32 UTC (rev 9565) +++ csw/mgar/pkg/xmlstarlet/trunk/Makefile 2010-04-08 15:45:06 UTC (rev 9566) @@ -1,5 +1,5 @@ GARNAME = xmlstarlet -GARVERSION = 1.0.1 +GARVERSION = 1.0.2 CATEGORIES = utils DESCRIPTION = XML transformation utility @@ -12,18 +12,17 @@ endef SF_PROJ = xmlstar -MASTER_SITES += $(SF_MIRRORS) +# MASTER_SITES += $(SF_MIRRORS) +MASTER_SITES = http://xmlstar.sourceforge.net/downloads/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -RUNTIME_DEP_PKGS = CSWgcrypt CSWggettextrt CSWgpgerr CSWiconv CSWlibxml2 CSWlibxslt CSWzlib +RUNTIME_DEP_PKGS = CSWiconv CSWlibxml2 CSWlibxslt CSWzlib # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=66612 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -PATCHFILES = $(GARNAME)-$(GARVERSION)-cc.patch - BUILD64 = 1 TEST_TARGET = check Modified: csw/mgar/pkg/xmlstarlet/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/checksums 2010-04-08 15:43:32 UTC (rev 9565) +++ csw/mgar/pkg/xmlstarlet/trunk/checksums 2010-04-08 15:45:06 UTC (rev 9566) @@ -1,2 +1 @@ -8deb71834bcdfb4443c258a1f0042fce download/xmlstarlet-1.0.1.tar.gz -43fc74b5208249a730dd910533a05cc8 download/xmlstarlet-1.0.1-cc.patch +e75486959970e7ddb5edeee45b55af80 xmlstarlet-1.0.2.tar.gz Deleted: csw/mgar/pkg/xmlstarlet/trunk/files/xmlstarlet-1.0.1-cc.patch =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/files/xmlstarlet-1.0.1-cc.patch 2010-04-08 15:43:32 UTC (rev 9565) +++ csw/mgar/pkg/xmlstarlet/trunk/files/xmlstarlet-1.0.1-cc.patch 2010-04-08 15:45:06 UTC (rev 9566) @@ -1,54 +0,0 @@ -diff --speed-large-files --minimal -Nru xmlstarlet-1.0.1.orig/configure xmlstarlet-1.0.1/configure ---- xmlstarlet-1.0.1.orig/configure 2005-03-14 02:32:18.000000000 +0100 -+++ xmlstarlet-1.0.1/configure 2007-07-05 22:32:36.130043000 +0200 -@@ -1076,7 +1076,6 @@ - fi - - --CFLAGS="-Wall -g -pedantic" - EXTRA_LIBS= - - case "${host}" in -@@ -1089,7 +1088,6 @@ - ;; - esac - --LIBXML_PREFIX="/usr" - # Check whether --with-libxml-prefix or --without-libxml-prefix was given. - if test "${with_libxml_prefix+set}" = set; then - withval="$with_libxml_prefix" -@@ -1138,7 +1136,6 @@ - fi - fi - --LIBXSLT_PREFIX="/usr" - # Check whether --with-libxslt-prefix or --without-libxslt-prefix was given. - if test "${with_libxslt_prefix+set}" = set; then - withval="$with_libxslt_prefix" -diff --speed-large-files --minimal -Nru xmlstarlet-1.0.1.orig/configure.in xmlstarlet-1.0.1/configure.in ---- xmlstarlet-1.0.1.orig/configure.in 2005-03-14 02:30:42.000000000 +0100 -+++ xmlstarlet-1.0.1/configure.in 2007-07-05 22:32:25.479586000 +0200 -@@ -8,7 +8,6 @@ - AC_CANONICAL_HOST - AC_PROG_CC - --CFLAGS="-Wall -g -pedantic" - EXTRA_LIBS= - - case "${host}" in -@@ -26,7 +25,6 @@ - dnl the ability to specify the location of the libxml - dnl library during linking and compilation. - dnl --LIBXML_PREFIX="/usr" - AC_ARG_WITH(libxml-prefix, - [ --with-libxml-prefix=[PFX] Specify location of libxml], - LIBXML_PREFIX=$withval -@@ -69,7 +67,6 @@ - dnl the ability to specify the location of the libxslt - dnl library during linking and compilation. - dnl --LIBXSLT_PREFIX="/usr" - AC_ARG_WITH(libxslt-prefix, - [ --with-libxslt-prefix=[PFX] Specify location of libxslt], - LIBXSLT_PREFIX=$withval This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Apr 8 19:54:05 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 08 Apr 2010 17:54:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[9567] csw/mgar/pkg/rrdtool/trunk Message-ID: Revision: 9567 http://gar.svn.sourceforge.net/gar/?rev=9567&view=rev Author: idogan23 Date: 2010-04-08 17:54:05 +0000 (Thu, 08 Apr 2010) Log Message: ----------- rrdtool: bump version to 1.4.3 Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile csw/mgar/pkg/rrdtool/trunk/checksums Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2010-04-08 15:45:06 UTC (rev 9566) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2010-04-08 17:54:05 UTC (rev 9567) @@ -1,5 +1,5 @@ GARNAME = rrdtool -GARVERSION = 1.4.2 +GARVERSION = 1.4.3 CATEGORIES = utils DESCRIPTION = time-series data logging and graphing. Modified: csw/mgar/pkg/rrdtool/trunk/checksums =================================================================== --- csw/mgar/pkg/rrdtool/trunk/checksums 2010-04-08 15:45:06 UTC (rev 9566) +++ csw/mgar/pkg/rrdtool/trunk/checksums 2010-04-08 17:54:05 UTC (rev 9567) @@ -1,2 +1,2 @@ 48a9b258cf8b4b943dbaf30ea939c315 CSWrrdtool.gspec -9318d3b4016dd9dd9897f1eac7548032 rrdtool-1.4.2.tar.gz +492cf946c72f85987238faa2c311b7bb rrdtool-1.4.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Apr 8 23:22:35 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 08 Apr 2010 21:22:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[9568] csw/mgar/pkg/tmpwatch/trunk Message-ID: Revision: 9568 http://gar.svn.sourceforge.net/gar/?rev=9568&view=rev Author: skayser Date: 2010-04-08 21:22:34 +0000 (Thu, 08 Apr 2010) Log Message: ----------- tmpwatch: add changelog.CSW, cleanups for first pkg release Modified Paths: -------------- csw/mgar/pkg/tmpwatch/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tmpwatch/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/tmpwatch/trunk/files/stpcpy.c Modified: csw/mgar/pkg/tmpwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/Makefile 2010-04-08 17:54:05 UTC (rev 9567) +++ csw/mgar/pkg/tmpwatch/trunk/Makefile 2010-04-08 21:22:34 UTC (rev 9568) @@ -18,5 +18,13 @@ CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = +NORUNPATH = 1 + include gar/category.mk +# Install changelog.CSW +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW + @$(MAKECOOKIE) Added: csw/mgar/pkg/tmpwatch/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/tmpwatch/trunk/files/changelog.CSW 2010-04-08 21:22:34 UTC (rev 9568) @@ -0,0 +1,5 @@ +tmpwatch (2.10.1,REV=2010.04.08) + + * Initial release. + + -- Sebastian Kayser Thu, 8 Apr 2010 23:08:50 +0200 Deleted: csw/mgar/pkg/tmpwatch/trunk/files/stpcpy.c =================================================================== --- csw/mgar/pkg/tmpwatch/trunk/files/stpcpy.c 2010-04-08 17:54:05 UTC (rev 9567) +++ csw/mgar/pkg/tmpwatch/trunk/files/stpcpy.c 2010-04-08 21:22:34 UTC (rev 9568) @@ -1,9 +0,0 @@ -char * -stpcpy(char *a,const char *b) -{ - while( *b ) - *a++ = *b++; - *a = 0; - - return (char*)a; -} 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 Apr 9 00:11:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Apr 2010 22:11:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[9569] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9569 http://gar.svn.sourceforge.net/gar/?rev=9569&view=rev Author: wahwah Date: 2010-04-08 22:11:57 +0000 (Thu, 08 Apr 2010) Log Message: ----------- mGAR v2: checkpkg, removing all_filenames from package stats. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/opencsw.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-04-08 21:22:34 UTC (rev 9568) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-04-08 22:11:57 UTC (rev 9569) @@ -724,6 +724,7 @@ def GetCommonPaths(self, arch): """Returns a list of paths for architecture, from gar/etc/commondirs*.""" + # TODO: If this was cached, it would save a significant amount of time. assert arch in ('i386', 'sparc', 'all'), "Wrong arch: %s" % repr(arch) if arch == 'all': archs = ('i386', 'sparc') @@ -947,7 +948,6 @@ """Collects stats about a package and saves it.""" # This list needs to be synchronized with the CollectStats() method. STAT_FILES = [ - "all_filenames", "bad_paths", "binaries", "binaries_dump_info", @@ -1192,7 +1192,6 @@ self.MakeStatsDir() dir_pkg = self.GetDirFormatPkg() logging.info("Collecting %s package statistics.", repr(dir_pkg.pkgname)) - self.DumpObject(dir_pkg.GetAllFilenames(), "all_filenames") self.DumpObject(dir_pkg.ListBinaries(), "binaries") self.DumpObject(self.GetBinaryDumpInfo(), "binaries_dump_info") self.DumpObject(dir_pkg.GetDependencies(), "depends") Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-04-08 21:22:34 UTC (rev 9568) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-04-08 22:11:57 UTC (rev 9569) @@ -817,10 +817,6 @@ self.binaries = sorted(self.binaries) return self.binaries - def GetAllFilenames(self): - file_paths = self.GetAllFilePaths() - return sorted([os.path.basename(f) for f in file_paths]) - def GetAllFilePaths(self): """Similar to GetAllFilenames, but returns full paths.""" if not self.file_paths: 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 Apr 9 09:33:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 07:33:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[9570] csw/mgar/pkg/grep/trunk/Makefile Message-ID: Revision: 9570 http://gar.svn.sourceforge.net/gar/?rev=9570&view=rev Author: dmichelsen Date: 2010-04-09 07:33:22 +0000 (Fri, 09 Apr 2010) Log Message: ----------- grep: Fix package name Modified Paths: -------------- csw/mgar/pkg/grep/trunk/Makefile Modified: csw/mgar/pkg/grep/trunk/Makefile =================================================================== --- csw/mgar/pkg/grep/trunk/Makefile 2010-04-08 22:11:57 UTC (rev 9569) +++ csw/mgar/pkg/grep/trunk/Makefile 2010-04-09 07:33:22 UTC (rev 9570) @@ -20,7 +20,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.xz -PACKAGES = CSWgrep +PACKAGES = CSWggrep CATALOGNAME = ggrep DEP_PKGS = CSWggettextrt CSWpcrert 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 Apr 9 10:01:25 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 08:01:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[9571] csw/mgar/pkg/cpan/Pod-Coverage/trunk/Makefile Message-ID: Revision: 9571 http://gar.svn.sourceforge.net/gar/?rev=9571&view=rev Author: dmichelsen Date: 2010-04-09 08:01:25 +0000 (Fri, 09 Apr 2010) Log Message: ----------- cpan/Pod-Coverage: Fix dependencies Modified Paths: -------------- csw/mgar/pkg/cpan/Pod-Coverage/trunk/Makefile Modified: csw/mgar/pkg/cpan/Pod-Coverage/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Pod-Coverage/trunk/Makefile 2010-04-09 07:33:22 UTC (rev 9570) +++ csw/mgar/pkg/cpan/Pod-Coverage/trunk/Makefile 2010-04-09 08:01:25 UTC (rev 9571) @@ -12,7 +12,7 @@ comprehensive. endef -PREREQUISITE_PKS = CSWpmmodulebuild CSWpmtestpod +BUILD_DEP_PKGS = CSWpmmodulebuild CSWpmtestpod RUNTIME_DEP_PKGS = CSWpmdevelsymdump DISTFILES = COPYING @@ -22,4 +22,6 @@ ARCHALL = 1 +CHECKPKG_OVERRIDES_CSWpmpodcoverage += surplus-dependency|CSWpmdevelsymdump + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 9 10:14:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 08:14:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9572] csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/Makefile Message-ID: Revision: 9572 http://gar.svn.sourceforge.net/gar/?rev=9572&view=rev Author: dmichelsen Date: 2010-04-09 08:14:30 +0000 (Fri, 09 Apr 2010) Log Message: ----------- cpan/Test-Pod-Coverage: Fix dependencies Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/Makefile Modified: csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/Makefile 2010-04-09 08:01:25 UTC (rev 9571) +++ csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/Makefile 2010-04-09 08:14:30 UTC (rev 9572) @@ -7,8 +7,8 @@ define BLURB endef -PREREQUISITE_PKGS = CSWpmtstbldrtester CSWpmpodcoverage -REQUIRED_PKGS = CSWpmpodsimple CSWpmiostringy +BUILD_DEP_PKGS = CSWpmtstbldrtester CSWpmpodcoverage +RUNTIME_DEP_PKGS = CSWpmpodsimple CSWpmiostringy DISTFILES = COPYING @@ -17,4 +17,7 @@ ARCHALL = 1 +CHECKPKG_OVERRIDES_CSWpmtestpodcoverage += surplus-dependency|CSWpmpodsimple +CHECKPKG_OVERRIDES_CSWpmtestpodcoverage += surplus-dependency|CSWpmiostringy + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 9 10:31:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 08:31:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9573] csw/mgar/pkg/cpan/Error/trunk Message-ID: Revision: 9573 http://gar.svn.sourceforge.net/gar/?rev=9573&view=rev Author: dmichelsen Date: 2010-04-09 08:31:58 +0000 (Fri, 09 Apr 2010) Log Message: ----------- cpan/Error: Update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/Error/trunk/Makefile csw/mgar/pkg/cpan/Error/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Error/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Error/trunk/files/CSWpmerror.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Error/trunk/ Property changes on: csw/mgar/pkg/cpan/Error/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/Error/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Error/trunk/Makefile 2010-04-09 08:14:30 UTC (rev 9572) +++ csw/mgar/pkg/cpan/Error/trunk/Makefile 2010-04-09 08:31:58 UTC (rev 9573) @@ -1,9 +1,9 @@ GARNAME = Error -GARVERSION = 0.15 +GARVERSION = 0.17016 CATEGORIES = cpan -AUTHOR = UARUN +AUTHOR = SHLOMIF -DESCRIPTION = error/exception handling in an OO-ish way +DESCRIPTION = Error/exception handling in an OO-ish way define BLURB The Error package provides two interfaces. Firstly Error provides a procedural interface to exception handling. Secondly Error is a base class @@ -11,6 +11,13 @@ can simply be recorded. endef -DISTFILES += CSWpmerror.gspec +DISTFILES = COPYING +PACKAGES = CSWpmerror +CATALOGNAME = pm_error + +BUILD_DEP_PKGS = CSWpmtestpodcoverage + +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Error/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Error/trunk/checksums 2010-04-09 08:14:30 UTC (rev 9572) +++ csw/mgar/pkg/cpan/Error/trunk/checksums 2010-04-09 08:31:58 UTC (rev 9573) @@ -1,2 +1,2 @@ -5136c67a6d0b2196231b5b8b6a5b7047 download/CSWpmerror.gspec -81b4847fb893f18a4e85186bca5f4380 download/Error-0.15.tar.gz +d1e94422f37619ab917dc77a2d3adaa2 COPYING +eedcd3c6970568dd32092b5334328eff Error-0.17016.tar.gz Copied: csw/mgar/pkg/cpan/Error/trunk/files/COPYING (from rev 9569, csw/mgar/pkg/cpan/Error/trunk/files/CSWpmerror.gspec) =================================================================== --- csw/mgar/pkg/cpan/Error/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Error/trunk/files/COPYING 2010-04-09 08:31:58 UTC (rev 9573) @@ -0,0 +1,3 @@ +Copyright (c) 1997-8 Graham Barr . All rights reserved. +This program is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Error/trunk/files/CSWpmerror.gspec =================================================================== --- csw/mgar/pkg/cpan/Error/trunk/files/CSWpmerror.gspec 2010-04-09 08:14:30 UTC (rev 9572) +++ csw/mgar/pkg/cpan/Error/trunk/files/CSWpmerror.gspec 2010-04-09 08:31:58 UTC (rev 9573) @@ -1,8 +0,0 @@ -%var bitname pm_error -%var pkgname CSWpmerror -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1997-8 Graham Barr . All rights reserved. -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 9 10:47:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 08:47:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[9574] csw/mgar/pkg/cpan/Cache-Cache/trunk Message-ID: Revision: 9574 http://gar.svn.sourceforge.net/gar/?rev=9574&view=rev Author: dmichelsen Date: 2010-04-09 08:47:56 +0000 (Fri, 09 Apr 2010) Log Message: ----------- cpan/Cache-Cache: Update to mGar v2 and 1.06 Modified Paths: -------------- csw/mgar/pkg/cpan/Cache-Cache/trunk/Makefile csw/mgar/pkg/cpan/Cache-Cache/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Cache-Cache/trunk/files/CSWpmcachecache.depend csw/mgar/pkg/cpan/Cache-Cache/trunk/files/CSWpmcachecache.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Cache-Cache/trunk/ Property changes on: csw/mgar/pkg/cpan/Cache-Cache/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/Cache-Cache/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Cache-Cache/trunk/Makefile 2010-04-09 08:31:58 UTC (rev 9573) +++ csw/mgar/pkg/cpan/Cache-Cache/trunk/Makefile 2010-04-09 08:47:56 UTC (rev 9574) @@ -1,9 +1,9 @@ GARNAME = Cache-Cache -GARVERSION = 1.05 +GARVERSION = 1.06 CATEGORIES = cpan -AUTHOR = DCLINTON +AUTHOR = JSWARTZ -DESCRIPTION = cache interface +DESCRIPTION = Cache interface define BLURB The Cache modules are designed to assist a developer in persisting data for a specified period of time. Often these modules are used in web applications @@ -14,8 +14,15 @@ to use abstraction of the filesystem or shared memory. endef -DISTFILES += CSWpmcachecache.gspec CSWpmcachecache.depend +PACKAGES = CSWpmcachecache +CATALOGNAME = pm_cachecache -DEPENDS += cpan/Digest-SHA1 cpan/IPC-ShareLite cpan/Error +DEP_PKGS = CSWpmdigestsha1 CSWpmerror CSWpmipcshrlite +ARCHALL = 1 + +CHECKPKG_OVERRIDES_CSWpmcachecache += surplus-dependency|CSWpmipcshrlite +CHECKPKG_OVERRIDES_CSWpmcachecache += surplus-dependency|CSWpmerror +CHECKPKG_OVERRIDES_CSWpmcachecache += surplus-dependency|CSWpmdigestsha1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Cache-Cache/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Cache-Cache/trunk/checksums 2010-04-09 08:31:58 UTC (rev 9573) +++ csw/mgar/pkg/cpan/Cache-Cache/trunk/checksums 2010-04-09 08:47:56 UTC (rev 9574) @@ -1,3 +1 @@ -36541a7fc6f654dba685ddfb116cab9a download/CSWpmcachecache.gspec -22aa30952f6af995d0fdd7403e608705 download/CSWpmcachecache.depend -09e4d37979c8f8ce2518e1d1ccd10d99 download/Cache-Cache-1.05.tar.gz +4425f44ddb138a799290802e5aad46ef Cache-Cache-1.06.tar.gz Deleted: csw/mgar/pkg/cpan/Cache-Cache/trunk/files/CSWpmcachecache.depend =================================================================== --- csw/mgar/pkg/cpan/Cache-Cache/trunk/files/CSWpmcachecache.depend 2010-04-09 08:31:58 UTC (rev 9573) +++ csw/mgar/pkg/cpan/Cache-Cache/trunk/files/CSWpmcachecache.depend 2010-04-09 08:47:56 UTC (rev 9574) @@ -1,3 +0,0 @@ -P CSWpmdigestsha1 pm_digestsha1 - interface to the SHA-1 Algorithm -P CSWpmerror pm_error - error/exception handling in an OO-ish way -P CSWpmipcsharelite pm_ipcsharelite - light-weight interface to shared memory Deleted: csw/mgar/pkg/cpan/Cache-Cache/trunk/files/CSWpmcachecache.gspec =================================================================== --- csw/mgar/pkg/cpan/Cache-Cache/trunk/files/CSWpmcachecache.gspec 2010-04-09 08:31:58 UTC (rev 9573) +++ csw/mgar/pkg/cpan/Cache-Cache/trunk/files/CSWpmcachecache.gspec 2010-04-09 08:47:56 UTC (rev 9574) @@ -1,5 +0,0 @@ -%var bitname pm_cachecache -%var pkgname CSWpmcachecache -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 9 13:04:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 11:04:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9575] csw/mgar/pkg/cpan/DateTime-TimeZone/trunk Message-ID: Revision: 9575 http://gar.svn.sourceforge.net/gar/?rev=9575&view=rev Author: dmichelsen Date: 2010-04-09 11:04:48 +0000 (Fri, 09 Apr 2010) Log Message: ----------- cpan/DateTime-TimeZone: Update package name Modified Paths: -------------- csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/checksums Modified: csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile 2010-04-09 08:47:56 UTC (rev 9574) +++ csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile 2010-04-09 11:04:48 UTC (rev 9575) @@ -1,5 +1,5 @@ GARNAME = DateTime-TimeZone -GARVERSION = 0.90 +GARVERSION = 1.16 CATEGORIES = cpan AUTHOR = DROLSKY @@ -13,13 +13,17 @@ use DateTime::TimeZone methods. endef -PACKAGES = CSWpmdatetimetimezone -CATALOGNAME = pm_datetimetimezone +PACKAGES = CSWpmdatetimetz +CATALOGNAME = pm_datetimetz + +LICENSE = LICENSE + ARCHALL = 1 -RUNTIME_DEP_PKGS = CSWpmclasssingleton -RUNTIME_DEP_PKGS += CSWpmparamsvalidate +DEP_PKGS = CSWpmclasssingleton CSWpmparamsvalidate +CHECKPKG_OVERRIDES_CSWpmdatetimetz += surplus-dependency|CSWpmclasssingleton +CHECKPKG_OVERRIDES_CSWpmdatetimetz += surplus-dependency|CSWpmparamsvalidate + include gar/category.mk -LICENSE = LICENSE Modified: csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/checksums 2010-04-09 08:47:56 UTC (rev 9574) +++ csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/checksums 2010-04-09 11:04:48 UTC (rev 9575) @@ -1 +1 @@ -d0efeaf9d52e51b727fbd927e3348e58 download/DateTime-TimeZone-0.90.tar.gz +cea4c74e6b8702ebcdafbe9d889ecd42 DateTime-TimeZone-1.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 9 13:33:04 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 11:33:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[9576] csw/mgar/pkg/cpan/DateTime-Locale/trunk Message-ID: Revision: 9576 http://gar.svn.sourceforge.net/gar/?rev=9576&view=rev Author: dmichelsen Date: 2010-04-09 11:33:03 +0000 (Fri, 09 Apr 2010) Log Message: ----------- cpan/DateTime-Locale: Update to 0.45 Modified Paths: -------------- csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile csw/mgar/pkg/cpan/DateTime-Locale/trunk/checksums Modified: csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile 2010-04-09 11:04:48 UTC (rev 9575) +++ csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile 2010-04-09 11:33:03 UTC (rev 9576) @@ -1,5 +1,5 @@ GARNAME = DateTime-Locale -GARVERSION = 0.42 +GARVERSION = 0.45 CATEGORIES = cpan AUTHOR = DROLSKY @@ -12,11 +12,10 @@ PACKAGES = CSWpmdatetimelocale CATALOGNAME = pm_datetimelocale -ARCHALL = 1 -RUNTIME_DEP_PKGS = CSWpmlistmoreutils +LICENSE = LICENSE +ARCHALL = 1 + include gar/category.mk -LICENSE = LICENSE - Modified: csw/mgar/pkg/cpan/DateTime-Locale/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DateTime-Locale/trunk/checksums 2010-04-09 11:04:48 UTC (rev 9575) +++ csw/mgar/pkg/cpan/DateTime-Locale/trunk/checksums 2010-04-09 11:33:03 UTC (rev 9576) @@ -1 +1 @@ -2f40350ef1c697f1bc402220824f6a7a download/DateTime-Locale-0.42.tar.gz +8ba6a4b70f8fa7d987529c2e2c708862 DateTime-Locale-0.45.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 9 14:30:29 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 12:30:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9577] csw/mgar/gar/v2 Message-ID: Revision: 9577 http://gar.svn.sourceforge.net/gar/?rev=9577&view=rev Author: dmichelsen Date: 2010-04-09 12:30:28 +0000 (Fri, 09 Apr 2010) Log Message: ----------- mGAR v2: Do not check package dependencies for Perl modules as it does not work right now Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2010-04-09 11:33:03 UTC (rev 9576) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2010-04-09 12:30:28 UTC (rev 9577) @@ -39,6 +39,9 @@ _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist _CATEGORY_GSPEC_INCLUDE ?= csw_cpan_dyngspec.gspec +# Perl module dependencies can not be properly tracked right now +_CATEGORY_CHECKPKG_OVERRIDES = surplus-dependency + include gar/gar.mk CONFIGURE_ENV += PERL5LIB=$(PERL5LIB) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-04-09 11:33:03 UTC (rev 9576) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-04-09 12:30:28 UTC (rev 9577) @@ -680,12 +680,12 @@ merge-checkpkgoverrides-%: @echo "[ Generating checkpkg override for package $* ]" $(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/checkpkg/overrides - $(_DBG)($(foreach O,$(or $(CHECKPKG_OVERRIDES_$*),$(CHECKPKG_OVERRIDES)),echo "$O";)) | \ + $(_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,$*) @$(MAKECOOKIE) -merge-checkpkgoverrides: $(foreach S,$(SPKG_SPECS),$(if $(or $(CHECKPKG_OVERRIDES_$S),$(CHECKPKG_OVERRIDES)),merge-checkpkgoverrides-$S)) +merge-checkpkgoverrides: $(foreach S,$(SPKG_SPECS),$(if $(or $(CHECKPKG_OVERRIDES_$S),$(CHECKPKG_OVERRIDES),$(_CATEGORY_CHECKPKG_OVERRIDES)),merge-checkpkgoverrides-$S)) reset-merge-checkpkgoverrides: @rm -f $(COOKIEDIR)/merge-checkpkgoverrides $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-checkpkgoverrides-$(SPEC)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 9 14:31:03 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 12:31:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[9578] csw/mgar/pkg/cpan/DateTime/trunk/Makefile Message-ID: Revision: 9578 http://gar.svn.sourceforge.net/gar/?rev=9578&view=rev Author: dmichelsen Date: 2010-04-09 12:31:03 +0000 (Fri, 09 Apr 2010) Log Message: ----------- cpan/DateTime: Update dependencies Modified Paths: -------------- csw/mgar/pkg/cpan/DateTime/trunk/Makefile Modified: csw/mgar/pkg/cpan/DateTime/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime/trunk/Makefile 2010-04-09 12:30:28 UTC (rev 9577) +++ csw/mgar/pkg/cpan/DateTime/trunk/Makefile 2010-04-09 12:31:03 UTC (rev 9578) @@ -16,14 +16,12 @@ LICENSE = LICENSE -DEP_PKGS = CSWpmdatetimetimezone CSWpmdatetimelocale +DEP_PKGS = CSWpmdatetimetz CSWpmdatetimelocale CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL BUILD_SCRIPTS = $(WORKSRC)/Build TEST_SCRIPTS = $(WORKSRC)/Build INSTALL_SCRIPTS = $(WORKSRC)/Build -ARCHALL = 1 - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 9 14:44:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 12:44:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9579] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 9579 http://gar.svn.sourceforge.net/gar/?rev=9579&view=rev Author: dmichelsen Date: 2010-04-09 12:44:48 +0000 (Fri, 09 Apr 2010) Log Message: ----------- libxml2: Make sure bin/64/xml2-config gets into the devel package Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2010-04-09 12:31:03 UTC (rev 9578) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2010-04-09 12:44:48 UTC (rev 9579) @@ -45,8 +45,8 @@ STRIP_LIBTOOL = 1 # Skip 64 bit binaries - they are just big and gain nothing -MERGE_DIRS_isa-sparcv9 = $(libdir) -MERGE_DIRS_isa-amd64 = $(libdir) +MERGE_SCRIPTS_isa-default64 = copy-relocated-only copy-config-only +MERGE_DIRS_isa-default64 = $(libdir) EXTRA_PAX_ARGS = -s ",^\.$(docdir)/libxml2-$(GARVERSION),.$(docdir)/libxml2,p" EXTRA_PAX_ARGS += -s ",^\.$(docdir)/libxml2-python-$(GARVERSION),.$(docdir)/pylibxml2,p" 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 Apr 9 15:09:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 13:09:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9580] csw/mgar/pkg/cpan Message-ID: Revision: 9580 http://gar.svn.sourceforge.net/gar/?rev=9580&view=rev Author: dmichelsen Date: 2010-04-09 13:09:47 +0000 (Fri, 09 Apr 2010) Log Message: ----------- cpan/DateTime-Format-Mail: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/DateTime-Format-Mail/ csw/mgar/pkg/cpan/DateTime-Format-Mail/branches/ csw/mgar/pkg/cpan/DateTime-Format-Mail/tags/ csw/mgar/pkg/cpan/DateTime-Format-Mail/trunk/ csw/mgar/pkg/cpan/DateTime-Format-Mail/trunk/Makefile csw/mgar/pkg/cpan/DateTime-Format-Mail/trunk/checksums csw/mgar/pkg/cpan/DateTime-Format-Mail/trunk/files/ Property changes on: csw/mgar/pkg/cpan/DateTime-Format-Mail/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/DateTime-Format-Mail/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-Format-Mail/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/DateTime-Format-Mail/trunk/Makefile 2010-04-09 13:09:47 UTC (rev 9580) @@ -0,0 +1,15 @@ +GARNAME = DateTime-Format-Mail +GARVERSION = 0.3001 +CATEGORIES = cpan +AUTHOR = DROLSKY + +DESCRIPTION = Convert between DateTime and RFC2822/822 formats +define BLURB +endef + +PACKAGES = CSWpmdatetimefmtmail +CATALOGNAME = pm_datetimefmtmail + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/DateTime-Format-Mail/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DateTime-Format-Mail/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/DateTime-Format-Mail/trunk/checksums 2010-04-09 13:09:47 UTC (rev 9580) @@ -0,0 +1 @@ +15e36249e866463bd0237262a8e43b16 DateTime-Format-Mail-0.3001.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 9 15:26:13 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 13:26:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9581] csw/mgar/pkg/cpan Message-ID: Revision: 9581 http://gar.svn.sourceforge.net/gar/?rev=9581&view=rev Author: dmichelsen Date: 2010-04-09 13:26:13 +0000 (Fri, 09 Apr 2010) Log Message: ----------- cpan/DateTime-Format-W3CDTF: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/ csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/branches/ csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/tags/ csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/trunk/ csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/trunk/Makefile csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/trunk/checksums csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/trunk/files/ Property changes on: csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/trunk/Makefile 2010-04-09 13:26:13 UTC (rev 9581) @@ -0,0 +1,17 @@ +GARNAME = DateTime-Format-W3CDTF +GARVERSION = 0.05 +CATEGORIES = cpan +AUTHOR = DROLSKY + +DESCRIPTION = Parse and format W3CDTF datetime strings +define BLURB +endef + +PACKAGES = CSWpmdatetimefmtw3tf +CATALOGNAME = pm_datetimefmtw3tf + +LICENSE = LICENSE + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/trunk/checksums 2010-04-09 13:26:13 UTC (rev 9581) @@ -0,0 +1 @@ +86b23720f1d2f40ca1fec0a4096a5ff4 DateTime-Format-W3CDTF-0.05.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 9 15:36:47 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 13:36:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9582] csw/mgar/pkg/cpan/XML-RSS/trunk Message-ID: Revision: 9582 http://gar.svn.sourceforge.net/gar/?rev=9582&view=rev Author: dmichelsen Date: 2010-04-09 13:36:47 +0000 (Fri, 09 Apr 2010) Log Message: ----------- cpan/XML-RSS: Update to 1.47 amd mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/XML-RSS/trunk/Makefile csw/mgar/pkg/cpan/XML-RSS/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/XML-RSS/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/XML-RSS/trunk/files/CSWpmxmlrss.depend csw/mgar/pkg/cpan/XML-RSS/trunk/files/CSWpmxmlrss.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/XML-RSS/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-RSS/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/XML-RSS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-RSS/trunk/Makefile 2010-04-09 13:26:13 UTC (rev 9581) +++ csw/mgar/pkg/cpan/XML-RSS/trunk/Makefile 2010-04-09 13:36:47 UTC (rev 9582) @@ -1,9 +1,9 @@ GARNAME = XML-RSS -GARVERSION = 1.05 +GARVERSION = 1.47 CATEGORIES = cpan -AUTHOR = KELLAN +AUTHOR = SHLOMIF -DESCRIPTION = creates and updates RSS files +DESCRIPTION = Creates and updates RSS files define BLURB This module provides a basic framework for creating and maintaining RDF Site Summary (RSS) files. This distribution also contains many examples that @@ -13,9 +13,13 @@ or if you want to syndicate your own content. endef -DISTFILES += CSWpmxmlrss.gspec CSWpmxmlrss.depend +DISTFILES = COPYING -DEPENDS += cpan/XML-Parser -BUILDDEPS += cpan/Test-Manifest +PACKAGES = CSWpmxmlrss +CATALOGNAME = pm_xmlrss +DEP_PKGS = CSWpmxmlparser CSWpmdatetime CSWpmdatetimefmtmail CSWpmdatetimefmtw3tf + +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/XML-RSS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-RSS/trunk/checksums 2010-04-09 13:26:13 UTC (rev 9581) +++ csw/mgar/pkg/cpan/XML-RSS/trunk/checksums 2010-04-09 13:36:47 UTC (rev 9582) @@ -1,3 +1,2 @@ -4ad6343720008d3b1e51953dc8d02805 download/CSWpmxmlrss.gspec -216480fc0798fb3627ad2e288bbcd56a download/CSWpmxmlrss.depend -3eaa65ec6316edec3194b6a2f384a65c download/XML-RSS-1.05.tar.gz +fb31ddc2f9285dd5fe1903231cb9024b COPYING +323756733908f86927045bc7f1d205ea XML-RSS-1.47.tar.gz Copied: csw/mgar/pkg/cpan/XML-RSS/trunk/files/COPYING (from rev 9271, csw/mgar/pkg/cpan/XML-RSS/trunk/files/CSWpmxmlrss.gspec) =================================================================== --- csw/mgar/pkg/cpan/XML-RSS/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/XML-RSS/trunk/files/COPYING 2010-04-09 13:36:47 UTC (rev 9582) @@ -0,0 +1,5 @@ +Copyright (c) 2001 Jonathan Eisenzopf and Rael Dornfest. All rights reserved. +Maintained by brian d foy + +This package is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/XML-RSS/trunk/files/CSWpmxmlrss.depend =================================================================== --- csw/mgar/pkg/cpan/XML-RSS/trunk/files/CSWpmxmlrss.depend 2010-04-09 13:26:13 UTC (rev 9581) +++ csw/mgar/pkg/cpan/XML-RSS/trunk/files/CSWpmxmlrss.depend 2010-04-09 13:36:47 UTC (rev 9582) @@ -1 +0,0 @@ -P CSWpmxmlparser pm_xmlparser - a module for parsing XML documents Deleted: csw/mgar/pkg/cpan/XML-RSS/trunk/files/CSWpmxmlrss.gspec =================================================================== --- csw/mgar/pkg/cpan/XML-RSS/trunk/files/CSWpmxmlrss.gspec 2010-04-09 13:26:13 UTC (rev 9581) +++ csw/mgar/pkg/cpan/XML-RSS/trunk/files/CSWpmxmlrss.gspec 2010-04-09 13:36:47 UTC (rev 9582) @@ -1,10 +0,0 @@ -%var bitname pm_xmlrss -%var pkgname CSWpmxmlrss -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2001 Jonathan Eisenzopf and Rael Dornfest. All rights reserved. -Maintained by brian d foy - -This package is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 9 16:41:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 14:41:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9583] csw/mgar/pkg Message-ID: Revision: 9583 http://gar.svn.sourceforge.net/gar/?rev=9583&view=rev Author: dmichelsen Date: 2010-04-09 14:41:54 +0000 (Fri, 09 Apr 2010) Log Message: ----------- maildrop: Initial commit, testsuite dumps core, maybe update dependencies first Added Paths: ----------- csw/mgar/pkg/maildrop/ csw/mgar/pkg/maildrop/branches/ csw/mgar/pkg/maildrop/tags/ csw/mgar/pkg/maildrop/trunk/ csw/mgar/pkg/maildrop/trunk/Makefile csw/mgar/pkg/maildrop/trunk/checksums csw/mgar/pkg/maildrop/trunk/files/ Property changes on: csw/mgar/pkg/maildrop/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/maildrop/trunk/Makefile =================================================================== --- csw/mgar/pkg/maildrop/trunk/Makefile (rev 0) +++ csw/mgar/pkg/maildrop/trunk/Makefile 2010-04-09 14:41:54 UTC (rev 9583) @@ -0,0 +1,26 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = maildrop +GARVERSION = 2.4.3 +CATEGORIES = utils + +DESCRIPTION = Mail delivery agent with filtering abilities +define BLURB +endef + +SF_PROJ = courier +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +DEP_PKGS = CSWlibidn CSWgdbm CSWpcrert + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +# We need whoami +PATH := /opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/maildrop/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/maildrop/trunk/checksums =================================================================== --- csw/mgar/pkg/maildrop/trunk/checksums (rev 0) +++ csw/mgar/pkg/maildrop/trunk/checksums 2010-04-09 14:41:54 UTC (rev 9583) @@ -0,0 +1 @@ +15b7528ba5e7ab76e676596af6bcd1c9 maildrop-2.4.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 9 17:12:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 15:12:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[9584] csw/mgar/pkg Message-ID: Revision: 9584 http://gar.svn.sourceforge.net/gar/?rev=9584&view=rev Author: dmichelsen Date: 2010-04-09 15:12:27 +0000 (Fri, 09 Apr 2010) Log Message: ----------- amanda: Initial commit, basic building works Added Paths: ----------- csw/mgar/pkg/amanda/ csw/mgar/pkg/amanda/branches/ csw/mgar/pkg/amanda/tags/ csw/mgar/pkg/amanda/trunk/ csw/mgar/pkg/amanda/trunk/Makefile csw/mgar/pkg/amanda/trunk/checksums csw/mgar/pkg/amanda/trunk/files/ Property changes on: csw/mgar/pkg/amanda/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/amanda/trunk/Makefile =================================================================== --- csw/mgar/pkg/amanda/trunk/Makefile (rev 0) +++ csw/mgar/pkg/amanda/trunk/Makefile 2010-04-09 15:12:27 UTC (rev 9584) @@ -0,0 +1,66 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = amanda +GARVERSION = 2.6.1p2 +CATEGORIES = apps + +DESCRIPTION = The Advanced Maryland Automatic Network Disk Archiver +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 + +DEP_PKGS = CSWperl CSWreadline CSWlibidn CSWglib2 CSWsasl CSWlibcares CSWggettextrt CSWzlib CSWoldaprt +DEP_PKGS += CSWcurlrt CSWosslrt CSWlibnet + +VENDOR_URL = http://www.amanda.org + +LICENSE = COPYRIGHT + +# From packaging/rpm/amanda.spec for reference: + +# --quiet \ +# --prefix=%{PREFIX} \ +# --sysconfdir=%{SYSCONFDIR} \ +# --sharedstatedir=%{LOCALSTATEDIR} \ +# --localstatedir=%{LOCALSTATEDIR} \ +# --libdir=%{LIBDIR} \ +# --includedir=%{INCLUDEDIR} \ +# --with-amdatadir=%{AMDATADIR} \ +# --with-gnuplot=/usr/bin/gnuplot \ +# --with-gnutar=/bin/tar \ +# --with-gnutar-listdir=%{AMANDAHOMEDIR}/gnutar-lists \ +# --with-index-server=localhost \ +# --with-tape-server=localhost \ +# --with-user=%{config_user} \ +# --with-group=%{config_group} \ +# --with-owner=%{packer} \ +# --with-fqdn \ +# --with-bsd-security \ +# --with-bsdtcp-security \ +# --with-bsdudp-security \ +# --with-ssh-security \ +# --with-udpportrange=%{udpportrange} \ +# --with-tcpportrange=%{tcpportrange} \ +# --with-low-tcpportrange=%{low_tcpportrange} \ +# --with-debugging=%{LOGDIR} \ +# --with-assertions \ +# --disable-installperms \ +# %{?without_ipv6} + +# Configure a target using Makefile.PL +# _CATEGORY_LD_OPTIONS ?= -L$(libdir) -lperl +# PERL_CONFIGURE_ARGS ?= INSTALLDIRS=vendor $(EXTRA_PERL_CONFIGURE_ARGS) + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-gnuplot=/opt/csw/bin/gnuplot +CONFIGURE_ARGS += --with-gnutar=/opt/csw/bin/gtar +CONFIGURE_ARGS += --disable-installperms +CONFIGURE_ARGS += --with-amperldir=/opt/csw/lib/perl/csw + +TEST_TARGET = check + +include gar/category.mk Property changes on: csw/mgar/pkg/amanda/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/amanda/trunk/checksums =================================================================== --- csw/mgar/pkg/amanda/trunk/checksums (rev 0) +++ csw/mgar/pkg/amanda/trunk/checksums 2010-04-09 15:12:27 UTC (rev 9584) @@ -0,0 +1 @@ +816ef0101b6d968c5df7d7d7e793caed amanda-2.6.1p2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 9 17:18:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 15:18:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9585] csw/mgar/pkg/cpan/Capitalization/trunk Message-ID: Revision: 9585 http://gar.svn.sourceforge.net/gar/?rev=9585&view=rev Author: dmichelsen Date: 2010-04-09 15:18:29 +0000 (Fri, 09 Apr 2010) Log Message: ----------- cpan/Capitalization: Fix dependencies Modified Paths: -------------- csw/mgar/pkg/cpan/Capitalization/trunk/Makefile csw/mgar/pkg/cpan/Capitalization/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Capitalization/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/Capitalization/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Capitalization/trunk/Makefile 2010-04-09 15:12:27 UTC (rev 9584) +++ csw/mgar/pkg/cpan/Capitalization/trunk/Makefile 2010-04-09 15:18:29 UTC (rev 9585) @@ -7,11 +7,16 @@ define BLURB endef -RUNTIME_DEP_PKGS = CSWpmdevelsymdump +DISTFILES = COPYING PACKAGES = CSWpmcapitalization CATALOGNAME = pm_capitalization +DEP_PKGS = CSWpmdevelsymdump + ARCHALL = 1 +# The CPAN name *really* does not start with a capital +CHECKPKG_OVERRIDES_CSWpmcapitalization += pkginfo-description-not-starting-with-uppercase + include gar/category.mk Modified: csw/mgar/pkg/cpan/Capitalization/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Capitalization/trunk/checksums 2010-04-09 15:12:27 UTC (rev 9584) +++ csw/mgar/pkg/cpan/Capitalization/trunk/checksums 2010-04-09 15:18:29 UTC (rev 9585) @@ -1 +1,2 @@ -94998b37b4f86bd2e5738ab3a8fb4e7c download/capitalization-0.03.tar.gz +1aafeda6c9fa4e01abb45657ef85e1ef COPYING +94998b37b4f86bd2e5738ab3a8fb4e7c capitalization-0.03.tar.gz Added: csw/mgar/pkg/cpan/Capitalization/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Capitalization/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Capitalization/trunk/files/COPYING 2010-04-09 15:18:29 UTC (rev 9585) @@ -0,0 +1,3 @@ +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 9 17:31:23 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Apr 2010 15:31:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9586] csw/mgar/pkg/cpan Message-ID: Revision: 9586 http://gar.svn.sourceforge.net/gar/?rev=9586&view=rev Author: dmichelsen Date: 2010-04-09 15:31:22 +0000 (Fri, 09 Apr 2010) Log Message: ----------- cpan/Cache-Simple-TimedExpiry: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/ csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/branches/ csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/tags/ csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/ csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/Makefile csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/checksums csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/files/ csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/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/Cache-Simple-TimedExpiry/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/Makefile 2010-04-09 15:31:22 UTC (rev 9586) @@ -0,0 +1,17 @@ +GARNAME = Cache-Simple-TimedExpiry +GARVERSION = 0.27 +CATEGORIES = cpan +AUTHOR = JESSE + +DESCRIPTION = A lightweight cache with timed expiration +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmcachesmptimexp +CATALOGNAME = pm_cachesmptimexp + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/checksums 2010-04-09 15:31:22 UTC (rev 9586) @@ -0,0 +1,2 @@ +2c5b2bf6ed505af9db5397dbae421c85 COPYING +4ef124ab7776f3c257b9ffbed917e67a Cache-Simple-TimedExpiry-0.27.tar.gz Added: csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/files/COPYING 2010-04-09 15:31:22 UTC (rev 9586) @@ -0,0 +1,5 @@ +Jesse Vincent +Some of the heavy lifting was designed by Robert Spier +Copyright 2004 Jesse Vincent + +Under the same license 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 Fri Apr 9 17:41:10 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 09 Apr 2010 15:41:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9587] csw/mgar/pkg/jpeginfo/trunk Message-ID: Revision: 9587 http://gar.svn.sourceforge.net/gar/?rev=9587&view=rev Author: bonivart Date: 2010-04-09 15:41:10 +0000 (Fri, 09 Apr 2010) Log Message: ----------- jpeginfo: update to 1.6.1 Modified Paths: -------------- csw/mgar/pkg/jpeginfo/trunk/Makefile csw/mgar/pkg/jpeginfo/trunk/checksums Modified: csw/mgar/pkg/jpeginfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/jpeginfo/trunk/Makefile 2010-04-09 15:31:22 UTC (rev 9586) +++ csw/mgar/pkg/jpeginfo/trunk/Makefile 2010-04-09 15:41:10 UTC (rev 9587) @@ -1,5 +1,5 @@ GARNAME = jpeginfo -GARVERSION = 1.6.0 +GARVERSION = 1.6.1 CATEGORIES = utils DESCRIPTION = Info and error checking of jpeg files Modified: csw/mgar/pkg/jpeginfo/trunk/checksums =================================================================== --- csw/mgar/pkg/jpeginfo/trunk/checksums 2010-04-09 15:31:22 UTC (rev 9586) +++ csw/mgar/pkg/jpeginfo/trunk/checksums 2010-04-09 15:41:10 UTC (rev 9587) @@ -1 +1 @@ -eda5b0d15d7373c9b0bc96bba4af61e0 download/jpeginfo-1.6.0.tar.gz +344be10d6b16ec559c5d8b7e3707241f jpeginfo-1.6.1.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 Fri Apr 9 17:56:27 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 09 Apr 2010 15:56:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[9588] csw/mgar/pkg Message-ID: Revision: 9588 http://gar.svn.sourceforge.net/gar/?rev=9588&view=rev Author: bonivart Date: 2010-04-09 15:56:27 +0000 (Fri, 09 Apr 2010) Log Message: ----------- jpegoptim: initial commit Added Paths: ----------- csw/mgar/pkg/jpegoptim/ csw/mgar/pkg/jpegoptim/branches/ csw/mgar/pkg/jpegoptim/tags/ csw/mgar/pkg/jpegoptim/trunk/ csw/mgar/pkg/jpegoptim/trunk/Makefile csw/mgar/pkg/jpegoptim/trunk/checksums csw/mgar/pkg/jpegoptim/trunk/files/ Property changes on: csw/mgar/pkg/jpegoptim/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/jpegoptim/trunk/Makefile =================================================================== --- csw/mgar/pkg/jpegoptim/trunk/Makefile (rev 0) +++ csw/mgar/pkg/jpegoptim/trunk/Makefile 2010-04-09 15:56:27 UTC (rev 9588) @@ -0,0 +1,37 @@ +GARNAME = jpegoptim +GARVERSION = 1.2.3 +CATEGORIES = utils + +DESCRIPTION = Utility to optimize jpeg files +define BLURB + Utility to optimize jpeg files +endef + +MASTER_SITES = http://www.kokkonen.net/tjko/src/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +RUNTIME_DEP_PKGS = CSWjpeg + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +TEST_TARGET = +INSTALL_SCRIPTS = custom + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +SPKG_SOURCEURL = http://www.kokkonen.net/tjko/projects.html + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @rm -rf $(DESTDIR) + @ginstall -d $(DESTDIR)$(bindir) + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -d $(DESTDIR)$(mandir)/man1 + @( cd $(WORKSRC) ; \ + cp -r $(GARNAME) $(DESTDIR)$(bindir)/$(GARNAME) ; \ + cp -r README $(DESTDIR)$(docdir)/$(GARNAME) ; \ + cp -r $(GARNAME).1 $(DESTDIR)$(mandir)/man1/$(GARNAME).1 ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/jpegoptim/trunk/checksums =================================================================== --- csw/mgar/pkg/jpegoptim/trunk/checksums (rev 0) +++ csw/mgar/pkg/jpegoptim/trunk/checksums 2010-04-09 15:56:27 UTC (rev 9588) @@ -0,0 +1 @@ +36afa60f8baac825935e215eb19e41e0 jpegoptim-1.2.3.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 Fri Apr 9 22:06:03 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 09 Apr 2010 20:06:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[9589] csw/mgar/pkg/rrdtool/branches/ihsan/Makefile Message-ID: Revision: 9589 http://gar.svn.sourceforge.net/gar/?rev=9589&view=rev Author: idogan23 Date: 2010-04-09 20:06:03 +0000 (Fri, 09 Apr 2010) Log Message: ----------- rrdtool: bump version to 1.4.3 Modified Paths: -------------- csw/mgar/pkg/rrdtool/branches/ihsan/Makefile Modified: csw/mgar/pkg/rrdtool/branches/ihsan/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/branches/ihsan/Makefile 2010-04-09 15:56:27 UTC (rev 9588) +++ csw/mgar/pkg/rrdtool/branches/ihsan/Makefile 2010-04-09 20:06:03 UTC (rev 9589) @@ -1,5 +1,5 @@ GARNAME = rrdtool -GARVERSION = 1.4.2 +GARVERSION = 1.4.3 CATEGORIES = utils DESCRIPTION = Time-series data logging and graphing. @@ -18,7 +18,7 @@ PACKAGES = CSWrrd CATALOGNAME = rrdtool -PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 RUNTIME_DEP_PKGS += CSWggettextrt RUNTIME_DEP_PKGS += CSWglib2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Apr 9 22:09:58 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 09 Apr 2010 20:09:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9590] csw/mgar/pkg/rrdtool/branches/ihsan/checksums Message-ID: Revision: 9590 http://gar.svn.sourceforge.net/gar/?rev=9590&view=rev Author: idogan23 Date: 2010-04-09 20:09:58 +0000 (Fri, 09 Apr 2010) Log Message: ----------- rrdtool: bump version to 1.4.3 Modified Paths: -------------- csw/mgar/pkg/rrdtool/branches/ihsan/checksums Modified: csw/mgar/pkg/rrdtool/branches/ihsan/checksums =================================================================== --- csw/mgar/pkg/rrdtool/branches/ihsan/checksums 2010-04-09 20:06:03 UTC (rev 9589) +++ csw/mgar/pkg/rrdtool/branches/ihsan/checksums 2010-04-09 20:09:58 UTC (rev 9590) @@ -4,4 +4,4 @@ 072482090287b462c8c092b2ead132da patch-bindings-ruby-extconf.rb 20e58c7facf2687037288c157c32df1a patch-src-Makefile.in 47709778545eec2e8c5c3b38f9c94fcd patch-src-rrd_open.c -9318d3b4016dd9dd9897f1eac7548032 rrdtool-1.4.2.tar.gz +492cf946c72f85987238faa2c311b7bb rrdtool-1.4.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 Fri Apr 9 22:19:08 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 09 Apr 2010 20:19:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9591] csw/mgar/pkg/cpan Message-ID: Revision: 9591 http://gar.svn.sourceforge.net/gar/?rev=9591&view=rev Author: bonivart Date: 2010-04-09 20:19:08 +0000 (Fri, 09 Apr 2010) Log Message: ----------- pm_cryptrc5: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Crypt-RC5/ csw/mgar/pkg/cpan/Crypt-RC5/branches/ csw/mgar/pkg/cpan/Crypt-RC5/tags/ csw/mgar/pkg/cpan/Crypt-RC5/trunk/ csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile csw/mgar/pkg/cpan/Crypt-RC5/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Crypt-RC5/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/Crypt-RC5/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile 2010-04-09 20:19:08 UTC (rev 9591) @@ -0,0 +1,20 @@ +GARNAME = Crypt-RC5 +GARVERSION = 2.00 +CATEGORIES = cpan +AUTHOR = SIFUKURT + +DESCRIPTION = Perl implementation of the RC5 encryption algorithm +define BLURB + Perl implementation of the RC5 encryption algorithm +endef + +DISTFILES += COPYING + +PACKAGES = CSWpmcryptrc5 +CATALOGNAME = pm_cryptrc5 +ARCHALL = 1 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +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 Fri Apr 9 22:21:34 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 09 Apr 2010 20:21:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[9592] csw/mgar/pkg/cpan/Crypt-RC5/trunk/files/COPYING Message-ID: Revision: 9592 http://gar.svn.sourceforge.net/gar/?rev=9592&view=rev Author: bonivart Date: 2010-04-09 20:21:34 +0000 (Fri, 09 Apr 2010) Log Message: ----------- pm_cryptrc5: add license Added Paths: ----------- csw/mgar/pkg/cpan/Crypt-RC5/trunk/files/COPYING Added: csw/mgar/pkg/cpan/Crypt-RC5/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Crypt-RC5/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Crypt-RC5/trunk/files/COPYING 2010-04-09 20:21:34 UTC (rev 9592) @@ -0,0 +1,4 @@ +Copyright (c) 2002 Kurt L. Kincaid + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Apr 9 22:22:26 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 09 Apr 2010 20:22:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[9593] csw/mgar/pkg/cpan/Crypt-RC5/trunk/checksums Message-ID: Revision: 9593 http://gar.svn.sourceforge.net/gar/?rev=9593&view=rev Author: bonivart Date: 2010-04-09 20:22:25 +0000 (Fri, 09 Apr 2010) Log Message: ----------- pm_cryptrc5: add checksums Added Paths: ----------- csw/mgar/pkg/cpan/Crypt-RC5/trunk/checksums Added: csw/mgar/pkg/cpan/Crypt-RC5/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-RC5/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Crypt-RC5/trunk/checksums 2010-04-09 20:22:25 UTC (rev 9593) @@ -0,0 +1,2 @@ +7195ab845635945f58ee9dd0a852f5ab COPYING +79649f6eba759a4415513a8512eaeb21 Crypt-RC5-2.00.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 Fri Apr 9 22:34:16 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 09 Apr 2010 20:34:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9594] csw/mgar/pkg/cpan Message-ID: Revision: 9594 http://gar.svn.sourceforge.net/gar/?rev=9594&view=rev Author: bonivart Date: 2010-04-09 20:34:16 +0000 (Fri, 09 Apr 2010) Log Message: ----------- pm_netnetmask: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-Netmask/ csw/mgar/pkg/cpan/Net-Netmask/branches/ csw/mgar/pkg/cpan/Net-Netmask/tags/ csw/mgar/pkg/cpan/Net-Netmask/trunk/ csw/mgar/pkg/cpan/Net-Netmask/trunk/Makefile csw/mgar/pkg/cpan/Net-Netmask/trunk/checksums csw/mgar/pkg/cpan/Net-Netmask/trunk/files/ csw/mgar/pkg/cpan/Net-Netmask/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Net-Netmask/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-Netmask/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Netmask/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-Netmask/trunk/Makefile 2010-04-09 20:34:16 UTC (rev 9594) @@ -0,0 +1,20 @@ +GARNAME = Net-Netmask +GARVERSION = 1.9015 +CATEGORIES = cpan +AUTHOR = MUIR + +DESCRIPTION = Parse, manipulate and lookup IP network blocks +define BLURB + Parse, manipulate and lookup IP network blocks +endef + +DISTFILES += COPYING + +PACKAGES = CSWpmnetnetmask +CATALOGNAME = pm_netnetmask +ARCHALL = 1 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-Netmask/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-Netmask/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-Netmask/trunk/checksums 2010-04-09 20:34:16 UTC (rev 9594) @@ -0,0 +1,2 @@ +3d6734478ccc5c63108efe748107619b COPYING +90298105cd17a5c2a4059297e09f1546 Net-Netmask-1.9015.tar.gz Added: csw/mgar/pkg/cpan/Net-Netmask/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Net-Netmask/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Net-Netmask/trunk/files/COPYING 2010-04-09 20:34:16 UTC (rev 9594) @@ -0,0 +1,9 @@ + Copyright (C) 1998-2006 David Muir Sharnoff. License hereby granted for + anyone to use, modify or redistribute this module at their own risk. + Please feed useful changes back to . + + If you found this module useful, please thank me (the author) by giving + me a chance to bid to provide your next high-speed Internet link. I run + multiple ISPs and can generally save you money and provide a top-notch + service for your T1s, T3s, OC3s, etc. Please send your request to + . Thank you. 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 Apr 9 22:58:00 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 09 Apr 2010 20:58:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9595] csw/mgar/pkg/cpan Message-ID: Revision: 9595 http://gar.svn.sourceforge.net/gar/?rev=9595&view=rev Author: bonivart Date: 2010-04-09 20:58:00 +0000 (Fri, 09 Apr 2010) Log Message: ----------- pm_idnapunycode: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/IDNA-Punycode/ csw/mgar/pkg/cpan/IDNA-Punycode/branches/ csw/mgar/pkg/cpan/IDNA-Punycode/tags/ csw/mgar/pkg/cpan/IDNA-Punycode/trunk/ csw/mgar/pkg/cpan/IDNA-Punycode/trunk/Makefile csw/mgar/pkg/cpan/IDNA-Punycode/trunk/checksums csw/mgar/pkg/cpan/IDNA-Punycode/trunk/files/ Property changes on: csw/mgar/pkg/cpan/IDNA-Punycode/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/IDNA-Punycode/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IDNA-Punycode/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/IDNA-Punycode/trunk/Makefile 2010-04-09 20:58:00 UTC (rev 9595) @@ -0,0 +1,24 @@ +GARNAME = IDNA-Punycode +GARVERSION = 1.001 +CATEGORIES = cpan +AUTHOR = CFAERBER + +DESCRIPTION = Deprecated module for IDNA and Punyode +define BLURB + Deprecated module for IDNA and Punyode +endef + +PACKAGES = CSWpmidnapunycode +CATALOGNAME = pm_idnapunycode +#ARCHALL = 1 + +LICENSE = LICENSE + +#Warning: prerequisite Net::IDN::Encode 1 not found. +#Warning: prerequisite Net::IDN::Punycode 1 not found. +#Warning: prerequisite Test::NoWarnings 0 not found. + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +include gar/category.mk Added: csw/mgar/pkg/cpan/IDNA-Punycode/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IDNA-Punycode/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/IDNA-Punycode/trunk/checksums 2010-04-09 20:58:00 UTC (rev 9595) @@ -0,0 +1 @@ +3052cad5a6fcd7141cf84540a6c26820 IDNA-Punycode-1.001.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Apr 9 23:01:08 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 09 Apr 2010 21:01:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9596] csw/mgar/pkg/poppler/trunk/Makefile Message-ID: Revision: 9596 http://gar.svn.sourceforge.net/gar/?rev=9596&view=rev Author: hson Date: 2010-04-09 21:01:08 +0000 (Fri, 09 Apr 2010) Log Message: ----------- poppler: CSWpoppler is an empty stub package, need a ton of checkpkg overrides for legacy files Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2010-04-09 20:58:00 UTC (rev 9595) +++ csw/mgar/pkg/poppler/trunk/Makefile 2010-04-09 21:01:08 UTC (rev 9596) @@ -19,24 +19,25 @@ CATALOGNAME_CSWlibpoppler = libpoppler CATALOGNAME_CSWlibpopplerdev = libpoppler_devel CATALOGNAME_CSWlibpopplerdoc = libpoppler_doc -SPKG_DESC_CSWpoppler = $(DESCRIPTION) - utilities +SPKG_DESC_CSWpoppler = $(DESCRIPTION) - legacy compat package SPKG_DESC_CSWlibpoppler = $(DESCRIPTION) SPKG_DESC_CSWlibpopplerdev = $(DESCRIPTION) - developer package SPKG_DESC_CSWlibpopplerdoc = $(DESCRIPTION) - documentation +PKGFILES_CSWpoppler= no files PKGFILES_CSWlibpoppler= $(PKGFILES_RT) PKGFILES_CSWlibpopplerdev = $(PKGFILES_DEVEL) PKGFILES_CSWlibpopplerdoc = $(sharedstatedir)/gtk-doc/.* -INCOMPATIBLE_PKGS_CSWpoppler = CSWxpdf +#INCOMPATIBLE_PKGS_CSWpoppler = CSWxpdf -RUNTIME_DEP_PKGS_CSWpoppler += CSWfconfig -RUNTIME_DEP_PKGS_CSWpoppler += CSWftype2 -RUNTIME_DEP_PKGS_CSWpoppler += CSWjpeg -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWpoppler += CSWlcmsrt -RUNTIME_DEP_PKGS_CSWpoppler += CSWpng +#RUNTIME_DEP_PKGS_CSWpoppler += CSWfconfig +#RUNTIME_DEP_PKGS_CSWpoppler += CSWftype2 +#RUNTIME_DEP_PKGS_CSWpoppler += CSWjpeg +#RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler +#RUNTIME_DEP_PKGS_CSWpoppler += CSWlibxml2 +#RUNTIME_DEP_PKGS_CSWpoppler += CSWlcmsrt +#RUNTIME_DEP_PKGS_CSWpoppler += CSWpng RUNTIME_DEP_PKGS_CSWlibpoppler += CSWlcmsrt RUNTIME_DEP_PKGS_CSWlibpoppler += CSWpng @@ -54,8 +55,50 @@ RUNTIME_DEP_PKGS_CSWlibpopplerdev += CSWlibpoppler +ARCHALL_CSWpoppler = 1 ARCHALL_CSWlibpopplerdoc = 1 +CHECKPKG_OVERRIDES_CSWlibpopplerdev += surplus-dependency|CSWlibpoppler +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib/64 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/amd64 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7/amd64 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/usr/ccs/lib/amd64 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/usr/lib/64 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib/64 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/amd64 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7/amd64 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/usr/ccs/lib/amd64 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/usr/lib/64 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/rw7 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/rw7 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/v8 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/v8 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/v8 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/v8 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/v8 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/v8 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib/sparcv9 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/sparc/64 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7/v9 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/sparc/64 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib/sparcv9 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/SUNWspro/lib/sparc/64 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7/v9 +CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/sparc/64 +CHECKPKG_OVERRIDES_CSWlibpoppler += surplus-dependency|CSWiconv + PATCHFILES += missing-includes.patch # UPSTREAM_MASTER_SITES = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Apr 10 00:02:06 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 09 Apr 2010 22:02:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9597] csw/mgar/pkg/poppler/trunk/Makefile Message-ID: Revision: 9597 http://gar.svn.sourceforge.net/gar/?rev=9597&view=rev Author: hson Date: 2010-04-09 22:02:06 +0000 (Fri, 09 Apr 2010) Log Message: ----------- poppler: Need to keep dependency chain intact Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2010-04-09 21:01:08 UTC (rev 9596) +++ csw/mgar/pkg/poppler/trunk/Makefile 2010-04-09 22:02:06 UTC (rev 9597) @@ -34,7 +34,7 @@ #RUNTIME_DEP_PKGS_CSWpoppler += CSWfconfig #RUNTIME_DEP_PKGS_CSWpoppler += CSWftype2 #RUNTIME_DEP_PKGS_CSWpoppler += CSWjpeg -#RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler #RUNTIME_DEP_PKGS_CSWpoppler += CSWlibxml2 #RUNTIME_DEP_PKGS_CSWpoppler += CSWlcmsrt #RUNTIME_DEP_PKGS_CSWpoppler += CSWpng @@ -58,6 +58,7 @@ ARCHALL_CSWpoppler = 1 ARCHALL_CSWlibpopplerdoc = 1 +CHECKPKG_OVERRIDES_CSWpoppler += surplus-dependency|CSWlibpoppler CHECKPKG_OVERRIDES_CSWlibpopplerdev += surplus-dependency|CSWlibpoppler CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/lib/64 CHECKPKG_OVERRIDES_CSWlibpoppler += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/amd64 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 Apr 10 04:42:09 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 10 Apr 2010 02:42:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[9598] csw/mgar/pkg/magit/trunk/Makefile Message-ID: Revision: 9598 http://gar.svn.sourceforge.net/gar/?rev=9598&view=rev Author: bdwalton Date: 2010-04-10 02:42:09 +0000 (Sat, 10 Apr 2010) Log Message: ----------- magit: leverage new emacs site start Modified Paths: -------------- csw/mgar/pkg/magit/trunk/Makefile Modified: csw/mgar/pkg/magit/trunk/Makefile =================================================================== --- csw/mgar/pkg/magit/trunk/Makefile 2010-04-09 22:02:06 UTC (rev 9597) +++ csw/mgar/pkg/magit/trunk/Makefile 2010-04-10 02:42:09 UTC (rev 9598) @@ -14,7 +14,7 @@ endef BUILD_DEP_PKGS = CSWautoconf CSWautomake CSWtexinfo CSWemacs -RUNTIME_DEP_PKGS = CSWgit CSWemacscommon +RUNTIME_DEP_PKGS = CSWgit CSWemacscommon CSWemacssitestart GIT_REPOS = git://gitorious.org/magit/magit.git GIT_TREEISH = $(PATCHLEVEL) @@ -39,5 +39,8 @@ @(cd $(WORKSRC); \ mkdir -p $(DESTDIR)/$(docdir)/$(GARNAME); \ cp README AUTHORS NEWS $(DESTDIR)/$(docdir)/$(GARNAME) ) + @echo Setting up emacs site-start... + @(cd $(DESTDIR); mkdir -p opt/csw/share/emacs/site-lisp/site-start.d; \ + mv opt/csw/etc/emacs/site-start.d/50magit.el opt/csw/share/emacs/site-lisp/site-start.d/magit.el ) @(cd $(DESTDIR); rm -rf opt/csw/etc opt/csw/share/info/dir ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Apr 10 04:44:13 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 10 Apr 2010 02:44:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9599] csw/mgar/pkg/magit/trunk/Makefile Message-ID: Revision: 9599 http://gar.svn.sourceforge.net/gar/?rev=9599&view=rev Author: bdwalton Date: 2010-04-10 02:44:12 +0000 (Sat, 10 Apr 2010) Log Message: ----------- magit: override checkpkg dep errors Modified Paths: -------------- csw/mgar/pkg/magit/trunk/Makefile Modified: csw/mgar/pkg/magit/trunk/Makefile =================================================================== --- csw/mgar/pkg/magit/trunk/Makefile 2010-04-10 02:42:09 UTC (rev 9598) +++ csw/mgar/pkg/magit/trunk/Makefile 2010-04-10 02:44:12 UTC (rev 9599) @@ -16,6 +16,9 @@ BUILD_DEP_PKGS = CSWautoconf CSWautomake CSWtexinfo CSWemacs RUNTIME_DEP_PKGS = CSWgit CSWemacscommon CSWemacssitestart +CHECKPKG_OVERRIDES_CSWmagit += surplus-dependency|CSWemacssitestart +CHECKPKG_OVERRIDES_CSWmagit += surplus-dependency|CSWgit + GIT_REPOS = git://gitorious.org/magit/magit.git GIT_TREEISH = $(PATCHLEVEL) 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 Apr 10 04:53:53 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 10 Apr 2010 02:53:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9600] csw/mgar/pkg/phpmode/trunk/Makefile Message-ID: Revision: 9600 http://gar.svn.sourceforge.net/gar/?rev=9600&view=rev Author: bdwalton Date: 2010-04-10 02:53:52 +0000 (Sat, 10 Apr 2010) Log Message: ----------- phpmode: tweak post-extract-modulated deps Modified Paths: -------------- csw/mgar/pkg/phpmode/trunk/Makefile Modified: csw/mgar/pkg/phpmode/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpmode/trunk/Makefile 2010-04-10 02:44:12 UTC (rev 9599) +++ csw/mgar/pkg/phpmode/trunk/Makefile 2010-04-10 02:53:52 UTC (rev 9600) @@ -44,7 +44,7 @@ LISPDIR = $(datadir)/emacs/site-lisp INFODIR = $(datadir)/info -post-extract-modulated: +post-extract-modulated: $(WORKSRC) @echo "Adding GPLv3 file to source tree." @( cp $(FILEDIR)/gpl-3.0.txt $(WORKSRC)/COPYING ) @$(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 Apr 10 05:01:34 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 10 Apr 2010 03:01:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[9601] csw/mgar/pkg/phpmode/trunk Message-ID: Revision: 9601 http://gar.svn.sourceforge.net/gar/?rev=9601&view=rev Author: bdwalton Date: 2010-04-10 03:01:34 +0000 (Sat, 10 Apr 2010) Log Message: ----------- phpmode: add a site-start file Modified Paths: -------------- csw/mgar/pkg/phpmode/trunk/Makefile csw/mgar/pkg/phpmode/trunk/checksums Added Paths: ----------- csw/mgar/pkg/phpmode/trunk/files/php-mode.el Modified: csw/mgar/pkg/phpmode/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpmode/trunk/Makefile 2010-04-10 02:53:52 UTC (rev 9600) +++ csw/mgar/pkg/phpmode/trunk/Makefile 2010-04-10 03:01:34 UTC (rev 9601) @@ -9,6 +9,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += php-mode.el BUILD_DEP_PKGS = CSWemacs @@ -55,4 +56,7 @@ cp $(WORKSRC)/php-mode.el $(DESTDIR)$(LISPDIR); \ chmod -x $(DESTDIR)$(LISPDIR)/*; \ cp $(WORKSRC)/*info $(DESTDIR)/$(INFODIR) ) + @echo Installing emacs site-start file. + @( gmkdir -p $(DESTDIR)/$(LISPDIR)/site-start.d; \ + cp $(FILEDIR)/php-mode.el $(DESTDIR)/$(LISPDIR)/site-start.d ) @$(MAKECOOKIE) Modified: csw/mgar/pkg/phpmode/trunk/checksums =================================================================== --- csw/mgar/pkg/phpmode/trunk/checksums 2010-04-10 02:53:52 UTC (rev 9600) +++ csw/mgar/pkg/phpmode/trunk/checksums 2010-04-10 03:01:34 UTC (rev 9601) @@ -1 +1,2 @@ -6ddad6d150c946846a65bcecfb2cc1a0 download/php-mode-1.5.0.tar.gz +6ddad6d150c946846a65bcecfb2cc1a0 php-mode-1.5.0.tar.gz +53d970500a286f2dc32429835d343a9e php-mode.el Added: csw/mgar/pkg/phpmode/trunk/files/php-mode.el =================================================================== --- csw/mgar/pkg/phpmode/trunk/files/php-mode.el (rev 0) +++ csw/mgar/pkg/phpmode/trunk/files/php-mode.el 2010-04-10 03:01:34 UTC (rev 9601) @@ -0,0 +1,3 @@ +;; use php-mode for *.php files. +(autoload 'php-mode "php-mode" "Major mode for php code editing." t) +(add-to-list 'auto-mode-alist '("\\.php\\'" . php-mode)) 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 Apr 10 05:04:22 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 10 Apr 2010 03:04:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[9602] csw/mgar/pkg/phpmode/trunk/Makefile Message-ID: Revision: 9602 http://gar.svn.sourceforge.net/gar/?rev=9602&view=rev Author: bdwalton Date: 2010-04-10 03:04:22 +0000 (Sat, 10 Apr 2010) Log Message: ----------- phpmode: depend on emacs site start and override checkpkg warning Modified Paths: -------------- csw/mgar/pkg/phpmode/trunk/Makefile Modified: csw/mgar/pkg/phpmode/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpmode/trunk/Makefile 2010-04-10 03:01:34 UTC (rev 9601) +++ csw/mgar/pkg/phpmode/trunk/Makefile 2010-04-10 03:04:22 UTC (rev 9602) @@ -17,8 +17,10 @@ CATALOGNAME_CSWphpmode = php_mode -RUNTIME_DEP_PKGS_CSWphpmode = CSWemacscommon +RUNTIME_DEP_PKGS_CSWphpmode = CSWemacscommon CSWemacssitestart +CHECKPKG_OVERRIDES_CSWphpmode += surplus-dependency|CSWemacssitestart + ARCHALL = 1 SPKG_DESC_CSWphpmode = An Emacs mode for editting PHP code This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Apr 10 08:22:19 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 10 Apr 2010 06:22:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9603] csw/mgar/pkg/libffi/trunk Message-ID: Revision: 9603 http://gar.svn.sourceforge.net/gar/?rev=9603&view=rev Author: hson Date: 2010-04-10 06:22:19 +0000 (Sat, 10 Apr 2010) Log Message: ----------- libffi: Found a way to build on amd64 using SOS12 Modified Paths: -------------- csw/mgar/pkg/libffi/trunk/Makefile csw/mgar/pkg/libffi/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libffi/trunk/files/ffi64.c.patch Modified: csw/mgar/pkg/libffi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libffi/trunk/Makefile 2010-04-10 03:04:22 UTC (rev 9602) +++ csw/mgar/pkg/libffi/trunk/Makefile 2010-04-10 06:22:19 UTC (rev 9603) @@ -17,10 +17,14 @@ SPKG_SOURCEURL = http://sourceware.org/libffi/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # Not needed unless using SOS compiler -#PATCHFILES += Makefile.in.patch +PATCHFILES += Makefile.in.patch # Not really needed for build, but for SOS compiler using libffi PATCHFILES += ffi_common.h.patch PATCHFILES += ffi_target.h.patch +# Fix needed for amd64 using SOS compiler +# found at http://software.intel.com/en-us/forums/showthread.php?t=56652 +# originally for icc, but at least get the stuff to compile +PATCHFILES += ffi64.c.patch PACKAGES = CSWlibffi CSWlibffidevel CATALOGNAME_CSWlibffi = libffi @@ -34,19 +38,17 @@ LICENSE = LICENSE RUNTIME_DEP_PKGS_CSWlibffidevel += CSWlibffi -RUNTIME_DEP_PKGS_CSWlibffi = CSWgcc4corert CHECKPKG_OVERRIDES_CSWlibffidevel += surplus-dependency|CSWlibffi UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -GARCOMPILER = GCC4 BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -# Tests fail since they are written for gcc only if using SOS12 compiler -# But they also fails on 64-bit +# Tests fail since they are written for gcc only +# But they also fails on 64-bit even when using gcc #TEST_TARGET = check TEST_TARGET = Modified: csw/mgar/pkg/libffi/trunk/checksums =================================================================== --- csw/mgar/pkg/libffi/trunk/checksums 2010-04-10 03:04:22 UTC (rev 9602) +++ csw/mgar/pkg/libffi/trunk/checksums 2010-04-10 06:22:19 UTC (rev 9603) @@ -1,3 +1,5 @@ +08153de5eadceb2e22ee24083d13dc4d Makefile.in.patch +76eebb10e449d11374c09661d448ca99 ffi64.c.patch c280f263ff0eab3248ea8abd9d0be21c ffi_common.h.patch 0e72bc1c6b8f797377f502e36b8df294 ffi_target.h.patch 1f300a7a7f975d4046f51c3022fa5ff1 libffi-3.0.9.tar.gz Added: csw/mgar/pkg/libffi/trunk/files/ffi64.c.patch =================================================================== --- csw/mgar/pkg/libffi/trunk/files/ffi64.c.patch (rev 0) +++ csw/mgar/pkg/libffi/trunk/files/ffi64.c.patch 2010-04-10 06:22:19 UTC (rev 9603) @@ -0,0 +1,34 @@ +--- libffi-3.0.9/src/x86/ffi64.c.orig 2009-12-29 16:22:26.000000000 +0100 ++++ libffi-3.0.9/src/x86/ffi64.c 2010-04-09 23:48:55.928436791 +0200 +@@ -36,6 +36,10 @@ + #define MAX_GPR_REGS 6 + #define MAX_SSE_REGS 8 + ++#if defined(__SUNPRO_C) ++typedef struct { int64_t m[2]; } __int128_t; ++#endif ++ + struct register_args + { + /* Registers for argument passing. */ +@@ -469,10 +473,20 @@ + break; + case X86_64_SSE_CLASS: + case X86_64_SSEDF_CLASS: ++#if defined(__SUNPRO_C) ++ reg_args->sse[ssecount++].m[0] = *(UINT64 *) a; ++ reg_args->sse[ssecount++].m[1] = 0; ++#else + reg_args->sse[ssecount++] = *(UINT64 *) a; ++#endif + break; + case X86_64_SSESF_CLASS: ++#if defined(__SUNPRO_C) ++ reg_args->sse[ssecount++].m[0] = *(UINT32 *) a; ++ reg_args->sse[ssecount++].m[1] = 0; ++#else + reg_args->sse[ssecount++] = *(UINT32 *) a; ++#endif + break; + default: + abort(); 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 Apr 10 10:39:51 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 10 Apr 2010 08:39:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[9604] csw/mgar/pkg Message-ID: Revision: 9604 http://gar.svn.sourceforge.net/gar/?rev=9604&view=rev Author: dmichelsen Date: 2010-04-10 08:39:51 +0000 (Sat, 10 Apr 2010) Log Message: ----------- xsnow: Initial commit Added Paths: ----------- csw/mgar/pkg/xsnow/ csw/mgar/pkg/xsnow/branches/ csw/mgar/pkg/xsnow/tags/ csw/mgar/pkg/xsnow/trunk/ csw/mgar/pkg/xsnow/trunk/Makefile csw/mgar/pkg/xsnow/trunk/checksums csw/mgar/pkg/xsnow/trunk/files/ csw/mgar/pkg/xsnow/trunk/files/COPYING Property changes on: csw/mgar/pkg/xsnow/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/xsnow/trunk/Makefile =================================================================== --- csw/mgar/pkg/xsnow/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xsnow/trunk/Makefile 2010-04-10 08:39:51 UTC (rev 9604) @@ -0,0 +1,35 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = xsnow +GARVERSION = 1.42 +CATEGORIES = utils + +DESCRIPTION = A classic X toy that displays falling snow on the X11 root window +define BLURB +endef + +MASTER_SITES = http://dropmix.xs4all.nl/rick/Xsnow/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += COPYING + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +build-custom: + cd $(WORKSRC); $(CC) $(CFLAGS) $(CPPFLAGS) -I/usr/openwin/include -DSVR4 -DSYSV -c xsnow.c + cd $(WORKSRC); $(CC) $(CFLAGS) $(CPPFLAGS) -I/usr/openwin/include -DSVR4 -DSYSV -c toon_root.c + cd $(WORKSRC); $(CC) $(LDFLAGS) -o xsnow xsnow.o toon_root.o -lXext -lX11 -lXpm -lm -lsocket -lnsl + @$(MAKECOOKIE) + +install-custom: + ginstall -d $(PKGROOT)$(bindir) + ginstall $(WORKSRC)/xsnow $(PKGROOT)$(bindir)/xsnow + ginstall -d $(PKGROOT)$(mandir)/man1 + ginstall $(WORKSRC)/xsnow.man $(PKGROOT)$(mandir)/man1/xsnow.1 + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/xsnow/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/xsnow/trunk/checksums =================================================================== --- csw/mgar/pkg/xsnow/trunk/checksums (rev 0) +++ csw/mgar/pkg/xsnow/trunk/checksums 2010-04-10 08:39:51 UTC (rev 9604) @@ -0,0 +1,2 @@ +4c02d75844b21d223884263b5dd82b32 COPYING +451d8fc0a2b5393b428faa496a556036 xsnow-1.42.tar.gz Added: csw/mgar/pkg/xsnow/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/xsnow/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/xsnow/trunk/files/COPYING 2010-04-10 08:39:51 UTC (rev 9604) @@ -0,0 +1,5 @@ +Xsnow is available freely and you may give it to other people as is, +but I retain all rights. Therefore it does not classify as 'Public +Domain' software. It *is* allowed to package Xsnow for Unix/Linux +distributions, CD-Roms etc, and to make the necessary changes to +makefiles etc. to facilitate this. 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 Apr 10 11:19:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 10 Apr 2010 09:19:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9605] csw/mgar/pkg/cpan Message-ID: Revision: 9605 http://gar.svn.sourceforge.net/gar/?rev=9605&view=rev Author: dmichelsen Date: 2010-04-10 09:19:45 +0000 (Sat, 10 Apr 2010) Log Message: ----------- cpan/Net-Daemon: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-Daemon/ csw/mgar/pkg/cpan/Net-Daemon/branches/ csw/mgar/pkg/cpan/Net-Daemon/tags/ csw/mgar/pkg/cpan/Net-Daemon/trunk/ csw/mgar/pkg/cpan/Net-Daemon/trunk/Makefile csw/mgar/pkg/cpan/Net-Daemon/trunk/checksums csw/mgar/pkg/cpan/Net-Daemon/trunk/files/ csw/mgar/pkg/cpan/Net-Daemon/trunk/files/COPYING csw/mgar/pkg/cpan/Net-Daemon/trunk/files/Net-Daemon-5.10-support.patch Property changes on: csw/mgar/pkg/cpan/Net-Daemon/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-Daemon/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Daemon/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-Daemon/trunk/Makefile 2010-04-10 09:19:45 UTC (rev 9605) @@ -0,0 +1,24 @@ +GARNAME = Net-Daemon +GARVERSION = 0.43 +CATEGORIES = cpan +AUTHOR = MNOONING + +DESCRIPTION = Perl extension for portable daemons +define BLURB +endef + +# Good thing the locations have standards. But why have a standard when +# people don't use it? :-( +MASTER_SITES = $(addsuffix $(GARNAME)/,$(CPAN_MIRRORS)) +DISTNAME = $(GARNAME) + +DISTFILES = COPYING + +PATCHFILES = Net-Daemon-5.10-support.patch + +PACKAGES = CSWpmnetdaemon +CATALOGNAME = pm_netdaemon + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-Daemon/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-Daemon/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-Daemon/trunk/checksums 2010-04-10 09:19:45 UTC (rev 9605) @@ -0,0 +1,3 @@ +39d56829aa3534d7374f4deca992ddaf COPYING +a173a8407fb7b049aa465598eca6dfd7 Net-Daemon-0.43.tar.gz +eeb72b048f2e65bc159dfcef3531a135 Net-Daemon-5.10-support.patch Added: csw/mgar/pkg/cpan/Net-Daemon/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Net-Daemon/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Net-Daemon/trunk/files/COPYING 2010-04-10 09:19:45 UTC (rev 9605) @@ -0,0 +1,3 @@ +You may distribute this package under the terms of either the GNU +General Public License or the Artistic License, as specified in the +Perl README file. Added: csw/mgar/pkg/cpan/Net-Daemon/trunk/files/Net-Daemon-5.10-support.patch =================================================================== --- csw/mgar/pkg/cpan/Net-Daemon/trunk/files/Net-Daemon-5.10-support.patch (rev 0) +++ csw/mgar/pkg/cpan/Net-Daemon/trunk/files/Net-Daemon-5.10-support.patch 2010-04-10 09:19:45 UTC (rev 9605) @@ -0,0 +1,88 @@ +diff -ruad Net-Daemon/ChangeLog Net-Daemon-fixed/ChangeLog +--- Net-Daemon/ChangeLog 2010-03-12 14:38:33.000000000 -0800 ++++ Net-Daemon-fixed/ChangeLog 2010-03-12 14:45:56.000000000 -0800 +@@ -1,4 +1,7 @@ +- ++2009-03-12 Joe McMahon (0.44) ++ * Added necessary thread sharing to work with 5.10 ++ threads model: regexp-threads, ++ * Bumped minimum required perl to 5.10. + 2007-06-17 Malcolm Nooning (0.43) + * lib/Net/Daemon.pm Needed to up the VERSION number + 2007-06-16 Malcolm Nooning (0.42) +diff -ruad Net-Daemon/lib/Net/Daemon.pm Net-Daemon-fixed/lib/Net/Daemon.pm +--- Net-Daemon/lib/Net/Daemon.pm 2010-03-12 14:38:33.000000000 -0800 ++++ Net-Daemon-fixed/lib/Net/Daemon.pm 2010-03-12 15:13:14.000000000 -0800 +@@ -20,7 +20,6 @@ + # + ############################################################################ + +-require 5.004; + use strict; + + use Getopt::Long (); +@@ -30,10 +29,21 @@ + use Net::Daemon::Log (); + use POSIX (); + +- + package Net::Daemon; + +-$Net::Daemon::VERSION = '0.43'; ++# Dummy share() in case we're not 5.10. If we are, require/import of ++# threads::shared will replace it appropriately. ++my $this_is_510 = $^V ge v5.10.0; ++if ($this_is_510) { ++ no warnings 'redefine'; ++ eval { require threads; }; ++ eval { require threads::shared; }; ++} ++else { ++ eval { require Threads; }; ++} ++ ++$Net::Daemon::VERSION = '0.43'; + @Net::Daemon::ISA = qw(Net::Daemon::Log); + + # +@@ -41,6 +51,7 @@ + # regexp-threads.) + # + $Net::Daemon::RegExpLock = 1; ++threads::shared::share(\$Net::Daemon::RegExpLock) if $this_is_510; + + use vars qw($exit); + +diff -ruad Net-Daemon/regexp-threads Net-Daemon-fixed/regexp-threads +--- Net-Daemon/regexp-threads 2010-03-12 14:38:33.000000000 -0800 ++++ Net-Daemon-fixed/regexp-threads 2010-03-12 15:11:30.000000000 -0800 +@@ -13,9 +13,18 @@ + # + # + ++my $this_is_510 = $^V ge v5.10.0; ++ + use Thread (); ++if ($this_is_510) { ++ eval {require threads::shared}; ++} + + my $numChilds; ++if ($this_is_510) { ++ eval { threads::shared::share($numChilds) }; ++} ++ + my $regExpLock = @ARGV ? 1 : 0; + + # Repeat generating a random number and check if it contains the +diff -ruad Net-Daemon/t/threadm.t Net-Daemon-fixed/t/threadm.t +--- Net-Daemon/t/threadm.t 2010-03-12 14:38:33.000000000 -0800 ++++ Net-Daemon-fixed/t/threadm.t 2010-03-12 14:47:19.000000000 -0800 +@@ -24,7 +24,6 @@ + exit 0; + } + +- + my($handle, $port); + if (@ARGV) { + $port = shift @ARGV; 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 Apr 10 11:27:43 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 10 Apr 2010 09:27:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9606] csw/mgar/pkg/cpan Message-ID: Revision: 9606 http://gar.svn.sourceforge.net/gar/?rev=9606&view=rev Author: dmichelsen Date: 2010-04-10 09:27:43 +0000 (Sat, 10 Apr 2010) Log Message: ----------- cpan/PlRPC: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/PlRPC/ csw/mgar/pkg/cpan/PlRPC/branches/ csw/mgar/pkg/cpan/PlRPC/tags/ csw/mgar/pkg/cpan/PlRPC/trunk/ csw/mgar/pkg/cpan/PlRPC/trunk/Makefile csw/mgar/pkg/cpan/PlRPC/trunk/checksums csw/mgar/pkg/cpan/PlRPC/trunk/files/ csw/mgar/pkg/cpan/PlRPC/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/PlRPC/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/PlRPC/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/PlRPC/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/PlRPC/trunk/Makefile 2010-04-10 09:27:43 UTC (rev 9606) @@ -0,0 +1,22 @@ +GARNAME = PlRPC +GARVERSION = 0.2020 +CATEGORIES = cpan +AUTHOR = MNOONING + +DESCRIPTION = Perl extension for writing perl RPC servers and clients +define BLURB +endef + +# Good thing the locations have standards. But why have a standard when +# people don't use it? :-( +MASTER_SITES = $(addsuffix $(GARNAME)/,$(CPAN_MIRRORS)) +DISTNAME = $(GARNAME) + +DISTFILES = COPYING + +PACKAGES = CSWpmplrpc +CATALOGNAME = pm_plrpc + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/PlRPC/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/PlRPC/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/PlRPC/trunk/checksums 2010-04-10 09:27:43 UTC (rev 9606) @@ -0,0 +1,2 @@ +b44758d74804510df3bb94f0d9f7b6ee COPYING +5361e137e56d037c5e796926ecb5300b PlRPC-0.2020.tar.gz Added: csw/mgar/pkg/cpan/PlRPC/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/PlRPC/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/PlRPC/trunk/files/COPYING 2010-04-10 09:27:43 UTC (rev 9606) @@ -0,0 +1,3 @@ +You may distribute this package under the terms of either the GNU +General Public License or the Artistic License, as specified in the Perl +README file. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Apr 10 11:34:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 10 Apr 2010 09:34:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[9607] csw/mgar/pkg/cpan Message-ID: Revision: 9607 http://gar.svn.sourceforge.net/gar/?rev=9607&view=rev Author: dmichelsen Date: 2010-04-10 09:34:26 +0000 (Sat, 10 Apr 2010) Log Message: ----------- prefork: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/prefork/ csw/mgar/pkg/cpan/prefork/branches/ csw/mgar/pkg/cpan/prefork/tags/ csw/mgar/pkg/cpan/prefork/trunk/ csw/mgar/pkg/cpan/prefork/trunk/Makefile csw/mgar/pkg/cpan/prefork/trunk/checksums csw/mgar/pkg/cpan/prefork/trunk/files/ Property changes on: csw/mgar/pkg/cpan/prefork/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/prefork/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/prefork/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/prefork/trunk/Makefile 2010-04-10 09:34:26 UTC (rev 9607) @@ -0,0 +1,20 @@ +GARNAME = prefork +GARVERSION = 1.04 +CATEGORIES = cpan +AUTHOR = ADAMK + +DESCRIPTION = Optimized module loading for forking or non-forking processes +define BLURB +endef + +PACKAGES = CSWpmprefork +CATALOGNAME = pm_prefork + +LICENSE = LICENSE + +ARCHALL = 1 + +# Yes, the module names violates the Perl standard +CHECKPKG_OVERRIDES_CSWpmprefork += pkginfo-description-not-starting-with-uppercase + +include gar/category.mk Added: csw/mgar/pkg/cpan/prefork/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/prefork/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/prefork/trunk/checksums 2010-04-10 09:34:26 UTC (rev 9607) @@ -0,0 +1 @@ +47a514d4058ffc8cca184b28d6d54d0a prefork-1.04.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Apr 10 11:42:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 10 Apr 2010 09:42:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9608] csw/mgar/pkg/cpan Message-ID: Revision: 9608 http://gar.svn.sourceforge.net/gar/?rev=9608&view=rev Author: dmichelsen Date: 2010-04-10 09:42:43 +0000 (Sat, 10 Apr 2010) Log Message: ----------- cpan/File-Slurp: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/File-Slurp/ csw/mgar/pkg/cpan/File-Slurp/branches/ csw/mgar/pkg/cpan/File-Slurp/tags/ csw/mgar/pkg/cpan/File-Slurp/trunk/ csw/mgar/pkg/cpan/File-Slurp/trunk/Makefile csw/mgar/pkg/cpan/File-Slurp/trunk/checksums csw/mgar/pkg/cpan/File-Slurp/trunk/files/ csw/mgar/pkg/cpan/File-Slurp/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/File-Slurp/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/File-Slurp/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-Slurp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/File-Slurp/trunk/Makefile 2010-04-10 09:42:43 UTC (rev 9608) @@ -0,0 +1,17 @@ +GARNAME = File-Slurp +GARVERSION = 9999.13 +CATEGORIES = cpan +AUTHOR = DROLSKY + +DESCRIPTION = Efficient Reading/Writing of Complete Files +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmfileslurp +CATALOGNAME = pm_fileslurp + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/File-Slurp/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-Slurp/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/File-Slurp/trunk/checksums 2010-04-10 09:42:43 UTC (rev 9608) @@ -0,0 +1,2 @@ +2085dc6907a018334a00d5bd5a798c5a COPYING +ac3cd9d466b99d1534762ff3549aaa66 File-Slurp-9999.13.tar.gz Added: csw/mgar/pkg/cpan/File-Slurp/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/File-Slurp/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/File-Slurp/trunk/files/COPYING 2010-04-10 09:42:43 UTC (rev 9608) @@ -0,0 +1,2 @@ +Copyright (C) 2003 Uri Guttman +Licensed the same 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 Sat Apr 10 11:50:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 10 Apr 2010 09:50:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9609] csw/mgar/pkg/cpan Message-ID: Revision: 9609 http://gar.svn.sourceforge.net/gar/?rev=9609&view=rev Author: dmichelsen Date: 2010-04-10 09:50:11 +0000 (Sat, 10 Apr 2010) Log Message: ----------- cpan/File-Copy-Recursive: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/File-Copy-Recursive/ csw/mgar/pkg/cpan/File-Copy-Recursive/branches/ csw/mgar/pkg/cpan/File-Copy-Recursive/tags/ csw/mgar/pkg/cpan/File-Copy-Recursive/trunk/ csw/mgar/pkg/cpan/File-Copy-Recursive/trunk/Makefile csw/mgar/pkg/cpan/File-Copy-Recursive/trunk/checksums csw/mgar/pkg/cpan/File-Copy-Recursive/trunk/files/ csw/mgar/pkg/cpan/File-Copy-Recursive/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/File-Copy-Recursive/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/File-Copy-Recursive/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-Copy-Recursive/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/File-Copy-Recursive/trunk/Makefile 2010-04-10 09:50:11 UTC (rev 9609) @@ -0,0 +1,17 @@ +GARNAME = File-Copy-Recursive +GARVERSION = 0.38 +CATEGORIES = cpan +AUTHOR = DMUEY + +DESCRIPTION = Recursively copy files and directories +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmfilecpyrecurs +CATALOGNAME = pm_filecpyrecurs + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/File-Copy-Recursive/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-Copy-Recursive/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/File-Copy-Recursive/trunk/checksums 2010-04-10 09:50:11 UTC (rev 9609) @@ -0,0 +1,2 @@ +b5b27d72df4b9cbc3189028c01358ba9 COPYING +e76dc75ab456510d67c6c3a95183f72f File-Copy-Recursive-0.38.tar.gz Added: csw/mgar/pkg/cpan/File-Copy-Recursive/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/File-Copy-Recursive/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/File-Copy-Recursive/trunk/files/COPYING 2010-04-10 09:50:11 UTC (rev 9609) @@ -0,0 +1,4 @@ +Copyright (C) 2004 Daniel Muey + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Apr 10 12:03:18 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 10 Apr 2010 10:03:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[9610] csw/mgar/pkg/cpan Message-ID: Revision: 9610 http://gar.svn.sourceforge.net/gar/?rev=9610&view=rev Author: dmichelsen Date: 2010-04-10 10:03:18 +0000 (Sat, 10 Apr 2010) Log Message: ----------- cpan/File-Flat: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/File-Flat/ csw/mgar/pkg/cpan/File-Flat/branches/ csw/mgar/pkg/cpan/File-Flat/tags/ csw/mgar/pkg/cpan/File-Flat/trunk/ csw/mgar/pkg/cpan/File-Flat/trunk/Makefile csw/mgar/pkg/cpan/File-Flat/trunk/checksums csw/mgar/pkg/cpan/File-Flat/trunk/files/ Property changes on: csw/mgar/pkg/cpan/File-Flat/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/File-Flat/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-Flat/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/File-Flat/trunk/Makefile 2010-04-10 10:03:18 UTC (rev 9610) @@ -0,0 +1,21 @@ +GARNAME = File-Flat +GARVERSION = 1.04 +CATEGORIES = cpan +AUTHOR = ADAMK + +DESCRIPTION = Implements a flat filesystem +define BLURB +endef + +PACKAGES = CSWpmfileflat +CATALOGNAME = pm_fileflat + +RUNTIME_DEP_PKGS = CSWpmprefork CSWpmfileslurp CSWpmfileremove CSWpmfilecpyrecurs +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +BUILD_DEP_PKGS += CSWpmtestclassapi + +LICENSE = LICENSE + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/File-Flat/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-Flat/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/File-Flat/trunk/checksums 2010-04-10 10:03:18 UTC (rev 9610) @@ -0,0 +1 @@ +20367f74ff34d92b3c839b3da282b4e0 File-Flat-1.04.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Apr 10 12:22:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 10 Apr 2010 10:22:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[9611] csw/mgar/pkg/cpan Message-ID: Revision: 9611 http://gar.svn.sourceforge.net/gar/?rev=9611&view=rev Author: dmichelsen Date: 2010-04-10 10:22:38 +0000 (Sat, 10 Apr 2010) Log Message: ----------- cpan/Probe-Perl: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Probe-Perl/ csw/mgar/pkg/cpan/Probe-Perl/branches/ csw/mgar/pkg/cpan/Probe-Perl/tags/ csw/mgar/pkg/cpan/Probe-Perl/trunk/ csw/mgar/pkg/cpan/Probe-Perl/trunk/Makefile csw/mgar/pkg/cpan/Probe-Perl/trunk/checksums csw/mgar/pkg/cpan/Probe-Perl/trunk/files/ csw/mgar/pkg/cpan/Probe-Perl/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Probe-Perl/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/Probe-Perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Probe-Perl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Probe-Perl/trunk/Makefile 2010-04-10 10:22:38 UTC (rev 9611) @@ -0,0 +1,17 @@ +GARNAME = Probe-Perl +GARVERSION = 0.01 +CATEGORIES = cpan +AUTHOR = KWILLIAMS + +DESCRIPTION = Information about the currently running perl +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmprobeperl +CATALOGNAME = pm_probeperl + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Probe-Perl/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Probe-Perl/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Probe-Perl/trunk/checksums 2010-04-10 10:22:38 UTC (rev 9611) @@ -0,0 +1,2 @@ +92fa468e63d72cbefa8b432c851c379e COPYING +b6f613a7d07dde568a0d4b9570de47c3 Probe-Perl-0.01.tar.gz Added: csw/mgar/pkg/cpan/Probe-Perl/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Probe-Perl/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Probe-Perl/trunk/files/COPYING 2010-04-10 10:22:38 UTC (rev 9611) @@ -0,0 +1,4 @@ +Copyright (C) 2005 Randy W. Sims + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Apr 11 02:37:03 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 11 Apr 2010 00:37:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[9612] csw/mgar/pkg/wireshark/trunk Message-ID: Revision: 9612 http://gar.svn.sourceforge.net/gar/?rev=9612&view=rev Author: hson Date: 2010-04-11 00:37:03 +0000 (Sun, 11 Apr 2010) Log Message: ----------- wireshark: Update to 1.2.7, cleanup of Makefile Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile csw/mgar/pkg/wireshark/trunk/checksums Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2010-04-10 10:22:38 UTC (rev 9611) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2010-04-11 00:37:03 UTC (rev 9612) @@ -1,5 +1,5 @@ GARNAME = wireshark -GARVERSION = 1.2.3 +GARVERSION = 1.2.7 CATEGORIES = apps DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer @@ -12,34 +12,31 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -RUNTIME_DEP_PKGS += CSWgcrypt CSWgeoip CSWggettextrt CSWglib2 CSWgnutls -RUNTIME_DEP_PKGS += CSWgpgerr CSWgtk2 CSWkrb5lib CSWlibpcap CSWlibxext -RUNTIME_DEP_PKGS += CSWlua CSWpango CSWpcrert CSWzlib +RUNTIME_DEP_PKGS_CSWwireshark += CSWgcrypt CSWgeoip CSWggettextrt CSWglib2 +RUNTIME_DEP_PKGS_CSWwireshark += CSWgpgerr CSWgtk2 CSWkrb5lib CSWlibpcap +RUNTIME_DEP_PKGS_CSWwireshark += CSWlua CSWpango CSWpcrert CSWzlib +RUNTIME_DEP_PKGS_CSWwireshark += CSWgnutls CSWlibcares +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibsmi +RUNTIME_DEP_PKGS_CSWwireshark += CSWosslrt -# We define upstream file regex so we can be notifed of new upstream software release +# krb5-config has -R/opt/csw/lib/ +CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/ + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 SPKG_SOURCEURL = http://www.wireshark.org/ -#SED = /opt/csw/bin/gsed -#EXTRA_COMMON_EXPORTS = SED - EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -#EXTRA_INC += /opt/csw/include/gtk-2.0 -#EXTRA_INC += /opt/csw/lib/gtk-2.0/include -#EXTRA_INC += /opt/csw/include/glib-2.0 -#EXTRA_INC += /opt/csw/lib/glib-2.0/include -#EXTRA_INC += /opt/csw/include/cairo -#EXTRA_INC += /opt/csw/include/pango-1.0 -#EXTRA_INC += /opt/csw/include/atk-1.0 +# We want to be link with Xrender from $(prefix)/X11/lib not $(prefix)/lib +# since the latter is linked to /usr/openwin/lib/libX11.so.4 +EXTRA_SOS_LD_FLAGS += -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -#EXTRA_LINKER_FLAGS = -lgtk-x11-2.0 -lX11 /usr/openwin/lib/libXext.so -EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so - CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-usr-local=no +CONFIGURE_ARGS += --with-ssl=/opt/csw TEST_SCRIPTS = Modified: csw/mgar/pkg/wireshark/trunk/checksums =================================================================== --- csw/mgar/pkg/wireshark/trunk/checksums 2010-04-10 10:22:38 UTC (rev 9611) +++ csw/mgar/pkg/wireshark/trunk/checksums 2010-04-11 00:37:03 UTC (rev 9612) @@ -1 +1,2 @@ -c2dfc197e485a0b0072ca64b8ac4d24c wireshark-1.2.3.tar.bz2 +0fd62ea77189c27f583a3bc83d60c794 configure.diff +cff6b18aa47a7e3eb973efe62c676b50 wireshark-1.2.7.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Apr 11 09:30:27 2010 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 11 Apr 2010 07:30:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[9613] csw/mgar/pkg/nagios/trunk Message-ID: Revision: 9613 http://gar.svn.sourceforge.net/gar/?rev=9613&view=rev Author: j_arndt Date: 2010-04-11 07:30:27 +0000 (Sun, 11 Apr 2010) Log Message: ----------- nagios: fixed minor issues with chkpkg Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/Makefile csw/mgar/pkg/nagios/trunk/checksums csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype Modified: csw/mgar/pkg/nagios/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios/trunk/Makefile 2010-04-11 00:37:03 UTC (rev 9612) +++ csw/mgar/pkg/nagios/trunk/Makefile 2010-04-11 07:30:27 UTC (rev 9613) @@ -2,7 +2,7 @@ GARVERSION = 3.2.1 CATEGORIES = apps -DESCRIPTION = nagios network monitoring base package (no plugins) +DESCRIPTION = Nagios network monitoring base package (no plugins) define BLURB Nagios is a powerful, enterprise-class host, service, application, and network monitoring program. Designed to be fast, flexible, and rock-solid stable. Nagios runs on *NIX hosts and can monitor Windows, Linux/Unix/BSD, Netware, and network devices. endef @@ -25,10 +25,12 @@ PACKAGING_PLATFORMS += solaris9-i386 RUNTIME_DEP_PKGS_CSWnagios = CSWapache2 CSWgd CSWglib2 CSWiconv CSWjpeg CSWlibtoolrt CSWggettextrt -RUNTIME_DEP_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWap2modphp5 CSWcswclassutils +RUNTIME_DEP_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWap2modphp5 CSWbdb SPKG_CLASSES = none cswpreserveconf cswinitsmf +LICENSE = LICENSE + NOISALIST = 1 prefix = $(BUILD_PREFIX)/nagios Modified: csw/mgar/pkg/nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios/trunk/checksums 2010-04-11 00:37:03 UTC (rev 9612) +++ csw/mgar/pkg/nagios/trunk/checksums 2010-04-11 07:30:27 UTC (rev 9613) @@ -2,7 +2,7 @@ e131ac989a8b7f10de8eb40fdd0b4120 CSWnagios.postinstall 7926d365165ee1ad76a7ddb5308bdbff CSWnagios.preinstall 92437323de0cceaa58c6238ec9e6c954 CSWnagios.preremove -7517d8088f0fbc36e37583aff84e3b31 CSWnagios.prototype +26c7d23a186dbb0aea6d0e4ba6a7be63 CSWnagios.prototype 0c26e222285ad2666ca0ecf6c85cebf8 cswnagios f3161bcb7c65f89707ee37b0a8d861d5 install-opts.diff d4655ee8c95c9679fd4fd53dac34bbe3 nagios-3.2.1.tar.gz Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2010-04-11 00:37:03 UTC (rev 9612) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2010-04-11 07:30:27 UTC (rev 9613) @@ -391,7 +391,7 @@ d none /opt/csw/share/doc/nagios 0755 root bin f none /opt/csw/share/doc/nagios/Changelog 0644 root bin f none /opt/csw/share/doc/nagios/INSTALLING 0644 root bin -f none /opt/csw/share/doc/nagios/LICENSE 0644 root bin +f none /opt/csw/share/doc/nagios/license 0644 root bin f none /opt/csw/share/doc/nagios/README 0644 root bin f none /opt/csw/share/doc/nagios/UPGRADING 0644 root bin d none /var/opt/csw/nagios 0755 nagios nagios This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Apr 11 09:39:45 2010 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 11 Apr 2010 07:39:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[9614] csw/mgar/pkg/nsca/trunk/files Message-ID: Revision: 9614 http://gar.svn.sourceforge.net/gar/?rev=9614&view=rev Author: j_arndt Date: 2010-04-11 07:39:45 +0000 (Sun, 11 Apr 2010) Log Message: ----------- nsca: drop unnecessary files Removed Paths: ------------- csw/mgar/pkg/nsca/trunk/files/CSWnsca.gspec csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.gspec Deleted: csw/mgar/pkg/nsca/trunk/files/CSWnsca.gspec =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWnsca.gspec 2010-04-11 07:30:27 UTC (rev 9613) +++ csw/mgar/pkg/nsca/trunk/files/CSWnsca.gspec 2010-04-11 07:39:45 UTC (rev 9614) @@ -1,3 +0,0 @@ -%var bitname nsca -%var pkgname CSWnsca -%include url file://%{PKGLIB}/csw_dyndepend.gspec Deleted: csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.gspec =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.gspec 2010-04-11 07:30:27 UTC (rev 9613) +++ csw/mgar/pkg/nsca/trunk/files/CSWsendnsca.gspec 2010-04-11 07:39:45 UTC (rev 9614) @@ -1,3 +0,0 @@ -%var bitname send_nsca -%var pkgname CSWsendnsca -%include url file://%{PKGLIB}/csw_dyndepend.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Apr 11 15:01:30 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 11 Apr 2010 13:01:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9615] csw/mgar/pkg Message-ID: Revision: 9615 http://gar.svn.sourceforge.net/gar/?rev=9615&view=rev Author: hson Date: 2010-04-11 13:01:30 +0000 (Sun, 11 Apr 2010) Log Message: ----------- Preparation for release, rename package and major cleaup of Makefile Modified Paths: -------------- csw/mgar/pkg/libeggdbus/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libeggdbus/ Removed Paths: ------------- csw/mgar/pkg/eggdbus/ Modified: csw/mgar/pkg/libeggdbus/trunk/Makefile =================================================================== --- csw/mgar/pkg/eggdbus/trunk/Makefile 2010-03-21 21:13:19 UTC (rev 9309) +++ csw/mgar/pkg/libeggdbus/trunk/Makefile 2010-04-11 13:01:30 UTC (rev 9615) @@ -2,36 +2,40 @@ GARVERSION = 0.6 CATEGORIES = lib -DESCRIPTION = EggDbus +DESCRIPTION = D-Bus bindings for GObject define BLURB +EggDBus aims to be an easy-to-use set of GObject bindings for interacting +with DBus. Currently, this interaction is done using libdbus-1 but that +is subject to change. endef +VENDOR_URL = http://cgit.freedesktop.org/~david/eggdbus MASTER_SITES = http://cgit.freedesktop.org/~david/eggdbus/snapshot/ -#DISTNAME = PolicyKit-$(GARVERSION) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWeggdbus CSWeggdbusdevel -CATALOGNAME_CSWeggdbus = eggdbus -CATALOGNAME_CSWeggdbusdevel = eggdbus_devel -SPKG_DESC_CSWeggdbus = eggdbus is an implementation of XMP -SPKG_DESC_CSWeggdbusdevel = eggdbus is an implementation of XMP - developer package +PACKAGES = CSWlibeggdbus CSWlibeggdbusdevel +CATALOGNAME_CSWlibeggdbus = libeggdbus +CATALOGNAME_CSWlibeggdbusdevel = libeggdbus_devel +SPKG_DESC_CSWlibeggdbus = $(DESCRIPTION) +SPKG_DESC_CSWlibeggdbusdevel = $(DESCRIPTION) - developer package -#REQUIRED_PKGS_CSWeggdbus += CSWexpat CSWstlport CSWzlib CSWiconv -#REQUIRED_PKGS_CSWeggdbusdevel += CSWeggdbus +RUNTIME_DEP_PKGS_CSWlibeggdbus += CSWdbusglib +RUNTIME_DEP_PKGS_CSWlibeggdbus += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibeggdbus += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibeggdbus += CSWlibdbus +RUNTIME_DEP_PKGS_CSWlibeggdbusdevel += CSWlibeggdbus -#PREREQUISITE_PKGS += $(REQUIRED_PKGS_CSWeggdbus) +PREREQUISITE_PKGS += $(REQUIRED_PKGS_CSWlibeggdbus) -PKGFILES_CSWeggdbusdevel = $(PKGFILES_DEVEL) +CHECKPKG_OVERRIDES_CSWlibeggdbusdevel += surplus-dependency|CSWlibeggdbus -SPKG_SOURCEURL = http://cgit.freedesktop.org/~david/eggdbus +PKGFILES_CSWlibeggdbusdevel = $(PKGFILES_DEVEL) -#CONFIGURE_SCRIPTS += $(WORKSRC)/autogen.sh -#CONFIGURE_SCRIPTS += $(WORKSRC)/configure +# libdbus isn't 64-bit yet +#BUILD64 = 1 -BUILD64 = 1 - CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check @@ -42,13 +46,3 @@ @echo " ==> Regenerating build tools..." @( cd $(WORKSRC) ; ./autogen.sh ) @$(MAKECOOKIE) - -#pre-configure-modulated: -# @echo " ==> Regenerating build tools..." -# @(cd $(WORKSRC) ; \ -# aclocal && \ -# autoconf && \ -# libtoolize --automake --force && \ -# aclocal && \ -# automake -a ) -# @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Apr 11 18:11:41 2010 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 11 Apr 2010 16:11:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9616] csw/mgar/pkg/nsca/trunk/files/submit_check_results. diff Message-ID: Revision: 9616 http://gar.svn.sourceforge.net/gar/?rev=9616&view=rev Author: j_arndt Date: 2010-04-11 16:11:41 +0000 (Sun, 11 Apr 2010) Log Message: ----------- nsca: changed path to config file in submit script Modified Paths: -------------- csw/mgar/pkg/nsca/trunk/files/submit_check_results.diff Modified: csw/mgar/pkg/nsca/trunk/files/submit_check_results.diff =================================================================== --- csw/mgar/pkg/nsca/trunk/files/submit_check_results.diff 2010-04-11 13:01:30 UTC (rev 9615) +++ csw/mgar/pkg/nsca/trunk/files/submit_check_results.diff 2010-04-11 16:11:41 UTC (rev 9616) @@ -37,4 +37,4 @@ +# in turn transmits the data to the nsca daemon on the central +# monitoring server + -+/usr/bin/echo "$1\t$2\t$return_code\t$4" | /opt/csw/bin/send_nsca my.central.server -c /opt/csw/etc/send_nsca.cfg ++/usr/bin/echo "$1\t$2\t$return_code\t$4" | /opt/csw/bin/send_nsca my.central.server -c /etc/opt/csw/nagios/send_nsca.cfg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Apr 11 18:15:21 2010 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 11 Apr 2010 16:15:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9617] csw/mgar/pkg/nsca/trunk/checksums Message-ID: Revision: 9617 http://gar.svn.sourceforge.net/gar/?rev=9617&view=rev Author: j_arndt Date: 2010-04-11 16:15:21 +0000 (Sun, 11 Apr 2010) Log Message: ----------- nsca: modified checksums Modified Paths: -------------- csw/mgar/pkg/nsca/trunk/checksums Modified: csw/mgar/pkg/nsca/trunk/checksums =================================================================== --- csw/mgar/pkg/nsca/trunk/checksums 2010-04-11 16:11:41 UTC (rev 9616) +++ csw/mgar/pkg/nsca/trunk/checksums 2010-04-11 16:15:21 UTC (rev 9617) @@ -6,4 +6,4 @@ 3e2a2fa1f5209b3bbee1b3822164e7f6 CSWsendnsca.prototype 55a1c5523b2fe1ee66b45a2807e80bd6 cswnsca 33a98e7975f633a9489d7a8938ed6131 nsca-2.7.2.tar.gz -cbb38cacd3ca318f00dfa0877b6017df submit_check_results.diff +28e7dbb0cd301747ff663df350a74ddb submit_check_results.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Apr 11 18:22:41 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 11 Apr 2010 16:22:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9618] csw/mgar/pkg/gobject-introspection/trunk/Makefile Message-ID: Revision: 9618 http://gar.svn.sourceforge.net/gar/?rev=9618&view=rev Author: hson Date: 2010-04-11 16:22:41 +0000 (Sun, 11 Apr 2010) Log Message: ----------- gobj_introspect: Modify catalogname, add a ton of checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/gobject-introspection/trunk/Makefile Modified: csw/mgar/pkg/gobject-introspection/trunk/Makefile =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/Makefile 2010-04-11 16:15:21 UTC (rev 9617) +++ csw/mgar/pkg/gobject-introspection/trunk/Makefile 2010-04-11 16:22:41 UTC (rev 9618) @@ -13,8 +13,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 PACKAGES = CSWgobjintrospect CSWgobjintrospectdev -CATALOGNAME_CSWgobjintrospect = gobject_introspection -CATALOGNAME_CSWgobjintrospectdev = gobject_introspection_devel +CATALOGNAME_CSWgobjintrospect = gobj_introspect +CATALOGNAME_CSWgobjintrospectdev = gobj_introspect_dev SPKG_DESC_CSWgobjintrospect = $(DESCRIPTION) SPKG_DESC_CSWgobjintrospectdev = $(DESCRIPTION) - developer package @@ -31,11 +31,46 @@ RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWpython RUNTIME_DEP_PKGS_CSWgobjintrospectdev += CSWgobjintrospect -CHECKPKG_OVERRIDES_CSWgobjintrospect += symbol-not-found|g-ir-compiler -CHECKPKG_OVERRIDES_CSWgobjintrospect += symbol-not-found|g-ir-generate -CHECKPKG_OVERRIDES_CSWgobjintrospect += symbol-not-found|_giscanner.so +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationparser.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationparser.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/ast.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/ast.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/cachestore.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/cachestore.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/config.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/config.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/dumper.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/dumper.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girparser.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girparser.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girwriter.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girwriter.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/glibast.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/glibast.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/glibtransformer.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/glibtransformer.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/libtoolimporter.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/libtoolimporter.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/minixpath.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/minixpath.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/odict.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/odict.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/scannermain.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/scannermain.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/shlibs.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/shlibs.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/sourcescanner.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/sourcescanner.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/transformer.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/transformer.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/utils.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/utils.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/xmlwriter.pyc +CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/xmlwriter.pyo +CHECKPKG_OVERRIDES_CSWgobjintrospectdev += surplus-dependency|CSWgobjintrospect - PATCHFILES += gobject-introspection-01-ginvoke.diff PATCHFILES += gobject-introspection-02-glib-compilation.diff PATCHFILES += gobject-introspection-03-ginfo.diff @@ -54,9 +89,14 @@ # Python isn't 64-bit yet #BUILD64 = 1 +BUILD_OVERRIDE_VARS = V +BUILD_OVERRIDE_VARS_V = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --x-include=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS += --disable-silent-rules +CONFIGURE_ARGS += --enable-gtk-doc #SHELL = /opt/csw/bin/bash This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Apr 11 18:42:59 2010 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 11 Apr 2010 16:42:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[9619] csw/mgar/pkg/nsca/trunk Message-ID: Revision: 9619 http://gar.svn.sourceforge.net/gar/?rev=9619&view=rev Author: j_arndt Date: 2010-04-11 16:42:59 +0000 (Sun, 11 Apr 2010) Log Message: ----------- nsca: fixed config file in start script Modified Paths: -------------- csw/mgar/pkg/nsca/trunk/checksums csw/mgar/pkg/nsca/trunk/files/cswnsca Modified: csw/mgar/pkg/nsca/trunk/checksums =================================================================== --- csw/mgar/pkg/nsca/trunk/checksums 2010-04-11 16:22:41 UTC (rev 9618) +++ csw/mgar/pkg/nsca/trunk/checksums 2010-04-11 16:42:59 UTC (rev 9619) @@ -4,6 +4,6 @@ 0a98ba4dd462e50f23239433117bae5e CSWsendnsca.cswusergroup e275462ffbf488fe5f7e29dd3abab0ae CSWsendnsca.preinstall 3e2a2fa1f5209b3bbee1b3822164e7f6 CSWsendnsca.prototype -55a1c5523b2fe1ee66b45a2807e80bd6 cswnsca +f7d14e529cdeae1548505c9106d1a6f5 cswnsca 33a98e7975f633a9489d7a8938ed6131 nsca-2.7.2.tar.gz 28e7dbb0cd301747ff663df350a74ddb submit_check_results.diff Modified: csw/mgar/pkg/nsca/trunk/files/cswnsca =================================================================== --- csw/mgar/pkg/nsca/trunk/files/cswnsca 2010-04-11 16:22:41 UTC (rev 9618) +++ csw/mgar/pkg/nsca/trunk/files/cswnsca 2010-04-11 16:42:59 UTC (rev 9619) @@ -9,7 +9,7 @@ #FMRI application # FMRI path for service -CONFIG_FILE=/opt/csw/nagios/etc/nsca.cfg +CONFIG_FILE=/etc/opt/csw/nagios/nsca.cfg SMF_EXIT_ERR_CONFIG=1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Apr 12 00:29:08 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 11 Apr 2010 22:29:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9620] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 9620 http://gar.svn.sourceforge.net/gar/?rev=9620&view=rev Author: bdwalton Date: 2010-04-11 22:29:08 +0000 (Sun, 11 Apr 2010) Log Message: ----------- git: prep for 1.7.1; rc1 passes all tests on both platforms Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-04-11 16:42:59 UTC (rev 9619) +++ csw/mgar/pkg/git/trunk/Makefile 2010-04-11 22:29:08 UTC (rev 9620) @@ -1,12 +1,12 @@ GARNAME = git -GARVERSION = 1.7.0 -# PATCHLEVEL = rc1 +GARVERSION = 1.7.1 +PATCHLEVEL = rc1 CATEGORIES = devel VENDOR_URL = http://git-scm.org/ # disable tests until next version bump (at the top so it stands out) -TEST_SCRIPTS = +# 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 bonivart at users.sourceforge.net Mon Apr 12 10:09:47 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 12 Apr 2010 08:09:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9621] csw/mgar/pkg/cpan Message-ID: Revision: 9621 http://gar.svn.sourceforge.net/gar/?rev=9621&view=rev Author: bonivart Date: 2010-04-12 08:09:47 +0000 (Mon, 12 Apr 2010) Log Message: ----------- pm_testtester: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Test-Tester/ csw/mgar/pkg/cpan/Test-Tester/branches/ csw/mgar/pkg/cpan/Test-Tester/tags/ csw/mgar/pkg/cpan/Test-Tester/trunk/ csw/mgar/pkg/cpan/Test-Tester/trunk/Makefile csw/mgar/pkg/cpan/Test-Tester/trunk/checksums csw/mgar/pkg/cpan/Test-Tester/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Test-Tester/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/Test-Tester/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Tester/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Test-Tester/trunk/Makefile 2010-04-12 08:09:47 UTC (rev 9621) @@ -0,0 +1,20 @@ +GARNAME = Test-Tester +GARVERSION = 0.107 +CATEGORIES = cpan +AUTHOR = FDALY + +DESCRIPTION = Ease testing test modules built with Test::Builder +define BLURB + Ease testing test modules built with Test::Builder +endef + +PACKAGES = CSWpmtesttester +CATALOGNAME = pm_testtester +ARCHALL = 1 + +LICENSE = ARTISTIC + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +include gar/category.mk Added: csw/mgar/pkg/cpan/Test-Tester/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-Tester/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Test-Tester/trunk/checksums 2010-04-12 08:09:47 UTC (rev 9621) @@ -0,0 +1 @@ +998a8abe241992faaa3e90f330800840 Test-Tester-0.107.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 Apr 12 17:26:40 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 Apr 2010 15:26:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[9622] csw/mgar/pkg/cpan/Digest-HMAC/trunk Message-ID: Revision: 9622 http://gar.svn.sourceforge.net/gar/?rev=9622&view=rev Author: dmichelsen Date: 2010-04-12 15:26:40 +0000 (Mon, 12 Apr 2010) Log Message: ----------- cpan/Digest-HMAC: Update to 1.02 Modified Paths: -------------- csw/mgar/pkg/cpan/Digest-HMAC/trunk/Makefile csw/mgar/pkg/cpan/Digest-HMAC/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/Digest-HMAC/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Digest-HMAC/trunk/Makefile 2010-04-12 08:09:47 UTC (rev 9621) +++ csw/mgar/pkg/cpan/Digest-HMAC/trunk/Makefile 2010-04-12 15:26:40 UTC (rev 9622) @@ -1,5 +1,5 @@ GARNAME = Digest-HMAC -GARVERSION = 1.01 +GARVERSION = 1.02 CATEGORIES = cpan AUTHOR = GAAS @@ -10,8 +10,10 @@ usually MD5 or SHA-1. The HMAC mechanism is described in RFC 2104. endef -REQUIRED_PKGS = CSWpmdigestsha1 +DEP_PKGS = CSWpmdigestsha1 +DISTFILES = COPYING + PACKAGES = CSWpmdigesthmac CATALOGNAME = pm_digesthmac Modified: csw/mgar/pkg/cpan/Digest-HMAC/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Digest-HMAC/trunk/checksums 2010-04-12 08:09:47 UTC (rev 9621) +++ csw/mgar/pkg/cpan/Digest-HMAC/trunk/checksums 2010-04-12 15:26:40 UTC (rev 9622) @@ -1 +1,2 @@ -32dc54c765100c638b5d7f7ff4c5c626 download/Digest-HMAC-1.01.tar.gz +da980cdc026faa065e5d5004115334e6 COPYING +64c4b247d83cd64ec32aa22bf58a709b Digest-HMAC-1.02.tar.gz Added: csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Digest-HMAC/trunk/files/COPYING 2010-04-12 15:26:40 UTC (rev 9622) @@ -0,0 +1,5 @@ +Copyright 1998-2001 Gisle Aas. +Copyright 1998 Graham Barr. + +This library is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 12 17:31:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 Apr 2010 15:31:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9623] csw/mgar/pkg/cpan/TimeDate/trunk Message-ID: Revision: 9623 http://gar.svn.sourceforge.net/gar/?rev=9623&view=rev Author: dmichelsen Date: 2010-04-12 15:31:31 +0000 (Mon, 12 Apr 2010) Log Message: ----------- cpan/TimeDate: Update to 1.20 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/TimeDate/trunk/Makefile csw/mgar/pkg/cpan/TimeDate/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/TimeDate/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/TimeDate/trunk/files/CSWpmtimedate.depend csw/mgar/pkg/cpan/TimeDate/trunk/files/CSWpmtimedate.gspec csw/mgar/pkg/cpan/TimeDate/trunk/files/CSWpmtimedate.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/TimeDate/trunk/ Property changes on: csw/mgar/pkg/cpan/TimeDate/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/TimeDate/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/TimeDate/trunk/Makefile 2010-04-12 15:26:40 UTC (rev 9622) +++ csw/mgar/pkg/cpan/TimeDate/trunk/Makefile 2010-04-12 15:31:31 UTC (rev 9623) @@ -1,5 +1,5 @@ GARNAME = TimeDate -GARVERSION = 1.16 +GARVERSION = 1.20 CATEGORIES = cpan AUTHOR = GBARR @@ -8,6 +8,11 @@ Date::Parse provides two routines for parsing date strings into time values. endef -DISTFILES = $(call admfiles,CSWpmtimedate,depend prototype) +DISTFILES = COPYING +PACKAGES = CSWpmtimedate +CATALOGNAME = pm_timedate + +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/TimeDate/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/TimeDate/trunk/checksums 2010-04-12 15:26:40 UTC (rev 9622) +++ csw/mgar/pkg/cpan/TimeDate/trunk/checksums 2010-04-12 15:31:31 UTC (rev 9623) @@ -1,4 +1,2 @@ -656b00092b2093db944f98ec6e442bf9 download/CSWpmtimedate.gspec -6e0d583c86d7f74b43769810714242aa download/CSWpmtimedate.depend -d9f45e4522209492e46b14d686e040d0 download/CSWpmtimedate.prototype -b3cc35a7cabd106ac8829d2f2ff4bd9d download/TimeDate-1.16.tar.gz +548ae818969b549bf703fbea7d667c07 COPYING +7da7452bce4c684e4238e6d09b390200 TimeDate-1.20.tar.gz Copied: csw/mgar/pkg/cpan/TimeDate/trunk/files/COPYING (from rev 9602, csw/mgar/pkg/cpan/TimeDate/trunk/files/CSWpmtimedate.gspec) =================================================================== --- csw/mgar/pkg/cpan/TimeDate/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/TimeDate/trunk/files/COPYING 2010-04-12 15:31:31 UTC (rev 9623) @@ -0,0 +1,4 @@ +Copyright 1996-2000 Graham Barr. All rights reserved. + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/TimeDate/trunk/files/CSWpmtimedate.depend =================================================================== Deleted: csw/mgar/pkg/cpan/TimeDate/trunk/files/CSWpmtimedate.gspec =================================================================== --- csw/mgar/pkg/cpan/TimeDate/trunk/files/CSWpmtimedate.gspec 2010-04-12 15:26:40 UTC (rev 9622) +++ csw/mgar/pkg/cpan/TimeDate/trunk/files/CSWpmtimedate.gspec 2010-04-12 15:31:31 UTC (rev 9623) @@ -1,9 +0,0 @@ -%var bitname pm_timedate -%var pkgname CSWpmtimedate -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 1996-2000 Graham Barr. All rights reserved. - -This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/TimeDate/trunk/files/CSWpmtimedate.prototype =================================================================== --- csw/mgar/pkg/cpan/TimeDate/trunk/files/CSWpmtimedate.prototype 2010-04-12 15:26:40 UTC (rev 9622) +++ csw/mgar/pkg/cpan/TimeDate/trunk/files/CSWpmtimedate.prototype 2010-04-12 15:31:31 UTC (rev 9623) @@ -1,44 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/TimeDate 0755 root bin -f none /opt/csw/lib/perl/csw/auto/TimeDate/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Date::Format.3perl 0444 root bin -f none /opt/csw/share/man/man3/Date::Parse.3perl 0444 root bin -f none /opt/csw/share/man/man3/Time::Zone.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Date 0755 root bin -f none /opt/csw/share/perl/csw/Date/Format.pm 0444 root bin -d none /opt/csw/share/perl/csw/Date/Language 0755 root bin -f none /opt/csw/share/perl/csw/Date/Language.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Afar.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Amharic.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Austrian.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Brazilian.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Chinese_GB.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Czech.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Danish.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Dutch.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/English.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Finnish.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/French.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Gedeo.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/German.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Greek.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Italian.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Norwegian.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Oromo.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Sidama.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Somali.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Swedish.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/Tigrinya.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/TigrinyaEritrean.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Language/TigrinyaEthiopian.pm 0444 root bin -f none /opt/csw/share/perl/csw/Date/Parse.pm 0444 root bin -d none /opt/csw/share/perl/csw/Time 0755 root bin -f none /opt/csw/share/perl/csw/Time/Zone.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 12 17:36:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 Apr 2010 15:36:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9624] csw/mgar/pkg/cpan/IO-stringy/trunk Message-ID: Revision: 9624 http://gar.svn.sourceforge.net/gar/?rev=9624&view=rev Author: dmichelsen Date: 2010-04-12 15:36:42 +0000 (Mon, 12 Apr 2010) Log Message: ----------- cpan/IO-stringy: Update to 2.110 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/IO-stringy/trunk/Makefile csw/mgar/pkg/cpan/IO-stringy/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/IO-stringy/trunk/files/CSWpmiostringy.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/IO-stringy/trunk/ Property changes on: csw/mgar/pkg/cpan/IO-stringy/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/IO-stringy/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-stringy/trunk/Makefile 2010-04-12 15:31:31 UTC (rev 9623) +++ csw/mgar/pkg/cpan/IO-stringy/trunk/Makefile 2010-04-12 15:36:42 UTC (rev 9624) @@ -1,7 +1,7 @@ GARNAME = IO-stringy -GARVERSION = 2.109 +GARVERSION = 2.110 CATEGORIES = cpan -AUTHOR = ERYQ +AUTHOR = DSKOLL DESCRIPTION = I/O on in-core objects like strings and arrays define BLURB @@ -10,6 +10,9 @@ IO::Scalar, IO::ScalarArray, and IO::Lines. endef -DISTFILES = $(call admfiles,CSWpmiostringy,) +PACKAGES = CSWpmiostringy +CATALOGNAME = pm_iostringy +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/IO-stringy/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IO-stringy/trunk/checksums 2010-04-12 15:31:31 UTC (rev 9623) +++ csw/mgar/pkg/cpan/IO-stringy/trunk/checksums 2010-04-12 15:36:42 UTC (rev 9624) @@ -1,2 +1 @@ -404b59b4e5f9a2c06dcf941f771ccd0a download/CSWpmiostringy.gspec -fb8fbb8037bcc2aa0b9abec675231544 download/IO-stringy-2.109.tar.gz +2e6a976cfa5521e815c1fdf4006982de IO-stringy-2.110.tar.gz Deleted: csw/mgar/pkg/cpan/IO-stringy/trunk/files/CSWpmiostringy.gspec =================================================================== --- csw/mgar/pkg/cpan/IO-stringy/trunk/files/CSWpmiostringy.gspec 2010-04-12 15:31:31 UTC (rev 9623) +++ csw/mgar/pkg/cpan/IO-stringy/trunk/files/CSWpmiostringy.gspec 2010-04-12 15:36:42 UTC (rev 9624) @@ -1,5 +0,0 @@ -%var bitname pm_iostringy -%var pkgname CSWpmiostringy -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Apr 12 17:40:42 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 12 Apr 2010 15:40:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[9625] csw/mgar/pkg/cpan Message-ID: Revision: 9625 http://gar.svn.sourceforge.net/gar/?rev=9625&view=rev Author: bonivart Date: 2010-04-12 15:40:09 +0000 (Mon, 12 Apr 2010) Log Message: ----------- pmtestnowarnings: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Test-NoWarnings/ csw/mgar/pkg/cpan/Test-NoWarnings/branches/ csw/mgar/pkg/cpan/Test-NoWarnings/tags/ csw/mgar/pkg/cpan/Test-NoWarnings/trunk/ csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile csw/mgar/pkg/cpan/Test-NoWarnings/trunk/checksums csw/mgar/pkg/cpan/Test-NoWarnings/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Test-NoWarnings/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/Test-NoWarnings/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile 2010-04-12 15:40:09 UTC (rev 9625) @@ -0,0 +1,20 @@ +GARNAME = Test-NoWarnings +GARVERSION = 1.01 +CATEGORIES = cpan +AUTHOR = ADAMK + +DESCRIPTION = Make sure you didn't emit any warnings while testing +define BLURB + Make sure you didn't emit any warnings while testing +endef + +PACKAGES = CSWpmtestnowarnings +CATALOGNAME = pm_testnowarnings +ARCHALL = 1 + +LICENSE = LICENSE + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +include gar/category.mk Added: csw/mgar/pkg/cpan/Test-NoWarnings/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-NoWarnings/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Test-NoWarnings/trunk/checksums 2010-04-12 15:40:09 UTC (rev 9625) @@ -0,0 +1 @@ +ea97a1891812c2968f2fa8f89c06ff30 Test-NoWarnings-1.01.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Apr 12 18:13:36 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 12 Apr 2010 16:13:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9626] csw/mgar/pkg/cpan Message-ID: Revision: 9626 http://gar.svn.sourceforge.net/gar/?rev=9626&view=rev Author: bonivart Date: 2010-04-12 16:13:35 +0000 (Mon, 12 Apr 2010) Log Message: ----------- pm_unicodestringprep: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Unicode-Stringprep/ csw/mgar/pkg/cpan/Unicode-Stringprep/branches/ csw/mgar/pkg/cpan/Unicode-Stringprep/tags/ csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/ csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/Makefile csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/checksums csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Unicode-Stringprep/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/Unicode-Stringprep/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/Makefile 2010-04-12 16:13:35 UTC (rev 9626) @@ -0,0 +1,20 @@ +GARNAME = Unicode-Stringprep +GARVERSION = 1.103 +CATEGORIES = cpan +AUTHOR = CFAERBER + +DESCRIPTION = Preparation of Internationalized Strings (RFC 3454) +define BLURB + Preparation of Internationalized Strings (RFC 3454) +endef + +PACKAGES = CSWpmunicodestrprep +CATALOGNAME = pm_unicodestringprep +ARCHALL = 1 + +LICENSE = LICENSE + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +include gar/category.mk Added: csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/checksums 2010-04-12 16:13:35 UTC (rev 9626) @@ -0,0 +1 @@ +38b37d58e8444832a8bb5b3c492726cd Unicode-Stringprep-1.103.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Apr 12 18:24:34 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 12 Apr 2010 16:24:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[9627] csw/mgar/pkg/cpan Message-ID: Revision: 9627 http://gar.svn.sourceforge.net/gar/?rev=9627&view=rev Author: bonivart Date: 2010-04-12 16:24:01 +0000 (Mon, 12 Apr 2010) Log Message: ----------- pm_netidnnameprep: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-IDN-Nameprep/ csw/mgar/pkg/cpan/Net-IDN-Nameprep/branches/ csw/mgar/pkg/cpan/Net-IDN-Nameprep/tags/ csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/ csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/Makefile csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/checksums csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/Makefile 2010-04-12 16:24:01 UTC (rev 9627) @@ -0,0 +1,20 @@ +GARNAME = Net-IDN-Nameprep +GARVERSION = 1.000 +CATEGORIES = cpan +AUTHOR = CFAERBER + +DESCRIPTION = A Stringprep Profile for Internationalized Domain Names (RFC 3491) +define BLURB + A Stringprep Profile for Internationalized Domain Names (RFC 3491) +endef + +PACKAGES = CSWpmnetidnnameprep +CATALOGNAME = pm_netidnnameprep +ARCHALL = 1 + +LICENSE = LICENSE + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/checksums 2010-04-12 16:24:01 UTC (rev 9627) @@ -0,0 +1 @@ +73071dc9b706e3f68b953bfdae52585f Net-IDN-Nameprep-1.000.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Apr 12 18:37:29 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 12 Apr 2010 16:37:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9628] csw/mgar/pkg/cpan Message-ID: Revision: 9628 http://gar.svn.sourceforge.net/gar/?rev=9628&view=rev Author: bonivart Date: 2010-04-12 16:37:12 +0000 (Mon, 12 Apr 2010) Log Message: ----------- pm_netidnencode: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-IDN-Encode/ csw/mgar/pkg/cpan/Net-IDN-Encode/branches/ csw/mgar/pkg/cpan/Net-IDN-Encode/tags/ csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/ csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/checksums csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Net-IDN-Encode/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile 2010-04-12 16:37:12 UTC (rev 9628) @@ -0,0 +1,20 @@ +GARNAME = Net-IDN-Encode +GARVERSION = 1.000 +CATEGORIES = cpan +AUTHOR = CFAERBER + +DESCRIPTION = Internationalizing Domain Names in Applications (RFC 3490) +define BLURB + Internationalizing Domain Names in Applications (RFC 3490) +endef + +PACKAGES = CSWpmnetidnencode +CATALOGNAME = pm_netidnencode +ARCHALL = 1 + +LICENSE = LICENSE + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/checksums 2010-04-12 16:37:12 UTC (rev 9628) @@ -0,0 +1 @@ +5b1c00ce7e6c7896b90f4435c650c99d Net-IDN-Encode-1.000.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Apr 12 18:49:12 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 12 Apr 2010 16:49:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9629] csw/mgar/pkg/cpan/IDNA-Punycode/trunk/Makefile Message-ID: Revision: 9629 http://gar.svn.sourceforge.net/gar/?rev=9629&view=rev Author: bonivart Date: 2010-04-12 16:49:11 +0000 (Mon, 12 Apr 2010) Log Message: ----------- pm_idnapunycode: now builds when all deps are done Modified Paths: -------------- csw/mgar/pkg/cpan/IDNA-Punycode/trunk/Makefile Modified: csw/mgar/pkg/cpan/IDNA-Punycode/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IDNA-Punycode/trunk/Makefile 2010-04-12 16:37:12 UTC (rev 9628) +++ csw/mgar/pkg/cpan/IDNA-Punycode/trunk/Makefile 2010-04-12 16:49:11 UTC (rev 9629) @@ -10,14 +10,10 @@ PACKAGES = CSWpmidnapunycode CATALOGNAME = pm_idnapunycode -#ARCHALL = 1 +ARCHALL = 1 LICENSE = LICENSE -#Warning: prerequisite Net::IDN::Encode 1 not found. -#Warning: prerequisite Net::IDN::Punycode 1 not found. -#Warning: prerequisite Test::NoWarnings 0 not found. - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Apr 12 19:11:52 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 12 Apr 2010 17:11:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9630] csw/mgar/pkg Message-ID: Revision: 9630 http://gar.svn.sourceforge.net/gar/?rev=9630&view=rev Author: bonivart Date: 2010-04-12 17:11:35 +0000 (Mon, 12 Apr 2010) Log Message: ----------- sauron: initial commmit Added Paths: ----------- csw/mgar/pkg/sauron/ csw/mgar/pkg/sauron/branches/ csw/mgar/pkg/sauron/tags/ csw/mgar/pkg/sauron/trunk/ csw/mgar/pkg/sauron/trunk/Makefile csw/mgar/pkg/sauron/trunk/checksums csw/mgar/pkg/sauron/trunk/files/ Property changes on: csw/mgar/pkg/sauron/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/sauron/trunk/Makefile =================================================================== --- csw/mgar/pkg/sauron/trunk/Makefile (rev 0) +++ csw/mgar/pkg/sauron/trunk/Makefile 2010-04-12 17:11:35 UTC (rev 9630) @@ -0,0 +1,39 @@ +GARNAME = sauron +GARVERSION = 0.6.2 +CATEGORIES = utils + +DESCRIPTION = Scalable system for management of DNS & DHCP services +define BLURB + Scalable system for management of DNS & DHCP services +endef + +MASTER_SITES = http://sauron.jyu.fi/pub/sauron/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +REQUIRED_PKGS = CSWperl CSWpostgresql + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check +INSTALL_SCRIPTS = custom + +include gar/category.mk + +SPKG_SOURCEURL = http://sauron.jyu.fi + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" +# @rm -rf $(DESTDIR) +# @ginstall -d $(DESTDIR)$(bindir) +# @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) +# @ginstall -d $(DESTDIR)$(mandir)/man1 + echo "DESTDIR: $(DESTDIR)" + @( cd $(WORKSRC) ; \ + gmake INSTALL_ROOT=$(DESTDIR) install ) +# cp -r $(GARNAME) $(DESTDIR)$(bindir)/$(GARNAME) ; \ +# cp -r README $(DESTDIR)$(docdir)/$(GARNAME) ; \ +# cp -r $(GARNAME).1 $(DESTDIR)$(mandir)/man1/$(GARNAME).1 ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/sauron/trunk/checksums =================================================================== --- csw/mgar/pkg/sauron/trunk/checksums (rev 0) +++ csw/mgar/pkg/sauron/trunk/checksums 2010-04-12 17:11:35 UTC (rev 9630) @@ -0,0 +1 @@ +73657fb21acd179c16aea634a14be7f4 download/sauron-0.6.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Apr 13 12:27:11 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 13 Apr 2010 10:27:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9631] csw/mgar/pkg/sudo/trunk Message-ID: Revision: 9631 http://gar.svn.sourceforge.net/gar/?rev=9631&view=rev Author: wahwah Date: 2010-04-13 10:27:08 +0000 (Tue, 13 Apr 2010) Log Message: ----------- sudo: Version up to p6, although it hasn't been announced by upstream yet. 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-04-12 17:11:35 UTC (rev 9630) +++ csw/mgar/pkg/sudo/trunk/Makefile 2010-04-13 10:27:08 UTC (rev 9631) @@ -1,5 +1,5 @@ GARNAME = sudo -GARVERSION = 1.7.2p5 +GARVERSION = 1.7.2p6 CATEGORIES = utils DESCRIPTION = Provides limited super user privileges @@ -64,6 +64,9 @@ ALTERNATIVE_minimal = $(bindir)/sudo sudo $(bindir)/sudo.minimal 50 ALTERNATIVE_minimal += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.minimal +CHECKPKG_OVERRIDES_CSWsudo += surplus-dependency|CSWalternatives +CHECKPKG_OVERRIDES_CSWsudo += surplus-dependency|CSWsudo-common + include gar/category.mk post-install-modulated: Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2010-04-12 17:11:35 UTC (rev 9630) +++ csw/mgar/pkg/sudo/trunk/checksums 2010-04-13 10:27:08 UTC (rev 9631) @@ -1,3 +1,3 @@ 955d99eda1432c7b7e00d98b91e35a79 CSWsudo-common.postinstall 157b2e5e38ca54eb36e0364706bd0292 install.diff -398f584e831bd75b3c0179e28368c2a3 sudo-1.7.2p5.tar.gz +c4f1a43e8ba94f6bf06d2211442148c4 sudo-1.7.2p6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 14 11:24:15 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 14 Apr 2010 09:24:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9632] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 9632 http://gar.svn.sourceforge.net/gar/?rev=9632&view=rev Author: dmichelsen Date: 2010-04-14 09:24:14 +0000 (Wed, 14 Apr 2010) Log Message: ----------- mGAR v2: Allow ALTERNATIVES for simple case 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-04-13 10:27:08 UTC (rev 9631) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-04-14 09:24:14 UTC (rev 9632) @@ -693,14 +693,15 @@ merge-alternatives-%: @echo "[ Generating alternatives for package $* ]" $(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/alternatives - $(_DBG)($(foreach A,$(or $(ALTERNATIVES_$*),$(ALTERNATIVES)), \ + $(_DBG)($(if $(ALTERNATIVE),echo "$(ALTERNATIVE)";) \ + $(foreach A,$(or $(ALTERNATIVES_$*),$(ALTERNATIVES)), \ $(if $(ALTERNATIVE_$A), \ echo "$(ALTERNATIVE_$A)";, \ $(error The variable 'ALTERNATIVE_$A' is empty, but must contain an alternative) \ ))) > $(PKGROOT)/opt/csw/share/alternatives/$(call catalogname,$*) @$(MAKECOOKIE) -merge-alternatives: $(foreach S,$(SPKG_SPECS),$(if $(or $(ALTERNATIVES_$S),$(ALTERNATIVES)),merge-alternatives-$S)) +merge-alternatives: $(foreach S,$(SPKG_SPECS),$(if $(or $(ALTERNATIVES_$S),$(ALTERNATIVES),$(ALTERNATIVE)),merge-alternatives-$S)) reset-merge-alternatives: @rm -f $(COOKIEDIR)/merge-alternatives $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-alternatives-$(SPEC)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 14 13:30:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 14 Apr 2010 11:30:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9633] csw/mgar/pkg/libssh2/trunk Message-ID: Revision: 9633 http://gar.svn.sourceforge.net/gar/?rev=9633&view=rev Author: dmichelsen Date: 2010-04-14 11:30:51 +0000 (Wed, 14 Apr 2010) Log Message: ----------- libssh2: Update to 1.2.5 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-04-14 09:24:14 UTC (rev 9632) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2010-04-14 11:30:51 UTC (rev 9633) @@ -1,5 +1,5 @@ GARNAME = libssh2 -GARVERSION = 1.2.4 +GARVERSION = 1.2.5 CATEGORIES = lib DESCRIPTION = A Library Implementing the SSH2 Protocol @@ -28,7 +28,7 @@ CATALOGNAME_CSWlibssh2devel = libssh2_devel SPKG_DESC_CSWlibssh2 = $(DESCRIPTION) -SPKG_DESC_CSWlibssh2devel = libssh2 developer files +SPKG_DESC_CSWlibssh2devel = Developer files for libssh2 BUILD64 = 1 NOISAEXEC = 1 @@ -39,11 +39,8 @@ TEST_TARGET = check -# The second test "ssh2" sometimes hangs. Disable tests for now until -# http://sourceforge.net/tracker/?func=detail&aid=2952151&group_id=125852&atid=703942 -# has been resolved. -SKIPTEST ?= 1 - PKGFILES_CSWlibssh2devel = $(PKGFILES_DEVEL) +CHECKPKG_OVERRIDES_CSWlibssh2devel += surplus-dependency|CSWlibssh2 + include gar/category.mk Modified: csw/mgar/pkg/libssh2/trunk/checksums =================================================================== --- csw/mgar/pkg/libssh2/trunk/checksums 2010-04-14 09:24:14 UTC (rev 9632) +++ csw/mgar/pkg/libssh2/trunk/checksums 2010-04-14 11:30:51 UTC (rev 9633) @@ -1 +1 @@ -4d65a66d5f232e5bb1d05b311e43d46d libssh2-1.2.4.tar.gz +9c4ccd6a078c465179bb70fcf5a704d8 libssh2-1.2.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 14 15:25:29 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 14 Apr 2010 13:25:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9634] csw/mgar/pkg/libssh2/trunk/Makefile Message-ID: Revision: 9634 http://gar.svn.sourceforge.net/gar/?rev=9634&view=rev Author: dmichelsen Date: 2010-04-14 13:25:22 +0000 (Wed, 14 Apr 2010) Log Message: ----------- libssh2: Disable tests for now Modified Paths: -------------- csw/mgar/pkg/libssh2/trunk/Makefile Modified: csw/mgar/pkg/libssh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libssh2/trunk/Makefile 2010-04-14 11:30:51 UTC (rev 9633) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2010-04-14 13:25:22 UTC (rev 9634) @@ -39,6 +39,10 @@ TEST_TARGET = check +# Disable for now until this is fixed: +# http://libssh2.stuge.se/ticket/170 +SKIPTEST ?= 1 + PKGFILES_CSWlibssh2devel = $(PKGFILES_DEVEL) CHECKPKG_OVERRIDES_CSWlibssh2devel += surplus-dependency|CSWlibssh2 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 Apr 14 15:39:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 14 Apr 2010 13:39:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[9635] csw/mgar/pkg Message-ID: Revision: 9635 http://gar.svn.sourceforge.net/gar/?rev=9635&view=rev Author: dmichelsen Date: 2010-04-14 13:39:32 +0000 (Wed, 14 Apr 2010) Log Message: ----------- minicom: Initial commit Added Paths: ----------- csw/mgar/pkg/minicom/ csw/mgar/pkg/minicom/branches/ csw/mgar/pkg/minicom/tags/ csw/mgar/pkg/minicom/trunk/ csw/mgar/pkg/minicom/trunk/Makefile csw/mgar/pkg/minicom/trunk/checksums csw/mgar/pkg/minicom/trunk/files/ Property changes on: csw/mgar/pkg/minicom/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/minicom/trunk/Makefile =================================================================== --- csw/mgar/pkg/minicom/trunk/Makefile (rev 0) +++ csw/mgar/pkg/minicom/trunk/Makefile 2010-04-14 13:39:32 UTC (rev 9635) @@ -0,0 +1,24 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = minicom +GARVERSION = 2.4 +CATEGORIES = apps + +DESCRIPTION = Serial communication program +define BLURB +endef + +WGET_OPTS = --no-check-certificate +MASTER_SITES = https://alioth.debian.org/frs/download.php/3195/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://alioth.debian.org/projects/minicom/ + +# Compilation doesn't work unless this is fixed: +\xC3# https://alioth.debian.org/tracker/index.php?func=detail&aid=312462&group_id=30018&atid=100031 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/minicom/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/minicom/trunk/checksums =================================================================== --- csw/mgar/pkg/minicom/trunk/checksums (rev 0) +++ csw/mgar/pkg/minicom/trunk/checksums 2010-04-14 13:39:32 UTC (rev 9635) @@ -0,0 +1 @@ +700976a3c2dcc8bbd50ab9bb1c08837b minicom-2.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Apr 14 15:42:12 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Apr 2010 13:42:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9636] csw/mgar/pkg/puppet/branches/puppet-0.25.x/ Message-ID: Revision: 9636 http://gar.svn.sourceforge.net/gar/?rev=9636&view=rev Author: wahwah Date: 2010-04-14 13:42:12 +0000 (Wed, 14 Apr 2010) Log Message: ----------- puppet: Adding a 0.25.x branch using cswclassutils Added Paths: ----------- csw/mgar/pkg/puppet/branches/puppet-0.25.x/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 14 15:58:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 14 Apr 2010 13:58:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9637] csw/mgar/pkg Message-ID: Revision: 9637 http://gar.svn.sourceforge.net/gar/?rev=9637&view=rev Author: dmichelsen Date: 2010-04-14 13:58:50 +0000 (Wed, 14 Apr 2010) Log Message: ----------- lha: Initial commit Added Paths: ----------- csw/mgar/pkg/lha/ csw/mgar/pkg/lha/branches/ csw/mgar/pkg/lha/tags/ csw/mgar/pkg/lha/trunk/ csw/mgar/pkg/lha/trunk/Makefile csw/mgar/pkg/lha/trunk/checksums csw/mgar/pkg/lha/trunk/files/ Property changes on: csw/mgar/pkg/lha/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/lha/trunk/Makefile =================================================================== --- csw/mgar/pkg/lha/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lha/trunk/Makefile 2010-04-14 13:58:50 UTC (rev 9637) @@ -0,0 +1,29 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = lha +GARVERSION = 1.14i-ac20040929p1 +SPKG_VERSION = $(echo $(GARVERSION) | tr '-' '_') +CATEGORIES = utils + +DESCRIPTION = File archiving/compression program +define BLURB +endef + +MASTER_SITES = http://sourceforge.jp/projects/lha/releases/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +DEP_PKGS = CSWiconv + +VENDOR_URL = http://www2m.biglobe.ne.jp/~dolphin/lha/lha-unix.htm + +EXTRA_LINKER_FLAGS = -liconv +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +# License is really unknown +CHECKPKG_OVERRIDES_CSWlha += license-missing|/opt/csw/share/doc/lha/license + +include gar/category.mk Property changes on: csw/mgar/pkg/lha/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lha/trunk/checksums =================================================================== --- csw/mgar/pkg/lha/trunk/checksums (rev 0) +++ csw/mgar/pkg/lha/trunk/checksums 2010-04-14 13:58:50 UTC (rev 9637) @@ -0,0 +1 @@ +52ce45f9007082e55ebd5857614eebec lha-1.14i-ac20040929p1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 14 16:06:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 14 Apr 2010 14:06:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[9638] csw/mgar/pkg/lha/trunk Message-ID: Revision: 9638 http://gar.svn.sourceforge.net/gar/?rev=9638&view=rev Author: dmichelsen Date: 2010-04-14 14:06:56 +0000 (Wed, 14 Apr 2010) Log Message: ----------- lha: Update to p1 Modified Paths: -------------- csw/mgar/pkg/lha/trunk/Makefile csw/mgar/pkg/lha/trunk/checksums Modified: csw/mgar/pkg/lha/trunk/Makefile =================================================================== --- csw/mgar/pkg/lha/trunk/Makefile 2010-04-14 13:58:50 UTC (rev 9637) +++ csw/mgar/pkg/lha/trunk/Makefile 2010-04-14 14:06:56 UTC (rev 9638) @@ -1,7 +1,7 @@ # : Makefile 9089 2010-03-11 08:34:46Z wahwah $ GARNAME = lha -GARVERSION = 1.14i-ac20040929p1 -SPKG_VERSION = $(echo $(GARVERSION) | tr '-' '_') +GARVERSION = 1.14i-ac20050924p1 +SPKG_VERSION = $(shell echo $(GARVERSION) | tr '-' '_') CATEGORIES = utils DESCRIPTION = File archiving/compression program Modified: csw/mgar/pkg/lha/trunk/checksums =================================================================== --- csw/mgar/pkg/lha/trunk/checksums 2010-04-14 13:58:50 UTC (rev 9637) +++ csw/mgar/pkg/lha/trunk/checksums 2010-04-14 14:06:56 UTC (rev 9638) @@ -1 +1 @@ -52ce45f9007082e55ebd5857614eebec lha-1.14i-ac20040929p1.tar.gz +9f52430410928ba4390a73a41a36d56f lha-1.14i-ac20050924p1.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 Wed Apr 14 20:49:30 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 14 Apr 2010 18:49:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9639] csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile Message-ID: Revision: 9639 http://gar.svn.sourceforge.net/gar/?rev=9639&view=rev Author: idogan23 Date: 2010-04-14 18:49:30 +0000 (Wed, 14 Apr 2010) Log Message: ----------- Digest::SHA is now included in Perl 5.10.1 Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile Modified: csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile 2010-04-14 14:06:56 UTC (rev 9638) +++ csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile 2010-04-14 18:49:30 UTC (rev 9639) @@ -17,7 +17,6 @@ ARCHALL = 1 DEPENDS += cpan/Crypt-OpenSSL-RSA -DEPENDS += cpan/Digest-SHA1 DEPENDS += cpan/Error DEPENDS += cpan/MailTools DEPENDS += cpan/Net-DNS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed Apr 14 21:18:43 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 14 Apr 2010 19:18:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9640] csw/mgar/pkg/irssi/trunk Message-ID: Revision: 9640 http://gar.svn.sourceforge.net/gar/?rev=9640&view=rev Author: idogan23 Date: 2010-04-14 19:18:43 +0000 (Wed, 14 Apr 2010) Log Message: ----------- irssi: bump version to 0.8.15 Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile csw/mgar/pkg/irssi/trunk/checksums Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2010-04-14 18:49:30 UTC (rev 9639) +++ csw/mgar/pkg/irssi/trunk/Makefile 2010-04-14 19:18:43 UTC (rev 9640) @@ -1,5 +1,5 @@ GARNAME = irssi -GARVERSION = 0.8.14 +GARVERSION = 0.8.15 CATEGORIES = apps DESCRIPTION = IRC client with IPv6, proxy, bot, socks and Perl support @@ -16,7 +16,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 SAMPLECONF = .*/irssi.conf Modified: csw/mgar/pkg/irssi/trunk/checksums =================================================================== --- csw/mgar/pkg/irssi/trunk/checksums 2010-04-14 18:49:30 UTC (rev 9639) +++ csw/mgar/pkg/irssi/trunk/checksums 2010-04-14 19:18:43 UTC (rev 9640) @@ -1 +1 @@ -7d9437f53209a61af4fe4c9c5528ffa7 download/irssi-0.8.14.tar.gz +870db8e319f640c2bf446c30d0c24ef6 irssi-0.8.15.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 Wed Apr 14 22:21:42 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 14 Apr 2010 20:21:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[9641] csw/mgar/pkg/irssi/trunk/Makefile Message-ID: Revision: 9641 http://gar.svn.sourceforge.net/gar/?rev=9641&view=rev Author: idogan23 Date: 2010-04-14 20:21:27 +0000 (Wed, 14 Apr 2010) Log Message: ----------- irssi: minor dependency corrections Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2010-04-14 19:18:43 UTC (rev 9640) +++ csw/mgar/pkg/irssi/trunk/Makefile 2010-04-14 20:21:27 UTC (rev 9641) @@ -34,10 +34,11 @@ RUNTIME_DEP_PKGS += CSWiconv RUNTIME_DEP_PKGS += CSWosslrt RUNTIME_DEP_PKGS += CSWperl -RUNTIME_DEP_PKGS += CSWsunmath RUNTIME_DEP_PKGS += CSWggettextrt -RUNTIME_DEP_PKGS += CSWbdb47 +RUNTIME_DEP_PKGS += CSWbdb +CHECKPKG_OVERRIDES_CSWirssi += surplus-dependency|CSWiconv + CHECKPKG_OVERRIDES_CSWirssi += symbol-not-found 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 Apr 14 23:38:03 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 14 Apr 2010 21:38:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[9642] csw/mgar/pkg Message-ID: Revision: 9642 http://gar.svn.sourceforge.net/gar/?rev=9642&view=rev Author: dmichelsen Date: 2010-04-14 21:38:03 +0000 (Wed, 14 Apr 2010) Log Message: ----------- xfig: Initial commit Added Paths: ----------- csw/mgar/pkg/xfig/ csw/mgar/pkg/xfig/branches/ csw/mgar/pkg/xfig/tags/ csw/mgar/pkg/xfig/trunk/ csw/mgar/pkg/xfig/trunk/Makefile csw/mgar/pkg/xfig/trunk/checksums csw/mgar/pkg/xfig/trunk/files/ csw/mgar/pkg/xfig/trunk/files/0001-Add-missing-define-for-REG_NOERROR.patch Property changes on: csw/mgar/pkg/xfig/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/xfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfig/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfig/trunk/Makefile 2010-04-14 21:38:03 UTC (rev 9642) @@ -0,0 +1,74 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = xfig +GARVERSION = 3.2.5b +CATEGORIES = utils + +DESCRIPTION = An interactive drawing tool +define BLURB + The purpose of this site is to provide a central Xfig repository for the + diverse documentation and programs available on the web. All the components + and libraries will be available at this site, in addition to Xfig drawings. +endef + +SF_PROJ = mcj +MASTER_SITES = $(SF_MIRROR) +DISTNAME = $(GARNAME).$(GARVERSION) +DISTFILES = $(DISTNAME).full.tar.gz + +PATCHFILES = 0001-Add-missing-define-for-REG_NOERROR.patch + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).full.tar.gz + +VENOR_URL = http://www.xfig.org/ + +LICENSE = Libraries/GUI/LICENSE + +DEP_PKGS = CSWxpm CSWzlib CSWjpeg CSWpng CSWxaw3d + +CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile + +BUILD_OVERRIDE_VARS = PNGLIBDIR PNGINC ZLIBDIR +BUILD_OVERRIDE_VARS += JPEGLIBDIR JPEGINC +BUILD_OVERRIDE_VARS += XPMLIBDIR XPMINC +BUILD_OVERRIDE_VARS += XFIGLIBDIR XFIGDOCDIR + +BUILD_OVERRIDE_VAR_PNGLIBDIR = $(libdir) +BUILD_OVERRIDE_VAR_PNGINC = -I$(includedir) +BUILD_OVERRIDE_VAR_ZLIBDIR = $(libdir) +BUILD_OVERRIDE_VAR_JPEGLIBDIR = $(libdir) +BUILD_OVERRIDE_VAR_JPEGINC = -I$(includedir) +BUILD_OVERRIDE_VAR_XPMLIBDIR = /usr/openwin/lib +BUILD_OVERRIDE_VAR_XPMINC = -I/usr/openwin/include/X11 + +BUILD_OVERRIDE_VAR_XFIGLIBDIR = $(libdir)/xfig +BUILD_OVERRIDE_VAR_XFIGDOCDIR = $(docdir)/xfig + +# -DXFIGLIBDIR=\"/usr/openwin/lib/X11/xfig\" -DXFIGDOCDIR=\"/usr/local/xfig/doc\" -DPRINTCAP=\"/etc/printcap\" + +TEST_SCRIPTS = + +INSTALL_ARGS = install.man install.html install.libs + +INSTALL_OVERRIDE_VARS = BINDIR MANPATH LIBDIR XFIGDOCDIR +INSTALL_OVERRIDE_VAR_BINDIR = $(bindir) +INSTALL_OVERRIDE_VAR_MANPATH = $(mandir) +INSTALL_OVERRIDE_VAR_LIBDIR = $(libdir) +INSTALL_OVERRIDE_VAR_XFIGDOCDIR = $(docdir)/xfig + +# INSTALL_SCRIPTS = custom + +include gar/category.mk + +post-extract-modulated: + -find $(WORKSRC) -type d -exec chmod 755 \{\} \; + -find $(WORKSRC) -type f -exec chmod ugo+r \{\} \; + @$(MAKECOOKIE) + + +#install-custom: +# ginstall -d $(DESTDIR)$(bindir) +# ginstall $(WORKSRC)/xearth $(DESTDIR)$(bindir)/xearth +# ginstall -d $(DESTDIR)$(mandir)/man1 +# ginstall $(WORKSRC)/xearth.man $(DESTDIR)$(mandir)/man1/xearth.1 +# @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/xfig/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/xfig/trunk/checksums =================================================================== --- csw/mgar/pkg/xfig/trunk/checksums (rev 0) +++ csw/mgar/pkg/xfig/trunk/checksums 2010-04-14 21:38:03 UTC (rev 9642) @@ -0,0 +1,2 @@ +f07c03aa2c8e449e8fce29b6b4d652c5 0001-Add-missing-define-for-REG_NOERROR.patch +499b0ce103a6b353453bf7e327f9a3b9 xfig.3.2.5b.full.tar.gz Added: csw/mgar/pkg/xfig/trunk/files/0001-Add-missing-define-for-REG_NOERROR.patch =================================================================== --- csw/mgar/pkg/xfig/trunk/files/0001-Add-missing-define-for-REG_NOERROR.patch (rev 0) +++ csw/mgar/pkg/xfig/trunk/files/0001-Add-missing-define-for-REG_NOERROR.patch 2010-04-14 21:38:03 UTC (rev 9642) @@ -0,0 +1,25 @@ +From 675687ba7bdf73c0000cc523f5608ec5519b95db Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 14 Apr 2010 22:22:39 +0200 +Subject: [PATCH] Add missing define for REG_NOERROR + +--- + w_keyboard.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/w_keyboard.c b/w_keyboard.c +index 6655d08..2168713 100644 +--- a/w_keyboard.c ++++ b/w_keyboard.c +@@ -41,7 +41,7 @@ + #define REG_NOERROR REG_OKAY + #endif + +-#if defined(__FreeBSD__) && !defined(REG_NOERROR) ++#if (defined(__FreeBSD__) || defined(__sun)) && !defined(REG_NOERROR) + #define REG_NOERROR 0 + #endif + +-- +1.7.0 + 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 Apr 15 05:00:39 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 15 Apr 2010 03:00:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9643] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 9643 http://gar.svn.sourceforge.net/gar/?rev=9643&view=rev Author: bdwalton Date: 2010-04-15 03:00:39 +0000 (Thu, 15 Apr 2010) Log Message: ----------- coreutils: use sos12 now; tweak build deps; force link against -lgen; almost done... Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/coreutils/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch Removed Paths: ------------- csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch csw/mgar/pkg/coreutils/trunk/files/autoconf.diff Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2010-04-14 21:38:03 UTC (rev 9642) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2010-04-15 03:00:39 UTC (rev 9643) @@ -8,11 +8,12 @@ OPT_FLAGS_GCC = -O1 -pipe # building with gcc gets us extra tools (eg: stdbuf) -GARCOMPILER = GCC4 +# GARCOMPILER = GCC4 SHELL = /opt/csw/bin/bash -BUILD_DEP_PKGS = CSWbash +BUILD_DEP_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit +BUILD_DEP_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash RUNTIME_DEP_PKGS = CSWiconv CSWggettextrt CSWlibgmp @@ -25,11 +26,8 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-Fix-solaris-acl-support-breakage.patch +PATCHFILES = 0001-Enhance-Solaris-ACL-error-handling.patch -BUILD_DEP_PKGS = CSWautomake CSWautoconf CSWbison CSWggettext CSWgit -BUILD_DEP_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -41,9 +39,11 @@ CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw/ CONFIGURE_ARGS += --enable-no-install-program=chcon -#TEST_TARGET = check -TEST_TARGET = +# required for eaccess and not picked up automatically. +EXTRA_LDFLAGS = -lgen +TEST_TARGET = check + include gar/category.mk PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2010-04-14 21:38:03 UTC (rev 9642) +++ csw/mgar/pkg/coreutils/trunk/checksums 2010-04-15 03:00:39 UTC (rev 9643) @@ -1,2 +1,2 @@ -2d8837f7ca6d422837bcdb2be4ab28bb 0001-Fix-solaris-acl-support-breakage.patch +f3903b1c38fd72456ae73af39ac2fec6 0001-Enhance-Solaris-ACL-error-handling.patch 56f549854d723d9dcebb77919019df55 coreutils-8.4.tar.gz Added: csw/mgar/pkg/coreutils/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch (rev 0) +++ csw/mgar/pkg/coreutils/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch 2010-04-15 03:00:39 UTC (rev 9643) @@ -0,0 +1,58 @@ +From a06d449a84a393d2d764a0d7871840cb99f665d7 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Thu, 11 Feb 2010 04:43:29 +0100 +Subject: [PATCH] Enhance Solaris ACL error handling + +Gracefully handle EOPNOTSUPP in qcopy_acl and qset_acl. These +functions, as used in coreutils, were causing the test suite to fail +on Solaris 8 i386 with ZFS-backed NFSv3 mounts. The failures included +errors such as: + +FAIL: cp/backup-dir +cp: preserving permissions for `y/x': Operation not supported on +transport endpoint + +Signed-off-by: Ben Walton +--- + lib/copy-acl.c | 4 ++-- + lib/set-mode-acl.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/copy-acl.c b/lib/copy-acl.c +index 1e82240..e187cda 100644 +--- a/lib/copy-acl.c ++++ b/lib/copy-acl.c +@@ -294,7 +294,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, + + if (count < 0) + { +- if (errno == ENOSYS || errno == ENOTSUP) ++ if (errno == ENOSYS || errno == ENOTSUP || errno == EOPNOTSUPP) + { + count = 0; + entries = NULL; +@@ -358,7 +358,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, + if (ret < 0 && saved_errno == 0) + { + saved_errno = errno; +- if (errno == ENOSYS && !acl_nontrivial (count, entries)) ++ if ((errno == ENOSYS || errno == EOPNOTSUPP) && !acl_nontrivial (count, entries)) + saved_errno = 0; + } + else +diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c +index c5b4726..2cd2c75 100644 +--- a/lib/set-mode-acl.c ++++ b/lib/set-mode-acl.c +@@ -387,7 +387,7 @@ qset_acl (char const *name, int desc, mode_t mode) + ret = acl (name, SETACL, sizeof (entries) / sizeof (aclent_t), entries); + if (ret < 0) + { +- if (errno == ENOSYS) ++ if (errno == ENOSYS || errno == EOPNOTSUPP) + return chmod_or_fchmod (name, desc, mode); + return -1; + } +-- +1.6.6 + Deleted: csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch 2010-04-14 21:38:03 UTC (rev 9642) +++ csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch 2010-04-15 03:00:39 UTC (rev 9643) @@ -1,55 +0,0 @@ -From 8d4aa48bc66f346db116dd2fe4aa524e1362897f Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Fri, 15 Jan 2010 03:43:16 +0100 -Subject: [PATCH] Fix solaris acl support breakage - -Solaris has support for ACL's on NFS, but only in certain combinations -of client and server. When ACL operations are attempted in -unsupported situations, EOPNOTSUPP can be returned instead of ENOSYS. -This patch allows utilities that work with ACL's to handle the -difference properly. - -Signed-off-by: Ben Walton ---- - lib/copy-acl.c | 4 ++-- - lib/set-mode-acl.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/copy-acl.c b/lib/copy-acl.c -index 1e82240..6a21aeb 100644 ---- a/lib/copy-acl.c -+++ b/lib/copy-acl.c -@@ -294,7 +294,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, - - if (count < 0) - { -- if (errno == ENOSYS || errno == ENOTSUP) -+ if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP) - { - count = 0; - entries = NULL; -@@ -358,7 +358,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, - if (ret < 0 && saved_errno == 0) - { - saved_errno = errno; -- if (errno == ENOSYS && !acl_nontrivial (count, entries)) -+ if ((errno == ENOSYS || errno == EOPNOTSUPP) && !acl_nontrivial (count, entries)) - saved_errno = 0; - } - else -diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c -index c5b4726..2cd2c75 100644 ---- a/lib/set-mode-acl.c -+++ b/lib/set-mode-acl.c -@@ -387,7 +387,7 @@ qset_acl (char const *name, int desc, mode_t mode) - ret = acl (name, SETACL, sizeof (entries) / sizeof (aclent_t), entries); - if (ret < 0) - { -- if (errno == ENOSYS) -+ if (errno == ENOSYS || errno == EOPNOTSUPP) - return chmod_or_fchmod (name, desc, mode); - return -1; - } --- -1.6.5.1 - Deleted: csw/mgar/pkg/coreutils/trunk/files/autoconf.diff =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/autoconf.diff 2010-04-14 21:38:03 UTC (rev 9642) +++ csw/mgar/pkg/coreutils/trunk/files/autoconf.diff 2010-04-15 03:00:39 UTC (rev 9643) @@ -1,12 +0,0 @@ -Binary files coreutils-5.94.orig/.NEWS.swp and coreutils-5.94/.NEWS.swp differ -diff --speed-large-files --minimal -Nru coreutils-5.94.orig/Makefile.in coreutils-5.94/Makefile.in ---- coreutils-5.94.orig/Makefile.in 2006-02-17 17:48:18.641296000 -0500 -+++ coreutils-5.94/Makefile.in 2006-02-17 17:46:42.922854000 -0500 -@@ -384,7 +384,6 @@ - esac; - - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- $(SHELL) ./config.status --recheck - - $(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) 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 Apr 15 08:28:41 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 15 Apr 2010 06:28:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9644] csw/mgar/pkg/curl/tags/curl-7.20.0, REV=2010.02.15/ Message-ID: Revision: 9644 http://gar.svn.sourceforge.net/gar/?rev=9644&view=rev Author: dmichelsen Date: 2010-04-15 06:28:41 +0000 (Thu, 15 Apr 2010) Log Message: ----------- curl: Tag 7.20.0,REV=2010.02.15 Added Paths: ----------- csw/mgar/pkg/curl/tags/curl-7.20.0,REV=2010.02.15/ 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 Apr 15 17:20:16 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Apr 2010 15:20:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9645] csw/mgar/pkg/puppet/branches/puppet-0.25.x Message-ID: Revision: 9645 http://gar.svn.sourceforge.net/gar/?rev=9645&view=rev Author: wahwah Date: 2010-04-15 15:20:15 +0000 (Thu, 15 Apr 2010) Log Message: ----------- puppet: puppet-0.25.x with classutils Modified Paths: -------------- csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/cswpuppetd Modified: csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile 2010-04-15 06:28:41 UTC (rev 9644) +++ csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile 2010-04-15 15:20:15 UTC (rev 9645) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh GARNAME = puppet -GARVERSION = 0.24.8 +GARVERSION = 0.25.4 CATEGORIES = apps define BLURB @@ -21,9 +21,9 @@ endef MASTER_SITES = http://reductivelabs.com/downloads/puppet/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += cswpuppetd cswpuppetmasterd cswusergroup -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz SPKG_SOURCEURL = http://reductivelabs.com/products/puppet/ INITSMF = $(sysconfdir)/init\.d/cswpuppetd @@ -40,6 +40,7 @@ RUNTIME_DEP_PKGS = CSWfacter RUNTIME_DEP_PKGS += CSWruby RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWpuppet +RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWruby PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd PKGFILES_CSWpuppetmaster += $(sbindir)/puppetmasterd @@ -59,6 +60,9 @@ PATCHFILES = 0001-pkgutil-support.patch PATCHFILES += 0002-Using-the-single-option-of-pkgutil.patch +CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWfacter +CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWpuppet + include gar/category.mk install-puppet: @@ -85,3 +89,11 @@ ginstall -m 644 $(FILEDIR)/cswusergroup \ $(DESTDIR)$(sysconfdir)/pkg/puppet/cswusergroup @$(MAKECOOKIE) + +post-merge: + # For this file to run, CSWpuppet would need to depend on CSWpython, + # and we don't want that. It could be split off to another package, but + # this file doesn't seem to be of any use on Solaris, so we can safely + # remove it. + rm $(PKGROOT)$(libdir)/ruby/site_ruby/1.8/puppet/provider/package/yumhelper.py + @$(MAKECOOKIE) Modified: csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums 2010-04-15 06:28:41 UTC (rev 9644) +++ csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums 2010-04-15 15:20:15 UTC (rev 9645) @@ -1,6 +1,6 @@ abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch 9c27c0cdca051eae986b56b91ef889ca 0002-Using-the-single-option-of-pkgutil.patch -ee39853fe02ec20eae7847bcb2822ed4 cswpuppetd +6d2a43142b64401159b357e5b055bece cswpuppetd aba2c79e589b9bd1c881a22aa663a213 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup -288d46dee00acad64d0f3ecc6d8ba6fa puppet-0.24.8.tgz +69c97019fda5620f9f45f6ad64407e3b puppet-0.25.4.tar.gz Modified: csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/cswpuppetd 2010-04-15 06:28:41 UTC (rev 9644) +++ csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/cswpuppetd 2010-04-15 15:20:15 UTC (rev 9645) @@ -27,7 +27,7 @@ start_puppetd() { cd / # Start daemons. - ${bindir}/puppetd + ${sbindir}/puppetd } reload_puppetd() { 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 Apr 15 17:23:28 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Apr 2010 15:23:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[9646] csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums Message-ID: Revision: 9646 http://gar.svn.sourceforge.net/gar/?rev=9646&view=rev Author: wahwah Date: 2010-04-15 15:23:28 +0000 (Thu, 15 Apr 2010) Log Message: ----------- puppet: Add checksums for files with the Id tag. Modified Paths: -------------- csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums Modified: csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums 2010-04-15 15:20:15 UTC (rev 9645) +++ csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums 2010-04-15 15:23:28 UTC (rev 9646) @@ -1,6 +1,6 @@ abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch 9c27c0cdca051eae986b56b91ef889ca 0002-Using-the-single-option-of-pkgutil.patch -6d2a43142b64401159b357e5b055bece cswpuppetd +0af8b2be6a2c9ecc6bb4a1878fcbefec cswpuppetd aba2c79e589b9bd1c881a22aa663a213 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup 69c97019fda5620f9f45f6ad64407e3b puppet-0.25.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Apr 15 22:11:31 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 15 Apr 2010 20:11:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9647] csw/mgar/pkg/irssi/trunk/Makefile Message-ID: Revision: 9647 http://gar.svn.sourceforge.net/gar/?rev=9647&view=rev Author: idogan23 Date: 2010-04-15 20:11:31 +0000 (Thu, 15 Apr 2010) Log Message: ----------- irssi: small changes Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2010-04-15 15:23:28 UTC (rev 9646) +++ csw/mgar/pkg/irssi/trunk/Makefile 2010-04-15 20:11:31 UTC (rev 9647) @@ -38,8 +38,10 @@ RUNTIME_DEP_PKGS += CSWbdb CHECKPKG_OVERRIDES_CSWirssi += surplus-dependency|CSWiconv +#CHECKPKG_OVERRIDES_CSWirssi += deprecated-library|opt/csw/bin/botti|Deprecated|Berkeley|DB|location|/opt/csw/lib/libdb-4.7.so +#CHECKPKG_OVERRIDES_CSWirssi += deprecated-library|opt/csw/bin/irssi|Deprecated|Berkeley|DB|location|/opt/csw/lib/libdb-4.7.so -CHECKPKG_OVERRIDES_CSWirssi += symbol-not-found +#CHECKPKG_OVERRIDES_CSWirssi += symbol-not-found TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 16 09:23:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Apr 2010 07:23:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9648] csw/mgar/pkg/yasm/tags/yasm-0.8.0, REV=2010.01.02/ Message-ID: Revision: 9648 http://gar.svn.sourceforge.net/gar/?rev=9648&view=rev Author: dmichelsen Date: 2010-04-16 07:23:58 +0000 (Fri, 16 Apr 2010) Log Message: ----------- yasm: Tag 0.8.0,REV=2010.01.02 Added Paths: ----------- csw/mgar/pkg/yasm/tags/yasm-0.8.0,REV=2010.01.02/ 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 Apr 16 09:24:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Apr 2010 07:24:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[9649] csw/mgar/pkg/yasm/trunk Message-ID: Revision: 9649 http://gar.svn.sourceforge.net/gar/?rev=9649&view=rev Author: dmichelsen Date: 2010-04-16 07:24:25 +0000 (Fri, 16 Apr 2010) Log Message: ----------- yasm: Update to 1.0.0 Modified Paths: -------------- csw/mgar/pkg/yasm/trunk/Makefile csw/mgar/pkg/yasm/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/yasm/trunk/files/0001-Force-bash-on-testsuite.patch csw/mgar/pkg/yasm/trunk/files/0002-Additional-force-to-bash.patch Modified: csw/mgar/pkg/yasm/trunk/Makefile =================================================================== --- csw/mgar/pkg/yasm/trunk/Makefile 2010-04-16 07:23:58 UTC (rev 9648) +++ csw/mgar/pkg/yasm/trunk/Makefile 2010-04-16 07:24:25 UTC (rev 9649) @@ -1,5 +1,5 @@ GARNAME = yasm -GARVERSION = 0.8.0 +GARVERSION = 1.0.0 CATEGORIES = devel DESCRIPTION = A complete rewrite of the NASM assembler @@ -16,11 +16,6 @@ MASTER_SITES = http://www.tortall.net/projects/yasm/releases/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -# Patch testsuite until this has been fixed: -# -PATCHFILES = 0001-Force-bash-on-testsuite.patch -PATCHFILES += 0002-Additional-force-to-bash.patch - RUNTIME_DEP_PKGS = CSWggettextrt # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/yasm/trunk/checksums =================================================================== --- csw/mgar/pkg/yasm/trunk/checksums 2010-04-16 07:23:58 UTC (rev 9648) +++ csw/mgar/pkg/yasm/trunk/checksums 2010-04-16 07:24:25 UTC (rev 9649) @@ -1,3 +1 @@ -1638b5fd7d97e30a437b2cab16d26f95 0001-Force-bash-on-testsuite.patch -8c9a186524ffca15f69be7c984290712 0002-Additional-force-to-bash.patch -84a72204c9b452a00b39b1b00495163f yasm-0.8.0.tar.gz +e00627e13d30ff9238053e95bd93a8fb yasm-1.0.0.tar.gz Deleted: csw/mgar/pkg/yasm/trunk/files/0001-Force-bash-on-testsuite.patch =================================================================== --- csw/mgar/pkg/yasm/trunk/files/0001-Force-bash-on-testsuite.patch 2010-04-16 07:23:58 UTC (rev 9648) +++ csw/mgar/pkg/yasm/trunk/files/0001-Force-bash-on-testsuite.patch 2010-04-16 07:24:25 UTC (rev 9649) @@ -1,22 +0,0 @@ -From 674f59ac775a2860d10b159c6a768987bf42e675 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Sat, 2 Jan 2010 11:14:49 +0100 -Subject: [PATCH 1/2] Force bash on testsuite - ---- - out_test.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/out_test.sh b/out_test.sh -index 610140d..67dc5d5 100755 ---- a/out_test.sh -+++ b/out_test.sh -@@ -1,4 +1,4 @@ --#! /bin/sh -+#!/opt/csw/bin/bash - # $Id: out_test.sh 1825 2007-04-22 03:32:46Z peter $ - - YASM_TEST_SUITE=1 --- -1.6.6 - Deleted: csw/mgar/pkg/yasm/trunk/files/0002-Additional-force-to-bash.patch =================================================================== --- csw/mgar/pkg/yasm/trunk/files/0002-Additional-force-to-bash.patch 2010-04-16 07:23:58 UTC (rev 9648) +++ csw/mgar/pkg/yasm/trunk/files/0002-Additional-force-to-bash.patch 2010-04-16 07:24:25 UTC (rev 9649) @@ -1,22 +0,0 @@ -From 595b93bd837b5349154d2796da90d53567de5adb Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Sat, 2 Jan 2010 11:21:42 +0100 -Subject: [PATCH 2/2] Additional force to bash - ---- - .../objfmts/bin/tests/multisect/bin_multi_test.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/modules/objfmts/bin/tests/multisect/bin_multi_test.sh b/modules/objfmts/bin/tests/multisect/bin_multi_test.sh -index acd0c34..4984530 100755 ---- a/modules/objfmts/bin/tests/multisect/bin_multi_test.sh -+++ b/modules/objfmts/bin/tests/multisect/bin_multi_test.sh -@@ -1,4 +1,4 @@ --#! /bin/sh -+#! /bin/bash - # $Id: bin_multi_test.sh 2010 2007-11-14 08:33:32Z peter $ - - YASM_TEST_SUITE=1 --- -1.6.6 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 16 11:32:08 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Apr 2010 09:32:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9650] csw/mgar/pkg Message-ID: Revision: 9650 http://gar.svn.sourceforge.net/gar/?rev=9650&view=rev Author: dmichelsen Date: 2010-04-16 09:32:08 +0000 (Fri, 16 Apr 2010) Log Message: ----------- libical: Initial commit Added Paths: ----------- csw/mgar/pkg/libical/ csw/mgar/pkg/libical/branches/ csw/mgar/pkg/libical/tags/ csw/mgar/pkg/libical/trunk/ csw/mgar/pkg/libical/trunk/Makefile csw/mgar/pkg/libical/trunk/checksums csw/mgar/pkg/libical/trunk/files/ csw/mgar/pkg/libical/trunk/files/0001-Use-putenv-instead-of-setenv.patch Property changes on: csw/mgar/pkg/libical/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/libical/trunk/Makefile =================================================================== --- csw/mgar/pkg/libical/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libical/trunk/Makefile 2010-04-16 09:32:08 UTC (rev 9650) @@ -0,0 +1,38 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = libical +GARVERSION = 0.44 +CATEGORIES = lib + +DESCRIPTION = Library that implements the iCal protocols in RFC2445, RFC2446, RFC2447 +define BLURB +endef + +SF_PROJ = freeassociation +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Fix testsuite until this is resolved: +# http://sourceforge.net/tracker/?func=detail&aid=2988172&group_id=16077&atid=116077 +PATCHFILES = 0001-Use-putenv-instead-of-setenv.patch + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://freeassociation.sourceforge.net/ + +PACKAGES = CSWlibical CSWlibicaldevel + +CATALOGNAME_CSWlibical = libical +CATALOGNAME_CSWliicaldevel = libical_devel + +SPKG_DESC_CSWlibical = $(DESCRIPTION) +SPKG_DESC_CSWlibicaldevel = Developer files for libical + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +PKGFILES_CSWlibicaldevel = $(PKGFILES_DEVEL) + +include gar/category.mk Property changes on: csw/mgar/pkg/libical/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libical/trunk/checksums =================================================================== --- csw/mgar/pkg/libical/trunk/checksums (rev 0) +++ csw/mgar/pkg/libical/trunk/checksums 2010-04-16 09:32:08 UTC (rev 9650) @@ -0,0 +1,2 @@ +d127fdd155907983c7829e24c61be59e 0001-Use-putenv-instead-of-setenv.patch +e0403c31e1ed82569325685f8c15959c libical-0.44.tar.gz Added: csw/mgar/pkg/libical/trunk/files/0001-Use-putenv-instead-of-setenv.patch =================================================================== --- csw/mgar/pkg/libical/trunk/files/0001-Use-putenv-instead-of-setenv.patch (rev 0) +++ csw/mgar/pkg/libical/trunk/files/0001-Use-putenv-instead-of-setenv.patch 2010-04-16 09:32:08 UTC (rev 9650) @@ -0,0 +1,27 @@ +From 65113edda06ad24ceec3a924d7a45cb609742924 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 16 Apr 2010 11:09:15 +0200 +Subject: [PATCH] Use putenv instead of setenv + +--- + src/test/timezones.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/src/test/timezones.c b/src/test/timezones.c +index 0ddcc7e..9621325 100644 +--- a/src/test/timezones.c ++++ b/src/test/timezones.c +@@ -49,7 +49,9 @@ int main(int argc, char **argv) + * select this location for glibc: needs support for TZ= + * which is not POSIX + */ +- setenv("TZ", zone_location, 1); ++ char tzenv[200]; ++ snprintf(tzenv,sizeof(tzenv),"TZ=%s", zone_location); ++ putenv( tzenv ); + tzset(); + + /* +-- +1.7.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 16 14:56:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Apr 2010 12:56:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9651] csw/mgar/pkg/libical/trunk Message-ID: Revision: 9651 http://gar.svn.sourceforge.net/gar/?rev=9651&view=rev Author: dmichelsen Date: 2010-04-16 12:56:31 +0000 (Fri, 16 Apr 2010) Log Message: ----------- libical: Fix for x86 Modified Paths: -------------- csw/mgar/pkg/libical/trunk/Makefile csw/mgar/pkg/libical/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libical/trunk/files/0002-libical-icaltz-util-sol10.diff.patch Modified: csw/mgar/pkg/libical/trunk/Makefile =================================================================== --- csw/mgar/pkg/libical/trunk/Makefile 2010-04-16 09:32:08 UTC (rev 9650) +++ csw/mgar/pkg/libical/trunk/Makefile 2010-04-16 12:56:31 UTC (rev 9651) @@ -15,6 +15,11 @@ # http://sourceforge.net/tracker/?func=detail&aid=2988172&group_id=16077&atid=116077 PATCHFILES = 0001-Use-putenv-instead-of-setenv.patch +# Fix on Solaris x86 only until this is resolved: +# http://sourceforge.net/tracker/?func=detail&aid=2805395&group_id=16077&atid=116077 +# (Patch has been reformatted for homogenous PATCHDIRLEVEL) +PATCHFILES += 0002-libical-icaltz-util-sol10.diff.patch + # File name regex to get notifications about upstream software releases UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/libical/trunk/checksums =================================================================== --- csw/mgar/pkg/libical/trunk/checksums 2010-04-16 09:32:08 UTC (rev 9650) +++ csw/mgar/pkg/libical/trunk/checksums 2010-04-16 12:56:31 UTC (rev 9651) @@ -1,2 +1,3 @@ d127fdd155907983c7829e24c61be59e 0001-Use-putenv-instead-of-setenv.patch +260e3bb940800e3c7c0f04ee86ea8894 0002-libical-icaltz-util-sol10.diff.patch e0403c31e1ed82569325685f8c15959c libical-0.44.tar.gz Added: csw/mgar/pkg/libical/trunk/files/0002-libical-icaltz-util-sol10.diff.patch =================================================================== --- csw/mgar/pkg/libical/trunk/files/0002-libical-icaltz-util-sol10.diff.patch (rev 0) +++ csw/mgar/pkg/libical/trunk/files/0002-libical-icaltz-util-sol10.diff.patch 2010-04-16 12:56:31 UTC (rev 9651) @@ -0,0 +1,24 @@ +From 053a845b3a7a65c2defcf570858cbbcffef5d147 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 16 Apr 2010 11:38:32 +0200 +Subject: [PATCH] libical-icaltz-util-sol10.diff + +--- + src/libical/icaltz-util.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c +index 6c2dc26..7104500 100644 +--- a/src/libical/icaltz-util.c ++++ b/src/libical/icaltz-util.c +@@ -26,6 +26,7 @@ + #include + + #if defined(sun) && defined(__SVR4) ++#include + #include + #else + # ifdef HAVE_BYTESWAP_H +-- +1.7.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 16 15:26:37 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Apr 2010 13:26:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9652] csw/mgar/pkg/msmtp/trunk Message-ID: Revision: 9652 http://gar.svn.sourceforge.net/gar/?rev=9652&view=rev Author: dmichelsen Date: 2010-04-16 13:26:37 +0000 (Fri, 16 Apr 2010) Log Message: ----------- msmtp: Update to 1.5.20, adjust dependencies Modified Paths: -------------- csw/mgar/pkg/msmtp/trunk/Makefile csw/mgar/pkg/msmtp/trunk/checksums Modified: csw/mgar/pkg/msmtp/trunk/Makefile =================================================================== --- csw/mgar/pkg/msmtp/trunk/Makefile 2010-04-16 12:56:31 UTC (rev 9651) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2010-04-16 13:26:37 UTC (rev 9652) @@ -1,5 +1,5 @@ GARNAME = msmtp -GARVERSION = 1.4.19 +GARVERSION = 1.4.20 CATEGORIES = net DESCRIPTION = SMTP client @@ -25,14 +25,13 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +VENDOR_URL = http://msmtp.sourceforge.net/ + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -RUNTIME_DEP_PKGS = CSWgcrypt CSWggettextrt CSWgnutls CSWgpgerr CSWiconv CSWkrb5lib -RUNTIME_DEP_PKGS += CSWlibgsasl CSWlibidn CSWlibntlm CSWzlib +RUNTIME_DEP_PKGS = CSWlibidn CSWgnutls CSWlibgsasl CSWggettextrt -RUNPATHQUOTE = 1 - CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/msmtp/trunk/checksums =================================================================== --- csw/mgar/pkg/msmtp/trunk/checksums 2010-04-16 12:56:31 UTC (rev 9651) +++ csw/mgar/pkg/msmtp/trunk/checksums 2010-04-16 13:26:37 UTC (rev 9652) @@ -1 +1 @@ -f0afdc943bf7c8a3a3bf3fe1a73072c4 msmtp-1.4.19.tar.bz2 +065042eaaee40c2779cf0bcfffe72aae msmtp-1.4.20.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 Apr 16 15:52:49 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Apr 2010 13:52:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9653] csw/mgar/pkg/libassuan/trunk/Makefile Message-ID: Revision: 9653 http://gar.svn.sourceforge.net/gar/?rev=9653&view=rev Author: dmichelsen Date: 2010-04-16 13:52:48 +0000 (Fri, 16 Apr 2010) Log Message: ----------- libassuan: Disable tests for now Modified Paths: -------------- csw/mgar/pkg/libassuan/trunk/Makefile Modified: csw/mgar/pkg/libassuan/trunk/Makefile =================================================================== --- csw/mgar/pkg/libassuan/trunk/Makefile 2010-04-16 13:26:37 UTC (rev 9652) +++ csw/mgar/pkg/libassuan/trunk/Makefile 2010-04-16 13:52:48 UTC (rev 9653) @@ -26,4 +26,8 @@ TEST_TARGET = check +# Disable tests until this is fixed: +# https://bugs.g10code.com/gnupg/msg3633 +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 dmichelsen at users.sourceforge.net Fri Apr 16 17:14:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Apr 2010 15:14:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9654] csw/mgar/pkg/libast/trunk Message-ID: Revision: 9654 http://gar.svn.sourceforge.net/gar/?rev=9654&view=rev Author: dmichelsen Date: 2010-04-16 15:14:11 +0000 (Fri, 16 Apr 2010) Log Message: ----------- libast: Add more patches and CSW X11 binding Modified Paths: -------------- csw/mgar/pkg/libast/trunk/Makefile csw/mgar/pkg/libast/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive-more.patch csw/mgar/pkg/libast/trunk/files/0002-Fix-check-for-C99.patch Modified: csw/mgar/pkg/libast/trunk/Makefile =================================================================== --- csw/mgar/pkg/libast/trunk/Makefile 2010-04-16 13:52:48 UTC (rev 9653) +++ csw/mgar/pkg/libast/trunk/Makefile 2010-04-16 15:14:11 UTC (rev 9654) @@ -9,10 +9,16 @@ MASTER_SITES = http://www.eterm.org/download/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0001-Fix-unknown-Sun-Studio-directive.patch +PATCHFILES += 0001-Fix-unknown-Sun-Studio-directive-more.patch +PATCHFILES += 0002-Fix-check-for-C99.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + STRIP_LIBTOOL = 1 BUILD64 = 1 Modified: csw/mgar/pkg/libast/trunk/checksums =================================================================== --- csw/mgar/pkg/libast/trunk/checksums 2010-04-16 13:52:48 UTC (rev 9653) +++ csw/mgar/pkg/libast/trunk/checksums 2010-04-16 15:14:11 UTC (rev 9654) @@ -1,2 +1,4 @@ +b73d6d2c26911ff3085b6dac28db3f5e 0001-Fix-unknown-Sun-Studio-directive-more.patch 2460a809fdffec738719fa1d59b63705 0001-Fix-unknown-Sun-Studio-directive.patch +4cbabcd7b09030530cd3311f713ee810 0002-Fix-check-for-C99.patch a9ec3b2da317f35869316e6d9571d296 libast-0.7.tar.gz Added: csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive-more.patch =================================================================== --- csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive-more.patch (rev 0) +++ csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive-more.patch 2010-04-16 15:14:11 UTC (rev 9654) @@ -0,0 +1,33 @@ +From 71446a56d8771125fb546942728493fe4f2b3c01 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 16 Apr 2010 16:49:46 +0200 +Subject: [PATCH 1/2] Fix unknown Sun Studio directive more + +--- + test/perf.c | 3 ++- + test/test.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/test/perf.c b/test/perf.c +index f2a4174..bcb5588 100644 +--- a/test/perf.c ++++ b/test/perf.c +@@ -21,13 +21,14 @@ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include ++ + static const char cvs_ident[] = "$Id: perf.c,v 1.13 2004/10/26 18:01:54 mej Exp $"; + + #if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0) + # include + #endif + +-#include + #include "perf.h" + + unsigned long tnum = 0; +-- +1.7.0 + Added: csw/mgar/pkg/libast/trunk/files/0002-Fix-check-for-C99.patch =================================================================== --- csw/mgar/pkg/libast/trunk/files/0002-Fix-check-for-C99.patch (rev 0) +++ csw/mgar/pkg/libast/trunk/files/0002-Fix-check-for-C99.patch 2010-04-16 15:14:11 UTC (rev 9654) @@ -0,0 +1,57 @@ +From 09a577da98246aa634b9b87ff21bb13b68d7fd82 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 16 Apr 2010 16:54:27 +0200 +Subject: [PATCH 2/2] Fix check for C99 + +--- + configure | 4 ++-- + configure.in | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 7e35ca3..b649ab9 100755 +--- a/configure ++++ b/configure +@@ -24270,7 +24270,7 @@ if test "${with_pedantry+set}" = set; then + withval="$with_pedantry" + + if test "$withval" != "no"; then +- CFLAGS="$CFLAGS -Wall -Werror -std=c99" ++ CFLAGS="$CFLAGS -xc99" + + cat >>confdefs.h <<\_ACEOF + #define STRICT_ISO_C99 1 +@@ -24297,7 +24297,7 @@ cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + int main () { +- int a = 0, b = 0; ++ signed char a = 0, b = 0; + (long) a = (long) b; + return 0; + } +diff --git a/configure.in b/configure.in +index cc50226..e9cc017 100644 +--- a/configure.in ++++ b/configure.in +@@ -71,7 +71,7 @@ AC_ARG_WITH(pedantry, + [ --with-pedantry add -Werror -std=c99 -pedantic to CFLAGS], + [ + if test "$withval" != "no"; then +- CFLAGS="$CFLAGS -Wall -Werror -std=c99" ++ CFLAGS="$CFLAGS -xc99" + AC_DEFINE(STRICT_ISO_C99, 1, [Defined if strict ISO C99 (9899:1999) is requested or required.]) + fi + ] +@@ -80,7 +80,7 @@ AC_ARG_WITH(pedantry, + AC_MSG_CHECKING(if STRICT_ISO_C99 required) + AC_TRY_RUN([ + int main () { +- int a = 0, b = 0; ++ signed char a = 0, b = 0; + (long) a = (long) b; + return 0; + } +-- +1.7.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 16 17:33:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Apr 2010 15:33:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9655] csw/mgar/pkg/xmlstarlet/trunk/checksums Message-ID: Revision: 9655 http://gar.svn.sourceforge.net/gar/?rev=9655&view=rev Author: dmichelsen Date: 2010-04-16 15:33:10 +0000 (Fri, 16 Apr 2010) Log Message: ----------- xmlstarlet: Adjust checksum for new tarball Modified Paths: -------------- csw/mgar/pkg/xmlstarlet/trunk/checksums Modified: csw/mgar/pkg/xmlstarlet/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/checksums 2010-04-16 15:14:11 UTC (rev 9654) +++ csw/mgar/pkg/xmlstarlet/trunk/checksums 2010-04-16 15:33:10 UTC (rev 9655) @@ -1 +1 @@ -e75486959970e7ddb5edeee45b55af80 xmlstarlet-1.0.2.tar.gz +cc6031201cb263ab364ee5bfbe503cb5 xmlstarlet-1.0.2.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 Fri Apr 16 23:06:52 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 16 Apr 2010 21:06:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9656] csw/mgar/pkg/nsd/trunk Message-ID: Revision: 9656 http://gar.svn.sourceforge.net/gar/?rev=9656&view=rev Author: idogan23 Date: 2010-04-16 21:06:52 +0000 (Fri, 16 Apr 2010) Log Message: ----------- nsd: bump version to 3.2.5 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-04-16 15:33:10 UTC (rev 9655) +++ csw/mgar/pkg/nsd/trunk/Makefile 2010-04-16 21:06:52 UTC (rev 9656) @@ -1,5 +1,5 @@ GARNAME = nsd -GARVERSION = 3.2.4 +GARVERSION = 3.2.5 CATEGORIES = server DESCRIPTION = An authoritative only non-recursive name server @@ -22,6 +22,8 @@ RUNTIME_DEP_PKGS = CSWosslrt CATALOGNAME = nsd SPKG_DESC = An authoritative only non-recursive name server +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +LICENSE = LICENSE DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += cswusergroup Modified: csw/mgar/pkg/nsd/trunk/checksums =================================================================== --- csw/mgar/pkg/nsd/trunk/checksums 2010-04-16 15:33:10 UTC (rev 9655) +++ csw/mgar/pkg/nsd/trunk/checksums 2010-04-16 21:06:52 UTC (rev 9656) @@ -1,3 +1,3 @@ 0eece57abde9d1cef8a962461b453d03 cswnsd 7a7560acb5d56847ea16fb8cd77b6ca5 cswusergroup -0c394fd713d194bde24a1035e56d5a79 nsd-3.2.4.tar.gz +73d60d82854609ca705bf48500fb14e6 nsd-3.2.5.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 Fri Apr 16 23:56:26 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 16 Apr 2010 21:56:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[9657] csw/mgar/pkg/amavisd-new/trunk Message-ID: Revision: 9657 http://gar.svn.sourceforge.net/gar/?rev=9657&view=rev Author: idogan23 Date: 2010-04-16 21:56:25 +0000 (Fri, 16 Apr 2010) Log Message: ----------- amavisd_new: bump version to 2.6.4, some packaging fixes Modified Paths: -------------- csw/mgar/pkg/amavisd-new/trunk/Makefile csw/mgar/pkg/amavisd-new/trunk/checksums Modified: csw/mgar/pkg/amavisd-new/trunk/Makefile =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/Makefile 2010-04-16 21:06:52 UTC (rev 9656) +++ csw/mgar/pkg/amavisd-new/trunk/Makefile 2010-04-16 21:56:25 UTC (rev 9657) @@ -1,5 +1,5 @@ GARNAME = amavisd-new -GARVERSION = 2.6.3 +GARVERSION = 2.6.4 CATEGORIES = server DESCRIPTION = Interface between MTA and content checkers @@ -10,6 +10,7 @@ PACKAGES = CSWamavisdnew CATALOGNAME = amavisd_new ARCHALL = 1 +LICENSE = LICENSE MASTER_SITES = http://www.ijs.si/software/amavisd/#download DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz @@ -22,13 +23,11 @@ RUNTIME_DEP_PKGS += CSWbdb47 RUNTIME_DEP_PKGS += CSWperl -RUNTIME_DEP_PKGS += CSWcswclassutils RUNTIME_DEP_PKGS += CSWpmiostringy RUNTIME_DEP_PKGS += CSWpmnetserver RUNTIME_DEP_PKGS += CSWpmmailtools RUNTIME_DEP_PKGS += CSWpmmimetools -RUNTIME_DEP_PKGS += CSWiocompress -RUNTIME_DEP_PKGS += CSWpmarchivetar +RUNTIME_DEP_PKGS += CSWpmiocompress RUNTIME_DEP_PKGS += CSWpmarchivezip RUNTIME_DEP_PKGS += CSWspamassassin RUNTIME_DEP_PKGS += CSWpmberkeleydb @@ -37,6 +36,20 @@ RUNTIME_DEP_PKGS += CSWpmmaildkim RUNTIME_DEP_PKGS += CSWpmunixsyslog +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmmaildkim +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmnetserver +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWbdb47 +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmiostringy +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmconverttnef +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmberkeleydb +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmiocompress +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmarchivezip +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmconvertuulib +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmmailtools +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWspamassassin +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmmimetools +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmunixsyslog + PATCHFILES += amavisd-agent.diff PATCHFILES += amavisd-nanny.diff PATCHFILES += amavisd-release.diff @@ -87,6 +100,7 @@ cp -r $(AMAVISDOC) $(DESTDIR)$(prefix)/share/doc/amavisd-new ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 755 files/cswamavisdnew $(DESTDIR)/etc/opt/csw/init.d/cswamavisdnew + ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWamavisdnew ginstall -m 644 files/CSWamavisdnew.cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWamavisdnew/cswusergroup $(MAKECOOKIE) Modified: csw/mgar/pkg/amavisd-new/trunk/checksums =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/checksums 2010-04-16 21:06:52 UTC (rev 9656) +++ csw/mgar/pkg/amavisd-new/trunk/checksums 2010-04-16 21:56:25 UTC (rev 9657) @@ -3,7 +3,7 @@ 171767585ab6662c0cbedae26e9baa2c CSWamavisdnew.preinstall b9cafe6715bc2703ac9411f24f248cd3 amavisd-agent.diff 3e81998c8b933129870e3cab68d40261 amavisd-nanny.diff -02b0bd38b40258841c60479603dc6842 amavisd-new-2.6.3.tar.gz +03d31657f14cd64c1cb38786214234b4 amavisd-new-2.6.4.tar.gz f218d10e5280940268a3ffaa125a00ae amavisd-release.diff 9c3d4118cf3837e559a6026d6b89b377 amavisd.conf.diff 071af9fb79ee5e9d045905043fea2b96 amavisd.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 Apr 17 02:54:23 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 17 Apr 2010 00:54:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9658] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 9658 http://gar.svn.sourceforge.net/gar/?rev=9658&view=rev Author: bdwalton Date: 2010-04-17 00:54:22 +0000 (Sat, 17 Apr 2010) Log Message: ----------- coreutils: disable test suite until next version bump Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2010-04-16 21:56:25 UTC (rev 9657) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2010-04-17 00:54:22 UTC (rev 9658) @@ -42,7 +42,11 @@ # required for eaccess and not picked up automatically. EXTRA_LDFLAGS = -lgen +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 bdwalton at users.sourceforge.net Sat Apr 17 03:11:07 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 17 Apr 2010 01:11:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[9659] csw/mgar/pkg/xmlto/trunk/Makefile Message-ID: Revision: 9659 http://gar.svn.sourceforge.net/gar/?rev=9659&view=rev Author: bdwalton Date: 2010-04-17 01:11:07 +0000 (Sat, 17 Apr 2010) Log Message: ----------- xmlto: prep for coreutils Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2010-04-17 00:54:22 UTC (rev 9658) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2010-04-17 01:11:07 UTC (rev 9659) @@ -7,7 +7,7 @@ RUNTIME_DEP_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds RUNTIME_DEP_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m CSWmktemp -RUNTIME_DEP_PKGS += CSWggetopt CSWbash CSWgfile CSWtextutils +RUNTIME_DEP_PKGS += CSWggetopt CSWbash CSWcoreutils DESCRIPTION = An XSL toolchain front end. define BLURB @@ -26,6 +26,8 @@ TEST_TARGET = check +CHECKPKG_OVERRIDES_CSWxmlto += unidentified-dependency|CSWcoreutils + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Apr 17 03:12:49 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 17 Apr 2010 01:12:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[9660] csw/mgar/pkg/xmlto/trunk/Makefile Message-ID: Revision: 9660 http://gar.svn.sourceforge.net/gar/?rev=9660&view=rev Author: bdwalton Date: 2010-04-17 01:12:44 +0000 (Sat, 17 Apr 2010) Log Message: ----------- xmlto: more checkpkg overrides (soft deps) Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2010-04-17 01:11:07 UTC (rev 9659) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2010-04-17 01:12:44 UTC (rev 9660) @@ -27,6 +27,18 @@ TEST_TARGET = check CHECKPKG_OVERRIDES_CSWxmlto += unidentified-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWxmlto += surplus-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWxmlto += surplus-dependency|CSWdocbookdtds +CHECKPKG_OVERRIDES_CSWxmlto += surplus-dependency|CSWsgmlcommon +CHECKPKG_OVERRIDES_CSWxmlto += surplus-dependency|CSWdocbookxsl +CHECKPKG_OVERRIDES_CSWxmlto += surplus-dependency|CSWxmlcommon +CHECKPKG_OVERRIDES_CSWxmlto += surplus-dependency|CSWflex +CHECKPKG_OVERRIDES_CSWxmlto += surplus-dependency|CSWmktemp +CHECKPKG_OVERRIDES_CSWxmlto += surplus-dependency|CSWlibxml2 +CHECKPKG_OVERRIDES_CSWxmlto += surplus-dependency|CSWbash +CHECKPKG_OVERRIDES_CSWxmlto += surplus-dependency|CSWggetopt +CHECKPKG_OVERRIDES_CSWxmlto += surplus-dependency|CSWlibxslt +CHECKPKG_OVERRIDES_CSWxmlto += surplus-dependency|CSWw3m # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Apr 17 03:33:37 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 17 Apr 2010 01:33:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9661] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 9661 http://gar.svn.sourceforge.net/gar/?rev=9661&view=rev Author: bdwalton Date: 2010-04-17 01:33:37 +0000 (Sat, 17 Apr 2010) Log Message: ----------- gardev: prep for coreutils Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2010-04-17 01:12:44 UTC (rev 9660) +++ csw/mgar/pkg/gardev/trunk/Makefile 2010-04-17 01:33:37 UTC (rev 9661) @@ -16,8 +16,8 @@ # git and netcat are required if a GAR repo is tracking a git repo instead # of upstream tarballs. svn is required for commiting gar recipes -RUNTIME_DEP_PKGS_CSWgardevel = CSWgmake CSWgtar CSWggrep CSWdiffutils CSWgfile -RUNTIME_DEP_PKGS_CSWgardevel += CSWtextutils CSWwget CSWfindutils CSWgsed +RUNTIME_DEP_PKGS_CSWgardevel = CSWgmake CSWgtar CSWggrep CSWdiffutils +RUNTIME_DEP_PKGS_CSWgardevel += CSWwget CSWfindutils CSWgsed CSWcoreutils RUNTIME_DEP_PKGS_CSWgardevel += CSWgawk CSWbzip2 CSWlftp CSWgit CSWnetcat RUNTIME_DEP_PKGS_CSWgardevel += CSWsvn CSWpython CSWpy-cheetah @@ -28,6 +28,8 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom +CHECKPKG_OVERRIDES_CSWgardevel += unidentified-dependency|CSWcoreutils + include gar/category.mk install-custom: DOCDIR=$(DESTDIR)/$(docdir)/$(GARNAME) 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 Apr 17 03:34:34 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 17 Apr 2010 01:34:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[9662] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 9662 http://gar.svn.sourceforge.net/gar/?rev=9662&view=rev Author: bdwalton Date: 2010-04-17 01:34:34 +0000 (Sat, 17 Apr 2010) Log Message: ----------- gardev: more checkpkg overrides for soft deps Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2010-04-17 01:33:37 UTC (rev 9661) +++ csw/mgar/pkg/gardev/trunk/Makefile 2010-04-17 01:34:34 UTC (rev 9662) @@ -29,6 +29,22 @@ INSTALL_SCRIPTS = custom CHECKPKG_OVERRIDES_CSWgardevel += unidentified-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWlftp +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWgmake +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWgsed +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWggrep +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWgtar +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWwget +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWfindutils +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWpy-cheetah +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWbzip2 +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWsvn +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWgawk +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWdiffutils +CHECKPKG_OVERRIDES_CSWgardevel += surplus-dependency|CSWnetcat 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 Sat Apr 17 03:41:31 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 17 Apr 2010 01:41:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9663] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 9663 http://gar.svn.sourceforge.net/gar/?rev=9663&view=rev Author: bdwalton Date: 2010-04-17 01:41:31 +0000 (Sat, 17 Apr 2010) Log Message: ----------- gardev: stuff in a dummy license to make checkpkg happy Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2010-04-17 01:34:34 UTC (rev 9662) +++ csw/mgar/pkg/gardev/trunk/Makefile 2010-04-17 01:41:31 UTC (rev 9663) @@ -51,5 +51,6 @@ install-custom: DOCDIR=$(DESTDIR)/$(docdir)/$(GARNAME) install-custom: $(WORKSRC) @(gmkdir -p $(DOCDIR); \ - cp $(FILEDIR)/README.csw $(DOCDIR) ) + cp $(FILEDIR)/README.csw $(DOCDIR); \ + echo 'This is a dummy package, covered by a dummy license.' >> $(DOCDIR)/license) @$(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 Apr 17 03:46:31 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 17 Apr 2010 01:46:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9664] csw/mgar/pkg/logwatch/trunk/Makefile Message-ID: Revision: 9664 http://gar.svn.sourceforge.net/gar/?rev=9664&view=rev Author: bdwalton Date: 2010-04-17 01:46:30 +0000 (Sat, 17 Apr 2010) Log Message: ----------- logwatch: coreutils prep Modified Paths: -------------- csw/mgar/pkg/logwatch/trunk/Makefile Modified: csw/mgar/pkg/logwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/logwatch/trunk/Makefile 2010-04-17 01:41:31 UTC (rev 9663) +++ csw/mgar/pkg/logwatch/trunk/Makefile 2010-04-17 01:46:30 UTC (rev 9664) @@ -3,7 +3,7 @@ CATEGORIES = utils ARCHALL = 1 -RUNTIME_DEP_PKGS = CSWperl CSWgnulinks CSWgfile CSWggrep CSWfortune CSWgawk +RUNTIME_DEP_PKGS = CSWperl CSWggrep CSWfortune CSWgawk CSWcoreutils LICENSE = License @@ -31,6 +31,8 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom +CHECKPKG_OVERRIDES_CSWlogwatch += unidentified-dependency|CSWcoreutils + include gar/category.mk sysconfdir = /etc/opt/csw 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 Apr 17 03:47:39 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 17 Apr 2010 01:47:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9665] csw/mgar/pkg/logwatch/trunk/Makefile Message-ID: Revision: 9665 http://gar.svn.sourceforge.net/gar/?rev=9665&view=rev Author: bdwalton Date: 2010-04-17 01:47:39 +0000 (Sat, 17 Apr 2010) Log Message: ----------- logwatch: ignore checkpkg warnings on soft deps Modified Paths: -------------- csw/mgar/pkg/logwatch/trunk/Makefile Modified: csw/mgar/pkg/logwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/logwatch/trunk/Makefile 2010-04-17 01:46:30 UTC (rev 9664) +++ csw/mgar/pkg/logwatch/trunk/Makefile 2010-04-17 01:47:39 UTC (rev 9665) @@ -32,6 +32,10 @@ INSTALL_SCRIPTS = custom CHECKPKG_OVERRIDES_CSWlogwatch += unidentified-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWlogwatch += surplus-dependency|CSWggrep +CHECKPKG_OVERRIDES_CSWlogwatch += surplus-dependency|CSWfortune +CHECKPKG_OVERRIDES_CSWlogwatch += surplus-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWlogwatch += surplus-dependency|CSWgawk 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 Sat Apr 17 04:01:20 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 17 Apr 2010 02:01:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9666] csw/mgar/pkg/colormake/trunk/Makefile Message-ID: Revision: 9666 http://gar.svn.sourceforge.net/gar/?rev=9666&view=rev Author: bdwalton Date: 2010-04-17 02:01:20 +0000 (Sat, 17 Apr 2010) Log Message: ----------- colormake: clean up DISTNAME/post-extract use Modified Paths: -------------- csw/mgar/pkg/colormake/trunk/Makefile Modified: csw/mgar/pkg/colormake/trunk/Makefile =================================================================== --- csw/mgar/pkg/colormake/trunk/Makefile 2010-04-17 01:47:39 UTC (rev 9665) +++ csw/mgar/pkg/colormake/trunk/Makefile 2010-04-17 02:01:20 UTC (rev 9666) @@ -11,6 +11,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch +DISTNAME = $(GARNAME) + ARCHALL = 1 RUNTIME_DEP_PKGS = CSWgmake CSWshutils CSWperl CSWless @@ -31,10 +33,6 @@ include gar/category.mk -post-extract: - @cd $(WORKDIR_FIRSTMOD); mv $(GARNAME) $(GARNAME)-$(GARVERSION); - @$(MAKECOOKIE) - install-custom: CMDD=$(docdir)/$(GARNAME) install-custom: @(cd $(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 Sat Apr 17 04:04:16 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 17 Apr 2010 02:04:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9667] csw/mgar/pkg/colormake/trunk/Makefile Message-ID: Revision: 9667 http://gar.svn.sourceforge.net/gar/?rev=9667&view=rev Author: bdwalton Date: 2010-04-17 02:04:07 +0000 (Sat, 17 Apr 2010) Log Message: ----------- colormake: prep for coreutils Modified Paths: -------------- csw/mgar/pkg/colormake/trunk/Makefile Modified: csw/mgar/pkg/colormake/trunk/Makefile =================================================================== --- csw/mgar/pkg/colormake/trunk/Makefile 2010-04-17 02:01:20 UTC (rev 9666) +++ csw/mgar/pkg/colormake/trunk/Makefile 2010-04-17 02:04:07 UTC (rev 9667) @@ -15,8 +15,10 @@ ARCHALL = 1 -RUNTIME_DEP_PKGS = CSWgmake CSWshutils CSWperl CSWless +RUNTIME_DEP_PKGS = CSWgmake CSWcoreutils CSWperl CSWless +CHECKPKG_OVERRIDES_CSWcolormake += unidentified-dependency|CSWcoreutils + # We define upstream file regex so we can be notifed of new upstream # software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Apr 17 04:06:28 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 17 Apr 2010 02:06:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[9668] csw/mgar/pkg/colormake/trunk/Makefile Message-ID: Revision: 9668 http://gar.svn.sourceforge.net/gar/?rev=9668&view=rev Author: bdwalton Date: 2010-04-17 02:06:28 +0000 (Sat, 17 Apr 2010) Log Message: ----------- colormake: checkpkg overrides for soft deps Modified Paths: -------------- csw/mgar/pkg/colormake/trunk/Makefile Modified: csw/mgar/pkg/colormake/trunk/Makefile =================================================================== --- csw/mgar/pkg/colormake/trunk/Makefile 2010-04-17 02:04:07 UTC (rev 9667) +++ csw/mgar/pkg/colormake/trunk/Makefile 2010-04-17 02:06:28 UTC (rev 9668) @@ -18,6 +18,9 @@ RUNTIME_DEP_PKGS = CSWgmake CSWcoreutils CSWperl CSWless CHECKPKG_OVERRIDES_CSWcolormake += unidentified-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWcolormake += surplus-dependency|CSWgmake +CHECKPKG_OVERRIDES_CSWcolormake += surplus-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWcolormake += surplus-dependency|CSWless # 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 bdwalton at users.sourceforge.net Sat Apr 17 04:12:19 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 17 Apr 2010 02:12:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9669] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 9669 http://gar.svn.sourceforge.net/gar/?rev=9669&view=rev Author: bdwalton Date: 2010-04-17 02:12:19 +0000 (Sat, 17 Apr 2010) Log Message: ----------- coreutils: drop slashes from --with dirs to prevent double / in rpath (checkpkg detected) Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2010-04-17 02:06:28 UTC (rev 9668) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2010-04-17 02:12:19 UTC (rev 9669) @@ -5,7 +5,7 @@ # seq has issues related to the handling of long double's with -O2. # this issue manifested on sol8 and sol9 x86 only. sparc was unaffected # and sol10 x86 was fine too. -OPT_FLAGS_GCC = -O1 -pipe +# OPT_FLAGS_GCC = -O1 -pipe # building with gcc gets us extra tools (eg: stdbuf) # GARCOMPILER = GCC4 @@ -28,15 +28,16 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0001-Enhance-Solaris-ACL-error-handling.patch -# We define upstream file regex so we can be notifed of new upstream software release +# 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) CONFIGURE_ARGS += --program-prefix=g -CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw/ -CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw/ +CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw +CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw CONFIGURE_ARGS += --enable-no-install-program=chcon # required for eaccess and not picked up automatically. 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 Apr 17 04:15:16 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 17 Apr 2010 02:15:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9670] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 9670 http://gar.svn.sourceforge.net/gar/?rev=9670&view=rev Author: bdwalton Date: 2010-04-17 02:15:16 +0000 (Sat, 17 Apr 2010) Log Message: ----------- gnulinks: drop {sh,file,text}utils deps; coreutils will provide own gnu links Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2010-04-17 02:12:19 UTC (rev 9669) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2010-04-17 02:15:16 UTC (rev 9670) @@ -7,7 +7,6 @@ GLINKPKGS = CSWdiffutils CSWggettext CSWggettextrt CSWbison CSWbinutils GLINKPKGS += CSWgawk CSWgsed CSWggetopt CSWfindutils GLINKPKGS += CSWgmake CSWgpatch CSWgm4 CSWgwhois CSWgtar -GLINKPKGS += CSWshutils CSWgfile CSWtextutils 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 dmichelsen at users.sourceforge.net Sat Apr 17 21:02:57 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 17 Apr 2010 19:02:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[9671] csw/mgar/pkg/xmlstarlet/trunk/Makefile Message-ID: Revision: 9671 http://gar.svn.sourceforge.net/gar/?rev=9671&view=rev Author: dmichelsen Date: 2010-04-17 19:02:57 +0000 (Sat, 17 Apr 2010) Log Message: ----------- xmlstar: Adjust download locations Modified Paths: -------------- csw/mgar/pkg/xmlstarlet/trunk/Makefile Modified: csw/mgar/pkg/xmlstarlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/Makefile 2010-04-17 02:15:16 UTC (rev 9670) +++ csw/mgar/pkg/xmlstarlet/trunk/Makefile 2010-04-17 19:02:57 UTC (rev 9671) @@ -12,9 +12,9 @@ endef SF_PROJ = xmlstar -# MASTER_SITES += $(SF_MIRRORS) -MASTER_SITES = http://xmlstar.sourceforge.net/downloads/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = $(SF_MIRRORS) +MASTER_SITES += http://xmlstar.sourceforge.net/downloads/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz RUNTIME_DEP_PKGS = CSWiconv CSWlibxml2 CSWlibxslt CSWzlib 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 Apr 17 21:18:14 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 17 Apr 2010 19:18:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[9672] csw/mgar/pkg/xmlstarlet/trunk/Makefile Message-ID: Revision: 9672 http://gar.svn.sourceforge.net/gar/?rev=9672&view=rev Author: dmichelsen Date: 2010-04-17 19:18:14 +0000 (Sat, 17 Apr 2010) Log Message: ----------- xmlstarlet: Add checkpkg override Modified Paths: -------------- csw/mgar/pkg/xmlstarlet/trunk/Makefile Modified: csw/mgar/pkg/xmlstarlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/Makefile 2010-04-17 19:02:57 UTC (rev 9671) +++ csw/mgar/pkg/xmlstarlet/trunk/Makefile 2010-04-17 19:18:14 UTC (rev 9672) @@ -25,10 +25,6 @@ BUILD64 = 1 -TEST_TARGET = check - -include gar/category.mk - CONFIGURE_ENV += LIBXML_PREFIX=$(prefix) CONFIGURE_ENV += LIBXML_CFLAGS="$(shell $(bindir)/xml2-config --cflags)" CONFIGURE_ENV += LIBXML_LIBS="$(shell $(bindir)/xml2-config --libs)" @@ -38,6 +34,12 @@ CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + +CHECKPKG_OVERRIDES_CSWxmlstarlet += soname-not-found|libm.so.2 + +include gar/category.mk + post-install-modulated: @echo " ==> Renaming program to xmlstarlet" @mv $(DESTDIR)$(bindir)/xml $(DESTDIR)$(bindir)/xmlstarlet 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 Apr 17 23:42:37 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 17 Apr 2010 21:42:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9673] csw/mgar/pkg/nsd/trunk/Makefile Message-ID: Revision: 9673 http://gar.svn.sourceforge.net/gar/?rev=9673&view=rev Author: idogan23 Date: 2010-04-17 21:42:36 +0000 (Sat, 17 Apr 2010) Log Message: ----------- nsd: move init script to /opt/csw/etc Modified Paths: -------------- csw/mgar/pkg/nsd/trunk/Makefile Modified: csw/mgar/pkg/nsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsd/trunk/Makefile 2010-04-17 19:18:14 UTC (rev 9672) +++ csw/mgar/pkg/nsd/trunk/Makefile 2010-04-17 21:42:36 UTC (rev 9673) @@ -42,10 +42,10 @@ post-install-modulated: @ginstall -d $(DESTDIR)/var/opt/csw/nsd - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -m 755 $(FILEDIR)/cswnsd $(DESTDIR)/etc/opt/csw/init.d/cswnsd + @ginstall -d $(DESTDIR)/opt/csw/etc/init.d + @ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWnsd + @ginstall -m 755 $(FILEDIR)/cswnsd $(DESTDIR)/opt/csw/etc/init.d/cswnsd @mv $(DESTDIR)/etc/opt/csw/nsd/nsd.conf.sample $(DESTDIR)/etc/opt/csw/nsd/nsd.conf.CSW - @ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWnsd @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWnsd/cswusergroup 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 Sun Apr 18 14:41:21 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 18 Apr 2010 12:41:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9674] csw/mgar/pkg/irssi/trunk/Makefile Message-ID: Revision: 9674 http://gar.svn.sourceforge.net/gar/?rev=9674&view=rev Author: idogan23 Date: 2010-04-18 12:41:21 +0000 (Sun, 18 Apr 2010) Log Message: ----------- irssi: changed linking for bdb47 Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2010-04-17 21:42:36 UTC (rev 9673) +++ csw/mgar/pkg/irssi/trunk/Makefile 2010-04-18 12:41:21 UTC (rev 9674) @@ -28,6 +28,9 @@ CONFIGURE_ARGS += --with-perl=yes CONFIGURE_ARGS += --with-perl-lib=vendor +EXTRA_LIB += $(prefix)/bdb47/lib +EXTRA_INC += $(prefix)/bdb47/include + EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod RUNTIME_DEP_PKGS += CSWglib2 @@ -35,14 +38,8 @@ RUNTIME_DEP_PKGS += CSWosslrt RUNTIME_DEP_PKGS += CSWperl RUNTIME_DEP_PKGS += CSWggettextrt -RUNTIME_DEP_PKGS += CSWbdb +RUNTIME_DEP_PKGS += CSWbdb47 -CHECKPKG_OVERRIDES_CSWirssi += surplus-dependency|CSWiconv -#CHECKPKG_OVERRIDES_CSWirssi += deprecated-library|opt/csw/bin/botti|Deprecated|Berkeley|DB|location|/opt/csw/lib/libdb-4.7.so -#CHECKPKG_OVERRIDES_CSWirssi += deprecated-library|opt/csw/bin/irssi|Deprecated|Berkeley|DB|location|/opt/csw/lib/libdb-4.7.so - -#CHECKPKG_OVERRIDES_CSWirssi += symbol-not-found - TEST_TARGET = check include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Apr 18 14:46:58 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 18 Apr 2010 12:46:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9675] csw/mgar/pkg/irssi/trunk/Makefile Message-ID: Revision: 9675 http://gar.svn.sourceforge.net/gar/?rev=9675&view=rev Author: idogan23 Date: 2010-04-18 12:46:58 +0000 (Sun, 18 Apr 2010) Log Message: ----------- irssi: removed unneded dependencies Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2010-04-18 12:41:21 UTC (rev 9674) +++ csw/mgar/pkg/irssi/trunk/Makefile 2010-04-18 12:46:58 UTC (rev 9675) @@ -34,7 +34,6 @@ EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod RUNTIME_DEP_PKGS += CSWglib2 -RUNTIME_DEP_PKGS += CSWiconv RUNTIME_DEP_PKGS += CSWosslrt RUNTIME_DEP_PKGS += CSWperl RUNTIME_DEP_PKGS += CSWggettextrt 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 Apr 18 15:15:21 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Apr 2010 13:15:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[9676] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 9676 http://gar.svn.sourceforge.net/gar/?rev=9676&view=rev Author: bdwalton Date: 2010-04-18 13:15:21 +0000 (Sun, 18 Apr 2010) Log Message: ----------- gcc4: bump version; deprecate sol8 from platforms Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2010-04-18 12:46:58 UTC (rev 9675) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2010-04-18 13:15:21 UTC (rev 9676) @@ -1,5 +1,5 @@ GARNAME = gcc -GARVERSION = 4.4.3 +GARVERSION = 4.5.0 CATEGORIES = lang DESCRIPTION = The GNU Compiler Collection @@ -16,7 +16,7 @@ # of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 ## build options 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 Apr 18 15:16:10 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 18 Apr 2010 13:16:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9677] csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile Message-ID: Revision: 9677 http://gar.svn.sourceforge.net/gar/?rev=9677&view=rev Author: idogan23 Date: 2010-04-18 13:16:10 +0000 (Sun, 18 Apr 2010) Log Message: ----------- pm_maildkim: removed unneeded dependency Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile Modified: csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile 2010-04-18 13:15:21 UTC (rev 9676) +++ csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile 2010-04-18 13:16:10 UTC (rev 9677) @@ -22,7 +22,6 @@ DEPENDS += cpan/Net-DNS RUNTIME_DEP_PKGS += CSWpmcryptosslrsa -RUNTIME_DEP_PKGS += CSWpmdigestsha RUNTIME_DEP_PKGS += CSWpmdigestsha1 RUNTIME_DEP_PKGS += CSWpmerror RUNTIME_DEP_PKGS += CSWpmmailtools 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 Apr 18 15:22:48 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 18 Apr 2010 13:22:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9678] csw/mgar/pkg/cpan/Mail-DKIM/trunk Message-ID: Revision: 9678 http://gar.svn.sourceforge.net/gar/?rev=9678&view=rev Author: idogan23 Date: 2010-04-18 13:22:48 +0000 (Sun, 18 Apr 2010) Log Message: ----------- pm_maildkim: added license Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cpan/Mail-DKIM/trunk/files/LICENSE Modified: csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile 2010-04-18 13:16:10 UTC (rev 9677) +++ csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile 2010-04-18 13:22:48 UTC (rev 9678) @@ -14,6 +14,7 @@ PACKAGES = CSWpmmaildkim CATALOGNAME = pm_maildkim +LICENSE = LICENSE ARCHALL = 1 DEPENDS += cpan/Crypt-OpenSSL-RSA Added: csw/mgar/pkg/cpan/Mail-DKIM/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/cpan/Mail-DKIM/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/cpan/Mail-DKIM/trunk/files/LICENSE 2010-04-18 13:22:48 UTC (rev 9678) @@ -0,0 +1,48 @@ +Preamble + +The intent of this document is to state the conditions under which a Package may be copied, such that the Copyright Holder maintains some semblance of artistic control over the development of the package, while giving the users of the package the right to use and distribute the Package in a more-or-less customary fashion, plus the right to make reasonable modifications. +Definitions + + "Package" refers to the collection of files distributed by the Copyright Holder, and derivatives of that collection of files created through textual modification. + + "Standard Version" refers to such a Package if it has not been modified, or has been modified in accordance with the wishes of the Copyright Holder as specified below. + + "Copyright Holder" is whoever is named in the copyright or copyrights for the package. + + "You" is you, if you're thinking about copying or distributing this Package. + + "Reasonable copying fee" is whatever you can justify on the basis of media cost, duplication charges, time of people involved, and so on. (You will not be required to justify it to the Copyright Holder, but only to the computing community at large as a market that must bear the fee.) + + "Freely Available" means that no fee is charged for the item itself, though there may be fees involved in handling the item. It also means that recipients of the item may redistribute it under the same conditions they received it. + + 1. You may make and give away verbatim copies of the source form of the Standard Version of this Package without restriction, provided that you duplicate all of the original copyright notices and associated disclaimers. + + 2. You may apply bug fixes, portability fixes and other modifications derived from the Public Domain or from the Copyright Holder. A Package modified in such a way shall still be considered the Standard Version. + + 3. You may otherwise modify your copy of this Package in any way, provided that you insert a prominent notice in each changed file stating how and when you changed that file, and provided that you do at least ONE of the following: + + 1. place your modifications in the Public Domain or otherwise make them Freely Available, such as by posting said modifications to Usenet or an equivalent medium, or placing the modifications on a major archive site such as uunet.uu.net, or by allowing the Copyright Holder to include your modifications in the Standard Version of the Package. + 2. use the modified Package only within your corporation or organization. + 3. rename any non-standard executables so the names do not conflict with standard executables, which must also be provided, and provide a separate manual page for each non-standard executable that clearly documents how it differs from the Standard Version. + 4. make other distribution arrangements with the Copyright Holder. + + 4. You may distribute the programs of this Package in object code or executable form, provided that you do at least ONE of the following: + + 1. distribute a Standard Version of the executables and library files, together with instructions (in the manual page or equivalent) on where to get the Standard Version. + 2. accompany the distribution with the machine-readable source of the Package with your modifications. + 3. give non-standard executables non-standard names, and clearly document the differences in manual pages (or equivalent), together with instructions on where to get the Standard Version. + 4. make other distribution arrangements with the Copyright Holder. + + 5. You may charge a reasonable copying fee for any distribution of this Package. You may charge any fee you choose for support of this Package. You may not charge a fee for this Package itself. However, you may distribute this Package in aggregate with other (possibly commercial) programs as part of a larger (possibly commercial) software distribution provided that you do not advertise this Package as a product of your own. You may embed this Package's interpreter within an executable of yours (by linking); this shall be construed as a mere form of aggregation, provided that the complete Standard Version of the interpreter is so embedded. + + 6. The scripts and library files supplied as input to or produced as output from the programs of this Package do not automatically fall under the copyright of this Package, but belong to whomever generated them, and may be sold commercially, and may be aggregated with this Package. If such scripts or library files are aggregated with this Package via the so-called "undump" or "unexec" methods of producing a binary executable image, then distribution of such an image shall neither be construed as a distribution of this Package nor shall it fall under the restrictions of Paragraphs 3 and 4, provided that you do not represent such an executable image as a Standard Version of this Package. + + 7. C subroutines (or comparably compiled subroutines in other languages) supplied by you and linked into this Package in order to emulate subroutines and variables of the language defined by this Package shall not be considered part of this Package, but are the equivalent of input as in Paragraph 6, provided these subroutines do not change the language in any way that would cause it to fail the regression tests for the language. + + 8. Aggregation of this Package with a commercial distribution is always permitted provided that the use of this Package is embedded; that is, when no overt attempt is made to make this Package's interfaces visible to the end user of the commercial distribution. Such use shall not be construed as a distribution of this Package. + + 9. The name of the Copyright Holder may not be used to endorse or promote products derived from this software without specific prior written permission. + + 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +The End 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 Apr 18 15:24:38 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Apr 2010 13:24:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[9679] csw/mgar/pkg/gcc4/trunk/checksums Message-ID: Revision: 9679 http://gar.svn.sourceforge.net/gar/?rev=9679&view=rev Author: bdwalton Date: 2010-04-18 13:24:38 +0000 (Sun, 18 Apr 2010) Log Message: ----------- gcc4: update checksums Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/checksums Modified: csw/mgar/pkg/gcc4/trunk/checksums =================================================================== --- csw/mgar/pkg/gcc4/trunk/checksums 2010-04-18 13:22:48 UTC (rev 9678) +++ csw/mgar/pkg/gcc4/trunk/checksums 2010-04-18 13:24:38 UTC (rev 9679) @@ -1,2 +1,2 @@ 9883bd7887c22e1180b9dae4f2acd8ec CSWgcc4core.space -fe1ca818fc6d2caeffc9051fe67ff103 gcc-4.4.3.tar.bz2 +ff27b7c4a5d5060c8a8543a44abca31f gcc-4.5.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Apr 18 15:39:04 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 18 Apr 2010 13:39:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[9680] csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile Message-ID: Revision: 9680 http://gar.svn.sourceforge.net/gar/?rev=9680&view=rev Author: idogan23 Date: 2010-04-18 13:39:04 +0000 (Sun, 18 Apr 2010) Log Message: ----------- pm_maildkim: added missing path Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile Modified: csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile 2010-04-18 13:24:38 UTC (rev 9679) +++ csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile 2010-04-18 13:39:04 UTC (rev 9680) @@ -14,7 +14,7 @@ PACKAGES = CSWpmmaildkim CATALOGNAME = pm_maildkim -LICENSE = LICENSE +LICENSE = $(FILEDIR)/LICENSE ARCHALL = 1 DEPENDS += cpan/Crypt-OpenSSL-RSA 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 Apr 18 16:07:27 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Apr 2010 14:07:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[9681] csw/mgar/pkg/libmpfr/trunk Message-ID: Revision: 9681 http://gar.svn.sourceforge.net/gar/?rev=9681&view=rev Author: bdwalton Date: 2010-04-18 14:07:27 +0000 (Sun, 18 Apr 2010) Log Message: ----------- libmpfr: version bump; add checksums Modified Paths: -------------- csw/mgar/pkg/libmpfr/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libmpfr/trunk/checksums Modified: csw/mgar/pkg/libmpfr/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/trunk/Makefile 2010-04-18 13:39:04 UTC (rev 9680) +++ csw/mgar/pkg/libmpfr/trunk/Makefile 2010-04-18 14:07:27 UTC (rev 9681) @@ -1,5 +1,5 @@ GARNAME = mpfr -GARVERSION = 2.4.1 +GARVERSION = 2.4.2 CATEGORIES = lib DESCRIPTION = GNU Multiple Precision floating-point arithmetic library @@ -17,7 +17,7 @@ SPKG_SOURCEURL_CSWlibmpfr = http://www.mpfr.org/ RUNTIME_DEP_PKGS_CSWlibmpfr = -PATCHFILES = patches +#PATCHFILES = patches # We define upstream file regex so we can be notifed of # new upstream software release Added: csw/mgar/pkg/libmpfr/trunk/checksums =================================================================== --- csw/mgar/pkg/libmpfr/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmpfr/trunk/checksums 2010-04-18 14:07:27 UTC (rev 9681) @@ -0,0 +1 @@ +89e59fe665e2b3ad44a6789f40b059a0 mpfr-2.4.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Apr 18 16:14:16 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Apr 2010 14:14:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9682] csw/mgar/pkg/libmpfr/trunk/Makefile Message-ID: Revision: 9682 http://gar.svn.sourceforge.net/gar/?rev=9682&view=rev Author: bdwalton Date: 2010-04-18 14:14:15 +0000 (Sun, 18 Apr 2010) Log Message: ----------- libmpfr: strip libtool Modified Paths: -------------- csw/mgar/pkg/libmpfr/trunk/Makefile Modified: csw/mgar/pkg/libmpfr/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/trunk/Makefile 2010-04-18 14:07:27 UTC (rev 9681) +++ csw/mgar/pkg/libmpfr/trunk/Makefile 2010-04-18 14:14:15 UTC (rev 9682) @@ -19,6 +19,8 @@ RUNTIME_DEP_PKGS_CSWlibmpfr = #PATCHFILES = patches +STRIP_LIBTOOL = 1 + # We define upstream file regex so we can be notifed of # new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Apr 18 17:38:37 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 18 Apr 2010 15:38:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9683] csw/mgar/pkg/rrdtool/branches/ihsan Message-ID: Revision: 9683 http://gar.svn.sourceforge.net/gar/?rev=9683&view=rev Author: idogan23 Date: 2010-04-18 15:38:37 +0000 (Sun, 18 Apr 2010) Log Message: ----------- rrdtool: updated bindings/Makefile.in patch for 1.4.3; removed not needed dependencies Modified Paths: -------------- csw/mgar/pkg/rrdtool/branches/ihsan/Makefile csw/mgar/pkg/rrdtool/branches/ihsan/checksums csw/mgar/pkg/rrdtool/branches/ihsan/files/patch-bindings-Makefile.in csw/mgar/pkg/rrdtool/branches/ihsan/gar Modified: csw/mgar/pkg/rrdtool/branches/ihsan/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/branches/ihsan/Makefile 2010-04-18 14:14:15 UTC (rev 9682) +++ csw/mgar/pkg/rrdtool/branches/ihsan/Makefile 2010-04-18 15:38:37 UTC (rev 9683) @@ -22,12 +22,8 @@ RUNTIME_DEP_PKGS += CSWggettextrt RUNTIME_DEP_PKGS += CSWglib2 -RUNTIME_DEP_PKGS += CSWiconv RUNTIME_DEP_PKGS += CSWlibcairo RUNTIME_DEP_PKGS += CSWpango -RUNTIME_DEP_PKGS += CSWpng -RUNTIME_DEP_PKGS += CSWsunmath -RUNTIME_DEP_PKGS += CSWzlib RUNTIME_DEP_PKGS += CSWperl RUNTIME_DEP_PKGS += CSWruby RUNTIME_DEP_PKGS += CSWpython Modified: csw/mgar/pkg/rrdtool/branches/ihsan/checksums =================================================================== --- csw/mgar/pkg/rrdtool/branches/ihsan/checksums 2010-04-18 14:14:15 UTC (rev 9682) +++ csw/mgar/pkg/rrdtool/branches/ihsan/checksums 2010-04-18 15:38:37 UTC (rev 9683) @@ -1,4 +1,4 @@ -c6bc2f9c3d88e0488f0332a9d288dc39 patch-bindings-Makefile.in +951bd5a3b688904d77f801621702ee99 patch-bindings-Makefile.in 0d068a4648f3a52c79c00374fa0ef486 patch-bindings-perl-piped-Makefile.PL 4fd31144a5e2799db7440d97430d3ab6 patch-bindings-perl-shared-Makefile.PL 072482090287b462c8c092b2ead132da patch-bindings-ruby-extconf.rb Modified: csw/mgar/pkg/rrdtool/branches/ihsan/files/patch-bindings-Makefile.in =================================================================== --- csw/mgar/pkg/rrdtool/branches/ihsan/files/patch-bindings-Makefile.in 2010-04-18 14:14:15 UTC (rev 9682) +++ csw/mgar/pkg/rrdtool/branches/ihsan/files/patch-bindings-Makefile.in 2010-04-18 15:38:37 UTC (rev 9683) @@ -1,9 +1,10 @@ ---- rrdtool-1.4.2.orig/bindings/Makefile.in 2009-11-15 12:55:04.000000000 +0100 -+++ rrdtool-1.4.2/bindings/Makefile.in 2010-03-02 15:29:39.602876133 +0100 -@@ -692,7 +692,7 @@ +diff --speed-large-files --minimal -Nru rrdtool-1.4.3.orig/bindings/Makefile.in rrdtool-1.4.3/bindings/Makefile.in +--- rrdtool-1.4.3.orig/bindings/Makefile.in 2010-03-22 18:30:03.000000000 +0100 ++++ rrdtool-1.4.3/bindings/Makefile.in 2010-04-18 17:08:45.391762317 +0200 +@@ -709,7 +709,7 @@ # rules for building the pyton module - python: + python: Makefile - cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build + cd python && env PATH=$(CC_HOME)/bin BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build Modified: csw/mgar/pkg/rrdtool/branches/ihsan/gar =================================================================== --- csw/mgar/pkg/rrdtool/branches/ihsan/gar 2010-04-18 14:14:15 UTC (rev 9682) +++ csw/mgar/pkg/rrdtool/branches/ihsan/gar 2010-04-18 15:38:37 UTC (rev 9683) @@ -1 +1 @@ -link ../../../../gar/v2 \ No newline at end of file +link /home/ihsan/mgar/gar/v2 \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Apr 18 17:47:54 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 18 Apr 2010 15:47:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9684] csw/mgar/pkg/miltergreylist/trunk Message-ID: Revision: 9684 http://gar.svn.sourceforge.net/gar/?rev=9684&view=rev Author: bonivart Date: 2010-04-18 15:47:54 +0000 (Sun, 18 Apr 2010) Log Message: ----------- miltergreylist: update to 4.2.4 Modified Paths: -------------- csw/mgar/pkg/miltergreylist/trunk/Makefile csw/mgar/pkg/miltergreylist/trunk/checksums Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/Makefile 2010-04-18 15:38:37 UTC (rev 9683) +++ csw/mgar/pkg/miltergreylist/trunk/Makefile 2010-04-18 15:47:54 UTC (rev 9684) @@ -1,5 +1,5 @@ GARNAME = miltergreylist -GARVERSION = 4.2.3 +GARVERSION = 4.2.4 #RELEASE = rc1 #DISTVERSION = $(GARVERSION)$(RELEASE) DISTVERSION = $(GARVERSION) @@ -16,7 +16,7 @@ DISTFILES = milter-greylist-$(DISTVERSION).tgz DISTFILES += COPYING -REQUIRED_PKGS = CSWcurlrt CSWgeoip +RUNTIME_DEP_PKGS = CSWcurlrt CSWgeoip # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz @@ -40,7 +40,7 @@ INSTALL_SCRIPTS = custom USERGROUP = /opt/csw/etc/pkg/miltergreylist/cswusergroup SAMPLECONF = /etc/opt/csw/greylist.conf -INITSMF = /etc/opt/csw/init.d/cswmiltergreylist +INITSMF = /opt/csw/etc/init.d/cswmiltergreylist PROTOTYPE_MODIFIERS = 1 PROTOTYPE_FILES_1 = /var/opt/csw/miltergreylist @@ -73,8 +73,8 @@ @rmdir $(DESTDIR)/var/milter-greylist @ginstall -d -m 755 $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME) @cp $(FILEDIR)/CSWmiltergreylist.ug $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME)/cswusergroup - @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/init.d - @cp $(FILEDIR)/CSWmiltergreylist.init $(DESTDIR)/etc/opt/csw/init.d/cswmiltergreylist - @chmod 755 $(DESTDIR)/etc/opt/csw/init.d/cswmiltergreylist + @ginstall -d -m 755 $(DESTDIR)/opt/csw/etc/init.d + @cp $(FILEDIR)/CSWmiltergreylist.init $(DESTDIR)/opt/csw/etc/init.d/cswmiltergreylist + @chmod 755 $(DESTDIR)/opt/csw/etc/init.d/cswmiltergreylist @cp $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(GARNAME) @$(MAKECOOKIE) Modified: csw/mgar/pkg/miltergreylist/trunk/checksums =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/checksums 2010-04-18 15:38:37 UTC (rev 9683) +++ csw/mgar/pkg/miltergreylist/trunk/checksums 2010-04-18 15:47:54 UTC (rev 9684) @@ -1,2 +1,2 @@ e61edd088404cd2a0eacb03ce70e2d5f COPYING -e821a8a4527c1e313f21fe36dbde4a24 milter-greylist-4.2.3.tgz +00f1576108631c7594b6fbc6b23622b9 milter-greylist-4.2.4.tgz 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 Apr 18 18:20:44 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 18 Apr 2010 16:20:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[9685] csw/mgar/pkg/rrdtool/branches/ihsan/Makefile Message-ID: Revision: 9685 http://gar.svn.sourceforge.net/gar/?rev=9685&view=rev Author: idogan23 Date: 2010-04-18 16:20:43 +0000 (Sun, 18 Apr 2010) Log Message: ----------- rrdtool: small hack Modified Paths: -------------- csw/mgar/pkg/rrdtool/branches/ihsan/Makefile Modified: csw/mgar/pkg/rrdtool/branches/ihsan/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/branches/ihsan/Makefile 2010-04-18 15:47:54 UTC (rev 9684) +++ csw/mgar/pkg/rrdtool/branches/ihsan/Makefile 2010-04-18 16:20:43 UTC (rev 9685) @@ -84,6 +84,8 @@ STRIP_LIBTOOL = 1 +CHECKPKG_OVERRIDES_CSWrrd += bad-rpath-entry|/home/ihsan/mgar/pkg/rrdtool/branches/ihsan/work/solaris9-sparc/install-isa-sparcv8/opt/csw/lib + include gar/category.mk # ugly fix to fix doc path #post-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Apr 18 18:54:17 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 18 Apr 2010 16:54:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9686] csw/mgar/pkg/dcc/trunk Message-ID: Revision: 9686 http://gar.svn.sourceforge.net/gar/?rev=9686&view=rev Author: bonivart Date: 2010-04-18 16:54:16 +0000 (Sun, 18 Apr 2010) Log Message: ----------- dcc: update to 1.3.122 Modified Paths: -------------- csw/mgar/pkg/dcc/trunk/Makefile csw/mgar/pkg/dcc/trunk/checksums Modified: csw/mgar/pkg/dcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/dcc/trunk/Makefile 2010-04-18 16:20:43 UTC (rev 9685) +++ csw/mgar/pkg/dcc/trunk/Makefile 2010-04-18 16:54:16 UTC (rev 9686) @@ -1,18 +1,20 @@ # dep to perl? GARNAME = dcc -GARVERSION = 1.3.116 +GARVERSION = 1.3.122 CATEGORIES = net DESCRIPTION = E-mail greylisting and a cooperative, distributed system to identify spam -MASTER_SITES = http://www.rhyolite.com/dcc/source/ -DISTFILES = $(GARNAME).tar.Z +MASTER_SITES = http://www.rhyolite.com/src/dcc/old/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.Z LICENSE = LICENSE +RUNTIME_DEP_PKGS += CSWperl + # Upstream watch -#UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.Z +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.Z #CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS = @@ -65,6 +67,9 @@ @( cd $(DESTDIR)/var/opt/csw/$(GARNAME) ; \ sed 's/bonivart/dcc/' dcc_conf > tmp.sed ; \ mv tmp.sed dcc_conf ) + @( cd $(DESTDIR)/opt/csw/libexec/$(GARNAME) ; \ + sed 's/bonivart/dcc/' fix-map > tmp.sed ; \ + mv tmp.sed fix-map ) # @$(foreach FILE, $(CONFFILES), mv $(DESTDIR)/var/opt/csw/$(GARNAME)/$(FILE) $(DESTDIR)/var/opt/csw/$(GARNAME) ;) @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/misc @$(foreach FILE, $(DOCFILES), cp $(WORKSRC)/$(FILE) $(DESTDIR)$(docdir)/$(GARNAME)/$(FILE) ;) Modified: csw/mgar/pkg/dcc/trunk/checksums =================================================================== --- csw/mgar/pkg/dcc/trunk/checksums 2010-04-18 16:20:43 UTC (rev 9685) +++ csw/mgar/pkg/dcc/trunk/checksums 2010-04-18 16:54:16 UTC (rev 9686) @@ -1 +1 @@ -dab3c668b82c931eb7191246cb11791f dcc.tar.Z +79401e314eff1c78f1bc896b6ae52955 dcc-1.3.122.tar.Z This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Apr 18 19:52:09 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 18 Apr 2010 17:52:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[9687] csw/mgar/pkg/miltergreylist/trunk Message-ID: Revision: 9687 http://gar.svn.sourceforge.net/gar/?rev=9687&view=rev Author: bonivart Date: 2010-04-18 17:52:09 +0000 (Sun, 18 Apr 2010) Log Message: ----------- milter-greylist: update to 4.2.5 Modified Paths: -------------- csw/mgar/pkg/miltergreylist/trunk/Makefile csw/mgar/pkg/miltergreylist/trunk/checksums Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/Makefile 2010-04-18 16:54:16 UTC (rev 9686) +++ csw/mgar/pkg/miltergreylist/trunk/Makefile 2010-04-18 17:52:09 UTC (rev 9687) @@ -1,5 +1,5 @@ GARNAME = miltergreylist -GARVERSION = 4.2.4 +GARVERSION = 4.2.5 #RELEASE = rc1 #DISTVERSION = $(GARVERSION)$(RELEASE) DISTVERSION = $(GARVERSION) @@ -16,7 +16,7 @@ DISTFILES = milter-greylist-$(DISTVERSION).tgz DISTFILES += COPYING -RUNTIME_DEP_PKGS = CSWcurlrt CSWgeoip +RUNTIME_DEP_PKGS = CSWcurlrt CSWgeoip CSWlibspf2 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz @@ -24,7 +24,6 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS = --prefix=/opt/csw CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw -#CONFIGURE_ARGS += --with-user=greylist CONFIGURE_ARGS += --with-user=`/usr/xpg4/bin/id -u` CONFIGURE_ARGS += --with-conffile=/etc/opt/csw/greylist.conf CONFIGURE_ARGS += --enable-dnsrbl @@ -32,10 +31,9 @@ CONFIGURE_ARGS += --localstatedir=/var/opt/csw/miltergreylist CONFIGURE_ARGS += --with-libGeoIP=/opt/csw/lib CONFIGURE_ARGS += --with-libcurl=/opt/csw/lib +CONFIGURE_ARGS += --with-libspf2=/opt/csw/lib CONFIGURE_ARGS += --mandir=/opt/csw/share/man -#SPKG_CLASSES = none cswusergroup ugfiles cswcpsampleconf cswinitsmf - TEST_SCRIPTS = INSTALL_SCRIPTS = custom USERGROUP = /opt/csw/etc/pkg/miltergreylist/cswusergroup @@ -48,10 +46,6 @@ PROTOTYPE_PERMS_1 = 0700 PROTOTYPE_USER_1 = greylist -#PROTOTYPE_FILTER = awk ' \ -# $$$$3 ~ /\/var\/opt\/csw\/miltergreylist/ { $$$$2 = "ugfiles" ; $$$$4 = "0700" ; $$$$5 = "greylist" } \ -# { print }' - include gar/category.mk #WORKSRC := $(WORKDIR)/$(GARNAME)-$(GARVERSION)b1 Modified: csw/mgar/pkg/miltergreylist/trunk/checksums =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/checksums 2010-04-18 16:54:16 UTC (rev 9686) +++ csw/mgar/pkg/miltergreylist/trunk/checksums 2010-04-18 17:52:09 UTC (rev 9687) @@ -1,2 +1,2 @@ e61edd088404cd2a0eacb03ce70e2d5f COPYING -00f1576108631c7594b6fbc6b23622b9 milter-greylist-4.2.4.tgz +fa1e68ff0a8b759b946c09f92d40af9d milter-greylist-4.2.5.tgz 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 Apr 18 21:52:22 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Apr 2010 19:52:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[9688] csw/mgar/pkg/libmpfr/trunk/Makefile Message-ID: Revision: 9688 http://gar.svn.sourceforge.net/gar/?rev=9688&view=rev Author: bdwalton Date: 2010-04-18 19:52:21 +0000 (Sun, 18 Apr 2010) Log Message: ----------- libmpfr: remove redundant strip_libtool. must read more carefully Modified Paths: -------------- csw/mgar/pkg/libmpfr/trunk/Makefile Modified: csw/mgar/pkg/libmpfr/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/trunk/Makefile 2010-04-18 17:52:09 UTC (rev 9687) +++ csw/mgar/pkg/libmpfr/trunk/Makefile 2010-04-18 19:52:21 UTC (rev 9688) @@ -19,8 +19,6 @@ RUNTIME_DEP_PKGS_CSWlibmpfr = #PATCHFILES = patches -STRIP_LIBTOOL = 1 - # We define upstream file regex so we can be notifed of # new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Apr 18 22:11:29 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Apr 2010 20:11:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9689] csw/mgar/pkg Message-ID: Revision: 9689 http://gar.svn.sourceforge.net/gar/?rev=9689&view=rev Author: bdwalton Date: 2010-04-18 20:11:29 +0000 (Sun, 18 Apr 2010) Log Message: ----------- quilt: initial commit; takeover from Murry Jensen Added Paths: ----------- csw/mgar/pkg/quilt/ csw/mgar/pkg/quilt/branches/ csw/mgar/pkg/quilt/tags/ csw/mgar/pkg/quilt/trunk/ csw/mgar/pkg/quilt/trunk/Makefile csw/mgar/pkg/quilt/trunk/checksums csw/mgar/pkg/quilt/trunk/files/ Property changes on: csw/mgar/pkg/quilt/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/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile (rev 0) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-18 20:11:29 UTC (rev 9689) @@ -0,0 +1,27 @@ +GARNAME = quilt +GARVERSION = 0.48 +CATEGORIES = utils + +DESCRIPTION = A patch management tooln +define BLURB +Quilt allows you to easily manage large numbers of patches by keeping +track of the changes each patch makes. Patches can be applied, +un-applied, refreshed, and more. + +Quilt originally was based on Andrew Morton's patch scripts found at +http://www.zip.com.au/~akpm/linux/patches/. +endef + +MASTER_SITES = http://mirror.csclub.uwaterloo.ca/nongnu/quilt/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/quilt/trunk/checksums =================================================================== --- csw/mgar/pkg/quilt/trunk/checksums (rev 0) +++ csw/mgar/pkg/quilt/trunk/checksums 2010-04-18 20:11:29 UTC (rev 9689) @@ -0,0 +1 @@ +f77adda60039ffa753f3c584a286f12b quilt-0.48.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 Mon Apr 19 02:51:29 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Apr 2010 00:51:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9690] csw/mgar/pkg/quilt/trunk/Makefile Message-ID: Revision: 9690 http://gar.svn.sourceforge.net/gar/?rev=9690&view=rev Author: bdwalton Date: 2010-04-19 00:51:29 +0000 (Mon, 19 Apr 2010) Log Message: ----------- quilt: add configure options Modified Paths: -------------- csw/mgar/pkg/quilt/trunk/Makefile Modified: csw/mgar/pkg/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile 2010-04-18 20:11:29 UTC (rev 9689) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 00:51:29 UTC (rev 9690) @@ -22,6 +22,24 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-bash=/opt/csw/bin/bash +CONFIGURE_ARGS += --with-cp=/opt/csw/bin/gcp +CONFIGURE_ARGS += --with-date=/opt/csw/bin/gdate +CONFIGURE_ARGS += --with-perl=/opt/csw/bin/perl +CONFIGURE_ARGS += --with-grep=/opt/csw/bin/ggrep +CONFIGURE_ARGS += --with-tail=/opt/csw/bin/gtail +CONFIGURE_ARGS += --with-tr=/opt/csw/bin/gtr +CONFIGURE_ARGS += --with-sed=/opt/csw/bin/gsed +CONFIGURE_ARGS += --with-awk=/opt/csw/bin/gawk +CONFIGURE_ARGS += --with-column=/opt/csw/bin/column +CONFIGURE_ARGS += --with-pod2man=/opt/csw/bin/pod2man +CONFIGURE_ARGS += --with-getopt=/opt/csw/bin/ggetopt +CONFIGURE_ARGS += --with-diff=/opt/csw/bin/gdiff +CONFIGURE_ARGS += --with-mktemp=/opt/csw/bin/mktemp +CONFIGURE_ARGS += --with-patch=/opt/csw/bin/gpatch +CONFIGURE_ARGS += --with-diffstat=/opt/csw/bin/gdiffstat +CONFIGURE_ARGS += --with-find=/opt/csw/bin/gfind +CONFIGURE_ARGS += --with-sendmail=/usr/lib/sendmail 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 Apr 19 02:53:06 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Apr 2010 00:53:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9691] csw/mgar/pkg/quilt/trunk/Makefile Message-ID: Revision: 9691 http://gar.svn.sourceforge.net/gar/?rev=9691&view=rev Author: bdwalton Date: 2010-04-19 00:53:06 +0000 (Mon, 19 Apr 2010) Log Message: ----------- quilt: force /opt/csw/gnu into path so msg* binaries are found Modified Paths: -------------- csw/mgar/pkg/quilt/trunk/Makefile Modified: csw/mgar/pkg/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 00:51:29 UTC (rev 9690) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 00:53:06 UTC (rev 9691) @@ -43,3 +43,5 @@ CONFIGURE_ARGS += --with-sendmail=/usr/lib/sendmail include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) 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 Apr 19 02:55:38 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Apr 2010 00:55:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[9692] csw/mgar/pkg/quilt/trunk/Makefile Message-ID: Revision: 9692 http://gar.svn.sourceforge.net/gar/?rev=9692&view=rev Author: bdwalton Date: 2010-04-19 00:55:38 +0000 (Mon, 19 Apr 2010) Log Message: ----------- quilt: disable rpm configure warning Modified Paths: -------------- csw/mgar/pkg/quilt/trunk/Makefile Modified: csw/mgar/pkg/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 00:53:06 UTC (rev 9691) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 00:55:38 UTC (rev 9692) @@ -41,6 +41,7 @@ CONFIGURE_ARGS += --with-diffstat=/opt/csw/bin/gdiffstat CONFIGURE_ARGS += --with-find=/opt/csw/bin/gfind CONFIGURE_ARGS += --with-sendmail=/usr/lib/sendmail +CONFIGURE_ARGS += --without-rpmbuild 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 Apr 19 02:56:47 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Apr 2010 00:56:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9693] csw/mgar/pkg/quilt/trunk/Makefile Message-ID: Revision: 9693 http://gar.svn.sourceforge.net/gar/?rev=9693&view=rev Author: bdwalton Date: 2010-04-19 00:56:47 +0000 (Mon, 19 Apr 2010) Log Message: ----------- quilt: fix diffstat configure argument Modified Paths: -------------- csw/mgar/pkg/quilt/trunk/Makefile Modified: csw/mgar/pkg/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 00:55:38 UTC (rev 9692) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 00:56:47 UTC (rev 9693) @@ -38,7 +38,7 @@ CONFIGURE_ARGS += --with-diff=/opt/csw/bin/gdiff CONFIGURE_ARGS += --with-mktemp=/opt/csw/bin/mktemp CONFIGURE_ARGS += --with-patch=/opt/csw/bin/gpatch -CONFIGURE_ARGS += --with-diffstat=/opt/csw/bin/gdiffstat +CONFIGURE_ARGS += --with-diffstat=/opt/csw/bin/diffstat CONFIGURE_ARGS += --with-find=/opt/csw/bin/gfind CONFIGURE_ARGS += --with-sendmail=/usr/lib/sendmail CONFIGURE_ARGS += --without-rpmbuild 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 Apr 19 03:02:47 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Apr 2010 01:02:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9694] csw/mgar/pkg/quilt/trunk/Makefile Message-ID: Revision: 9694 http://gar.svn.sourceforge.net/gar/?rev=9694&view=rev Author: bdwalton Date: 2010-04-19 01:02:47 +0000 (Mon, 19 Apr 2010) Log Message: ----------- quilt: add runtime and build dependencies (same list) Modified Paths: -------------- csw/mgar/pkg/quilt/trunk/Makefile Modified: csw/mgar/pkg/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 00:56:47 UTC (rev 9693) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 01:02:47 UTC (rev 9694) @@ -12,6 +12,13 @@ http://www.zip.com.au/~akpm/linux/patches/. endef +RUNTIME_DEP_PKGS = CSWgfile CSWshutils CSWtextutils +RUNTIME_DEP_PKGS += CSWperl CSWgawk CSWgsed CSWbash CSWdiffstat CSWdiffutils +RUNTIME_DEP_PKGS += CSWgpatch CSWmktemp CSWggrep CSWggettext CSWgnulinks +RUNTIME_DEP_PKGS += CSWfindutils CSWggetopt + +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) + MASTER_SITES = http://mirror.csclub.uwaterloo.ca/nongnu/quilt/ DISTFILES = $(GARNAME)-$(GARVERSION).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 Mon Apr 19 03:11:54 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Apr 2010 01:11:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9695] csw/mgar/pkg/quilt/trunk/Makefile Message-ID: Revision: 9695 http://gar.svn.sourceforge.net/gar/?rev=9695&view=rev Author: bdwalton Date: 2010-04-19 01:11:53 +0000 (Mon, 19 Apr 2010) Log Message: ----------- quilt: handle non-standard DESTDIR/BUILD_ROOT to make install work Modified Paths: -------------- csw/mgar/pkg/quilt/trunk/Makefile Modified: csw/mgar/pkg/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 01:02:47 UTC (rev 9694) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 01:11:53 UTC (rev 9695) @@ -53,3 +53,7 @@ include gar/category.mk PATH := /opt/csw/gnu:$(PATH) + +# it seems they prefer the RPM name for this variable in their Makefile +BUILD_ROOT = $(DESTDIR) +EXTRA_COMMON_EXPORTS += BUILD_ROOT 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 Apr 19 03:28:04 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Apr 2010 01:28:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[9696] csw/mgar/pkg/quilt/trunk/Makefile Message-ID: Revision: 9696 http://gar.svn.sourceforge.net/gar/?rev=9696&view=rev Author: bdwalton Date: 2010-04-19 01:28:04 +0000 (Mon, 19 Apr 2010) Log Message: ----------- quilt: compile the .el files Modified Paths: -------------- csw/mgar/pkg/quilt/trunk/Makefile Modified: csw/mgar/pkg/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 01:11:53 UTC (rev 9695) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 01:28:04 UTC (rev 9696) @@ -50,6 +50,8 @@ CONFIGURE_ARGS += --with-sendmail=/usr/lib/sendmail CONFIGURE_ARGS += --without-rpmbuild +COMPILE_ELISP = 1 + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) 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 Apr 19 03:31:39 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Apr 2010 01:31:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9697] csw/mgar/pkg/quilt/trunk/Makefile Message-ID: Revision: 9697 http://gar.svn.sourceforge.net/gar/?rev=9697&view=rev Author: bdwalton Date: 2010-04-19 01:31:38 +0000 (Mon, 19 Apr 2010) Log Message: ----------- quilt: checkpkg overrides for soft deps Modified Paths: -------------- csw/mgar/pkg/quilt/trunk/Makefile Modified: csw/mgar/pkg/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 01:28:04 UTC (rev 9696) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 01:31:38 UTC (rev 9697) @@ -52,6 +52,23 @@ COMPILE_ELISP = 1 +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWgsed +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWgawk +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWshutils +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWfindutils +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWgnulinks +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWgfile +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWtextutils +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWggrep +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWdiffstat +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWmktemp +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWbash +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWggetopt +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWdiffutils +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWggettext +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWgpatch + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) 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 Apr 19 04:01:08 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Apr 2010 02:01:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9698] csw/mgar/pkg/quilt/trunk/Makefile Message-ID: Revision: 9698 http://gar.svn.sourceforge.net/gar/?rev=9698&view=rev Author: bdwalton Date: 2010-04-19 02:01:08 +0000 (Mon, 19 Apr 2010) Log Message: ----------- quilt: split out elisp sub-package Modified Paths: -------------- csw/mgar/pkg/quilt/trunk/Makefile Modified: csw/mgar/pkg/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 01:31:38 UTC (rev 9697) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 02:01:08 UTC (rev 9698) @@ -12,23 +12,39 @@ http://www.zip.com.au/~akpm/linux/patches/. endef -RUNTIME_DEP_PKGS = CSWgfile CSWshutils CSWtextutils -RUNTIME_DEP_PKGS += CSWperl CSWgawk CSWgsed CSWbash CSWdiffstat CSWdiffutils -RUNTIME_DEP_PKGS += CSWgpatch CSWmktemp CSWggrep CSWggettext CSWgnulinks -RUNTIME_DEP_PKGS += CSWfindutils CSWggetopt +PACKAGES = CSWquilt CSWquilt-el +SPKG_DESC_CSWquilt-el = Emacs support for quilt +CATALOGNAME_CSWquilt-el = quilt_el + +ARCHALL_CSWquilt-el = 1 + +RUNTIME_DEP_PKGS_CSWquilt = CSWgfile CSWshutils CSWtextutils +RUNTIME_DEP_PKGS_CSWquilt += CSWperl CSWgawk CSWgsed CSWbash CSWdiffstat +RUNTIME_DEP_PKGS_CSWquilt += CSWgpatch CSWmktemp CSWggrep CSWggettext +RUNTIME_DEP_PKGS_CSWquilt += CSWfindutils CSWggetopt CSWdiffutils +RUNTIME_DEP_PKGS_CSWquilt += CSWgnulinks + +RUNTIME_DEP_PKGS_CSWquilt-el = CSWemacscommon CSWquilt + BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +PKGFILES_CSWquilt-el = $(datadir)/emacs/site-lisp/.* + MASTER_SITES = http://mirror.csclub.uwaterloo.ca/nongnu/quilt/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release +# We define upstream file regex so we can be notifed of new upstream +# software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# 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 = +sysconfdir = /etc/opt/csw + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-bash=/opt/csw/bin/bash CONFIGURE_ARGS += --with-cp=/opt/csw/bin/gcp @@ -52,6 +68,7 @@ COMPILE_ELISP = 1 +# quilt overrides CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWperl CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWgsed CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWgawk @@ -69,6 +86,9 @@ CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWggettext CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWgpatch +# quilt_el overrides +CHECKPKG_OVERRIDES_CSWquilt-el += surplus-dependency|CSWquilt + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) 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 Apr 19 04:11:42 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Apr 2010 02:11:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[9699] csw/mgar/pkg/quilt/trunk/Makefile Message-ID: Revision: 9699 http://gar.svn.sourceforge.net/gar/?rev=9699&view=rev Author: bdwalton Date: 2010-04-19 02:11:42 +0000 (Mon, 19 Apr 2010) Log Message: ----------- quilt: ensure quiltrc is in the right sysconfdir Modified Paths: -------------- csw/mgar/pkg/quilt/trunk/Makefile Modified: csw/mgar/pkg/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 02:01:08 UTC (rev 9698) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 02:11:42 UTC (rev 9699) @@ -96,3 +96,7 @@ # it seems they prefer the RPM name for this variable in their Makefile BUILD_ROOT = $(DESTDIR) EXTRA_COMMON_EXPORTS += BUILD_ROOT + +post-install-modulated: + @( gmkdir -p $(DESTDIR)/$(sysconfdir)/; \ + mv $(DESTDIR)/$(prefix)/etc/quilt.quiltrc $(DESTDIR)/$(sysconfdir) ) \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Apr 19 04:16:33 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Apr 2010 02:16:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[9700] csw/mgar/pkg/quilt/trunk/Makefile Message-ID: Revision: 9700 http://gar.svn.sourceforge.net/gar/?rev=9700&view=rev Author: bdwalton Date: 2010-04-19 02:16:33 +0000 (Mon, 19 Apr 2010) Log Message: ----------- quilt: split out bash completion subpackage Modified Paths: -------------- csw/mgar/pkg/quilt/trunk/Makefile Modified: csw/mgar/pkg/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 02:11:42 UTC (rev 9699) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 02:16:33 UTC (rev 9700) @@ -12,12 +12,15 @@ http://www.zip.com.au/~akpm/linux/patches/. endef -PACKAGES = CSWquilt CSWquilt-el +PACKAGES = CSWquilt CSWquilt-el CSWquilt-completion SPKG_DESC_CSWquilt-el = Emacs support for quilt +SPKG_DESC_CSWquilt-completion = Bash completion support for quilt CATALOGNAME_CSWquilt-el = quilt_el +CATALOGNAME_CSWquilt-completion = quilt_completion ARCHALL_CSWquilt-el = 1 +ARCHALL_CSWquilt-completion = 1 RUNTIME_DEP_PKGS_CSWquilt = CSWgfile CSWshutils CSWtextutils RUNTIME_DEP_PKGS_CSWquilt += CSWperl CSWgawk CSWgsed CSWbash CSWdiffstat @@ -26,10 +29,12 @@ RUNTIME_DEP_PKGS_CSWquilt += CSWgnulinks RUNTIME_DEP_PKGS_CSWquilt-el = CSWemacscommon CSWquilt +RUNTIME_DEP_PKGS_CSWquilt-complation = CSWbashcmplt CSWquilt BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) PKGFILES_CSWquilt-el = $(datadir)/emacs/site-lisp/.* +PKGFILES_CSWquilt-completion = $(prefix)/etc/.* MASTER_SITES = http://mirror.csclub.uwaterloo.ca/nongnu/quilt/ DISTFILES = $(GARNAME)-$(GARVERSION).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 Mon Apr 19 04:25:11 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Apr 2010 02:25:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[9701] csw/mgar/pkg/quilt/trunk/Makefile Message-ID: Revision: 9701 http://gar.svn.sourceforge.net/gar/?rev=9701&view=rev Author: bdwalton Date: 2010-04-19 02:25:10 +0000 (Mon, 19 Apr 2010) Log Message: ----------- quilt: depend on CSWcolumn; correct BUILD_DEP_PKGS after package splitting Modified Paths: -------------- csw/mgar/pkg/quilt/trunk/Makefile Modified: csw/mgar/pkg/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 02:16:33 UTC (rev 9700) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 02:25:10 UTC (rev 9701) @@ -26,12 +26,12 @@ RUNTIME_DEP_PKGS_CSWquilt += CSWperl CSWgawk CSWgsed CSWbash CSWdiffstat RUNTIME_DEP_PKGS_CSWquilt += CSWgpatch CSWmktemp CSWggrep CSWggettext RUNTIME_DEP_PKGS_CSWquilt += CSWfindutils CSWggetopt CSWdiffutils -RUNTIME_DEP_PKGS_CSWquilt += CSWgnulinks +RUNTIME_DEP_PKGS_CSWquilt += CSWgnulinks CSWcolumn RUNTIME_DEP_PKGS_CSWquilt-el = CSWemacscommon CSWquilt RUNTIME_DEP_PKGS_CSWquilt-complation = CSWbashcmplt CSWquilt -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWquilt) PKGFILES_CSWquilt-el = $(datadir)/emacs/site-lisp/.* PKGFILES_CSWquilt-completion = $(prefix)/etc/.* 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 Apr 19 04:27:22 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 19 Apr 2010 02:27:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[9702] csw/mgar/pkg/quilt/trunk/Makefile Message-ID: Revision: 9702 http://gar.svn.sourceforge.net/gar/?rev=9702&view=rev Author: bdwalton Date: 2010-04-19 02:27:22 +0000 (Mon, 19 Apr 2010) Log Message: ----------- quilt: another checkpkg soft dep override Modified Paths: -------------- csw/mgar/pkg/quilt/trunk/Makefile Modified: csw/mgar/pkg/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 02:25:10 UTC (rev 9701) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-19 02:27:22 UTC (rev 9702) @@ -90,6 +90,7 @@ CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWdiffutils CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWggettext CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWgpatch +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWcolumn # quilt_el overrides CHECKPKG_OVERRIDES_CSWquilt-el += surplus-dependency|CSWquilt 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 Apr 19 09:56:39 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Apr 2010 07:56:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9703] csw/mgar/pkg/wgetpaste/trunk Message-ID: Revision: 9703 http://gar.svn.sourceforge.net/gar/?rev=9703&view=rev Author: wahwah Date: 2010-04-19 07:56:39 +0000 (Mon, 19 Apr 2010) Log Message: ----------- wgetpaste: Depending on CSWcoreutils Modified Paths: -------------- csw/mgar/pkg/wgetpaste/trunk/Makefile csw/mgar/pkg/wgetpaste/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wgetpaste/trunk/files/COPYING Modified: csw/mgar/pkg/wgetpaste/trunk/Makefile =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/Makefile 2010-04-19 02:27:22 UTC (rev 9702) +++ csw/mgar/pkg/wgetpaste/trunk/Makefile 2010-04-19 07:56:39 UTC (rev 9703) @@ -11,11 +11,12 @@ MASTER_SITES = http://wgetpaste.zlin.dk/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += wgetpaste.conf +DISTFILES += COPYING UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 RUNTIME_DEP_PKGS = CSWbash -RUNTIME_DEP_PKGS += CSWshutils +RUNTIME_DEP_PKGS += CSWcoreutils RUNTIME_DEP_PKGS += CSWwget PATCHFILES = 0001-Using-gwhoami-instead-of-whoami.patch @@ -32,6 +33,13 @@ INSTALL_SCRIPTS = wgetpaste TEST_SCRIPTS = +CHECKPKG_OVERRIDES_CSWwgetpaste += surplus-dependency|CSWbash +CHECKPKG_OVERRIDES_CSWwgetpaste += surplus-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWwgetpaste += surplus-dependency|CSWwget + +# CSWcoreutils haven't been released yet. +CHECKPKG_OVERRIDES_CSWwgetpaste += unidentified-dependency|CSWcoreutils + include gar/category.mk install-wgetpaste: Modified: csw/mgar/pkg/wgetpaste/trunk/checksums =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/checksums 2010-04-19 02:27:22 UTC (rev 9702) +++ csw/mgar/pkg/wgetpaste/trunk/checksums 2010-04-19 07:56:39 UTC (rev 9703) @@ -1,4 +1,5 @@ ca8e4122a420d95c0cd96d731b5b9777 0001-Using-gwhoami-instead-of-whoami.patch 4ce4101e5be2ea7af5b5ea18be7f8693 0002-CSW-bash.patch +117ac37c24d02f3576903d24bca24421 COPYING f270d87c5ea9939b2818d38f43b51936 wgetpaste-2.16.tar.bz2 67425820c0281729a7f63e3e3339c49f wgetpaste.conf Added: csw/mgar/pkg/wgetpaste/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/wgetpaste/trunk/files/COPYING 2010-04-19 07:56:39 UTC (rev 9703) @@ -0,0 +1,2 @@ +# Copyright (c) 2007-2009 Bo ?rsted Andresen +# Distributed in the public domain. Do with it whatever you want. 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 Apr 19 11:53:09 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Apr 2010 09:53:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[9704] csw/mgar/pkg/buildbot/trunk Message-ID: Revision: 9704 http://gar.svn.sourceforge.net/gar/?rev=9704&view=rev Author: wahwah Date: 2010-04-19 09:53:08 +0000 (Mon, 19 Apr 2010) Log Message: ----------- buildbot: 0.7.12, depending on CSWcoreutils Modified Paths: -------------- csw/mgar/pkg/buildbot/trunk/Makefile csw/mgar/pkg/buildbot/trunk/checksums Added Paths: ----------- csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch Removed Paths: ------------- csw/mgar/pkg/buildbot/trunk/files/debug-0.7.11p3.patch csw/mgar/pkg/buildbot/trunk/files/tail-0.7.11p3.patch Modified: csw/mgar/pkg/buildbot/trunk/Makefile =================================================================== --- csw/mgar/pkg/buildbot/trunk/Makefile 2010-04-19 07:56:39 UTC (rev 9703) +++ csw/mgar/pkg/buildbot/trunk/Makefile 2010-04-19 09:53:08 UTC (rev 9704) @@ -3,9 +3,9 @@ # $Id$ GARNAME = buildbot -GARVERSION = 0.7.11 -PATCHLEVEL = p3 -CATEGORIES = utils +GARVERSION = 0.7.12 +PATCHLEVEL = +CATEGORIES = python DESCRIPTION = A system to automate the compile/test cycle define BLURB @@ -23,15 +23,17 @@ endef MASTER_SITES = $(SF_MIRROR) -PATCHFILES = tail-$(GARVERSION)$(PATCHLEVEL).patch -PATCHFILES += debug-$(GARVERSION)$(PATCHLEVEL).patch +PATCHFILES = buildbot-tail.patch +PATCHFILES += buildbot-debug.patch DISTFILES = $(GARNAME)-$(GARVERSION)$(PATCHLEVEL).tar.gz $(PATCHFILES) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_CLASSES = none cswpycompile +PYCOMPILE = 1 -RUNTIME_DEP_PKGS = CSWcswclassutils CSWpython CSWtwisted CSWzope CSWtextutils +RUNTIME_DEP_PKGS += CSWcoreutils +RUNTIME_DEP_PKGS += CSWtwisted +RUNTIME_DEP_PKGS += CSWzope ARCHALL = 1 CONFIGURE_SCRIPTS = @@ -39,12 +41,13 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = buildbot -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } \ - { print }' - WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)$(PATCHLEVEL) +CHECKPKG_OVERRIDES_CSWbuildbot += unidentified-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWtwisted +CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWzope +CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWcoreutils + build-buildbot: (cd $(WORKSRC); python setup.py build) @$(MAKECOOKIE) @@ -58,5 +61,3 @@ @$(MAKECOOKIE) include gar/category.mk - -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL) Modified: csw/mgar/pkg/buildbot/trunk/checksums =================================================================== --- csw/mgar/pkg/buildbot/trunk/checksums 2010-04-19 07:56:39 UTC (rev 9703) +++ csw/mgar/pkg/buildbot/trunk/checksums 2010-04-19 09:53:08 UTC (rev 9704) @@ -1,3 +1,3 @@ -6e4ef001d11caf270e2ed7d1d7d43318 download/buildbot-0.7.11p3.tar.gz -4c70db04b3514157aa746370ad282eeb download/debug-0.7.11p3.patch -a39720c9a13d73bbda054938d6a98c47 download/tail-0.7.11p3.patch +5ba9559e2ef0d4e34a26815d95fc2d68 buildbot-0.7.12.tar.gz +4c70db04b3514157aa746370ad282eeb buildbot-debug.patch +a39720c9a13d73bbda054938d6a98c47 buildbot-tail.patch Copied: csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch (from rev 9324, csw/mgar/pkg/buildbot/trunk/files/debug-0.7.11p3.patch) =================================================================== --- csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch (rev 0) +++ csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch 2010-04-19 09:53:08 UTC (rev 9704) @@ -0,0 +1,25 @@ +diff -ru buildbot-0.7.11p1.orig/buildbot/changes/changes.py buildbot-0.7.11p1/buildbot/changes/changes.py +--- buildbot-0.7.11p1.orig/buildbot/changes/changes.py 2009-07-15 20:09:30.000000000 +0100 ++++ buildbot-0.7.11p1/buildbot/changes/changes.py 2009-07-30 13:30:01.632031291 +0100 +@@ -73,6 +73,9 @@ + self.files = files[:] + self.files.sort() + ++ def __repr__(self): ++ return "branch(%s) at %s by %s" % (self.branch, self.revision, self.who) ++ + def asText(self): + data = "" + data += self.getFileContents() +diff -ru buildbot-0.7.11p1.orig/buildbot/scheduler.py buildbot-0.7.11p1/buildbot/scheduler.py +--- buildbot-0.7.11p1.orig/buildbot/scheduler.py 2009-07-15 20:09:30.000000000 +0100 ++++ buildbot-0.7.11p1/buildbot/scheduler.py 2009-07-30 16:56:59.195283110 +0100 +@@ -287,6 +287,8 @@ + + def addChange(self, change): + branch = change.branch ++ log.msg("branch = %s" % repr(branch)) ++ log.msg("self.branches = %s" % repr(self.branches)) + if self.branches is not None and branch not in self.branches: + log.msg("%s ignoring off-branch %s" % (self, change)) + return Copied: csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch (from rev 9324, csw/mgar/pkg/buildbot/trunk/files/tail-0.7.11p3.patch) =================================================================== --- csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch (rev 0) +++ csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch 2010-04-19 09:53:08 UTC (rev 9704) @@ -0,0 +1,12 @@ +diff -ru buildbot-0.7.11p1.orig/buildbot/scripts/logwatcher.py buildbot-0.7.11p1/buildbot/scripts/logwatcher.py +--- buildbot-0.7.11p1.orig/buildbot/scripts/logwatcher.py 2009-03-02 18:13:03.000000000 +0100 ++++ buildbot-0.7.11p1/buildbot/scripts/logwatcher.py 2009-07-29 18:00:44.304903854 +0200 +@@ -43,7 +43,7 @@ + # been seen within 10 seconds, and with ReconfigError if the error + # line was seen. If the logfile could not be opened, it errbacks with + # an IOError. +- self.p = reactor.spawnProcess(self.pp, "/usr/bin/tail", ++ self.p = reactor.spawnProcess(self.pp, "/opt/csw/bin/gtail", + ("tail", "-f", "-n", "0", self.logfile), + env=os.environ, + ) Deleted: csw/mgar/pkg/buildbot/trunk/files/debug-0.7.11p3.patch =================================================================== --- csw/mgar/pkg/buildbot/trunk/files/debug-0.7.11p3.patch 2010-04-19 07:56:39 UTC (rev 9703) +++ csw/mgar/pkg/buildbot/trunk/files/debug-0.7.11p3.patch 2010-04-19 09:53:08 UTC (rev 9704) @@ -1,25 +0,0 @@ -diff -ru buildbot-0.7.11p1.orig/buildbot/changes/changes.py buildbot-0.7.11p1/buildbot/changes/changes.py ---- buildbot-0.7.11p1.orig/buildbot/changes/changes.py 2009-07-15 20:09:30.000000000 +0100 -+++ buildbot-0.7.11p1/buildbot/changes/changes.py 2009-07-30 13:30:01.632031291 +0100 -@@ -73,6 +73,9 @@ - self.files = files[:] - self.files.sort() - -+ def __repr__(self): -+ return "branch(%s) at %s by %s" % (self.branch, self.revision, self.who) -+ - def asText(self): - data = "" - data += self.getFileContents() -diff -ru buildbot-0.7.11p1.orig/buildbot/scheduler.py buildbot-0.7.11p1/buildbot/scheduler.py ---- buildbot-0.7.11p1.orig/buildbot/scheduler.py 2009-07-15 20:09:30.000000000 +0100 -+++ buildbot-0.7.11p1/buildbot/scheduler.py 2009-07-30 16:56:59.195283110 +0100 -@@ -287,6 +287,8 @@ - - def addChange(self, change): - branch = change.branch -+ log.msg("branch = %s" % repr(branch)) -+ log.msg("self.branches = %s" % repr(self.branches)) - if self.branches is not None and branch not in self.branches: - log.msg("%s ignoring off-branch %s" % (self, change)) - return Deleted: csw/mgar/pkg/buildbot/trunk/files/tail-0.7.11p3.patch =================================================================== --- csw/mgar/pkg/buildbot/trunk/files/tail-0.7.11p3.patch 2010-04-19 07:56:39 UTC (rev 9703) +++ csw/mgar/pkg/buildbot/trunk/files/tail-0.7.11p3.patch 2010-04-19 09:53:08 UTC (rev 9704) @@ -1,12 +0,0 @@ -diff -ru buildbot-0.7.11p1.orig/buildbot/scripts/logwatcher.py buildbot-0.7.11p1/buildbot/scripts/logwatcher.py ---- buildbot-0.7.11p1.orig/buildbot/scripts/logwatcher.py 2009-03-02 18:13:03.000000000 +0100 -+++ buildbot-0.7.11p1/buildbot/scripts/logwatcher.py 2009-07-29 18:00:44.304903854 +0200 -@@ -43,7 +43,7 @@ - # been seen within 10 seconds, and with ReconfigError if the error - # line was seen. If the logfile could not be opened, it errbacks with - # an IOError. -- self.p = reactor.spawnProcess(self.pp, "/usr/bin/tail", -+ self.p = reactor.spawnProcess(self.pp, "/opt/csw/bin/gtail", - ("tail", "-f", "-n", "0", self.logfile), - env=os.environ, - ) 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 Apr 19 12:17:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Apr 2010 10:17:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9705] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9705 http://gar.svn.sourceforge.net/gar/?rev=9705&view=rev Author: wahwah Date: 2010-04-19 10:17:43 +0000 (Mon, 19 Apr 2010) Log Message: ----------- mGAR v2: checkpkg, checking for /etc/opt/csw/init.d files, suggesting /opt/csw/etc/init.d/. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-04-19 09:53:08 UTC (rev 9704) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-04-19 10:17:43 UTC (rev 9705) @@ -160,6 +160,12 @@ error_mgr.ReportError( "init-file-missing-cswinitsmf-class", "%s class=%s" % (entry["path"], entry["class"])) + if "/etc/opt/csw/init.d" in entry["path"]: + messenger.Message("Init files should go into /opt/csw/etc/init.d, " + "not /etc/opt/csw/init.d.") + error_mgr.ReportError( + "init-file-wrong-location", + entry["path"]) def SetCheckLibraries(pkgs_data, error_mgr, logger, messenger): Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-04-19 09:53:08 UTC (rev 9704) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-04-19 10:17:43 UTC (rev 9705) @@ -101,33 +101,48 @@ self.pkg_data["pkginfo"]["NAME"] = 'libsigc++_devel - This catalog name is good' -class TestCheckSmfIntegration(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckSmfIntegrationBad(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckSmfIntegration' def CheckpkgTest(self): self.pkg_data["pkgmap"].append({ "class": "none", "group": "bin", - "line": "1 f none /etc/opt/csw/init.d/foo 0644 root bin 36372 24688 1266395027", + "line": "1 f none /opt/csw/etc/init.d/foo 0644 root bin 36372 24688 1266395027", "mode": '0755', - "path": "/etc/opt/csw/init.d/foo", + "path": "/opt/csw/etc/init.d/foo", "type": "f", "user": "root" }) self.error_mgr_mock.ReportError('init-file-missing-cswinitsmf-class', - '/etc/opt/csw/init.d/foo class=none') + '/opt/csw/etc/init.d/foo class=none') -class TestCheckCatalognameGood(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckCheckSmfIntegrationGood(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckSmfIntegration' def CheckpkgTest(self): self.pkg_data["pkgmap"].append({ "class": "cswinitsmf", "group": "bin", + "line": "1 f none /opt/csw/etc/init.d/foo 0644 root bin 36372 24688 1266395027", + "mode": '0755', + "path": "/opt/csw/etc/init.d/foo", + "type": "f", + "user": "root" + }) + + +class TestCheckCheckSmfIntegrationWrongLocation(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckSmfIntegration' + def CheckpkgTest(self): + self.pkg_data["pkgmap"].append({ + "class": "cswinitsmf", + "group": "bin", "line": "1 f none /etc/opt/csw/init.d/foo 0644 root bin 36372 24688 1266395027", "mode": '0755', "path": "/etc/opt/csw/init.d/foo", "type": "f", "user": "root" }) + self.error_mgr_mock.ReportError('init-file-wrong-location', '/etc/opt/csw/init.d/foo') class TestCatalognameLowercase_1(CheckpkgUnitTestHelper, unittest.TestCase): 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 Apr 19 13:28:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 19 Apr 2010 11:28:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9706] csw/mgar/pkg/libspectre/trunk Message-ID: Revision: 9706 http://gar.svn.sourceforge.net/gar/?rev=9706&view=rev Author: dmichelsen Date: 2010-04-19 11:28:06 +0000 (Mon, 19 Apr 2010) Log Message: ----------- libspectre: Update to 0.2.5 Modified Paths: -------------- csw/mgar/pkg/libspectre/trunk/Makefile csw/mgar/pkg/libspectre/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libspectre/trunk/files/fixme.sh Modified: csw/mgar/pkg/libspectre/trunk/Makefile =================================================================== --- csw/mgar/pkg/libspectre/trunk/Makefile 2010-04-19 10:17:43 UTC (rev 9705) +++ csw/mgar/pkg/libspectre/trunk/Makefile 2010-04-19 11:28:06 UTC (rev 9706) @@ -1,5 +1,5 @@ GARNAME = libspectre -GARVERSION = 0.2.2 +GARVERSION = 0.2.5 CATEGORIES = lib DESCRIPTION = A small library for rendering Postscript documents @@ -8,7 +8,9 @@ MASTER_SITES = http://libspectre.freedesktop.org/releases/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += fixme.sh + +# Use int_types.h instead of stdint.h until this is fixed: +# https://bugs.freedesktop.org/show_bug.cgi?id=27734 PATCHFILES = patch-stdint.diff SPKG_SOURCEURL = http://libspectre.freedesktop.org @@ -16,15 +18,18 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWgs +DEP_PKGS = CSWgs +# The flags -pedantic gets selected during configure as it seems to cause +# no harm, but it effectively triggers performance tuning and fails as some +# files miss _mcount as the performance lib is not linked in. +# Do this until this bug is resolved: +# https://bugs.freedesktop.org/show_bug.cgi?id=27735 +BUILD_OVERRIDE_VARS = SPECTRE_CFLAGS +BUILD_OVERRIDE_VAR_SPECTRE_CFLAGS = + # Disable for now as libgs is missing 64 bit #BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk - -post-configure-modulated: - @echo " ==> Fixing libtool files" - @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/libspectre/trunk/checksums =================================================================== --- csw/mgar/pkg/libspectre/trunk/checksums 2010-04-19 10:17:43 UTC (rev 9705) +++ csw/mgar/pkg/libspectre/trunk/checksums 2010-04-19 11:28:06 UTC (rev 9706) @@ -1,3 +1,2 @@ -34f5b20f6caf282b2533784fbb1b4395 download/fixme.sh -0600653653d9313e3be135b2217ea7fd download/libspectre-0.2.2.tar.gz -7f3edd354885de75d806dfd740a23881 download/patch-stdint.diff +56ed626fdf430039f1285e869b8fb3b6 libspectre-0.2.5.tar.gz +7f3edd354885de75d806dfd740a23881 patch-stdint.diff Deleted: csw/mgar/pkg/libspectre/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/libspectre/trunk/files/fixme.sh 2010-04-19 10:17:43 UTC (rev 9705) +++ csw/mgar/pkg/libspectre/trunk/files/fixme.sh 2010-04-19 11:28:06 UTC (rev 9706) @@ -1,51 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} - gchmod +x ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} - gchmod +x ${lt} -done - -for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} - gchmod +x ${LTMAIN} -done - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 19 14:00:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 19 Apr 2010 12:00:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9707] csw/mgar/pkg Message-ID: Revision: 9707 http://gar.svn.sourceforge.net/gar/?rev=9707&view=rev Author: dmichelsen Date: 2010-04-19 12:00:12 +0000 (Mon, 19 Apr 2010) Log Message: ----------- blame: Initial commit Added Paths: ----------- csw/mgar/pkg/blame/ csw/mgar/pkg/blame/branches/ csw/mgar/pkg/blame/tags/ csw/mgar/pkg/blame/trunk/ csw/mgar/pkg/blame/trunk/Makefile csw/mgar/pkg/blame/trunk/checksums csw/mgar/pkg/blame/trunk/files/ csw/mgar/pkg/blame/trunk/files/0001-Do-not-force-Wall.patch Property changes on: csw/mgar/pkg/blame/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/blame/trunk/Makefile =================================================================== --- csw/mgar/pkg/blame/trunk/Makefile (rev 0) +++ csw/mgar/pkg/blame/trunk/Makefile 2010-04-19 12:00:12 UTC (rev 9707) @@ -0,0 +1,21 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = blame +GARVERSION = 1.3.1 +CATEGORIES = utils + +DESCRIPTION = Displays the last modification for each line in an RCS file +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Do-not-force-Wall.patch + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Property changes on: csw/mgar/pkg/blame/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/blame/trunk/checksums =================================================================== --- csw/mgar/pkg/blame/trunk/checksums (rev 0) +++ csw/mgar/pkg/blame/trunk/checksums 2010-04-19 12:00:12 UTC (rev 9707) @@ -0,0 +1,2 @@ +21cea8c9b84a9dad29c4c9bb92cd18fb 0001-Do-not-force-Wall.patch +7e63b28b5c2bc6bed2b30891a619c29c blame-1.3.1.tar.gz Added: csw/mgar/pkg/blame/trunk/files/0001-Do-not-force-Wall.patch =================================================================== --- csw/mgar/pkg/blame/trunk/files/0001-Do-not-force-Wall.patch (rev 0) +++ csw/mgar/pkg/blame/trunk/files/0001-Do-not-force-Wall.patch 2010-04-19 12:00:12 UTC (rev 9707) @@ -0,0 +1,39 @@ +From 7e1d85f98ff7cb76076701198d45c312baa30c66 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 19 Apr 2010 13:46:51 +0200 +Subject: [PATCH] Do not force -Wall + +--- + src/Makefile.am | 2 +- + src/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index af59b4a..2e1937c 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -20,7 +20,7 @@ blame_SOURCES = \ + blame_LDADD = $(top_builddir)/lib/libmisc.a + AM_YFLAGS = -d + AM_LFLAGS = -f -8 +-AM_CFLAGS = -Wall ++AM_CFLAGS = + if GCC + AM_CFLAGS += -W -Wno-format-y2k + endif +diff --git a/src/Makefile.in b/src/Makefile.in +index 1e2ec25..c709976 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -266,7 +266,7 @@ blame_SOURCES = \ + blame_LDADD = $(top_builddir)/lib/libmisc.a + AM_YFLAGS = -d + AM_LFLAGS = -f -8 +-AM_CFLAGS = -Wall $(am__append_1) ++AM_CFLAGS = $(am__append_1) + AM_CPPFLAGS = -I$(top_srcdir)/lib + BUILT_SOURCES = parser.h + AUTOMAKE_OPTIONS = $(top_builddir)/lib/ansi2knr +-- +1.7.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Apr 19 14:09:51 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Apr 2010 12:09:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[9708] csw/mgar/pkg/python/trunk/Makefile Message-ID: Revision: 9708 http://gar.svn.sourceforge.net/gar/?rev=9708&view=rev Author: wahwah Date: 2010-04-19 12:09:51 +0000 (Mon, 19 Apr 2010) Log Message: ----------- python: Linking against libX11.so.4 Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2010-04-19 12:00:12 UTC (rev 9707) +++ csw/mgar/pkg/python/trunk/Makefile 2010-04-19 12:09:51 UTC (rev 9708) @@ -48,11 +48,7 @@ # Test for sunaudiodev fails. SKIPTEST = 1 -EXTRA_INC += $(prefix)/X11/include -EXTRA_LIB += $(prefix)/X11/lib EXTRA_LIB += $(prefix)/bdb47/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS @@ -115,7 +111,6 @@ RUNTIME_DEP_PKGS_CSWpython-tk += CSWpython RUNTIME_DEP_PKGS_CSWpython-tk += CSWtcl RUNTIME_DEP_PKGS_CSWpython-tk += CSWtk -RUNTIME_DEP_PKGS_CSWpython-tk += CSWlibx11 RUNTIME_DEP_PKGS_CSWpython-devel = CSWpython RUNTIME_DEP_PKGS_CSWpython-test += CSWpython @@ -143,6 +138,9 @@ CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/python CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/opt/build|root/opt/csw/share/checkpkg/overrides/python +# http://lists.opencsw.org/pipermail/pkgsubmissions/2010-April/000648.html +CHECKPKG_OVERRIDES_CSWpython-tk += linked-against-discouraged-library|_tkinter.so|libX11.so.4 + include gar/category.mk post-install-modulated: install-deprecated-libs 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 Apr 19 15:38:08 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Apr 2010 13:38:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9709] csw/mgar/pkg/gnupg2/trunk Message-ID: Revision: 9709 http://gar.svn.sourceforge.net/gar/?rev=9709&view=rev Author: wahwah Date: 2010-04-19 13:38:08 +0000 (Mon, 19 Apr 2010) Log Message: ----------- gnupg2: Upgrade to 2.0.15, three unit tests are failing Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile csw/mgar/pkg/gnupg2/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/gnupg2/trunk/ Property changes on: csw/mgar/pkg/gnupg2/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2010-04-19 12:09:51 UTC (rev 9708) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2010-04-19 13:38:08 UTC (rev 9709) @@ -3,7 +3,7 @@ # $Id$ GARNAME = gnupg -GARVERSION = 2.0.13 +GARVERSION = 2.0.15 CATEGORIES = apps DESCRIPTION = GnuPG is a complete and free replacement for PGP. @@ -60,11 +60,8 @@ RUNTIME_DEP_PKGS_common += CSWggettextrt RUNTIME_DEP_PKGS_common += CSWgpgerr RUNTIME_DEP_PKGS_common += CSWiconv -RUNTIME_DEP_PKGS_common += CSWlibassuan -RUNTIME_DEP_PKGS_common += CSWlibidn RUNTIME_DEP_PKGS_common += CSWlibksba RUNTIME_DEP_PKGS_common += CSWoldaprt -RUNTIME_DEP_PKGS_common += CSWosslrt RUNTIME_DEP_PKGS_common += CSWpth RUNTIME_DEP_PKGS_common += CSWreadline RUNTIME_DEP_PKGS_common += CSWzlib @@ -72,6 +69,9 @@ RUNTIME_DEP_PKGS_CSWgnupg2 += $(RUNTIME_DEP_PKGS_common) RUNTIME_DEP_PKGS_CSWgnupg2 += CSWgnupg-agent +RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibassuan +RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibidn +RUNTIME_DEP_PKGS_CSWgnupg2 += CSWosslrt RUNTIME_DEP_PKGS_CSWgnupg-agent = CSWpinentry RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWgcrypt Modified: csw/mgar/pkg/gnupg2/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg2/trunk/checksums 2010-04-19 12:09:51 UTC (rev 9708) +++ csw/mgar/pkg/gnupg2/trunk/checksums 2010-04-19 13:38:08 UTC (rev 9709) @@ -1,2 +1,2 @@ -41bd7629d815b90c15b37bb31c2f07c0 download/gnupg-2.0.13.tar.bz2 -9ee96ed5623d9ff8f3be8c3d70709509 download/sm-libraries.patch +c1286e85b66349879dc4b760dd83e2f1 gnupg-2.0.15.tar.bz2 +9ee96ed5623d9ff8f3be8c3d70709509 sm-libraries.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 Mon Apr 19 16:11:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 19 Apr 2010 14:11:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9710] csw/mgar/pkg Message-ID: Revision: 9710 http://gar.svn.sourceforge.net/gar/?rev=9710&view=rev Author: dmichelsen Date: 2010-04-19 14:11:51 +0000 (Mon, 19 Apr 2010) Log Message: ----------- tinyca: Initial commit Added Paths: ----------- csw/mgar/pkg/tinyca/ csw/mgar/pkg/tinyca/branches/ csw/mgar/pkg/tinyca/tags/ csw/mgar/pkg/tinyca/trunk/ csw/mgar/pkg/tinyca/trunk/Makefile csw/mgar/pkg/tinyca/trunk/checksums csw/mgar/pkg/tinyca/trunk/files/ csw/mgar/pkg/tinyca/trunk/files/0001-Hardcode-pathes-to-CSW.patch csw/mgar/pkg/tinyca/trunk/files/COPYING Property changes on: csw/mgar/pkg/tinyca/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/tinyca/trunk/Makefile =================================================================== --- csw/mgar/pkg/tinyca/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tinyca/trunk/Makefile 2010-04-19 14:11:51 UTC (rev 9710) @@ -0,0 +1,50 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = tinyca2 +GARVERSION = 0.7.5 +CATEGORIES = utils + +DESCRIPTION = Graphical userinterface to manage a small CA +define BLURB + TinyCA is a graphical tool written in Perl/Gtk to manage a small Certification Authority (CA) using openssl. + TinyCA supports - creation and revocation of x509 - S/MIME certificates. + - PKCS#10 requests. + - exporting certificates as PEM, DER, TXT, and PKCS#12. + - server certificates for use in web servers, email servers, IPsec, and more. + - client certificates for use in web browsers, email clients, IPsec, and more. + - creation and management of SubCAs +endef + +MASTER_SITES = http://tinyca.sm-zone.net/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += COPYING +PATCHFILES = 0001-Hardcode-pathes-to-CSW.patch + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +RUNTIME_DEP_PKGS = CSWperl CSWpmgtk2 CSWosslutils CSWzip CSWgtar + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom +TEST_SCRIPTS = + +ARCHALL = 1 + +CHECKPKG_OVERRIDES_CSWtinyca2 += surplus-dependency|CSWzip +CHECKPKG_OVERRIDES_CSWtinyca2 += surplus-dependency|CSWosslutils +CHECKPKG_OVERRIDES_CSWtinyca2 += surplus-dependency|CSWgtar +CHECKPKG_OVERRIDES_CSWtinyca2 += surplus-dependency|CSWpmgtk2 + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall -m 755 $(WORKSRC)/tinyca2 $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)/opt/csw/share/tinyca2 + cp -rp $(WORKSRC)/lib $(DESTDIR)/opt/csw/share/tinyca2/ + cp -rp $(WORKSRC)/templates $(DESTDIR)/opt/csw/share/tinyca2/ + ginstall -d $(DESTDIR)$(libdir) + cp -rp $(WORKSRC)/locale $(DESTDIR)$(libdir) + @$(MAKECOOKIE) + Property changes on: csw/mgar/pkg/tinyca/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tinyca/trunk/checksums =================================================================== --- csw/mgar/pkg/tinyca/trunk/checksums (rev 0) +++ csw/mgar/pkg/tinyca/trunk/checksums 2010-04-19 14:11:51 UTC (rev 9710) @@ -0,0 +1,3 @@ +f7604e61ea386a1d091cf25d5a4c4b28 0001-Hardcode-pathes-to-CSW.patch +79dfd0ac627713992b6b400ece148122 COPYING +a7f63806dbdc38a34ed58e42e79f4822 tinyca2-0.7.5.tar.bz2 Added: csw/mgar/pkg/tinyca/trunk/files/0001-Hardcode-pathes-to-CSW.patch =================================================================== --- csw/mgar/pkg/tinyca/trunk/files/0001-Hardcode-pathes-to-CSW.patch (rev 0) +++ csw/mgar/pkg/tinyca/trunk/files/0001-Hardcode-pathes-to-CSW.patch 2010-04-19 14:11:51 UTC (rev 9710) @@ -0,0 +1,62 @@ +From f3297cac179fd07286c5c0a82033fd1b7b664c7d Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 19 Apr 2010 16:09:50 +0200 +Subject: [PATCH] Hardcode CSW pathes + +--- + tinyca2 | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/tinyca2 b/tinyca2 +index 7a7998c..82db49c 100755 +--- a/tinyca2 ++++ b/tinyca2 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + # + # $Id: tinyca2,v 1.6 2006/07/04 19:53:16 sm Exp $ + # +@@ -18,7 +18,7 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + +-BEGIN { unshift(@INC, './lib'); # put here the location of the modules ++BEGIN { unshift(@INC, '/opt/csw/share/tinyca2/lib'); # put here the location of the modules + } + + use strict; +@@ -46,7 +46,7 @@ use KEY; + use TCONFIG; + + setlocale(LC_MESSAGES, ""); +-bindtextdomain("tinyca2", "./locale/"); ++bindtextdomain("tinyca2", "/opt/csw/share/locale/"); + textdomain("tinyca2"); + + # https://bugs.gentoo.org/show_bug.cgi?id=78576 +@@ -55,9 +55,9 @@ $ENV{XLIB_SKIP_ARGB_VISUALS}= '1'; + my $init = {}; + + # location of openssl +-$init->{'opensslbin'} = "/usr/bin/openssl"; +-$init->{'zipbin'} = "/usr/bin/zip"; +-$init->{'tarbin'} = "/bin/tar"; ++$init->{'opensslbin'} = "/opt/csw/bin/openssl"; ++$init->{'zipbin'} = "/opt/csw/bin/zip"; ++$init->{'tarbin'} = "/opt/csw/bin/tar"; + + if(not -x $init->{'opensslbin'}) { + printf(gettext("Can't execute %s.\n"), $init->{'opensslbin'}); +@@ -76,7 +76,7 @@ if(not -x $init->{'tarbin'}) { + } + + # directory with the templates +-$init->{'templatedir'} = "./templates"; ++$init->{'templatedir'} = "/opt/csw/share/tinyca2/templates"; + + if(not -d $init->{'templatedir'}) { + print gettext("Can't find templatedir.\n"); +-- +1.7.0 + Added: csw/mgar/pkg/tinyca/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/tinyca/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/tinyca/trunk/files/COPYING 2010-04-19 14:11:51 UTC (rev 9710) @@ -0,0 +1,15 @@ +Copyright (c) Stephan Martin + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. 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 Apr 19 16:51:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 19 Apr 2010 14:51:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9711] csw/mgar/pkg/cpan/Locale-Gettext/trunk Message-ID: Revision: 9711 http://gar.svn.sourceforge.net/gar/?rev=9711&view=rev Author: dmichelsen Date: 2010-04-19 14:50:59 +0000 (Mon, 19 Apr 2010) Log Message: ----------- cpan/Locale-Gettext: Add patch for Perl 5.10 Modified Paths: -------------- csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile csw/mgar/pkg/cpan/Locale-Gettext/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/compatibility-with-POSIX-module.diff csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/doc-update.diff Modified: csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile 2010-04-19 14:11:51 UTC (rev 9710) +++ csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile 2010-04-19 14:50:59 UTC (rev 9711) @@ -10,11 +10,21 @@ to internationalize software. endef +DISTFILES = COPYING + +# Compatibility patches for Perl 5.10.1 from +# https://rt.cpan.org/Public/Bug/Display.html?id=35680 +PATCHFILES = compatibility-with-POSIX-module.diff +PATCHFILES += doc-update.diff + PACKAGES = CSWpmlocalegettext CATALOGNAME = pm_localegettext RUNTIME_DEP_PKGS = CSWggettextrt +# The Perl module really does not start with uppercase... +CHECKPKG_OVERRIDES_CSWpmlocalegettext += pkginfo-description-not-starting-with-uppercase + include gar/category.mk BUILD_ARGS += OTHERLDFLAGS="-lintl -R$(libdir)" Modified: csw/mgar/pkg/cpan/Locale-Gettext/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Locale-Gettext/trunk/checksums 2010-04-19 14:11:51 UTC (rev 9710) +++ csw/mgar/pkg/cpan/Locale-Gettext/trunk/checksums 2010-04-19 14:50:59 UTC (rev 9711) @@ -1,2 +1,4 @@ -8af338048eefc89879d1799aaeefc1e1 download/CSWpmlocalegettext.gspec -f3d3f474a1458f37174c410dfef61a46 download/gettext-1.05.tar.gz +40930028a14e3310e33dfdfe5fb9db37 COPYING +6c1d3bcfd532e5ca5a5b3dcab8d49745 compatibility-with-POSIX-module.diff +a6a34db43bbd5ed17a8565b9c7cc97c2 doc-update.diff +f3d3f474a1458f37174c410dfef61a46 gettext-1.05.tar.gz Added: csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/compatibility-with-POSIX-module.diff =================================================================== --- csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/compatibility-with-POSIX-module.diff (rev 0) +++ csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/compatibility-with-POSIX-module.diff 2010-04-19 14:50:59 UTC (rev 9711) @@ -0,0 +1,25 @@ +Locale::Gettext exports by default the various LC_* constants as does the +POSIX perl module. Up to perl-5.10, their definition was strictly the same +and didn't cause any harm. Now the POSIX module evolved slightly and the +symbol redefinition are conflictual and +generate warnings. + +Resolve this by making sure that Locale::Gettext reexports the constants +coming from the POSIX module. + +Fixes Debian bug #479803. + + -- Raphael Hertzog + +Index: liblocale-gettext-perl-1.05/gettext.pm +=================================================================== +--- liblocale-gettext-perl-1.05.orig/gettext.pm 2008-05-07 09:40:23.000000000 +0200 ++++ liblocale-gettext-perl-1.05/gettext.pm 2008-05-07 09:41:04.000000000 +0200 +@@ -32,6 +32,7 @@ + =cut + + use Carp; ++use POSIX qw(:locale_h); + + require Exporter; + require DynaLoader; Added: csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/doc-update.diff =================================================================== --- csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/doc-update.diff (rev 0) +++ csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/doc-update.diff 2010-04-19 14:50:59 UTC (rev 9711) @@ -0,0 +1,14 @@ +Fix documentation in manual page +Index: liblocale-gettext-perl/gettext.pm +=================================================================== +--- liblocale-gettext-perl.orig/gettext.pm 2006-04-13 22:49:49.000000000 +0200 ++++ liblocale-gettext-perl/gettext.pm 2008-02-03 19:53:01.000000000 +0100 +@@ -235,7 +235,7 @@ + gettext(), dgettext(), and dcgettext() attempt to retrieve a string + matching their C parameter within the context of the current + locale. dcgettext() takes the message's category and the text domain +-as parameters while dcgettext() defaults to the LC_MESSAGES category ++as parameters while dgettext() defaults to the LC_MESSAGES category + and gettext() defaults to LC_MESSAGES and uses the current text domain. + If the string is not found in the database, then C is returned. + 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 Apr 19 17:22:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 19 Apr 2010 15:22:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[9712] csw/mgar/pkg/cpan Message-ID: Revision: 9712 http://gar.svn.sourceforge.net/gar/?rev=9712&view=rev Author: dmichelsen Date: 2010-04-19 15:22:55 +0000 (Mon, 19 Apr 2010) Log Message: ----------- cpan/File-chmod: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/File-chmod/ csw/mgar/pkg/cpan/File-chmod/branches/ csw/mgar/pkg/cpan/File-chmod/tags/ csw/mgar/pkg/cpan/File-chmod/trunk/ csw/mgar/pkg/cpan/File-chmod/trunk/Makefile csw/mgar/pkg/cpan/File-chmod/trunk/checksums csw/mgar/pkg/cpan/File-chmod/trunk/files/ csw/mgar/pkg/cpan/File-chmod/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/File-chmod/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/File-chmod/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-chmod/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/File-chmod/trunk/Makefile 2010-04-19 15:22:55 UTC (rev 9712) @@ -0,0 +1,17 @@ +GARNAME = File-chmod +GARVERSION = 0.32 +CATEGORIES = cpan +AUTHOR = PINYAN + +DESCRIPTION = Implements symbolic and ls chmod modes +define BLURB +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmfilechmod +CATALOGNAME = pm_filechmod + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/File-chmod/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-chmod/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/File-chmod/trunk/checksums 2010-04-19 15:22:55 UTC (rev 9712) @@ -0,0 +1,2 @@ +23a655c51974efbe8e6b13260df20754 COPYING +0048eb67fffad544e1cc07e04c33b0b2 File-chmod-0.32.tar.gz Added: csw/mgar/pkg/cpan/File-chmod/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/File-chmod/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/File-chmod/trunk/files/COPYING 2010-04-19 15:22:55 UTC (rev 9712) @@ -0,0 +1,5 @@ +Copyright (C) 2007 by Jeff Pinyan + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself, either Perl version 5.8.8 or, +at your option, any later version of Perl 5 you may have available. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 19 18:44:36 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 19 Apr 2010 16:44:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[9713] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 9713 http://gar.svn.sourceforge.net/gar/?rev=9713&view=rev Author: rthurner Date: 2010-04-19 16:44:36 +0000 (Mon, 19 Apr 2010) Log Message: ----------- svn-1.6.11 upgrade Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-04-19 15:22:55 UTC (rev 9712) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-04-19 16:44:36 UTC (rev 9713) @@ -22,7 +22,7 @@ # http://subversion.apache.org/mailing-lists.html GARNAME = subversion -GARVERSION = 1.6.9 +GARVERSION = 1.6.11 CATEGORIES = utils DESCRIPTION = Version control rethought Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2010-04-19 15:22:55 UTC (rev 9712) +++ csw/mgar/pkg/subversion/trunk/checksums 2010-04-19 16:44:36 UTC (rev 9713) @@ -5,6 +5,6 @@ 41ec540885de7c34625768aa1fb9682b fixme.sh f107831ad0c702ff32e51df6a207237b httpd-svn.conf.CSW f0aa58c145ae99f8e4d72499ab826169 javahl_headers_for_nested_classes.diff -9c30a47b1d48664e7afef68bb4834c53 subversion-1.6.9.tar.bz2 +75419159b50661092c4137449940b5cc subversion-1.6.11.tar.bz2 f7d05c59656dcf01fb844295c9912f78 subversion161.diff 1b532d3055708a97771f5cd959983628 svn_access.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 19 18:54:53 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 19 Apr 2010 16:54:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9714] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 9714 http://gar.svn.sourceforge.net/gar/?rev=9714&view=rev Author: rthurner Date: 2010-04-19 16:54:53 +0000 (Mon, 19 Apr 2010) Log Message: ----------- apache2 - fix checkpkg error Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2010-04-19 16:44:36 UTC (rev 9713) +++ csw/mgar/pkg/apache2/trunk/Makefile 2010-04-19 16:54:53 UTC (rev 9714) @@ -46,7 +46,7 @@ RUNTIME_DEP_PKGS_CSWapache2 = CSWexpat CSWiconv RUNTIME_DEP_PKGS_CSWapache2 += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib -RUNTIME_DEP_PKGS_CSWapache2 += CSWsqlite3rt CSWcswclassutils +RUNTIME_DEP_PKGS_CSWapache2 += CSWsqlite3rt # The SMF support: you don't need to specify cswinitsmf any more. You need to # make sure the the /etc/opt/csw/init.d/cswapache file gets installed during This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 19 19:09:06 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 19 Apr 2010 17:09:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9715] csw/mgar/pkg/libserf/tags/libserf-0.3.1, REV=2010.04. 19/ Message-ID: Revision: 9715 http://gar.svn.sourceforge.net/gar/?rev=9715&view=rev Author: rthurner Date: 2010-04-19 17:09:06 +0000 (Mon, 19 Apr 2010) Log Message: ----------- libserf: Tag as release 0.3.1,REV=2010.04.19 Added Paths: ----------- csw/mgar/pkg/libserf/tags/libserf-0.3.1,REV=2010.04.19/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 19 19:54:12 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 19 Apr 2010 17:54:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9716] csw/mgar/pkg/pil/trunk/Makefile Message-ID: Revision: 9716 http://gar.svn.sourceforge.net/gar/?rev=9716&view=rev Author: rthurner Date: 2010-04-19 17:54:12 +0000 (Mon, 19 Apr 2010) Log Message: ----------- pil - upgrade to 1.1.7, and use python category Modified Paths: -------------- csw/mgar/pkg/pil/trunk/Makefile Modified: csw/mgar/pkg/pil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pil/trunk/Makefile 2010-04-19 17:09:06 UTC (rev 9715) +++ csw/mgar/pkg/pil/trunk/Makefile 2010-04-19 17:54:12 UTC (rev 9716) @@ -1,6 +1,6 @@ GARNAME = pil -GARVERSION = 1.1.6 -CATEGORIES = lib +GARVERSION = 1.1.7 +CATEGORIES = python DISTNAME = Imaging-$(GARVERSION) @@ -30,11 +30,6 @@ include gar/category.mk -install-custom: - @echo " ==> Installing $(GARNAME)" - @( cd $(WORKSRC) ; $(INSTALL_ENV) python ./setup.py install $(INSTALL_ARGS) ) - $(DONADA) - post-install: copy-docs $(DONADA) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 19 19:54:47 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 19 Apr 2010 17:54:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9717] csw/mgar/pkg/pil/trunk/checksums Message-ID: Revision: 9717 http://gar.svn.sourceforge.net/gar/?rev=9717&view=rev Author: rthurner Date: 2010-04-19 17:54:47 +0000 (Mon, 19 Apr 2010) Log Message: ----------- pil - upgrade to 1.1.7, and use python category Modified Paths: -------------- csw/mgar/pkg/pil/trunk/checksums Modified: csw/mgar/pkg/pil/trunk/checksums =================================================================== --- csw/mgar/pkg/pil/trunk/checksums 2010-04-19 17:54:12 UTC (rev 9716) +++ csw/mgar/pkg/pil/trunk/checksums 2010-04-19 17:54:47 UTC (rev 9717) @@ -1 +1 @@ -3a9b5c20ca52f0a9900512d2c7347622 download/Imaging-1.1.6.tar.gz +fc14a54e1ce02a0225be8854bfba478e Imaging-1.1.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 19 19:55:31 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 19 Apr 2010 17:55:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[9718] csw/mgar/pkg/pil/trunk/Makefile Message-ID: Revision: 9718 http://gar.svn.sourceforge.net/gar/?rev=9718&view=rev Author: rthurner Date: 2010-04-19 17:55:31 +0000 (Mon, 19 Apr 2010) Log Message: ----------- pil - upgrade to 1.1.7, and use python category Modified Paths: -------------- csw/mgar/pkg/pil/trunk/Makefile Modified: csw/mgar/pkg/pil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pil/trunk/Makefile 2010-04-19 17:54:47 UTC (rev 9717) +++ csw/mgar/pkg/pil/trunk/Makefile 2010-04-19 17:55:31 UTC (rev 9718) @@ -25,8 +25,6 @@ CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = -INSTALL_SCRIPTS = custom -INSTALL_ARGS = --root=$(DESTDIR) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 19 20:35:37 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 19 Apr 2010 18:35:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9719] csw/mgar/pkg/pil/trunk/Makefile Message-ID: Revision: 9719 http://gar.svn.sourceforge.net/gar/?rev=9719&view=rev Author: rthurner Date: 2010-04-19 18:35:37 +0000 (Mon, 19 Apr 2010) Log Message: ----------- pil - upgrade to 1.1.7, and use python category Modified Paths: -------------- csw/mgar/pkg/pil/trunk/Makefile Modified: csw/mgar/pkg/pil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pil/trunk/Makefile 2010-04-19 17:55:31 UTC (rev 9718) +++ csw/mgar/pkg/pil/trunk/Makefile 2010-04-19 18:35:37 UTC (rev 9719) @@ -12,9 +12,10 @@ MASTER_SITES = http://effbot.org/downloads/ DISTFILES = $(DISTNAME).tar.gz -RUNTIME_DEP_PKGS_CSWpil = CSWftype2 CSWjpeg CSWpython +RUNTIME_DEP_PKGS_CSWpil = CSWlcmsrt CSWftype2 CSWjpeg CSWtcl CSWzlib CSWtk + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = Imaging-(\d+(?:\.\d+)*).tar.gz @@ -26,9 +27,7 @@ BUILD_SCRIPTS = TEST_SCRIPTS = +CHECKPKG_OVERRIDES_CSWpil += license-missing + include gar/category.mk -post-install: copy-docs - $(DONADA) - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 19 20:44:20 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 19 Apr 2010 18:44:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9720] csw/mgar/pkg/apr/trunk/Makefile Message-ID: Revision: 9720 http://gar.svn.sourceforge.net/gar/?rev=9720&view=rev Author: rthurner Date: 2010-04-19 18:44:20 +0000 (Mon, 19 Apr 2010) Log Message: ----------- apr - license file for unintelligent checkpkg ... Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2010-04-19 18:35:37 UTC (rev 9719) +++ csw/mgar/pkg/apr/trunk/Makefile 2010-04-19 18:44:20 UTC (rev 9720) @@ -11,6 +11,7 @@ MASTER_SITES = http://apache.crihan.fr/dist/apr/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +LICENSE = LICENSE # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Apr 19 20:47:50 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 19 Apr 2010 18:47:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9721] csw/mgar/pkg/reportlab/trunk Message-ID: Revision: 9721 http://gar.svn.sourceforge.net/gar/?rev=9721&view=rev Author: rthurner Date: 2010-04-19 18:47:50 +0000 (Mon, 19 Apr 2010) Log Message: ----------- reportlab - upgrade to new python make and version 2.4 Modified Paths: -------------- csw/mgar/pkg/reportlab/trunk/Makefile csw/mgar/pkg/reportlab/trunk/checksums Modified: csw/mgar/pkg/reportlab/trunk/Makefile =================================================================== --- csw/mgar/pkg/reportlab/trunk/Makefile 2010-04-19 18:44:20 UTC (rev 9720) +++ csw/mgar/pkg/reportlab/trunk/Makefile 2010-04-19 18:47:50 UTC (rev 9721) @@ -1,7 +1,7 @@ GARNAME = reportlab -GARVERSION = 2.3 -CATEGORIES = lib -DISTNAME = ReportLab_2_3 +GARVERSION = 2.4 +CATEGORIES = python +DISTNAME = ReportLab_2_4 DESCRIPTION = industry-strength PDF generating solution define BLURB @@ -31,16 +31,6 @@ CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = -INSTALL_SCRIPTS = custom -INSTALL_ARGS = --root=$(DESTDIR) include gar/category.mk -install-custom: - @echo " ==> Installing $(GARNAME)" - @( cd $(WORKSRC) ; $(INSTALL_ENV) python ./setup.py install $(INSTALL_ARGS) ) - $(DONADA) - -post-install: copy-docs - $(DONADA) - Modified: csw/mgar/pkg/reportlab/trunk/checksums =================================================================== --- csw/mgar/pkg/reportlab/trunk/checksums 2010-04-19 18:44:20 UTC (rev 9720) +++ csw/mgar/pkg/reportlab/trunk/checksums 2010-04-19 18:47:50 UTC (rev 9721) @@ -1 +1 @@ -057b846bd3b7b2c3498bf14f6a523632 download/ReportLab_2_3.tar.gz +e6dc4b0fbfb6814f7777e5960774cb5d ReportLab_2_4.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 Mon Apr 19 22:35:37 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 19 Apr 2010 20:35:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9722] csw/mgar/pkg/tomcat6/trunk Message-ID: Revision: 9722 http://gar.svn.sourceforge.net/gar/?rev=9722&view=rev Author: rthurner Date: 2010-04-19 20:35:37 +0000 (Mon, 19 Apr 2010) Log Message: ----------- tomcat6 - upgrade to gar-v2 and 6.0.26 Modified Paths: -------------- csw/mgar/pkg/tomcat6/trunk/Makefile csw/mgar/pkg/tomcat6/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/tomcat6/trunk/ Property changes on: csw/mgar/pkg/tomcat6/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/tomcat6/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat6/trunk/Makefile 2010-04-19 18:47:50 UTC (rev 9721) +++ csw/mgar/pkg/tomcat6/trunk/Makefile 2010-04-19 20:35:37 UTC (rev 9722) @@ -1,5 +1,5 @@ GARNAME = tomcat6 -GARVERSION = 6.0.18 +GARVERSION = 6.0.26 CATEGORIES = server DESCRIPTION = Apache Jakarta Tomcat 6 Servlet/JSP Container Modified: csw/mgar/pkg/tomcat6/trunk/checksums =================================================================== --- csw/mgar/pkg/tomcat6/trunk/checksums 2010-04-19 18:47:50 UTC (rev 9721) +++ csw/mgar/pkg/tomcat6/trunk/checksums 2010-04-19 20:35:37 UTC (rev 9722) @@ -1,15 +1,15 @@ -8354e156f097158f8d7b699078fd39c1 download/apache-tomcat-6.0.18.tar.gz -d47fc99cefd4bbf97b124bc7432f573a download/CSWtomcat6.gspec -d776b690879dc9fef307de153e499af2 download/CSWtomcat6.prototype -d41d8cd98f00b204e9800998ecf8427e download/CSWtomcat6.depend -b46a7d41733aceecfdcba29e8352517f download/preremove -3792b87a62c4548dda0d5d34b48dd528 download/postinstall -e3b7c69c73f9a98477476f91930bfa8b download/preinstall -3a7532b44b2b0b0f8688bd5177e2bdea download/checkinstall -f49c3339aa897df97abf1baf54582fb8 download/space -08c55c4f691abf3a0783d5275dbd77e7 download/i.smfno -5936b013c012eceb670ea715e2812ca4 download/i.smfyes -5ce231c9fafe52180725d4d23a538d9a download/svc-tomcat6 -2c0f11da2f8d2c5aefefdd2258661b26 download/tomcat6.xml -bb366a079377af5416672ce5dd2a0f79 download/tomcat6 -2ead862bc2074b9acef4f10d5becc859 download/cswtomcat6 +d41d8cd98f00b204e9800998ecf8427e CSWtomcat6.depend +d47fc99cefd4bbf97b124bc7432f573a CSWtomcat6.gspec +d776b690879dc9fef307de153e499af2 CSWtomcat6.prototype +f9eafa9bfd620324d1270ae8f09a8c89 apache-tomcat-6.0.26.tar.gz +3a7532b44b2b0b0f8688bd5177e2bdea checkinstall +2ead862bc2074b9acef4f10d5becc859 cswtomcat6 +08c55c4f691abf3a0783d5275dbd77e7 i.smfno +5936b013c012eceb670ea715e2812ca4 i.smfyes +3792b87a62c4548dda0d5d34b48dd528 postinstall +e3b7c69c73f9a98477476f91930bfa8b preinstall +b46a7d41733aceecfdcba29e8352517f preremove +f49c3339aa897df97abf1baf54582fb8 space +5ce231c9fafe52180725d4d23a538d9a svc-tomcat6 +bb366a079377af5416672ce5dd2a0f79 tomcat6 +2c0f11da2f8d2c5aefefdd2258661b26 tomcat6.xml 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 Apr 20 10:18:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Apr 2010 08:18:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9723] csw/mgar/pkg/libtasn1/tags/libtasn1-2.5, REV=2010.03. 15/ Message-ID: Revision: 9723 http://gar.svn.sourceforge.net/gar/?rev=9723&view=rev Author: dmichelsen Date: 2010-04-20 08:18:16 +0000 (Tue, 20 Apr 2010) Log Message: ----------- libtasn1: Tag 2.5,REV=2010.03.15 Added Paths: ----------- csw/mgar/pkg/libtasn1/tags/libtasn1-2.5,REV=2010.03.15/ 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 Apr 20 10:41:30 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Apr 2010 08:41:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[9724] csw/mgar/pkg/libtasn1/trunk Message-ID: Revision: 9724 http://gar.svn.sourceforge.net/gar/?rev=9724&view=rev Author: dmichelsen Date: 2010-04-20 08:41:30 +0000 (Tue, 20 Apr 2010) Log Message: ----------- libtasn1: Update to 2.6 Modified Paths: -------------- csw/mgar/pkg/libtasn1/trunk/Makefile csw/mgar/pkg/libtasn1/trunk/checksums Modified: csw/mgar/pkg/libtasn1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtasn1/trunk/Makefile 2010-04-20 08:18:16 UTC (rev 9723) +++ csw/mgar/pkg/libtasn1/trunk/Makefile 2010-04-20 08:41:30 UTC (rev 9724) @@ -1,5 +1,5 @@ GARNAME = libtasn1 -GARVERSION = 2.5 +GARVERSION = 2.6 CATEGORIES = lib DESCRIPTION = GNU ASN1 library @@ -27,6 +27,10 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# We don't need it and if defined the test breaks +LD_OPTIONS = +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) + BUILD64 = 1 NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -38,5 +42,7 @@ PKGFILES_CSWlibtasn1devel = $(PKGFILES_DEVEL) +CHECKPKG_OVERRIDES_CSWlibtasn1devel += surplus-dependency|CSWlibtasn1 + include gar/category.mk Modified: csw/mgar/pkg/libtasn1/trunk/checksums =================================================================== --- csw/mgar/pkg/libtasn1/trunk/checksums 2010-04-20 08:18:16 UTC (rev 9723) +++ csw/mgar/pkg/libtasn1/trunk/checksums 2010-04-20 08:41:30 UTC (rev 9724) @@ -1 +1 @@ -e60b863697713c3d6a59b1e8c6f9b0d1 libtasn1-2.5.tar.gz +d410671e13038324336917ceed7470a5 libtasn1-2.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 20 14:10:13 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Apr 2010 12:10:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9725] csw/mgar/pkg/xfig/trunk/Makefile Message-ID: Revision: 9725 http://gar.svn.sourceforge.net/gar/?rev=9725&view=rev Author: dmichelsen Date: 2010-04-20 12:10:13 +0000 (Tue, 20 Apr 2010) Log Message: ----------- xfig: Adjust directory locations Modified Paths: -------------- csw/mgar/pkg/xfig/trunk/Makefile Modified: csw/mgar/pkg/xfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfig/trunk/Makefile 2010-04-20 08:41:30 UTC (rev 9724) +++ csw/mgar/pkg/xfig/trunk/Makefile 2010-04-20 12:10:13 UTC (rev 9725) @@ -31,7 +31,7 @@ BUILD_OVERRIDE_VARS = PNGLIBDIR PNGINC ZLIBDIR BUILD_OVERRIDE_VARS += JPEGLIBDIR JPEGINC BUILD_OVERRIDE_VARS += XPMLIBDIR XPMINC -BUILD_OVERRIDE_VARS += XFIGLIBDIR XFIGDOCDIR +BUILD_OVERRIDE_VARS += XFIGLIBDIR XFIGDOCDIR XAPPLOADDIR BUILD_OVERRIDE_VAR_PNGLIBDIR = $(libdir) BUILD_OVERRIDE_VAR_PNGINC = -I$(includedir) @@ -41,8 +41,9 @@ BUILD_OVERRIDE_VAR_XPMLIBDIR = /usr/openwin/lib BUILD_OVERRIDE_VAR_XPMINC = -I/usr/openwin/include/X11 -BUILD_OVERRIDE_VAR_XFIGLIBDIR = $(libdir)/xfig +BUILD_OVERRIDE_VAR_XFIGLIBDIR = $(libdir)/X11/xfig BUILD_OVERRIDE_VAR_XFIGDOCDIR = $(docdir)/xfig +BUILD_OVERRIDE_VAR_XAPPLOADDIR = $(libdir)/X11/app-defaults # -DXFIGLIBDIR=\"/usr/openwin/lib/X11/xfig\" -DXFIGDOCDIR=\"/usr/local/xfig/doc\" -DPRINTCAP=\"/etc/printcap\" @@ -50,25 +51,17 @@ INSTALL_ARGS = install.man install.html install.libs -INSTALL_OVERRIDE_VARS = BINDIR MANPATH LIBDIR XFIGDOCDIR +INSTALL_OVERRIDE_VARS = BINDIR MANPATH LIBDIR XFIGLIBDIR XFIGDOCDIR XAPPLOADDIR INSTALL_OVERRIDE_VAR_BINDIR = $(bindir) INSTALL_OVERRIDE_VAR_MANPATH = $(mandir) INSTALL_OVERRIDE_VAR_LIBDIR = $(libdir) +INSTALL_OVERRIDE_VAR_XFIGLIBDIR = $(libdir)/X11/xfig INSTALL_OVERRIDE_VAR_XFIGDOCDIR = $(docdir)/xfig +INSTALL_OVERRIDE_VAR_XAPPLOADDIR = $(libdir)/X11/app-defaults -# INSTALL_SCRIPTS = custom - include gar/category.mk post-extract-modulated: -find $(WORKSRC) -type d -exec chmod 755 \{\} \; -find $(WORKSRC) -type f -exec chmod ugo+r \{\} \; @$(MAKECOOKIE) - - -#install-custom: -# ginstall -d $(DESTDIR)$(bindir) -# ginstall $(WORKSRC)/xearth $(DESTDIR)$(bindir)/xearth -# ginstall -d $(DESTDIR)$(mandir)/man1 -# ginstall $(WORKSRC)/xearth.man $(DESTDIR)$(mandir)/man1/xearth.1 -# @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 20 14:12:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Apr 2010 12:12:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9726] csw/mgar/pkg/wxwidgets/branches Message-ID: Revision: 9726 http://gar.svn.sourceforge.net/gar/?rev=9726&view=rev Author: dmichelsen Date: 2010-04-20 12:12:45 +0000 (Tue, 20 Apr 2010) Log Message: ----------- wxwidgets: Make branch for fixing #10660 Modified Paths: -------------- csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/Makefile csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/checksums Added Paths: ----------- csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/ csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/files/0002-Define-WXBUILDING-when-building-wxWidgets-itself.patch csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/files/0003-Don-t-define-_T-when-using-Sun-compiler-if-possible.patch csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/files/0004-Don-t-use-_T-in-public-headers-used-under-Unix.patch csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/files/0005-Predefine-wxNEEDS_T-to-fix-wxrc-compilation-with-Sun.patch csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/files/updated-0001.patch Removed Paths: ------------- csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/files/0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch Modified: csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2010-04-20 08:18:16 UTC (rev 9723) +++ csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/Makefile 2010-04-20 12:12:45 UTC (rev 9726) @@ -13,11 +13,6 @@ the platform's own native controls rather than emulating them. endef -# The unicode version can't be currently built on Solaris 8. Doing separate -# builds on Solaris 8 and Solaris 9. Unicode support will start in Solaris 9. -# More details below, look for 'unicode'. -PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 - EXTRA_MODULATORS = GARVERSION # Once upon a time, this build also supported the version 2.8.5 for backward @@ -43,6 +38,12 @@ MASTER_SITES = $(SF_MIRRORS) SF_PROJ = wxwindows +# Patches from http://trac.wxwidgets.org/ticket/10660 +PATCHFILES_10660 = updated-0001.patch +PATCHFILES_10660 += 0002-Define-WXBUILDING-when-building-wxWidgets-itself.patch +PATCHFILES_10660 += 0003-Don-t-define-_T-when-using-Sun-compiler-if-possible.patch +PATCHFILES_10660 += 0004-Don-t-use-_T-in-public-headers-used-under-Unix.patch +PATCHFILES_10660 += 0005-Predefine-wxNEEDS_T-to-fix-wxrc-compilation-with-Sun.patch PATCHFILES_isa-i386-garversion-2.8.5 = 0500-wxT-macro-first-iteration.patch PATCHFILES_isa-i386-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch @@ -56,11 +57,11 @@ PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0005-stupid-vwscanf-workaround.patch -PATCHFILES_isa-i386-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch +PATCHFILES_isa-i386-garversion-2.8.10 = $(PATCHFILES_10660) PATCHFILES_isa-i386-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-i386-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch PATCHFILES_isa-i386-garversion-2.8.10 += 0005-stupid-vwscanf-workaround.patch -PATCHFILES_isa-sparcv8-garversion-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch +PATCHFILES_isa-sparcv8-garversion-2.8.10 = $(PATCHFILES_10660) PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0005-stupid-vwscanf-workaround.patch Modified: csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2010-04-20 08:18:16 UTC (rev 9723) +++ csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/checksums 2010-04-20 12:12:45 UTC (rev 9726) @@ -1,9 +1,13 @@ -7830ab8006ade9b14567341b5481eadd 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch +7059098afff46dca5882358490f18fef 0002-Define-WXBUILDING-when-building-wxWidgets-itself.patch 45df2933ed2fa53f229feda01467db81 0002-Fixing-retarded-checks-for-libGL.patch +b43431d188f76aa977e72a82ea90d019 0003-Don-t-define-_T-when-using-Sun-compiler-if-possible.patch 225f6163a1c31d1f96a3b0548b338105 0003-vsscanf-support-via-ncursesw.patch +559e00c4e1331d7afb2a7e097977aa51 0004-Don-t-use-_T-in-public-headers-used-under-Unix.patch +d7e6a815ac53f9be240295e39ddaac99 0005-Predefine-wxNEEDS_T-to-fix-wxrc-compilation-with-Sun.patch 969c363847e675dc4d3ad6b8871b96db 0005-stupid-vwscanf-workaround.patch d4a33d7a1a30965edf15b54bfb011174 libwx_gtk2u-2.8.so.0.2.0-i386 6a5857bca9695738ba5e185aac4d26e7 libwx_gtk2u-2.8.so.0.2.0-sparc 9f2495b8a4b9b91998a74164efc9ca3a libwx_gtk2u_gl-2.8.so.0.2.0-i386 5870955c6c23ec655c17b4da92548207 libwx_gtk2u_gl-2.8.so.0.2.0-sparc +549ce5ebbba1fd489e52056ec2053698 updated-0001.patch 05b32ca051651f4b1885a90f62969faf wxWidgets-2.8.10.tar.gz Deleted: csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/files/0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/files/0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch 2010-04-20 08:18:16 UTC (rev 9723) +++ csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/files/0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch 2010-04-20 12:12:45 UTC (rev 9726) @@ -1,3566 +0,0 @@ -From 3f9876856278a83d9f15e3d3be8ac1b037356a15 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Fri, 21 Aug 2009 08:49:59 +0200 -Subject: [PATCH] Patches from http://trac.wxwidgets.org/ticket/10660 - ---- - Makefile.in | 128 +++++++------- - build/bakefiles/common.bkl | 2 + - include/wx/afterstd.h | 11 + - include/wx/arrstr.h | 4 +- - include/wx/artprov.h | 6 +- - include/wx/beforestd.h | 10 + - include/wx/buffer.h | 2 +- - include/wx/cocoa/dirdlg.h | 2 +- - include/wx/confbase.h | 4 +- - include/wx/cppunit.h | 2 +- - include/wx/cshelp.h | 2 +- - include/wx/datectrl.h | 2 +- - include/wx/datetime.h | 42 ++-- - include/wx/dbgrid.h | 6 +- - include/wx/dbtable.h | 2 +- - include/wx/dcbuffer.h | 6 +- - include/wx/dcmirror.h | 6 +- - include/wx/debug.h | 6 +- - include/wx/debugrpt.h | 2 +- - include/wx/defs.h | 18 +- - include/wx/dynlib.h | 2 +- - include/wx/dynload.h | 2 +- - include/wx/event.h | 4 +- - include/wx/ffile.h | 4 +- - include/wx/filefn.h | 2 +- - include/wx/filename.h | 4 +- - include/wx/generic/calctrl.h | 6 +- - include/wx/generic/combo.h | 4 +- - include/wx/generic/grid.h | 14 +- - include/wx/generic/gridctrl.h | 4 +- - include/wx/generic/spinctlg.h | 8 +- - include/wx/generic/splitter.h | 2 +- - include/wx/glcanvas.h | 2 +- - include/wx/gtk/checklst.h | 6 +- - include/wx/gtk/spinctrl.h | 4 +- - include/wx/gtk1/checklst.h | 6 +- - include/wx/gtk1/spinctrl.h | 4 +- - include/wx/imagbmp.h | 26 ++-- - include/wx/image.h | 12 +- - include/wx/imagtiff.h | 8 +- - include/wx/intl.h | 16 +- - include/wx/list.h | 2 +- - include/wx/longlong.h | 8 +- - include/wx/mimetype.h | 6 +- - include/wx/module.h | 2 +- - include/wx/msgdlg.h | 4 +- - include/wx/object.h | 2 +- - include/wx/palette.h | 2 +- - include/wx/private/fileback.h | 2 +- - include/wx/protocol/ftp.h | 2 +- - include/wx/recguard.h | 2 +- - include/wx/selstore.h | 2 +- - include/wx/sound.h | 2 +- - include/wx/spinbutt.h | 2 +- - include/wx/stopwatch.h | 2 +- - include/wx/string.h | 30 ++-- - include/wx/tbarbase.h | 4 +- - include/wx/thrimpl.cpp | 22 +- - include/wx/tokenzr.h | 2 +- - include/wx/univ/button.h | 8 +- - include/wx/univ/checkbox.h | 6 +- - include/wx/univ/checklst.h | 2 +- - include/wx/univ/combobox.h | 6 +- - include/wx/univ/control.h | 4 +- - include/wx/univ/inpcons.h | 2 +- - include/wx/univ/inphand.h | 30 ++-- - include/wx/univ/listbox.h | 36 ++-- - include/wx/univ/menuitem.h | 4 +- - include/wx/univ/notebook.h | 6 +- - include/wx/univ/scrolbar.h | 18 +- - include/wx/univ/slider.h | 20 +- - include/wx/univ/spinbutt.h | 4 +- - include/wx/univ/textctrl.h | 52 +++--- - include/wx/univ/toolbar.h | 4 +- - include/wx/univ/toplevel.h | 12 +- - include/wx/valtext.h | 4 +- - include/wx/vector.h | 2 +- - include/wx/version.h | 4 +- - include/wx/vlbox.h | 4 +- - include/wx/wfstream.h | 4 +- - include/wx/wxchar.h | 32 ++-- - include/wx/x11/textctrl.h | 50 +++--- - include/wx/xrc/xmlres.h | 2 +- - utils/wxrc/wxrc.cpp | 414 ++++++++++++++++++++-------------------- - 84 files changed, 631 insertions(+), 600 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 8c1a03e..175a0fb 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -75,7 +75,7 @@ WX_RELEASE = 2.8 - WX_RELEASE_NODOT = 28 - WX_VERSION = $(WX_RELEASE).10 - LIBDIRNAME = $(wx_top_builddir)/lib --WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \ -+WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ -DWXBUILDING $(__WXUNIV_DEFINE_p) $(____SHARED) \ - $(CPPFLAGS) $(CFLAGS) - WXREGEX_OBJECTS = \ - wxregex_regcomp.o \ -@@ -676,17 +676,17 @@ ALL_BASE_SOURCES = \ - src/common/dbtable.cpp - MONODLL_CFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 \ - -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) - MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) - MONODLL_OBJCXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS) - MONODLL_OBJECTS = \ -@@ -781,17 +781,17 @@ MONODLL_OBJECTS = \ - MONODLL_ODEP = $(_____pch_wxprec_monodll_wx_wxprec_h_gch___depname) - MONOLIB_CFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 $(CPPFLAGS) \ - $(CFLAGS) - MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS) - MONOLIB_OBJCXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DwxUSE_BASE=1 $(CPPFLAGS) $(OBJCXXFLAGS) - MONOLIB_OBJECTS = \ -@@ -885,12 +885,12 @@ MONOLIB_OBJECTS = \ - MONOLIB_ODEP = $(_____pch_wxprec_monolib_wx_wxprec_h_gch___depname) - BASEDLL_CFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 \ - -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) - BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) \ - $(CXXFLAGS) -@@ -971,12 +971,12 @@ BASEDLL_OBJECTS = \ - BASEDLL_ODEP = $(_____pch_wxprec_basedll_wx_wxprec_h_gch___depname) - BASELIB_CFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 \ - -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) - BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS) - BASELIB_OBJECTS = \ -@@ -1055,7 +1055,7 @@ BASELIB_OBJECTS = \ - BASELIB_ODEP = $(_____pch_wxprec_baselib_wx_wxprec_h_gch___depname) - NETDLL_CXXFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ - -DWXMAKINGDLL_NET $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) - NETDLL_OBJECTS = \ -@@ -1074,7 +1074,7 @@ NETDLL_OBJECTS = \ - NETDLL_ODEP = $(_____pch_wxprec_netdll_wx_wxprec_h_gch___depname) - NETLIB_CXXFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) \ - $(CXXFLAGS) - NETLIB_OBJECTS = \ -@@ -1092,18 +1092,18 @@ NETLIB_OBJECTS = \ - NETLIB_ODEP = $(_____pch_wxprec_netlib_wx_wxprec_h_gch___depname) - COREDLL_CFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \ - -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) - COREDLL_CXXFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) \ - $(CXXFLAGS) - COREDLL_OBJCXXFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) \ - $(OBJCXXFLAGS) -@@ -1119,17 +1119,17 @@ COREDLL_OBJECTS = \ - COREDLL_ODEP = $(_____pch_wxprec_coredll_wx_wxprec_h_gch___depname) - CORELIB_CFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CPPFLAGS) \ - $(CFLAGS) - CORELIB_CXXFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DwxUSE_BASE=0 $(CPPFLAGS) $(CXXFLAGS) - CORELIB_OBJCXXFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DwxUSE_BASE=0 $(CPPFLAGS) $(OBJCXXFLAGS) - CORELIB_OBJECTS = \ -@@ -1143,17 +1143,17 @@ CORELIB_OBJECTS = \ - CORELIB_ODEP = $(_____pch_wxprec_corelib_wx_wxprec_h_gch___depname) - ADVDLL_CFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \ - -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) - ADVDLL_CXXFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \ - -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) - ADVDLL_OBJCXXFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS) - ADVDLL_OBJECTS = \ -@@ -1163,15 +1163,15 @@ ADVDLL_OBJECTS = \ - ADVDLL_ODEP = $(_____pch_wxprec_advdll_wx_wxprec_h_gch___depname) - ADVLIB_CFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CFLAGS) - ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) - ADVLIB_OBJCXXFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - $(CPPFLAGS) $(OBJCXXFLAGS) - ADVLIB_OBJECTS = \ -@@ -1180,12 +1180,12 @@ ADVLIB_OBJECTS = \ - ADVLIB_ODEP = $(_____pch_wxprec_advlib_wx_wxprec_h_gch___depname) - MEDIADLL_CXXFLAGS = $(__mediadll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DWXUSINGDLL -DWXMAKINGDLL_MEDIA $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) - MEDIADLL_OBJCXXFLAGS = $(__mediadll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DWXUSINGDLL -DWXMAKINGDLL_MEDIA $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS) - MEDIADLL_OBJECTS = \ -@@ -1195,12 +1195,12 @@ MEDIADLL_OBJECTS = \ - MEDIADLL_ODEP = $(_____pch_wxprec_mediadll_wx_wxprec_h_gch___depname) - MEDIALIB_CXXFLAGS = $(__medialib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - $(CPPFLAGS) $(CXXFLAGS) - MEDIALIB_OBJCXXFLAGS = $(__medialib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - $(CPPFLAGS) $(OBJCXXFLAGS) - MEDIALIB_OBJECTS = \ -@@ -1209,7 +1209,7 @@ MEDIALIB_OBJECTS = \ - MEDIALIB_ODEP = $(_____pch_wxprec_medialib_wx_wxprec_h_gch___depname) - ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(PIC_FLAG) $(CPPFLAGS) \ - $(CXXFLAGS) -@@ -1220,7 +1220,7 @@ ODBCDLL_OBJECTS = \ - ODBCDLL_ODEP = $(_____pch_wxprec_odbcdll_wx_wxprec_h_gch___depname) - ODBCLIB_CXXFLAGS = $(__odbclib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) - ODBCLIB_OBJECTS = \ -@@ -1229,7 +1229,7 @@ ODBCLIB_OBJECTS = \ - ODBCLIB_ODEP = $(_____pch_wxprec_odbclib_wx_wxprec_h_gch___depname) - DBGRIDDLL_CXXFLAGS = $(__dbgriddll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DWXUSINGDLL -DWXMAKINGDLL_DBGRID $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) - DBGRIDDLL_OBJECTS = \ -@@ -1238,7 +1238,7 @@ DBGRIDDLL_OBJECTS = \ - DBGRIDDLL_ODEP = $(_____pch_wxprec_dbgriddll_wx_wxprec_h_gch___depname) - DBGRIDLIB_CXXFLAGS = $(__dbgridlib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - $(CPPFLAGS) $(CXXFLAGS) - DBGRIDLIB_OBJECTS = \ -@@ -1246,7 +1246,7 @@ DBGRIDLIB_OBJECTS = \ - DBGRIDLIB_ODEP = $(_____pch_wxprec_dbgridlib_wx_wxprec_h_gch___depname) - HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DWXUSINGDLL -DWXMAKINGDLL_HTML $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) - HTMLDLL_OBJECTS = \ -@@ -1278,7 +1278,7 @@ HTMLDLL_OBJECTS = \ - HTMLDLL_ODEP = $(_____pch_wxprec_htmldll_wx_wxprec_h_gch___depname) - HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - $(CPPFLAGS) $(CXXFLAGS) - HTMLLIB_OBJECTS = \ -@@ -1309,7 +1309,7 @@ HTMLLIB_OBJECTS = \ - HTMLLIB_ODEP = $(_____pch_wxprec_htmllib_wx_wxprec_h_gch___depname) - QADLL_CXXFLAGS = $(__qadll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \ - -DWXMAKINGDLL_QA $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) - QADLL_OBJECTS = \ -@@ -1319,7 +1319,7 @@ QADLL_OBJECTS = \ - QADLL_ODEP = $(_____pch_wxprec_qadll_wx_wxprec_h_gch___depname) - QALIB_CXXFLAGS = $(__qalib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) - QALIB_OBJECTS = \ - qalib_debugrpt.o \ -@@ -1327,7 +1327,7 @@ QALIB_OBJECTS = \ - QALIB_ODEP = $(_____pch_wxprec_qalib_wx_wxprec_h_gch___depname) - XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ - -DWXMAKINGDLL_XML $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) - XMLDLL_OBJECTS = \ -@@ -1337,7 +1337,7 @@ XMLDLL_OBJECTS = \ - XMLDLL_ODEP = $(_____pch_wxprec_xmldll_wx_wxprec_h_gch___depname) - XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) \ - $(CXXFLAGS) - XMLLIB_OBJECTS = \ -@@ -1346,7 +1346,7 @@ XMLLIB_OBJECTS = \ - XMLLIB_ODEP = $(_____pch_wxprec_xmllib_wx_wxprec_h_gch___depname) - XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \ - -DWXMAKINGDLL_XRC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) - XRCDLL_OBJECTS = \ -@@ -1410,7 +1410,7 @@ XRCDLL_OBJECTS = \ - XRCDLL_ODEP = $(_____pch_wxprec_xrcdll_wx_wxprec_h_gch___depname) - XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) - XRCLIB_OBJECTS = \ - xrclib_xh_animatctrl.o \ -@@ -1472,7 +1472,7 @@ XRCLIB_OBJECTS = \ - XRCLIB_ODEP = $(_____pch_wxprec_xrclib_wx_wxprec_h_gch___depname) - AUIDLL_CXXFLAGS = $(__auidll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \ - -DWXMAKINGDLL_AUI $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) - AUIDLL_OBJECTS = \ -@@ -1486,7 +1486,7 @@ AUIDLL_OBJECTS = \ - AUIDLL_ODEP = $(_____pch_wxprec_auidll_wx_wxprec_h_gch___depname) - AUILIB_CXXFLAGS = $(__auilib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) - AUILIB_OBJECTS = \ - auilib_framemanager.o \ -@@ -1498,7 +1498,7 @@ AUILIB_OBJECTS = \ - AUILIB_ODEP = $(_____pch_wxprec_auilib_wx_wxprec_h_gch___depname) - RICHTEXTDLL_CXXFLAGS = $(__richtextdll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -DWXUSINGDLL -DWXMAKINGDLL_RICHTEXT $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) - RICHTEXTDLL_OBJECTS = \ -@@ -1515,7 +1515,7 @@ RICHTEXTDLL_OBJECTS = \ - RICHTEXTDLL_ODEP = $(_____pch_wxprec_richtextdll_wx_wxprec_h_gch___depname) - RICHTEXTLIB_CXXFLAGS = $(__richtextlib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ -- $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ -+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - $(CPPFLAGS) $(CXXFLAGS) - RICHTEXTLIB_OBJECTS = \ -@@ -1531,12 +1531,12 @@ RICHTEXTLIB_OBJECTS = \ - RICHTEXTLIB_ODEP = $(_____pch_wxprec_richtextlib_wx_wxprec_h_gch___depname) - GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \ - -DWXMAKINGDLL_GL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) - GLDLL_OBJCXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL \ - -DWXMAKINGDLL_GL $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS) - GLDLL_OBJECTS = \ -@@ -1545,11 +1545,11 @@ GLDLL_OBJECTS = \ - GLDLL_ODEP = $(_____pch_wxprec_gldll_wx_wxprec_h_gch___depname) - GLLIB_CXXFLAGS = $(__gllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) - GLLIB_OBJCXXFLAGS = $(__gllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -- $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ -+ -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(OBJCXXFLAGS) - GLLIB_OBJECTS = \ - $(__OPENGL_SRC_OBJECTS_1) -@@ -12660,7 +12660,7 @@ wxexpat_xmltok.o: $(srcdir)/src/expat/lib/xmltok.c - $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $(srcdir)/src/expat/lib/xmltok.c - - monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_BASE=1 --define WXMAKINGDLL -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_BASE=1 --define WXMAKINGDLL - - monodll_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp -@@ -20937,7 +20937,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) - @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp - - basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 - - basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp -@@ -22122,7 +22122,7 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP) - @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp - - netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET - - netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETDLL_ODEP) - $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp -@@ -22227,7 +22227,7 @@ netlib_carbon_gsocket.o: $(srcdir)/src/mac/carbon/gsocket.cpp $(NETLIB_ODEP) - @COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp - - coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 - - coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp -@@ -28158,7 +28158,7 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) - @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp - - advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_ADV -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_ADV - - advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP) - $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp -@@ -28581,7 +28581,7 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP) - @COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp - - mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA - - mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP) - $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp -@@ -28668,7 +28668,7 @@ medialib_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIALIB_ODEP) - @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp - - odbcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ODBCDLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_ODBC -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_ODBC - - odbcdll_db.o: $(srcdir)/src/common/db.cpp $(ODBCDLL_ODEP) - $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $(srcdir)/src/common/db.cpp -@@ -28683,7 +28683,7 @@ odbclib_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(ODBCLIB_ODEP) - $(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $(srcdir)/src/common/dbtable.cpp - - dbgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(DBGRIDDLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_DBGRID -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_DBGRID - - dbgriddll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(DBGRIDDLL_ODEP) - $(CXXC) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp -@@ -28692,7 +28692,7 @@ dbgridlib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(DBGRIDLIB_ODEP) - $(CXXC) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp - - htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_HTML -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_HTML - - htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(HTMLDLL_ODEP) - $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp -@@ -28851,7 +28851,7 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP) - @COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp - - qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_QA -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_QA - - qadll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(QADLL_ODEP) - $(CXXC) -c -o $@ $(QADLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp -@@ -28866,7 +28866,7 @@ qalib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(QALIB_ODEP) - $(CXXC) -c -o $@ $(QALIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp - - xmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(XMLDLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML - - xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(XMLDLL_ODEP) - $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp -@@ -28881,7 +28881,7 @@ xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(XMLLIB_ODEP) - $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp - - xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_XRC -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_XRC - - xrcdll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCDLL_ODEP) - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp -@@ -29220,7 +29220,7 @@ xrclib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCLIB_ODEP) - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp - - auidll_version_rc.o: $(srcdir)/src/msw/version.rc $(AUIDLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_AUI -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_AUI - - auidll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUIDLL_ODEP) - $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp -@@ -29259,7 +29259,7 @@ auilib_auibar.o: $(srcdir)/src/aui/auibar.cpp $(AUILIB_ODEP) - $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/auibar.cpp - - richtextdll_version_rc.o: $(srcdir)/src/msw/version.rc $(RICHTEXTDLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT - - richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP) - $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp -@@ -29316,7 +29316,7 @@ richtextlib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXT - $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp - - gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP) -- $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_GL -+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_57) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_ODBC_p_57) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_GL - - gldll_carbon_glcanvas.o: $(srcdir)/src/mac/carbon/glcanvas.cpp $(GLDLL_ODEP) - $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/glcanvas.cpp -diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl -index 25cc25f..338fdad 100644 ---- a/build/bakefiles/common.bkl -+++ b/build/bakefiles/common.bkl -@@ -592,6 +592,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r - $(wxwin.mkLibName(wxid)) - $(WXLIBNAME) - -+ WXBUILDING -+ - - - $(WXTOPDIR)src/common/dummy.cpp -diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h -index 4c1d4a5..a1ad8d1 100644 ---- a/include/wx/afterstd.h -+++ b/include/wx/afterstd.h -@@ -46,3 +46,14 @@ - #endif - #endif - -+#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) -+#ifndef _T -+#if !wxUSE_UNICODE -+#define _T(x) x -+#else /* Unicode */ -+/* use wxCONCAT_HELPER so that x could be expanded if it's a macro */ -+#define _T(x) wxCONCAT_HELPER(L, x) -+#endif /* ASCII/Unicode */ -+#endif /* !defined(_T) */ -+ -+#endif /* defined(__SUNPRO_CC) || defined(__SUNPRO_C) */ -diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h -index 0f1b908..d669dc6 100644 ---- a/include/wx/arrstr.h -+++ b/include/wx/arrstr.h -@@ -152,7 +152,7 @@ public: - wxString& Item(size_t nIndex) const - { - wxASSERT_MSG( nIndex < m_nCount, -- _T("wxArrayString: index out of bounds") ); -+ wxT("wxArrayString: index out of bounds") ); - - return *(wxString *)&(m_pItems[nIndex]); - } -@@ -163,7 +163,7 @@ public: - wxString& Last() const - { - wxASSERT_MSG( !IsEmpty(), -- _T("wxArrayString: index out of bounds") ); -+ wxT("wxArrayString: index out of bounds") ); - return Item(Count() - 1); - } - -diff --git a/include/wx/artprov.h b/include/wx/artprov.h -index 1d026a7..e6df4f3 100644 ---- a/include/wx/artprov.h -+++ b/include/wx/artprov.h -@@ -27,10 +27,10 @@ class wxArtProviderModule; - typedef wxString wxArtClient; - typedef wxString wxArtID; - --#define wxART_MAKE_CLIENT_ID_FROM_STR(id) (id + _T("_C")) --#define wxART_MAKE_CLIENT_ID(id) _T(#id) _T("_C") -+#define wxART_MAKE_CLIENT_ID_FROM_STR(id) (id + wxT("_C")) -+#define wxART_MAKE_CLIENT_ID(id) wxT(#id) wxT("_C") - #define wxART_MAKE_ART_ID_FROM_STR(id) (id) --#define wxART_MAKE_ART_ID(id) _T(#id) -+#define wxART_MAKE_ART_ID(id) wxT(#id) - - // ---------------------------------------------------------------------------- - // Art clients -diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h -index aacfc7c..609073c 100644 ---- a/include/wx/beforestd.h -+++ b/include/wx/beforestd.h -@@ -63,3 +63,13 @@ - #pragma warning(disable:4786) - #endif // VC++ < 7 - -+#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) -+#undef _T -+#endif // SUNCC -+ -+#if defined (WXBUILDING) -+#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) -+#undef _T -+#endif /* SUNCC */ -+#endif /* WXBUILDING */ -+ -diff --git a/include/wx/buffer.h b/include/wx/buffer.h -index 605f4f1..f169f22 100644 ---- a/include/wx/buffer.h -+++ b/include/wx/buffer.h -@@ -286,7 +286,7 @@ public: - // Other ways to append to the buffer - void AppendByte(char data) - { -- wxCHECK_RET( m_bufdata->m_data, _T("invalid wxMemoryBuffer") ); -+ wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") ); - - m_bufdata->ResizeIfNeeded(m_bufdata->m_len + 1); - *(((char*)m_bufdata->m_data) + m_bufdata->m_len) = data; -diff --git a/include/wx/cocoa/dirdlg.h b/include/wx/cocoa/dirdlg.h -index 3c5b8dc..084d561 100644 ---- a/include/wx/cocoa/dirdlg.h -+++ b/include/wx/cocoa/dirdlg.h -@@ -26,7 +26,7 @@ class WXDLLEXPORT wxDirDialog: public wxDirDialogBase - public: - wxDirDialog(wxWindow *parent, - const wxString& message = wxDirSelectorPromptStr, -- const wxString& defaultPath = _T(""), -+ const wxString& defaultPath = wxT(""), - long style = wxDD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, -diff --git a/include/wx/confbase.h b/include/wx/confbase.h -index 9e0cf54..2941b8a 100644 ---- a/include/wx/confbase.h -+++ b/include/wx/confbase.h -@@ -30,13 +30,13 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString; - - /// separates group and entry names (probably shouldn't be changed) - #ifndef wxCONFIG_PATH_SEPARATOR -- #define wxCONFIG_PATH_SEPARATOR _T('/') -+ #define wxCONFIG_PATH_SEPARATOR wxT('/') - #endif - - /// introduces immutable entries - // (i.e. the ones which can't be changed from the local config file) - #ifndef wxCONFIG_IMMUTABLE_PREFIX -- #define wxCONFIG_IMMUTABLE_PREFIX _T('!') -+ #define wxCONFIG_IMMUTABLE_PREFIX wxT('!') - #endif - - #if wxUSE_CONFIG -diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h -index c70cfbd..18266f8 100644 ---- a/include/wx/cppunit.h -+++ b/include/wx/cppunit.h -@@ -69,7 +69,7 @@ - if (Condition) \ - { anyTest; } \ - else \ -- wxLogInfo(wxString::Format(_T("skipping: %s.%s\n reason: %s equals false\n"), \ -+ wxLogInfo(wxString::Format(wxT("skipping: %s.%s\n reason: %s equals false\n"), \ - wxString(suiteName, wxConvUTF8).c_str(), \ - wxString(#testMethod, wxConvUTF8).c_str(), \ - wxString(#Condition, wxConvUTF8).c_str())) -diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h -index f77ac4f..4cee508 100644 ---- a/include/wx/cshelp.h -+++ b/include/wx/cshelp.h -@@ -134,7 +134,7 @@ public: - const wxPoint& pt, - wxHelpEvent::Origin origin) - { -- wxCHECK_MSG( window, false, _T("window must not be NULL") ); -+ wxCHECK_MSG( window, false, wxT("window must not be NULL") ); - - m_helptextAtPoint = pt; - m_helptextOrigin = origin; -diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h -index 0da1277..085a8d1 100644 ---- a/include/wx/datectrl.h -+++ b/include/wx/datectrl.h -@@ -19,7 +19,7 @@ - #include "wx/control.h" // the base class - #include "wx/datetime.h" - --#define wxDatePickerCtrlNameStr _T("datectrl") -+#define wxDatePickerCtrlNameStr wxT("datectrl") - - // wxDatePickerCtrl styles - enum -diff --git a/include/wx/datetime.h b/include/wx/datetime.h -index e74dde1..cf6c024 100644 ---- a/include/wx/datetime.h -+++ b/include/wx/datetime.h -@@ -951,37 +951,37 @@ public: - - inline bool operator<(const wxDateTime& dt) const - { -- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); -+ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); - return GetValue() < dt.GetValue(); - } - - inline bool operator<=(const wxDateTime& dt) const - { -- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); -+ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); - return GetValue() <= dt.GetValue(); - } - - inline bool operator>(const wxDateTime& dt) const - { -- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); -+ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); - return GetValue() > dt.GetValue(); - } - - inline bool operator>=(const wxDateTime& dt) const - { -- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); -+ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); - return GetValue() >= dt.GetValue(); - } - - inline bool operator==(const wxDateTime& dt) const - { -- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); -+ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); - return GetValue() == dt.GetValue(); - } - - inline bool operator!=(const wxDateTime& dt) const - { -- wxASSERT_MSG( IsValid() && dt.IsValid(), _T("invalid wxDateTime") ); -+ wxASSERT_MSG( IsValid() && dt.IsValid(), wxT("invalid wxDateTime") ); - return GetValue() != dt.GetValue(); - } - -@@ -1075,15 +1075,15 @@ public: - wxString Format(const wxChar *format = wxDefaultDateTimeFormat, - const TimeZone& tz = Local) const; - // preferred date representation for the current locale -- wxString FormatDate() const { return Format(_T("%x")); } -+ wxString FormatDate() const { return Format(wxT("%x")); } - // preferred time representation for the current locale -- wxString FormatTime() const { return Format(_T("%X")); } -+ wxString FormatTime() const { return Format(wxT("%X")); } - // returns the string representing the date in ISO 8601 format - // (YYYY-MM-DD) -- wxString FormatISODate() const { return Format(_T("%Y-%m-%d")); } -+ wxString FormatISODate() const { return Format(wxT("%Y-%m-%d")); } - // returns the string representing the time in ISO 8601 format - // (HH:MM:SS) -- wxString FormatISOTime() const { return Format(_T("%H:%M:%S")); } -+ wxString FormatISOTime() const { return Format(wxT("%H:%M:%S")); } - - // implementation - // ------------------------------------------------------------------------ -@@ -1647,7 +1647,7 @@ inline wxDateTime::wxDateTime(double jdn) - - inline wxDateTime& wxDateTime::Set(const Tm& tm) - { -- wxASSERT_MSG( tm.IsValid(), _T("invalid broken down date/time") ); -+ wxASSERT_MSG( tm.IsValid(), wxT("invalid broken down date/time") ); - - return Set(tm.mday, (Month)tm.mon, tm.year, - tm.hour, tm.min, tm.sec, tm.msec); -@@ -1678,14 +1678,14 @@ inline wxDateTime::wxDateTime(wxDateTime_t day, - - inline wxLongLong wxDateTime::GetValue() const - { -- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); -+ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); - - return m_time; - } - - inline time_t wxDateTime::GetTicks() const - { -- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); -+ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); - if ( !IsInStdRange() ) - { - return (time_t)-1; -@@ -1753,21 +1753,21 @@ inline wxDateTime wxDateTime::GetYearDay(wxDateTime_t yday) const - - inline bool wxDateTime::IsEqualTo(const wxDateTime& datetime) const - { -- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime")); -+ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); - - return m_time == datetime.m_time; - } - - inline bool wxDateTime::IsEarlierThan(const wxDateTime& datetime) const - { -- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime")); -+ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); - - return m_time < datetime.m_time; - } - - inline bool wxDateTime::IsLaterThan(const wxDateTime& datetime) const - { -- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime")); -+ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); - - return m_time > datetime.m_time; - } -@@ -1824,14 +1824,14 @@ inline bool wxDateTime::IsEqualUpTo(const wxDateTime& dt, - - inline wxDateTime wxDateTime::Add(const wxTimeSpan& diff) const - { -- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); -+ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); - - return wxDateTime(m_time + diff.GetValue()); - } - - inline wxDateTime& wxDateTime::Add(const wxTimeSpan& diff) - { -- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); -+ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); - - m_time += diff.GetValue(); - -@@ -1845,14 +1845,14 @@ inline wxDateTime& wxDateTime::operator+=(const wxTimeSpan& diff) - - inline wxDateTime wxDateTime::Subtract(const wxTimeSpan& diff) const - { -- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); -+ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); - - return wxDateTime(m_time - diff.GetValue()); - } - - inline wxDateTime& wxDateTime::Subtract(const wxTimeSpan& diff) - { -- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime")); -+ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime")); - - m_time -= diff.GetValue(); - -@@ -1866,7 +1866,7 @@ inline wxDateTime& wxDateTime::operator-=(const wxTimeSpan& diff) - - inline wxTimeSpan wxDateTime::Subtract(const wxDateTime& datetime) const - { -- wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime")); -+ wxASSERT_MSG( IsValid() && datetime.IsValid(), wxT("invalid wxDateTime")); - - return wxTimeSpan(GetValue() - datetime.GetValue()); - } -diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h -index 4e8655c..7e3b513 100644 ---- a/include/wx/dbgrid.h -+++ b/include/wx/dbgrid.h -@@ -23,7 +23,7 @@ - #include "wx/grid.h" - #include "wx/dbkeyg.h" - --#define wxGRID_VALUE_DBAUTO _T("dbauto") -+#define wxGRID_VALUE_DBAUTO wxT("dbauto") - - WX_DECLARE_USER_EXPORTED_OBJARRAY(GenericKey,keyarray,WXDLLIMPEXP_DBGRID); - -@@ -119,12 +119,12 @@ public: - - virtual int GetNumberRows() - { -- wxLogDebug(_T(" GetNumberRows() = %i"),m_rowtotal); -+ wxLogDebug(wxT(" GetNumberRows() = %i"),m_rowtotal); - return m_rowtotal; - } - virtual int GetNumberCols() - { -- wxLogDebug(_T(" GetNumberCols() = %i"),m_nocols); -+ wxLogDebug(wxT(" GetNumberCols() = %i"),m_nocols); - return m_nocols; - } - virtual bool IsEmptyCell(int row, int col) ; -diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h -index 1bbef54..9fb6260 100644 ---- a/include/wx/dbtable.h -+++ b/include/wx/dbtable.h -@@ -305,7 +305,7 @@ public: - HSTMT *NewCursor(bool setCursor = false, bool bindColumns = true) { return GetNewCursor(setCursor,bindColumns); } - #endif - -- ULONG Count(const wxString &args=_T("*")); -+ ULONG Count(const wxString &args=wxT("*")); - int DB_STATUS(void) { return(pDb->DB_STATUS); } - - bool IsColNull(UWORD colNumber) const; -diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h -index 46c28ba..7249235 100644 ---- a/include/wx/dcbuffer.h -+++ b/include/wx/dcbuffer.h -@@ -100,8 +100,8 @@ public: - // blitting to) is destroyed. - void UnMask() - { -- wxCHECK_RET( m_dc, _T("no underlying wxDC?") ); -- wxASSERT_MSG( m_buffer && m_buffer->IsOk(), _T("invalid backing store") ); -+ wxCHECK_RET( m_dc, wxT("no underlying wxDC?") ); -+ wxASSERT_MSG( m_buffer && m_buffer->IsOk(), wxT("invalid backing store") ); - - wxCoord x = 0, - y = 0; -@@ -122,7 +122,7 @@ private: - // common part of Init()s - void InitCommon(wxDC *dc, int style) - { -- wxASSERT_MSG( !m_dc, _T("wxBufferedDC already initialised") ); -+ wxASSERT_MSG( !m_dc, wxT("wxBufferedDC already initialised") ); - - m_dc = dc; - m_style = style; -diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h -index bc15a39..3b9dcb9 100644 ---- a/include/wx/dcmirror.h -+++ b/include/wx/dcmirror.h -@@ -135,7 +135,7 @@ protected: - wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc) - { -- wxFAIL_MSG( _T("this is probably wrong") ); -+ wxFAIL_MSG( wxT("this is probably wrong") ); - - m_dc.DoDrawArc(GetX(x1, y1), GetY(x1, y1), - GetX(x2, y2), GetY(x2, y2), -@@ -152,7 +152,7 @@ protected: - virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea) - { -- wxFAIL_MSG( _T("this is probably wrong") ); -+ wxFAIL_MSG( wxT("this is probably wrong") ); - - m_dc.DoDrawEllipticArc(GetX(x, y), GetY(x, y), - GetX(w, h), GetY(w, h), -@@ -256,7 +256,7 @@ protected: - - virtual void DoSetClippingRegionAsRegion(const wxRegion& WXUNUSED(region)) - { -- wxFAIL_MSG( _T("not implemented") ); -+ wxFAIL_MSG( wxT("not implemented") ); - } - - virtual void DoSetClippingRegion(wxCoord x, wxCoord y, -diff --git a/include/wx/debug.h b/include/wx/debug.h -index fd389d5..7e07377 100644 ---- a/include/wx/debug.h -+++ b/include/wx/debug.h -@@ -123,13 +123,13 @@ - if ( cond ) \ - {} \ - else \ -- wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(#cond), msg) -+ wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(#cond), msg) - #else - #define wxASSERT_MSG(cond, msg) \ - if ( cond ) \ - ; \ - else \ -- wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(#cond), msg) -+ wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(#cond), msg) - #endif - - /* special form of assert: always triggers it (in debug mode) */ -@@ -140,7 +140,7 @@ - - /* FAIL with some message and a condition */ - #define wxFAIL_COND_MSG(cond, msg) \ -- wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(cond), msg) -+ wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(cond), msg) - - /* An assert helper used to avoid warning when testing constant expressions, */ - /* i.e. wxASSERT( sizeof(int) == 4 ) can generate a compiler warning about */ -diff --git a/include/wx/debugrpt.h b/include/wx/debugrpt.h -index a50f1cb..d2b57d5 100644 ---- a/include/wx/debugrpt.h -+++ b/include/wx/debugrpt.h -@@ -161,7 +161,7 @@ public: - wxDebugReportUpload(const wxString& url, - const wxString& input, - const wxString& action, -- const wxString& curl = _T("curl")); -+ const wxString& curl = wxT("curl")); - - protected: - virtual bool DoProcess(); -diff --git a/include/wx/defs.h b/include/wx/defs.h -index 0e2ca0c..5e1ae54 100644 ---- a/include/wx/defs.h -+++ b/include/wx/defs.h -@@ -915,28 +915,28 @@ inline void *wxUIntToPtr(wxUIntPtr p) - #if (defined(__VISUALC__) && defined(__WIN32__)) - #define wxLongLong_t __int64 - #define wxLongLongSuffix i64 -- #define wxLongLongFmtSpec _T("I64") -+ #define wxLongLongFmtSpec wxT("I64") - #elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520) - #define wxLongLong_t __int64 - #define wxLongLongSuffix i64 -- #define wxLongLongFmtSpec _T("L") -+ #define wxLongLongFmtSpec wxT("L") - #elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__) || defined(__OS2__))) - #define wxLongLong_t __int64 - #define wxLongLongSuffix i64 -- #define wxLongLongFmtSpec _T("L") -+ #define wxLongLongFmtSpec wxT("L") - #elif defined(__DIGITALMARS__) - #define wxLongLong_t __int64 - #define wxLongLongSuffix LL -- #define wxLongLongFmtSpec _T("ll") -+ #define wxLongLongFmtSpec wxT("ll") - #elif defined(__MINGW32__) - #define wxLongLong_t long long - #define wxLongLongSuffix ll -- #define wxLongLongFmtSpec _T("I64") -+ #define wxLongLongFmtSpec wxT("I64") - #elif defined(__MWERKS__) - #if __option(longlong) - #define wxLongLong_t long long - #define wxLongLongSuffix ll -- #define wxLongLongFmtSpec _T("ll") -+ #define wxLongLongFmtSpec wxT("ll") - #else - #error "The 64 bit integer support in CodeWarrior has been disabled." - #error "See the documentation on the 'longlong' pragma." -@@ -944,7 +944,7 @@ inline void *wxUIntToPtr(wxUIntPtr p) - #elif defined(__WXPALMOS__) - #define wxLongLong_t int64_t - #define wxLongLongSuffix ll -- #define wxLongLongFmtSpec _T("ll") -+ #define wxLongLongFmtSpec wxT("ll") - #elif defined(__VISAGECPP__) && __IBMCPP__ >= 400 - #define wxLongLong_t long long - #elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8) || \ -@@ -954,11 +954,11 @@ inline void *wxUIntToPtr(wxUIntPtr p) - (defined(__DJGPP__) && __DJGPP__ >= 2) - #define wxLongLong_t long long - #define wxLongLongSuffix ll -- #define wxLongLongFmtSpec _T("ll") -+ #define wxLongLongFmtSpec wxT("ll") - #elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 8) - #define wxLongLong_t long - #define wxLongLongSuffix l -- #define wxLongLongFmtSpec _T("l") -+ #define wxLongLongFmtSpec wxT("l") - #define wxLongLongIsLong - #endif - -diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h -index 3552bdc..eefd49f 100644 ---- a/include/wx/dynlib.h -+++ b/include/wx/dynlib.h -@@ -116,7 +116,7 @@ enum wxPluginCategory - // type only once, as the first parameter, and creating a variable of this type - // called "pfn" initialized with the "name" from the "dynlib" - #define wxDYNLIB_FUNCTION(type, name, dynlib) \ -- type pfn ## name = (type)(dynlib).GetSymbol(_T(#name)) -+ type pfn ## name = (type)(dynlib).GetSymbol(wxT(#name)) - - // ---------------------------------------------------------------------------- - // wxDynamicLibraryDetails: contains details about a loaded wxDynamicLibrary -diff --git a/include/wx/dynload.h b/include/wx/dynload.h -index 68c63c1..3c40113 100644 ---- a/include/wx/dynload.h -+++ b/include/wx/dynload.h -@@ -71,7 +71,7 @@ public: - void RefObj() { ++m_objcount; } - void UnrefObj() - { -- wxASSERT_MSG( m_objcount > 0, _T("Too many objects deleted??") ); -+ wxASSERT_MSG( m_objcount > 0, wxT("Too many objects deleted??") ); - --m_objcount; - } - -diff --git a/include/wx/event.h b/include/wx/event.h -index 26fab62..351d04f 100644 ---- a/include/wx/event.h -+++ b/include/wx/event.h -@@ -451,7 +451,7 @@ public: - wxPropagateOnce(wxEvent& event) : m_event(event) - { - wxASSERT_MSG( m_event.m_propagationLevel > 0, -- _T("shouldn't be used unless ShouldPropagate()!") ); -+ wxT("shouldn't be used unless ShouldPropagate()!") ); - - m_event.m_propagationLevel--; - } -@@ -1398,7 +1398,7 @@ public: - // m_loggingOff flag is only used by wxEVT_[QUERY_]END_SESSION, it - // doesn't make sense for wxEVT_CLOSE_WINDOW - wxASSERT_MSG( m_eventType != wxEVT_CLOSE_WINDOW, -- _T("this flag is for end session events only") ); -+ wxT("this flag is for end session events only") ); - - return m_loggingOff; - } -diff --git a/include/wx/ffile.h b/include/wx/ffile.h -index c3dda75..5577484 100644 ---- a/include/wx/ffile.h -+++ b/include/wx/ffile.h -@@ -37,13 +37,13 @@ public: - // def ctor - wxFFile() { m_fp = NULL; } - // open specified file (may fail, use IsOpened()) -- wxFFile(const wxChar *filename, const wxChar *mode = _T("r")); -+ wxFFile(const wxChar *filename, const wxChar *mode = wxT("r")); - // attach to (already opened) file - wxFFile(FILE *lfp) { m_fp = lfp; } - - // open/close - // open a file (existing or not - the mode controls what happens) -- bool Open(const wxChar *filename, const wxChar *mode = _T("r")); -+ bool Open(const wxChar *filename, const wxChar *mode = wxT("r")); - // closes the opened file (this is a NOP if not opened) - bool Close(); - -diff --git a/include/wx/filefn.h b/include/wx/filefn.h -index 56c01c7..0e35b39 100644 ---- a/include/wx/filefn.h -+++ b/include/wx/filefn.h -@@ -406,7 +406,7 @@ enum wxFileKind - #define wxHAS_LARGE_FFILES - #endif - #else -- #define wxFileOffsetFmtSpec _T("") -+ #define wxFileOffsetFmtSpec wxT("") - #endif - // functions - #define wxClose close -diff --git a/include/wx/filename.h b/include/wx/filename.h -index 0a3abb5..c156e73 100644 ---- a/include/wx/filename.h -+++ b/include/wx/filename.h -@@ -488,10 +488,10 @@ public: - static wxULongLong GetSize(const wxString &file); - - // returns the size in a human readable form -- wxString GetHumanReadableSize(const wxString &nullsize = wxGetTranslation(_T("Not available")), -+ wxString GetHumanReadableSize(const wxString &nullsize = wxGetTranslation(wxT("Not available")), - int precision = 1) const; - static wxString GetHumanReadableSize(const wxULongLong &sz, -- const wxString &nullsize = wxGetTranslation(_T("Not available")), -+ const wxString &nullsize = wxGetTranslation(wxT("Not available")), - int precision = 1); - - -diff --git a/include/wx/generic/calctrl.h b/include/wx/generic/calctrl.h -index 43b854c..a525a4b 100644 ---- a/include/wx/generic/calctrl.h -+++ b/include/wx/generic/calctrl.h -@@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxComboBox; - class WXDLLIMPEXP_FWD_CORE wxStaticText; - class WXDLLIMPEXP_FWD_CORE wxSpinCtrl; - --#define wxCalendarNameStr _T("CalendarCtrl") -+#define wxCalendarNameStr wxT("CalendarCtrl") - - // ---------------------------------------------------------------------------- - // wxCalendarCtrl: a control allowing the user to pick a date interactively -@@ -124,14 +124,14 @@ public: - - wxCalendarDateAttr *GetAttr(size_t day) const - { -- wxCHECK_MSG( day > 0 && day < 32, NULL, _T("invalid day") ); -+ wxCHECK_MSG( day > 0 && day < 32, NULL, wxT("invalid day") ); - - return m_attrs[day - 1]; - } - - void SetAttr(size_t day, wxCalendarDateAttr *attr) - { -- wxCHECK_RET( day > 0 && day < 32, _T("invalid day") ); -+ wxCHECK_RET( day > 0 && day < 32, wxT("invalid day") ); - - delete m_attrs[day - 1]; - m_attrs[day - 1] = attr; -diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h -index 1b25185..06814aa 100644 ---- a/include/wx/generic/combo.h -+++ b/include/wx/generic/combo.h -@@ -26,8 +26,8 @@ - // all actions of single line text controls are supported - - // popup/dismiss the choice window --#define wxACTION_COMBOBOX_POPUP _T("popup") --#define wxACTION_COMBOBOX_DISMISS _T("dismiss") -+#define wxACTION_COMBOBOX_POPUP wxT("popup") -+#define wxACTION_COMBOBOX_DISMISS wxT("dismiss") - - #endif - -diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h -index e84bb7d..fb308ed 100644 ---- a/include/wx/generic/grid.h -+++ b/include/wx/generic/grid.h -@@ -42,11 +42,11 @@ extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGridNameStr[]; - #define WXGRID_DEFAULT_SCROLLBAR_WIDTH 16 - - // type names for grid table values --#define wxGRID_VALUE_STRING _T("string") --#define wxGRID_VALUE_BOOL _T("bool") --#define wxGRID_VALUE_NUMBER _T("long") --#define wxGRID_VALUE_FLOAT _T("double") --#define wxGRID_VALUE_CHOICE _T("choice") -+#define wxGRID_VALUE_STRING wxT("string") -+#define wxGRID_VALUE_BOOL wxT("bool") -+#define wxGRID_VALUE_NUMBER wxT("long") -+#define wxGRID_VALUE_FLOAT wxT("double") -+#define wxGRID_VALUE_CHOICE wxT("choice") - - #define wxGRID_VALUE_TEXT wxGRID_VALUE_STRING - #define wxGRID_VALUE_LONG wxGRID_VALUE_NUMBER -@@ -472,7 +472,7 @@ protected: - - // string representation of m_valueOld - wxString GetString() const -- { return wxString::Format(_T("%ld"), m_valueOld); } -+ { return wxString::Format(wxT("%ld"), m_valueOld); } - - private: - int m_min, -@@ -552,7 +552,7 @@ public: - - // set the string values returned by GetValue() for the true and false - // states, respectively -- static void UseStringValues(const wxString& valueTrue = _T("1"), -+ static void UseStringValues(const wxString& valueTrue = wxT("1"), - const wxString& valueFalse = wxEmptyString); - - // return true if the given string is equal to the string representation of -diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h -index 2581fd2..477e0f1 100644 ---- a/include/wx/generic/gridctrl.h -+++ b/include/wx/generic/gridctrl.h -@@ -16,8 +16,8 @@ - - #if wxUSE_GRID - --#define wxGRID_VALUE_CHOICEINT _T("choiceint") --#define wxGRID_VALUE_DATETIME _T("datetime") -+#define wxGRID_VALUE_CHOICEINT wxT("choiceint") -+#define wxGRID_VALUE_DATETIME wxT("datetime") - - #if wxUSE_DATETIME - -diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h -index 7874e44..9719432 100644 ---- a/include/wx/generic/spinctlg.h -+++ b/include/wx/generic/spinctlg.h -@@ -41,7 +41,7 @@ public: - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS, - int min = 0, int max = 100, int initial = 0, -- const wxString& name = _T("wxSpinCtrl")) -+ const wxString& name = wxT("wxSpinCtrl")) - { - Init(); - Create(parent, id, value, pos, size, style, min, max, initial, name); -@@ -54,7 +54,7 @@ public: - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS, - int min = 0, int max = 100, int initial = 0, -- const wxString& name = _T("wxSpinCtrl")); -+ const wxString& name = wxT("wxSpinCtrl")); - - virtual ~wxSpinCtrl(); - -@@ -125,7 +125,7 @@ public: - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS, - int min = 0, int max = 100, int initial = 0, -- const wxString& name = _T("wxSpinCtrl")) -+ const wxString& name = wxT("wxSpinCtrl")) - { - Create(parent, id, value, pos, size, style, min, max, initial, name); - } -@@ -137,7 +137,7 @@ public: - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS, - int min = 0, int max = 100, int initial = 0, -- const wxString& name = _T("wxSpinCtrl")) -+ const wxString& name = wxT("wxSpinCtrl")) - { - SetRange(min, max); - -diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h -index ac651f2..d5927a6 100644 ---- a/include/wx/generic/splitter.h -+++ b/include/wx/generic/splitter.h -@@ -91,7 +91,7 @@ public: - void SetSplitMode(int mode) - { - wxASSERT_MSG( mode == wxSPLIT_VERTICAL || mode == wxSPLIT_HORIZONTAL, -- _T("invalid split mode") ); -+ wxT("invalid split mode") ); - - m_splitMode = (wxSplitMode)mode; - } -diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h -index 25e2eac..c6ed1c8 100644 ---- a/include/wx/glcanvas.h -+++ b/include/wx/glcanvas.h -@@ -44,7 +44,7 @@ enum - WX_GL_MIN_ACCUM_ALPHA /* use alpha buffer with most bits (> MIN_ACCUM_ALPHA bits) */ - }; - --#define wxGLCanvasName _T("GLCanvas") -+#define wxGLCanvasName wxT("GLCanvas") - - #if defined(__WXMSW__) - #include "wx/msw/glcanvas.h" -diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h -index fa89477..2c1ff65 100644 ---- a/include/wx/gtk/checklst.h -+++ b/include/wx/gtk/checklst.h -@@ -18,10 +18,10 @@ - // there is no "right" choice of the checkbox indicators, so allow the user to - // define them himself if he wants - #ifndef wxCHECKLBOX_CHECKED -- #define wxCHECKLBOX_CHECKED _T('x') -- #define wxCHECKLBOX_UNCHECKED _T(' ') -+ #define wxCHECKLBOX_CHECKED wxT('x') -+ #define wxCHECKLBOX_UNCHECKED wxT(' ') - -- #define wxCHECKLBOX_STRING _T("[ ] ") -+ #define wxCHECKLBOX_STRING wxT("[ ] ") - #endif - - //----------------------------------------------------------------------------- -diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h -index 2929f7f..8fc1dc9 100644 ---- a/include/wx/gtk/spinctrl.h -+++ b/include/wx/gtk/spinctrl.h -@@ -26,7 +26,7 @@ public: - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS, - int min = 0, int max = 100, int initial = 0, -- const wxString& name = _T("wxSpinCtrl")) -+ const wxString& name = wxT("wxSpinCtrl")) - { - Create(parent, id, value, pos, size, style, min, max, initial, name); - } -@@ -38,7 +38,7 @@ public: - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS, - int min = 0, int max = 100, int initial = 0, -- const wxString& name = _T("wxSpinCtrl")); -+ const wxString& name = wxT("wxSpinCtrl")); - - void SetValue(const wxString& text); - void SetSelection(long from, long to); -diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h -index 5a9b8cb..de75b1f 100644 ---- a/include/wx/gtk1/checklst.h -+++ b/include/wx/gtk1/checklst.h -@@ -18,10 +18,10 @@ - // there is no "right" choice of the checkbox indicators, so allow the user to - // define them himself if he wants - #ifndef wxCHECKLBOX_CHECKED -- #define wxCHECKLBOX_CHECKED _T('x') -- #define wxCHECKLBOX_UNCHECKED _T(' ') -+ #define wxCHECKLBOX_CHECKED wxT('x') -+ #define wxCHECKLBOX_UNCHECKED wxT(' ') - -- #define wxCHECKLBOX_STRING _T("[ ] ") -+ #define wxCHECKLBOX_STRING wxT("[ ] ") - #endif - - //----------------------------------------------------------------------------- -diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h -index 7c94538..2c60b77 100644 ---- a/include/wx/gtk1/spinctrl.h -+++ b/include/wx/gtk1/spinctrl.h -@@ -32,7 +32,7 @@ public: - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS, - int min = 0, int max = 100, int initial = 0, -- const wxString& name = _T("wxSpinCtrl")) -+ const wxString& name = wxT("wxSpinCtrl")) - { - Create(parent, id, value, pos, size, style, min, max, initial, name); - } -@@ -44,7 +44,7 @@ public: - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS, - int min = 0, int max = 100, int initial = 0, -- const wxString& name = _T("wxSpinCtrl")); -+ const wxString& name = wxT("wxSpinCtrl")); - - void SetValue(const wxString& text); - void SetSelection(long from, long to); -diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h -index b7a5222..780736b 100644 ---- a/include/wx/imagbmp.h -+++ b/include/wx/imagbmp.h -@@ -14,7 +14,7 @@ - - // defines for saving the BMP file in different formats, Bits Per Pixel - // USE: wximage.SetOption( wxIMAGE_OPTION_BMP_FORMAT, wxBMP_xBPP ); --#define wxIMAGE_OPTION_BMP_FORMAT wxString(_T("wxBMP_FORMAT")) -+#define wxIMAGE_OPTION_BMP_FORMAT wxString(wxT("wxBMP_FORMAT")) - - // These two options are filled in upon reading CUR file and can (should) be - // specified when saving a CUR file - they define the hotspot of the cursor: -@@ -52,10 +52,10 @@ class WXDLLEXPORT wxBMPHandler : public wxImageHandler - public: - wxBMPHandler() - { -- m_name = _T("Windows bitmap file"); -- m_extension = _T("bmp"); -+ m_name = wxT("Windows bitmap file"); -+ m_extension = wxT("bmp"); - m_type = wxBITMAP_TYPE_BMP; -- m_mime = _T("image/x-bmp"); -+ m_mime = wxT("image/x-bmp"); - } - - #if wxUSE_STREAMS -@@ -86,10 +86,10 @@ class WXDLLEXPORT wxICOHandler : public wxBMPHandler - public: - wxICOHandler() - { -- m_name = _T("Windows icon file"); -- m_extension = _T("ico"); -+ m_name = wxT("Windows icon file"); -+ m_extension = wxT("ico"); - m_type = wxBITMAP_TYPE_ICO; -- m_mime = _T("image/x-ico"); -+ m_mime = wxT("image/x-ico"); - } - - #if wxUSE_STREAMS -@@ -115,10 +115,10 @@ class WXDLLEXPORT wxCURHandler : public wxICOHandler - public: - wxCURHandler() - { -- m_name = _T("Windows cursor file"); -- m_extension = _T("cur"); -+ m_name = wxT("Windows cursor file"); -+ m_extension = wxT("cur"); - m_type = wxBITMAP_TYPE_CUR; -- m_mime = _T("image/x-cur"); -+ m_mime = wxT("image/x-cur"); - } - - // VS: This handler's meat is implemented inside wxICOHandler (the two -@@ -142,10 +142,10 @@ class WXDLLEXPORT wxANIHandler : public wxCURHandler - public: - wxANIHandler() - { -- m_name = _T("Windows animated cursor file"); -- m_extension = _T("ani"); -+ m_name = wxT("Windows animated cursor file"); -+ m_extension = wxT("ani"); - m_type = wxBITMAP_TYPE_ANI; -- m_mime = _T("image/x-ani"); -+ m_mime = wxT("image/x-ani"); - } - - -diff --git a/include/wx/image.h b/include/wx/image.h -index 8048da4..f7f58a4 100644 ---- a/include/wx/image.h -+++ b/include/wx/image.h -@@ -27,14 +27,14 @@ - // which breaks the compilation below - #undef index - --#define wxIMAGE_OPTION_QUALITY wxString(_T("quality")) --#define wxIMAGE_OPTION_FILENAME wxString(_T("FileName")) -+#define wxIMAGE_OPTION_QUALITY wxString(wxT("quality")) -+#define wxIMAGE_OPTION_FILENAME wxString(wxT("FileName")) - --#define wxIMAGE_OPTION_RESOLUTION wxString(_T("Resolution")) --#define wxIMAGE_OPTION_RESOLUTIONX wxString(_T("ResolutionX")) --#define wxIMAGE_OPTION_RESOLUTIONY wxString(_T("ResolutionY")) -+#define wxIMAGE_OPTION_RESOLUTION wxString(wxT("Resolution")) -+#define wxIMAGE_OPTION_RESOLUTIONX wxString(wxT("ResolutionX")) -+#define wxIMAGE_OPTION_RESOLUTIONY wxString(wxT("ResolutionY")) - --#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(_T("ResolutionUnit")) -+#define wxIMAGE_OPTION_RESOLUTIONUNIT wxString(wxT("ResolutionUnit")) - - // constants used with wxIMAGE_OPTION_RESOLUTIONUNIT - enum -diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h -index d236b75..d807ae7 100644 ---- a/include/wx/imagtiff.h -+++ b/include/wx/imagtiff.h -@@ -21,10 +21,10 @@ - #include "wx/image.h" - - // defines for wxImage::SetOption --#define wxIMAGE_OPTION_BITSPERSAMPLE wxString(_T("BitsPerSample")) --#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxString(_T("SamplesPerPixel")) --#define wxIMAGE_OPTION_COMPRESSION wxString(_T("Compression")) --#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxString(_T("ImageDescriptor")) -+#define wxIMAGE_OPTION_BITSPERSAMPLE wxString(wxT("BitsPerSample")) -+#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxString(wxT("SamplesPerPixel")) -+#define wxIMAGE_OPTION_COMPRESSION wxString(wxT("Compression")) -+#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxString(wxT("ImageDescriptor")) - - class WXDLLEXPORT wxTIFFHandler: public wxImageHandler - { -diff --git a/include/wx/intl.h b/include/wx/intl.h -index 02bef05..311281a 100644 ---- a/include/wx/intl.h -+++ b/include/wx/intl.h -@@ -45,13 +45,13 @@ enum wxLayoutDirection - // --keyword="_" --keyword="wxPLURAL:1,2" options - // to extract the strings from the sources) - #ifndef WXINTL_NO_GETTEXT_MACRO -- #define _(s) wxGetTranslation(_T(s)) -- #define wxPLURAL(sing, plur, n) wxGetTranslation(_T(sing), _T(plur), n) -+ #define _(s) wxGetTranslation(wxT(s)) -+ #define wxPLURAL(sing, plur, n) wxGetTranslation(wxT(sing), wxT(plur), n) - #endif - - // another one which just marks the strings for extraction, but doesn't - // perform the translation (use -kwxTRANSLATE with xgettext!) --#define wxTRANSLATE(str) _T(str) -+#define wxTRANSLATE(str) wxT(str) - - // ---------------------------------------------------------------------------- - // forward decls -@@ -603,12 +603,12 @@ wxGetTranslation(const wxChar *sz1, const wxChar *sz2, - - #if !defined(WXINTL_NO_GETTEXT_MACRO) - #if !defined(_) -- #define _(s) (_T(s)) -+ #define _(s) (wxT(s)) - #endif -- #define wxPLURAL(sing, plur, n) ((n) == 1 ? _T(sing) : _T(plur)) -+ #define wxPLURAL(sing, plur, n) ((n) == 1 ? wxT(sing) : wxT(plur)) - #endif - --#define wxTRANSLATE(str) _T(str) -+#define wxTRANSLATE(str) wxT(str) - - inline const wxChar * - wxGetTranslation(const wxChar *sz, const wxChar * WXUNUSED(domain) = NULL) -@@ -622,10 +622,10 @@ wxGetTranslation(const wxChar *sz, const wxChar * WXUNUSED(domain) = NULL) - // wxTRANSLATE) too - #if !defined(WXINTL_NO_GETTEXT_MACRO) - #if !defined(gettext_noop) -- #define gettext_noop(str) _T(str) -+ #define gettext_noop(str) wxT(str) - #endif - #if !defined(N_) -- #define N_(s) _T(s) -+ #define N_(s) wxT(s) - #endif - #endif - -diff --git a/include/wx/list.h b/include/wx/list.h -index 4b5ae06..b0c2e18 100644 ---- a/include/wx/list.h -+++ b/include/wx/list.h -@@ -207,7 +207,7 @@ private: - bool operator==(const compatibility_iterator& i) const \ - { \ - wxASSERT_MSG( m_list && i.m_list, \ -- _T("comparing invalid iterators is illegal") ); \ -+ wxT("comparing invalid iterators is illegal") ); \ - return (m_list == i.m_list) && (m_iter == i.m_iter); \ - } \ - bool operator!=(const compatibility_iterator& i) const \ -diff --git a/include/wx/longlong.h b/include/wx/longlong.h -index 0bead47..9210228 100644 ---- a/include/wx/longlong.h -+++ b/include/wx/longlong.h -@@ -177,7 +177,7 @@ public: - long ToLong() const - { - wxASSERT_MSG( (m_ll >= LONG_MIN) && (m_ll <= LONG_MAX), -- _T("wxLongLong to long conversion loss of precision") ); -+ wxT("wxLongLong to long conversion loss of precision") ); - - return wx_truncate_cast(long, m_ll); - } -@@ -405,7 +405,7 @@ public: - unsigned long ToULong() const - { - wxASSERT_MSG( m_ll <= LONG_MAX, -- _T("wxULongLong to long conversion loss of precision") ); -+ wxT("wxULongLong to long conversion loss of precision") ); - - return wx_truncate_cast(unsigned long, m_ll); - } -@@ -683,7 +683,7 @@ public: - long ToLong() const - { - wxASSERT_MSG( (m_hi == 0l) || (m_hi == -1l), -- _T("wxLongLong to long conversion loss of precision") ); -+ wxT("wxLongLong to long conversion loss of precision") ); - - return (long)m_lo; - } -@@ -908,7 +908,7 @@ public: - unsigned long ToULong() const - { - wxASSERT_MSG( m_hi == 0ul, -- _T("wxULongLong to long conversion loss of precision") ); -+ wxT("wxULongLong to long conversion loss of precision") ); - - return (unsigned long)m_lo; - } -diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h -index 2ebf996..8eee00d 100644 ---- a/include/wx/mimetype.h -+++ b/include/wx/mimetype.h -@@ -51,12 +51,12 @@ class WXDLLIMPEXP_BASE wxMimeType : public wxString - public: - // all string ctors here - -- wxString GetType() const { return BeforeFirst(_T('/')); } -- wxString GetSubType() const { return AfterFirst(_T('/')); } -+ wxString GetType() const { return BeforeFirst(wxT('/')); } -+ wxString GetSubType() const { return AfterFirst(wxT('/')); } - - void SetSubType(const wxString& subtype) - { -- *this = GetType() + _T('/') + subtype; -+ *this = GetType() + wxT('/') + subtype; - } - - bool Matches(const wxMimeType& wildcard) -diff --git a/include/wx/module.h b/include/wx/module.h -index 7394f4e..b4d0abc 100644 ---- a/include/wx/module.h -+++ b/include/wx/module.h -@@ -68,7 +68,7 @@ protected: - // after that - void AddDependency(wxClassInfo *dep) - { -- wxCHECK_RET( dep, _T("NULL module dependency") ); -+ wxCHECK_RET( dep, wxT("NULL module dependency") ); - - m_dependencies.Add(dep); - } -diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h -index d225726..a2ce2a8 100644 ---- a/include/wx/msgdlg.h -+++ b/include/wx/msgdlg.h -@@ -23,10 +23,10 @@ protected: - void SetMessageDialogStyle(long style) - { - wxASSERT_MSG( ((style & wxYES_NO) == wxYES_NO) || ((style & wxYES_NO) == 0), -- _T("wxYES and wxNO may only be used together in wxMessageDialog") ); -+ wxT("wxYES and wxNO may only be used together in wxMessageDialog") ); - - wxASSERT_MSG( (style & wxID_OK) != wxID_OK, -- _T("wxMessageBox: Did you mean wxOK (and not wxID_OK)?") ); -+ wxT("wxMessageBox: Did you mean wxOK (and not wxID_OK)?") ); - - m_dialogStyle = style; - } -diff --git a/include/wx/object.h b/include/wx/object.h -index d46efcf..b7fda24 100644 ---- a/include/wx/object.h -+++ b/include/wx/object.h -@@ -311,7 +311,7 @@ name##PluginSentinel m_pluginsentinel; - #ifdef __WXDEBUG__ - inline void* wxCheckCast(void *ptr) - { -- wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") ); -+ wxASSERT_MSG( ptr, wxT("wxStaticCast() used incorrectly") ); - return ptr; - } - #define wxStaticCast(obj, className) \ -diff --git a/include/wx/palette.h b/include/wx/palette.h -index 9a09456..43757ab 100644 ---- a/include/wx/palette.h -+++ b/include/wx/palette.h -@@ -27,7 +27,7 @@ public: - - virtual bool Ok() const { return IsOk(); } - virtual bool IsOk() const = 0; -- virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; } -+ virtual int GetColoursCount() const { wxFAIL_MSG( wxT("not implemented") ); return 0; } - }; - - #if defined(__WXPALMOS__) -diff --git a/include/wx/private/fileback.h b/include/wx/private/fileback.h -index 534a0f3..7f5e722 100644 ---- a/include/wx/private/fileback.h -+++ b/include/wx/private/fileback.h -@@ -33,7 +33,7 @@ public: - // backing file is never created and the backing is done with memory. @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 20 15:42:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Apr 2010 13:42:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[9727] csw/mgar/pkg/gsasl/trunk Message-ID: Revision: 9727 http://gar.svn.sourceforge.net/gar/?rev=9727&view=rev Author: dmichelsen Date: 2010-04-20 13:42:16 +0000 (Tue, 20 Apr 2010) Log Message: ----------- gsasl: Update to 1.4.5 and split off devel Modified Paths: -------------- csw/mgar/pkg/gsasl/trunk/Makefile csw/mgar/pkg/gsasl/trunk/checksums Modified: csw/mgar/pkg/gsasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/gsasl/trunk/Makefile 2010-04-20 12:12:45 UTC (rev 9726) +++ csw/mgar/pkg/gsasl/trunk/Makefile 2010-04-20 13:42:16 UTC (rev 9727) @@ -1,5 +1,5 @@ GARNAME = gsasl -GARVERSION = 1.2 +GARVERSION = 1.4.4 CATEGORIES = apps DESCRIPTION = GNU SASL binary @@ -14,32 +14,55 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGES = CSWlibgsasl CSWgsasl - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWlibgsasl CSWlibgsasldevel CSWgsasl + +CATALOGNAME_CSWlibgsasl = libgsasl +CATALOGNAME_CSWlibgsasldevel = libgsasl_devel +CATALOGNAME_CSWgsasl = gsasl + BUILD_DEP_PKGS = CSWkrb5libdev CSWgnulinks -RUNTIME_DEP_PKGS_CSWlibgsasl = CSWggettextrt CSWiconv CSWkrb5lib CSWlibidn CSWlibntlm CSWreadline +RUNTIME_DEP_PKGS_CSWlibgsasl = CSWggettextrt CSWkrb5lib CSWlibidn CSWlibntlm +RUNTIME_DEP_PKGS_CSWlibgsasl += CSWgcrypt CSWgpgerr RUNTIME_DEP_PKGS_CSWgsasl = CSWlibgsasl CSWgnutls CSWggettextrt CSWiconv CSWkrb5lib CSWlibidn CSWlibntlm CSWreadline +RUNTIME_DEP_PKGS_CSWgsasl += CSWgcrypt CSWgpgerr +RUNTIME_DEP_PKGS_CSWlibgsasldevel = CSWlibgsasl CSWkrb5libdev +SPKG_DESC_CSWlibgsasl = GNU SASL Library +SPKG_DESC_CSWlibgsasl = GNU SASL Development Files +SPKG_DESC_CSWgsasl = GNU SASL + SPKG_SOURCEURL = http://www.gnu.org/software/$(GNU_PROJ) +# We don't need it and if defined the test breaks +LD_OPTIONS = +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) + CONFIGURE_ARGS = $(DIRPATHS) -# One test fails, reported upstream -#TEST_TARGET = check -TEST_TARGET = +TEST_TARGET = check +# One test inside GNULib fails, reported upstream. This is most +# probably harmless. +SKIPTEST ?= 1 + EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias -PKGFILES_CSWlibgsasl = $(includedir)/.* -PKGFILES_CSWlibgsasl += $(libdir)/.* -PKGFILES_CSWlibgsasl += $(mandir)/man3/.* -PKGFILES_CSWlibgsasl += $(sharedstatedir)/locale/.*/libgsasl.mo +# Make sure we do NOT add here /opt/csw/include/gsasl.h +PKGFILES_CSWgsasl = $(bindir)/.* +PKGFILES_CSWgsasl += $(infodir)/gsasl\..* +PKGFILES_CSWgsasl += $(sharedstatedir)/.*/gsasl\..* +PKGFILES_CSWgsasl += $(mandir)/.*/gsasl\..* +PKGFILES_CSWlibgsasldevel = $(PKGFILES_DEVEL) + +CHECKPKG_OVERRIDES_CSWlibgsasl += bad-rpath-entry|/opt/csw/lib/ +CHECKPKG_OVERRIDES_CSWlibgsasldevel += surplus-dependency|CSWlibgsasl +CHECKPKG_OVERRIDES_CSWlibgsasldevel += surplus-dependency|CSWkrb5libdev + include gar/category.mk # Tests use 'grep -e' PATH := /opt/csw/gnu:$(PATH) - Modified: csw/mgar/pkg/gsasl/trunk/checksums =================================================================== --- csw/mgar/pkg/gsasl/trunk/checksums 2010-04-20 12:12:45 UTC (rev 9726) +++ csw/mgar/pkg/gsasl/trunk/checksums 2010-04-20 13:42:16 UTC (rev 9727) @@ -1 +1 @@ -28b5826186900665e8f2c542312fd5ec download/gsasl-1.2.tar.gz +ab3e343717c0f67614e1398cfbab83b6 gsasl-1.4.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 20 17:19:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Apr 2010 15:19:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9728] csw/mgar/pkg/glpk/trunk Message-ID: Revision: 9728 http://gar.svn.sourceforge.net/gar/?rev=9728&view=rev Author: dmichelsen Date: 2010-04-20 15:19:38 +0000 (Tue, 20 Apr 2010) Log Message: ----------- glpk: Update to 3.43 and use isaexec now Modified Paths: -------------- csw/mgar/pkg/glpk/trunk/Makefile csw/mgar/pkg/glpk/trunk/checksums Modified: csw/mgar/pkg/glpk/trunk/Makefile =================================================================== --- csw/mgar/pkg/glpk/trunk/Makefile 2010-04-20 13:42:16 UTC (rev 9727) +++ csw/mgar/pkg/glpk/trunk/Makefile 2010-04-20 15:19:38 UTC (rev 9728) @@ -1,5 +1,5 @@ GARNAME = glpk -GARVERSION = 4.39 +GARVERSION = 4.43 CATEGORIES = lib DESCRIPTION = GNU Linear Programming Kit @@ -18,11 +18,8 @@ PACKAGES = CSWlibglpk BUILD64 = 1 -NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check -MERGE_DIRS_isa-extra = $(libdir) - include gar/category.mk Modified: csw/mgar/pkg/glpk/trunk/checksums =================================================================== --- csw/mgar/pkg/glpk/trunk/checksums 2010-04-20 13:42:16 UTC (rev 9727) +++ csw/mgar/pkg/glpk/trunk/checksums 2010-04-20 15:19:38 UTC (rev 9728) @@ -1 +1 @@ -95f276ef6c94c6de1eb689f161f525f3 glpk-4.39.tar.gz +b984e9e6451399c8dd46e18889c80148 glpk-4.43.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 Apr 20 17:33:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Apr 2010 15:33:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[9729] csw/mgar/pkg/cpan/FreezeThaw/trunk Message-ID: Revision: 9729 http://gar.svn.sourceforge.net/gar/?rev=9729&view=rev Author: dmichelsen Date: 2010-04-20 15:33:09 +0000 (Tue, 20 Apr 2010) Log Message: ----------- cpan/FreezeThaw: Update to 0.5001 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/FreezeThaw/trunk/Makefile csw/mgar/pkg/cpan/FreezeThaw/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/FreezeThaw/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/FreezeThaw/trunk/files/CSWpmfreezethaw.depend csw/mgar/pkg/cpan/FreezeThaw/trunk/files/CSWpmfreezethaw.gspec csw/mgar/pkg/cpan/FreezeThaw/trunk/files/CSWpmfreezethaw.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/FreezeThaw/trunk/ Property changes on: csw/mgar/pkg/cpan/FreezeThaw/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/FreezeThaw/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/FreezeThaw/trunk/Makefile 2010-04-20 15:19:38 UTC (rev 9728) +++ csw/mgar/pkg/cpan/FreezeThaw/trunk/Makefile 2010-04-20 15:33:09 UTC (rev 9729) @@ -1,9 +1,9 @@ GARNAME = FreezeThaw -GARVERSION = 0.43 +GARVERSION = 0.5001 CATEGORIES = cpan AUTHOR = ILYAZ -DESCRIPTION = converting Perl structures to strings and back. +DESCRIPTION = Converting Perl structures to strings and back. define BLURB Converts data to/from stringified form, appropriate for saving-to and reading-from permanent storage. Deals with objects, circular lists, @@ -11,8 +11,12 @@ stringify operator yet. endef -DISTFILES = $(call admfiles,CSWpmfreezethaw,depend prototype) +MASTER_SITES = $(addsuffix modules/,$(CPAN_MIRRORS)) +DISTFILES = COPYING +PACKAGES = CSWpmfreezethaw +CATALOGNAME = pm_freezethaw + +ARCHALL = 1 + include gar/category.mk - -AUTHOR_ID := $(AUTHOR_ID)/modules Modified: csw/mgar/pkg/cpan/FreezeThaw/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/FreezeThaw/trunk/checksums 2010-04-20 15:19:38 UTC (rev 9728) +++ csw/mgar/pkg/cpan/FreezeThaw/trunk/checksums 2010-04-20 15:33:09 UTC (rev 9729) @@ -1,4 +1,2 @@ -5ddc5c6766b56d12212eafbc5ee6987f download/CSWpmfreezethaw.gspec -6e0d583c86d7f74b43769810714242aa download/CSWpmfreezethaw.depend -bc342624ab3a4c1b192a76bc25c3150b download/CSWpmfreezethaw.prototype -705efa533b366151953a5e2b1744650f download/FreezeThaw-0.43.tar.gz +fb4a5787284fbacdc9221b845f6f2622 COPYING +6314ff39384d839a7394a3bc363e149f FreezeThaw-0.5001.tar.gz Copied: csw/mgar/pkg/cpan/FreezeThaw/trunk/files/COPYING (from rev 9723, csw/mgar/pkg/cpan/FreezeThaw/trunk/files/CSWpmfreezethaw.gspec) =================================================================== --- csw/mgar/pkg/cpan/FreezeThaw/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/FreezeThaw/trunk/files/COPYING 2010-04-20 15:33:09 UTC (rev 9729) @@ -0,0 +1,18 @@ +Copyright (c) 1995 Ilya Zakharevich. All rights reserved. +This program is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. + +You should have received a copy of the Perl license along with +Perl; see the file README in Perl distribution. + +You should have received a copy of the GNU General Public License +along with Perl; see the file Copying. If not, write to +the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + +You should have received a copy of the Artistic License +along with Perl; see the file Artistic. + +Author of this software makes no claim whatsoever about suitability, +reliability, edability, editability or usability of this product. If +you can use it, you are in luck, if not, I should not be kept +responsible. Keep a handy copy of your backup tape at hand. Deleted: csw/mgar/pkg/cpan/FreezeThaw/trunk/files/CSWpmfreezethaw.depend =================================================================== Deleted: csw/mgar/pkg/cpan/FreezeThaw/trunk/files/CSWpmfreezethaw.gspec =================================================================== --- csw/mgar/pkg/cpan/FreezeThaw/trunk/files/CSWpmfreezethaw.gspec 2010-04-20 15:19:38 UTC (rev 9728) +++ csw/mgar/pkg/cpan/FreezeThaw/trunk/files/CSWpmfreezethaw.gspec 2010-04-20 15:33:09 UTC (rev 9729) @@ -1,23 +0,0 @@ -%var bitname pm_freezethaw -%var pkgname CSWpmfreezethaw -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1995 Ilya Zakharevich. All rights reserved. -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. - -You should have received a copy of the Perl license along with -Perl; see the file README in Perl distribution. - -You should have received a copy of the GNU General Public License -along with Perl; see the file Copying. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - -You should have received a copy of the Artistic License -along with Perl; see the file Artistic. - -Author of this software makes no claim whatsoever about suitability, -reliability, edability, editability or usability of this product. If -you can use it, you are in luck, if not, I should not be kept -responsible. Keep a handy copy of your backup tape at hand. Deleted: csw/mgar/pkg/cpan/FreezeThaw/trunk/files/CSWpmfreezethaw.prototype =================================================================== --- csw/mgar/pkg/cpan/FreezeThaw/trunk/files/CSWpmfreezethaw.prototype 2010-04-20 15:19:38 UTC (rev 9728) +++ csw/mgar/pkg/cpan/FreezeThaw/trunk/files/CSWpmfreezethaw.prototype 2010-04-20 15:33:09 UTC (rev 9729) @@ -1,13 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/FreezeThaw 0755 root bin -f none /opt/csw/lib/perl/csw/auto/FreezeThaw/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/FreezeThaw.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -f none /opt/csw/share/perl/csw/FreezeThaw.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 20 17:41:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Apr 2010 15:41:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9730] csw/mgar/pkg/cpan/MLDBM/trunk Message-ID: Revision: 9730 http://gar.svn.sourceforge.net/gar/?rev=9730&view=rev Author: dmichelsen Date: 2010-04-20 15:41:06 +0000 (Tue, 20 Apr 2010) Log Message: ----------- cpan/MLDBM: Update to 2.04 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/MLDBM/trunk/Makefile csw/mgar/pkg/cpan/MLDBM/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/MLDBM/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/MLDBM/trunk/files/CSWpmmldbm.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/MLDBM/trunk/ Property changes on: csw/mgar/pkg/cpan/MLDBM/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/MLDBM/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MLDBM/trunk/Makefile 2010-04-20 15:33:09 UTC (rev 9729) +++ csw/mgar/pkg/cpan/MLDBM/trunk/Makefile 2010-04-20 15:41:06 UTC (rev 9730) @@ -1,9 +1,9 @@ GARNAME = MLDBM -GARVERSION = 2.01 +GARVERSION = 2.04 CATEGORIES = cpan -AUTHOR = CHAMAS +AUTHOR = CHORNY -DESCRIPTION = store multi-level hash structure in single level tied hash +DESCRIPTION = Store multi-level hash structure in single level tied hash define BLURB This module can serve as a transparent interface to any TIEHASH package that is required to store arbitrary perl data, including nested references. Thus, @@ -11,6 +11,13 @@ within DBM databases. endef -DISTFILES += CSWpmmldbm.gspec +DISTFILES = COPYING +DEP_PKGS = CSWpmfreezethaw + +PACKAGES = CSWpmmldbm +CATALOGNAME = pm_mldbm + +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/MLDBM/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/MLDBM/trunk/checksums 2010-04-20 15:33:09 UTC (rev 9729) +++ csw/mgar/pkg/cpan/MLDBM/trunk/checksums 2010-04-20 15:41:06 UTC (rev 9730) @@ -1,2 +1,2 @@ -fb664ec78215787a36277b688c73da04 download/CSWpmmldbm.gspec -99550ae2cffbc0bb3eb0358631077c10 download/MLDBM-2.01.tar.gz +c122ffd078f62bd464e4988ae3caf1c4 COPYING +b2793c419136fc11082e1ed1b564aeff MLDBM-2.04.tar.gz Copied: csw/mgar/pkg/cpan/MLDBM/trunk/files/COPYING (from rev 9723, csw/mgar/pkg/cpan/MLDBM/trunk/files/CSWpmmldbm.gspec) =================================================================== --- csw/mgar/pkg/cpan/MLDBM/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/MLDBM/trunk/files/COPYING 2010-04-20 15:41:06 UTC (rev 9730) @@ -0,0 +1,8 @@ +Copyright (c) 1995-98 Gurusamy Sarathy. All rights reserved. + +Copyright (c) 1998 Raphael Manfredi. + +Copyright (c) 2002 Josh Chamas, Chamas Enterprises Inc. + +This program is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/MLDBM/trunk/files/CSWpmmldbm.gspec =================================================================== --- csw/mgar/pkg/cpan/MLDBM/trunk/files/CSWpmmldbm.gspec 2010-04-20 15:33:09 UTC (rev 9729) +++ csw/mgar/pkg/cpan/MLDBM/trunk/files/CSWpmmldbm.gspec 2010-04-20 15:41:06 UTC (rev 9730) @@ -1,13 +0,0 @@ -%var bitname pm_mldbm -%var pkgname CSWpmmldbm -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1995-98 Gurusamy Sarathy. All rights reserved. - -Copyright (c) 1998 Raphael Manfredi. - -Copyright (c) 2002 Josh Chamas, Chamas Enterprises Inc. - -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 Tue Apr 20 17:42:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Apr 2010 15:42:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9731] csw/mgar/pkg/glpk/trunk/Makefile Message-ID: Revision: 9731 http://gar.svn.sourceforge.net/gar/?rev=9731&view=rev Author: dmichelsen Date: 2010-04-20 15:42:06 +0000 (Tue, 20 Apr 2010) Log Message: ----------- glpk: Add override Modified Paths: -------------- csw/mgar/pkg/glpk/trunk/Makefile Modified: csw/mgar/pkg/glpk/trunk/Makefile =================================================================== --- csw/mgar/pkg/glpk/trunk/Makefile 2010-04-20 15:41:06 UTC (rev 9730) +++ csw/mgar/pkg/glpk/trunk/Makefile 2010-04-20 15:42:06 UTC (rev 9731) @@ -22,4 +22,7 @@ TEST_TARGET = check +# This is normal for amd64 on i386 +CHECKPKG_OVERRIDES_CSWlibglpk += soname-not-found|libm.so.2 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 20 17:47:18 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Apr 2010 15:47:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[9732] csw/mgar/pkg/cpan/GDTextUtil/trunk Message-ID: Revision: 9732 http://gar.svn.sourceforge.net/gar/?rev=9732&view=rev Author: dmichelsen Date: 2010-04-20 15:47:18 +0000 (Tue, 20 Apr 2010) Log Message: ----------- cpan/GDTextUtil: Update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/GDTextUtil/trunk/Makefile csw/mgar/pkg/cpan/GDTextUtil/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/GDTextUtil/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/GDTextUtil/trunk/files/CSWpmgdtextut.depend csw/mgar/pkg/cpan/GDTextUtil/trunk/files/CSWpmgdtextut.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/GDTextUtil/trunk/ Property changes on: csw/mgar/pkg/cpan/GDTextUtil/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/GDTextUtil/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/GDTextUtil/trunk/Makefile 2010-04-20 15:42:06 UTC (rev 9731) +++ csw/mgar/pkg/cpan/GDTextUtil/trunk/Makefile 2010-04-20 15:47:18 UTC (rev 9732) @@ -3,15 +3,20 @@ CATEGORIES = cpan AUTHOR = MVERB -DESCRIPTION = text utilities for use with GD +DESCRIPTION = Text utilities for use with GD define BLURB This module provides a font-independent way of dealing with text in GD, for use with the GD::Text::* modules and GD::Graph. endef -DISTFILES += $(call admfiles,CSWpmgdtextut,depend) +DISTFILES = COPYING -DEPENDS += cpan/GD +PACKAGES = CSWpmgdtextut +CATALOGNAME = pm_gdtextut +DEP_PKGS = CSWpmgd + +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/GDTextUtil/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/GDTextUtil/trunk/checksums 2010-04-20 15:42:06 UTC (rev 9731) +++ csw/mgar/pkg/cpan/GDTextUtil/trunk/checksums 2010-04-20 15:47:18 UTC (rev 9732) @@ -1,3 +1,2 @@ -2eb815d3b614a06ebd6a4678f8f7a79f download/CSWpmgdtextut.gspec -f76e63f2366b8648783c87e98dda7e19 download/CSWpmgdtextut.depend -941ad06eadc86b47f3a32da405665c41 download/GDTextUtil-0.86.tar.gz +f7b6ae8112858302a569905d878a2930 COPYING +941ad06eadc86b47f3a32da405665c41 GDTextUtil-0.86.tar.gz Copied: csw/mgar/pkg/cpan/GDTextUtil/trunk/files/COPYING (from rev 9723, csw/mgar/pkg/cpan/GDTextUtil/trunk/files/CSWpmgdtextut.gspec) =================================================================== --- csw/mgar/pkg/cpan/GDTextUtil/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/GDTextUtil/trunk/files/COPYING 2010-04-20 15:47:18 UTC (rev 9732) @@ -0,0 +1,6 @@ +Copyright (c) 1999 Martien Verbruggen +mgjv at comdyn.com.au + +This package is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. + Deleted: csw/mgar/pkg/cpan/GDTextUtil/trunk/files/CSWpmgdtextut.depend =================================================================== --- csw/mgar/pkg/cpan/GDTextUtil/trunk/files/CSWpmgdtextut.depend 2010-04-20 15:42:06 UTC (rev 9731) +++ csw/mgar/pkg/cpan/GDTextUtil/trunk/files/CSWpmgdtextut.depend 2010-04-20 15:47:18 UTC (rev 9732) @@ -1 +0,0 @@ -P CSWpmgd pm_gd - interface to Gd Graphics Library Deleted: csw/mgar/pkg/cpan/GDTextUtil/trunk/files/CSWpmgdtextut.gspec =================================================================== --- csw/mgar/pkg/cpan/GDTextUtil/trunk/files/CSWpmgdtextut.gspec 2010-04-20 15:42:06 UTC (rev 9731) +++ csw/mgar/pkg/cpan/GDTextUtil/trunk/files/CSWpmgdtextut.gspec 2010-04-20 15:47:18 UTC (rev 9732) @@ -1,11 +0,0 @@ -%var bitname pm_gdtextut -%var pkgname CSWpmgdtextut -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1999 Martien Verbruggen -mgjv at comdyn.com.au - -This package 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 Apr 21 10:19:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Apr 2010 08:19:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[9733] csw/mgar/pkg/libical/trunk/Makefile Message-ID: Revision: 9733 http://gar.svn.sourceforge.net/gar/?rev=9733&view=rev Author: dmichelsen Date: 2010-04-21 08:19:38 +0000 (Wed, 21 Apr 2010) Log Message: ----------- libical: Fix catalogname Modified Paths: -------------- csw/mgar/pkg/libical/trunk/Makefile Modified: csw/mgar/pkg/libical/trunk/Makefile =================================================================== --- csw/mgar/pkg/libical/trunk/Makefile 2010-04-20 15:47:18 UTC (rev 9732) +++ csw/mgar/pkg/libical/trunk/Makefile 2010-04-21 08:19:38 UTC (rev 9733) @@ -28,11 +28,13 @@ PACKAGES = CSWlibical CSWlibicaldevel CATALOGNAME_CSWlibical = libical -CATALOGNAME_CSWliicaldevel = libical_devel +CATALOGNAME_CSWlibicaldevel = libical_devel SPKG_DESC_CSWlibical = $(DESCRIPTION) SPKG_DESC_CSWlibicaldevel = Developer files for libical +RUNTIME_DEP_PKGS_CSWlibicaldevel = CSWlibical + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -40,4 +42,6 @@ PKGFILES_CSWlibicaldevel = $(PKGFILES_DEVEL) +CHECKPKG_OVERRIDES_CSWlibicaldevel += surplus-dependency|CSWlibical + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 21 13:44:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Apr 2010 11:44:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9734] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 9734 http://gar.svn.sourceforge.net/gar/?rev=9734&view=rev Author: dmichelsen Date: 2010-04-21 11:44:46 +0000 (Wed, 21 Apr 2010) Log Message: ----------- mGAR v2: Remove setting a cookie on phony rule reset-merge Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-04-21 08:19:38 UTC (rev 9733) +++ csw/mgar/gar/v2/gar.mk 2010-04-21 11:44:46 UTC (rev 9734) @@ -779,7 +779,6 @@ reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-src @rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge @rm -rf $(PKGROOT) - @$(DONADA) reset-merge-modulated: @$(call _pmod,Reset merge state) 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 Apr 21 14:02:41 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Apr 2010 12:02:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9735] csw/mgar/pkg/openssh/branches Message-ID: Revision: 9735 http://gar.svn.sourceforge.net/gar/?rev=9735&view=rev Author: dmichelsen Date: 2010-04-21 12:02:40 +0000 (Wed, 21 Apr 2010) Log Message: ----------- openssh: Make branch for 5.4p1-lpk Modified Paths: -------------- csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/Makefile csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/checksums csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/files/CSWosshlpk.prototype Added Paths: ----------- csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/ csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/files/0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch Removed Paths: ------------- csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/files/contrib-openssh-lpk-5.2p1-0.3.9.patch Modified: csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2010-04-20 15:47:18 UTC (rev 9732) +++ csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/Makefile 2010-04-21 12:02:40 UTC (rev 9735) @@ -83,7 +83,7 @@ # documentation files to install (not a gar variable) DOCFILES = CREDITS ChangeLog ChangeLog.gssapi INSTALL LICENCE OVERVIEW README README.dns -DOCFILES += README.platform README.privsep README.smartcard README.tun TODO WARNING.RNG +DOCFILES += README.platform README.privsep README.tun TODO WARNING.RNG # we're using conf handling class from the cswclassutils package RUNTIME_DEP_PKGS += CSWcswclassutils @@ -106,15 +106,19 @@ # we always register the lpk related files so checksum # is the same with LPK enabled or not -DISTFILES += contrib-openssh-lpk-5.2p1-0.3.9.patch +# Patch taken from http://code.google.com/p/openssh-lpk/issues/detail?id=7 +# and modified with +# perl -e 's/--- g/--- /; s/\+{3} g/+++ /' -pi +# as all filenames seem to be prefixed with 'g' and redone patch for +# patchdirlevel 1 instead of 0 +DISTFILES += 0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch ifdef LPK PACKAGES = CSWosshlpk CATALOGNAME_CSWosshlpk = openssh_lpk SPKG_DESC_CSWosshlpk = $(SPKG_DESC_CSWossh) with ldap public key support RUNTIME_DEP_PKGS_CSWosshlpk = $(RUNTIME_DEP_PKGS_CSWossh) CSWoldaprt SPKG_CLASSES_CSWosshlpk = none cswpreserveconf cswinitsmf - MASTER_SITES += http://openssh-lpk.googlecode.com/svn/trunk/patch/contrib/ - PATCHFILES += contrib-openssh-lpk-5.2p1-0.3.9.patch + PATCHFILES += 0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch CONFIGURE_ARGS += --with-ldap DOCFILES += openssh-lpk_openldap.schema openssh-lpk_sun.schema lpk-user-example.txt README.lpk @@ -122,6 +126,10 @@ SPKG_DESC_CSWosshclient = endif +CHECKPKG_OVERRIDES_CSWosshlpk += bad-rpath-entry|/opt/csw/lib/ +CHECKPKG_OVERRIDES_CSWosshlpk += bad-rpath-entry|/opt/csw/lib/ +CHECKPKG_OVERRIDES_CSWosshlpk += init-file-wrong-location|/etc/opt/csw/init.d/cswopenssh +CHECKPKG_OVERRIDES_CSWosshlpk += surplus-dependency|CSWosshclient include gar/category.mk @@ -133,6 +141,7 @@ # adding documentation files post-merge: merge-config-files merge-doc-files merge-init-files merge-contrib-files + @$(MAKECOOKIE) merge-contrib-files: ginstall -D "$(WORKSRC_FIRSTMOD)/contrib/ssh-copy-id" "$(PKGROOT)/$(bindir)/ssh-copy-id" @@ -150,7 +159,6 @@ (cd $(WORKSRC_FIRSTMOD) && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/$$DOCDIR/); \ ginstall $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$$DOCDIR/; \ done - @$(MAKECOOKIE) merge-config-files: ginstall $(PKGROOT)/$(sysconfdir)/ssh/ssh_config $(PKGROOT)/$(sysconfdir)/ssh/ssh_config.CSW @@ -161,6 +169,5 @@ -e 's,^ *# *UsePAM *.*,UsePAM yes,g' \ -e 's,^ *# *PrintMotd *.*,PrintMotd no,g' \ -e 's,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config" > "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW - @$(MAKECOOKIE) Modified: csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2010-04-20 15:47:18 UTC (rev 9732) +++ csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/checksums 2010-04-21 12:02:40 UTC (rev 9735) @@ -1,3 +1,4 @@ +d0bdd7ebcbd41acd67dcf55e98c53dcb 0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch 1d3d6d477c09e59c514e637fa3a2f7a4 CSWossh.checkinstall 0993813fa5c752215f892cb67c86816f CSWossh.preinstall e00106f28a2aef529e097aa182906273 CSWossh.prototype @@ -4,9 +5,8 @@ 39259b734dc10d2b7eb82d2331254d4c CSWosshclient.prototype 1d3d6d477c09e59c514e637fa3a2f7a4 CSWosshlpk.checkinstall 0993813fa5c752215f892cb67c86816f CSWosshlpk.preinstall -77b86c30c3257fdf014102c8166fab2d CSWosshlpk.prototype +36aff9d761d77369ba97ce6508782ccd CSWosshlpk.prototype 3344f6f17e6d75e8e135b8366e64a7ee changelog.CSW -9153031524651a18e7edaed4637aa769 contrib-openssh-lpk-5.2p1-0.3.9.patch a5ebb2e3fdaa06c3c9edba55aac5f83b cswopenssh 8e765642349b6321d01b33e95304e113 cswopenssh.xml 704ad1d3216df8de4d44465006c64c39 derelativise_path_bugfix.patch Added: csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/files/0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch =================================================================== --- csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/files/0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch (rev 0) +++ csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/files/0001-This-is-a-forward-port-of-the-OpenSSH-LPK-support-pa.patch 2010-04-21 12:02:40 UTC (rev 9735) @@ -0,0 +1,1948 @@ +From bf2274fb19b2da6b8b3b6c51111d912e19b3128c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 21 Apr 2010 11:14:45 +0200 +Subject: [PATCH] This is a forward-port of the OpenSSH LPK support patch. + +It adds support for storing OpenSSH public keys in LDAP. It also supports +grouping of machines in the LDAP data to limit users to specific machines. + +The latest homepage for the LPK project is: +http://code.google.com/p/openssh-lpk/ + +The 0.3.10 version of the patch includes a fix for 64-bit platforms, as +discovered by Gentoo, where the bind timeout and search timeout values were not +being parsed correctly: http://bugs.gentoo.org/210110 + +Forward-ported-from: openssh-lpk-5.1p1-0.3.10.patch +--- + Makefile.in | 2 +- + README.lpk | 267 ++++++++++++++++++++ + auth-rsa.c | 86 +++++++ + auth2-pubkey.c | 73 ++++++ + config.h.in | 3 + + configure | 81 ++++++ + configure.ac | 32 +++ + ldapauth.c | 575 +++++++++++++++++++++++++++++++++++++++++++ + ldapauth.h | 124 ++++++++++ + lpk-user-example.txt | 117 +++++++++ + openssh-lpk_openldap.schema | 19 ++ + openssh-lpk_sun.schema | 21 ++ + servconf.c | 169 +++++++++++++ + servconf.h | 7 + + sshd.c | 14 + + sshd_config | 15 ++ + sshd_config.5 | 56 +++++ + 17 files changed, 1660 insertions(+), 1 deletions(-) + create mode 100644 README.lpk + create mode 100644 ldapauth.c + create mode 100644 ldapauth.h + create mode 100644 lpk-user-example.txt + create mode 100644 openssh-lpk_openldap.schema + create mode 100644 openssh-lpk_sun.schema + +diff --git a/Makefile.in b/Makefile.in +index 69e3567..b15d85d 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -91,7 +91,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ + auth2-gss.o gss-serv.o gss-serv-krb5.o \ + loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ + audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \ +- roaming_common.o roaming_serv.o ++ roaming_common.o roaming_serv.o ldapauth.o + + MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out + MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5 +diff --git a/README.lpk b/README.lpk +new file mode 100644 +index 0000000..d0b6de0 +--- /dev/null ++++ b/README.lpk +@@ -0,0 +1,267 @@ ++OpenSSH LDAP PUBLIC KEY PATCH ++Copyright (c) 2003 Eric AUGE (eau at phear.org) ++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. ++ ++purposes of this patch: ++ ++This patch would help to have authentication centralization policy ++using ssh public key authentication. ++This patch could be an alternative to other "secure" authentication system ++working in a similar way (Kerberos, SecurID, etc...), except the fact ++that it's based on OpenSSH and its public key abilities. ++ ++>> FYI: << ++'uid': means unix accounts existing on the current server ++'lpkServerGroup:' mean server group configured on the current server ('lpkServerGroup' in sshd_config) ++ ++example schema: ++ ++ ++ server1 (uid: eau,rival,toto) (lpkServerGroup: unix) ++ ___________ / ++ / \ --- - server3 (uid: eau, titi) (lpkServerGroup: unix) ++ | LDAP Server | \ ++ | eau ,rival | server2 (uid: rival, eau) (lpkServerGroup: unix) ++ | titi ,toto | ++ | userx,.... | server5 (uid: eau) (lpkServerGroup: mail) ++ \___________/ \ / ++ ----- - server4 (uid: eau, rival) (no group configured) ++ \ ++ etc... ++ ++- WHAT WE NEED : ++ ++ * configured LDAP server somewhere on the network (i.e. OpenLDAP) ++ * patched sshd (with this patch ;) ++ * LDAP user(/group) entry (look at users.ldif (& groups.ldif)): ++ User entry: ++ - attached to the 'ldapPublicKey' objectclass ++ - attached to the 'posixAccount' objectclass ++ - with a filled 'sshPublicKey' attribute ++ Example: ++ dn: uid=eau,ou=users,dc=cuckoos,dc=net ++ objectclass: top ++ objectclass: person ++ objectclass: organizationalPerson ++ objectclass: posixAccount ++ objectclass: ldapPublicKey ++ description: Eric AUGE Account ++ userPassword: blah ++ cn: Eric AUGE ++ sn: Eric AUGE ++ uid: eau ++ uidNumber: 1034 ++ gidNumber: 1 ++ homeDirectory: /export/home/eau ++ sshPublicKey: ssh-dss AAAAB3... ++ sshPublicKey: ssh-dss AAAAM5... ++ ++ Group entry: ++ - attached to the 'posixGroup' objectclass ++ - with a 'cn' groupname attribute ++ - with multiple 'memberUid' attributes filled with usernames allowed in this group ++ Example: ++ # few members ++ dn: cn=unix,ou=groups,dc=cuckoos,dc=net ++ objectclass: top ++ objectclass: posixGroup ++ description: Unix based servers group ++ cn: unix ++ gidNumber: 1002 ++ memberUid: eau ++ memberUid: user1 ++ memberUid: user2 ++ ++ ++- HOW IT WORKS : ++ ++ * without patch ++ If a user wants to authenticate to log in a server the sshd, will first look for authentication method allowed (RSAauth,kerberos,etc..) ++ and if RSAauth and tickets based auth fails, it will fallback to standard password authentication (if enabled). ++ ++ * with the patch ++ If a user want to authenticate to log in a server, the sshd will first look for auth method including LDAP pubkey, if the ldappubkey options is enabled. ++ It will do an ldapsearch to get the public key directly from the LDAP instead of reading it from the server filesystem. ++ (usually in $HOME/.ssh/authorized_keys) ++ ++ If groups are enabled, it will also check if the user that wants to login is in the group of the server he is trying to log into. ++ If it fails, it falls back on RSA auth files ($HOME/.ssh/authorized_keys), etc.. and finally to standard password authentication (if enabled). ++ ++ 7 tokens are added to sshd_config : ++ # here is the new patched ldap related tokens ++ # entries in your LDAP must be posixAccount & strongAuthenticationUser & posixGroup ++ UseLPK yes # look the pub key into LDAP ++ LpkServers ldap://10.31.32.5/ ldap://10.31.32.4 ldap://10.31.32.3 # which LDAP server for users ? (URL format) ++ LpkUserDN ou=users,dc=foobar,dc=net # which base DN for users ? ++ LpkGroupDN ou=groups,dc=foobar,dc=net # which base DN for groups ? ++ LpkBindDN cn=manager,dc=foobar,dc=net # which bind DN ? ++ LpkBindPw asecret # bind DN credidentials ++ LpkServerGroup agroupname # the group the server is part of ++ ++ Right now i'm using anonymous binding to get public keys, because getting public keys of someone doesn't impersonate him\xB8 but there is some ++ flaws you have to take care of. ++ ++- HOW TO INSERT A USER/KEY INTO AN LDAP ENTRY ++ ++ * my way (there is plenty :) ++ - create ldif file (i.e. users.ldif) ++ - cat ~/.ssh/id_dsa.pub OR cat ~/.ssh/id_rsa.pub OR cat ~/.ssh/identity.pub ++ - my way in 4 steps : ++ Example: ++ ++ # you add this to the user entry in the LDIF file : ++ [...] ++ objectclass: posixAccount ++ objectclass: ldapPublicKey ++ [...] ++ sshPubliKey: ssh-dss AAAABDh12DDUR2... ++ [...] ++ ++ # insert your entry and you're done :) ++ ldapadd -D balblabla -w bleh < file.ldif ++ ++ all standard options can be present in the 'sshPublicKey' attribute. ++ ++- WHY : ++ ++ Simply because, i was looking for a way to centralize all sysadmins authentication, easily, without completely using LDAP ++ as authentication method (like pam_ldap etc..). ++ ++ After looking into Kerberos, SecurID, and other centralized secure authentications systems, the use of RSA and LDAP to get ++ public key for authentication allows us to control who has access to which server (the user needs an account and to be in 'strongAuthenticationUser' ++ objectclass within LDAP and part of the group the SSH server is in). ++ ++ Passwords update are no longer a nightmare for a server farm (key pair passphrase is stored on each user's box and private key is locally encrypted using his passphrase ++ so each user can change it as much as he wants). ++ ++ Blocking a user account can be done directly from the LDAP (if sshd is using RSAAuth + ldap only). ++ ++- RULES : ++ Entry in the LDAP server must respect 'posixAccount' and 'ldapPublicKey' which are defined in core.schema. ++ and the additionnal lpk.schema. ++ ++ This patch could allow a smooth transition between standard auth (/etc/passwd) and complete LDAP based authentication ++ (pamldap, nss_ldap, etc..). ++ ++ This can be an alternative to other (old?/expensive?) authentication methods (Kerberos/SecurID/..). ++ ++ Referring to schema at the beginning of this file if user 'eau' is only in group 'unix' ++ 'eau' would ONLY access 'server1', 'server2', 'server3' AND 'server4' BUT NOT 'server5'. ++ If you then modify the LDAP 'mail' group entry to add 'memberUid: eau' THEN user 'eau' would be able ++ to log in 'server5' (i hope you got the idea, my english is bad :). ++ ++ Each server's sshd is patched and configured to ask the public key and the group infos in the LDAP ++ server. ++ When you want to allow a new user to have access to the server parc, you just add him an account on ++ your servers, you add his public key into his entry on the LDAP server, it's done. ++ ++ Because sshds are looking public keys into the LDAP directly instead of a file ($HOME/.ssh/authorized_keys). ++ ++ When the user needs to change his passphrase he can do it directly from his workstation by changing ++ his own key set lock passphrase, and all servers are automatically aware. ++ ++ With a CAREFUL LDAP server configuration you could allow a user to add/delete/modify his own entry himself ++ so he can add/modify/delete himself his public key when needed. ++ ++\xAD FLAWS : ++ LDAP must be well configured, getting the public key of some user is not a problem, but if anonymous LDAP ++ allow write to users dn, somebody could replace someuser's public key by its own and impersonate some ++ of your users in all your server farm be VERY CAREFUL. ++ ++ MITM attack when sshd is requesting the public key, could lead to a compromise of your servers allowing login ++ as the impersonnated user. ++ ++ If LDAP server is down then, fallback on passwd auth. ++ ++ the ldap code part has not been well audited yet. ++ ++- LDAP USER ENTRY EXAMPLES (LDIF Format, look in users.ldif) ++ --- CUT HERE --- ++ dn: uid=jdoe,ou=users,dc=foobar,dc=net ++ objectclass: top ++ objectclass: person ++ objectclass: organizationalPerson ++ objectclass: posixAccount ++ objectclass: ldapPublicKey ++ description: My account ++ cn: John Doe ++ sn: John Doe ++ uid: jdoe ++ uidNumber: 100 ++ gidNumber: 100 ++ homeDirectory: /home/jdoe ++ sshPublicKey: ssh-dss AAAAB3NzaC1kc3MAAAEBAOvL8pREUg9wSy/8+hQJ54YF3AXkB0OZrXB.... ++ [...] ++ --- CUT HERE --- ++ ++- LDAP GROUP ENTRY EXAMPLES (LDIF Format, look in groups.ldif) ++ --- CUT HERE --- ++ dn: cn=unix,ou=groups,dc=cuckoos,dc=net ++ objectclass: top ++ objectclass: posixGroup ++ description: Unix based servers group ++ cn: unix ++ gidNumber: 1002 ++ memberUid: jdoe ++ memberUid: user1 ++ memberUid: user2 ++ [...] ++ --- CUT HERE --- ++ ++>> FYI: << ++Multiple 'sshPublicKey' in a user entry are allowed, as well as multiple 'memberUid' attributes in a group entry ++ ++- COMPILING: ++ 1. Apply the patch ++ 2. ./configure --with-your-options --with-ldap=/prefix/to/ldap_libs_and_includes ++ 3. make ++ 4. it's done. ++ ++- BLA : ++ I hope this could help, and i hope to be clear enough,, or give ideas. questions/comments/improvements are welcome. ++ ++- TODO : ++ Redesign differently. ++ ++- DOCS/LINK : ++ http://pacsec.jp/core05/psj05-barisani-en.pdf ++ http://fritz.potsdam.edu/projects/openssh-lpk/ ++ http://fritz.potsdam.edu/projects/sshgate/ ++ http://dev.inversepath.com/trac/openssh-lpk ++ http://lam.sf.net/ ( http://lam.sourceforge.net/documentation/supportedSchemas.htm ) ++ ++- CONTRIBUTORS/IDEAS/GREETS : ++ - Falk Siemonsmeier. ++ - Jacob Rief. ++ - Michael Durchgraf. ++ - frederic peters. ++ - Finlay dobbie. ++ - Stefan Fisher. ++ - Robin H. Johnson. ++ - Adrian Bridgett. ++ ++- CONTACT : ++ - Eric AUGE ++ - Andrea Barisani +diff --git a/auth-rsa.c b/auth-rsa.c +index 65571a8..107fcaf 100644 +--- a/auth-rsa.c ++++ b/auth-rsa.c +@@ -177,10 +177,96 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) + FILE *f; + u_long linenum = 0; + Key *key; ++#ifdef WITH_LDAP_PUBKEY ++ ldap_key_t * k; ++ unsigned int i = 0; ++#endif + + /* Temporarily use the user's uid. */ + temporarily_use_uid(pw); + ++#ifdef WITH_LDAP_PUBKEY ++ /* here is the job */ ++ key = key_new(KEY_RSA1); ++ ++ if (options.lpk.on) { ++ debug("[LDAP] trying LDAP first uid=%s", pw->pw_name); ++ if ( ldap_ismember(&options.lpk, pw->pw_name) > 0) { ++ if ( (k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) { ++ for (i = 0 ; i < k->num ; i++) { ++ char *cp, *options = NULL; ++ ++ for (cp = k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++) ++ ; ++ if (!*cp || *cp == '\n' || *cp == '#') ++ continue; ++ ++ /* ++ * Check if there are options for this key, and if so, ++ * save their starting address and skip the option part ++ * for now. If there are no options, set the starting ++ * address to NULL. ++ */ ++ if (*cp < '0' || *cp > '9') { ++ int quoted = 0; ++ options = cp; ++ for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) { ++ if (*cp == '\\' && cp[1] == '"') ++ cp++; /* Skip both */ ++ else if (*cp == '"') ++ quoted = !quoted; ++ } ++ } else ++ options = NULL; ++ ++ /* Parse the key from the line. */ ++ if (hostfile_read_key(&cp, &bits, key) == 0) { ++ debug("[LDAP] line %d: non ssh1 key syntax", i); ++ continue; ++ } ++ /* cp now points to the comment part. */ ++ ++ /* Check if the we have found the desired key (identified by its modulus). */ ++ if (BN_cmp(key->rsa->n, client_n) != 0) ++ continue; ++ ++ /* check the real bits */ ++ if (bits != (unsigned int)BN_num_bits(key->rsa->n)) ++ logit("[LDAP] Warning: ldap, line %lu: keysize mismatch: " ++ "actual %d vs. announced %d.", (unsigned long)i, BN_num_bits(key->rsa->n), bits); ++ ++ /* We have found the desired key. */ ++ /* ++ * If our options do not allow this key to be used, ++ * do not send challenge. ++ */ ++ if (!auth_parse_options(pw, options, "[LDAP]", (unsigned long) i)) ++ continue; ++ ++ /* break out, this key is allowed */ ++ allowed = 1; ++ ++ /* add the return stuff etc... */ ++ /* Restore the privileged uid. */ ++ restore_uid(); ++ ++ /* return key if allowed */ ++ if (allowed && rkey != NULL) ++ *rkey = key; ++ else ++ key_free(key); ++ ++ ldap_keys_free(k); ++ return (allowed); ++ } ++ } else { ++ logit("[LDAP] no keys found for '%s'!", pw->pw_name); ++ } ++ } else { ++ logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup); ++ } ++ } ++#endif + /* The authorized keys. */ + file = authorized_keys_file(pw); + debug("trying public RSA key file %s", file); +diff --git a/auth2-pubkey.c b/auth2-pubkey.c +index 51aa774..7a3a27b 100644 +--- a/auth2-pubkey.c ++++ b/auth2-pubkey.c +@@ -58,6 +58,10 @@ + #include "misc.h" + #include "authfile.h" + ++#ifdef WITH_LDAP_PUBKEY ++#include "ldapauth.h" ++#endif ++ + /* import */ + extern ServerOptions options; + extern u_char *session_id2; +@@ -187,10 +191,79 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file) + u_long linenum = 0; + Key *found; + char *fp; ++#ifdef WITH_LDAP_PUBKEY ++ ldap_key_t * k; ++ unsigned int i = 0; ++#endif + + /* Temporarily use the user's uid. */ + temporarily_use_uid(pw); + ++#ifdef WITH_LDAP_PUBKEY ++ found_key = 0; ++ /* allocate a new key type */ ++ found = key_new(key->type); ++ ++ /* first check if the options is enabled, then try.. */ ++ if (options.lpk.on) { ++ debug("[LDAP] trying LDAP first uid=%s",pw->pw_name); ++ if (ldap_ismember(&options.lpk, pw->pw_name) > 0) { ++ if ((k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) { ++ /* Skip leading whitespace, empty and comment lines. */ ++ for (i = 0 ; i < k->num ; i++) { ++ /* dont forget if multiple keys to reset options */ ++ char *cp, *options = NULL; ++ ++ for (cp = (char *)k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++) ++ ; ++ if (!*cp || *cp == '\n' || *cp == '#') ++ continue; ++ ++ if (key_read(found, &cp) != 1) { ++ /* no key? check if there are options for this key */ ++ int quoted = 0; ++ debug2("[LDAP] user_key_allowed: check options: '%s'", cp); ++ options = cp; ++ for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) { ++ if (*cp == '\\' && cp[1] == '"') ++ cp++; /* Skip both */ ++ else if (*cp == '"') ++ quoted = !quoted; ++ } ++ /* Skip remaining whitespace. */ ++ for (; *cp == ' ' || *cp == '\t'; cp++) ++ ; ++ if (key_read(found, &cp) != 1) { ++ debug2("[LDAP] user_key_allowed: advance: '%s'", cp); ++ /* still no key? advance to next line*/ ++ continue; ++ } ++ } ++ ++ if (key_equal(found, key) && ++ auth_parse_options(pw, options, file, linenum) == 1) { ++ found_key = 1; ++ debug("[LDAP] matching key found"); ++ fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX); ++ verbose("[LDAP] Found matching %s key: %s", key_type(found), fp); ++ ++ /* restoring memory */ ++ ldap_keys_free(k); ++ xfree(fp); ++ restore_uid(); ++ key_free(found); ++ return found_key; ++ break; ++ } ++ }/* end of LDAP for() */ ++ } else { ++ logit("[LDAP] no keys found for '%s'!", pw->pw_name); ++ } ++ } else { ++ logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup); ++ } ++ } ++#endif + debug("trying public key file %s", file); + f = auth_openkeyfile(file, pw, options.strict_modes); + +diff --git a/config.h.in b/config.h.in +index a61dec6..eba6884 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -575,6 +575,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_LINUX_IF_TUN_H + ++/* Define if you want LDAP support */ ++#undef WITH_LDAP_PUBKEY ++ + /* Define if your libraries define login() */ + #undef HAVE_LOGIN + +diff --git a/configure b/configure +index 7c19fc2..8ebf2e1 100755 +--- a/configure ++++ b/configure +@@ -1340,6 +1340,7 @@ Optional Packages: + --with-tcp-wrappers[=PATH] Enable tcpwrappers support (optionally in PATH) + --with-libedit[=PATH] Enable libedit support for sftp + --with-audit=module Enable EXPERIMENTAL audit support (modules=debug,bsm) ++ --with-ldap[=PATH] Enable LDAP pubkey support (optionally in PATH) + --with-ssl-dir=PATH Specify path to OpenSSL installation + --without-openssl-header-check Disable OpenSSL version consistency check + --with-ssl-engine Enable OpenSSL (hardware) ENGINE support +@@ -12845,6 +12846,85 @@ echo "$as_me: error: Unknown audit module $withval" >&2;} + fi + + ++# Check whether user wants LDAP support ++LDAP_MSG="no" ++ ++# Check whether --with-ldap was given. ++if test "${with_ldap+set}" = set; then ++ withval=$with_ldap; ++ if test "x$withval" != "xno" ; then ++ ++ if test "x$withval" != "xyes" ; then ++ CPPFLAGS="$CPPFLAGS -I${withval}/include" ++ LDFLAGS="$LDFLAGS -L${withval}/lib" ++ fi ++ ++ ++cat >>confdefs.h <<\_ACEOF ++#define WITH_LDAP_PUBKEY 1 ++_ACEOF ++ ++ LIBS="-lldap $LIBS" ++ LDAP_MSG="yes" ++ ++ { echo "$as_me:$LINENO: checking for LDAP support" >&5 ++echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6; } ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ #include ++int ++main () ++{ ++(void)ldap_init(0, 0); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ { { echo "$as_me:$LINENO: error: ** Incomplete or missing ldap libraries **" >&5 ++echo "$as_me: error: ** Incomplete or missing ldap libraries **" >&2;} ++ { (exit 1); exit 1; }; } ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ fi ++ ++ ++fi ++ ++ + + + +@@ -30786,6 +30866,7 @@ echo " SELinux support: $SELINUX_MSG" + echo " Smartcard support: $SCARD_MSG" + echo " S/KEY support: $SKEY_MSG" + echo " TCP Wrappers support: $TCPW_MSG" ++echo " LDAP support: $LDAP_MSG" + echo " MD5 password support: $MD5_MSG" + echo " libedit support: $LIBEDIT_MSG" + echo " Solaris process contract support: $SPC_MSG" +diff --git a/configure.ac b/configure.ac +index a9960a7..d3d85ca 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1323,6 +1323,37 @@ AC_ARG_WITH(audit, + esac ] + ) + ++# Check whether user wants LDAP support ++LDAP_MSG="no" ++AC_ARG_WITH(ldap, ++ [ --with-ldap[[=PATH]] Enable LDAP pubkey support (optionally in PATH)], ++ [ ++ if test "x$withval" != "xno" ; then ++ ++ if test "x$withval" != "xyes" ; then ++ CPPFLAGS="$CPPFLAGS -I${withval}/include" ++ LDFLAGS="$LDFLAGS -L${withval}/lib" ++ fi ++ ++ AC_DEFINE([WITH_LDAP_PUBKEY], 1, [Enable LDAP pubkey support]) ++ LIBS="-lldap $LIBS" ++ LDAP_MSG="yes" ++ ++ AC_MSG_CHECKING([for LDAP support]) ++ AC_TRY_COMPILE( ++ [#include ++ #include ], ++ [(void)ldap_init(0, 0);], ++ [AC_MSG_RESULT(yes)], ++ [ ++ AC_MSG_RESULT(no) ++ AC_MSG_ERROR([** Incomplete or missing ldap libraries **]) ++ ] ++ ) ++ fi ++ ] ++) ++ + dnl Checks for library functions. Please keep in alphabetical order + AC_CHECK_FUNCS( \ + arc4random \ +@@ -4185,6 +4216,7 @@ echo " SELinux support: $SELINUX_MSG" + echo " Smartcard support: $SCARD_MSG" + echo " S/KEY support: $SKEY_MSG" + echo " TCP Wrappers support: $TCPW_MSG" ++echo " LDAP support: $LDAP_MSG" + echo " MD5 password support: $MD5_MSG" + echo " libedit support: $LIBEDIT_MSG" + echo " Solaris process contract support: $SPC_MSG" +diff --git a/ldapauth.c b/ldapauth.c +new file mode 100644 +index 0000000..133483e +--- /dev/null ++++ b/ldapauth.c +@@ -0,0 +1,575 @@ ++/* ++ * $Id: openssh-lpk-4.3p1-0.3.7.patch,v 1.3 2006/04/18 15:29:09 eau Exp $ ++ */ ++ ++/* ++ * ++ * Copyright (c) 2005, Eric AUGE ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: ++ * ++ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. ++ * 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. ++ * Neither the name of the phear.org nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * ++ */ ++ ++#include "includes.h" ++ ++#ifdef WITH_LDAP_PUBKEY ++ ++#include ++#include ++#include ++#include ++ ++#include "ldapauth.h" ++#include "log.h" ++ ++static char *attrs[] = { ++ PUBKEYATTR, ++ NULL ++}; ++ ++/* filter building infos */ ++#define FILTER_GROUP_PREFIX "(&(objectclass=posixGroup)" ++#define FILTER_OR_PREFIX "(|" ++#define FILTER_OR_SUFFIX ")" ++#define FILTER_CN_PREFIX "(cn=" ++#define FILTER_CN_SUFFIX ")" ++#define FILTER_UID_FORMAT "(memberUid=%s)" ++#define FILTER_GROUP_SUFFIX ")" ++#define FILTER_GROUP_SIZE(group) (size_t) (strlen(group)+(ldap_count_group(group)*5)+52) ++ ++/* just filter building stuff */ ++#define REQUEST_GROUP_SIZE(filter, uid) (size_t) (strlen(filter)+strlen(uid)+1) ++#define REQUEST_GROUP(buffer, prefilter, pwname) \ ++ buffer = (char *) calloc(REQUEST_GROUP_SIZE(prefilter, pwname), sizeof(char)); \ ++ if (!buffer) { \ ++ perror("calloc()"); \ ++ return FAILURE; \ ++ } \ ++ snprintf(buffer, REQUEST_GROUP_SIZE(prefilter,pwname), prefilter, pwname) ++/* ++XXX OLD group building macros ++#define REQUEST_GROUP_SIZE(grp, uid) (size_t) (strlen(grp)+strlen(uid)+46) ++#define REQUEST_GROUP(buffer,pwname,grp) \ ++ buffer = (char *) calloc(REQUEST_GROUP_SIZE(grp, pwname), sizeof(char)); \ ++ if (!buffer) { \ ++ perror("calloc()"); \ ++ return FAILURE; \ ++ } \ ++ snprintf(buffer,REQUEST_GROUP_SIZE(grp,pwname),"(&(objectclass=posixGroup)(cn=%s)(memberUid=%s))",grp,pwname) ++ */ ++ ++/* ++XXX stock upstream version without extra filter support ++#define REQUEST_USER_SIZE(uid) (size_t) (strlen(uid)+64) ++#define REQUEST_USER(buffer, pwname) \ ++ buffer = (char *) calloc(REQUEST_USER_SIZE(pwname), sizeof(char)); \ ++ if (!buffer) { \ ++ perror("calloc()"); \ ++ return NULL; \ ++ } \ ++ snprintf(buffer,REQUEST_USER_SIZE(pwname),"(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s))",pwname) ++ */ ++ ++#define REQUEST_USER_SIZE(uid, filter) (size_t) (strlen(uid)+64+(filter != NULL ? strlen(filter) : 0)) ++#define REQUEST_USER(buffer, pwname, customfilter) \ ++ buffer = (char *) calloc(REQUEST_USER_SIZE(pwname, customfilter), sizeof(char)); \ ++ if (!buffer) { \ ++ perror("calloc()"); \ ++ return NULL; \ ++ } \ ++ snprintf(buffer, REQUEST_USER_SIZE(pwname, customfilter), \ ++ "(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s)%s)", \ ++ pwname, (customfilter != NULL ? customfilter : "")) ++ ++/* some portable and working tokenizer, lame though */ ++static int tokenize(char ** o, size_t size, char * input) { ++ unsigned int i = 0, num; ++ const char * charset = " \t"; ++ char * ptr = input; ++ ++ /* leading white spaces are ignored */ ++ num = strspn(ptr, charset); ++ ptr += num; ++ ++ while ((num = strcspn(ptr, charset))) { ++ if (i < size-1) { ++ o[i++] = ptr; ++ ptr += num; ++ if (*ptr) ++ *ptr++ = '\0'; ++ } ++ } ++ o[i] = NULL; ++ return SUCCESS; ++} ++ ++void ldap_close(ldap_opt_t * ldap) { ++ ++ if (!ldap) ++ return; ++ ++ if ( ldap_unbind_ext(ldap->ld, NULL, NULL) < 0) ++ ldap_perror(ldap->ld, "ldap_unbind()"); ++ ++ ldap->ld = NULL; ++ FLAG_SET_DISCONNECTED(ldap->flags); ++ ++ return; ++} ++ ++/* init && bind */ ++int ldap_connect(ldap_opt_t * ldap) { ++ int version = LDAP_VERSION3; ++ ++ if (!ldap->servers) ++ return FAILURE; ++ ++ /* Connection Init and setup */ ++ ldap->ld = ldap_init(ldap->servers, LDAP_PORT); ++ if (!ldap->ld) { ++ ldap_perror(ldap->ld, "ldap_init()"); ++ return FAILURE; ++ } ++ ++ if ( ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_OPT_SUCCESS) { ++ ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_PROTOCOL_VERSION)"); ++ return FAILURE; ++ } ++ ++ /* Timeouts setup */ ++ if (ldap_set_option(ldap->ld, LDAP_OPT_NETWORK_TIMEOUT, &ldap->b_timeout) != LDAP_SUCCESS) { ++ ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_NETWORK_TIMEOUT)"); ++ } ++ if (ldap_set_option(ldap->ld, LDAP_OPT_TIMEOUT, &ldap->s_timeout) != LDAP_SUCCESS) { ++ ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_TIMEOUT)"); ++ } ++ ++ /* TLS support */ ++ if ( (ldap->tls == -1) || (ldap->tls == 1) ) { ++ if (ldap_start_tls_s(ldap->ld, NULL, NULL ) != LDAP_SUCCESS) { ++ /* failed then reinit the initial connect */ ++ ldap_perror(ldap->ld, "ldap_connect: (TLS) ldap_start_tls()"); ++ if (ldap->tls == 1) ++ return FAILURE; ++ ++ ldap->ld = ldap_init(ldap->servers, LDAP_PORT); ++ if (!ldap->ld) { ++ ldap_perror(ldap->ld, "ldap_init()"); ++ return FAILURE; ++ } ++ ++ if ( ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_OPT_SUCCESS) { ++ ldap_perror(ldap->ld, "ldap_set_option()"); ++ return FAILURE; ++ } ++ } ++ } ++ ++ ++ if ( ldap_simple_bind_s(ldap->ld, ldap->binddn, ldap->bindpw) != LDAP_SUCCESS) { ++ ldap_perror(ldap->ld, "ldap_simple_bind_s()"); ++ return FAILURE; ++ } ++ ++ /* says it is connected */ ++ FLAG_SET_CONNECTED(ldap->flags); ++ ++ return SUCCESS; ++} ++ ++/* must free allocated ressource */ ++static char * ldap_build_host(char *host, int port) { ++ unsigned int size = strlen(host)+11; ++ char * h = (char *) calloc (size, sizeof(char)); ++ int rc; ++ if (!h) ++ return NULL; ++ ++ rc = snprintf(h, size, "%s:%d ", host, port); ++ if (rc == -1) ++ return NULL; ++ return h; ++} ++ ++static int ldap_count_group(const char * input) { ++ const char * charset = " \t"; ++ const char * ptr = input; ++ unsigned int count = 0; ++ unsigned int num; ++ ++ num = strspn(ptr, charset); ++ ptr += num; ++ ++ while ((num = strcspn(ptr, charset))) { ++ count++; ++ ptr += num; ++ ptr++; ++ } ++ ++ return count; ++} ++ ++/* format filter */ ++char * ldap_parse_groups(const char * groups) { ++ unsigned int buffer_size = FILTER_GROUP_SIZE(groups); ++ char * buffer = (char *) calloc(buffer_size, sizeof(char)); ++ char * g = NULL; ++ char * garray[32]; ++ unsigned int i = 0; ++ ++ if ((!groups)||(!buffer)) ++ return NULL; ++ ++ g = strdup(groups); ++ if (!g) { ++ free(buffer); ++ return NULL; ++ } ++ ++ /* first separate into n tokens */ ++ if ( tokenize(garray, sizeof(garray)/sizeof(*garray), g) < 0) { ++ free(g); ++ free(buffer); ++ return NULL; ++ } ++ ++ /* build the final filter format */ ++ strlcat(buffer, FILTER_GROUP_PREFIX, buffer_size); ++ strlcat(buffer, FILTER_OR_PREFIX, buffer_size); ++ i = 0; ++ while (garray[i]) { ++ strlcat(buffer, FILTER_CN_PREFIX, buffer_size); ++ strlcat(buffer, garray[i], buffer_size); ++ strlcat(buffer, FILTER_CN_SUFFIX, buffer_size); ++ i++; ++ } ++ strlcat(buffer, FILTER_OR_SUFFIX, buffer_size); ++ strlcat(buffer, FILTER_UID_FORMAT, buffer_size); ++ strlcat(buffer, FILTER_GROUP_SUFFIX, buffer_size); ++ ++ free(g); ++ return buffer; ++} ++ ++/* a bit dirty but leak free */ ++char * ldap_parse_servers(const char * servers) { ++ char * s = NULL; ++ char * tmp = NULL, *urls[32]; ++ unsigned int num = 0 , i = 0 , asize = 0; ++ LDAPURLDesc *urld[32]; ++ ++ if (!servers) ++ return NULL; ++ ++ /* local copy of the arg */ ++ s = strdup(servers); ++ if (!s) ++ return NULL; ++ ++ /* first separate into URL tokens */ ++ if ( tokenize(urls, sizeof(urls)/sizeof(*urls), s) < 0) ++ return NULL; ++ ++ i = 0; ++ while (urls[i]) { ++ if (! ldap_is_ldap_url(urls[i]) || ++ (ldap_url_parse(urls[i], &urld[i]) != 0)) { ++ return NULL; ++ } ++ i++; ++ } ++ ++ /* now free(s) */ ++ free (s); ++ ++ /* how much memory do we need */ ++ num = i; ++ for (i = 0 ; i < num ; i++) ++ asize += strlen(urld[i]->lud_host)+11; ++ ++ /* alloc */ ++ s = (char *) calloc( asize+1 , sizeof(char)); ++ if (!s) { ++ for (i = 0 ; i < num ; i++) ++ ldap_free_urldesc(urld[i]); ++ return NULL; ++ } ++ ++ /* then build the final host string */ ++ for (i = 0 ; i < num ; i++) { ++ /* built host part */ ++ tmp = ldap_build_host(urld[i]->lud_host, urld[i]->lud_port); ++ strncat(s, tmp, strlen(tmp)); ++ ldap_free_urldesc(urld[i]); ++ free(tmp); ++ } ++ ++ return s; ++} ++ ++void ldap_options_print(ldap_opt_t * ldap) { ++ debug("ldap options:"); ++ debug("servers: %s", ldap->servers); ++ if (ldap->u_basedn) ++ debug("user basedn: %s", ldap->u_basedn); ++ if (ldap->g_basedn) ++ debug("group basedn: %s", ldap->g_basedn); ++ if (ldap->binddn) ++ debug("binddn: %s", ldap->binddn); ++ if (ldap->bindpw) ++ debug("bindpw: %s", ldap->bindpw); ++ if (ldap->sgroup) ++ debug("group: %s", ldap->sgroup); ++ if (ldap->filter) ++ debug("filter: %s", ldap->filter); ++} ++ ++void ldap_options_free(ldap_opt_t * l) { ++ if (!l) ++ return; ++ if (l->servers) ++ free(l->servers); ++ if (l->u_basedn) ++ free(l->u_basedn); ++ if (l->g_basedn) ++ free(l->g_basedn); ++ if (l->binddn) ++ free(l->binddn); ++ if (l->bindpw) ++ free(l->bindpw); ++ if (l->sgroup) ++ free(l->sgroup); ++ if (l->fgroup) ++ free(l->fgroup); ++ if (l->filter) ++ free(l->filter); ++ if (l->l_conf) ++ free(l->l_conf); ++ free(l); ++} ++ ++/* free keys */ ++void ldap_keys_free(ldap_key_t * k) { ++ ldap_value_free_len(k->keys); ++ free(k); ++ return; ++} ++ ++ldap_key_t * ldap_getuserkey(ldap_opt_t *l, const char * user) { ++ ldap_key_t * k = (ldap_key_t *) calloc (1, sizeof(ldap_key_t)); ++ LDAPMessage *res, *e; ++ char * filter; ++ int i; ++ ++ if ((!k) || (!l)) ++ return NULL; ++ ++ /* Am i still connected ? RETRY n times */ ++ /* XXX TODO: setup some conf value for retrying */ ++ if (!(l->flags & FLAG_CONNECTED)) ++ for (i = 0 ; i < 2 ; i++) ++ if (ldap_connect(l) == 0) ++ break; ++ ++ /* quick check for attempts to be evil */ ++ if ((strchr(user, '(') != NULL) || (strchr(user, ')') != NULL) || ++ (strchr(user, '*') != NULL) || (strchr(user, '\\') != NULL)) ++ return NULL; ++ ++ /* build filter for LDAP request */ ++ REQUEST_USER(filter, user, l->filter); ++ ++ if ( ldap_search_st( l->ld, ++ l->u_basedn, ++ LDAP_SCOPE_SUBTREE, ++ filter, ++ attrs, 0, &l->s_timeout, &res ) != LDAP_SUCCESS) { ++ ++ ldap_perror(l->ld, "ldap_search_st()"); ++ ++ free(filter); ++ free(k); ++ ++ /* XXX error on search, timeout etc.. close ask for reconnect */ ++ ldap_close(l); ++ ++ return NULL; ++ } ++ ++ /* free */ ++ free(filter); ++ ++ /* check if any results */ ++ i = ldap_count_entries(l->ld,res); ++ if (i <= 0) { ++ ldap_msgfree(res); ++ free(k); ++ return NULL; ++ } ++ ++ if (i > 1) ++ debug("[LDAP] duplicate entries, using the FIRST entry returned"); ++ ++ e = ldap_first_entry(l->ld, res); ++ k->keys = ldap_get_values_len(l->ld, e, PUBKEYATTR); ++ k->num = ldap_count_values_len(k->keys); ++ ++ ldap_msgfree(res); ++ return k; ++} ++ ++ ++/* -1 if trouble ++ 0 if user is NOT member of current server group ++ 1 if user IS MEMBER of current server group ++ */ ++int ldap_ismember(ldap_opt_t * l, const char * user) { ++ LDAPMessage *res; ++ char * filter; ++ int i; ++ ++ if ((!l->sgroup) || !(l->g_basedn)) ++ return 1; ++ ++ /* Am i still connected ? RETRY n times */ ++ /* XXX TODO: setup some conf value for retrying */ ++ if (!(l->flags & FLAG_CONNECTED)) ++ for (i = 0 ; i < 2 ; i++) ++ if (ldap_connect(l) == 0) ++ break; ++ ++ /* quick check for attempts to be evil */ ++ if ((strchr(user, '(') != NULL) || (strchr(user, ')') != NULL) || ++ (strchr(user, '*') != NULL) || (strchr(user, '\\') != NULL)) ++ return FAILURE; ++ ++ /* build filter for LDAP request */ ++ REQUEST_GROUP(filter, l->fgroup, user); ++ ++ if (ldap_search_st( l->ld, ++ l->g_basedn, ++ LDAP_SCOPE_SUBTREE, ++ filter, ++ NULL, 0, &l->s_timeout, &res) != LDAP_SUCCESS) { ++ ++ ldap_perror(l->ld, "ldap_search_st()"); ++ ++ free(filter); ++ ++ /* XXX error on search, timeout etc.. close ask for reconnect */ ++ ldap_close(l); ++ ++ return FAILURE; ++ } ++ ++ free(filter); ++ ++ /* check if any results */ ++ if (ldap_count_entries(l->ld, res) > 0) { ++ ldap_msgfree(res); ++ return 1; ++ } ++ ++ ldap_msgfree(res); ++ return 0; ++} ++ ++/* ++ * ldap.conf simple parser ++ * XXX TODO: sanity checks ++ * must either ++ * - free the previous ldap_opt_before replacing entries ++ * - free each necessary previously parsed elements ++ * ret: ++ * -1 on FAILURE, 0 on SUCCESS ++ */ ++int ldap_parse_lconf(ldap_opt_t * l) { ++ FILE * lcd; /* ldap.conf descriptor */ ++ char buf[BUFSIZ]; ++ char * s = NULL, * k = NULL, * v = NULL; ++ int li, len; ++ ++ lcd = fopen (l->l_conf, "r"); ++ if (lcd == NULL) { ++ /* debug("Cannot open %s", l->l_conf); */ ++ perror("ldap_parse_lconf()"); ++ return FAILURE; ++ } ++ ++ while (fgets (buf, sizeof (buf), lcd) != NULL) { ++ ++ if (*buf == '\n' || *buf == '#') ++ continue; ++ ++ k = buf; ++ v = k; ++ while (*v != '\0' && *v != ' ' && *v != '\t') ++ v++; ++ ++ if (*v == '\0') ++ continue; ++ ++ *(v++) = '\0'; ++ ++ while (*v == ' ' || *v == '\t') ++ v++; ++ ++ li = strlen (v) - 1; ++ while (v[li] == ' ' || v[li] == '\t' || v[li] == '\n') ++ --li; ++ v[li + 1] = '\0'; ++ ++ if (!strcasecmp (k, "uri")) { ++ if ((l->servers = ldap_parse_servers(v)) == NULL) { ++ fatal("error in ldap servers"); ++ return FAILURE; ++ } ++ ++ } ++ else if (!strcasecmp (k, "base")) { ++ s = strchr (v, '?'); ++ if (s != NULL) { ++ len = s - v; ++ l->u_basedn = malloc (len + 1); ++ strncpy (l->u_basedn, v, len); ++ l->u_basedn[len] = '\0'; ++ } else { ++ l->u_basedn = strdup (v); ++ } ++ } ++ else if (!strcasecmp (k, "binddn")) { ++ l->binddn = strdup (v); ++ } ++ else if (!strcasecmp (k, "bindpw")) { ++ l->bindpw = strdup (v); ++ } ++ else if (!strcasecmp (k, "timelimit")) { ++ l->s_timeout.tv_sec = atoi (v); ++ } ++ else if (!strcasecmp (k, "bind_timelimit")) { ++ l->b_timeout.tv_sec = atoi (v); ++ } ++ else if (!strcasecmp (k, "ssl")) { ++ if (!strcasecmp (v, "start_tls")) ++ l->tls = 1; ++ } ++ } ++ ++ fclose (lcd); ++ return SUCCESS; ++} ++ ++#endif /* WITH_LDAP_PUBKEY */ +diff --git a/ldapauth.h b/ldapauth.h +new file mode 100644 +index 0000000..ba70958 +--- /dev/null ++++ b/ldapauth.h +@@ -0,0 +1,124 @@ ++/* ++ * $Id: openssh-lpk-4.3p1-0.3.7.patch,v 1.3 2006/04/18 15:29:09 eau Exp $ ++ */ ++ ++/* ++ * ++ * Copyright (c) 2005, Eric AUGE ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: ++ * ++ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. ++ * 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. ++ * Neither the name of the phear.org nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * ++ */ ++ ++#ifndef LDAPAUTH_H ++#define LDAPAUTH_H ++ ++#define LDAP_DEPRECATED 1 ++ ++#include ++#include ++#include ++#include ++ ++/* tokens in use for config */ ++#define _DEFAULT_LPK_TOKEN "UseLPK" ++#define _DEFAULT_SRV_TOKEN "LpkServers" ++#define _DEFAULT_USR_TOKEN "LpkUserDN" ++#define _DEFAULT_GRP_TOKEN "LpkGroupDN" ++#define _DEFAULT_BDN_TOKEN "LpkBindDN" ++#define _DEFAULT_BPW_TOKEN "LpkBindPw" ++#define _DEFAULT_MYG_TOKEN "LpkServerGroup" ++#define _DEFAULT_FIL_TOKEN "LpkFilter" ++#define _DEFAULT_TLS_TOKEN "LpkForceTLS" ++#define _DEFAULT_BTI_TOKEN "LpkBindTimelimit" ++#define _DEFAULT_STI_TOKEN "LpkSearchTimelimit" ++#define _DEFAULT_LDP_TOKEN "LpkLdapConf" ++ ++/* default options */ ++#define _DEFAULT_LPK_ON 0 ++#define _DEFAULT_LPK_SERVERS NULL ++#define _DEFAULT_LPK_UDN NULL ++#define _DEFAULT_LPK_GDN NULL ++#define _DEFAULT_LPK_BINDDN NULL ++#define _DEFAULT_LPK_BINDPW NULL ++#define _DEFAULT_LPK_SGROUP NULL ++#define _DEFAULT_LPK_FILTER NULL ++#define _DEFAULT_LPK_TLS -1 ++#define _DEFAULT_LPK_BTIMEOUT 10 ++#define _DEFAULT_LPK_STIMEOUT 10 ++#define _DEFAULT_LPK_LDP NULL ++ ++/* flags */ ++#define FLAG_EMPTY 0x00000000 ++#define FLAG_CONNECTED 0x00000001 ++ ++/* flag macros */ ++#define FLAG_SET_EMPTY(x) x&=(FLAG_EMPTY) ++#define FLAG_SET_CONNECTED(x) x|=(FLAG_CONNECTED) ++#define FLAG_SET_DISCONNECTED(x) x&=~(FLAG_CONNECTED) ++ ++/* defines */ ++#define FAILURE -1 ++#define SUCCESS 0 ++#define PUBKEYATTR "sshPublicKey" ++ ++/* ++ * ++ * defined files path ++ * (should be relocated to pathnames.h, ++ * if one day it's included within the tree) ++ * ++ */ ++#define _PATH_LDAP_CONFIG_FILE "/etc/ldap.conf" ++ ++/* structures */ ++typedef struct ldap_options { ++ int on; /* Use it or NOT */ ++ LDAP * ld; /* LDAP file desc */ ++ char * servers; /* parsed servers for ldaplib failover handling */ ++ char * u_basedn; /* user basedn */ ++ char * g_basedn; /* group basedn */ ++ char * binddn; /* binddn */ ++ char * bindpw; /* bind password */ ++ char * sgroup; /* server group */ ++ char * fgroup; /* group filter */ ++ char * filter; /* additional filter */ ++ char * l_conf; /* use ldap.conf */ ++ int tls; /* TLS only */ ++ struct timeval b_timeout; /* bind timeout */ ++ struct timeval s_timeout; /* search timeout */ ++ unsigned int flags; /* misc flags (reconnection, future use?) */ ++} ldap_opt_t; ++ ++typedef struct ldap_keys { ++ struct berval ** keys; /* the public keys retrieved */ ++ unsigned int num; /* number of keys */ ++} ldap_key_t; ++ ++ ++/* function headers */ ++void ldap_close(ldap_opt_t *); ++int ldap_connect(ldap_opt_t *); ++char * ldap_parse_groups(const char *); ++char * ldap_parse_servers(const char *); ++void ldap_options_print(ldap_opt_t *); ++void ldap_options_free(ldap_opt_t *); ++void ldap_keys_free(ldap_key_t *); ++int ldap_parse_lconf(ldap_opt_t *); ++ldap_key_t * ldap_getuserkey(ldap_opt_t *, const char *); ++int ldap_ismember(ldap_opt_t *, const char *); ++ ++#endif +diff --git a/lpk-user-example.txt b/lpk-user-example.txt +new file mode 100644 +index 0000000..1528fc0 +--- /dev/null ++++ b/lpk-user-example.txt +@@ -0,0 +1,117 @@ ++ ++Post to ML -> User Made Quick Install Doc. ++Contribution from John Lane ++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ++ ++OpenSSH LDAP keystore Patch ++=========================== ++ ++NOTE: these notes are a transcript of a specific installation ++ they work for me, your specifics may be different! ++ from John Lane March 17th 2005 john at lane.uk.net ++ ++This is a patch to OpenSSH 4.0p1 to allow it to obtain users' public keys ++from their LDAP record as an alternative to ~/.ssh/authorized_keys. ++ ++(Assuming here that necessary build stuff is in $BUILD) ++ ++cd $BUILD/openssh-4.0p1 ++patch -Np1 -i $BUILD/openssh-lpk-4.0p1-0.3.patch ++mkdir -p /var/empty && ++./configure --prefix=/usr --sysconfdir=/etc/ssh \ ++ --libexecdir=/usr/sbin --with-md5-passwords --with-pam \ ++ --with-libs="-lldap" --with-cppflags="-DWITH_LDAP_PUBKEY" ++Now do. ++make && ++make install ++ ++Add the following config to /etc/ssh/ssh_config ++UseLPK yes ++LpkServers ldap://myhost.mydomain.com ++LpkUserDN ou=People,dc=mydomain,dc=com ++ ++We need to tell sshd about the SSL keys during boot, as root's ++environment does not exist at that time. Edit /etc/rc.d/init.d/sshd. ++Change the startup code from this: ++ echo "Starting SSH Server..." ++ loadproc /usr/sbin/sshd ++ ;; ++to this: ++ echo "Starting SSH Server..." ++ LDAPRC="/root/.ldaprc" loadproc /usr/sbin/sshd ++ ;; ++ ++Re-start the sshd daemon: ++/etc/rc.d/init.d/sshd restart ++ ++Install the additional LDAP schema ++cp $BUILD/openssh-lpk-0.2.schema /etc/openldap/schema/openssh.schema ++ ++Now add the openSSH LDAP schema to /etc/openldap/slapd.conf: ++Add the following to the end of the existing block of schema includes ++include /etc/openldap/schema/openssh.schema ++ ++Re-start the LDAP server: ++/etc/rc.d/init.d/slapd restart ++ ++To add one or more public keys to a user, eg "testuser" : ++ldapsearch -x -W -Z -LLL -b "uid=testuser,ou=People,dc=mydomain,dc=com" -D ++"uid=testuser,ou=People,dc=mydomain,dc=com" > /tmp/testuser ++ ++append the following to this /tmp/testuser file ++objectclass: ldapPublicKey ++sshPublicKey: ssh-rsa ++AAAAB3NzaC1yc2EAAAABJQAAAIB3dsrwqXqD7E4zYYrxwdDKBUQxKMioXy9pxFVai64kAPxjU9KS ++qIo7QfkjslfsjflksjfldfkjsldfjLX/5zkzRmT28I5piGzunPv17S89z8XwSsuAoR1t86t+5dlI ++7eZE/gVbn2UQkQq7+kdDTS2yXV6VnC52N/kKLG3ciBkBAw== General Purpose RSA Key ++ ++Then do a modify: ++ldapmodify -x -D "uid=testuser,ou=People,dc=mydomain,dc=com" -W -f ++/tmp/testuser -Z ++Enter LDAP Password: ++modifying entry "uid=testuser,ou=People,dc=mydomain,dc=com" ++And check the modify is ok: ++ldapsearch -x -W -Z -b "uid=testuser,ou=People,dc=mydomain,dc=com" -D ++"uid=testuser,ou=People,dc=mydomain,dc=com" ++Enter LDAP Password: ++# extended LDIF ++# ++# LDAPv3 ++# base with scope sub ++# filter: (objectclass=*) ++# requesting: ALL ++# ++ ++# testuser, People, mydomain.com ++dn: uid=testuser,ou=People,dc=mydomain,dc=com ++uid: testuser ++cn: testuser ++objectClass: account ++objectClass: posixAccount ++objectClass: top ++objectClass: shadowAccount ++objectClass: ldapPublicKey ++shadowLastChange: 12757 ++shadowMax: 99999 ++shadowWarning: 7 ++loginShell: /bin/bash ++uidNumber: 9999 ++gidNumber: 501 ++homeDirectory: /home/testuser ++userPassword:: e1NTSEF9UDgwV1hnM1VjUDRJK0k1YnFiL1d4ZUJObXlZZ3Z3UTU= ++sshPublicKey: ssh-rsa ++AAAAB3NzaC1yc2EAAAABJQAAAIB3dsrwqXqD7E4zYYrxwdDKBUQxKMioXy9pxFVai64kAPxjU9KSqIo7QfkjslfsjflksjfldfkjsldfjLX/5zkzRmT28I5piGzunPv17S89z ++8XwSsuAoR1t86t+5dlI7eZE/gVbn2UQkQq7+kdDTS2yXV6VnC52N/kKLG3ciBkBAw== General Purpose RSA Key ++ ++# search result ++search: 3 ++result: 0 Success ++ ++# numResponses: 2 ++# numEntries: 1 ++ ++Now start a ssh session to user "testuser" from usual ssh client (e.g. ++puTTY). Login should succeed. ++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +diff --git a/openssh-lpk_openldap.schema b/openssh-lpk_openldap.schema +new file mode 100644 +index 0000000..5f5512a +--- /dev/null ++++ b/openssh-lpk_openldap.schema +@@ -0,0 +1,19 @@ ++# ++# LDAP Public Key Patch schema for use with openssh-ldappubkey ++# Author: Eric AUGE ++# ++# Based on the proposal of : Mark Ruijter ++# ++ ++ ++# octetString SYNTAX ++attributetype ( 1.3.6.1.4.1.24552.500.1.1.1.13 NAME 'sshPublicKey' ++ DESC 'MANDATORY: OpenSSH Public key' ++ EQUALITY octetStringMatch ++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 ) ++ ++# printableString SYNTAX yes|no ++objectclass ( 1.3.6.1.4.1.24552.500.1.1.2.0 NAME 'ldapPublicKey' SUP top AUXILIARY ++ DESC 'MANDATORY: OpenSSH LPK objectclass' ++ MUST ( sshPublicKey $ uid ) ++ ) +diff --git a/openssh-lpk_sun.schema b/openssh-lpk_sun.schema +new file mode 100644 +index 0000000..c5e0214 +--- /dev/null ++++ b/openssh-lpk_sun.schema +@@ -0,0 +1,21 @@ ++# ++# LDAP Public Key Patch schema for use with openssh-ldappubkey ++# Author: Eric AUGE ++# ++# Schema for Sun Directory Server. ++# Based on the original schema, modified by Stefan Fischer. ++# ++ ++dn: cn=schema ++ ++# octetString SYNTAX ++attributeTypes: ( 1.3.6.1.4.1.24552.500.1.1.1.13 NAME 'sshPublicKey' ++ DESC 'MANDATORY: OpenSSH Public key' ++ EQUALITY octetStringMatch ++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 ) ++ ++# printableString SYNTAX yes|no ++objectClasses: ( 1.3.6.1.4.1.24552.500.1.1.2.0 NAME 'ldapPublicKey' SUP top AUXILIARY ++ DESC 'MANDATORY: OpenSSH LPK objectclass' ++ MUST ( sshPublicKey $ uid ) ++ ) +diff --git a/servconf.c b/servconf.c +index f9e2f2d..078b581 100644 +--- a/servconf.c ++++ b/servconf.c +@@ -42,6 +42,10 @@ + #include "channels.h" + #include "groupaccess.h" + ++#ifdef WITH_LDAP_PUBKEY ++#include "ldapauth.h" ++#endif ++ + static void add_listen_addr(ServerOptions *, char *, int); + static void add_one_listen_addr(ServerOptions *, char *, int); + +@@ -131,6 +135,24 @@ initialize_server_options(ServerOptions *options) + options->zero_knowledge_password_authentication = -1; + options->revoked_keys_file = NULL; + options->trusted_user_ca_keys = NULL; ++#ifdef WITH_LDAP_PUBKEY ++ /* XXX dirty */ ++ options->lpk.ld = NULL; ++ options->lpk.on = -1; ++ options->lpk.servers = NULL; ++ options->lpk.u_basedn = NULL; ++ options->lpk.g_basedn = NULL; ++ options->lpk.binddn = NULL; ++ options->lpk.bindpw = NULL; ++ options->lpk.sgroup = NULL; ++ options->lpk.filter = NULL; ++ options->lpk.fgroup = NULL; ++ options->lpk.l_conf = NULL; ++ options->lpk.tls = -1; ++ options->lpk.b_timeout.tv_sec = -1; ++ options->lpk.s_timeout.tv_sec = -1; ++ options->lpk.flags = FLAG_EMPTY; ++#endif + } + + void +@@ -265,6 +287,32 @@ fill_default_server_options(ServerOptions *options) + options->permit_tun = SSH_TUNMODE_NO; + if (options->zero_knowledge_password_authentication == -1) + options->zero_knowledge_password_authentication = 0; ++#ifdef WITH_LDAP_PUBKEY ++ if (options->lpk.on == -1) ++ options->lpk.on = _DEFAULT_LPK_ON; ++ if (options->lpk.servers == NULL) ++ options->lpk.servers = _DEFAULT_LPK_SERVERS; ++ if (options->lpk.u_basedn == NULL) ++ options->lpk.u_basedn = _DEFAULT_LPK_UDN; ++ if (options->lpk.g_basedn == NULL) ++ options->lpk.g_basedn = _DEFAULT_LPK_GDN; ++ if (options->lpk.binddn == NULL) ++ options->lpk.binddn = _DEFAULT_LPK_BINDDN; ++ if (options->lpk.bindpw == NULL) ++ options->lpk.bindpw = _DEFAULT_LPK_BINDPW; ++ if (options->lpk.sgroup == NULL) ++ options->lpk.sgroup = _DEFAULT_LPK_SGROUP; ++ if (options->lpk.filter == NULL) ++ options->lpk.filter = _DEFAULT_LPK_FILTER; ++ if (options->lpk.tls == -1) ++ options->lpk.tls = _DEFAULT_LPK_TLS; ++ if (options->lpk.b_timeout.tv_sec == -1) ++ options->lpk.b_timeout.tv_sec = _DEFAULT_LPK_BTIMEOUT; ++ if (options->lpk.s_timeout.tv_sec == -1) ++ options->lpk.s_timeout.tv_sec = _DEFAULT_LPK_STIMEOUT; ++ if (options->lpk.l_conf == NULL) ++ options->lpk.l_conf = _DEFAULT_LPK_LDP; ++#endif + + /* Turn privilege separation on by default */ + if (use_privsep == -1) +@@ -312,6 +360,12 @@ typedef enum { + sZeroKnowledgePasswordAuthentication, sHostCertificate, + sRevokedKeys, sTrustedUserCAKeys, + sDeprecated, sUnsupported ++#ifdef WITH_LDAP_PUBKEY ++ ,sLdapPublickey, sLdapServers, sLdapUserDN ++ ,sLdapGroupDN, sBindDN, sBindPw, sMyGroup ++ ,sLdapFilter, sForceTLS, sBindTimeout ++ ,sSearchTimeout, sLdapConf ++#endif + } ServerOpCodes; + + #define SSHCFG_GLOBAL 0x01 /* allowed in main section of sshd_config */ +@@ -432,6 +486,20 @@ static struct { + { "hostcertificate", sHostCertificate, SSHCFG_GLOBAL }, + { "revokedkeys", sRevokedKeys, SSHCFG_ALL }, + { "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL }, ++#ifdef WITH_LDAP_PUBKEY ++ { _DEFAULT_LPK_TOKEN, sLdapPublickey, SSHCFG_GLOBAL }, ++ { _DEFAULT_SRV_TOKEN, sLdapServers, SSHCFG_GLOBAL }, ++ { _DEFAULT_USR_TOKEN, sLdapUserDN, SSHCFG_GLOBAL }, ++ { _DEFAULT_GRP_TOKEN, sLdapGroupDN, SSHCFG_GLOBAL }, ++ { _DEFAULT_BDN_TOKEN, sBindDN, SSHCFG_GLOBAL }, ++ { _DEFAULT_BPW_TOKEN, sBindPw, SSHCFG_GLOBAL }, ++ { _DEFAULT_MYG_TOKEN, sMyGroup, SSHCFG_GLOBAL }, ++ { _DEFAULT_FIL_TOKEN, sLdapFilter, SSHCFG_GLOBAL }, ++ { _DEFAULT_TLS_TOKEN, sForceTLS, SSHCFG_GLOBAL }, ++ { _DEFAULT_BTI_TOKEN, sBindTimeout, SSHCFG_GLOBAL }, ++ { _DEFAULT_STI_TOKEN, sSearchTimeout, SSHCFG_GLOBAL }, ++ { _DEFAULT_LDP_TOKEN, sLdapConf, SSHCFG_GLOBAL }, ++#endif + { NULL, sBadOption, 0 } + }; + +@@ -1349,6 +1417,107 @@ process_server_config_line(ServerOptions *options, char *line, + while (arg) + arg = strdelim(&cp); + break; ++#ifdef WITH_LDAP_PUBKEY ++ case sLdapPublickey: ++ intptr = &options->lpk.on; ++ goto parse_flag; ++ case sLdapServers: ++ /* arg = strdelim(&cp); */ ++ p = line; ++ while(*p++); ++ arg = p; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing ldap server",filename,linenum); ++ arg[strlen(arg)] = '\0'; ++ if ((options->lpk.servers = ldap_parse_servers(arg)) == NULL) ++ fatal("%s line %d: error in ldap servers", filename, linenum); ++ memset(arg,0,strlen(arg)); ++ break; ++ case sLdapUserDN: ++ arg = cp; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing ldap server",filename,linenum); ++ arg[strlen(arg)] = '\0'; ++ options->lpk.u_basedn = xstrdup(arg); ++ memset(arg,0,strlen(arg)); ++ break; ++ case sLdapGroupDN: ++ arg = cp; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing ldap server",filename,linenum); ++ arg[strlen(arg)] = '\0'; ++ options->lpk.g_basedn = xstrdup(arg); ++ memset(arg,0,strlen(arg)); ++ break; ++ case sBindDN: ++ arg = cp; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing binddn",filename,linenum); ++ arg[strlen(arg)] = '\0'; ++ options->lpk.binddn = xstrdup(arg); ++ memset(arg,0,strlen(arg)); ++ break; ++ case sBindPw: ++ arg = cp; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing bindpw",filename,linenum); ++ arg[strlen(arg)] = '\0'; ++ options->lpk.bindpw = xstrdup(arg); ++ memset(arg,0,strlen(arg)); ++ break; ++ case sMyGroup: ++ arg = cp; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing groupname",filename, linenum); ++ arg[strlen(arg)] = '\0'; ++ options->lpk.sgroup = xstrdup(arg); ++ if (options->lpk.sgroup) ++ options->lpk.fgroup = ldap_parse_groups(options->lpk.sgroup); ++ memset(arg,0,strlen(arg)); ++ break; ++ case sLdapFilter: ++ arg = cp; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing filter",filename, linenum); ++ arg[strlen(arg)] = '\0'; ++ options->lpk.filter = xstrdup(arg); ++ memset(arg,0,strlen(arg)); ++ break; ++ case sForceTLS: ++ intptr = &options->lpk.tls; ++ arg = strdelim(&cp); ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing yes/no argument.", ++ filename, linenum); ++ value = 0; /* silence compiler */ ++ if (strcmp(arg, "yes") == 0) ++ value = 1; ++ else if (strcmp(arg, "no") == 0) ++ value = 0; ++ else if (strcmp(arg, "try") == 0) ++ value = -1; ++ else ++ fatal("%s line %d: Bad yes/no argument: %s", ++ filename, linenum, arg); ++ if (*intptr == -1) ++ *intptr = value; ++ break; ++ case sBindTimeout: ++ intptr = (int *) &options->lpk.b_timeout.tv_sec; ++ goto parse_int; ++ case sSearchTimeout: ++ intptr = (int *) &options->lpk.s_timeout.tv_sec; ++ goto parse_int; ++ break; ++ case sLdapConf: ++ arg = cp; ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing LpkLdapConf", filename, linenum); ++ arg[strlen(arg)] = '\0'; ++ options->lpk.l_conf = xstrdup(arg); ++ memset(arg, 0, strlen(arg)); ++ break; ++#endif + + default: + fatal("%s line %d: Missing handler for opcode %s (%d)", +diff --git a/servconf.h b/servconf.h +index 860009f..fd113c2 100644 +--- a/servconf.h ++++ b/servconf.h +@@ -16,6 +16,10 @@ + #ifndef SERVCONF_H + #define SERVCONF_H + ++#ifdef WITH_LDAP_PUBKEY ++#include "ldapauth.h" ++#endif ++ + #define MAX_PORTS 256 /* Max # ports. */ + + #define MAX_ALLOW_USERS 256 /* Max # users on allow list. */ +@@ -150,6 +154,9 @@ typedef struct { + int use_pam; /* Enable auth via PAM */ + + int permit_tun; ++#ifdef WITH_LDAP_PUBKEY ++ ldap_opt_t lpk; ++#endif + + int num_permitted_opens; + +diff --git a/sshd.c b/sshd.c +index bc0d275..e82e102 100644 +--- a/sshd.c ++++ b/sshd.c +@@ -127,6 +127,10 @@ int allow_severity; + int deny_severity; + #endif /* LIBWRAP */ + ++#ifdef WITH_LDAP_PUBKEY ++#include "ldapauth.h" ++#endif ++ + #ifndef O_NOCTTY + #define O_NOCTTY 0 + #endif +@@ -1530,6 +1534,16 @@ main(int ac, char **av) + exit(1); + } + ++#ifdef WITH_LDAP_PUBKEY ++ /* ldap_options_print(&options.lpk); */ ++ /* XXX initialize/check ldap connection and set *LD */ ++ if (options.lpk.on) { ++ if (options.lpk.l_conf && (ldap_parse_lconf(&options.lpk) < 0) ) ++ error("[LDAP] could not parse %s", options.lpk.l_conf); ++ if (ldap_connect(&options.lpk) < 0) ++ error("[LDAP] could not initialize ldap connection"); ++ } ++#endif + debug("sshd version %.100s", SSH_RELEASE); + + /* Store privilege separation user for later use if required. */ +diff --git a/sshd_config b/sshd_config +index 72fbae3..381b390 100644 +--- a/sshd_config ++++ b/sshd_config +@@ -107,6 +107,21 @@ + # no default banner path + #Banner none + ++# here are the new patched ldap related tokens ++# entries in your LDAP must have posixAccount & ldapPublicKey objectclass ++#UseLPK yes ++#LpkLdapConf /etc/ldap.conf ++#LpkServers ldap://10.1.7.1/ ldap://10.1.7.2/ ++#LpkUserDN ou=users,dc=phear,dc=org ++#LpkGroupDN ou=groups,dc=phear,dc=org ++#LpkBindDN cn=Manager,dc=phear,dc=org ++#LpkBindPw secret ++#LpkServerGroup mail ++#LpkFilter (hostAccess=master.phear.org) ++#LpkForceTLS no ++#LpkSearchTimelimit 3 ++#LpkBindTimelimit 3 ++ + # override default of no subsystems + Subsystem sftp /usr/libexec/sftp-server + +diff --git a/sshd_config.5 b/sshd_config.5 +index 2f54102..cb86374 100644 +--- a/sshd_config.5 ++++ b/sshd_config.5 +@@ -1043,6 +1043,62 @@ Specifies the full pathname of the + program. + The default is + .Pa /usr/X11R6/bin/xauth . ++.It Cm UseLPK ++Specifies whether LDAP public key retrieval must be used or not. It allow ++an easy centralisation of public keys within an LDAP directory. The argument must be ++.Dq yes ++or ++.Dq no . ++.It Cm LpkLdapConf ++Specifies whether LDAP Public keys should parse the specified ldap.conf file ++instead of sshd_config Tokens. The argument must be a valid path to an ldap.conf ++file like ++.Pa /etc/ldap.conf ++.It Cm LpkServers ++Specifies LDAP one or more [:space:] separated server's url the following form may be used: ++.Pp ++LpkServers ldaps://127.0.0.1 ldap://127.0.0.2 ldap://127.0.0.3 ++.It Cm LpkUserDN ++Specifies the LDAP user DN. ++.Pp ++LpkUserDN ou=users,dc=phear,dc=org ++.It Cm LpkGroupDN ++Specifies the LDAP groups DN. ++.Pp ++LpkGroupDN ou=groups,dc=phear,dc=org ++.It Cm LpkBindDN ++Specifies the LDAP bind DN to use if necessary. ++.Pp ++LpkBindDN cn=Manager,dc=phear,dc=org ++.It Cm LpkBindPw ++Specifies the LDAP bind credential. ++.Pp ++LpkBindPw secret ++.It Cm LpkServerGroup ++Specifies one or more [:space:] separated group the server is part of. ++.Pp ++LpkServerGroup unix mail prod ++.It Cm LpkFilter ++Specifies an additional LDAP filter to use for finding SSH keys ++.Pp ++LpkFilter (hostAccess=master.phear.org) ++.It Cm LpkForceTLS ++Specifies if the LDAP server connection must be tried, forced or not used. The argument must be ++.Dq yes ++or ++.Dq no ++or ++.Dq try . ++.It Cm LpkSearchTimelimit ++Sepcifies the search time limit before the search is considered over. value is ++in seconds. ++.Pp ++LpkSearchTimelimit 3 ++.It Cm LpkBindTimelimit ++Sepcifies the bind time limit before the connection is considered dead. value is ++in seconds. ++.Pp ++LpkBindTimelimit 3 + .El + .Sh TIME FORMATS + .Xr sshd 8 +-- +1.7.0 + Modified: csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/files/CSWosshlpk.prototype =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype 2010-04-20 15:47:18 UTC (rev 9732) +++ csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/files/CSWosshlpk.prototype 2010-04-21 12:02:40 UTC (rev 9735) @@ -6,7 +6,6 @@ f none /opt/csw/libexec/sftp-server 0755 root bin f none /opt/csw/sbin/sshd 0755 root bin f none /opt/csw/sbin/sshd.smf_wrapper 0755 root bin -f none /opt/csw/share/Ssh.bin 0644 root bin d none /opt/csw/share/doc/openssh_lpk 0755 root bin f none /opt/csw/share/doc/openssh_lpk/changelog.CSW 0644 root bin f none /opt/csw/share/doc/openssh_lpk/CREDITS 0644 root bin @@ -20,7 +19,6 @@ f none /opt/csw/share/doc/openssh_lpk/README.dns 0644 root bin f none /opt/csw/share/doc/openssh_lpk/README.platform 0644 root bin f none /opt/csw/share/doc/openssh_lpk/README.privsep 0644 root bin -f none /opt/csw/share/doc/openssh_lpk/README.smartcard 0644 root bin f none /opt/csw/share/doc/openssh_lpk/README.tun 0644 root bin f none /opt/csw/share/doc/openssh_lpk/TODO 0644 root bin f none /opt/csw/share/doc/openssh_lpk/WARNING.RNG 0644 root bin @@ -32,5 +30,8 @@ f none /opt/csw/share/man/man8/sftp-server.8 0644 root bin f none /opt/csw/share/man/man8/sshd.8 0644 root bin d none /opt/csw/share/openssh 0755 root bin +d none /opt/csw/share/checkpkg 0755 root bin +d none /opt/csw/share/checkpkg/overrides 0755 root bin +f none /opt/csw/share/checkpkg/overrides/openssh_lpk 0644 root bin d none /var/empty f none /var/opt/csw/svc/manifest/network/cswopenssh.xml 0644 root sys Deleted: csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/files/contrib-openssh-lpk-5.2p1-0.3.9.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/contrib-openssh-lpk-5.2p1-0.3.9.patch 2010-04-20 15:47:18 UTC (rev 9732) +++ csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/files/contrib-openssh-lpk-5.2p1-0.3.9.patch 2010-04-21 12:02:40 UTC (rev 9735) @@ -1,1884 +0,0 @@ -diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/Makefile.in openssh-5.2p1+lpk/Makefile.in ---- openssh-5.2p1.orig/Makefile.in 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.2p1+lpk/Makefile.in 2009-03-22 15:59:08.607515800 +0100 -@@ -86,7 +86,7 @@ - auth-krb5.o \ - auth2-gss.o gss-serv.o gss-serv-krb5.o \ - loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ -- audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o -+ audit.o audit-bsm.o platform.o ldapauth.o sftp-server.o sftp-common.o - - MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out - MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5 -diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/README.lpk openssh-5.2p1+lpk/README.lpk ---- openssh-5.2p1.orig/README.lpk 1970-01-01 01:00:00.000000000 +0100 -+++ openssh-5.2p1+lpk/README.lpk 2009-03-22 15:59:08.672813997 +0100 -@@ -0,0 +1,267 @@ -+OpenSSH LDAP PUBLIC KEY PATCH -+Copyright (c) 2003 Eric AUGE (eau at phear.org) -+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. -+ -+purposes of this patch: -+ -+This patch would help to have authentication centralization policy -+using ssh public key authentication. -+This patch could be an alternative to other "secure" authentication system -+working in a similar way (Kerberos, SecurID, etc...), except the fact -+that it's based on OpenSSH and its public key abilities. -+ -+>> FYI: << -+'uid': means unix accounts existing on the current server -+'lpkServerGroup:' mean server group configured on the current server ('lpkServerGroup' in sshd_config) -+ -+example schema: -+ -+ -+ server1 (uid: eau,rival,toto) (lpkServerGroup: unix) -+ ___________ / -+ / \ --- - server3 (uid: eau, titi) (lpkServerGroup: unix) -+ | LDAP Server | \ -+ | eau ,rival | server2 (uid: rival, eau) (lpkServerGroup: unix) -+ | titi ,toto | -+ | userx,.... | server5 (uid: eau) (lpkServerGroup: mail) -+ \___________/ \ / -+ ----- - server4 (uid: eau, rival) (no group configured) -+ \ -+ etc... -+ -+- WHAT WE NEED : -+ -+ * configured LDAP server somewhere on the network (i.e. OpenLDAP) -+ * patched sshd (with this patch ;) -+ * LDAP user(/group) entry (look at users.ldif (& groups.ldif)): -+ User entry: -+ - attached to the 'ldapPublicKey' objectclass -+ - attached to the 'posixAccount' objectclass -+ - with a filled 'sshPublicKey' attribute -+ Example: -+ dn: uid=eau,ou=users,dc=cuckoos,dc=net -+ objectclass: top -+ objectclass: person -+ objectclass: organizationalPerson -+ objectclass: posixAccount -+ objectclass: ldapPublicKey -+ description: Eric AUGE Account -+ userPassword: blah -+ cn: Eric AUGE -+ sn: Eric AUGE -+ uid: eau -+ uidNumber: 1034 -+ gidNumber: 1 -+ homeDirectory: /export/home/eau -+ sshPublicKey: ssh-dss AAAAB3... -+ sshPublicKey: ssh-dss AAAAM5... -+ -+ Group entry: -+ - attached to the 'posixGroup' objectclass -+ - with a 'cn' groupname attribute -+ - with multiple 'memberUid' attributes filled with usernames allowed in this group -+ Example: -+ # few members -+ dn: cn=unix,ou=groups,dc=cuckoos,dc=net -+ objectclass: top -+ objectclass: posixGroup -+ description: Unix based servers group -+ cn: unix -+ gidNumber: 1002 -+ memberUid: eau -+ memberUid: user1 -+ memberUid: user2 -+ -+ -+- HOW IT WORKS : -+ -+ * without patch -+ If a user wants to authenticate to log in a server the sshd, will first look for authentication method allowed (RSAauth,kerberos,etc..) -+ and if RSAauth and tickets based auth fails, it will fallback to standard password authentication (if enabled). -+ -+ * with the patch -+ If a user want to authenticate to log in a server, the sshd will first look for auth method including LDAP pubkey, if the ldappubkey options is enabled. -+ It will do an ldapsearch to get the public key directly from the LDAP instead of reading it from the server filesystem. -+ (usually in $HOME/.ssh/authorized_keys) -+ -+ If groups are enabled, it will also check if the user that wants to login is in the group of the server he is trying to log into. -+ If it fails, it falls back on RSA auth files ($HOME/.ssh/authorized_keys), etc.. and finally to standard password authentication (if enabled). -+ -+ 7 tokens are added to sshd_config : -+ # here is the new patched ldap related tokens -+ # entries in your LDAP must be posixAccount & strongAuthenticationUser & posixGroup -+ UseLPK yes # look the pub key into LDAP -+ LpkServers ldap://10.31.32.5/ ldap://10.31.32.4 ldap://10.31.32.3 # which LDAP server for users ? (URL format) -+ LpkUserDN ou=users,dc=foobar,dc=net # which base DN for users ? -+ LpkGroupDN ou=groups,dc=foobar,dc=net # which base DN for groups ? -+ LpkBindDN cn=manager,dc=foobar,dc=net # which bind DN ? -+ LpkBindPw asecret # bind DN credidentials -+ LpkServerGroup agroupname # the group the server is part of -+ -+ Right now i'm using anonymous binding to get public keys, because getting public keys of someone doesn't impersonate him\xB8 but there is some -+ flaws you have to take care of. -+ -+- HOW TO INSERT A USER/KEY INTO AN LDAP ENTRY -+ -+ * my way (there is plenty :) -+ - create ldif file (i.e. users.ldif) -+ - cat ~/.ssh/id_dsa.pub OR cat ~/.ssh/id_rsa.pub OR cat ~/.ssh/identity.pub -+ - my way in 4 steps : -+ Example: -+ -+ # you add this to the user entry in the LDIF file : -+ [...] -+ objectclass: posixAccount -+ objectclass: ldapPublicKey -+ [...] -+ sshPubliKey: ssh-dss AAAABDh12DDUR2... -+ [...] -+ -+ # insert your entry and you're done :) -+ ldapadd -D balblabla -w bleh < file.ldif -+ -+ all standard options can be present in the 'sshPublicKey' attribute. -+ -+- WHY : -+ -+ Simply because, i was looking for a way to centralize all sysadmins authentication, easily, without completely using LDAP -+ as authentication method (like pam_ldap etc..). -+ -+ After looking into Kerberos, SecurID, and other centralized secure authentications systems, the use of RSA and LDAP to get -+ public key for authentication allows us to control who has access to which server (the user needs an account and to be in 'strongAuthenticationUser' -+ objectclass within LDAP and part of the group the SSH server is in). -+ -+ Passwords update are no longer a nightmare for a server farm (key pair passphrase is stored on each user's box and private key is locally encrypted using his passphrase -+ so each user can change it as much as he wants). -+ -+ Blocking a user account can be done directly from the LDAP (if sshd is using RSAAuth + ldap only). -+ -+- RULES : -+ Entry in the LDAP server must respect 'posixAccount' and 'ldapPublicKey' which are defined in core.schema. -+ and the additionnal lpk.schema. -+ -+ This patch could allow a smooth transition between standard auth (/etc/passwd) and complete LDAP based authentication -+ (pamldap, nss_ldap, etc..). -+ -+ This can be an alternative to other (old?/expensive?) authentication methods (Kerberos/SecurID/..). -+ -+ Referring to schema at the beginning of this file if user 'eau' is only in group 'unix' -+ 'eau' would ONLY access 'server1', 'server2', 'server3' AND 'server4' BUT NOT 'server5'. -+ If you then modify the LDAP 'mail' group entry to add 'memberUid: eau' THEN user 'eau' would be able -+ to log in 'server5' (i hope you got the idea, my english is bad :). -+ -+ Each server's sshd is patched and configured to ask the public key and the group infos in the LDAP -+ server. -+ When you want to allow a new user to have access to the server parc, you just add him an account on -+ your servers, you add his public key into his entry on the LDAP server, it's done. -+ -+ Because sshds are looking public keys into the LDAP directly instead of a file ($HOME/.ssh/authorized_keys). -+ -+ When the user needs to change his passphrase he can do it directly from his workstation by changing -+ his own key set lock passphrase, and all servers are automatically aware. -+ -+ With a CAREFUL LDAP server configuration you could allow a user to add/delete/modify his own entry himself -+ so he can add/modify/delete himself his public key when needed. -+ -+\xAD FLAWS : -+ LDAP must be well configured, getting the public key of some user is not a problem, but if anonymous LDAP -+ allow write to users dn, somebody could replace someuser's public key by its own and impersonate some -+ of your users in all your server farm be VERY CAREFUL. -+ -+ MITM attack when sshd is requesting the public key, could lead to a compromise of your servers allowing login -+ as the impersonnated user. -+ -+ If LDAP server is down then, fallback on passwd auth. -+ -+ the ldap code part has not been well audited yet. -+ -+- LDAP USER ENTRY EXAMPLES (LDIF Format, look in users.ldif) -+ --- CUT HERE --- -+ dn: uid=jdoe,ou=users,dc=foobar,dc=net -+ objectclass: top -+ objectclass: person -+ objectclass: organizationalPerson -+ objectclass: posixAccount -+ objectclass: ldapPublicKey -+ description: My account -+ cn: John Doe -+ sn: John Doe -+ uid: jdoe -+ uidNumber: 100 -+ gidNumber: 100 -+ homeDirectory: /home/jdoe -+ sshPublicKey: ssh-dss AAAAB3NzaC1kc3MAAAEBAOvL8pREUg9wSy/8+hQJ54YF3AXkB0OZrXB.... -+ [...] -+ --- CUT HERE --- -+ -+- LDAP GROUP ENTRY EXAMPLES (LDIF Format, look in groups.ldif) -+ --- CUT HERE --- -+ dn: cn=unix,ou=groups,dc=cuckoos,dc=net -+ objectclass: top -+ objectclass: posixGroup -+ description: Unix based servers group -+ cn: unix -+ gidNumber: 1002 -+ memberUid: jdoe -+ memberUid: user1 -+ memberUid: user2 -+ [...] -+ --- CUT HERE --- -+ -+>> FYI: << -+Multiple 'sshPublicKey' in a user entry are allowed, as well as multiple 'memberUid' attributes in a group entry -+ -+- COMPILING: -+ 1. Apply the patch -+ 2. ./configure --with-your-options --with-ldap=/prefix/to/ldap_libs_and_includes -+ 3. make -+ 4. it's done. -+ -+- BLA : -+ I hope this could help, and i hope to be clear enough,, or give ideas. questions/comments/improvements are welcome. -+ -+- TODO : -+ Redesign differently. -+ -+- DOCS/LINK : -+ http://pacsec.jp/core05/psj05-barisani-en.pdf -+ http://fritz.potsdam.edu/projects/openssh-lpk/ -+ http://fritz.potsdam.edu/projects/sshgate/ -+ http://dev.inversepath.com/trac/openssh-lpk -+ http://lam.sf.net/ ( http://lam.sourceforge.net/documentation/supportedSchemas.htm ) -+ -+- CONTRIBUTORS/IDEAS/GREETS : -+ - Falk Siemonsmeier. -+ - Jacob Rief. -+ - Michael Durchgraf. -+ - frederic peters. -+ - Finlay dobbie. -+ - Stefan Fisher. -+ - Robin H. Johnson. -+ - Adrian Bridgett. -+ -+- CONTACT : -+ - Eric AUGE -+ - Andrea Barisani -diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/auth-rsa.c openssh-5.2p1+lpk/auth-rsa.c ---- openssh-5.2p1.orig/auth-rsa.c 2008-07-02 14:37:30.000000000 +0200 -+++ openssh-5.2p1+lpk/auth-rsa.c 2009-03-22 15:59:08.132715250 +0100 -@@ -174,10 +174,96 @@ - FILE *f; - u_long linenum = 0; - Key *key; -+#ifdef WITH_LDAP_PUBKEY -+ ldap_key_t * k; -+ unsigned int i = 0; -+#endif - - /* Temporarily use the user's uid. */ - temporarily_use_uid(pw); - -+#ifdef WITH_LDAP_PUBKEY -+ /* here is the job */ -+ key = key_new(KEY_RSA1); -+ -+ if (options.lpk.on) { -+ debug("[LDAP] trying LDAP first uid=%s", pw->pw_name); -+ if ( ldap_ismember(&options.lpk, pw->pw_name) > 0) { -+ if ( (k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) { -+ for (i = 0 ; i < k->num ; i++) { -+ char *cp, *options = NULL; -+ -+ for (cp = k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++) -+ ; -+ if (!*cp || *cp == '\n' || *cp == '#') -+ continue; -+ -+ /* -+ * Check if there are options for this key, and if so, -+ * save their starting address and skip the option part -+ * for now. If there are no options, set the starting -+ * address to NULL. -+ */ -+ if (*cp < '0' || *cp > '9') { -+ int quoted = 0; -+ options = cp; -+ for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) { -+ if (*cp == '\\' && cp[1] == '"') -+ cp++; /* Skip both */ -+ else if (*cp == '"') -+ quoted = !quoted; -+ } -+ } else -+ options = NULL; -+ -+ /* Parse the key from the line. */ -+ if (hostfile_read_key(&cp, &bits, key) == 0) { -+ debug("[LDAP] line %d: non ssh1 key syntax", i); -+ continue; -+ } -+ /* cp now points to the comment part. */ -+ -+ /* Check if the we have found the desired key (identified by its modulus). */ -+ if (BN_cmp(key->rsa->n, client_n) != 0) -+ continue; -+ -+ /* check the real bits */ -+ if (bits != (unsigned int)BN_num_bits(key->rsa->n)) -+ logit("[LDAP] Warning: ldap, line %lu: keysize mismatch: " -+ "actual %d vs. announced %d.", (unsigned long)i, BN_num_bits(key->rsa->n), bits); -+ -+ /* We have found the desired key. */ -+ /* -+ * If our options do not allow this key to be used, -+ * do not send challenge. -+ */ -+ if (!auth_parse_options(pw, options, "[LDAP]", (unsigned long) i)) -+ continue; -+ -+ /* break out, this key is allowed */ -+ allowed = 1; -+ -+ /* add the return stuff etc... */ -+ /* Restore the privileged uid. */ -+ restore_uid(); -+ -+ /* return key if allowed */ -+ if (allowed && rkey != NULL) -+ *rkey = key; -+ else -+ key_free(key); -+ -+ ldap_keys_free(k); -+ return (allowed); -+ } -+ } else { -+ logit("[LDAP] no keys found for '%s'!", pw->pw_name); -+ } -+ } else { -+ logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup); -+ } -+ } -+#endif - /* The authorized keys. */ - file = authorized_keys_file(pw); - debug("trying public RSA key file %s", file); -diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/auth2-pubkey.c openssh-5.2p1+lpk/auth2-pubkey.c ---- openssh-5.2p1.orig/auth2-pubkey.c 2008-07-04 04:54:25.000000000 +0200 -+++ openssh-5.2p1+lpk/auth2-pubkey.c 2009-03-22 15:59:08.102307504 +0100 -@@ -55,6 +55,10 @@ - #include "monitor_wrap.h" - #include "misc.h" - -+#ifdef WITH_LDAP_PUBKEY -+#include "ldapauth.h" -+#endif -+ - /* import */ - extern ServerOptions options; - extern u_char *session_id2; -@@ -187,10 +191,79 @@ - u_long linenum = 0; - Key *found; - char *fp; -+#ifdef WITH_LDAP_PUBKEY -+ ldap_key_t * k; -+ unsigned int i = 0; -+#endif - - /* Temporarily use the user's uid. */ - temporarily_use_uid(pw); - -+#ifdef WITH_LDAP_PUBKEY -+ found_key = 0; -+ /* allocate a new key type */ -+ found = key_new(key->type); -+ -+ /* first check if the options is enabled, then try.. */ -+ if (options.lpk.on) { -+ debug("[LDAP] trying LDAP first uid=%s",pw->pw_name); -+ if (ldap_ismember(&options.lpk, pw->pw_name) > 0) { -+ if ((k = ldap_getuserkey(&options.lpk, pw->pw_name)) != NULL) { -+ /* Skip leading whitespace, empty and comment lines. */ -+ for (i = 0 ; i < k->num ; i++) { -+ /* dont forget if multiple keys to reset options */ -+ char *cp, *options = NULL; -+ -+ for (cp = (char *)k->keys[i]->bv_val; *cp == ' ' || *cp == '\t'; cp++) -+ ; -+ if (!*cp || *cp == '\n' || *cp == '#') -+ continue; -+ -+ if (key_read(found, &cp) != 1) { -+ /* no key? check if there are options for this key */ -+ int quoted = 0; -+ debug2("[LDAP] user_key_allowed: check options: '%s'", cp); -+ options = cp; -+ for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) { -+ if (*cp == '\\' && cp[1] == '"') -+ cp++; /* Skip both */ -+ else if (*cp == '"') -+ quoted = !quoted; -+ } -+ /* Skip remaining whitespace. */ -+ for (; *cp == ' ' || *cp == '\t'; cp++) -+ ; -+ if (key_read(found, &cp) != 1) { -+ debug2("[LDAP] user_key_allowed: advance: '%s'", cp); -+ /* still no key? advance to next line*/ -+ continue; -+ } -+ } -+ -+ if (key_equal(found, key) && -+ auth_parse_options(pw, options, file, linenum) == 1) { -+ found_key = 1; -+ debug("[LDAP] matching key found"); -+ fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX); -+ verbose("[LDAP] Found matching %s key: %s", key_type(found), fp); -+ -+ /* restoring memory */ -+ ldap_keys_free(k); -+ xfree(fp); -+ restore_uid(); -+ key_free(found); -+ return found_key; -+ break; -+ } -+ }/* end of LDAP for() */ -+ } else { -+ logit("[LDAP] no keys found for '%s'!", pw->pw_name); -+ } -+ } else { -+ logit("[LDAP] '%s' is not in '%s'", pw->pw_name, options.lpk.sgroup); -+ } -+ } -+#endif - debug("trying public key file %s", file); - f = auth_openkeyfile(file, pw, options.strict_modes); - -diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/config.h.in openssh-5.2p1+lpk/config.h.in ---- openssh-5.2p1.orig/config.h.in 2009-02-23 01:18:12.000000000 +0100 -+++ openssh-5.2p1+lpk/config.h.in 2009-03-22 15:59:08.195639244 +0100 -@@ -563,6 +563,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_LINUX_IF_TUN_H - -+/* Define if you want LDAP support */ -+#undef WITH_LDAP_PUBKEY -+ - /* Define if your libraries define login() */ - #undef HAVE_LOGIN - -diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/configure openssh-5.2p1+lpk/configure ---- openssh-5.2p1.orig/configure 2009-02-23 01:18:14.000000000 +0100 -+++ openssh-5.2p1+lpk/configure 2009-03-22 15:59:08.400328912 +0100 -@@ -1340,6 +1340,7 @@ - --with-tcp-wrappers[=PATH] Enable tcpwrappers support (optionally in PATH) - --with-libedit[=PATH] Enable libedit support for sftp - --with-audit=module Enable EXPERIMENTAL audit support (modules=debug,bsm) -+ --with-ldap[=PATH] Enable LDAP pubkey support (optionally in PATH) - --with-ssl-dir=PATH Specify path to OpenSSL installation - --without-openssl-header-check Disable OpenSSL version consistency check - --with-ssl-engine Enable OpenSSL (hardware) ENGINE support -@@ -12767,6 +12768,85 @@ - fi - - -+# Check whether user wants LDAP support -+LDAP_MSG="no" -+ -+# Check whether --with-ldap was given. -+if test "${with_ldap+set}" = set; then -+ withval=$with_ldap; -+ if test "x$withval" != "xno" ; then -+ -+ if test "x$withval" != "xyes" ; then -+ CPPFLAGS="$CPPFLAGS -I${withval}/include" -+ LDFLAGS="$LDFLAGS -L${withval}/lib" -+ fi -+ -+ -+cat >>confdefs.h <<\_ACEOF -+#define WITH_LDAP_PUBKEY 1 -+_ACEOF -+ -+ LIBS="-lldap $LIBS" -+ LDAP_MSG="yes" -+ -+ { echo "$as_me:$LINENO: checking for LDAP support" >&5 -+echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6; } -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+ #include -+int -+main () -+{ -+(void)ldap_init(0, 0); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ { { echo "$as_me:$LINENO: error: ** Incomplete or missing ldap libraries **" >&5 -+echo "$as_me: error: ** Incomplete or missing ldap libraries **" >&2;} -+ { (exit 1); exit 1; }; } -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ fi -+ -+ -+fi -+ -+ - - - -@@ -30543,6 +30623,7 @@ - echo " Smartcard support: $SCARD_MSG" - echo " S/KEY support: $SKEY_MSG" - echo " TCP Wrappers support: $TCPW_MSG" -+echo " LDAP support: $LDAP_MSG" - echo " MD5 password support: $MD5_MSG" - echo " libedit support: $LIBEDIT_MSG" - echo " Solaris process contract support: $SPC_MSG" -diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/configure.ac openssh-5.2p1+lpk/configure.ac ---- openssh-5.2p1.orig/configure.ac 2009-02-16 05:37:03.000000000 +0100 -+++ openssh-5.2p1+lpk/configure.ac 2009-03-22 15:59:08.490709251 +0100 -@@ -1314,6 +1314,37 @@ - esac ] - ) - -+# Check whether user wants LDAP support -+LDAP_MSG="no" -+AC_ARG_WITH(ldap, -+ [ --with-ldap[[=PATH]] Enable LDAP pubkey support (optionally in PATH)], -+ [ -+ if test "x$withval" != "xno" ; then -+ -+ if test "x$withval" != "xyes" ; then -+ CPPFLAGS="$CPPFLAGS -I${withval}/include" -+ LDFLAGS="$LDFLAGS -L${withval}/lib" -+ fi -+ -+ AC_DEFINE([WITH_LDAP_PUBKEY], 1, [Enable LDAP pubkey support]) -+ LIBS="-lldap $LIBS" -+ LDAP_MSG="yes" -+ -+ AC_MSG_CHECKING([for LDAP support]) -+ AC_TRY_COMPILE( -+ [#include -+ #include ], -+ [(void)ldap_init(0, 0);], -+ [AC_MSG_RESULT(yes)], -+ [ -+ AC_MSG_RESULT(no) -+ AC_MSG_ERROR([** Incomplete or missing ldap libraries **]) -+ ] -+ ) -+ fi -+ ] -+) -+ - dnl Checks for library functions. Please keep in alphabetical order - AC_CHECK_FUNCS( \ - arc4random \ -@@ -4163,6 +4194,7 @@ - echo " Smartcard support: $SCARD_MSG" - echo " S/KEY support: $SKEY_MSG" - echo " TCP Wrappers support: $TCPW_MSG" -+echo " LDAP support: $LDAP_MSG" - echo " MD5 password support: $MD5_MSG" - echo " libedit support: $LIBEDIT_MSG" - echo " Solaris process contract support: $SPC_MSG" -diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.2p1.orig/ldapauth.c openssh-5.2p1+lpk/ldapauth.c ---- openssh-5.2p1.orig/ldapauth.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssh-5.2p1+lpk/ldapauth.c 2009-03-22 15:59:08.528655666 +0100 -@@ -0,0 +1,575 @@ -+/* -+ * $Id: openssh-lpk-4.3p1-0.3.7.patch,v 1.3 2006/04/18 15:29:09 eau Exp $ -+ */ -+ -+/* -+ * -+ * Copyright (c) 2005, Eric AUGE -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -+ * -+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -+ * 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. -+ * Neither the name of the phear.org nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, -+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * -+ * -+ */ -+ -+#include "includes.h" -+ -+#ifdef WITH_LDAP_PUBKEY -+ -+#include -+#include -+#include -+#include -+ -+#include "ldapauth.h" -+#include "log.h" -+ -+static char *attrs[] = { -+ PUBKEYATTR, -+ NULL -+}; -+ -+/* filter building infos */ -+#define FILTER_GROUP_PREFIX "(&(objectclass=posixGroup)" -+#define FILTER_OR_PREFIX "(|" -+#define FILTER_OR_SUFFIX ")" -+#define FILTER_CN_PREFIX "(cn=" -+#define FILTER_CN_SUFFIX ")" -+#define FILTER_UID_FORMAT "(memberUid=%s)" -+#define FILTER_GROUP_SUFFIX ")" -+#define FILTER_GROUP_SIZE(group) (size_t) (strlen(group)+(ldap_count_group(group)*5)+52) -+ -+/* just filter building stuff */ -+#define REQUEST_GROUP_SIZE(filter, uid) (size_t) (strlen(filter)+strlen(uid)+1) -+#define REQUEST_GROUP(buffer, prefilter, pwname) \ -+ buffer = (char *) calloc(REQUEST_GROUP_SIZE(prefilter, pwname), sizeof(char)); \ -+ if (!buffer) { \ -+ perror("calloc()"); \ -+ return FAILURE; \ -+ } \ -+ snprintf(buffer, REQUEST_GROUP_SIZE(prefilter,pwname), prefilter, pwname) -+/* -+XXX OLD group building macros -+#define REQUEST_GROUP_SIZE(grp, uid) (size_t) (strlen(grp)+strlen(uid)+46) -+#define REQUEST_GROUP(buffer,pwname,grp) \ -+ buffer = (char *) calloc(REQUEST_GROUP_SIZE(grp, pwname), sizeof(char)); \ -+ if (!buffer) { \ -+ perror("calloc()"); \ -+ return FAILURE; \ -+ } \ -+ snprintf(buffer,REQUEST_GROUP_SIZE(grp,pwname),"(&(objectclass=posixGroup)(cn=%s)(memberUid=%s))",grp,pwname) -+ */ -+ -+/* -+XXX stock upstream version without extra filter support -+#define REQUEST_USER_SIZE(uid) (size_t) (strlen(uid)+64) -+#define REQUEST_USER(buffer, pwname) \ -+ buffer = (char *) calloc(REQUEST_USER_SIZE(pwname), sizeof(char)); \ -+ if (!buffer) { \ -+ perror("calloc()"); \ -+ return NULL; \ -+ } \ -+ snprintf(buffer,REQUEST_USER_SIZE(pwname),"(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s))",pwname) -+ */ -+ -+#define REQUEST_USER_SIZE(uid, filter) (size_t) (strlen(uid)+64+(filter != NULL ? strlen(filter) : 0)) -+#define REQUEST_USER(buffer, pwname, customfilter) \ -+ buffer = (char *) calloc(REQUEST_USER_SIZE(pwname, customfilter), sizeof(char)); \ -+ if (!buffer) { \ -+ perror("calloc()"); \ -+ return NULL; \ -+ } \ -+ snprintf(buffer, REQUEST_USER_SIZE(pwname, customfilter), \ -+ "(&(objectclass=posixAccount)(objectclass=ldapPublicKey)(uid=%s)%s)", \ -+ pwname, (customfilter != NULL ? customfilter : "")) -+ -+/* some portable and working tokenizer, lame though */ -+static int tokenize(char ** o, size_t size, char * input) { -+ unsigned int i = 0, num; -+ const char * charset = " \t"; -+ char * ptr = input; -+ -+ /* leading white spaces are ignored */ -+ num = strspn(ptr, charset); -+ ptr += num; -+ -+ while ((num = strcspn(ptr, charset))) { -+ if (i < size-1) { -+ o[i++] = ptr; -+ ptr += num; -+ if (*ptr) -+ *ptr++ = '\0'; -+ } -+ } -+ o[i] = NULL; -+ return SUCCESS; -+} -+ -+void ldap_close(ldap_opt_t * ldap) { -+ -+ if (!ldap) -+ return; -+ -+ if ( ldap_unbind_ext(ldap->ld, NULL, NULL) < 0) -+ ldap_perror(ldap->ld, "ldap_unbind()"); -+ -+ ldap->ld = NULL; -+ FLAG_SET_DISCONNECTED(ldap->flags); -+ -+ return; -+} -+ -+/* init && bind */ -+int ldap_connect(ldap_opt_t * ldap) { -+ int version = LDAP_VERSION3; -+ -+ if (!ldap->servers) -+ return FAILURE; -+ -+ /* Connection Init and setup */ -+ ldap->ld = ldap_init(ldap->servers, LDAP_PORT); -+ if (!ldap->ld) { -+ ldap_perror(ldap->ld, "ldap_init()"); -+ return FAILURE; -+ } -+ -+ if ( ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_OPT_SUCCESS) { -+ ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_PROTOCOL_VERSION)"); -+ return FAILURE; -+ } -+ -+ /* Timeouts setup */ -+ if (ldap_set_option(ldap->ld, LDAP_OPT_NETWORK_TIMEOUT, &ldap->b_timeout) != LDAP_SUCCESS) { -+ ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_NETWORK_TIMEOUT)"); -+ } -+ if (ldap_set_option(ldap->ld, LDAP_OPT_TIMEOUT, &ldap->s_timeout) != LDAP_SUCCESS) { -+ ldap_perror(ldap->ld, "ldap_set_option(LDAP_OPT_TIMEOUT)"); -+ } -+ -+ /* TLS support */ -+ if ( (ldap->tls == -1) || (ldap->tls == 1) ) { -+ if (ldap_start_tls_s(ldap->ld, NULL, NULL ) != LDAP_SUCCESS) { -+ /* failed then reinit the initial connect */ -+ ldap_perror(ldap->ld, "ldap_connect: (TLS) ldap_start_tls()"); -+ if (ldap->tls == 1) -+ return FAILURE; -+ -+ ldap->ld = ldap_init(ldap->servers, LDAP_PORT); -+ if (!ldap->ld) { -+ ldap_perror(ldap->ld, "ldap_init()"); -+ return FAILURE; -+ } -+ -+ if ( ldap_set_option(ldap->ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_OPT_SUCCESS) { -+ ldap_perror(ldap->ld, "ldap_set_option()"); -+ return FAILURE; -+ } -+ } -+ } -+ -+ -+ if ( ldap_simple_bind_s(ldap->ld, ldap->binddn, ldap->bindpw) != LDAP_SUCCESS) { -+ ldap_perror(ldap->ld, "ldap_simple_bind_s()"); -+ return FAILURE; -+ } -+ -+ /* says it is connected */ -+ FLAG_SET_CONNECTED(ldap->flags); -+ -+ return SUCCESS; -+} -+ @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Apr 21 14:41:41 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 21 Apr 2010 12:41:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[9736] csw/mgar/pkg/xmms/trunk Message-ID: Revision: 9736 http://gar.svn.sourceforge.net/gar/?rev=9736&view=rev Author: wahwah Date: 2010-04-21 12:41:41 +0000 (Wed, 21 Apr 2010) Log Message: ----------- xmms: upgrade to 1.2.11, move to GAR v2. Modified Paths: -------------- csw/mgar/pkg/xmms/trunk/Makefile csw/mgar/pkg/xmms/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/xmms/trunk/ Property changes on: csw/mgar/pkg/xmms/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/xmms/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmms/trunk/Makefile 2010-04-21 12:02:40 UTC (rev 9735) +++ csw/mgar/pkg/xmms/trunk/Makefile 2010-04-21 12:41:41 UTC (rev 9736) @@ -1,5 +1,9 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id: Makefile 8335 2010-02-03 18:36:29Z wahwah $ + GARNAME = xmms -GARVERSION = 1.2.10 +GARVERSION = 1.2.11 CATEGORIES = gnome DESCRIPTION = The X MultiMedia System. @@ -12,19 +16,30 @@ MASTER_SITES = http://www.xmms.org/files/1.2.x/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 - -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -DEPENDS = lib/libvorbis - CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-glib-prefix=/usr/sfw -CONFIGURE_ARGS += --with-gtk-prefix=/usr/sfw +CONFIGURE_ARGS += --with-glib-prefix=$(prefix) +CONFIGURE_ARGS += --with-gtk-prefix=$(prefix) CONFIGURE_ARGS += --with-ogg=$(prefix) CONFIGURE_ARGS += --with-vorbis=$(prefix) # 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 + include gar/category.mk Modified: csw/mgar/pkg/xmms/trunk/checksums =================================================================== --- csw/mgar/pkg/xmms/trunk/checksums 2010-04-21 12:02:40 UTC (rev 9735) +++ csw/mgar/pkg/xmms/trunk/checksums 2010-04-21 12:41:41 UTC (rev 9736) @@ -1 +1 @@ -03a85cfc5e1877a2e1f7be4fa1d3f63c download/xmms-1.2.10.tar.bz2 +f3e6dbaf0b3f571a532ab575656be506 download/xmms-1.2.11.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 21 14:52:46 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Apr 2010 12:52:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[9737] csw/mgar/pkg/alternatives Message-ID: Revision: 9737 http://gar.svn.sourceforge.net/gar/?rev=9737&view=rev Author: dmichelsen Date: 2010-04-21 12:52:46 +0000 (Wed, 21 Apr 2010) Log Message: ----------- alternatives: Remove link to chkconfig to make space for csw-specific implementation Removed Paths: ------------- csw/mgar/pkg/alternatives Deleted: csw/mgar/pkg/alternatives =================================================================== --- csw/mgar/pkg/alternatives 2010-04-21 12:41:41 UTC (rev 9736) +++ csw/mgar/pkg/alternatives 2010-04-21 12:52:46 UTC (rev 9737) @@ -1 +0,0 @@ -link chkconfig \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 21 15:58:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Apr 2010 13:58:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9738] csw/mgar/pkg Message-ID: Revision: 9738 http://gar.svn.sourceforge.net/gar/?rev=9738&view=rev Author: dmichelsen Date: 2010-04-21 13:58:05 +0000 (Wed, 21 Apr 2010) Log Message: ----------- alternatives: Make empty hull for Phil to fill Added Paths: ----------- csw/mgar/pkg/alternatives/ csw/mgar/pkg/alternatives/branches/ csw/mgar/pkg/alternatives/tags/ csw/mgar/pkg/alternatives/trunk/ csw/mgar/pkg/alternatives/trunk/Makefile csw/mgar/pkg/alternatives/trunk/checksums csw/mgar/pkg/alternatives/trunk/files/ csw/mgar/pkg/alternatives/trunk/files/CSWalternatives.i.cswalternatives csw/mgar/pkg/alternatives/trunk/files/CSWalternatives.r.cswalternatives csw/mgar/pkg/alternatives/trunk/files/LICENSE-2.0.txt csw/mgar/pkg/alternatives/trunk/files/alternatives csw/mgar/pkg/alternatives/trunk/files/alternatives.8 Property changes on: csw/mgar/pkg/alternatives/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/alternatives/trunk/Makefile =================================================================== --- csw/mgar/pkg/alternatives/trunk/Makefile (rev 0) +++ csw/mgar/pkg/alternatives/trunk/Makefile 2010-04-21 13:58:05 UTC (rev 9738) @@ -0,0 +1,41 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = alternatives +GARVERSION = 1.0 +CATEGORIES = utils + +DESCRIPTION = Alternatives implementation specific to OpenCSW +define BLURB +endef + +MASTER_SITES = +DISTFILES = alternatives alternatives.8 +DISTFILES += CSWalternatives.i.cswalternatives +DISTFILES += CSWalternatives.r.cswalternatives +DISTFILES += LICENSE-2.0.txt + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +LICENSE = LICENSE-2.0.txt + +VENDOR_URL = http://wiki.opencsw.org/project-alternatives + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom +TEST_SCRIPTS = + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKDIR)/alternatives $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(mandir)/man8 + ginstall $(WORKDIR)/alternatives.1 $(DESTDIR)$(mandir)/man8 + ginstall -d $(DESTDIR)/etc/opt/csw/alternatives + ginstall -d $(DESTDIR)/etc/opt/csw/preserve/CSWalternatives/alternatives + ginstall -d $(DESTDIR)/var/opt/csw/alternatives + ginstall -d $(DESTDIR)/usr/sadm/install/scripts + ginstall $(WORKDIR)/CSWalternatives.i.cswalternatives $(DESTDIR)/usr/sadm/install/scripts/i.cswalternatives + ginstall $(WORKDIR)/CSWalternatives.r.cswalternatives $(DESTDIR)/usr/sadm/install/scripts/r.cswalternatives + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/alternatives/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/alternatives/trunk/checksums =================================================================== --- csw/mgar/pkg/alternatives/trunk/checksums (rev 0) +++ csw/mgar/pkg/alternatives/trunk/checksums 2010-04-21 13:58:05 UTC (rev 9738) @@ -0,0 +1,5 @@ +5e7b546021e5606165c34f154b70bc7b CSWalternatives.i.cswalternatives +b610f50080c8ffe65037bb9891316935 CSWalternatives.r.cswalternatives +3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt +d41d8cd98f00b204e9800998ecf8427e alternatives +d41d8cd98f00b204e9800998ecf8427e alternatives.8 Copied: csw/mgar/pkg/alternatives/trunk/files/CSWalternatives.i.cswalternatives (from rev 9737, csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.i.cswalternatives) =================================================================== --- csw/mgar/pkg/alternatives/trunk/files/CSWalternatives.i.cswalternatives (rev 0) +++ csw/mgar/pkg/alternatives/trunk/files/CSWalternatives.i.cswalternatives 2010-04-21 13:58:05 UTC (rev 9738) @@ -0,0 +1,52 @@ +#!/bin/sh +# +# i.cswalternatives - Class action script for +# registering applications in alternatives +# +# Written and maintained by Dagobert Michelsen +# +# 2010-02-11 Initial release + +: ${PKG_INSTALL_ROOT:=/} + +while read src dest; do + /usr/bin/cp $src $dest || exit 2 + + cat $dest | while read C; do + set -- $C + + ALTLINK="$1" + ALTNAME="$2" + ALTPATH="$3" + ALTPRIO="$4" + + echo "Registering '$ALTNAME' alternative $ALTPATH ..." + + ARGS="--install $ALTLINK $ALTNAME $ALTPATH $ALTPRIO" + shift; shift; shift; shift + + while [ $# -gt 0 ]; do + ARGS="$ARGS --slave $1 $2 $3" + shift; shift; shift + done + + if [ ! -x ${PKG_INSTALL_ROOT}/opt/csw/sbin/alternatives ]; then + echo "ERROR: /opt/csw/sbin/alternatives could not be found" >&2 + exit 2 + fi + + chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives $ARGS + + # Redo previous manual selection if this is an upgrade + if /usr/bin/test -L "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$ALTNAME"; then + CHOICE=`/usr/bin/perl -e 'print readlink $ARGV[0]' "${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$ALTNAME"` + if [ "${CHOICE}" = "$ALTPATH" ]; then + echo "Applying previous manual selection ${CHOICE} ..." + chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives --set $ALTNAME ${CHOICE} + rm -f ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$ALTNAME + fi + fi + done +done + +exit 0 Copied: csw/mgar/pkg/alternatives/trunk/files/CSWalternatives.r.cswalternatives (from rev 9737, csw/mgar/pkg/chkconfig/trunk/files/CSWalternatives.r.cswalternatives) =================================================================== --- csw/mgar/pkg/alternatives/trunk/files/CSWalternatives.r.cswalternatives (rev 0) +++ csw/mgar/pkg/alternatives/trunk/files/CSWalternatives.r.cswalternatives 2010-04-21 13:58:05 UTC (rev 9738) @@ -0,0 +1,42 @@ +#!/bin/sh +# +# r.cswalternatives - Class action script for +# registering applications in alternatives +# +# Written and maintained by Dagobert Michelsen +# +# 2010-02-11 Initial release + +: ${PKG_INSTALL_ROOT:=/} + +while read dest; do + cat $dest | while read C; do + set -- $C + + # If we are in manual mode and the selected item is about to be removed + # make sure to remember the selection for next install to be reset. + + if egrep '^manual$' ${PKG_INSTALL_ROOT}/var/opt/csw/alternatives/$2 >/dev/null 2>&1; then + CHOICE="`perl -e 'print readlink $ARGV[0]' ${PKG_INSTALL_ROOT}/etc/opt/csw/alternatives/$2`" + if [ "$3" = "${CHOICE}" ]; then + echo "Preserving '$2' manual choice ${CHOICE} ..." + mkdir -p ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives + rm -f ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$2 + ln -s "${CHOICE}" ${PKG_INSTALL_ROOT}/etc/opt/csw/preserve/${PKG}/alternatives/$2 + fi + fi + + echo "Unregistering '$2' alternative $3 ..." + + if [ -x ${PKG_INSTALL_ROOT}/opt/csw/sbin/alternatives ]; then + chroot ${PKG_INSTALL_ROOT} /opt/csw/sbin/alternatives --remove $2 $3 + else + echo "ERROR: /opt/csw/sbin/alternatives could not be found" >&2 + exit 2 + fi + done + + rm -f $dest +done + +exit 0 Added: csw/mgar/pkg/alternatives/trunk/files/LICENSE-2.0.txt =================================================================== --- csw/mgar/pkg/alternatives/trunk/files/LICENSE-2.0.txt (rev 0) +++ csw/mgar/pkg/alternatives/trunk/files/LICENSE-2.0.txt 2010-04-21 13:58:05 UTC (rev 9738) @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. Added: csw/mgar/pkg/alternatives/trunk/files/alternatives =================================================================== Added: csw/mgar/pkg/alternatives/trunk/files/alternatives.8 =================================================================== 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 Apr 21 16:41:50 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Apr 2010 14:41:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9739] csw/mgar/pkg Message-ID: Revision: 9739 http://gar.svn.sourceforge.net/gar/?rev=9739&view=rev Author: dmichelsen Date: 2010-04-21 14:41:49 +0000 (Wed, 21 Apr 2010) Log Message: ----------- libarchive: Initial commit Added Paths: ----------- csw/mgar/pkg/libarchive/ csw/mgar/pkg/libarchive/branches/ csw/mgar/pkg/libarchive/tags/ csw/mgar/pkg/libarchive/trunk/ csw/mgar/pkg/libarchive/trunk/Makefile csw/mgar/pkg/libarchive/trunk/checksums csw/mgar/pkg/libarchive/trunk/files/ Property changes on: csw/mgar/pkg/libarchive/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/libarchive/trunk/Makefile =================================================================== --- csw/mgar/pkg/libarchive/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libarchive/trunk/Makefile 2010-04-21 14:41:49 UTC (rev 9739) @@ -0,0 +1,27 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +GARNAME = libarchive +GARVERSION = 2.8.3 +CATEGORIES = lib + +DESCRIPTION = C library for reading and writing various archive formats +define BLURB +endef + +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://code.google.com/p/libarchive/ + +DEP_PKGS = CSWxz CSWbzip2 CSWiconv CSWlibxml2 CSWzlib CSWosslrt + +EXTRA_INC = $(includedir)/cryptopp + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Property changes on: csw/mgar/pkg/libarchive/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libarchive/trunk/checksums =================================================================== --- csw/mgar/pkg/libarchive/trunk/checksums (rev 0) +++ csw/mgar/pkg/libarchive/trunk/checksums 2010-04-21 14:41:49 UTC (rev 9739) @@ -0,0 +1 @@ +fe8d917e101d4b37580124030842a1d0 libarchive-2.8.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Wed Apr 21 20:56:43 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Wed, 21 Apr 2010 18:56:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9740] csw/mgar/pkg Message-ID: Revision: 9740 http://gar.svn.sourceforge.net/gar/?rev=9740&view=rev Author: trygvis Date: 2010-04-21 18:56:43 +0000 (Wed, 21 Apr 2010) Log Message: ----------- sbt: Initial import. Added Paths: ----------- csw/mgar/pkg/sbt/ csw/mgar/pkg/sbt/branches/ csw/mgar/pkg/sbt/tags/ csw/mgar/pkg/sbt/trunk/ csw/mgar/pkg/sbt/trunk/Makefile csw/mgar/pkg/sbt/trunk/checksums csw/mgar/pkg/sbt/trunk/files/ csw/mgar/pkg/sbt/trunk/files/sbt Property changes on: csw/mgar/pkg/sbt/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/sbt/trunk/Makefile =================================================================== --- csw/mgar/pkg/sbt/trunk/Makefile (rev 0) +++ csw/mgar/pkg/sbt/trunk/Makefile 2010-04-21 18:56:43 UTC (rev 9740) @@ -0,0 +1,34 @@ +GARNAME = sbt +GARVERSION = 0.7.3 +CATEGORIES = devel +ARCHALL = 1 + +DESCRIPTION = A build tool for Scala + +VENDOR_URL = http://code.google.com/p/simple-build-tool/ +MASTER_SITES = http://simple-build-tool.googlecode.com/files/ +DISTFILES = sbt-launch-$(GARVERSION).jar +DISTFILES += sbt + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = sbt-launch-(\d+(?:\.\d+)*).jar + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = + +include gar/category.mk + +post-merge: + mkdir -p $(PKGROOT)/opt/csw/share/doc/sbt/ + (cd $(PKGROOT)/opt/csw/share/doc/sbt; jar xfv $(abspath $(WORKDIR_FIRSTMOD))/sbt-launch-$(GARVERSION).jar LICENSE) + mv $(PKGROOT)/opt/csw/share/doc/sbt/LICENSE $(PKGROOT)/opt/csw/share/doc/sbt/license + ginstall -D $(WORKDIR_FIRSTMOD)/sbt $(PKGROOT)/opt/csw/bin/sbt + ginstall -D $(WORKDIR_FIRSTMOD)/sbt-launch-$(GARVERSION).jar $(PKGROOT)/opt/csw/share/sbt/sbt-launch-$(GARVERSION).jar + ln -s sbt-launch-$(GARVERSION).jar $(PKGROOT)/opt/csw/share/sbt/sbt-launch.jar + @$(MAKECOOKIE) Added: csw/mgar/pkg/sbt/trunk/checksums =================================================================== --- csw/mgar/pkg/sbt/trunk/checksums (rev 0) +++ csw/mgar/pkg/sbt/trunk/checksums 2010-04-21 18:56:43 UTC (rev 9740) @@ -0,0 +1,2 @@ +083439853fab9d84b208bc855b5cd63b sbt +bb0cc51177dc1590d4ed174d1624d6e8 sbt-launch-0.7.3.jar Added: csw/mgar/pkg/sbt/trunk/files/sbt =================================================================== --- csw/mgar/pkg/sbt/trunk/files/sbt (rev 0) +++ csw/mgar/pkg/sbt/trunk/files/sbt 2010-04-21 18:56:43 UTC (rev 9740) @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ -z "$JVM_OPTS" ] +then + JVM_OPTS="-Xmx512M" +fi + +exec java $JVM_OPTS -jar /opt/csw/share/sbt/sbt-launch.jar "$@" 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 Apr 22 04:13:17 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 22 Apr 2010 02:13:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9741] csw/mgar/pkg/libgmp/trunk Message-ID: Revision: 9741 http://gar.svn.sourceforge.net/gar/?rev=9741&view=rev Author: bdwalton Date: 2010-04-22 02:13:17 +0000 (Thu, 22 Apr 2010) Log Message: ----------- libgmp: version bump Modified Paths: -------------- csw/mgar/pkg/libgmp/trunk/Makefile csw/mgar/pkg/libgmp/trunk/checksums Modified: csw/mgar/pkg/libgmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp/trunk/Makefile 2010-04-21 18:56:43 UTC (rev 9740) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2010-04-22 02:13:17 UTC (rev 9741) @@ -1,5 +1,5 @@ GARNAME = gmp -GARVERSION = 4.3.1 +GARVERSION = 4.3.2 CATEGORIES = lib DESCRIPTION = GNU Multiple Precision Arithmetic Library Modified: csw/mgar/pkg/libgmp/trunk/checksums =================================================================== --- csw/mgar/pkg/libgmp/trunk/checksums 2010-04-21 18:56:43 UTC (rev 9740) +++ csw/mgar/pkg/libgmp/trunk/checksums 2010-04-22 02:13:17 UTC (rev 9741) @@ -1 +1 @@ -26cec15a90885042dd4a15c4003b08ae download/gmp-4.3.1.tar.bz2 +dd60683d7057917e34630b4a787932e8 gmp-4.3.2.tar.bz2 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 Apr 23 19:24:51 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 23 Apr 2010 17:24:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[9742] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 9742 http://gar.svn.sourceforge.net/gar/?rev=9742&view=rev Author: rthurner Date: 2010-04-23 17:24:51 +0000 (Fri, 23 Apr 2010) Log Message: ----------- openssl update to 1.0.0 Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2010-04-22 02:13:17 UTC (rev 9741) +++ csw/mgar/pkg/openssl/trunk/Makefile 2010-04-23 17:24:51 UTC (rev 9742) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = openssl -GARVERSION = 0.9.8n +GARVERSION = 1.0.0 CATEGORIES = lib DESCRIPTION = The Open Source toolkit for SSL and TLS 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 Apr 23 19:26:23 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 23 Apr 2010 17:26:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9743] csw/mgar/pkg/openssl/trunk/checksums Message-ID: Revision: 9743 http://gar.svn.sourceforge.net/gar/?rev=9743&view=rev Author: rthurner Date: 2010-04-23 17:26:22 +0000 (Fri, 23 Apr 2010) Log Message: ----------- openssl-1.0.0 checksums Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/checksums Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2010-04-23 17:24:51 UTC (rev 9742) +++ csw/mgar/pkg/openssl/trunk/checksums 2010-04-23 17:26:22 UTC (rev 9743) @@ -10,4 +10,4 @@ b78faa440d6f6a2a07663de331678648 README.CSW f0d5119652618d956eb24490b7577eb9 changelog.CSW 84830e15846f1b20d8371c1fa375a0b1 more_configure_targets.patch -076d8efc3ed93646bd01f04e23c07066 openssl-0.9.8n.tar.gz +89eaa86e25b2845f920ec00ae4c864ed openssl-1.0.0.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 Apr 23 19:36:51 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 23 Apr 2010 17:36:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[9744] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 9744 http://gar.svn.sourceforge.net/gar/?rev=9744&view=rev Author: rthurner Date: 2010-04-23 17:36:50 +0000 (Fri, 23 Apr 2010) Log Message: ----------- openldap - upgrade to 2.4.21 - first try Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openldap/trunk/checksums Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-04-23 17:26:22 UTC (rev 9743) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-04-23 17:36:50 UTC (rev 9744) @@ -1,8 +1,8 @@ GARNAME = openldap -GARVERSION = 2.4.19 +GARVERSION = 2.4.21 CATEGORIES = server EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 2.3.43 2.4.19 +MODULATIONS_GARVERSION = 2.3.43 2.4.21 DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol define BLURB @@ -20,10 +20,10 @@ DISTFILES += README.CSW openldaprc DISTFILES += cswopenldap openldap.xml svc-openldap -PATCHFILES_isa-sparcv8-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff -PATCHFILES_isa-sparcv9-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff -PATCHFILES_isa-i386-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff -PATCHFILES_isa-amd64-garversion-2.4.19 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-sparcv8-garversion-2.4.21 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-sparcv9-garversion-2.4.21 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-i386-garversion-2.4.21 = patch-oldap-2.4.16-ntlm.diff +PATCHFILES_isa-amd64-garversion-2.4.21 = patch-oldap-2.4.16-ntlm.diff PATCHFILES += patch-libtool-64bit.diff DISTFILES += patch-oldap-2.4.16-ntlm.diff @@ -43,7 +43,7 @@ SPKG_DESC_CSWoldapdevel = OpenLDAP development support SPKG_DESC_CSWoldaprt = OpenLDAP runtime libraries -RUNTIME_DEP_PKGS_CSWoldap = CSWbdb47 CSWiconv CSWlibnet CSWlibtoolrt CSWoldaprt +RUNTIME_DEP_PKGS_CSWoldap = CSWbdb48 CSWiconv CSWlibnet CSWlibtoolrt CSWoldaprt RUNTIME_DEP_PKGS_CSWoldap += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc RUNTIME_DEP_PKGS_CSWoldap += CSWkrb5lib CSWlibicu CSWperl RUNTIME_DEP_PKGS_CSWoldapclient = CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWkrb5lib @@ -59,8 +59,8 @@ EXTRA_LIB_garversion-2.3.43 = $(prefix)/bdb44/lib EXTRA_INC_garversion-2.3.43 = $(prefix)/bdb44/include -EXTRA_LIB_garversion-2.4.19 = $(prefix)/bdb47/lib -EXTRA_INC_garversion-2.4.19 = $(prefix)/bdb47/include +EXTRA_LIB_garversion-2.4.21 = $(prefix)/bdb47/lib +EXTRA_INC_garversion-2.4.21 = $(prefix)/bdb47/include EXTRA_LIB = $(EXTRA_LIB_garversion-$(GARVERSION)) EXTRA_INC = $(EXTRA_INC_garversion-$(GARVERSION)) @@ -100,9 +100,9 @@ MERGE_SCRIPTS_isa-default64-garversion-2.3.43 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-2.3.43 = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-2.4.19 = copy-all -MERGE_SCRIPTS_isa-default64-garversion-2.4.19 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-2.4.19 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-garversion-2.4.21 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-2.4.21 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-2.4.21 = $(bindir) $(sbindir) $(libexecdir) $(libdir) PKGFILES_CSWoldapclient = $(bindir)/.* PKGFILES_CSWoldapclient += $(mandir)/man1/.* Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2010-04-23 17:26:22 UTC (rev 9743) +++ csw/mgar/pkg/openldap/trunk/checksums 2010-04-23 17:36:50 UTC (rev 9744) @@ -2,7 +2,7 @@ 892dba5f625755be024c30ea0055fd55 README.CSW c50f5c4040139b6cf57fcc08abffbee7 cswopenldap 1b25281086eb146b8e11ebd33de086dc openldap-2.3.43.tgz -4a6dab2711fcf141f19bb680bc335887 openldap-2.4.19.tgz +e7128c57b2bacd940e8906057c94ff26 openldap-2.4.21.tgz 0e57547ad2b5fedca9f0bd4beaddfe39 openldap.xml ab2ac7519b092ce8d16124c5270bfec0 openldaprc 93dc2a04fd943c198ad00edd4d88ce65 patch-libtool-64bit.diff 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 Apr 23 19:44:20 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 23 Apr 2010 17:44:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[9745] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 9745 http://gar.svn.sourceforge.net/gar/?rev=9745&view=rev Author: rthurner Date: 2010-04-23 17:44:20 +0000 (Fri, 23 Apr 2010) Log Message: ----------- openldap - upgrade to use newest bdb Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-04-23 17:36:50 UTC (rev 9744) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-04-23 17:44:20 UTC (rev 9745) @@ -59,8 +59,8 @@ EXTRA_LIB_garversion-2.3.43 = $(prefix)/bdb44/lib EXTRA_INC_garversion-2.3.43 = $(prefix)/bdb44/include -EXTRA_LIB_garversion-2.4.21 = $(prefix)/bdb47/lib -EXTRA_INC_garversion-2.4.21 = $(prefix)/bdb47/include +EXTRA_LIB_garversion-2.4.21 = $(prefix)/bdb48/lib +EXTRA_INC_garversion-2.4.21 = $(prefix)/bdb48/include EXTRA_LIB = $(EXTRA_LIB_garversion-$(GARVERSION)) EXTRA_INC = $(EXTRA_INC_garversion-$(GARVERSION)) 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 Apr 24 03:06:37 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 24 Apr 2010 01:06:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[9746] csw/mgar/pkg/quilt/trunk/Makefile Message-ID: Revision: 9746 http://gar.svn.sourceforge.net/gar/?rev=9746&view=rev Author: bdwalton Date: 2010-04-24 01:06:37 +0000 (Sat, 24 Apr 2010) Log Message: ----------- quilt: prepare for coreutils by tweaking deps and overrides Modified Paths: -------------- csw/mgar/pkg/quilt/trunk/Makefile Modified: csw/mgar/pkg/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile 2010-04-23 17:44:20 UTC (rev 9745) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-24 01:06:37 UTC (rev 9746) @@ -22,7 +22,7 @@ ARCHALL_CSWquilt-el = 1 ARCHALL_CSWquilt-completion = 1 -RUNTIME_DEP_PKGS_CSWquilt = CSWgfile CSWshutils CSWtextutils +RUNTIME_DEP_PKGS_CSWquilt = CSWcoreutils RUNTIME_DEP_PKGS_CSWquilt += CSWperl CSWgawk CSWgsed CSWbash CSWdiffstat RUNTIME_DEP_PKGS_CSWquilt += CSWgpatch CSWmktemp CSWggrep CSWggettext RUNTIME_DEP_PKGS_CSWquilt += CSWfindutils CSWggetopt CSWdiffutils @@ -31,7 +31,7 @@ RUNTIME_DEP_PKGS_CSWquilt-el = CSWemacscommon CSWquilt RUNTIME_DEP_PKGS_CSWquilt-complation = CSWbashcmplt CSWquilt -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWquilt) +BUILD_DEP_PKGS = $(filter-out CSWcoreutils, $(RUNTIME_DEP_PKGS_CSWquilt)) PKGFILES_CSWquilt-el = $(datadir)/emacs/site-lisp/.* PKGFILES_CSWquilt-completion = $(prefix)/etc/.* @@ -73,15 +73,15 @@ COMPILE_ELISP = 1 +CHECKPKG_OVERRIDES_CSWquilt += unidentified-dependency|CSWcoreutils + # quilt overrides +CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWcoreutils CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWperl CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWgsed CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWgawk -CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWshutils CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWfindutils CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWgnulinks -CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWgfile -CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWtextutils CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWggrep CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWdiffstat CHECKPKG_OVERRIDES_CSWquilt += surplus-dependency|CSWmktemp 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 Apr 24 03:07:38 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 24 Apr 2010 01:07:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[9747] csw/mgar/pkg/quilt/trunk/Makefile Message-ID: Revision: 9747 http://gar.svn.sourceforge.net/gar/?rev=9747&view=rev Author: bdwalton Date: 2010-04-24 01:07:38 +0000 (Sat, 24 Apr 2010) Log Message: ----------- quilt: add missing MAKECOOKIE to post-install-modulated routine Modified Paths: -------------- csw/mgar/pkg/quilt/trunk/Makefile Modified: csw/mgar/pkg/quilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/quilt/trunk/Makefile 2010-04-24 01:06:37 UTC (rev 9746) +++ csw/mgar/pkg/quilt/trunk/Makefile 2010-04-24 01:07:38 UTC (rev 9747) @@ -105,4 +105,5 @@ post-install-modulated: @( gmkdir -p $(DESTDIR)/$(sysconfdir)/; \ - mv $(DESTDIR)/$(prefix)/etc/quilt.quiltrc $(DESTDIR)/$(sysconfdir) ) \ No newline at end of file + mv $(DESTDIR)/$(prefix)/etc/quilt.quiltrc $(DESTDIR)/$(sysconfdir) ) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 24 09:57:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 24 Apr 2010 07:57:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9748] csw/mgar/pkg/hachoir-core/trunk Message-ID: Revision: 9748 http://gar.svn.sourceforge.net/gar/?rev=9748&view=rev Author: wahwah Date: 2010-04-24 07:57:58 +0000 (Sat, 24 Apr 2010) Log Message: ----------- hachoir-core: Upgrade to 1.3.3 Modified Paths: -------------- csw/mgar/pkg/hachoir-core/trunk/Makefile csw/mgar/pkg/hachoir-core/trunk/checksums Modified: csw/mgar/pkg/hachoir-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/hachoir-core/trunk/Makefile 2010-04-24 01:07:38 UTC (rev 9747) +++ csw/mgar/pkg/hachoir-core/trunk/Makefile 2010-04-24 07:57:58 UTC (rev 9748) @@ -3,9 +3,9 @@ # $Id$ GARNAME = hachoir-core -GARVERSION = 1.2.1 +GARVERSION = 1.3.3 CATEGORIES = python -DESCRIPTION = allows to view and edit a binary stream field by field (core) +DESCRIPTION = Allows to view and edit a binary stream field by field (core) define BLURB Hachoir is a Python library that allows to view and edit a binary stream field by field. In other words, Hachoir allows you to "browse" any binary Modified: csw/mgar/pkg/hachoir-core/trunk/checksums =================================================================== --- csw/mgar/pkg/hachoir-core/trunk/checksums 2010-04-24 01:07:38 UTC (rev 9747) +++ csw/mgar/pkg/hachoir-core/trunk/checksums 2010-04-24 07:57:58 UTC (rev 9748) @@ -1 +1 @@ -d7227f9d1bcf62f2a5c8f3e6da4f2aee hachoir-core-1.2.1.tar.gz +b80f0257536e2b2cb23f66670c4f6f31 hachoir-core-1.3.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 24 10:02:29 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 24 Apr 2010 08:02:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9749] csw/mgar/pkg/hachoir-parser/trunk Message-ID: Revision: 9749 http://gar.svn.sourceforge.net/gar/?rev=9749&view=rev Author: wahwah Date: 2010-04-24 08:02:29 +0000 (Sat, 24 Apr 2010) Log Message: ----------- hachoir-parser: Upgrade to 1.3.3, adding an override to be able to release it together with hachoir-core. Modified Paths: -------------- csw/mgar/pkg/hachoir-parser/trunk/Makefile csw/mgar/pkg/hachoir-parser/trunk/checksums Modified: csw/mgar/pkg/hachoir-parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/hachoir-parser/trunk/Makefile 2010-04-24 07:57:58 UTC (rev 9748) +++ csw/mgar/pkg/hachoir-parser/trunk/Makefile 2010-04-24 08:02:29 UTC (rev 9749) @@ -3,9 +3,9 @@ # $Id$ GARNAME = hachoir-parser -GARVERSION = 1.2.1 +GARVERSION = 1.3.3 CATEGORIES = python -DESCRIPTION = allows to view and edit a binary stream field by field (core) +DESCRIPTION = Allows to view and edit a binary stream field by field (core) define BLURB Hachoir is a Python library that allows to view and edit a binary stream field by field. In other words, Hachoir allows you to "browse" any binary @@ -19,5 +19,8 @@ CATALOGNAME = py_hachoir_parser ARCHALL = 1 RUNTIME_DEP_PKGS = CSWpy-hachoir-core +CHECKPKG_OVERRIDES_CSWhachoir-parser += surplus-dependency|CSWpy-hachoir-core +# To be able to release it together with CSWhachoir-core. +CHECKPKG_OVERRIDES_CSWhachoir-parser += unidentified-dependency|CSWpy-hachoir-core TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/hachoir-parser/trunk/checksums =================================================================== --- csw/mgar/pkg/hachoir-parser/trunk/checksums 2010-04-24 07:57:58 UTC (rev 9748) +++ csw/mgar/pkg/hachoir-parser/trunk/checksums 2010-04-24 08:02:29 UTC (rev 9749) @@ -1 +1 @@ -8308920290165f73955043ea21666264 hachoir-parser-1.2.1.tar.gz +378df2d18ceb9d1f8a83345fdd78deab hachoir-parser-1.3.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Apr 24 10:46:08 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 24 Apr 2010 08:46:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9750] csw/mgar/pkg Message-ID: Revision: 9750 http://gar.svn.sourceforge.net/gar/?rev=9750&view=rev Author: wahwah Date: 2010-04-24 08:46:08 +0000 (Sat, 24 Apr 2010) Log Message: ----------- geeqie: Initial commit. Modified Paths: -------------- csw/mgar/pkg/geeqie/trunk/Makefile csw/mgar/pkg/geeqie/trunk/checksums Added Paths: ----------- csw/mgar/pkg/geeqie/ Modified: csw/mgar/pkg/geeqie/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-03-22 15:07:32 UTC (rev 9324) +++ csw/mgar/pkg/geeqie/trunk/Makefile 2010-04-24 08:46:08 UTC (rev 9750) @@ -2,184 +2,28 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg +GARNAME = geeqie GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +CATEGORIES = gnome +DESCRIPTION = A lightweight image viewer, forked from GQview define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://geeqie.sourceforge.net/ +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 . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +EXTRA_LDFLAGS = -lsocket -#include gar/category.mk +RUNTIME_DEP_PKGS_CSWgeeqie += CSWgtk2 +RUNTIME_DEP_PKGS_CSWgeeqie += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWgeeqie += CSWglib2 +RUNTIME_DEP_PKGS_CSWgeeqie += CSWpango +RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibatk +RUNTIME_DEP_PKGS_CSWgeeqie += CSWggettextrt +RUNTIME_DEP_PKGS_CSWgeeqie += CSWlibcairo +RUNTIME_DEP_PKGS_CSWgeeqie += CSWfconfig +RUNTIME_DEP_PKGS_CSWgeeqie += CSWftype2 + +include gar/category.mk Modified: csw/mgar/pkg/geeqie/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-03-22 15:07:32 UTC (rev 9324) +++ csw/mgar/pkg/geeqie/trunk/checksums 2010-04-24 08:46:08 UTC (rev 9750) @@ -0,0 +1 @@ +1d67ef990390224c5052697d93bb49c0 geeqie-1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Apr 24 12:47:17 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 24 Apr 2010 10:47:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9751] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 9751 http://gar.svn.sourceforge.net/gar/?rev=9751&view=rev Author: rthurner Date: 2010-04-24 10:47:17 +0000 (Sat, 24 Apr 2010) Log Message: ----------- openlda - adjust to new checkpkg Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-04-24 08:46:08 UTC (rev 9750) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-04-24 10:47:17 UTC (rev 9751) @@ -43,12 +43,11 @@ SPKG_DESC_CSWoldapdevel = OpenLDAP development support SPKG_DESC_CSWoldaprt = OpenLDAP runtime libraries -RUNTIME_DEP_PKGS_CSWoldap = CSWbdb48 CSWiconv CSWlibnet CSWlibtoolrt CSWoldaprt +RUNTIME_DEP_PKGS_CSWoldap = CSWbdb CSWlibnet CSWlibtoolrt RUNTIME_DEP_PKGS_CSWoldap += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc -RUNTIME_DEP_PKGS_CSWoldap += CSWkrb5lib CSWlibicu CSWperl -RUNTIME_DEP_PKGS_CSWoldapclient = CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWkrb5lib -RUNTIME_DEP_PKGS_CSWoldapdevel = CSWoldaprt -RUNTIME_DEP_PKGS_CSWoldaprt = CSWlibnet CSWosslrt CSWsasl CSWkrb5lib +RUNTIME_DEP_PKGS_CSWoldap += CSWlibicu CSWperl +RUNTIME_DEP_PKGS_CSWoldapclient = CSWlibnet CSWosslrt CSWsasl +RUNTIME_DEP_PKGS_CSWoldaprt = CSWlibnet CSWosslrt CSWsasl SPKG_SOURCEURL = http://www.openldap.org @@ -114,7 +113,8 @@ PKGFILES_CSWoldaprt += $(sysconfdir)/ldap.conf PKGFILES_CSWoldaprt += $(mandir)/man5/ldap.conf.5 -INITSMF = /etc/opt/csw/init.d/cswopenldap +# gives error: init file wrong location??? +#INITSMF = /etc/opt/csw/init.d/cswopenldap # There are plenty of cross-references. Ignore for now, but should be # investigated later. 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 Apr 24 19:37:29 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 24 Apr 2010 17:37:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[9752] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 9752 http://gar.svn.sourceforge.net/gar/?rev=9752&view=rev Author: bdwalton Date: 2010-04-24 17:37:28 +0000 (Sat, 24 Apr 2010) Log Message: ----------- git: 1.7.1 just hit the streets. Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-04-24 10:47:17 UTC (rev 9751) +++ csw/mgar/pkg/git/trunk/Makefile 2010-04-24 17:37:28 UTC (rev 9752) @@ -1,6 +1,6 @@ GARNAME = git GARVERSION = 1.7.1 -PATCHLEVEL = rc1 +# PATCHLEVEL = rc1 CATEGORIES = devel VENDOR_URL = http://git-scm.org/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Apr 24 22:18:10 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 24 Apr 2010 20:18:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[9753] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 9753 http://gar.svn.sourceforge.net/gar/?rev=9753&view=rev Author: bdwalton Date: 2010-04-24 20:18:10 +0000 (Sat, 24 Apr 2010) Log Message: ----------- git: add some checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-04-24 17:37:28 UTC (rev 9752) +++ csw/mgar/pkg/git/trunk/Makefile 2010-04-24 20:18:10 UTC (rev 9753) @@ -46,7 +46,7 @@ RUNTIME_DEP_PKGS_CSWgitcvs = CSWgit CSWcvs CSWcvsps -RUNTIME_DEP_PKGS_CSWgitemacs = CSWgit CSWemacs +RUNTIME_DEP_PKGS_CSWgitemacs = CSWgit CSWemacscommon RUNTIME_DEP_PKGS_CSWgitdoc = CSWgit @@ -129,6 +129,31 @@ ETCSERVICES = /opt/csw/etc/pkg/CSWgit/services +CHECKPKG_OVERRIDES_CSWgitcompletion += surplus-dependency|CSWbash +CHECKPKG_OVERRIDES_CSWgitcompletion += surplus-dependency|CSWbashcmplt +CHECKPKG_OVERRIDES_CSWgitcompletion += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgitdoc += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgitdevel += discouraged-path-in-pkgmap|/opt/csw/lib/git/libgit.a +CHECKPKG_OVERRIDES_CSWgitdevel += discouraged-path-in-pkgmap|/opt/csw/lib/git/libxdiff.a +CHECKPKG_OVERRIDES_CSWgitdevel += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpmerror +CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWbash +CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWosshclient +CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWrsync +CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWless +CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpmnetsmtpssl +CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpmtermreadkey +CHECKPKG_OVERRIDES_CSWgitgui += surplus-dependency|CSWtk +CHECKPKG_OVERRIDES_CSWgitgui += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgitemacs += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgitcvs += surplus-dependency|CSWcvsps +CHECKPKG_OVERRIDES_CSWgitcvs += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgitcvs += surplus-dependency|CSWcvs +CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWtk +CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgitsvn += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgitsvn += surplus-dependency|CSWpmsvn + include gar/category.mk # for tail -n and to override things like, etc with the gnu counterparts 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 Apr 25 09:01:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Apr 2010 07:01:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9754] csw/mgar/pkg/cups/trunk Message-ID: Revision: 9754 http://gar.svn.sourceforge.net/gar/?rev=9754&view=rev Author: wahwah Date: 2010-04-25 07:01:57 +0000 (Sun, 25 Apr 2010) Log Message: ----------- cups: Version 1.4.3 builds, but there are still problems: (1) rpath, (2) init file outside sysconfdir Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/cups/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cups/trunk/files/CFLAGS-leaking-to-C++-compiler.patch Removed Paths: ------------- csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2010-04-24 20:18:10 UTC (rev 9753) +++ csw/mgar/pkg/cups/trunk/Makefile 2010-04-25 07:01:57 UTC (rev 9754) @@ -3,7 +3,7 @@ # $Id$ GARNAME = cups -GARVERSION = 1.4.2 +GARVERSION = 1.4.3 CATEGORIES = net define BLURB @@ -52,9 +52,9 @@ PATCHFILES = 0001-cswcups-for-service-name.patch PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch PATCHFILES += 0003-Reference-counting-for-printers-only.patch -PATCHFILES += 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch +PATCHFILES += CFLAGS-leaking-to-C++-compiler.patch BUILD_DEP_PKGS = CSWggettext BUILD_DEP_PKGS += CSWjpeg @@ -94,7 +94,7 @@ RUNTIME_DEP_PKGS_CSWlibcups += CSWpng RUNTIME_DEP_PKGS_CSWlibcups += CSWtiff RUNTIME_DEP_PKGS_CSWlibcups += CSWzlib -RUNTIME_DEP_PKGS_CSWcupsdev += CSWcupsd +RUNTIME_DEP_PKGS_CSWcupsdev += CSWlibcups PKGFILES_CSWlibcups = $(libdir)/libcups.* @@ -106,7 +106,7 @@ PKGFILES_CSWcupsdev += $(bindir)/cups-config PKGFILES_CSWcupsdev += $(datadir)/cups/ppdc.* PKGFILES_CSWcupsdev += $(datadir)/cups/drv.* -PKGFILES_CSWcupsd = $(sysconfdir)/init\.d/.* +PKGFILES_CSWcupsd += $(prefix)/etc/init\.d/.* PKGFILES_CSWcupsd += $(sysconfdir)/rc.* PKGFILES_CSWcupsd += $(sysconfdir)/cups/cupsd.* PKGFILES_CSWcupsd += $(sysconfdir)/cups/interfaces.* @@ -162,7 +162,7 @@ # http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html SAMPLECONF_CSWcupsd = $(sysconfdir)/cups/cupsd\.conf\.CSW SAMPLECONF_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW -INITSMF = $(sysconfdir)/init\.d/cswcups +INITSMF = $(prefix)/etc/init\.d/cswcups LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib @@ -203,10 +203,22 @@ OPTIM = $(OPTIM_$(GARFLAVOR)) export OPTIM +INITDIR=/opt/csw/etc +export INITDIR + LICENSE = LICENSE.txt +CHECKPKG_OVERRIDES_CSWcupsdev += surplus-dependency|CSWlibcups +CHECKPKG_OVERRIDES_CSWcups += surplus-dependency|CSWcupsclient +CHECKPKG_OVERRIDES_CSWcups += surplus-dependency|CSWcupsd + include gar/category.mk +pre-configure-modulated: + # This command will fail, but it's okay, it's enough to get the job done. + (cd $(WORKSRC); autoreconf || true) + @$(MAKECOOKIE) + post-install-modulated: (cd $(DESTDIR)$(sysconfdir)/cups; \ echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \ Modified: csw/mgar/pkg/cups/trunk/checksums =================================================================== --- csw/mgar/pkg/cups/trunk/checksums 2010-04-24 20:18:10 UTC (rev 9753) +++ csw/mgar/pkg/cups/trunk/checksums 2010-04-25 07:01:57 UTC (rev 9754) @@ -1,11 +1,11 @@ 1e5e54a2b503cfdeeda1b683bcccab83 0001-cswcups-for-service-name.patch 0da4ea6bf72d61adfc4316a738b90ab5 0002-Adding-the-refcount-member-to-mime_type_t.patch a80b8543633e2f9b3b1e531ac2289306 0003-Reference-counting-for-printers-only.patch -bbf0295c76cd06b5311ac3a3467fd431 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch 44ff410e237d6f4f9f0fe650ba2c7fa0 0007-Solaris-zone-support-in-init-script.patch +e5a145b36404974a689ac694f679d1e1 CFLAGS-leaking-to-C++-compiler.patch cf6a3fe902545aac1ab2303e41c08a3e CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove cf6a3fe902545aac1ab2303e41c08a3e CSWcupsd.preinstall 4e6b68d829be4e88afd27ac4897957f4 client.conf.CSW -d95e2d588e3d36e563027a963b117b1b cups-1.4.2-source.tar.bz2 +e70b1c3f60143d7310c1d74c111a21ab cups-1.4.3-source.tar.bz2 Deleted: csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch =================================================================== --- csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 2010-04-24 20:18:10 UTC (rev 9753) +++ csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 2010-04-25 07:01:57 UTC (rev 9754) @@ -1,42 +0,0 @@ -From 77851ae023d84a70379d8897ca5b2e5cfcfebeba Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Wed, 21 Oct 2009 12:40:39 +0200 -Subject: [PATCH] Mapping gnutls_record_recv return error codes to errno - ---- - cups/http.c | 19 ++++++++++++++++++- - 1 files changed, 18 insertions(+), 1 deletions(-) - -diff --git a/cups/http.c b/cups/http.c -index 840e3fc..e255375 100644 ---- a/cups/http.c -+++ b/cups/http.c -@@ -2719,7 +2719,24 @@ http_read_ssl(http_t *http, /* I - Connection to server */ - return (SSL_read((SSL *)(http->tls), buf, len)); - - # elif defined(HAVE_GNUTLS) -- return (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); -+ int result; -+ result = (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len)); -+ if (result < 0 && !errno) { -+ switch (result) -+ { -+ case GNUTLS_E_INTERRUPTED : -+ errno = EINTR; -+ break; -+ case GNUTLS_E_AGAIN : -+ errno = EAGAIN; -+ break; -+ default : -+ errno = EPIPE; -+ break; -+ } -+ result = -1; -+ } -+ return result; - - # elif defined(HAVE_CDSASSL) - int result; /* Return value */ --- -1.6.5 - Added: csw/mgar/pkg/cups/trunk/files/CFLAGS-leaking-to-C++-compiler.patch =================================================================== --- csw/mgar/pkg/cups/trunk/files/CFLAGS-leaking-to-C++-compiler.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/CFLAGS-leaking-to-C++-compiler.patch 2010-04-25 07:01:57 UTC (rev 9754) @@ -0,0 +1,11 @@ +--- cups-1.4.3/config-scripts/cups-gssapi.m4.orig 2010-04-24 14:27:26.897008812 +0200 ++++ cups-1.4.3/config-scripts/cups-gssapi.m4 2010-04-24 14:27:53.269633434 +0200 +@@ -35,7 +35,7 @@ + AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available]) + CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS" + CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS" +- LIBGSSAPI="-lgss `$KRB5CONFIG --libs`") ++ LIBGSSAPI="-lgss `CFLAGS= $KRB5CONFIG --libs`") + ;; + *) + # Other platforms just ask for GSSAPI This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Apr 25 09:12:50 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 25 Apr 2010 07:12:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9755] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 9755 http://gar.svn.sourceforge.net/gar/?rev=9755&view=rev Author: rthurner Date: 2010-04-25 07:12:50 +0000 (Sun, 25 Apr 2010) Log Message: ----------- openldap - chkpkg adjustments Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-04-25 07:01:57 UTC (rev 9754) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-04-25 07:12:50 UTC (rev 9755) @@ -116,13 +116,6 @@ # gives error: init file wrong location??? #INITSMF = /etc/opt/csw/init.d/cswopenldap -# There are plenty of cross-references. Ignore for now, but should be -# investigated later. -CHECKPKG_OVERRIDES = symbol-not-found -CHECKPKG_OVERRIDES_CSWoldapdevel = symbol-not-found -# The devel package depends on rt instead of the full package, that is ok. -CHECKPKG_OVERRIDES_CSWoldapdevel += missing-dependency|CSWoldap - include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) 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 Apr 25 09:48:25 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Apr 2010 07:48:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[9756] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 9756 http://gar.svn.sourceforge.net/gar/?rev=9756&view=rev Author: wahwah Date: 2010-04-25 07:48:25 +0000 (Sun, 25 Apr 2010) Log Message: ----------- cups: Moved the init script to /opt/csw/etc. Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2010-04-25 07:12:50 UTC (rev 9755) +++ csw/mgar/pkg/cups/trunk/Makefile 2010-04-25 07:48:25 UTC (rev 9756) @@ -171,6 +171,7 @@ CONFIGURE_ARGS += --localedir=$(datadir)/locale CONFIGURE_ARGS += --with-rcdir=$(sysconfdir) CONFIGURE_ARGS += --with-icondir=$(datadir)/icons +CONFIGURE_ARGS += --with-rcdir=/opt/csw/etc CONFIGURE_ARGS_DBG = --enable-debug CONFIGURE_ARGS_DBG += --enable-debug-guards @@ -203,9 +204,6 @@ OPTIM = $(OPTIM_$(GARFLAVOR)) export OPTIM -INITDIR=/opt/csw/etc -export INITDIR - LICENSE = LICENSE.txt CHECKPKG_OVERRIDES_CSWcupsdev += surplus-dependency|CSWlibcups This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Apr 25 10:02:50 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 25 Apr 2010 08:02:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[9757] csw/mgar/pkg/spamassassin/trunk Message-ID: Revision: 9757 http://gar.svn.sourceforge.net/gar/?rev=9757&view=rev Author: bonivart Date: 2010-04-25 08:02:50 +0000 (Sun, 25 Apr 2010) Log Message: ----------- spamassassin: fix init file (#4406) Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2010-04-25 07:48:25 UTC (rev 9756) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2010-04-25 08:02:50 UTC (rev 9757) @@ -41,6 +41,26 @@ #TEST_SCRIPTS = INSTALL_SCRIPTS = custom +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmaildkim +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmiosocketssl +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmipcountry +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmnetdns +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWrazor +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmdbi +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmnetaddrip +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmlibwww +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmimebase64 +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmuri +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmailspf +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmhtmlparser +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmldap +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmiosocketinet6 +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmailtools +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWzlib +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWgnupg +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWosslrt +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmiozlib + include gar/category.mk WORKSRC = $(WORKDIR)/$(SPKG_NAME)-$(GARVERSION) Modified: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd 2010-04-25 07:48:25 UTC (rev 9756) +++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.cswspamd 2010-04-25 08:02:50 UTC (rev 9757) @@ -21,7 +21,7 @@ case "$1" in start) if [ -x /opt/csw/bin/spamd ]; then - if [ -d /var/opt/csw/spamassassin/3.003000 ]; then + if [ -d /var/opt/csw/spamassassin/3.003001 ]; then echo "Starting $PROG." /opt/csw/bin/spamd -d $OPTIONS else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Apr 25 10:38:39 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 25 Apr 2010 08:38:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9758] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 9758 http://gar.svn.sourceforge.net/gar/?rev=9758&view=rev Author: rthurner Date: 2010-04-25 08:38:39 +0000 (Sun, 25 Apr 2010) Log Message: ----------- openldap - adjust for checkpkg errors Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-04-25 08:02:50 UTC (rev 9757) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-04-25 08:38:39 UTC (rev 9758) @@ -43,7 +43,7 @@ SPKG_DESC_CSWoldapdevel = OpenLDAP development support SPKG_DESC_CSWoldaprt = OpenLDAP runtime libraries -RUNTIME_DEP_PKGS_CSWoldap = CSWbdb CSWlibnet CSWlibtoolrt +RUNTIME_DEP_PKGS_CSWoldap = CSWbdb CSWbdb48 CSWlibnet CSWlibtoolrt RUNTIME_DEP_PKGS_CSWoldap += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc RUNTIME_DEP_PKGS_CSWoldap += CSWlibicu CSWperl RUNTIME_DEP_PKGS_CSWoldapclient = CSWlibnet CSWosslrt CSWsasl @@ -114,8 +114,12 @@ PKGFILES_CSWoldaprt += $(mandir)/man5/ldap.conf.5 # gives error: init file wrong location??? -#INITSMF = /etc/opt/csw/init.d/cswopenldap +INITSMF = /opt/csw/etc/init.d/cswopenldap +#CHECKPKG_OVERRIDES_CSWoldap += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/cswopenldap|class=none +#CHECKPKG_OVERRIDES_CSWoldap += init-file-wrong-location|/etc/opt/csw/init.d/cswopenldap +ARCHALL_CSWoldapdevel = 1 + include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Apr 25 11:18:32 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 25 Apr 2010 09:18:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9759] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 9759 http://gar.svn.sourceforge.net/gar/?rev=9759&view=rev Author: rthurner Date: 2010-04-25 09:18:31 +0000 (Sun, 25 Apr 2010) Log Message: ----------- openldap - smf file into /opt/csw Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-04-25 08:38:39 UTC (rev 9758) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-04-25 09:18:31 UTC (rev 9759) @@ -127,6 +127,6 @@ post-merge: ginstall -D $(DOWNLOADDIR)/cswopenldap \ - $(PKGROOT)/etc/opt/csw/init.d/cswopenldap + $(PKGROOT)/opt/csw/etc/init.d/cswopenldap $(foreach F,$(EXTRA_DOCS),ginstall -D $(DOWNLOADDIR)/$F $(PKGROOT)$(docdir)/$(GARNAME)/$F;) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 25 12:37:59 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Apr 2010 10:37:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[9760] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 9760 http://gar.svn.sourceforge.net/gar/?rev=9760&view=rev Author: wahwah Date: 2010-04-25 10:37:59 +0000 (Sun, 25 Apr 2010) Log Message: ----------- Adding overrides for problems caused by krb5-config. Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2010-04-25 09:18:31 UTC (rev 9759) +++ csw/mgar/pkg/cups/trunk/Makefile 2010-04-25 10:37:59 UTC (rev 9760) @@ -210,6 +210,11 @@ CHECKPKG_OVERRIDES_CSWcups += surplus-dependency|CSWcupsclient CHECKPKG_OVERRIDES_CSWcups += surplus-dependency|CSWcupsd +# The following overrides are necessary because of a bug in krb5-config, please +# see bug http://www.opencsw.org/bugtrack/view.php?id=4384 +CHECKPKG_OVERRIDES_CSWcupsd += bad-rpath-entry|/opt/csw/lib/|opt/csw/sbin/cupsd +CHECKPKG_OVERRIDES_CSWlibcups += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libcups.so.2 + include gar/category.mk pre-configure-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 25 12:50:15 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Apr 2010 10:50:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9761] csw/mgar/pkg/cups/trunk Message-ID: Revision: 9761 http://gar.svn.sourceforge.net/gar/?rev=9761&view=rev Author: wahwah Date: 2010-04-25 10:50:15 +0000 (Sun, 25 Apr 2010) Log Message: ----------- cups: A cleaner workaround for the CFLAGS problem in krb5-config, adding CFLAGS and CXXFLAGS to linker calls. Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cups/trunk/files/0008-Adding-CFLAGS-and-CXXFLAGS-to-linker-calls.patch csw/mgar/pkg/cups/trunk/files/0009-Add-workaround-for-krb5-config-outputting-CFLAGS.patch Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2010-04-25 10:37:59 UTC (rev 9760) +++ csw/mgar/pkg/cups/trunk/Makefile 2010-04-25 10:50:15 UTC (rev 9761) @@ -55,6 +55,8 @@ PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch PATCHFILES += CFLAGS-leaking-to-C++-compiler.patch +PATCHFILES += 0008-Adding-CFLAGS-and-CXXFLAGS-to-linker-calls.patch +PATCHFILES += 0009-Add-workaround-for-krb5-config-outputting-CFLAGS.patch BUILD_DEP_PKGS = CSWggettext BUILD_DEP_PKGS += CSWjpeg @@ -217,11 +219,6 @@ include gar/category.mk -pre-configure-modulated: - # This command will fail, but it's okay, it's enough to get the job done. - (cd $(WORKSRC); autoreconf || true) - @$(MAKECOOKIE) - post-install-modulated: (cd $(DESTDIR)$(sysconfdir)/cups; \ echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \ Added: csw/mgar/pkg/cups/trunk/files/0008-Adding-CFLAGS-and-CXXFLAGS-to-linker-calls.patch =================================================================== --- csw/mgar/pkg/cups/trunk/files/0008-Adding-CFLAGS-and-CXXFLAGS-to-linker-calls.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0008-Adding-CFLAGS-and-CXXFLAGS-to-linker-calls.patch 2010-04-25 10:50:15 UTC (rev 9761) @@ -0,0 +1,95 @@ +From 31ab34144321ce16de1b72b2eba5d346561ca9ab Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 25 Apr 2010 12:39:37 +0200 +Subject: [PATCH 8/9] Adding CFLAGS and CXXFLAGS to linker calls. + +Fixes a problem in which the -xnorunpath and -norunpath options are not +passed to the linker, causing spurious RPATH elements to be added. +--- + ppdc/Makefile | 12 ++++++------ + scheduler/Makefile | 4 ++-- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/ppdc/Makefile b/ppdc/Makefile +index ee0f0e2..a9f238f 100644 +--- a/ppdc/Makefile ++++ b/ppdc/Makefile +@@ -253,7 +253,7 @@ genstrings: genstrings.o libcupsppdc.a ../cups/libcups.a \ + + ppdc: ppdc.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS) + echo Linking $@... +- $(CXX) $(LDFLAGS) -o $@ ppdc.o -L. -lcupsppdc $(LIBS) ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ ppdc.o -L. -lcupsppdc $(LIBS) + + + ppdc-static: ppdc.o libcupsppdc.a ../cups/libcups.a foo.drv foo-fr.po +@@ -272,7 +272,7 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/libcups.a foo.drv foo-fr.po + + ppdhtml: ppdhtml.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS) + echo Linking $@... +- $(CXX) $(LDFLAGS) -o $@ ppdhtml.o -L. -lcupsppdc $(LIBS) ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ ppdhtml.o -L. -lcupsppdc $(LIBS) + + + # +@@ -281,7 +281,7 @@ ppdhtml: ppdhtml.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS) + + ppdi: ppdi.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS) + echo Linking $@... +- $(CXX) $(LDFLAGS) -o $@ ppdi.o -L. -lcupsppdc $(LIBS) ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ ppdi.o -L. -lcupsppdc $(LIBS) + + + ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/libcups.a +@@ -308,7 +308,7 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/libcups.a + + ppdmerge: ppdmerge.o ../cups/$(LIBCUPS) + echo Linking $@... +- $(CXX) $(LDFLAGS) -o $@ ppdmerge.o $(LIBS) ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ ppdmerge.o $(LIBS) + + + # +@@ -317,7 +317,7 @@ ppdmerge: ppdmerge.o ../cups/$(LIBCUPS) + + ppdpo: ppdpo.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS) + echo Linking $@... +- $(CXX) $(LDFLAGS) -o $@ ppdpo.o -L. -lcupsppdc $(LIBS) ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ ppdpo.o -L. -lcupsppdc $(LIBS) + + + # +@@ -337,7 +337,7 @@ testcatalog: testcatalog.o libcupsppdc.a ../cups/libcups.a + + libcupsppdc.so.1 libcupsppdc.sl.1: $(LIBOBJS) ../cups/$(LIBCUPS) + echo Linking $@... +- $(DSOXX) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LINKCUPS) ++ $(DSOXX) $(CXXFLAGS) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LINKCUPS) + $(RM) `basename $@ .1` + $(LN) $@ `basename $@ .1` + +diff --git a/scheduler/Makefile b/scheduler/Makefile +index bcf1ff0..06b6919 100644 +--- a/scheduler/Makefile ++++ b/scheduler/Makefile +@@ -296,7 +296,7 @@ framedhelp: + + cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cups/$(LIBCUPS) + echo Linking $@... +- $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \ ++ $(CC) $(CFLAGS) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \ + $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ + $(LIBPAPER) $(LIBMALLOC) $(CUPSDLIBS) $(DNSSDLIBS) $(LIBS) \ + $(LIBGSSAPI) $(LIBWRAP) +@@ -336,7 +336,7 @@ cups-deviced: cups-deviced.o util.o ../cups/$(LIBCUPS) + + cups-driverd: cups-driverd.o util.o ../cups/$(LIBCUPS) ../ppdc/$(LIBCUPSPPDC) + echo Linking $@... +- $(CXX) $(LDFLAGS) -o cups-driverd cups-driverd.o util.o \ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o cups-driverd cups-driverd.o util.o \ + -L../ppdc -lcupsppdc $(LIBS) + + +-- +1.7.0 + Added: csw/mgar/pkg/cups/trunk/files/0009-Add-workaround-for-krb5-config-outputting-CFLAGS.patch =================================================================== --- csw/mgar/pkg/cups/trunk/files/0009-Add-workaround-for-krb5-config-outputting-CFLAGS.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0009-Add-workaround-for-krb5-config-outputting-CFLAGS.patch 2010-04-25 10:50:15 UTC (rev 9761) @@ -0,0 +1,26 @@ +From b1111f35ad829d2cbdbf9e1ba6ecfa7344a179bc Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 25 Apr 2010 12:45:00 +0200 +Subject: [PATCH 9/9] Add workaround for krb5-config outputting CFLAGS + +...in the configure script +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index fab858f..ec6b8d2 100755 +--- a/configure ++++ b/configure +@@ -14501,7 +14501,7 @@ _ACEOF + + CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS" + CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS" +- LIBGSSAPI="-lgss `$KRB5CONFIG --libs`" ++ LIBGSSAPI="-lgss `CFLAGS= $KRB5CONFIG --libs`" + fi + + ;; +-- +1.7.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Apr 25 12:52:07 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Apr 2010 10:52:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[9762] csw/mgar/pkg/cups/trunk/checksums Message-ID: Revision: 9762 http://gar.svn.sourceforge.net/gar/?rev=9762&view=rev Author: wahwah Date: 2010-04-25 10:52:07 +0000 (Sun, 25 Apr 2010) Log Message: ----------- cups: checksums for new patches. Modified Paths: -------------- csw/mgar/pkg/cups/trunk/checksums Modified: csw/mgar/pkg/cups/trunk/checksums =================================================================== --- csw/mgar/pkg/cups/trunk/checksums 2010-04-25 10:50:15 UTC (rev 9761) +++ csw/mgar/pkg/cups/trunk/checksums 2010-04-25 10:52:07 UTC (rev 9762) @@ -3,6 +3,8 @@ a80b8543633e2f9b3b1e531ac2289306 0003-Reference-counting-for-printers-only.patch 0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch 44ff410e237d6f4f9f0fe650ba2c7fa0 0007-Solaris-zone-support-in-init-script.patch +9714ccb8b117c3eb57c0b4556480905f 0008-Adding-CFLAGS-and-CXXFLAGS-to-linker-calls.patch +c01746cdcc93635abf86df2179658f2e 0009-Add-workaround-for-krb5-config-outputting-CFLAGS.patch e5a145b36404974a689ac694f679d1e1 CFLAGS-leaking-to-C++-compiler.patch cf6a3fe902545aac1ab2303e41c08a3e CSWcupsclient.preinstall ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Apr 25 14:48:02 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 25 Apr 2010 12:48:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[9763] csw/mgar/pkg/sqlite3/trunk/Makefile Message-ID: Revision: 9763 http://gar.svn.sourceforge.net/gar/?rev=9763&view=rev Author: rthurner Date: 2010-04-25 12:48:02 +0000 (Sun, 25 Apr 2010) Log Message: ----------- sqlite3 - upgrade to sqlite-3.6.23.1 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2010-04-25 10:52:07 UTC (rev 9762) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2010-04-25 12:48:02 UTC (rev 9763) @@ -1,5 +1,5 @@ GARNAME = sqlite3 -GARVERSION = 3.6.23 +GARVERSION = 3.6.23.1 CATEGORIES = lib DESCRIPTION = An embeddable SQL engine in a C library This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Apr 25 14:49:01 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 25 Apr 2010 12:49:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[9764] csw/mgar/pkg/sqlite3/trunk/checksums Message-ID: Revision: 9764 http://gar.svn.sourceforge.net/gar/?rev=9764&view=rev Author: rthurner Date: 2010-04-25 12:49:00 +0000 (Sun, 25 Apr 2010) Log Message: ----------- sqlite3 - upgrade to sqlite-3.6.23.1 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/checksums Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2010-04-25 12:48:02 UTC (rev 9763) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2010-04-25 12:49:00 UTC (rev 9764) @@ -1,3 +1,3 @@ 80d638505872be7ffa238d43f0e268b2 gar-base.diff 1a2be927ceacfa534501b9f4675bce83 shell.c.diff -5ab08907643eda2aa8bf4e72e7eb31e9 sqlite-3.6.23.tar.gz +d99f1b31da0eb33271464bee15cec701 sqlite-3.6.23.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Apr 25 15:58:57 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 25 Apr 2010 13:58:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[9765] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 9765 http://gar.svn.sourceforge.net/gar/?rev=9765&view=rev Author: rthurner Date: 2010-04-25 13:58:56 +0000 (Sun, 25 Apr 2010) Log Message: ----------- openldap - checkpkg still complains for i386 Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-04-25 12:49:00 UTC (rev 9764) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-04-25 13:58:56 UTC (rev 9765) @@ -117,7 +117,11 @@ INITSMF = /opt/csw/etc/init.d/cswopenldap #CHECKPKG_OVERRIDES_CSWoldap += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/cswopenldap|class=none #CHECKPKG_OVERRIDES_CSWoldap += init-file-wrong-location|/etc/opt/csw/init.d/cswopenldap +CHECKPKG_OVERRIDES_CSWoldap += deprecated-library|opt/csw/libexec/amd64/openldap/back_perl-2.4.so.2.5.4|Deprecated|Berkeley|DB|location|/opt/csw/lib/libdb-4.7.so +CHECKPKG_OVERRIDES_CSWoldap += deprecated-library|opt/csw/libexec/openldap/back_perl-2.4.so.2.5.4|Deprecated|Berkeley|DB|location|/opt/csw/lib/libdb-4.7.so +CHECKPKG_OVERRIDES_CSWoldap += soname-not-found|libm.so.2 + ARCHALL_CSWoldapdevel = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Apr 25 18:14:34 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 25 Apr 2010 16:14:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[9766] csw/mgar/pkg/sqlite3/trunk/Makefile Message-ID: Revision: 9766 http://gar.svn.sourceforge.net/gar/?rev=9766&view=rev Author: rthurner Date: 2010-04-25 16:14:33 +0000 (Sun, 25 Apr 2010) Log Message: ----------- sqlite upgrade to 2.6.23.1 ... but still includes some not understandable checkpkg exclusions Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2010-04-25 13:58:56 UTC (rev 9765) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2010-04-25 16:14:33 UTC (rev 9766) @@ -35,8 +35,13 @@ RUNTIME_DEP_PKGS_CSWsqlite3 = CSWsqlite3rt RUNTIME_DEP_PKGS_CSWsqlite3 += CSWreadline RUNTIME_DEP_PKGS_CSWsqlite3 += CSWncurses -RUNTIME_DEP_PKGS_CSWsqlite3devel = CSWsqlite3 +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 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 Apr 25 19:17:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 25 Apr 2010 17:17:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[9767] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 9767 http://gar.svn.sourceforge.net/gar/?rev=9767&view=rev Author: wahwah Date: 2010-04-25 17:17:13 +0000 (Sun, 25 Apr 2010) Log Message: ----------- mGAR v2, checkpkg: Adding messages to help Rupert understand the errors. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-04-25 16:14:33 UTC (rev 9766) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-04-25 17:17:13 UTC (rev 9767) @@ -309,6 +309,10 @@ license_path = LICENSE_TMPL % catalogname pkgmap_paths = [x["path"] for x in pkgmap] if license_path not in pkgmap_paths: + messenger.Message("The license file needs to be placed " + "at %s. Also see " + "http://sourceforge.net/apps/trac/gar/wiki/CopyRight" + % license_path) error_mgr.ReportError( "license-missing", license_path, "See http://sourceforge.net/apps/trac/gar/wiki/CopyRight") @@ -566,6 +570,13 @@ def CheckBadPaths(pkg_data, error_mgr, logger, messenger): for regex in pkg_data["bad_paths"]: for file_name in pkg_data["bad_paths"][regex]: + messenger.Message("File %s contains bad content: %s. " + "It's usually build-machine data. " + "If it's a legacy file you can't modify, " + "add an override " + "for this file. After doing so, run checkpkg " + "again, you'll need to add an override for " + "the override file too." % (file_name, regex)) error_mgr.ReportError("file-with-bad-content", "%s %s" % (regex, file_name)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Apr 25 23:21:48 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 25 Apr 2010 21:21:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9768] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 9768 http://gar.svn.sourceforge.net/gar/?rev=9768&view=rev Author: rthurner Date: 2010-04-25 21:21:47 +0000 (Sun, 25 Apr 2010) Log Message: ----------- openldap - remove now unnecessary comments in the makefile Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2010-04-25 17:17:13 UTC (rev 9767) +++ csw/mgar/pkg/openldap/trunk/Makefile 2010-04-25 21:21:47 UTC (rev 9768) @@ -113,15 +113,12 @@ PKGFILES_CSWoldaprt += $(sysconfdir)/ldap.conf PKGFILES_CSWoldaprt += $(mandir)/man5/ldap.conf.5 -# gives error: init file wrong location??? INITSMF = /opt/csw/etc/init.d/cswopenldap -#CHECKPKG_OVERRIDES_CSWoldap += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/cswopenldap|class=none -#CHECKPKG_OVERRIDES_CSWoldap += init-file-wrong-location|/etc/opt/csw/init.d/cswopenldap + CHECKPKG_OVERRIDES_CSWoldap += deprecated-library|opt/csw/libexec/amd64/openldap/back_perl-2.4.so.2.5.4|Deprecated|Berkeley|DB|location|/opt/csw/lib/libdb-4.7.so CHECKPKG_OVERRIDES_CSWoldap += deprecated-library|opt/csw/libexec/openldap/back_perl-2.4.so.2.5.4|Deprecated|Berkeley|DB|location|/opt/csw/lib/libdb-4.7.so CHECKPKG_OVERRIDES_CSWoldap += soname-not-found|libm.so.2 - ARCHALL_CSWoldapdevel = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Apr 26 13:14:57 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 26 Apr 2010 11:14:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[9769] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 9769 http://gar.svn.sourceforge.net/gar/?rev=9769&view=rev Author: chninkel Date: 2010-04-26 11:14:57 +0000 (Mon, 26 Apr 2010) Log Message: ----------- openssl1: updated to 1.0.0 Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/checksums csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2010-04-25 21:21:47 UTC (rev 9768) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2010-04-26 11:14:57 UTC (rev 9769) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = openssl -GARVERSION = 1.0.0-beta3 +GARVERSION = 1.0.0 CATEGORIES = lib DESCRIPTION = The Open Source toolkit for SSL and TLS Modified: csw/mgar/pkg/openssl1/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl1/trunk/checksums 2010-04-25 21:21:47 UTC (rev 9768) +++ csw/mgar/pkg/openssl1/trunk/checksums 2010-04-26 11:14:57 UTC (rev 9769) @@ -3,5 +3,5 @@ c9de908daad1a31fca20329cb043ad3c CSWossl1rt.preinstall b78faa440d6f6a2a07663de331678648 README.CSW 904ceefa66b6b7b7e93ae0e9bc58bac8 changelog.CSW -a15d8b6511963d2e67448a88b0667fce more_configure_targets.patch -cf5a32016bb9da0b9578099727bf15c9 openssl-1.0.0-beta3.tar.gz +a8f10e3b109567d6caedf5113411ff4b more_configure_targets.patch +89eaa86e25b2845f920ec00ae4c864ed openssl-1.0.0.tar.gz Modified: csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch 2010-04-25 21:21:47 UTC (rev 9768) +++ csw/mgar/pkg/openssl1/trunk/files/more_configure_targets.patch 2010-04-26 11:14:57 UTC (rev 9769) @@ -5,7 +5,7 @@ #### Solaris x86 with Sun C setups "solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-pentium_pro-cc","cc:-fast -xarch=pentium_pro -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64", + "solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64", #### SPARC Solaris with GNU C setups @@ -232,6 +233,7 @@ 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 Apr 26 16:16:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 26 Apr 2010 14:16:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[9770] csw/mgar/pkg/mktemp/tags/mktemp-1.6, REV=2008.12.02/ Message-ID: Revision: 9770 http://gar.svn.sourceforge.net/gar/?rev=9770&view=rev Author: dmichelsen Date: 2010-04-26 14:16:53 +0000 (Mon, 26 Apr 2010) Log Message: ----------- mktemp: Tag 1.6,REV=2008.12.02 Added Paths: ----------- csw/mgar/pkg/mktemp/tags/mktemp-1.6,REV=2008.12.02/ 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 Apr 26 16:27:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 26 Apr 2010 14:27:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[9771] csw/mgar/pkg/mktemp/trunk Message-ID: Revision: 9771 http://gar.svn.sourceforge.net/gar/?rev=9771&view=rev Author: dmichelsen Date: 2010-04-26 14:27:52 +0000 (Mon, 26 Apr 2010) Log Message: ----------- mktemp: Update to 1.7 Modified Paths: -------------- csw/mgar/pkg/mktemp/trunk/Makefile csw/mgar/pkg/mktemp/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/mktemp/trunk/files/makefile-destdir.patch Modified: csw/mgar/pkg/mktemp/trunk/Makefile =================================================================== --- csw/mgar/pkg/mktemp/trunk/Makefile 2010-04-26 14:16:53 UTC (rev 9770) +++ csw/mgar/pkg/mktemp/trunk/Makefile 2010-04-26 14:27:52 UTC (rev 9771) @@ -1,5 +1,5 @@ GARNAME = mktemp -GARVERSION = 1.6 +GARVERSION = 1.7 CATEGORIES = utils DESCRIPTION = A small program to allow safe temporary file creation from shell scripts @@ -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 -PATCHFILES = makefile-destdir.patch +VENDOR_URL = http://www.mktemp.org/ CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/mktemp/trunk/checksums =================================================================== --- csw/mgar/pkg/mktemp/trunk/checksums 2010-04-26 14:16:53 UTC (rev 9770) +++ csw/mgar/pkg/mktemp/trunk/checksums 2010-04-26 14:27:52 UTC (rev 9771) @@ -1,2 +1 @@ -3e66f91f8a39c7dc0a67b158aeb9c2ac download/mktemp-1.6.tar.gz -9e53911c3dce0236badb46a801a834f6 download/makefile-destdir.patch +787bbed9fa2ee8e7645733c0e8e65172 mktemp-1.7.tar.gz Deleted: csw/mgar/pkg/mktemp/trunk/files/makefile-destdir.patch =================================================================== --- csw/mgar/pkg/mktemp/trunk/files/makefile-destdir.patch 2010-04-26 14:16:53 UTC (rev 9770) +++ csw/mgar/pkg/mktemp/trunk/files/makefile-destdir.patch 2010-04-26 14:27:52 UTC (rev 9771) @@ -1,25 +0,0 @@ -diff --speed-large-files --minimal -Nru mktemp-1.6.orig/Makefile.in mktemp-1.6/Makefile.in ---- mktemp-1.6.orig/Makefile.in 2008-08-17 17:38:34.000000000 +0200 -+++ mktemp-1.6/Makefile.in 2008-12-02 18:53:03.208788742 +0100 -@@ -65,13 +65,14 @@ - mantype = @MANTYPE@ - - # Where to install things... --prefix = @prefix@ --exec_prefix = @exec_prefix@ --bindir = @bindir@ --sbindir = @sbindir@ --sysconfdir = @sysconfdir@ --mandir = @mandir@ --datarootdir = @datarootdir@ -+prefix = $(DESTDIR)@prefix@ -+exec_prefix = $(DESTDIR)@exec_prefix@ -+bindir = $(DESTDIR)@bindir@ -+sbindir = $(DESTDIR)@sbindir@ -+sysconfdir = $(DESTDIR)@sysconfdir@ -+mandir = $(DESTDIR)@mandir@ -+datarootdir = $(DESTDIR)@datarootdir@ -+ - - #### End of system configuration section. #### - 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 Apr 26 19:00:43 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 26 Apr 2010 17:00:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[9772] csw/mgar/gar/v2/bin/analyze_module_results.py Message-ID: Revision: 9772 http://gar.svn.sourceforge.net/gar/?rev=9772&view=rev Author: wahwah Date: 2010-04-26 17:00:43 +0000 (Mon, 26 Apr 2010) Log Message: ----------- mGAR v2: checkpkg, five lines of text informing that checkpkg doesn't suggest the maintainer should add the overrdies. Modified Paths: -------------- csw/mgar/gar/v2/bin/analyze_module_results.py Modified: csw/mgar/gar/v2/bin/analyze_module_results.py =================================================================== --- csw/mgar/gar/v2/bin/analyze_module_results.py 2010-04-26 14:27:52 UTC (rev 9771) +++ csw/mgar/gar/v2/bin/analyze_module_results.py 2010-04-26 17:00:43 UTC (rev 9772) @@ -38,6 +38,11 @@ print "override them pasting the lines below to the GAR recipe." for tag in tags_after_overrides: print tag.ToGarSyntax() + print "Please note that checkpkg isn't suggesting you should " + print "use these overrides. It only informs what the overrides could " + print "look like. You need to understand what are the reported issues about" + print "and use your best judgement to decide whether to fix the underlying" + print "problems or override them." if unapplied_overrides: print "WARNING: Some overrides did not match any errors." print " They can be removed, as they don't take any effect anyway." 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 Apr 27 08:17:59 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 27 Apr 2010 06:17:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[9773] csw/mgar/pkg/hachoir-parser/trunk/Makefile Message-ID: Revision: 9773 http://gar.svn.sourceforge.net/gar/?rev=9773&view=rev Author: wahwah Date: 2010-04-27 06:17:59 +0000 (Tue, 27 Apr 2010) Log Message: ----------- hachoir_parser: Changing pkgname to include CSWpy-* Modified Paths: -------------- csw/mgar/pkg/hachoir-parser/trunk/Makefile Modified: csw/mgar/pkg/hachoir-parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/hachoir-parser/trunk/Makefile 2010-04-26 17:00:43 UTC (rev 9772) +++ csw/mgar/pkg/hachoir-parser/trunk/Makefile 2010-04-27 06:17:59 UTC (rev 9773) @@ -17,10 +17,12 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME = py_hachoir_parser +PACKAGES = CSWpy-hachoir-parser +INCOMPATIBLE_PKGS = CSWhachoir-parser ARCHALL = 1 RUNTIME_DEP_PKGS = CSWpy-hachoir-core -CHECKPKG_OVERRIDES_CSWhachoir-parser += surplus-dependency|CSWpy-hachoir-core +CHECKPKG_OVERRIDES_CSWpy-hachoir-parser += surplus-dependency|CSWpy-hachoir-core # To be able to release it together with CSWhachoir-core. -CHECKPKG_OVERRIDES_CSWhachoir-parser += unidentified-dependency|CSWpy-hachoir-core +CHECKPKG_OVERRIDES_CSWpy-hachoir-parser += unidentified-dependency|CSWpy-hachoir-core TEST_SCRIPTS = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 27 09:24:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Apr 2010 07:24:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9774] csw/mgar/pkg/cpan/Crypt-Blowfish/trunk Message-ID: Revision: 9774 http://gar.svn.sourceforge.net/gar/?rev=9774&view=rev Author: dmichelsen Date: 2010-04-27 07:24:00 +0000 (Tue, 27 Apr 2010) Log Message: ----------- cpan/Crypt-Blowfish: Update to 2.12 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/Makefile csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/files/CSWpmcryptblowfish.depend csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/files/CSWpmcryptblowfish.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-Blowfish/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/Crypt-Blowfish/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/Makefile 2010-04-27 06:17:59 UTC (rev 9773) +++ csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/Makefile 2010-04-27 07:24:00 UTC (rev 9774) @@ -1,5 +1,5 @@ GARNAME = Crypt-Blowfish -GARVERSION = 2.10 +GARVERSION = 2.12 CATEGORIES = cpan AUTHOR = DPARIS @@ -10,8 +10,9 @@ size to ensure the strongest encryption possible from this module. endef -DISTFILES += CSWpmcryptblowfish.gspec CSWpmcryptblowfish.depend +PACKAGES = CSWpmcryptblowfish +CATALOGNAME = pm_cryptblowfish -DEPENDS += cpan/Crypt-CBC +LICENSE = COPYRIGHT include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/checksums 2010-04-27 06:17:59 UTC (rev 9773) +++ csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/checksums 2010-04-27 07:24:00 UTC (rev 9774) @@ -1,3 +1 @@ -3910b196e103281ccda224126bf07ae5 download/CSWpmcryptblowfish.gspec -50db8d1191dd5adb32df93bd76446a63 download/CSWpmcryptblowfish.depend -15b53308df3b29a62a9f2f718aace19a download/Crypt-Blowfish-2.10.tar.gz +a0eca17addc8bdaf38c044c365a8800c Crypt-Blowfish-2.12.tar.gz Deleted: csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/files/CSWpmcryptblowfish.depend =================================================================== --- csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/files/CSWpmcryptblowfish.depend 2010-04-27 06:17:59 UTC (rev 9773) +++ csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/files/CSWpmcryptblowfish.depend 2010-04-27 07:24:00 UTC (rev 9774) @@ -1 +0,0 @@ -P CSWpmcryptcbc pm_cryptcbc - encrypt data with cipher block chaining mode Deleted: csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/files/CSWpmcryptblowfish.gspec =================================================================== --- csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/files/CSWpmcryptblowfish.gspec 2010-04-27 06:17:59 UTC (rev 9773) +++ csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/files/CSWpmcryptblowfish.gspec 2010-04-27 07:24:00 UTC (rev 9774) @@ -1,4 +0,0 @@ -%var bitname pm_cryptblowfish -%var pkgname CSWpmcryptblowfish -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT 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 Apr 27 09:32:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Apr 2010 07:32:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[9775] csw/mgar/pkg/cpan Message-ID: Revision: 9775 http://gar.svn.sourceforge.net/gar/?rev=9775&view=rev Author: dmichelsen Date: 2010-04-27 07:32:00 +0000 (Tue, 27 Apr 2010) Log Message: ----------- cpan/Crypt-CAST5: Update to 0.05 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-CAST5/trunk/Makefile csw/mgar/pkg/cpan/Crypt-CAST5/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Crypt-CAST5/ csw/mgar/pkg/cpan/Crypt-CAST5/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Crypt-CAST5/trunk/files/CSWpmcryptcast5pp.depend csw/mgar/pkg/cpan/Crypt-CAST5/trunk/files/CSWpmcryptcast5pp.gspec csw/mgar/pkg/cpan/Crypt-CAST5/trunk/files/CSWpmcryptcast5pp.prototype csw/mgar/pkg/cpan/Crypt-CAST5_PP/ Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-CAST5/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-CAST5/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/Crypt-CAST5/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-CAST5_PP/trunk/Makefile 2010-04-26 17:00:43 UTC (rev 9772) +++ csw/mgar/pkg/cpan/Crypt-CAST5/trunk/Makefile 2010-04-27 07:32:00 UTC (rev 9775) @@ -1,15 +1,17 @@ -GARNAME = Crypt-CAST5_PP -GARVERSION = 1.04 +GARNAME = Crypt-CAST5 +GARVERSION = 0.05 CATEGORIES = cpan AUTHOR = BOBMATH -DESCRIPTION = CAST5 block cipher in pure Perl +DESCRIPTION = CAST5 block cipher define BLURB - This module provides a pure Perl implementation of the CAST5 block cipher. CAST5 is also known as CAST-128. It is a product of the CAST design procedure developed by C. Adams and S. Tavares. endef -DISTFILES = $(call admfiles,CSWpmcryptcast5pp,depend prototype) +DISTFILES = COPYING +PACKAGES = CSWpmcryptcast5 +CATALOGNAME = pm_cryptcast5 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-CAST5/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-CAST5_PP/trunk/checksums 2010-04-26 17:00:43 UTC (rev 9772) +++ csw/mgar/pkg/cpan/Crypt-CAST5/trunk/checksums 2010-04-27 07:32:00 UTC (rev 9775) @@ -1,4 +1,2 @@ -0b6c8fbb4f37a215c319a1b36ad34bda download/CSWpmcryptcast5pp.gspec -6e0d583c86d7f74b43769810714242aa download/CSWpmcryptcast5pp.depend -281000ee2e389612546e5928856560e6 download/CSWpmcryptcast5pp.prototype -563d7ecad9193fe442cf1fe0b1da1a97 download/Crypt-CAST5_PP-1.04.tar.gz +e7d101fb3b1e65df5d205edd5bebd3ae COPYING +f4a876c68885950d5df3c30ede634787 Crypt-CAST5-0.05.tar.gz Copied: csw/mgar/pkg/cpan/Crypt-CAST5/trunk/files/COPYING (from rev 9772, csw/mgar/pkg/cpan/Crypt-CAST5_PP/trunk/files/CSWpmcryptcast5pp.gspec) =================================================================== --- csw/mgar/pkg/cpan/Crypt-CAST5/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Crypt-CAST5/trunk/files/COPYING 2010-04-27 07:32:00 UTC (rev 9775) @@ -0,0 +1,3 @@ +Copyright (c) 2002 Bob Mathews. All rights reserved. +This program is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Crypt-CAST5/trunk/files/CSWpmcryptcast5pp.depend =================================================================== Deleted: csw/mgar/pkg/cpan/Crypt-CAST5/trunk/files/CSWpmcryptcast5pp.gspec =================================================================== --- csw/mgar/pkg/cpan/Crypt-CAST5_PP/trunk/files/CSWpmcryptcast5pp.gspec 2010-04-26 17:00:43 UTC (rev 9772) +++ csw/mgar/pkg/cpan/Crypt-CAST5/trunk/files/CSWpmcryptcast5pp.gspec 2010-04-27 07:32:00 UTC (rev 9775) @@ -1,8 +0,0 @@ -%var bitname pm_cryptcast5pp -%var pkgname CSWpmcryptcast5pp -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2002 Bob Mathews. All rights reserved. -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Crypt-CAST5/trunk/files/CSWpmcryptcast5pp.prototype =================================================================== --- csw/mgar/pkg/cpan/Crypt-CAST5_PP/trunk/files/CSWpmcryptcast5pp.prototype 2010-04-26 17:00:43 UTC (rev 9772) +++ csw/mgar/pkg/cpan/Crypt-CAST5/trunk/files/CSWpmcryptcast5pp.prototype 2010-04-27 07:32:00 UTC (rev 9775) @@ -1,24 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Crypt 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Crypt/CAST5_PP 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Crypt/CAST5_PP/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Crypt::CAST5_PP.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Crypt 0755 root bin -d none /opt/csw/share/perl/csw/Crypt/CAST5_PP 0755 root bin -f none /opt/csw/share/perl/csw/Crypt/CAST5_PP.pm 0444 root bin -f none /opt/csw/share/perl/csw/Crypt/CAST5_PP/Tables.pm 0444 root bin -d none /opt/csw/share/perl/csw/auto 0755 root bin -d none /opt/csw/share/perl/csw/auto/Crypt 0755 root bin -d none /opt/csw/share/perl/csw/auto/Crypt/CAST5_PP 0755 root bin -f none /opt/csw/share/perl/csw/auto/Crypt/CAST5_PP/autosplit.ix 0444 root bin -f none /opt/csw/share/perl/csw/auto/Crypt/CAST5_PP/decrypt.al 0444 root bin -f none /opt/csw/share/perl/csw/auto/Crypt/CAST5_PP/encrypt.al 0444 root bin -f none /opt/csw/share/perl/csw/auto/Crypt/CAST5_PP/init.al 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 27 09:32:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Apr 2010 07:32:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[9776] csw/mgar/pkg/cpan/Crypt-IDEA/trunk Message-ID: Revision: 9776 http://gar.svn.sourceforge.net/gar/?rev=9776&view=rev Author: dmichelsen Date: 2010-04-27 07:32:17 +0000 (Tue, 27 Apr 2010) Log Message: ----------- cpan/Crypt-IDEA: Update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-IDEA/trunk/Makefile csw/mgar/pkg/cpan/Crypt-IDEA/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Crypt-IDEA/trunk/files/CSWpmcryptidea.depend csw/mgar/pkg/cpan/Crypt-IDEA/trunk/files/CSWpmcryptidea.gspec csw/mgar/pkg/cpan/Crypt-IDEA/trunk/files/CSWpmcryptidea.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-IDEA/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-IDEA/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/Crypt-IDEA/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-IDEA/trunk/Makefile 2010-04-27 07:32:00 UTC (rev 9775) +++ csw/mgar/pkg/cpan/Crypt-IDEA/trunk/Makefile 2010-04-27 07:32:17 UTC (rev 9776) @@ -8,6 +8,9 @@ This perl extension is an implementation of the IDEA block cipher algorithm. endef -DISTFILES = $(call admfiles,CSWpmcryptidea,depend prototype) +PACKAGES = CSWpmcryptidea +CATALOGNAME = pm_cryptidea +LICENSE = COPYRIGHT + include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-IDEA/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-IDEA/trunk/checksums 2010-04-27 07:32:00 UTC (rev 9775) +++ csw/mgar/pkg/cpan/Crypt-IDEA/trunk/checksums 2010-04-27 07:32:17 UTC (rev 9776) @@ -1,4 +1 @@ -fa75a6c7ea348b9a25d91af2e4a39c0e download/CSWpmcryptidea.gspec -6e0d583c86d7f74b43769810714242aa download/CSWpmcryptidea.depend -5917ea59f99a11d095522bb1483950ed download/CSWpmcryptidea.prototype -6718c630fa8ac28cb989b7db763ed97c download/Crypt-IDEA-1.08.tar.gz +6718c630fa8ac28cb989b7db763ed97c Crypt-IDEA-1.08.tar.gz Deleted: csw/mgar/pkg/cpan/Crypt-IDEA/trunk/files/CSWpmcryptidea.depend =================================================================== Deleted: csw/mgar/pkg/cpan/Crypt-IDEA/trunk/files/CSWpmcryptidea.gspec =================================================================== --- csw/mgar/pkg/cpan/Crypt-IDEA/trunk/files/CSWpmcryptidea.gspec 2010-04-27 07:32:00 UTC (rev 9775) +++ csw/mgar/pkg/cpan/Crypt-IDEA/trunk/files/CSWpmcryptidea.gspec 2010-04-27 07:32:17 UTC (rev 9776) @@ -1,4 +0,0 @@ -%var bitname pm_cryptidea -%var pkgname CSWpmcryptidea -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT Deleted: csw/mgar/pkg/cpan/Crypt-IDEA/trunk/files/CSWpmcryptidea.prototype =================================================================== --- csw/mgar/pkg/cpan/Crypt-IDEA/trunk/files/CSWpmcryptidea.prototype 2010-04-27 07:32:00 UTC (rev 9775) +++ csw/mgar/pkg/cpan/Crypt-IDEA/trunk/files/CSWpmcryptidea.prototype 2010-04-27 07:32:17 UTC (rev 9776) @@ -1,16 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/Crypt 0755 root bin -f none /opt/csw/lib/perl/csw/Crypt/IDEA.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Crypt/IDEA.pod 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Crypt 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Crypt/IDEA 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Crypt/IDEA/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/Crypt/IDEA/IDEA.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/Crypt/IDEA/IDEA.so 0555 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Crypt::IDEA.3perl 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 27 10:12:47 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Apr 2010 08:12:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[9777] csw/mgar/pkg/cpan Message-ID: Revision: 9777 http://gar.svn.sourceforge.net/gar/?rev=9777&view=rev Author: dmichelsen Date: 2010-04-27 08:12:47 +0000 (Tue, 27 Apr 2010) Log Message: ----------- cpan/Data-Serializer: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Data-Serializer/ csw/mgar/pkg/cpan/Data-Serializer/branches/ csw/mgar/pkg/cpan/Data-Serializer/tags/ csw/mgar/pkg/cpan/Data-Serializer/trunk/ csw/mgar/pkg/cpan/Data-Serializer/trunk/Makefile csw/mgar/pkg/cpan/Data-Serializer/trunk/checksums csw/mgar/pkg/cpan/Data-Serializer/trunk/files/ csw/mgar/pkg/cpan/Data-Serializer/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Data-Serializer/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/Data-Serializer/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Data-Serializer/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Data-Serializer/trunk/Makefile 2010-04-27 08:12:47 UTC (rev 9777) @@ -0,0 +1,20 @@ +GARNAME = Data-Serializer +GARVERSION = 0.49 +CATEGORIES = cpan +AUTHOR = NEELY + +DESCRIPTION = Modules that serialize data structures +define BLURB + Provides a unified interface to the various serializing modules + currently available. Adds the functionality of both compression and + encryption. +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmdataserializer +CATALOGNAME = pm_dataserializer + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Data-Serializer/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Data-Serializer/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Data-Serializer/trunk/checksums 2010-04-27 08:12:47 UTC (rev 9777) @@ -0,0 +1,2 @@ +d2b87165b62be5e8d2fada3dc272fca1 COPYING +31a8c3f5ab573a840b4314d327bc534a Data-Serializer-0.49.tar.gz Added: csw/mgar/pkg/cpan/Data-Serializer/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Data-Serializer/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Data-Serializer/trunk/files/COPYING 2010-04-27 08:12:47 UTC (rev 9777) @@ -0,0 +1,7 @@ +Copyright (c) 2001-2008 Neil Neely. All rights reserved. + +This library is free software; you can redistribute it and/or modify it +under the same terms as Perl itself, either Perl version 5.8.2 or, at +your option, any later version of Perl 5 you may have available. + +See http://www.perl.com/language/misc/Artistic.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 27 10:37:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Apr 2010 08:37:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[9778] csw/mgar/pkg/cpan/Crypt-CBC/trunk Message-ID: Revision: 9778 http://gar.svn.sourceforge.net/gar/?rev=9778&view=rev Author: dmichelsen Date: 2010-04-27 08:37:06 +0000 (Tue, 27 Apr 2010) Log Message: ----------- cpan/Crypt-CBC: Update to 2.30 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-CBC/trunk/Makefile csw/mgar/pkg/cpan/Crypt-CBC/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Crypt-CBC/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Crypt-CBC/trunk/files/CSWpmcryptcbc.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-CBC/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-CBC/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/Crypt-CBC/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-CBC/trunk/Makefile 2010-04-27 08:12:47 UTC (rev 9777) +++ csw/mgar/pkg/cpan/Crypt-CBC/trunk/Makefile 2010-04-27 08:37:06 UTC (rev 9778) @@ -1,9 +1,9 @@ GARNAME = Crypt-CBC -GARVERSION = 2.22 +GARVERSION = 2.30 CATEGORIES = cpan AUTHOR = LDS -DESCRIPTION = encrypt data with cipher block chaining mode +DESCRIPTION = Encrypt Data with Cipher Block Chaining Mode define BLURB This module is a Perl-only implementation of the cryptographic cipher block chaining mode (CBC). In combination with a block cipher such as DES or IDEA, @@ -11,6 +11,11 @@ encrypted messages are compatible with the encryption format used by SSLeay. endef -DISTFILES += CSWpmcryptcbc.gspec +DISTFILES = COPYING +PACKAGES = CSWpmcryptcbc +CATALOGNAME = pm_cryptcbc + +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-CBC/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-CBC/trunk/checksums 2010-04-27 08:12:47 UTC (rev 9777) +++ csw/mgar/pkg/cpan/Crypt-CBC/trunk/checksums 2010-04-27 08:37:06 UTC (rev 9778) @@ -1,2 +1,2 @@ -4aaef3833e455d866d320739f42d82e6 download/CSWpmcryptcbc.gspec -02622a5f0e70c1bc45c8db7985606643 download/Crypt-CBC-2.22.tar.gz +26341365473ed9794a9c5e0f2705e821 COPYING +c71ab992f3da65deb1a141bef79a4bff Crypt-CBC-2.30.tar.gz Copied: csw/mgar/pkg/cpan/Crypt-CBC/trunk/files/COPYING (from rev 9772, csw/mgar/pkg/cpan/Crypt-CBC/trunk/files/CSWpmcryptcbc.gspec) =================================================================== --- csw/mgar/pkg/cpan/Crypt-CBC/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Crypt-CBC/trunk/files/COPYING 2010-04-27 08:37:06 UTC (rev 9778) @@ -0,0 +1,4 @@ +Lincoln Stein, lstein at cshl.org + +This module is distributed under the ARTISTIC LICENSE using the same +terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Crypt-CBC/trunk/files/CSWpmcryptcbc.gspec =================================================================== --- csw/mgar/pkg/cpan/Crypt-CBC/trunk/files/CSWpmcryptcbc.gspec 2010-04-27 08:12:47 UTC (rev 9777) +++ csw/mgar/pkg/cpan/Crypt-CBC/trunk/files/CSWpmcryptcbc.gspec 2010-04-27 08:37:06 UTC (rev 9778) @@ -1,9 +0,0 @@ -%var bitname pm_cryptcbc -%var pkgname CSWpmcryptcbc -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Lincoln Stein, lstein at cshl.org - -This module is distributed under the ARTISTIC LICENSE using the same -terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 27 11:48:08 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Apr 2010 09:48:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[9779] csw/mgar/pkg/help2man/trunk Message-ID: Revision: 9779 http://gar.svn.sourceforge.net/gar/?rev=9779&view=rev Author: dmichelsen Date: 2010-04-27 09:48:08 +0000 (Tue, 27 Apr 2010) Log Message: ----------- help2man: Update to 1.38.1 Modified Paths: -------------- csw/mgar/pkg/help2man/trunk/Makefile csw/mgar/pkg/help2man/trunk/checksums Modified: csw/mgar/pkg/help2man/trunk/Makefile =================================================================== --- csw/mgar/pkg/help2man/trunk/Makefile 2010-04-27 08:37:06 UTC (rev 9778) +++ csw/mgar/pkg/help2man/trunk/Makefile 2010-04-27 09:48:08 UTC (rev 9779) @@ -1,5 +1,5 @@ GARNAME = help2man -GARVERSION = 1.37.1 +GARVERSION = 1.38.1 CATEGORIES = devel DESCRIPTION = A tool for automatically generating simple manual pages from program output @@ -26,4 +26,6 @@ ARCHALL = 1 +CHECKPKG_OVERRIDES_CSWhelp2man += surplus-dependency|CSWpmlocalegettext + include gar/category.mk Modified: csw/mgar/pkg/help2man/trunk/checksums =================================================================== --- csw/mgar/pkg/help2man/trunk/checksums 2010-04-27 08:37:06 UTC (rev 9778) +++ csw/mgar/pkg/help2man/trunk/checksums 2010-04-27 09:48:08 UTC (rev 9779) @@ -1 +1 @@ -371b5cc74fe9c2ea3ee1ca23c19b19a8 help2man-1.37.1.tar.gz +32435397b2668b8cb3920aa18b87bec5 help2man-1.38.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 Tue Apr 27 13:26:23 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Apr 2010 11:26:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[9780] csw/mgar/pkg/setoolkit/trunk Message-ID: Revision: 9780 http://gar.svn.sourceforge.net/gar/?rev=9780&view=rev Author: dmichelsen Date: 2010-04-27 11:26:22 +0000 (Tue, 27 Apr 2010) Log Message: ----------- setoolkit: Checkpkg overrides for 3.5.1 Modified Paths: -------------- csw/mgar/pkg/setoolkit/trunk/Makefile csw/mgar/pkg/setoolkit/trunk/checksums Modified: csw/mgar/pkg/setoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/setoolkit/trunk/Makefile 2010-04-27 09:48:08 UTC (rev 9779) +++ csw/mgar/pkg/setoolkit/trunk/Makefile 2010-04-27 11:26:22 UTC (rev 9780) @@ -39,9 +39,13 @@ # Testsuite must be run as root SKIPTEST = 1 -# This is intended behaviour as the missing symbols are provided by the "se" binary -# and the libs are to be used only by "se". -CHECKPKG_OVERRIDES = symbol-not-found|libsegui.so -CHECKPKG_OVERRIDES += symbol-not-found|libsenet.so +CHECKPKG_OVERRIDES_CSWsetoolkit += missing-dependency|CSWemacscommon +CHECKPKG_OVERRIDES_CSWsetoolkit += linked-against-discouraged-library|libsegui.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWsetoolkit += linked-against-discouraged-library|libsegui.so|libX11.so.4 +CHECKPKG_OVERRIDES_CSWsetoolkit += init-file-missing-cswinitsmf-class|/opt/csw/share/setoolkit/etc/init.d/mon_cm|class=none +CHECKPKG_OVERRIDES_CSWsetoolkit += init-file-missing-cswinitsmf-class|/opt/csw/share/setoolkit/etc/init.d/monlog|class=none +CHECKPKG_OVERRIDES_CSWsetoolkit += init-file-missing-cswinitsmf-class|/opt/csw/share/setoolkit/etc/init.d/percol|class=none +CHECKPKG_OVERRIDES_CSWsetoolkit += init-file-missing-cswinitsmf-class|/opt/csw/share/setoolkit/etc/init.d/va_monitor|class=none +CHECKPKG_OVERRIDES_CSWsetoolkit += init-file-missing-cswinitsmf-class|/opt/csw/share/setoolkit/etc/init.d/vader|class=none include gar/category.mk Modified: csw/mgar/pkg/setoolkit/trunk/checksums =================================================================== --- csw/mgar/pkg/setoolkit/trunk/checksums 2010-04-27 09:48:08 UTC (rev 9779) +++ csw/mgar/pkg/setoolkit/trunk/checksums 2010-04-27 11:26:22 UTC (rev 9780) @@ -1 +1 @@ -8e592c0b09260597a85b9f325dcdfc33 setoolkit-3.5.1.tar.gz +53c5f7c38447951aceb619b1f60d12f1 setoolkit-3.5.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 Tue Apr 27 13:28:19 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 27 Apr 2010 11:28:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[9781] csw/mgar/pkg/setoolkit/trunk/Makefile Message-ID: Revision: 9781 http://gar.svn.sourceforge.net/gar/?rev=9781&view=rev Author: dmichelsen Date: 2010-04-27 11:28:19 +0000 (Tue, 27 Apr 2010) Log Message: ----------- setoolkit: Checkpkg overrides for 3.5.1 Modified Paths: -------------- csw/mgar/pkg/setoolkit/trunk/Makefile Modified: csw/mgar/pkg/setoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/setoolkit/trunk/Makefile 2010-04-27 11:26:22 UTC (rev 9780) +++ csw/mgar/pkg/setoolkit/trunk/Makefile 2010-04-27 11:28:19 UTC (rev 9781) @@ -47,5 +47,6 @@ CHECKPKG_OVERRIDES_CSWsetoolkit += init-file-missing-cswinitsmf-class|/opt/csw/share/setoolkit/etc/init.d/percol|class=none CHECKPKG_OVERRIDES_CSWsetoolkit += init-file-missing-cswinitsmf-class|/opt/csw/share/setoolkit/etc/init.d/va_monitor|class=none CHECKPKG_OVERRIDES_CSWsetoolkit += init-file-missing-cswinitsmf-class|/opt/csw/share/setoolkit/etc/init.d/vader|class=none +CHECKPKG_OVERRIDES_CSWsetoolkit += soname-not-found|libm.so.2 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Apr 27 14:17:32 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 27 Apr 2010 12:17:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[9782] csw/mgar/pkg/sqlite3/trunk/ Message-ID: Revision: 9782 http://gar.svn.sourceforge.net/gar/?rev=9782&view=rev Author: wahwah Date: 2010-04-27 12:17:32 +0000 (Tue, 27 Apr 2010) Log Message: ----------- sqlite3: Change svn:externals to v2. Property Changed: ---------------- csw/mgar/pkg/sqlite3/trunk/ Property changes on: csw/mgar/pkg/sqlite3/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Apr 27 14:56:15 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 27 Apr 2010 12:56:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[9783] csw/mgar/pkg Message-ID: Revision: 9783 http://gar.svn.sourceforge.net/gar/?rev=9783&view=rev Author: bonivart Date: 2010-04-27 12:56:15 +0000 (Tue, 27 Apr 2010) Log Message: ----------- rsyslog: initial commit of 4.7.1 Added Paths: ----------- csw/mgar/pkg/rsyslog/ csw/mgar/pkg/rsyslog/branches/ csw/mgar/pkg/rsyslog/tags/ csw/mgar/pkg/rsyslog/trunk/ csw/mgar/pkg/rsyslog/trunk/Makefile csw/mgar/pkg/rsyslog/trunk/checksums csw/mgar/pkg/rsyslog/trunk/files/ Property changes on: csw/mgar/pkg/rsyslog/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/rsyslog/trunk/Makefile =================================================================== --- csw/mgar/pkg/rsyslog/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rsyslog/trunk/Makefile 2010-04-27 12:56:15 UTC (rev 9783) @@ -0,0 +1,26 @@ +GARNAME = rsyslog +GARVERSION = 4.7.1 +CATEGORIES = server + +DESCRIPTION = Enhanced multi-threaded syslogd with a focus on security and reliability +define BLURB + Enhanced multi-threaded syslogd with a focus on security and reliability +endef + +MASTER_SITES = http://download.rsyslog.com/rsyslog/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +RUNTIME_DEP_PKGS_CSWrsyslog += CSWzlib +RUNTIME_DEP_PKGS_CSWrsyslog += CSWgcc4corert + +GARCOMPILER = GNU + +TEST_SCRIPTS = +TEST_TARGET = check + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/rsyslog/trunk/checksums =================================================================== --- csw/mgar/pkg/rsyslog/trunk/checksums (rev 0) +++ csw/mgar/pkg/rsyslog/trunk/checksums 2010-04-27 12:56:15 UTC (rev 9783) @@ -0,0 +1 @@ +3875a3ab0f57b5a5ba4aeaad91432058 rsyslog-4.7.1.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 Apr 28 02:01:58 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 28 Apr 2010 00:01:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[9784] csw/mgar/gar/v2-bwalton/ Message-ID: Revision: 9784 http://gar.svn.sourceforge.net/gar/?rev=9784&view=rev Author: bdwalton Date: 2010-04-28 00:01:57 +0000 (Wed, 28 Apr 2010) Log Message: ----------- branch gar/v2 to gar/v2-bwalton to add git/makepatch changes Added Paths: ----------- csw/mgar/gar/v2-bwalton/ 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 Apr 28 02:06:40 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 28 Apr 2010 00:06:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[9785] csw/mgar/gar/v2-bwalton Message-ID: Revision: 9785 http://gar.svn.sourceforge.net/gar/?rev=9785&view=rev Author: bdwalton Date: 2010-04-28 00:06:40 +0000 (Wed, 28 Apr 2010) Log Message: ----------- gar/v2-bwalton: convert makepatch to use git (and work again) Modified Paths: -------------- csw/mgar/gar/v2-bwalton/gar.conf.mk csw/mgar/gar/v2-bwalton/gar.lib.mk csw/mgar/gar/v2-bwalton/gar.mk Modified: csw/mgar/gar/v2-bwalton/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-bwalton/gar.conf.mk 2010-04-28 00:01:57 UTC (rev 9784) +++ csw/mgar/gar/v2-bwalton/gar.conf.mk 2010-04-28 00:06:40 UTC (rev 9785) @@ -184,10 +184,11 @@ DEF_BASE_PKGS += CSWpython DEF_BASE_PKGS += CSWtextutils DEF_BASE_PKGS += CSWwget +DEF_BASE_PKGS += CSWgit ifdef GIT_REPOS # netcat and bash are for the gitproxy script. -DEF_BASE_PKGS += CSWgit CSWnetcat +DEF_BASE_PKGS += CSWnetcat endif PREREQUISITE_BASE_PKGS ?= $(DEF_BASE_PKGS) Modified: csw/mgar/gar/v2-bwalton/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-bwalton/gar.lib.mk 2010-04-28 00:01:57 UTC (rev 9784) +++ csw/mgar/gar/v2-bwalton/gar.lib.mk 2010-04-28 00:06:40 UTC (rev 9785) @@ -236,7 +236,7 @@ echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ fi; \ fi - + check-upstream: FILES2CHECK = $(call files2check) check-upstream: @if [ -n '$(FILES2CHECK)' ]; then \ @@ -477,18 +477,6 @@ $(GARPATCH) < $(DOWNLOADDIR)/$* @$(MAKECOOKIE) -# This is used by makepatch -%/gar-base.diff: - @echo " ==> Creating patch $@" - @EXTRACTDIR=$(SCRATCHDIR) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) extract - @PATCHDIR=$(SCRATCHDIR)/$(BASEWORKSRC) COOKIEDIR=$(SCRATCHDIR)-$(COOKIEDIR) $(MAKE) patch - @mv $(SCRATCHDIR)/$(BASEWORKSRC) $(WORKSRC_FIRSTMOD).orig - @( cd $(WORKDIR_FIRSTMOD); \ - if gdiff --speed-large-files --minimal -Nru $(BASEWORKSRC).orig $(BASEWORKSRC) > gar-base.diff; then :; else \ - cd $(CURDIR); \ - mv -f $(WORKDIR_FIRSTMOD)/gar-base.diff $@; \ - fi ) - ### PATCH FILE TYPE MAPPINGS ### # These rules specify which of the above patch action rules to use for a given # file extension. Often support for a given patch format can be handled by Modified: csw/mgar/gar/v2-bwalton/gar.mk =================================================================== --- csw/mgar/gar/v2-bwalton/gar.mk 2010-04-28 00:01:57 UTC (rev 9784) +++ csw/mgar/gar/v2-bwalton/gar.mk 2010-04-28 00:06:40 UTC (rev 9785) @@ -1,4 +1,3 @@ - # # $Id$ # @@ -390,9 +389,16 @@ extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ announce-modulation \ - pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated + pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) $(if $(filter $(firstword $(MODULATIONS)),$(MODULATION)),post-extract-gitsnap) post-extract-$(MODULATION) post-extract-modulated @$(DONADA) +post-extract-gitsnap: $(EXTRACT_TARGETS) + @echo Snapshotting extracted source tree with git... + @( cd $(WORKSRC); git init; git add .; \ + git commit -m "Upstream $(GARVERSION)"; \ + git tag -a -m "Upstream $(GARVERSION)" upstream-$(GARVERSION) ) + @$(MAKECOOKIE) + # returns true if extract has completed successfully, false # otherwise extract-p: @@ -411,19 +417,36 @@ patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch @$(DONADA) -patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) post-patch-$(MODULATION) post-patch-modulated +patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter $(firstword $(MODULATIONS)),$(MODULATION)),post-patch-gitsnap) post-patch-$(MODULATION) post-patch-modulated @$(DONADA) +post-patch-gitsnap: $(PATCH_TARGETS) + @echo Snapshotting patched source tree with git... + @( cd $(WORKSRC); \ + git checkout -b csw-$(GARVERSION) upstream-$(GARVERSION); \ + git add -A; git commit -m "CSW patches for $(GARVERSION)" ) + @$(MAKECOOKIE) + # returns true if patch has completed successfully, false # otherwise patch-p: @$(foreach COOKIEFILE,$(PATCH_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) -# makepatch - Grab the upstream source and diff against $(WORKSRC). Since -# diff returns 1 if there are differences, we remove the patch -# file on "success". Goofy diff. -makepatch: $(SCRATCHDIR) $(FILEDIR) $(FILEDIR)/gar-base.diff - $(DONADA) +# Allow generation of patches from modified work source. +makepatch: $(FILEDIR) + @echo Makepatch: Checking for changes in work tree... + @( cd $(WORKSRC_FIRSTMOD); \ + git add -A; \ + git diff --cached --quiet; \ + if test $$? -eq 0; then echo "No changes."; exit 1; fi ) + @echo Makepatch: Capturing changes... + @(cd $(WORKSRC_FIRSTMOD); \ + git commit; \ + git format-patch HEAD~1; \ + echo Add the following to your recipe and then; \ + echo rerun: gmake makesums; \ + echo PATCHFILES += 0001*; \ + mv 0001* $(abspath $(FILEDIR)) ) # XXX: Allow patching of pristine sources separate from ISA directories # XXX: Use makepatch on global/ 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 Apr 28 04:45:39 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 28 Apr 2010 02:45:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9786] csw/mgar/pkg/cswutils/trunk Message-ID: Revision: 9786 http://gar.svn.sourceforge.net/gar/?rev=9786&view=rev Author: bdwalton Date: 2010-04-28 02:45:39 +0000 (Wed, 28 Apr 2010) Log Message: ----------- cswutils: depend on forthcoming coreutils; enable tests; add overrides; update for moved python files Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile csw/mgar/pkg/cswutils/trunk/checksums Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2010-04-28 00:06:40 UTC (rev 9785) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2010-04-28 02:45:39 UTC (rev 9786) @@ -9,10 +9,10 @@ endef SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/ -SVN_REV = 96 +SVN_REV = 104 MASTER_SITES = -SVN_FILES = submit_to_newpkgs.py compare_pkgs.py opencsw_lib.py +SVN_FILES = compare_pkgs.py DISTFILES = COPYING DISTFILES += checkpkg checkpkg.8 DISTFILES += cpan2pkg @@ -20,8 +20,9 @@ DISTFILES += stagepkg stagepkg.8 DISTFILES += stagepkg stagepkg.8 DISTFILES += $(foreach F,$(SVN_FILES),$(F)-r$(SVN_REV)) +DISTFILES += opencsw.py submitpkg -RUNTIME_DEP_PKGS = CSWtextutils CSWfakeroot CSWperl +RUNTIME_DEP_PKGS = CSWcoreutils CSWfakeroot CSWperl RUNTIME_DEP_PKGS += CSWpmyaml CSWpmlibwww CSWpmhtmltree RUNTIME_DEP_PKGS += CSWpython @@ -36,10 +37,13 @@ ARCHALL = 1 -# The package contains 'checkpkg', which checks for bad pathes. Of -# course the bad pathes are inside the package, because it is checked -# for them. So disable the test. -ENABLE_CHECK = 0 +CHECKPKG_OVERRIDES_CSWcswutils += unidentified-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWpmhtmltree +CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWfakeroot +CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWpmyaml +CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWpmlibwww include gar/category.mk @@ -49,6 +53,14 @@ mv $(subst -r$(SVN_REV),,$(notdir $@)) $@ @$(MAKECOOKIE) +$(DOWNLOADDIR)/opencsw.py: + ln -s $(abspath gar/lib/python/opencsw.py) $(DOWNLOADDIR)/ + @$(MAKECOOKIE) + +$(DOWNLOADDIR)/submitpkg: + ln -s $(abspath gar/bin/submitpkg) $(DOWNLOADDIR)/ + @$(MAKECOOKIE) + install-custom: @ginstall -d $(DESTDIR)$(bindir) @ginstall $(WORKSRC)/checkpkg $(DESTDIR)$(bindir) @@ -61,12 +73,12 @@ @ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall -d $(DESTDIR)$(libdir)/python/csw - @ginstall -m 644 $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \ - $(DESTDIR)$(libdir)/python/csw/opencsw_lib.py - @for f in compare_pkgs.py submit_to_newpkgs.py; do \ + @ginstall -m 644 $(WORKSRC)/opencsw.py \ + $(DESTDIR)$(libdir)/python/csw/opencsw.py + @ginstall -m 644 $(WORKSRC)/submitpkg $(DESTDIR)$(bindir)/submitpkg + @for f in $(SVN_FILES); do \ ginstall -m 755 $(WORKSRC)/$${f}-r$(SVN_REV) \ $(DESTDIR)$(libdir)/python/csw/$${f}; \ done @ln -s ../lib/python/csw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg - @ln -s ../lib/python/csw/submit_to_newpkgs.py $(DESTDIR)$(bindir)/submitpkg @$(MAKECOOKIE) Modified: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums 2010-04-28 00:06:40 UTC (rev 9785) +++ csw/mgar/pkg/cswutils/trunk/checksums 2010-04-28 02:45:39 UTC (rev 9786) @@ -1,11 +1,11 @@ 091b12575ebc0e45cf8c3d8b43d8b638 COPYING 59c261b5337c61ddda9146a2a97efc3d checkpkg 6ec3b6597e04714430987ccc199db3c4 checkpkg.8 -24881eb553044a5b437b7293f4138ba4 compare_pkgs.py-r96 +1fae82cde07f0d2eddb688a089e9de5b compare_pkgs.py-r104 9a637f6546cc50974159a987302d91c0 cpan2pkg 93b6a811d303ce3be0050c5a7b3c8e69 createpkg a605598f30195f9ab1b29fc3944d3b31 createpkg.8 -6af12950bab350ecd2a14fe1e347b18b opencsw_lib.py-r96 +ab6da685ca1ba45003e1a90a831a5883 opencsw.py cd4496ee27bf86d5c8bc656c9c5974be stagepkg 8908a0a898aa07a7a928b2b8bd8384f0 stagepkg.8 -bb90fa5379bcae922a499333951f5796 submit_to_newpkgs.py-r96 +d83f47f61a12b29ba50a5e83944fe4ff submitpkg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Apr 28 10:21:54 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 28 Apr 2010 08:21:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9787] csw/mgar/gar/v2/lib/python Message-ID: Revision: 9787 http://gar.svn.sourceforge.net/gar/?rev=9787&view=rev Author: wahwah Date: 2010-04-28 08:21:54 +0000 (Wed, 28 Apr 2010) Log Message: ----------- mGAR v2: checkpkg, a new check for Python packages Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2010-04-28 02:45:39 UTC (rev 9786) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2010-04-28 08:21:54 UTC (rev 9787) @@ -673,3 +673,29 @@ "relocation bound to a symbol with STV_PROTECTED visibility" % (ldd_elem["symbol"], ldd_elem["path"])) +def CheckPythonPackageName(pkg_data, error_mgr, logger, messenger): + """Checks for CSWpy-* and py_* package names.""" + pyfile_re = re.compile(r"/opt/csw/lib/python.*/.*") + pkgname = pkg_data["basic_stats"]["pkgname"] + has_py_files = False + example_py_file = "" + for pkgmap_entry in pkg_data["pkgmap"]: + if not pkgmap_entry["path"]: + continue + if pyfile_re.match(pkgmap_entry["path"]): + has_py_files = True + example_py_file = pkgmap_entry["path"] + break + if has_py_files and not pkgname.startswith("CSWpy-"): + error_mgr.ReportError("pkgname-does-not-start-with-CSWpy-") + messenger.Message("The package " + "installs files into /opt/csw/lib/python. For example, %s. " + "However, the pkgname doesn't start with 'CSWpy-'." + % repr(example_py_file)) + if has_py_files and not pkg_data["basic_stats"]["catalogname"].startswith("py_"): + error_mgr.ReportError("catalogname-does-not-start-with-py_") + messenger.Message("The package installs files into /opt/csw/lib/python. " + "For example, %s. " + "However, the catalogname doesn't start with 'py_'." + % repr(example_py_file)) + Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-04-28 02:45:39 UTC (rev 9786) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2010-04-28 08:21:54 UTC (rev 9787) @@ -462,5 +462,37 @@ self.pkg_data["pkginfo"]["VENDOR"] = "https://www.example.com/" +class TestCheckPythonPackageName(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = "CheckPythonPackageName" + def CheckpkgTest(self): + self.pkg_data["pkgmap"].append({ + "class": "none", + "group": "bin", + "line": "", + "mode": '0755', + "path": "/opt/csw/lib/python/site-packages/hachoir_parser/video/mov.py", + "type": "f", + "user": "root" + }) + self.error_mgr_mock.ReportError('pkgname-does-not-start-with-CSWpy-') + self.error_mgr_mock.ReportError('catalogname-does-not-start-with-py_') + + +class TestCheckPythonPackageName_good(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = "CheckPythonPackageName" + def CheckpkgTest(self): + self.pkg_data["pkgmap"].append({ + "class": "none", + "group": "bin", + "line": "", + "mode": '0755', + "path": "/opt/csw/lib/python/site-packages/hachoir_parser/video/mov.py", + "type": "f", + "user": "root" + }) + self.pkg_data["basic_stats"]["catalogname"] = "py_foo" + self.pkg_data["basic_stats"]["pkgname"] = "CSWpy-foo" + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Apr 28 16:10:48 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 28 Apr 2010 14:10:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9788] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 9788 http://gar.svn.sourceforge.net/gar/?rev=9788&view=rev Author: wahwah Date: 2010-04-28 14:10:48 +0000 (Wed, 28 Apr 2010) Log Message: ----------- postgresql: Uncommittted work from a long time ago. The build still needs more work. Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl Added Paths: ----------- csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-84.postinstall Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2010-04-28 08:21:54 UTC (rev 9787) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2010-04-28 14:10:48 UTC (rev 9788) @@ -2,14 +2,28 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# This BUILD is NOT READY! It needs work before it's usable. + +# TODO: Initialize the database cluster during installation if not already +# there. +# +# TODO: Migration plan from 8.3: Installing 8.3 and 8.4 at the same time, and +# migrating +# +# TODO: The isaexec part in GAR doesn't work very well. Let's write a minimal +# example of it. (gmake repackage may produce the right output) + GARNAME = postgresql BASE_VERSION = 8.4 +# How to make one automatically? +VERSION_NODOT = 8_4 +BASE_VERSION_G = 84 PATCHLEVEL = 2 GARVERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps # Useful when making a series of builds on the same day -GARFLAVOR ?= DBG +# GARFLAVOR ?= DBG DESCRIPTION = An advanced open source database SPKG_SOURCEURL = http://www.postgresql.org/ @@ -19,8 +33,14 @@ version_dependent = /lib/$(GARNAME)/$(BASE_VERSION) bindir_install = $(prefix)$(version_dependent)/bin +bindir = $(prefix)$(version_dependent)/bin sbindir_install = $(prefix)$(version_dependent)/sbin +sbindir = $(prefix)$(version_dependent)/sbin libdir_install = $(prefix)$(version_dependent)/lib +# libdir = $(prefix)$(version_dependent)/lib +# Otherwise initdb can't find the right libraries, see: +# http://archives.postgresql.org/pgsql-general/2010-01/msg00422.php +libdir = $(abspath $(prefix)$(version_dependent)/$(MM_LIBDIR)) localstatedir = /var$(prefix)/$(GARNAME)/$(BASE_VERSION) sysconfdir = /etc$(prefix)/$(GARNAME)/$(BASE_VERSION) datadir = $(prefix)/share/$(GARNAME)/$(BASE_VERSION) @@ -33,8 +53,8 @@ sharedstatedir = $(prefix)/share/$(GARNAME)/$(BASE_VERSION) sourcedir = $(prefix)/src/$(GARNAME)/$(BASE_VERSION) -MIGRATE_FILES_CSWpostgresql-8.4 = postgresql.conf -MIGRATE_DEST_DIR_CSWpostgresql-8.4 = $(sysconfdir) +MIGRATE_FILES_CSWpostgresql-$(BASE_VERSION_G) = postgresql.conf +MIGRATE_DEST_DIR_CSWpostgresql-$(BASE_VERSION_G) = $(sysconfdir) MASTER_SITES = http://wwwmaster.postgresql.org/redir/53/h/source/v$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 @@ -42,32 +62,45 @@ DISTFILES += cswusergroup.tmpl DISTFILES += postgresql.conf.tmpl DISTFILES += README-CSW.txt +# DISTFILES += CSWpostgresql-$(BASE_VERSION_G).postinstall +include files/CSWpostgresql-$(BASE_VERSION_G).postinstall -PACKAGES = CSWpostgresql-84 CSWpostgresql-84-doc CSWpostgresql-84-dev CSWlibpq-84 PACKAGES += CSWpostgresql +PACKAGES += CSWlibpq-$(BASE_VERSION_G) +PACKAGES += CSWpostgresql-$(BASE_VERSION_G) +PACKAGES += CSWpostgresql-$(BASE_VERSION_G)-dev +PACKAGES += CSWpostgresql-$(BASE_VERSION_G)-doc -CATALOGNAME_CSWpostgresql-84 = postgresql_84 -CATALOGNAME_CSWpostgresql-84-doc = postgresql_84_doc -CATALOGNAME_CSWpostgresql-84-dev = postgresql_84_devel -CATALOGNAME_CSWlibpq-84 = libpq84 -CATALOGNAME_CSWpostgresql = postgresql +CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G) = postgresql_$(BASE_VERSION_G) +CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G)-doc = postgresql_$(BASE_VERSION_G)_doc +CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G)-dev = postgresql_$(BASE_VERSION_G)_devel +CATALOGNAME_CSWlibpq-$(BASE_VERSION_G) = libpq$(BASE_VERSION_G) +CATALOGNAME_CSWpostgresql = postgresql -SPKG_DEST_CSWpostgresql = An advanced open source database, a metapackage -SPKG_DESC_CSWpostgresql-84 = An advanced open source database, version 8.4.x -SPKG_DESC_CSWpostgresql-84-doc = PostgreSQL Documentation -SPKG_DESC_CSWpostgresql-84-dev = PostgreSQL Developer Files -SPKG_DESC_CSWlibpq-84 = PostgreSQL Libraries +SPKG_DEST_CSWpostgresql = An advanced open source database, a metapackage +SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G) = An advanced open source database, version $(BASE_VERSION).x +SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G)-doc = PostgreSQL $(BASE_VERSION).x Documentation +SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G)-dev = PostgreSQL $(BASE_VERSION).x Developer Files +SPKG_DESC_CSWlibpq-$(BASE_VERSION_G) = PostgreSQL $(BASE_VERSION).x Libraries -RUNTIME_DEP_PKGS_CSWpostgresql = CSWpostgresql-84 -RUNTIME_DEP_PKGS_CSWpostgresql-84 = CSWreadline CSWzlib CSWlibpq-84 -RUNTIME_DEP_PKGS_CSWpostgresql-84 += CSWlibxml2 CSWlibxslt CSWosslrt CSWkrb5lib -RUNTIME_DEP_PKGS_CSWpostgresql-84-dev = CSWpostgresql-84 -RUNTIME_DEP_PKGS_CSWlibpq-84 = CSWkrb5lib CSWlibxml2 CSWlibxslt CSWosslrt -RUNTIME_DEP_PKGS_CSWlibpq-84 += CSWzlib +RUNTIME_DEP_PKGS_CSWpostgresql = CSWpostgresql-$(BASE_VERSION_G) +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWkrb5lib +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibpq-$(BASE_VERSION_G) +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxslt +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWosslrt +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWreadline +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWzlib +RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G) += CSWkrb5lib +RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G) += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G) += CSWlibxslt +RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G) += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G) += CSWzlib +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)-dev = CSWpostgresql-$(BASE_VERSION_G) -ARCHALL_CSWpostgresql = 1 -ARCHALL_CSWpostgresql-84-doc = 1 -ARCHALL_CSWpostgresql-84-doc = 1 +ARCHALL_CSWpostgresql = 1 +ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1 +ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1 LICENSE = COPYRIGHT @@ -117,15 +150,18 @@ SKIPTEST ?= 1 TEST_TARGET = check -PKGFILES_CSWpostgresql = $(prefix)/bin/.* -PKGFILES_CSWpostgresql-84-doc = $(PKGFILES_DOC) -PKGFILES_CSWpostgresql-84-doc += $(prefix)/share/doc/postgresql/html.* -PKGFILES_CSWpostgresql-84-dev = $(PKGFILES_DEVEL) -PKGFILES_CSWlibpq-84 = $(PKGFILES_RT) -PKGFILES_CSWlibpq-84 += $(libdir)/64 +PKGFILES_CSWpostgresql = $(prefix)/bin/.* +PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-doc = $(PKGFILES_DOC) +PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-doc += $(prefix)/share/doc.* +PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibpq-$(BASE_VERSION_G) = $(PKGFILES_RT) +PKGFILES_CSWlibpq-$(BASE_VERSION_G) += $(libdir)/64 +PKGFILES_CSWlibpq-$(BASE_VERSION_G) += $(prefix)/share/checkpkg/overrides/libpq$(BASE_VERSION_G) -INITSMF = /etc$(prefix)/init\.d/cswpostgres_$(BASE_VERSION) -USERGROUP = /etc$(prefix)/pkg/postgresql-$(BASE_VERSION) +# initscript_base_name = cswpostgres_$(subst .,_,$(BASE_VERSION)) +initscript_base_name = cswpostgres_$(VERSION_NODOT) +INITSMF = /etc$(prefix)/init\.d/$(initscript_base_name) +USERGROUP = /etc/opt/csw/pkg/postgresql/cswusergroup_$(VERSION_NODOT) PRESERVECONF = $(sysconfdir)/postgresql\.conf BIN_NAMES = clusterdb @@ -157,14 +193,12 @@ PGDATA = $(localstatedir)/pgdata PROTOTYPE_MODIFIERS = pgdata -PROTOTYPE_FILES_pgdata = $(localstatedir) $(PGDATA) +PROTOTYPE_FILES_pgdata = $(PGDATA) PROTOTYPE_USER_pgdata = postgres -PROTOTYPE_GROUP_pgdata = postgres +PROTOTYPE_GROUP_pgdata = sys PROTOTYPE_PERMS_pgdata = 0700 PROTOTYPE_CLASS_pgdata = ugfiles -SPKG_CLASSES = none ugfiles - include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) @@ -179,28 +213,29 @@ post-merge: ginstall -d $(PKGROOT)/etc$(prefix)/init.d - sed -e 's+ at PGDATA@+$(PGDATA)+' \ - -e 's+ at sysconfdir@+$(sysconfdir)+' \ - -e 's+ at bindir@+$(bindir)+' \ + gsed \ + -e 's+ at PGDATA@+$(PGDATA)+g' \ + -e 's+ at sysconfdir@+$(sysconfdir)+g' \ + -e 's+ at bindir@+$(bindir)+g' \ < $(FILEDIR)/cswpostgres.tmpl \ - > $(WORKDIR)/cswpostgres_$(BASE_VERSION) + > $(WORKDIR)/$(initscript_base_name) ginstall \ - $(WORKDIR)/cswpostgres_$(BASE_VERSION) \ - $(PKGROOT)/etc$(prefix)/init.d/cswpostgres_$(BASE_VERSION) + $(WORKDIR)/$(initscript_base_name) \ + $(PKGROOT)/etc$(prefix)/init.d/$(initscript_base_name) ginstall -d $(PKGROOT)/etc$(prefix)/pkg/$(GARNAME) - sed -e 's+ at PGDATA@+$(PGDATA)+' \ + gsed -e 's+ at PGDATA@+$(PGDATA)+g' \ < $(FILEDIR)/cswusergroup.tmpl \ > $(WORKDIR)/cswusergroup ginstall $(WORKDIR)/cswusergroup \ - $(PKGROOT)/etc$(prefix)/pkg/$(GARNAME)/cswusergroup-$(BASE_VERSION) + $(PKGROOT)/etc$(prefix)/pkg/$(GARNAME)/cswusergroup_$(VERSION_NODOT) ginstall -d $(PKGROOT)$(sysconfdir) - sed -e 's+ at PGDATA@+$(PGDATA)+' \ + gsed -e 's+ at PGDATA@+$(PGDATA)+g' \ < $(FILEDIR)/postgresql.conf.tmpl \ > $(WORKDIR)/postgresql.conf ginstall $(WORKDIR)/postgresql.conf \ $(PKGROOT)$(sysconfdir) ginstall -d $(PKGROOT)$(docdir) - ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir) + # ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir) ginstall -m 755 -d $(PKGROOT)$(prefix)/bin for b in $(BIN_NAMES); do \ gln -s ..$(version_dependent)/bin/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \ Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2010-04-28 08:21:54 UTC (rev 9787) +++ csw/mgar/pkg/postgresql/trunk/checksums 2010-04-28 14:10:48 UTC (rev 9788) @@ -1,5 +1,5 @@ -d738227e2f1f742d2f2d4ab56496c5c6 download/postgresql-8.4.2.tar.bz2 -e6f5d88d673c79e3948bf0fde2ba282f download/cswpostgres.tmpl -9e1e49d76fee70cb8e2d49304695ec89 download/cswusergroup.tmpl -8237c74666058f607f5418e3b57c74a9 download/postgresql.conf.tmpl -6e4e2a7755acf94bc83200a308e21ef3 download/README-CSW.txt +6e4e2a7755acf94bc83200a308e21ef3 README-CSW.txt +e5202be64cafe8f65d41a6fffd1bc311 cswpostgres.tmpl +9e1e49d76fee70cb8e2d49304695ec89 cswusergroup.tmpl +d738227e2f1f742d2f2d4ab56496c5c6 postgresql-8.4.2.tar.bz2 +8237c74666058f607f5418e3b57c74a9 postgresql.conf.tmpl Added: csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-84.postinstall =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-84.postinstall (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-84.postinstall 2010-04-28 14:10:48 UTC (rev 9788) @@ -0,0 +1,41 @@ +define CSWpostgresql-84_postinstall +#!/bin/sh +# vim:set ft=sh: +# +# $$Id$$ +# +# Initialize the database cluster if it hasn't been initialized before. + +# Read in the user configuration file +[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf +[ -s $(sysconfdir)/postgresql.conf ] && . $(sysconfdir)/postgresql.conf + +PGDATA=$(PGDATA) +PGINIT=$(bindir)/initdb + +initialize_cluster() { + chown postgres "$${PGDATA}" + chmod 0700 "$${PGDATA}" + echo "Initializing PostgreSQL database..." + su postgres -c "\"$${PGINIT}\" -D \"$${PGDATA}\" -E utf-8" +} + +if [ `ls -l $${PGDATA} 2>/dev/null | wc -l` -eq 1 ]; then + initialize_cluster +else + echo "The database cluster seems to be initialized already." +fi + +if [ -x /usr/sbin/svcadm ]; then + fmri="cswpostgres_$(VERSION_NODOT)" + echo "Enabling the $${fmri} service in SMF" + svcadm clear "$${fmri}" + svcadm enable "$${fmri}" +else + initscript="/etc/opt/csw/init.d/cswpostgres_$(VERSION_NODOT)" + echo "Issuing $${initscript} start" + $${initscript} start +fi + +exit 0 +endef Property changes on: csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-84.postinstall ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl 2010-04-28 08:21:54 UTC (rev 9787) +++ csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl 2010-04-28 14:10:48 UTC (rev 9788) @@ -60,11 +60,14 @@ fi # Exit if postgres user hasn't been created. -if ! grep '^postgres:' /etc/passwd >/dev/null; then - getent passwd postgres >/dev/null - if [ $? -ne 0 ] ; then - exit 0 - fi +# FIXME: This bit of code is old. It might be obsolete. +if grep '^postgres:' /etc/passwd >/dev/null; then + echo > /dev/null +else + getent passwd postgres >/dev/null + if [ $? -ne 0 ] ; then + exit 0 + fi fi # Change to /var/tmp, as pgctl etc. need to be started from @@ -83,6 +86,7 @@ stop) echo "Stopping PostgreSQL database..." su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log stop" + true # The previous command fails when there's no .pid file ;; restart) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Apr 29 01:23:48 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 28 Apr 2010 23:23:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[9789] csw/mgar/pkg Message-ID: Revision: 9789 http://gar.svn.sourceforge.net/gar/?rev=9789&view=rev Author: skayser Date: 2010-04-28 23:23:48 +0000 (Wed, 28 Apr 2010) Log Message: ----------- password-gorilla: initial commit Added Paths: ----------- csw/mgar/pkg/password-gorilla/ csw/mgar/pkg/password-gorilla/branches/ csw/mgar/pkg/password-gorilla/tags/ csw/mgar/pkg/password-gorilla/trunk/ csw/mgar/pkg/password-gorilla/trunk/Makefile csw/mgar/pkg/password-gorilla/trunk/checksums csw/mgar/pkg/password-gorilla/trunk/files/ Property changes on: csw/mgar/pkg/password-gorilla/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/password-gorilla/trunk/Makefile =================================================================== --- csw/mgar/pkg/password-gorilla/trunk/Makefile (rev 0) +++ csw/mgar/pkg/password-gorilla/trunk/Makefile 2010-04-28 23:23:48 UTC (rev 9789) @@ -0,0 +1,45 @@ +GARNAME = password-gorilla +GARVERSION = 1.4 +CATEGORIES = apps + +DESCRIPTION = A cross-platform, Tcl/Tk-based Password Manager +define BLURB + The Password Gorilla helps you manage your logins. It stores all your user + names and passwords, along with login information and other notes, in a + securely encrypted file. A single "master password" is used to protect the + file. This way, you only need to remember the single master password, instead + of the many logins that you use. +endef + +VENDOR_URL = http://www.fpx.de/fp/Software/Gorilla/ +MASTER_SITES = http://www.fpx.de/fp/Software/Gorilla/download/ +DISTNAME = gorilla-$(GARVERSION) +DISTFILES = gorilla-$(GARVERSION).tar.gz +UFILES_REGEX = gorilla-(\d+(?:\.\d+)*).tar.gz +CATALOGNAME = password_gorilla +ARCHALL = 1 +LICENSE = LICENSE.txt + +RUNTIME_DEP_PKGS = CSWtk + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += -with-wish=$(bindir)/tclsh + +INSTALL_SCRIPTS = custom +TEST_SCRIPTS = + +include gar/category.mk + +install-custom: TCLPKGS = twofish blowfish sha1 pwsafe +install-custom: TCLDEST = $(DESTDIR)$(datadir)/password-gorilla/ +install-custom: + $(foreach P,$(TCLPKGS),\ + mkdir -p $(TCLDEST)$(P); \ + cp -r $(WORKSRC)/$(P) $(TCLDEST)$(P); \ + ) + cp $(WORKSRC)/gorilla $(WORKSRC)/gorilla.tcl $(TCLDEST) + mkdir -p $(DESTDIR)$(bindir) + echo '#!/bin/sh\nexec $(datadir)/password-gorilla/gorilla' > \ + $(DESTDIR)$(bindir)/password-gorilla + chmod 755 $(DESTDIR)$(bindir)/password-gorilla + $(MAKECOOKIE) Added: csw/mgar/pkg/password-gorilla/trunk/checksums =================================================================== --- csw/mgar/pkg/password-gorilla/trunk/checksums (rev 0) +++ csw/mgar/pkg/password-gorilla/trunk/checksums 2010-04-28 23:23:48 UTC (rev 9789) @@ -0,0 +1 @@ +9914efa3ddaf309de76f083c43f57dce gorilla-1.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 30 09:32:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Apr 2010 07:32:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[9790] csw/mgar/pkg/glib2 Message-ID: Revision: 9790 http://gar.svn.sourceforge.net/gar/?rev=9790&view=rev Author: dmichelsen Date: 2010-04-30 07:32:12 +0000 (Fri, 30 Apr 2010) Log Message: ----------- glib2: Move legacy to tags/ Added Paths: ----------- csw/mgar/pkg/glib2/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/glib2/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Fri Apr 30 10:01:54 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Fri, 30 Apr 2010 08:01:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[9791] csw/mgar/pkg Message-ID: Revision: 9791 http://gar.svn.sourceforge.net/gar/?rev=9791&view=rev Author: janholzh Date: 2010-04-30 08:01:53 +0000 (Fri, 30 Apr 2010) Log Message: ----------- libsigc++: initial commit Added Paths: ----------- csw/mgar/pkg/libsigcpp/ csw/mgar/pkg/libsigcpp/branches/ csw/mgar/pkg/libsigcpp/tags/ csw/mgar/pkg/libsigcpp/trunk/ csw/mgar/pkg/libsigcpp/trunk/Makefile csw/mgar/pkg/libsigcpp/trunk/checksums csw/mgar/pkg/libsigcpp/trunk/files/ Property changes on: csw/mgar/pkg/libsigcpp/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/libsigcpp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libsigcpp/trunk/Makefile 2010-04-30 08:01:53 UTC (rev 9791) @@ -0,0 +1,39 @@ +GARNAME = libsigc++ +GARVERSION = 2.2.6 +CATEGORIES = lib + +DESCRIPTION = Typesafe signal and callback system for C++ +define BLURB + Typesafe signal and callback system for C++ +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# 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 = + +PACKAGES = CSWlibsigc++rt +PACKAGES += CSWlibsigc++devel +SPKG_DESC_CSWlibsigc++rt = Typesafe signal and callback system for C++ +SPKG_DESC_CSWlibsigc++devel = Header files and docs for libsigc++ + +PKGFILES_CSWlibsigc++devel = /opt/csw/share/.* +PKGFILES_CSWlibsigc++devel += /opt/csw/include/.* +PKGFILES_CSWlibsigc++devel += /opt/csw/lib/pkgconfig/.* +PKGFILES_CSWlibsigc++devel += /opt/csw/lib/sigc\+\+-2.0/include/.* + +CATALOGNAME_CSWlibsigc++rt= libsigc++_rt +CATALOGNAME_CSWlibsigc++devel = libsigc++_devel + +CONFIGURE_ARGS = $(DIRPATHS) --disable-static +BUILD64 = 1 +NOISAEXEC = 1 +TEST_TARGET = check + +include gar/category.mk +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/libsigcpp/trunk/checksums =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/checksums (rev 0) +++ csw/mgar/pkg/libsigcpp/trunk/checksums 2010-04-30 08:01:53 UTC (rev 9791) @@ -0,0 +1 @@ +cd897cdcb313de0090682c54787f39bc libsigc++-2.2.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Apr 30 11:52:42 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 30 Apr 2010 09:52:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[9792] csw/mgar/pkg Message-ID: Revision: 9792 http://gar.svn.sourceforge.net/gar/?rev=9792&view=rev Author: wahwah Date: 2010-04-30 09:52:42 +0000 (Fri, 30 Apr 2010) Log Message: ----------- python-magic: Initial commit Modified Paths: -------------- csw/mgar/pkg/python-magic/trunk/Makefile csw/mgar/pkg/python-magic/trunk/checksums Added Paths: ----------- csw/mgar/pkg/python-magic/ Modified: csw/mgar/pkg/python-magic/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-03-22 15:07:32 UTC (rev 9324) +++ csw/mgar/pkg/python-magic/trunk/Makefile 2010-04-30 09:52:42 UTC (rev 9792) @@ -2,184 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = python-magic +GARVERSION = 0.3.1 +PACKAGES = CSWpy-magic +CATALOGNAME_CSWpy-magic = py_magic +CATEGORIES = python +DESCRIPTION = A python wrapper for libmagic, can classify files according to magic number tests define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://github.com/ahupp/python-magic +MASTER_SITES = http://pypi.python.org/packages/source/p/python-magic/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +LICENSE = README +ARCHALL_CSWpy-magic = 1 +include gar/category.mk Modified: csw/mgar/pkg/python-magic/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-03-22 15:07:32 UTC (rev 9324) +++ csw/mgar/pkg/python-magic/trunk/checksums 2010-04-30 09:52:42 UTC (rev 9792) @@ -0,0 +1 @@ +397cff81d2502e81fd3830a61ca2ad2c python-magic-0.3.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 30 15:12:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Apr 2010 13:12:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[9793] csw/mgar/pkg/cpan Message-ID: Revision: 9793 http://gar.svn.sourceforge.net/gar/?rev=9793&view=rev Author: dmichelsen Date: 2010-04-30 13:12:34 +0000 (Fri, 30 Apr 2010) Log Message: ----------- cpan/File-LibMagic: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/File-LibMagic/ csw/mgar/pkg/cpan/File-LibMagic/branches/ csw/mgar/pkg/cpan/File-LibMagic/tags/ csw/mgar/pkg/cpan/File-LibMagic/trunk/ csw/mgar/pkg/cpan/File-LibMagic/trunk/Makefile csw/mgar/pkg/cpan/File-LibMagic/trunk/checksums csw/mgar/pkg/cpan/File-LibMagic/trunk/files/ csw/mgar/pkg/cpan/File-LibMagic/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/File-LibMagic/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/File-LibMagic/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-LibMagic/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/File-LibMagic/trunk/Makefile 2010-04-30 13:12:34 UTC (rev 9793) @@ -0,0 +1,20 @@ +GARNAME = File-LibMagic +GARVERSION = 0.96 +CATEGORIES = cpan +AUTHOR = FITZNER + +DESCRIPTION = Perlwrapper for libmagic +define BLURB +endef + +DISTFILES = COPYING +MODDIST = $(GARNAME)-$(GARVERSION).tgz + +DEP_PKGS = CSWfile CSWzlib + +PACKAGES = CSWpmfilelibmagic +CATALOGNAME = pm_filelibmagic + +PERL_CONFIGURE_ARGS = INC="-I. -I$(includedir)" + +include gar/category.mk Added: csw/mgar/pkg/cpan/File-LibMagic/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-LibMagic/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/File-LibMagic/trunk/checksums 2010-04-30 13:12:34 UTC (rev 9793) @@ -0,0 +1,2 @@ +40b8a7bf756caa5a62b9c473da59cb1d COPYING +945f063eb9cd2ce555f452792320f601 File-LibMagic-0.96.tgz Added: csw/mgar/pkg/cpan/File-LibMagic/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/File-LibMagic/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/File-LibMagic/trunk/files/COPYING 2010-04-30 13:12:34 UTC (rev 9793) @@ -0,0 +1,4 @@ +Copyright 200[5-9] by Andreas Fitzner, Michael Hendricks + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 30 15:16:34 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Apr 2010 13:16:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[9794] csw/mgar/pkg/x11/proto/x11_renderproto/branches Message-ID: Revision: 9794 http://gar.svn.sourceforge.net/gar/?rev=9794&view=rev Author: dmichelsen Date: 2010-04-30 13:16:34 +0000 (Fri, 30 Apr 2010) Log Message: ----------- x11/renderproto: Make branch for x11-reloaded project Modified Paths: -------------- csw/mgar/pkg/x11/proto/x11_renderproto/branches/renderproto-project-x11-reloaded/Makefile Added Paths: ----------- csw/mgar/pkg/x11/proto/x11_renderproto/branches/renderproto-project-x11-reloaded/ Modified: csw/mgar/pkg/x11/proto/x11_renderproto/branches/renderproto-project-x11-reloaded/Makefile =================================================================== --- csw/mgar/pkg/x11/proto/x11_renderproto/trunk/Makefile 2010-04-30 08:01:53 UTC (rev 9791) +++ csw/mgar/pkg/x11/proto/x11_renderproto/branches/renderproto-project-x11-reloaded/Makefile 2010-04-30 13:16:34 UTC (rev 9794) @@ -1,7 +1,7 @@ GARVERSION = 0.11 -CATEGORIES = x11 +CATEGORIES = devel PROTONAME = renderproto -GARNAME = x11_$(PROTONAME) +GARNAME = $(PROTONAME) DISTNAME = $(PROTONAME)-$(GARVERSION) DESCRIPTION = Render extension headers from modular X.org @@ -9,20 +9,20 @@ This provides the Render extension headers from modular X.org X11 project. endef -MASTER_SITES = $(X11_PROTO_MASTER_SITE) +X11_RELEASE_VERSION = X11R7.5 +MASTER_SITES = http://xorg.freedesktop.org/releases/$(X11_RELEASE_VERSION)/src/proto/ DISTFILES = $(PROTONAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(PROTONAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWx11$(PROTONAME) -CATALOGNAME_CSWx11$(PROTONAME) = x11_$(PROTONAME) +PACKAGES = CSW$(PROTONAME) +CATALOGNAME_CSW$(PROTONAME) = $(PROTONAME) -RUNTIME_DEP_PKGS = CSWx11common -INCOMPATIBLE_PKGS = CSWrenderproto - BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 30 16:50:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Apr 2010 14:50:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9795] csw/mgar/pkg/libcairo/branches Message-ID: Revision: 9795 http://gar.svn.sourceforge.net/gar/?rev=9795&view=rev Author: dmichelsen Date: 2010-04-30 14:50:38 +0000 (Fri, 30 Apr 2010) Log Message: ----------- libcairo: Split-package for x11-reloaded Modified Paths: -------------- csw/mgar/pkg/libcairo/branches/libcairo-x11-reloaded/Makefile csw/mgar/pkg/libcairo/branches/libcairo-x11-reloaded/checksums Added Paths: ----------- csw/mgar/pkg/libcairo/branches/libcairo-x11-reloaded/ Modified: csw/mgar/pkg/libcairo/branches/libcairo-x11-reloaded/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2010-04-28 02:45:39 UTC (rev 9786) +++ csw/mgar/pkg/libcairo/branches/libcairo-x11-reloaded/Makefile 2010-04-30 14:50:38 UTC (rev 9795) @@ -1,10 +1,13 @@ GARNAME = libcairo -GARVERSION = 1.8.8 +GARVERSION = 1.8.10 CATEGORIES = lib DESCRIPTION = The Cairo 2D Graphics Library define BLURB -Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL (through glitz), XCB, BeOS, OS/2, and DirectFB. + Cairo is a 2D graphics library with support for multiple output devices. + Currently supported output targets include the X Window System, Quartz, + Win32, image buffers, PostScript, PDF, and SVG file output. Experimental + backends include OpenGL (through glitz), XCB, BeOS, OS/2, and DirectFB. endef MASTER_SITES = http://www.cairographics.org/releases/ @@ -15,58 +18,89 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWlibcairo CSWlibcairodevel CSWlibcairodoc +PACKAGES += CSWcxlibcairo CSWcxlibcairodevel CATALOGNAME_CSWlibcairo = libcairo CATALOGNAME_CSWlibcairodevel = libcairo_devel CATALOGNAME_CSWlibcairodoc = libcairo_doc +CATALOGNAME_CSWcxlibcairo = cx_libcairo +CATALOGNAME_CSWcxlibcairodevel = cx_libcairo_devel SPKG_DESC_CSWlibcairo = $(DESCRIPTION) SPKG_DESC_CSWlibcairodevel = $(DESCRIPTION) development package SPKG_DESC_CSWlibcairodoc = $(DESCRIPTION) documentation +SPKG_DESC_CSWcxlibcairo = $(DESCRIPTION) (bound against OpenCSW X11) +SPKG_DESC_CSWcxlibcairodevel = $(DESCRIPTION) development package (bound against OpenCSW X11) -PKGFILES_CSWlibcairodevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibcairodevel += $(docdir)/libcairo_devel/.* -PKGFILES_CSWlibcairodoc = $(sharedstatedir)/gtk-doc.* -PKGFILES_CSWlibcairodoc += $(docdir)/libcairo_doc/.* +BUILD_DEP_PKGS = CSWlibxrenderdevel CSWkbproto CSWrenderproto CSWlibspectre -BUILD_DEP_PKGS += CSWlibxrenderdevel CSWkbproto CSWrenderproto -BUILD_DEP_PKGS += CSWlibspectre - -RUNTIME_DEP_PKGS_CSWlibcairo = CSWfconfig -RUNTIME_DEP_PKGS_CSWlibcairo += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibcairo += CSWlibxrender -RUNTIME_DEP_PKGS_CSWlibcairo += CSWpixman -RUNTIME_DEP_PKGS_CSWlibcairo += CSWpng -RUNTIME_DEP_PKGS_CSWlibcairo += CSWzlib -RUNTIME_DEP_PKGS_CSWlibcairo += CSWexpat -RUNTIME_DEP_PKGS_CSWlibcairo += CSWiconv -RUNTIME_DEP_PKGS_CSWlibcairo += CSWlibx11 -RUNTIME_DEP_PKGS_CSWlibcairo += CSWlibxcb -RUNTIME_DEP_PKGS_CSWlibcairo += CSWxcbutil - +RUNTIME_DEP_PKGS_CSWlibcairo = CSWfconfig CSWftype2 CSWpixman CSWpng CSWzlib RUNTIME_DEP_PKGS_CSWlibcairodevel = CSWlibcairo RUNTIME_DEP_PKGS_CSWlibcairodoc = +RUNTIME_DEP_PKGS_CSWcxlibcairo = CSWftype2 CSWpixman CSWlibxrender CSWlibxcb CSWxcbutil CSWzlib CSWpng CSWfconfig CSWlibx11 +RUNTIME_DEP_PKGS_CSWcxlibcairodevel = CSWcxlibcairo CSWlibxrenderdevel CSWlibxcbdevel CSWlibx11devel -ARCHALL_CSWlibcairodoc = 1 +EXTRA_MODULATORS = X11 +MODULATIONS_X11 = sunwx11 cswx11 BUILD64 = 1 -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_INC_cswx11 = $(prefix)/X11/include +EXTRA_LIB_cswx11 = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS_cswx11 = $(prefix)/X11/lib + +EXTRA_INC = $(EXTRA_INC_$(X11) +EXTRA_LIB = $(EXTRA_LIB_$(X11) +EXTRA_PKG_CONFIG_DIRS = $(EXTRA_PKG_CONFIG_DIRS_$(X11)) + # We want libcairo to be linked with Xrender from $(prefix)/X11/lib not # $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4 -EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +#EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +#EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) # imagediff in testsuite needs -lsocket EXTRA_LDFLAGS = -lsocket -lnsl +prefix_cswx11 = $(BUILD_PREFIX)/X11 +prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX)) + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-full-testing --enable-xlib=yes --enable-xlib-xrender=yes --enable-ft=yes --with-x -CONFIGURE_ARGS += --enable-png=yes --enable-ps=yes --enable-pdf=yes --enable-svg=yes --enable-xcb=yes +CONFIGURE_ARGS += --disable-full-testing --enable-xlib=yes --enable-ft=yes --with-x +CONFIGURE_ARGS += --enable-png=yes --enable-ps=yes --enable-pdf=yes --enable-svg=yes CONFIGURE_ARGS += --enable-gtk-doc --enable-test-surfaces=yes -CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS_sunwx11 += --x-includes=/usr/openwin/include +CONFIGURE_ARGS_sunwx11 += --x-libraries=$(abspath /usr/openwin/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS_sunwx11 += --enable-xlib-xrender=no --enable-xcb=no +CONFIGURE_ARGS_cswx11 += --x-includes=$(prefix)/include +CONFIGURE_ARGS_cswx11 += --x-libraries=$(abspath $(prefix)/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS_cswx11 += --enable-xlib-xrender=yes --enable-xcb=yes +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(X11)) + +MERGE_SCRIPTS_isa-default-x11-sunwx11 = copy-all +MERGE_SCRIPTS_isa-default64-x11-sunwx11 = copy-relocated-only +MERGE_DIRS_isa-default64-x11-sunwx11 = $(libdir) +MERGE_SCRIPTS_isa-default-x11-cswx11 = copy-only +MERGE_DIRS_isa-default-x11-cswx11 = $(libdir) $(includedir) +MERGE_SCRIPTS_isa-default64-x11-cswx11 = copy-relocated-only +MERGE_DIRS_isa-default64-x11-cswx11 = $(libdir) + +PKGFILES_CSWlibcairodevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibcairodevel += $(docdir)/libcairo_devel/.* +PKGFILES_CSWlibcairodoc = $(sharedstatedir)/gtk-doc.* +PKGFILES_CSWlibcairodoc += $(docdir)/libcairo_doc/.* +PKGFILES_CSWcxlibcairo = $(call baseisadirs,/opt/csw/X11/lib,[^/]*\.so(\.\d+)*) +PKGFILES_CSWcxlibcairodevel = $(call baseisadirs,/opt/csw/X11/lib,pkgconfig(/.*)?) +PKGFILES_CSWcxlibcairodevel += /opt/csw/X11/include/.* + +ARCHALL_CSWlibcairodoc = 1 + +CHECKPKG_OVERRIDES_CSWlibcairo += linked-against-discouraged-library|libcairo.so.2.10800.10|libX11.so.4 +CHECKPKG_OVERRIDES_CSWlibcairo += linked-against-discouraged-library|libcairo.so.2.10800.10|libX11.so.4 +CHECKPKG_OVERRIDES_CSWlibcairodevel += surplus-dependency|CSWlibcairo +CHECKPKG_OVERRIDES_CSWcxlibcairodevel += surplus-dependency|CSWlibx11devel +CHECKPKG_OVERRIDES_CSWcxlibcairodevel += surplus-dependency|CSWcxlibcairo +CHECKPKG_OVERRIDES_CSWcxlibcairodevel += surplus-dependency|CSWlibxcbdevel +CHECKPKG_OVERRIDES_CSWcxlibcairodevel += surplus-dependency|CSWlibxrenderdevel + include gar/category.mk # configure have problems with non-gnu utilities Modified: csw/mgar/pkg/libcairo/branches/libcairo-x11-reloaded/checksums =================================================================== --- csw/mgar/pkg/libcairo/trunk/checksums 2010-04-28 02:45:39 UTC (rev 9786) +++ csw/mgar/pkg/libcairo/branches/libcairo-x11-reloaded/checksums 2010-04-30 14:50:38 UTC (rev 9795) @@ -1 +1 @@ -d3e1a1035ae563812d4dd44a74fb0dd0 download/cairo-1.8.8.tar.gz +b60a82f405f9400bbfdcf850b1728d25 cairo-1.8.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 Fri Apr 30 17:17:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Apr 2010 15:17:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[9796] csw/mgar/pkg/libcairo/branches/libcairo-x11-reloaded /Makefile Message-ID: Revision: 9796 http://gar.svn.sourceforge.net/gar/?rev=9796&view=rev Author: dmichelsen Date: 2010-04-30 15:17:39 +0000 (Fri, 30 Apr 2010) Log Message: ----------- libcairo-x11-reloaded: Update overrides Modified Paths: -------------- csw/mgar/pkg/libcairo/branches/libcairo-x11-reloaded/Makefile Modified: csw/mgar/pkg/libcairo/branches/libcairo-x11-reloaded/Makefile =================================================================== --- csw/mgar/pkg/libcairo/branches/libcairo-x11-reloaded/Makefile 2010-04-30 14:50:38 UTC (rev 9795) +++ csw/mgar/pkg/libcairo/branches/libcairo-x11-reloaded/Makefile 2010-04-30 15:17:39 UTC (rev 9796) @@ -100,6 +100,8 @@ CHECKPKG_OVERRIDES_CSWcxlibcairodevel += surplus-dependency|CSWcxlibcairo CHECKPKG_OVERRIDES_CSWcxlibcairodevel += surplus-dependency|CSWlibxcbdevel CHECKPKG_OVERRIDES_CSWcxlibcairodevel += surplus-dependency|CSWlibxrenderdevel +CHECKPKG_OVERRIDES_CSWlibcairo += soname-not-found|libm.so.2 +CHECKPKG_OVERRIDES_CSWcxlibcairo += soname-not-found|libm.so.2 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Apr 30 21:14:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 30 Apr 2010 19:14:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[9797] csw/mgar/pkg/file/trunk Message-ID: Revision: 9797 http://gar.svn.sourceforge.net/gar/?rev=9797&view=rev Author: wahwah Date: 2010-04-30 19:14:55 +0000 (Fri, 30 Apr 2010) Log Message: ----------- file: Trying to build Python bindings, it doesn't work. Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile csw/mgar/pkg/file/trunk/checksums Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2010-04-30 15:17:39 UTC (rev 9796) +++ csw/mgar/pkg/file/trunk/Makefile 2010-04-30 19:14:55 UTC (rev 9797) @@ -1,8 +1,7 @@ GARNAME = file -GARVERSION = 5.03 +GARVERSION = 5.04 CATEGORIES = utils -DESCRIPTION = A file type guesser define BLURB The file command is "a file type guesser", that is, a command-line tool that tells you in words what kind of data a file contains. Unlike most GUI systems, @@ -13,20 +12,23 @@ MASTER_SITES = ftp://ftp.astron.com/pub/file/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - SPKG_SOURCEURL = http://www.darwinsys.com/file/ - -RUNTIME_DEP_PKGS = CSWzlib - CONFIGURE_ARGS = $(DIRPATHS) - # These flags are not understood by Sun Studio CONFIGURE_ARGS += --disable-warnings - TEST_TARGET = check +PACKAGES = CSWfile CSWlibmagic CSWpy-magic +PKGFILES_CSWlibmagic = $(PKGFILES_RT) +PKGFILES_CSWpy-magic = later +SPKG_DESC_CSWfile = A file type guesser +SPKG_DESC_CSWlibmagic = The library behind file(1) +SPKG_DESC_CSWpy-magic = Python wrapper for libmagic +CATALOGNAME_CSWpy-magic = py_magic +RUNTIME_DEP_PKGS_CSWfile += CSWlibmagic +ARCHALL_CSWpy-magic = 1 +RUNTIME_DEP_PKGS_CSWfile += CSWzlib +RUNTIME_DEP_PKGS_CSWlibmagic += CSWzlib # The "file" util is used during stripbin. As the newly build binary # requires libmagic which is not installed yet we must not use the @@ -34,3 +36,13 @@ IGNORE_DESTDIR = 1 include gar/category.mk + +post-build-modulated-disabled: + # This fails for a mysterious reason. Can't find libmagic (-lmagic). + (cd $(WORKSRC)/python && python setup.py build) + @$(MAKECOOKIE) + +post-install-modulated: + (cd $(WORKSRC)/python && \ + python setup.py install) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/file/trunk/checksums =================================================================== --- csw/mgar/pkg/file/trunk/checksums 2010-04-30 15:17:39 UTC (rev 9796) +++ csw/mgar/pkg/file/trunk/checksums 2010-04-30 19:14:55 UTC (rev 9797) @@ -1 +1 @@ -d05f08a53e5c2f51f8ee6a4758c0cc53 file-5.03.tar.gz +accade81ff1cc774904b47c72c8aeea0 file-5.04.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.