From skayser at users.sourceforge.net Wed Apr 1 00:30:12 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 31 Mar 2009 22:30:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[4122] csw/mgar/pkg/cpan/Mail-IMAPClient/trunk Message-ID: Revision: 4122 http://gar.svn.sourceforge.net/gar/?rev=4122&view=rev Author: skayser Date: 2009-03-31 22:30:12 +0000 (Tue, 31 Mar 2009) Log Message: ----------- pm_mailimapclient: version bumped, changed to garv2 Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/Makefile csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/files/CSWpmmailimapclient.depend csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/files/CSWpmmailimapclient.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/ Property changes on: csw/mgar/pkg/cpan/Mail-IMAPClient/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/Makefile 2009-03-31 20:50:58 UTC (rev 4121) +++ csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/Makefile 2009-03-31 22:30:12 UTC (rev 4122) @@ -1,7 +1,7 @@ GARNAME = Mail-IMAPClient -GARVERSION = 2.2.9 +GARVERSION = 3.15 CATEGORIES = cpan -AUTHOR = DJKERNEN +AUTHOR = MARKOV DESCRIPTION = IMAP Client API define BLURB @@ -9,8 +9,14 @@ scripts to interact with IMAP message stores. endef -DISTFILES += CSWpmmailimapclient.gspec CSWpmmailimapclient.depend +PACKAGES = CSWpmmailimapclient +CATALOGNAME = pm_mailimapclient +ARCHALL = 1 -DEPENDS += cpan/Parse-RecDescent +LICENSE = COPYRIGHT +# Don't know about those yet +#DEPENDS += cpan/Parse-RecDescent +#DEPENDS += cpan/Digest-HMAC + include gar/category.mk Modified: csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/checksums 2009-03-31 20:50:58 UTC (rev 4121) +++ csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/checksums 2009-03-31 22:30:12 UTC (rev 4122) @@ -1,3 +1 @@ -29ea00ff47fc77d307f24efdf8ba40f8 download/CSWpmmailimapclient.gspec -737756fbcd7276890f88420cfd4760d5 download/CSWpmmailimapclient.depend -21c1901d55a2d57f73840cad478c665d download/Mail-IMAPClient-2.2.9.tar.gz +85450b57f77f92f8dda9ecf8ff046a1e download/Mail-IMAPClient-3.15.tar.gz Deleted: csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/files/CSWpmmailimapclient.depend =================================================================== --- csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/files/CSWpmmailimapclient.depend 2009-03-31 20:50:58 UTC (rev 4121) +++ csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/files/CSWpmmailimapclient.depend 2009-03-31 22:30:12 UTC (rev 4122) @@ -1 +0,0 @@ -P CSWpmparserecdescent pm_parserecdescent - %var bitname pm_parserecdescent Deleted: csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/files/CSWpmmailimapclient.gspec =================================================================== --- csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/files/CSWpmmailimapclient.gspec 2009-03-31 20:50:58 UTC (rev 4121) +++ csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/files/CSWpmmailimapclient.gspec 2009-03-31 22:30:12 UTC (rev 4122) @@ -1,5 +0,0 @@ -%var bitname pm_mailimapclient -%var pkgname CSWpmmailimapclient -%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 skayser at users.sourceforge.net Wed Apr 1 01:04:47 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 31 Mar 2009 23:04:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[4123] csw/mgar/pkg/cpan Message-ID: Revision: 4123 http://gar.svn.sourceforge.net/gar/?rev=4123&view=rev Author: skayser Date: 2009-03-31 23:04:47 +0000 (Tue, 31 Mar 2009) Log Message: ----------- File-Next: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/File-Next/ csw/mgar/pkg/cpan/File-Next/branches/ csw/mgar/pkg/cpan/File-Next/tags/ csw/mgar/pkg/cpan/File-Next/trunk/ csw/mgar/pkg/cpan/File-Next/trunk/Makefile csw/mgar/pkg/cpan/File-Next/trunk/checksums csw/mgar/pkg/cpan/File-Next/trunk/files/ Property changes on: csw/mgar/pkg/cpan/File-Next/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-Next/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-Next/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/File-Next/trunk/Makefile 2009-03-31 23:04:47 UTC (rev 4123) @@ -0,0 +1,18 @@ +GARNAME = File-Next +GARVERSION = 1.02 +CATEGORIES = cpan +AUTHOR = PETDANCE + +DESCRIPTION = File-finding iterator +define BLURB +File::Next is a lightweight, taint-safe file-finding module. It's lightweight +and has no non-core prerequisites. +endef + +PACKAGES = CSWpmfilenext +CATALOGNAME = pm_filenext +ARCHALL = 1 + +LICENSE = + +include gar/category.mk Added: csw/mgar/pkg/cpan/File-Next/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-Next/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/File-Next/trunk/checksums 2009-03-31 23:04:47 UTC (rev 4123) @@ -0,0 +1 @@ +ad2800827fd053f556e5e18fe9d50202 download/File-Next-1.02.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 Wed Apr 1 01:09:06 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 31 Mar 2009 23:09:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[4124] csw/mgar/pkg/cpan Message-ID: Revision: 4124 http://gar.svn.sourceforge.net/gar/?rev=4124&view=rev Author: skayser Date: 2009-03-31 23:09:06 +0000 (Tue, 31 Mar 2009) Log Message: ----------- ack: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/ack/ csw/mgar/pkg/cpan/ack/branches/ csw/mgar/pkg/cpan/ack/tags/ csw/mgar/pkg/cpan/ack/trunk/ csw/mgar/pkg/cpan/ack/trunk/Makefile csw/mgar/pkg/cpan/ack/trunk/checksums csw/mgar/pkg/cpan/ack/trunk/files/ Property changes on: csw/mgar/pkg/cpan/ack/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/ack/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/ack/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/ack/trunk/Makefile 2009-03-31 23:09:06 UTC (rev 4124) @@ -0,0 +1,19 @@ +GARNAME = ack +GARVERSION = 1.88 +CATEGORIES = cpan +AUTHOR = PETDANCE + +DESCRIPTION = A tool like grep, aimed at programmers +define BLURB +ack is a tool like grep, aimed at programmers with large trees of heterogeneous +source code. ack is written purely in Perl, and takes advantage of the power of +Perl's regular expressions. +endef + +PACKAGES = CSWack +CATALOGNAME = ack +ARCHALL = 1 + +LICENSE = COPYRIGHT + +include gar/category.mk Added: csw/mgar/pkg/cpan/ack/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/ack/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/ack/trunk/checksums 2009-03-31 23:09:06 UTC (rev 4124) @@ -0,0 +1 @@ +a1aad025ac94d582628ee72872d44c94 download/ack-1.88.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 Wed Apr 1 01:52:30 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 31 Mar 2009 23:52:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[4125] csw/mgar/pkg/cpan/ack/trunk/Makefile Message-ID: Revision: 4125 http://gar.svn.sourceforge.net/gar/?rev=4125&view=rev Author: skayser Date: 2009-03-31 23:52:30 +0000 (Tue, 31 Mar 2009) Log Message: ----------- ack: only install ack itself Modified Paths: -------------- csw/mgar/pkg/cpan/ack/trunk/Makefile Modified: csw/mgar/pkg/cpan/ack/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/ack/trunk/Makefile 2009-03-31 23:09:06 UTC (rev 4124) +++ csw/mgar/pkg/cpan/ack/trunk/Makefile 2009-03-31 23:52:30 UTC (rev 4125) @@ -3,17 +3,26 @@ CATEGORIES = cpan AUTHOR = PETDANCE -DESCRIPTION = A tool like grep, aimed at programmers +DESCRIPTION = grep-like text finder, aimed at programmers define BLURB -ack is a tool like grep, aimed at programmers with large trees of heterogeneous -source code. ack is written purely in Perl, and takes advantage of the power of -Perl's regular expressions. + ack is a tool like grep, aimed at programmers with large trees of + heterogeneous source code. ack is written purely in Perl, and takes + advantage of the power of Perl's regular expressions. endef PACKAGES = CSWack CATALOGNAME = ack ARCHALL = 1 -LICENSE = COPYRIGHT +LICENSE = +INSTALL_SCRIPTS = custom + include gar/category.mk + +install-custom: + @ginstall -d $(DESTDIR)$(bindir) + @ginstall -d $(DESTDIR)$(mandir)/man1 + @cp $(WORKSRC)/ack $(DESTDIR)$(bindir) + @pod2man --section=1 $(WORKSRC)/ack > $(DESTDIR)$(mandir)/man1/ack.1 + @$(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 Wed Apr 1 01:55:01 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 31 Mar 2009 23:55:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[4126] csw/mgar/pkg/cvsps/trunk/Makefile Message-ID: Revision: 4126 http://gar.svn.sourceforge.net/gar/?rev=4126&view=rev Author: bdwalton Date: 2009-03-31 23:55:01 +0000 (Tue, 31 Mar 2009) Log Message: ----------- apply RPATH correction to address mantis #3528 Modified Paths: -------------- csw/mgar/pkg/cvsps/trunk/Makefile Modified: csw/mgar/pkg/cvsps/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvsps/trunk/Makefile 2009-03-31 23:52:30 UTC (rev 4125) +++ csw/mgar/pkg/cvsps/trunk/Makefile 2009-03-31 23:55:01 UTC (rev 4126) @@ -32,6 +32,9 @@ TEST_SCRIPTS = +# to fix mantis bug #3528 +RUNPATHQUOTE = 1 + CONFIGURE_ARGS = $(DIRPATHS) --with-zlib=/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 bdwalton at users.sourceforge.net Wed Apr 1 02:17:10 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 01 Apr 2009 00:17:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[4127] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 4127 http://gar.svn.sourceforge.net/gar/?rev=4127&view=rev Author: bdwalton Date: 2009-04-01 00:17:10 +0000 (Wed, 01 Apr 2009) Log Message: ----------- address mantis bug #3539 (improperly quoted RPATH) Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-03-31 23:55:01 UTC (rev 4126) +++ csw/mgar/pkg/git/trunk/Makefile 2009-04-01 00:17:10 UTC (rev 4127) @@ -94,6 +94,9 @@ # software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +# properly quote RPATH to address mantis bug #3539 +RUNPATHQUOTE = 1 + CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash CONFIGURE_ARGS += --with-perl=$(bindir)/perl CONFIGURE_ARGS += --with-tcltk=$(bindir)/wish This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Apr 1 14:36:16 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 01 Apr 2009 12:36:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[4128] csw/mgar/pkg/cpan/ack/trunk/Makefile Message-ID: Revision: 4128 http://gar.svn.sourceforge.net/gar/?rev=4128&view=rev Author: skayser Date: 2009-04-01 12:36:16 +0000 (Wed, 01 Apr 2009) Log Message: ----------- ack: added license and changelog Modified Paths: -------------- csw/mgar/pkg/cpan/ack/trunk/Makefile Modified: csw/mgar/pkg/cpan/ack/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/ack/trunk/Makefile 2009-04-01 00:17:10 UTC (rev 4127) +++ csw/mgar/pkg/cpan/ack/trunk/Makefile 2009-04-01 12:36:16 UTC (rev 4128) @@ -14,8 +14,6 @@ CATALOGNAME = ack ARCHALL = 1 -LICENSE = - INSTALL_SCRIPTS = custom include gar/category.mk @@ -23,6 +21,12 @@ install-custom: @ginstall -d $(DESTDIR)$(bindir) @ginstall -d $(DESTDIR)$(mandir)/man1 + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @cp $(WORKSRC)/ack $(DESTDIR)$(bindir) @pod2man --section=1 $(WORKSRC)/ack > $(DESTDIR)$(mandir)/man1/ack.1 + @cp $(WORKSRC)/Changes $(DESTDIR)$(docdir)/$(GARNAME)/changelog @$(MAKECOOKIE) + +pre-merge-modulated: + @$(WORKSRC)/ack --version | sed -n '/^Copyright/,$$p' > $(WORKSRC)/COPYING + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Apr 1 18:50:50 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 01 Apr 2009 16:50:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[4129] csw/mgar/pkg Message-ID: Revision: 4129 http://gar.svn.sourceforge.net/gar/?rev=4129&view=rev Author: skayser Date: 2009-04-01 16:50:50 +0000 (Wed, 01 Apr 2009) Log Message: ----------- vttest: initial commit Added Paths: ----------- csw/mgar/pkg/vttest/ csw/mgar/pkg/vttest/branches/ csw/mgar/pkg/vttest/tags/ csw/mgar/pkg/vttest/trunk/ csw/mgar/pkg/vttest/trunk/Makefile csw/mgar/pkg/vttest/trunk/checksums csw/mgar/pkg/vttest/trunk/files/ Property changes on: csw/mgar/pkg/vttest/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/vttest/trunk/Makefile =================================================================== --- csw/mgar/pkg/vttest/trunk/Makefile (rev 0) +++ csw/mgar/pkg/vttest/trunk/Makefile 2009-04-01 16:50:50 UTC (rev 4129) @@ -0,0 +1,25 @@ +GARNAME = vttest +GARVERSION = 20071216 +CATEGORIES = utils + +DESCRIPTION = Tool for testing VT100 compatibility of terminals +define BLURB +This is a program to test the compatibility (or to demonstrate the +non-compatibility) of so-called "VT100-compatible" terminals. Additional tests +(past version 1.7) are provided for analysis of vt220, vt420 terminals, as well +as variants of xterm. +endef + +MASTER_SITES = ftp://invisible-island.net/vttest/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz + +UFILES_REGEX = $(GARNAME)-(\d+).tgz + +TEST_SCRIPTS = + +CONFIGURE_ARGS = $(DIRPATHS) + +# No RUNPATH needed, vttest only links against system libs +LINKER_FLAGS = + +include gar/category.mk Added: csw/mgar/pkg/vttest/trunk/checksums =================================================================== --- csw/mgar/pkg/vttest/trunk/checksums (rev 0) +++ csw/mgar/pkg/vttest/trunk/checksums 2009-04-01 16:50:50 UTC (rev 4129) @@ -0,0 +1 @@ +490cebc85e531c833dcf14c32790184b download/vttest-20071216.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 19:01:21 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 17:01:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[4131] csw/mgar/pkg/chrpath/trunk/ Message-ID: Revision: 4131 http://gar.svn.sourceforge.net/gar/?rev=4131&view=rev Author: valholla Date: 2009-04-01 17:01:20 +0000 (Wed, 01 Apr 2009) Log Message: ----------- svnprop garv2 checkin Property Changed: ---------------- csw/mgar/pkg/chrpath/trunk/ Property changes on: csw/mgar/pkg/chrpath/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 19:00:29 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 17:00:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[4130] csw/mgar/pkg Message-ID: Revision: 4130 http://gar.svn.sourceforge.net/gar/?rev=4130&view=rev Author: valholla Date: 2009-04-01 17:00:29 +0000 (Wed, 01 Apr 2009) Log Message: ----------- initial checkin Added Paths: ----------- csw/mgar/pkg/chrpath/ csw/mgar/pkg/chrpath/Makefile csw/mgar/pkg/chrpath/branches/ csw/mgar/pkg/chrpath/tags/ csw/mgar/pkg/chrpath/trunk/ csw/mgar/pkg/chrpath/trunk/Makefile csw/mgar/pkg/chrpath/trunk/checksums csw/mgar/pkg/chrpath/trunk/files/ csw/mgar/pkg/chrpath/trunk/files/chrpath_0.13-2.diff Added: csw/mgar/pkg/chrpath/Makefile =================================================================== --- csw/mgar/pkg/chrpath/Makefile (rev 0) +++ csw/mgar/pkg/chrpath/Makefile 2009-04-01 17:00:29 UTC (rev 4130) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/chrpath/trunk/Makefile =================================================================== --- csw/mgar/pkg/chrpath/trunk/Makefile (rev 0) +++ csw/mgar/pkg/chrpath/trunk/Makefile 2009-04-01 17:00:29 UTC (rev 4130) @@ -0,0 +1,40 @@ +GARNAME = chrpath +GARVERSION = 0.13 +CATEGORIES = utils + +DESCRIPTION = A program to fix/change runpaths +define BLURB +endef + +MASTER_SITES = http://directory.fsf.org/project/chrpath/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWchrpath +CATALOGNAME_CSWchrpath = chrpath +SPKG_DESC_CSWchrpath = $(DESCRIPTION) + +PATCHFILES = chrpath_0.13-2.diff +PATCHDIR = $(WORKSRC) + + +# We define upstream file regex so we can be notifed of +# new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +NOISALIST = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +## There are no tests for this +## runtest.ksh is broken manual test required +TEST_SCRIPTS = skip + +test-skip: + $(DONADA) + +post-configure-modulated: + @(perl -i -plne 's|docdir = .*|docdir = $(prefix)/share/doc/$(GARNAME)|'\ + $(WORKSRC)/Makefile) + +include gar/category.mk Added: csw/mgar/pkg/chrpath/trunk/checksums =================================================================== --- csw/mgar/pkg/chrpath/trunk/checksums (rev 0) +++ csw/mgar/pkg/chrpath/trunk/checksums 2009-04-01 17:00:29 UTC (rev 4130) @@ -0,0 +1,2 @@ +b73072a8fbba277558c50364b65bb407 download/chrpath-0.13.tar.gz +963e8a8a27f91bf1f7a37c66750f60d7 download/chrpath_0.13-2.diff Added: csw/mgar/pkg/chrpath/trunk/files/chrpath_0.13-2.diff =================================================================== --- csw/mgar/pkg/chrpath/trunk/files/chrpath_0.13-2.diff (rev 0) +++ csw/mgar/pkg/chrpath/trunk/files/chrpath_0.13-2.diff 2009-04-01 17:00:29 UTC (rev 4130) @@ -0,0 +1,8899 @@ +--- chrpath-0.13.orig/Makefile.in ++++ chrpath-0.13/Makefile.in +@@ -1,6 +1,8 @@ +-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am ++# Makefile.in generated by automake 1.8.5 from Makefile.am. ++# @configure_input@ + +-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -10,75 +12,189 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + ++ at SET_MAKE@ + +-SHELL = @SHELL@ ++ ++SOURCES = $(chrpath_SOURCES) + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +-prefix = @prefix@ +-exec_prefix = @exec_prefix@ +- +-bindir = @bindir@ +-sbindir = @sbindir@ +-libexecdir = @libexecdir@ +-datadir = @datadir@ +-sysconfdir = @sysconfdir@ +-sharedstatedir = @sharedstatedir@ +-localstatedir = @localstatedir@ +-libdir = @libdir@ +-infodir = @infodir@ +-mandir = @mandir@ +-includedir = @includedir@ +-oldincludedir = /usr/include +- +-DESTDIR = +- + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +- + top_builddir = . +- +-ACLOCAL = @ACLOCAL@ +-AUTOCONF = @AUTOCONF@ +-AUTOMAKE = @AUTOMAKE@ +-AUTOHEADER = @AUTOHEADER@ +- ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + INSTALL = @INSTALL@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +-INSTALL_DATA = @INSTALL_DATA@ +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ +-transform = @program_transform_name@ +- ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) + NORMAL_INSTALL = : + PRE_INSTALL = : + POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++host_triplet = @host@ ++bin_PROGRAMS = chrpath$(EXEEXT) ++DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ ++ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ ++ config.guess config.sub depcomp install-sh ltmain.sh missing \ ++ mkinstalldirs ++subdir = . ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ++ configure.lineno configure.status.lineno ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)" ++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ++PROGRAMS = $(bin_PROGRAMS) ++am_chrpath_OBJECTS = chrpath.$(OBJEXT) killrpath.$(OBJEXT) \ ++ main.$(OBJEXT) elf.$(OBJEXT) ++chrpath_OBJECTS = $(am_chrpath_OBJECTS) ++chrpath_LDADD = $(LDADD) ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I. ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/chrpath.Po ./$(DEPDIR)/elf.Po \ ++ at AMDEP_TRUE@ ./$(DEPDIR)/killrpath.Po ./$(DEPDIR)/main.Po ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++SOURCES = $(chrpath_SOURCES) ++DIST_SOURCES = $(chrpath_SOURCES) ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-exec-recursive install-info-recursive \ ++ install-recursive installcheck-recursive installdirs-recursive \ ++ pdf-recursive ps-recursive uninstall-info-recursive \ ++ uninstall-recursive ++man1dir = $(mandir)/man1 ++NROFF = nroff ++MANS = $(man_MANS) ++docDATA_INSTALL = $(INSTALL_DATA) ++DATA = $(doc_DATA) ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++distdir = $(PACKAGE)-$(VERSION) ++top_distdir = $(distdir) ++am__remove_distdir = \ ++ { test ! -d $(distdir) \ ++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr $(distdir); }; } ++DIST_ARCHIVES = $(distdir).tar.gz ++GZIP_ENV = --best ++distuninstallcheck_listfiles = find . -type f -print ++distcleancheck_listfiles = find . -type f -print ++ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ ++AMTAR = @AMTAR@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ + CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++LDFLAGS = @LDFLAGS@ + LDRPATH = @LDRPATH@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ ++LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++STRIP = @STRIP@ + VERSION = @VERSION@ +- ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_STRIP = @ac_ct_STRIP@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++datadir = @datadir@ ++exec_prefix = @exec_prefix@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++sysconfdir = @sysconfdir@ ++target = @target@ ++target_alias = @target_alias@ ++target_cpu = @target_cpu@ ++target_os = @target_os@ ++target_vendor = @target_vendor@ + SUBDIRS = testsuite deb +- + docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION) +- + doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README +- +-bin_PROGRAMS = chrpath +- + man_MANS = chrpath.1 +- +-chrpath_SOURCES = chrpath.c killrpath.c main.c elf.c protos.h +- ++chrpath_SOURCES = \ ++ chrpath.c \ ++ killrpath.c \ ++ main.c \ ++ elf.c \ ++ protos.h + + EXTRA_DIST = ChangeLog.usermap $(man_MANS) +- + CLEANFILES = *.bb *.bbg *.da *.gcov testsuite/*.bb testsuite/*.bbg + + # ChangeLog autogenerated from CVS log messages +@@ -90,142 +206,121 @@ + # --usermap ... Make usernames with names/emails in given file + # --ignore ChangeLog Don't log changes to the ChangeLog itself + CVS2CL = cvs2cl +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = +-PROGRAMS = $(bin_PROGRAMS) +- +- +-DEFS = @DEFS@ -I. -I$(srcdir) -I. +-CPPFLAGS = @CPPFLAGS@ +-LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ +-chrpath_OBJECTS = chrpath.o killrpath.o main.o elf.o +-chrpath_LDADD = $(LDADD) +-chrpath_DEPENDENCIES = +-chrpath_LDFLAGS = +-CFLAGS = @CFLAGS@ +-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +-man1dir = $(mandir)/man1 +-MANS = $(man_MANS) +- +-NROFF = nroff +-DATA = $(doc_DATA) +- +-DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ +-Makefile.am Makefile.in NEWS acinclude.m4 aclocal.m4 config.guess \ +-config.h.in config.sub configure configure.ac install-sh ltmain.sh \ +-missing mkinstalldirs +- +- +-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +- +-TAR = tar +-GZIP_ENV = --best +-SOURCES = $(chrpath_SOURCES) +-OBJECTS = $(chrpath_OBJECTS) ++all: config.h ++ $(MAKE) $(AM_MAKEFLAGS) all-recursive + +-all: all-redirect + .SUFFIXES: +-.SUFFIXES: .S .c .o .s +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile +- +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) \ +- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status +- +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac acinclude.m4 +- cd $(srcdir) && $(ACLOCAL) ++.SUFFIXES: .c .o .obj ++am--refresh: ++ @: ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ ++ cd $(srcdir) && $(AUTOMAKE) --gnu \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ echo ' $(SHELL) ./config.status'; \ ++ $(SHELL) ./config.status;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ ++ esac; + +-config.status: $(srcdir)/configure.ac $(CONFIG_STATUS_DEPENDENCIES) ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + +-config.h: stamp-h ++config.h: stamp-h1 + @if test ! -f $@; then \ +- rm -f stamp-h; \ +- $(MAKE) stamp-h; \ ++ rm -f stamp-h1; \ ++ $(MAKE) stamp-h1; \ + else :; fi +-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status +- cd $(top_builddir) \ +- && CONFIG_FILES= CONFIG_HEADERS=config.h \ +- $(SHELL) ./config.status +- @echo timestamp > stamp-h 2> /dev/null +-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in +- @if test ! -f $@; then \ +- rm -f $(srcdir)/stamp-h.in; \ +- $(MAKE) $(srcdir)/stamp-h.in; \ +- else :; fi +-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOHEADER) +- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null +- +-mostlyclean-hdr: + +-clean-hdr: ++stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status ++ @rm -f stamp-h1 ++ cd $(top_builddir) && $(SHELL) ./config.status config.h ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_srcdir) && $(AUTOHEADER) ++ rm -f stamp-h1 ++ touch $@ + + distclean-hdr: +- -rm -f config.h +- +-maintainer-clean-hdr: +- +-mostlyclean-binPROGRAMS: +- +-clean-binPROGRAMS: +- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +- +-distclean-binPROGRAMS: +- +-maintainer-clean-binPROGRAMS: +- ++ -rm -f config.h stamp-h1 + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(bindir) ++ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- if test -f $$p; then \ +- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ +- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ ++ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ if test -f $$p \ ++ ; then \ ++ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + + uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) +- list='$(bin_PROGRAMS)'; for p in $$list; do \ +- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ ++ @list='$(bin_PROGRAMS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + +-.c.o: +- $(COMPILE) -c $< +- +-.s.o: +- $(COMPILE) -c $< +- +-.S.o: +- $(COMPILE) -c $< ++clean-binPROGRAMS: ++ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) ++chrpath$(EXEEXT): $(chrpath_OBJECTS) $(chrpath_DEPENDENCIES) ++ @rm -f chrpath$(EXEEXT) ++ $(LINK) $(chrpath_LDFLAGS) $(chrpath_OBJECTS) $(chrpath_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.o core *.core +- +-clean-compile: ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c + +-maintainer-clean-compile: ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/chrpath.Po at am__quote@ ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/elf.Po at am__quote@ ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/killrpath.Po at am__quote@ ++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@ + +-chrpath: $(chrpath_OBJECTS) $(chrpath_DEPENDENCIES) +- @rm -f chrpath +- $(LINK) $(chrpath_LDFLAGS) $(chrpath_OBJECTS) $(chrpath_LDADD) $(LIBS) +- +-install-man1: +- $(mkinstalldirs) $(DESTDIR)$(man1dir) +- @list='$(man1_MANS)'; \ +- l2='$(man_MANS)'; for i in $$l2; do \ ++.c.o: ++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ at am__fastdepCC_FALSE@ $(COMPILE) -c $< ++ ++.c.obj: ++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ ++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` ++uninstall-info-am: ++install-man1: $(man1_MANS) $(man_MANS) ++ @$(NORMAL_INSTALL) ++ test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" ++ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ ++ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ ++ for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ +@@ -234,50 +329,53 @@ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ ++ case "$$ext" in \ ++ 1*) ;; \ ++ *) ext='1' ;; \ ++ esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ ++ inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ +- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ ++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +- + uninstall-man1: +- @list='$(man1_MANS)'; \ +- l2='$(man_MANS)'; for i in $$l2; do \ ++ @$(NORMAL_UNINSTALL) ++ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ ++ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ ++ for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ ++ case "$$ext" in \ ++ 1*) ;; \ ++ *) ext='1' ;; \ ++ esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ ++ inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ +- rm -f $(DESTDIR)$(man1dir)/$$inst; \ ++ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done +-install-man: $(MANS) +- @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-man1 +-uninstall-man: +- @$(NORMAL_UNINSTALL) +- $(MAKE) $(AM_MAKEFLAGS) uninstall-man1 +- + install-docDATA: $(doc_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(docdir) ++ test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" + @list='$(doc_DATA)'; for p in $$list; do \ +- if test -f $(srcdir)/$$p; then \ +- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p"; \ +- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \ +- else if test -f $$p; then \ +- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \ +- $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \ +- fi; fi; \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ ++ $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ + done + + uninstall-docDATA: + @$(NORMAL_UNINSTALL) +- list='$(doc_DATA)'; for p in $$list; do \ +- rm -f $(DESTDIR)$(docdir)/$$p; \ ++ @list='$(doc_DATA)'; for p in $$list; do \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(docdir)/$$f"; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -286,13 +384,8 @@ + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. +- +- at SET_MAKE@ +- +-all-recursive install-data-recursive install-exec-recursive \ +-installdirs-recursive install-recursive uninstall-recursive \ +-check-recursive installcheck-recursive info-recursive dvi-recursive: +- @set fnord $(MAKEFLAGS); amf=$$2; \ ++$(RECURSIVE_TARGETS): ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -312,13 +405,18 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @set fnord $(MAKEFLAGS); amf=$$2; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ +- rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ +- rev="$$subdir $$rev"; \ +- test "$$subdir" = "." && dot_seen=yes; \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ rev=''; for subdir in $$list; do \ ++ if test "$$subdir" = "."; then :; else \ ++ rev="$$subdir $$rev"; \ ++ fi; \ + done; \ +- test "$$dot_seen" = "no" && rev=". $$rev"; \ ++ rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ +@@ -334,189 +432,318 @@ + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done ++ctags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ done + +-tags: TAGS +- +-ID: $(HEADERS) $(SOURCES) $(LISP) +- list='$(SOURCES) $(HEADERS)'; \ +- unique=`for i in $$list; do echo $$i; done | \ +- awk ' { files[$$0] = 1; } \ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- here=`pwd` && cd $(srcdir) \ +- && mkid -f$$here/ID $$unique $(LISP) ++ mkid -fID $$unique ++tags: TAGS + +-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) ++TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ include_option=--etags-include; \ ++ empty_fix=.; \ ++ else \ ++ include_option=--include; \ ++ empty_fix=; \ ++ fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ +- fi; \ ++ if test "$$subdir" = .; then :; else \ ++ test ! -f $$subdir/TAGS || \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ fi; \ + done; \ +- list='$(SOURCES) $(HEADERS)'; \ +- unique=`for i in $$list; do echo $$i; done | \ +- awk ' { files[$$0] = 1; } \ ++ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ +- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) +- +-mostlyclean-tags: +- +-clean-tags: ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi ++ctags: CTAGS ++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$tags $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: +- -rm -f TAGS ID +- +-maintainer-clean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +-distdir = $(PACKAGE)-$(VERSION) +-top_distdir = $(distdir) +- +-# This target untars the dist file and tries a VPATH configuration. Then +-# it guarantees that the distribution is self-contained by making another +-# tarfile. +-distcheck: dist +- -rm -rf $(distdir) +- GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz +- mkdir $(distdir)/=build +- mkdir $(distdir)/=inst +- dc_install_base=`cd $(distdir)/=inst && pwd`; \ +- cd $(distdir)/=build \ +- && ../configure --srcdir=.. --prefix=$$dc_install_base \ +- && $(MAKE) $(AM_MAKEFLAGS) \ +- && $(MAKE) $(AM_MAKEFLAGS) dvi \ +- && $(MAKE) $(AM_MAKEFLAGS) check \ +- && $(MAKE) $(AM_MAKEFLAGS) install \ +- && $(MAKE) $(AM_MAKEFLAGS) installcheck \ +- && $(MAKE) $(AM_MAKEFLAGS) dist +- -rm -rf $(distdir) +- @banner="$(distdir).tar.gz is ready for distribution"; \ +- dashes=`echo "$$banner" | sed s/./=/g`; \ +- echo "$$dashes"; \ +- echo "$$banner"; \ +- echo "$$dashes" +-dist: distdir +- -chmod -R a+r $(distdir) +- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) +- -rm -rf $(distdir) +-dist-all: distdir +- -chmod -R a+r $(distdir) +- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) +- -rm -rf $(distdir) + distdir: $(DISTFILES) +- -rm -rf $(distdir) ++ $(am__remove_distdir) + mkdir $(distdir) +- -chmod 777 $(distdir) +- @for file in $(DISTFILES); do \ +- d=$(srcdir); \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkdir_p) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ + if test -d $$d/$$file; then \ +- cp -pr $$d/$$file $(distdir)/$$file; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ + fi; \ + done +- for subdir in $(SUBDIRS); do \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d $(distdir)/$$subdir \ +- || mkdir $(distdir)/$$subdir \ ++ test -d "$(distdir)/$$subdir" \ ++ || mkdir "$(distdir)/$$subdir" \ + || exit 1; \ +- chmod 777 $(distdir)/$$subdir; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ ++ (cd $$subdir && \ ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="../$(top_distdir)" \ ++ distdir="../$(distdir)/$$subdir" \ ++ distdir) \ + || exit 1; \ + fi; \ + done +-chrpath.o: chrpath.c config.h protos.h +-elf.o: elf.c config.h protos.h +-killrpath.o: killrpath.c config.h protos.h +-main.o: main.c config.h protos.h ++ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ++ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ++ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ++ || chmod -R a+r $(distdir) ++dist-gzip: distdir ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(am__remove_distdir) ++ ++dist-bzip2: distdir ++ $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 ++ $(am__remove_distdir) ++ ++dist-tarZ: distdir ++ $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z ++ $(am__remove_distdir) ++ ++dist-shar: distdir ++ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz ++ $(am__remove_distdir) ++ ++dist-zip: distdir ++ -rm -f $(distdir).zip ++ zip -rq $(distdir).zip $(distdir) ++ $(am__remove_distdir) ++ ++dist dist-all: distdir ++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(am__remove_distdir) + +-info-am: +-info: info-recursive +-dvi-am: +-dvi: dvi-recursive ++# This target untars the dist file and tries a VPATH configuration. Then ++# it guarantees that the distribution is self-contained by making another ++# tarfile. ++distcheck: dist ++ case '$(DIST_ARCHIVES)' in \ ++ *.tar.gz*) \ ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ ++ *.tar.bz2*) \ ++ bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ ++ *.tar.Z*) \ ++ uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ ++ *.shar.gz*) \ ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ *.zip*) \ ++ unzip $(distdir).zip ;;\ ++ esac ++ chmod -R a-w $(distdir); chmod a+w $(distdir) ++ mkdir $(distdir)/_build ++ mkdir $(distdir)/_inst ++ chmod a-w $(distdir) ++ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ ++ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ ++ && cd $(distdir)/_build \ ++ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ ++ $(DISTCHECK_CONFIGURE_FLAGS) \ ++ && $(MAKE) $(AM_MAKEFLAGS) \ ++ && $(MAKE) $(AM_MAKEFLAGS) dvi \ ++ && $(MAKE) $(AM_MAKEFLAGS) check \ ++ && $(MAKE) $(AM_MAKEFLAGS) install \ ++ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ++ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ ++ distuninstallcheck \ ++ && chmod -R a-w "$$dc_install_base" \ ++ && ({ \ ++ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ ++ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ ++ } || { rm -rf "$$dc_destdir"; exit 1; }) \ ++ && rm -rf "$$dc_destdir" \ ++ && $(MAKE) $(AM_MAKEFLAGS) dist \ ++ && rm -rf $(DIST_ARCHIVES) \ ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck ++ $(am__remove_distdir) ++ @(echo "$(distdir) archives ready for distribution: "; \ ++ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ ++ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' ++distuninstallcheck: ++ @cd $(distuninstallcheck_dir) \ ++ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ ++ || { echo "ERROR: files left after uninstall:" ; \ ++ if test -n "$(DESTDIR)"; then \ ++ echo " (check DESTDIR support)"; \ ++ fi ; \ ++ $(distuninstallcheck_listfiles) ; \ ++ exit 1; } >&2 ++distcleancheck: distclean ++ @if test '$(srcdir)' = . ; then \ ++ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ ++ exit 1 ; \ ++ fi ++ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ++ || { echo "ERROR: files left in build directory after distclean:" ; \ ++ $(distcleancheck_listfiles) ; \ ++ exit 1; } >&2 + check-am: all-am + check: check-recursive +-installcheck-am: +-installcheck: installcheck-recursive +-all-recursive-am: config.h +- $(MAKE) $(AM_MAKEFLAGS) all-recursive +- +-install-exec-am: install-binPROGRAMS ++all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h ++installdirs: installdirs-recursive ++installdirs-am: ++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"; do \ ++ test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ done ++install: install-recursive + install-exec: install-exec-recursive +- +-install-data-am: install-man install-docDATA + install-data: install-data-recursive ++uninstall: uninstall-recursive + + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +-install: install-recursive +-uninstall-am: uninstall-binPROGRAMS uninstall-man uninstall-docDATA +-uninstall: uninstall-recursive +-all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h +-all-redirect: all-recursive-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +-installdirs: installdirs-recursive +-installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 \ +- $(DESTDIR)$(docdir) +- + ++installcheck: installcheck-recursive ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic: + + clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f Makefile $(CONFIG_CLEAN_FILES) +- -rm -f config.cache config.log stamp-h stamp-h[0-9]* ++ -rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: +-mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ +- mostlyclean-compile mostlyclean-tags \ +- mostlyclean-generic ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-recursive + +-mostlyclean: mostlyclean-recursive ++clean-am: clean-binPROGRAMS clean-generic mostlyclean-am + +-clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \ +- clean-generic mostlyclean-am ++distclean: distclean-recursive ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++distclean-am: clean-am distclean-compile distclean-generic \ ++ distclean-hdr distclean-tags + +-clean: clean-recursive ++dvi: dvi-recursive + +-distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \ +- distclean-tags distclean-generic clean-am ++dvi-am: + +-distclean: distclean-recursive +- -rm -f config.status ++html: html-recursive + +-maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ +- maintainer-clean-compile maintainer-clean-tags \ +- maintainer-clean-generic distclean-am +- @echo "This command is intended for maintainers to use;" +- @echo "it deletes files that may require special tools to rebuild." ++info: info-recursive ++ ++info-am: ++ ++install-data-am: install-docDATA install-man ++ ++install-exec-am: install-binPROGRAMS ++ ++install-info: install-info-recursive ++ ++install-man: install-man1 ++ ++installcheck-am: + + maintainer-clean: maintainer-clean-recursive +- -rm -f config.status ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -rf $(top_srcdir)/autom4te.cache ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic + +-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ +-mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ +-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ +-mostlyclean-compile distclean-compile clean-compile \ +-maintainer-clean-compile install-man1 uninstall-man1 install-man \ +-uninstall-man uninstall-docDATA install-docDATA install-data-recursive \ +-uninstall-data-recursive install-exec-recursive \ +-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +-all-recursive check-recursive installcheck-recursive info-recursive \ +-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ +-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ +-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +-dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ +-install-exec-am install-exec install-data-am install-data install-am \ +-install uninstall-am uninstall all-redirect all-am all installdirs-am \ +-installdirs mostlyclean-generic distclean-generic clean-generic \ +-maintainer-clean-generic clean mostlyclean distclean maintainer-clean ++mostlyclean: mostlyclean-recursive ++ ++mostlyclean-am: mostlyclean-compile mostlyclean-generic ++ ++pdf: pdf-recursive ++ ++pdf-am: ++ ++ps: ps-recursive ++ ++ps-am: ++ ++uninstall-am: uninstall-binPROGRAMS uninstall-docDATA \ ++ uninstall-info-am uninstall-man ++ ++uninstall-info: uninstall-info-recursive ++ ++uninstall-man: uninstall-man1 ++ ++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ ++ check-am clean clean-binPROGRAMS clean-generic clean-recursive \ ++ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ ++ dist-shar dist-tarZ dist-zip distcheck distclean \ ++ distclean-compile distclean-generic distclean-hdr \ ++ distclean-recursive distclean-tags distcleancheck distdir \ ++ distuninstallcheck dvi dvi-am html html-am info info-am \ ++ install install-am install-binPROGRAMS install-data \ ++ install-data-am install-docDATA install-exec install-exec-am \ ++ install-info install-info-am install-man install-man1 \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am \ ++ uninstall-binPROGRAMS uninstall-docDATA uninstall-info-am \ ++ uninstall-man uninstall-man1 + + + debs: +@@ -526,7 +753,6 @@ + log: ChangeLog.usermap + $(CVS2CL) -b --gmt --log-opts "-d'2001-01-01< now'" --window 7200 \ + --usermap ChangeLog.usermap --ignore ChangeLog -f ChangeLog +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +--- chrpath-0.13.orig/acinclude.m4 ++++ chrpath-0.13/acinclude.m4 +@@ -22,7 +22,7 @@ + AC_DEFUN(CHRPATH_LDRPATH_OPTION, + [AC_REQUIRE([AC_CANONICAL_TARGET])[]dnl + case "$target" in +- *-linux*) ++ *-linux*|*-gnu*|*-k*bsd*-gnu) + LDRPATH=-Wl,-rpath, + ;; + *-*-irix*|*-*-osf*) +--- chrpath-0.13.orig/aclocal.m4 ++++ chrpath-0.13/aclocal.m4 +@@ -1,115 +1,916 @@ +-dnl aclocal.m4 generated automatically by aclocal 1.4-p4 ++# generated automatically by aclocal 1.8.5 -*- Autoconf -*- + +-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +-dnl This file is free software; the Free Software Foundation +-dnl gives unlimited permission to copy and/or distribute it, +-dnl with or without modifications, as long as this notice is preserved. +- +-dnl This program is distributed in the hope that it will be useful, +-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-dnl PARTICULAR PURPOSE. +- +-dnl +-dnl Add macros +-dnl JAPHAR_GREP_CFLAGS +-dnl +- +-dnl +-dnl JAPHAR_GREP_CFLAGS(flag, cmd_if_missing, cmd_if_present) +-dnl +-dnl From Japhar. Report changes to japhar at hungry.com +-dnl +-AC_DEFUN(JAPHAR_GREP_CFLAGS, +-[case "$CFLAGS" in +-"$1" | "$1 "* | *" $1" | *" $1 "* ) +- ifelse($#, 3, [$3], [:]) +- ;; +-*) +- $2 +- ;; +-esac +-]) +- +-AC_DEFUN(CHRPATH_LDRPATH_OPTION, +-[AC_REQUIRE([AC_CANONICAL_TARGET])[]dnl +-case "$target" in +- *-linux*) +- LDRPATH=-Wl,-rpath, +- ;; +- *-*-irix*|*-*-osf*) +- LDRPATH="-rpath " +- ;; +- *-*-hpux*) +- # Hm, this seem to set runpath on ia64, not rpath +- LDRPATH="-Wl,+b," +- ;; +- *-*-darwin*) +- # No idea how to add rpath/runpath on Darwin +- LDRPATH="" +- ;; +- *) +- LDRPATH="-R " +- ;; +-esac +-AC_SUBST(LDRPATH) +-]) +- +-# Do all the work for Automake. This macro actually does too much -- +-# some checks are only needed if your package does certain things. +-# But this isn't really a big deal. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 ++# Free Software Foundation, Inc. ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++# -*- Autoconf -*- ++# Copyright (C) 2002, 2003 Free Software Foundation, Inc. ++# Generated from amversion.in; do not edit by hand. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++ ++# AM_AUTOMAKE_VERSION(VERSION) ++# ---------------------------- ++# Automake X.Y traces this macro to ensure aclocal.m4 has been ++# generated from the m4 files accompanying Automake X.Y. ++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) ++ ++# AM_SET_CURRENT_AUTOMAKE_VERSION ++# ------------------------------- ++# Call AM_AUTOMAKE_VERSION so it can be traced. ++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ++ [AM_AUTOMAKE_VERSION([1.8.5])]) ++ ++# AM_AUX_DIR_EXPAND ++ ++# Copyright (C) 2001, 2003 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets ++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to ++# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++# ++# Of course, Automake must honor this variable whenever it calls a ++# tool from the auxiliary directory. The problem is that $srcdir (and ++# therefore $ac_aux_dir as well) can be either absolute or relative, ++# depending on how configure is run. This is pretty annoying, since ++# it makes $ac_aux_dir quite unusable in subdirectories: in the top ++# source directory, any form will work fine, but in subdirectories a ++# relative path needs to be adjusted first. ++# ++# $ac_aux_dir/missing ++# fails when called from a subdirectory if $ac_aux_dir is relative ++# $top_srcdir/$ac_aux_dir/missing ++# fails if $ac_aux_dir is absolute, ++# fails when called from a subdirectory in a VPATH build with ++# a relative $ac_aux_dir ++# ++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir ++# are both prefixed by $srcdir. In an in-source build this is usually ++# harmless because $srcdir is `.', but things will broke when you ++# start a VPATH build or use an absolute $srcdir. ++# ++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, ++# iff we strip the leading $srcdir from $ac_aux_dir. That would be: ++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` ++# and then we would define $MISSING as ++# MISSING="\${SHELL} $am_aux_dir/missing" ++# This will work as long as MISSING is not called from configure, because ++# unfortunately $(top_srcdir) has no meaning in configure. ++# However there are other variables, like CC, which are often used in ++# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# ++# Another solution, used here, is to always expand $ac_aux_dir to an ++# absolute PATH. The drawback is that using absolute paths prevent a ++# configured tree to be moved without reconfiguration. ++ ++AC_DEFUN([AM_AUX_DIR_EXPAND], ++[dnl Rely on autoconf to set up CDPATH properly. ++AC_PREREQ([2.50])dnl ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++]) ++ ++# AM_CONDITIONAL -*- Autoconf -*- ++ ++# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 6 ++ ++# AM_CONDITIONAL(NAME, SHELL-CONDITION) ++# ------------------------------------- ++# Define a conditional. ++AC_DEFUN([AM_CONDITIONAL], ++[AC_PREREQ(2.52)dnl ++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++AC_SUBST([$1_TRUE]) ++AC_SUBST([$1_FALSE]) ++if $2; then ++ $1_TRUE= ++ $1_FALSE='#' ++else ++ $1_TRUE='#' ++ $1_FALSE= ++fi ++AC_CONFIG_COMMANDS_PRE( ++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ++ AC_MSG_ERROR([conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]) ++fi])]) ++ ++# serial 7 -*- Autoconf -*- ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 ++# Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++ ++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ++# written in clear, in which case automake, when reading aclocal.m4, ++# will think it sees a *use*, and therefore will trigger all it's ++# C support machinery. Also note that it means that autoscan, seeing ++# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + +-# serial 1 + +-dnl Usage: +-dnl AM_INIT_AUTOMAKE(package,version, [no-define]) + +-AC_DEFUN(AM_INIT_AUTOMAKE, +-[AC_REQUIRE([AC_PROG_INSTALL]) +-PACKAGE=[$1] +-AC_SUBST(PACKAGE) +-VERSION=[$2] +-AC_SUBST(VERSION) +-dnl test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then ++# _AM_DEPENDENCIES(NAME) ++# ---------------------- ++# See how the compiler implements dependency checking. ++# NAME is "CC", "CXX", "GCJ", or "OBJC". ++# We try a few techniques and use that to set a single cache variable. ++# ++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was ++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular ++# dependency, and given that the user is not expected to run this macro, ++# just rely on AC_PROG_CC. ++AC_DEFUN([_AM_DEPENDENCIES], ++[AC_REQUIRE([AM_SET_DEPDIR])dnl ++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl ++AC_REQUIRE([AM_MAKE_INCLUDE])dnl ++AC_REQUIRE([AM_DEP_TRACK])dnl ++ ++ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ++ [$1], CXX, [depcc="$CXX" am_compiler_list=], ++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ++ [depcc="$$1" am_compiler_list=]) ++ ++AC_CACHE_CHECK([dependency style of $depcc], ++ [am_cv_$1_dependencies_compiler_type], ++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_$1_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_$1_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_$1_dependencies_compiler_type=none ++fi ++]) ++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ++AM_CONDITIONAL([am__fastdep$1], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ++]) ++ ++ ++# AM_SET_DEPDIR ++# ------------- ++# Choose a directory name for dependency files. ++# This macro is AC_REQUIREd in _AM_DEPENDENCIES ++AC_DEFUN([AM_SET_DEPDIR], ++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ++]) ++ ++ ++# AM_DEP_TRACK ++# ------------ ++AC_DEFUN([AM_DEP_TRACK], ++[AC_ARG_ENABLE(dependency-tracking, ++[ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors]) ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++AC_SUBST([AMDEPBACKSLASH]) ++]) ++ ++# Generate code to set up dependency tracking. -*- Autoconf -*- ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++#serial 2 ++ ++# _AM_OUTPUT_DEPENDENCY_COMMANDS ++# ------------------------------ ++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], ++[for mf in $CONFIG_FILES; do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # So let's grep whole file. ++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue ++ # Extract the definition of DEP_FILES from the Makefile without ++ # running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" ++ # We invoke sed twice because it is the simplest approach to ++ # changing $(DEPDIR) to its actual value in the expansion. ++ for file in `sed -n ' ++ /^DEP_FILES = .*\\\\$/ { ++ s/^DEP_FILES = // ++ :loop ++ s/\\\\$// ++ p ++ n ++ /\\\\$/ b loop ++ p ++ } ++ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++done ++])# _AM_OUTPUT_DEPENDENCY_COMMANDS ++ ++ ++# AM_OUTPUT_DEPENDENCY_COMMANDS ++# ----------------------------- ++# This macro should only be invoked once -- use via AC_REQUIRE. ++# ++# This code is only required when automatic dependency tracking ++# is enabled. FIXME. This creates each `.P' file that we will ++# need in order to bootstrap the dependency handling code. ++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ++[AC_CONFIG_COMMANDS([depfiles], ++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++]) ++ ++# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 7 ++ ++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) ++ ++# Do all the work for Automake. -*- Autoconf -*- ++ ++# This macro actually does too much some checks are only needed if ++# your package does certain things. But this isn't really a big deal. ++ ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++# Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 11 ++ ++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) ++# AM_INIT_AUTOMAKE([OPTIONS]) ++# ----------------------------------------------- ++# The call with PACKAGE and VERSION arguments is the old style ++# call (pre autoconf-2.50), which is being phased out. PACKAGE ++# and VERSION should now be passed to AC_INIT and removed from ++# the call to AM_INIT_AUTOMAKE. ++# We support both call styles for the transition. After ++# the next Automake release, Autoconf can make the AC_INIT ++# arguments mandatory, and then we can depend on a new Autoconf ++# release and drop the old call support. ++AC_DEFUN([AM_INIT_AUTOMAKE], ++[AC_PREREQ([2.58])dnl ++dnl Autoconf wants to disallow AM_ names. We explicitly allow ++dnl the ones we care about. ++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl ++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ++AC_REQUIRE([AC_PROG_INSTALL])dnl ++# test to see if srcdir already configured ++if test "`cd $srcdir && pwd`" != "`pwd`" && ++ test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +-ifelse([$3],, +-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) +-AC_REQUIRE([AM_SANITY_CHECK]) +-AC_REQUIRE([AC_ARG_PROGRAM]) +-dnl FIXME This is truly gross. +-missing_dir=`cd $ac_aux_dir && pwd` +-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) +-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) +-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) +-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) +-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) +-AC_REQUIRE([AC_PROG_MAKE_SET])]) ++ ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++AC_SUBST([CYGPATH_W]) ++ ++# Define the identity of the package. ++dnl Distinguish between old-style and new-style calls. ++m4_ifval([$2], ++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl ++ AC_SUBST([PACKAGE], [$1])dnl ++ AC_SUBST([VERSION], [$2])], ++[_AM_SET_OPTIONS([$1])dnl ++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++ ++_AM_IF_OPTION([no-define],, ++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++ ++# Some tools Automake needs. ++AC_REQUIRE([AM_SANITY_CHECK])dnl ++AC_REQUIRE([AC_ARG_PROGRAM])dnl ++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) ++AM_MISSING_PROG(AUTOCONF, autoconf) ++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) ++AM_MISSING_PROG(AUTOHEADER, autoheader) ++AM_MISSING_PROG(MAKEINFO, makeinfo) ++AM_MISSING_PROG(AMTAR, tar) ++AM_PROG_INSTALL_SH ++AM_PROG_INSTALL_STRIP ++AC_REQUIRE([AM_PROG_MKDIR_P])dnl ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++AC_REQUIRE([AC_PROG_AWK])dnl ++AC_REQUIRE([AC_PROG_MAKE_SET])dnl ++AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++ ++_AM_IF_OPTION([no-dependencies],, ++[AC_PROVIDE_IFELSE([AC_PROG_CC], ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++]) ++]) ++ ++ ++# When config.status generates a header, we must update the stamp-h file. ++# This file resides in the same directory as the config header ++# that is generated. The stamp files are numbered to have different names. ++ ++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the ++# loop where config.status creates the headers, so we can generate ++# our stamp files there. ++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], ++[# Compute $1's index in $config_headers. ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $1 | $1:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++ ++# AM_PROG_INSTALL_SH ++# ------------------ ++# Define $install_sh. ++ ++# Copyright (C) 2001, 2003 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++AC_DEFUN([AM_PROG_INSTALL_SH], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++install_sh=${install_sh-"$am_aux_dir/install-sh"} ++AC_SUBST(install_sh)]) ++ ++# -*- Autoconf -*- ++# Copyright (C) 2003 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 1 ++ ++# Check whether the underlying file-system supports filenames ++# with a leading dot. For instance MS-DOS doesn't. ++AC_DEFUN([AM_SET_LEADING_DOT], ++[rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++AC_SUBST([am__leading_dot])]) ++ ++# Add --enable-maintainer-mode option to configure. ++# From Jim Meyering ++ ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004 ++# Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 3 ++ ++AC_DEFUN([AM_MAINTAINER_MODE], ++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode is disabled by default ++ AC_ARG_ENABLE(maintainer-mode, ++[ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ USE_MAINTAINER_MODE=$enableval, ++ USE_MAINTAINER_MODE=no) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST(MAINT)dnl ++] ++) ++ ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++ ++# Check to see how 'make' treats includes. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 2 ++ ++# AM_MAKE_INCLUDE() ++# ----------------- ++# Check to see how make treats includes. ++AC_DEFUN([AM_MAKE_INCLUDE], ++[am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo done ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++AC_MSG_CHECKING([for style of include used by $am_make]) ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# We grep out `Entering directory' and `Leaving directory' ++# messages which can occur if `w' ends up in MAKEFLAGS. ++# In particular we don't look at `^make:' because GNU make might ++# be invoked under some other name (usually "gmake"), in which ++# case it prints its new name instead of `make'. ++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then ++ am__include=include ++ am__quote= ++ _am_result=GNU ++fi ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ fi ++fi ++AC_SUBST([am__include]) ++AC_SUBST([am__quote]) ++AC_MSG_RESULT([$_am_result]) ++rm -f confinc confmf ++]) ++ ++# -*- Autoconf -*- ++ ++ ++# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 3 ++ ++# AM_MISSING_PROG(NAME, PROGRAM) ++# ------------------------------ ++AC_DEFUN([AM_MISSING_PROG], ++[AC_REQUIRE([AM_MISSING_HAS_RUN]) ++$1=${$1-"${am_missing_run}$2"} ++AC_SUBST($1)]) ++ ++ ++# AM_MISSING_HAS_RUN ++# ------------------ ++# Define MISSING if not defined so far and test if it supports --run. ++# If it does, set am_missing_run to use it, otherwise, to nothing. ++AC_DEFUN([AM_MISSING_HAS_RUN], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " ++else ++ am_missing_run= ++ AC_MSG_WARN([`missing' script is too old or missing]) ++fi ++]) ++ ++# AM_PROG_MKDIR_P ++# --------------- ++# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. ++ ++# Copyright (C) 2003, 2004 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories ++# created by `make install' are always world readable, even if the ++# installer happens to have an overly restrictive umask (e.g. 077). ++# This was a mistake. There are at least two reasons why we must not ++# use `-m 0755': ++# - it causes special bits like SGID to be ignored, ++# - it may be too restrictive (some setups expect 775 directories). ++# ++# Do not use -m 0755 and let people choose whatever they expect by ++# setting umask. ++# ++# We cannot accept any implementation of `mkdir' that recognizes `-p'. ++# Some implementations (such as Solaris 8's) are not thread-safe: if a ++# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' ++# concurrently, both version can detect that a/ is missing, but only ++# one can create it and the other will error out. Consequently we ++# restrict ourselves to GNU make (using the --version option ensures ++# this.) ++AC_DEFUN([AM_PROG_MKDIR_P], ++[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then ++ # Keeping the `.' argument allows $(mkdir_p) to be used without ++ # argument. Indeed, we sometimes output rules like ++ # $(mkdir_p) $(somedir) ++ # where $(somedir) is conditionally defined. ++ # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more ++ # expensive solution, as it forces Make to start a sub-shell.) ++ mkdir_p='mkdir -p -- .' ++else ++ # On NextStep and OpenStep, the `mkdir' command does not ++ # recognize any option. It will interpret all options as ++ # directories to create, and then abort because `.' already ++ # exists. ++ for d in ./-p ./--version; ++ do ++ test -d $d && rmdir $d ++ done ++ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. ++ if test -f "$ac_aux_dir/mkinstalldirs"; then ++ mkdir_p='$(mkinstalldirs)' ++ else ++ mkdir_p='$(install_sh) -d' ++ fi ++fi ++AC_SUBST([mkdir_p])]) ++ ++# Helper functions for option handling. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 2 ++ ++# _AM_MANGLE_OPTION(NAME) ++# ----------------------- ++AC_DEFUN([_AM_MANGLE_OPTION], ++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) ++ ++# _AM_SET_OPTION(NAME) ++# ------------------------------ ++# Set option NAME. Presently that only means defining a flag for this option. ++AC_DEFUN([_AM_SET_OPTION], ++[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) ++ ++# _AM_SET_OPTIONS(OPTIONS) ++# ---------------------------------- ++# OPTIONS is a space-separated list of Automake options. ++AC_DEFUN([_AM_SET_OPTIONS], ++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++ ++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------- ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++AC_DEFUN([_AM_IF_OPTION], ++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + + # + # Check to make sure that the build environment is sane. + # + +-AC_DEFUN(AM_SANITY_CHECK, ++# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# serial 3 ++ ++# AM_SANITY_CHECK ++# --------------- ++AC_DEFUN([AM_SANITY_CHECK], + [AC_MSG_CHECKING([whether build environment is sane]) + # Just in case + sleep 1 +-echo timestamp > conftestfile ++echo timestamp > conftest.file + # Do `set' in a subshell so we don't clobber the current shell's + # arguments. Must try -L first in case configure is actually a + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). + if ( +- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` +- if test "[$]*" = "X"; then ++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ if test "$[*]" = "X"; then + # -L didn't work. +- set X `ls -t $srcdir/configure conftestfile` ++ set X `ls -t $srcdir/configure conftest.file` + fi +- if test "[$]*" != "X $srcdir/configure conftestfile" \ +- && test "[$]*" != "X conftestfile $srcdir/configure"; then ++ rm -f conftest.file ++ if test "$[*]" != "X $srcdir/configure conftest.file" \ ++ && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a +@@ -119,7 +920,7 @@ + alias in your environment]) + fi + +- test "[$]2" = conftestfile ++ test "$[2]" = conftest.file + ) + then + # Ok. +@@ -128,78 +929,45 @@ + AC_MSG_ERROR([newly created file is older than distributed files! + Check your system clock]) + fi +-rm -f conftest* + AC_MSG_RESULT(yes)]) + +-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) +-dnl The program must properly implement --version. +-AC_DEFUN(AM_MISSING_PROG, +-[AC_MSG_CHECKING(for working $2) +-# Run test in a subshell; some versions of sh will print an error if +-# an executable is not found, even if stderr is redirected. +-# Redirect stdin to placate older versions of autoconf. Sigh. +-if ($2 --version) < /dev/null > /dev/null 2>&1; then +- $1=$2 +- AC_MSG_RESULT(found) +-else +- $1="$3/missing $2" +- AC_MSG_RESULT(missing) +-fi +-AC_SUBST($1)]) ++# AM_PROG_INSTALL_STRIP + +-# Like AC_CONFIG_HEADER, but automatically create stamp file. +- +-AC_DEFUN(AM_CONFIG_HEADER, +-[AC_PREREQ([2.12]) +-AC_CONFIG_HEADER([$1]) +-dnl When config.status generates a header, we must update the stamp-h file. +-dnl This file resides in the same directory as the config header +-dnl that is generated. We must strip everything past the first ":", +-dnl and everything past the last "/". +-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl +-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, +-<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, +-<>; do +- case " <<$>>CONFIG_HEADERS " in +- *" <<$>>am_file "*<<)>> +- echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx +- ;; +- esac +- am_indx=`expr "<<$>>am_indx" + 1` +-done<<>>dnl>>) +-changequote([,]))]) ++# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +-# Add --enable-maintainer-mode option to configure. +-# From Jim Meyering +- +-# serial 1 +- +-AC_DEFUN(AM_MAINTAINER_MODE, +-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +- dnl maintainer-mode is disabled by default +- AC_ARG_ENABLE(maintainer-mode, +-[ --enable-maintainer-mode enable make rules and dependencies not useful +- (and sometimes confusing) to the casual installer], +- USE_MAINTAINER_MODE=$enableval, +- USE_MAINTAINER_MODE=no) +- AC_MSG_RESULT($USE_MAINTAINER_MODE) +- AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) +- MAINT=$MAINTAINER_MODE_TRUE +- AC_SUBST(MAINT)dnl +-] +-) +- +-# Define a conditional. +- +-AC_DEFUN(AM_CONDITIONAL, +-[AC_SUBST($1_TRUE) +-AC_SUBST($1_FALSE) +-if $2; then +- $1_TRUE= +- $1_FALSE='#' +-else +- $1_TRUE='#' +- $1_FALSE= +-fi]) ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++# 02111-1307, USA. ++ ++# One issue with vendor `install' (even GNU) is that you can't ++# specify the program used to strip binaries. This is especially ++# annoying in cross-compiling environments, where the build's strip ++# is unlikely to handle the host's binaries. ++# Fortunately install-sh will honor a STRIPPROG variable, so we ++# always use install-sh in `make install-strip', and initialize ++# STRIPPROG with the value of the STRIP variable (set by the user). ++AC_DEFUN([AM_PROG_INSTALL_STRIP], ++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ++if test "$cross_compiling" != no; then ++ AC_CHECK_TOOL([STRIP], [strip], :) ++fi ++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++AC_SUBST([INSTALL_STRIP_PROGRAM])]) + ++m4_include([acinclude.m4]) +--- chrpath-0.13.orig/config.guess ++++ chrpath-0.13/config.guess +@@ -1,9 +1,9 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + +-timestamp='2002-03-20' ++timestamp='2005-08-03' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,13 +17,15 @@ + # + # 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-1307, USA. ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + ++ + # Originally written by Per Bothner . + # Please send patches to . Submit a context + # diff and a properly formatted ChangeLog entry. +@@ -53,7 +55,7 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 + Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO +@@ -66,11 +68,11 @@ + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -88,30 +90,42 @@ + exit 1 + fi + ++trap 'exit 1' 1 2 15 + +-dummy=dummy-$$ +-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 ++# CC_FOR_BUILD -- compiler used by this script. Note that the use of a ++# compiler to aid in system detection is discouraged as it requires ++# temporary files to be created and, as you can see below, it is a ++# headache to deal with in a portable fashion. + +-# CC_FOR_BUILD -- compiler used by this script. + # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still + # use `HOST_CC' if defined, but it is deprecated. + +-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in +- ,,) echo "int dummy(){}" > $dummy.c ; ++# Portable tmp directory creation inspired by the Autoconf team. ++ ++set_cc_for_build=' ++trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; ++: ${TMPDIR=/tmp} ; ++ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || ++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || ++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; ++dummy=$tmp/dummy ; ++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; ++case $CC_FOR_BUILD,$HOST_CC,$CC in ++ ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do +- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; +- if test $? = 0 ; then ++ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; +- rm -f $dummy.c $dummy.o $dummy.rel ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +-esac' ++esac ; set_cc_for_build= ;' + + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. + # (ghazi at noc.rutgers.edu 1994-08-24) +@@ -142,6 +156,7 @@ + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in ++ armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; +@@ -167,141 +182,125 @@ + ;; + esac + # The OS release +- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ # Debian GNU/NetBSD machines have a different userland, and ++ # thus, need a distinct triplet. However, they do not need ++ # kernel version information, so it can be replaced with a ++ # suitable tag, in the style of linux-gnu. ++ case "${UNAME_VERSION}" in ++ Debian*) ++ release='-gnu' ++ ;; ++ *) ++ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ ;; ++ esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" +- exit 0 ;; +- amiga:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- arc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- hp300:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- macppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvmeppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pmax:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sgi:OpenBSD:*:*) +- echo mipseb-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sun3:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- wgrisc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:OpenBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} ++ exit ;; ++ *:ekkoBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} ++ exit ;; ++ macppc:MirBSD:*:*) ++ echo powerppc-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ *:MirBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; + alpha:OSF1:*:*) +- if test $UNAME_RELEASE = "V4.0"; then ++ case $UNAME_RELEASE in ++ *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` +- fi ++ ;; ++ *5.*) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ ;; ++ esac ++ # According to Compaq, /usr/sbin/psrinfo has been available on ++ # OSF/1 and Tru64 systems produced since 1995. I hope that ++ # covers most systems running today. This code pipes the CPU ++ # types through head -n 1, so we only detect the type of CPU 0. ++ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` ++ case "$ALPHA_CPU_TYPE" in ++ "EV4 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "EV4.5 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "LCA4 (21066/21068)") ++ UNAME_MACHINE="alpha" ;; ++ "EV5 (21164)") ++ UNAME_MACHINE="alphaev5" ;; ++ "EV5.6 (21164A)") ++ UNAME_MACHINE="alphaev56" ;; ++ "EV5.6 (21164PC)") ++ UNAME_MACHINE="alphapca56" ;; ++ "EV5.7 (21164PC)") ++ UNAME_MACHINE="alphapca57" ;; ++ "EV6 (21264)") ++ UNAME_MACHINE="alphaev6" ;; ++ "EV6.7 (21264A)") ++ UNAME_MACHINE="alphaev67" ;; ++ "EV6.8CB (21264C)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8AL (21264B)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8CX (21264D)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.9A (21264/EV69A)") ++ UNAME_MACHINE="alphaev69" ;; ++ "EV7 (21364)") ++ UNAME_MACHINE="alphaev7" ;; ++ "EV7.9 (21364A)") ++ UNAME_MACHINE="alphaev79" ;; ++ esac ++ # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. +- cat <$dummy.s +- .data +-\$Lformat: +- .byte 37,100,45,37,120,10,0 # "%d-%x\n" +- +- .text +- .globl main +- .align 4 +- .ent main +-main: +- .frame \$30,16,\$26,0 +- ldgp \$29,0(\$27) +- .prologue 1 +- .long 0x47e03d80 # implver \$0 +- lda \$2,-1 +- .long 0x47e20c21 # amask \$2,\$1 +- lda \$16,\$Lformat +- mov \$0,\$17 +- not \$1,\$18 +- jsr \$26,printf +- ldgp \$29,0(\$26) +- mov 0,\$16 +- jsr \$26,exit +- .end main +-EOF +- eval $set_cc_for_build +- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null +- if test "$?" = 0 ; then +- case `./$dummy` in +- 0-0) +- UNAME_MACHINE="alpha" +- ;; +- 1-0) +- UNAME_MACHINE="alphaev5" +- ;; +- 1-1) +- UNAME_MACHINE="alphaev56" +- ;; +- 1-101) +- UNAME_MACHINE="alphapca56" +- ;; +- 2-303) +- UNAME_MACHINE="alphaev6" +- ;; +- 2-307) +- UNAME_MACHINE="alphaev67" +- ;; +- 2-1307) +- UNAME_MACHINE="alphaev68" +- ;; +- esac +- fi +- rm -f $dummy.s $dummy +- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit 0 ;; ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ exit ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix +- exit 0 ;; ++ exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 +- exit 0 ;; ++ exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 +- exit 0;; ++ exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos +- exit 0 ;; ++ exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos +- exit 0 ;; ++ exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition +- exit 0 ;; ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; ++ *:OS400:*:*) ++ echo powerpc-ibm-os400 ++ exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} +- exit 0;; ++ exit ;; ++ arm:riscos:*:*|arm:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp +- exit 0;; ++ exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then +@@ -309,25 +308,32 @@ + else + echo pyramid-pyramid-bsd + fi +- exit 0 ;; ++ exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 +- exit 0 ;; ++ exit ;; ++ DRS?6000:unix:4.0:6*) ++ echo sparc-icl-nx6 ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) ++ case `/usr/bin/uname -p` in ++ sparc) echo sparc-icl-nx7; exit ;; ++ esac ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + i86pc:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) +@@ -336,10 +342,10 @@ + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit 0 ;; ++ exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 +@@ -351,10 +357,10 @@ + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac +- exit 0 ;; ++ exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor +@@ -365,37 +371,40 @@ + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten${UNAME_RELEASE} ++ exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 +- exit 0 ;; ++ exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -419,27 +428,33 @@ + exit (-1); + } + EOF +- $CC_FOR_BUILD $dummy.c -o $dummy \ +- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ +- && rm -f $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && ++ SYSTEM_NAME=`$dummy $dummyarg` && ++ { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax +- exit 0 ;; ++ exit ;; ++ Motorola:*:4.3:PL8-*) ++ echo powerpc-harris-powermax ++ exit ;; ++ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) ++ echo powerpc-harris-powermax ++ exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix +- exit 0 ;; ++ exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 +- exit 0 ;; ++ exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 +- exit 0 ;; ++ exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` +@@ -455,29 +470,29 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 +- exit 0 ;; ++ exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 +- exit 0 ;; ++ exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd +- exit 0 ;; ++ exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit 0 ;; ++ exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix +- exit 0 ;; ++ exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` +@@ -485,7 +500,7 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build +@@ -500,15 +515,18 @@ + exit(0); + } + EOF +- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy +- echo rs6000-ibm-aix3.2.5 ++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi +- exit 0 ;; ++ exit ;; + *:AIX:*:[45]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then +@@ -522,28 +540,28 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix +- exit 0 ;; ++ exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 +- exit 0 ;; ++ exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit 0 ;; # report: romp-ibm BSD 4.3 ++ exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx +- exit 0 ;; ++ exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 +- exit 0 ;; ++ exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd +- exit 0 ;; ++ exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 +- exit 0 ;; ++ exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in +@@ -599,17 +617,37 @@ + exit (0); + } + EOF +- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy` +- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi +- rm -f $dummy.c $dummy @@ 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 wbonnet at users.sourceforge.net Wed Apr 1 21:52:50 2009 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 01 Apr 2009 19:52:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[4132] csw/mgar/pkg/java/ajcdigester/trunk/Makefile Message-ID: Revision: 4132 http://gar.svn.sourceforge.net/gar/?rev=4132&view=rev Author: wbonnet Date: 2009-04-01 19:52:49 +0000 (Wed, 01 Apr 2009) Log Message: ----------- Remove dependencies to ajccollect Modified Paths: -------------- csw/mgar/pkg/java/ajcdigester/trunk/Makefile Modified: csw/mgar/pkg/java/ajcdigester/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcdigester/trunk/Makefile 2009-04-01 17:01:20 UTC (rev 4131) +++ csw/mgar/pkg/java/ajcdigester/trunk/Makefile 2009-04-01 19:52:49 UTC (rev 4132) @@ -25,7 +25,7 @@ SPKG_DESC_CSWajcdigesterdoc = $(DESCRIPTION) documentation package # Defines dependencies -REQUIRED_PKGS_CSWajcdigester = CSWajclogging CSWajccollect CSWajcbeanutils +REQUIRED_PKGS_CSWajcdigester = CSWajclogging CSWajcbeanutils # Defines package content PKGFILES_CSWajcdigester = $(prefix)/share/doc/$(GARNAME)/License.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 1 21:58:09 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 01 Apr 2009 19:58:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[4133] csw/mgar/pkg/m4/trunk Message-ID: Revision: 4133 http://gar.svn.sourceforge.net/gar/?rev=4133&view=rev Author: dmichelsen Date: 2009-04-01 19:58:08 +0000 (Wed, 01 Apr 2009) Log Message: ----------- m4: Update tp 1.4.13, move to dynamic gspec Modified Paths: -------------- csw/mgar/pkg/m4/trunk/Makefile csw/mgar/pkg/m4/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/m4/trunk/files/CSWgm4.gspec Property Changed: ---------------- csw/mgar/pkg/m4/trunk/ Property changes on: csw/mgar/pkg/m4/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/m4/trunk/Makefile =================================================================== --- csw/mgar/pkg/m4/trunk/Makefile 2009-04-01 19:52:49 UTC (rev 4132) +++ csw/mgar/pkg/m4/trunk/Makefile 2009-04-01 19:58:08 UTC (rev 4133) @@ -1,5 +1,5 @@ GARNAME = m4 -GARVERSION = 1.4.11 +GARVERSION = 1.4.13 CATEGORIES = utils DESCRIPTION = GNU m4 Unix macro processor @@ -12,17 +12,19 @@ MASTER_SITES = ftp://ftp.gnu.org/gnu/m4/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWgm4,) +PACKAGE = CSWgm4 + +SPKG_SOURCEURL = http://www.gnu.org/software/m4/ + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWlibsigsegv + CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g TEST_SCRIPTS = +EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias + include gar/category.mk - -post-install: - @rm -f $(DESTDIR)$(libdir)/charset.alias - @rm -f $(DESTDIR)$(sharedstatedir)/info/dir - @$(MAKECOOKIE) Modified: csw/mgar/pkg/m4/trunk/checksums =================================================================== --- csw/mgar/pkg/m4/trunk/checksums 2009-04-01 19:52:49 UTC (rev 4132) +++ csw/mgar/pkg/m4/trunk/checksums 2009-04-01 19:58:08 UTC (rev 4133) @@ -1,2 +1 @@ -988aa098326d5f2b5b5aa4b3efe8d528 download/m4-1.4.11.tar.gz -322e3b9fbcb90ab77c20c60d23757728 download/CSWgm4.gspec +e9e36108b5f9855a82ca4a07ebc0fd2e download/m4-1.4.13.tar.gz Deleted: csw/mgar/pkg/m4/trunk/files/CSWgm4.gspec =================================================================== --- csw/mgar/pkg/m4/trunk/files/CSWgm4.gspec 2009-04-01 19:52:49 UTC (rev 4132) +++ csw/mgar/pkg/m4/trunk/files/CSWgm4.gspec 2009-04-01 19:58:08 UTC (rev 4133) @@ -1,4 +0,0 @@ -%var bitname gm4 -%var pkgname CSWgm4 -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 1 22:23:29 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 01 Apr 2009 20:23:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[4134] csw/mgar/pkg/m4/trunk/Makefile Message-ID: Revision: 4134 http://gar.svn.sourceforge.net/gar/?rev=4134&view=rev Author: dmichelsen Date: 2009-04-01 20:23:29 +0000 (Wed, 01 Apr 2009) Log Message: ----------- gm4: Fix package name Modified Paths: -------------- csw/mgar/pkg/m4/trunk/Makefile Modified: csw/mgar/pkg/m4/trunk/Makefile =================================================================== --- csw/mgar/pkg/m4/trunk/Makefile 2009-04-01 19:58:08 UTC (rev 4133) +++ csw/mgar/pkg/m4/trunk/Makefile 2009-04-01 20:23:29 UTC (rev 4134) @@ -13,7 +13,7 @@ MASTER_SITES = ftp://ftp.gnu.org/gnu/m4/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PACKAGE = CSWgm4 +PACKAGES = CSWgm4 SPKG_SOURCEURL = http://www.gnu.org/software/m4/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 23:00:46 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:00:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[4135] csw/mgar/pkg/python/trunk Message-ID: Revision: 4135 http://gar.svn.sourceforge.net/gar/?rev=4135&view=rev Author: valholla Date: 2009-04-01 21:00:45 +0000 (Wed, 01 Apr 2009) Log Message: ----------- bugfix 3510 and 3579 Modified Paths: -------------- csw/mgar/pkg/python/trunk/Makefile csw/mgar/pkg/python/trunk/checksums csw/mgar/pkg/python/trunk/files/modules.diff Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2009-04-01 20:23:29 UTC (rev 4134) +++ csw/mgar/pkg/python/trunk/Makefile 2009-04-01 21:00:45 UTC (rev 4135) @@ -47,12 +47,15 @@ DEPENDS += lib/db DEPENDS += lib/gdbm +NOISALIST = 1 +LD_OPTIONS = -R/opt/csw/lib +export LD_OPTIONS CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS += --enable-unicode=ucs4 CONFIGURE_ARGS += --with-fpectl -CONFIGURE_ARGS += LDFLAGS='-R/opt/csw/lib/\$ISALIST -R/opt/csw/lib -L/opt/csw/lib' +CONFIGURE_ARGS += LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib' PKGFILES_CSWidle = $(libdir)/python(\d+(?:\.\d+)*)/idlelib/.* PKGFILES_CSWidle += $(bindir)/idle Modified: csw/mgar/pkg/python/trunk/checksums =================================================================== --- csw/mgar/pkg/python/trunk/checksums 2009-04-01 20:23:29 UTC (rev 4134) +++ csw/mgar/pkg/python/trunk/checksums 2009-04-01 21:00:45 UTC (rev 4135) @@ -3,7 +3,7 @@ 5664b3970307d7d39d8d4061e7dccbb0 download/libpython2.5.so.1.0-isa-i386 42dd6523beb94a805d5764ae1276091c download/faqwiz.diff 33f4094ee46ce865d3973a197f3fb4a0 download/makesetup.diff -5bc782aa89e5bc218ec154c68aa6801b download/modules.diff +ff716b13c8b0965f92550732151e545a download/modules.diff 369c5593c0c0edda03f3c1844788dbee download/multiprocess.diff 05724da367b025ce525de2bb704af6e3 download/pyport.diff 296f46fb4a6a392093120cd86675309b download/setup.diff Modified: csw/mgar/pkg/python/trunk/files/modules.diff =================================================================== --- csw/mgar/pkg/python/trunk/files/modules.diff 2009-04-01 20:23:29 UTC (rev 4134) +++ csw/mgar/pkg/python/trunk/files/modules.diff 2009-04-01 21:00:45 UTC (rev 4135) @@ -6,10 +6,10 @@ -#_curses _cursesmodule.c -lcurses -ltermcap +*shared* -+_curses _cursesmodule.c -lcurses -ltermcap ++_curses _cursesmodule.c -R/opt/csw/lib -L/opt/csw/lib -lncurses -lxtermcap # Wrapper for the panel library that's part of ncurses and SYSV curses. -#_curses_panel _curses_panel.c -lpanel -lncurses -+_curses_panel _curses_panel.c -lpanel -lcurses -ltermcap ++_curses_panel _curses_panel.c -R/opt/csw/lib -L/opt/csw/lib -lpanel -lncurses -lxtermcap # Generic (SunOS / SVR4) dynamic loading module. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 23:06:38 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:06:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[4136] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4136 http://gar.svn.sourceforge.net/gar/?rev=4136&view=rev Author: valholla Date: 2009-04-01 21:06:38 +0000 (Wed, 01 Apr 2009) Log Message: ----------- various fixes Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/checksums Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-04-01 21:00:45 UTC (rev 4135) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-04-01 21:06:38 UTC (rev 4136) @@ -20,15 +20,15 @@ php5_bin = $(php5_root)/bin php5_lib = $(php5_root)/lib -MASTER_SITES = http://us.php.net/distributions/ +MASTER_SITES = http://us.php.net/distributions/ SPKG_SOURCEURL = http://www.php.net/downloads.php -DISTFILES += $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += $(GARNAME)-$(GARVERSION).tar.bz2 -INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) -PHP5ROOT = $(DESTDIR)$(prefix)/php5 +INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) +PHP5ROOT = $(DESTDIR)$(prefix)/php5 -STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ -STRIP_DIRS += $(PHP5ROOT)/bin +STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ +STRIP_DIRS += $(PHP5ROOT)/bin # Auxilliary files DISTFILES += php.ini.CSW phpext pear.conf.CSW @@ -53,6 +53,7 @@ PKGFILES_CSWphp5devel += $(prefix)/php5/man/.* PATCHFILES += configure.diff +#PATCHFILES += php-bug-45557-fix.diff # PHP Extensions EXTDIRLIST = $(shell ls -d extensions/*) @@ -62,6 +63,7 @@ EXTRA_LIB += $(prefix)/bdb44/lib EXTRA_INC += $(prefix)/bdb44/lib +NOISALIST = 1 DISTFILES += fixme.sh CONFIGURE_ARGS += --prefix=$(prefix)/php5 Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-04-01 21:00:45 UTC (rev 4135) +++ csw/mgar/pkg/php5/trunk/checksums 2009-04-01 21:06:38 UTC (rev 4136) @@ -6,7 +6,8 @@ 89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh 8139c9c02a2f62bac64041fdd0e90bf6 download/CSWphp5.postinstall 41ec540885de7c34625768aa1fb9682b download/fixme.sh -ab08e2ba62667bf13fa236099e433e84 download/configure.diff +55567f364408f345f387a749fd73c09e download/configure.diff +a450a46ce0ea9fd0c0abe432e750a873 download/php-bug-45557-fix.diff 2206431e47c2075c0b9c4a12de5cf791 download/odbc.diff 230126f76ee6400ccf225bb6a8243532 download/pdopgsql.diff 13db46097c9686302bebf160e2d26ed2 download/pgsql.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 23:07:39 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:07:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[4137] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4137 http://gar.svn.sourceforge.net/gar/?rev=4137&view=rev Author: valholla Date: 2009-04-01 21:07:39 +0000 (Wed, 01 Apr 2009) Log Message: ----------- bugfix 3499 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/php5/trunk/files/php-bug-45557-fix.diff Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-04-01 21:06:38 UTC (rev 4136) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-04-01 21:07:39 UTC (rev 4137) @@ -53,7 +53,7 @@ PKGFILES_CSWphp5devel += $(prefix)/php5/man/.* PATCHFILES += configure.diff -#PATCHFILES += php-bug-45557-fix.diff +PATCHFILES += php-bug-45557-fix.diff # PHP Extensions EXTDIRLIST = $(shell ls -d extensions/*) Added: csw/mgar/pkg/php5/trunk/files/php-bug-45557-fix.diff =================================================================== --- csw/mgar/pkg/php5/trunk/files/php-bug-45557-fix.diff (rev 0) +++ csw/mgar/pkg/php5/trunk/files/php-bug-45557-fix.diff 2009-04-01 21:07:39 UTC (rev 4137) @@ -0,0 +1,60 @@ +diff -up php-5.2.9/ext/libxml/libxml.c.visibility php-5.2.9/ext/libxml/libxml.c +--- php-5.2.9/ext/libxml/libxml.c.visibility 2008-01-30 16:31:42.000000000 +0100 ++++ php-5.2.9/ext/libxml/libxml.c 2008-07-18 20:23:14.000000000 +0200 +@@ -523,7 +523,7 @@ static void php_libxml_internal_error_ha + } + } + +-void php_libxml_ctx_error(void *ctx, const char *msg, ...) ++PHP_LIBXML_API void php_libxml_ctx_error(void *ctx, const char *msg, ...) + { + va_list args; + va_start(args, msg); +@@ -531,7 +531,7 @@ void php_libxml_ctx_error(void *ctx, con + va_end(args); + } + +-void php_libxml_ctx_warning(void *ctx, const char *msg, ...) ++PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...) + { + va_list args; + va_start(args, msg); +@@ -974,7 +974,7 @@ PHP_LIBXML_API int php_libxml_decrement_ + return ret_refcount; + } + +-void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC) ++PHP_LIBXML_API void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC) + { + if (!node) { + return; +@@ -1010,7 +1010,7 @@ void php_libxml_node_free_resource(xmlNo + } + } + +-void php_libxml_node_decrement_resource(php_libxml_node_object *object TSRMLS_DC) ++PHP_LIBXML_API void php_libxml_node_decrement_resource(php_libxml_node_object *object TSRMLS_DC) + { + int ret_refcount = -1; + xmlNodePtr nodep; +diff -up php-5.2.9/ext/libxml/php_libxml.h.visibility php-5.2.9/ext/libxml/php_libxml.h +--- php-5.2.9/ext/libxml/php_libxml.h.visibility 2008-01-30 12:31:47.000000000 +0100 ++++ php-5.2.9/ext/libxml/php_libxml.h 2008-07-18 20:23:01.000000000 +0200 +@@ -84,12 +84,12 @@ PHP_LIBXML_API int php_libxml_decrement_ + PHP_LIBXML_API xmlNodePtr php_libxml_import_node(zval *object TSRMLS_DC); + PHP_LIBXML_API int php_libxml_register_export(zend_class_entry *ce, php_libxml_export_node export_function); + /* When an explicit freeing of node and children is required */ +-void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC); ++PHP_LIBXML_API void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC); + /* When object dtor is called as node may still be referenced */ +-void php_libxml_node_decrement_resource(php_libxml_node_object *object TSRMLS_DC); ++PHP_LIBXML_API void php_libxml_node_decrement_resource(php_libxml_node_object *object TSRMLS_DC); + PHP_LIBXML_API void php_libxml_error_handler(void *ctx, const char *msg, ...); +-void php_libxml_ctx_warning(void *ctx, const char *msg, ...); +-void php_libxml_ctx_error(void *ctx, const char *msg, ...); ++PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...); ++PHP_LIBXML_API void php_libxml_ctx_error(void *ctx, const char *msg, ...); + PHP_LIBXML_API int php_libxml_xmlCheckUTF8(const unsigned char *s); + PHP_LIBXML_API zval *php_libxml_switch_context(zval *context TSRMLS_DC); + PHP_LIBXML_API void php_libxml_issue_error(int level, const char *msg TSRMLS_DC); + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 23:09:11 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:09:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[4138] csw/mgar/pkg/php5/trunk/checksums Message-ID: Revision: 4138 http://gar.svn.sourceforge.net/gar/?rev=4138&view=rev Author: valholla Date: 2009-04-01 21:09:11 +0000 (Wed, 01 Apr 2009) Log Message: ----------- checksum file Modified Paths: -------------- csw/mgar/pkg/php5/trunk/checksums Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-04-01 21:07:39 UTC (rev 4137) +++ csw/mgar/pkg/php5/trunk/checksums 2009-04-01 21:09:11 UTC (rev 4138) @@ -6,7 +6,7 @@ 89e79becc9d7698c5c561581f2b098bc download/CSWphp5_ext_disable.sh 8139c9c02a2f62bac64041fdd0e90bf6 download/CSWphp5.postinstall 41ec540885de7c34625768aa1fb9682b download/fixme.sh -55567f364408f345f387a749fd73c09e download/configure.diff +ab08e2ba62667bf13fa236099e433e84 download/configure.diff a450a46ce0ea9fd0c0abe432e750a873 download/php-bug-45557-fix.diff 2206431e47c2075c0b9c4a12de5cf791 download/odbc.diff 230126f76ee6400ccf225bb6a8243532 download/pdopgsql.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Apr 1 23:10:54 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:10:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[4139] csw/mgar/pkg/cadaver/trunk Message-ID: Revision: 4139 http://gar.svn.sourceforge.net/gar/?rev=4139&view=rev Author: chninkel Date: 2009-04-01 21:10:52 +0000 (Wed, 01 Apr 2009) Log Message: ----------- cadaver: updated to 0.23.2 Modified Paths: -------------- csw/mgar/pkg/cadaver/trunk/Makefile csw/mgar/pkg/cadaver/trunk/checksums csw/mgar/pkg/cadaver/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/cadaver/trunk/files/destdir.patch Property Changed: ---------------- csw/mgar/pkg/cadaver/trunk/ Property changes on: csw/mgar/pkg/cadaver/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/cadaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/cadaver/trunk/Makefile 2009-04-01 21:09:11 UTC (rev 4138) +++ csw/mgar/pkg/cadaver/trunk/Makefile 2009-04-01 21:10:52 UTC (rev 4139) @@ -1,5 +1,19 @@ +##################################################################### +# OpenCSW build recipe for cadaver +# +# Copyright 2009 Yann Rouillard +# All rights reserved. Use is subject to license terms. +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +##################################################################### + +###### Package information ####### + GARNAME = cadaver -GARVERSION = 0.22.5 +GARVERSION = 0.23.2 CATEGORIES = net DESCRIPTION = WebDAV commandline tool @@ -8,6 +22,14 @@ operations (copy/move), collection deletion/creation, property manipulation, and locking operations. endef +PACKAGES = CSWcadav + +REQUIRED_PKGS = CSWggettextrt CSWiconv CSWneon CSWosslrt CSWreadline CSWzlib CSWgcrypt CSWgnutls CSWgpgerr + + + +###### Upstream and opencsw files information ####### + MASTER_SITES = http://www.webdav.org/cadaver/ UPSTREAM_MASTER_SITES = http://www.webdav.org/cadaver/ @@ -15,15 +37,15 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWcadav,prototype depend) +DISTFILES += CSWcadav.prototype DISTFILES += changelog.CSW # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# add destdir support to makefile -PATCHFILES = destdir.patch +##### Build and installation information ##### + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-nls @@ -31,6 +53,6 @@ include gar/category.mk -post-install: - @ginstall -D $(WORKDIR)/changelog.CSW $(DESTDIR)$(docdir)/$(GARNAME)/changelog.CSW +post-merge: + @ginstall -D $(DOWNLOADDIR)/changelog.CSW $(PKGROOT)$(docdir)/$(GARNAME)/changelog.CSW Modified: csw/mgar/pkg/cadaver/trunk/checksums =================================================================== --- csw/mgar/pkg/cadaver/trunk/checksums 2009-04-01 21:09:11 UTC (rev 4138) +++ csw/mgar/pkg/cadaver/trunk/checksums 2009-04-01 21:10:52 UTC (rev 4139) @@ -1,6 +1,3 @@ -e9fade983dd7b18d33230967051fcfe0 download/cadaver-0.22.5.tar.gz -e888b8bbd86f5b49d2e8b20b757d1acb download/CSWcadav.gspec +5ac79e41f3b7b4f68bf4003beed5dc26 download/cadaver-0.23.2.tar.gz 7a78f71995cd40263b04470976eba5a6 download/CSWcadav.prototype -73eefde72fd7d75082c96874f520e78d download/CSWcadav.depend -8fbd80b2a48a1341ced1b9d0919977c7 download/changelog.CSW -bb9626371527a54b88a01eaab55742cf download/destdir.patch +66c58979dc055ea9b233ec8530c41870 download/changelog.CSW Modified: csw/mgar/pkg/cadaver/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2009-04-01 21:09:11 UTC (rev 4138) +++ csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2009-04-01 21:10:52 UTC (rev 4139) @@ -1,3 +1,9 @@ +cadaver (0.23.2,REV=2009.03.30) unstable + + * New upstream version. + + -- Yann Rouillard Sat, 14 Feb 2009 23:53:41 +0100 + cadaver (0.22.5,REV=2009.02.15) unstable * Changed gettext dependancy to follow gettext package split Deleted: csw/mgar/pkg/cadaver/trunk/files/destdir.patch =================================================================== --- csw/mgar/pkg/cadaver/trunk/files/destdir.patch 2009-04-01 21:09:11 UTC (rev 4138) +++ csw/mgar/pkg/cadaver/trunk/files/destdir.patch 2009-04-01 21:10:52 UTC (rev 4139) @@ -1,20 +0,0 @@ -diff --speed-large-files --minimal -Nru cadaver-0.22.3.orig/Makefile.in cadaver-0.22.3/Makefile.in ---- cadaver-0.22.3.orig/Makefile.in 2005-12-31 07:57:37.000000000 -0500 -+++ cadaver-0.22.3/Makefile.in 2006-07-11 05:14:56.576413000 -0400 -@@ -71,12 +71,12 @@ - - install: $(TARGET) install-nls - @echo "Creating directories..." -- $(INSTALL) -d $(bindir) -- $(INSTALL) -d $(man1dir) -+ $(INSTALL) -d $(DESTDIR)/$(bindir) -+ $(INSTALL) -d $(DESTDIR)/$(man1dir) - @echo "Installing $(TARGET) executable..." -- $(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET) -+ $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)/$(bindir)/$(TARGET) - @echo "Installing man page..." -- $(INSTALL_DATA) $(top_srcdir)/doc/cadaver.1 $(man1dir)/cadaver.1 -+ $(INSTALL_DATA) $(top_srcdir)/doc/cadaver.1 $(DESTDIR)/$(man1dir)/cadaver.1 - - install-nls: - @cd po && $(MAKE) install This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 23:19:28 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:19:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[4140] csw/mgar/pkg/mod_python/trunk/Makefile Message-ID: Revision: 4140 http://gar.svn.sourceforge.net/gar/?rev=4140&view=rev Author: valholla Date: 2009-04-01 21:19:28 +0000 (Wed, 01 Apr 2009) Log Message: ----------- isalist fix Modified Paths: -------------- csw/mgar/pkg/mod_python/trunk/Makefile Modified: csw/mgar/pkg/mod_python/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_python/trunk/Makefile 2009-04-01 21:10:52 UTC (rev 4139) +++ csw/mgar/pkg/mod_python/trunk/Makefile 2009-04-01 21:19:28 UTC (rev 4140) @@ -30,6 +30,7 @@ CONFIGURE_ARGS += --with-flex=$(bindir)/flex-2.5.35 CONFIGURE_ARGS += --with-python-src=../python +NOISALIST = 1 include gar/category.mk DESTDOC = $(DESTDIR)$(docdir)/ap2_modpython This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 23:20:21 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:20:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[4141] csw/mgar/pkg/cmake/trunk Message-ID: Revision: 4141 http://gar.svn.sourceforge.net/gar/?rev=4141&view=rev Author: valholla Date: 2009-04-01 21:20:21 +0000 (Wed, 01 Apr 2009) Log Message: ----------- isafix and misc changes Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile csw/mgar/pkg/cmake/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/cmake/trunk/ Property changes on: csw/mgar/pkg/cmake/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2009-04-01 21:19:28 UTC (rev 4140) +++ csw/mgar/pkg/cmake/trunk/Makefile 2009-04-01 21:20:21 UTC (rev 4141) @@ -1,5 +1,5 @@ GARNAME = cmake -GARVERSION = 2.6.2 +GARVERSION = 2.6.3 CATEGORIES = devel DESCRIPTION = Cross-platform make @@ -15,19 +15,25 @@ UPSTREAM_MASTER_SITES = http://www.cmake.org/files/ MASTER_SITES = http://www.cmake.org/files/v2.6/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWcmake) -# We define upstream file regex so we can be notifed of new upstream software release +PACKAGES = CSWcmake +CATALOGNAME_CSWcmake = cmake +SPKG_DESC_CSWcmake = $(DESCRIPTION) + +REQUIRED_PKGS_CSWcmake = CSWcurlrt CSWexpat CSWlibidn CSWoldaprt +REQUIRED_PKGS_CSWcmake += CSWosslrt CSWxmlrpc-c CSWzlib + +# We define upstream file regex so we can be notifed of +# new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*) datadir = /share/$(GARNAME)-$(GARVERSION) sharedstatedir = /share docdir = /share/doc/$(GARNAME)-$(GARVERSION) +NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) --docdir=$(docdir) -SKIPTEST = 1 - include gar/category.mk FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/share/$(GARNAME)-$(GARVERSION)/Modules @@ -40,12 +46,29 @@ @echo "Docdir: $(docdir)" # Do NOT include the CSW include pathes here (cd $(WORKSRC); /usr/bin/env \ - CFLAGS="$($(GARCOMPILER)_CC_$(GARFLAVOR))" \ - CXXFLAGS="$($(GARCOMPILER)_CXX_$(GARFLAVOR))" \ + CFLAGS="$($(GARCOMPILER)_CC_$(GARFLAVOR)) -I/opt/csw/include" \ + CXXFLAGS="$($(GARCOMPILER)_CXX_$(GARFLAVOR)) -I/opt/csw/include" \ + LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib/$$ISALIST -R/opt/csw/lib" \ ./bootstrap \ --prefix=$(prefix) \ --datadir=$(datadir) \ --docdir=$(docdir) \ --mandir=/man \ + --system-libs \ ) @$(MAKECOOKIE) + +post-configure-modulated: + @(echo "==> Forcing use of system libraries") + @(echo "=====> curl, expat, xmlrpc, and zlib") + @(perl -i -plne 's/USE_SYSTEM_CURL:BOOL=OFF/USE_SYSTEM_CURL:BOOL=ON/' \ + $(WORKSRC)/CMakeCache.txt) + @(perl -i -plne 's/USE_SYSTEM_EXPAT:BOOL=OFF/USE_SYSTEM_EXPAT:BOOL=ON/' \ + $(WORKSRC)/CMakeCache.txt) + @(perl -i -plne 's/USE_SYSTEM_XMLRPC:BOOL=OFF/USE_SYSTEM_XMLRPC:BOOL=ON/' \ + $(WORKSRC)/CMakeCache.txt) + @(perl -i -plne 's/USE_SYSTEM_ZLIB:BOOL=OFF/USE_SYSTEM_ZLIB:BOOL=ON/' \ + $(WORKSRC)/CMakeCache.txt) + @$(MAKECOOKIE) + + Modified: csw/mgar/pkg/cmake/trunk/checksums =================================================================== --- csw/mgar/pkg/cmake/trunk/checksums 2009-04-01 21:19:28 UTC (rev 4140) +++ csw/mgar/pkg/cmake/trunk/checksums 2009-04-01 21:20:21 UTC (rev 4141) @@ -1,2 +1,2 @@ -9e82aa3beb991aa8e5797cf330618d42 download/cmake-2.6.2.tar.gz +5ba47a94ce276f326abca1fd72a7e7c6 download/cmake-2.6.3.tar.gz 871d267960a850d05e99246f5c438e62 download/CSWcmake.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 23:20:47 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:20:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[4142] csw/mgar/pkg/gd/trunk/Makefile Message-ID: Revision: 4142 http://gar.svn.sourceforge.net/gar/?rev=4142&view=rev Author: valholla Date: 2009-04-01 21:20:47 +0000 (Wed, 01 Apr 2009) Log Message: ----------- isafix Modified Paths: -------------- csw/mgar/pkg/gd/trunk/Makefile Modified: csw/mgar/pkg/gd/trunk/Makefile =================================================================== --- csw/mgar/pkg/gd/trunk/Makefile 2009-04-01 21:20:21 UTC (rev 4141) +++ csw/mgar/pkg/gd/trunk/Makefile 2009-04-01 21:20:47 UTC (rev 4142) @@ -25,11 +25,12 @@ REQUIRED_PKGS_CSWgd = CSWexpat CSWfconfig CSWftype2 CSWiconv REQUIRED_PKGS_CSWgd += CSWjpeg CSWpng CSWxpm CSWzlib -# 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.bz2 BUILD64 = 1 -NO_ISAEXEC = 1 +NO_ISAEXEC = 0 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 23:21:07 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:21:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[4143] csw/mgar/pkg/gnupg/trunk/Makefile Message-ID: Revision: 4143 http://gar.svn.sourceforge.net/gar/?rev=4143&view=rev Author: valholla Date: 2009-04-01 21:21:07 +0000 (Wed, 01 Apr 2009) Log Message: ----------- isafix Modified Paths: -------------- csw/mgar/pkg/gnupg/trunk/Makefile Modified: csw/mgar/pkg/gnupg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile 2009-04-01 21:20:47 UTC (rev 4142) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2009-04-01 21:21:07 UTC (rev 4143) @@ -19,6 +19,7 @@ # new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*) +RUNPATHQUOTE = 1 BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 23:21:34 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:21:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[4144] csw/mgar/pkg/gnupg2/trunk/Makefile Message-ID: Revision: 4144 http://gar.svn.sourceforge.net/gar/?rev=4144&view=rev Author: valholla Date: 2009-04-01 21:21:33 +0000 (Wed, 01 Apr 2009) Log Message: ----------- isafix Modified Paths: -------------- csw/mgar/pkg/gnupg2/trunk/Makefile Modified: csw/mgar/pkg/gnupg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg2/trunk/Makefile 2009-04-01 21:21:07 UTC (rev 4143) +++ csw/mgar/pkg/gnupg2/trunk/Makefile 2009-04-01 21:21:33 UTC (rev 4144) @@ -25,6 +25,7 @@ # new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*) +RUNPATHQUOTE = 1 BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -40,7 +41,7 @@ # Needed for nanosleep() EXTRA_LINKER_FLAGS += -lrt -REQUIRED_PKGS = CSWlibksba CSWgpgerr CSWgcrypt CSWlibassuan +REQUIRED_PKGS = CSWlibksba CSWgpgerr CSWgcrypt REQUIRED_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth CSWlibidn REQUIRED_PKGS += CSWbzip2 CSWreadline CSWggettextrt CSWiconv CSWosslrt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 23:22:04 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:22:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[4145] csw/mgar/pkg/gnupg_minimal/trunk/Makefile Message-ID: Revision: 4145 http://gar.svn.sourceforge.net/gar/?rev=4145&view=rev Author: valholla Date: 2009-04-01 21:22:04 +0000 (Wed, 01 Apr 2009) Log Message: ----------- isafix Modified Paths: -------------- csw/mgar/pkg/gnupg_minimal/trunk/Makefile Modified: csw/mgar/pkg/gnupg_minimal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg_minimal/trunk/Makefile 2009-04-01 21:21:33 UTC (rev 4144) +++ csw/mgar/pkg/gnupg_minimal/trunk/Makefile 2009-04-01 21:22:04 UTC (rev 4145) @@ -14,7 +14,7 @@ PACKAGES = CSWgnupgminimal CATALOGNAME_CSWgnupgminimal = gnupg_minimal SPKG_DESC_CSWgnupgminimal = $(DESCRIPTION) -#PKGFILES_CSWgnupgminimal = .*/bin/.* +PKGFILES_CSWgnupgminimal = .*/bin/.* REQUIRED_PKGS_CSWgnupgminimal = CSWbzip2 CSWcurlrt CSWggettextrt CSWiconv REQUIRED_PKGS_CSWgnupgminimal += CSWoldaprt CSWreadline CSWzlib @@ -57,6 +57,7 @@ CONFIGURE_ARGS += --disable-dns-pka CONFIGURE_ARGS += --disable-dns-cert +RUNPATHQUOTE = 1 TEST_TARGET = check include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Apr 1 23:43:58 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:43:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[4146] csw/mgar/pkg/cadaver/trunk Message-ID: Revision: 4146 http://gar.svn.sourceforge.net/gar/?rev=4146&view=rev Author: chninkel Date: 2009-04-01 21:43:58 +0000 (Wed, 01 Apr 2009) Log Message: ----------- cadaver: updated changelog Modified Paths: -------------- csw/mgar/pkg/cadaver/trunk/checksums csw/mgar/pkg/cadaver/trunk/files/changelog.CSW Modified: csw/mgar/pkg/cadaver/trunk/checksums =================================================================== --- csw/mgar/pkg/cadaver/trunk/checksums 2009-04-01 21:22:04 UTC (rev 4145) +++ csw/mgar/pkg/cadaver/trunk/checksums 2009-04-01 21:43:58 UTC (rev 4146) @@ -1,3 +1,3 @@ 5ac79e41f3b7b4f68bf4003beed5dc26 download/cadaver-0.23.2.tar.gz 7a78f71995cd40263b04470976eba5a6 download/CSWcadav.prototype -66c58979dc055ea9b233ec8530c41870 download/changelog.CSW +af240ee7947d504a6b3e517352d0d883 download/changelog.CSW Modified: csw/mgar/pkg/cadaver/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2009-04-01 21:22:04 UTC (rev 4145) +++ csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2009-04-01 21:43:58 UTC (rev 4146) @@ -1,6 +1,7 @@ -cadaver (0.23.2,REV=2009.03.30) unstable +cadaver (0.23.2,REV=2009.04.01) unstable * New upstream version. + * Dropped destdir.patch as DESTDIR support has been added upstream. -- Yann Rouillard Sat, 14 Feb 2009 23:53:41 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 23:52:31 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:52:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[4147] csw/mgar/pkg/mysql-python/trunk/Makefile Message-ID: Revision: 4147 http://gar.svn.sourceforge.net/gar/?rev=4147&view=rev Author: valholla Date: 2009-04-01 21:52:31 +0000 (Wed, 01 Apr 2009) Log Message: ----------- isalist Modified Paths: -------------- csw/mgar/pkg/mysql-python/trunk/Makefile Modified: csw/mgar/pkg/mysql-python/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql-python/trunk/Makefile 2009-04-01 21:43:58 UTC (rev 4146) +++ csw/mgar/pkg/mysql-python/trunk/Makefile 2009-04-01 21:52:31 UTC (rev 4147) @@ -33,7 +33,9 @@ mysql_prefix = $(prefix)/mysql5 mysql_bindir = $(mysql_prefix)/bin -LD_OPTIONS := -R/opt/csw/mysql5/lib/mysql/\$$ISALIST $(LD_OPTIONS) +NOISALIST = 1 +LD_OPTIONS := -R/opt/csw/mysql5/lib/mysql/\$$ISALIST:/opt/csw/lib/\$$ISALIST PATH := $(mysql_bindir):$(PATH) -export LD_OPTIONS PATH +LDFLAGS = +export LD_OPTIONS PATH LDFLAGS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 23:54:20 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:54:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[4148] csw/mgar/pkg/pysetuptools/trunk/Makefile Message-ID: Revision: 4148 http://gar.svn.sourceforge.net/gar/?rev=4148&view=rev Author: valholla Date: 2009-04-01 21:54:18 +0000 (Wed, 01 Apr 2009) Log Message: ----------- various fixes Modified Paths: -------------- csw/mgar/pkg/pysetuptools/trunk/Makefile Modified: csw/mgar/pkg/pysetuptools/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysetuptools/trunk/Makefile 2009-04-01 21:52:31 UTC (rev 4147) +++ csw/mgar/pkg/pysetuptools/trunk/Makefile 2009-04-01 21:54:18 UTC (rev 4148) @@ -3,7 +3,8 @@ CATEGORIES = lang SPKG_SOURCEURL = http://peak.telecommunity.com/DevCenter/setuptools - +PYSETUPTOOLS_VERSION := $(shell echo $(GARVERSION) | sed -e 's/[a-z].*//') +PYSETUPTOOLS_RELEASE := $(shell echo $(GARVERSION) | sed -e 's/^[0-9].[0-9]*//') DESCRIPTION = Distribution Utiltiies for Python define BLURB Distribution Utilities for Python @@ -34,3 +35,6 @@ include gar/category.mk +SPKG_VERSION := $(PYSETUPTOOLS_VERSION) +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PYSETUPTOOLS_RELEASE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 23:55:22 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:55:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[4149] csw/mgar/pkg/pysqlite/trunk/Makefile Message-ID: Revision: 4149 http://gar.svn.sourceforge.net/gar/?rev=4149&view=rev Author: valholla Date: 2009-04-01 21:55:22 +0000 (Wed, 01 Apr 2009) Log Message: ----------- various fixes Modified Paths: -------------- csw/mgar/pkg/pysqlite/trunk/Makefile Modified: csw/mgar/pkg/pysqlite/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite/trunk/Makefile 2009-04-01 21:54:18 UTC (rev 4148) +++ csw/mgar/pkg/pysqlite/trunk/Makefile 2009-04-01 21:55:22 UTC (rev 4149) @@ -2,6 +2,9 @@ GARVERSION = 1.1.8a CATEGORIES = lang +PYSQLITE_VERSION := $(shell echo $(GARVERSION) | sed -e 's/[a-z]//g') +PYSQLITE_RELEASE := $(shell echo $(GARVERSION) | sed -e 's/[^a-z]//g') + DESCRIPTION = SQLite 1.x support for Python define BLURB SQLite support for Python @@ -21,6 +24,7 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) +NOISALIST = 1 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = @@ -31,3 +35,6 @@ include gar/category.mk +SPKG_VERSION := $(PYSQLITE_VERSION) +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PYSQLITE_RELEASE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Wed Apr 1 23:57:21 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 21:57:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[4150] csw/mgar/pkg/xchat/trunk/Makefile Message-ID: Revision: 4150 http://gar.svn.sourceforge.net/gar/?rev=4150&view=rev Author: valholla Date: 2009-04-01 21:57:21 +0000 (Wed, 01 Apr 2009) Log Message: ----------- housekeeping Modified Paths: -------------- csw/mgar/pkg/xchat/trunk/Makefile Modified: csw/mgar/pkg/xchat/trunk/Makefile =================================================================== --- csw/mgar/pkg/xchat/trunk/Makefile 2009-04-01 21:55:22 UTC (rev 4149) +++ csw/mgar/pkg/xchat/trunk/Makefile 2009-04-01 21:57:21 UTC (rev 4150) @@ -25,9 +25,12 @@ REQUIRED_PKGS_CSWxchat += CSWggettextrt CSWglib2 CSWgtk2 CSWiconv CSWlibatk REQUIRED_PKGS_CSWxchat += CSWlibcairo CSWlibdbus CSWlibxft2 CSWlibxrender REQUIRED_PKGS_CSWxchat += CSWosslrt CSWpango CSWpng CSWsunmath CSWzlib -REQUIRED_PKGS_CSWxchat-pl = CSWxchat CSWperl -REQUIRED_PKGS_CSWxchat-py = CSWxchat CSWpython -REQUIRED_PKGS_CSWxchat-tcl = CSWxchat CSWtcl +REQUIRED_PKGS_CSWxchat-pl = CSWxchat CSWperl CSWosslrt CSWglib2 +REQUIRED_PKGS_CSWxchat-pl += CSWggettextrt CSWlibntlm +REQUIRED_PKGS_CSWxchat-py = CSWxchat CSWpython CSWosslrt CSWglib2 +REQUIRED_PKGS_CSWxchat-py += CSWggettextrt CSWlibntlm +REQUIRED_PKGS_CSWxchat-tcl = CSWxchat CSWtcl CSWosslrt CSWglib2 +REQUIRED_PKGS_CSWxchat-tcl += CSWggettextrt CSWlibntlm PKGFILES_CSWxchat-pl = $(libdir)/.*/perl.so PKGFILES_CSWxchat-py = $(libdir)/.*/python.so PKGFILES_CSWxchat-tcl = $(libdir)/.*/tcl.so @@ -40,6 +43,8 @@ PATCHFILES = xc286-smallfixes.diff PATCHFILES += xchat26-compiletime.diff +LDFLAGS = +NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-openssl=$(prefix) CONFIGURE_ARGS += --enable-threads=solaris This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Apr 2 00:11:59 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Wed, 01 Apr 2009 22:11:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[4151] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 4151 http://gar.svn.sourceforge.net/gar/?rev=4151&view=rev Author: valholla Date: 2009-04-01 22:11:59 +0000 (Wed, 01 Apr 2009) Log Message: ----------- curses fix Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-04-01 21:57:21 UTC (rev 4150) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-04-01 22:11:59 UTC (rev 4151) @@ -61,7 +61,8 @@ # BerkeleyDB EXTRA_LIB += $(prefix)/bdb44/lib -EXTRA_INC += $(prefix)/bdb44/lib +EXTRA_INC += $(prefix)/bdb44/include +EXTRA_CFLAGS = $(prefix)/include/ncursesw NOISALIST = 1 DISTFILES += fixme.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Apr 2 03:43:51 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 02 Apr 2009 01:43:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[4152] csw/mgar/pkg/php5/trunk/extensions Message-ID: Revision: 4152 http://gar.svn.sourceforge.net/gar/?rev=4152&view=rev Author: valholla Date: 2009-04-02 01:43:50 +0000 (Thu, 02 Apr 2009) Log Message: ----------- admin scripts Modified Paths: -------------- csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile Modified: csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-bcmath=shared PKGFILES_CSWphp5bcmath = .*/lib/php/extensions/.*/bcmath.* + +define CSWphp5bcmath_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling bcmath extension" + +perl -i -plne 's|;extension=bcmath.so|extension=bcmath.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5bcmath_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling bcmath extension" + +perl -i -plne 's|extension=bcmath.so|;extension=bcmath.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --with-bz2=shared,$(prefix) PKGFILES_CSWphp5bz2 = .*/lib/php/extensions/.*/bz2.* + +define CSWphp5bz2_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling bz2 extension" + +perl -i -plne 's|;extension=bz2.so|extension=bz2.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5bz2_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling bz2 extension" + +perl -i -plne 's|extension=bz2.so|;extension=bz2.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-calendar=shared PKGFILES_CSWphp5calendar = .*/lib/php/extensions/.*/calendar.* + +define CSWphp5calendar_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling calendar extension" + +perl -i -plne 's|;extension=calendar.so|extension=calendar.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5calendar_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling calendar extension" + +perl -i -plne 's|extension=calendar.so|;extension=calendar.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-ctype=shared PKGFILES_CSWphp5ctype = .*/lib/php/extensions/.*/ctype.* + +define CSWphp5ctype_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ctype extension" + +perl -i -plne 's|;extension=ctype.so|extension=ctype.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5ctype_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ctype extension" + +perl -i -plne 's|extension=ctype.so|;extension=ctype.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -11,3 +11,30 @@ CONFIGURE_ARGS += --with-curlwrappers PKGFILES_CSWphp5curl = .*/lib/php/extensions/.*/curl.* + +define CSWphp5curl_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling curl extension" + +perl -i -plne 's|;extension=curl.so|extension=curl.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5curl_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling curl extension" + +perl -i -plne 's|extension=curl.so|;extension=curl.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -14,3 +14,30 @@ PKGFILES_CSWphp5dba = .*/lib/php/extensions/.*/dba\.so PKGFILES_CSWphp5dba += .*/lib/php/extensions/.*/dba\.a + +define CSWphp5dba_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling dba extension" + +perl -i -plne 's|;extension=dba.so|extension=dba.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5dba_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling dba extension" + +perl -i -plne 's|extension=dba.so|;extension=dba.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-dbase=shared PKGFILES_CSWphp5dbase = .*/lib/php/extensions/.*/dbase.* + +define CSWphp5dbase_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling dbase extension" + +perl -i -plne 's|;extension=dbase.so|extension=dbase.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5dbase_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling dbase extension" + +perl -i -plne 's|extension=dbase.so|;extension=dbase.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -10,3 +10,30 @@ CONFIGURE_ARGS += --with-libxml-dir=$(prefix) PKGFILES_CSWphp5dom = .*/lib/php/extensions/.*/dom.* + +define CSWphp5dom_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling dom extension" + +perl -i -plne 's|;extension=dom.so|extension=dom.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5dom_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling dom extension" + +perl -i -plne 's|extension=dom.so|;extension=dom.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -12,3 +12,30 @@ export CPPFLAGS PKGFILES_CSWphp5exif = .*/lib/php/extensions/.*/exif.* + +define CSWphp5exif_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling exif extension" + +perl -i -plne 's|;extension=exif.so|extension=exif.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5exif_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling exif extension" + +perl -i -plne 's|extension=exif.so|;extension=exif.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -10,3 +10,30 @@ CONFIGURE_ARGS += --with-pcre-dir=$(prefix) PKGFILES_CSWphp5filter = .*/lib/php/extensions/.*/filter.* + +define CSWphp5filter_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling filter extension" + +perl -i -plne 's|;extension=filter.so|extension=filter.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5filter_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling filter extension" + +perl -i -plne 's|extension=filter.so|;extension=filter.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-ftp=shared PKGFILES_CSWphp5ftp = .*/lib/php/extensions/.*/ftp.* + +define CSWphp5ftp_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ftp extension" + +perl -i -plne 's|;extension=ftp.so|extension=ftp.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5ftp_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ftp extension" + +perl -i -plne 's|extension=ftp.so|;extension=ftp.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -20,3 +20,30 @@ CONFIGURE_ARGS += --enable-gd-jis-conv PKGFILES_CSWphp5gd = .*/lib/php/extensions/.*/gd.* + +define CSWphp5gd_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling gd extension" + +perl -i -plne 's|;extension=gd.so|extension=gd.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5gd_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling gd extension" + +perl -i -plne 's|extension=gd.so|;extension=gd.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --with-gettext=shared,$(prefix) PKGFILES_CSWphp5gettext = .*/lib/php/extensions/.*/gettext.* + +define CSWphp5gettext_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling gettext extension" + +perl -i -plne 's|;extension=gettext.so|extension=gettext.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5gettext_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling gettext extension" + +perl -i -plne 's|extension=gettext.so|;extension=gettext.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --with-gmp=shared,$(prefix) PKGFILES_CSWphp5gmp = .*/lib/php/extensions/.*/gmp.* + +define CSWphp5gmp_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling gmp extension" + +perl -i -plne 's|;extension=gmp.so|extension=gmp.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5gmp_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling gmp extension" + +perl -i -plne 's|extension=gmp.so|;extension=gmp.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-hash=shared PKGFILES_CSWphp5hash = .*/lib/php/extensions/.*/hash.* + +define CSWphp5hash_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling hash extension" + +perl -i -plne 's|;extension=hash.so|extension=hash.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5hash_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling hash extension" + +perl -i -plne 's|extension=hash.so|;extension=hash.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -16,3 +16,30 @@ #PATCHFILES += iconv.diff PKGFILES_CSWphp5iconv = .*/lib/php/extensions/.*/iconv.* + +define CSWphp5iconv_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling iconv extension" + +perl -i -plne 's|;extension=iconv.so|extension=iconv.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5iconv_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling iconv extension" + +perl -i -plne 's|extension=iconv.so|;extension=iconv.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -11,3 +11,30 @@ CONFIGURE_ARGS += --with-imap-ssl=$(prefix) PKGFILES_CSWphp5imap = .*/lib/php/extensions/.*/imap.* + +define CSWphp5imap_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling imap extension" + +perl -i -plne 's|;extension=imap.so|extension=imap.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5imap_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling imap extension" + +perl -i -plne 's|extension=imap.so|;extension=imap.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-json=shared PKGFILES_CSWphp5json = .*/lib/php/extensions/.*/json.* + +define CSWphp5json_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling json extension" + +perl -i -plne 's|;extension=json.so|extension=json.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5json_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling json extension" + +perl -i -plne 's|extension=json.so|;extension=json.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -10,3 +10,31 @@ CONFIGURE_ARGS += --with-ldap-sasl=$(prefix) PKGFILES_CSWphp5ldap = .*/lib/php/extensions/.*/ldap.* + + +define CSWphp5ldap_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ldap extension" + +perl -i -plne 's|;extension=ldap.so|extension=ldap.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5ldap_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ldap extension" + +perl -i -plne 's|extension=ldap.so|;extension=ldap.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -11,3 +11,30 @@ CONFIGURE_ARGS += --enable-mbregex=shared PKGFILES_CSWphp5mbstring = .*/lib/php/extensions/.*/mbstring.* + +define CSWphp5mbstring_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling mbstring extension" + +perl -i -plne 's|;extension=mbstring.so|extension=mbstring.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5mbstring_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling mbstring extension" + +perl -i -plne 's|extension=mbstring.so|;extension=mbstring.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --with-mcrypt=shared,$(prefix) PKGFILES_CSWphp5mcrypt = .*/lib/php/extensions/.*/mcrypt.* + +define CSWphp5mcrypt_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling mcrypt extension" + +perl -i -plne 's|;extension=mcrypt.so|extension=mcrypt.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5mcrypt_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling mcrypt extension" + +perl -i -plne 's|extension=mcrypt.so|;extension=mcrypt.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --with-mhash=shared,$(prefix) PKGFILES_CSWphp5mhash = .*/lib/php/extensions/.*/mhash.* + +define CSWphp5mhash_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling mhash extension" + +perl -i -plne 's|;extension=mhash.so|extension=mhash.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5mhash_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling mhash extension" + +perl -i -plne 's|extension=mhash.so|;extension=mhash.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --with-mime-magic=shared PKGFILES_CSWphp5mimemagic = .*/lib/php/extensions/.*/mime_magic.* + +define CSWphp5mimemagic_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling mime_magic extension" + +perl -i -plne 's|;extension=mime_magic.so|extension=mime_magic.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5mimemagic_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling mime_magic extension" + +perl -i -plne 's|extension=mime_magic.so|;extension=mime_magic.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --with-mssql=shared,$(prefix) PKGFILES_CSWphp5mssql = .*/lib/php/extensions/.*/mssql.* + +define CSWphp5mssql_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling mssql extension" + +perl -i -plne 's|;extension=mssql.so|extension=mssql.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5mssql_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling mssql extension" + +perl -i -plne 's|extension=mssql.so|;extension=mssql.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -10,3 +10,30 @@ PKGFILES_CSWphp5mysql = .*/lib/php/extensions/.*/mysql\.so PKGFILES_CSWphp5mysql += .*/lib/php/extensions/.*/mysql\.a + +define CSWphp5mysql_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling mysql extension" + +perl -i -plne 's|;extension=mysql.so|extension=mysql.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5mysql_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling mysql extension" + +perl -i -plne 's|extension=mysql.so|;extension=mysql.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --with-mysqli=shared,$(bindir)/mysql_config PKGFILES_CSWphp5mysqli = .*/lib/php/extensions/.*/mysqli.* + +define CSWphp5mysqli_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling mysqli extension" + +perl -i -plne 's|;extension=mysqli.so|extension=mysqli.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5mysqli_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling mysqli extension" + +perl -i -plne 's|extension=mysqli.so|;extension=mysqli.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --with-ncurses=shared,$(prefix) PKGFILES_CSWphp5ncurses = .*/lib/php/extensions/.*/ncurses.* + +define CSWphp5ncurses_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling ncurses extension" + +perl -i -plne 's|;extension=ncurses.so|extension=ncurses.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5ncurses_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling ncurses extension" + +perl -i -plne 's|extension=ncurses.so|;extension=ncurses.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -11,3 +11,30 @@ CONFIGURE_ARGS += --with-unixODBC=shared,$(prefix) PKGFILES_CSWphp5odbc = .*/lib/php/extensions/.*/odbc.* + +define CSWphp5odbc_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling odbc extension" + +perl -i -plne 's|;extension=odbc.so|extension=odbc.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5odbc_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling odbc extension" + +perl -i -plne 's|extension=odbc.so|;extension=odbc.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --with-openssl=shared,$(prefix) PKGFILES_CSWphp5openssl = .*/lib/php/extensions/.*/openssl.* + +define CSWphp5openssl_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling openssl extension" + +perl -i -plne 's|;extension=openssl.so|extension=openssl.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5openssl_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling openssl extension" + +perl -i -plne 's|extension=openssl.so|;extension=openssl.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-pcntl=shared PKGFILES_CSWphp5pcntl = .*/lib/php/extensions/.*/pcntl.* + +define CSWphp5pcntl_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling pcntl extension" + +perl -i -plne 's|;extension=pcntl.so|extension=pcntl.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5pcntl_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling pcntl extension" + +perl -i -plne 's|extension=pcntl.so|;extension=pcntl.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -10,3 +10,30 @@ CONFIGURE_ARGS += --with-zlib-dir=$(prefix) PKGFILES_CSWphp5pdomysql = .*/lib/php/extensions/.*/pdo_mysql.* + +define CSWphp5pdomysql_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling pdo_mysql extension" + +perl -i -plne 's|;extension=pdo_mysql.so|extension=pdo_mysql.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5pdomysql_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling pdo_mysql extension" + +perl -i -plne 's|extension=pdo_mysql.so|;extension=pdo_mysql.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --with-pdo-odbc=shared,unixODBC,$(prefix) PKGFILES_CSWphp5pdoodbc = .*/lib/php/extensions/.*/pdo_odbc.* + +define CSWphp5pdoodbc_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling pdo_odbc extension" + +perl -i -plne 's|;extension=pdo_odbc.so|extension=pdo_odbc.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5pdoodbc_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling pdo_odbc extension" + +perl -i -plne 's|extension=pdo_odbc.so|;extension=pdo_odbc.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -11,3 +11,30 @@ CONFIGURE_ARGS += --with-pdo-pgsql=shared,$(prefix)/postgresql PKGFILES_CSWphp5pdopgsql = .*/lib/php/extensions/.*/pdo_pgsql.* + +define CSWphp5pdopgsql_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling pdo_pgsql extension" + +perl -i -plne 's|;extension=pdo_pgsql.so|extension=pdo_pgsql.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5pdopgsql_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling pdo_pgsql extension" + +perl -i -plne 's|extension=pdo_pgsql.so|;extension=pdo_pgsql.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --with-pdo-sqlite=shared PKGFILES_CSWphp5pdosqlite = .*/lib/php/extensions/.*/pdo_sqlite.* + +define CSWphp5pdosqlite_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling pdo_sqlite extension" + +perl -i -plne 's|;extension=pdo_sqlite.so|extension=pdo_sqlite.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5pdosqlite_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling pdo_sqlite extension" + +perl -i -plne 's|extension=pdo_sqlite.so|;extension=pdo_sqlite.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -11,3 +11,30 @@ CONFIGURE_ARGS += --with-pgsql=shared,$(prefix)/postgresql PKGFILES_CSWphp5pgsql = .*/lib/php/extensions/.*/pgsql.* + +define CSWphp5pgsql_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling pgsql extension" + +perl -i -plne 's|;extension=pgsql.so|extension=pgsql.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5pgsql_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling pgsql extension" + +perl -i -plne 's|extension=pgsql.so|;extension=pgsql.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-posix=shared PKGFILES_CSWphp5posix = .*/lib/php/extensions/.*/posix.* + +define CSWphp5posix_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling posix extension" + +perl -i -plne 's|;extension=posix.so|extension=posix.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5posix_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling posix extension" + +perl -i -plne 's|extension=posix.so|;extension=posix.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --with-pspell=shared,$(prefix) PKGFILES_CSWphp5pspell = .*/lib/php/extensions/.*/pspell.* + +define CSWphp5pspell_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling pspell extension" + +perl -i -plne 's|;extension=pspell.so|extension=pspell.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5pspell_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling pspell extension" + +perl -i -plne 's|extension=pspell.so|;extension=pspell.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -10,3 +10,30 @@ CONFIGURE_ARGS += --with-readline=shared,/opt/csw PKGFILES_CSWphp5readline = .*/lib/php/extensions/.*/readline.* + +define CSWphp5readline_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling readline extension" + +perl -i -plne 's|;extension=readline.so|extension=readline.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5readline_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling readline extension" + +perl -i -plne 's|extension=readline.so|;extension=readline.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-session=shared PKGFILES_CSWphp5session = .*/lib/php/extensions/.*/session.* + +define CSWphp5session_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling session extension" + +perl -i -plne 's|;extension=session.so|extension=session.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5session_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling session extension" + +perl -i -plne 's|extension=session.so|;extension=session.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-shmop=shared PKGFILES_CSWphp5shmop = .*/lib/php/extensions/.*/shmop.* + +define CSWphp5shmop_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling shmop extension" + +perl -i -plne 's|;extension=shmop.so|extension=shmop.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5shmop_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling shmop extension" + +perl -i -plne 's|extension=shmop.so|;extension=shmop.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -6,3 +6,29 @@ CONFIGURE_ARGS += --enable-simplexml CONFIGURE_ARGS += --with-libxml-dir=$(prefix) +define CSWphp5simplexml_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling simplexml extension" + +perl -i -plne 's|;extension=simplexml.so|extension=simplexml.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5simplexml_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling simplexml extension" + +perl -i -plne 's|extension=simplexml.so|;extension=simplexml.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --with-snmp=shared,$(prefix) PKGFILES_CSWphp5snmp = .*/lib/php/extensions/.*/snmp.* + +define CSWphp5snmp_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling snmp extension" + +perl -i -plne 's|;extension=snmp.so|extension=snmp.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5snmp_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling snmp extension" + +perl -i -plne 's|extension=snmp.so|;extension=snmp.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -10,3 +10,30 @@ CONFIGURE_ARGS += --with-libxml-dir=$(prefix) PKGFILES_CSWphp5soap = .*/lib/php/extensions/.*/soap.* + +define CSWphp5soap_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling soap extension" + +perl -i -plne 's|;extension=soap.so|extension=soap.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5soap_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling soap extension" + +perl -i -plne 's|extension=soap.so|;extension=soap.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-sockets=shared PKGFILES_CSWphp5sockets = .*/lib/php/extensions/.*/sockets.* + +define CSWphp5sockets_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling sockets extension" + +perl -i -plne 's|;extension=sockets.so|extension=sockets.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5sockets_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling sockets extension" + +perl -i -plne 's|extension=sockets.so|;extension=sockets.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -10,3 +10,30 @@ CONFIGURE_ARGS += --enable-sqlite-utf8 PKGFILES_CSWphp5sqlite = .*/lib/php/extensions/.*/sqlite.* + +define CSWphp5sqlite_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling sqlite extension" + +perl -i -plne 's|;extension=sqlite.so|extension=sqlite.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5sqlite_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling sqlite extension" + +perl -i -plne 's|extension=sqlite.so|;extension=sqlite.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-sysvsem=shared PKGFILES_CSWphp5sysvmsg = .*/lib/php/extensions/.*/sysvmsg.* + +define CSWphp5sysvmsg_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling sysvmsg extension" + +perl -i -plne 's|;extension=sysvmsg.so|extension=sysvmsg.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5sysvmsg_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling sysvmsg extension" + +perl -i -plne 's|extension=sysvmsg.so|;extension=sysvmsg.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-sysvsem=shared PKGFILES_CSWphp5sysvsem = .*/lib/php/extensions/.*/sysvsem.* + +define CSWphp5sysvsem_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling sysvsem extension" + +perl -i -plne 's|;extension=sysvsem.so|extension=sysvsem.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5sysvsem_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling sysvsem extension" + +perl -i -plne 's|extension=sysvsem.so|;extension=sysvsem.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-sysvshm=shared PKGFILES_CSWphp5sysvshm = .*/lib/php/extensions/.*/sysvshm.* + +define CSWphp5sysvshm_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling sysvshm extension" + +perl -i -plne 's|;extension=sysvshm.so|extension=sysvshm.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5sysvshm_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling sysvshm extension" + +perl -i -plne 's|extension=sysvshm.so|;extension=sysvshm.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --with-tidy=shared,$(prefix) PKGFILES_CSWphp5tidy = .*/lib/php/extensions/.*/tidy.* + +define CSWphp5tidy_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling tidy extension" + +perl -i -plne 's|;extension=tidy.so|extension=tidy.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5tidy_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling tidy extension" + +perl -i -plne 's|extension=tidy.so|;extension=tidy.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -9,3 +9,30 @@ CONFIGURE_ARGS += --enable-tokenizer=shared PKGFILES_CSWphp5tokenizer = .*/lib/php/extensions/.*/tokenizer.* + +define CSWphp5tokenizer_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling tokenizer extension" + +perl -i -plne 's|;extension=tokenizer.so|extension=tokenizer.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5tokenizer_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling tokenizer extension" + +perl -i -plne 's|extension=tokenizer.so|;extension=tokenizer.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -11,3 +11,30 @@ CONFIGURE_ARGS += --with-libexpat-dir=$(prefix) PKGFILES_CSWphp5wddx = .*/lib/php/extensions/.*/wddx.* + +define CSWphp5wddx_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling wddx extension" + +perl -i -plne 's|;extension=wddx.so|extension=wddx.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5wddx_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling wddx extension" + +perl -i -plne 's|extension=wddx.so|;extension=wddx.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -3,3 +3,4 @@ CONFIGURE_ARGS += --enable-xml CONFIGURE_ARGS += --with-libxml-dir=$(prefix) CONFIGURE_ARGS += --with-libexpat-dir=$(prefix) + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -10,3 +10,30 @@ CONFIGURE_ARGS += --with-libxml-dir=$(prefix) PKGFILES_CSWphp5xmlreader = .*/lib/php/extensions/.*/xmlreader.* + +define CSWphp5xmlreader_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling xmlreader extension" + +perl -i -plne 's|;extension=xmlreader.so|extension=xmlreader.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5xmlreader_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling xmlreader extension" + +perl -i -plne 's|extension=xmlreader.so|;extension=xmlreader.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -12,3 +12,30 @@ CONFIGURE_ARGS += --with-libexpat-dir=$(prefix) PKGFILES_CSWphp5xmlrpc = .*/lib/php/extensions/.*/xmlrpc.* + +define CSWphp5xmlrpc_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling xmlrpc extension" + +perl -i -plne 's|;extension=xmlrpc.so|extension=xmlrpc.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5xmlrpc_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling xmlrpc extension" + +perl -i -plne 's|extension=xmlrpc.so|;extension=xmlrpc.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -10,3 +10,30 @@ CONFIGURE_ARGS += --with-libxml-dir=$(prefix) PKGFILES_CSWphp5xmlwriter = .*/lib/php/extensions/.*/xmlwriter.* + +define CSWphp5xmlwriter_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling xmlwriter extension" + +perl -i -plne 's|;extension=xmlwriter.so|extension=xmlwriter.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5xmlwriter_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling xmlwriter extension" + +perl -i -plne 's|extension=xmlwriter.so|;extension=xmlwriter.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -10,3 +10,30 @@ CONFIGURE_ARGS += --with-xsl=shared,$(prefix) PKGFILES_CSWphp5xsl = .*/lib/php/extensions/.*/xsl.* + +define CSWphp5xsl_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling xsl extension" + +perl -i -plne 's|;extension=xsl.so|extension=xsl.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5xsl_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling xsl extension" + +perl -i -plne 's|extension=xsl.so|;extension=xsl.so|' ${PHP_INI} + +exit 0 +endef + Modified: csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile 2009-04-01 22:11:59 UTC (rev 4151) +++ csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile 2009-04-02 01:43:50 UTC (rev 4152) @@ -10,3 +10,30 @@ CONFIGURE_ARGS += --with-zlib-dir=$(prefix) PKGFILES_CSWphp5zip = .*/lib/php/extensions/.*/zip.* + +define CSWphp5zip_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling zip extension" + +perl -i -plne 's|;extension=zip.so|extension=zip.so|' ${PHP_INI} + +exit 0 +endef + +define CSWphp5zip_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling zip extension" + +perl -i -plne 's|extension=zip.so|;extension=zip.so|' ${PHP_INI} + +exit 0 +endef + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Apr 2 07:10:53 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 02 Apr 2009 05:10:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[4153] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 4153 http://gar.svn.sourceforge.net/gar/?rev=4153&view=rev Author: valholla Date: 2009-04-02 05:10:51 +0000 (Thu, 02 Apr 2009) Log Message: ----------- isalist Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2009-04-02 01:43:50 UTC (rev 4152) +++ csw/mgar/pkg/subversion/trunk/Makefile 2009-04-02 05:10:51 UTC (rev 4153) @@ -85,6 +85,8 @@ EXTRA_INC += $(JDK)/include SVNLIB = $(prefix)/lib/svn +NOISALIST = 1 +LDFLAGS = CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) CONFIGURE_ARGS += --with-gnu-ld=yes CONFIGURE_ARGS += --with-apr=$(prefix)/apache2/bin/apr-config This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Apr 2 08:26:32 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 02 Apr 2009 06:26:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[4154] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4154 http://gar.svn.sourceforge.net/gar/?rev=4154&view=rev Author: valholla Date: 2009-04-02 06:26:31 +0000 (Thu, 02 Apr 2009) Log Message: ----------- various fixes Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/checksums csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile csw/mgar/pkg/php5/trunk/files/php.ini.CSW Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -62,7 +62,7 @@ # BerkeleyDB EXTRA_LIB += $(prefix)/bdb44/lib EXTRA_INC += $(prefix)/bdb44/include -EXTRA_CFLAGS = $(prefix)/include/ncursesw +EXTRA_CFLAGS = -I$(prefix)/include/ncursesw NOISALIST = 1 DISTFILES += fixme.sh Modified: csw/mgar/pkg/php5/trunk/checksums =================================================================== --- csw/mgar/pkg/php5/trunk/checksums 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/checksums 2009-04-02 06:26:31 UTC (rev 4154) @@ -1,5 +1,5 @@ 280d6cda7f72a4fc6de42fda21ac2db7 download/php-5.2.9.tar.bz2 -72e4984625252fc0a0c2199a820b7563 download/php.ini.CSW +160963de6006c558963e5bc37584bf15 download/php.ini.CSW 90ae3cef3692d7e566c47d89fe39c43d download/phpext d4c93751890b989c5a7b04acb5845fd9 download/pear.conf.CSW de56d3571f4484284d106af158bffc38 download/CSWphp5_ext_enable.sh Modified: csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling bcmath extension" -perl -i -plne 's|;extension=bcmath.so|extension=bcmath.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"bcmath\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=bcmath.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=bcmath.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=bcmath.so|extension=bcmath.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=bcmath.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"bcmath\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling bcmath extension" -perl -i -plne 's|extension=bcmath.so|;extension=bcmath.so|' ${PHP_INI} +perl -i -plne 's|extension=bcmath.so|;extension=bcmath.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"bcmath\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling bz2 extension" -perl -i -plne 's|;extension=bz2.so|extension=bz2.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"bz2\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=bz2.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=bz2.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=bz2.so|extension=bz2.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=bz2.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"bz2\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling bz2 extension" -perl -i -plne 's|extension=bz2.so|;extension=bz2.so|' ${PHP_INI} +perl -i -plne 's|extension=bz2.so|;extension=bz2.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"bz2\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling calendar extension" -perl -i -plne 's|;extension=calendar.so|extension=calendar.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"calendar\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=calendar.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=calendar.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=calendar.so|extension=calendar.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=calendar.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"calendar\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling calendar extension" -perl -i -plne 's|extension=calendar.so|;extension=calendar.so|' ${PHP_INI} +perl -i -plne 's|extension=calendar.so|;extension=calendar.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"calendar\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling ctype extension" -perl -i -plne 's|;extension=ctype.so|extension=ctype.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"ctype\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=ctype.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=ctype.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=ctype.so|extension=ctype.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=ctype.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"ctype\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling ctype extension" -perl -i -plne 's|extension=ctype.so|;extension=ctype.so|' ${PHP_INI} +perl -i -plne 's|extension=ctype.so|;extension=ctype.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"ctype\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -20,8 +20,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling curl extension" -perl -i -plne 's|;extension=curl.so|extension=curl.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"curl\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=curl.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=curl.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=curl.so|extension=curl.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=curl.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"curl\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -33,8 +63,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling curl extension" -perl -i -plne 's|extension=curl.so|;extension=curl.so|' ${PHP_INI} +perl -i -plne 's|extension=curl.so|;extension=curl.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"curl\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -23,8 +23,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling dba extension" -perl -i -plne 's|;extension=dba.so|extension=dba.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"dba\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=dba.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=dba.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=dba.so|extension=dba.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=dba.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"dba\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -36,8 +66,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling dba extension" -perl -i -plne 's|extension=dba.so|;extension=dba.so|' ${PHP_INI} +perl -i -plne 's|extension=dba.so|;extension=dba.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"dba\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling dbase extension" -perl -i -plne 's|;extension=dbase.so|extension=dbase.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"dbase\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=dbase.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=dbase.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=dbase.so|extension=dbase.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=dbase.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"dbase\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling dbase extension" -perl -i -plne 's|extension=dbase.so|;extension=dbase.so|' ${PHP_INI} +perl -i -plne 's|extension=dbase.so|;extension=dbase.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"dbase\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -19,8 +19,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling dom extension" -perl -i -plne 's|;extension=dom.so|extension=dom.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"dom\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=dom.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=dom.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=dom.so|extension=dom.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=dom.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"dom\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -32,8 +62,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling dom extension" -perl -i -plne 's|extension=dom.so|;extension=dom.so|' ${PHP_INI} +perl -i -plne 's|extension=dom.so|;extension=dom.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"dom\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -21,8 +21,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling exif extension" -perl -i -plne 's|;extension=exif.so|extension=exif.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"exif\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=exif.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=exif.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=exif.so|extension=exif.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=exif.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"exif\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -34,8 +64,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling exif extension" -perl -i -plne 's|extension=exif.so|;extension=exif.so|' ${PHP_INI} +perl -i -plne 's|extension=exif.so|;extension=exif.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"exif\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_filter/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -1,39 +1,5 @@ PHP5EXT_NAME = filter -PACKAGES += CSWphp5filter - -CATALOGNAME_CSWphp5filter = php5_filter -SPKG_DESC_CSWphp5filter = filter Extention for PHP5 -REQUIRED_PKGS_CSWphp5filter = CSWphp5 CSWpcrert - CONFIGURE_ARGS += --enable-filter=shared CONFIGURE_ARGS += --with-pcre-dir=$(prefix) -PKGFILES_CSWphp5filter = .*/lib/php/extensions/.*/filter.* - -define CSWphp5filter_postinstall -#!/bin/sh - -PHP_INI=/opt/csw/php5/lib/php.ini - -echo "[===> Running Post Install <===]" -echo " ===> Enabling filter extension" - -perl -i -plne 's|;extension=filter.so|extension=filter.so|' ${PHP_INI} - -exit 0 -endef - -define CSWphp5filter_preremove -#!/bin/sh - -PHP_INI=/opt/csw/php5/lib/php.ini - -echo "[===> Running Pre Remove <===]" -echo " ===> Disabling filter extension" - -perl -i -plne 's|extension=filter.so|;extension=filter.so|' ${PHP_INI} - -exit 0 -endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling ftp extension" -perl -i -plne 's|;extension=ftp.so|extension=ftp.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"ftp\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=ftp.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=ftp.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=ftp.so|extension=ftp.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=ftp.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"ftp\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling ftp extension" -perl -i -plne 's|extension=ftp.so|;extension=ftp.so|' ${PHP_INI} +perl -i -plne 's|extension=ftp.so|;extension=ftp.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"ftp\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -29,8 +29,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling gd extension" -perl -i -plne 's|;extension=gd.so|extension=gd.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"gd\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=gd.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=gd.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=gd.so|extension=gd.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=gd.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"gd\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -42,8 +72,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling gd extension" -perl -i -plne 's|extension=gd.so|;extension=gd.so|' ${PHP_INI} +perl -i -plne 's|extension=gd.so|;extension=gd.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"gd\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling gettext extension" -perl -i -plne 's|;extension=gettext.so|extension=gettext.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"gettext\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=gettext.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=gettext.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=gettext.so|extension=gettext.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=gettext.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"gettext\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling gettext extension" -perl -i -plne 's|extension=gettext.so|;extension=gettext.so|' ${PHP_INI} +perl -i -plne 's|extension=gettext.so|;extension=gettext.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"gettext\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling gmp extension" -perl -i -plne 's|;extension=gmp.so|extension=gmp.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"gmp\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=gmp.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=gmp.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=gmp.so|extension=gmp.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=gmp.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"gmp\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling gmp extension" -perl -i -plne 's|extension=gmp.so|;extension=gmp.so|' ${PHP_INI} +perl -i -plne 's|extension=gmp.so|;extension=gmp.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"gmp\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling hash extension" -perl -i -plne 's|;extension=hash.so|extension=hash.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"hash\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=hash.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=hash.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=hash.so|extension=hash.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=hash.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"hash\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling hash extension" -perl -i -plne 's|extension=hash.so|;extension=hash.so|' ${PHP_INI} +perl -i -plne 's|extension=hash.so|;extension=hash.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"hash\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -25,8 +25,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling iconv extension" -perl -i -plne 's|;extension=iconv.so|extension=iconv.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"iconv\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=iconv.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=iconv.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=iconv.so|extension=iconv.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=iconv.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"iconv\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -38,8 +68,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling iconv extension" -perl -i -plne 's|extension=iconv.so|;extension=iconv.so|' ${PHP_INI} +perl -i -plne 's|extension=iconv.so|;extension=iconv.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"iconv\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -20,8 +20,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling imap extension" -perl -i -plne 's|;extension=imap.so|extension=imap.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"imap\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=imap.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=imap.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=imap.so|extension=imap.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=imap.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"imap\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -33,8 +63,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling imap extension" -perl -i -plne 's|extension=imap.so|;extension=imap.so|' ${PHP_INI} +perl -i -plne 's|extension=imap.so|;extension=imap.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"imap\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling json extension" -perl -i -plne 's|;extension=json.so|extension=json.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"json\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=json.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=json.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=json.so|extension=json.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=json.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"json\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling json extension" -perl -i -plne 's|extension=json.so|;extension=json.so|' ${PHP_INI} +perl -i -plne 's|extension=json.so|;extension=json.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"json\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -20,8 +20,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling ldap extension" -perl -i -plne 's|;extension=ldap.so|extension=ldap.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"ldap\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=ldap.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=ldap.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=ldap.so|extension=ldap.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=ldap.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"ldap\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -33,8 +63,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling ldap extension" -perl -i -plne 's|extension=ldap.so|;extension=ldap.so|' ${PHP_INI} +perl -i -plne 's|extension=ldap.so|;extension=ldap.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"ldap\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -20,8 +20,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling mbstring extension" -perl -i -plne 's|;extension=mbstring.so|extension=mbstring.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"mbstring\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=mbstring.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=mbstring.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=mbstring.so|extension=mbstring.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=mbstring.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"mbstring\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -33,8 +63,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling mbstring extension" -perl -i -plne 's|extension=mbstring.so|;extension=mbstring.so|' ${PHP_INI} +perl -i -plne 's|extension=mbstring.so|;extension=mbstring.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"mbstring\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling mcrypt extension" -perl -i -plne 's|;extension=mcrypt.so|extension=mcrypt.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"mcrypt\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=mcrypt.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=mcrypt.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=mcrypt.so|extension=mcrypt.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=mcrypt.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"mcrypt\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling mcrypt extension" -perl -i -plne 's|extension=mcrypt.so|;extension=mcrypt.so|' ${PHP_INI} +perl -i -plne 's|extension=mcrypt.so|;extension=mcrypt.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"mcrypt\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling mhash extension" -perl -i -plne 's|;extension=mhash.so|extension=mhash.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"mhash\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=mhash.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=mhash.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=mhash.so|extension=mhash.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=mhash.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"mhash\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling mhash extension" -perl -i -plne 's|extension=mhash.so|;extension=mhash.so|' ${PHP_INI} +perl -i -plne 's|extension=mhash.so|;extension=mhash.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"mhash\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -10,7 +10,7 @@ PKGFILES_CSWphp5mimemagic = .*/lib/php/extensions/.*/mime_magic.* -define CSWphp5mimemagic_postinstall +define CSWphp5mime_magic_postinstall #!/bin/sh PHP_INI=/opt/csw/php5/lib/php.ini @@ -18,12 +18,42 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling mime_magic extension" -perl -i -plne 's|;extension=mime_magic.so|extension=mime_magic.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"mime_magic\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=mime_magic.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=mime_magic.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=mime_magic.so|extension=mime_magic.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=mime_magic.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"mime_magic\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef -define CSWphp5mimemagic_preremove +define CSWphp5mime_magic_preremove #!/bin/sh PHP_INI=/opt/csw/php5/lib/php.ini @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling mime_magic extension" -perl -i -plne 's|extension=mime_magic.so|;extension=mime_magic.so|' ${PHP_INI} +perl -i -plne 's|extension=mime_magic.so|;extension=mime_magic.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"mime_magic\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling mssql extension" -perl -i -plne 's|;extension=mssql.so|extension=mssql.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"mssql\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=mssql.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=mssql.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=mssql.so|extension=mssql.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=mssql.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"mssql\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling mssql extension" -perl -i -plne 's|extension=mssql.so|;extension=mssql.so|' ${PHP_INI} +perl -i -plne 's|extension=mssql.so|;extension=mssql.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"mssql\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -19,8 +19,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling mysql extension" -perl -i -plne 's|;extension=mysql.so|extension=mysql.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"mysql\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=mysql.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=mysql.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=mysql.so|extension=mysql.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=mysql.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"mysql\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -32,8 +62,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling mysql extension" -perl -i -plne 's|extension=mysql.so|;extension=mysql.so|' ${PHP_INI} +perl -i -plne 's|extension=mysql.so|;extension=mysql.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"mysql\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling mysqli extension" -perl -i -plne 's|;extension=mysqli.so|extension=mysqli.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"mysqli\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=mysqli.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=mysqli.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=mysqli.so|extension=mysqli.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=mysqli.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"mysqli\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling mysqli extension" -perl -i -plne 's|extension=mysqli.so|;extension=mysqli.so|' ${PHP_INI} +perl -i -plne 's|extension=mysqli.so|;extension=mysqli.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"mysqli\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling ncurses extension" -perl -i -plne 's|;extension=ncurses.so|extension=ncurses.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"ncurses\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=ncurses.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=ncurses.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=ncurses.so|extension=ncurses.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=ncurses.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"ncurses\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling ncurses extension" -perl -i -plne 's|extension=ncurses.so|;extension=ncurses.so|' ${PHP_INI} +perl -i -plne 's|extension=ncurses.so|;extension=ncurses.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"ncurses\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -20,8 +20,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling odbc extension" -perl -i -plne 's|;extension=odbc.so|extension=odbc.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"odbc\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=odbc.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=odbc.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=odbc.so|extension=odbc.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=odbc.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"odbc\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -33,8 +63,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling odbc extension" -perl -i -plne 's|extension=odbc.so|;extension=odbc.so|' ${PHP_INI} +perl -i -plne 's|extension=odbc.so|;extension=odbc.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"odbc\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling openssl extension" -perl -i -plne 's|;extension=openssl.so|extension=openssl.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"openssl\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=openssl.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=openssl.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=openssl.so|extension=openssl.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=openssl.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"openssl\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling openssl extension" -perl -i -plne 's|extension=openssl.so|;extension=openssl.so|' ${PHP_INI} +perl -i -plne 's|extension=openssl.so|;extension=openssl.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"openssl\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling pcntl extension" -perl -i -plne 's|;extension=pcntl.so|extension=pcntl.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"pcntl\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=pcntl.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=pcntl.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=pcntl.so|extension=pcntl.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pcntl.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"pcntl\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling pcntl extension" -perl -i -plne 's|extension=pcntl.so|;extension=pcntl.so|' ${PHP_INI} +perl -i -plne 's|extension=pcntl.so|;extension=pcntl.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"pcntl\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -17,10 +17,40 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Post Install <===]" -echo " ===> Enabling pdo_mysql extension" +echo " ===> Enabling pdomysql extension" -perl -i -plne 's|;extension=pdo_mysql.so|extension=pdo_mysql.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"pdomysql\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=pdomysql.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=pdomysql.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=pdomysql.so|extension=pdomysql.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pdomysql.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"pdomysql\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -30,10 +60,18 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Pre Remove <===]" -echo " ===> Disabling pdo_mysql extension" +echo " ===> Disabling pdomysql extension" -perl -i -plne 's|extension=pdo_mysql.so|;extension=pdo_mysql.so|' ${PHP_INI} +perl -i -plne 's|extension=pdomysql.so|;extension=pdomysql.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"pdomysql\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -16,10 +16,40 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Post Install <===]" -echo " ===> Enabling pdo_odbc extension" +echo " ===> Enabling pdoodbc extension" -perl -i -plne 's|;extension=pdo_odbc.so|extension=pdo_odbc.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"pdoodbc\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=pdoodbc.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=pdoodbc.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=pdoodbc.so|extension=pdoodbc.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pdoodbc.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"pdoodbc\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -29,10 +59,18 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Pre Remove <===]" -echo " ===> Disabling pdo_odbc extension" +echo " ===> Disabling pdoodbc extension" -perl -i -plne 's|extension=pdo_odbc.so|;extension=pdo_odbc.so|' ${PHP_INI} +perl -i -plne 's|extension=pdoodbc.so|;extension=pdoodbc.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"pdoodbc\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,10 +18,40 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Post Install <===]" -echo " ===> Enabling pdo_pgsql extension" +echo " ===> Enabling pdopgsql extension" -perl -i -plne 's|;extension=pdo_pgsql.so|extension=pdo_pgsql.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"pdopgsql\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=pdopgsql.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=pdopgsql.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=pdopgsql.so|extension=pdopgsql.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pdopgsql.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"pdopgsql\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,10 +61,18 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Pre Remove <===]" -echo " ===> Disabling pdo_pgsql extension" +echo " ===> Disabling pdopgsql extension" -perl -i -plne 's|extension=pdo_pgsql.so|;extension=pdo_pgsql.so|' ${PHP_INI} +perl -i -plne 's|extension=pdopgsql.so|;extension=pdopgsql.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"pdopgsql\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -16,10 +16,40 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Post Install <===]" -echo " ===> Enabling pdo_sqlite extension" +echo " ===> Enabling pdosqlite extension" -perl -i -plne 's|;extension=pdo_sqlite.so|extension=pdo_sqlite.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"pdosqlite\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=pdosqlite.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=pdosqlite.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=pdosqlite.so|extension=pdosqlite.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pdosqlite.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"pdosqlite\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -29,10 +59,18 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Pre Remove <===]" -echo " ===> Disabling pdo_sqlite extension" +echo " ===> Disabling pdosqlite extension" -perl -i -plne 's|extension=pdo_sqlite.so|;extension=pdo_sqlite.so|' ${PHP_INI} +perl -i -plne 's|extension=pdosqlite.so|;extension=pdosqlite.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"pdosqlite\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -20,8 +20,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling pgsql extension" -perl -i -plne 's|;extension=pgsql.so|extension=pgsql.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"pgsql\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=pgsql.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=pgsql.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=pgsql.so|extension=pgsql.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pgsql.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"pgsql\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -33,8 +63,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling pgsql extension" -perl -i -plne 's|extension=pgsql.so|;extension=pgsql.so|' ${PHP_INI} +perl -i -plne 's|extension=pgsql.so|;extension=pgsql.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"pgsql\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling posix extension" -perl -i -plne 's|;extension=posix.so|extension=posix.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"posix\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=posix.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=posix.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=posix.so|extension=posix.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=posix.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"posix\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling posix extension" -perl -i -plne 's|extension=posix.so|;extension=posix.so|' ${PHP_INI} +perl -i -plne 's|extension=posix.so|;extension=posix.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"posix\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling pspell extension" -perl -i -plne 's|;extension=pspell.so|extension=pspell.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"pspell\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=pspell.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=pspell.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=pspell.so|extension=pspell.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pspell.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"pspell\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling pspell extension" -perl -i -plne 's|extension=pspell.so|;extension=pspell.so|' ${PHP_INI} +perl -i -plne 's|extension=pspell.so|;extension=pspell.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"pspell\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -19,8 +19,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling readline extension" -perl -i -plne 's|;extension=readline.so|extension=readline.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"readline\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=readline.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=readline.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=readline.so|extension=readline.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=readline.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"readline\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -32,8 +62,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling readline extension" -perl -i -plne 's|extension=readline.so|;extension=readline.so|' ${PHP_INI} +perl -i -plne 's|extension=readline.so|;extension=readline.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"readline\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -1 +1,65 @@ @ ( echo "==> Not configuring recode see README in extensions/php5_recode" ) +define CSWphp5recode_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling recode extension" + +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"recode\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=recode.so +****************************************************************************** +_EOF_ +exit 0 +fi + +if grep 'extension=recode.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=recode.so|extension=recode.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=recode.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"recode\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + +exit 0 +endef + +define CSWphp5recode_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling recode extension" + +perl -i -plne 's|extension=recode.so|;extension=recode.so|' $${PHP_INI} + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"recode\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + +exit 0 +endef Modified: csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling session extension" -perl -i -plne 's|;extension=session.so|extension=session.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"session\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=session.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=session.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=session.so|extension=session.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=session.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"session\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling session extension" -perl -i -plne 's|extension=session.so|;extension=session.so|' ${PHP_INI} +perl -i -plne 's|extension=session.so|;extension=session.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"session\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling shmop extension" -perl -i -plne 's|;extension=shmop.so|extension=shmop.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"shmop\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=shmop.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=shmop.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=shmop.so|extension=shmop.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=shmop.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"shmop\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling shmop extension" -perl -i -plne 's|extension=shmop.so|;extension=shmop.so|' ${PHP_INI} +perl -i -plne 's|extension=shmop.so|;extension=shmop.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"shmop\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -14,8 +14,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling simplexml extension" -perl -i -plne 's|;extension=simplexml.so|extension=simplexml.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"simplexml\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=simplexml.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=simplexml.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=simplexml.so|extension=simplexml.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=simplexml.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"simplexml\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -27,8 +57,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling simplexml extension" -perl -i -plne 's|extension=simplexml.so|;extension=simplexml.so|' ${PHP_INI} +perl -i -plne 's|extension=simplexml.so|;extension=simplexml.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"simplexml\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling snmp extension" -perl -i -plne 's|;extension=snmp.so|extension=snmp.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"snmp\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=snmp.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=snmp.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=snmp.so|extension=snmp.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=snmp.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"snmp\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling snmp extension" -perl -i -plne 's|extension=snmp.so|;extension=snmp.so|' ${PHP_INI} +perl -i -plne 's|extension=snmp.so|;extension=snmp.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"snmp\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -19,8 +19,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling soap extension" -perl -i -plne 's|;extension=soap.so|extension=soap.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"soap\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=soap.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=soap.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=soap.so|extension=soap.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=soap.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"soap\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -32,8 +62,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling soap extension" -perl -i -plne 's|extension=soap.so|;extension=soap.so|' ${PHP_INI} +perl -i -plne 's|extension=soap.so|;extension=soap.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"soap\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -18,8 +18,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling sockets extension" -perl -i -plne 's|;extension=sockets.so|extension=sockets.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"sockets\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=sockets.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=sockets.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=sockets.so|extension=sockets.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=sockets.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"sockets\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -31,8 +61,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling sockets extension" -perl -i -plne 's|extension=sockets.so|;extension=sockets.so|' ${PHP_INI} +perl -i -plne 's|extension=sockets.so|;extension=sockets.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"sockets\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-04-02 05:10:51 UTC (rev 4153) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-04-02 06:26:31 UTC (rev 4154) @@ -19,8 +19,38 @@ echo "[===> Running Post Install <===]" echo " ===> Enabling sqlite extension" -perl -i -plne 's|;extension=sqlite.so|extension=sqlite.so|' ${PHP_INI} +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension \"sqlite\" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=sqlite.so +****************************************************************************** +_EOF_ +exit 0 +fi +if grep 'extension=sqlite.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=sqlite.so|extension=sqlite.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=sqlite.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension \"sqlite\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + exit 0 endef @@ -32,8 +62,16 @@ echo "[===> Running Pre Remove <===]" echo " ===> Disabling sqlite extension" -perl -i -plne 's|extension=sqlite.so|;extension=sqlite.so|' ${PHP_INI} +perl -i -plne 's|extension=sqlite.so|;extension=sqlite.so|' $${PHP_INI} +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension \"sqlite\" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + exit 0 endef - Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile =================================================================== @@ 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 Thu Apr 2 10:57:40 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 02 Apr 2009 08:57:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[4155] csw/mgar/pkg/figlet/trunk Message-ID: Revision: 4155 http://gar.svn.sourceforge.net/gar/?rev=4155&view=rev Author: dmichelsen Date: 2009-04-02 08:57:40 +0000 (Thu, 02 Apr 2009) Log Message: ----------- figlet: Make sure GAR CFLAGS are used, dynamic gspec Modified Paths: -------------- csw/mgar/pkg/figlet/trunk/Makefile csw/mgar/pkg/figlet/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/figlet/trunk/files/CSWfiglet.gspec Property Changed: ---------------- csw/mgar/pkg/figlet/trunk/ Property changes on: csw/mgar/pkg/figlet/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/figlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/figlet/trunk/Makefile 2009-04-02 06:26:31 UTC (rev 4154) +++ csw/mgar/pkg/figlet/trunk/Makefile 2009-04-02 08:57:40 UTC (rev 4155) @@ -17,8 +17,11 @@ MASTER_SITES += ftp://ftp.figlet.org/pub/figlet/fonts/ # ours.tar.gz is already in the figlet distribution DISTFILES += contributed.tar.gz international.tar.gz ms-dos.tar.gz -DISTFILES += $(call admfiles,CSWfiglet) +SPKG_SOURCEURL = http://www.figlet.org + +LICENSE = LICENSE + DISTNAME = $(GARNAME)$(RELEASE) # We define upstream file regex so we can be notifed of new upstream software release @@ -30,7 +33,7 @@ APPDIR = $(sharedstatedir)/$(GARNAME) DEFAULTFONTDIR = $(APPDIR)/fonts -BUILD_OVERRIDE_DIRS = CC DEFAULTFONTDIR +BUILD_OVERRIDE_DIRS = CC CFLAGS DEFAULTFONTDIR # FIGlet doesn't have tests TEST_SCRIPTS = Modified: csw/mgar/pkg/figlet/trunk/checksums =================================================================== --- csw/mgar/pkg/figlet/trunk/checksums 2009-04-02 06:26:31 UTC (rev 4154) +++ csw/mgar/pkg/figlet/trunk/checksums 2009-04-02 08:57:40 UTC (rev 4155) @@ -1,5 +1,4 @@ -9fcf4f1651b8e6d3f56f1ef665285b2e download/figlet222.tar.gz +5f84ad52d092d5db4ad5916df767646b download/figlet222.tar.gz 6e2dec4499f7a7fe178522e02e0b6cd1 download/contributed.tar.gz b2d53f7e251014adcdb4d407c47f90ef download/international.tar.gz 49aa57ab989e8d952be037414b0bbbe4 download/ms-dos.tar.gz -8ccf6bb63ce609750b65ba1e74aa2ca2 download/CSWfiglet.gspec Deleted: csw/mgar/pkg/figlet/trunk/files/CSWfiglet.gspec =================================================================== --- csw/mgar/pkg/figlet/trunk/files/CSWfiglet.gspec 2009-04-02 06:26:31 UTC (rev 4154) +++ csw/mgar/pkg/figlet/trunk/files/CSWfiglet.gspec 2009-04-02 08:57:40 UTC (rev 4155) @@ -1,4 +0,0 @@ -%var bitname figlet -%var pkgname CSWfiglet -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 2 10:58:46 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 02 Apr 2009 08:58:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[4156] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 4156 http://gar.svn.sourceforge.net/gar/?rev=4156&view=rev Author: dmichelsen Date: 2009-04-02 08:58:46 +0000 (Thu, 02 Apr 2009) Log Message: ----------- mGAR v2: Increase wget timeout to honour slow FTP sites Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2009-04-02 08:57:40 UTC (rev 4155) +++ csw/mgar/gar/v2/gar.lib.mk 2009-04-02 08:58:46 UTC (rev 4156) @@ -90,16 +90,16 @@ # download an http URL (colons omitted) http//%: - @wget $(WGET_OPTS) -T 10 -c -P $(PARTIALDIR) http://$* + @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) http://$* https//%: - @wget $(WGET_OPTS) -T 10 -c -P $(PARTIALDIR) https://$* + @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) https://$* # download an ftp URL (colons omitted) #ftp//%: -# @wget -T 10 -c --passive-ftp -P $(PARTIALDIR) ftp://$* +# @wget -T 30 -c --passive-ftp -P $(PARTIALDIR) ftp://$* ftp//%: - @wget $(WGET_OPTS) -T 10 -c -P $(PARTIALDIR) ftp://$* + @wget $(WGET_OPTS) -T 30 -c -P $(PARTIALDIR) ftp://$* # link to a local copy of the file # (absolute path) 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 2 13:26:02 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 02 Apr 2009 11:26:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[4157] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 4157 http://gar.svn.sourceforge.net/gar/?rev=4157&view=rev Author: dmichelsen Date: 2009-04-02 11:26:02 +0000 (Thu, 02 Apr 2009) Log Message: ----------- mGAR v2: Rewrote passing of runtime linker path via LD_OPTIONS instead of LDFLAGS Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-04-02 08:58:46 UTC (rev 4156) +++ csw/mgar/gar/v2/gar.conf.mk 2009-04-02 11:26:02 UTC (rev 4157) @@ -442,31 +442,25 @@ # however not expanded during compilation, so linker-pathes must directly be accessible # without expansion and needs to be differentiated between 32 and 64 bit, therefore # the links 32 and 64. -ifndef NORUNPATH -_ADD_RUNPATH = 1 -endif -ifeq ($(origin LINKER_FLAGS), undefined) -ifdef NOISALIST -LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))$(if $(_ADD_RUNPATH), -R$(abspath $(ELIB)/$(MM_LIBDIR)))) $(EXTRA_LINKER_FLAGS) -else +ifndef NORUNPATH # If we use $ISALIST it is a good idea to also add $MM_LIBDIR as there # may not be a subdirectory for the 32-bit standard case (this would normally # be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .). This is most likely # the case for libraries in $(EXTRA_LIBS) for which no links generated in CSWcommon. -# The quoting of $ISALIST is unfortunately dependend on how often the linker flags -# are expanded until execution. The definition here is suitable for autotools. -# For other buildtools it may be suitable to add definitions with other quotings. -RUNPATHQUOTE ?= 2 -ifeq ($(RUNPATHQUOTE),1) - _Q = \\\$$\$$ -else - _Q = \\\\\\\$$\$$ +RUNPATH_DIRS ?= $(foreach D,$(libdir_install) $(EXTRA_LIB),$(abspath $D/$(MM_LIBDIR))) $(EXTRA_RUNPATH_DIRS) + +ifndef NOISALIST +RUNPATH_ISALIST ?= $(foreach D,$(libdir_install) $(EXTRA_LIB),$(abspath $D/$(MM_LIBDIR))) $(EXTRA_RUNPATH_ISALIST) endif -LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))$(if $(_ADD_RUNPATH), -R$(ELIB)/$(_Q)ISALIST -R$(abspath $(ELIB)/$(MM_LIBDIR)))) $(EXTRA_LINKER_FLAGS) + +# Iterate over all directories in RUNPATH_DIRS, prefix each directory with one +# with $ISALIST if it exists in RUNPATH_ISALIST, then append remaining dirs from RUNPATH_ISALIST +RUNPATH_LINKER_FLAGS ?= $(foreach D,$(RUNPATH_DIRS),$(addprefix -R,$(addsuffix /\$$ISALIST,$(filter $D,$(RUNPATH_ISALIST))) $D)) $(addprefix -R,$(filter-out $(RUNPATH_DIRS),$(RUNPATH_ISALIST))) $(EXTRA_RUNPATH_LINKER_FLAGS) endif -endif +LINKER_FLAGS ?= $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) + CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) CXX = $($(GARCOMPILER)_CXX) @@ -477,12 +471,12 @@ ASFLAGS ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(EXTRA_ASFLAGS)) OPTFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(EXTRA_OPTFLAGS)) -#GCC3_LD_OPTIONS = -R$(GNU_CC_HOME)/lib $(EXTRA_GCC3_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) $(EXTRA_LD_OPTIONS) -#GCC4_LD_OPTIONS = -R$(GNU_CC_HOME)/lib $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) $(EXTRA_LD_OPTIONS) -#SOS11_LD_OPTIONS = $(strip $(EXTRA_SOS11_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) $(EXTRA_LD_OPTIONS)) -#SOS12_LD_OPTIONS = $(strip $(EXTRA_SOS12_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) $(EXTRA_LD_OPTIONS)) +GCC3_LD_OPTIONS = -R$(GNU_CC_HOME)/lib $(EXTRA_GCC3_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) $(EXTRA_LD_OPTIONS) +GCC4_LD_OPTIONS = -R$(GNU_CC_HOME)/lib $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) $(EXTRA_LD_OPTIONS) +SOS11_LD_OPTIONS = $(strip $(EXTRA_SOS11_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) $(EXTRA_LD_OPTIONS)) +SOS12_LD_OPTIONS = $(strip $(EXTRA_SOS12_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) $(EXTRA_LD_OPTIONS)) -#LD_OPTIONS = $($(GARCOMPILER)_LD_OPTIONS) +LD_OPTIONS ?= $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) # LD_OPTIONS considered harmful. Disable for the moment. #LDOPT_LIBS ?= $(libdir) 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 2 14:15:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 02 Apr 2009 12:15:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[4158] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 4158 http://gar.svn.sourceforge.net/gar/?rev=4158&view=rev Author: dmichelsen Date: 2009-04-02 12:15:19 +0000 (Thu, 02 Apr 2009) Log Message: ----------- mGAR v2: Apply MM_LIBDIR as late as possible Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-04-02 11:26:02 UTC (rev 4157) +++ csw/mgar/gar/v2/gar.conf.mk 2009-04-02 12:15:19 UTC (rev 4158) @@ -448,15 +448,15 @@ # may not be a subdirectory for the 32-bit standard case (this would normally # be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .). This is most likely # the case for libraries in $(EXTRA_LIBS) for which no links generated in CSWcommon. -RUNPATH_DIRS ?= $(foreach D,$(libdir_install) $(EXTRA_LIB),$(abspath $D/$(MM_LIBDIR))) $(EXTRA_RUNPATH_DIRS) +RUNPATH_DIRS ?= $(libdir_install) $(EXTRA_LIB) $(EXTRA_RUNPATH_DIRS) ifndef NOISALIST -RUNPATH_ISALIST ?= $(foreach D,$(libdir_install) $(EXTRA_LIB),$(abspath $D/$(MM_LIBDIR))) $(EXTRA_RUNPATH_ISALIST) +RUNPATH_ISALIST ?= $(libdir_install) $(EXTRA_LIB) $(EXTRA_RUNPATH_ISALIST) endif # Iterate over all directories in RUNPATH_DIRS, prefix each directory with one # with $ISALIST if it exists in RUNPATH_ISALIST, then append remaining dirs from RUNPATH_ISALIST -RUNPATH_LINKER_FLAGS ?= $(foreach D,$(RUNPATH_DIRS),$(addprefix -R,$(addsuffix /\$$ISALIST,$(filter $D,$(RUNPATH_ISALIST))) $D)) $(addprefix -R,$(filter-out $(RUNPATH_DIRS),$(RUNPATH_ISALIST))) $(EXTRA_RUNPATH_LINKER_FLAGS) +RUNPATH_LINKER_FLAGS ?= $(foreach D,$(RUNPATH_DIRS),$(addprefix -R,$(addsuffix /\$$ISALIST,$(filter $D,$(RUNPATH_ISALIST))) $(abspath $D/$(MM_LIBDIR)))) $(addprefix -R,$(filter-out $(RUNPATH_DIRS),$(RUNPATH_ISALIST))) $(EXTRA_RUNPATH_LINKER_FLAGS) endif LINKER_FLAGS ?= $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 2 15:06:51 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 02 Apr 2009 13:06:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[4159] csw/mgar/pkg/figlet/trunk/Makefile Message-ID: Revision: 4159 http://gar.svn.sourceforge.net/gar/?rev=4159&view=rev Author: dmichelsen Date: 2009-04-02 13:06:50 +0000 (Thu, 02 Apr 2009) Log Message: ----------- figlet: Don't include any runtime linker path Modified Paths: -------------- csw/mgar/pkg/figlet/trunk/Makefile Modified: csw/mgar/pkg/figlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/figlet/trunk/Makefile 2009-04-02 12:15:19 UTC (rev 4158) +++ csw/mgar/pkg/figlet/trunk/Makefile 2009-04-02 13:06:50 UTC (rev 4159) @@ -40,6 +40,8 @@ INSTALL_SCRIPTS = custom +NORUNPATH = 1 + include gar/category.mk # The install part from the Makefile is completely unrelocatable :-( 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 2 15:23:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 02 Apr 2009 13:23:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[4160] csw/mgar/pkg/flex_new/trunk/Makefile Message-ID: Revision: 4160 http://gar.svn.sourceforge.net/gar/?rev=4160&view=rev Author: dmichelsen Date: 2009-04-02 13:23:59 +0000 (Thu, 02 Apr 2009) Log Message: ----------- flex_new: Don't use ISALIST in runtime linker path Modified Paths: -------------- csw/mgar/pkg/flex_new/trunk/Makefile Modified: csw/mgar/pkg/flex_new/trunk/Makefile =================================================================== --- csw/mgar/pkg/flex_new/trunk/Makefile 2009-04-02 13:06:50 UTC (rev 4159) +++ csw/mgar/pkg/flex_new/trunk/Makefile 2009-04-02 13:23:59 UTC (rev 4160) @@ -23,6 +23,7 @@ REQUIRED_PKGS = CSWggettextrt CSWiconv +NOISALIST = 1 CONFIGURE_ARGS = --prefix=$(libexecdir)/$(GARNAME)-$(GARVERSION) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 2 15:30:37 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 02 Apr 2009 13:30:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[4161] csw/mgar/pkg/less/trunk/Makefile Message-ID: Revision: 4161 http://gar.svn.sourceforge.net/gar/?rev=4161&view=rev Author: dmichelsen Date: 2009-04-02 13:30:34 +0000 (Thu, 02 Apr 2009) Log Message: ----------- less: Don't use ISALIST in runtime linker path Modified Paths: -------------- csw/mgar/pkg/less/trunk/Makefile Modified: csw/mgar/pkg/less/trunk/Makefile =================================================================== --- csw/mgar/pkg/less/trunk/Makefile 2009-04-02 13:23:59 UTC (rev 4160) +++ csw/mgar/pkg/less/trunk/Makefile 2009-04-02 13:30:34 UTC (rev 4161) @@ -18,6 +18,7 @@ REQUIRED_PKGS = CSWncurses CSWggettextrt +NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = 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 2 15:38:56 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 02 Apr 2009 13:38:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[4162] csw/mgar/pkg/gtar/trunk/Makefile Message-ID: Revision: 4162 http://gar.svn.sourceforge.net/gar/?rev=4162&view=rev Author: dmichelsen Date: 2009-04-02 13:38:56 +0000 (Thu, 02 Apr 2009) Log Message: ----------- gtar: Don't use ISALIST in runtime linker path Modified Paths: -------------- csw/mgar/pkg/gtar/trunk/Makefile Modified: csw/mgar/pkg/gtar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtar/trunk/Makefile 2009-04-02 13:30:34 UTC (rev 4161) +++ csw/mgar/pkg/gtar/trunk/Makefile 2009-04-02 13:38:56 UTC (rev 4162) @@ -26,6 +26,7 @@ REQUIRED_PKGS = CSWggettextrt CSWiconv +NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Apr 2 16:28:44 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 02 Apr 2009 14:28:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[4163] csw/mgar/pkg/cvsps/trunk/Makefile Message-ID: Revision: 4163 http://gar.svn.sourceforge.net/gar/?rev=4163&view=rev Author: bdwalton Date: 2009-04-02 14:28:44 +0000 (Thu, 02 Apr 2009) Log Message: ----------- remove RUNPATHQUOTE setting now that LD_OPTIONS is used Modified Paths: -------------- csw/mgar/pkg/cvsps/trunk/Makefile Modified: csw/mgar/pkg/cvsps/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvsps/trunk/Makefile 2009-04-02 13:38:56 UTC (rev 4162) +++ csw/mgar/pkg/cvsps/trunk/Makefile 2009-04-02 14:28:44 UTC (rev 4163) @@ -32,9 +32,6 @@ TEST_SCRIPTS = -# to fix mantis bug #3528 -RUNPATHQUOTE = 1 - CONFIGURE_ARGS = $(DIRPATHS) --with-zlib=/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 ggunselm at emporia.edu Thu Apr 2 17:22:44 2009 From: ggunselm at emporia.edu (Glen Gunselman) Date: Thu, 02 Apr 2009 10:22:44 -0500 Subject: [csw-devel] Orca and friends packages In-Reply-To: <625385e30903201821y4f2e219o772856b94a260f86@mail.gmail.com> References: <49BF8E3F.CC54.005D.3@emporia.edu> <0D826C3D-72DD-4D61-B481-E58105177490@opencsw.org> <49BFE579.CC54.005D.3@emporia.edu> <91D22A54-32E7-40FF-A6D1-BE3252D91D92@opencsw.org> <49C3F3E8.CC54.005D.3@emporia.edu> <625385e30903201821y4f2e219o772856b94a260f86@mail.gmail.com> Message-ID: <49D491F4.CC54.005D.3@emporia.edu> Peter, Thanks, pkgutil was able to install package. Glen >>> Peter Bonivart 3/20/2009 8:21 PM >>> 2009/3/21 Glen Gunselman : > Is this a symptom of using "test packages" and I need to manually install > the dependancies, or have I missed a step or two, or is there some work on > your end that I need to wait for? There's another way of installing mentioned on that page: pkgutil -t http://mirror.opencsw.org/opencsw/testing/`uname -p`/`uname -r` -i Have you tried that? -- /peter _______________________________________________ devel mailing list devel at lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel -------------- next part -------------- An HTML attachment was scrubbed... URL: From bdwalton at users.sourceforge.net Thu Apr 2 18:50:22 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 02 Apr 2009 16:50:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[4164] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 4164 http://gar.svn.sourceforge.net/gar/?rev=4164&view=rev Author: bdwalton Date: 2009-04-02 16:50:17 +0000 (Thu, 02 Apr 2009) Log Message: ----------- remove RUNPATHQUOTE now that LD_OPTIONS is doing the -R bits. Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-04-02 14:28:44 UTC (rev 4163) +++ csw/mgar/pkg/git/trunk/Makefile 2009-04-02 16:50:17 UTC (rev 4164) @@ -94,9 +94,6 @@ # software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -# properly quote RPATH to address mantis bug #3539 -RUNPATHQUOTE = 1 - CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash CONFIGURE_ARGS += --with-perl=$(bindir)/perl CONFIGURE_ARGS += --with-tcltk=$(bindir)/wish 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 2 21:55:35 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 02 Apr 2009 19:55:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[4165] csw/mgar/pkg/xmlto/trunk/Makefile Message-ID: Revision: 4165 http://gar.svn.sourceforge.net/gar/?rev=4165&view=rev Author: bdwalton Date: 2009-04-02 19:55:35 +0000 (Thu, 02 Apr 2009) Log Message: ----------- disable runpath; add missing dependency on bash Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2009-04-02 16:50:17 UTC (rev 4164) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-04-02 19:55:35 UTC (rev 4165) @@ -7,7 +7,7 @@ REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds REQUIRED_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m CSWmktemp -REQUIRED_PKGS += CSWggetopt +REQUIRED_PKGS += CSWggetopt CSWbash DESCRIPTION = An XSL toolchain front end. define BLURB @@ -24,6 +24,9 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +# we don't link to anything besides libc and libm. +NORUNPATH = 1 + pre-configure: @(cd $(WORKSRC); \ touch doc/xmlto.xml doc/xmlif.xml ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Apr 2 22:01:17 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 02 Apr 2009 20:01:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[4166] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4166 http://gar.svn.sourceforge.net/gar/?rev=4166&view=rev Author: valholla Date: 2009-04-02 20:01:16 +0000 (Thu, 02 Apr 2009) Log Message: ----------- fix for bugs 3587,3479,and 3499 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile Added Paths: ----------- csw/mgar/pkg/php5/trunk/extensions/php5_pdo/ csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdo/files/ Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -111,5 +111,8 @@ pre-fetch: $(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR))) +post-merge-modulated: + @(grm -fr $(DESTDIR)/.[a-z]*) + # System Rules/Configuration include gar/category.mk Modified: csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_bcmath/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"bcmath\" +* WARNING: Could not enable Extension "bcmath" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"bcmath\" +* NOTICE: Successfully Enabled Extension "bcmath" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"bcmath\" +* NOTICE: Successfully Disabled Extension "bcmath" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_bz2/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"bz2\" +* WARNING: Could not enable Extension "bz2" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"bz2\" +* NOTICE: Successfully Enabled Extension "bz2" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"bz2\" +* NOTICE: Successfully Disabled Extension "bz2" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_calendar/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"calendar\" +* WARNING: Could not enable Extension "calendar" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"calendar\" +* NOTICE: Successfully Enabled Extension "calendar" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"calendar\" +* NOTICE: Successfully Disabled Extension "calendar" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ctype/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"ctype\" +* WARNING: Could not enable Extension "ctype" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"ctype\" +* NOTICE: Successfully Enabled Extension "ctype" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"ctype\" +* NOTICE: Successfully Disabled Extension "ctype" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_curl/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -25,7 +25,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"curl\" +* WARNING: Could not enable Extension "curl" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -44,7 +44,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"curl\" +* NOTICE: Successfully Enabled Extension "curl" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -67,7 +67,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"curl\" +* NOTICE: Successfully Disabled Extension "curl" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dba/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -28,7 +28,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"dba\" +* WARNING: Could not enable Extension "dba" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -47,7 +47,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"dba\" +* NOTICE: Successfully Enabled Extension "dba" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -70,7 +70,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"dba\" +* NOTICE: Successfully Disabled Extension "dba" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dbase/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"dbase\" +* WARNING: Could not enable Extension "dbase" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"dbase\" +* NOTICE: Successfully Enabled Extension "dbase" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"dbase\" +* NOTICE: Successfully Disabled Extension "dbase" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_dom/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -24,7 +24,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"dom\" +* WARNING: Could not enable Extension "dom" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -43,7 +43,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"dom\" +* NOTICE: Successfully Enabled Extension "dom" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -66,7 +66,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"dom\" +* NOTICE: Successfully Disabled Extension "dom" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_exif/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -26,7 +26,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"exif\" +* WARNING: Could not enable Extension "exif" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -45,7 +45,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"exif\" +* NOTICE: Successfully Enabled Extension "exif" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -68,7 +68,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"exif\" +* NOTICE: Successfully Disabled Extension "exif" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ftp/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"ftp\" +* WARNING: Could not enable Extension "ftp" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"ftp\" +* NOTICE: Successfully Enabled Extension "ftp" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"ftp\" +* NOTICE: Successfully Disabled Extension "ftp" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gd/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -34,7 +34,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"gd\" +* WARNING: Could not enable Extension "gd" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -53,7 +53,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"gd\" +* NOTICE: Successfully Enabled Extension "gd" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -76,7 +76,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"gd\" +* NOTICE: Successfully Disabled Extension "gd" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gettext/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"gettext\" +* WARNING: Could not enable Extension "gettext" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"gettext\" +* NOTICE: Successfully Enabled Extension "gettext" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"gettext\" +* NOTICE: Successfully Disabled Extension "gettext" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_gmp/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"gmp\" +* WARNING: Could not enable Extension "gmp" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"gmp\" +* NOTICE: Successfully Enabled Extension "gmp" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"gmp\" +* NOTICE: Successfully Disabled Extension "gmp" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_hash/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"hash\" +* WARNING: Could not enable Extension "hash" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"hash\" +* NOTICE: Successfully Enabled Extension "hash" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"hash\" +* NOTICE: Successfully Disabled Extension "hash" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_iconv/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -30,7 +30,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"iconv\" +* WARNING: Could not enable Extension "iconv" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -49,7 +49,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"iconv\" +* NOTICE: Successfully Enabled Extension "iconv" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -72,7 +72,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"iconv\" +* NOTICE: Successfully Disabled Extension "iconv" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_imap/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -25,7 +25,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"imap\" +* WARNING: Could not enable Extension "imap" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -44,7 +44,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"imap\" +* NOTICE: Successfully Enabled Extension "imap" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -67,7 +67,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"imap\" +* NOTICE: Successfully Disabled Extension "imap" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_json/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"json\" +* WARNING: Could not enable Extension "json" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"json\" +* NOTICE: Successfully Enabled Extension "json" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"json\" +* NOTICE: Successfully Disabled Extension "json" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ldap/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -25,7 +25,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"ldap\" +* WARNING: Could not enable Extension "ldap" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -44,7 +44,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"ldap\" +* NOTICE: Successfully Enabled Extension "ldap" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -67,7 +67,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"ldap\" +* NOTICE: Successfully Disabled Extension "ldap" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mbstring/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -25,7 +25,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"mbstring\" +* WARNING: Could not enable Extension "mbstring" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -44,7 +44,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"mbstring\" +* NOTICE: Successfully Enabled Extension "mbstring" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -67,7 +67,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"mbstring\" +* NOTICE: Successfully Disabled Extension "mbstring" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mcrypt/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"mcrypt\" +* WARNING: Could not enable Extension "mcrypt" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"mcrypt\" +* NOTICE: Successfully Enabled Extension "mcrypt" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"mcrypt\" +* NOTICE: Successfully Disabled Extension "mcrypt" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mhash/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"mhash\" +* WARNING: Could not enable Extension "mhash" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"mhash\" +* NOTICE: Successfully Enabled Extension "mhash" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"mhash\" +* NOTICE: Successfully Disabled Extension "mhash" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"mime_magic\" +* WARNING: Could not enable Extension "mime_magic" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"mime_magic\" +* NOTICE: Successfully Enabled Extension "mime_magic" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"mime_magic\" +* NOTICE: Successfully Disabled Extension "mime_magic" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mssql/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"mssql\" +* WARNING: Could not enable Extension "mssql" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"mssql\" +* NOTICE: Successfully Enabled Extension "mssql" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"mssql\" +* NOTICE: Successfully Disabled Extension "mssql" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mysql/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -24,7 +24,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"mysql\" +* WARNING: Could not enable Extension "mysql" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -43,7 +43,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"mysql\" +* NOTICE: Successfully Enabled Extension "mysql" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -66,7 +66,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"mysql\" +* NOTICE: Successfully Disabled Extension "mysql" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mysqli/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"mysqli\" +* WARNING: Could not enable Extension "mysqli" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"mysqli\" +* NOTICE: Successfully Enabled Extension "mysqli" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"mysqli\" +* NOTICE: Successfully Disabled Extension "mysqli" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_ncurses/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"ncurses\" +* WARNING: Could not enable Extension "ncurses" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"ncurses\" +* NOTICE: Successfully Enabled Extension "ncurses" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"ncurses\" +* NOTICE: Successfully Disabled Extension "ncurses" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_odbc/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -25,7 +25,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"odbc\" +* WARNING: Could not enable Extension "odbc" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -44,7 +44,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"odbc\" +* NOTICE: Successfully Enabled Extension "odbc" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -67,7 +67,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"odbc\" +* NOTICE: Successfully Disabled Extension "odbc" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_openssl/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"openssl\" +* WARNING: Could not enable Extension "openssl" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"openssl\" +* NOTICE: Successfully Enabled Extension "openssl" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"openssl\" +* NOTICE: Successfully Disabled Extension "openssl" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pcntl/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"pcntl\" +* WARNING: Could not enable Extension "pcntl" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"pcntl\" +* NOTICE: Successfully Enabled Extension "pcntl" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"pcntl\" +* NOTICE: Successfully Disabled Extension "pcntl" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Added: csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile (rev 0) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdo/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -0,0 +1,75 @@ +PHP5EXT_NAME = pdo + +PACKAGES += CSWphp5pdo + +CATALOGNAME_CSWphp5pdo = php5_pdo +SPKG_DESC_CSWphp5pdo = pdo Extention for PHP5 +REQUIRED_PKGS_CSWphp5pdo = CSWphp5 + +PKGFILES_CSWphp5pdo = .*/lib/php/extensions/.*/pdo\.so* +PKGFILES_CSWphp5pdo += .*/lib/php/extensions/.*/pdo\.a* + +define CSWphp5pdo_postinstall +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Post Install <===]" +echo " ===> Enabling pdo extension" + +if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then + /bin/true +else + cat << _EOF_ +****************************************************************************** +* WARNING: Could not enable Extension "pdo" +* You will need to enable it by hand as follows: +* +* open $${PHP_INI} in your favorite text editor +* Add the following line to the file, save, and restart your web server +* extension=pdo.so +****************************************************************************** +_EOF_ +exit 0 +fi + +if grep 'extension=pdo.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=pdo.so|extension=pdo.so|' $${PHP_INI} +else + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pdo.so|' $${PHP_INI} + fi + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Enabled Extension "pdo" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the install +****************************************************************************** +_EOF_ + + +exit 0 +endef + +define CSWphp5pdo_preremove +#!/bin/sh + +PHP_INI=/opt/csw/php5/lib/php.ini + +echo "[===> Running Pre Remove <===]" +echo " ===> Disabling pdo extension" + +perl -i -plne 's|extension=pdo.so|;extension=pdo.so|' $${PHP_INI} + +cat << _EOF_ +****************************************************************************** +* NOTICE: Successfully Disabled Extension "pdo" +* in $${PHP_INI} +* +* You will need to restart your web server to finish the removal +****************************************************************************** +_EOF_ + +exit 0 +endef Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -4,7 +4,7 @@ CATALOGNAME_CSWphp5pdomysql = php5_pdomysql SPKG_DESC_CSWphp5pdomysql = pdomysql Extention for PHP5 -REQUIRED_PKGS_CSWphp5pdomysql = CSWphp5 CSWmysql5rt CSWzlib +REQUIRED_PKGS_CSWphp5pdomysql = CSWphp5 CSWmysql5rt CSWzlib CSWphp5pdo CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix) CONFIGURE_ARGS += --with-zlib-dir=$(prefix) @@ -24,7 +24,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"pdomysql\" +* WARNING: Could not enable Extension "pdomysql" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -43,7 +43,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"pdomysql\" +* NOTICE: Successfully Enabled Extension "pdomysql" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -66,7 +66,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"pdomysql\" +* NOTICE: Successfully Disabled Extension "pdomysql" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -4,7 +4,7 @@ CATALOGNAME_CSWphp5pdoodbc = php5_pdoodbc SPKG_DESC_CSWphp5pdoodbc = pdoodbc Extention for PHP5 -REQUIRED_PKGS_CSWphp5pdoodbc = CSWphp5 CSWunixodbc +REQUIRED_PKGS_CSWphp5pdoodbc = CSWphp5 CSWunixodbc CSWphp5pdo CONFIGURE_ARGS += --with-pdo-odbc=shared,unixODBC,$(prefix) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"pdoodbc\" +* WARNING: Could not enable Extension "pdoodbc" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"pdoodbc\" +* NOTICE: Successfully Enabled Extension "pdoodbc" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"pdoodbc\" +* NOTICE: Successfully Disabled Extension "pdoodbc" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -4,7 +4,7 @@ CATALOGNAME_CSWphp5pdopgsql = php5_pdopgsql SPKG_DESC_CSWphp5pdopgsql = pdopgsql Extention for PHP5 -REQUIRED_PKGS_CSWphp5pdopgsql = CSWphp5 CSWlibpq +REQUIRED_PKGS_CSWphp5pdopgsql = CSWphp5 CSWlibpq CSWphp5pdo PATCHFILES += pdopgsql.diff @@ -25,7 +25,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"pdopgsql\" +* WARNING: Could not enable Extension "pdopgsql" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -44,7 +44,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"pdopgsql\" +* NOTICE: Successfully Enabled Extension "pdopgsql" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -67,7 +67,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"pdopgsql\" +* NOTICE: Successfully Disabled Extension "pdopgsql" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -4,7 +4,7 @@ CATALOGNAME_CSWphp5pdosqlite = php5_pdosqlite SPKG_DESC_CSWphp5pdosqlite = pdosqlite Extention for PHP5 -REQUIRED_PKGS_CSWphp5pdosqlite = CSWphp5 +REQUIRED_PKGS_CSWphp5pdosqlite = CSWphp5 CSWphp5pdo CONFIGURE_ARGS += --with-pdo-sqlite=shared @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"pdosqlite\" +* WARNING: Could not enable Extension "pdosqlite" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"pdosqlite\" +* NOTICE: Successfully Enabled Extension "pdosqlite" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"pdosqlite\" +* NOTICE: Successfully Disabled Extension "pdosqlite" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pgsql/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -25,7 +25,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"pgsql\" +* WARNING: Could not enable Extension "pgsql" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -44,7 +44,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"pgsql\" +* NOTICE: Successfully Enabled Extension "pgsql" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -67,7 +67,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"pgsql\" +* NOTICE: Successfully Disabled Extension "pgsql" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_posix/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"posix\" +* WARNING: Could not enable Extension "posix" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"posix\" +* NOTICE: Successfully Enabled Extension "posix" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"posix\" +* NOTICE: Successfully Disabled Extension "posix" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pspell/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"pspell\" +* WARNING: Could not enable Extension "pspell" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"pspell\" +* NOTICE: Successfully Enabled Extension "pspell" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"pspell\" +* NOTICE: Successfully Disabled Extension "pspell" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_readline/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -24,7 +24,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"readline\" +* WARNING: Could not enable Extension "readline" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -43,7 +43,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"readline\" +* NOTICE: Successfully Enabled Extension "readline" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -66,7 +66,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"readline\" +* NOTICE: Successfully Disabled Extension "readline" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -12,7 +12,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"recode\" +* WARNING: Could not enable Extension "recode" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -31,7 +31,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"recode\" +* NOTICE: Successfully Enabled Extension "recode" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -54,7 +54,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"recode\" +* NOTICE: Successfully Disabled Extension "recode" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_session/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"session\" +* WARNING: Could not enable Extension "session" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"session\" +* NOTICE: Successfully Enabled Extension "session" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"session\" +* NOTICE: Successfully Disabled Extension "session" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_shmop/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"shmop\" +* WARNING: Could not enable Extension "shmop" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"shmop\" +* NOTICE: Successfully Enabled Extension "shmop" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"shmop\" +* NOTICE: Successfully Disabled Extension "shmop" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_simplexml/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -19,7 +19,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"simplexml\" +* WARNING: Could not enable Extension "simplexml" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -38,7 +38,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"simplexml\" +* NOTICE: Successfully Enabled Extension "simplexml" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -61,7 +61,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"simplexml\" +* NOTICE: Successfully Disabled Extension "simplexml" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_snmp/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"snmp\" +* WARNING: Could not enable Extension "snmp" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"snmp\" +* NOTICE: Successfully Enabled Extension "snmp" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"snmp\" +* NOTICE: Successfully Disabled Extension "snmp" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_soap/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -24,7 +24,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"soap\" +* WARNING: Could not enable Extension "soap" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -43,7 +43,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"soap\" +* NOTICE: Successfully Enabled Extension "soap" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -66,7 +66,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"soap\" +* NOTICE: Successfully Disabled Extension "soap" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sockets/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"sockets\" +* WARNING: Could not enable Extension "sockets" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"sockets\" +* NOTICE: Successfully Enabled Extension "sockets" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"sockets\" +* NOTICE: Successfully Disabled Extension "sockets" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sqlite/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -24,7 +24,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"sqlite\" +* WARNING: Could not enable Extension "sqlite" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -43,7 +43,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"sqlite\" +* NOTICE: Successfully Enabled Extension "sqlite" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -66,7 +66,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"sqlite\" +* NOTICE: Successfully Disabled Extension "sqlite" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"sysvmsg\" +* WARNING: Could not enable Extension "sysvmsg" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"sysvmsg\" +* NOTICE: Successfully Enabled Extension "sysvmsg" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"sysvmsg\" +* NOTICE: Successfully Disabled Extension "sysvmsg" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvsem/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"sysvsem\" +* WARNING: Could not enable Extension "sysvsem" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"sysvsem\" +* NOTICE: Successfully Enabled Extension "sysvsem" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"sysvsem\" +* NOTICE: Successfully Disabled Extension "sysvsem" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvshm/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"sysvshm\" +* WARNING: Could not enable Extension "sysvshm" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"sysvshm\" +* NOTICE: Successfully Enabled Extension "sysvshm" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"sysvshm\" +* NOTICE: Successfully Disabled Extension "sysvshm" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_tidy/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"tidy\" +* WARNING: Could not enable Extension "tidy" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"tidy\" +* NOTICE: Successfully Enabled Extension "tidy" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"tidy\" +* NOTICE: Successfully Disabled Extension "tidy" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_tokenizer/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -23,7 +23,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"tokenizer\" +* WARNING: Could not enable Extension "tokenizer" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -42,7 +42,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"tokenizer\" +* NOTICE: Successfully Enabled Extension "tokenizer" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -65,7 +65,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"tokenizer\" +* NOTICE: Successfully Disabled Extension "tokenizer" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_wddx/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -25,7 +25,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"wddx\" +* WARNING: Could not enable Extension "wddx" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -44,7 +44,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"wddx\" +* NOTICE: Successfully Enabled Extension "wddx" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -67,7 +67,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"wddx\" +* NOTICE: Successfully Disabled Extension "wddx" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xml/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -17,7 +17,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"xml\" +* WARNING: Could not enable Extension "xml" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -36,7 +36,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"xml\" +* NOTICE: Successfully Enabled Extension "xml" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -59,7 +59,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"xml\" +* NOTICE: Successfully Disabled Extension "xml" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xmlreader/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -24,7 +24,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"xmlreader\" +* WARNING: Could not enable Extension "xmlreader" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -43,7 +43,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"xmlreader\" +* NOTICE: Successfully Enabled Extension "xmlreader" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -66,7 +66,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"xmlreader\" +* NOTICE: Successfully Disabled Extension "xmlreader" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xmlrpc/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -26,7 +26,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"xmlrpc\" +* WARNING: Could not enable Extension "xmlrpc" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -45,7 +45,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"xmlrpc\" +* NOTICE: Successfully Enabled Extension "xmlrpc" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -68,7 +68,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"xmlrpc\" +* NOTICE: Successfully Disabled Extension "xmlrpc" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xmlwriter/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -24,7 +24,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"xmlwriter\" +* WARNING: Could not enable Extension "xmlwriter" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -43,7 +43,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"xmlwriter\" +* NOTICE: Successfully Enabled Extension "xmlwriter" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -66,7 +66,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"xmlwriter\" +* NOTICE: Successfully Disabled Extension "xmlwriter" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_xsl/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -24,7 +24,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"xsl\" +* WARNING: Could not enable Extension "xsl" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -43,7 +43,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"xsl\" +* NOTICE: Successfully Enabled Extension "xsl" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -66,7 +66,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"xsl\" +* NOTICE: Successfully Disabled Extension "xsl" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_zip/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -24,7 +24,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"zip\" +* WARNING: Could not enable Extension "zip" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -43,7 +43,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"zip\" +* NOTICE: Successfully Enabled Extension "zip" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -66,7 +66,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"zip\" +* NOTICE: Successfully Disabled Extension "zip" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile 2009-04-02 19:55:35 UTC (rev 4165) +++ csw/mgar/pkg/php5/trunk/extensions/php5_zlib/Makefile 2009-04-02 20:01:16 UTC (rev 4166) @@ -16,7 +16,7 @@ else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension \"zlib\" +* WARNING: Could not enable Extension "zlib" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor @@ -35,7 +35,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension \"zlib\" +* NOTICE: Successfully Enabled Extension "zlib" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -58,7 +58,7 @@ cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension \"zlib\" +* NOTICE: Successfully Disabled Extension "zlib" * in $${PHP_INI} * * You will need to restart your web server to finish the removal 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 2 22:26:54 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 02 Apr 2009 20:26:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[4167] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 4167 http://gar.svn.sourceforge.net/gar/?rev=4167&view=rev Author: idogan23 Date: 2009-04-02 20:26:54 +0000 (Thu, 02 Apr 2009) Log Message: ----------- apache2_manual: fixed packaging bug in prototype file Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/checksums csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.prototype Modified: csw/mgar/pkg/apache2/trunk/checksums =================================================================== --- csw/mgar/pkg/apache2/trunk/checksums 2009-04-02 20:01:16 UTC (rev 4166) +++ csw/mgar/pkg/apache2/trunk/checksums 2009-04-02 20:26:54 UTC (rev 4167) @@ -19,7 +19,7 @@ 405bc4df4662e9faebe34f9b6a093d14 download/CSWap2suexec.postinstall 36128341749fa79f9942f4156b85f5b6 download/CSWap2suexec.preremove cb25d4b9c4e32f9e308c84824a4ca8f3 download/CSWapache2-manual.gspec -b189b99501543416dec017d0ba555f9c download/CSWapache2-manual.prototype +03d560ad0cd320ead33dc6fa2e72ad4c download/CSWapache2-manual.prototype 020f593630a0d59a4e398814e0e02c0f download/CSWapache2-devel.gspec 557c1d7fea8d6cd6674be399c0ab10d5 download/CSWapache2-devel.prototype 61b6b11aa70677da9386e90c3b5ba21c download/CSWapache2.killproc Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.prototype =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.prototype 2009-04-02 20:01:16 UTC (rev 4166) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2-manual.prototype 2009-04-02 20:26:54 UTC (rev 4167) @@ -658,7 +658,7 @@ f none /opt/csw/apache2/share/manual/rewrite/index.html 0644 root bin f none /opt/csw/apache2/share/manual/rewrite/rewrite_tech.html.en 0644 root bin f none /opt/csw/apache2/share/manual/rewrite/index.html.en 0644 root bin -f none opt/csw/apache2/share/manual/rewrite/rewrite_flags.html 0644 root bin +f none /opt/csw/apache2/share/manual/rewrite/rewrite_flags.html 0644 root bin f none /opt/csw/apache2/share/manual/rewrite/rewrite_guide_advanced.html.en 0644 root bin f none /opt/csw/apache2/share/manual/rewrite/rewrite_guide.html.en 0644 root bin f none /opt/csw/apache2/share/manual/rewrite/rewrite_flags.html.en 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri Apr 3 02:13:00 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 03 Apr 2009 00:13:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[4168] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 4168 http://gar.svn.sourceforge.net/gar/?rev=4168&view=rev Author: valholla Date: 2009-04-03 00:13:00 +0000 (Fri, 03 Apr 2009) Log Message: ----------- remove extra paths Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-04-02 20:26:54 UTC (rev 4167) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-04-03 00:13:00 UTC (rev 4168) @@ -83,6 +83,7 @@ # Disable Tests (report submitted to PHP QA) SKIPTEST = 1 +ENABLE_CHECK = 0 # SAPI Specific Rules STRIP_DIRS += $(DESTDIR)$(prefix)/apache2/libexec @@ -100,6 +101,8 @@ ginstall -m 0644 \ $(WORKDIR)/pear.conf.CSW \ $(DESTDIR)$(prefix)/php5/etc + @(grm -fr $(DESTDIR)/.[a-z]*) + @(grm -fr $(DESTDIR)/$(php5_lib)/.[a-z]*) @$(MAKECOOKIE) post-configure-modulated: @@ -111,8 +114,5 @@ pre-fetch: $(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR))) -post-merge-modulated: - @(grm -fr $(DESTDIR)/.[a-z]*) - # System Rules/Configuration include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri Apr 3 02:40:44 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 03 Apr 2009 00:40:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[4169] csw/mgar/pkg/php5/trunk Message-ID: Revision: 4169 http://gar.svn.sourceforge.net/gar/?rev=4169&view=rev Author: valholla Date: 2009-04-03 00:40:43 +0000 (Fri, 03 Apr 2009) Log Message: ----------- typo in sysvmsg module Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2009-04-03 00:13:00 UTC (rev 4168) +++ csw/mgar/pkg/php5/trunk/Makefile 2009-04-03 00:40:43 UTC (rev 4169) @@ -102,7 +102,6 @@ $(WORKDIR)/pear.conf.CSW \ $(DESTDIR)$(prefix)/php5/etc @(grm -fr $(DESTDIR)/.[a-z]*) - @(grm -fr $(DESTDIR)/$(php5_lib)/.[a-z]*) @$(MAKECOOKIE) post-configure-modulated: Modified: csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile 2009-04-03 00:13:00 UTC (rev 4168) +++ csw/mgar/pkg/php5/trunk/extensions/php5_sysvmsg/Makefile 2009-04-03 00:40:43 UTC (rev 4169) @@ -6,7 +6,7 @@ SPKG_DESC_CSWphp5sysvmsg = sysvmsg Extention for PHP5 REQUIRED_PKGS_CSWphp5sysvmsg = CSWphp5 -CONFIGURE_ARGS += --enable-sysvsem=shared +CONFIGURE_ARGS += --enable-sysvmsg=shared PKGFILES_CSWphp5sysvmsg = .*/lib/php/extensions/.*/sysvmsg.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri Apr 3 03:32:44 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 03 Apr 2009 01:32:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[4170] csw/mgar/pkg/mod_python/trunk Message-ID: Revision: 4170 http://gar.svn.sourceforge.net/gar/?rev=4170&view=rev Author: valholla Date: 2009-04-03 01:32:44 +0000 (Fri, 03 Apr 2009) Log Message: ----------- isalist Modified Paths: -------------- csw/mgar/pkg/mod_python/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/mod_python/trunk/files/fixme.sh Modified: csw/mgar/pkg/mod_python/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_python/trunk/Makefile 2009-04-03 00:40:43 UTC (rev 4169) +++ csw/mgar/pkg/mod_python/trunk/Makefile 2009-04-03 01:32:44 UTC (rev 4170) @@ -24,17 +24,26 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*) +LD_OPTIONS = +LDFLAGS = -L/opt/csw/lib +NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs CONFIGURE_ARGS += --with-python=$(bindir)/python CONFIGURE_ARGS += --with-flex=$(bindir)/flex-2.5.35 CONFIGURE_ARGS += --with-python-src=../python -NOISALIST = 1 include gar/category.mk DESTDOC = $(DESTDIR)$(docdir)/ap2_modpython +DISTFILES += fixme.sh +post-configure-modulated: + @echo " ==> Fixing libtool files" + @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) + @$(MAKECOOKIE) + + post-install-modulated: @install -d $(DESTDOC) @for file in COPYRIGHT CREDITS LICENSE NEWS NOTICE README ; do \ Copied: csw/mgar/pkg/mod_python/trunk/files/fixme.sh (from rev 3986, csw/mgar/pkg/fixme/trunk/fixme.sh) =================================================================== --- csw/mgar/pkg/mod_python/trunk/files/fixme.sh (rev 0) +++ csw/mgar/pkg/mod_python/trunk/files/fixme.sh 2009-04-03 01:32:44 UTC (rev 4170) @@ -0,0 +1,51 @@ +#!/bin/bash +#################################################### +# +# fixme.sh +# Intended to remove the use of libtool's +# pseudo-libraries for opencsw builds. +# +# Author: Mike Watters mwatters_at_opencsw.org +# Initial Version: 0.1 +# +#################################################### + +umask 0022 +PATH=/opt/csw/bin + +if [ $# -ne 1 ]; then + gecho "USAGE: $(basename $0) WORKSRC" + exit 1 +fi +BASEPATH=$1 + +## Fix Makefiles +for mk in $(gfind ${BASEPATH} -name Makefile -print); do + LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ + gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") + + for file in ${LT_FILES}; do + LIB_NAME=$(ggrep 'dlname=' ${file} | \ + gsed -e "s/.*'\(.*\)'/\1/" \ + -e "s/^lib//" \ + -e "s/\.so.*$//") + fixpath=$(gecho $file |gsed 's/\//\\\//g') + gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new + gmv Makefile.new ${mk} + gchmod +x ${mk} + done +done + +## Fix libtool Script +for lt in $(gfind ${BASEPATH} -name libtool -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new + gmv ${lt}.new ${lt} + gchmod +x ${lt} +done + +for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new + gmv ${LTMAIN}.new ${LTMAIN} + gchmod +x ${LTMAIN} +done + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri Apr 3 04:18:31 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 03 Apr 2009 02:18:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[4171] csw/mgar/pkg/python/trunk Message-ID: Revision: 4171 http://gar.svn.sourceforge.net/gar/?rev=4171&view=rev Author: valholla Date: 2009-04-03 02:18:31 +0000 (Fri, 03 Apr 2009) Log Message: ----------- various fixes Modified Paths: -------------- csw/mgar/pkg/python/trunk/checksums csw/mgar/pkg/python/trunk/files/modules.diff csw/mgar/pkg/python/trunk/files/python-config-in.diff csw/mgar/pkg/python/trunk/files/site.diff Modified: csw/mgar/pkg/python/trunk/checksums =================================================================== --- csw/mgar/pkg/python/trunk/checksums 2009-04-03 01:32:44 UTC (rev 4170) +++ csw/mgar/pkg/python/trunk/checksums 2009-04-03 02:18:31 UTC (rev 4171) @@ -3,10 +3,10 @@ 5664b3970307d7d39d8d4061e7dccbb0 download/libpython2.5.so.1.0-isa-i386 42dd6523beb94a805d5764ae1276091c download/faqwiz.diff 33f4094ee46ce865d3973a197f3fb4a0 download/makesetup.diff -ff716b13c8b0965f92550732151e545a download/modules.diff +b389061e5a556feab6b20a08dad7ea23 download/modules.diff 369c5593c0c0edda03f3c1844788dbee download/multiprocess.diff 05724da367b025ce525de2bb704af6e3 download/pyport.diff 296f46fb4a6a392093120cd86675309b download/setup.diff -e1cb8bf39625613272c210c71274b1e0 download/site.diff +918c25923436792b353fac29acc88c22 download/site.diff 9b45df21739387380ba2f5737a443170 download/configure.diff -fae0bb9b9a5a21d755c971d2fce9b592 download/python-config-in.diff +60ffb8b1ad45d337f57b94c5a703e62a download/python-config-in.diff Modified: csw/mgar/pkg/python/trunk/files/modules.diff =================================================================== --- csw/mgar/pkg/python/trunk/files/modules.diff 2009-04-03 01:32:44 UTC (rev 4170) +++ csw/mgar/pkg/python/trunk/files/modules.diff 2009-04-03 02:18:31 UTC (rev 4171) @@ -6,10 +6,10 @@ -#_curses _cursesmodule.c -lcurses -ltermcap +*shared* -+_curses _cursesmodule.c -R/opt/csw/lib -L/opt/csw/lib -lncurses -lxtermcap ++_curses _cursesmodule.c -R/opt/csw/lib -L/opt/csw/lib -lncursesw -lxtermcap # Wrapper for the panel library that's part of ncurses and SYSV curses. -#_curses_panel _curses_panel.c -lpanel -lncurses -+_curses_panel _curses_panel.c -R/opt/csw/lib -L/opt/csw/lib -lpanel -lncurses -lxtermcap ++_curses_panel _curses_panel.c -R/opt/csw/lib -L/opt/csw/lib -lpanel -lncursesw -lxtermcap # Generic (SunOS / SVR4) dynamic loading module. Modified: csw/mgar/pkg/python/trunk/files/python-config-in.diff =================================================================== --- csw/mgar/pkg/python/trunk/files/python-config-in.diff 2009-04-03 01:32:44 UTC (rev 4170) +++ csw/mgar/pkg/python/trunk/files/python-config-in.diff 2009-04-03 02:18:31 UTC (rev 4171) @@ -5,6 +5,6 @@ if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'): libs.insert(0, '-L' + getvar('LIBPL')) + if opt == '--ldflags': -+ libs.insert(0, '-L/opt/csw/lib -R/opt/csw/lib/$ISALIST') ++ libs.insert(0, '-R/opt/csw/lib -L/opt/csw/lib') print ' '.join(libs) Modified: csw/mgar/pkg/python/trunk/files/site.diff =================================================================== --- csw/mgar/pkg/python/trunk/files/site.diff 2009-04-03 01:32:44 UTC (rev 4170) +++ csw/mgar/pkg/python/trunk/files/site.diff 2009-04-03 02:18:31 UTC (rev 4171) @@ -10,16 +10,16 @@ + "site-packages")) + sitedirs.append(os.path.join(prefix, "lib", + "python2.5", -+ "site-python")) ++ "site-packages")) + sitedirs.append(os.path.join(prefix, "lib", + "python2.3", -+ "site-python")) ++ "site-packages")) + sitedirs.append(os.path.join(prefix, "lib", + "python2.1", -+ "site-python")) ++ "site-packages")) + sitedirs.append(os.path.join(prefix, "lib", -+ "site-python", -+ "site-python")) ++ "python", ++ "site-packages")) else: sitedirs.append(prefix) sitedirs.append(os.path.join(prefix, "lib", "site-packages")) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Apr 3 08:32:57 2009 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 03 Apr 2009 06:32:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[4172] csw/mgar/pkg Message-ID: Revision: 4172 http://gar.svn.sourceforge.net/gar/?rev=4172&view=rev Author: wahwah Date: 2009-04-03 06:32:57 +0000 (Fri, 03 Apr 2009) Log Message: ----------- Adding PyYAML library Modified Paths: -------------- csw/mgar/pkg/pyyaml/trunk/Makefile csw/mgar/pkg/pyyaml/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pyyaml/ Property Changed: ---------------- csw/mgar/pkg/pyyaml/trunk/ csw/mgar/pkg/pyyaml/trunk/Makefile Property changes on: csw/mgar/pkg/pyyaml/trunk ___________________________________________________________________ Modified: svn:ignore - cookies download work + cookies download work Modified: csw/mgar/pkg/pyyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2009-04-02 06:26:31 UTC (rev 4154) +++ csw/mgar/pkg/pyyaml/trunk/Makefile 2009-04-03 06:32:57 UTC (rev 4172) @@ -1,24 +1,51 @@ -GARNAME = mypkg -GARVERSION = 1.0 +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +GARNAME = pyyaml +GARVERSION = 3.08 CATEGORIES = lib -DESCRIPTION = This is a useful library +PROJ_NAME = PyYAML + +DESCRIPTION = YAML parser and emitter for Python define BLURB - It does stuff with things + PyYAML is a YAML parser and emitter for the Python programming language. + + PyYAML features: + + * a complete YAML 1.1 parser. In particular, PyYAML can parse all examples + from the specification. The parsing algorithm is simple enough to be a + reference for YAML parser implementors. + * Unicode support including UTF-8/UTF-16 input/output and \u escape + sequences. + * low-level event-based parser and emitter API (like SAX). + * high-level API for serializing and deserializing native Python + objects (like DOM or pickle). + * support for all types from the YAML types repository. A + simple extension API is provided. + * both pure-Python and fast LibYAML-based parsers and + emitters. + * relatively sensible error messages. endef -MASTER_SITES = -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = http://pyyaml.org/download/pyyaml/ +DISTFILES = $(PROJ_NAME)-$(GARVERSION).tar.gz +WORKSRC = $(WORKDIR)/$(PROJ_NAME)-$(GARVERSION) # 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) +ARCHALL = 1 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = pyyaml +TEST_SCRIPTS = +INSTALL_SCRIPTS = pyyaml -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +build-pyyaml: + (cd $(WORKSRC); python setup.py build) -#include gar/category.mk +install-pyyaml: + (cd $(WORKSRC); python setup.py install --root=$(DESTDIR)) + +include gar/category.mk Property changes on: csw/mgar/pkg/pyyaml/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Header Modified: csw/mgar/pkg/pyyaml/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2009-04-02 06:26:31 UTC (rev 4154) +++ csw/mgar/pkg/pyyaml/trunk/checksums 2009-04-03 06:32:57 UTC (rev 4172) @@ -0,0 +1 @@ +a4163a2017fa57f448c66815511fa555 download/PyYAML-3.08.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri Apr 3 18:17:12 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 03 Apr 2009 16:17:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[4173] csw/mgar/pkg/php5/trunk/extensions Message-ID: Revision: 4173 http://gar.svn.sourceforge.net/gar/?rev=4173&view=rev Author: valholla Date: 2009-04-03 16:17:12 +0000 (Fri, 03 Apr 2009) Log Message: ----------- fix extension install admin scripts Modified Paths: -------------- csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile Modified: csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile 2009-04-03 06:32:57 UTC (rev 4172) +++ csw/mgar/pkg/php5/trunk/extensions/php5_mime_magic/Makefile 2009-04-03 16:17:12 UTC (rev 4173) @@ -10,7 +10,7 @@ PKGFILES_CSWphp5mimemagic = .*/lib/php/extensions/.*/mime_magic.* -define CSWphp5mime_magic_postinstall +define CSWphp5mimemagic_postinstall #!/bin/sh PHP_INI=/opt/csw/php5/lib/php.ini @@ -53,7 +53,7 @@ exit 0 endef -define CSWphp5mime_magic_preremove +define CSWphp5mimemagic_preremove #!/bin/sh PHP_INI=/opt/csw/php5/lib/php.ini Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-04-03 06:32:57 UTC (rev 4172) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdomysql/Makefile 2009-04-03 16:17:12 UTC (rev 4173) @@ -17,33 +17,33 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Post Install <===]" -echo " ===> Enabling pdomysql extension" +echo " ===> Enabling pdo_mysql extension" if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then /bin/true else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension "pdomysql" +* WARNING: Could not enable Extension "pdo_mysql" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor * Add the following line to the file, save, and restart your web server -* extension=pdomysql.so +* extension=pdo_mysql.so ****************************************************************************** _EOF_ exit 0 fi -if grep 'extension=pdomysql.so' $${PHP_INI} >/dev/null 2>&1; then - perl -i -plne 's|;extension=pdomysql.so|extension=pdomysql.so|' $${PHP_INI} +if grep 'extension=pdo_mysql.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=pdo_mysql.so|extension=pdo_mysql.so|' $${PHP_INI} else - perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pdomysql.so|' $${PHP_INI} + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pdo_mysql.so|' $${PHP_INI} fi cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension "pdomysql" +* NOTICE: Successfully Enabled Extension "pdo_mysql" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -60,13 +60,13 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Pre Remove <===]" -echo " ===> Disabling pdomysql extension" +echo " ===> Disabling pdo_mysql extension" -perl -i -plne 's|extension=pdomysql.so|;extension=pdomysql.so|' $${PHP_INI} +perl -i -plne 's|extension=pdo_mysql.so|;extension=pdo_mysql.so|' $${PHP_INI} cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension "pdomysql" +* NOTICE: Successfully Disabled Extension "pdo_mysql" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-04-03 06:32:57 UTC (rev 4172) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdoodbc/Makefile 2009-04-03 16:17:12 UTC (rev 4173) @@ -16,33 +16,33 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Post Install <===]" -echo " ===> Enabling pdoodbc extension" +echo " ===> Enabling pdo_odbc extension" if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then /bin/true else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension "pdoodbc" +* WARNING: Could not enable Extension "pdo_odbc" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor * Add the following line to the file, save, and restart your web server -* extension=pdoodbc.so +* extension=pdo_odbc.so ****************************************************************************** _EOF_ exit 0 fi -if grep 'extension=pdoodbc.so' $${PHP_INI} >/dev/null 2>&1; then - perl -i -plne 's|;extension=pdoodbc.so|extension=pdoodbc.so|' $${PHP_INI} +if grep 'extension=pdo_odbc.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=pdo_odbc.so|extension=pdo_odbc.so|' $${PHP_INI} else - perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pdoodbc.so|' $${PHP_INI} + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pdo_odbc.so|' $${PHP_INI} fi cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension "pdoodbc" +* NOTICE: Successfully Enabled Extension "pdo_odbc" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -59,13 +59,13 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Pre Remove <===]" -echo " ===> Disabling pdoodbc extension" +echo " ===> Disabling pdo_odbc extension" -perl -i -plne 's|extension=pdoodbc.so|;extension=pdoodbc.so|' $${PHP_INI} +perl -i -plne 's|extension=pdo_odbc.so|;extension=pdo_odbc.so|' $${PHP_INI} cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension "pdoodbc" +* NOTICE: Successfully Disabled Extension "pdo_odbc" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-04-03 06:32:57 UTC (rev 4172) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdopgsql/Makefile 2009-04-03 16:17:12 UTC (rev 4173) @@ -18,33 +18,33 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Post Install <===]" -echo " ===> Enabling pdopgsql extension" +echo " ===> Enabling pdo_pgsql extension" if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then /bin/true else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension "pdopgsql" +* WARNING: Could not enable Extension "pdo_pgsql" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor * Add the following line to the file, save, and restart your web server -* extension=pdopgsql.so +* extension=pdo_pgsql.so ****************************************************************************** _EOF_ exit 0 fi -if grep 'extension=pdopgsql.so' $${PHP_INI} >/dev/null 2>&1; then - perl -i -plne 's|;extension=pdopgsql.so|extension=pdopgsql.so|' $${PHP_INI} +if grep 'extension=pdo_pgsql.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=pdo_pgsql.so|extension=pdo_pgsql.so|' $${PHP_INI} else - perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pdopgsql.so|' $${PHP_INI} + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pdo_pgsql.so|' $${PHP_INI} fi cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension "pdopgsql" +* NOTICE: Successfully Enabled Extension "pdo_pgsql" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -61,13 +61,13 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Pre Remove <===]" -echo " ===> Disabling pdopgsql extension" +echo " ===> Disabling pdo_pgsql extension" -perl -i -plne 's|extension=pdopgsql.so|;extension=pdopgsql.so|' $${PHP_INI} +perl -i -plne 's|extension=pdo_pgsql.so|;extension=pdo_pgsql.so|' $${PHP_INI} cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension "pdopgsql" +* NOTICE: Successfully Disabled Extension "pdo_pgsql" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-04-03 06:32:57 UTC (rev 4172) +++ csw/mgar/pkg/php5/trunk/extensions/php5_pdosqlite/Makefile 2009-04-03 16:17:12 UTC (rev 4173) @@ -16,33 +16,33 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Post Install <===]" -echo " ===> Enabling pdosqlite extension" +echo " ===> Enabling pdo_sqlite extension" if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then /bin/true else cat << _EOF_ ****************************************************************************** -* WARNING: Could not enable Extension "pdosqlite" +* WARNING: Could not enable Extension "pdo_sqlite" * You will need to enable it by hand as follows: * * open $${PHP_INI} in your favorite text editor * Add the following line to the file, save, and restart your web server -* extension=pdosqlite.so +* extension=pdo_sqlite.so ****************************************************************************** _EOF_ exit 0 fi -if grep 'extension=pdosqlite.so' $${PHP_INI} >/dev/null 2>&1; then - perl -i -plne 's|;extension=pdosqlite.so|extension=pdosqlite.so|' $${PHP_INI} +if grep 'extension=pdo_sqlite.so' $${PHP_INI} >/dev/null 2>&1; then + perl -i -plne 's|;extension=pdo_sqlite.so|extension=pdo_sqlite.so|' $${PHP_INI} else - perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pdosqlite.so|' $${PHP_INI} + perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=pdo_sqlite.so|' $${PHP_INI} fi cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Enabled Extension "pdosqlite" +* NOTICE: Successfully Enabled Extension "pdo_sqlite" * in $${PHP_INI} * * You will need to restart your web server to finish the install @@ -59,13 +59,13 @@ PHP_INI=/opt/csw/php5/lib/php.ini echo "[===> Running Pre Remove <===]" -echo " ===> Disabling pdosqlite extension" +echo " ===> Disabling pdo_sqlite extension" -perl -i -plne 's|extension=pdosqlite.so|;extension=pdosqlite.so|' $${PHP_INI} +perl -i -plne 's|extension=pdo_sqlite.so|;extension=pdo_sqlite.so|' $${PHP_INI} cat << _EOF_ ****************************************************************************** -* NOTICE: Successfully Disabled Extension "pdosqlite" +* NOTICE: Successfully Disabled Extension "pdo_sqlite" * in $${PHP_INI} * * You will need to restart your web server to finish the removal Modified: csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile 2009-04-03 06:32:57 UTC (rev 4172) +++ csw/mgar/pkg/php5/trunk/extensions/php5_recode/Makefile 2009-04-03 16:17:12 UTC (rev 4173) @@ -1,65 +1 @@ @ ( echo "==> Not configuring recode see README in extensions/php5_recode" ) -define CSWphp5recode_postinstall -#!/bin/sh - -PHP_INI=/opt/csw/php5/lib/php.ini - -echo "[===> Running Post Install <===]" -echo " ===> Enabling recode extension" - -if grep 'CSW Extensions' $${PHP_INI} >/dev/null 2>&1; then - /bin/true -else - cat << _EOF_ -****************************************************************************** -* WARNING: Could not enable Extension "recode" -* You will need to enable it by hand as follows: -* -* open $${PHP_INI} in your favorite text editor -* Add the following line to the file, save, and restart your web server -* extension=recode.so -****************************************************************************** -_EOF_ -exit 0 -fi - -if grep 'extension=recode.so' $${PHP_INI} >/dev/null 2>&1; then - perl -i -plne 's|;extension=recode.so|extension=recode.so|' $${PHP_INI} -else - perl -i -pe 's|.*CSW Extensions|; CSW Extensions\nextension=recode.so|' $${PHP_INI} - fi - -cat << _EOF_ -****************************************************************************** -* NOTICE: Successfully Enabled Extension "recode" -* in $${PHP_INI} -* -* You will need to restart your web server to finish the install -****************************************************************************** -_EOF_ - - -exit 0 -endef - -define CSWphp5recode_preremove -#!/bin/sh - -PHP_INI=/opt/csw/php5/lib/php.ini - -echo "[===> Running Pre Remove <===]" -echo " ===> Disabling recode extension" - -perl -i -plne 's|extension=recode.so|;extension=recode.so|' $${PHP_INI} - -cat << _EOF_ -****************************************************************************** -* NOTICE: Successfully Disabled Extension "recode" -* in $${PHP_INI} -* -* You will need to restart your web server to finish the removal -****************************************************************************** -_EOF_ - -exit 0 -endef 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 4 00:43:32 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 03 Apr 2009 22:43:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[4174] csw/mgar/pkg/exiftool/trunk Message-ID: Revision: 4174 http://gar.svn.sourceforge.net/gar/?rev=4174&view=rev Author: hson Date: 2009-04-03 22:43:32 +0000 (Fri, 03 Apr 2009) Log Message: ----------- exiftool: Upgrade to 7.73 Modified Paths: -------------- csw/mgar/pkg/exiftool/trunk/Makefile csw/mgar/pkg/exiftool/trunk/checksums Modified: csw/mgar/pkg/exiftool/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiftool/trunk/Makefile 2009-04-03 16:17:12 UTC (rev 4173) +++ csw/mgar/pkg/exiftool/trunk/Makefile 2009-04-03 22:43:32 UTC (rev 4174) @@ -1,5 +1,5 @@ GARNAME = exiftool -GARVERSION = 7.69 +GARVERSION = 7.73 CATEGORIES = cpan DESCRIPTION = Read, Write and Edit Image File Meta Information Modified: csw/mgar/pkg/exiftool/trunk/checksums =================================================================== --- csw/mgar/pkg/exiftool/trunk/checksums 2009-04-03 16:17:12 UTC (rev 4173) +++ csw/mgar/pkg/exiftool/trunk/checksums 2009-04-03 22:43:32 UTC (rev 4174) @@ -1,2 +1,2 @@ -a20279271732877dd967ed2caa697882 download/Image-ExifTool-7.69.tar.gz +427d0107f6b40b0110757aaefd7cd8c8 download/Image-ExifTool-7.73.tar.gz 13f9aae615a5de5e3c145b374950a75c download/CSWexiftool.gspec 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 4 02:42:48 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 04 Apr 2009 00:42:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[4175] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 4175 http://gar.svn.sourceforge.net/gar/?rev=4175&view=rev Author: bdwalton Date: 2009-04-04 00:42:48 +0000 (Sat, 04 Apr 2009) Log Message: ----------- add missing perl dependency. Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-04-03 22:43:32 UTC (rev 4174) +++ csw/mgar/pkg/git/trunk/Makefile 2009-04-04 00:42:48 UTC (rev 4175) @@ -29,6 +29,7 @@ REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt REQUIRED_PKGS_CSWgit += CSWossh CSWiconv CSWexpat CSWbash CSWpmerror +REQUIRED_PKGS_CSWgit += CSWpmtermreadkey REQUIRED_PKGS_CSWgitk = CSWgit CSWtk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sat Apr 4 05:29:16 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 04 Apr 2009 03:29:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[4176] csw/mgar/pkg/pth/trunk Message-ID: Revision: 4176 http://gar.svn.sourceforge.net/gar/?rev=4176&view=rev Author: valholla Date: 2009-04-04 03:29:16 +0000 (Sat, 04 Apr 2009) Log Message: ----------- checkin patch Modified Paths: -------------- csw/mgar/pkg/pth/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pth/trunk/files/patch_pth_fdsetsize64.diff Modified: csw/mgar/pkg/pth/trunk/checksums =================================================================== --- csw/mgar/pkg/pth/trunk/checksums 2009-04-04 00:42:48 UTC (rev 4175) +++ csw/mgar/pkg/pth/trunk/checksums 2009-04-04 03:29:16 UTC (rev 4176) @@ -1,3 +1,3 @@ 9cb4a25331a4c4db866a31cbe507c793 download/pth-2.0.7.tar.gz 0969fbb8ae032c8c1a08ff1c839a8c1c download/CSWpth.gspec -d7abc5f4f304d19371e3667de4810e48 download/patch_pth_fdsetsize64.diff +58bbe7bfde0cf264c073b5a3d5d3845f download/patch_pth_fdsetsize64.diff Added: csw/mgar/pkg/pth/trunk/files/patch_pth_fdsetsize64.diff =================================================================== --- csw/mgar/pkg/pth/trunk/files/patch_pth_fdsetsize64.diff (rev 0) +++ csw/mgar/pkg/pth/trunk/files/patch_pth_fdsetsize64.diff 2009-04-04 03:29:16 UTC (rev 4176) @@ -0,0 +1,39 @@ +--- pth-2.0.7/configure.o 2009-04-03 21:48:07.888815157 -0500 ++++ pth-2.0.7/configure 2009-04-03 21:50:45.969836100 -0500 +@@ -19603,7 +19603,7 @@ + echo $ECHO_N "checking for default value of FD_SETSIZE... $ECHO_C" >&6 + cross_compiling=no + if test "$cross_compiling" = yes; then +- ac_fdsetsize=1024 ++ ac_fdsetsize=65536 + + else + cat >conftest.$ac_ext <<_ACEOF +@@ -19652,7 +19652,7 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) +-ac_fdsetsize=1024 ++ac_fdsetsize=65536 + fi + rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi +@@ -19666,12 +19666,13 @@ + if test "${with_fdsetsize+set}" = set; then + withval="$with_fdsetsize" + +-case $withval in +- [1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]) PTH_FDSETSIZE=$withval ;; +- * ) { { echo "$as_me:$LINENO: error: invalid FD_SETSIZE specified -- allowed: 10-9999" >&5 ++ if test $withval -ge 10 -a test $withval -le 65536; then ++ PTH_FDSETSIZE=$withval ++ else ++ { { echo "$as_me:$LINENO: error: invalid FD_SETSIZE specified -- allowed: 10-9999" >&5 + echo "$as_me: error: invalid FD_SETSIZE specified -- allowed: 10-9999" >&2;} +- { (exit 1); exit 1; }; } ;; +-esac ++ { (exit 1); exit 1; }; } ++fi + CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=$PTH_FDSETSIZE" + echo "$as_me:$LINENO: checking for overridden FD_SETSIZE value" >&5 + echo $ECHO_N "checking for overridden FD_SETSIZE value... $ECHO_C" >&6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Apr 4 16:11:09 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 04 Apr 2009 14:11:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[4177] csw/mgar/pkg/cadaver/trunk Message-ID: Revision: 4177 http://gar.svn.sourceforge.net/gar/?rev=4177&view=rev Author: chninkel Date: 2009-04-04 14:11:08 +0000 (Sat, 04 Apr 2009) Log Message: ----------- cadaver: updated changelog Modified Paths: -------------- csw/mgar/pkg/cadaver/trunk/checksums csw/mgar/pkg/cadaver/trunk/files/changelog.CSW Modified: csw/mgar/pkg/cadaver/trunk/checksums =================================================================== --- csw/mgar/pkg/cadaver/trunk/checksums 2009-04-04 03:29:16 UTC (rev 4176) +++ csw/mgar/pkg/cadaver/trunk/checksums 2009-04-04 14:11:08 UTC (rev 4177) @@ -1,3 +1,3 @@ 5ac79e41f3b7b4f68bf4003beed5dc26 download/cadaver-0.23.2.tar.gz 7a78f71995cd40263b04470976eba5a6 download/CSWcadav.prototype -af240ee7947d504a6b3e517352d0d883 download/changelog.CSW +9deb0d89879fd18151fdd8a5472f194d download/changelog.CSW Modified: csw/mgar/pkg/cadaver/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2009-04-04 03:29:16 UTC (rev 4176) +++ csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2009-04-04 14:11:08 UTC (rev 4177) @@ -1,4 +1,4 @@ -cadaver (0.23.2,REV=2009.04.01) unstable +cadaver (0.23.2,REV=2009.04.04) unstable * New upstream version. * Dropped destdir.patch as DESTDIR support has been added upstream. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sat Apr 4 17:51:06 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 04 Apr 2009 15:51:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[4178] csw/mgar/pkg/pysqlite/trunk/Makefile Message-ID: Revision: 4178 http://gar.svn.sourceforge.net/gar/?rev=4178&view=rev Author: valholla Date: 2009-04-04 15:51:06 +0000 (Sat, 04 Apr 2009) Log Message: ----------- ISALIST fix Modified Paths: -------------- csw/mgar/pkg/pysqlite/trunk/Makefile Modified: csw/mgar/pkg/pysqlite/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite/trunk/Makefile 2009-04-04 14:11:08 UTC (rev 4177) +++ csw/mgar/pkg/pysqlite/trunk/Makefile 2009-04-04 15:51:06 UTC (rev 4178) @@ -17,19 +17,20 @@ PACKAGES = CSWpysqlite CATALOGNAME_CSWpysqlite = pysqlite SPKG_DESC_CSWpysqlite = SQLite 1.x support for Python -REQUIRED_PKGS_CSWpysqlite = CSWpython CSWsqlite3 +REQUIRED_PKGS_CSWpysqlite = CSWpython CSWsqlite3rt # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=54058 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -NOISALIST = 1 +EXTRA_CPPFLAGS = -I/opt/csw/include CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = INSTALL_SCRIPTS = $(WORKSRC)/setup.py + INSTALL_ARGS = --root=$(DESTDIR) INSTALL_ARGS += --prefix=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sat Apr 4 17:51:23 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sat, 04 Apr 2009 15:51:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[4179] csw/mgar/pkg/pysqlite2/trunk/Makefile Message-ID: Revision: 4179 http://gar.svn.sourceforge.net/gar/?rev=4179&view=rev Author: valholla Date: 2009-04-04 15:51:23 +0000 (Sat, 04 Apr 2009) Log Message: ----------- ISALIST fix Modified Paths: -------------- csw/mgar/pkg/pysqlite2/trunk/Makefile Modified: csw/mgar/pkg/pysqlite2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite2/trunk/Makefile 2009-04-04 15:51:06 UTC (rev 4178) +++ csw/mgar/pkg/pysqlite2/trunk/Makefile 2009-04-04 15:51:23 UTC (rev 4179) @@ -11,7 +11,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWpysqlite2 -REQUIRED_PKGS_CSWpysqlite2 = CSWpython CSWsqlite3 +REQUIRED_PKGS_CSWpysqlite2 = CSWpython CSWsqlite3rt CATALOGNAME_CSWpysqlite2 = pysqlite2 SPKG_DESC_CSWpysqlite2 = SQLite3 support for Python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Sat Apr 4 20:01:29 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sat, 04 Apr 2009 18:01:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[4180] csw/mgar/pkg/libsdl/trunk Message-ID: Revision: 4180 http://gar.svn.sourceforge.net/gar/?rev=4180&view=rev Author: jake_goerzen Date: 2009-04-04 18:01:29 +0000 (Sat, 04 Apr 2009) Log Message: ----------- update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/libsdl/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libsdl/trunk/files/CSWlibsdl.prototype Property Changed: ---------------- csw/mgar/pkg/libsdl/trunk/ Property changes on: csw/mgar/pkg/libsdl/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/libsdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsdl/trunk/Makefile 2009-04-04 15:51:23 UTC (rev 4179) +++ csw/mgar/pkg/libsdl/trunk/Makefile 2009-04-04 18:01:29 UTC (rev 4180) @@ -10,9 +10,11 @@ endef MASTER_SITES = http://www.libsdl.org/release/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibsdl, prototype) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWlibsdl) +REQUIRED_PKGS = CSWiconv + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Deleted: csw/mgar/pkg/libsdl/trunk/files/CSWlibsdl.prototype =================================================================== --- csw/mgar/pkg/libsdl/trunk/files/CSWlibsdl.prototype 2009-04-04 15:51:23 UTC (rev 4179) +++ csw/mgar/pkg/libsdl/trunk/files/CSWlibsdl.prototype 2009-04-04 18:01:29 UTC (rev 4180) @@ -1,222 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/sdl-config 0755 root bin -d none /opt/csw/include/SDL 0755 root bin -f none /opt/csw/include/SDL/SDL.h 0644 root bin -f none /opt/csw/include/SDL/SDL_active.h 0644 root bin -f none /opt/csw/include/SDL/SDL_audio.h 0644 root bin -f none /opt/csw/include/SDL/SDL_byteorder.h 0644 root bin -f none /opt/csw/include/SDL/SDL_cdrom.h 0644 root bin -f none /opt/csw/include/SDL/SDL_config.h 0644 root bin -f none /opt/csw/include/SDL/SDL_cpuinfo.h 0644 root bin -f none /opt/csw/include/SDL/SDL_endian.h 0644 root bin -f none /opt/csw/include/SDL/SDL_error.h 0644 root bin -f none /opt/csw/include/SDL/SDL_events.h 0644 root bin -f none /opt/csw/include/SDL/SDL_getenv.h 0644 root bin -f none /opt/csw/include/SDL/SDL_joystick.h 0644 root bin -f none /opt/csw/include/SDL/SDL_keyboard.h 0644 root bin -f none /opt/csw/include/SDL/SDL_keysym.h 0644 root bin -f none /opt/csw/include/SDL/SDL_loadso.h 0644 root bin -f none /opt/csw/include/SDL/SDL_main.h 0644 root bin -f none /opt/csw/include/SDL/SDL_mouse.h 0644 root bin -f none /opt/csw/include/SDL/SDL_mutex.h 0644 root bin -f none /opt/csw/include/SDL/SDL_name.h 0644 root bin -f none /opt/csw/include/SDL/SDL_opengl.h 0644 root bin -f none /opt/csw/include/SDL/SDL_platform.h 0644 root bin -f none /opt/csw/include/SDL/SDL_quit.h 0644 root bin -f none /opt/csw/include/SDL/SDL_rwops.h 0644 root bin -f none /opt/csw/include/SDL/SDL_stdinc.h 0644 root bin -f none /opt/csw/include/SDL/SDL_syswm.h 0644 root bin -f none /opt/csw/include/SDL/SDL_thread.h 0644 root bin -f none /opt/csw/include/SDL/SDL_timer.h 0644 root bin -f none /opt/csw/include/SDL/SDL_types.h 0644 root bin -f none /opt/csw/include/SDL/SDL_version.h 0644 root bin -f none /opt/csw/include/SDL/SDL_video.h 0644 root bin -f none /opt/csw/include/SDL/begin_code.h 0644 root bin -f none /opt/csw/include/SDL/close_code.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libSDL-1.2.so.0.11.2 0755 root bin -s none /opt/csw/lib/libSDL-1.2.so.0=libSDL-1.2.so.0.11.2 -s none /opt/csw/lib/libSDL.so=libSDL-1.2.so.0.11.2 -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/sdl.pc 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/aclocal 0755 root bin -f none /opt/csw/share/aclocal/sdl.m4 0644 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/SDLKey.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_ActiveEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_AddTimer.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_AudioCVT.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_AudioSpec.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_BlitSurface.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_BuildAudioCVT.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CD.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CDClose.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CDEject.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CDName.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CDNumDrives.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CDOpen.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CDPause.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CDPlay.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CDPlayTracks.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CDResume.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CDStatus.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CDStop.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CDtrack.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CloseAudio.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_Color.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CondBroadcast.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CondSignal.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CondWait.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CondWaitTimeout.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_ConvertAudio.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_ConvertSurface.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CreateCond.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CreateCursor.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CreateMutex.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CreateRGBSurface.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CreateRGBSurfaceFrom.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CreateSemaphore.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CreateThread.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_CreateYUVOverlay.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_Delay.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_DestroyCond.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_DestroyMutex.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_DestroySemaphore.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_DisplayFormat.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_DisplayFormatAlpha.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_DisplayYUVOverlay.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_EnableKeyRepeat.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_EnableUNICODE.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_Event.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_EventState.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_ExposeEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_FillRect.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_Flip.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_FreeCursor.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_FreeSurface.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_FreeWAV.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_FreeYUVOverlay.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GL_GetAttribute.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GL_GetProcAddress.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GL_LoadLibrary.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GL_SetAttribute.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GL_SwapBuffers.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GLattr.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetAppState.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetAudioStatus.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetClipRect.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetCursor.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetError.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetEventFilter.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetGamma.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetGammaRamp.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetKeyName.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetKeyState.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetModState.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetMouseState.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetRGB.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetRGBA.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetRelativeMouseState.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetThreadID.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetTicks.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetVideoInfo.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_GetVideoSurface.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_Init.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_InitSubSystem.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoyAxisEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoyBallEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoyButtonEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoyHatEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoystickClose.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoystickEventState.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoystickGetAxis.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoystickGetBall.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoystickGetButton.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoystickGetHat.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoystickIndex.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoystickName.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoystickNumAxes.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoystickNumBalls.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoystickNumButtons.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoystickNumHats.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoystickOpen.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoystickOpened.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_JoystickUpdate.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_KeyboardEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_KillThread.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_ListModes.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_LoadBMP.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_LoadWAV.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_LockAudio.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_LockSurface.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_LockYUVOverlay.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_MapRGB.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_MapRGBA.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_MixAudio.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_MouseButtonEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_MouseMotionEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_NumJoysticks.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_OpenAudio.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_Overlay.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_Palette.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_PauseAudio.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_PeepEvents.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_PixelFormat.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_PollEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_PumpEvents.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_PushEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_Quit.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_QuitEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_QuitSubSystem.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_RWFromFile.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_Rect.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_RemoveTimer.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_ResizeEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SaveBMP.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SemPost.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SemTryWait.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SemValue.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SemWait.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SemWaitTimeout.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SetAlpha.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SetClipRect.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SetColorKey.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SetColors.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SetCursor.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SetEventFilter.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SetGamma.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SetGammaRamp.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SetModState.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SetPalette.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SetTimer.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SetVideoMode.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_ShowCursor.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_Surface.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_SysWMEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_ThreadID.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_UnlockAudio.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_UnlockSurface.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_UnlockYUVOverlay.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_UpdateRect.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_UpdateRects.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_UserEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_VideoDriverName.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_VideoInfo.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_VideoModeOK.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_WM_GetCaption.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_WM_GrabInput.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_WM_IconifyWindow.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_WM_SetCaption.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_WM_SetIcon.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_WM_ToggleFullScreen.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_WaitEvent.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_WaitThread.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_WarpMouse.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_WasInit.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_keysym.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_mutexP.3 0644 root bin -f none /opt/csw/share/man/man3/SDL_mutexV.3 0644 root bin -i copyright=CSWlibsdl.copyright -i depend=CSWlibsdl.depend -i pkginfo=CSWlibsdl.pkginfo 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 4 20:02:21 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 04 Apr 2009 18:02:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[4181] csw/mgar/pkg/libnids/trunk Message-ID: Revision: 4181 http://gar.svn.sourceforge.net/gar/?rev=4181&view=rev Author: hson Date: 2009-04-04 18:02:20 +0000 (Sat, 04 Apr 2009) Log Message: ----------- libnids: Patch configure when not using LD_OPTIONS, split other patches into their own files Modified Paths: -------------- csw/mgar/pkg/libnids/trunk/Makefile csw/mgar/pkg/libnids/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libnids/trunk/files/Makfile.in.diff csw/mgar/pkg/libnids/trunk/files/checksum.c.diff csw/mgar/pkg/libnids/trunk/files/configure.diff csw/mgar/pkg/libnids/trunk/files/ip_options.c.diff csw/mgar/pkg/libnids/trunk/files/utils.c.diff Removed Paths: ------------- csw/mgar/pkg/libnids/trunk/files/mainpatch Modified: csw/mgar/pkg/libnids/trunk/Makefile =================================================================== --- csw/mgar/pkg/libnids/trunk/Makefile 2009-04-04 18:01:29 UTC (rev 4180) +++ csw/mgar/pkg/libnids/trunk/Makefile 2009-04-04 18:02:20 UTC (rev 4181) @@ -4,7 +4,11 @@ DESCRIPTION = implementation of an e-component of network intrusion detection define BLURB - Long description + Libnids is a library that provides a functionality of one of NIDS + (Network Intrusion Detection System) components, namely E-component. It means + that libnids code watches all local network traffic, cooks received datagrams + a bit (quite a bit ;)), and provides convenient information on them to + analyzing modules of NIDS. endef SF_PROJ = $(GARNAME) @@ -20,14 +24,12 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -# 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 = +PATCHFILES = Makfile.in.diff +PATCHFILES += checksum.c.diff +PATCHFILES += configure.diff +PATCHFILES += ip_options.c.diff +PATCHFILES += utils.c.diff -#GARCOMPILER = GCC3 - -PATCHFILES = mainpatch - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared Modified: csw/mgar/pkg/libnids/trunk/checksums =================================================================== --- csw/mgar/pkg/libnids/trunk/checksums 2009-04-04 18:01:29 UTC (rev 4180) +++ csw/mgar/pkg/libnids/trunk/checksums 2009-04-04 18:02:20 UTC (rev 4181) @@ -1,2 +1,6 @@ af35e8ef403a0ca95df2da94db856428 download/libnids-1.23.tar.gz -eded3e75e8a25acf7922ba0e7593ecb1 download/mainpatch +5c4890d30fb6d8666f8aa8987d6b4b24 download/Makfile.in.diff +1eb0e1c82b9855f7526d63323741aec6 download/checksum.c.diff +875c511f86f39a0b13131f4d3246a35a download/configure.diff +d98069814fe6b17ea8c07aecc76e4386 download/ip_options.c.diff +276ccbd2caeab913432fe749d6a0c020 download/utils.c.diff Added: csw/mgar/pkg/libnids/trunk/files/Makfile.in.diff =================================================================== --- csw/mgar/pkg/libnids/trunk/files/Makfile.in.diff (rev 0) +++ csw/mgar/pkg/libnids/trunk/files/Makfile.in.diff 2009-04-04 18:02:20 UTC (rev 4181) @@ -0,0 +1,75 @@ +diff --speed-large-files --minimal -ru libnids-1.23.orig/src/Makefile.in libnids-1.23/src/Makefile.in +--- libnids-1.23.orig/src/Makefile.in 2008-02-21 11:40:19.000000000 +0100 ++++ libnids-1.23/src/Makefile.in 2009-03-11 00:03:28.000000000 +0100 +@@ -16,7 +16,7 @@ + LIBSHARED = libnids.so.1.23 + + CC = @CC@ +-CFLAGS = @CFLAGS@ -W -Wall -DLIBNET_VER=@LIBNET_VER@ -DHAVE_ICMPHDR=@ICMPHEADER@ -DHAVE_TCP_STATES=@TCPSTATES@ -DHAVE_BSD_UDPHDR=@HAVE_BSD_UDPHDR@ ++CFLAGS = @CFLAGS@ -DLIBNET_VER=@LIBNET_VER@ -DHAVE_ICMPHDR=@ICMPHEADER@ -DHAVE_TCP_STATES=@TCPSTATES@ -DHAVE_BSD_UDPHDR=@HAVE_BSD_UDPHDR@ + LDFLAGS = @LDFLAGS@ + + PCAP_CFLAGS = @PCAP_CFLAGS@ +@@ -40,43 +40,43 @@ + # How to write the following rules compactly and portably ? + # gmake accepts "%_pic.o: %.c", bsd make does not. + checksum_pic.o: checksum.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c checksum.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c checksum.c -o $@ + ip_fragment_pic.o: ip_fragment.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c ip_fragment.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c ip_fragment.c -o $@ + ip_options_pic.o: ip_options.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c ip_options.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c ip_options.c -o $@ + killtcp_pic.o: killtcp.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c killtcp.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c killtcp.c -o $@ + libnids_pic.o: libnids.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c libnids.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c libnids.c -o $@ + scan_pic.o: scan.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c scan.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c scan.c -o $@ + tcp_pic.o: tcp.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c tcp.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c tcp.c -o $@ + util_pic.o: util.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c util.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c util.c -o $@ + allpromisc_pic.o: allpromisc.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c allpromisc.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c allpromisc.c -o $@ + hash_pic.o: hash.c +- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c hash.c -o $@ ++ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c hash.c -o $@ + + + $(LIBSTATIC): $(OBJS) + ar -cr $@ $(OBJS) + $(RANLIB) $@ + $(LIBSHARED): $(OBJS_SHARED) +- $(CC) -shared -Wl,-soname,$(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB) ++ $(LD) -G -h $(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB) + + _install install: $(LIBSTATIC) +- ../mkinstalldirs $(install_prefix)$(libdir) +- ../mkinstalldirs $(install_prefix)$(includedir) +- ../mkinstalldirs $(install_prefix)$(mandir)/man3 +- $(INSTALL) -c -m 644 libnids.a $(install_prefix)$(libdir) +- $(INSTALL) -c -m 644 nids.h $(install_prefix)$(includedir) +- $(INSTALL) -c -m 644 libnids.3 $(install_prefix)$(mandir)/man3 ++ ../mkinstalldirs $(DESTDIR)$(install_prefix)$(libdir) ++ ../mkinstalldirs $(DESTDIR)$(install_prefix)$(includedir) ++ ../mkinstalldirs $(DESTDIR)$(install_prefix)$(mandir)/man3 ++ $(INSTALL) -c -m 644 libnids.a $(DESTDIR)$(install_prefix)$(libdir) ++ $(INSTALL) -c -m 644 nids.h $(DESTDIR)$(install_prefix)$(includedir) ++ $(INSTALL) -c -m 644 libnids.3 $(DESTDIR)$(install_prefix)$(mandir)/man3 + _installshared installshared: install $(LIBSHARED) +- $(INSTALL) -c -m 755 $(LIBSHARED) $(install_prefix)$(libdir) +- ln -s -f $(LIBSHARED) $(install_prefix)$(libdir)/libnids.so ++ $(INSTALL) -c -m 755 $(LIBSHARED) $(DESTDIR)$(install_prefix)$(libdir) ++ ln -s -f $(LIBSHARED) $(DESTDIR)$(install_prefix)$(libdir)/libnids.so + + clean: + rm -f *.o *~ $(LIBSTATIC) $(LIBSHARED) Added: csw/mgar/pkg/libnids/trunk/files/checksum.c.diff =================================================================== --- csw/mgar/pkg/libnids/trunk/files/checksum.c.diff (rev 0) +++ csw/mgar/pkg/libnids/trunk/files/checksum.c.diff 2009-04-04 18:02:20 UTC (rev 4181) @@ -0,0 +1,46 @@ +diff --speed-large-files --minimal -ru libnids-1.23.orig/src/checksum.c libnids-1.23/src/checksum.c +--- libnids-1.23.orig/src/checksum.c 2005-02-08 16:46:11.000000000 +0100 ++++ libnids-1.23/src/checksum.c 2009-03-11 12:38:07.808047165 +0100 +@@ -25,7 +25,7 @@ + return 0; + } + +-#if ( __i386__ || __i386 ) ++#if ( __i386__ || __i386 ) && __GNUC__ + // all asm procedures are copied from Linux 2.0.36 and 2.2.10 kernels + + /* +@@ -120,7 +120,7 @@ + By Jorge Cwik , adapted for linux by Arnt + Gulbrandsen. + */ +-inline u_short ip_fast_csum(u_char * iph, u_int ihl) ++u_short ip_fast_csum(u_char * iph, u_int ihl) + { + u_int sum; + if (dontchksum(((struct ip*)iph)->ip_src.s_addr)) +@@ -191,13 +191,13 @@ + this routine is used for miscellaneous IP-like checksums, mainly in + icmp.c + */ +-inline u_short ++u_short + ip_compute_csum(u_char * buff, int len) + { + return (csum_fold(csum_partial(buff, len, 0))); + } + +-inline u_short ++u_short + my_tcp_check(struct tcphdr *th, int len, u_int saddr, u_int daddr) + { + if (dontchksum(saddr)) +@@ -205,7 +205,7 @@ + return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_TCP, + csum_partial((char *)th, len, 0)); + } +-inline u_short ++u_short + my_udp_check(void *u, int len, u_int saddr, u_int daddr) + { + if (dontchksum(saddr)) Added: csw/mgar/pkg/libnids/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/libnids/trunk/files/configure.diff (rev 0) +++ csw/mgar/pkg/libnids/trunk/files/configure.diff 2009-04-04 18:02:20 UTC (rev 4181) @@ -0,0 +1,20 @@ +--- ../build-global/libnids-1.23/configure 2006-05-01 19:14:51.000000000 +0200 ++++ libnids-1.23/configure 2009-04-04 19:03:29.185337901 +0200 +@@ -4288,7 +4288,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lgthread-2.0 $GTHREAD_LIBS $LIBS" ++LIBS="$LIBS $GTHREAD_LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -4350,7 +4350,7 @@ + #define HAVE_LIBGTHREAD_2_0 1 + _ACEOF + +- LIBS="-lgthread-2.0 $LIBS" ++ LIBS="$LIBS $GTHREAD_LIBS" + + fi + Added: csw/mgar/pkg/libnids/trunk/files/ip_options.c.diff =================================================================== --- csw/mgar/pkg/libnids/trunk/files/ip_options.c.diff (rev 0) +++ csw/mgar/pkg/libnids/trunk/files/ip_options.c.diff 2009-04-04 18:02:20 UTC (rev 4181) @@ -0,0 +1,12 @@ +diff --speed-large-files --minimal -ru libnids-1.23.orig/src/ip_options.c libnids-1.23/src/ip_options.c +--- libnids-1.23.orig/src/ip_options.c 2002-08-10 21:07:45.000000000 +0200 ++++ libnids-1.23/src/ip_options.c 2009-03-11 00:03:28.000000000 +0100 +@@ -69,7 +69,7 @@ + unsigned char __pad1; + unsigned char __pad2; + unsigned char __pad3; +- unsigned char __data[0]; ++ unsigned char __data[]; + }; + + struct iphdr { Deleted: csw/mgar/pkg/libnids/trunk/files/mainpatch =================================================================== --- csw/mgar/pkg/libnids/trunk/files/mainpatch 2009-04-04 18:01:29 UTC (rev 4180) +++ csw/mgar/pkg/libnids/trunk/files/mainpatch 2009-04-04 18:02:20 UTC (rev 4181) @@ -1,152 +0,0 @@ -diff --speed-large-files --minimal -ru libnids-1.23.orig/src/Makefile.in libnids-1.23/src/Makefile.in ---- libnids-1.23.orig/src/Makefile.in 2008-02-21 11:40:19.000000000 +0100 -+++ libnids-1.23/src/Makefile.in 2009-03-11 00:03:28.000000000 +0100 -@@ -16,7 +16,7 @@ - LIBSHARED = libnids.so.1.23 - - CC = @CC@ --CFLAGS = @CFLAGS@ -W -Wall -DLIBNET_VER=@LIBNET_VER@ -DHAVE_ICMPHDR=@ICMPHEADER@ -DHAVE_TCP_STATES=@TCPSTATES@ -DHAVE_BSD_UDPHDR=@HAVE_BSD_UDPHDR@ -+CFLAGS = @CFLAGS@ -DLIBNET_VER=@LIBNET_VER@ -DHAVE_ICMPHDR=@ICMPHEADER@ -DHAVE_TCP_STATES=@TCPSTATES@ -DHAVE_BSD_UDPHDR=@HAVE_BSD_UDPHDR@ - LDFLAGS = @LDFLAGS@ - - PCAP_CFLAGS = @PCAP_CFLAGS@ -@@ -40,43 +40,43 @@ - # How to write the following rules compactly and portably ? - # gmake accepts "%_pic.o: %.c", bsd make does not. - checksum_pic.o: checksum.c -- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c checksum.c -o $@ -+ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c checksum.c -o $@ - ip_fragment_pic.o: ip_fragment.c -- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c ip_fragment.c -o $@ -+ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c ip_fragment.c -o $@ - ip_options_pic.o: ip_options.c -- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c ip_options.c -o $@ -+ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c ip_options.c -o $@ - killtcp_pic.o: killtcp.c -- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c killtcp.c -o $@ -+ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c killtcp.c -o $@ - libnids_pic.o: libnids.c -- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c libnids.c -o $@ -+ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c libnids.c -o $@ - scan_pic.o: scan.c -- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c scan.c -o $@ -+ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c scan.c -o $@ - tcp_pic.o: tcp.c -- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c tcp.c -o $@ -+ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c tcp.c -o $@ - util_pic.o: util.c -- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c util.c -o $@ -+ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c util.c -o $@ - allpromisc_pic.o: allpromisc.c -- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c allpromisc.c -o $@ -+ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c allpromisc.c -o $@ - hash_pic.o: hash.c -- $(CC) -fPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c hash.c -o $@ -+ $(CC) -KPIC $(CFLAGS) -I. $(LIBS_CFLAGS) -c hash.c -o $@ - - - $(LIBSTATIC): $(OBJS) - ar -cr $@ $(OBJS) - $(RANLIB) $@ - $(LIBSHARED): $(OBJS_SHARED) -- $(CC) -shared -Wl,-soname,$(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB) -+ $(LD) -G -h $(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB) - - _install install: $(LIBSTATIC) -- ../mkinstalldirs $(install_prefix)$(libdir) -- ../mkinstalldirs $(install_prefix)$(includedir) -- ../mkinstalldirs $(install_prefix)$(mandir)/man3 -- $(INSTALL) -c -m 644 libnids.a $(install_prefix)$(libdir) -- $(INSTALL) -c -m 644 nids.h $(install_prefix)$(includedir) -- $(INSTALL) -c -m 644 libnids.3 $(install_prefix)$(mandir)/man3 -+ ../mkinstalldirs $(DESTDIR)$(install_prefix)$(libdir) -+ ../mkinstalldirs $(DESTDIR)$(install_prefix)$(includedir) -+ ../mkinstalldirs $(DESTDIR)$(install_prefix)$(mandir)/man3 -+ $(INSTALL) -c -m 644 libnids.a $(DESTDIR)$(install_prefix)$(libdir) -+ $(INSTALL) -c -m 644 nids.h $(DESTDIR)$(install_prefix)$(includedir) -+ $(INSTALL) -c -m 644 libnids.3 $(DESTDIR)$(install_prefix)$(mandir)/man3 - _installshared installshared: install $(LIBSHARED) -- $(INSTALL) -c -m 755 $(LIBSHARED) $(install_prefix)$(libdir) -- ln -s -f $(LIBSHARED) $(install_prefix)$(libdir)/libnids.so -+ $(INSTALL) -c -m 755 $(LIBSHARED) $(DESTDIR)$(install_prefix)$(libdir) -+ ln -s -f $(LIBSHARED) $(DESTDIR)$(install_prefix)$(libdir)/libnids.so - - clean: - rm -f *.o *~ $(LIBSTATIC) $(LIBSHARED) -diff --speed-large-files --minimal -ru libnids-1.23.orig/src/checksum.c libnids-1.23/src/checksum.c ---- libnids-1.23.orig/src/checksum.c 2005-02-08 16:46:11.000000000 +0100 -+++ libnids-1.23/src/checksum.c 2009-03-11 12:38:07.808047165 +0100 -@@ -25,7 +25,7 @@ - return 0; - } - --#if ( __i386__ || __i386 ) -+#if ( __i386__ || __i386 ) && __GNUC__ - // all asm procedures are copied from Linux 2.0.36 and 2.2.10 kernels - - /* -@@ -120,7 +120,7 @@ - By Jorge Cwik , adapted for linux by Arnt - Gulbrandsen. - */ --inline u_short ip_fast_csum(u_char * iph, u_int ihl) -+u_short ip_fast_csum(u_char * iph, u_int ihl) - { - u_int sum; - if (dontchksum(((struct ip*)iph)->ip_src.s_addr)) -@@ -191,13 +191,13 @@ - this routine is used for miscellaneous IP-like checksums, mainly in - icmp.c - */ --inline u_short -+u_short - ip_compute_csum(u_char * buff, int len) - { - return (csum_fold(csum_partial(buff, len, 0))); - } - --inline u_short -+u_short - my_tcp_check(struct tcphdr *th, int len, u_int saddr, u_int daddr) - { - if (dontchksum(saddr)) -@@ -205,7 +205,7 @@ - return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_TCP, - csum_partial((char *)th, len, 0)); - } --inline u_short -+u_short - my_udp_check(void *u, int len, u_int saddr, u_int daddr) - { - if (dontchksum(saddr)) -diff --speed-large-files --minimal -ru libnids-1.23.orig/src/ip_options.c libnids-1.23/src/ip_options.c ---- libnids-1.23.orig/src/ip_options.c 2002-08-10 21:07:45.000000000 +0200 -+++ libnids-1.23/src/ip_options.c 2009-03-11 00:03:28.000000000 +0100 -@@ -69,7 +69,7 @@ - unsigned char __pad1; - unsigned char __pad2; - unsigned char __pad3; -- unsigned char __data[0]; -+ unsigned char __data[]; - }; - - struct iphdr { -diff --speed-large-files --minimal -ru libnids-1.23.orig/src/util.c libnids-1.23/src/util.c ---- libnids-1.23.orig/src/util.c 2006-05-01 18:58:48.000000000 +0200 -+++ libnids-1.23/src/util.c 2009-03-11 00:48:59.000000000 +0100 -@@ -29,13 +29,13 @@ - return ret; - } - --inline int -+int - before(u_int seq1, u_int seq2) - { - return ((int)(seq1 - seq2) < 0); - } - --inline int -+int - after(u_int seq1, u_int seq2) - { - return ((int)(seq2 - seq1) < 0); Added: csw/mgar/pkg/libnids/trunk/files/utils.c.diff =================================================================== --- csw/mgar/pkg/libnids/trunk/files/utils.c.diff (rev 0) +++ csw/mgar/pkg/libnids/trunk/files/utils.c.diff 2009-04-04 18:02:20 UTC (rev 4181) @@ -0,0 +1,19 @@ +diff --speed-large-files --minimal -ru libnids-1.23.orig/src/util.c libnids-1.23/src/util.c +--- libnids-1.23.orig/src/util.c 2006-05-01 18:58:48.000000000 +0200 ++++ libnids-1.23/src/util.c 2009-03-11 00:48:59.000000000 +0100 +@@ -29,13 +29,13 @@ + return ret; + } + +-inline int ++int + before(u_int seq1, u_int seq2) + { + return ((int)(seq1 - seq2) < 0); + } + +-inline int ++int + after(u_int seq1, u_int seq2) + { + return ((int)(seq2 - seq1) < 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Apr 4 20:08:40 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 04 Apr 2009 18:08:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[4182] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 4182 http://gar.svn.sourceforge.net/gar/?rev=4182&view=rev Author: hson Date: 2009-04-04 18:08:40 +0000 (Sat, 04 Apr 2009) Log Message: ----------- imagemagick: Use fixme to patch libtool, rename compare to compare2 due to conflict with CSWschilyutils Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ImageMagick/trunk/files/fixme.sh Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-04-04 18:02:20 UTC (rev 4181) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-04-04 18:08:40 UTC (rev 4182) @@ -24,6 +24,7 @@ REQUIRED_PKGS += CSWglib2 CSWgs CSWgtk2 CSWilmbase CSWjasper CSWjbigkit REQUIRED_PKGS += CSWjpeg CSWlcms CSWlibcairo CSWlibfpx CSWlibrsvg CSWlibxml2 REQUIRED_PKGS += CSWopenexr CSWperl CSWpng CSWsunmath CSWtiff CSWwmf CSWzlib +REQUIRED_PKGS += CSWlibtoolrt # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 @@ -47,6 +48,11 @@ include gar/category.mk +post-configure-$(MODULATION): + @(echo "~~~ Fixing Libtool ~~~") + @$(FILEDIR)/fixme.sh $(WORKSRC) + @$(MAKECOOKIE) + post-install-isa-sparcv8: @cp $(FILEDIR)/libMagick.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 @cp $(FILEDIR)/libWand.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 @@ -57,6 +63,8 @@ @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick echo $(DESTDIR) @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/lib_6.2.9_s.tar.gz |tar xf -) + @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 + @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 @$(MAKECOOKIE) post-install-isa-i386: @@ -69,4 +77,6 @@ @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick echo $(DESTDIR) @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/lib_6.2.9_i.tar.gz |tar xf -) + @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 + @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 @$(MAKECOOKIE) Added: csw/mgar/pkg/ImageMagick/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/files/fixme.sh (rev 0) +++ csw/mgar/pkg/ImageMagick/trunk/files/fixme.sh 2009-04-04 18:08:40 UTC (rev 4182) @@ -0,0 +1,49 @@ +#!/bin/bash +#################################################### +# +# fixme.sh +# Intended to remove the use of libtool's +# pseudo-libraries for opencsw builds. +# +# Author: Mike Watters mwatters_at_opencsw.org +# Initial Version: 0.1 +# +#################################################### + +umask 0022 +PATH=/opt/csw/bin + +if [ $# -ne 1 ]; then + gecho "USAGE: $(basename $0) WORKSRC" + exit 1 +fi +BASEPATH=$1 + +## Fix Makefiles +for mk in $(gfind ${BASEPATH} -name Makefile -print); do + LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ + gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") + + for file in ${LT_FILES}; do + LIB_NAME=$(ggrep 'dlname=' ${file} | \ + gsed -e "s/.*'\(.*\)'/\1/" \ + -e "s/^lib//" \ + -e "s/\.so.*$//") + fixpath=$(gecho $file |gsed 's/\//\\\//g') + gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new + gmv Makefile.new ${mk} + done +done + +## Fix libtool Script +for lt in $(gfind ${BASEPATH} -name libtool -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new + gmv ${lt}.new ${lt} +done + +LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print) +if [ -f ${LTMAIN} ]; then + gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new + gmv ${LTMAIN}.new ${LTMAIN} +fi + Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/fixme.sh ___________________________________________________________________ Added: svn:executable + * 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 4 20:33:29 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 04 Apr 2009 18:33:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[4183] csw/mgar/pkg/librsvg/trunk Message-ID: Revision: 4183 http://gar.svn.sourceforge.net/gar/?rev=4183&view=rev Author: hson Date: 2009-04-04 18:33:28 +0000 (Sat, 04 Apr 2009) Log Message: ----------- librsvg: Use fixme to fix libtool problem Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile csw/mgar/pkg/librsvg/trunk/checksums Added Paths: ----------- csw/mgar/pkg/librsvg/trunk/files/fixme.sh Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2009-04-04 18:08:40 UTC (rev 4182) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2009-04-04 18:33:28 UTC (rev 4183) @@ -19,6 +19,7 @@ MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).$(GARSUBREV).tar.bz2 +DISTFILES += fixme.sh DISTNAME = $(GARNAME)-$(GARVERSION).$(GARSUBREV) @@ -50,6 +51,11 @@ include gar/category.mk +post-configure-modulated: + @(echo "~~~ Fixing Libtool ~~~") + @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) + $(DONADA) + post-install-isa-sparcv8: @cp $(FILEDIR)/librsvg-2.so.2.15.90.s $(INSTALLISADIR)/opt/csw/lib/librsvg-2.so.2.15.90 Modified: csw/mgar/pkg/librsvg/trunk/checksums =================================================================== --- csw/mgar/pkg/librsvg/trunk/checksums 2009-04-04 18:08:40 UTC (rev 4182) +++ csw/mgar/pkg/librsvg/trunk/checksums 2009-04-04 18:33:28 UTC (rev 4183) @@ -1,7 +1,5 @@ c4ec4fdb2b1842e221ca39127e85682d download/librsvg-2.22.3.tar.bz2 -300ffe1b2413261b5ce5e451c8c7d0eb download/librsvg-2.so.2.15.90.i -5e90964c1f99f46100f71cdb3d549fcc download/librsvg-2.so.2.15.90.s -d2491b9b8f422321a88f0414f5e78196 download/CSWlibrsvg.gspec +70771682427d524354d50482371edca5 download/fixme.sh 5b0c0387946c3b7ca7feb913de436936 download/pdiff.patch 8a26f6d0d0cf1cfce1a1e0365c6624ce download/perceptualdiff.patch 803a5d10e3e9c9a561b397aade043024 download/test_makefiles.patch Added: csw/mgar/pkg/librsvg/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/librsvg/trunk/files/fixme.sh (rev 0) +++ csw/mgar/pkg/librsvg/trunk/files/fixme.sh 2009-04-04 18:33:28 UTC (rev 4183) @@ -0,0 +1,49 @@ +#!/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') + sed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new + gmv Makefile.new ${mk} + done +done + +## Fix libtool Script +for lt in $(gfind ${BASEPATH} -name libtool -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new + gmv ${lt}.new ${lt} +done + +LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print) +if [ -f ${LTMAIN} ]; then + gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new + gmv ${LTMAIN}.new ${LTMAIN} +fi + Property changes on: csw/mgar/pkg/librsvg/trunk/files/fixme.sh ___________________________________________________________________ Added: svn:executable + * 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 4 20:34:36 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 04 Apr 2009 18:34:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[4184] csw/mgar/pkg/wmf/trunk Message-ID: Revision: 4184 http://gar.svn.sourceforge.net/gar/?rev=4184&view=rev Author: hson Date: 2009-04-04 18:34:36 +0000 (Sat, 04 Apr 2009) Log Message: ----------- wmf: Use fixme to fix libtool problem Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile csw/mgar/pkg/wmf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wmf/trunk/files/fixme.sh Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2009-04-04 18:33:28 UTC (rev 4183) +++ csw/mgar/pkg/wmf/trunk/Makefile 2009-04-04 18:34:36 UTC (rev 4184) @@ -28,11 +28,13 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -# 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) TEST_TARGET = check + include gar/category.mk + +post-configure-modulated: + @(echo "~~~ Fixing Libtool ~~~") + @$(FILEDIR)/fixme.sh $(WORKSRC) + $(DONADA) Modified: csw/mgar/pkg/wmf/trunk/checksums =================================================================== --- csw/mgar/pkg/wmf/trunk/checksums 2009-04-04 18:33:28 UTC (rev 4183) +++ csw/mgar/pkg/wmf/trunk/checksums 2009-04-04 18:34:36 UTC (rev 4184) @@ -1 +1,2 @@ d1177739bf1ceb07f57421f0cee191e0 download/libwmf-0.2.8.4.tar.gz +34f5b20f6caf282b2533784fbb1b4395 download/fixme.sh Added: csw/mgar/pkg/wmf/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/wmf/trunk/files/fixme.sh (rev 0) +++ csw/mgar/pkg/wmf/trunk/files/fixme.sh 2009-04-04 18:34:36 UTC (rev 4184) @@ -0,0 +1,51 @@ +#!/bin/bash +#################################################### +# +# fixme.sh +# Intended to remove the use of libtool's +# pseudo-libraries for opencsw builds. +# +# Author: Mike Watters mwatters_at_opencsw.org +# Initial Version: 0.1 +# +#################################################### + +umask 0022 +PATH=/opt/csw/bin + +if [ $# -ne 1 ]; then + gecho "USAGE: $(basename $0) WORKSRC" + exit 1 +fi +BASEPATH=$1 + +## Fix Makefiles +for mk in $(gfind ${BASEPATH} -name Makefile -print); do + LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ + gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") + + for file in ${LT_FILES}; do + LIB_NAME=$(ggrep 'dlname=' ${file} | \ + gsed -e "s/.*'\(.*\)'/\1/" \ + -e "s/^lib//" \ + -e "s/\.so.*$//") + fixpath=$(gecho $file |gsed 's/\//\\\//g') + gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new + gmv Makefile.new ${mk} + gchmod +x ${mk} + done +done + +## Fix libtool Script +for lt in $(gfind ${BASEPATH} -name libtool -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new + gmv ${lt}.new ${lt} + gchmod +x ${lt} +done + +for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do + gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new + gmv ${LTMAIN}.new ${LTMAIN} + gchmod +x ${LTMAIN} +done + Property changes on: csw/mgar/pkg/wmf/trunk/files/fixme.sh ___________________________________________________________________ Added: svn:executable + * 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 4 20:36:03 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 04 Apr 2009 18:36:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[4185] csw/mgar/pkg/wmf/trunk/checksums Message-ID: Revision: 4185 http://gar.svn.sourceforge.net/gar/?rev=4185&view=rev Author: hson Date: 2009-04-04 18:36:02 +0000 (Sat, 04 Apr 2009) Log Message: ----------- wmf: fixme dont have to be in DISTFILES Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/checksums Modified: csw/mgar/pkg/wmf/trunk/checksums =================================================================== --- csw/mgar/pkg/wmf/trunk/checksums 2009-04-04 18:34:36 UTC (rev 4184) +++ csw/mgar/pkg/wmf/trunk/checksums 2009-04-04 18:36:02 UTC (rev 4185) @@ -1,2 +1 @@ d1177739bf1ceb07f57421f0cee191e0 download/libwmf-0.2.8.4.tar.gz -34f5b20f6caf282b2533784fbb1b4395 download/fixme.sh 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 4 20:36:20 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 04 Apr 2009 18:36:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[4186] csw/mgar/pkg/librsvg/trunk Message-ID: Revision: 4186 http://gar.svn.sourceforge.net/gar/?rev=4186&view=rev Author: hson Date: 2009-04-04 18:36:20 +0000 (Sat, 04 Apr 2009) Log Message: ----------- librsvg: fixme dont have to be in DISTFILES Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile csw/mgar/pkg/librsvg/trunk/checksums Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2009-04-04 18:36:02 UTC (rev 4185) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2009-04-04 18:36:20 UTC (rev 4186) @@ -19,7 +19,6 @@ MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).$(GARSUBREV).tar.bz2 -DISTFILES += fixme.sh DISTNAME = $(GARNAME)-$(GARVERSION).$(GARSUBREV) @@ -53,7 +52,7 @@ post-configure-modulated: @(echo "~~~ Fixing Libtool ~~~") - @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) + @$(FILEDIR)/fixme.sh $(WORKSRC) $(DONADA) post-install-isa-sparcv8: Modified: csw/mgar/pkg/librsvg/trunk/checksums =================================================================== --- csw/mgar/pkg/librsvg/trunk/checksums 2009-04-04 18:36:02 UTC (rev 4185) +++ csw/mgar/pkg/librsvg/trunk/checksums 2009-04-04 18:36:20 UTC (rev 4186) @@ -1,5 +1,4 @@ c4ec4fdb2b1842e221ca39127e85682d download/librsvg-2.22.3.tar.bz2 -70771682427d524354d50482371edca5 download/fixme.sh 5b0c0387946c3b7ca7feb913de436936 download/pdiff.patch 8a26f6d0d0cf1cfce1a1e0365c6624ce download/perceptualdiff.patch 803a5d10e3e9c9a561b397aade043024 download/test_makefiles.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Apr 4 23:01:36 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 04 Apr 2009 21:01:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[4187] csw/mgar/pkg/wput/trunk Message-ID: Revision: 4187 http://gar.svn.sourceforge.net/gar/?rev=4187&view=rev Author: hson Date: 2009-04-04 21:01:36 +0000 (Sat, 04 Apr 2009) Log Message: ----------- wput: gnutls_devel required, gzipped manpages wont work Modified Paths: -------------- csw/mgar/pkg/wput/trunk/Makefile csw/mgar/pkg/wput/trunk/checksums csw/mgar/pkg/wput/trunk/files/Makefile.in.diff Modified: csw/mgar/pkg/wput/trunk/Makefile =================================================================== --- csw/mgar/pkg/wput/trunk/Makefile 2009-04-04 18:36:20 UTC (rev 4186) +++ csw/mgar/pkg/wput/trunk/Makefile 2009-04-04 21:01:36 UTC (rev 4187) @@ -15,8 +15,10 @@ LICENSE = COPYING -REQUIRED_PKGS = CSWggettextrt +PREREQUISITE_PKGS = CSWgnutlsdevel +REQUIRED_PKGS = CSWggettextrt CSWgnutls + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=141519 UPSTREAM_USE_SF = 1 Modified: csw/mgar/pkg/wput/trunk/checksums =================================================================== --- csw/mgar/pkg/wput/trunk/checksums 2009-04-04 18:36:20 UTC (rev 4186) +++ csw/mgar/pkg/wput/trunk/checksums 2009-04-04 21:01:36 UTC (rev 4187) @@ -1,4 +1,4 @@ a14c4c13d91d04d6119bdc977e8a8bdf download/wput-0.6.2.tgz 90369c3a9dbb27432bdb5ae2611b6a96 download/configure.diff -066a65a869f312afc0e0a4d89e8b8710 download/Makefile.in.diff +b9f350b039a04e6ad5af3c4151d06b31 download/Makefile.in.diff e6e15f2a2fdac44f31ad4e3403993ff3 download/Makefile.in.src.diff Modified: csw/mgar/pkg/wput/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/wput/trunk/files/Makefile.in.diff 2009-04-04 18:36:20 UTC (rev 4186) +++ csw/mgar/pkg/wput/trunk/files/Makefile.in.diff 2009-04-04 21:01:36 UTC (rev 4187) @@ -1,7 +1,6 @@ -diff -ru ../build-global/wput-0.6.2/Makefile.in wput-0.6.2/Makefile.in --- ../build-global/wput-0.6.2/Makefile.in 2008-09-27 12:31:23.000000000 +0200 -+++ wput-0.6.2/Makefile.in 2009-03-29 18:25:34.366444523 +0200 -@@ -16,12 +16,12 @@ ++++ wput-0.6.2/Makefile.in 2009-04-04 22:04:33.828472735 +0200 +@@ -16,12 +16,14 @@ install: all cd po && $(MAKE) $(MAKEDEFS) $@ @@ -15,12 +14,14 @@ + mkdir -p $(DESTDIR)$(mandir) + ginstall -m0755 wput $(DESTDIR)$(bindir) + ginstall -m0644 doc/wput.1.gz $(DESTDIR)$(mandir) ++ gzip -d $(DESTDIR)$(mandir)/wput.1.gz + ln -s $(bindir)/wput $(DESTDIR)$(bindir)/wdel + ginstall -m0644 doc/wdel.1.gz $(DESTDIR)$(mandir) ++ gzip -d $(DESTDIR)$(mandir)/wdel.1.gz @echo "----------------" @echo "Wput and Wdel installed. See 'wput/wdel -h' or 'man wput/wdel' for" @echo "usage information." -@@ -30,6 +30,7 @@ +@@ -30,6 +32,7 @@ @echo "Wput is not perfect, so please report any bugs you notice (see BUGS-section" @echo "in the manpage)." @echo "----------------" 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 5 00:55:42 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 04 Apr 2009 22:55:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[4188] csw/mgar/pkg/zlib/trunk Message-ID: Revision: 4188 http://gar.svn.sourceforge.net/gar/?rev=4188&view=rev Author: hson Date: 2009-04-04 22:55:42 +0000 (Sat, 04 Apr 2009) Log Message: ----------- zlib: Patch configure to build shared lib on amd64 Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/Makefile csw/mgar/pkg/zlib/trunk/checksums csw/mgar/pkg/zlib/trunk/files/configure.diff Modified: csw/mgar/pkg/zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2009-04-04 21:01:36 UTC (rev 4187) +++ csw/mgar/pkg/zlib/trunk/Makefile 2009-04-04 22:55:42 UTC (rev 4188) @@ -30,7 +30,7 @@ PATCHFILES += configure.diff BUILD64 = 1 -NO_ISAEXEC = 1 +#NO_ISAEXEC = 1 CONFIGURE_ARGS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) CONFIGURE_ARGS += --libdir=$(libdir) --includedir=$(includedir) --shared Modified: csw/mgar/pkg/zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/zlib/trunk/checksums 2009-04-04 21:01:36 UTC (rev 4187) +++ csw/mgar/pkg/zlib/trunk/checksums 2009-04-04 22:55:42 UTC (rev 4188) @@ -1,3 +1,3 @@ dee233bf288ee795ac96a98cc2e369b6 download/zlib-1.2.3.tar.bz2 f1b6f2e9b6ce5902d2e7d83728233532 download/Makefile.in.diff -59755e3443f9a9c0374febf39663bf5f download/configure.diff +95c0edba1d5160ed41b871f2c83e813a download/configure.diff Modified: csw/mgar/pkg/zlib/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/zlib/trunk/files/configure.diff 2009-04-04 21:01:36 UTC (rev 4187) +++ csw/mgar/pkg/zlib/trunk/files/configure.diff 2009-04-04 22:55:42 UTC (rev 4188) @@ -1,5 +1,14 @@ --- ../build-global/zlib-1.2.3/configure 2005-07-11 22:11:57.000000000 +0200 -+++ zlib-1.2.3/configure 2009-03-23 08:21:07.639754073 +0100 ++++ zlib-1.2.3/configure 2009-04-01 00:31:48.271327549 +0200 +@@ -19,7 +19,7 @@ + # an error. + + LIBS=libz.a +-LDFLAGS="-L. ${LIBS}" ++#LDFLAGS="-L. ${LIBS}" + VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h` + VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h` + VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h` @@ -29,7 +29,7 @@ exec_prefix=${exec_prefix-'${prefix}'} libdir=${libdir-'${exec_prefix}/lib'} @@ -9,3 +18,23 @@ shared_ext='.so' shared=0 gcc=0 +@@ -132,9 +132,9 @@ + SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "} + CFLAGS=${CFLAGS-"-O3"} + LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};; +- SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."} ++ SunOS\ 5*) SFLAGS="-KPIC $CFLAGS" + CFLAGS=${CFLAGS-"-fast -xcg89"} +- LDSHARED=${LDSHARED-"cc -G"};; ++ LDSHARED=${LDSHARED-"cc -G $LDFLAGS"};; + SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"} + CFLAGS=${CFLAGS-"-O2"} + LDSHARED=${LDSHARED-"ld"};; +@@ -187,6 +187,7 @@ + if test $shared -eq 0; then + LDSHARED="$CC" + echo Building static library $LIBS version $VER with $CC. ++ LDFLAGS="-L. ${LIBS}" + else + LDFLAGS="-L. ${SHAREDLIBV}" + fi 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 5 02:07:49 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 05 Apr 2009 00:07:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[4189] csw/mgar/pkg/wput/trunk Message-ID: Revision: 4189 http://gar.svn.sourceforge.net/gar/?rev=4189&view=rev Author: hson Date: 2009-04-05 00:07:48 +0000 (Sun, 05 Apr 2009) Log Message: ----------- wput: Patches for gnutls Modified Paths: -------------- csw/mgar/pkg/wput/trunk/Makefile csw/mgar/pkg/wput/trunk/checksums csw/mgar/pkg/wput/trunk/files/Makefile.in.src.diff csw/mgar/pkg/wput/trunk/files/configure.diff Modified: csw/mgar/pkg/wput/trunk/Makefile =================================================================== --- csw/mgar/pkg/wput/trunk/Makefile 2009-04-04 22:55:42 UTC (rev 4188) +++ csw/mgar/pkg/wput/trunk/Makefile 2009-04-05 00:07:48 UTC (rev 4189) @@ -17,7 +17,7 @@ PREREQUISITE_PKGS = CSWgnutlsdevel -REQUIRED_PKGS = CSWggettextrt CSWgnutls +REQUIRED_PKGS = CSWggettextrt CSWgnutls CSWgcrypt # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=141519 Modified: csw/mgar/pkg/wput/trunk/checksums =================================================================== --- csw/mgar/pkg/wput/trunk/checksums 2009-04-04 22:55:42 UTC (rev 4188) +++ csw/mgar/pkg/wput/trunk/checksums 2009-04-05 00:07:48 UTC (rev 4189) @@ -1,4 +1,4 @@ a14c4c13d91d04d6119bdc977e8a8bdf download/wput-0.6.2.tgz -90369c3a9dbb27432bdb5ae2611b6a96 download/configure.diff +424b62a6981cd7372281eb5b143e516d download/configure.diff b9f350b039a04e6ad5af3c4151d06b31 download/Makefile.in.diff -e6e15f2a2fdac44f31ad4e3403993ff3 download/Makefile.in.src.diff +ad2fee9c34f44b2c812ba300823eafe0 download/Makefile.in.src.diff Modified: csw/mgar/pkg/wput/trunk/files/Makefile.in.src.diff =================================================================== --- csw/mgar/pkg/wput/trunk/files/Makefile.in.src.diff 2009-04-04 22:55:42 UTC (rev 4188) +++ csw/mgar/pkg/wput/trunk/files/Makefile.in.src.diff 2009-04-05 00:07:48 UTC (rev 4189) @@ -1,12 +1,11 @@ -diff -ru ../build-global/wput-0.6.2/src/Makefile.in wput-0.6.2/src/Makefile.in --- ../build-global/wput-0.6.2/src/Makefile.in 2008-09-27 12:31:23.000000000 +0200 -+++ wput-0.6.2/src/Makefile.in 2009-03-29 18:24:32.132443546 +0200 ++++ wput-0.6.2/src/Makefile.in 2009-04-05 01:53:24.184186828 +0200 @@ -6,7 +6,7 @@ localedir=$(prefix)/share/locale CC=@CC@ CFLAGS= @CFLAGS@ -DLOCALEDIR=\"$(localedir)\" @GNUTLS_CFLAGS@ -LIBS=@LIBINTL@ @LIBS@ @GNUTLS_LIBS@ -+LIBS=@LIBINTL@ @LIBS@ @GNUTLS_LIBS@ -lsocket -lnsl ++LIBS=@LDFLAGS@ @LIBINTL@ @LIBS@ @GNUTLS_LIBS@ -lsocket -lnsl EXE=../wput GETOPT=@GETOPT@ MEMDBG=@MEMDBG@ Modified: csw/mgar/pkg/wput/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/wput/trunk/files/configure.diff 2009-04-04 22:55:42 UTC (rev 4188) +++ csw/mgar/pkg/wput/trunk/files/configure.diff 2009-04-05 00:07:48 UTC (rev 4189) @@ -1,6 +1,5 @@ -diff -ru ../build-global/wput-0.6.2/configure wput-0.6.2/configure --- ../build-global/wput-0.6.2/configure 2008-09-27 12:31:23.000000000 +0200 -+++ wput-0.6.2/configure 2009-03-29 18:17:59.596861076 +0200 ++++ wput-0.6.2/configure 2009-04-05 02:02:56.976236308 +0200 @@ -1736,7 +1736,7 @@ @@ -10,3 +9,21 @@ PACKAGE="wput" VERSION="0.6.2" +@@ -6632,7 +6632,7 @@ + CPPFLAGS="$CPPFLAGS -I$with_gnutls_includes" + + +-for ac_header in gnutls/gnutls.h, gnutls/openssl.h ++for ac_header in gnutls/gnutls.h gnutls/openssl.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +@@ -6879,7 +6879,7 @@ + _ACEOF + + msg_gnutls="GNUTLS" +- GNUTLS_LIBS="$with_gnutls_libs -lgnutls-openssl" ++ GNUTLS_LIBS="$with_gnutls_libs -lgnutls -lgcrypt -lgnutls-openssl" + + with_ssl="yes" + else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Sun Apr 5 06:43:44 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sun, 05 Apr 2009 04:43:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[4190] csw/mgar/pkg/fltk/trunk Message-ID: Revision: 4190 http://gar.svn.sourceforge.net/gar/?rev=4190&view=rev Author: jake_goerzen Date: 2009-04-05 04:43:44 +0000 (Sun, 05 Apr 2009) Log Message: ----------- switch to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/fltk/trunk/Makefile csw/mgar/pkg/fltk/trunk/checksums Added Paths: ----------- csw/mgar/pkg/fltk/trunk/files/Makefile.diff Property Changed: ---------------- csw/mgar/pkg/fltk/trunk/ Property changes on: csw/mgar/pkg/fltk/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/fltk/trunk/Makefile =================================================================== --- csw/mgar/pkg/fltk/trunk/Makefile 2009-04-05 00:07:48 UTC (rev 4189) +++ csw/mgar/pkg/fltk/trunk/Makefile 2009-04-05 04:43:44 UTC (rev 4190) @@ -10,19 +10,20 @@ MASTER_SITES = http://ftp.easysw.com/pub/fltk/$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.gz -DISTFILES += $(call admfiles,CSWfltk, prototype) +DISTFILES += $(call admfiles,CSWfltk) -UFILES_REGEX = (\d+(?:\.\d+)*) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES = makeinclude.in.diff +PATCHFILES = makeinclude.in.diff Makefile.diff -CONFIGURE_ARGS = $(DIRPATHS) LDFLAGS='-L/opt/csw/lib -L../lib' +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --mandir=/opt/csw/share/man CONFIGURE_ARGS += --disable-localpng CONFIGURE_ARGS += --disable-localjpeg CONFIGURE_ARGS += --disable-localzlib CONFIGURE_ARGS += --enable-threads CONFIGURE_ARGS += --enable-largefile +CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-shared include gar/category.mk Modified: csw/mgar/pkg/fltk/trunk/checksums =================================================================== --- csw/mgar/pkg/fltk/trunk/checksums 2009-04-05 00:07:48 UTC (rev 4189) +++ csw/mgar/pkg/fltk/trunk/checksums 2009-04-05 04:43:44 UTC (rev 4190) @@ -1,4 +1,4 @@ d3c76db1b6cebce7a009429bbd125470 download/fltk-1.1.9-source.tar.gz 5b35d77bcd4cb9dbb8a68eab89b358c8 download/CSWfltk.gspec -72ba3eb7711deeaad9d44004da12cc63 download/CSWfltk.prototype 1c51238fcb309cc77681874450d1bb28 download/makeinclude.in.diff +3c8162474dca50e2a8def66fc76f890d download/Makefile.diff Added: csw/mgar/pkg/fltk/trunk/files/Makefile.diff =================================================================== --- csw/mgar/pkg/fltk/trunk/files/Makefile.diff (rev 0) +++ csw/mgar/pkg/fltk/trunk/files/Makefile.diff 2009-04-05 04:43:44 UTC (rev 4190) @@ -0,0 +1,12 @@ +diff --speed-large-files --minimal -Nru fltk-1.1.9.orig/fluid/Makefile fltk-1.1.9/fluid/Makefile +--- fltk-1.1.9.orig/fluid/Makefile 2008-02-26 16:26:08.000000000 +0100 ++++ fltk-1.1.9/fluid/Makefile 2009-04-05 06:25:12.680119819 +0200 +@@ -64,7 +64,7 @@ + fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \ + ../src/$(IMGDSONAME) + echo Linking $@... +- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) ++ $(CXX) $(ARCHFLAGS) -L../src $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) + $(POSTBUILD) $@ ../FL/mac.r + + clean: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Sun Apr 5 07:09:56 2009 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sun, 05 Apr 2009 05:09:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[4191] csw/mgar/pkg/fltk/trunk Message-ID: Revision: 4191 http://gar.svn.sourceforge.net/gar/?rev=4191&view=rev Author: jake_goerzen Date: 2009-04-05 05:09:56 +0000 (Sun, 05 Apr 2009) Log Message: ----------- add depend file Modified Paths: -------------- csw/mgar/pkg/fltk/trunk/Makefile csw/mgar/pkg/fltk/trunk/checksums Added Paths: ----------- csw/mgar/pkg/fltk/trunk/files/CSWfltk.depend Removed Paths: ------------- csw/mgar/pkg/fltk/trunk/files/CSWfltk.prototype Modified: csw/mgar/pkg/fltk/trunk/Makefile =================================================================== --- csw/mgar/pkg/fltk/trunk/Makefile 2009-04-05 04:43:44 UTC (rev 4190) +++ csw/mgar/pkg/fltk/trunk/Makefile 2009-04-05 05:09:56 UTC (rev 4191) @@ -10,7 +10,7 @@ MASTER_SITES = http://ftp.easysw.com/pub/fltk/$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.gz -DISTFILES += $(call admfiles,CSWfltk) +DISTFILES += $(call admfiles,CSWfltk, depend) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/fltk/trunk/checksums =================================================================== --- csw/mgar/pkg/fltk/trunk/checksums 2009-04-05 04:43:44 UTC (rev 4190) +++ csw/mgar/pkg/fltk/trunk/checksums 2009-04-05 05:09:56 UTC (rev 4191) @@ -1,4 +1,5 @@ d3c76db1b6cebce7a009429bbd125470 download/fltk-1.1.9-source.tar.gz 5b35d77bcd4cb9dbb8a68eab89b358c8 download/CSWfltk.gspec +043fee4145d49b611961c22859edc4ec download/CSWfltk.depend 1c51238fcb309cc77681874450d1bb28 download/makeinclude.in.diff 3c8162474dca50e2a8def66fc76f890d download/Makefile.diff Added: csw/mgar/pkg/fltk/trunk/files/CSWfltk.depend =================================================================== --- csw/mgar/pkg/fltk/trunk/files/CSWfltk.depend (rev 0) +++ csw/mgar/pkg/fltk/trunk/files/CSWfltk.depend 2009-04-05 05:09:56 UTC (rev 4191) @@ -0,0 +1,4 @@ +P CSWcommon +P CSWjpeg +P CSWpng +P CSWzlib Deleted: csw/mgar/pkg/fltk/trunk/files/CSWfltk.prototype =================================================================== --- csw/mgar/pkg/fltk/trunk/files/CSWfltk.prototype 2009-04-05 04:43:44 UTC (rev 4190) +++ csw/mgar/pkg/fltk/trunk/files/CSWfltk.prototype 2009-04-05 05:09:56 UTC (rev 4191) @@ -1,581 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/fltk-config 0755 root bin -f none /opt/csw/bin/fluid 0755 root bin -d none /opt/csw/include 0755 root bin -d none /opt/csw/include/FL 0755 root bin -f none /opt/csw/include/FL/Enumerations.H 0644 root bin -s none /opt/csw/include/FL/Enumerations.h=Enumerations.H -f none /opt/csw/include/FL/Fl.H 0644 root bin -s none /opt/csw/include/FL/Fl.h=Fl.H -f none /opt/csw/include/FL/Fl_Adjuster.H 0644 root bin -s none /opt/csw/include/FL/Fl_Adjuster.h=Fl_Adjuster.H -f none /opt/csw/include/FL/Fl_BMP_Image.H 0644 root bin -s none /opt/csw/include/FL/Fl_BMP_Image.h=Fl_BMP_Image.H -f none /opt/csw/include/FL/Fl_Bitmap.H 0644 root bin -s none /opt/csw/include/FL/Fl_Bitmap.h=Fl_Bitmap.H -f none /opt/csw/include/FL/Fl_Box.H 0644 root bin -s none /opt/csw/include/FL/Fl_Box.h=Fl_Box.H -f none /opt/csw/include/FL/Fl_Browser.H 0644 root bin -s none /opt/csw/include/FL/Fl_Browser.h=Fl_Browser.H -f none /opt/csw/include/FL/Fl_Browser_.H 0644 root bin -s none /opt/csw/include/FL/Fl_Browser_.h=Fl_Browser_.H -f none /opt/csw/include/FL/Fl_Button.H 0644 root bin -s none /opt/csw/include/FL/Fl_Button.h=Fl_Button.H -f none /opt/csw/include/FL/Fl_Chart.H 0644 root bin -s none /opt/csw/include/FL/Fl_Chart.h=Fl_Chart.H -f none /opt/csw/include/FL/Fl_Check_Browser.H 0644 root bin -s none /opt/csw/include/FL/Fl_Check_Browser.h=Fl_Check_Browser.H -f none /opt/csw/include/FL/Fl_Check_Button.H 0644 root bin -s none /opt/csw/include/FL/Fl_Check_Button.h=Fl_Check_Button.H -f none /opt/csw/include/FL/Fl_Choice.H 0644 root bin -s none /opt/csw/include/FL/Fl_Choice.h=Fl_Choice.H -f none /opt/csw/include/FL/Fl_Clock.H 0644 root bin -s none /opt/csw/include/FL/Fl_Clock.h=Fl_Clock.H -f none /opt/csw/include/FL/Fl_Color_Chooser.H 0644 root bin -s none /opt/csw/include/FL/Fl_Color_Chooser.h=Fl_Color_Chooser.H -f none /opt/csw/include/FL/Fl_Counter.H 0644 root bin -s none /opt/csw/include/FL/Fl_Counter.h=Fl_Counter.H -f none /opt/csw/include/FL/Fl_Dial.H 0644 root bin -s none /opt/csw/include/FL/Fl_Dial.h=Fl_Dial.H -f none /opt/csw/include/FL/Fl_Double_Window.H 0644 root bin -s none /opt/csw/include/FL/Fl_Double_Window.h=Fl_Double_Window.H -f none /opt/csw/include/FL/Fl_Export.H 0644 root bin -s none /opt/csw/include/FL/Fl_Export.h=Fl_Export.H -f none /opt/csw/include/FL/Fl_File_Browser.H 0644 root bin -s none /opt/csw/include/FL/Fl_File_Browser.h=Fl_File_Browser.H -f none /opt/csw/include/FL/Fl_File_Chooser.H 0644 root bin -s none /opt/csw/include/FL/Fl_File_Chooser.h=Fl_File_Chooser.H -f none /opt/csw/include/FL/Fl_File_Icon.H 0644 root bin -s none /opt/csw/include/FL/Fl_File_Icon.h=Fl_File_Icon.H -f none /opt/csw/include/FL/Fl_File_Input.H 0644 root bin -s none /opt/csw/include/FL/Fl_File_Input.h=Fl_File_Input.H -f none /opt/csw/include/FL/Fl_Fill_Dial.H 0644 root bin -s none /opt/csw/include/FL/Fl_Fill_Dial.h=Fl_Fill_Dial.H -f none /opt/csw/include/FL/Fl_Fill_Slider.H 0644 root bin -s none /opt/csw/include/FL/Fl_Fill_Slider.h=Fl_Fill_Slider.H -f none /opt/csw/include/FL/Fl_Float_Input.H 0644 root bin -s none /opt/csw/include/FL/Fl_Float_Input.h=Fl_Float_Input.H -f none /opt/csw/include/FL/Fl_FormsBitmap.H 0644 root bin -s none /opt/csw/include/FL/Fl_FormsBitmap.h=Fl_FormsBitmap.H -f none /opt/csw/include/FL/Fl_FormsPixmap.H 0644 root bin -s none /opt/csw/include/FL/Fl_FormsPixmap.h=Fl_FormsPixmap.H -f none /opt/csw/include/FL/Fl_Free.H 0644 root bin -s none /opt/csw/include/FL/Fl_Free.h=Fl_Free.H -f none /opt/csw/include/FL/Fl_GIF_Image.H 0644 root bin -s none /opt/csw/include/FL/Fl_GIF_Image.h=Fl_GIF_Image.H -f none /opt/csw/include/FL/Fl_Gl_Window.H 0644 root bin -s none /opt/csw/include/FL/Fl_Gl_Window.h=Fl_Gl_Window.H -f none /opt/csw/include/FL/Fl_Group.H 0644 root bin -s none /opt/csw/include/FL/Fl_Group.h=Fl_Group.H -f none /opt/csw/include/FL/Fl_Help_Dialog.H 0644 root bin -s none /opt/csw/include/FL/Fl_Help_Dialog.h=Fl_Help_Dialog.H -f none /opt/csw/include/FL/Fl_Help_View.H 0644 root bin -s none /opt/csw/include/FL/Fl_Help_View.h=Fl_Help_View.H -f none /opt/csw/include/FL/Fl_Hold_Browser.H 0644 root bin -s none /opt/csw/include/FL/Fl_Hold_Browser.h=Fl_Hold_Browser.H -f none /opt/csw/include/FL/Fl_Hor_Fill_Slider.H 0644 root bin -s none /opt/csw/include/FL/Fl_Hor_Fill_Slider.h=Fl_Hor_Fill_Slider.H -f none /opt/csw/include/FL/Fl_Hor_Nice_Slider.H 0644 root bin -s none /opt/csw/include/FL/Fl_Hor_Nice_Slider.h=Fl_Hor_Nice_Slider.H -f none /opt/csw/include/FL/Fl_Hor_Slider.H 0644 root bin -s none /opt/csw/include/FL/Fl_Hor_Slider.h=Fl_Hor_Slider.H -f none /opt/csw/include/FL/Fl_Hor_Value_Slider.H 0644 root bin -s none /opt/csw/include/FL/Fl_Hor_Value_Slider.h=Fl_Hor_Value_Slider.H -f none /opt/csw/include/FL/Fl_Image.H 0644 root bin -s none /opt/csw/include/FL/Fl_Image.h=Fl_Image.H -f none /opt/csw/include/FL/Fl_Input.H 0644 root bin -s none /opt/csw/include/FL/Fl_Input.h=Fl_Input.H -f none /opt/csw/include/FL/Fl_Input_.H 0644 root bin -s none /opt/csw/include/FL/Fl_Input_.h=Fl_Input_.H -f none /opt/csw/include/FL/Fl_Input_Choice.H 0644 root bin -s none /opt/csw/include/FL/Fl_Input_Choice.h=Fl_Input_Choice.H -f none /opt/csw/include/FL/Fl_Int_Input.H 0644 root bin -s none /opt/csw/include/FL/Fl_Int_Input.h=Fl_Int_Input.H -f none /opt/csw/include/FL/Fl_JPEG_Image.H 0644 root bin -s none /opt/csw/include/FL/Fl_JPEG_Image.h=Fl_JPEG_Image.H -f none /opt/csw/include/FL/Fl_Light_Button.H 0644 root bin -s none /opt/csw/include/FL/Fl_Light_Button.h=Fl_Light_Button.H -f none /opt/csw/include/FL/Fl_Line_Dial.H 0644 root bin -s none /opt/csw/include/FL/Fl_Line_Dial.h=Fl_Line_Dial.H -f none /opt/csw/include/FL/Fl_Menu.H 0644 root bin -s none /opt/csw/include/FL/Fl_Menu.h=Fl_Menu.H -f none /opt/csw/include/FL/Fl_Menu_.H 0644 root bin -s none /opt/csw/include/FL/Fl_Menu_.h=Fl_Menu_.H -f none /opt/csw/include/FL/Fl_Menu_Bar.H 0644 root bin -s none /opt/csw/include/FL/Fl_Menu_Bar.h=Fl_Menu_Bar.H -f none /opt/csw/include/FL/Fl_Menu_Button.H 0644 root bin -s none /opt/csw/include/FL/Fl_Menu_Button.h=Fl_Menu_Button.H -f none /opt/csw/include/FL/Fl_Menu_Item.H 0644 root bin -s none /opt/csw/include/FL/Fl_Menu_Item.h=Fl_Menu_Item.H -f none /opt/csw/include/FL/Fl_Menu_Window.H 0644 root bin -s none /opt/csw/include/FL/Fl_Menu_Window.h=Fl_Menu_Window.H -f none /opt/csw/include/FL/Fl_Multi_Browser.H 0644 root bin -s none /opt/csw/include/FL/Fl_Multi_Browser.h=Fl_Multi_Browser.H -f none /opt/csw/include/FL/Fl_Multi_Label.H 0644 root bin -s none /opt/csw/include/FL/Fl_Multi_Label.h=Fl_Multi_Label.H -f none /opt/csw/include/FL/Fl_Multiline_Input.H 0644 root bin -s none /opt/csw/include/FL/Fl_Multiline_Input.h=Fl_Multiline_Input.H -f none /opt/csw/include/FL/Fl_Multiline_Output.H 0644 root bin -s none /opt/csw/include/FL/Fl_Multiline_Output.h=Fl_Multiline_Output.H -f none /opt/csw/include/FL/Fl_Nice_Slider.H 0644 root bin -s none /opt/csw/include/FL/Fl_Nice_Slider.h=Fl_Nice_Slider.H -f none /opt/csw/include/FL/Fl_Object.H 0644 root bin -s none /opt/csw/include/FL/Fl_Object.h=Fl_Object.H -f none /opt/csw/include/FL/Fl_Output.H 0644 root bin -s none /opt/csw/include/FL/Fl_Output.h=Fl_Output.H -f none /opt/csw/include/FL/Fl_Overlay_Window.H 0644 root bin -s none /opt/csw/include/FL/Fl_Overlay_Window.h=Fl_Overlay_Window.H -f none /opt/csw/include/FL/Fl_PNG_Image.H 0644 root bin -s none /opt/csw/include/FL/Fl_PNG_Image.h=Fl_PNG_Image.H -f none /opt/csw/include/FL/Fl_PNM_Image.H 0644 root bin -s none /opt/csw/include/FL/Fl_PNM_Image.h=Fl_PNM_Image.H -f none /opt/csw/include/FL/Fl_Pack.H 0644 root bin -s none /opt/csw/include/FL/Fl_Pack.h=Fl_Pack.H -f none /opt/csw/include/FL/Fl_Pixmap.H 0644 root bin -s none /opt/csw/include/FL/Fl_Pixmap.h=Fl_Pixmap.H -f none /opt/csw/include/FL/Fl_Positioner.H 0644 root bin -s none /opt/csw/include/FL/Fl_Positioner.h=Fl_Positioner.H -f none /opt/csw/include/FL/Fl_Preferences.H 0644 root bin -s none /opt/csw/include/FL/Fl_Preferences.h=Fl_Preferences.H -f none /opt/csw/include/FL/Fl_Progress.H 0644 root bin -s none /opt/csw/include/FL/Fl_Progress.h=Fl_Progress.H -f none /opt/csw/include/FL/Fl_RGB_Image.H 0644 root bin -s none /opt/csw/include/FL/Fl_RGB_Image.h=Fl_RGB_Image.H -f none /opt/csw/include/FL/Fl_Radio_Button.H 0644 root bin -s none /opt/csw/include/FL/Fl_Radio_Button.h=Fl_Radio_Button.H -f none /opt/csw/include/FL/Fl_Radio_Light_Button.H 0644 root bin -s none /opt/csw/include/FL/Fl_Radio_Light_Button.h=Fl_Radio_Light_Button.H -f none /opt/csw/include/FL/Fl_Radio_Round_Button.H 0644 root bin -s none /opt/csw/include/FL/Fl_Radio_Round_Button.h=Fl_Radio_Round_Button.H -f none /opt/csw/include/FL/Fl_Repeat_Button.H 0644 root bin -s none /opt/csw/include/FL/Fl_Repeat_Button.h=Fl_Repeat_Button.H -f none /opt/csw/include/FL/Fl_Return_Button.H 0644 root bin -s none /opt/csw/include/FL/Fl_Return_Button.h=Fl_Return_Button.H -f none /opt/csw/include/FL/Fl_Roller.H 0644 root bin -s none /opt/csw/include/FL/Fl_Roller.h=Fl_Roller.H -f none /opt/csw/include/FL/Fl_Round_Button.H 0644 root bin -s none /opt/csw/include/FL/Fl_Round_Button.h=Fl_Round_Button.H -f none /opt/csw/include/FL/Fl_Round_Clock.H 0644 root bin -s none /opt/csw/include/FL/Fl_Round_Clock.h=Fl_Round_Clock.H -f none /opt/csw/include/FL/Fl_Scroll.H 0644 root bin -s none /opt/csw/include/FL/Fl_Scroll.h=Fl_Scroll.H -f none /opt/csw/include/FL/Fl_Scrollbar.H 0644 root bin -s none /opt/csw/include/FL/Fl_Scrollbar.h=Fl_Scrollbar.H -f none /opt/csw/include/FL/Fl_Secret_Input.H 0644 root bin -s none /opt/csw/include/FL/Fl_Secret_Input.h=Fl_Secret_Input.H -f none /opt/csw/include/FL/Fl_Select_Browser.H 0644 root bin -s none /opt/csw/include/FL/Fl_Select_Browser.h=Fl_Select_Browser.H -f none /opt/csw/include/FL/Fl_Shared_Image.H 0644 root bin -s none /opt/csw/include/FL/Fl_Shared_Image.h=Fl_Shared_Image.H -f none /opt/csw/include/FL/Fl_Simple_Counter.H 0644 root bin -s none /opt/csw/include/FL/Fl_Simple_Counter.h=Fl_Simple_Counter.H -f none /opt/csw/include/FL/Fl_Single_Window.H 0644 root bin -s none /opt/csw/include/FL/Fl_Single_Window.h=Fl_Single_Window.H -f none /opt/csw/include/FL/Fl_Slider.H 0644 root bin -s none /opt/csw/include/FL/Fl_Slider.h=Fl_Slider.H -f none /opt/csw/include/FL/Fl_Spinner.H 0644 root bin -s none /opt/csw/include/FL/Fl_Spinner.h=Fl_Spinner.H -f none /opt/csw/include/FL/Fl_Sys_Menu_Bar.H 0644 root bin -s none /opt/csw/include/FL/Fl_Sys_Menu_Bar.h=Fl_Sys_Menu_Bar.H -f none /opt/csw/include/FL/Fl_Tabs.H 0644 root bin -s none /opt/csw/include/FL/Fl_Tabs.h=Fl_Tabs.H -f none /opt/csw/include/FL/Fl_Text_Buffer.H 0644 root bin -s none /opt/csw/include/FL/Fl_Text_Buffer.h=Fl_Text_Buffer.H -f none /opt/csw/include/FL/Fl_Text_Display.H 0644 root bin -s none /opt/csw/include/FL/Fl_Text_Display.h=Fl_Text_Display.H -f none /opt/csw/include/FL/Fl_Text_Editor.H 0644 root bin -s none /opt/csw/include/FL/Fl_Text_Editor.h=Fl_Text_Editor.H -f none /opt/csw/include/FL/Fl_Tile.H 0644 root bin -s none /opt/csw/include/FL/Fl_Tile.h=Fl_Tile.H -f none /opt/csw/include/FL/Fl_Tiled_Image.H 0644 root bin -s none /opt/csw/include/FL/Fl_Tiled_Image.h=Fl_Tiled_Image.H -f none /opt/csw/include/FL/Fl_Timer.H 0644 root bin -s none /opt/csw/include/FL/Fl_Timer.h=Fl_Timer.H -f none /opt/csw/include/FL/Fl_Toggle_Button.H 0644 root bin -s none /opt/csw/include/FL/Fl_Toggle_Button.h=Fl_Toggle_Button.H -f none /opt/csw/include/FL/Fl_Toggle_Light_Button.H 0644 root bin -s none /opt/csw/include/FL/Fl_Toggle_Light_Button.h=Fl_Toggle_Light_Button.H -f none /opt/csw/include/FL/Fl_Toggle_Round_Button.H 0644 root bin -s none /opt/csw/include/FL/Fl_Toggle_Round_Button.h=Fl_Toggle_Round_Button.H -f none /opt/csw/include/FL/Fl_Tooltip.H 0644 root bin -s none /opt/csw/include/FL/Fl_Tooltip.h=Fl_Tooltip.H -f none /opt/csw/include/FL/Fl_Valuator.H 0644 root bin -s none /opt/csw/include/FL/Fl_Valuator.h=Fl_Valuator.H -f none /opt/csw/include/FL/Fl_Value_Input.H 0644 root bin -s none /opt/csw/include/FL/Fl_Value_Input.h=Fl_Value_Input.H -f none /opt/csw/include/FL/Fl_Value_Output.H 0644 root bin -s none /opt/csw/include/FL/Fl_Value_Output.h=Fl_Value_Output.H -f none /opt/csw/include/FL/Fl_Value_Slider.H 0644 root bin -s none /opt/csw/include/FL/Fl_Value_Slider.h=Fl_Value_Slider.H -f none /opt/csw/include/FL/Fl_Widget.H 0644 root bin -s none /opt/csw/include/FL/Fl_Widget.h=Fl_Widget.H -f none /opt/csw/include/FL/Fl_Window.H 0644 root bin -s none /opt/csw/include/FL/Fl_Window.h=Fl_Window.H -f none /opt/csw/include/FL/Fl_Wizard.H 0644 root bin -s none /opt/csw/include/FL/Fl_Wizard.h=Fl_Wizard.H -f none /opt/csw/include/FL/Fl_XBM_Image.H 0644 root bin -s none /opt/csw/include/FL/Fl_XBM_Image.h=Fl_XBM_Image.H -f none /opt/csw/include/FL/Fl_XPM_Image.H 0644 root bin -s none /opt/csw/include/FL/Fl_XPM_Image.h=Fl_XPM_Image.H -f none /opt/csw/include/FL/dirent.h 0644 root bin -f none /opt/csw/include/FL/filename.H 0644 root bin -s none /opt/csw/include/FL/filename.h=filename.H -f none /opt/csw/include/FL/fl_ask.H 0644 root bin -s none /opt/csw/include/FL/fl_ask.h=fl_ask.H -f none /opt/csw/include/FL/fl_draw.H 0644 root bin -s none /opt/csw/include/FL/fl_draw.h=fl_draw.H -s none /opt/csw/include/FL/fl_file_chooser.H=Fl_File_Chooser.H -s none /opt/csw/include/FL/fl_file_chooser.h=Fl_File_Chooser.H -f none /opt/csw/include/FL/fl_message.H 0644 root bin -s none /opt/csw/include/FL/fl_message.h=fl_message.H -f none /opt/csw/include/FL/fl_show_colormap.H 0644 root bin -s none /opt/csw/include/FL/fl_show_colormap.h=fl_show_colormap.H -f none /opt/csw/include/FL/fl_show_input.H 0644 root bin -s none /opt/csw/include/FL/fl_show_input.h=fl_show_input.H -f none /opt/csw/include/FL/forms.H 0644 root bin -s none /opt/csw/include/FL/forms.h=forms.H -f none /opt/csw/include/FL/gl.h 0644 root bin -f none /opt/csw/include/FL/gl2opengl.h 0644 root bin -f none /opt/csw/include/FL/gl_draw.H 0644 root bin -s none /opt/csw/include/FL/gl_draw.h=gl_draw.H -f none /opt/csw/include/FL/glu.h 0644 root bin -f none /opt/csw/include/FL/glut.H 0644 root bin -s none /opt/csw/include/FL/glut.h=glut.H -f none /opt/csw/include/FL/mac.H 0644 root bin -s none /opt/csw/include/FL/mac.h=mac.H -f none /opt/csw/include/FL/mac.r 0644 root bin -f none /opt/csw/include/FL/math.h 0644 root bin -f none /opt/csw/include/FL/names.h 0644 root bin -f none /opt/csw/include/FL/win32.H 0644 root bin -s none /opt/csw/include/FL/win32.h=win32.H -f none /opt/csw/include/FL/x.H 0644 root bin -s none /opt/csw/include/FL/x.h=x.H -s none /opt/csw/include/Fl=FL -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libfltk.so.1.1 0755 root bin -s none /opt/csw/lib/libfltk.so=libfltk.so.1.1 -f none /opt/csw/lib/libfltk_forms.so.1.1 0755 root bin -s none /opt/csw/lib/libfltk_forms.so=libfltk_forms.so.1.1 -f none /opt/csw/lib/libfltk_gl.so.1.1 0755 root bin -s none /opt/csw/lib/libfltk_gl.so=libfltk_gl.so.1.1 -f none /opt/csw/lib/libfltk_images.so.1.1 0755 root bin -s none /opt/csw/lib/libfltk_images.so=libfltk_images.so.1.1 -d none /opt/csw/share/doc/fltk 0755 root bin -f none /opt/csw/share/doc/fltk/FL.gif 0644 root bin -f none /opt/csw/share/doc/fltk/Fl.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Adjuster.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_BMP_Image.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Bitmap.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Box.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Browser.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Browser_.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Button.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Chart.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Check_Browser.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Check_Button.gif 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Check_Button.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Choice.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Clock.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Clock_Output.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Color_Chooser.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Counter.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Dial.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Double_Window.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_End.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_File_Browser.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_File_Chooser.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_File_Chooser.jpg 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_File_Icon.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_File_Input.gif 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_File_Input.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Float_Input.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Free.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_GIF_Image.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Gl_Window.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Group.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Help_Dialog.gif 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Help_Dialog.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Help_View.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Hold_Browser.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Image.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Input.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Input_.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Input_Choice.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Int_Input.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_JPEG_Image.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Light_Button.gif 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Light_Button.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Menu_.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Menu_Bar.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Menu_Button.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Menu_Item.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Menu_Window.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Multi_Browser.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Multiline_Input.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Multiline_Output.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Output.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Overlay_Window.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_PNG_Image.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_PNM_Image.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Pack.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Pixmap.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Positioner.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Preferences.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Progress.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_RGB_Image.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Repeat_Button.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Return_Button.gif 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Return_Button.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Roller.gif 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Roller.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Round_Button.gif 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Round_Button.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Scroll.gif 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Scroll.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Scrollbar.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Secret_Input.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Select_Browser.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Shared_Image.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Single_Window.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Slider.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Spinner.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Tabs.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Text_Buffer.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Text_Display.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Text_Editor.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Tile.gif 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Tile.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Tiled_Image.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Timer.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Toggle_Button.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Tooltip.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Valuator.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Value_Input.gif 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Value_Input.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Value_Output.gif 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Value_Output.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Value_Slider.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Widget.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Window.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_Wizard.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_XBM_Image.html 0644 root bin -f none /opt/csw/share/doc/fltk/Fl_XPM_Image.html 0644 root bin -f none /opt/csw/share/doc/fltk/adjuster1.gif 0644 root bin -f none /opt/csw/share/doc/fltk/advanced.html 0644 root bin -f none /opt/csw/share/doc/fltk/basics.html 0644 root bin -f none /opt/csw/share/doc/fltk/boxtypes.gif 0644 root bin -f none /opt/csw/share/doc/fltk/buttons.gif 0644 root bin -f none /opt/csw/share/doc/fltk/charts.gif 0644 root bin -f none /opt/csw/share/doc/fltk/choice.gif 0644 root bin -f none /opt/csw/share/doc/fltk/clock.gif 0644 root bin -f none /opt/csw/share/doc/fltk/common.html 0644 root bin -f none /opt/csw/share/doc/fltk/counter.gif 0644 root bin -f none /opt/csw/share/doc/fltk/cubeview.gif 0644 root bin -f none /opt/csw/share/doc/fltk/dial.gif 0644 root bin -f none /opt/csw/share/doc/fltk/drawing.html 0644 root bin -f none /opt/csw/share/doc/fltk/editor-replace.gif 0644 root bin -f none /opt/csw/share/doc/fltk/editor.gif 0644 root bin -f none /opt/csw/share/doc/fltk/editor.html 0644 root bin -f none /opt/csw/share/doc/fltk/enumerations.html 0644 root bin -f none /opt/csw/share/doc/fltk/events.html 0644 root bin -d none /opt/csw/share/doc/fltk/examples 0755 root bin -f none /opt/csw/share/doc/fltk/examples.html 0644 root bin -f none /opt/csw/share/doc/fltk/examples/CubeMain.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/CubeView.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/CubeView.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/CubeViewUI.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/CubeViewUI.fl 0644 root bin -f none /opt/csw/share/doc/fltk/examples/CubeViewUI.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/adjuster.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/arc.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/ask.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/bitmap.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/blocks.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/boxtype.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/browser.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/button.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/buttons.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/checkers.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/clock.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/colbrowser.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/color_chooser.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/connect.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/cube.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/cursor.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/curve.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/demo.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/demo.menu 0644 root bin -f none /opt/csw/share/doc/fltk/examples/doublebuffer.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/editor.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/fast_slow.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/fast_slow.fl 0644 root bin -f none /opt/csw/share/doc/fltk/examples/fast_slow.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/file_chooser.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/fl_jpeg_image.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/fonts.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/forms.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/fractals.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/fracviewer.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/fracviewer.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/fullscreen.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/gl_overlay.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/glpuzzle.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/hello.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/help.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/iconize.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/image.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/inactive.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/inactive.fl 0644 root bin -f none /opt/csw/share/doc/fltk/examples/inactive.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/input.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/input_choice.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/keyboard.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/keyboard.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/keyboard_ui.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/keyboard_ui.fl 0644 root bin -f none /opt/csw/share/doc/fltk/examples/keyboard_ui.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/label.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/line_style.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/list_visuals.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/mandelbrot.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/mandelbrot.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/mandelbrot_ui.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/mandelbrot_ui.fl 0644 root bin -f none /opt/csw/share/doc/fltk/examples/mandelbrot_ui.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/menubar.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/message.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/minimum.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/navigation.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/output.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/overlay.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pack.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmap.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmap_browser.cxx 0644 root bin -d none /opt/csw/share/doc/fltk/examples/pixmaps 0755 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/black_1.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/black_2.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/black_3.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/black_4.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/blackking_1.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/blackking_2.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/blackking_3.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/blackking_4.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/blast.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/blue.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/blue_bomb.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/cyan.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/cyan_bomb.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/gray.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/gray_bomb.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/green.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/green_bomb.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/magenta.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/magenta_bomb.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/porsche.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/porsche1.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/red.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/red_bomb.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/srs.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/sudoku.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/tile.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/white_1.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/white_2.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/white_3.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/white_4.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/whiteking_1.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/whiteking_2.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/whiteking_3.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/whiteking_4.xbm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/yellow.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/pixmaps/yellow_bomb.xpm 0644 root bin -f none /opt/csw/share/doc/fltk/examples/preferences.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/preferences.fl 0644 root bin -f none /opt/csw/share/doc/fltk/examples/preferences.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/radio.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/radio.fl 0644 root bin -f none /opt/csw/share/doc/fltk/examples/radio.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/resize.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/resize.fl 0644 root bin -f none /opt/csw/share/doc/fltk/examples/resize.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/resizebox.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/scroll.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/shape.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/subwindow.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/sudoku.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/sudokurc.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/symbols.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/tabs.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/tabs.fl 0644 root bin -f none /opt/csw/share/doc/fltk/examples/tabs.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/threads.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/threads.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/tile.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/tiled_image.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/trackball.h 0644 root bin -f none /opt/csw/share/doc/fltk/examples/unittests.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/valuators.cxx 0644 root bin -f none /opt/csw/share/doc/fltk/examples/valuators.fl 0644 root bin -f none /opt/csw/share/doc/fltk/examples/valuators.h 0644 root bin -f none /opt/csw/share/doc/fltk/fl_alert.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fl_ask.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fl_choice.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fl_color_chooser.jpg 0644 root bin -f none /opt/csw/share/doc/fltk/fl_input.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fl_message.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fl_password.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fl_show_colormap.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fluid-catgets.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fluid-gettext.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fluid-org.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fluid.html 0644 root bin -f none /opt/csw/share/doc/fltk/fluid1.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fluid2.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fluid3-cxx.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fluid3-gui.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fluid3-style.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fluid4.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fluid_prefs.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fluid_widget_cxx.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fluid_widget_gui.gif 0644 root bin -f none /opt/csw/share/doc/fltk/fluid_widget_style.gif 0644 root bin -f none /opt/csw/share/doc/fltk/forms.html 0644 root bin -f none /opt/csw/share/doc/fltk/functions.html 0644 root bin -f none /opt/csw/share/doc/fltk/glut.html 0644 root bin -f none /opt/csw/share/doc/fltk/hello.C.gif 0644 root bin -f none /opt/csw/share/doc/fltk/index.html 0644 root bin -f none /opt/csw/share/doc/fltk/input_choice.jpg 0644 root bin -f none /opt/csw/share/doc/fltk/intro.html 0644 root bin -f none /opt/csw/share/doc/fltk/license.html 0644 root bin -f none /opt/csw/share/doc/fltk/menu.gif 0644 root bin -f none /opt/csw/share/doc/fltk/menu_button.gif 0644 root bin -f none /opt/csw/share/doc/fltk/menubar.gif 0644 root bin -f none /opt/csw/share/doc/fltk/migration.html 0644 root bin -f none /opt/csw/share/doc/fltk/opengl.html 0644 root bin -f none /opt/csw/share/doc/fltk/osissues.html 0644 root bin -f none /opt/csw/share/doc/fltk/positioner.gif 0644 root bin -f none /opt/csw/share/doc/fltk/preface.html 0644 root bin -f none /opt/csw/share/doc/fltk/resizebox1.gif 0644 root bin -f none /opt/csw/share/doc/fltk/resizebox2.gif 0644 root bin -f none /opt/csw/share/doc/fltk/round_clock.gif 0644 root bin -f none /opt/csw/share/doc/fltk/scrollbar.gif 0644 root bin -f none /opt/csw/share/doc/fltk/slider.gif 0644 root bin -f none /opt/csw/share/doc/fltk/subclassing.html 0644 root bin -f none /opt/csw/share/doc/fltk/symbols.gif 0644 root bin -f none /opt/csw/share/doc/fltk/tabs.gif 0644 root bin -f none /opt/csw/share/doc/fltk/text.gif 0644 root bin -f none /opt/csw/share/doc/fltk/valuators.gif 0644 root bin -f none /opt/csw/share/doc/fltk/value_slider.gif 0644 root bin -f none /opt/csw/share/doc/fltk/widgets.html 0644 root bin -d none /opt/csw/share/man/cat1 0755 root bin -f none /opt/csw/share/man/cat1/fltk-config.1 0644 root bin -f none /opt/csw/share/man/cat1/fluid.1 0644 root bin -d none /opt/csw/share/man/cat3 0755 root bin -f none /opt/csw/share/man/cat3/fltk.3 0644 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/fltk-config.1 0644 root bin -f none /opt/csw/share/man/man1/fluid.1 0644 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/fltk.3 0644 root bin -i copyright=CSWfltk.copyright -i depend=CSWfltk.depend -i pkginfo=CSWfltk.pkginfo 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 5 09:14:47 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 05 Apr 2009 07:14:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[4192] csw/mgar/pkg/nsca/trunk/Makefile Message-ID: Revision: 4192 http://gar.svn.sourceforge.net/gar/?rev=4192&view=rev Author: j_arndt Date: 2009-04-05 07:14:47 +0000 (Sun, 05 Apr 2009) Log Message: ----------- nsca: fix for #3568 and #3591 Modified Paths: -------------- csw/mgar/pkg/nsca/trunk/Makefile Modified: csw/mgar/pkg/nsca/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsca/trunk/Makefile 2009-04-05 05:09:56 UTC (rev 4191) +++ csw/mgar/pkg/nsca/trunk/Makefile 2009-04-05 07:14:47 UTC (rev 4192) @@ -23,6 +23,8 @@ SPKG_CLASSES_CSWnsca = none cswpreserveconf cswinitsmf SPKG_CLASSES_CSWsendnsca = none cswpreserveconf +NOISALIST = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-nsca-port=5667 CONFIGURE_ARGS += --localstatedir=/opt/csw/nagios/var 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 5 09:34:25 2009 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 05 Apr 2009 07:34:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4193] csw/mgar/pkg/nrpe/trunk/Makefile Message-ID: Revision: 4193 http://gar.svn.sourceforge.net/gar/?rev=4193&view=rev Author: j_arndt Date: 2009-04-05 07:34:24 +0000 (Sun, 05 Apr 2009) Log Message: ----------- fix for #3567 and #3566 Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2009-04-05 07:14:47 UTC (rev 4192) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2009-04-05 07:34:24 UTC (rev 4193) @@ -21,6 +21,8 @@ SPKG_CLASSES_CSWnrpe = none cswpreserveconf cswinitsmf +NOISALIST = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl-lib=/opt/csw/lib CONFIGURE_ARGS += --with-ssl-inc=/opt/csw/include 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 5 11:16:26 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 05 Apr 2009 09:16:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[4194] csw/mgar/pkg/zlib/trunk Message-ID: Revision: 4194 http://gar.svn.sourceforge.net/gar/?rev=4194&view=rev Author: hson Date: 2009-04-05 09:16:25 +0000 (Sun, 05 Apr 2009) Log Message: ----------- zlib: Set SONAME Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/checksums csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff Modified: csw/mgar/pkg/zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/zlib/trunk/checksums 2009-04-05 07:34:24 UTC (rev 4193) +++ csw/mgar/pkg/zlib/trunk/checksums 2009-04-05 09:16:25 UTC (rev 4194) @@ -1,3 +1,3 @@ dee233bf288ee795ac96a98cc2e369b6 download/zlib-1.2.3.tar.bz2 -f1b6f2e9b6ce5902d2e7d83728233532 download/Makefile.in.diff +fc375b4e1b10b7946d3b872720154e63 download/Makefile.in.diff 95c0edba1d5160ed41b871f2c83e813a download/configure.diff Modified: csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff 2009-04-05 07:34:24 UTC (rev 4193) +++ csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff 2009-04-05 09:16:25 UTC (rev 4194) @@ -1,5 +1,25 @@ --- ../build-global/zlib-1.2.3/Makefile.in 2005-07-18 04:25:21.000000000 +0200 -+++ zlib-1.2.3/Makefile.in 2009-03-23 08:05:49.549504439 +0100 ++++ zlib-1.2.3/Makefile.in 2009-04-05 11:06:51.418782054 +0200 +@@ -24,15 +24,15 @@ + #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ + # -Wstrict-prototypes -Wmissing-prototypes + +-LDFLAGS=libz.a +-LDSHARED=$(CC) +-CPP=$(CC) -E +- + LIBS=libz.a + SHAREDLIB=libz.so + SHAREDLIBV=libz.so.1.2.3 + SHAREDLIBM=libz.so.1 + ++LDFLAGS=libz.a ++LDSHARED=$(CC) -h $(SHAREDLIBM) ++CPP=$(CC) -E ++ + AR=ar rc + RANLIB=ranlib + TAR=tar @@ -43,7 +43,7 @@ exec_prefix = ${prefix} libdir = ${exec_prefix}/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 Sun Apr 5 11:29:04 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 05 Apr 2009 09:29:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[4195] csw/mgar/pkg/zlib/trunk Message-ID: Revision: 4195 http://gar.svn.sourceforge.net/gar/?rev=4195&view=rev Author: hson Date: 2009-04-05 09:29:04 +0000 (Sun, 05 Apr 2009) Log Message: ----------- zlib: SONAME fix Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/checksums csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff Modified: csw/mgar/pkg/zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/zlib/trunk/checksums 2009-04-05 09:16:25 UTC (rev 4194) +++ csw/mgar/pkg/zlib/trunk/checksums 2009-04-05 09:29:04 UTC (rev 4195) @@ -1,3 +1,3 @@ dee233bf288ee795ac96a98cc2e369b6 download/zlib-1.2.3.tar.bz2 -fc375b4e1b10b7946d3b872720154e63 download/Makefile.in.diff +7e6ff59ded76dd7d90a5dc10ff25e20a download/Makefile.in.diff 95c0edba1d5160ed41b871f2c83e813a download/configure.diff Modified: csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff 2009-04-05 09:16:25 UTC (rev 4194) +++ csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff 2009-04-05 09:29:04 UTC (rev 4195) @@ -1,25 +1,5 @@ --- ../build-global/zlib-1.2.3/Makefile.in 2005-07-18 04:25:21.000000000 +0200 -+++ zlib-1.2.3/Makefile.in 2009-04-05 11:06:51.418782054 +0200 -@@ -24,15 +24,15 @@ - #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ - # -Wstrict-prototypes -Wmissing-prototypes - --LDFLAGS=libz.a --LDSHARED=$(CC) --CPP=$(CC) -E -- - LIBS=libz.a - SHAREDLIB=libz.so - SHAREDLIBV=libz.so.1.2.3 - SHAREDLIBM=libz.so.1 - -+LDFLAGS=libz.a -+LDSHARED=$(CC) -h $(SHAREDLIBM) -+CPP=$(CC) -E -+ - AR=ar rc - RANLIB=ranlib - TAR=tar ++++ zlib-1.2.3/Makefile.in 2009-04-05 11:24:56.336506142 +0200 @@ -43,7 +43,7 @@ exec_prefix = ${prefix} libdir = ${exec_prefix}/lib @@ -29,6 +9,15 @@ man3dir = ${mandir}/man3 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ +@@ -78,7 +78,7 @@ + rm -f _match.s + + $(SHAREDLIBV): $(OBJS) +- $(LDSHARED) -o $@ $(OBJS) ++ $(LDSHARED) -h $(SHAREDLIBM) -o $@ $(OBJS) + rm -f $(SHAREDLIB) $(SHAREDLIBM) + ln -s $@ $(SHAREDLIB) + ln -s $@ $(SHAREDLIBM) @@ -90,23 +90,23 @@ $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Apr 5 15:48:44 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 05 Apr 2009 13:48:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[4196] csw/mgar/pkg/bash_completion/trunk Message-ID: Revision: 4196 http://gar.svn.sourceforge.net/gar/?rev=4196&view=rev Author: chninkel Date: 2009-04-05 13:48:44 +0000 (Sun, 05 Apr 2009) Log Message: ----------- bash_completion: updated to 1.0 bash_completion: switched to gar v2 Modified Paths: -------------- csw/mgar/pkg/bash_completion/trunk/Makefile csw/mgar/pkg/bash_completion/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch Removed Paths: ------------- csw/mgar/pkg/bash_completion/trunk/files/CSWbash_completion.gspec csw/mgar/pkg/bash_completion/trunk/files/blastwave.patch Property Changed: ---------------- csw/mgar/pkg/bash_completion/trunk/ Property changes on: csw/mgar/pkg/bash_completion/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/bash_completion/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash_completion/trunk/Makefile 2009-04-05 09:29:04 UTC (rev 4195) +++ csw/mgar/pkg/bash_completion/trunk/Makefile 2009-04-05 13:48:44 UTC (rev 4196) @@ -1,5 +1,19 @@ +##################################################################### +# OpenCSW build recipe for bash-completion +# +# Copyright 2009 Yann Rouillard +# All rights reserved. Use is subject to license terms. +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +##################################################################### + +###### Package information ####### + GARNAME = bash_completion -GARVERSION = 20060301 +GARVERSION = 1.0 CATEGORIES = xtra DESCRIPTION = Programmable completion for bash @@ -7,38 +21,59 @@ Since v2.04, bash has allowed you to intelligently program and extend its standard completion behavior to achieve complex command lines with just a few keystrokes. Imagine typing ssh [Tab] and being able to complete on hosts from your ~/.ssh/known_hosts files. Or typing man 3 str [Tab] and getting a list of all string handling functions in the UNIX manual. mount system: [Tab] would complete on all exported file-systems from the host called system, while make [Tab] would complete on all targets in Makefile. This project was conceived to produce programmable completion routines for the most common Linux/UNIX commands, reducing the amount of typing sysadmins and programmers need to do on a daily basis. endef -MASTER_SITES = http://www.caliban.org/files/bash/ +ARCHALL=1 +PACKAGES = CSWbashcmplt +CATALOGNAME_CSWbashcmplt = bash_completion + + +###### Upstream and OpenCSW files information ####### + +MASTER_SITES = http://bash-completion.alioth.debian.org/files/ + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(shell echo $(GARNAME) | tr '_' '-')-(\d+).tar.gz -DISTFILES = $(shell echo $(GARNAME) | tr '_' '-')-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWbash_completion,) +DISTNAME = $(shell echo $(GARNAME) | tr '_' '-')-$(GARVERSION) + +DISTFILES = $(DISTNAME).tar.gz +# we automatically include all DISTFILES += $(shell cd files; for FILE in *.completion; do echo $$FILE; done) -# add blastwave paths -PATCHFILES = blastwave.patch +DISTFILES += changelog.CSW -WORKSRC = $(WORKDIR)/$(GARNAME) +# change the paths to use opencsw ones +PATCHFILES = opencsw_paths.patch -# no configure/Makefile -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = manual + +##### Build and installation information ##### + +# the configure script doesn't seem to take in account the prefix +# env variable defined automatically by GAR +CONFIGURE_ARGS += --prefix $(prefix) + +# no test script in bash_completion TEST_SCRIPTS = -install-manual: - @ginstall -d $(DESTDIR)$(sysconfdir) - @ginstall -d $(DESTDIR)$(sysconfdir)/bash_completion.d - @ginstall -D $(WORKSRC)/bash_completion $(DESTDIR)$(sysconfdir)/bash_completion +post-merge: merge-opencsw-completion merge-additional-docs merge-changelog + +# we add some completion scripts for Solaris +merge-opencsw-completion: @( for FILE in $(WORKDIR)/*.completion; do \ - NFILE="`basename $$FILE | sed -e 's/\.completion$$//'`"; \ - ginstall -D $$FILE $(DESTDIR)$(sysconfdir)/bash_completion.d/$$NFILE; \ + NFILE="`basename $$FILE | sed -e 's/\.completion$$//'`"; \ + ginstall -D $$FILE $(PKGROOT)$(sysconfdir)/bash_completion.d/$$NFILE; \ done ) - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - @( for FILE in BUGS README TODO Changelog; do \ - ginstall -D $(WORKSRC)/$$FILE $(DESTDIR)$(docdir)/$(GARNAME)/$$FILE; \ + @$(MAKECOOKIE) + + +merge-additional-docs: + @( for FILE in AUTHORS README TODO CHANGES; do \ + ginstall -D "$(WORKSRC_FIRSTMOD)/$$FILE" "$(PKGROOT)$(docdir)/$(GARNAME)/$$FILE"; \ done ) + @$(MAKECOOKIE) +merge-changelog: + ginstall -D "$(WORKDIR)/changelog.CSW" "$(PKGROOT)$(docdir)/$(GARNAME)/changelog.CSW" + @$(MAKECOOKIE) include gar/category.mk Modified: csw/mgar/pkg/bash_completion/trunk/checksums =================================================================== --- csw/mgar/pkg/bash_completion/trunk/checksums 2009-04-05 09:29:04 UTC (rev 4195) +++ csw/mgar/pkg/bash_completion/trunk/checksums 2009-04-05 13:48:44 UTC (rev 4196) @@ -1,7 +1,7 @@ -9bca1cf97e8f8c73e3ef560cc9dead21 download/bash-completion-20060301.tar.gz -2de14c97d596cf5ac0da21ea34ea93aa download/CSWbash_completion.gspec +cd1c5648272917fbe0eef4ba30bb93f4 download/bash-completion-1.0.tar.gz 2acb33dad8ee4ea46b02f2cd86ced5e1 download/pkg-get.completion 0fcc270cda377374a9637d24c8b689b3 download/pkgadd.completion 7d304567cc880dd42e8ea277c991017f download/pkgrm.completion cc213a6d8dd2d484f2bce4f7905437f8 download/smf.completion -152cc17cbfe6875b15d9216f63bed3f9 download/blastwave.patch +1745e51815578a18384ff36a449e0002 download/changelog.CSW +d0c0d867babf351bca9ee97e03be550d download/opencsw_paths.patch Deleted: csw/mgar/pkg/bash_completion/trunk/files/CSWbash_completion.gspec =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/CSWbash_completion.gspec 2009-04-05 09:29:04 UTC (rev 4195) +++ csw/mgar/pkg/bash_completion/trunk/files/CSWbash_completion.gspec 2009-04-05 13:48:44 UTC (rev 4196) @@ -1,4 +0,0 @@ -%var bitname bash_completion -%var pkgname CSWbashcmplt -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/bash_completion/trunk/files/blastwave.patch =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/blastwave.patch 2009-04-05 09:29:04 UTC (rev 4195) +++ csw/mgar/pkg/bash_completion/trunk/files/blastwave.patch 2009-04-05 13:48:44 UTC (rev 4196) @@ -1,23 +0,0 @@ -diff --speed-large-files --minimal -Nru bash_completion.orig/bash_completion bash_completion/bash_completion ---- bash_completion.orig/bash_completion 2006-05-01 21:23:54.827097000 -0400 -+++ bash_completion/bash_completion 2006-05-01 21:23:49.947089000 -0400 -@@ -32,8 +32,8 @@ - { - # These declarations must go within braces in order to be able to silence - # readonly variable errors. -- BASH_COMPLETION="${BASH_COMPLETION:-/etc/bash_completion}" -- BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/etc/bash_completion.d}" -+ BASH_COMPLETION="${BASH_COMPLETION:-/opt/csw/etc/bash_completion}" -+ BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/opt/csw/etc/bash_completion.d}" - } 2>/dev/null || : - readonly BASH_COMPLETION BASH_COMPLETION_DIR - -@@ -163,7 +163,7 @@ - have() - { - unset -v have -- PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type $1 &>/dev/null && -+ PATH=$PATH:/opt/csw/sbin:/sbin:/usr/sbin:/usr/local/sbin type $1 &>/dev/null && - have="yes" - } - Added: csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2009-04-05 13:48:44 UTC (rev 4196) @@ -0,0 +1,6 @@ +bash_completion (1.0,REV=2009.04.05) + + * New upstream version. + * Switched to gar v2. + + -- Yann Rouillard Sun, 05 Apr 2009 15:32:52 +0200 Copied: csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch (from rev 4177, csw/mgar/pkg/bash_completion/trunk/files/blastwave.patch) =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch (rev 0) +++ csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch 2009-04-05 13:48:44 UTC (rev 4196) @@ -0,0 +1,45 @@ +--- bash-completion-1.0/bash_completion 2009-04-02 22:01:39.000000000 +0200 ++++ bash-completion-1.0/bash_completion.new 2009-04-04 19:21:58.156466726 +0200 +@@ -42,8 +42,8 @@ + + # Alter the following to reflect the location of this file. + # +-[ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/etc/bash_completion +-[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/etc/bash_completion.d ++[ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/opt/csw/etc/bash_completion ++[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/opt/csw/etc/bash_completion.d + readonly BASH_COMPLETION BASH_COMPLETION_DIR + + # Set a couple of useful vars +@@ -2657,6 +2657,8 @@ + [ -r "$configfile" ] && + config=( "${config[@]}" "$configfile" ) + else ++ [ -r /opt/csw/etc/ssh/ssh_config ] && ++ config=( "${config[@]}" "/opt/csw/etc/ssh/ssh_config" ) + [ -r /etc/ssh/ssh_config ] && + config=( "${config[@]}" "/etc/ssh/ssh_config" ) + [ -r "${HOME}/.ssh/config" ] && +@@ -2676,6 +2678,8 @@ + [ -r "$global_kh" ] && + kh=( "${kh[@]}" "$global_kh" ) + if [ -z "$configfile" ]; then ++ [ -r /opt/csw/etc/ssh/ssh_known_hosts ] && ++ kh=( "${kh[@]}" /opt/csw/etc/ssh/ssh_known_hosts ) + [ -r /etc/ssh/ssh_known_hosts ] && + kh=( "${kh[@]}" /etc/ssh/ssh_known_hosts ) + [ -r /etc/ssh/ssh_known_hosts2 ] && +--- bash-completion-1.0/bash_completion.sh 2009-04-02 22:01:42.000000000 +0200 ++++ bash-completion-1.0/bash_completion.sh.new 2009-04-04 19:22:33.430034421 +0200 +@@ -4,9 +4,9 @@ + # Check for recent enough version of bash. + bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.} + if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then +- if [ -r /etc/bash_completion ]; then ++ if [ -r /opt/csw/etc/bash_completion ]; then + # Source completion code. +- . /etc/bash_completion ++ . /opt/csw/etc/bash_completion + fi + fi + unset bash bminor bmajor This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun Apr 5 17:54:10 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 05 Apr 2009 15:54:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[4197] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 4197 http://gar.svn.sourceforge.net/gar/?rev=4197&view=rev Author: valholla Date: 2009-04-05 15:54:10 +0000 (Sun, 05 Apr 2009) Log Message: ----------- switch from Sun Studio to gcc Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk csw/mgar/pkg/gcc4/trunk/files/gar_override.mk csw/mgar/pkg/gcc4/trunk/files/package_def.mk Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2009-04-05 13:48:44 UTC (rev 4196) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2009-04-05 15:54:10 UTC (rev 4197) @@ -19,8 +19,8 @@ ## The following patches address bug 29442 ## http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29442 ## Patch to Reenable alloca() on non-GCC compilers -PATCHFILES = re-enable-alloc.diff -PATCHFILES += split-insn-attrtab.diff +#PATCHFILES = re-enable-alloc.diff +#PATCHFILES += split-insn-attrtab.diff ## build options CONFIGURE_ARGS = --prefix=$(BUILD_PREFIX)/gcc4 @@ -41,7 +41,7 @@ CONFIGURE_ARGS += --enable-objc-gc CONFIGURE_ARGS += --enable-threads=posix CONFIGURE_ARGS += --enable-stage1-languages=c -CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc +CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,java,objc ## For cleanliness I split the Configuration into separate files include files/amd_merge.mk Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-04-05 13:48:44 UTC (rev 4196) +++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-04-05 15:54:10 UTC (rev 4197) @@ -14,7 +14,6 @@ AMD_MERGE_TARGETS = merge-dirs-amd AMD_MERGE_TARGETS += merge-i386-files AMD_MERGE_TARGETS += merge-amd64-files -AMD_MERGE_TARGETS += merge-strip-amd merge-amd: $(AMD_MERGE_TARGETS) $(_DBG)$(MAKECOOKIE) @@ -45,13 +44,6 @@ $(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/libexec $(PKGROOT)) $(_DBG)$(MAKECOOKIE) -merge-strip-amd: - @(echo "[===== Stripping Merged Binaries =====]") - $(_DBG)(stripbin $(PPREFIX)/bin/i386) - $(_DBG)(stripbin $(PPREFIX)/bin/amd64) - $(_DBG)(stripbin $(PPREFIX)/bin) - $(_DBG)$(MAKECOOKIE) - ifeq ($(shell uname -p), i386) ISAEXEC_DIRS = /opt/csw/gcc4/bin ISAEXEC_FILES += /opt/csw/gcc4/bin/gcc Modified: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2009-04-05 13:48:44 UTC (rev 4196) +++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2009-04-05 15:54:10 UTC (rev 4197) @@ -1,34 +1,31 @@ -COOKIEDIR = $(COOKIEROOTDIR)/$(MODULATION)-$(GAROSREL)-$(GARCH) -WORKDIR = $(WORKROOTDIR)/build-$(MODULATION)-$(GAROSREL)-$(GARCH) -PATCHDIR = $(WORKDIR)/$(GARNAME)-$(GARVERSION) +COOKIEDIR = $(COOKIEROOTDIR)/$(MODULATION)-$(GAROSREL)-$(GARCH) +WORKDIR = $(WORKROOTDIR)/build-$(MODULATION)-$(GAROSREL)-$(GARCH) +PATCHDIR = $(WORKDIR)/$(GARNAME)-$(GARVERSION) INSTALLISADIR = $(WORKROOTDIR)/install-$(MODULATION)-$(GAROSREL)-$(GARCH) -PKGROOT = $(abspath $(WORKROOTDIR)/pkgroot-$(GARCH)) -OBJECT_DIR = $(WORKDIR)/objdir -WORKSRC = $(OBJECT_DIR) -DIRPATHS = -OPTFLAGS = - -CONFIG_SHELL = /bin/ksh -GARCOMPILER = SOS11 -SOS11_CC = /opt/studio/SOS11/SUNWspro/bin/cc -xO3 -xarch=v8 -CFLAGS = -I/opt/csw/include -CPPFLAGS = -I/opt/csw/include -CXXFLAGS = -I/opt/csw/include -LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib -BOOT_CFLAGS = -I/opt/csw/include -mcpu=v8 -g -O2 -pipe +PKGROOT = $(abspath $(WORKROOTDIR)/pkgroot-$(GARCH)) +OBJECT_DIR = $(WORKDIR)/objdir +WORKSRC = $(OBJECT_DIR) +DIRPATHS = +OPTFLAGS = +CONFIG_SHELL = /bin/bash +GARCOMPILER = GCC3 +GCC3_CC = /opt/csw/gcc3/bin/gcc -g -O2 -mcpu=v8 -pipe +CFLAGS = -I/opt/csw/include +CPPFLAGS = -I/opt/csw/include +CXXFLAGS = -I/opt/csw/include +LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib +BOOT_CFLAGS = -I/opt/csw/include -mcpu=v8 -g -O2 -pipe BOOT_LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib ifeq ($(shell uname -p),i386) ifeq ($(shell uname -r),5.10) - GARCOMPILER = SOS12 - SOS12_CC = /opt/studio/SOS12/SUNWspro/bin/cc - BOOT_CFLAGS = -I/opt/csw/include -g -O2 -pipe + GCC3_CC = /opt/csw/gcc3/bin/gcc -g -O2 -pipe + BOOT_CFLAGS = -I/opt/csw/include -g -O2 -pipe BOOT_LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib else - GARCOMPILER = SOS11 - SOS11_CC = /opt/studio/SOS11/SUNWspro/bin/cc -xarch=386 - BOOT_CFLAGS = -I/opt/csw/include -m32 -march=i386 -g -O2 -pipe + GCC3_CC = /opt/csw/gcc3/bin/gcc -march=i386 -g -O2 -pipe + BOOT_CFLAGS = -I/opt/csw/include -m32 -march=i386 -g -O2 -pipe BOOT_LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib endif endif @@ -36,14 +33,13 @@ export CONFIG_SHELL CFLAGS CPPFLAGS CXXFLAGS export LDFLAGS BOOT_CFLAGS BOOT_LDFLAGS -FIXCONFIG_DIRS += $(DESTDIR)$(BUILD_PREFIX)/gcc4/lib -STRIP_DIRS += $(DESTDIR)$(BUILD_PREFIX)/gcc4/bin - -CONFIGURE_SCRIPTS = objdir -TEST_SCRIPTS = skip +FIXCONFIG_DIRS += $(DESTDIR)$(BUILD_PREFIX)/gcc4/lib +STRIP_DIRS += $(DESTDIR)$(BUILD_PREFIX)/gcc4/bin +CONFIGURE_SCRIPTS = objdir +TEST_SCRIPTS = skip post-configure-modulated: fix-bootflags -MERGE_SCRIPTS_isa-i386 = amd +MERGE_SCRIPTS_isa-i386 = amd ## Run checkpkg Manually -ENABLE_CHECK = 0 +ENABLE_CHECK = 0 Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-04-05 13:48:44 UTC (rev 4196) +++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-04-05 15:54:10 UTC (rev 4197) @@ -4,6 +4,8 @@ PACKAGES += CSWgcc4objc CSWgcc4objcrt CSWgcc4g++ CSWgcc4g++rt ## Define Package Catalog Names +CATALOGNAME_CSWgcc4ada = gcc4ada +CATALOGNAME_CSWgcc4adart = gcc4adart CATALOGNAME_CSWgcc4core = gcc4core CATALOGNAME_CSWgcc4corert = gcc4corert CATALOGNAME_CSWgcc4g++ = gcc4g++ @@ -16,6 +18,8 @@ CATALOGNAME_CSWgcc4objcrt = gcc4objcrt ## Source URLs +SPKG_SOURCEURL_CSWgcc4ada = http://gcc.gnu.org +SPKG_SOURCEURL_CSWgcc4adart = http://gcc.gnu.org SPKG_SOURCEURL_CSWgcc4core = http://gcc.gnu.org SPKG_SOURCEURL_CSWgcc4corert = http://gcc.gnu.org SPKG_SOURCEURL_CSWgcc4g++ = http://gcc.gnu.org @@ -28,6 +32,8 @@ SPKG_SOURCEURL_CSWgcc4objcrt = http://gcc.gnu.org ## Copyright File +LICENSE_CSWgcc4ada = COPYING3 +LICENSE_CSWgcc4adart = COPYING3 LICENSE_CSWgcc4core = COPYING3 LICENSE_CSWgcc4corert = COPYING3 LICENSE_CSWgcc4g++ = COPYING3 @@ -40,6 +46,8 @@ LICENSE_CSWgcc4objcrt = COPYING3 ## Define Package Descriptions +SPKG_DESC_CSWgcc4ada = GNU C ADA Compiler +SPKG_DESC_CSWgcc4adart = GNU C ADA Compiler Run Time SPKG_DESC_CSWgcc4core = GNU C Compiler SPKG_DESC_CSWgcc4corert = GNU C Compiler Run Time SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler @@ -53,6 +61,8 @@ ## Define Dependencies COMMON_REQUIRE = CSWiconv CSWlibgmp CSWlibmpfr +REQUIRED_PKGS_CSWgcc4adart = CSWggettextrt $(COMMON_REQUIRE) +REQUIRED_PKGS_CSWgcc4ada = CSWgcc4adart $(COMMON_REQUIRE) REQUIRED_PKGS_CSWgcc4corert = CSWggettextrt $(COMMON_REQUIRE) REQUIRED_PKGS_CSWgcc4core = CSWgcc4corert $(COMMON_REQUIRE) REQUIRED_PKGS_CSWgcc4g++rt = CSWgcc4corert CSWiconv @@ -67,6 +77,13 @@ ## Define the Contents of the Packages +## gcc4ada Definitions +PKGFILES_CSWgcc4ada = .*/libexec/.*gnat1 +PKGFILES_CSWgcc4ada += .*/adalib/.* +PKGFILES_CSWgcc4ada += .*/adainclude/.* +PKGFILES_CSWgcc4ada += .*/info/.*gnat.* +PKGFILES_CSWgcc4ada += .*/bin/gnat.* + ## gcc4gfortran Definitions PKGFILES_CSWgcc4gfortran = .*/bin/.*gfortran PKGFILES_CSWgcc4gfortran += .*/libexec/.*f951 @@ -133,6 +150,10 @@ ####### RunTime Packages +## gcc4adart +PKGFILES_CSWgcc4adart = .*/lib/.*libgnat.* +PKGFILES_CSWgcc4adart = .*/lib/.*libgnarl.* + ## gcc4corert PKGFILES_CSWgcc4corert = .*/lib/.*libgcc_s.* PKGFILES_CSWgcc4corert += .*/lib/.*libgomp.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Sun Apr 5 17:56:57 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 05 Apr 2009 15:56:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[4198] csw/mgar/pkg/gcc4/trunk/files/package_def.mk Message-ID: Revision: 4198 http://gar.svn.sourceforge.net/gar/?rev=4198&view=rev Author: valholla Date: 2009-04-05 15:56:57 +0000 (Sun, 05 Apr 2009) Log Message: ----------- add ada package Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/files/package_def.mk Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-04-05 15:54:10 UTC (rev 4197) +++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-04-05 15:56:57 UTC (rev 4198) @@ -1,7 +1,7 @@ ### Package Section ### -PACKAGES = CSWgcc4core CSWgcc4corert CSWgcc4gfortran -PACKAGES += CSWgcc4gfortranrt CSWgcc4java CSWgcc4javart -PACKAGES += CSWgcc4objc CSWgcc4objcrt CSWgcc4g++ CSWgcc4g++rt +PACKAGES = CSWgcc4ada CSWgcc4adart CSWgcc4core CSWgcc4corert CSWgcc4gfortran +PACKAGES += CSWgcc4gfortranrt CSWgcc4java CSWgcc4javart CSWgcc4objc +PACKAGES += CSWgcc4objcrt CSWgcc4g++ CSWgcc4g++rt ## Define Package Catalog Names CATALOGNAME_CSWgcc4ada = gcc4ada This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Apr 5 18:30:09 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 05 Apr 2009 16:30:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[4199] csw/mgar/pkg/bash_completion/trunk/files Message-ID: Revision: 4199 http://gar.svn.sourceforge.net/gar/?rev=4199&view=rev Author: chninkel Date: 2009-04-05 16:30:09 +0000 (Sun, 05 Apr 2009) Log Message: ----------- bash_completion: updated pkg-get completion with new options Modified Paths: -------------- csw/mgar/pkg/bash_completion/trunk/files/pkg-get.completion csw/mgar/pkg/bash_completion/trunk/files/pkgadd.completion csw/mgar/pkg/bash_completion/trunk/files/pkgrm.completion csw/mgar/pkg/bash_completion/trunk/files/smf.completion Modified: csw/mgar/pkg/bash_completion/trunk/files/pkg-get.completion =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/pkg-get.completion 2009-04-05 15:56:57 UTC (rev 4198) +++ csw/mgar/pkg/bash_completion/trunk/files/pkg-get.completion 2009-04-05 16:30:09 UTC (rev 4199) @@ -68,7 +68,7 @@ fi if [[ ${cur} == -* ]] ; then - local opts="-c -d -D -f -i -l -s -u -U" + local opts="-c -d -D -f -i -l -s -S -u -U -v" COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 else Modified: csw/mgar/pkg/bash_completion/trunk/files/pkgadd.completion =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/pkgadd.completion 2009-04-05 15:56:57 UTC (rev 4198) +++ csw/mgar/pkg/bash_completion/trunk/files/pkgadd.completion 2009-04-05 16:30:09 UTC (rev 4199) @@ -1,5 +1,5 @@ # -# Copyright 2006 Yann Rouillard +# Copyright 2006 Yann Rouillard # All rights reserved. Use is subject to license terms. # # Redistribution and/or use, with or without modification, is Modified: csw/mgar/pkg/bash_completion/trunk/files/pkgrm.completion =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/pkgrm.completion 2009-04-05 15:56:57 UTC (rev 4198) +++ csw/mgar/pkg/bash_completion/trunk/files/pkgrm.completion 2009-04-05 16:30:09 UTC (rev 4199) @@ -1,5 +1,5 @@ # -# Copyright 2006 Yann Rouillard +# Copyright 2006 Yann Rouillard # All rights reserved. Use is subject to license terms. # # Redistribution and/or use, with or without modification, is Modified: csw/mgar/pkg/bash_completion/trunk/files/smf.completion =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/smf.completion 2009-04-05 15:56:57 UTC (rev 4198) +++ csw/mgar/pkg/bash_completion/trunk/files/smf.completion 2009-04-05 16:30:09 UTC (rev 4199) @@ -1,5 +1,5 @@ # -# Copyright 2006 Yann Rouillard +# Copyright 2006 Yann Rouillard # All rights reserved. Use is subject to license terms. # # Redistribution and/or use, with or without modification, is This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Apr 5 18:31:11 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 05 Apr 2009 16:31:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[4200] csw/mgar/pkg/bash_completion/trunk/files/pkg-get. completion Message-ID: Revision: 4200 http://gar.svn.sourceforge.net/gar/?rev=4200&view=rev Author: chninkel Date: 2009-04-05 16:31:11 +0000 (Sun, 05 Apr 2009) Log Message: ----------- bash_completion: some blastwave -> opencsw Modified Paths: -------------- csw/mgar/pkg/bash_completion/trunk/files/pkg-get.completion Modified: csw/mgar/pkg/bash_completion/trunk/files/pkg-get.completion =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/pkg-get.completion 2009-04-05 16:30:09 UTC (rev 4199) +++ csw/mgar/pkg/bash_completion/trunk/files/pkg-get.completion 2009-04-05 16:31:11 UTC (rev 4200) @@ -1,5 +1,5 @@ # -# Copyright 2006 Yann Rouillard +# Copyright 2006 Yann Rouillard # All rights reserved. Use is subject to license terms. # # Redistribution and/or use, with or without modification, is @@ -7,7 +7,7 @@ # author(s) shall not be liable in the event that use of the # software causes damage. # -# pkg-get.completion - bash completion for blastwave pkg-get +# pkg-get.completion - bash completion for opencsw pkg-get # have pkg-get && 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 5 21:24:29 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 05 Apr 2009 19:24:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[4201] csw/mgar/pkg/libfaac/trunk Message-ID: Revision: 4201 http://gar.svn.sourceforge.net/gar/?rev=4201&view=rev Author: hson Date: 2009-04-05 19:24:29 +0000 (Sun, 05 Apr 2009) Log Message: ----------- libfaac: Several patches to get compiling to work Modified Paths: -------------- csw/mgar/pkg/libfaac/trunk/Makefile csw/mgar/pkg/libfaac/trunk/checksums csw/mgar/pkg/libfaac/trunk/files/config.h.in.diff Added Paths: ----------- csw/mgar/pkg/libfaac/trunk/files/Makefile.in.common.mp4v2.diff csw/mgar/pkg/libfaac/trunk/files/configure.diff Modified: csw/mgar/pkg/libfaac/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfaac/trunk/Makefile 2009-04-05 16:31:11 UTC (rev 4200) +++ csw/mgar/pkg/libfaac/trunk/Makefile 2009-04-05 19:24:29 UTC (rev 4201) @@ -19,9 +19,11 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(SF_PROJ)-(\d+(?:\.\d+)*).tar.bz2 -PATCHFILES += Makefile.am.diff Makefile.in.diff Makefile.in.frontend.diff +#PATCHFILES += Makefile.am.diff Makefile.in.diff Makefile.in.frontend.diff +PATCHFILES += Makefile.in.frontend.diff Makefile.in.common.mp4v2.diff PATCHFILES += aacquant.c.diff aacquant.h.diff config.h.in.diff -PATCHFILES += configure.in.diff faac.h.diff faaccfg.h.diff frame.h.diff +#PATCHFILES += configure.in.diff faac.h.diff faaccfg.h.diff frame.h.diff +PATCHFILES += configure.diff faac.h.diff faaccfg.h.diff frame.h.diff PATCHFILES += input.c.diff ltp.c.diff mp4property.h.diff mp4util.h.diff PATCHFILES += mpeg4ip.h.diff psych.h.diff Modified: csw/mgar/pkg/libfaac/trunk/checksums =================================================================== --- csw/mgar/pkg/libfaac/trunk/checksums 2009-04-05 16:31:11 UTC (rev 4200) +++ csw/mgar/pkg/libfaac/trunk/checksums 2009-04-05 19:24:29 UTC (rev 4201) @@ -1,11 +1,10 @@ c5dde68840cefe46532089c9392d1df0 download/faac-1.28.tar.bz2 -dcfdb7a011ce03ea536ddb92cc7ee8e4 download/Makefile.am.diff -62ba5e8b03a5c551ad17b149aa86e0c2 download/Makefile.in.diff eb7e2cee261c71ac4a8d718b5498777e download/Makefile.in.frontend.diff +3d7c0f7936dcc1c4833d693860720adf download/Makefile.in.common.mp4v2.diff 19f2eebe3df5300ab4a1a16e43593663 download/aacquant.c.diff 2af64ce38f023774fb0c8f691b98c564 download/aacquant.h.diff -86598bb0fb18acdf27557f65baf05f66 download/config.h.in.diff -ffb37b75a68dd524aa3d87dc38b4b971 download/configure.in.diff +ea8508703521e663e637382231d4c13b download/config.h.in.diff +027ebf052052128c67f0749e610f4acb download/configure.diff 56f2c5e28e1177e3b6956aaf83a10e13 download/faac.h.diff 268d60a6a1304fa1758a962a20731c1c download/faaccfg.h.diff 29fe6485d9ebe7fd0892c18ed450bac5 download/frame.h.diff Added: csw/mgar/pkg/libfaac/trunk/files/Makefile.in.common.mp4v2.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/Makefile.in.common.mp4v2.diff (rev 0) +++ csw/mgar/pkg/libfaac/trunk/files/Makefile.in.common.mp4v2.diff 2009-04-05 19:24:29 UTC (rev 4201) @@ -0,0 +1,13 @@ +--- ../build-global/faac-1.28/common/mp4v2/Makefile.in 2009-02-10 09:37:00.000000000 +0100 ++++ faac-1.28/common/mp4v2/Makefile.in 2009-04-05 20:42:49.571593147 +0200 +@@ -205,8 +205,8 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-INCLUDES = -I$(top_srcdir)/include +-AM_CXXFLAGS = -Wall ++INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 ++AM_CXXFLAGS = $(CXXFLAGS) + noinst_LIBRARIES = libmp4v2.a + noinst_HEADERS = mp4.h mpeg4ip.h mpeg4ip_version.h mpeg4ip_config.h + libmp4v2_a_SOURCES = \ Modified: csw/mgar/pkg/libfaac/trunk/files/config.h.in.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/config.h.in.diff 2009-04-05 16:31:11 UTC (rev 4200) +++ csw/mgar/pkg/libfaac/trunk/files/config.h.in.diff 2009-04-05 19:24:29 UTC (rev 4201) @@ -1,7 +1,6 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/config.h.in faac-1.28/config.h.in --- ../build-global/faac-1.28/config.h.in 2009-02-10 09:36:59.000000000 +0100 -+++ faac-1.28/config.h.in 2009-03-20 05:55:21.041828651 +0100 -@@ -1,5 +1,26 @@ ++++ faac-1.28/config.h.in 2009-04-05 18:56:29.025432723 +0200 +@@ -1,5 +1,25 @@ /* config.h.in. Generated from configure.in by autoheader. */ +#ifndef __FAAC_CONFIG_H @@ -9,7 +8,6 @@ + +#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) +#include -+#include + +typedef uint8_t u_int8_t; +typedef uint16_t u_int16_t; @@ -28,7 +26,7 @@ /* Define if you want to encode for DRM */ #undef DRM -@@ -131,3 +152,5 @@ +@@ -131,3 +151,5 @@ /* Define to `long int' if does not define. */ #undef off_t Added: csw/mgar/pkg/libfaac/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/configure.diff (rev 0) +++ csw/mgar/pkg/libfaac/trunk/files/configure.diff 2009-04-05 19:24:29 UTC (rev 4201) @@ -0,0 +1,20 @@ +--- ../build-global/faac-1.28/configure 2009-02-10 09:36:58.000000000 +0100 ++++ faac-1.28/configure 2009-04-05 20:17:04.647262929 +0200 +@@ -19731,7 +19731,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lmp4v2 -lstdc++ $LIBS" ++LIBS="-lmp4v2 -lCrun -lCstd $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -19864,7 +19864,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lmp4v2 -lstdc++ $LIBS" ++LIBS="-lmp4v2 -lCrun -lCstd $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF 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 5 21:39:25 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 05 Apr 2009 19:39:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4202] csw/mgar/pkg/libgoffice/trunk Message-ID: Revision: 4202 http://gar.svn.sourceforge.net/gar/?rev=4202&view=rev Author: hson Date: 2009-04-05 19:39:25 +0000 (Sun, 05 Apr 2009) Log Message: ----------- libgoffice: Revert back to 0.6.6 since gnumeric wont work with 0.7.x Modified Paths: -------------- csw/mgar/pkg/libgoffice/trunk/Makefile csw/mgar/pkg/libgoffice/trunk/checksums Modified: csw/mgar/pkg/libgoffice/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgoffice/trunk/Makefile 2009-04-05 19:24:29 UTC (rev 4201) +++ csw/mgar/pkg/libgoffice/trunk/Makefile 2009-04-05 19:39:25 UTC (rev 4202) @@ -1,5 +1,5 @@ GARNAME = libgoffice -GARVERSION = 0.7.3 +GARVERSION = 0.6.6 CATEGORIES = gnome DESCRIPTION = Document centric objects library @@ -8,13 +8,16 @@ top of GLib and Gtk+. endef -MASTER_SITES = $(GNOME_MIRROR) +MASTER_SITES = $(GNOME_ROOT)/goffice/$(GNOME_SUBV)/ DISTFILES = goffice-$(GARVERSION).tar.gz DISTNAME = goffice-$(GARVERSION) REQUIRED_PKGS += CSWgconf2 CSWggettextrt CSWglib2 CSWgtk2 CSWlibatk REQUIRED_PKGS += CSWlibcairo CSWlibglade2 CSWlibgsf CSWlibxml2 CSWlibxrender REQUIRED_PKGS += CSWpango CSWsunmath CSWzlib +REQUIRED_PKGS += CSWbonobo2 CSWgnomekeyring CSWgnomevfs2 CSWlibart +REQUIRED_PKGS += CSWlibbonoboui CSWlibgnome CSWlibgnomecanvas CSWlibgnomeui +REQUIRED_PKGS += CSWlibpopt CSWorbit2 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = goffice-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/libgoffice/trunk/checksums =================================================================== --- csw/mgar/pkg/libgoffice/trunk/checksums 2009-04-05 19:24:29 UTC (rev 4201) +++ csw/mgar/pkg/libgoffice/trunk/checksums 2009-04-05 19:39:25 UTC (rev 4202) @@ -1 +1 @@ -515bf59321337fe432c8c9bb4835fc52 download/goffice-0.7.3.tar.gz +e689b21b892768af9ef2c08f2b6ee94e download/goffice-0.6.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Apr 5 23:20:49 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 05 Apr 2009 21:20:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[4203] csw/mgar/pkg/netsnmp/trunk/Makefile Message-ID: Revision: 4203 http://gar.svn.sourceforge.net/gar/?rev=4203&view=rev Author: hson Date: 2009-04-05 21:20:49 +0000 (Sun, 05 Apr 2009) Log Message: ----------- netsnmp: LD_OPTIONS workaround not needed anymore Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2009-04-05 19:39:25 UTC (rev 4202) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2009-04-05 21:20:49 UTC (rev 4203) @@ -24,10 +24,6 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -# 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) CONFIGURE_ARGS += --with-default-snmp-version=1 CONFIGURE_ARGS += --with-sys-contact=unknown @@ -47,8 +43,8 @@ # Patch for python module PATCHFILES += Makefile.in.diff -LD_OPTIONS = -EXTRA_COMMON_EXPORTS = LD_OPTIONS +#LD_OPTIONS = +#EXTRA_COMMON_EXPORTS = LD_OPTIONS EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon Apr 6 00:36:59 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Sun, 05 Apr 2009 22:36:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[4204] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 4204 http://gar.svn.sourceforge.net/gar/?rev=4204&view=rev Author: valholla Date: 2009-04-05 22:36:59 +0000 (Sun, 05 Apr 2009) Log Message: ----------- test-results Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk csw/mgar/pkg/gcc4/trunk/files/package_def.mk Added Paths: ----------- csw/mgar/pkg/gcc4/trunk/files/test-results/ csw/mgar/pkg/gcc4/trunk/files/test-results/gcc4-amd csw/mgar/pkg/gcc4/trunk/files/test-results/gcc4-i386 csw/mgar/pkg/gcc4/trunk/files/test-results/gcc4-sparc Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2009-04-05 21:20:49 UTC (rev 4203) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2009-04-05 22:36:59 UTC (rev 4204) @@ -16,12 +16,6 @@ # of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -## The following patches address bug 29442 -## http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29442 -## Patch to Reenable alloca() on non-GCC compilers -#PATCHFILES = re-enable-alloc.diff -#PATCHFILES += split-insn-attrtab.diff - ## build options CONFIGURE_ARGS = --prefix=$(BUILD_PREFIX)/gcc4 CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4 Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-04-05 21:20:49 UTC (rev 4203) +++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-04-05 22:36:59 UTC (rev 4204) @@ -24,14 +24,6 @@ $(_DBG)(ginstall -d $(PPREFIX)/bin/i386) $(_DBG)$(MAKECOOKIE) -merge-amd64-files: - @echo "[===== Merging isa-amd64 =====]" - $(_DBG)(cd $(AMD_BASE); for dir in `gfind . -name "*solaris2\.10*" -type d` ; do \ - /usr/bin/pax -rw $$dir $(PKGROOT); done ) - $(_DBG)(cd $(AMD_BASE); /usr/bin/pax -rw $(MPREFIX)/lib/amd64 $(PKGROOT)) - $(_DBG)(cd $(APREFIX)/bin; /usr/bin/pax -rw * $(PPREFIX)/bin/amd64) - $(_DBG)$(MAKECOOKIE) - merge-i386-files: @echo "[===== Merging isa-i386 =====]" $(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/bin $(PKGROOT)) @@ -44,6 +36,15 @@ $(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/libexec $(PKGROOT)) $(_DBG)$(MAKECOOKIE) +merge-amd64-files: + @echo "[===== Merging isa-amd64 =====]" + $(_DBG)(cd $(AMD_BASE); \ + for dir in `gfind . -name "*solaris2\.10*" -type d` ; do \ + /usr/bin/pax -rw $$dir $(PKGROOT); done ) + $(_DBG)(cd $(AMD_BASE); /usr/bin/pax -rw $(MPREFIX)/lib/amd64 $(PKGROOT)) + $(_DBG)(cd $(APREFIX)/bin; /usr/bin/pax -rw * $(PPREFIX)/bin/amd64) + $(_DBG)$(MAKECOOKIE) + ifeq ($(shell uname -p), i386) ISAEXEC_DIRS = /opt/csw/gcc4/bin ISAEXEC_FILES += /opt/csw/gcc4/bin/gcc @@ -73,4 +74,18 @@ ISAEXEC_FILES += /opt/csw/gcc4/bin/gjar ISAEXEC_FILES += /opt/csw/gcc4/bin/gorbd ISAEXEC_FILES += /opt/csw/gcc4/bin/gtnameserv +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnat +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatbind +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatbl +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatchop +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatclean +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatfind +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnative2ascii +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatkr +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatlink +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatls +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatmake +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatname +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatprep +ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatxref endif Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-04-05 21:20:49 UTC (rev 4203) +++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-04-05 22:36:59 UTC (rev 4204) @@ -151,8 +151,8 @@ ####### RunTime Packages ## gcc4adart -PKGFILES_CSWgcc4adart = .*/lib/.*libgnat.* -PKGFILES_CSWgcc4adart = .*/lib/.*libgnarl.* +PKGFILES_CSWgcc4adart = .*/lib/.*libgnat.* +PKGFILES_CSWgcc4adart += .*/lib/.*libgnarl.* ## gcc4corert PKGFILES_CSWgcc4corert = .*/lib/.*libgcc_s.* Added: csw/mgar/pkg/gcc4/trunk/files/test-results/gcc4-amd =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/test-results/gcc4-amd (rev 0) +++ csw/mgar/pkg/gcc4/trunk/files/test-results/gcc4-amd 2009-04-05 22:36:59 UTC (rev 4204) @@ -0,0 +1,397 @@ +$ make check +gmake[1]: Entering directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/objdir/gcc' +test -d testsuite || mkdir testsuite +test -d testsuite/gcc || mkdir testsuite/gcc +(rootme=`${PWDCMD-pwd}`; export rootme; \ + srcdir=`cd ../../gcc-4.3.3/gcc; ${PWDCMD-pwd}` ; export srcdir ; \ + cd testsuite/gcc; \ + rm -f tmp-site.exp; \ + sed '/set tmpdir/ s|testsuite|testsuite/gcc|' \ + < ../../site.exp > tmp-site.exp; \ + /bin/bash ${srcdir}/../move-if-change tmp-site.exp site.exp; \ + EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \ + if [ -f ${rootme}/../expect/expect ] ; then \ + TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWDCMD-pwd}` ; \ + export TCL_LIBRARY ; fi ; \ + GCC_EXEC_PREFIX="/opt/csw/gcc4/lib/gcc/" ; export GCC_EXEC_PREFIX ; \ + runtestflags= ; \ + if [ -n "" ] ; then \ + runtestflags=""; \ + elif [ -n "" ] ; then \ + parts="`echo ' ' \ + | sed 's/=[^ ]* / /g'`"; \ + for part in `find $srcdir/testsuite/gcc* -name \*.exp` ; do \ + part=`basename $part` ; \ + case " $parts $runtestflags " in \ + *" $part "*) ;; \ + *) runtestflags="$runtestflags $part" ;; \ + esac ; \ + done ; \ + fi ; \ + `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool gcc $runtestflags) +WARNING: Couldn't find the global config file. +Test Run By mwatters on Sun Apr 5 01:17:49 2009 +Native configuration is i386-pc-solaris2.10 + + === gcc tests === + +Schedule of variations: + unix + +Running target unix +Using /opt/csw/share/dejagnu/baseboards/unix.exp as board description file for target. +Using /opt/csw/share/dejagnu/config/unix.exp as generic interface file for target. +Using /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/config/default.exp as tool-and-target-specific interface file. +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/compile.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/execute.exp ... +FAIL: gcc.c-torture/execute/990127-2.c execution, -O2 +FAIL: gcc.c-torture/execute/990127-2.c execution, -Os +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.c-torture/unsorted/unsorted.exp ... + +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/autopar/autopar.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/charset/charset.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/compat/compat.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/compat/struct-layout-1.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/cpp/cpp.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/cpp/trad/trad.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/debug/debug.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/dfp.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/dg.exp ... +XPASS: gcc.dg/ucnid-2.c (test for excess errors) +XPASS: gcc.dg/ucnid-3.c (test for excess errors) +XPASS: gcc.dg/ucnid-4.c (test for excess errors) +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/fixed-point/fixed-point.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/format/format.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/gomp/gomp.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/ipa/ipa.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/matrix/matrix.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/noncompile/noncompile.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/pch/pch.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/special/mips-abi.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/special/special.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/struct/struct-reorg.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/tls/tls.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/torture/dg-torture.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/tree-prof/tree-prof.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/tree-ssa/tree-ssa.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/vect/costmodel/i386/i386-costmodel-vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/vect/costmodel/ppc/ppc-costmodel-vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/vect/costmodel/spu/spu-costmodel-vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/x86_64-costmodel-vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/vect/vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/vmx/vmx.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/vxworks/vxworks.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/weak/weak.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/acker1.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/arm-isr.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/bprob.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/dectest.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/dhry.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/gcov.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/i386-prefetch.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/linkage.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/matrix1.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/mg-2.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/mg.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/options.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/sieve.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/sort2.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/alpha/alpha.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/arm/arm.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/arm/neon/neon.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/bfin/bfin.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/cris/cris.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/cris/torture/cris-torture.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/frv/frv.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/i386/i386.exp ... +FAIL: gcc.target/i386/sse-13.c (test for excess errors) +FAIL: gcc.target/i386/sse-14.c (test for excess errors) +FAIL: gcc.target/i386/sse5-haddX.c (test for excess errors) +WARNING: gcc.target/i386/sse5-haddX.c compilation failed to produce executable +FAIL: gcc.target/i386/sse5-hsubX.c (test for excess errors) +WARNING: gcc.target/i386/sse5-hsubX.c compilation failed to produce executable +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/i386/math-torture/math-torture.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/ia64/ia64.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/m68k/m68k.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/mips/inter/mips16-inter.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/mips/mips.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/powerpc/powerpc.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/s390/s390.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/sh/sh.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/sparc/sparc.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/spu/spu.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/x86_64/abi/abi-x86_64.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.target/xstormy16/xstormy16.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gcc.test-framework/test-framework.exp ... +skipping test framework tests, CHECK_TEST_FRAMEWORK is not defined + + === gcc Summary === + +# of expected passes 48837 +# of unexpected failures 6 +# of unexpected successes 3 +# of expected failures 176 +# of untested testcases 42 +# of unsupported tests 314 +/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/objdir/gcc/xgcc version 4.3.3 (GCC) + +gmake[1]: [check-parallel-gcc] Error 1 (ignored) +gmake[1]: Leaving directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/objdir/gcc' + === acats configuration === +target gcc is /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/objdir/gcc/xgcc -B/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/objdir/gcc/ +Reading specs from /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/objdir/gcc/specs Target: i386-pc-solaris2.10 Configured with: ../gcc-4.3.3/configure --prefix=/opt/csw/gcc4 --exec-prefix=/opt/csw/gcc4 --with-gnu-as --with-as=/opt/csw/bin/gas --without-gnu-ld --with-ld=/usr/ccs/bin/ld --enable-nls --with-included-gettext --with-libiconv-prefix=/opt/csw --with-x --with-mpfr=/opt/csw --with-gmp=/opt/csw --enable-java-awt=xlib --enable-libada --enable-libssp --enable-objc-gc --enable-threads=posix --enable-stage1-languages=c --enable-languages=ada,c,c++,fortran,java,objc Thread model: posix gcc version 4.3.3 (GCC) +host=i386-pc-solaris2.8 +target=i386-pc-solaris2.10 +gnatmake is /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/objdir/gcc/gnatmake + + === acats support === +Generating support files... done. +Compiling support files... done. + + === acats tests === +Running chapter a ... +Running chapter c2 ... +Running chapter c3 ... +Running chapter c4 ... +Running chapter c5 ... +Running chapter c6 ... +Running chapter c7 ... +Running chapter c8 ... +Running chapter c9 ... +Running chapter ca ... +Running chapter cb ... +Running chapter cc ... +Running chapter cd ... +Running chapter ce ... +Running chapter cxa ... +Running chapter cxb ... +Running chapter cxf ... +Running chapter cxg ... +Running chapter cxh ... +Running chapter cz ... +Running chapter d ... +Running chapter e ... +Running chapter gcc ... +Running chapter l ... + === acats Summary === +# of expected passes 2315 +# of unexpected failures 0 +test -d testsuite || mkdir testsuite +test -d testsuite/gnat || mkdir testsuite/gnat +(rootme=`${PWDCMD-pwd}`; export rootme; \ + srcdir=`cd ../../gcc-4.3.3/gcc; ${PWDCMD-pwd}` ; export srcdir ; \ + cd testsuite/gnat; \ + rm -f tmp-site.exp; \ + sed '/set tmpdir/ s|testsuite|testsuite/gnat|' \ + < ../../site.exp > tmp-site.exp; \ + /bin/bash ${srcdir}/../move-if-change tmp-site.exp site.exp; \ + EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \ + if [ -f ${rootme}/../expect/expect ] ; then \ + TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWDCMD-pwd}` ; \ + export TCL_LIBRARY ; fi ; \ + GCC_EXEC_PREFIX="/opt/csw/gcc4/lib/gcc/" ; export GCC_EXEC_PREFIX ; \ + `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool gnat ) +WARNING: Couldn't find the global config file. +Test Run By mwatters on Sun Apr 5 05:27:21 2009 +Native configuration is i386-pc-solaris2.10 + + === gnat tests === + +Schedule of variations: + unix + +Running target unix +Using /opt/csw/share/dejagnu/baseboards/unix.exp as board description file for target. +Using /opt/csw/share/dejagnu/config/unix.exp as generic interface file for target. +Using /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/config/default.exp as tool-and-target-specific interface file. +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gnat.dg/dg.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gnat.dg/specs/specs.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gnat.dg/style/style.exp ... + + === gnat Summary === + +# of expected passes 374 +# of expected failures 1 +gmake[1]: Entering directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/objdir/gcc' +test -d testsuite || mkdir testsuite +test -d testsuite/g++ || mkdir testsuite/g++ +(rootme=`${PWDCMD-pwd}`; export rootme; \ + srcdir=`cd ../../gcc-4.3.3/gcc; ${PWDCMD-pwd}` ; export srcdir ; \ + cd testsuite/g++; \ + rm -f tmp-site.exp; \ + sed '/set tmpdir/ s|testsuite|testsuite/g++|' \ + < ../../site.exp > tmp-site.exp; \ + /bin/bash ${srcdir}/../move-if-change tmp-site.exp site.exp; \ + EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \ + if [ -f ${rootme}/../expect/expect ] ; then \ + TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWDCMD-pwd}` ; \ + export TCL_LIBRARY ; fi ; \ + GCC_EXEC_PREFIX="/opt/csw/gcc4/lib/gcc/" ; export GCC_EXEC_PREFIX ; \ + runtestflags= ; \ + if [ -n "" ] ; then \ + runtestflags=""; \ + elif [ -n "" ] ; then \ + parts="`echo ' ' \ + | sed 's/=[^ ]* / /g'`"; \ + for part in `find $srcdir/testsuite/g++* -name \*.exp` ; do \ + part=`basename $part` ; \ + case " $parts $runtestflags " in \ + *" $part "*) ;; \ + *) runtestflags="$runtestflags $part" ;; \ + esac ; \ + done ; \ + fi ; \ + `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool g++ $runtestflags) +WARNING: Couldn't find the global config file. +Test Run By mwatters on Sun Apr 5 05:31:24 2009 +Native configuration is i386-pc-solaris2.10 + + === g++ tests === + +Schedule of variations: + unix + +Running target unix +Using /opt/csw/share/dejagnu/baseboards/unix.exp as board description file for target. +Using /opt/csw/share/dejagnu/config/unix.exp as generic interface file for target. +Using /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/config/default.exp as tool-and-target-specific interface file. +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.dg/bprob/bprob.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.dg/charset/charset.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.dg/compat/compat.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.dg/compat/struct-layout-1.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.dg/debug/debug.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.dg/debug/dwarf2/dwarf2.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.dg/dg.exp ... +XPASS: g++.dg/other/ucnid-1.C (test for excess errors) +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.dg/gcov/gcov.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.dg/gomp/gomp.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.dg/pch/pch.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.dg/special/ecos.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.dg/tls/tls.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.dg/torture/dg-torture.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.dg/tree-prof/tree-prof.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.dg/vect/vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/g++.old-deja/old-deja.exp ... +XPASS: g++.old-deja/g++.oliva/dwarf2.C (test for excess errors) +XPASS: g++.old-deja/g++.oliva/dwarf3.C (test for excess errors) +XPASS: g++.old-deja/g++.other/init19.C execution test + + === g++ Summary === + +# of expected passes 17496 +# of unexpected successes 4 +# of expected failures 83 +# of unsupported tests 172 +/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/objdir/gcc/testsuite/g++/../../g++ version 4.3.3 (GCC) + +gmake[1]: [check-parallel-g++] Error 1 (ignored) +gmake[1]: Leaving directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/objdir/gcc' +gmake[1]: Entering directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/objdir/gcc' +test -d testsuite || mkdir testsuite +test -d testsuite/gfortran || mkdir testsuite/gfortran +(rootme=`${PWDCMD-pwd}`; export rootme; \ + srcdir=`cd ../../gcc-4.3.3/gcc; ${PWDCMD-pwd}` ; export srcdir ; \ + cd testsuite/gfortran; \ + rm -f tmp-site.exp; \ + sed '/set tmpdir/ s|testsuite|testsuite/gfortran|' \ + < ../../site.exp > tmp-site.exp; \ + /bin/bash ${srcdir}/../move-if-change tmp-site.exp site.exp; \ + EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \ + if [ -f ${rootme}/../expect/expect ] ; then \ + TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWDCMD-pwd}` ; \ + export TCL_LIBRARY ; fi ; \ + GCC_EXEC_PREFIX="/opt/csw/gcc4/lib/gcc/" ; export GCC_EXEC_PREFIX ; \ + runtestflags= ; \ + if [ -n "" ] ; then \ + runtestflags=""; \ + elif [ -n "" ] ; then \ + parts="`echo ' ' \ + | sed 's/=[^ ]* / /g'`"; \ + for part in `find $srcdir/testsuite/gfortran* -name \*.exp` ; do \ + part=`basename $part` ; \ + case " $parts $runtestflags " in \ + *" $part "*) ;; \ + *) runtestflags="$runtestflags $part" ;; \ + esac ; \ + done ; \ + fi ; \ + `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool gfortran $runtestflags) +WARNING: Couldn't find the global config file. +Test Run By mwatters on Sun Apr 5 06:21:32 2009 +Native configuration is i386-pc-solaris2.10 + + === gfortran tests === + +Schedule of variations: + unix + +Running target unix +Using /opt/csw/share/dejagnu/baseboards/unix.exp as board description file for target. +Using /opt/csw/share/dejagnu/config/unix.exp as generic interface file for target. +Using /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/config/default.exp as tool-and-target-specific interface file. +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gfortran.dg/dg.exp ... +FAIL: gfortran.dg/array_constructor_23.f -O3 -fomit-frame-pointer execution test +FAIL: gfortran.dg/array_constructor_23.f -O3 -fomit-frame-pointer -funroll-loops execution test +FAIL: gfortran.dg/array_constructor_23.f -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions execution test +FAIL: gfortran.dg/array_constructor_23.f -O3 -g execution test +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gfortran.dg/gomp/gomp.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gfortran.dg/vect/vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gfortran.fortran-torture/compile/compile.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/gfortran.fortran-torture/execute/execute.exp ... + + === gfortran Summary === + +# of expected passes 25233 +# of unexpected failures 4 +# of expected failures 3 +# of unsupported tests 32 +/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/objdir/gcc/testsuite/gfortran/../../gfortran version 4.3.3 (GCC) + +gmake[1]: [check-parallel-gfortran] Error 1 (ignored) +gmake[1]: Leaving directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/objdir/gcc' +test -d testsuite || mkdir testsuite +test -d testsuite/objc || mkdir testsuite/objc +(rootme=`${PWDCMD-pwd}`; export rootme; \ + srcdir=`cd ../../gcc-4.3.3/gcc; ${PWDCMD-pwd}` ; export srcdir ; \ + cd testsuite/objc; \ + rm -f tmp-site.exp; \ + sed '/set tmpdir/ s|testsuite|testsuite/objc|' \ + < ../../site.exp > tmp-site.exp; \ + /bin/bash ${srcdir}/../move-if-change tmp-site.exp site.exp; \ + EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \ + if [ -f ${rootme}/../expect/expect ] ; then \ + TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWDCMD-pwd}` ; \ + export TCL_LIBRARY ; fi ; \ + GCC_EXEC_PREFIX="/opt/csw/gcc4/lib/gcc/" ; export GCC_EXEC_PREFIX ; \ + `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool objc ) +WARNING: Couldn't find the global config file. +Test Run By mwatters on Sun Apr 5 08:04:18 2009 +Native configuration is i386-pc-solaris2.10 + + === objc tests === + +Schedule of variations: + unix + +Running target unix +Using /opt/csw/share/dejagnu/baseboards/unix.exp as board description file for target. +Using /opt/csw/share/dejagnu/config/unix.exp as generic interface file for target. +Using /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/config/default.exp as tool-and-target-specific interface file. +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/objc/compile/compile.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/objc/execute/exceptions/exceptions.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/objc/execute/execute.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/objc.dg/dg.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/objc.dg/pch/pch.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/gcc-4.3.3/gcc/testsuite/objc.dg/special/special.exp ... + + === objc Summary === + +# of expected passes 1812 +# of expected failures 7 +# of unsupported tests 24 +/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.10-i386/objdir/gcc/xgcc version 4.3.3 (GCC) + Added: csw/mgar/pkg/gcc4/trunk/files/test-results/gcc4-i386 =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/test-results/gcc4-i386 (rev 0) +++ csw/mgar/pkg/gcc4/trunk/files/test-results/gcc4-i386 2009-04-05 22:36:59 UTC (rev 4204) @@ -0,0 +1,512 @@ +$ make check +Making a new config file... +echo "set tmpdir /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/objdir/gcc/testsuite" >> ./tmp0 +gmake[1]: Entering directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/objdir/gcc' +test -d testsuite || mkdir testsuite +test -d testsuite/gcc || mkdir testsuite/gcc +(rootme=`${PWDCMD-pwd}`; export rootme; \ + srcdir=`cd ../../gcc-4.3.3/gcc; ${PWDCMD-pwd}` ; export srcdir ; \ + cd testsuite/gcc; \ + rm -f tmp-site.exp; \ + sed '/set tmpdir/ s|testsuite|testsuite/gcc|' \ + < ../../site.exp > tmp-site.exp; \ + /bin/bash ${srcdir}/../move-if-change tmp-site.exp site.exp; \ + EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \ + if [ -f ${rootme}/../expect/expect ] ; then \ + TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWDCMD-pwd}` ; \ + export TCL_LIBRARY ; fi ; \ + GCC_EXEC_PREFIX="/opt/csw/gcc4/lib/gcc/" ; export GCC_EXEC_PREFIX ; \ + runtestflags= ; \ + if [ -n "" ] ; then \ + runtestflags=""; \ + elif [ -n "" ] ; then \ + parts="`echo ' ' \ + | sed 's/=[^ ]* / /g'`"; \ + for part in `find $srcdir/testsuite/gcc* -name \*.exp` ; do \ + part=`basename $part` ; \ + case " $parts $runtestflags " in \ + *" $part "*) ;; \ + *) runtestflags="$runtestflags $part" ;; \ + esac ; \ + done ; \ + fi ; \ + `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool gcc $runtestflags) +WARNING: Couldn't find the global config file. +Test Run By mwatters on Sun Apr 5 10:07:08 2009 +Native configuration is i386-pc-solaris2.8 + + === gcc tests === + +Schedule of variations: + unix + +Running target unix +Using /opt/csw/share/dejagnu/baseboards/unix.exp as board description file for target. +Using /opt/csw/share/dejagnu/config/unix.exp as generic interface file for target. +Using /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/config/default.exp as tool-and-target-specific interface file. +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/compile.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/execute.exp ... +FAIL: gcc.c-torture/execute/990127-2.c execution, -O2 +FAIL: gcc.c-torture/execute/990127-2.c execution, -Os +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.c-torture/unsorted/unsorted.exp ... + +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/autopar/autopar.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/charset/charset.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/compat/compat.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/compat/struct-layout-1.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/cpp/cpp.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/cpp/trad/trad.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/debug/debug.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/dfp.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/dg.exp ... +FAIL: gcc.dg/builtins-8.c execution test +FAIL: gcc.dg/pr36584.c execution test +FAIL: gcc.dg/pthread-init-1.c (test for excess errors) +FAIL: gcc.dg/pthread-init-2.c (test for excess errors) +XPASS: gcc.dg/ucnid-2.c (test for excess errors) +XPASS: gcc.dg/ucnid-3.c (test for excess errors) +XPASS: gcc.dg/ucnid-4.c (test for excess errors) +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/fixed-point/fixed-point.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/format/format.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/gomp/gomp.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/ipa/ipa.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/matrix/matrix.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/noncompile/noncompile.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/pch/pch.exp ... +FAIL: largefile.c -O0 -g (test for excess errors) +FAIL: gcc.dg/pch/largefile.c -O0 -g assembly comparison +FAIL: largefile.c -O0 (test for excess errors) +FAIL: gcc.dg/pch/largefile.c -O0 assembly comparison +FAIL: largefile.c -O1 (test for excess errors) +FAIL: gcc.dg/pch/largefile.c -O1 assembly comparison +FAIL: largefile.c -O2 (test for excess errors) +FAIL: gcc.dg/pch/largefile.c -O2 assembly comparison +FAIL: largefile.c -O3 -fomit-frame-pointer (test for excess errors) +FAIL: gcc.dg/pch/largefile.c -O3 -fomit-frame-pointer assembly comparison +FAIL: largefile.c -O3 -g (test for excess errors) +FAIL: gcc.dg/pch/largefile.c -O3 -g assembly comparison +FAIL: largefile.c -Os (test for excess errors) +FAIL: gcc.dg/pch/largefile.c -Os assembly comparison +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/special/mips-abi.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/special/special.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/struct/struct-reorg.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/tls/tls.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/torture/dg-torture.exp ... +FAIL: gcc.dg/torture/complex-alias-1.c -O0 execution test +FAIL: gcc.dg/torture/complex-alias-1.c -O1 execution test +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/tree-prof/tree-prof.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/tree-ssa/tree-ssa.exp ... +XPASS: gcc.dg/tree-ssa/20040204-1.c scan-tree-dump-times optimized "link_error" 0 +FAIL: gcc.dg/tree-ssa/ltrans-1.c scan-tree-dump-times ltrans "converted loop nest to perfect loop nest" 1 +FAIL: gcc.dg/tree-ssa/ltrans-1.c scan-tree-dump-times ltrans "transformed loop" 1 +FAIL: gcc.dg/tree-ssa/ltrans-4.c scan-tree-dump-times ltrans "transformed loop" 1 +FAIL: gcc.dg/tree-ssa/ltrans-5.c scan-tree-dump-times ltrans "transformed loop" 1 +FAIL: gcc.dg/tree-ssa/ltrans-6.c scan-tree-dump-times ltrans "transformed loop" 1 +FAIL: gcc.dg/tree-ssa/ltrans-8.c scan-tree-dump-times ltrans "transformed loop" 1 +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/vect/costmodel/i386/i386-costmodel-vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/vect/costmodel/ppc/ppc-costmodel-vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/vect/costmodel/spu/spu-costmodel-vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/x86_64-costmodel-vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/vect/vect.exp ... +FAIL: gcc.dg/vect/pr36493.c execution test +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/vmx/vmx.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/vxworks/vxworks.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.dg/weak/weak.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/acker1.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/arm-isr.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/bprob.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/dectest.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/dhry.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/gcov.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/i386-prefetch.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/linkage.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/matrix1.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/mg-2.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/mg.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/options.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/sieve.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/sort2.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/alpha/alpha.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/arm/arm.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/arm/neon/neon.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/bfin/bfin.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/cris/cris.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/cris/torture/cris-torture.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/frv/frv.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/i386/i386.exp ... +FAIL: gcc.target/i386/20060512-1.c execution test +FAIL: gcc.target/i386/20060512-3.c execution test +FAIL: gcc.target/i386/abi-1.c scan-assembler xmm0 +FAIL: gcc.target/i386/asm-2.c (internal compiler error) +FAIL: gcc.target/i386/asm-2.c (test for excess errors) +FAIL: gcc.target/i386/fastcall-sseregparm.c execution test +FAIL: gcc.target/i386/fpprec-1.c execution test +FAIL: gcc.target/i386/pr13685.c execution test +FAIL: gcc.target/i386/pr37191.c (test for excess errors) +FAIL: gcc.target/i386/reload-1.c (test for excess errors) +ERROR: gcc.target/i386/reload-1.c: error executing dg-final: no files matched glob pattern "reload-1.c.[0-9][0-9][0-9]r.csa" +FAIL: gcc.target/i386/sse-10.c execution test +FAIL: gcc.target/i386/sse-11.c execution test +FAIL: gcc.target/i386/sse-13.c (test for excess errors) +FAIL: gcc.target/i386/sse-14.c (test for excess errors) +FAIL: gcc.target/i386/sse-17.c execution test +FAIL: gcc.target/i386/sse-18.c execution test +FAIL: gcc.target/i386/sse-3.c execution test +FAIL: gcc.target/i386/sse-6.c execution test +FAIL: gcc.target/i386/sse-recip-vec.c execution test +FAIL: gcc.target/i386/sse-recip.c execution test +FAIL: gcc.target/i386/sse2-lrint-vec.c execution test +FAIL: gcc.target/i386/sse2-lrintf-vec.c execution test +FAIL: gcc.target/i386/sse2-vec-1.c execution test +FAIL: gcc.target/i386/sse2-vec-2.c execution test +FAIL: gcc.target/i386/sse2-vec-3.c execution test +FAIL: gcc.target/i386/sse2-vec-4.c execution test +FAIL: gcc.target/i386/sse2-vec-5.c execution test +FAIL: gcc.target/i386/sse2-vec-6.c execution test +FAIL: gcc.target/i386/sse5-haddX.c (test for excess errors) +WARNING: gcc.target/i386/sse5-haddX.c compilation failed to produce executable +FAIL: gcc.target/i386/sse5-hsubX.c (test for excess errors) +WARNING: gcc.target/i386/sse5-hsubX.c compilation failed to produce executable +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/i386/math-torture/math-torture.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/ia64/ia64.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/m68k/m68k.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/mips/inter/mips16-inter.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/mips/mips.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/powerpc/powerpc.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/s390/s390.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/sh/sh.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/sparc/sparc.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/spu/spu.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/x86_64/abi/abi-x86_64.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.target/xstormy16/xstormy16.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gcc.test-framework/test-framework.exp ... +skipping test framework tests, CHECK_TEST_FRAMEWORK is not defined + + === gcc Summary === + +# of expected passes 48710 +# of unexpected failures 59 +# of unexpected successes 4 +# of expected failures 168 +# of unresolved testcases 1 +# of untested testcases 35 +# of unsupported tests 340 +/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/objdir/gcc/xgcc version 4.3.3 (GCC) + +gmake[1]: [check-parallel-gcc] Error 1 (ignored) +gmake[1]: Leaving directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/objdir/gcc' + === acats configuration === +target gcc is /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/objdir/gcc/xgcc -B/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/objdir/gcc/ +Reading specs from /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/objdir/gcc/specs Target: i386-pc-solaris2.8 Configured with: ../gcc-4.3.3/configure --prefix=/opt/csw/gcc4 --exec-prefix=/opt/csw/gcc4 --with-gnu-as --with-as=/opt/csw/bin/gas --without-gnu-ld --with-ld=/usr/ccs/bin/ld --enable-nls --with-included-gettext --with-libiconv-prefix=/opt/csw --with-x --with-mpfr=/opt/csw --with-gmp=/opt/csw --enable-java-awt=xlib --enable-libada --enable-libssp --enable-objc-gc --enable-threads=posix --enable-stage1-languages=c --enable-languages=ada,c,c++,fortran,java,objc Thread model: posix gcc version 4.3.3 (GCC) +host=i386-pc-solaris2.8 +target=i386-pc-solaris2.8 +gnatmake is /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/objdir/gcc/gnatmake + + === acats support === +Generating support files... done. +Compiling support files... done. + + === acats tests === +Running chapter a ... +Running chapter c2 ... +Running chapter c3 ... +Running chapter c4 ... +Running chapter c5 ... +Running chapter c6 ... +Running chapter c7 ... +Running chapter c8 ... +Running chapter c9 ... +Running chapter ca ... +Running chapter cb ... +Running chapter cc ... +Running chapter cd ... +Running chapter ce ... +Running chapter cxa ... +Running chapter cxb ... +Running chapter cxf ... +Running chapter cxg ... +Running chapter cxh ... +Running chapter cz ... +Running chapter d ... +Running chapter e ... +Running chapter gcc ... +Running chapter l ... + === acats Summary === +# of expected passes 2315 +# of unexpected failures 0 +test -d testsuite || mkdir testsuite +test -d testsuite/gnat || mkdir testsuite/gnat +(rootme=`${PWDCMD-pwd}`; export rootme; \ + srcdir=`cd ../../gcc-4.3.3/gcc; ${PWDCMD-pwd}` ; export srcdir ; \ + cd testsuite/gnat; \ + rm -f tmp-site.exp; \ + sed '/set tmpdir/ s|testsuite|testsuite/gnat|' \ + < ../../site.exp > tmp-site.exp; \ + /bin/bash ${srcdir}/../move-if-change tmp-site.exp site.exp; \ + EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \ + if [ -f ${rootme}/../expect/expect ] ; then \ + TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWDCMD-pwd}` ; \ + export TCL_LIBRARY ; fi ; \ + GCC_EXEC_PREFIX="/opt/csw/gcc4/lib/gcc/" ; export GCC_EXEC_PREFIX ; \ + `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool gnat ) +WARNING: Couldn't find the global config file. +Test Run By mwatters on Sun Apr 5 14:20:14 2009 +Native configuration is i386-pc-solaris2.8 + + === gnat tests === + +Schedule of variations: + unix + +Running target unix +Using /opt/csw/share/dejagnu/baseboards/unix.exp as board description file for target. +Using /opt/csw/share/dejagnu/config/unix.exp as generic interface file for target. +Using /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/config/default.exp as tool-and-target-specific interface file. +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gnat.dg/dg.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gnat.dg/specs/specs.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gnat.dg/style/style.exp ... + + === gnat Summary === + +# of expected passes 374 +# of expected failures 1 +gmake[1]: Entering directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/objdir/gcc' +test -d testsuite || mkdir testsuite +test -d testsuite/g++ || mkdir testsuite/g++ +(rootme=`${PWDCMD-pwd}`; export rootme; \ + srcdir=`cd ../../gcc-4.3.3/gcc; ${PWDCMD-pwd}` ; export srcdir ; \ + cd testsuite/g++; \ + rm -f tmp-site.exp; \ + sed '/set tmpdir/ s|testsuite|testsuite/g++|' \ + < ../../site.exp > tmp-site.exp; \ + /bin/bash ${srcdir}/../move-if-change tmp-site.exp site.exp; \ + EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \ + if [ -f ${rootme}/../expect/expect ] ; then \ + TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWDCMD-pwd}` ; \ + export TCL_LIBRARY ; fi ; \ + GCC_EXEC_PREFIX="/opt/csw/gcc4/lib/gcc/" ; export GCC_EXEC_PREFIX ; \ + runtestflags= ; \ + if [ -n "" ] ; then \ + runtestflags=""; \ + elif [ -n "" ] ; then \ + parts="`echo ' ' \ + | sed 's/=[^ ]* / /g'`"; \ + for part in `find $srcdir/testsuite/g++* -name \*.exp` ; do \ + part=`basename $part` ; \ + case " $parts $runtestflags " in \ + *" $part "*) ;; \ + *) runtestflags="$runtestflags $part" ;; \ + esac ; \ + done ; \ + fi ; \ + `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool g++ $runtestflags) +WARNING: Couldn't find the global config file. +Test Run By mwatters on Sun Apr 5 14:24:10 2009 +Native configuration is i386-pc-solaris2.8 + + === g++ tests === + +Schedule of variations: + unix + +Running target unix +Using /opt/csw/share/dejagnu/baseboards/unix.exp as board description file for target. +Using /opt/csw/share/dejagnu/config/unix.exp as generic interface file for target. +Using /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/config/default.exp as tool-and-target-specific interface file. +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.dg/bprob/bprob.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.dg/charset/charset.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.dg/compat/compat.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.dg/compat/struct-layout-1.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.dg/debug/debug.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.dg/debug/dwarf2/dwarf2.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.dg/dg.exp ... +FAIL: g++.dg/other/i386-1.C execution test +XPASS: g++.dg/other/ucnid-1.C (test for excess errors) +FAIL: g++.dg/warn/miss-format-1.C printf attribute warning (test for warnings, line 15) +FAIL: g++.dg/warn/miss-format-1.C printf attribute warning 2 (test for warnings, line 40) +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.dg/gcov/gcov.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.dg/gomp/gomp.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.dg/pch/pch.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.dg/special/ecos.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.dg/tls/tls.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.dg/torture/dg-torture.exp ... +FAIL: g++.dg/torture/pr34099.C -O0 execution test +FAIL: g++.dg/torture/pr34099.C -O1 execution test +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.dg/tree-prof/tree-prof.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.dg/vect/vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/g++.old-deja/old-deja.exp ... +FAIL: g++.old-deja/g++.brendan/complex1.C execution test +XPASS: g++.old-deja/g++.oliva/dwarf2.C (test for excess errors) +XPASS: g++.old-deja/g++.oliva/dwarf3.C (test for excess errors) +FAIL: g++.old-deja/g++.other/headers1.C (test for excess errors) +WARNING: g++.old-deja/g++.other/headers1.C compilation failed to produce executable +XPASS: g++.old-deja/g++.other/init19.C execution test + + === g++ Summary === + +# of expected passes 17488 +# of unexpected failures 7 +# of unexpected successes 4 +# of expected failures 84 +# of unsupported tests 172 +/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/objdir/gcc/testsuite/g++/../../g++ version 4.3.3 (GCC) + +gmake[1]: [check-parallel-g++] Error 1 (ignored) +gmake[1]: Leaving directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/objdir/gcc' +gmake[1]: Entering directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/objdir/gcc' +test -d testsuite || mkdir testsuite +test -d testsuite/gfortran || mkdir testsuite/gfortran +(rootme=`${PWDCMD-pwd}`; export rootme; \ + srcdir=`cd ../../gcc-4.3.3/gcc; ${PWDCMD-pwd}` ; export srcdir ; \ + cd testsuite/gfortran; \ + rm -f tmp-site.exp; \ + sed '/set tmpdir/ s|testsuite|testsuite/gfortran|' \ + < ../../site.exp > tmp-site.exp; \ + /bin/bash ${srcdir}/../move-if-change tmp-site.exp site.exp; \ + EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \ + if [ -f ${rootme}/../expect/expect ] ; then \ + TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWDCMD-pwd}` ; \ + export TCL_LIBRARY ; fi ; \ + GCC_EXEC_PREFIX="/opt/csw/gcc4/lib/gcc/" ; export GCC_EXEC_PREFIX ; \ + runtestflags= ; \ + if [ -n "" ] ; then \ + runtestflags=""; \ + elif [ -n "" ] ; then \ + parts="`echo ' ' \ + | sed 's/=[^ ]* / /g'`"; \ + for part in `find $srcdir/testsuite/gfortran* -name \*.exp` ; do \ + part=`basename $part` ; \ + case " $parts $runtestflags " in \ + *" $part "*) ;; \ + *) runtestflags="$runtestflags $part" ;; \ + esac ; \ + done ; \ + fi ; \ + `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool gfortran $runtestflags) +WARNING: Couldn't find the global config file. +Test Run By mwatters on Sun Apr 5 15:18:21 2009 +Native configuration is i386-pc-solaris2.8 + + === gfortran tests === + +Schedule of variations: + unix + +Running target unix +Using /opt/csw/share/dejagnu/baseboards/unix.exp as board description file for target. +Using /opt/csw/share/dejagnu/config/unix.exp as generic interface file for target. +Using /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/config/default.exp as tool-and-target-specific interface file. +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gfortran.dg/dg.exp ... +FAIL: gfortran.dg/c_by_val_1.f -O0 execution test +FAIL: gfortran.dg/c_by_val_1.f -O1 execution test +FAIL: gfortran.dg/c_by_val_1.f -O2 execution test +FAIL: gfortran.dg/c_by_val_1.f -O3 -fomit-frame-pointer execution test +FAIL: gfortran.dg/c_by_val_1.f -O3 -fomit-frame-pointer -funroll-loops execution test +FAIL: gfortran.dg/c_by_val_1.f -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions execution test +FAIL: gfortran.dg/c_by_val_1.f -O3 -g execution test +FAIL: gfortran.dg/c_by_val_1.f -Os execution test +FAIL: gfortran.dg/f2c_2.f90 -O0 execution test +FAIL: gfortran.dg/f2c_2.f90 -O1 execution test +FAIL: gfortran.dg/f2c_2.f90 -O2 execution test +FAIL: gfortran.dg/f2c_2.f90 -O3 -fomit-frame-pointer execution test +FAIL: gfortran.dg/f2c_2.f90 -O3 -fomit-frame-pointer -funroll-loops execution test +FAIL: gfortran.dg/f2c_2.f90 -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions execution test +FAIL: gfortran.dg/f2c_2.f90 -O3 -g execution test +FAIL: gfortran.dg/f2c_2.f90 -Os execution test +FAIL: gfortran.dg/ltrans-7.f90 -O scan-tree-dump-times ltrans "transformed loop" 1 +FAIL: gfortran.dg/specifics_1.f90 -O0 execution test +FAIL: gfortran.dg/specifics_1.f90 -O1 execution test +FAIL: gfortran.dg/specifics_1.f90 -O2 execution test +FAIL: gfortran.dg/specifics_1.f90 -O3 -fomit-frame-pointer execution test +FAIL: gfortran.dg/specifics_1.f90 -O3 -fomit-frame-pointer -funroll-loops execution test +FAIL: gfortran.dg/specifics_1.f90 -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions execution test +FAIL: gfortran.dg/specifics_1.f90 -O3 -g execution test +FAIL: gfortran.dg/specifics_1.f90 -Os execution test +FAIL: gfortran.dg/value_4.f90 -O0 execution test +FAIL: gfortran.dg/value_4.f90 -O1 execution test +FAIL: gfortran.dg/value_4.f90 -O2 execution test +FAIL: gfortran.dg/value_4.f90 -O3 -fomit-frame-pointer execution test +FAIL: gfortran.dg/value_4.f90 -O3 -fomit-frame-pointer -funroll-loops execution test +FAIL: gfortran.dg/value_4.f90 -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions execution test +FAIL: gfortran.dg/value_4.f90 -O3 -g execution test +FAIL: gfortran.dg/value_4.f90 -Os execution test +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gfortran.dg/gomp/gomp.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gfortran.dg/vect/vect.exp ... +FAIL: gfortran.dg/vect/vect-5.f90 -O execution test +FAIL: gfortran.dg/vect/fast-math-pr33299.f90 execution test +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gfortran.fortran-torture/compile/compile.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/gfortran.fortran-torture/execute/execute.exp ... +FAIL: gfortran.fortran-torture/execute/common.f90 execution, -O2 -ftree-vectorize -msse2 +FAIL: gfortran.fortran-torture/execute/common_size.f90 execution, -O2 -ftree-vectorize -msse2 +FAIL: gfortran.fortran-torture/execute/forall_4.f90 execution, -O2 -ftree-vectorize -msse2 +FAIL: gfortran.fortran-torture/execute/forall_5.f90 execution, -O2 -ftree-vectorize -msse2 +FAIL: gfortran.fortran-torture/execute/intrinsic_integer.f90 execution, -O2 -ftree-vectorize -msse2 +FAIL: gfortran.fortran-torture/execute/seq_io.f90 execution, -O2 -ftree-vectorize -msse2 +FAIL: gfortran.fortran-torture/execute/specifics.f90 execution, -O0 +FAIL: gfortran.fortran-torture/execute/specifics.f90 execution, -O1 +FAIL: gfortran.fortran-torture/execute/specifics.f90 execution, -O2 +FAIL: gfortran.fortran-torture/execute/specifics.f90 execution, -O2 -fomit-frame-pointer -finline-functions +FAIL: gfortran.fortran-torture/execute/specifics.f90 execution, -O2 -fomit-frame-pointer -finline-functions -funroll-loops +FAIL: gfortran.fortran-torture/execute/specifics.f90 execution, -O2 -fbounds-check +FAIL: gfortran.fortran-torture/execute/specifics.f90 execution, -O3 -g +FAIL: gfortran.fortran-torture/execute/specifics.f90 execution, -Os +FAIL: gfortran.fortran-torture/execute/specifics.f90 execution, -O2 -ftree-vectorize -msse2 +FAIL: gfortran.fortran-torture/execute/stack_varsize.f90 execution, -O2 -ftree-vectorize -msse2 +FAIL: gfortran.fortran-torture/execute/where_2.f90 execution, -O2 -ftree-vectorize -msse2 + + === gfortran Summary === + +# of expected passes 24969 +# of unexpected failures 52 +# of expected failures 3 +# of unsupported tests 136 +/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/objdir/gcc/testsuite/gfortran/../../gfortran version 4.3.3 (GCC) + +gmake[1]: [check-parallel-gfortran] Error 1 (ignored) +gmake[1]: Leaving directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/objdir/gcc' +test -d testsuite || mkdir testsuite +test -d testsuite/objc || mkdir testsuite/objc +(rootme=`${PWDCMD-pwd}`; export rootme; \ + srcdir=`cd ../../gcc-4.3.3/gcc; ${PWDCMD-pwd}` ; export srcdir ; \ + cd testsuite/objc; \ + rm -f tmp-site.exp; \ + sed '/set tmpdir/ s|testsuite|testsuite/objc|' \ + < ../../site.exp > tmp-site.exp; \ + /bin/bash ${srcdir}/../move-if-change tmp-site.exp site.exp; \ + EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \ + if [ -f ${rootme}/../expect/expect ] ; then \ + TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWDCMD-pwd}` ; \ + export TCL_LIBRARY ; fi ; \ + GCC_EXEC_PREFIX="/opt/csw/gcc4/lib/gcc/" ; export GCC_EXEC_PREFIX ; \ + `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool objc ) +WARNING: Couldn't find the global config file. +Test Run By mwatters on Sun Apr 5 17:01:58 2009 +Native configuration is i386-pc-solaris2.8 + + === objc tests === + +Schedule of variations: + unix + +Running target unix +Using /opt/csw/share/dejagnu/baseboards/unix.exp as board description file for target. +Using /opt/csw/share/dejagnu/config/unix.exp as generic interface file for target. +Using /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/config/default.exp as tool-and-target-specific interface file. +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/objc/compile/compile.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/objc/execute/exceptions/exceptions.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/objc/execute/execute.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/objc.dg/dg.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/objc.dg/pch/pch.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/gcc-4.3.3/gcc/testsuite/objc.dg/special/special.exp ... + + === objc Summary === + +# of expected passes 1812 +# of expected failures 7 +# of unsupported tests 24 +/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-i386-5.8-i386/objdir/gcc/xgcc version 4.3.3 (GCC) + Added: csw/mgar/pkg/gcc4/trunk/files/test-results/gcc4-sparc =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/test-results/gcc4-sparc (rev 0) +++ csw/mgar/pkg/gcc4/trunk/files/test-results/gcc4-sparc 2009-04-05 22:36:59 UTC (rev 4204) @@ -0,0 +1,410 @@ +$ make check +Making a new config file... +echo "set tmpdir /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/objdir/gcc/testsuite" >> ./tmp0 +gmake[1]: Entering directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/objdir/gcc' +test -d testsuite || mkdir testsuite +test -d testsuite/gcc || mkdir testsuite/gcc +(rootme=`${PWDCMD-pwd}`; export rootme; \ + srcdir=`cd ../../gcc-4.3.3/gcc; ${PWDCMD-pwd}` ; export srcdir ; \ + cd testsuite/gcc; \ + rm -f tmp-site.exp; \ + sed '/set tmpdir/ s|testsuite|testsuite/gcc|' \ + < ../../site.exp > tmp-site.exp; \ + /bin/bash ${srcdir}/../move-if-change tmp-site.exp site.exp; \ + EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \ + if [ -f ${rootme}/../expect/expect ] ; then \ + TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWDCMD-pwd}` ; \ + export TCL_LIBRARY ; fi ; \ + GCC_EXEC_PREFIX="/opt/csw/gcc4/lib/gcc/" ; export GCC_EXEC_PREFIX ; \ + runtestflags= ; \ + if [ -n "" ] ; then \ + runtestflags=""; \ + elif [ -n "" ] ; then \ + parts="`echo ' ' \ + | sed 's/=[^ ]* / /g'`"; \ + for part in `find $srcdir/testsuite/gcc* -name \*.exp` ; do \ + part=`basename $part` ; \ + case " $parts $runtestflags " in \ + *" $part "*) ;; \ + *) runtestflags="$runtestflags $part" ;; \ + esac ; \ + done ; \ + fi ; \ + `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool gcc $runtestflags) +WARNING: Couldn't find the global config file. +Test Run By mwatters on Sat Apr 4 13:48:45 2009 +Native configuration is sparc-sun-solaris2.8 + + === gcc tests === + +Schedule of variations: + unix + +Running target unix +Using /opt/csw/share/dejagnu/baseboards/unix.exp as board description file for target. +Using /opt/csw/share/dejagnu/config/unix.exp as generic interface file for target. +Using /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/config/default.exp as tool-and-target-specific interface file. +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/compile.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/execute.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.c-torture/unsorted/unsorted.exp ... + +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/autopar/autopar.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/charset/charset.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/compat/compat.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/compat/struct-layout-1.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/cpp/cpp.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/cpp/trad/trad.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/debug/debug.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/dfp.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/dg.exp ... +WARNING: program timed out. +FAIL: gcc.dg/pr28796-2.c execution test +FAIL: gcc.dg/pthread-init-1.c (test for excess errors) +FAIL: gcc.dg/pthread-init-2.c (test for excess errors) +XPASS: gcc.dg/ucnid-2.c (test for excess errors) +XPASS: gcc.dg/ucnid-3.c (test for excess errors) +XPASS: gcc.dg/ucnid-4.c (test for excess errors) +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/fixed-point/fixed-point.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/format/format.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/gomp/gomp.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/ipa/ipa.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/matrix/matrix.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/noncompile/noncompile.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/pch/pch.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/special/mips-abi.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/special/special.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/struct/struct-reorg.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/tls/tls.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/torture/dg-torture.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/tree-prof/tree-prof.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/tree-ssa/tree-ssa.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/vect/costmodel/i386/i386-costmodel-vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/vect/costmodel/ppc/ppc-costmodel-vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/vect/costmodel/spu/spu-costmodel-vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/x86_64-costmodel-vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/vect/vect.exp ... +FAIL: gcc.dg/vect/pr33804.c scan-tree-dump-times vect "vectorized 1 loops" 1 +FAIL: gcc.dg/vect/pr33804.c scan-tree-dump-times vect "vectorizing stmts using SLP" 1 +FAIL: gcc.dg/vect/vect-35.c scan-tree-dump-times vect "vectorized 1 loops" 1 +FAIL: gcc.dg/vect/vect-iv-6.c scan-tree-dump-times vect "vectorized 1 loops" 1 +FAIL: gcc.dg/vect/vect-multitypes-5.c scan-tree-dump-times vect "vectorized 1 loops" 1 +FAIL: gcc.dg/vect/vect-multitypes-6.c scan-tree-dump-times vect "vectorized 1 loops" 1 +FAIL: gcc.dg/vect/vect-outer-5.c scan-tree-dump-times vect "OUTER LOOP VECTORIZED" 1 +FAIL: gcc.dg/vect/vect-outer-5.c scan-tree-dump-times vect "zero step in outer loop." 1 +FAIL: gcc.dg/vect/vect-outer-6.c scan-tree-dump-times vect "OUTER LOOP VECTORIZED" 1 +FAIL: gcc.dg/vect/vect-outer-6.c scan-tree-dump-times vect "zero step in outer loop." 1 +FAIL: gcc.dg/vect/vect-vfa-slp.c scan-tree-dump-times vect "vectorized 1 loops" 1 +FAIL: gcc.dg/vect/slp-15.c scan-tree-dump-times vect "vectorizing stmts using SLP" 2 +FAIL: gcc.dg/vect/slp-25.c scan-tree-dump-times vect "Alignment of access forced using peeling" 2 +FAIL: gcc.dg/vect/slp-3.c scan-tree-dump-times vect "vectorized 3 loops" 1 +FAIL: gcc.dg/vect/slp-3.c scan-tree-dump-times vect "vectorizing stmts using SLP" 3 +FAIL: gcc.dg/vect/no-vfa-pr29145.c scan-tree-dump-times vect "vectorized 0 loops" 2 +FAIL: gcc.dg/vect/no-vfa-pr29145.c scan-tree-dump-times vect "vectorized 1 loops" 1 +FAIL: gcc.dg/vect/no-vfa-vect-depend-1.c scan-tree-dump-times vect "vectorized 1 loops" 1 +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/vmx/vmx.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/vxworks/vxworks.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.dg/weak/weak.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/acker1.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/arm-isr.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/bprob.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/dectest.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/dhry.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/gcov.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/i386-prefetch.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/linkage.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/matrix1.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/mg-2.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/mg.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/options.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/sieve.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.misc-tests/sort2.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/alpha/alpha.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/arm/arm.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/arm/neon/neon.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/bfin/bfin.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/cris/cris.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/cris/torture/cris-torture.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/frv/frv.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/i386/i386.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/i386/math-torture/math-torture.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/ia64/ia64.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/m68k/m68k.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/mips/inter/mips16-inter.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/mips/mips.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/powerpc/powerpc.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/s390/s390.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/sh/sh.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/sparc/sparc.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/spu/spu.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/x86_64/abi/abi-x86_64.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.target/xstormy16/xstormy16.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gcc.test-framework/test-framework.exp ... +skipping test framework tests, CHECK_TEST_FRAMEWORK is not defined + + === gcc Summary === + +# of expected passes 46968 +# of unexpected failures 21 +# of unexpected successes 3 +# of expected failures 192 +# of untested testcases 35 +# of unsupported tests 531 +/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/objdir/gcc/xgcc version 4.3.3 (GCC) + +gmake[1]: [check-parallel-gcc] Error 1 (ignored) +gmake[1]: Leaving directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/objdir/gcc' + === acats configuration === +target gcc is /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/objdir/gcc/xgcc -B/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/objdir/gcc/ +Reading specs from /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/objdir/gcc/specs Target: sparc-sun-solaris2.8 Configured with: ../gcc-4.3.3/configure --prefix=/opt/csw/gcc4 --exec-prefix=/opt/csw/gcc4 --with-gnu-as --with-as=/opt/csw/bin/gas --without-gnu-ld --with-ld=/usr/ccs/bin/ld --enable-nls --with-included-gettext --with-libiconv-prefix=/opt/csw --with-x --with-mpfr=/opt/csw --with-gmp=/opt/csw --enable-java-awt=xlib --enable-libada --enable-libssp --enable-objc-gc --enable-threads=posix --enable-stage1-languages=c --enable-languages=ada,c,c++,fortran,java,objc Thread model: posix gcc version 4.3.3 (GCC) +host=sparc-sun-solaris2.8 +target=sparc-sun-solaris2.8 +gnatmake is /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/objdir/gcc/gnatmake + + === acats support === +Generating support files... done. +Compiling support files... done. + + === acats tests === +Running chapter a ... +Running chapter c2 ... +Running chapter c3 ... +Running chapter c4 ... +Running chapter c5 ... +Running chapter c6 ... +Running chapter c7 ... +Running chapter c8 ... +Running chapter c9 ... +Running chapter ca ... +Running chapter cb ... +Running chapter cc ... +Running chapter cd ... +Running chapter ce ... +Running chapter cxa ... +Running chapter cxb ... +Running chapter cxf ... +Running chapter cxg ... +Running chapter cxh ... +Running chapter cz ... +Running chapter d ... +Running chapter e ... +Running chapter gcc ... +Running chapter l ... + === acats Summary === +# of expected passes 2315 +# of unexpected failures 0 +test -d testsuite || mkdir testsuite +test -d testsuite/gnat || mkdir testsuite/gnat +(rootme=`${PWDCMD-pwd}`; export rootme; \ + srcdir=`cd ../../gcc-4.3.3/gcc; ${PWDCMD-pwd}` ; export srcdir ; \ + cd testsuite/gnat; \ + rm -f tmp-site.exp; \ + sed '/set tmpdir/ s|testsuite|testsuite/gnat|' \ + < ../../site.exp > tmp-site.exp; \ + /bin/bash ${srcdir}/../move-if-change tmp-site.exp site.exp; \ + EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \ + if [ -f ${rootme}/../expect/expect ] ; then \ + TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWDCMD-pwd}` ; \ + export TCL_LIBRARY ; fi ; \ + GCC_EXEC_PREFIX="/opt/csw/gcc4/lib/gcc/" ; export GCC_EXEC_PREFIX ; \ + `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool gnat ) +WARNING: Couldn't find the global config file. +Test Run By mwatters on Sat Apr 4 18:48:17 2009 +Native configuration is sparc-sun-solaris2.8 + + === gnat tests === + +Schedule of variations: + unix + +Running target unix +Using /opt/csw/share/dejagnu/baseboards/unix.exp as board description file for target. +Using /opt/csw/share/dejagnu/config/unix.exp as generic interface file for target. +Using /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/config/default.exp as tool-and-target-specific interface file. +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gnat.dg/dg.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gnat.dg/specs/specs.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gnat.dg/style/style.exp ... + + === gnat Summary === + +# of expected passes 375 +# of expected failures 1 +gmake[1]: Entering directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/objdir/gcc' +test -d testsuite || mkdir testsuite +test -d testsuite/g++ || mkdir testsuite/g++ +(rootme=`${PWDCMD-pwd}`; export rootme; \ + srcdir=`cd ../../gcc-4.3.3/gcc; ${PWDCMD-pwd}` ; export srcdir ; \ + cd testsuite/g++; \ + rm -f tmp-site.exp; \ + sed '/set tmpdir/ s|testsuite|testsuite/g++|' \ + < ../../site.exp > tmp-site.exp; \ + /bin/bash ${srcdir}/../move-if-change tmp-site.exp site.exp; \ + EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \ + if [ -f ${rootme}/../expect/expect ] ; then \ + TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWDCMD-pwd}` ; \ + export TCL_LIBRARY ; fi ; \ + GCC_EXEC_PREFIX="/opt/csw/gcc4/lib/gcc/" ; export GCC_EXEC_PREFIX ; \ + runtestflags= ; \ + if [ -n "" ] ; then \ + runtestflags=""; \ + elif [ -n "" ] ; then \ + parts="`echo ' ' \ + | sed 's/=[^ ]* / /g'`"; \ + for part in `find $srcdir/testsuite/g++* -name \*.exp` ; do \ + part=`basename $part` ; \ + case " $parts $runtestflags " in \ + *" $part "*) ;; \ + *) runtestflags="$runtestflags $part" ;; \ + esac ; \ + done ; \ + fi ; \ + `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool g++ $runtestflags) +WARNING: Couldn't find the global config file. +Test Run By mwatters on Sat Apr 4 18:52:36 2009 +Native configuration is sparc-sun-solaris2.8 + + === g++ tests === + +Schedule of variations: + unix + +Running target unix +Using /opt/csw/share/dejagnu/baseboards/unix.exp as board description file for target. +Using /opt/csw/share/dejagnu/config/unix.exp as generic interface file for target. +Using /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/config/default.exp as tool-and-target-specific interface file. +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.dg/bprob/bprob.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.dg/charset/charset.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.dg/compat/compat.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.dg/compat/struct-layout-1.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.dg/debug/debug.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.dg/debug/dwarf2/dwarf2.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.dg/dg.exp ... +FAIL: g++.dg/opt/anchor1.C execution test +XPASS: g++.dg/other/ucnid-1.C (test for excess errors) +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.dg/gcov/gcov.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.dg/gomp/gomp.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.dg/pch/pch.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.dg/special/ecos.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.dg/tls/tls.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.dg/torture/dg-torture.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.dg/tree-prof/tree-prof.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.dg/vect/vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/g++.old-deja/old-deja.exp ... +XPASS: g++.old-deja/g++.other/init19.C execution test + + === g++ Summary === + +# of expected passes 17327 +# of unexpected failures 1 +# of unexpected successes 2 +# of expected failures 84 +# of unsupported tests 227 +/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/objdir/gcc/testsuite/g++/../../g++ version 4.3.3 (GCC) + +gmake[1]: [check-parallel-g++] Error 1 (ignored) +gmake[1]: Leaving directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/objdir/gcc' +gmake[1]: Entering directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/objdir/gcc' +test -d testsuite || mkdir testsuite +test -d testsuite/gfortran || mkdir testsuite/gfortran +(rootme=`${PWDCMD-pwd}`; export rootme; \ + srcdir=`cd ../../gcc-4.3.3/gcc; ${PWDCMD-pwd}` ; export srcdir ; \ + cd testsuite/gfortran; \ + rm -f tmp-site.exp; \ + sed '/set tmpdir/ s|testsuite|testsuite/gfortran|' \ + < ../../site.exp > tmp-site.exp; \ + /bin/bash ${srcdir}/../move-if-change tmp-site.exp site.exp; \ + EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \ + if [ -f ${rootme}/../expect/expect ] ; then \ + TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWDCMD-pwd}` ; \ + export TCL_LIBRARY ; fi ; \ + GCC_EXEC_PREFIX="/opt/csw/gcc4/lib/gcc/" ; export GCC_EXEC_PREFIX ; \ + runtestflags= ; \ + if [ -n "" ] ; then \ + runtestflags=""; \ + elif [ -n "" ] ; then \ + parts="`echo ' ' \ + | sed 's/=[^ ]* / /g'`"; \ + for part in `find $srcdir/testsuite/gfortran* -name \*.exp` ; do \ + part=`basename $part` ; \ + case " $parts $runtestflags " in \ + *" $part "*) ;; \ + *) runtestflags="$runtestflags $part" ;; \ + esac ; \ + done ; \ + fi ; \ + `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool gfortran $runtestflags) +WARNING: Couldn't find the global config file. +Test Run By mwatters on Sat Apr 4 19:59:55 2009 +Native configuration is sparc-sun-solaris2.8 + + === gfortran tests === + +Schedule of variations: + unix + +Running target unix +Using /opt/csw/share/dejagnu/baseboards/unix.exp as board description file for target. +Using /opt/csw/share/dejagnu/config/unix.exp as generic interface file for target. +Using /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/config/default.exp as tool-and-target-specific interface file. +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gfortran.dg/dg.exp ... +FAIL: gfortran.dg/nint_2.f90 -O0 execution test +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gfortran.dg/gomp/gomp.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gfortran.dg/vect/vect.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gfortran.fortran-torture/compile/compile.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/gfortran.fortran-torture/execute/execute.exp ... + + === gfortran Summary === + +# of expected passes 24901 +# of unexpected failures 1 +# of expected failures 5 +# of unsupported tests 171 +/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/objdir/gcc/testsuite/gfortran/../../gfortran version 4.3.3 (GCC) + +gmake[1]: [check-parallel-gfortran] Error 1 (ignored) +gmake[1]: Leaving directory `/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/objdir/gcc' +test -d testsuite || mkdir testsuite +test -d testsuite/objc || mkdir testsuite/objc +(rootme=`${PWDCMD-pwd}`; export rootme; \ + srcdir=`cd ../../gcc-4.3.3/gcc; ${PWDCMD-pwd}` ; export srcdir ; \ + cd testsuite/objc; \ + rm -f tmp-site.exp; \ + sed '/set tmpdir/ s|testsuite|testsuite/objc|' \ + < ../../site.exp > tmp-site.exp; \ + /bin/bash ${srcdir}/../move-if-change tmp-site.exp site.exp; \ + EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \ + if [ -f ${rootme}/../expect/expect ] ; then \ + TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWDCMD-pwd}` ; \ + export TCL_LIBRARY ; fi ; \ + GCC_EXEC_PREFIX="/opt/csw/gcc4/lib/gcc/" ; export GCC_EXEC_PREFIX ; \ + `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool objc ) +WARNING: Couldn't find the global config file. +Test Run By mwatters on Sat Apr 4 22:13:33 2009 +Native configuration is sparc-sun-solaris2.8 + + === objc tests === + +Schedule of variations: + unix + +Running target unix +Using /opt/csw/share/dejagnu/baseboards/unix.exp as board description file for target. +Using /opt/csw/share/dejagnu/config/unix.exp as generic interface file for target. +Using /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/config/default.exp as tool-and-target-specific interface file. +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/objc/compile/compile.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/objc/execute/exceptions/exceptions.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/objc/execute/execute.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/objc.dg/dg.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/objc.dg/pch/pch.exp ... +Running /home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/gcc-4.3.3/gcc/testsuite/objc.dg/special/special.exp ... + + === objc Summary === + +# of expected passes 1812 +# of expected failures 7 +# of unsupported tests 24 +/home/mwatters/mgar/pkg/gcc4/trunk/work/build-isa-sparcv8-5.8-sparc/objdir/gcc/xgcc version 4.3.3 (GCC) + 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 6 01:03:35 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 05 Apr 2009 23:03:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[4205] csw/mgar/pkg/libgoffice/trunk Message-ID: Revision: 4205 http://gar.svn.sourceforge.net/gar/?rev=4205&view=rev Author: hson Date: 2009-04-05 23:03:35 +0000 (Sun, 05 Apr 2009) Log Message: ----------- libgoffice: Update to 0.7.4 Modified Paths: -------------- csw/mgar/pkg/libgoffice/trunk/Makefile csw/mgar/pkg/libgoffice/trunk/checksums Modified: csw/mgar/pkg/libgoffice/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgoffice/trunk/Makefile 2009-04-05 22:36:59 UTC (rev 4204) +++ csw/mgar/pkg/libgoffice/trunk/Makefile 2009-04-05 23:03:35 UTC (rev 4205) @@ -1,5 +1,5 @@ GARNAME = libgoffice -GARVERSION = 0.6.6 +GARVERSION = 0.7.4 CATEGORIES = gnome DESCRIPTION = Document centric objects library Modified: csw/mgar/pkg/libgoffice/trunk/checksums =================================================================== --- csw/mgar/pkg/libgoffice/trunk/checksums 2009-04-05 22:36:59 UTC (rev 4204) +++ csw/mgar/pkg/libgoffice/trunk/checksums 2009-04-05 23:03:35 UTC (rev 4205) @@ -1 +1 @@ -e689b21b892768af9ef2c08f2b6ee94e download/goffice-0.6.6.tar.gz +efb34403af04315c0ae1b55f89a24b3d download/goffice-0.7.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Apr 6 02:08:13 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 06 Apr 2009 00:08:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[4206] csw/mgar/pkg Message-ID: Revision: 4206 http://gar.svn.sourceforge.net/gar/?rev=4206&view=rev Author: hson Date: 2009-04-06 00:08:13 +0000 (Mon, 06 Apr 2009) Log Message: ----------- libgnomedb: Initial commit Added Paths: ----------- csw/mgar/pkg/libgnomedb/ csw/mgar/pkg/libgnomedb/branches/ csw/mgar/pkg/libgnomedb/tags/ csw/mgar/pkg/libgnomedb/trunk/ csw/mgar/pkg/libgnomedb/trunk/Makefile csw/mgar/pkg/libgnomedb/trunk/checksums csw/mgar/pkg/libgnomedb/trunk/files/ Property changes on: csw/mgar/pkg/libgnomedb/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libgnomedb/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnomedb/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgnomedb/trunk/Makefile 2009-04-06 00:08:13 UTC (rev 4206) @@ -0,0 +1,31 @@ +GARNAME = libgnomedb +GARVERSION = 3.99.7 +CATEGORIES = gnome + +DESCRIPTION = The libgnomedb library +define BLURB + libgnomedb provides data-bound UI widgets, using GTK+ and libgda. + + The libgnomedb library is released under the terms of the LGPL license, which + allows for commercial applications to be developed based on libgnomedb. The + accompanying tools are under the GPL. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +#REQUIRED_PKGS += CSWgconf2 CSWggettextrt CSWglib2 CSWgtk2 CSWlibatk +#REQUIRED_PKGS += CSWlibcairo CSWlibglade2 CSWlibgsf CSWlibxml2 CSWlibxrender +#REQUIRED_PKGS += CSWpango CSWsunmath CSWzlib + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +#TEST_TARGET = + +include gar/category.mk + +PATH :=/opt/csw/bin:/opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/libgnomedb/trunk/checksums =================================================================== --- csw/mgar/pkg/libgnomedb/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgnomedb/trunk/checksums 2009-04-06 00:08:13 UTC (rev 4206) @@ -0,0 +1 @@ +5d6c77c6c156230ad624cdae190c9d52 download/libgnomedb-3.99.7.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 6 02:08:43 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 06 Apr 2009 00:08:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[4207] csw/mgar/pkg Message-ID: Revision: 4207 http://gar.svn.sourceforge.net/gar/?rev=4207&view=rev Author: hson Date: 2009-04-06 00:08:42 +0000 (Mon, 06 Apr 2009) Log Message: ----------- libgda: Initial commit Added Paths: ----------- csw/mgar/pkg/libgda/ csw/mgar/pkg/libgda/branches/ csw/mgar/pkg/libgda/tags/ csw/mgar/pkg/libgda/trunk/ csw/mgar/pkg/libgda/trunk/Makefile csw/mgar/pkg/libgda/trunk/checksums csw/mgar/pkg/libgda/trunk/files/ Property changes on: csw/mgar/pkg/libgda/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libgda/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgda/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgda/trunk/Makefile 2009-04-06 00:08:42 UTC (rev 4207) @@ -0,0 +1,32 @@ +GARNAME = libgda +GARVERSION = 3.99.14 +CATEGORIES = gnome + +DESCRIPTION = GNU Data Access +define BLURB + GNU Data Access (GDA) is an attempt to provide uniform access to different + kinds of data sources (databases, information servers, mail spools, etc). + It is a complete architecture that provides all you need to access your data. + It is defined by a set of plugin APIs as generic as possible + (but very powerful at the same time) so that any kind of data source + can be accessed through them. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +#REQUIRED_PKGS += CSWgconf2 CSWggettextrt CSWglib2 CSWgtk2 CSWlibatk +#REQUIRED_PKGS += CSWlibcairo CSWlibglade2 CSWlibgsf CSWlibxml2 CSWlibxrender +#REQUIRED_PKGS += CSWpango CSWsunmath CSWzlib + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +#TEST_TARGET = + +include gar/category.mk + +PATH :=/opt/csw/bin:/opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/libgda/trunk/checksums =================================================================== --- csw/mgar/pkg/libgda/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgda/trunk/checksums 2009-04-06 00:08:42 UTC (rev 4207) @@ -0,0 +1 @@ +c7cf44e50dee4336cb79311f85ad948e download/libgda-3.99.14.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 Mon Apr 6 04:17:49 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 06 Apr 2009 02:17:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[4208] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 4208 http://gar.svn.sourceforge.net/gar/?rev=4208&view=rev Author: bdwalton Date: 2009-04-06 02:17:49 +0000 (Mon, 06 Apr 2009) Log Message: ----------- Correct the LD_OPTIONS that are set when GARCOMPILER is either GCC3 or GCC4. Previously, -R/lib being added. Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-04-06 00:08:42 UTC (rev 4207) +++ csw/mgar/gar/v2/gar.conf.mk 2009-04-06 02:17:49 UTC (rev 4208) @@ -471,8 +471,8 @@ ASFLAGS ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(EXTRA_ASFLAGS)) OPTFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(EXTRA_OPTFLAGS)) -GCC3_LD_OPTIONS = -R$(GNU_CC_HOME)/lib $(EXTRA_GCC3_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) $(EXTRA_LD_OPTIONS) -GCC4_LD_OPTIONS = -R$(GNU_CC_HOME)/lib $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) $(EXTRA_LD_OPTIONS) +GCC3_LD_OPTIONS = -R$(GCC3_CC_HOME)/lib $(EXTRA_GCC3_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) $(EXTRA_LD_OPTIONS) +GCC4_LD_OPTIONS = -R$(GCC4_CC_HOME)/lib $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS) $(EXTRA_LD_OPTIONS) SOS11_LD_OPTIONS = $(strip $(EXTRA_SOS11_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) $(EXTRA_LD_OPTIONS)) SOS12_LD_OPTIONS = $(strip $(EXTRA_SOS12_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) $(EXTRA_LD_OPTIONS)) 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 6 04:22:24 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 06 Apr 2009 02:22:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[4209] csw/mgar/pkg/ruby/trunk/Makefile Message-ID: Revision: 4209 http://gar.svn.sourceforge.net/gar/?rev=4209&view=rev Author: bdwalton Date: 2009-04-06 02:22:24 +0000 (Mon, 06 Apr 2009) Log Message: ----------- As per Mantis #3623, allow libruby.so to be pulled into CSWruby instead of CSWrubydev. Modified Paths: -------------- csw/mgar/pkg/ruby/trunk/Makefile Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2009-04-06 02:17:49 UTC (rev 4208) +++ csw/mgar/pkg/ruby/trunk/Makefile 2009-04-06 02:22:24 UTC (rev 4209) @@ -44,7 +44,6 @@ PKGFILES_CSWrubytk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb PKGFILES_CSWrubydev = $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a -PKGFILES_CSWrubydev += $(libdir)/libruby.so MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/ MASTER_SITES += ftp://www.ibiblio.org/pub/languages/ruby/ 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 6 16:52:57 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 06 Apr 2009 14:52:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[4210] csw/mgar/pkg/ncurses/trunk/Makefile Message-ID: Revision: 4210 http://gar.svn.sourceforge.net/gar/?rev=4210&view=rev Author: dmichelsen Date: 2009-04-06 14:52:54 +0000 (Mon, 06 Apr 2009) Log Message: ----------- ncurses: Add both includes for ncurses and ncursesw Modified Paths: -------------- csw/mgar/pkg/ncurses/trunk/Makefile Modified: csw/mgar/pkg/ncurses/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncurses/trunk/Makefile 2009-04-06 02:22:24 UTC (rev 4209) +++ csw/mgar/pkg/ncurses/trunk/Makefile 2009-04-06 14:52:54 UTC (rev 4210) @@ -50,7 +50,7 @@ CONFIGURE_ARGS += --without-xterm-new MERGE_SCRIPTS_isa-sparcv8-widec-disable = copy-only copy-config-only - MERGE_DIRS_isa-sparcv8-widec-disable = $(libdir) + MERGE_DIRS_isa-sparcv8-widec-disable = $(libdir) $(includedir) MERGE_SCRIPTS_isa-sparcv9-widec-disable = copy-relocated-only copy-config-only MERGE_DIRS_isa-sparcv9-widec-disable = $(libdir) @@ -59,7 +59,7 @@ MERGE_DIRS_isa-sparcv9-widec-enable = $(libdir) MERGE_SCRIPTS_isa-i386-widec-disable = copy-only copy-config-only - MERGE_DIRS_isa-i386-widec-disable = $(libdir) + MERGE_DIRS_isa-i386-widec-disable = $(libdir) $(includedir) MERGE_SCRIPTS_isa-amd64-widec-disable = copy-relocated-only copy-config-only MERGE_DIRS_isa-amd64-widec-disable = $(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 Mon Apr 6 16:57:25 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 06 Apr 2009 14:57:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4211] csw/mgar/pkg/gnumeric/trunk Message-ID: Revision: 4211 http://gar.svn.sourceforge.net/gar/?rev=4211&view=rev Author: hson Date: 2009-04-06 14:57:25 +0000 (Mon, 06 Apr 2009) Log Message: ----------- gnumeric: Update to 1.9.5 Modified Paths: -------------- csw/mgar/pkg/gnumeric/trunk/Makefile csw/mgar/pkg/gnumeric/trunk/checksums csw/mgar/pkg/gnumeric/trunk/files/mainpatch Modified: csw/mgar/pkg/gnumeric/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnumeric/trunk/Makefile 2009-04-06 14:52:54 UTC (rev 4210) +++ csw/mgar/pkg/gnumeric/trunk/Makefile 2009-04-06 14:57:25 UTC (rev 4211) @@ -1,10 +1,10 @@ GARNAME = gnumeric -GARVERSION = 1.8.3 +GARVERSION = 1.9.5 CATEGORIES = gnome -DESCRIPTION = Brief description +DESCRIPTION = GNOME spreadsheet program define BLURB - Long description + The project aims to become a drop in replacement for proprietary spreadsheets. endef MASTER_SITES = $(GNOME_MIRROR) @@ -19,8 +19,10 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES = mainpatch +#PATCHFILES = mainpatch CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/gnumeric/trunk/checksums =================================================================== --- csw/mgar/pkg/gnumeric/trunk/checksums 2009-04-06 14:52:54 UTC (rev 4210) +++ csw/mgar/pkg/gnumeric/trunk/checksums 2009-04-06 14:57:25 UTC (rev 4211) @@ -1,2 +1 @@ -64721d3c0d48ffeb5bf721315682cdcd download/gnumeric-1.8.3.tar.gz -cf9ffd8f1b23eec556cd949af385b972 download/mainpatch +4bc2ca7b90e953934b086c931238fd04 download/gnumeric-1.9.5.tar.gz Modified: csw/mgar/pkg/gnumeric/trunk/files/mainpatch =================================================================== --- csw/mgar/pkg/gnumeric/trunk/files/mainpatch 2009-04-06 14:52:54 UTC (rev 4210) +++ csw/mgar/pkg/gnumeric/trunk/files/mainpatch 2009-04-06 14:57:25 UTC (rev 4211) @@ -1,68 +1,3 @@ -Only in gnumeric-1.8.3: Makefile -Only in gnumeric-1.8.3: config.log -Only in gnumeric-1.8.3: config.status -Only in gnumeric-1.8.3: config.status.lineno -Only in gnumeric-1.8.3/doc/C: Makefile -Only in gnumeric-1.8.3/doc/C/figures: Makefile -Only in gnumeric-1.8.3/doc/C/figures/icons: Makefile -Only in gnumeric-1.8.3/doc/C: gnumeric-C.omf.out -Only in gnumeric-1.8.3/doc/C: omf_timestamp -Only in gnumeric-1.8.3/doc: Makefile -Only in gnumeric-1.8.3/doc/developer: Makefile -Only in gnumeric-1.8.3: gnumeric-config.h -Only in gnumeric-1.8.3: gnumeric-features.h -Only in gnumeric-1.8.3: gnumeric.desktop -Only in gnumeric-1.8.3/icons: Makefile -Only in gnumeric-1.8.3: intltool-extract -Only in gnumeric-1.8.3: intltool-merge -Only in gnumeric-1.8.3: intltool-update -Only in gnumeric-1.8.3: libspreadsheet-1.8.pc -Only in gnumeric-1.8.3: libspreadsheet.pc -Only in gnumeric-1.8.3: libtool -Only in gnumeric-1.8.3/plugins: Makefile -Only in gnumeric-1.8.3/plugins/applix: .deps -Only in gnumeric-1.8.3/plugins/applix: .libs -Only in gnumeric-1.8.3/plugins/applix: Makefile -Only in gnumeric-1.8.3/plugins/applix: applix-read.lo -Only in gnumeric-1.8.3/plugins/applix: applix-write.lo -Only in gnumeric-1.8.3/plugins/applix: applix.la -Only in gnumeric-1.8.3/plugins/applix: boot.lo -Only in gnumeric-1.8.3/plugins/applix: plugin.xml -Only in gnumeric-1.8.3/plugins/corba: .deps -Only in gnumeric-1.8.3/plugins/corba: .libs -Only in gnumeric-1.8.3/plugins/corba: GNOME_Gnumeric-common.c -Only in gnumeric-1.8.3/plugins/corba: GNOME_Gnumeric-common.lo -Only in gnumeric-1.8.3/plugins/corba: GNOME_Gnumeric-skels.c -Only in gnumeric-1.8.3/plugins/corba: GNOME_Gnumeric-skels.lo -Only in gnumeric-1.8.3/plugins/corba: GNOME_Gnumeric-stubs.c -Only in gnumeric-1.8.3/plugins/corba: GNOME_Gnumeric-stubs.lo -Only in gnumeric-1.8.3/plugins/corba: GNOME_Gnumeric.h -Only in gnumeric-1.8.3/plugins/corba: Makefile -Only in gnumeric-1.8.3/plugins/corba: corba-application.lo -Only in gnumeric-1.8.3/plugins/corba: corba-sheet.lo -Only in gnumeric-1.8.3/plugins/corba: corba-workbook.lo -Only in gnumeric-1.8.3/plugins/corba: corba.la -Only in gnumeric-1.8.3/plugins/corba: plugin.xml -Only in gnumeric-1.8.3/plugins/corba: stamp_Gnumeric_idl -Only in gnumeric-1.8.3/plugins/derivatives: .deps -Only in gnumeric-1.8.3/plugins/derivatives: .libs -Only in gnumeric-1.8.3/plugins/derivatives: Makefile -Only in gnumeric-1.8.3/plugins/derivatives: derivatives.la -Only in gnumeric-1.8.3/plugins/derivatives: options.lo -Only in gnumeric-1.8.3/plugins/derivatives: plugin.xml -Only in gnumeric-1.8.3/plugins/dif: .deps -Only in gnumeric-1.8.3/plugins/dif: .libs -Only in gnumeric-1.8.3/plugins/dif: Makefile -Only in gnumeric-1.8.3/plugins/dif: dif.la -Only in gnumeric-1.8.3/plugins/dif: dif.lo -Only in gnumeric-1.8.3/plugins/dif: plugin.xml -Only in gnumeric-1.8.3/plugins/excel: .deps -Only in gnumeric-1.8.3/plugins/excel: .libs -Only in gnumeric-1.8.3/plugins/excel: Makefile -Only in gnumeric-1.8.3/plugins/excel: boot.lo -Only in gnumeric-1.8.3/plugins/excel: crypt-md4.lo -Only in gnumeric-1.8.3/plugins/excel: excel-xml-read.lo -Only in gnumeric-1.8.3/plugins/excel: excel.la diff -ru gnumeric-1.8.3.orig/plugins/excel/md5.h gnumeric-1.8.3/plugins/excel/md5.h --- gnumeric-1.8.3.orig/plugins/excel/md5.h 2008-01-15 00:55:11.000000000 +0100 +++ gnumeric-1.8.3/plugins/excel/md5.h 2009-03-17 00:23:02.110582251 +0100 @@ -78,150 +13,6 @@ #define MD5_DIGEST_SIZE 16 #define MD5_BLOCK_SIZE 64 -Only in gnumeric-1.8.3/plugins/excel: md5.lo -Only in gnumeric-1.8.3/plugins/excel: ms-biff.lo -Only in gnumeric-1.8.3/plugins/excel: ms-chart.lo -Only in gnumeric-1.8.3/plugins/excel: ms-container.lo -Only in gnumeric-1.8.3/plugins/excel: ms-escher.lo -Only in gnumeric-1.8.3/plugins/excel: ms-excel-read.lo -Only in gnumeric-1.8.3/plugins/excel: ms-excel-util.lo -Only in gnumeric-1.8.3/plugins/excel: ms-excel-write.lo -Only in gnumeric-1.8.3/plugins/excel: ms-formula-read.lo -Only in gnumeric-1.8.3/plugins/excel: ms-formula-write.lo -Only in gnumeric-1.8.3/plugins/excel: ms-obj.lo -Only in gnumeric-1.8.3/plugins/excel: ms-pivot.lo -Only in gnumeric-1.8.3/plugins/excel: plugin.xml -Only in gnumeric-1.8.3/plugins/excel: rc4.lo -Only in gnumeric-1.8.3/plugins/excel: xlsx-read.lo -Only in gnumeric-1.8.3/plugins/excel: xlsx-utils.lo -Only in gnumeric-1.8.3/plugins/excel: xlsx-write.lo -Only in gnumeric-1.8.3/plugins/fn-complex: .deps -Only in gnumeric-1.8.3/plugins/fn-complex: .libs -Only in gnumeric-1.8.3/plugins/fn-complex: Makefile -Only in gnumeric-1.8.3/plugins/fn-complex: functions.lo -Only in gnumeric-1.8.3/plugins/fn-complex: gsl-complex.lo -Only in gnumeric-1.8.3/plugins/fn-complex: plugin.la -Only in gnumeric-1.8.3/plugins/fn-complex: plugin.xml -Only in gnumeric-1.8.3/plugins/fn-database: .deps -Only in gnumeric-1.8.3/plugins/fn-database: .libs -Only in gnumeric-1.8.3/plugins/fn-database: Makefile -Only in gnumeric-1.8.3/plugins/fn-database: functions.lo -Only in gnumeric-1.8.3/plugins/fn-database: plugin.la -Only in gnumeric-1.8.3/plugins/fn-database: plugin.xml -Only in gnumeric-1.8.3/plugins/fn-date: .deps -Only in gnumeric-1.8.3/plugins/fn-date: .libs -Only in gnumeric-1.8.3/plugins/fn-date: Makefile -Only in gnumeric-1.8.3/plugins/fn-date: functions.lo -Only in gnumeric-1.8.3/plugins/fn-date: plugin.la -Only in gnumeric-1.8.3/plugins/fn-date: plugin.xml -Only in gnumeric-1.8.3/plugins/fn-eng: .deps -Only in gnumeric-1.8.3/plugins/fn-eng: .libs -Only in gnumeric-1.8.3/plugins/fn-eng: Makefile -Only in gnumeric-1.8.3/plugins/fn-eng: functions.lo -Only in gnumeric-1.8.3/plugins/fn-eng: plugin.la -Only in gnumeric-1.8.3/plugins/fn-eng: plugin.xml -Only in gnumeric-1.8.3/plugins/fn-erlang: .deps -Only in gnumeric-1.8.3/plugins/fn-erlang: .libs -Only in gnumeric-1.8.3/plugins/fn-erlang: Makefile -Only in gnumeric-1.8.3/plugins/fn-erlang: erlang.la -Only in gnumeric-1.8.3/plugins/fn-erlang: functions.lo -Only in gnumeric-1.8.3/plugins/fn-erlang: plugin.xml -Only in gnumeric-1.8.3/plugins/fn-financial: .deps -Only in gnumeric-1.8.3/plugins/fn-financial: .libs -Only in gnumeric-1.8.3/plugins/fn-financial: Makefile -Only in gnumeric-1.8.3/plugins/fn-financial: functions.lo -Only in gnumeric-1.8.3/plugins/fn-financial: plugin.la -Only in gnumeric-1.8.3/plugins/fn-financial: plugin.xml -Only in gnumeric-1.8.3/plugins/fn-financial: sc-fin.lo -Only in gnumeric-1.8.3/plugins/fn-info: .deps -Only in gnumeric-1.8.3/plugins/fn-info: .libs -Only in gnumeric-1.8.3/plugins/fn-info: Makefile -Only in gnumeric-1.8.3/plugins/fn-info: functions.lo -Only in gnumeric-1.8.3/plugins/fn-info: plugin.la -Only in gnumeric-1.8.3/plugins/fn-info: plugin.xml -Only in gnumeric-1.8.3/plugins/fn-logical: .deps -Only in gnumeric-1.8.3/plugins/fn-logical: .libs -Only in gnumeric-1.8.3/plugins/fn-logical: Makefile -Only in gnumeric-1.8.3/plugins/fn-logical: functions.lo -Only in gnumeric-1.8.3/plugins/fn-logical: plugin.la -Only in gnumeric-1.8.3/plugins/fn-logical: plugin.xml -Only in gnumeric-1.8.3/plugins/fn-lookup: .deps -Only in gnumeric-1.8.3/plugins/fn-lookup: .libs -Only in gnumeric-1.8.3/plugins/fn-lookup: Makefile -Only in gnumeric-1.8.3/plugins/fn-lookup: functions.lo -Only in gnumeric-1.8.3/plugins/fn-lookup: plugin.la -Only in gnumeric-1.8.3/plugins/fn-lookup: plugin.xml -Only in gnumeric-1.8.3/plugins/fn-math: .deps -Only in gnumeric-1.8.3/plugins/fn-math: .libs -Only in gnumeric-1.8.3/plugins/fn-math: Makefile -Only in gnumeric-1.8.3/plugins/fn-math: functions.lo -Only in gnumeric-1.8.3/plugins/fn-math: plugin.la -Only in gnumeric-1.8.3/plugins/fn-math: plugin.xml -Only in gnumeric-1.8.3/plugins/fn-r: .deps -Only in gnumeric-1.8.3/plugins/fn-r: .libs -Only in gnumeric-1.8.3/plugins/fn-r: Makefile -Only in gnumeric-1.8.3/plugins/fn-r: extra.lo -Only in gnumeric-1.8.3/plugins/fn-r: functions.lo -Only in gnumeric-1.8.3/plugins/fn-r: plugin.xml -Only in gnumeric-1.8.3/plugins/fn-r: rstat.la -Only in gnumeric-1.8.3/plugins/fn-random: .deps -Only in gnumeric-1.8.3/plugins/fn-random: .libs -Only in gnumeric-1.8.3/plugins/fn-random: Makefile -Only in gnumeric-1.8.3/plugins/fn-random: functions.lo -Only in gnumeric-1.8.3/plugins/fn-random: plugin.la -Only in gnumeric-1.8.3/plugins/fn-random: plugin.xml -Only in gnumeric-1.8.3/plugins/fn-stat: .deps -Only in gnumeric-1.8.3/plugins/fn-stat: .libs -Only in gnumeric-1.8.3/plugins/fn-stat: Makefile -Only in gnumeric-1.8.3/plugins/fn-stat: functions.lo -Only in gnumeric-1.8.3/plugins/fn-stat: plugin.la -Only in gnumeric-1.8.3/plugins/fn-stat: plugin.xml -Only in gnumeric-1.8.3/plugins/fn-string: .deps -Only in gnumeric-1.8.3/plugins/fn-string: .libs -Only in gnumeric-1.8.3/plugins/fn-string: Makefile -Only in gnumeric-1.8.3/plugins/fn-string: functions.lo -Only in gnumeric-1.8.3/plugins/fn-string: plugin.la -Only in gnumeric-1.8.3/plugins/fn-string: plugin.xml -Only in gnumeric-1.8.3/plugins/fn-tsa: .deps -Only in gnumeric-1.8.3/plugins/fn-tsa: .libs -Only in gnumeric-1.8.3/plugins/fn-tsa: Makefile -Only in gnumeric-1.8.3/plugins/fn-tsa: functions.lo -Only in gnumeric-1.8.3/plugins/fn-tsa: plugin.la -Only in gnumeric-1.8.3/plugins/fn-tsa: plugin.xml -Only in gnumeric-1.8.3/plugins/gda: .deps -Only in gnumeric-1.8.3/plugins/gda: Makefile -Only in gnumeric-1.8.3/plugins/gnome-db: .deps -Only in gnumeric-1.8.3/plugins/gnome-db: Makefile -Only in gnumeric-1.8.3/plugins/gnome-glossary: Makefile -Only in gnumeric-1.8.3/plugins/html: .deps -Only in gnumeric-1.8.3/plugins/html: .libs -Only in gnumeric-1.8.3/plugins/html: Makefile -Only in gnumeric-1.8.3/plugins/html: boot.lo -Only in gnumeric-1.8.3/plugins/html: font.lo -Only in gnumeric-1.8.3/plugins/html: html.la -Only in gnumeric-1.8.3/plugins/html: html.lo -Only in gnumeric-1.8.3/plugins/html: html_read.lo -Only in gnumeric-1.8.3/plugins/html: latex.lo -Only in gnumeric-1.8.3/plugins/html: plugin.xml -Only in gnumeric-1.8.3/plugins/html: roff.lo -Only in gnumeric-1.8.3/plugins/lotus-123: .deps -Only in gnumeric-1.8.3/plugins/lotus-123: .libs -Only in gnumeric-1.8.3/plugins/lotus-123: Makefile -Only in gnumeric-1.8.3/plugins/lotus-123: boot.lo -Only in gnumeric-1.8.3/plugins/lotus-123: lotus-formula.lo -Only in gnumeric-1.8.3/plugins/lotus-123: lotus.la -Only in gnumeric-1.8.3/plugins/lotus-123: lotus.lo -Only in gnumeric-1.8.3/plugins/lotus-123: plugin.xml -Only in gnumeric-1.8.3/plugins/mps: .deps -Only in gnumeric-1.8.3/plugins/mps: .libs -Only in gnumeric-1.8.3/plugins/mps: Makefile -Only in gnumeric-1.8.3/plugins/mps: mps.la -Only in gnumeric-1.8.3/plugins/mps: mps.lo -Only in gnumeric-1.8.3/plugins/mps: parser.lo -Only in gnumeric-1.8.3/plugins/mps: plugin.xml -Only in gnumeric-1.8.3/plugins/numtheory: .deps -Only in gnumeric-1.8.3/plugins/numtheory: .libs -Only in gnumeric-1.8.3/plugins/numtheory: Makefile diff -ru gnumeric-1.8.3.orig/plugins/numtheory/numtheory.c gnumeric-1.8.3/plugins/numtheory/numtheory.c --- gnumeric-1.8.3.orig/plugins/numtheory/numtheory.c 2008-01-15 00:55:10.000000000 +0100 +++ gnumeric-1.8.3/plugins/numtheory/numtheory.c 2009-03-17 00:55:21.253509921 +0100 @@ -240,90 +31,6 @@ /* ------------------------------------------------------------------------- */ -Only in gnumeric-1.8.3/plugins/numtheory: numtheory.e -Only in gnumeric-1.8.3/plugins/numtheory: numtheory.la -Only in gnumeric-1.8.3/plugins/numtheory: numtheory.lo -Only in gnumeric-1.8.3/plugins/numtheory: plugin.xml -Only in gnumeric-1.8.3/plugins/oleo: .deps -Only in gnumeric-1.8.3/plugins/oleo: .libs -Only in gnumeric-1.8.3/plugins/oleo: Makefile -Only in gnumeric-1.8.3/plugins/oleo: boot.lo -Only in gnumeric-1.8.3/plugins/oleo: oleo.la -Only in gnumeric-1.8.3/plugins/oleo: oleo.lo -Only in gnumeric-1.8.3/plugins/oleo: plugin.xml -Only in gnumeric-1.8.3/plugins/openoffice: .deps -Only in gnumeric-1.8.3/plugins/openoffice: .libs -Only in gnumeric-1.8.3/plugins/openoffice: Makefile -Only in gnumeric-1.8.3/plugins/openoffice: openoffice-read.lo -Only in gnumeric-1.8.3/plugins/openoffice: openoffice-write.lo -Only in gnumeric-1.8.3/plugins/openoffice: openoffice.la -Only in gnumeric-1.8.3/plugins/openoffice: plugin.xml -Only in gnumeric-1.8.3/plugins/paradox: .deps -Only in gnumeric-1.8.3/plugins/paradox: Makefile -Only in gnumeric-1.8.3/plugins/perl-func: Makefile -Only in gnumeric-1.8.3/plugins/perl-func: plugin.xml -Only in gnumeric-1.8.3/plugins/perl-loader: .libs -Only in gnumeric-1.8.3/plugins/perl-loader: Makefile -Only in gnumeric-1.8.3/plugins/perl-loader: boot.lo -Only in gnumeric-1.8.3/plugins/perl-loader: perl-gnumeric.lo -Only in gnumeric-1.8.3/plugins/perl-loader: perl-loader.lo -Only in gnumeric-1.8.3/plugins/perl-loader: perl_loader.la -Only in gnumeric-1.8.3/plugins/perl-loader: plugin.xml -Only in gnumeric-1.8.3/plugins/perl-loader: xsinit.c -Only in gnumeric-1.8.3/plugins/perl-loader: xsinit.lo -Only in gnumeric-1.8.3/plugins/plan-perfect: .deps -Only in gnumeric-1.8.3/plugins/plan-perfect: .libs -Only in gnumeric-1.8.3/plugins/plan-perfect: Makefile -Only in gnumeric-1.8.3/plugins/plan-perfect: charset.lo -Only in gnumeric-1.8.3/plugins/plan-perfect: plan_perfect.la -Only in gnumeric-1.8.3/plugins/plan-perfect: pln.lo -Only in gnumeric-1.8.3/plugins/plan-perfect: plugin.xml -Only in gnumeric-1.8.3/plugins/psiconv: .deps -Only in gnumeric-1.8.3/plugins/psiconv: Makefile -Only in gnumeric-1.8.3/plugins/py-func: Makefile -Only in gnumeric-1.8.3/plugins/python-loader: .deps -Only in gnumeric-1.8.3/plugins/python-loader: Makefile -Only in gnumeric-1.8.3/plugins/qpro: .deps -Only in gnumeric-1.8.3/plugins/qpro: .libs -Only in gnumeric-1.8.3/plugins/qpro: Makefile -Only in gnumeric-1.8.3/plugins/qpro: plugin.xml -Only in gnumeric-1.8.3/plugins/qpro: qpro-read.lo -Only in gnumeric-1.8.3/plugins/qpro: qpro.la -Only in gnumeric-1.8.3/plugins/sample_datasource: .deps -Only in gnumeric-1.8.3/plugins/sample_datasource: .libs -Only in gnumeric-1.8.3/plugins/sample_datasource: Makefile -Only in gnumeric-1.8.3/plugins/sample_datasource: plugin.xml -Only in gnumeric-1.8.3/plugins/sample_datasource: sample_datasource.la -Only in gnumeric-1.8.3/plugins/sample_datasource: sample_datasource.lo -Only in gnumeric-1.8.3/plugins/sc: .deps -Only in gnumeric-1.8.3/plugins/sc: .libs -Only in gnumeric-1.8.3/plugins/sc: Makefile -Only in gnumeric-1.8.3/plugins/sc: plugin.xml -Only in gnumeric-1.8.3/plugins/sc: sc.la -Only in gnumeric-1.8.3/plugins/sc: sc.lo -Only in gnumeric-1.8.3/plugins/sylk: .deps -Only in gnumeric-1.8.3/plugins/sylk: .libs -Only in gnumeric-1.8.3/plugins/sylk: Makefile -Only in gnumeric-1.8.3/plugins/sylk: plugin.xml -Only in gnumeric-1.8.3/plugins/sylk: sylk-write.lo -Only in gnumeric-1.8.3/plugins/sylk: sylk.la -Only in gnumeric-1.8.3/plugins/sylk: sylk.lo -Only in gnumeric-1.8.3/plugins/uihello: .deps -Only in gnumeric-1.8.3/plugins/uihello: .libs -Only in gnumeric-1.8.3/plugins/uihello: Makefile -Only in gnumeric-1.8.3/plugins/uihello: plugin.la -Only in gnumeric-1.8.3/plugins/uihello: plugin.xml -Only in gnumeric-1.8.3/plugins/uihello: uihello.lo -Only in gnumeric-1.8.3/plugins/xbase: .deps -Only in gnumeric-1.8.3/plugins/xbase: .libs -Only in gnumeric-1.8.3/plugins/xbase: Makefile -Only in gnumeric-1.8.3/plugins/xbase: boot.lo -Only in gnumeric-1.8.3/plugins/xbase: plugin.xml -Only in gnumeric-1.8.3/plugins/xbase: xbase.la -Only in gnumeric-1.8.3/plugins/xbase: xbase.lo -Only in gnumeric-1.8.3/po: .intltool-merge-cache -Only in gnumeric-1.8.3/po: Makefile -Only in gnumeric-1.8.3/po: Makefile.in diff -ru gnumeric-1.8.3.orig/po/Makefile.in.in gnumeric-1.8.3/po/Makefile.in.in --- gnumeric-1.8.3.orig/po/Makefile.in.in 2008-05-24 22:40:36.000000000 +0200 +++ gnumeric-1.8.3/po/Makefile.in.in 2009-03-17 00:59:24.557217225 +0100 @@ -336,183 +43,6 @@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ -Only in gnumeric-1.8.3/po: POTFILES -Only in gnumeric-1.8.3/po: am.gmo -Only in gnumeric-1.8.3/po: ar.gmo -Only in gnumeric-1.8.3/po: az.gmo -Only in gnumeric-1.8.3/po: bg.gmo -Only in gnumeric-1.8.3/po: ca.gmo -Only in gnumeric-1.8.3/po: cs.gmo -Only in gnumeric-1.8.3/po: da.gmo -Only in gnumeric-1.8.3/po: de.gmo -Only in gnumeric-1.8.3/po: dz.gmo -Only in gnumeric-1.8.3/po: el.gmo -Only in gnumeric-1.8.3/po: en_CA.gmo -Only in gnumeric-1.8.3/po: en_GB.gmo -Only in gnumeric-1.8.3/po: es.gmo -Only in gnumeric-1.8.3/po: et.gmo -Only in gnumeric-1.8.3/po: fi.gmo -Only in gnumeric-1.8.3/po: fr.gmo -Only in gnumeric-1.8.3/po: ga.gmo -Only in gnumeric-1.8.3/po: gl.gmo -Only in gnumeric-1.8.3/po: he.gmo -Only in gnumeric-1.8.3/po: hr.gmo -Only in gnumeric-1.8.3/po: hu.gmo -Only in gnumeric-1.8.3/po: it.gmo -Only in gnumeric-1.8.3/po: ja.gmo -Only in gnumeric-1.8.3/po: ko.gmo -Only in gnumeric-1.8.3/po: lt.gmo -Only in gnumeric-1.8.3/po: lv.gmo -Only in gnumeric-1.8.3/po: mk.gmo -Only in gnumeric-1.8.3/po: ml.gmo -Only in gnumeric-1.8.3/po: mr.gmo -Only in gnumeric-1.8.3/po: ms.gmo -Only in gnumeric-1.8.3/po: nb.gmo -Only in gnumeric-1.8.3/po: ne.gmo -Only in gnumeric-1.8.3/po: nl.gmo -Only in gnumeric-1.8.3/po: nn.gmo -Only in gnumeric-1.8.3/po: oc.gmo -Only in gnumeric-1.8.3/po: pl.gmo -Only in gnumeric-1.8.3/po: pt.gmo -Only in gnumeric-1.8.3/po: pt_BR.gmo -Only in gnumeric-1.8.3/po: ro.gmo -Only in gnumeric-1.8.3/po: ru.gmo -Only in gnumeric-1.8.3/po: rw.gmo -Only in gnumeric-1.8.3/po: sk.gmo -Only in gnumeric-1.8.3/po: sr.gmo -Only in gnumeric-1.8.3/po: sr at Latn.gmo -Only in gnumeric-1.8.3/po: stamp-it -Only in gnumeric-1.8.3/po: sv.gmo -Only in gnumeric-1.8.3/po: te.gmo -Only in gnumeric-1.8.3/po: tr.gmo -Only in gnumeric-1.8.3/po: uk.gmo -Only in gnumeric-1.8.3/po: vi.gmo -Only in gnumeric-1.8.3/po: zh_CN.gmo -Only in gnumeric-1.8.3/po: zh_TW.gmo -Only in gnumeric-1.8.3/po-functions: Makefile -Only in gnumeric-1.8.3/po-functions: Makefile.in -Only in gnumeric-1.8.3/po-functions: POTFILES -Only in gnumeric-1.8.3/po-functions: am.gmo -Only in gnumeric-1.8.3/po-functions: ar.gmo -Only in gnumeric-1.8.3/po-functions: az.gmo -Only in gnumeric-1.8.3/po-functions: bg.gmo -Only in gnumeric-1.8.3/po-functions: ca.gmo -Only in gnumeric-1.8.3/po-functions: cs.gmo -Only in gnumeric-1.8.3/po-functions: da.gmo -Only in gnumeric-1.8.3/po-functions: de.gmo -Only in gnumeric-1.8.3/po-functions: dz.gmo -Only in gnumeric-1.8.3/po-functions: el.gmo -Only in gnumeric-1.8.3/po-functions: en_CA.gmo -Only in gnumeric-1.8.3/po-functions: en_GB.gmo -Only in gnumeric-1.8.3/po-functions: es.gmo -Only in gnumeric-1.8.3/po-functions: et.gmo -Only in gnumeric-1.8.3/po-functions: fi.gmo -Only in gnumeric-1.8.3/po-functions: fr.gmo -Only in gnumeric-1.8.3/po-functions: ga.gmo -Only in gnumeric-1.8.3/po-functions: gl.gmo -Only in gnumeric-1.8.3/po-functions: he.gmo -Only in gnumeric-1.8.3/po-functions: hr.gmo -Only in gnumeric-1.8.3/po-functions: hu.gmo -Only in gnumeric-1.8.3/po-functions: it.gmo -Only in gnumeric-1.8.3/po-functions: ja.gmo -Only in gnumeric-1.8.3/po-functions: ko.gmo -Only in gnumeric-1.8.3/po-functions: lt.gmo -Only in gnumeric-1.8.3/po-functions: lv.gmo -Only in gnumeric-1.8.3/po-functions: mk.gmo -Only in gnumeric-1.8.3/po-functions: ml.gmo -Only in gnumeric-1.8.3/po-functions: mr.gmo -Only in gnumeric-1.8.3/po-functions: ms.gmo -Only in gnumeric-1.8.3/po-functions: nb.gmo -Only in gnumeric-1.8.3/po-functions: ne.gmo -Only in gnumeric-1.8.3/po-functions: nl.gmo -Only in gnumeric-1.8.3/po-functions: nn.gmo -Only in gnumeric-1.8.3/po-functions: oc.gmo -Only in gnumeric-1.8.3/po-functions: pl.gmo -Only in gnumeric-1.8.3/po-functions: pt.gmo -Only in gnumeric-1.8.3/po-functions: pt_BR.gmo -Only in gnumeric-1.8.3/po-functions: ro.gmo -Only in gnumeric-1.8.3/po-functions: ru.gmo -Only in gnumeric-1.8.3/po-functions: rw.gmo -Only in gnumeric-1.8.3/po-functions: sk.gmo -Only in gnumeric-1.8.3/po-functions: sr.gmo -Only in gnumeric-1.8.3/po-functions: sr at Latn.gmo -Only in gnumeric-1.8.3/po-functions: sv.gmo -Only in gnumeric-1.8.3/po-functions: te.gmo -Only in gnumeric-1.8.3/po-functions: tr.gmo -Only in gnumeric-1.8.3/po-functions: uk.gmo -Only in gnumeric-1.8.3/po-functions: vi.gmo -Only in gnumeric-1.8.3/po-functions: zh_CN.gmo -Only in gnumeric-1.8.3/po-functions: zh_TW.gmo -Only in gnumeric-1.8.3/schemas: Makefile -Only in gnumeric-1.8.3/schemas: gnumeric-dialogs.schemas -Only in gnumeric-1.8.3/schemas: gnumeric-general.schemas -Only in gnumeric-1.8.3/schemas: gnumeric-plugins.schemas -Only in gnumeric-1.8.3/src: .deps -Only in gnumeric-1.8.3/src: .libs -Only in gnumeric-1.8.3/src: GNOME_Gnumeric-gtk.xml -Only in gnumeric-1.8.3/src: Makefile -Only in gnumeric-1.8.3/src/cut-n-paste-code: Makefile -Only in gnumeric-1.8.3/src/dialogs: .deps -Only in gnumeric-1.8.3/src/dialogs: .libs -Only in gnumeric-1.8.3/src/dialogs: Makefile -Only in gnumeric-1.8.3/src/dialogs: dao-gui-utils.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-about.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-advanced-filter.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-analysis-tools.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-autocorrect.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-autofilter.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-autoformat.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-autosave.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-cell-comment.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-cell-format.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-cell-sort.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-col-row.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-col-width.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-consolidate.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-data-table.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-define-names.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-delete-cells.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-doc-metadata.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-fill-series.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-formula-guru.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-function-select.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-goal-seek.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-goto-cell.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-hyperlink.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-insert-cells.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-merge.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-password.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-paste-names.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-paste-special.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-plugin-manager.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-preferences.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-printer-setup.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-quit.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-random-generator.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-recent.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-row-height.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-scenarios.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-search-replace.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-search.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-sheet-order.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-shuffle.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-simulation.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-so-list.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-so-styled.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-solver.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-stf-csv-page.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-stf-export.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-stf-fixed-page.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-stf-format-page.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-stf-main-page.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-stf-preview.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-stf.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-tabulate.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-view.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-workbook-attr.lo -Only in gnumeric-1.8.3/src/dialogs: dialog-zoom.lo -Only in gnumeric-1.8.3/src/dialogs: libdialogs.la -Only in gnumeric-1.8.3/src: gnm-marshalers.h diff -ru gnumeric-1.8.3.orig/src/gnm-so-polygon.c gnumeric-1.8.3/src/gnm-so-polygon.c --- gnumeric-1.8.3.orig/src/gnm-so-polygon.c 2008-01-15 00:54:39.000000000 +0100 +++ gnumeric-1.8.3/src/gnm-so-polygon.c 2009-03-16 23:35:49.881228497 +0100 @@ -525,206 +55,3 @@ } static void -Only in gnumeric-1.8.3/src: gnumeric -Only in gnumeric-1.8.3/src: gnumeric-paths.h -Only in gnumeric-1.8.3/src: io-context-gtk.o -Only in gnumeric-1.8.3/src: libspreadsheet.la -Only in gnumeric-1.8.3/src: libspreadsheet_la-application.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-auto-format.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-cell-draw.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-cell.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-cellspan.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-clipboard.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-cmd-edit.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-collect.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-colrow.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-command-context-stderr.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-command-context.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-commands.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-complete-sheet.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-complete.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-complex.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-consolidate.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-dependent.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-expr-name.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-expr.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-file-autoft.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-format-template.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-func-builtin.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-func.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-datetime.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-format.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-graph-window.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-marshalers.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-pane.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-plugin.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-so-filled.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-so-line.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-gnm-so-polygon.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-gnumeric-gconf.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-gnumeric-simple-canvas.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-graph.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-gui-clipboard.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-gui-file.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-gui-util.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-gutils.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-history.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-hlink.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-input-msg.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-item-acetate.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-item-bar.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-item-cursor.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-item-debug.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-item-edit.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-item-grid.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-libgnumeric.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-mathfunc.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-mstyle.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-number-match.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-parse-util.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-parser.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-pattern.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-position.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-preview-grid.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-print-cell.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-print-info.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-print.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-rangefunc-strings.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-rangefunc.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-ranges.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-rendered-value.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-search.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-selection.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-session.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-autofill.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-control-gui.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-control.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-filter.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-merge.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-object-cell-comment.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-object-graph.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-object-image.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-object-widget.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-object.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-style.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet-view.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-sheet.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-sort.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-stf-export.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-stf-parse.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-stf.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-str.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-style-border.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-style-color.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-style-conditions.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-style.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-symbol.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-validation.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-value-sheet.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-value.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-wbc-gtk-actions.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-wbc-gtk-edit.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-wbc-gtk.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-workbook-cmd-format.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-workbook-control.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-workbook-view.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-workbook.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-xml-io.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-xml-sax-read.lo -Only in gnumeric-1.8.3/src: libspreadsheet_la-xml-sax-write.lo -Only in gnumeric-1.8.3/src: main-application.o -Only in gnumeric-1.8.3/src/pixmaps: Makefile -Only in gnumeric-1.8.3/src/pixmaps: gnumeric-stock-pixbufs.h -Only in gnumeric-1.8.3/src: ssconvert -Only in gnumeric-1.8.3/src: ssconvert.o -Only in gnumeric-1.8.3/src: ssindex -Only in gnumeric-1.8.3/src: ssindex.o -Only in gnumeric-1.8.3/src/tools: .deps -Only in gnumeric-1.8.3/src/tools: .libs -Only in gnumeric-1.8.3/src/tools: Makefile -Only in gnumeric-1.8.3/src/tools: analysis-histogram.lo -Only in gnumeric-1.8.3/src/tools: analysis-tools.lo -Only in gnumeric-1.8.3/src/tools: auto-correct.lo -Only in gnumeric-1.8.3/src/tools: dao.lo -Only in gnumeric-1.8.3/src/tools: data-shuffling.lo -Only in gnumeric-1.8.3/src/tools: fill-series.lo -Only in gnumeric-1.8.3/src/tools: filter.lo -Only in gnumeric-1.8.3/src/tools: goal-seek.lo -Only in gnumeric-1.8.3/src/tools: libtools.la -Only in gnumeric-1.8.3/src/tools: random-generator.lo -Only in gnumeric-1.8.3/src/tools: scenarios.lo -Only in gnumeric-1.8.3/src/tools: simulation.lo -Only in gnumeric-1.8.3/src/tools/solver: .deps -Only in gnumeric-1.8.3/src/tools/solver: .libs -Only in gnumeric-1.8.3/src/tools/solver: Makefile -Only in gnumeric-1.8.3/src/tools/solver: api.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk: Makefile -Only in gnumeric-1.8.3/src/tools/solver/glpk/include: Makefile -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: .deps -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: .libs -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: Makefile -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpavl.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpdmp.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpinv.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpipp1.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpipp2.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplib1a.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplib1b.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplib2.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplib3.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplib4.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpp1.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpp2.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx1.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx2.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx3.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx4.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx5.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx6a.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx6c.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx6d.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx7.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glplpx7a.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpluf.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpmip1.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpmip2.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpspx1.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpspx2.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: glpstr.lo -Only in gnumeric-1.8.3/src/tools/solver/glpk/source: libglpk.la -Only in gnumeric-1.8.3/src/tools/solver: libsolver.la -Only in gnumeric-1.8.3/src/tools/solver/lp_solve: .deps -Only in gnumeric-1.8.3/src/tools/solver/lp_solve: .libs -Only in gnumeric-1.8.3/src/tools/solver/lp_solve: Makefile -Only in gnumeric-1.8.3/src/tools/solver/lp_solve: liblp_solve.la -Only in gnumeric-1.8.3/src/tools/solver/lp_solve: lp_solve.lo -Only in gnumeric-1.8.3/src/tools/solver: reports-write.lo -Only in gnumeric-1.8.3/src/tools/solver: reports.lo -Only in gnumeric-1.8.3/src/tools/solver: solver.lo -Only in gnumeric-1.8.3/src/tools: tabulate.lo -Only in gnumeric-1.8.3/src/widgets: .deps -Only in gnumeric-1.8.3/src/widgets: .libs -Only in gnumeric-1.8.3/src/widgets: Makefile -Only in gnumeric-1.8.3/src/widgets: gnm-cell-combo-foo-view.lo -Only in gnumeric-1.8.3/src/widgets: gnm-dao.lo -Only in gnumeric-1.8.3/src/widgets: gnm-filter-combo-foo-view.lo -Only in gnumeric-1.8.3/src/widgets: gnm-format-sel.lo -Only in gnumeric-1.8.3/src/widgets: gnm-validation-combo-foo-view.lo -Only in gnumeric-1.8.3/src/widgets: gnumeric-cell-renderer-expr-entry.lo -Only in gnumeric-1.8.3/src/widgets: gnumeric-cell-renderer-text.lo -Only in gnumeric-1.8.3/src/widgets: gnumeric-cell-renderer-toggle.lo -Only in gnumeric-1.8.3/src/widgets: gnumeric-dashed-canvas-line.lo -Only in gnumeric-1.8.3/src/widgets: gnumeric-expr-entry.lo -Only in gnumeric-1.8.3/src/widgets: gnumeric-lazy-list.lo -Only in gnumeric-1.8.3/src/widgets: libwidgets.la -Only in gnumeric-1.8.3/src/widgets: widget-editable-label.lo -Only in gnumeric-1.8.3/src/widgets: widget-font-selector.lo -Only in gnumeric-1.8.3: stamp-h1 -Only in gnumeric-1.8.3: stamp-h2 -Only in gnumeric-1.8.3/templates: Makefile -Only in gnumeric-1.8.3/templates/autoformat: Makefile -Only in gnumeric-1.8.3/templates/english: Makefile -Only in gnumeric-1.8.3/test: Makefile -Only in gnumeric-1.8.3/tools: .deps -Only in gnumeric-1.8.3/tools: Makefile -Only in gnumeric-1.8.3/tools/win32: gnumeric.nsi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmacduff at users.sourceforge.net Mon Apr 6 21:28:32 2009 From: rmacduff at users.sourceforge.net (rmacduff at users.sourceforge.net) Date: Mon, 06 Apr 2009 19:28:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[4212] csw/mgar/pkg/sed/trunk/Makefile Message-ID: Revision: 4212 http://gar.svn.sourceforge.net/gar/?rev=4212&view=rev Author: rmacduff Date: 2009-04-06 19:28:32 +0000 (Mon, 06 Apr 2009) Log Message: ----------- gsed: corrected runtime linker path Modified Paths: -------------- csw/mgar/pkg/sed/trunk/Makefile Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2009-04-06 14:57:25 UTC (rev 4211) +++ csw/mgar/pkg/sed/trunk/Makefile 2009-04-06 19:28:32 UTC (rev 4212) @@ -5,7 +5,7 @@ PACKAGES = CSWgsed CATALOGNAME_CSWgsed = gsed -DESCRIPTION = GNU Stream Editor +DESCRIPTION = The GNU non-interactive text Stream-oriented EDitor (sed) define BLURB Sed, the GNU Stream Editor, copies the named files (standard input default) to the standard output, edited according to a script of commands. @@ -25,6 +25,8 @@ REQUIRED_PKGS = CSWiconv +# No special platform optimization +NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g @@ -37,4 +39,6 @@ # Make sure we are using gnu tools (esp. sed) PATH := /opt/csw/gnu:$(PATH) -EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias +EXTRA_MERGE_EXCLUDE_FILES = $(sharedstatedir)/.*locale.alias +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/charset.alias + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ggunselm at emporia.edu Tue Apr 7 06:05:26 2009 From: ggunselm at emporia.edu (Glen Gunselman) Date: Mon, 06 Apr 2009 23:05:26 -0500 Subject: [csw-devel] Orca and friends packages In-Reply-To: <0D826C3D-72DD-4D61-B481-E58105177490@opencsw.org> References: <49BF8E3F.CC54.005D.3@emporia.edu> <0D826C3D-72DD-4D61-B481-E58105177490@opencsw.org> Message-ID: <49DA8AB5.CC54.005D.0@emporia.edu> I the collection process running on the master and one client. When I run Orca I get the following: /opt/csw/bin/orca -v /opt/csw/etc/orca_services.cfg Orca at Mon Apr 6 22:02:00 2009 running on: Orca version 0.28.0 (dev 535) RRDs version 1.3006 Perl version 5.008008 Loading state from '/var/opt/csw/orca/rrd/orca_services/orca.state'. Creating orca_logo.gif. Creating rrdtool_logo.gif. Creating rothschild_image_logo.png. Finding files and setting up data structures at Mon Apr 6 22:02:00 2009. Current running time is 0:01 minutes. Loading new data from group orca_services for sys1. Loading new data from group orca_services for sysa. Saving state into '/var/opt/csw/orca/rrd/orca_services/orca.state'. Updating PNGs. Creating HTML files in '/opt/csw/share/www/orca/orca_services/'. Sleeping at Mon Apr 6 22:02:02 2009 until Mon Apr 6 22:07:30 2009. Current running time is 5:32 minutes. Loading new data from group orca_services for sys1. Updating PNGs. Sleeping at Mon Apr 6 22:07:31 2009 until Mon Apr 6 22:07:32 2009. Current running time is 5:34 minutes. Loading new data from group orca_services for sysa. Updating PNGs. Sleeping at Mon Apr 6 22:07:33 2009 until Mon Apr 6 22:13:01 2009. ^CCurrent running time is 11:02 minutes. /opt/csw/bin/orca: caught signal INT. At this point the web page contains the headers and trailers plus the table(s) with the two servers but no graphs. The plot statements from the cfg file are of the following format: plot { title %g SMTP Mail Queue source orca_services data mailq_total legend Msgs. in queue (5m) y_legend Number of Messages line_type line2 data_min 0 data_max U href http://o-s.kpnqwest.pt/orca_services.html#SMTP_Mail_Queue } I'm looking for plots like the older versions (0.265 is what I've been using). Unless you have a magic bullet I'm ready to throw in the towel. If I had any obligation to test CSW packages, I feel that I've proven that it's beyond me. I invested a couple of weeks trying but don't really have anything to show for it. Glen Gunselman Systems Software Specialist TCS Emporia State University >>> Dagobert Michelsen dam at opencsw.org> 3/17/2009 4:22 PM >> ( mailto:dam at opencsw.org> ) Basically the packages are ready for use, but the start-scripts are still without SMF-support. Do you know how to operate Orca in general or should I write some small how-to? Best regards -- Dago -------------- next part -------------- An HTML attachment was scrubbed... URL: From valholla at users.sourceforge.net Tue Apr 7 07:22:48 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 07 Apr 2009 05:22:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[4213] csw/mgar/pkg Message-ID: Revision: 4213 http://gar.svn.sourceforge.net/gar/?rev=4213&view=rev Author: valholla Date: 2009-04-07 05:22:47 +0000 (Tue, 07 Apr 2009) Log Message: ----------- initial checkin Added Paths: ----------- csw/mgar/pkg/libffi/ csw/mgar/pkg/libffi/branches/ csw/mgar/pkg/libffi/tags/ csw/mgar/pkg/libffi/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Tue Apr 7 07:23:56 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Tue, 07 Apr 2009 05:23:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[4214] csw/mgar/pkg/libffi/trunk/ Message-ID: Revision: 4214 http://gar.svn.sourceforge.net/gar/?rev=4214&view=rev Author: valholla Date: 2009-04-07 05:23:56 +0000 (Tue, 07 Apr 2009) Log Message: ----------- externals to garv2 Property Changed: ---------------- csw/mgar/pkg/libffi/trunk/ Property changes on: csw/mgar/pkg/libffi/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Tue Apr 7 09:28:00 2009 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 7 Apr 2009 09:28:00 +0200 Subject: [csw-devel] Orca and friends packages In-Reply-To: <49DA8AB5.CC54.005D.0@emporia.edu> References: <49BF8E3F.CC54.005D.3@emporia.edu> <0D826C3D-72DD-4D61-B481-E58105177490@opencsw.org> <49DA8AB5.CC54.005D.0@emporia.edu> Message-ID: Hi Glen, Am 07.04.2009 um 06:05 schrieb Glen Gunselman: > I the collection process running on the master and one client. That means you have applied something like this? --- /opt/csw/bin/start_orcallator.orig 2009-04-07 09:21:13.991714686 +0200 +++ /opt/csw/bin/start_orcallator 2009-04-07 09:21:27.598788701 +0200 @@ -139,7 +139,7 @@ # Now start the logging. echo "Starting logging" -nohup $SE $SE_PATCHES -DWATCH_OS $WATCH_WEB -I$libdir/SE/$SE_VERSION $libdir/orcallator.se & +nohup $SE $SE_PATCHES -DWATCH_OS $WATCH_WEB $libdir/orca/ orcallator.se & # Write the PID of orcallator to a file to make killing easier. pid=$! Then you should have statistics data like this coming in: build8s-dam# ls -l /var/opt/csw/orca/orcallator/build8s-dam/ total 11 -rw-r--r-- 1 root other 7137 Apr 7 09:20 orcallator-2009-04-07-000 -rw-r--r-- 1 root other 1 Apr 7 09:01 orcallator.pid Copy these from the clients to the host doing the graphing e. g. via rsync. > When I run Orca I get the following: > > /opt/csw/bin/orca -v /opt/csw/etc/orca_services.cfg Are you collecting data for services? If you run orcallator.se you must run /opt/csw/bin/orca -v /opt/csw/etc/orcallator.cfg to generate the graphs for the collected data. > Updating PNGs. > Sleeping at Mon Apr 6 22:07:31 2009 until Mon Apr 6 22:07:32 2009. > Current running time is 5:34 minutes. > Loading new data from group orca_services for sysa. > Updating PNGs. > Sleeping at Mon Apr 6 22:07:33 2009 until Mon Apr 6 22:13:01 2009. > ^CCurrent running time is 11:02 minutes. > /opt/csw/bin/orca: caught signal INT. > > At this point the web page contains the headers and trailers plus > the table(s) with the two servers but no graphs. Do not stop the process, start it in background and make sure the data from the collection hosts is transferred regularly to /var/opt/csw/ orca/orcallator. Then the webpages should be updated. > Unless you have a magic bullet I'm ready to throw in the towel. > > If I had any obligation to test CSW packages, I feel that I've > proven that it's beyond me. I invested a couple of weeks trying but > don't really have anything to show for it. Thank you very much for your commitment. I apologize for not having enough time to build a proper releasable package of Orca right now. My day is currently stuffed with private things and work-related stuff and the little remaining spare time is needed for work on the build system itself. Best regards -- Dago -------------- next part -------------- An HTML attachment was scrubbed... URL: From idogan23 at users.sourceforge.net Tue Apr 7 14:48:15 2009 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 07 Apr 2009 12:48:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[4215] csw/mgar/pkg/rrdtool/trunk Message-ID: Revision: 4215 http://gar.svn.sourceforge.net/gar/?rev=4215&view=rev Author: idogan23 Date: 2009-04-07 12:48:14 +0000 (Tue, 07 Apr 2009) Log Message: ----------- rrdtool: update to 1.3.7 Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile csw/mgar/pkg/rrdtool/trunk/checksums Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2009-04-07 05:23:56 UTC (rev 4214) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2009-04-07 12:48:14 UTC (rev 4215) @@ -1,5 +1,5 @@ GARNAME = rrdtool -GARVERSION = 1.3.6 +GARVERSION = 1.3.7 CATEGORIES = utils DESCRIPTION = time-series data logging and graphing. Modified: csw/mgar/pkg/rrdtool/trunk/checksums =================================================================== --- csw/mgar/pkg/rrdtool/trunk/checksums 2009-04-07 05:23:56 UTC (rev 4214) +++ csw/mgar/pkg/rrdtool/trunk/checksums 2009-04-07 12:48:14 UTC (rev 4215) @@ -1,3 +1,3 @@ -afaabd5a60115581e866efbac796d307 download/rrdtool-1.3.6.tar.gz +e2e0da2a83e58ba2fcefba932a3cbb72 download/rrdtool-1.3.7.tar.gz 48a9b258cf8b4b943dbaf30ea939c315 download/CSWrrdtool.gspec 1c2f1efd982f4f4a1c9d5abd1f8b6501 download/fixme.sh 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 7 15:25:57 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 07 Apr 2009 13:25:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[4216] csw/mgar/pkg/cpan/perl-ldap/trunk Message-ID: Revision: 4216 http://gar.svn.sourceforge.net/gar/?rev=4216&view=rev Author: bonivart Date: 2009-04-07 13:25:57 +0000 (Tue, 07 Apr 2009) Log Message: ----------- perl-ldap: update to 0.39 Modified Paths: -------------- csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile csw/mgar/pkg/cpan/perl-ldap/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/perl-ldap/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/perl-ldap/trunk/files/CSWpmldap.depend csw/mgar/pkg/cpan/perl-ldap/trunk/files/CSWpmldap.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/perl-ldap/trunk/ Property changes on: csw/mgar/pkg/cpan/perl-ldap/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/perl-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile 2009-04-07 12:48:14 UTC (rev 4215) +++ csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile 2009-04-07 13:25:57 UTC (rev 4216) @@ -1,5 +1,5 @@ GARNAME = perl-ldap -GARVERSION = 0.34 +GARVERSION = 0.39 CATEGORIES = cpan AUTHOR = GBARR @@ -10,12 +10,21 @@ maintenance functions such as adding, deleting or modifying entries. endef -DISTFILES += CSWpmldap.gspec CSWpmldap.depend +DISTFILES = COPYING +PACKAGES = CSWpmldap +CATALOGNAME = pm_ldap +ARCHALL = 1 + +REQUIRED_PKGS = CSWpmxmlsax CSWpmauthensasl CSWpmiosocketssl CSWpmuri CSWpmconvertasn1 CSWpmmimebase64 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DEPENDS += cpan/Convert-ASN1 cpan/IO-Socket-SSL DEPENDS += cpan/Authen-SASL cpan/XML-SAX # Module version numbers defeat Sort::Versions -MANUAL_UPDATE = 1 +#MANUAL_UPDATE = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/perl-ldap/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/perl-ldap/trunk/checksums 2009-04-07 12:48:14 UTC (rev 4215) +++ csw/mgar/pkg/cpan/perl-ldap/trunk/checksums 2009-04-07 13:25:57 UTC (rev 4216) @@ -1,3 +1,2 @@ -3f89b099591e33b3f040adba367c56ff download/CSWpmldap.gspec -a857be6cb94009be59ef97db547d91f7 download/CSWpmldap.depend -398689b0a7b1615075a6b5035f6e3e91 download/perl-ldap-0.34.tar.gz +4d6588c2fa0d38ae162f6314d201d89e download/COPYING +0c31097aa22672a2831a7542250d1b55 download/perl-ldap-0.39.tar.gz Added: csw/mgar/pkg/cpan/perl-ldap/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/perl-ldap/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/perl-ldap/trunk/files/COPYING 2009-04-07 13:25:57 UTC (rev 4216) @@ -0,0 +1,3 @@ +Copyright (c) 1997-2004 Graham Barr. All rights reserved. +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/perl-ldap/trunk/files/CSWpmldap.depend =================================================================== --- csw/mgar/pkg/cpan/perl-ldap/trunk/files/CSWpmldap.depend 2009-04-07 12:48:14 UTC (rev 4215) +++ csw/mgar/pkg/cpan/perl-ldap/trunk/files/CSWpmldap.depend 2009-04-07 13:25:57 UTC (rev 4216) @@ -1,4 +0,0 @@ -P CSWpmauthensasl pm_authensasl - SASL Authentication framework -P CSWpmconvertasn1 pm_convertasn1 - ASN.1 Encode/Decode library -P CSWpmiosocketssl pm_iosocketssl - nearly transparent SSL encapsulation for IO::Socket::INET. -P CSWpmxmlsax pm_xmlsax - Simple API for XML Deleted: csw/mgar/pkg/cpan/perl-ldap/trunk/files/CSWpmldap.gspec =================================================================== --- csw/mgar/pkg/cpan/perl-ldap/trunk/files/CSWpmldap.gspec 2009-04-07 12:48:14 UTC (rev 4215) +++ csw/mgar/pkg/cpan/perl-ldap/trunk/files/CSWpmldap.gspec 2009-04-07 13:25:57 UTC (rev 4216) @@ -1,7 +0,0 @@ -%var bitname pm_ldap -%var pkgname CSWpmldap -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1997-2004 Graham Barr. All rights reserved. -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 chninkel at users.sourceforge.net Tue Apr 7 16:42:23 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 07 Apr 2009 14:42:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[4217] csw/mgar/pkg/cadaver/trunk Message-ID: Revision: 4217 http://gar.svn.sourceforge.net/gar/?rev=4217&view=rev Author: chninkel Date: 2009-04-07 14:42:01 +0000 (Tue, 07 Apr 2009) Log Message: ----------- cadaver: fixed catalog name Modified Paths: -------------- csw/mgar/pkg/cadaver/trunk/Makefile csw/mgar/pkg/cadaver/trunk/checksums csw/mgar/pkg/cadaver/trunk/files/changelog.CSW Modified: csw/mgar/pkg/cadaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/cadaver/trunk/Makefile 2009-04-07 13:25:57 UTC (rev 4216) +++ csw/mgar/pkg/cadaver/trunk/Makefile 2009-04-07 14:42:01 UTC (rev 4217) @@ -23,6 +23,7 @@ endef PACKAGES = CSWcadav +CATALOGNAME_CSWcadav = cadaver REQUIRED_PKGS = CSWggettextrt CSWiconv CSWneon CSWosslrt CSWreadline CSWzlib CSWgcrypt CSWgnutls CSWgpgerr Modified: csw/mgar/pkg/cadaver/trunk/checksums =================================================================== --- csw/mgar/pkg/cadaver/trunk/checksums 2009-04-07 13:25:57 UTC (rev 4216) +++ csw/mgar/pkg/cadaver/trunk/checksums 2009-04-07 14:42:01 UTC (rev 4217) @@ -1,3 +1,3 @@ 5ac79e41f3b7b4f68bf4003beed5dc26 download/cadaver-0.23.2.tar.gz 7a78f71995cd40263b04470976eba5a6 download/CSWcadav.prototype -9deb0d89879fd18151fdd8a5472f194d download/changelog.CSW +0db916e7303fe1fac02ba69acbd41ce9 download/changelog.CSW Modified: csw/mgar/pkg/cadaver/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2009-04-07 13:25:57 UTC (rev 4216) +++ csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2009-04-07 14:42:01 UTC (rev 4217) @@ -1,4 +1,4 @@ -cadaver (0.23.2,REV=2009.04.04) unstable +cadaver (0.23.2,REV=2009.04.07) unstable * New upstream version. * Dropped destdir.patch as DESTDIR support has been added upstream. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Apr 7 17:20:39 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 07 Apr 2009 15:20:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[4218] csw/mgar/pkg/mcabber/trunk/Makefile Message-ID: Revision: 4218 http://gar.svn.sourceforge.net/gar/?rev=4218&view=rev Author: skayser Date: 2009-04-07 15:20:38 +0000 (Tue, 07 Apr 2009) Log Message: ----------- mcabber: build against ncursesw, add samplerc / changelog to pkg Modified Paths: -------------- csw/mgar/pkg/mcabber/trunk/Makefile Modified: csw/mgar/pkg/mcabber/trunk/Makefile =================================================================== --- csw/mgar/pkg/mcabber/trunk/Makefile 2009-04-07 14:42:01 UTC (rev 4217) +++ csw/mgar/pkg/mcabber/trunk/Makefile 2009-04-07 15:20:38 UTC (rev 4218) @@ -16,6 +16,10 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PREREQUISITE_PKGS = CSWncurses CSWossldevel CSWotrdevel +PREREQUISITE_PKGS += CSWaspell CSWggettext CSWglib2devel CSWpkgconfig +PREREQUISITE_PKGS += CSWgpgerr CSWgpgme CSWiconv + REQUIRED_PKGS = CSWncurses CSWosslrt CSWotr REQUIRED_PKGS += CSWaspell CSWggettextrt CSWglib2 REQUIRED_PKGS += CSWgpgerr CSWgpgme CSWiconv @@ -26,6 +30,7 @@ CONFIGURE_ARGS += --with-openssl=/opt/csw/lib CONFIGURE_ARGS += --enable-otr CONFIGURE_ARGS += --enable-aspell +CONFIGURE_ARGS += --enable-sigwinch # mcabber is geared towards gcc and heavily uses inline functions without # static/extern storage qualifiers. Sun Studio needs to emulate gcc @@ -35,8 +40,8 @@ # EXTRA_CFLAGS = -features=no%extinl -EXTRA_LDFLAGS = -lsocket -EXTRA_INC = /opt/csw/lib/ncurses +EXTRA_LDFLAGS = -lsocket -lnsl +EXTRA_INC = /opt/csw/lib/ncursesw # Get rid of inline functions which are referenced externally (no%extinl # makes inline functions static and would break linking otherwise) @@ -53,10 +58,13 @@ $(WORKSRC)/Makefile \ $(WORKSRC)/src/Makefile \ $(WORKSRC)/libjabber/Makefile + @$(MAKECOOKIE) post-install-modulated: @perl -pi -e '\ s|/usr/share/ssl/certs/ca-bundle.crt|/opt/csw/ssl/certs/ca-certificates.crt|;' \ $(WORKSRC)/mcabberrc.example - @ginstall -d $(DESTDIR)$(docdir)$(GARNAME) - @cp $(WORKSRC)/mcabberrc.example $(DESTDIR)$(docdir)$(GARNAME) + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @cp $(WORKSRC)/mcabberrc.example $(DESTDIR)$(docdir)/$(GARNAME) + @cp $(WORKSRC)/ChangeLog $(DESTDIR)$(docdir)/$(GARNAME)/changelog + @$(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 7 21:49:04 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Apr 2009 19:49:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[4219] csw/mgar/pkg/sysstat/trunk Message-ID: Revision: 4219 http://gar.svn.sourceforge.net/gar/?rev=4219&view=rev Author: dmichelsen Date: 2009-04-07 19:49:04 +0000 (Tue, 07 Apr 2009) Log Message: ----------- sysstat: Update to 20090405 Modified Paths: -------------- csw/mgar/pkg/sysstat/trunk/Makefile csw/mgar/pkg/sysstat/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/sysstat/trunk/ Property changes on: csw/mgar/pkg/sysstat/trunk ___________________________________________________________________ Added: svn:ignore + work download cookies Modified: csw/mgar/pkg/sysstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/sysstat/trunk/Makefile 2009-04-07 15:20:38 UTC (rev 4218) +++ csw/mgar/pkg/sysstat/trunk/Makefile 2009-04-07 19:49:04 UTC (rev 4219) @@ -1,5 +1,5 @@ GARNAME = sysstat -GARVERSION = 20090218 +GARVERSION = 20090405 CATEGORIES = utils DESCRIPTION = Key system statistics at a glance Modified: csw/mgar/pkg/sysstat/trunk/checksums =================================================================== --- csw/mgar/pkg/sysstat/trunk/checksums 2009-04-07 15:20:38 UTC (rev 4218) +++ csw/mgar/pkg/sysstat/trunk/checksums 2009-04-07 19:49:04 UTC (rev 4219) @@ -1,2 +1,2 @@ -cb48048e5b6eee430017ce8591a71d65 download/sysstat-20090218.tgz +847e0101576ae2a73a09c2b4af3da8f1 download/sysstat-20090405.tgz 7a7f0f67bb68484b56375d4a922fb63f download/patch-onlyisaexec-sysstatd.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Apr 7 22:42:11 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 07 Apr 2009 20:42:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[4220] csw/mgar/pkg/bash_completion/trunk Message-ID: Revision: 4220 http://gar.svn.sourceforge.net/gar/?rev=4220&view=rev Author: chninkel Date: 2009-04-07 20:42:11 +0000 (Tue, 07 Apr 2009) Log Message: ----------- bash_completion: added completion for pkgutil Modified Paths: -------------- csw/mgar/pkg/bash_completion/trunk/checksums csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/bash_completion/trunk/files/pkgutil.completion Modified: csw/mgar/pkg/bash_completion/trunk/checksums =================================================================== --- csw/mgar/pkg/bash_completion/trunk/checksums 2009-04-07 19:49:04 UTC (rev 4219) +++ csw/mgar/pkg/bash_completion/trunk/checksums 2009-04-07 20:42:11 UTC (rev 4220) @@ -1,7 +1,8 @@ cd1c5648272917fbe0eef4ba30bb93f4 download/bash-completion-1.0.tar.gz -2acb33dad8ee4ea46b02f2cd86ced5e1 download/pkg-get.completion -0fcc270cda377374a9637d24c8b689b3 download/pkgadd.completion -7d304567cc880dd42e8ea277c991017f download/pkgrm.completion -cc213a6d8dd2d484f2bce4f7905437f8 download/smf.completion -1745e51815578a18384ff36a449e0002 download/changelog.CSW +5bc234f6060561c564a20d2a9cc552c1 download/pkg-get.completion +af7a63477c6e81ed5b08f195e153091e download/pkgadd.completion +1389a7771e34fc54fe993d442cce1524 download/pkgrm.completion +f922762210a6f208695c328c040ac90d download/pkgutil.completion +52bd6948f5cc1548c3791a969da0e5e2 download/smf.completion +a413f5d9346c32ef22093b55956bd268 download/changelog.CSW d0c0d867babf351bca9ee97e03be550d download/opencsw_paths.patch Modified: csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2009-04-07 19:49:04 UTC (rev 4219) +++ csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2009-04-07 20:42:11 UTC (rev 4220) @@ -1,6 +1,7 @@ -bash_completion (1.0,REV=2009.04.05) +bash_completion (1.0,REV=2009.04.07) * New upstream version. + * Added completion code for pkgutil. * Switched to gar v2. - -- Yann Rouillard Sun, 05 Apr 2009 15:32:52 +0200 + -- Yann Rouillard Sun, 07 Apr 2009 15:32:52 +0200 Added: csw/mgar/pkg/bash_completion/trunk/files/pkgutil.completion =================================================================== --- csw/mgar/pkg/bash_completion/trunk/files/pkgutil.completion (rev 0) +++ csw/mgar/pkg/bash_completion/trunk/files/pkgutil.completion 2009-04-07 20:42:11 UTC (rev 4220) @@ -0,0 +1,62 @@ +# +# Copyright 2006 Yann Rouillard +# All rights reserved. Use is subject to license terms. +# +# Redistribution and/or use, with or without modification, is +# permitted. This code is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +# +# pkgutil.completion - bash completion for pkgutil +# + +have pkgutil && +_pkgutil() +{ + local cur prev file catalog_file url command + local catalog_file="/var/opt/csw/pkgutil/catalog.`uname -p`.`uname -r`" + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + + i=${#COMP_WORDS[*]} + while [[ $i -gt 1 ]]; do + i=$((i-1)) + if [[ "${COMP_WORDS[$i]}" = @(-t|--temp) ]]; then + url="${COMP_WORDS[$((i+1))]}" + fi + if [[ "${COMP_WORDS[$i]}" == @(-i|--install|-u|--upgrade|-r|--remove|-d|--download|-a|--available|-c|--compare|-U|--catalog|-S|--stream) ]]; then + command="${COMP_WORDS[$i]}" + fi + done + + if [[ -n "$command" ]]; then + if [[ -f $catalog_file ]]; then + if [[ "$command" == @(--download|-d|--install|-i|--upgrade|-u|s|--stream) ]]; then + local packages_list=$(awk ' $0 ~ /BEGIN PGP SIGNATURE/ { exit } $1 ~ /^Hash:/ || $1 ~ /^ *(-|#|$)/ { next } { print $1 }' $catalog_file) + COMPREPLY=( $(compgen -W "${packages_list}" -- ${cur}) ) + elif [[ "$command" == @(-r|--remove) ]]; then + local packages_list=$(pkginfo | awk ' $2 ~ /^CSW/ { printf ("%s|",$2) }') + packages_list=${packages_list%|} + packages_list=$(nawk " \$3 ~ /^$packages_list\$/ { print \$1 }" $catalog_file) + COMPREPLY=( $(compgen -W "${packages_list}" -- ${cur}) ) + fi + fi + return 0 + fi + + if [[ "$prev" = @(-W|--workdir) ]]; then + COMPREPLY=( $(compgen -d -- ${cur}) ) + return 0 + fi + + if [[ "$prev" = @(-o|--output) ]]; then + COMPREPLY=( $(compgen -f -- ${cur}) ) + return 0 + fi + + local commands="-i --install -u --upgrade -r --remove -d --download -a --available -c --compare -U --catalog -e --email -t --temp=site -s --stream -T --target -o --output -x --exclude -W --workdir -y --yes -n --nomod -D --debug -h --help -v --version -V --syscheck" + COMPREPLY=( $(compgen -W "${commands}" -- ${cur}) ) + return 0 +} && +complete -F _pkgutil pkgutil Property changes on: csw/mgar/pkg/bash_completion/trunk/files/pkgutil.completion ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Apr 8 00:48:42 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 07 Apr 2009 22:48:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[4221] csw/mgar/pkg/libgda Message-ID: Revision: 4221 http://gar.svn.sourceforge.net/gar/?rev=4221&view=rev Author: hson Date: 2009-04-07 22:48:42 +0000 (Tue, 07 Apr 2009) Log Message: ----------- libgda: Add intermediate level Makefile, fix for __FUNCTION__ Modified Paths: -------------- csw/mgar/pkg/libgda/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libgda/Makefile Added: csw/mgar/pkg/libgda/Makefile =================================================================== --- csw/mgar/pkg/libgda/Makefile (rev 0) +++ csw/mgar/pkg/libgda/Makefile 2009-04-07 22:48:42 UTC (rev 4221) @@ -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) Modified: csw/mgar/pkg/libgda/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgda/trunk/Makefile 2009-04-07 20:42:11 UTC (rev 4220) +++ csw/mgar/pkg/libgda/trunk/Makefile 2009-04-07 22:48:42 UTC (rev 4221) @@ -16,16 +16,20 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTNAME = $(GARNAME)-$(GARVERSION) -#REQUIRED_PKGS += CSWgconf2 CSWggettextrt CSWglib2 CSWgtk2 CSWlibatk -#REQUIRED_PKGS += CSWlibcairo CSWlibglade2 CSWlibgsf CSWlibxml2 CSWlibxrender -#REQUIRED_PKGS += CSWpango CSWsunmath CSWzlib +REQUIRED_PKGS += CSWggettextrt CSWglib2 CSWiconv CSWlibxml2 CSWlibxslt +REQUIRED_PKGS += CSWncurses CSWreadline CSWzlib # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +CFLAGS += -D__FUNCTION__=__func__ +CXXFLAGS += -D__FUNCTION__=__func__ + CONFIGURE_ARGS = $(DIRPATHS) -#TEST_TARGET = +# One test fail for some reason... +#TEST_TARGET = check +TEST_TARGET = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Apr 8 01:44:44 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 07 Apr 2009 23:44:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[4222] csw/mgar/pkg/libgnomedb/Makefile Message-ID: Revision: 4222 http://gar.svn.sourceforge.net/gar/?rev=4222&view=rev Author: hson Date: 2009-04-07 23:44:44 +0000 (Tue, 07 Apr 2009) Log Message: ----------- libgnomedb: Add intermediate Makefile Added Paths: ----------- csw/mgar/pkg/libgnomedb/Makefile Added: csw/mgar/pkg/libgnomedb/Makefile =================================================================== --- csw/mgar/pkg/libgnomedb/Makefile (rev 0) +++ csw/mgar/pkg/libgnomedb/Makefile 2009-04-07 23:44:44 UTC (rev 4222) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Apr 8 02:21:29 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 08 Apr 2009 00:21:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[4223] csw/mgar/pkg/mysql5/trunk/Makefile Message-ID: Revision: 4223 http://gar.svn.sourceforge.net/gar/?rev=4223&view=rev Author: bdwalton Date: 2009-04-08 00:21:29 +0000 (Wed, 08 Apr 2009) Log Message: ----------- Builds completely. RPATH set appropriately (accounting for modified prefix). Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-04-07 23:44:44 UTC (rev 4222) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-04-08 00:21:29 UTC (rev 4223) @@ -2,6 +2,8 @@ GARVERSION = 5.1.32 CATEGORIES = server +GARCOMPILER = GCC4 + DESCRIPTION = Multithreaded SQL database define BLURB MySQL is a very fast, multi-threaded, multi-user and robust SQL @@ -18,23 +20,25 @@ # Change prefix to /opt/csw/mysql5 prefix = /opt/csw/mysql5 +WORKSRC = $(WORKDIR)/mysql-$(GARVERSION) + +EXTRA_LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST + # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler -CONFIGURE_ARGS += --without-docs -CONFIGURE_ARGS += --enable-thread-safe-client -CONFIGURE_ARGS += --with-named-z-libs=yes -CONFIGURE_ARGS += --with-berkeley-db -CONFIGURE_ARGS += --with-innodb -CONFIGURE_ARGS += --enable-local-infile -CONFIGURE_ARGS += --with-extra-charsets=all +CONFIGURE_ARGS += --without-docs +CONFIGURE_ARGS += --enable-local-infile +CONFIGURE_ARGS += --with-extra-charsets=all CONFIGURE_ARGS += --with-low-memory +CONFIGURE_ARGS += --with-pthread +CONFIGURE_ARGS += --with-readline +CONFIGURE_ARGS += --with-zlib-dir=/opt/csw +CONFIGURE_ARGS += --with-ssl=/opt/csw +CONFIGURE_ARGS += --with-plugins=max-no-ndb # Enable 64 bits build # BUILD64 = 1 include gar/category.mk -post-extract: - @for i in $(WORKROOTDIR)/build-isa* ; do mv $$i/mysql-$(GARVERSION) $$i/$(GARNAME)-$(GARVERSION) ; 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 Wed Apr 8 02:34:16 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 08 Apr 2009 00:34:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[4224] csw/mgar/pkg/mcabber/trunk Message-ID: Revision: 4224 http://gar.svn.sourceforge.net/gar/?rev=4224&view=rev Author: skayser Date: 2009-04-08 00:34:16 +0000 (Wed, 08 Apr 2009) Log Message: ----------- mcabber: fixed build issues on Solaris 10 Modified Paths: -------------- csw/mgar/pkg/mcabber/trunk/checksums csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff Modified: csw/mgar/pkg/mcabber/trunk/checksums =================================================================== --- csw/mgar/pkg/mcabber/trunk/checksums 2009-04-08 00:21:29 UTC (rev 4223) +++ csw/mgar/pkg/mcabber/trunk/checksums 2009-04-08 00:34:16 UTC (rev 4224) @@ -1,3 +1,3 @@ 189fb9d23f5a8412bc660884528475ea download/mcabber-0.9.9.tar.bz2 a7ceb9f017c2c9267e2264aa626b7a4e download/patch-inline.diff -cff6d32fef59fc10806534025dc53f7e download/patch-iswblank.diff +73e2ae212a072d753942ff24c806ba5d download/patch-iswblank.diff Modified: csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff =================================================================== --- csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff 2009-04-08 00:21:29 UTC (rev 4223) +++ csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff 2009-04-08 00:34:16 UTC (rev 4224) @@ -1,13 +1,22 @@ ---- mcabber-0.9.9.orig/src/screen.h 2008-10-09 22:17:52.000000000 +0200 -+++ mcabber-0.9.9/src/screen.h 2009-03-08 16:31:44.043214331 +0100 -@@ -20,6 +20,10 @@ - //static void spellcheck(char*, char*); - #endif +diff --speed-large-files --minimal -Nru mcabber-0.9.9.orig/src/utf8.h mcabber-0.9.9/src/utf8.h +--- mcabber-0.9.9.orig/src/utf8.h 2008-10-09 22:17:52.000000000 +0200 ++++ mcabber-0.9.9/src/utf8.h 2009-04-03 17:57:44.524993893 +0200 +@@ -17,6 +17,18 @@ -+#ifndef HAVE_ISWBLANK -+#define iswblank(wc) iswctype(wc, wctype("blank")) -+#endif + #ifdef HAVE_WCTYPE_H + # include + - #include "hbuf.h" - #include "logprint.h" - ++/* The following bit is a hack for Solaris 8&9 systems that don't have ++ * iswblank(). HAVE_ISWBLANK is not set by the mcabber build system so ++ * this always gets included, even on Solaris 10 systems where iswblank() ++ * is present. ++ * For now i made sure it comes after wctype.h so it doesn't create ++ * problems (wctype.h has calls to iswblank() before wctype() is declared). ++ */ ++# ifndef HAVE_ISWBLANK ++# define iswblank(wc) iswctype(wc, wctype("blank")) ++# endif ++ + #else + # define iswblank(c) (c == ' ') + # define iswalnum(c) isalnum(c) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Apr 8 14:56:18 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 08 Apr 2009 12:56:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[4225] csw/mgar/pkg/xterm/trunk Message-ID: Revision: 4225 http://gar.svn.sourceforge.net/gar/?rev=4225&view=rev Author: skayser Date: 2009-04-08 12:56:18 +0000 (Wed, 08 Apr 2009) Log Message: ----------- xterm: added fix for ACS chars in UTF-8 mode, added README.CSW Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xterm/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xterm/trunk/files/README.CSW csw/mgar/pkg/xterm/trunk/files/patch-mkwidth.diff Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2009-04-08 00:34:16 UTC (rev 4224) +++ csw/mgar/pkg/xterm/trunk/Makefile 2009-04-08 12:56:18 UTC (rev 4225) @@ -16,6 +16,10 @@ REQUIRED_PKGS = CSWfconfig CSWlibxft2 +# enable -mk_width per default to address unicode form character width woes, +# can be taken out once upstream enhances wcwidth() sanity checking +# http://article.gmane.org/gmane.comp.lib.ncurses.bugs/3795 +PATCHFILES = patch-mkwidth.diff # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz @@ -47,3 +51,8 @@ EXTRA_INC = $(includedir)/freetype2 include gar/category.mk + +post-install-modulated: + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @cp $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(GARNAME) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/xterm/trunk/checksums =================================================================== --- csw/mgar/pkg/xterm/trunk/checksums 2009-04-08 00:34:16 UTC (rev 4224) +++ csw/mgar/pkg/xterm/trunk/checksums 2009-04-08 12:56:18 UTC (rev 4225) @@ -1 +1,2 @@ be25d2d3661d0bb77fc66e1bcbb3caba download/xterm-243.tgz +347f24b7ed3e42a3d40b1db1ed0061f0 download/patch-mkwidth.diff Added: csw/mgar/pkg/xterm/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/xterm/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/xterm/trunk/files/README.CSW 2009-04-08 12:56:18 UTC (rev 4225) @@ -0,0 +1,22 @@ +Note: app-defaults in /opt/csw/lib/X11/app-defaults +--------------------------------------------------- + +Although this package delivers some x resource files in +/opt/csw/lib/X11/app-defaults/ this folder is not evaluated by the +Solaris libXt per default. + +Either treat them as example files and copy and paste what you need into +your system / personal x resource files or set XFILESEARCHPATH / +XUSERFILESEARCHPATH to honor this directory. + + http://www.faqs.org/faqs/x-faq/part2/section-22.html + + +Note: mkWidth/-mk_width activated per default +--------------------------------------------- + +This xterm has been adjusted to set the mkWidth resource to true per +default (xterm command line argument -mk_width), which works around some +bugs with box drawing characters and Solaris locales. In case you want +to restore the default behaviour, either start xterm with +mk_width or +set the mkWidth resource to false. Added: csw/mgar/pkg/xterm/trunk/files/patch-mkwidth.diff =================================================================== --- csw/mgar/pkg/xterm/trunk/files/patch-mkwidth.diff (rev 0) +++ csw/mgar/pkg/xterm/trunk/files/patch-mkwidth.diff 2009-04-08 12:56:18 UTC (rev 4225) @@ -0,0 +1,12 @@ +diff --speed-large-files --minimal -Nru xterm-243.orig/charproc.c xterm-243/charproc.c +--- xterm-243.orig/charproc.c 2009-03-29 01:23:12.000000000 +0100 ++++ xterm-243/charproc.c 2009-04-08 14:09:42.224460743 +0200 +@@ -662,7 +662,7 @@ + + #if OPT_WIDE_CHARS + Bres(XtNcjkWidth, XtCCjkWidth, misc.cjk_width, False), +- Bres(XtNmkWidth, XtCMkWidth, misc.mk_width, False), ++ Bres(XtNmkWidth, XtCMkWidth, misc.mk_width, True), + Bres(XtNutf8Latin1, XtCUtf8Latin1, screen.utf8_latin1, False), + Bres(XtNutf8Title, XtCUtf8Title, screen.utf8_title, False), + Bres(XtNvt100Graphics, XtCVT100Graphics, screen.vt100_graphics, True), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Apr 8 15:26:11 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 08 Apr 2009 13:26:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[4226] csw/mgar/pkg/xterm/trunk/Makefile Message-ID: Revision: 4226 http://gar.svn.sourceforge.net/gar/?rev=4226&view=rev Author: skayser Date: 2009-04-08 13:26:11 +0000 (Wed, 08 Apr 2009) Log Message: ----------- xterm: fix double /opt/csw/lib entry in R*PATH Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2009-04-08 12:56:18 UTC (rev 4225) +++ csw/mgar/pkg/xterm/trunk/Makefile 2009-04-08 13:26:11 UTC (rev 4226) @@ -52,6 +52,12 @@ include gar/category.mk +# Hack for now to address the double /opt/csw/lib in $R*PATH. One comes +# from LD_OPTIONS and this one from pkg-config i suppose. +pre-build-modulated: + @perl -pi -e 's|-R/opt/csw/lib ||' $(WORKSRC)/Makefile + @$(MAKECOOKIE) + post-install-modulated: @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @cp $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(GARNAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Apr 8 15:38:19 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 08 Apr 2009 13:38:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[4227] csw/mgar/pkg/xterm/trunk/files/README.CSW Message-ID: Revision: 4227 http://gar.svn.sourceforge.net/gar/?rev=4227&view=rev Author: skayser Date: 2009-04-08 13:38:19 +0000 (Wed, 08 Apr 2009) Log Message: ----------- xterm: added note about TERM handling WRT to vanilla Solaris xterm Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/files/README.CSW Modified: csw/mgar/pkg/xterm/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/xterm/trunk/files/README.CSW 2009-04-08 13:26:11 UTC (rev 4226) +++ csw/mgar/pkg/xterm/trunk/files/README.CSW 2009-04-08 13:38:19 UTC (rev 4227) @@ -1,3 +1,16 @@ +$TERM, ncurses and how to make xterm display colors +--------------------------------------------------- + +The xterm distributed with Solaris is a basic xterm (xterm-r6), whereas this +is a current xterm and supports a wider range of terminal capabilites. +To keep CSWncurses compatible with the Solaris xterm, TERM=xterm refers +to the basic xterm-r6 capabilities, which unfortunately also defeats +color support in some ncurses-based applications. + +To make full use of the capabilities of this xterm (including color-support) +set TERM=xterm-new. + + Note: app-defaults in /opt/csw/lib/X11/app-defaults --------------------------------------------------- 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 8 16:09:54 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 08 Apr 2009 14:09:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[4228] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 4228 http://gar.svn.sourceforge.net/gar/?rev=4228&view=rev Author: bonivart Date: 2009-04-08 14:09:53 +0000 (Wed, 08 Apr 2009) Log Message: ----------- pkgutil: update to 1.5 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-04-08 13:38:19 UTC (rev 4227) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-04-08 14:09:53 UTC (rev 4228) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.5b4 +GARVERSION = 1.5 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-04-08 13:38:19 UTC (rev 4227) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-04-08 14:09:53 UTC (rev 4228) @@ -1,4 +1,4 @@ -f4771b87ddaa176ebe0c5bbd31414e2c download/pkgutil-1.5b4.zip +97349a661c6f779e33621b73b738925e download/pkgutil-1.5.zip 805cd30ad9f21cb1167d166fa99b5891 download/CSWpkgutil.gspec 54bd1af1cd6ca5ac7e63586ffc16842d download/CSWpkgutil.prototype e1407c24d47306dbc4cea22dcb291f1d download/CSWpkgutil.postinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Apr 8 16:39:27 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 08 Apr 2009 14:39:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[4229] csw/mgar/pkg/htmldoc/trunk/Makefile Message-ID: Revision: 4229 http://gar.svn.sourceforge.net/gar/?rev=4229&view=rev Author: hson Date: 2009-04-08 14:39:27 +0000 (Wed, 08 Apr 2009) Log Message: ----------- htmldoc: Split package in two Modified Paths: -------------- csw/mgar/pkg/htmldoc/trunk/Makefile Modified: csw/mgar/pkg/htmldoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/htmldoc/trunk/Makefile 2009-04-08 14:09:53 UTC (rev 4228) +++ csw/mgar/pkg/htmldoc/trunk/Makefile 2009-04-08 14:39:27 UTC (rev 4229) @@ -4,19 +4,33 @@ DESCRIPTION = converts HTML files and web pages into indexed HTML PostScript and PDF define BLURB - HTMLDOC converts Hyper-Text Markup Language ("HTML") files and web pages into - indexed HTML, Adobe\xAE PostScript\xAE, or Adobe Portable Document Format ("PDF") - files. + HTMLDOC is a program for writing documentation in HTML and producing indexed + HTML, PostScript, or PDF output (with tables of contents). It supports most + HTML 3.2 and some HTML 4.0 syntax, as well as GIF, JPEG, and PNG images. endef +PACKAGES = CSWhtmldoc-common CSWhtmldoc +CATALOGNAME_CSWhtmldoc = $(GARNAME) +CATALOGNAME_CSWhtmldoc-common = $(GARNAME)_common +SPKG_DESC_CSWhtmldoc = $(DESCRIPTION) +SPKG_DESC_CSWhtmldoc-common = This package contains the htmldoc files common to all architectures. +ARCHALL_CSWhtmldoc-common = 1 + +REQUIRED_PKGS_CSWhtmldoc = CSWfltk CSWjpeg CSWosslrt CSWpng CSWzlib +REQUIRED_PKGS_CSWhtmldoc += CSWhtmldoc-common +#REQUIRED_PKGS_CSWhtmldoc-common = + +PKGFILES_CSWhtmldoc = $(bindir)/.* +PKGFILES_CSWhtmldoc-common = $(datadir)/.* + MASTER_SITES = http://ftp.easysw.com/pub/htmldoc/$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.bz2 +#DISTFILES += $(call admfiles,CSWhtmldoc, ) +#DISTFILES += $(call admfiles,CSWhtmldoc-common, ) -SPKG_SOURCEURL = http://www.htmldoc.org - LICENSE = COPYING.txt -REQUIRED_PKGS = CSWfltk CSWjpeg CSWosslrt CSWpng CSWzlib +SPKG_SOURCEURL = http://www.htmldoc.org # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-source.tar.bz2 @@ -31,4 +45,6 @@ TEST_SCRIPTS = +# Disable check until package is released +ENABLE_CHECK = 0 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 8 22:12:00 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 08 Apr 2009 20:12:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[4230] csw/mgar/pkg/pca/trunk Message-ID: Revision: 4230 http://gar.svn.sourceforge.net/gar/?rev=4230&view=rev Author: dmichelsen Date: 2009-04-08 20:12:00 +0000 (Wed, 08 Apr 2009) Log Message: ----------- pca: Update to 20090408-01 Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2009-04-08 14:39:27 UTC (rev 4229) +++ csw/mgar/pkg/pca/trunk/Makefile 2009-04-08 20:12:00 UTC (rev 4230) @@ -1,5 +1,5 @@ GARNAME = pca -GARVERSION = 20090224-01 +GARVERSION = 20090408-01 CATEGORIES = utils DESCRIPTION = Patch Check Advanced Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2009-04-08 14:39:27 UTC (rev 4229) +++ csw/mgar/pkg/pca/trunk/checksums 2009-04-08 20:12:00 UTC (rev 4230) @@ -1,3 +1,3 @@ -3de9a69abff821d3b103a660f161f119 download/pca-20090224-01 +9019de37bfb4d9e89930f922695cc788 download/pca-20090408-01 6f2f2376eba0a788795dd43d68ad32d1 download/COPYING 12de68ff8f67b4bb8b095e5646402208 download/pca.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 8 22:55:24 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 08 Apr 2009 20:55:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[4231] csw/mgar/pkg/libvorbis/trunk/Makefile Message-ID: Revision: 4231 http://gar.svn.sourceforge.net/gar/?rev=4231&view=rev Author: dmichelsen Date: 2009-04-08 20:55:24 +0000 (Wed, 08 Apr 2009) Log Message: ----------- libvorbis: Fix package name Modified Paths: -------------- csw/mgar/pkg/libvorbis/trunk/Makefile Modified: csw/mgar/pkg/libvorbis/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvorbis/trunk/Makefile 2009-04-08 20:12:00 UTC (rev 4230) +++ csw/mgar/pkg/libvorbis/trunk/Makefile 2009-04-08 20:55:24 UTC (rev 4231) @@ -12,6 +12,8 @@ MASTER_SITES = http://downloads.xiph.org/releases/vorbis/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PACKAGES = CSWvorbis +CATALOGNAME = libvorbis REQUIRED_PKGS = CSWlibogg SPKG_SOURCEURL = http://www.vorbis.com/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Apr 8 23:55:23 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 08 Apr 2009 21:55:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[4232] csw/mgar/pkg/gnumeric/trunk Message-ID: Revision: 4232 http://gar.svn.sourceforge.net/gar/?rev=4232&view=rev Author: hson Date: 2009-04-08 21:55:22 +0000 (Wed, 08 Apr 2009) Log Message: ----------- gnumeric: Add patches required to compile Modified Paths: -------------- csw/mgar/pkg/gnumeric/trunk/Makefile csw/mgar/pkg/gnumeric/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gnumeric/trunk/files/md5.h.diff csw/mgar/pkg/gnumeric/trunk/files/numtheory.c.diff Removed Paths: ------------- csw/mgar/pkg/gnumeric/trunk/files/mainpatch Modified: csw/mgar/pkg/gnumeric/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnumeric/trunk/Makefile 2009-04-08 20:55:24 UTC (rev 4231) +++ csw/mgar/pkg/gnumeric/trunk/Makefile 2009-04-08 21:55:22 UTC (rev 4232) @@ -19,7 +19,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -#PATCHFILES = mainpatch +PATCHFILES = md5.h.diff +PATCHFILES += numtheory.c.diff CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/gnumeric/trunk/checksums =================================================================== --- csw/mgar/pkg/gnumeric/trunk/checksums 2009-04-08 20:55:24 UTC (rev 4231) +++ csw/mgar/pkg/gnumeric/trunk/checksums 2009-04-08 21:55:22 UTC (rev 4232) @@ -1 +1,3 @@ 4bc2ca7b90e953934b086c931238fd04 download/gnumeric-1.9.5.tar.gz +883cdef1974db050cb0fd002a399d940 download/md5.h.diff +70046f2846c948a2740cfc9e4c331a50 download/numtheory.c.diff Deleted: csw/mgar/pkg/gnumeric/trunk/files/mainpatch =================================================================== --- csw/mgar/pkg/gnumeric/trunk/files/mainpatch 2009-04-08 20:55:24 UTC (rev 4231) +++ csw/mgar/pkg/gnumeric/trunk/files/mainpatch 2009-04-08 21:55:22 UTC (rev 4232) @@ -1,57 +0,0 @@ -diff -ru gnumeric-1.8.3.orig/plugins/excel/md5.h gnumeric-1.8.3/plugins/excel/md5.h ---- gnumeric-1.8.3.orig/plugins/excel/md5.h 2008-01-15 00:55:11.000000000 +0100 -+++ gnumeric-1.8.3/plugins/excel/md5.h 2009-03-17 00:23:02.110582251 +0100 -@@ -22,7 +22,11 @@ - #define _MD5_H 1 - - #include -+#ifdef __sun -+#include -+#else - #include -+#endif - - #define MD5_DIGEST_SIZE 16 - #define MD5_BLOCK_SIZE 64 -diff -ru gnumeric-1.8.3.orig/plugins/numtheory/numtheory.c gnumeric-1.8.3/plugins/numtheory/numtheory.c ---- gnumeric-1.8.3.orig/plugins/numtheory/numtheory.c 2008-01-15 00:55:10.000000000 +0100 -+++ gnumeric-1.8.3/plugins/numtheory/numtheory.c 2009-03-17 00:55:21.253509921 +0100 -@@ -33,7 +33,14 @@ - - #define OUT_OF_BOUNDS "#LIMIT!" - -+#ifdef __sun -+static inline double bit_max_fn(void) { -+ return MIN (1 / GNM_EPSILON, (gnm_float)G_MAXUINT64); -+} -+#define bit_max (bit_max_fn()) -+#else - static const double bit_max = MIN (1 / GNM_EPSILON, (gnm_float)G_MAXUINT64); -+#endif - - /* ------------------------------------------------------------------------- */ - -diff -ru gnumeric-1.8.3.orig/po/Makefile.in.in gnumeric-1.8.3/po/Makefile.in.in ---- gnumeric-1.8.3.orig/po/Makefile.in.in 2008-05-24 22:40:36.000000000 +0200 -+++ gnumeric-1.8.3/po/Makefile.in.in 2009-03-17 00:59:24.557217225 +0100 -@@ -69,7 +69,7 @@ - EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS - - POTFILES = \ -- -+# - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - -diff -ru gnumeric-1.8.3.orig/src/gnm-so-polygon.c gnumeric-1.8.3/src/gnm-so-polygon.c ---- gnumeric-1.8.3.orig/src/gnm-so-polygon.c 2008-01-15 00:54:39.000000000 +0100 -+++ gnumeric-1.8.3/src/gnm-so-polygon.c 2009-03-16 23:35:49.881228497 +0100 -@@ -223,7 +223,7 @@ - gnm_so_polygon_write_xml_sax (SheetObject const *so, GsfXMLOut *output) - { - /* TODO */ -- return gnm_so_polygon_parent_class->write_xml_sax (so, output); -+ gnm_so_polygon_parent_class->write_xml_sax (so, output); - } - - static void Added: csw/mgar/pkg/gnumeric/trunk/files/md5.h.diff =================================================================== --- csw/mgar/pkg/gnumeric/trunk/files/md5.h.diff (rev 0) +++ csw/mgar/pkg/gnumeric/trunk/files/md5.h.diff 2009-04-08 21:55:22 UTC (rev 4232) @@ -0,0 +1,15 @@ +diff -ru ../build-global/gnumeric-1.9.5/plugins/excel/md5.h gnumeric-1.9.5/plugins/excel/md5.h +--- ../build-global/gnumeric-1.9.5/plugins/excel/md5.h 2007-09-21 02:11:31.000000000 +0200 ++++ gnumeric-1.9.5/plugins/excel/md5.h 2009-04-07 08:29:55.235754017 +0200 +@@ -22,7 +22,11 @@ + #define _MD5_H 1 + + #include ++#ifdef __sun ++#include ++#else + #include ++#endif + + #define MD5_DIGEST_SIZE 16 + #define MD5_BLOCK_SIZE 64 Added: csw/mgar/pkg/gnumeric/trunk/files/numtheory.c.diff =================================================================== --- csw/mgar/pkg/gnumeric/trunk/files/numtheory.c.diff (rev 0) +++ csw/mgar/pkg/gnumeric/trunk/files/numtheory.c.diff 2009-04-08 21:55:22 UTC (rev 4232) @@ -0,0 +1,18 @@ +diff -ru ../build-global/gnumeric-1.9.5/plugins/numtheory/numtheory.c gnumeric-1.9.5/plugins/numtheory/numtheory.c +--- ../build-global/gnumeric-1.9.5/plugins/numtheory/numtheory.c 2009-03-02 03:05:42.000000000 +0100 ++++ gnumeric-1.9.5/plugins/numtheory/numtheory.c 2009-04-08 00:59:37.712247116 +0200 +@@ -38,7 +38,14 @@ + * represented in a gnm_float _and_ in a guint64. (For regular "double", + * the latter part is irrelevant.) + */ ++#ifdef __sun ++static inline double bit_max_fn(void) { ++ return MIN (1 / GNM_EPSILON, (gnm_float)G_MAXUINT64); ++} ++#define bit_max (bit_max_fn()) ++#else + static const double bit_max = MIN (1 / GNM_EPSILON, (gnm_float)G_MAXUINT64); ++#endif + + /* ------------------------------------------------------------------------- */ + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Apr 8 23:56:32 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 08 Apr 2009 21:56:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[4233] csw/mgar/pkg Message-ID: Revision: 4233 http://gar.svn.sourceforge.net/gar/?rev=4233&view=rev Author: hson Date: 2009-04-08 21:56:32 +0000 (Wed, 08 Apr 2009) Log Message: ----------- scrollkeeper: Initial commit Added Paths: ----------- csw/mgar/pkg/scrollkeeper/ csw/mgar/pkg/scrollkeeper/Makefile csw/mgar/pkg/scrollkeeper/branches/ csw/mgar/pkg/scrollkeeper/tags/ csw/mgar/pkg/scrollkeeper/trunk/ csw/mgar/pkg/scrollkeeper/trunk/Makefile csw/mgar/pkg/scrollkeeper/trunk/files/ csw/mgar/pkg/scrollkeeper/trunk/files/CSWscrollkeeper.postinstall csw/mgar/pkg/scrollkeeper/trunk/files/CSWscrollkeeper.postremove csw/mgar/pkg/scrollkeeper/trunk/files/Makefile.in.diff Added: csw/mgar/pkg/scrollkeeper/Makefile =================================================================== --- csw/mgar/pkg/scrollkeeper/Makefile (rev 0) +++ csw/mgar/pkg/scrollkeeper/Makefile 2009-04-08 21:56:32 UTC (rev 4233) @@ -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/scrollkeeper/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/scrollkeeper/trunk/Makefile =================================================================== --- csw/mgar/pkg/scrollkeeper/trunk/Makefile (rev 0) +++ csw/mgar/pkg/scrollkeeper/trunk/Makefile 2009-04-08 21:56:32 UTC (rev 4233) @@ -0,0 +1,37 @@ +GARNAME = scrollkeeper +GARVERSION = 0.3.14 +CATEGORIES = utils + +DESCRIPTION = a cataloging system for documentation on open systems +define BLURB + ScrollKeeper is a cataloging system for documentation on open systems. It + manages documentation metadata (as specified by the Open Source Metadata + Framework(OMF)) and provides a simple API to allow help browsers to find, + sort, and search the document catalog. It will also be able to communicate + with catalog servers on the Net to search for documents which are not on the + local system. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +SPKG_SOURCEURL = http://scrollkeeper.sourceforge.net/ + +LICENSE = COPYING + +REQUIRED_PKGS = CSWggettextrt 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)=11543 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +PATCHFILES = Makefile.in.diff + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk + +localstatedir = /var/$(prefix) Added: csw/mgar/pkg/scrollkeeper/trunk/files/CSWscrollkeeper.postinstall =================================================================== --- csw/mgar/pkg/scrollkeeper/trunk/files/CSWscrollkeeper.postinstall (rev 0) +++ csw/mgar/pkg/scrollkeeper/trunk/files/CSWscrollkeeper.postinstall 2009-04-08 21:56:32 UTC (rev 4233) @@ -0,0 +1,5 @@ +#!/bin/sh +PATH=/opt/csw/bin:$PATH;export PATH +if [ -x /opt/csw/bin/scrollkeeper-rebuilddb ]; then + /opt/csw/bin/scrollkeeper-rebuilddb -q -p /var/opt/csw/lib/scrollkeeper +fi Added: csw/mgar/pkg/scrollkeeper/trunk/files/CSWscrollkeeper.postremove =================================================================== --- csw/mgar/pkg/scrollkeeper/trunk/files/CSWscrollkeeper.postremove (rev 0) +++ csw/mgar/pkg/scrollkeeper/trunk/files/CSWscrollkeeper.postremove 2009-04-08 21:56:32 UTC (rev 4233) @@ -0,0 +1,6 @@ +#!/bin/sh +PATH=/opt/csw/bin:$PATH;export PATH +if [ -d /var/opt/csw/lib/scrollkeeper ]; then + rm -rf /var/opt/csw/lib/scrollkeeper + rm -f /var/opt/csw/log/scrollkeeper.log* +fi Property changes on: csw/mgar/pkg/scrollkeeper/trunk/files/CSWscrollkeeper.postremove ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/scrollkeeper/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/scrollkeeper/trunk/files/Makefile.in.diff (rev 0) +++ csw/mgar/pkg/scrollkeeper/trunk/files/Makefile.in.diff 2009-04-08 21:56:32 UTC (rev 4233) @@ -0,0 +1,17 @@ +--- ../build-global/scrollkeeper-0.3.14/Makefile.in 2003-12-06 09:17:51.000000000 +0100 ++++ scrollkeeper-0.3.14/Makefile.in 2009-04-08 19:57:15.376155974 +0200 +@@ -673,10 +673,10 @@ + rm -rf $(DESTDIR)$(scrollkeeper_localstate_dir) + $(mkinstalldirs) $(DESTDIR)$(scrollkeeper_localstate_dir) + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log +- PATH="$(PATH):$(DESTDIR)$(bindir)" ; \ +- echo "`date +\"%b %d %X\"` Installing ScrollKeeper `scrollkeeper-config --version`..." >> $(DESTDIR)$(localstatedir)/log/scrollkeeper.log +- PATH="$(PATH):$(DESTDIR)$(bindir)" ; \ +- $(DESTDIR)$(bindir)/scrollkeeper-rebuilddb -q -p $(DESTDIR)$(scrollkeeper_localstate_dir) ++# PATH="$(PATH):$(DESTDIR)$(bindir)" ; \ ++# echo "`date +\"%b %d %X\"` Installing ScrollKeeper `scrollkeeper-config --version`..." >> $(DESTDIR)$(localstatedir)/log/scrollkeeper.log ++# PATH="$(PATH):$(DESTDIR)$(bindir)" ; \ ++# $(DESTDIR)$(bindir)/scrollkeeper-rebuilddb -q -p $(DESTDIR)$(scrollkeeper_localstate_dir) + + # Remove generated files + uninstall-local: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Thu Apr 9 01:18:59 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 08 Apr 2009 23:18:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[4234] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 4234 http://gar.svn.sourceforge.net/gar/?rev=4234&view=rev Author: harpchad Date: 2009-04-08 23:18:58 +0000 (Wed, 08 Apr 2009) Log Message: ----------- No longer dependant on CSWsunmath Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2009-04-08 21:56:32 UTC (rev 4233) +++ csw/mgar/pkg/glib2/trunk/Makefile 2009-04-08 23:18:58 UTC (rev 4234) @@ -32,7 +32,7 @@ BUILD64 = 1 NO_ISAEXEC = 1 -REQUIRED_PKGS_CSWglib2 = CSWggettextrt CSWiconv CSWsunmath +REQUIRED_PKGS_CSWglib2 = CSWggettextrt CSWiconv REQUIRED_PKGS_CSWglib2devel = CSWglib2 CSWggettextrt CSWiconv TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Thu Apr 9 02:14:19 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Thu, 09 Apr 2009 00:14:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[4235] csw/mgar/pkg/gvim/trunk Message-ID: Revision: 4235 http://gar.svn.sourceforge.net/gar/?rev=4235&view=rev Author: harpchad Date: 2009-04-09 00:14:19 +0000 (Thu, 09 Apr 2009) Log Message: ----------- Bump to patchrev 148 Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile csw/mgar/pkg/gvim/trunk/checksums Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2009-04-08 23:18:58 UTC (rev 4234) +++ csw/mgar/pkg/gvim/trunk/Makefile 2009-04-09 00:14:19 UTC (rev 4235) @@ -1,6 +1,6 @@ GARNAME = vim DISTVERSION = 7.2 -PATCHREV = 128 +PATCHREV = 148 GARVERSION = $(DISTVERSION).$(PATCHREV) CATEGORIES = utils SPKG_SOURCEURL = http://www.vim.org/download.php @@ -48,7 +48,7 @@ REQUIRED_PKGS_CSWgvim = CSWvimrt CSWbonobo2 CSWfconfig CSWftype2 CSWgconf2 REQUIRED_PKGS_CSWgvim += CSWggettextrt CSWglib2 CSWgnomekeyring CSWgnomevfs2 CSWgtk2 REQUIRED_PKGS_CSWgvim += CSWiconv CSWlibart CSWlibatk CSWlibbonoboui CSWlibcairo -REQUIRED_PKGS_CSWgvim += CSWlibgnome CSWlibgnomecanvas CSWlibgnomeui CSWlibnet CSWlibpopt +REQUIRED_PKGS_CSWgvim += CSWlibgnome CSWlibgnomecanvas CSWlibgnomeui CSWlibpopt REQUIRED_PKGS_CSWgvim += CSWlibxml2 CSWlibxrender CSWncurses CSWorbit2 CSWpango REQUIRED_PKGS_CSWgvim += CSWperl CSWpng CSWzlib Modified: csw/mgar/pkg/gvim/trunk/checksums =================================================================== --- csw/mgar/pkg/gvim/trunk/checksums 2009-04-08 23:18:58 UTC (rev 4234) +++ csw/mgar/pkg/gvim/trunk/checksums 2009-04-09 00:14:19 UTC (rev 4235) @@ -131,4 +131,24 @@ b31534667bb741e21479b1e3757c9e21 download/7.2.126 71e87e78bea69d8876ff7f6d824c8986 download/7.2.127 21da01d371757282bfd402ddd91005ba download/7.2.128 +e890b630efa3847c8cdee2f197145b6c download/7.2.129 +d3fe3bf37d5c0940f3e751f41d92e817 download/7.2.130 +3c2aaa22914d06a65bf0f212e43c3ace download/7.2.131 +379aa718df5dbcde8215fc4d94062d9f download/7.2.132 +6d51f9deb4c2604692f532c118b73ef8 download/7.2.133 +4acae77b2a217e1cb47040c08e28180d download/7.2.134 +4d30bf2c9d2973f5dd1c12468123dc41 download/7.2.135 +f2ae8cc595933938ee608e040d1256a5 download/7.2.136 +c613c1e0fac319f05ffe1fa7e27d6600 download/7.2.137 +e7d02c3dea47fa579366bb1cd025ce5e download/7.2.138 +04f7131164b3f46d6365a8faea0e32c6 download/7.2.139 +e1c0e4fbd985f5a2e5a24a4cfab1112c download/7.2.140 +e5a9c7ef44a38057c0c5c1191d9cdf77 download/7.2.141 +f08f7f966749c2ef20ff87dfeb9bef62 download/7.2.142 +6b132dad3ad947662d1c370193a14218 download/7.2.143 +4e2a1d1cb12198a783759f88e6c64fc4 download/7.2.144 +38877e2ac720e45e5d62cd1089167db3 download/7.2.145 +cb97aca73a1f4fdd2fac894bba7e43ae download/7.2.146 +4219afedebf0172118f2d078d9012995 download/7.2.147 +49ca89a47315f512c7ee06f5b2617a90 download/7.2.148 582717146f6bbd5b73db83a2f62e62a5 download/vimtutor.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Thu Apr 9 02:14:51 2009 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Thu, 09 Apr 2009 00:14:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[4236] csw/mgar/pkg/vim/trunk Message-ID: Revision: 4236 http://gar.svn.sourceforge.net/gar/?rev=4236&view=rev Author: harpchad Date: 2009-04-09 00:14:50 +0000 (Thu, 09 Apr 2009) Log Message: ----------- Bump to patchrev 148 Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile csw/mgar/pkg/vim/trunk/checksums Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2009-04-09 00:14:19 UTC (rev 4235) +++ csw/mgar/pkg/vim/trunk/Makefile 2009-04-09 00:14:50 UTC (rev 4236) @@ -1,6 +1,6 @@ GARNAME = vim DISTVERSION = 7.2 -PATCHREV = 128 +PATCHREV = 148 GARVERSION = $(DISTVERSION).$(PATCHREV) CATEGORIES = utils SPKG_SOURCEURL = http://www.vim.org/download.php Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2009-04-09 00:14:19 UTC (rev 4235) +++ csw/mgar/pkg/vim/trunk/checksums 2009-04-09 00:14:50 UTC (rev 4236) @@ -133,4 +133,24 @@ b31534667bb741e21479b1e3757c9e21 download/7.2.126 71e87e78bea69d8876ff7f6d824c8986 download/7.2.127 21da01d371757282bfd402ddd91005ba download/7.2.128 +e890b630efa3847c8cdee2f197145b6c download/7.2.129 +d3fe3bf37d5c0940f3e751f41d92e817 download/7.2.130 +3c2aaa22914d06a65bf0f212e43c3ace download/7.2.131 +379aa718df5dbcde8215fc4d94062d9f download/7.2.132 +6d51f9deb4c2604692f532c118b73ef8 download/7.2.133 +4acae77b2a217e1cb47040c08e28180d download/7.2.134 +4d30bf2c9d2973f5dd1c12468123dc41 download/7.2.135 +f2ae8cc595933938ee608e040d1256a5 download/7.2.136 +c613c1e0fac319f05ffe1fa7e27d6600 download/7.2.137 +e7d02c3dea47fa579366bb1cd025ce5e download/7.2.138 +04f7131164b3f46d6365a8faea0e32c6 download/7.2.139 +e1c0e4fbd985f5a2e5a24a4cfab1112c download/7.2.140 +e5a9c7ef44a38057c0c5c1191d9cdf77 download/7.2.141 +f08f7f966749c2ef20ff87dfeb9bef62 download/7.2.142 +6b132dad3ad947662d1c370193a14218 download/7.2.143 +4e2a1d1cb12198a783759f88e6c64fc4 download/7.2.144 +38877e2ac720e45e5d62cd1089167db3 download/7.2.145 +cb97aca73a1f4fdd2fac894bba7e43ae download/7.2.146 +4219afedebf0172118f2d078d9012995 download/7.2.147 +49ca89a47315f512c7ee06f5b2617a90 download/7.2.148 582717146f6bbd5b73db83a2f62e62a5 download/vimtutor.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Apr 9 02:17:10 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 09 Apr 2009 00:17:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[4237] csw/mgar/pkg/scrollkeeper/trunk/checksums Message-ID: Revision: 4237 http://gar.svn.sourceforge.net/gar/?rev=4237&view=rev Author: hson Date: 2009-04-09 00:17:10 +0000 (Thu, 09 Apr 2009) Log Message: ----------- scrollkeeper: Missed checksums Added Paths: ----------- csw/mgar/pkg/scrollkeeper/trunk/checksums Added: csw/mgar/pkg/scrollkeeper/trunk/checksums =================================================================== --- csw/mgar/pkg/scrollkeeper/trunk/checksums (rev 0) +++ csw/mgar/pkg/scrollkeeper/trunk/checksums 2009-04-09 00:17:10 UTC (rev 4237) @@ -0,0 +1,2 @@ +161eb3f29e30e7b24f84eb93ac696155 download/scrollkeeper-0.3.14.tar.gz +b04f0a91f4fa5870868059d454eda833 download/Makefile.in.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 Thu Apr 9 04:08:32 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 09 Apr 2009 02:08:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[4238] csw/mgar/pkg/mysql5/trunk/Makefile Message-ID: Revision: 4238 http://gar.svn.sourceforge.net/gar/?rev=4238&view=rev Author: bdwalton Date: 2009-04-09 02:08:32 +0000 (Thu, 09 Apr 2009) Log Message: ----------- use EXTRA_LIB instead of EXTRA_LD_OPTIONS to get handling of ISALIST properly for all -L dirs Modified Paths: -------------- csw/mgar/pkg/mysql5/trunk/Makefile Modified: csw/mgar/pkg/mysql5/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql5/trunk/Makefile 2009-04-09 00:17:10 UTC (rev 4237) +++ csw/mgar/pkg/mysql5/trunk/Makefile 2009-04-09 02:08:32 UTC (rev 4238) @@ -22,7 +22,7 @@ WORKSRC = $(WORKDIR)/mysql-$(GARVERSION) -EXTRA_LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST +EXTRA_LIB = /opt/csw/lib # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Apr 9 04:42:30 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 09 Apr 2009 02:42:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[4239] csw/mgar/pkg/libpcap/trunk Message-ID: Revision: 4239 http://gar.svn.sourceforge.net/gar/?rev=4239&view=rev Author: hson Date: 2009-04-09 02:42:30 +0000 (Thu, 09 Apr 2009) Log Message: ----------- libpcap: Update to 0.9.8 Modified Paths: -------------- csw/mgar/pkg/libpcap/trunk/Makefile csw/mgar/pkg/libpcap/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff Removed Paths: ------------- csw/mgar/pkg/libpcap/trunk/files/solib.diff Property Changed: ---------------- csw/mgar/pkg/libpcap/trunk/ Property changes on: csw/mgar/pkg/libpcap/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/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2009-04-09 02:08:32 UTC (rev 4238) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2009-04-09 02:42:30 UTC (rev 4239) @@ -1,5 +1,5 @@ GARNAME = libpcap -GARVERSION = 0.8.3 +GARVERSION = 0.9.8 CATEGORIES = lib DESCRIPTION = Libraries for network diagnostics @@ -9,22 +9,29 @@ MASTER_SITES = http://www.tcpdump.org/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibpcap,) +LICENSE = LICENSE + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # Shared libraries patch -PATCHFILES = solib.diff +PATCHFILES = Makefile.in.diff +PATCHFILES += scanner.l.diff # No test target for libpcap TEST_SCRIPTS = -CONFIGURE_ARGS = $(DIRPATHS) +BUILD64 = 1 -INSTALL_OVERRIDE_DIRS = prefix exec_prefix includedir libdir mandir +EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv8plus+vis +EXTRA_BUILD_ISAS_i386 = pentium pentium_pro+mmx +TEST_TARGET = check + +EXTRA_CFLAGS = -I. + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-ipv6 + include gar/category.mk - -post-install: - rm -f $(DESTDIR)$(libdir)/$(GARNAME).a Modified: csw/mgar/pkg/libpcap/trunk/checksums =================================================================== --- csw/mgar/pkg/libpcap/trunk/checksums 2009-04-09 02:08:32 UTC (rev 4238) +++ csw/mgar/pkg/libpcap/trunk/checksums 2009-04-09 02:42:30 UTC (rev 4239) @@ -1,3 +1,3 @@ -56a9d4615d8354fcfe8cff8c8443c77b download/libpcap-0.8.3.tar.gz -a6d2e7614701143a2e4e905814fead77 download/CSWlibpcap.gspec -0754daf384e4d107ef35ed2cb4e44f0e download/solib.diff +5208f24d0328ee7c20b52c43eaa9aa0e download/libpcap-0.9.8.tar.gz +d036716d6563bcad5fad70916f5c2c2e download/Makefile.in.diff +c0002322e0b90a3e9eed0b7ac9e6c050 download/scanner.l.diff Added: csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff (rev 0) +++ csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff 2009-04-09 02:42:30 UTC (rev 4239) @@ -0,0 +1,116 @@ +--- ../build-global/libpcap-0.9.8/Makefile.in 2007-07-24 04:35:15.000000000 +0200 ++++ libpcap-0.9.8/Makefile.in 2009-04-09 04:07:28.839392745 +0200 +@@ -37,6 +37,15 @@ + srcdir = @srcdir@ + VPATH = @srcdir@ + ++# some defines for shared library compilation - FIXME ++MAJ=0 ++MIN=9.8 ++VERSION=$(MAJ).$(MIN) ++LIBNAME=pcap ++LIBRARY=lib$(LIBNAME).a ++SOLIBRARY=lib$(LIBNAME).so ++SHAREDLIB=$(SOLIBRARY).$(VERSION) ++ + # + # You shouldn't need to edit anything below. + # +@@ -52,6 +61,7 @@ + + # Standard CFLAGS + CFLAGS = $(CCOPT) $(INCLS) $(DEFS) ++CFLAGS_SHARED = -G $(LDFLAGS) -Wl,-h,$(SOLIBRARY).$(MAJ) + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -71,7 +81,11 @@ + # problem if you don't own the file but can write to the directory. + .c.o: + @rm -f $@ +- $(CC) $(CFLAGS) -c $(srcdir)/$*.c ++ $(CC) $(CFLAGS) -c -o $@ $(srcdir)/$*.c ++ ++%_pic.o: %.c ++ @rm -f $@ ++ $(CC) -KPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c + + PSRC = pcap- at V_PCAP@.c + FSRC = fad- at V_FINDALLDEVS@.c +@@ -86,6 +100,8 @@ + # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot + # hack the extra indirection + OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) ++OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=_pic.o) $(CSRC:.c=_pic.o) $(SSRC:.c=_pic.o) $(GENSRC:.c=_pic.o) ++ + HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ + ethertype.h gencode.h gnuc.h + GENHDR = \ +@@ -98,14 +114,22 @@ + $(SRC) $(HDR) $(TAGHDR) + + CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c ++CLEANFILES = $(OBJ) $(OBJ_PIC) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so* + +-all: libpcap.a ++all: libpcap.a $(SHAREDLIB) + + libpcap.a: $(OBJ) + @rm -f $@ + ar rc $@ $(OBJ) $(LIBS) + $(RANLIB) $@ + ++$(SHAREDLIB): $(OBJ_PIC) ++ - at rm -f $@ ++ - at rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ) ++ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc ++ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ) ++ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY) ++ + shared: libpcap.$(DYEXT) + + # +@@ -131,6 +155,9 @@ + scanner.o: scanner.c tokdefs.h + $(CC) $(CFLAGS) -c scanner.c + ++scanner_pic.o: scanner.c tokdefs.h ++ $(CC) -KPIC $(CFLAGS) -o $@ -c scanner.c ++ + pcap.o: version.h + + tokdefs.h: grammar.c +@@ -144,9 +171,16 @@ + @rm -f $@ + $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c + ++grammar_pic.o: grammar.c ++ @rm -f $@ ++ $(CC) -KPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c ++ + version.o: version.c + $(CC) $(CFLAGS) -c version.c + ++version_pic.o: version.c ++ $(CC) -KPIC $(CFLAGS) -o $@ -c version.c ++ + snprintf.o: $(srcdir)/missing/snprintf.c + $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c + +@@ -172,10 +206,16 @@ + bpf_filter.o: bpf_filter.c + $(CC) $(CFLAGS) -c bpf_filter.c + ++bpf_filter_pic.o: bpf_filter.c ++ $(CC) -KPIC $(CFLAGS) -o $@ -c bpf_filter.c ++ + install: libpcap.a + [ -d $(DESTDIR)$(libdir) ] || \ + (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) + $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a ++ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/ ++ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ) ++ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY) + $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a + [ -d $(DESTDIR)$(includedir) ] || \ + (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) Added: csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff (rev 0) +++ csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff 2009-04-09 02:42:30 UTC (rev 4239) @@ -0,0 +1,11 @@ +--- ../build-global/libpcap-0.9.8/scanner.l 2007-06-11 21:34:28.000000000 +0200 ++++ libpcap-0.9.8/scanner.l 2009-04-09 04:41:33.481612776 +0200 +@@ -32,6 +32,8 @@ + #include + #include + ++#include ++ + #include "pcap-int.h" + + #include "gencode.h" Deleted: csw/mgar/pkg/libpcap/trunk/files/solib.diff =================================================================== --- csw/mgar/pkg/libpcap/trunk/files/solib.diff 2009-04-09 02:08:32 UTC (rev 4238) +++ csw/mgar/pkg/libpcap/trunk/files/solib.diff 2009-04-09 02:42:30 UTC (rev 4239) @@ -1,159 +0,0 @@ -diff --speed-large-files --minimal -Nru libpcap-0.7.1.orig/Makefile.in libpcap-0.7.1/Makefile.in ---- libpcap-0.7.1.orig/Makefile.in 2001-01-17 20:05:12.000000000 -0800 -+++ libpcap-0.7.1/Makefile.in 2003-07-28 14:12:12.837173000 -0700 -@@ -37,6 +37,15 @@ - srcdir = @srcdir@ - VPATH = @srcdir@ - -+# some defines for shared library compilation - FIXME -+MAJ=0 -+MIN=7.1 -+VERSION=$(MAJ).$(MIN) -+LIBNAME=pcap -+LIBRARY=lib$(LIBNAME).a -+SOLIBRARY=lib$(LIBNAME).so -+SHAREDLIB=$(SOLIBRARY).$(VERSION) -+ - # - # You shouldn't need to edit anything below. - # -@@ -48,6 +57,7 @@ - - # Standard CFLAGS - CFLAGS = $(CCOPT) $(INCLS) $(DEFS) -+CFLAGS_SHARED = -G -Wl,-h,$(SOLIBRARY).$(MAJ) - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -67,7 +77,11 @@ - # problem if you don't own the file but can write to the directory. - .c.o: - @rm -f $@ -- $(CC) $(CFLAGS) -c $(srcdir)/$*.c -+ $(CC) $(CFLAGS) -c -o $@ $(srcdir)/$*.c -+ -+%_pic.o: %.c -+ @rm -f $@ -+ $(CC) -KPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c - - PSRC = pcap- at V_PCAP@.c - CSRC = pcap.c inet.c gencode.c optimize.c nametoaddr.c \ -@@ -80,6 +94,8 @@ - # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot - # hack the extra indirection - OBJ = $(PSRC:.c=.o) $(CSRC:.c=.o) $(GENSRC:.c=.o) # $(LIBOBJS) -+OBJ_PIC = $(PSRC:.c=_pic.o) $(CSRC:.c=_pic.o) $(GENSRC:.c=_pic.o) -+ - HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ - ethertype.h gencode.h gnuc.h - GENHDR = \ -@@ -91,15 +107,22 @@ - TAGFILES = \ - $(SRC) $(HDR) $(TAGHDR) - --CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c -+CLEANFILES = $(OBJ) $(OBJ_PIC) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so* - --all: libpcap.a -+all: libpcap.a $(SHAREDLIB) - - libpcap.a: $(OBJ) - @rm -f $@ - ar rc $@ $(OBJ) - $(RANLIB) $@ - -+$(SHAREDLIB): $(OBJ_PIC) -+ - at rm -f $@ -+ - at rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ) -+ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc -+ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ) -+ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY) -+ - scanner.c: $(srcdir)/scanner.l - @rm -f $@ - $(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@ -@@ -107,6 +130,9 @@ - scanner.o: scanner.c tokdefs.h - $(CC) $(CFLAGS) -c scanner.c - -+scanner_pic.o: scanner.c tokdefs.h -+ $(CC) -KPIC $(CFLAGS) -o $@ -c scanner.c -+ - tokdefs.h: grammar.c - grammar.c: $(srcdir)/grammar.y - @rm -f grammar.c tokdefs.h -@@ -118,9 +144,16 @@ - @rm -f $@ - $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c - -+grammar_pic.o: grammar.c -+ @rm -f $@ -+ $(CC) -KPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c -+ - version.o: version.c - $(CC) $(CFLAGS) -c version.c - -+version_pic.o: version.c -+ $(CC) -KPIC $(CFLAGS) -o $@ -c version.c -+ - snprintf.o: $(srcdir)/../tcpdump/missing/snprintf.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/../tcpdump/missing/snprintf.c - -@@ -135,31 +168,35 @@ - bpf_filter.o: bpf_filter.c - $(CC) $(CFLAGS) -c bpf_filter.c - -+bpf_filter_pic.o: bpf_filter.c -+ $(CC) -KPIC $(CFLAGS) -o $@ -c bpf_filter.c -+ - install: -- [ -d $(DESTDIR)$(libdir) ] || \ -- (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) -- $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a -- $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a -- [ -d $(DESTDIR)$(includedir) ] || \ -- (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) -- $(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h -- $(INSTALL_DATA) $(srcdir)/pcap-namedb.h \ -- $(DESTDIR)$(includedir)/pcap-namedb.h -- [ -d $(DESTDIR)$(includedir)/net ] || \ -- (mkdir -p $(DESTDIR)$(includedir)/net; chmod 755 $(DESTDIR)$(includedir)/net) -- $(INSTALL_DATA) $(srcdir)/bpf/net/bpf.h \ -- $(DESTDIR)$(includedir)/net/bpf.h -- [ -d $(DESTDIR)$(mandir)/man3 ] || \ -- (mkdir -p $(DESTDIR)$(mandir)/man3; chmod 755 $(DESTDIR)$(mandir)/man3) -- $(INSTALL_DATA) $(srcdir)/pcap.3 \ -- $(DESTDIR)$(mandir)/man3/pcap.3 -+ [ -d $(libdir) ] || \ -+ (mkdir -p $(libdir); chmod 755 $(libdir)) -+ $(INSTALL_DATA) libpcap.a $(libdir)/libpcap.a -+ $(INSTALL_DATA) $(SHAREDLIB) $(libdir)/ -+ ln -sf $(SHAREDLIB) $(libdir)/$(SOLIBRARY).$(MAJ) -+ ln -sf $(SOLIBRARY).$(MAJ) $(libdir)/$(SOLIBRARY) -+ $(RANLIB) $(libdir)/libpcap.a -+ [ -d $(includedir) ] || \ -+ (mkdir -p $(includedir); chmod 755 $(includedir)) -+ $(INSTALL_DATA) $(srcdir)/pcap.h $(includedir)/pcap.h -+ $(INSTALL_DATA) $(srcdir)/pcap-namedb.h $(includedir)/pcap-namedb.h -+ [ -d $(includedir)/net ] || \ -+ (mkdir -p $(includedir)/net; chmod 755 $(includedir)/net) -+ $(INSTALL_DATA) $(srcdir)/bpf/net/bpf.h $(includedir)/net/bpf.h -+ [ -d $(mandir)/man3 ] || \ -+ (mkdir -p $(mandir)/man3; chmod 755 $(mandir)/man3) -+ $(INSTALL_DATA) $(srcdir)/pcap.3 $(mandir)/man3/pcap.3 -+ - - uninstall: -- rm -f $(DESTDIR)$(libdir)/libpcap.a -- rm -f $(DESTDIR)$(includedir)/pcap.h -- rm -f $(DESTDIR)$(includedir)/pcap-namedb.h -- rm -f $(DESTDIR)$(includedir)/net/bpf.h -- rm -f $(DESTDIR)$(mandir)/man3/pcap.3 -+ rm -f $(libdir)/libpcap.a -+ rm -f $(includedir)/pcap.h -+ rm -f $(includedir)/pcap-namedb.h -+ rm -f $(includedir)/net/bpf.h -+ rm -f $(mandir)/man3/pcap.3 - - clean: - rm -f $(CLEANFILES) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Apr 9 05:32:05 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 09 Apr 2009 03:32:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[4240] csw/mgar/pkg Message-ID: Revision: 4240 http://gar.svn.sourceforge.net/gar/?rev=4240&view=rev Author: hson Date: 2009-04-09 03:32:05 +0000 (Thu, 09 Apr 2009) Log Message: ----------- tcpdump: Initial commit Added Paths: ----------- csw/mgar/pkg/tcpdump/ csw/mgar/pkg/tcpdump/Makefile csw/mgar/pkg/tcpdump/branches/ csw/mgar/pkg/tcpdump/tags/ csw/mgar/pkg/tcpdump/trunk/ csw/mgar/pkg/tcpdump/trunk/Makefile csw/mgar/pkg/tcpdump/trunk/checksums csw/mgar/pkg/tcpdump/trunk/files/ Added: csw/mgar/pkg/tcpdump/Makefile =================================================================== --- csw/mgar/pkg/tcpdump/Makefile (rev 0) +++ csw/mgar/pkg/tcpdump/Makefile 2009-04-09 03:32:05 UTC (rev 4240) @@ -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/tcpdump/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/tcpdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpdump/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tcpdump/trunk/Makefile 2009-04-09 03:32:05 UTC (rev 4240) @@ -0,0 +1,31 @@ +GARNAME = tcpdump +GARVERSION = 3.9.8 +CATEGORIES = utils + +DESCRIPTION = tcpdump allows you to dump the traffic on a network +define BLURB + +endef + +MASTER_SITES = http://www.tcpdump.org/release/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +LICENSE = LICENSE + +PREREQUISITE_PKGS = CSWlibpcap CSWosslrt CSWossldevel +REQUIRED_PKGS = CSWlibpcap CSWosslrt +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# Shared libraries patch +#PATCHFILES = solib.diff + +# No test target for libpcap +TEST_SCRIPTS = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-ipv6 + +#INSTALL_OVERRIDE_DIRS = prefix exec_prefix includedir libdir mandir + +include gar/category.mk Added: csw/mgar/pkg/tcpdump/trunk/checksums =================================================================== --- csw/mgar/pkg/tcpdump/trunk/checksums (rev 0) +++ csw/mgar/pkg/tcpdump/trunk/checksums 2009-04-09 03:32:05 UTC (rev 4240) @@ -0,0 +1 @@ +c491a78c52fe73f1f7271aa5d8c6ab2e download/tcpdump-3.9.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Apr 9 06:43:04 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 09 Apr 2009 04:43:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[4241] csw/mgar/pkg/sudo-ldap/trunk Message-ID: Revision: 4241 http://gar.svn.sourceforge.net/gar/?rev=4241&view=rev Author: valholla Date: 2009-04-09 04:43:04 +0000 (Thu, 09 Apr 2009) Log Message: ----------- Update to gar v2 and sudo 1.7 Modified Paths: -------------- csw/mgar/pkg/sudo-ldap/trunk/Makefile csw/mgar/pkg/sudo-ldap/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.depend csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.gspec csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.postinstall csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.postremove csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.prototype csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.space Property Changed: ---------------- csw/mgar/pkg/sudo-ldap/trunk/ Property changes on: csw/mgar/pkg/sudo-ldap/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/sudo-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo-ldap/trunk/Makefile 2009-04-09 03:32:05 UTC (rev 4240) +++ csw/mgar/pkg/sudo-ldap/trunk/Makefile 2009-04-09 04:43:04 UTC (rev 4241) @@ -1,8 +1,8 @@ GARNAME = sudo -GARVERSION = 1.6.9p8 +GARVERSION = 1.7.0 CATEGORIES = utils -DESCRIPTION = Provides limited super user privileges to specific users +DESCRIPTION = Provides limited super user privileges (LDAP Enabled) define BLURB Sudo (superuser do) allows a system administrator to give certain users (or groups of users) the ability to run some (or all) commands as root while @@ -12,19 +12,25 @@ MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = install.diff -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# We define upstream file regex so we can be notifed of new +# upstream software release +UFILES_REGEX = $(GARNAME)-((\d+(?:\.\d+)*)(p\d+)?).tar.gz -DISTFILES += CSWsudo-ldap.gspec CSWsudo-ldap.postinstall -DISTFILES += CSWsudo-ldap.prototype CSWsudo-ldap.depend -DISTFILES += CSWsudo-ldap.space CSWsudo-ldap.postremove +PACKAGES = CSWsudo-ldap -# Original maintainer's patch to disable strip on install -PATCHFILES = install.diff +CATALOGNAME_CSWsudo-ldap = sudo_ldap +SPKG_DESC_CSWsudo-ldap = $(DESCRIPTION) +SPKG_SOURCEURL_CSWsudo-ldap = http://www.sudo.ws +INCOMPATIBLE_PKGS_CSWsudo-ldap = CSWsudo +REQUIRED_PKGS_CSWsudo-ldap = CSWsudo-common CSWggettextrt CSWoldaprt CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-pam +CONFIGURE_ARGS += --with-logging=both +CONFIGURE_ARGS += --with-ignore-dot +CONFIGURE_ARGS += --with-env-editor CONFIGURE_ARGS += --with-ldap=$(prefix) CONFIGURE_ARGS += --with-ldap-conf-file=$(sysconfdir)/ldap.conf @@ -32,3 +38,12 @@ include gar/category.mk +PKGFILES_CSWsudo-ldap = .*/bin/.* + +post-install-modulated: + @( cd $(DESTDIR)$(bindir) ; rm -f sudoedit ) + @( cd $(DESTDIR)$(bindir) ; mv sudo sudo.ldap ) + @( cd $(DESTDIR)$(bindir) ; ln -f sudo.ldap sudo ) + @( cd $(DESTDIR)$(bindir) ; ln -f sudo.ldap sudoedit ) + @$(MAKECOOKIE) + $(DONADA) Modified: csw/mgar/pkg/sudo-ldap/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo-ldap/trunk/checksums 2009-04-09 03:32:05 UTC (rev 4240) +++ csw/mgar/pkg/sudo-ldap/trunk/checksums 2009-04-09 04:43:04 UTC (rev 4241) @@ -1,8 +1,2 @@ -67a7f95664e9f3926dc3e36d8684f921 download/sudo-1.6.9p8.tar.gz -c8104c6902e496dba5bb18f9c6db1959 download/CSWsudo-ldap.gspec -f9eeac02cdb8e5a3c2d13b65f76a6cf2 download/CSWsudo-ldap.postinstall -e78775e8a1d8d3ce576d2c8d38afc008 download/CSWsudo-ldap.prototype -5bda7fbebf834933fb7b72d64da8d60b download/CSWsudo-ldap.depend -44fabb4ce87e861516533d80274a52c0 download/CSWsudo-ldap.space -cc346986b765441205b04e076a80ba0e download/CSWsudo-ldap.postremove +5fd96bba35fe29b464f7aa6ad255f0a6 download/sudo-1.7.0.tar.gz 157b2e5e38ca54eb36e0364706bd0292 download/install.diff Deleted: csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.depend =================================================================== --- csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.depend 2009-04-09 03:32:05 UTC (rev 4240) +++ csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.depend 2009-04-09 04:43:04 UTC (rev 4241) @@ -1,5 +0,0 @@ -P CSWsudo-common - sudo_common - sudo common files -P CSWlibnet libnet - the libnet packet construction library -P CSWoldaprt openldap_rt - ldap runtime libraries -P CSWosslrt openssl_rt - Openssl runtime libraries -P CSWsasl sasl - Simple Authentication and Security Layer Deleted: csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.gspec =================================================================== --- csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.gspec 2009-04-09 03:32:05 UTC (rev 4240) +++ csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.gspec 2009-04-09 04:43:04 UTC (rev 4241) @@ -1,5 +0,0 @@ -%var bitname sudo_ldap -%var pkgname CSWsudoldap -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc Provides limited super user privileges (LDAP Enabled) -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.postinstall =================================================================== --- csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.postinstall 2009-04-09 03:32:05 UTC (rev 4240) +++ csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.postinstall 2009-04-09 04:43:04 UTC (rev 4241) @@ -1,11 +0,0 @@ -#!/bin/sh - -BINDIR=$BASEDIR/opt/csw/bin - -cd $BINDIR -rm -f sudo sudoedit -ln -f sudo.ldap sudo -ln -f sudo.ldap sudoedit - -exit 0 - Deleted: csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.postremove =================================================================== --- csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.postremove 2009-04-09 03:32:05 UTC (rev 4240) +++ csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.postremove 2009-04-09 04:43:04 UTC (rev 4241) @@ -1,16 +0,0 @@ -#!/bin/sh - -BINDIR=$BASEDIR/opt/csw/bin - -cd $BINDIR -rm -f sudo sudoedit - -OTHERSUDO=`ls -1 sudo.* 2>/dev/null | head -1` -if [ -n "$OTHERSUDO" ]; then - rm -f sudo - ln -f $OTHERSUDO sudo - ln -f $OTHERSUDO sudoedit -fi - -exit 0 - Deleted: csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.prototype =================================================================== --- csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.prototype 2009-04-09 03:32:05 UTC (rev 4240) +++ csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.prototype 2009-04-09 04:43:04 UTC (rev 4241) @@ -1,3 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/sudo.ldap=/opt/csw/bin/sudo 4111 root root -l none /opt/csw/bin/sudoedit=/opt/csw/bin/sudo.ldap Deleted: csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.space =================================================================== --- csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.space 2009-04-09 03:32:05 UTC (rev 4240) +++ csw/mgar/pkg/sudo-ldap/trunk/files/CSWsudo-ldap.space 2009-04-09 04:43:04 UTC (rev 4241) @@ -1 +0,0 @@ -$BASEDIR 1 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Thu Apr 9 06:44:37 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Thu, 09 Apr 2009 04:44:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[4242] csw/mgar/pkg/sudo/trunk Message-ID: Revision: 4242 http://gar.svn.sourceforge.net/gar/?rev=4242&view=rev Author: valholla Date: 2009-04-09 04:44:37 +0000 (Thu, 09 Apr 2009) Log Message: ----------- Update to gar v2 and sudo 1.7 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/sudo/trunk/files/CSWsudo-common.depend csw/mgar/pkg/sudo/trunk/files/CSWsudo-common.gspec csw/mgar/pkg/sudo/trunk/files/CSWsudo-common.prototype csw/mgar/pkg/sudo/trunk/files/CSWsudo-common.space csw/mgar/pkg/sudo/trunk/files/CSWsudo.depend csw/mgar/pkg/sudo/trunk/files/CSWsudo.gspec csw/mgar/pkg/sudo/trunk/files/CSWsudo.postinstall csw/mgar/pkg/sudo/trunk/files/CSWsudo.postremove csw/mgar/pkg/sudo/trunk/files/CSWsudo.prototype csw/mgar/pkg/sudo/trunk/files/CSWsudo.space Property Changed: ---------------- csw/mgar/pkg/sudo/trunk/ Property changes on: csw/mgar/pkg/sudo/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2009-04-09 04:43:04 UTC (rev 4241) +++ csw/mgar/pkg/sudo/trunk/Makefile 2009-04-09 04:44:37 UTC (rev 4242) @@ -1,5 +1,5 @@ GARNAME = sudo -GARVERSION = 1.6.9p8 +GARVERSION = 1.7.0 CATEGORIES = utils DESCRIPTION = Provides limited super user privileges @@ -12,30 +12,45 @@ MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = install.diff -# 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+)*)(p\d+)?).tar.gz -DISTFILES += CSWsudo.gspec CSWsudo.postinstall -DISTFILES += CSWsudo.prototype CSWsudo.depend -DISTFILES += CSWsudo.space CSWsudo.postremove +PACKAGES = CSWsudo CSWsudo-common -DISTFILES += CSWsudo-common.gspec CSWsudo-common.postinstall -DISTFILES += CSWsudo-common.prototype CSWsudo-common.depend -DISTFILES += CSWsudo-common.space +CATALOGNAME_CSWsudo = sudo +SPKG_DESC_CSWsudo = $(DESCRIPTION) +SPKG_SOURCEURL_CSWsudo = http://www.sudo.ws +INCOMPATIBLE_PKGS_CSWsudo = CSWsudo-ldap +REQUIRED_PKGS_CSWsudo = CSWsudo-common CSWggettextrt -# Original maintainer's patch to disable strip on install -PATCHFILES = install.diff +CATALOGNAME_CSWsudo-common = sudo_common +SPKG_DESC_CSWsudo-common = Common files for sudo +SPKG_SOURCEURL_CSWsudo-common = http://www.sudo.ws +REQUIRED_PKGS_CSWsudo-common = CSWggettextrt +DISTFILES += CSWsudo-common.postinstall + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-pam +CONFIGURE_ARGS += --with-logging=both +CONFIGURE_ARGS += --with-ignore-dot +CONFIGURE_ARGS += --with-env-editor TEST_TARGET = check FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir) include gar/category.mk -post-install: +PKGFILES_CSWsudo = .*/bin/.* + +post-install-modulated: @( cd $(DESTDIR)$(sysconfdir) ; mv sudoers sudoers.CSW ) + @( cd $(DESTDIR)$(bindir) ; rm -f sudoedit ) + @( cd $(DESTDIR)$(bindir) ; mv sudo sudo.minimal ) + @( cd $(DESTDIR)$(bindir) ; ln -f sudo.minimal sudo ) + @( cd $(DESTDIR)$(bindir) ; ln -f sudo.minimal sudoedit ) @$(MAKECOOKIE) $(DONADA) Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2009-04-09 04:43:04 UTC (rev 4241) +++ csw/mgar/pkg/sudo/trunk/checksums 2009-04-09 04:44:37 UTC (rev 4242) @@ -1,13 +1,5 @@ -67a7f95664e9f3926dc3e36d8684f921 download/sudo-1.6.9p8.tar.gz -58d79819635f48eccc23c49028d01b55 download/CSWsudo.gspec +5fd96bba35fe29b464f7aa6ad255f0a6 download/sudo-1.7.0.tar.gz 2264728d06b220edf5e47eb9da2b7e66 download/CSWsudo.postinstall -9fbef4bcd879914c4ebc7d8d1ca2a92a download/CSWsudo.prototype -82a6efe0a5c261689546cebfff198b0a download/CSWsudo.depend -44fabb4ce87e861516533d80274a52c0 download/CSWsudo.space e9bd76af1d6c4110121d6d784c910b3d download/CSWsudo.postremove -d009538c73a79d95974996ba3096194b download/CSWsudo-common.gspec 955d99eda1432c7b7e00d98b91e35a79 download/CSWsudo-common.postinstall -9203dbbf5dc2c1741fcea6b86895bd6a download/CSWsudo-common.prototype -d41d8cd98f00b204e9800998ecf8427e download/CSWsudo-common.depend -44fabb4ce87e861516533d80274a52c0 download/CSWsudo-common.space 157b2e5e38ca54eb36e0364706bd0292 download/install.diff Deleted: csw/mgar/pkg/sudo/trunk/files/CSWsudo-common.gspec =================================================================== --- csw/mgar/pkg/sudo/trunk/files/CSWsudo-common.gspec 2009-04-09 04:43:04 UTC (rev 4241) +++ csw/mgar/pkg/sudo/trunk/files/CSWsudo-common.gspec 2009-04-09 04:44:37 UTC (rev 4242) @@ -1,5 +0,0 @@ -%var bitname sudo_common -%var pkgname CSWsudo-common -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%var desc sudo common files -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/sudo/trunk/files/CSWsudo-common.prototype =================================================================== --- csw/mgar/pkg/sudo/trunk/files/CSWsudo-common.prototype 2009-04-09 04:43:04 UTC (rev 4241) +++ csw/mgar/pkg/sudo/trunk/files/CSWsudo-common.prototype 2009-04-09 04:44:37 UTC (rev 4242) @@ -1,13 +0,0 @@ -d none /opt/csw/sbin 0755 root bin -f none /opt/csw/sbin/visudo 0111 root root -f none /opt/csw/etc/sudoers.CSW 0440 root root -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1m 0755 root bin -f none /opt/csw/share/man/man1m/sudo.1m 0644 root root -l none /opt/csw/share/man/man1m/sudoedit.1m=/opt/csw/share/man/man1m/sudo.1m -f none /opt/csw/share/man/man1m/visudo.1m 0644 root root -d none /opt/csw/share/man/man4 0755 root bin -f none /opt/csw/share/man/man4/sudoers.4 0644 root root -f none /opt/csw/libexec/sudo_noexec.so 0755 root root -f none /opt/csw/libexec/sudo_noexec.la 0644 root root Deleted: csw/mgar/pkg/sudo/trunk/files/CSWsudo-common.space =================================================================== --- csw/mgar/pkg/sudo/trunk/files/CSWsudo-common.space 2009-04-09 04:43:04 UTC (rev 4241) +++ csw/mgar/pkg/sudo/trunk/files/CSWsudo-common.space 2009-04-09 04:44:37 UTC (rev 4242) @@ -1 +0,0 @@ -$BASEDIR 1 1 Deleted: csw/mgar/pkg/sudo/trunk/files/CSWsudo.depend =================================================================== --- csw/mgar/pkg/sudo/trunk/files/CSWsudo.depend 2009-04-09 04:43:04 UTC (rev 4241) +++ csw/mgar/pkg/sudo/trunk/files/CSWsudo.depend 2009-04-09 04:44:37 UTC (rev 4242) @@ -1,2 +0,0 @@ -I CSWsudo-minimal sudo_minimal -P CSWsudo-common sudo_common - sudo common files Deleted: csw/mgar/pkg/sudo/trunk/files/CSWsudo.gspec =================================================================== --- csw/mgar/pkg/sudo/trunk/files/CSWsudo.gspec 2009-04-09 04:43:04 UTC (rev 4241) +++ csw/mgar/pkg/sudo/trunk/files/CSWsudo.gspec 2009-04-09 04:44:37 UTC (rev 4242) @@ -1,4 +0,0 @@ -%var bitname sudo -%var pkgname CSWsudo -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/sudo/trunk/files/CSWsudo.postinstall =================================================================== --- csw/mgar/pkg/sudo/trunk/files/CSWsudo.postinstall 2009-04-09 04:43:04 UTC (rev 4241) +++ csw/mgar/pkg/sudo/trunk/files/CSWsudo.postinstall 2009-04-09 04:44:37 UTC (rev 4242) @@ -1,12 +0,0 @@ -#!/bin/sh - -BINDIR=$BASEDIR/opt/csw/bin - -# Set up links -cd $BINDIR -rm -f sudo sudoedit -ln -f sudo.minimal sudo -ln -f sudo.minimal sudoedit - -exit 0 - Deleted: csw/mgar/pkg/sudo/trunk/files/CSWsudo.postremove =================================================================== --- csw/mgar/pkg/sudo/trunk/files/CSWsudo.postremove 2009-04-09 04:43:04 UTC (rev 4241) +++ csw/mgar/pkg/sudo/trunk/files/CSWsudo.postremove 2009-04-09 04:44:37 UTC (rev 4242) @@ -1,15 +0,0 @@ -#!/bin/sh - -BINDIR=$BASEDIR/opt/csw/bin - -cd $BINDIR -rm -f sudo sudoedit - -OTHERSUDO=`ls -1 sudo.* 2>/dev/null | head -1` -if [ -n "$OTHERSUDO" ]; then - ln -f $OTHERSUDO sudo - ln -f $OTHERSUDO sudoedit -fi - -exit 0 - Deleted: csw/mgar/pkg/sudo/trunk/files/CSWsudo.prototype =================================================================== --- csw/mgar/pkg/sudo/trunk/files/CSWsudo.prototype 2009-04-09 04:43:04 UTC (rev 4241) +++ csw/mgar/pkg/sudo/trunk/files/CSWsudo.prototype 2009-04-09 04:44:37 UTC (rev 4242) @@ -1,2 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/sudo.minimal=/opt/csw/bin/sudo 4111 root root Deleted: csw/mgar/pkg/sudo/trunk/files/CSWsudo.space =================================================================== --- csw/mgar/pkg/sudo/trunk/files/CSWsudo.space 2009-04-09 04:43:04 UTC (rev 4241) +++ csw/mgar/pkg/sudo/trunk/files/CSWsudo.space 2009-04-09 04:44:37 UTC (rev 4242) @@ -1 +0,0 @@ -$BASEDIR 1 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Apr 9 10:19:51 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 09 Apr 2009 08:19:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[4243] csw/mgar/pkg/htmldoc/trunk/Makefile Message-ID: Revision: 4243 http://gar.svn.sourceforge.net/gar/?rev=4243&view=rev Author: hson Date: 2009-04-09 08:19:51 +0000 (Thu, 09 Apr 2009) Log Message: ----------- htmldoc: Enable check again Modified Paths: -------------- csw/mgar/pkg/htmldoc/trunk/Makefile Modified: csw/mgar/pkg/htmldoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/htmldoc/trunk/Makefile 2009-04-09 04:44:37 UTC (rev 4242) +++ csw/mgar/pkg/htmldoc/trunk/Makefile 2009-04-09 08:19:51 UTC (rev 4243) @@ -46,5 +46,5 @@ TEST_SCRIPTS = # Disable check until package is released -ENABLE_CHECK = 0 +#ENABLE_CHECK = 0 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 9 10:57:06 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Apr 2009 08:57:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[4244] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 4244 http://gar.svn.sourceforge.net/gar/?rev=4244&view=rev Author: dmichelsen Date: 2009-04-09 08:57:06 +0000 (Thu, 09 Apr 2009) Log Message: ----------- mGAR v2: Take out legacy feature inherited from Garnome Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2009-04-09 08:19:51 UTC (rev 4243) +++ csw/mgar/gar/v2/gar.pkg.mk 2009-04-09 08:57:06 UTC (rev 4244) @@ -127,9 +127,6 @@ SPKG_REVSTAMP ?= ,REV=$(shell date '+%Y.%m.%d') endif -# Is this a full or incremental build? -SPKG_INCREMENTAL ?= 1 - # Where we find our mkpackage global templates PKGLIB = $(CURDIR)/$(GARDIR)/pkglib 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 9 11:06:41 2009 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 09 Apr 2009 09:06:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[4245] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 4245 http://gar.svn.sourceforge.net/gar/?rev=4245&view=rev Author: bonivart Date: 2009-04-09 09:06:41 +0000 (Thu, 09 Apr 2009) Log Message: ----------- pkgutil: rename LICENSE to license Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.gspec csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2009-04-09 08:57:06 UTC (rev 4244) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2009-04-09 09:06:41 UTC (rev 4245) @@ -45,7 +45,7 @@ @cp $(WORKSRC)/bldcat $(DESTDIR)$(bindir) @cp $(WORKSRC)/chkcat $(DESTDIR)$(bindir) @cp $(WORKSRC)/readme $(DESTDIR)$(docdir)/$(GARNAME)/ - @cp $(WORKSRC)/LICENSE $(DESTDIR)$(docdir)/$(GARNAME)/ + @cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/ # @cp $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil # @cp $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil @cp $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2009-04-09 08:57:06 UTC (rev 4244) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2009-04-09 09:06:41 UTC (rev 4245) @@ -1,5 +1,5 @@ -97349a661c6f779e33621b73b738925e download/pkgutil-1.5.zip -805cd30ad9f21cb1167d166fa99b5891 download/CSWpkgutil.gspec -54bd1af1cd6ca5ac7e63586ffc16842d download/CSWpkgutil.prototype +f9fdd7e5a2bf82ebabe1db387ef163a1 download/pkgutil-1.5.zip +a16c6f81bc537d6172fd65d8da1aeecc download/CSWpkgutil.gspec +bbfa438bcc97cd709f8d1b6716485925 download/CSWpkgutil.prototype e1407c24d47306dbc4cea22dcb291f1d download/CSWpkgutil.postinstall 2fb6c94a2d212f08b71d462082a2d31a download/CSWpkgutil.preremove Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.gspec =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.gspec 2009-04-09 08:57:06 UTC (rev 4244) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.gspec 2009-04-09 09:06:41 UTC (rev 4245) @@ -6,5 +6,5 @@ %prototype url file://%{FILEDIR}/CSWpkgutil.prototype %copyright -Please see /opt/csw/share/doc/pkgutil/LICENSE for license information. +Please see /opt/csw/share/doc/pkgutil/license for license information. Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-04-09 08:57:06 UTC (rev 4244) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2009-04-09 09:06:41 UTC (rev 4245) @@ -17,7 +17,7 @@ d none /opt/csw/share 0755 root bin d none /opt/csw/share/doc 0755 root bin d none /opt/csw/share/doc/pkgutil 0755 root bin -f none /opt/csw/share/doc/pkgutil/LICENSE 644 root bin +f none /opt/csw/share/doc/pkgutil/license 644 root bin f none /opt/csw/share/doc/pkgutil/readme 644 root bin d none /opt/csw/share/man 0755 root bin d none /opt/csw/share/man/man1 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Apr 9 12:03:46 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 09 Apr 2009 10:03:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[4246] csw/mgar/pkg/xterm/trunk Message-ID: Revision: 4246 http://gar.svn.sourceforge.net/gar/?rev=4246&view=rev Author: skayser Date: 2009-04-09 10:03:42 +0000 (Thu, 09 Apr 2009) Log Message: ----------- xterm: enable build against freetype2, added program suffix (86) Modified Paths: -------------- csw/mgar/pkg/xterm/trunk/Makefile csw/mgar/pkg/xterm/trunk/files/README.CSW Modified: csw/mgar/pkg/xterm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xterm/trunk/Makefile 2009-04-09 09:06:41 UTC (rev 4245) +++ csw/mgar/pkg/xterm/trunk/Makefile 2009-04-09 10:03:42 UTC (rev 4246) @@ -39,6 +39,8 @@ CONFIGURE_ARGS += --enable-sun-fkeys CONFIGURE_ARGS += --enable-warnings CONFIGURE_ARGS += --enable-wide-chars +CONFIGURE_ARGS += --program-suffix=86 --with-xterm-symlink +CONFIGURE_ARGS += --with-freetype-cflags="-I$(includedir)/freetype2" # luit comes with snv_85 # http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6662431 @@ -48,8 +50,6 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings -EXTRA_INC = $(includedir)/freetype2 - include gar/category.mk # Hack for now to address the double /opt/csw/lib in $R*PATH. One comes Modified: csw/mgar/pkg/xterm/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/xterm/trunk/files/README.CSW 2009-04-09 09:06:41 UTC (rev 4245) +++ csw/mgar/pkg/xterm/trunk/files/README.CSW 2009-04-09 10:03:42 UTC (rev 4246) @@ -8,18 +8,21 @@ color support in some ncurses-based applications. To make full use of the capabilities of this xterm (including color-support) -set TERM=xterm-new. +set TERM=xterm-new. You might then however experience problems when +SSH'ing to machines where xterm-new isn't known to terminfo ("terminal not +fully functional" messages). That's the main reason TERM=xterm-new hasn't +been compiled in as a default by the way. -Note: app-defaults in /opt/csw/lib/X11/app-defaults ---------------------------------------------------- +Note: X resource files in /opt/csw/lib/X11/app-defaults +------------------------------------------------------- -Although this package delivers some x resource files in +Although this package delivers some X resource files in /opt/csw/lib/X11/app-defaults/ this folder is not evaluated by the Solaris libXt per default. Either treat them as example files and copy and paste what you need into -your system / personal x resource files or set XFILESEARCHPATH / +your system / personal X resource files or set XFILESEARCHPATH / XUSERFILESEARCHPATH to honor this directory. http://www.faqs.org/faqs/x-faq/part2/section-22.html 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 9 12:05:14 2009 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 09 Apr 2009 10:05:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[4247] csw/mgar/pkg/mcabber/trunk/Makefile Message-ID: Revision: 4247 http://gar.svn.sourceforge.net/gar/?rev=4247&view=rev Author: skayser Date: 2009-04-09 10:05:14 +0000 (Thu, 09 Apr 2009) Log Message: ----------- mcabber: adjusted DESCRIPTION Modified Paths: -------------- csw/mgar/pkg/mcabber/trunk/Makefile Modified: csw/mgar/pkg/mcabber/trunk/Makefile =================================================================== --- csw/mgar/pkg/mcabber/trunk/Makefile 2009-04-09 10:03:42 UTC (rev 4246) +++ csw/mgar/pkg/mcabber/trunk/Makefile 2009-04-09 10:05:14 UTC (rev 4247) @@ -2,7 +2,7 @@ GARVERSION = 0.9.9 CATEGORIES = utils -DESCRIPTION = A small Jabber console client +DESCRIPTION = A small terminal-based Jabber client define BLURB mcabber is a small Jabber console client. mcabber includes features such as SSL support, MUC (Multi-User Chat) support, history logging, command This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Thu Apr 9 13:12:41 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Thu, 09 Apr 2009 11:12:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[4248] csw/mgar/pkg/maven2/trunk Message-ID: Revision: 4248 http://gar.svn.sourceforge.net/gar/?rev=4248&view=rev Author: trygvis Date: 2009-04-09 11:12:41 +0000 (Thu, 09 Apr 2009) Log Message: ----------- o Upgrading to Maven 2.0.10. Modified Paths: -------------- csw/mgar/pkg/maven2/trunk/Makefile csw/mgar/pkg/maven2/trunk/checksums Modified: csw/mgar/pkg/maven2/trunk/Makefile =================================================================== --- csw/mgar/pkg/maven2/trunk/Makefile 2009-04-09 10:05:14 UTC (rev 4247) +++ csw/mgar/pkg/maven2/trunk/Makefile 2009-04-09 11:12:41 UTC (rev 4248) @@ -1,5 +1,5 @@ GARNAME = maven2 -GARVERSION = 2.0.9 +GARVERSION = 2.0.10 CATEGORIES = devel GARCH = all Modified: csw/mgar/pkg/maven2/trunk/checksums =================================================================== --- csw/mgar/pkg/maven2/trunk/checksums 2009-04-09 10:05:14 UTC (rev 4247) +++ csw/mgar/pkg/maven2/trunk/checksums 2009-04-09 11:12:41 UTC (rev 4248) @@ -1,3 +1,3 @@ -6d842f7cb9696676982096c72d063133 download/apache-maven-2.0.9-bin.tar.gz +1673c4b206633155774ecbcab1c2fb2e download/apache-maven-2.0.10-bin.tar.gz 8c87a565ba53d763dbf82a2f27f1cff0 download/CSWmaven2.gspec f935bf12216ef6533ca53879a456ebeb download/bin-mvn 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 9 14:35:01 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Apr 2009 12:35:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[4249] csw/mgar/pkg Message-ID: Revision: 4249 http://gar.svn.sourceforge.net/gar/?rev=4249&view=rev Author: dmichelsen Date: 2009-04-09 12:35:00 +0000 (Thu, 09 Apr 2009) Log Message: ----------- vncserver: Initial commit, unfinished Added Paths: ----------- csw/mgar/pkg/vncserver/ csw/mgar/pkg/vncserver/branches/ csw/mgar/pkg/vncserver/tags/ csw/mgar/pkg/vncserver/trunk/ csw/mgar/pkg/vncserver/trunk/Makefile csw/mgar/pkg/vncserver/trunk/checksums csw/mgar/pkg/vncserver/trunk/files/ csw/mgar/pkg/vncserver/trunk/files/vncservers Property changes on: csw/mgar/pkg/vncserver/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/vncserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/vncserver/trunk/Makefile (rev 0) +++ csw/mgar/pkg/vncserver/trunk/Makefile 2009-04-09 12:35:00 UTC (rev 4249) @@ -0,0 +1,132 @@ +GARNAME = tightvnc +GARVERSION = 1.3.10 +CATEGORIES = utils + +DESCRIPTION = TightVNC server is a free remote control package derived from the popular VNC software +define BLURB +endef + +SF_PROJ = vnc-tight +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION)_unixsrc.tar.bz2 +DISTFILES += vncservers + +PACKAGES = CSWvncs +CATALOGNAME = vncserver + +SPKG_SOURCEURL = http://www.tightvnc.org/ + +REQUIRED_PKGS = CSWjpeg CSWtcpwrap + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_USE_SF = 1 +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=14067 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)_unixsrc.tar.bz2 + +DISTNAME = vnc_unixsrc + +# Use tightvnc.spec + +EXTRA_DEFINES = -DUSE_LIBWRAP=1 +EXTRA_INCLUDE = $(CFLAGS) +LOCAL_LDFLAGS = $(LINKER_FLAGS) +BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDE LOCAL_LDFLAGS + +CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile Xvnc +CONFIGURE_ARGS = -a + +BUILD_SCRIPTS = vnc Xvnc + +# VNC doesn't come with tests +TEST_SCRIPTS = + +INSTALL_SCRIPTS = vnc + +include gar/category.mk + +pre-configure-modulated: + perl -pi -e "s|/usr/local/vnc/classes|$(datadir)/vnc/classes|" $(WORKSRC)/vncserver + $(MAKECOOKIE) + +configure-Xvnc: + banner "Config Xvnc" + perl -pi -e "s|^(\s*make)\s*$$|\1 CC=$(CC)|" $(WORKSRC)/Xvnc/configure + cd $(WORKSRC)/Xvnc && ./configure + $(MAKECOOKIE) + +build-vnc: + banner "Build VNC" + #$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + cd $(WORKSRC) && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") World + $(MAKECOOKIE) + +build-Xvnc: configure-Xvnc + banner "Build Xvnc" + cd $(WORKSRC)/Xvnc && $(MAKE) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" + +#xmkmf -a +#make CDEBUGFLAGS="$RPM_OPT_FLAGS" World +#cd Xvnc +#./configure +#make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="$RPM_OPT_FLAGS" \ +# EXTRA_DEFINES="-DUSE_LIBWRAP=1" + +install-vnc: + ginstall -d $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(mandir)/man1 + (cd $(WORKSRC); ./vncinstall $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)) + ginstall -d $(DESTDIR)$(datadir)/vnc + (cd $(WORKSRC); cp -pR classes $(DESTDIR)$(datadir)/vnc) + #mkdir -p %{buildroot}/etc/rc.d/init.d + #install -m755 vncserver.init %{buildroot}/etc/rc.d/init.d/vncserver + ginstall -m 644 $(WORKDIR)/vncservers $(DESTDIR)$(sysconfdir)/vncservers + + + +# Build + +#patch < vnc-xclients.patch + +#xmkmf -a +#make CDEBUGFLAGS="$RPM_OPT_FLAGS" World +#cd Xvnc +#./configure +#make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="$RPM_OPT_FLAGS" \ +# EXTRA_DEFINES="-DUSE_LIBWRAP=1" + + + + +# Install + +#rm -rf %{buildroot} + +#mkdir -p %{buildroot}%{_bindir} +#mkdir -p %{buildroot}%{_mandir}/man1 +#./vncinstall %{buildroot}%{_bindir} %{buildroot}%{_mandir} + +#mkdir -p %{buildroot}%{_datadir}/vnc +#cp -aR classes %{buildroot}%{_datadir}/vnc + +#strip %{buildroot}%{_bindir}/* || : + +#mkdir -p %{buildroot}/etc/rc.d/init.d +#install -m755 vncserver.init %{buildroot}/etc/rc.d/init.d/vncserver +# +#mkdir -p %{buildroot}/etc/sysconfig +#cat > %{buildroot}/etc/sysconfig/vncservers << EOF +# The VNCSERVERS variable is a list of display:user pairs. +# +# Uncomment the line below to start a VNC server on display :1 +# as my 'myusername' (adjust this to your own). You will also +# need to set a VNC password; run 'man vncpasswd' to see how +# to do that. +# +# DO NOT RUN THIS SERVICE if your local area network is +# untrusted! For a secure way of using VNC, see +# . + +# VNCSERVERS="1:myusername" +#EOF +#chmod 644 %{buildroot}/etc/sysconfig/vncservers + Added: csw/mgar/pkg/vncserver/trunk/checksums =================================================================== --- csw/mgar/pkg/vncserver/trunk/checksums (rev 0) +++ csw/mgar/pkg/vncserver/trunk/checksums 2009-04-09 12:35:00 UTC (rev 4249) @@ -0,0 +1,2 @@ +397b35faad32d5246b6d44b142f8304f download/tightvnc-1.3.10_unixsrc.tar.bz2 +56c09be17c17184e96193c13246fd649 download/vncservers Added: csw/mgar/pkg/vncserver/trunk/files/vncservers =================================================================== --- csw/mgar/pkg/vncserver/trunk/files/vncservers (rev 0) +++ csw/mgar/pkg/vncserver/trunk/files/vncservers 2009-04-09 12:35:00 UTC (rev 4249) @@ -0,0 +1,12 @@ +# The VNCSERVERS variable is a list of display:user pairs. + +# Uncomment the line below to start a VNC server on display :1 +# as my 'myusername' (adjust this to your own). You will also +# need to set a VNC password; run 'man vncpasswd' to see how +# to do that. + +# DO NOT RUN THIS SERVICE if your local area network is +# untrusted! For a secure way of using VNC, see +# . + +# VNCSERVERS="1:myusername" 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 9 14:36:05 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Apr 2009 12:36:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[4250] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 4250 http://gar.svn.sourceforge.net/gar/?rev=4250&view=rev Author: dmichelsen Date: 2009-04-09 12:36:04 +0000 (Thu, 09 Apr 2009) Log Message: ----------- mGAR v2: Avoid double-inclusion of patches appearing on more than one modulation Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-04-09 12:35:00 UTC (rev 4249) +++ csw/mgar/gar/v2/gar.mk 2009-04-09 12:36:04 UTC (rev 4250) @@ -49,7 +49,7 @@ ALLFILES_PATCHFILES ?= $(PATCHFILES) $(foreach M,$(MODULATIONS),$(PATCHFILES_$M)) ALLFILES_DYNSCRIPTS ?= $(DYNSCRIPTS) ALLFILES_GIT_REPOS ?= $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))) -ALLFILES ?= $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) +ALLFILES ?= $(sort $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES) $(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS) $(EXTRA_ALLFILES)) ifeq ($(MAKE_INSTALL_DIRS),1) INSTALL_DIRS = $(addprefix $(DESTDIR),$(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir) $(datadir) $(sysconfdir) $(sharedstatedir) $(localstatedir) $(libdir) $(infodir) $(lispdir) $(includedir) $(mandir) $(foreach NUM,1 2 3 4 5 6 7 8, $(mandir)/man$(NUM)) $(sourcedir)) 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 9 14:53:21 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Apr 2009 12:53:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[4251] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 4251 http://gar.svn.sourceforge.net/gar/?rev=4251&view=rev Author: dmichelsen Date: 2009-04-09 12:53:21 +0000 (Thu, 09 Apr 2009) Log Message: ----------- mGAR v2: Extend path to include imake-related things Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2009-04-09 12:36:04 UTC (rev 4250) +++ csw/mgar/gar/v2/gar.conf.mk 2009-04-09 12:53:21 UTC (rev 4251) @@ -489,7 +489,8 @@ # 1. Make sure everything works fine for SOS12 # 2. Allow us to use programs we just built. This is a bit complicated, # but we want PATH to be a recursive variable, or 'gmake isaenv' won't work -PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(binpath_install)/$(MM_BINDIR)):$(DESTDIR)$(binpath_install):$(abspath $(DESTDIR)$(sbinpath_install)/$(MM_BINDIR)):$(DESTDIR)$(sbinpath_install):)$(abspath $(binpath_install)/$(MM_BINDIR)):$(binpath_install):$(abspath $(sbinpath_install)/$(MM_BINDIR)):$(sbinpath_install):$(CC_HOME)/bin:$(abspath $(GARBIN)):/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin +# /usr/openwin/bin is needed for xmkmf used in gar.lib.mk +PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(binpath_install)/$(MM_BINDIR)):$(DESTDIR)$(binpath_install):$(abspath $(DESTDIR)$(sbinpath_install)/$(MM_BINDIR)):$(DESTDIR)$(sbinpath_install):)$(abspath $(binpath_install)/$(MM_BINDIR)):$(binpath_install):$(abspath $(sbinpath_install)/$(MM_BINDIR)):$(sbinpath_install):$(CC_HOME)/bin:$(abspath $(GARBIN)):/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin:/usr/openwin/bin # This is for foo-config chaos PKG_CONFIG_DIRS ?= $(libdir_install) $(EXTRA_PKG_CONFIG_DIRS) 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 9 15:13:26 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Apr 2009 13:13:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[4252] csw/mgar/pkg/top/trunk/Makefile Message-ID: Revision: 4252 http://gar.svn.sourceforge.net/gar/?rev=4252&view=rev Author: dmichelsen Date: 2009-04-09 13:13:26 +0000 (Thu, 09 Apr 2009) Log Message: ----------- top: Don't include superflous runtime linker path Modified Paths: -------------- csw/mgar/pkg/top/trunk/Makefile Modified: csw/mgar/pkg/top/trunk/Makefile =================================================================== --- csw/mgar/pkg/top/trunk/Makefile 2009-04-09 12:53:21 UTC (rev 4251) +++ csw/mgar/pkg/top/trunk/Makefile 2009-04-09 13:13:26 UTC (rev 4252) @@ -19,6 +19,9 @@ BUILD64 = 1 +# No runtime linker path as we don't reference any libs from /opt/csw +RUNPATH_LINKER_FLAGS = + # autoconf tries to compile for the current kernel. Get rid of # these extra flags as we set them ourselves with BUILD64 = 1 BUILD_OVERRIDE_DIRS = ARCHFLAG 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 9 15:40:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Apr 2009 13:40:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[4253] csw/mgar/pkg/flac/trunk Message-ID: Revision: 4253 http://gar.svn.sourceforge.net/gar/?rev=4253&view=rev Author: dmichelsen Date: 2009-04-09 13:40:35 +0000 (Thu, 09 Apr 2009) Log Message: ----------- flac: UModulate over 1.1.4 and 1.2.1 Modified Paths: -------------- csw/mgar/pkg/flac/trunk/Makefile csw/mgar/pkg/flac/trunk/checksums csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch Added Paths: ----------- csw/mgar/pkg/flac/trunk/bin/ csw/mgar/pkg/flac/trunk/bin/CC csw/mgar/pkg/flac/trunk/bin/cc Modified: csw/mgar/pkg/flac/trunk/Makefile =================================================================== --- csw/mgar/pkg/flac/trunk/Makefile 2009-04-09 13:13:26 UTC (rev 4252) +++ csw/mgar/pkg/flac/trunk/Makefile 2009-04-09 13:40:35 UTC (rev 4253) @@ -1,7 +1,17 @@ -GARNAME = flac +GARNAME = libflac GARVERSION = 1.2.1 CATEGORIES = lib +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 1.1.4 1.2.1 + +MODULATIONS = isa-sparcv8-garversion-1.1.4 +# There was no 64 bit legacy version. Do not provide it as new binaries should +# link against the new version. +#MODULATIONS += isa-sparcv9-garversion-1.1.4 +MODULATIONS += isa-sparcv8-garversion-1.2.1 +MODULATIONS += isa-sparcv9-garversion-1.2.1 + DESCRIPTION = Free lossless audio codec define BLURB FLAC stands for Free Lossless Audio Codec, an audio format similar @@ -15,13 +25,24 @@ SF_PROJ = flac MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = $(SF_PROJ)-$(GARVERSION) +DISTFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(SF_PROJ)-$(VERSION).tar.gz) -PATCHFILES = no-stdint.patch -PATCHFILES += libtool-64bit.patch +PATCHFILES_isa-sparcv8-garversion-1.1.4 = libtool-64bit.patch +PATCHFILES_isa-sparcv9-garversion-1.1.4 = libtool-64bit.patch +PATCHFILES_isa-sparcv8-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch +PATCHFILES_isa-sparcv9-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch +PACKAGES = CSWflac CSWxmmsflac CATALOGNAME = libflac +CATALOGNAME = xmms_flac +REQUIRED_PKGS_CSWflac = CSWiconv CSWlibogg +REQUIRED_PKGS_CSWxmmsflac = CSWglib CSWgtk CSWxmms CSWflac + +SPKG_DESC_CSWflac = Free lossless audio codec +SPKG_DESC_CSWxmmsflac = FLAC plugin for XMMS + LICENSE = $(foreach lic,FDL GPL LGPL Xiph,COPYING.$(lic)) # We define upstream file regex so we can be notifed of new upstream software release @@ -29,14 +50,43 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = flac-(\d+(?:\.\d+)*)-src -REQUIRED_PKGS = CSWiconv CSWlibogg - BUILD64 = 1 +NODIRPATHS = --includedir +CPPFLAGS = + +# Must be defined and empty or -I$(includedir) is added too early +EXTRA_CFLAGS = -D__inline= +EXTRA_BUILD_EXPORTS = AM_CFLAGS + +EXTRA_CONFIGURE_ARGS_mm-64 = --disable-xmms-plugin CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_mm-$(MEMORYMODEL)) TEST_TARGET = check +MERGE_SCRIPTS_isa-i386-garversion-1.1.4 = copy-only +MERGE_DIRS_isa-i386-garversion-1.1.4 = $(libdir) +MERGE_SCRIPTS_isa-amd64-garversion-1.1.4 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-1.1.4 = $(libdir) + +MERGE_SCRIPTS_isa-i386-garversion-1.2.1 = copy-all +MERGE_SCRIPTS_isa-amd64-garversion-1.2.1 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + +MERGE_SCRIPTS_isa-sparcv8-garversion-1.1.4 = copy-only +MERGE_DIRS_isa-sparcv8-garversion-1.1.4 = $(libdir) +MERGE_SCRIPTS_isa-sparcv9-garversion-1.1.4 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-1.1.4 = $(libdir) + +MERGE_SCRIPTS_isa-sparcv8-garversion-1.2.1 = copy-all +MERGE_SCRIPTS_isa-sparcv9-garversion-1.2.1 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + +PKGFILES_CSWxmmsflac = $(libdir)/xmms/.* + include gar/category.mk -PATH := $(PATH):/usr/ccs/bin +CC := $(abspath ./bin/cc) +CXX := $(abspath ./bin/CC) +PATH := ./bin:$(PATH):/usr/ccs/bin Added: csw/mgar/pkg/flac/trunk/bin/CC =================================================================== --- csw/mgar/pkg/flac/trunk/bin/CC (rev 0) +++ csw/mgar/pkg/flac/trunk/bin/CC 2009-04-09 13:40:35 UTC (rev 4253) @@ -0,0 +1 @@ +link cc \ No newline at end of file Property changes on: csw/mgar/pkg/flac/trunk/bin/CC ___________________________________________________________________ Added: svn:special + * Added: csw/mgar/pkg/flac/trunk/bin/cc =================================================================== --- csw/mgar/pkg/flac/trunk/bin/cc (rev 0) +++ csw/mgar/pkg/flac/trunk/bin/cc 2009-04-09 13:40:35 UTC (rev 4253) @@ -0,0 +1,22 @@ +#!/opt/csw/bin/perl -w + +use strict; + +my @oargs; + +my @includes = grep { /^-I/ } @ARGV; + at includes = ((grep { /^-I[^\/]/ } @includes),(grep { /^-I[\/]/ } @includes)); +my @argswoincludes = grep { !/^-I/ } @ARGV; + +foreach (@ARGV) { + if( /^-I/ ) { + push @oargs, @includes, @argswoincludes; + last; + } + push @oargs, shift @argswoincludes; +} + +my $cc = "/opt/studio/SOS11/SUNWspro/bin/" . ($0 =~ /cc/ ? "cc" : "CC"); + +print "$cc ", join( " ", @oargs ), "\n"; +exec( $cc, @oargs ); Property changes on: csw/mgar/pkg/flac/trunk/bin/cc ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/pkg/flac/trunk/checksums =================================================================== --- csw/mgar/pkg/flac/trunk/checksums 2009-04-09 13:13:26 UTC (rev 4252) +++ csw/mgar/pkg/flac/trunk/checksums 2009-04-09 13:40:35 UTC (rev 4253) @@ -1,3 +1,4 @@ +3958cbd5b6ed8c14966792538e44223b download/flac-1.1.4.tar.gz 153c8b15a54da428d1f0fadc756c22c7 download/flac-1.2.1.tar.gz +c9e9052e1d1238a21ac6c4ab263d2b7f download/libtool-64bit.patch e3144fad8810ceaca718adb6f09dc8fa download/no-stdint.patch -099621e0dad419188acd42c588242131 download/libtool-64bit.patch Modified: csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch =================================================================== --- csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch 2009-04-09 13:13:26 UTC (rev 4252) +++ csw/mgar/pkg/flac/trunk/files/libtool-64bit.patch 2009-04-09 13:40:35 UTC (rev 4253) @@ -1,7 +1,7 @@ -diff -Naur db-4.4.20.orig/dist/ltmain.sh db-4.4.20/dist/ltmain.sh ---- dist/ltmain.sh 2005-10-17 16:35:53.000000000 +0200 -+++ dist/ltmain.sh 2008-05-14 08:30:26.766534000 +0200 -@@ -1552,9 +1552,7 @@ +diff -Naur flac-1.1.4.orig/ltmain.sh flac-1.1.4.patched/ltmain.sh +--- flac-1.1.4.orig/ltmain.sh 2005-04-26 20:23:39.000000000 +0200 ++++ flac-1.1.4.patched/ltmain.sh 2009-04-09 13:59:57.521039544 +0200 +@@ -1545,9 +1545,7 @@ esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" 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 9 15:57:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Apr 2009 13:57:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[4254] csw/mgar/pkg/texinfo/trunk/Makefile Message-ID: Revision: 4254 http://gar.svn.sourceforge.net/gar/?rev=4254&view=rev Author: dmichelsen Date: 2009-04-09 13:57:33 +0000 (Thu, 09 Apr 2009) Log Message: ----------- texinfo: Fix runtime linker path from bug #3598 and depend on CSWbash from #3613 Modified Paths: -------------- csw/mgar/pkg/texinfo/trunk/Makefile Modified: csw/mgar/pkg/texinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/texinfo/trunk/Makefile 2009-04-09 13:40:35 UTC (rev 4253) +++ csw/mgar/pkg/texinfo/trunk/Makefile 2009-04-09 13:57:33 UTC (rev 4254) @@ -19,10 +19,14 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWgsed CSWncurses CSWiconv CSWggettextrt +REQUIRED_PKGS = CSWbash CSWgsed CSWncurses CSWiconv CSWggettextrt CONFIGURE_ARGS = $(DIRPATHS) +# /opt/csw/lib is added automatically during the build and the +# required libraries don't offer optimized versions, hence no $ISALIST. +RUNPATH_LINKER_FLAGS = + TEST_TARGET = check EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias @@ -31,6 +35,10 @@ SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) +post-extract-modulated: + perl -pi -e "s(#! /bin/sh)(#!/opt/csw/bin/bash)" $(WORKSRC)/util/texi2dvi + @$(MAKECOOKIE) + post-install-modulated: ginstall -d $(DESTDIR)$(sbindir) ginstall -m 755 $(WORKDIR)/mkdirentries $(DESTDIR)$(sbindir)/mkdirentries This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Thu Apr 9 16:01:11 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Thu, 09 Apr 2009 14:01:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[4255] csw/mgar/pkg Message-ID: Revision: 4255 http://gar.svn.sourceforge.net/gar/?rev=4255&view=rev Author: trygvis Date: 2009-04-09 14:01:11 +0000 (Thu, 09 Apr 2009) Log Message: ----------- o Initial commit of Kawa. Added Paths: ----------- csw/mgar/pkg/kawa/ csw/mgar/pkg/kawa/Makefile csw/mgar/pkg/kawa/branches/ csw/mgar/pkg/kawa/tags/ csw/mgar/pkg/kawa/trunk/ csw/mgar/pkg/kawa/trunk/Makefile csw/mgar/pkg/kawa/trunk/checksums csw/mgar/pkg/kawa/trunk/files/ csw/mgar/pkg/kawa/trunk/files/CSWkawa.gspec Added: csw/mgar/pkg/kawa/Makefile =================================================================== --- csw/mgar/pkg/kawa/Makefile (rev 0) +++ csw/mgar/pkg/kawa/Makefile 2009-04-09 14:01:11 UTC (rev 4255) @@ -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/kawa/trunk ___________________________________________________________________ Added: svn:ignore + Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/kawa/trunk/Makefile =================================================================== --- csw/mgar/pkg/kawa/trunk/Makefile (rev 0) +++ csw/mgar/pkg/kawa/trunk/Makefile 2009-04-09 14:01:11 UTC (rev 4255) @@ -0,0 +1,29 @@ +GARNAME = kawa +GARVERSION = 1.9.1 +CATEGORIES = utils +GARCH = all + +DESCRIPTION = Java implementation of Scheme and a framework for implementing high-level and dynamic languages + +MASTER_SITES = ftp://ftp.gnu.org/pub/gnu/kawa +DISTFILES = apache-maven-$(GARVERSION)-bin.tar.gz +DISTFILES += $(call admfiles,CSWkawa,) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = kawa-(\d+(?:\.\d+)*).tar.gz + +#CONFIGURE_SCRIPTS = +#BUILD_SCRIPTS = +#TEST_SCRIPTS = +#INSTALL_SCRIPTS = common + +include gar/category.mk + +#install-common: +# mkdir -p $(DESTDIR)/opt/csw/bin +# rm -rf $(DESTDIR)/opt/csw/share/maven2 +# mkdir -p $(DESTDIR)/opt/csw/share/maven2 +# cp -r $(WORKDIR)/apache-maven-$(GARVERSION)/ $(DESTDIR)/opt/csw/share/maven2/home +# cp $(WORKDIR)/bin-mvn $(DESTDIR)/opt/csw/bin/mvn +# chmod +x $(DESTDIR)/opt/csw/bin/mvn +# $(MAKECOOKIE) Added: csw/mgar/pkg/kawa/trunk/checksums =================================================================== --- csw/mgar/pkg/kawa/trunk/checksums (rev 0) +++ csw/mgar/pkg/kawa/trunk/checksums 2009-04-09 14:01:11 UTC (rev 4255) @@ -0,0 +1,3 @@ +6d842f7cb9696676982096c72d063133 download/apache-maven-2.0.9-bin.tar.gz +8c87a565ba53d763dbf82a2f27f1cff0 download/CSWmaven2.gspec +f935bf12216ef6533ca53879a456ebeb download/bin-mvn Added: csw/mgar/pkg/kawa/trunk/files/CSWkawa.gspec =================================================================== --- csw/mgar/pkg/kawa/trunk/files/CSWkawa.gspec (rev 0) +++ csw/mgar/pkg/kawa/trunk/files/CSWkawa.gspec 2009-04-09 14:01:11 UTC (rev 4255) @@ -0,0 +1,6 @@ +%var bitname kawa +%var pkgname CSWkawa +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +See /opt/csw/share/kawa/LICENSE.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Thu Apr 9 16:42:37 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Thu, 09 Apr 2009 14:42:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[4256] csw/mgar/pkg/kawa/trunk Message-ID: Revision: 4256 http://gar.svn.sourceforge.net/gar/?rev=4256&view=rev Author: trygvis Date: 2009-04-09 14:42:37 +0000 (Thu, 09 Apr 2009) Log Message: ----------- o Correcting master site and checksums. Modified Paths: -------------- csw/mgar/pkg/kawa/trunk/Makefile csw/mgar/pkg/kawa/trunk/checksums Modified: csw/mgar/pkg/kawa/trunk/Makefile =================================================================== --- csw/mgar/pkg/kawa/trunk/Makefile 2009-04-09 14:01:11 UTC (rev 4255) +++ csw/mgar/pkg/kawa/trunk/Makefile 2009-04-09 14:42:37 UTC (rev 4256) @@ -5,8 +5,8 @@ DESCRIPTION = Java implementation of Scheme and a framework for implementing high-level and dynamic languages -MASTER_SITES = ftp://ftp.gnu.org/pub/gnu/kawa -DISTFILES = apache-maven-$(GARVERSION)-bin.tar.gz +MASTER_SITES = ftp://ftp.gnu.org/pub/gnu/kawa/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWkawa,) # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/kawa/trunk/checksums =================================================================== --- csw/mgar/pkg/kawa/trunk/checksums 2009-04-09 14:01:11 UTC (rev 4255) +++ csw/mgar/pkg/kawa/trunk/checksums 2009-04-09 14:42:37 UTC (rev 4256) @@ -1,3 +1,2 @@ -6d842f7cb9696676982096c72d063133 download/apache-maven-2.0.9-bin.tar.gz -8c87a565ba53d763dbf82a2f27f1cff0 download/CSWmaven2.gspec -f935bf12216ef6533ca53879a456ebeb download/bin-mvn +611209ca2f621cee8041321902a0466c download/CSWkawa.gspec +8a1cc2d67127392f6f3f180d53800725 download/kawa-1.9.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 Thu Apr 9 16:48:02 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Apr 2009 14:48:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[4257] csw/mgar/pkg/flac/trunk Message-ID: Revision: 4257 http://gar.svn.sourceforge.net/gar/?rev=4257&view=rev Author: dmichelsen Date: 2009-04-09 14:48:02 +0000 (Thu, 09 Apr 2009) Log Message: ----------- flac: Downgrade to legacy 1.1.2 Modified Paths: -------------- csw/mgar/pkg/flac/trunk/Makefile csw/mgar/pkg/flac/trunk/checksums Modified: csw/mgar/pkg/flac/trunk/Makefile =================================================================== --- csw/mgar/pkg/flac/trunk/Makefile 2009-04-09 14:42:37 UTC (rev 4256) +++ csw/mgar/pkg/flac/trunk/Makefile 2009-04-09 14:48:02 UTC (rev 4257) @@ -3,12 +3,13 @@ CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 1.1.4 1.2.1 +# Version 1.1.2 is the last to contain libflac.so.7 where most of the binaries depend on +MODULATIONS_GARVERSION = 1.1.2 1.2.1 -MODULATIONS = isa-sparcv8-garversion-1.1.4 +MODULATIONS = isa-sparcv8-garversion-1.1.2 # There was no 64 bit legacy version. Do not provide it as new binaries should # link against the new version. -#MODULATIONS += isa-sparcv9-garversion-1.1.4 +#MODULATIONS += isa-sparcv9-garversion-1.1.2 MODULATIONS += isa-sparcv8-garversion-1.2.1 MODULATIONS += isa-sparcv9-garversion-1.2.1 @@ -28,8 +29,8 @@ DISTNAME = $(SF_PROJ)-$(GARVERSION) DISTFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(SF_PROJ)-$(VERSION).tar.gz) -PATCHFILES_isa-sparcv8-garversion-1.1.4 = libtool-64bit.patch -PATCHFILES_isa-sparcv9-garversion-1.1.4 = libtool-64bit.patch +PATCHFILES_isa-sparcv8-garversion-1.1.2 = libtool-64bit.patch +PATCHFILES_isa-sparcv9-garversion-1.1.2 = libtool-64bit.patch PATCHFILES_isa-sparcv8-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch PATCHFILES_isa-sparcv9-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch @@ -43,6 +44,8 @@ SPKG_DESC_CSWflac = Free lossless audio codec SPKG_DESC_CSWxmmsflac = FLAC plugin for XMMS +SPKG_SOURCEURL = http://flac.sourceforge.net/ + LICENSE = $(foreach lic,FDL GPL LGPL Xiph,COPYING.$(lic)) # We define upstream file regex so we can be notifed of new upstream software release @@ -65,19 +68,19 @@ TEST_TARGET = check -MERGE_SCRIPTS_isa-i386-garversion-1.1.4 = copy-only -MERGE_DIRS_isa-i386-garversion-1.1.4 = $(libdir) -MERGE_SCRIPTS_isa-amd64-garversion-1.1.4 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-1.1.4 = $(libdir) +MERGE_SCRIPTS_isa-i386-garversion-1.1.2 = copy-only +MERGE_DIRS_isa-i386-garversion-1.1.2 = $(libdir) +MERGE_SCRIPTS_isa-amd64-garversion-1.1.2 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-1.1.2 = $(libdir) MERGE_SCRIPTS_isa-i386-garversion-1.2.1 = copy-all MERGE_SCRIPTS_isa-amd64-garversion-1.2.1 = copy-relocated-only MERGE_DIRS_isa-amd64-garversion-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) -MERGE_SCRIPTS_isa-sparcv8-garversion-1.1.4 = copy-only -MERGE_DIRS_isa-sparcv8-garversion-1.1.4 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-1.1.4 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-1.1.4 = $(libdir) +MERGE_SCRIPTS_isa-sparcv8-garversion-1.1.2 = copy-only +MERGE_DIRS_isa-sparcv8-garversion-1.1.2 = $(libdir) +MERGE_SCRIPTS_isa-sparcv9-garversion-1.1.2 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-1.1.2 = $(libdir) MERGE_SCRIPTS_isa-sparcv8-garversion-1.2.1 = copy-all MERGE_SCRIPTS_isa-sparcv9-garversion-1.2.1 = copy-relocated-only @@ -90,3 +93,7 @@ CC := $(abspath ./bin/cc) CXX := $(abspath ./bin/CC) PATH := ./bin:$(PATH):/usr/ccs/bin + +post-patch-isa-sparcv8-garversion-1.1.2: + perl -pi -e "s/-O2 //g" $(WORKSRC)/configure + $(MAKECOOKIE) Modified: csw/mgar/pkg/flac/trunk/checksums =================================================================== --- csw/mgar/pkg/flac/trunk/checksums 2009-04-09 14:42:37 UTC (rev 4256) +++ csw/mgar/pkg/flac/trunk/checksums 2009-04-09 14:48:02 UTC (rev 4257) @@ -1,4 +1,4 @@ -3958cbd5b6ed8c14966792538e44223b download/flac-1.1.4.tar.gz +2bfc127cdda02834d0491ab531a20960 download/flac-1.1.2.tar.gz 153c8b15a54da428d1f0fadc756c22c7 download/flac-1.2.1.tar.gz c9e9052e1d1238a21ac6c4ab263d2b7f download/libtool-64bit.patch e3144fad8810ceaca718adb6f09dc8fa download/no-stdint.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 Thu Apr 9 17:14:33 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Apr 2009 15:14:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[4258] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 4258 http://gar.svn.sourceforge.net/gar/?rev=4258&view=rev Author: dmichelsen Date: 2009-04-09 15:14:33 +0000 (Thu, 09 Apr 2009) Log Message: ----------- mGAR v2: Allow skipping of specific modulations Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2009-04-09 14:48:02 UTC (rev 4257) +++ csw/mgar/gar/v2/gar.mk 2009-04-09 15:14:33 UTC (rev 4258) @@ -121,7 +121,7 @@ ),\ $(call expand_modulator_1,$(1))) -MODULATIONS ?= $(strip $(call modulations,$(strip $(MODULATORS)))) +MODULATIONS ?= $(filter-out $(SKIP_MODULATIONS),$(strip $(call modulations,$(strip $(MODULATORS))))) # _modulate(ISA STATIC,,,) # -> _modulate2(STATIC,isa-i386,ISA,ISA=i386) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Thu Apr 9 17:16:36 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Thu, 09 Apr 2009 15:16:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[4259] csw/mgar/pkg/kawa/trunk/Makefile Message-ID: Revision: 4259 http://gar.svn.sourceforge.net/gar/?rev=4259&view=rev Author: trygvis Date: 2009-04-09 15:16:35 +0000 (Thu, 09 Apr 2009) Log Message: ----------- o Adjustments. Thanks Ben!. Modified Paths: -------------- csw/mgar/pkg/kawa/trunk/Makefile Modified: csw/mgar/pkg/kawa/trunk/Makefile =================================================================== --- csw/mgar/pkg/kawa/trunk/Makefile 2009-04-09 15:14:33 UTC (rev 4258) +++ csw/mgar/pkg/kawa/trunk/Makefile 2009-04-09 15:16:35 UTC (rev 4259) @@ -12,18 +12,13 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = kawa-(\d+(?:\.\d+)*).tar.gz -#CONFIGURE_SCRIPTS = -#BUILD_SCRIPTS = -#TEST_SCRIPTS = -#INSTALL_SCRIPTS = common +CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = include gar/category.mk -#install-common: -# mkdir -p $(DESTDIR)/opt/csw/bin -# rm -rf $(DESTDIR)/opt/csw/share/maven2 -# mkdir -p $(DESTDIR)/opt/csw/share/maven2 -# cp -r $(WORKDIR)/apache-maven-$(GARVERSION)/ $(DESTDIR)/opt/csw/share/maven2/home -# cp $(WORKDIR)/bin-mvn $(DESTDIR)/opt/csw/bin/mvn -# chmod +x $(DESTDIR)/opt/csw/bin/mvn -# $(MAKECOOKIE) +PATH := /usr/jdk1.5.0_15/bin:$(PATH) + +# checkpkg complains unless this file is removed. +post-install: + rm $(DESTDIR)/opt/csw/share/info/dir 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 9 17:17:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Apr 2009 15:17:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[4260] csw/mgar/pkg/flac/trunk/Makefile Message-ID: Revision: 4260 http://gar.svn.sourceforge.net/gar/?rev=4260&view=rev Author: dmichelsen Date: 2009-04-09 15:17:22 +0000 (Thu, 09 Apr 2009) Log Message: ----------- flac: Add modulations for i386 Modified Paths: -------------- csw/mgar/pkg/flac/trunk/Makefile Modified: csw/mgar/pkg/flac/trunk/Makefile =================================================================== --- csw/mgar/pkg/flac/trunk/Makefile 2009-04-09 15:16:35 UTC (rev 4259) +++ csw/mgar/pkg/flac/trunk/Makefile 2009-04-09 15:17:22 UTC (rev 4260) @@ -6,12 +6,10 @@ # Version 1.1.2 is the last to contain libflac.so.7 where most of the binaries depend on MODULATIONS_GARVERSION = 1.1.2 1.2.1 -MODULATIONS = isa-sparcv8-garversion-1.1.2 # There was no 64 bit legacy version. Do not provide it as new binaries should # link against the new version. -#MODULATIONS += isa-sparcv9-garversion-1.1.2 -MODULATIONS += isa-sparcv8-garversion-1.2.1 -MODULATIONS += isa-sparcv9-garversion-1.2.1 +SKIP_MODULATIONS = isa-sparcv9-garversion-1.1.2 +SKIP_MODULATIONS += isa-amd64-garversion-1.1.2 DESCRIPTION = Free lossless audio codec define BLURB @@ -34,6 +32,11 @@ PATCHFILES_isa-sparcv8-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch PATCHFILES_isa-sparcv9-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch +PATCHFILES_isa-i386-garversion-1.1.2 = libtool-64bit.patch +PATCHFILES_isa-amd64-garversion-1.1.2 = libtool-64bit.patch +PATCHFILES_isa-i386-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch +PATCHFILES_isa-amd64-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch + PACKAGES = CSWflac CSWxmmsflac CATALOGNAME = libflac CATALOGNAME = xmms_flac This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Thu Apr 9 17:19:33 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Thu, 09 Apr 2009 15:19:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[4261] csw/mgar/pkg/kawa/trunk/ Message-ID: Revision: 4261 http://gar.svn.sourceforge.net/gar/?rev=4261&view=rev Author: trygvis Date: 2009-04-09 15:19:32 +0000 (Thu, 09 Apr 2009) Log Message: ----------- o Adding ignores. Property Changed: ---------------- csw/mgar/pkg/kawa/trunk/ Property changes on: csw/mgar/pkg/kawa/trunk ___________________________________________________________________ Modified: svn:ignore - + cookies download work 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 9 17:35:25 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Apr 2009 15:35:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4262] csw/mgar/pkg/flac/trunk/Makefile Message-ID: Revision: 4262 http://gar.svn.sourceforge.net/gar/?rev=4262&view=rev Author: dmichelsen Date: 2009-04-09 15:35:24 +0000 (Thu, 09 Apr 2009) Log Message: ----------- flac: Add patch for i386 modulation Modified Paths: -------------- csw/mgar/pkg/flac/trunk/Makefile Modified: csw/mgar/pkg/flac/trunk/Makefile =================================================================== --- csw/mgar/pkg/flac/trunk/Makefile 2009-04-09 15:19:32 UTC (rev 4261) +++ csw/mgar/pkg/flac/trunk/Makefile 2009-04-09 15:35:24 UTC (rev 4262) @@ -97,6 +97,10 @@ CXX := $(abspath ./bin/CC) PATH := ./bin:$(PATH):/usr/ccs/bin +post-patch-isa-i386-garversion-1.1.2: + perl -pi -e "s/-O2 //g" $(WORKSRC)/configure + $(MAKECOOKIE) + post-patch-isa-sparcv8-garversion-1.1.2: perl -pi -e "s/-O2 //g" $(WORKSRC)/configure $(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 9 17:51:19 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Apr 2009 15:51:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[4263] csw/mgar/pkg/flac/trunk/Makefile Message-ID: Revision: 4263 http://gar.svn.sourceforge.net/gar/?rev=4263&view=rev Author: dmichelsen Date: 2009-04-09 15:51:19 +0000 (Thu, 09 Apr 2009) Log Message: ----------- flac: Fix catalog name Modified Paths: -------------- csw/mgar/pkg/flac/trunk/Makefile Modified: csw/mgar/pkg/flac/trunk/Makefile =================================================================== --- csw/mgar/pkg/flac/trunk/Makefile 2009-04-09 15:35:24 UTC (rev 4262) +++ csw/mgar/pkg/flac/trunk/Makefile 2009-04-09 15:51:19 UTC (rev 4263) @@ -38,8 +38,8 @@ PATCHFILES_isa-amd64-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch PACKAGES = CSWflac CSWxmmsflac -CATALOGNAME = libflac -CATALOGNAME = xmms_flac +CATALOGNAME_CSWflac = libflac +CATALOGNAME_CSWxmmsflac = xmms_flac REQUIRED_PKGS_CSWflac = CSWiconv CSWlibogg REQUIRED_PKGS_CSWxmmsflac = CSWglib CSWgtk CSWxmms CSWflac This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Thu Apr 9 22:00:54 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Thu, 09 Apr 2009 20:00:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[4264] csw/mgar/pkg/kawa/trunk/Makefile Message-ID: Revision: 4264 http://gar.svn.sourceforge.net/gar/?rev=4264&view=rev Author: trygvis Date: 2009-04-09 20:00:54 +0000 (Thu, 09 Apr 2009) Log Message: ----------- o Fixing broken ARCH flag. Modified Paths: -------------- csw/mgar/pkg/kawa/trunk/Makefile Modified: csw/mgar/pkg/kawa/trunk/Makefile =================================================================== --- csw/mgar/pkg/kawa/trunk/Makefile 2009-04-09 15:51:19 UTC (rev 4263) +++ csw/mgar/pkg/kawa/trunk/Makefile 2009-04-09 20:00:54 UTC (rev 4264) @@ -1,7 +1,7 @@ GARNAME = kawa GARVERSION = 1.9.1 CATEGORIES = utils -GARCH = all +ARCHALL = 1 DESCRIPTION = Java implementation of Scheme and a framework for implementing high-level and dynamic languages 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 9 22:22:59 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Apr 2009 20:22:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[4265] csw/mgar/pkg/kawa/trunk/Makefile Message-ID: Revision: 4265 http://gar.svn.sourceforge.net/gar/?rev=4265&view=rev Author: dmichelsen Date: 2009-04-09 20:22:59 +0000 (Thu, 09 Apr 2009) Log Message: ----------- kawa: Removed unnecessary removal of info/dir Modified Paths: -------------- csw/mgar/pkg/kawa/trunk/Makefile Modified: csw/mgar/pkg/kawa/trunk/Makefile =================================================================== --- csw/mgar/pkg/kawa/trunk/Makefile 2009-04-09 20:00:54 UTC (rev 4264) +++ csw/mgar/pkg/kawa/trunk/Makefile 2009-04-09 20:22:59 UTC (rev 4265) @@ -18,7 +18,3 @@ include gar/category.mk PATH := /usr/jdk1.5.0_15/bin:$(PATH) - -# checkpkg complains unless this file is removed. -post-install: - rm $(DESTDIR)/opt/csw/share/info/dir 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 9 22:42:35 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Apr 2009 20:42:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[4266] csw/mgar/pkg/kawa/trunk Message-ID: Revision: 4266 http://gar.svn.sourceforge.net/gar/?rev=4266&view=rev Author: dmichelsen Date: 2009-04-09 20:42:35 +0000 (Thu, 09 Apr 2009) Log Message: ----------- kawa: Switch to dynamic gspec Modified Paths: -------------- csw/mgar/pkg/kawa/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/kawa/trunk/files/CSWkawa.gspec Modified: csw/mgar/pkg/kawa/trunk/Makefile =================================================================== --- csw/mgar/pkg/kawa/trunk/Makefile 2009-04-09 20:22:59 UTC (rev 4265) +++ csw/mgar/pkg/kawa/trunk/Makefile 2009-04-09 20:42:35 UTC (rev 4266) @@ -7,7 +7,6 @@ MASTER_SITES = ftp://ftp.gnu.org/pub/gnu/kawa/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWkawa,) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = kawa-(\d+(?:\.\d+)*).tar.gz Deleted: csw/mgar/pkg/kawa/trunk/files/CSWkawa.gspec =================================================================== --- csw/mgar/pkg/kawa/trunk/files/CSWkawa.gspec 2009-04-09 20:22:59 UTC (rev 4265) +++ csw/mgar/pkg/kawa/trunk/files/CSWkawa.gspec 2009-04-09 20:42:35 UTC (rev 4266) @@ -1,6 +0,0 @@ -%var bitname kawa -%var pkgname CSWkawa -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -See /opt/csw/share/kawa/LICENSE.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Thu Apr 9 22:48:54 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Thu, 09 Apr 2009 20:48:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[4267] csw/mgar/pkg/kawa/trunk/Makefile Message-ID: Revision: 4267 http://gar.svn.sourceforge.net/gar/?rev=4267&view=rev Author: trygvis Date: 2009-04-09 20:48:54 +0000 (Thu, 09 Apr 2009) Log Message: ----------- o Adding dependency information. o Enabling the readline wrapper. Modified Paths: -------------- csw/mgar/pkg/kawa/trunk/Makefile Modified: csw/mgar/pkg/kawa/trunk/Makefile =================================================================== --- csw/mgar/pkg/kawa/trunk/Makefile 2009-04-09 20:42:35 UTC (rev 4266) +++ csw/mgar/pkg/kawa/trunk/Makefile 2009-04-09 20:48:54 UTC (rev 4267) @@ -8,12 +8,22 @@ MASTER_SITES = ftp://ftp.gnu.org/pub/gnu/kawa/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +REQUIRED_PKG = CSWncurses CSWreadline + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = kawa-(\d+(?:\.\d+)*).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-kawa-frontend TEST_SCRIPTS = include gar/category.mk PATH := /usr/jdk1.5.0_15/bin:$(PATH) + +# When building the 'kawa' binary, this flag is ignore from the ./configure stuff, but LIBS is used. +kawa_LDFLAGS = -L/opt/csw/lib +export kawa_LDFLAGS + +LIBS = -lsocket +export LIBS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Thu Apr 9 23:27:07 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Thu, 09 Apr 2009 21:27:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[4268] csw/mgar/pkg/kawa/trunk Message-ID: Revision: 4268 http://gar.svn.sourceforge.net/gar/?rev=4268&view=rev Author: trygvis Date: 2009-04-09 21:27:06 +0000 (Thu, 09 Apr 2009) Log Message: ----------- o Removing the native readline wrapper, no good. Adding custom one based on CSWrlwrap. Modified Paths: -------------- csw/mgar/pkg/kawa/trunk/Makefile csw/mgar/pkg/kawa/trunk/checksums Modified: csw/mgar/pkg/kawa/trunk/Makefile =================================================================== --- csw/mgar/pkg/kawa/trunk/Makefile 2009-04-09 20:48:54 UTC (rev 4267) +++ csw/mgar/pkg/kawa/trunk/Makefile 2009-04-09 21:27:06 UTC (rev 4268) @@ -7,16 +7,17 @@ MASTER_SITES = ftp://ftp.gnu.org/pub/gnu/kawa/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += bin-kawa -REQUIRED_PKG = CSWncurses CSWreadline +REQUIRED_PKG = CSWrlwrap # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = kawa-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-kawa-frontend -TEST_SCRIPTS = +TEST_SCRIPTS = + include gar/category.mk PATH := /usr/jdk1.5.0_15/bin:$(PATH) @@ -27,3 +28,7 @@ LIBS = -lsocket export LIBS + +post-install-modulated: + # Overwrite the default kawa junk + cp $(WORKDIR)/bin-kawa $(DESTDIR)/opt/csw/bin/kawa Modified: csw/mgar/pkg/kawa/trunk/checksums =================================================================== --- csw/mgar/pkg/kawa/trunk/checksums 2009-04-09 20:48:54 UTC (rev 4267) +++ csw/mgar/pkg/kawa/trunk/checksums 2009-04-09 21:27:06 UTC (rev 4268) @@ -1,2 +1,2 @@ -611209ca2f621cee8041321902a0466c download/CSWkawa.gspec +ba051c4dde680a004ea89ed369355d0e download/bin-kawa 8a1cc2d67127392f6f3f180d53800725 download/kawa-1.9.1.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 Thu Apr 9 23:27:41 2009 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Thu, 09 Apr 2009 21:27:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[4269] csw/mgar/pkg/kawa/trunk/files/bin-kawa Message-ID: Revision: 4269 http://gar.svn.sourceforge.net/gar/?rev=4269&view=rev Author: trygvis Date: 2009-04-09 21:27:41 +0000 (Thu, 09 Apr 2009) Log Message: ----------- o Adding missing file from previous commit. Added Paths: ----------- csw/mgar/pkg/kawa/trunk/files/bin-kawa Added: csw/mgar/pkg/kawa/trunk/files/bin-kawa =================================================================== --- csw/mgar/pkg/kawa/trunk/files/bin-kawa (rev 0) +++ csw/mgar/pkg/kawa/trunk/files/bin-kawa 2009-04-09 21:27:41 UTC (rev 4269) @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ -z "$JAVA" ] +then + if [ -z "$JAVA_HOME" ] + then + JAVA=/usr/jdk/latest/bin/java + fi +fi + +exec /opt/csw/bin/rlwrap "$JAVA" -classpath /opt/csw/share/java/kawa.jar kawa.repl "$@" Property changes on: csw/mgar/pkg/kawa/trunk/files/bin-kawa ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Fri Apr 10 02:13:56 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Fri, 10 Apr 2009 00:13:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[4270] csw/mgar/pkg/gcc4/trunk/files/package_def.mk Message-ID: Revision: 4270 http://gar.svn.sourceforge.net/gar/?rev=4270&view=rev Author: valholla Date: 2009-04-10 00:13:56 +0000 (Fri, 10 Apr 2009) Log Message: ----------- add binutils as a requirement, this gcc uses /opt/csw/bin/gas Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/files/package_def.mk Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-04-09 21:27:41 UTC (rev 4269) +++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-04-10 00:13:56 UTC (rev 4270) @@ -64,7 +64,7 @@ REQUIRED_PKGS_CSWgcc4adart = CSWggettextrt $(COMMON_REQUIRE) REQUIRED_PKGS_CSWgcc4ada = CSWgcc4adart $(COMMON_REQUIRE) REQUIRED_PKGS_CSWgcc4corert = CSWggettextrt $(COMMON_REQUIRE) -REQUIRED_PKGS_CSWgcc4core = CSWgcc4corert $(COMMON_REQUIRE) +REQUIRED_PKGS_CSWgcc4core = CSWgcc4corert $(COMMON_REQUIRE) CSWbinutils REQUIRED_PKGS_CSWgcc4g++rt = CSWgcc4corert CSWiconv REQUIRED_PKGS_CSWgcc4g++ = CSWgcc4g++rt $(COMMON_REQUIRE) REQUIRED_PKGS_CSWgcc4gfortranrt = CSWgcc4corert CSWiconv 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 10 04:34:31 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 10 Apr 2009 02:34:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[4271] csw/mgar/pkg/docbook-style-xsl/trunk Message-ID: Revision: 4271 http://gar.svn.sourceforge.net/gar/?rev=4271&view=rev Author: bdwalton Date: 2009-04-10 02:34:31 +0000 (Fri, 10 Apr 2009) Log Message: ----------- Bump to 1.74.3. Convert to dynamic gspec. Updated postinstall script. Update makefile patch to reflect the fact that they now ship one (that doesn't do an install). Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile csw/mgar/pkg/docbook-style-xsl/trunk/checksums csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch Removed Paths: ------------- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec Modified: csw/mgar/pkg/docbook-style-xsl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2009-04-10 00:13:56 UTC (rev 4270) +++ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2009-04-10 02:34:31 UTC (rev 4271) @@ -1,11 +1,16 @@ GARNAME = docbookxsl -GARVERSION = 1.69.1 -PATCHLEVEL = 5.1 +GARVERSION = 1.74.3 CATEGORIES = xtra # for our (modified from rhel) copied in Makefile. PREREQUISITE_PKGS = CSWgfile CSWbash +PACKAGES = CSWdocbookxsl CSWdocbookxsldoc +ARCHALL = 1 + +CATALOGNAME_CSWdocbookxsl = $(GARNAME) +CATALOGNAME_CSWdocbookxsldoc = $(GARNAME)doc + REQUIRED_PKGS_CSWdocbookxsl = CSWsgmlcommon CSWxmlcommon CSWdocbookdtds REQUIRED_PKGS_CSWdocbookxsl += CSWlibxml2 REQUIRED_PKGS_CSWdocbookxsldoc = CSWdocbookxsl @@ -28,21 +33,18 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = docbook-xsl-$(GARVERSION).tar.bz2 DISTFILES += docbook-xsl-doc-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWdocbookxsl,postinstall preremove) -DISTFILES += $(call admfiles,CSWdocbookxsldoc,) +DISTFILES += CSWdocbookxsl.postinstall CSWdocbookxsl.preremove -# These are listed in the same order they'd be applied during the rpm build... -# They don't apply cleanly, otherwise. -PATCHFILES = docbook-xsl-pagesetup.patch docbook-xsl-marginleft.patch -PATCHFILES += docbook-xsl-lists.patch docbook-xsl-sp.patch PATCHFILES += add_makefile.patch CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = +BUILD_SCRIPTS = TEST_SCRIPTS = +INSTALL_SCRIPTS = $(WORKSRC)/Makefile.csw + INSTALL_ARGS = DESTDIR=$(DESTDIR) #to make the package extraction happy...(we don't use the - separator) @@ -50,5 +52,7 @@ include gar/category.mk -#override system checkpkg so that docbookxsldoc can depend on docbookxsl -PATH := /home/bwalton:$(PATH) +install-%/Makefile.csw: + @echo " ==> Running make install in $*" + @$(INSTALL_ENV) $(MAKE) -f Makefile.csw DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @$(MAKECOOKIE) \ No newline at end of file Modified: csw/mgar/pkg/docbook-style-xsl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2009-04-10 00:13:56 UTC (rev 4270) +++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2009-04-10 02:34:31 UTC (rev 4271) @@ -1,11 +1,5 @@ -6ebd29a67f2dcc3f2220f475ee6f6552 download/docbook-xsl-1.69.1.tar.bz2 -b3bf09a0b1a368a3490e68ffc695d290 download/docbook-xsl-doc-1.69.1.tar.bz2 -4120f10e50070dd8fc2284d5214bf51d download/CSWdocbookxsl.gspec -e96ac786b8d7b1bd6bc76787c965017a download/CSWdocbookxsl.postinstall +c022eb8e15bf110605a4695235f20075 download/CSWdocbookxsl.postinstall 1b98827c1a02fcec57ec0f7376bb8815 download/CSWdocbookxsl.preremove -a0c6ee83fdef595158d9eed95d508d8f download/CSWdocbookxsldoc.gspec -84b37b559cc95c747e39a5a8f79558a3 download/docbook-xsl-pagesetup.patch -1d1ff63f5ebd3527c925f68e55138b6f download/docbook-xsl-marginleft.patch -cec8c281ed1c9be99ad47a74362248d5 download/docbook-xsl-lists.patch -e7bbf777eadbb70aaed073006de0347e download/docbook-xsl-sp.patch -8b8a8d4307fa3f3dcb992ebd16c4fb09 download/add_makefile.patch +9ba4d6409de31404b8022f10630016e0 download/add_makefile.patch +c77c0c317040b2f2e366842bd9df2218 download/docbook-xsl-1.74.3.tar.bz2 +2a032a95fbf24367d13acc8210f9cd72 download/docbook-xsl-doc-1.74.3.tar.bz2 Deleted: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec 2009-04-10 00:13:56 UTC (rev 4270) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec 2009-04-10 02:34:31 UTC (rev 4271) @@ -1,5 +0,0 @@ -%var bitname docbookxsl -%var pkgname CSWdocbookxsl -%var arch all -%include url file://%{PKGLIB}/csw_dyndepend.gspec - Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2009-04-10 00:13:56 UTC (rev 4270) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2009-04-10 02:34:31 UTC (rev 4271) @@ -14,7 +14,7 @@ CATALOG=/opt/csw/etc/xml/catalog #we need a version here, since that will be referenced in URLS being redirected -VERSION=1.69.1 +VERSION=1.74.3 $PREFIX $CATCMD --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/$VERSION" \ Deleted: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec 2009-04-10 00:13:56 UTC (rev 4270) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec 2009-04-10 02:34:31 UTC (rev 4271) @@ -1,6 +0,0 @@ -%var bitname docbookxsldoc -%var pkgname CSWdocbookxsldoc -%var arch all -%var desc Documentation for the Docbook XSL Stylesheets -%include url file://%{PKGLIB}/csw_dyndepend.gspec - Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch 2009-04-10 00:13:56 UTC (rev 4270) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch 2009-04-10 02:34:31 UTC (rev 4271) @@ -1,7 +1,6 @@ ---- /dev/null 2008-12-14 03:06:26.000000000 +0100 -+++ docbook-xsl-1.69.1/Makefile 2008-12-14 04:12:33.444192066 +0100 -@@ -0,0 +1,49 @@ -+ +--- /dev/null 2009-04-10 02:03:32.000000000 +0200 ++++ docbook-xsl-1.74.3/Makefile.csw 2009-04-10 04:25:32.872750482 +0200 +@@ -0,0 +1,46 @@ +DESTDIR ?= ... should be overridden by GAR ... + +SHELL = /opt/csw/bin/bash @@ -29,11 +28,9 @@ + cp htmlhelp/*.xsl $(instdir)/htmlhelp + cp javahelp/*.xsl $(instdir)/javahelp + cp lib/lib.xsl $(instdir)/lib -+ cp template/README $(instdir)/template + cp template/*.xml $(instdir)/template + cp template/*.xsl $(instdir)/template + cp xhtml/*.xsl $(instdir)/xhtml -+ cp manpages/README $(instdir)/manpages + cp manpages/*.xsl $(instdir)/manpages + cp profiling/*.xsl $(instdir)/profiling + @@ -48,6 +45,5 @@ + +install-docs: + gmkdir -p $(docdir) -+ cp BUGS ChangeLog README TODO $(docdir)/ ++ cp AUTHORS BUGS README TODO RELEASE-NOTES* NEWS* $(docdir)/ + cp -R doc $(docdir)/ - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Apr 10 12:49:05 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 10 Apr 2009 10:49:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[4272] csw/mgar/pkg/bash/trunk Message-ID: Revision: 4272 http://gar.svn.sourceforge.net/gar/?rev=4272&view=rev Author: chninkel Date: 2009-04-10 10:49:05 +0000 (Fri, 10 Apr 2009) Log Message: ----------- bash: updated to patch level 17 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2009-04-10 02:34:31 UTC (rev 4271) +++ csw/mgar/pkg/bash/trunk/Makefile 2009-04-10 10:49:05 UTC (rev 4272) @@ -1,6 +1,6 @@ GARNAME = bash GARVERSION = 4.0 -PATCHLEVEL = 10 +PATCHLEVEL = 17 CATEGORIES = devel DESCRIPTION = A sh-compatible command language interpreter Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2009-04-10 02:34:31 UTC (rev 4271) +++ csw/mgar/pkg/bash/trunk/checksums 2009-04-10 10:49:05 UTC (rev 4272) @@ -4,7 +4,7 @@ bcc9760316385d49ff31c2ed72f4be4a download/CSWbash.postinstall 589297e4f9a43d0c82632e99423db7ef download/CSWbash.postremove 293cc64a948ea3d49010ae6e58122b52 download/CSWbash.depend -a4c85be596685b1d7bdc469d17472f5f download/changelog.CSW +9fbdf25b297945fee52e6f7b7a5c218f download/changelog.CSW bc7f4762443939bd7dccb42370f0d932 download/bash40-001 c2a4a4786a83ed4ec366c6a8924369a2 download/bash40-002 22e8a824eddba21a8fce10d7984c2aba download/bash40-003 @@ -15,4 +15,11 @@ d3eb7b6f00d525e032478c33f51d46a8 download/bash40-008 340601c997ce569532417a7ae92248b8 download/bash40-009 0bd5ab96d514ffb1afbb8c7984b15146 download/bash40-010 +32cb20f339a20e1e9fb37a5d18f18fca download/bash40-011 +33fd9e93d30a17988c19554ef26d56e0 download/bash40-012 +a266b42df5e9ed7e8818a8b00d50e00b download/bash40-013 +86cac78f191a32cd1404f11264eb9b2a download/bash40-014 +bb41963d030bc61a20e8185367b337c5 download/bash40-015 +f75455048a086528971252fd979b8755 download/bash40-016 +34b2cd57271a452f4a26b39d77ff908f download/bash40-017 29607316cff22f7427322d8f190cbadf download/use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-04-10 02:34:31 UTC (rev 4271) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-04-10 10:49:05 UTC (rev 4272) @@ -1,3 +1,9 @@ +bash (4.0,REV=2009.04.10) unstable + + * Added bash patches bash40-011 to bash40-017. + + -- Yann Rouillard Fri, 10 Apr 2009 12:06:33 +0200 + bash (4.0,REV=2009.03.21) unstable * Added bash patches bash40-001 to bash40-010. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Apr 10 18:56:53 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 10 Apr 2009 16:56:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[4273] csw/mgar/pkg/bash/trunk Message-ID: Revision: 4273 http://gar.svn.sourceforge.net/gar/?rev=4273&view=rev Author: chninkel Date: 2009-04-10 16:56:53 +0000 (Fri, 10 Apr 2009) Log Message: ----------- bash: added patch level in package version and some reorganisation Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2009-04-10 10:49:05 UTC (rev 4272) +++ csw/mgar/pkg/bash/trunk/Makefile 2009-04-10 16:56:53 UTC (rev 4273) @@ -1,6 +1,19 @@ +##################################################################### +# OpenCSW build recipe for bash +# +# Copyright 2009 Yann Rouillard +# All rights reserved. Use is subject to license terms. +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +##################################################################### + +###### Package information ####### + GARNAME = bash -GARVERSION = 4.0 -PATCHLEVEL = 17 +GARVERSION = 4.0.17 CATEGORIES = devel DESCRIPTION = A sh-compatible command language interpreter @@ -8,23 +21,29 @@ GNU Bash is an sh-compatible command language interpreter that executes commands read from the standard input or from a file. Bash also incorporates useful features from the Korn and C shells (ksh and csh). Bash is intended to be a conforming implementation of the IEEE POSIX Shell and Tools specification (IEEE Working Group 1003.2). endef +BASH_VERSION = $(shell echo $(GARVERSION)c | cut -d. -f1-2) +BASH_PATCHLEVEL = $(shell echo -n $(GARVERSION) | cut -d. -f3) + + +###### Upstream and opencsw files information ####### + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = bash-(\d+\.\d+).tar.gz $(PATCHFILE_PREFIX)-(\d+) # Patches download location -MASTER_SITES = $(GNU_MIRROR)/bash-$(GARVERSION)-patches/ +MASTER_SITES = $(GNU_MIRROR)/bash-$(BASH_VERSION)-patches/ # Main archive location MASTER_SITES += $(GNU_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(BASH_VERSION).tar.gz DISTFILES += $(call admfiles,CSWbash,prototype postinstall postremove depend) DISTFILES += changelog.CSW -PATCHFILE_PREFIX = bash$(subst .,,$(GARVERSION)) +PATCHFILE_PREFIX = bash$(subst .,,$(BASH_VERSION)) PATCHDIRLEVEL = 0 # we generate the list of patches from the PATCHLEVEL PATCHFILES = $(shell LEVEL=1; \ PREFIX_0="00"; \ - while [ $$LEVEL -le $(PATCHLEVEL) ]; do \ + while [ $$LEVEL -le $(BASH_PATCHLEVEL) ]; do \ echo $(PATCHFILE_PREFIX)-$$PREFIX_0$$LEVEL; \ LEVEL=`expr $$LEVEL + 1`; \ if [ $$LEVEL -ge 10 ]; then \ @@ -34,6 +53,9 @@ PATCHFILES += use_system_bashrc_and_logout.patch + +##### Build and installation information ##### + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-04-10 10:49:05 UTC (rev 4272) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-04-10 16:56:53 UTC (rev 4273) @@ -1,6 +1,7 @@ -bash (4.0,REV=2009.04.10) unstable +bash (4.0.17,REV=2009.04.10) unstable * Added bash patches bash40-011 to bash40-017. + * Added patch level in package version. -- Yann Rouillard Fri, 10 Apr 2009 12:06:33 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Apr 11 17:35:57 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 11 Apr 2009 15:35:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[4274] csw/mgar/pkg/bash/trunk Message-ID: Revision: 4274 http://gar.svn.sourceforge.net/gar/?rev=4274&view=rev Author: chninkel Date: 2009-04-11 15:35:57 +0000 (Sat, 11 Apr 2009) Log Message: ----------- bash: switched to gar v2 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/CSWbash.prototype csw/mgar/pkg/bash/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/bash/trunk/files/CSWbash.depend csw/mgar/pkg/bash/trunk/files/CSWbash.gspec Property Changed: ---------------- csw/mgar/pkg/bash/trunk/ Property changes on: csw/mgar/pkg/bash/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/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2009-04-10 16:56:53 UTC (rev 4273) +++ csw/mgar/pkg/bash/trunk/Makefile 2009-04-11 15:35:57 UTC (rev 4274) @@ -24,7 +24,12 @@ BASH_VERSION = $(shell echo $(GARVERSION)c | cut -d. -f1-2) BASH_PATCHLEVEL = $(shell echo -n $(GARVERSION) | cut -d. -f3) +PACKAGES = CSWbash +REQUIRED_PKGS = CSWggettextrt +REQUIRED_PKGS += CSWiconv + + ###### Upstream and opencsw files information ####### # We define upstream file regex so we can be notifed of new upstream software release @@ -34,8 +39,9 @@ MASTER_SITES = $(GNU_MIRROR)/bash-$(BASH_VERSION)-patches/ # Main archive location MASTER_SITES += $(GNU_MIRROR) +DISTNAME = $(GARNAME)-$(BASH_VERSION) DISTFILES = $(GARNAME)-$(BASH_VERSION).tar.gz -DISTFILES += $(call admfiles,CSWbash,prototype postinstall postremove depend) +DISTFILES += CSWbash.prototype CSWbash.postinstall CSWbash.postremove DISTFILES += changelog.CSW PATCHFILE_PREFIX = bash$(subst .,,$(BASH_VERSION)) @@ -68,8 +74,9 @@ touch $(WORKSRC)/config.status -post-install: +post-merge: @( for FILE in README RBASH NEWS NOTES POSIX AUTHORS doc/FAQ doc/INTRO; do \ - ginstall -D $(WORKSRC)/$$FILE $(DESTDIR)$(docdir)/$(GARNAME)/`basename $$FILE`; \ + ginstall -D $(WORKSRC_FIRSTMOD)/$$FILE $(PKGROOT)$(docdir)/$(GARNAME)/`basename $$FILE`; \ done ) + ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)$(docdir)/$(GARNAME)/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2009-04-10 16:56:53 UTC (rev 4273) +++ csw/mgar/pkg/bash/trunk/checksums 2009-04-11 15:35:57 UTC (rev 4274) @@ -1,10 +1,7 @@ -a90a1b5a6db4838483f05438e05e8eb9 download/bash-4.0.tar.gz -29e973aa9a6fca0a9e28c905b95609bf download/CSWbash.gspec -5ba80bd9a48fdccfb70739095fb77010 download/CSWbash.prototype bcc9760316385d49ff31c2ed72f4be4a download/CSWbash.postinstall 589297e4f9a43d0c82632e99423db7ef download/CSWbash.postremove -293cc64a948ea3d49010ae6e58122b52 download/CSWbash.depend -9fbdf25b297945fee52e6f7b7a5c218f download/changelog.CSW +949396065ba932e8af683eae510586e9 download/CSWbash.prototype +a90a1b5a6db4838483f05438e05e8eb9 download/bash-4.0.tar.gz bc7f4762443939bd7dccb42370f0d932 download/bash40-001 c2a4a4786a83ed4ec366c6a8924369a2 download/bash40-002 22e8a824eddba21a8fce10d7984c2aba download/bash40-003 @@ -22,4 +19,5 @@ bb41963d030bc61a20e8185367b337c5 download/bash40-015 f75455048a086528971252fd979b8755 download/bash40-016 34b2cd57271a452f4a26b39d77ff908f download/bash40-017 +4e4a9d374ce4291b6ba4974adc086767 download/changelog.CSW 29607316cff22f7427322d8f190cbadf download/use_system_bashrc_and_logout.patch Deleted: csw/mgar/pkg/bash/trunk/files/CSWbash.depend =================================================================== --- csw/mgar/pkg/bash/trunk/files/CSWbash.depend 2009-04-10 16:56:53 UTC (rev 4273) +++ csw/mgar/pkg/bash/trunk/files/CSWbash.depend 2009-04-11 15:35:57 UTC (rev 4274) @@ -1,2 +0,0 @@ -P CSWggettextrt ggettextrt - GNU gettext -P CSWiconv libiconv - GNU iconv library Deleted: csw/mgar/pkg/bash/trunk/files/CSWbash.gspec =================================================================== --- csw/mgar/pkg/bash/trunk/files/CSWbash.gspec 2009-04-10 16:56:53 UTC (rev 4273) +++ csw/mgar/pkg/bash/trunk/files/CSWbash.gspec 2009-04-11 15:35:57 UTC (rev 4274) @@ -1,4 +0,0 @@ -%var bitname bash -%var pkgname CSWbash -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Modified: csw/mgar/pkg/bash/trunk/files/CSWbash.prototype =================================================================== --- csw/mgar/pkg/bash/trunk/files/CSWbash.prototype 2009-04-10 16:56:53 UTC (rev 4273) +++ csw/mgar/pkg/bash/trunk/files/CSWbash.prototype 2009-04-11 15:35:57 UTC (rev 4274) @@ -1,7 +1,7 @@ f none /opt/csw/bin/bash 0755 root bin f none /opt/csw/bin/bashbug 0555 root bin d none /opt/csw/share/doc/bash 0755 root bin -f none /opt/csw/share/doc/bash/changelog.CSW=changelog.CSW 0644 root bin +f none /opt/csw/share/doc/bash/changelog.CSW 0644 root bin f none /opt/csw/share/doc/bash/README 0644 root bin f none /opt/csw/share/doc/bash/FAQ 0644 root bin f none /opt/csw/share/doc/bash/RBASH 0644 root bin Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-04-10 16:56:53 UTC (rev 4273) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2009-04-11 15:35:57 UTC (rev 4274) @@ -1,28 +1,28 @@ -bash (4.0.17,REV=2009.04.10) unstable +bash (4.0.17,REV=2009.04.11) unstable * Added bash patches bash40-011 to bash40-017. * Added patch level in package version. - -- Yann Rouillard Fri, 10 Apr 2009 12:06:33 +0200 + -- Yann Rouillard Fri, 11 Apr 2009 12:06:33 +0200 bash (4.0,REV=2009.03.21) unstable * Added bash patches bash40-001 to bash40-010. - -- Yann Rouillard Sat, 21 Mar 2009 12:55:58 +0100 + -- Yann Rouillard Sat, 21 Mar 2009 12:55:58 +0100 bash (4.0,REV=2009.02.21) unstable * New upstream release. - -- Yann Rouillard Sat, 21 Feb 2009 16:58:45 +0100 + -- Yann Rouillard Sat, 21 Feb 2009 16:58:45 +0100 bash (3.2,REV=2009.02.15) unstable * Changed gettext dependancy to follow gettext package split (Closes: #3147). - -- Yann Rouillard Sat, 14 Feb 2009 23:53:41 +0100 + -- Yann Rouillard Sat, 14 Feb 2009 23:53:41 +0100 bash (3.2,REV=2008.11.30) unstable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Apr 11 20:42:24 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 11 Apr 2009 18:42:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[4275] csw/mgar/pkg/bash/trunk Message-ID: Revision: 4275 http://gar.svn.sourceforge.net/gar/?rev=4275&view=rev Author: chninkel Date: 2009-04-11 18:42:23 +0000 (Sat, 11 Apr 2009) Log Message: ----------- bash: now uses build class action script provided by Solaris Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/CSWbash.prototype csw/mgar/pkg/bash/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/bash/trunk/files/shells Removed Paths: ------------- csw/mgar/pkg/bash/trunk/files/CSWbash.postinstall csw/mgar/pkg/bash/trunk/files/CSWbash.postremove Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2009-04-11 15:35:57 UTC (rev 4274) +++ csw/mgar/pkg/bash/trunk/Makefile 2009-04-11 18:42:23 UTC (rev 4275) @@ -29,6 +29,7 @@ REQUIRED_PKGS = CSWggettextrt REQUIRED_PKGS += CSWiconv +SPKG_CLASSES = none build ###### Upstream and opencsw files information ####### @@ -41,9 +42,12 @@ MASTER_SITES += $(GNU_MIRROR) DISTNAME = $(GARNAME)-$(BASH_VERSION) DISTFILES = $(GARNAME)-$(BASH_VERSION).tar.gz -DISTFILES += CSWbash.prototype CSWbash.postinstall CSWbash.postremove +DISTFILES += CSWbash.prototype DISTFILES += changelog.CSW +# build action script to modify /etc/shells at package installation and removal time +DISTFILES += shells + PATCHFILE_PREFIX = bash$(subst .,,$(BASH_VERSION)) PATCHDIRLEVEL = 0 # we generate the list of patches from the PATCHLEVEL @@ -57,6 +61,8 @@ fi; \ done ) +# +# opencsw bash use /etc/bash.bashrc and /etc/bash.bash_logout files PATCHFILES += use_system_bashrc_and_logout.patch @@ -79,4 +85,4 @@ ginstall -D $(WORKSRC_FIRSTMOD)/$$FILE $(PKGROOT)$(docdir)/$(GARNAME)/`basename $$FILE`; \ done ) ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)$(docdir)/$(GARNAME)/changelog.CSW - + ginstall -D $(WORKDIR_FIRSTMOD)/shells $(PKGROOT)/etc/shells Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2009-04-11 15:35:57 UTC (rev 4274) +++ csw/mgar/pkg/bash/trunk/checksums 2009-04-11 18:42:23 UTC (rev 4275) @@ -1,6 +1,4 @@ -bcc9760316385d49ff31c2ed72f4be4a download/CSWbash.postinstall -589297e4f9a43d0c82632e99423db7ef download/CSWbash.postremove -949396065ba932e8af683eae510586e9 download/CSWbash.prototype +f93b41b44ce6b023df65b72f00386ac5 download/CSWbash.prototype a90a1b5a6db4838483f05438e05e8eb9 download/bash-4.0.tar.gz bc7f4762443939bd7dccb42370f0d932 download/bash40-001 c2a4a4786a83ed4ec366c6a8924369a2 download/bash40-002 @@ -19,5 +17,6 @@ bb41963d030bc61a20e8185367b337c5 download/bash40-015 f75455048a086528971252fd979b8755 download/bash40-016 34b2cd57271a452f4a26b39d77ff908f download/bash40-017 -4e4a9d374ce4291b6ba4974adc086767 download/changelog.CSW +e3a631b0798de159e48cdb8701dad334 download/changelog.CSW +60956e6be20f69dafbb06fcc83bab88e download/shells 29607316cff22f7427322d8f190cbadf download/use_system_bashrc_and_logout.patch Deleted: csw/mgar/pkg/bash/trunk/files/CSWbash.postinstall =================================================================== --- csw/mgar/pkg/bash/trunk/files/CSWbash.postinstall 2009-04-11 15:35:57 UTC (rev 4274) +++ csw/mgar/pkg/bash/trunk/files/CSWbash.postinstall 2009-04-11 18:42:23 UTC (rev 4275) @@ -1,42 +0,0 @@ -#!/bin/sh -PATH=/usr/bin -export PATH - -if [ -f ${BASEDIR}/etc/shells ]; then - echo "${BASEDIR}/etc/shells already exists." -else - cat > ${BASEDIR}/etc/shells </dev/null >/dev/null; then - echo "${BASEDIR}/etc/shells is UNCHANGED because entry $THE_SHELL does already exists." -else - echo "$THE_SHELL" >> ${BASEDIR}/etc/shells - echo "ADDED $THE_SHELL to ${BASEDIR}/etc/shells." -fi - Deleted: csw/mgar/pkg/bash/trunk/files/CSWbash.postremove =================================================================== --- csw/mgar/pkg/bash/trunk/files/CSWbash.postremove 2009-04-11 15:35:57 UTC (rev 4274) +++ csw/mgar/pkg/bash/trunk/files/CSWbash.postremove 2009-04-11 18:42:23 UTC (rev 4275) @@ -1,19 +0,0 @@ -#!/bin/sh -PATH=/usr/bin -export PATH - -# Removing bash from /etc/shells -THE_SHELL="`echo "${BASEDIR}/opt/csw/bin/bash" | /usr/bin/sed -e 's/\/\/*/\//g'`" - -if /usr/bin/cat "${BASEDIR}/etc/shells" | /usr/bin/sed -e 's/\/\/*/\//g' | /usr/bin/grep "$THE_SHELL" 2>/dev/null >/dev/null; then - /usr/bin/perl -i -pwe '$_ = "" if /\/+opt\/+csw\/+bin\/+bash$/' ${BASEDIR}/etc/shells - cat < Fri, 11 Apr 2009 12:06:33 +0200 Added: csw/mgar/pkg/bash/trunk/files/shells =================================================================== --- csw/mgar/pkg/bash/trunk/files/shells (rev 0) +++ csw/mgar/pkg/bash/trunk/files/shells 2009-04-11 18:42:23 UTC (rev 4275) @@ -0,0 +1,40 @@ +if [ install = "$1" ]; then + if [ -f "$PKG_INSTALL_ROOT/etc/shells" ]; then + cat "$PKG_INSTALL_ROOT/etc/shells" + else + cat <<-__EOT__ +# default entries +/usr/bin/sh +/usr/bin/csh +/usr/bin/ksh +/usr/bin/jsh +/bin/sh +/bin/csh +/bin/ksh +/bin/jsh +/sbin/sh +/sbin/jsh +/usr/bin/pfsh +/usr/bin/pfcsh +/usr/bin/pfksh +/usr/bin/bash +/usr/bin/tcsh +/usr/bin/zsh +/bin/pfsh +/bin/pfcsh +/bin/pfksh +/bin/bash +/bin/tcsh +/bin/zsh +/usr/xpg4/bin/sh + +# added entries +__EOT__ + fi && + cat <<-__EOT__ +/opt/csw/bin/bash # added by $PKGINST +__EOT__ + +elif [ remove = "$1" ] && [ -f "$PKG_INSTALL_ROOT/etc/shells" ]; then + egrep -v "^/opt/csw/bin/bash(#| | |\$)" <$PKG_INSTALL_ROOT/etc/shells || echo "#" +fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 12 00:03:28 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 11 Apr 2009 22:03:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[4276] csw/mgar/pkg/lame/trunk/Makefile Message-ID: Revision: 4276 http://gar.svn.sourceforge.net/gar/?rev=4276&view=rev Author: dmichelsen Date: 2009-04-11 22:03:27 +0000 (Sat, 11 Apr 2009) Log Message: ----------- lame: Fix sourceurl for next package build Modified Paths: -------------- csw/mgar/pkg/lame/trunk/Makefile Modified: csw/mgar/pkg/lame/trunk/Makefile =================================================================== --- csw/mgar/pkg/lame/trunk/Makefile 2009-04-11 18:42:23 UTC (rev 4275) +++ csw/mgar/pkg/lame/trunk/Makefile 2009-04-11 22:03:27 UTC (rev 4276) @@ -13,6 +13,8 @@ REQUIRED_PKGS = CSWncurses +SPKG_SOURCEURL = http://lame.sourceforge.net/ + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=628063 UPSTREAM_USE_SF = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 12 00:09:49 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 11 Apr 2009 22:09:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[4277] csw/mgar/pkg/less/trunk Message-ID: Revision: 4277 http://gar.svn.sourceforge.net/gar/?rev=4277&view=rev Author: dmichelsen Date: 2009-04-11 22:09:49 +0000 (Sat, 11 Apr 2009) Log Message: ----------- less: Update to 429 Modified Paths: -------------- csw/mgar/pkg/less/trunk/Makefile csw/mgar/pkg/less/trunk/checksums Modified: csw/mgar/pkg/less/trunk/Makefile =================================================================== --- csw/mgar/pkg/less/trunk/Makefile 2009-04-11 22:03:27 UTC (rev 4276) +++ csw/mgar/pkg/less/trunk/Makefile 2009-04-11 22:09:49 UTC (rev 4277) @@ -1,5 +1,5 @@ GARNAME = less -GARVERSION = 418 +GARVERSION = 429 CATEGORIES = utils DESCRIPTION = Less is a free, open-source file pager Modified: csw/mgar/pkg/less/trunk/checksums =================================================================== --- csw/mgar/pkg/less/trunk/checksums 2009-04-11 22:03:27 UTC (rev 4276) +++ csw/mgar/pkg/less/trunk/checksums 2009-04-11 22:09:49 UTC (rev 4277) @@ -1 +1 @@ -b5864d76c54ddf4627fd57ab333c88b4 download/less-418.tar.gz +206f2f13b9b0a35e45df660fcb6af31d download/less-429.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Apr 12 00:51:25 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 11 Apr 2009 22:51:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[4278] csw/mgar/pkg/elinks/trunk Message-ID: Revision: 4278 http://gar.svn.sourceforge.net/gar/?rev=4278&view=rev Author: chninkel Date: 2009-04-11 22:51:24 +0000 (Sat, 11 Apr 2009) Log Message: ----------- elinks: updated to gar v2 Modified Paths: -------------- csw/mgar/pkg/elinks/trunk/Makefile csw/mgar/pkg/elinks/trunk/checksums csw/mgar/pkg/elinks/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/elinks/trunk/files/CSWelinks.depend csw/mgar/pkg/elinks/trunk/files/CSWelinks.gspec Property Changed: ---------------- csw/mgar/pkg/elinks/trunk/ Property changes on: csw/mgar/pkg/elinks/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/elinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/elinks/trunk/Makefile 2009-04-11 22:09:49 UTC (rev 4277) +++ csw/mgar/pkg/elinks/trunk/Makefile 2009-04-11 22:51:24 UTC (rev 4278) @@ -1,5 +1,19 @@ +##################################################################### +# OpenCSW build recipe for elinks +# +# Copyright 2009 Yann Rouillard +# All rights reserved. Use is subject to license terms. +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +##################################################################### + +###### Package information ####### + GARNAME = elinks -GARVERSION = 0.11.5 +GARVERSION = 0.11.6 CATEGORIES = net DESCRIPTION = An advanced text mode web browser @@ -10,25 +24,36 @@ scripts. It has limited support for CSS and Javascript. endef +PACKAGES = CSWelinks + +REQUIRED_PKGS = CSWbzip2 +REQUIRED_PKGS += CSWexpat +REQUIRED_PKGS += CSWiconv +REQUIRED_PKGS += CSWlibidn +REQUIRED_PKGS += CSWosslrt +REQUIRED_PKGS += CSWzlib + + +###### Upstream and opencsw files information ####### + MASTER_SITES = http://elinks.cz/download/ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWelinks,prototype depend) +DISTFILES = CSWelinks.prototype DISTFILES += changelog.CSW # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -# suppress the rdynamic test which doesn't -# work correctly -# PATCHFILES = configure_no_rdynamic.patch - # Debian security path for CVE-2007-2027 PATCHFILES += elinks-417789.diff + +##### Build and installation information ##### + # we use bash instead of sh as the Makefiles # use "test -e" unsupported with sun sh CONFIG_SHELL = /bin/bash @@ -52,6 +77,6 @@ touch $(WORKSRC)/configure touch $(WORKSRC)/config.status -post-install: - @ginstall -D $(WORKDIR)/changelog.CSW $(DESTDIR)$(docdir)/$(GARNAME)/changelog.CSW +post-merge: + @ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)$(docdir)/$(GARNAME)/changelog.CSW Modified: csw/mgar/pkg/elinks/trunk/checksums =================================================================== --- csw/mgar/pkg/elinks/trunk/checksums 2009-04-11 22:09:49 UTC (rev 4277) +++ csw/mgar/pkg/elinks/trunk/checksums 2009-04-11 22:51:24 UTC (rev 4278) @@ -1,6 +1,3 @@ -7dccdb6568d7eeda68912f6541496b7e download/elinks-0.11.5.tar.bz2 -69fa3fff33f6f6e3cbff0861f7ba7443 download/CSWelinks.gspec 9998467007acbd4cb8e46db6e5a9b306 download/CSWelinks.prototype -b928e13fa7db10428293f776939b4859 download/CSWelinks.depend -fcf32c4251bf50795365aa4f5c89dc03 download/changelog.CSW +14b871e8361937a10490cf1018d6f218 download/changelog.CSW 858331d6cc6c8459b2dba5e24f0c8cc3 download/elinks-417789.diff Deleted: csw/mgar/pkg/elinks/trunk/files/CSWelinks.depend =================================================================== --- csw/mgar/pkg/elinks/trunk/files/CSWelinks.depend 2009-04-11 22:09:49 UTC (rev 4277) +++ csw/mgar/pkg/elinks/trunk/files/CSWelinks.depend 2009-04-11 22:51:24 UTC (rev 4278) @@ -1,6 +0,0 @@ -P CSWbzip2 bzip2 - a high-quality block-sorting file compressor -P CSWexpat expat - XML Parser Toolkit -P CSWiconv libiconv - GNU iconv library -P CSWlibidn libidn - Implementation of the Stringprep, Punycode and IDNA -P CSWosslrt openssl - The Open Source toolkit for SSL and TLS. -P CSWzlib zlib - Zlib Data Compression Library Deleted: csw/mgar/pkg/elinks/trunk/files/CSWelinks.gspec =================================================================== --- csw/mgar/pkg/elinks/trunk/files/CSWelinks.gspec 2009-04-11 22:09:49 UTC (rev 4277) +++ csw/mgar/pkg/elinks/trunk/files/CSWelinks.gspec 2009-04-11 22:51:24 UTC (rev 4278) @@ -1,4 +0,0 @@ -%var bitname elinks -%var pkgname CSWelinks -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Modified: csw/mgar/pkg/elinks/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/elinks/trunk/files/changelog.CSW 2009-04-11 22:09:49 UTC (rev 4277) +++ csw/mgar/pkg/elinks/trunk/files/changelog.CSW 2009-04-11 22:51:24 UTC (rev 4278) @@ -1,3 +1,9 @@ +elinks (0.11.6,REV=2009.03.22) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 22 Mar 2009 10:34:39 +0100 + elinks (0.11.5,REV=2008.10.04) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Apr 12 14:13:38 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 12 Apr 2009 12:13:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[4279] csw/mgar/pkg/elinks/trunk Message-ID: Revision: 4279 http://gar.svn.sourceforge.net/gar/?rev=4279&view=rev Author: chninkel Date: 2009-04-12 12:13:38 +0000 (Sun, 12 Apr 2009) Log Message: ----------- elinks: fixed DISTFILES error Modified Paths: -------------- csw/mgar/pkg/elinks/trunk/Makefile csw/mgar/pkg/elinks/trunk/checksums Modified: csw/mgar/pkg/elinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/elinks/trunk/Makefile 2009-04-11 22:51:24 UTC (rev 4278) +++ csw/mgar/pkg/elinks/trunk/Makefile 2009-04-12 12:13:38 UTC (rev 4279) @@ -42,7 +42,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES = CSWelinks.prototype +DISTFILES += CSWelinks.prototype DISTFILES += changelog.CSW # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/elinks/trunk/checksums =================================================================== --- csw/mgar/pkg/elinks/trunk/checksums 2009-04-11 22:51:24 UTC (rev 4278) +++ csw/mgar/pkg/elinks/trunk/checksums 2009-04-12 12:13:38 UTC (rev 4279) @@ -1,3 +1,4 @@ 9998467007acbd4cb8e46db6e5a9b306 download/CSWelinks.prototype 14b871e8361937a10490cf1018d6f218 download/changelog.CSW +463ec007b013822a82d197580117ea16 download/elinks-0.11.6.tar.bz2 858331d6cc6c8459b2dba5e24f0c8cc3 download/elinks-417789.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Apr 12 14:28:20 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 12 Apr 2009 12:28:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[4280] csw/mgar/pkg/vsftpd/trunk/Makefile Message-ID: Revision: 4280 http://gar.svn.sourceforge.net/gar/?rev=4280&view=rev Author: chninkel Date: 2009-04-12 12:28:20 +0000 (Sun, 12 Apr 2009) Log Message: ----------- vsftpd: some Makefile cleanup Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2009-04-12 12:13:38 UTC (rev 4279) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2009-04-12 12:28:20 UTC (rev 4280) @@ -1,3 +1,17 @@ +##################################################################### +# OpenCSW build recipe for vsftpd +# +# Copyright 2009 Yann Rouillard +# All rights reserved. Use is subject to license terms. +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +##################################################################### + +###### Package information ####### + GARNAME = vsftpd GARVERSION = 2.1.0 CATEGORIES = server @@ -13,6 +27,14 @@ MASTER_SITES = ftp://vsftpd.beasts.org/users/cevans/ + +# adding configuration handling classes +# (init/smf classes are dynamically added in checkinstall) +SPKG_CLASSES = none conf + + +###### Upstream and opencsw files information ####### + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -23,10 +45,6 @@ DISTFILES += cswvsftpd cswvsftpd.xml svc-cswvsftpd DISTFILES += i.conf r.conf -# adding configuration handling classes -# (init/smf classes are dynamically added in checkinstall) -SPKG_CLASSES = none conf - # build options are set by modifying # builddefs.h, so we patch it to enable # ssl and tcp wrapper support @@ -44,16 +62,11 @@ # privilege separation user PATCHFILES += set_priv_sep_user.patch -# patch to workaround the fact that -# solaris libc doesn t have tm_gmtoff -# update: not useful anymore since 2.0.5 -# PATCHFILES += tm_gmtoff.patch - # patch to add DESTDIR support to # vsftpd makfile PATCHFILES += destdir.patch -# Documents +# Documentation files DOCFILES = AUDIT BENCHMARKS BUGS COPYING COPYRIGHT Changelog FAQ INSTALL LICENSE REFS DOCFILES += REWARD SIZE SPEED TODO TUNING README README.ssl README.security DOCFILES += SECURITY/DESIGN SECURITY/IMPLEMENTATION SECURITY/OVERVIEW SECURITY/TRUST @@ -64,6 +77,9 @@ DOCFILES += EXAMPLE/INTERNET_SITE_NOINETD/README EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf + +##### Build and installation information ##### + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_SCRIPTS = fake This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Apr 12 14:39:06 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 12 Apr 2009 12:39:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[4281] csw/mgar/pkg/vsftpd/trunk/ Message-ID: Revision: 4281 http://gar.svn.sourceforge.net/gar/?rev=4281&view=rev Author: chninkel Date: 2009-04-12 12:39:06 +0000 (Sun, 12 Apr 2009) Log Message: ----------- vsftpd: switched to gar v2 Property Changed: ---------------- csw/mgar/pkg/vsftpd/trunk/ Property changes on: csw/mgar/pkg/vsftpd/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Apr 12 14:59:04 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 12 Apr 2009 12:59:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[4282] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 4282 http://gar.svn.sourceforge.net/gar/?rev=4282&view=rev Author: hson Date: 2009-04-12 12:59:04 +0000 (Sun, 12 Apr 2009) Log Message: ----------- imagemagick: update to 6.5.1-1 Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-04-12 12:39:06 UTC (rev 4281) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-04-12 12:59:04 UTC (rev 4282) @@ -1,6 +1,6 @@ GARNAME = imagemagick -GARVERSION = 6.4.9 -GARSUBREV = 10 +GARVERSION = 6.5.1 +GARSUBREV = 1 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -39,6 +39,8 @@ CONFIGURE_ARGS += --x-libraries=/usr/openwin/lib PATCHFILES += Makefile.patch +# Temporary patch until upstream make a more permenent fix +PATCHFILES += djvu.c.diff # Test has to be run *after* install TEST_SCRIPTS = Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2009-04-12 12:39:06 UTC (rev 4281) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2009-04-12 12:59:04 UTC (rev 4282) @@ -1,2 +1,3 @@ -4efbf9ba504ce228ed67e6db4c8245ff download/ImageMagick-6.4.9-10.tar.bz2 +2e5f775ac599ff2548395706fcc7eba0 download/ImageMagick-6.5.1-1.tar.bz2 6bd361fe352c7d497d60d8d2cbe7cfd4 download/Makefile.patch +de358462d89bfceb050888cf6b564257 download/djvu.c.diff Added: csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff (rev 0) +++ csw/mgar/pkg/ImageMagick/trunk/files/djvu.c.diff 2009-04-12 12:59:04 UTC (rev 4282) @@ -0,0 +1,32 @@ +--- ../build-global/ImageMagick-6.5.1-1/coders/djvu.c 2009-03-31 17:44:40.000000000 +0200 ++++ ImageMagick-6.5.1-1/coders/djvu.c 2009-04-12 11:00:15.678316236 +0200 +@@ -58,6 +58,29 @@ + #if defined(MAGICKCORE_DJVU_DELEGATE) + #include + #endif ++ ++#if defined(__SunOS_5_8) || defined(__SunOS_5_9) ++#define signbit(x) copysign(1, x)<0 ++ ++ ++double ++fmax(double x, double y) ++{ ++ if (isnan(x)) ++ return (y); ++ if (isnan(y)) ++ return (x); ++ ++ if (signbit(x) != signbit(y)) { ++ if (signbit(x)) ++ return (y); ++ else ++ return (x); ++ } ++ ++ return (x > y ? x : y); ++} ++#endif + + /* + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Apr 12 15:19:37 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 12 Apr 2009 13:19:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[4283] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 4283 http://gar.svn.sourceforge.net/gar/?rev=4283&view=rev Author: chninkel Date: 2009-04-12 13:19:37 +0000 (Sun, 12 Apr 2009) Log Message: ----------- vsftpd: gar v2 fixes Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.gspec csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype Added Paths: ----------- csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.gspec csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.preinstall Removed Paths: ------------- csw/mgar/pkg/vsftpd/trunk/files/tm_gmtoff.patch Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2009-04-12 12:59:04 UTC (rev 4282) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2009-04-12 13:19:37 UTC (rev 4283) @@ -80,11 +80,11 @@ ##### Build and installation information ##### +GARCOMPILER = SUN + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_SCRIPTS = fake -GARCOMPILER = SUN - +CONFIGURE_SCRIPTS = TEST_SCRIPTS = include gar/category.mk @@ -99,24 +99,29 @@ INSTALL_ENV += INSTALL="ginstall" -# no configure step with vsftpd -configure-fake: - $(MAKECOOKIE) # we create the csw directory hierarchy -pre-install: +pre-install-modulated: @echo "Creating csw directories" - ( install -d $(DESTDIR)$(sbindir); \ - install -d $(DESTDIR)$(mandir)/man5; \ - install -d $(DESTDIR)$(mandir)/man8; \ + ( ginstall -d $(DESTDIR)$(sbindir); \ + ginstall -d $(DESTDIR)$(mandir)/man5; \ + ginstall -d $(DESTDIR)$(mandir)/man8; \ ln -sf $(DESTDIR)$(mandir) $(DESTDIR)$(prefix)/man; \ - install -d $(DESTDIR)$(docdir)/vsftpd ) + ginstall -d $(DESTDIR)$(docdir)/vsftpd ) +post-merge: merge-doc-files merge-config-files merge-class-files -post-install: - cd $(WORKSRC) && \ +merge-config-files: + ginstall -D "$(WORKDIR_FIRSTMOD)/vsftpd.conf" "$(PKGROOT)$(sysconfdir)/vsftpd/vsftpd.conf.CSW" + ginstall -D "$(WORKDIR_FIRSTMOD)/vsftpd.userlist" "$(PKGROOT)$(sysconfdir)/vsftpd/vsftpd.userlist" + +merge-doc-files: for FILE in $(DOCFILES); do \ - ginstall -D $$FILE $(DESTDIR)$(docdir)/vsftpd/$$FILE; \ + ginstall -D "$(WORKSRC_FIRSTMOD)/$$FILE" "$(PKGROOT)$(docdir)/vsftpd/$$FILE"; \ done + ginstall -D "$(WORKDIR_FIRSTMOD)/changelog.CSW" "$(PKGROOT)$(docdir)/vsftpd/changelog.CSW" + ginstall -D "$(WORKDIR_FIRSTMOD)/README.CSW" "$(PKGROOT)$(docdir)/vsftpd/README.CSW" +merge-class-files: + ginstall "$(DOWNLOADDIR)/"*.conf $(WORKDIR)/ Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2009-04-12 12:59:04 UTC (rev 4282) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2009-04-12 13:19:37 UTC (rev 4283) @@ -1,20 +1,20 @@ -7890b54e7ffa6106ffbdfda53f47fa41 download/vsftpd-2.1.0.tar.gz -ad51a44007f43ed9ff736a38c764352b download/CSWvsftpd.gspec -eb9b4f253fa90f3b6187e44375306010 download/CSWvsftpd.prototype +314e73654490c2abe742b7ed7be798b1 download/CSWvsftpd.csw_usrgrp_config +81319e5dd110b08a476c3b31af2fd573 download/CSWvsftpd.depend +598e429baa86555a44a3da6581a78704 download/CSWvsftpd.gspec a2f5b70fe49839b0463c9d90af0f11dd download/CSWvsftpd.preinstall -81319e5dd110b08a476c3b31af2fd573 download/CSWvsftpd.depend -314e73654490c2abe742b7ed7be798b1 download/CSWvsftpd.csw_usrgrp_config +c3916a9a49d6167fc67c07754d8aa980 download/CSWvsftpd.prototype +eeaf77528b2da0c7730323838f30b7ef download/README.CSW +281c51282cabd9475cceef363bbc699b download/build_options.patch 68178673c7d33baead2d7b97e878ed79 download/changelog.CSW -eeaf77528b2da0c7730323838f30b7ef download/README.CSW -f6ce22a6959b93e500a4ae800295c2ee download/vsftpd.conf -60c736802e2ce00c531953b01e4a26f6 download/vsftpd.userlist +54c1c39c6bfa8747a4457f135fd5bca1 download/csw_build_system.patch +a9e994d2b57999b76a0e03503745c01a download/csw_paths.patch 8a11892757760e07534a4a455f051e84 download/cswvsftpd 5d093652c802b21dd00a52b2d012d977 download/cswvsftpd.xml -32905b27a67ac3d4c93a52e10a3a80fd download/svc-cswvsftpd +73e59f9ada47d3d20199f7c97849fb13 download/destdir.patch 9b2ae27f98333b73ff2b16ed98ee896a download/i.conf 5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf -281c51282cabd9475cceef363bbc699b download/build_options.patch -a9e994d2b57999b76a0e03503745c01a download/csw_paths.patch -54c1c39c6bfa8747a4457f135fd5bca1 download/csw_build_system.patch a9a65f55cbfd01f9d72d1de25e67148d download/set_priv_sep_user.patch -73e59f9ada47d3d20199f7c97849fb13 download/destdir.patch +32905b27a67ac3d4c93a52e10a3a80fd download/svc-cswvsftpd +7890b54e7ffa6106ffbdfda53f47fa41 download/vsftpd-2.1.0.tar.gz +f6ce22a6959b93e500a4ae800295c2ee download/vsftpd.conf +60c736802e2ce00c531953b01e4a26f6 download/vsftpd.userlist Modified: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.gspec =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.gspec 2009-04-12 12:59:04 UTC (rev 4282) +++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.gspec 2009-04-12 13:19:37 UTC (rev 4283) @@ -4,4 +4,4 @@ %copyright url file://%{WORKSRC}/LICENSE %var SERVICE_CONF_FILES /opt/csw/etc/vsftpd/vsftpd.conf %include url file://%{PKGLIB}/smf_enabled.gspec -%include url file://%{PKGLIB}/csw_usrgrp.gspec +%include url file://files/csw_usrgrp.gspec Modified: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype 2009-04-12 12:59:04 UTC (rev 4282) +++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype 2009-04-12 13:19:37 UTC (rev 4283) @@ -1,8 +1,8 @@ i i.conf i r.conf d none /opt/csw/etc/vsftpd 0755 root bin -f none /opt/csw/etc/vsftpd/vsftpd.conf.CSW=vsftpd.conf 0755 root bin -e conf /opt/csw/etc/vsftpd/vsftpd.userlist=vsftpd.userlist 0755 root bin +f none /opt/csw/etc/vsftpd/vsftpd.conf.CSW 0755 root bin +e conf /opt/csw/etc/vsftpd/vsftpd.userlist 0755 root bin f none /opt/csw/sbin/vsftpd 0755 root bin d none /opt/csw/share/doc/vsftpd 0755 root bin d none /opt/csw/share/doc/vsftpd/EXAMPLE 0755 root bin @@ -24,8 +24,8 @@ f none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.xinetd 0644 root bin f none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/README 0644 root bin f none /opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.conf 0644 root bin -f none /opt/csw/share/doc/vsftpd/README.CSW=README.CSW 0755 root bin -f none /opt/csw/share/doc/vsftpd/changelog.CSW=changelog.CSW 0644 root bin +f none /opt/csw/share/doc/vsftpd/README.CSW 0755 root bin +f none /opt/csw/share/doc/vsftpd/changelog.CSW 0644 root bin f none /opt/csw/share/doc/vsftpd/AUDIT 0644 root bin f none /opt/csw/share/doc/vsftpd/BENCHMARKS 0644 root bin f none /opt/csw/share/doc/vsftpd/BUGS 0644 root bin Added: csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.gspec =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.gspec (rev 0) +++ csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.gspec 2009-04-12 13:19:37 UTC (rev 4283) @@ -0,0 +1,3 @@ +%prototype:merge +i csw_usrgrp_config=CSW%{bitname}.csw_usrgrp_config +%preinstall:merge url file://files/csw_usrgrp.preinstall Added: csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.preinstall =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.preinstall (rev 0) +++ csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.preinstall 2009-04-12 13:19:37 UTC (rev 4283) @@ -0,0 +1,79 @@ +################################################################################ +# Start csw_usrgrp.postinstall +################################################################################ + +# This was once based upon the preinstallation script from vsftpd + +set -e + +################################################## +# create the given group if it doesn't exist +################################################## +create_group() +{ + NAME=$1 + + if /usr/sbin/chroot "$PKG_INSTALL_ROOT" /usr/bin/getent group $NAME > /dev/null; then + /usr/bin/echo "Group already exist: $NAME" + else + /usr/sbin/chroot "$PKG_INSTALL_ROOT" /usr/sbin/groupadd $NAME + /usr/bin/echo "Group created: $NAME" + fi +} + +################################################## +# create the given user if it doesn't exist +# paramters are: userid gid home shell gecos +################################################## +create_user() +{ + NAME=$1 + GROUP=$2 + HOME=$3 + SHELL=$4 + COMMENT="$5" + + if /usr/sbin/chroot "$PKG_INSTALL_ROOT" /usr/bin/getent passwd $NAME > /dev/null; then + /usr/bin/echo "User already exists: $NAME" + else + /usr/sbin/chroot "$PKG_INSTALL_ROOT" /usr/sbin/useradd -g "$GROUP" -c "$COMMENT" -d $HOME -s $SHELL $NAME + /usr/sbin/chroot "$PKG_INSTALL_ROOT" /usr/bin/pwconv + /usr/bin/echo "User created: $NAME" + fi +} + +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} + +CSW_USRGRP_CONFIG="$PKGSAV/../install/csw_usrgrp_config" + +# Note to self: do not replace this with a "return" as additional scripts can be merged after this script +if [ -r "$CSW_USRGRP_CONFIG" ] +then + # Read the csw_usrgrp_config file and make sure that it has the correct version + set +e + version=`grep "^version=" "$CSW_USRGRP_CONFIG"` + set -e + + if [ "$version" != "version=1" ] + then + echo "ERROR: invalid csw_usrgrp_config file. Expected version=1" + exit 1 + fi + + OIFS="$IFS"; + IFS=":" + sed -n "s/^group=//p" "$CSW_USRGRP_CONFIG" | while read NAME + do + create_group "$NAME" + done + + sed -n "s/^user=//p" "$CSW_USRGRP_CONFIG" | while read NAME GROUP HOME SHELL COMMENT + do + create_user "$NAME" "$GROUP" "$HOME" "$SHELL" "$COMMENT" + done + IFS="$OIFS" +fi + +################################################################################ +# End csw_usrgrp.postinstall +################################################################################ Deleted: csw/mgar/pkg/vsftpd/trunk/files/tm_gmtoff.patch =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/tm_gmtoff.patch 2009-04-12 12:59:04 UTC (rev 4282) +++ csw/mgar/pkg/vsftpd/trunk/files/tm_gmtoff.patch 2009-04-12 13:19:37 UTC (rev 4283) @@ -1,23 +0,0 @@ -diff --speed-large-files --minimal -Nru vsftpd-2.0.4.orig/sysutil.c vsftpd-2.0.4/sysutil.c ---- vsftpd-2.0.4.orig/sysutil.c 2006-04-12 18:45:16.969532000 -0400 -+++ vsftpd-2.0.4/sysutil.c 2006-04-12 18:44:48.196361000 -0400 -@@ -2475,10 +2475,19 @@ - { - time_t the_time = 0; - struct tm* p_tm; -+#if defined (__SVR4) && defined (__sun) -+ struct tm* p_tm_utc; -+#endif -+ - tzset(); - the_time = time(NULL); - p_tm = localtime(&the_time); -+#if defined (__SVR4) && defined (__sun) -+ p_tm_utc = gmtime(&the_time); -+ s_timezone = -(mktime(p_tm) - mktime(p_tm_utc)); -+#else - s_timezone = -p_tm->tm_gmtoff; -+#endif - } - - const char* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Apr 12 15:26:17 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 12 Apr 2009 13:26:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[4284] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 4284 http://gar.svn.sourceforge.net/gar/?rev=4284&view=rev Author: chninkel Date: 2009-04-12 13:26:16 +0000 (Sun, 12 Apr 2009) Log Message: ----------- vsftpd: switched to cswpreserveconf class Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.depend csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype Removed Paths: ------------- csw/mgar/pkg/vsftpd/trunk/files/i.conf csw/mgar/pkg/vsftpd/trunk/files/r.conf Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2009-04-12 13:19:37 UTC (rev 4283) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2009-04-12 13:26:16 UTC (rev 4284) @@ -30,7 +30,7 @@ # adding configuration handling classes # (init/smf classes are dynamically added in checkinstall) -SPKG_CLASSES = none conf +SPKG_CLASSES = none cswpreserveconf ###### Upstream and opencsw files information ####### @@ -43,7 +43,6 @@ DISTFILES += changelog.CSW README.CSW DISTFILES += vsftpd.conf vsftpd.userlist DISTFILES += cswvsftpd cswvsftpd.xml svc-cswvsftpd -DISTFILES += i.conf r.conf # build options are set by modifying # builddefs.h, so we patch it to enable @@ -114,7 +113,7 @@ merge-config-files: ginstall -D "$(WORKDIR_FIRSTMOD)/vsftpd.conf" "$(PKGROOT)$(sysconfdir)/vsftpd/vsftpd.conf.CSW" - ginstall -D "$(WORKDIR_FIRSTMOD)/vsftpd.userlist" "$(PKGROOT)$(sysconfdir)/vsftpd/vsftpd.userlist" + ginstall -D "$(WORKDIR_FIRSTMOD)/vsftpd.userlist" "$(PKGROOT)$(sysconfdir)/vsftpd/vsftpd.userlist.CSW" merge-doc-files: for FILE in $(DOCFILES); do \ Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2009-04-12 13:19:37 UTC (rev 4283) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2009-04-12 13:26:16 UTC (rev 4284) @@ -1,8 +1,8 @@ 314e73654490c2abe742b7ed7be798b1 download/CSWvsftpd.csw_usrgrp_config -81319e5dd110b08a476c3b31af2fd573 download/CSWvsftpd.depend +6193a623b66f1132fa0d3e64904ecf15 download/CSWvsftpd.depend 598e429baa86555a44a3da6581a78704 download/CSWvsftpd.gspec a2f5b70fe49839b0463c9d90af0f11dd download/CSWvsftpd.preinstall -c3916a9a49d6167fc67c07754d8aa980 download/CSWvsftpd.prototype +3445fbf0fc7e28cc7f2db827dfbaddb0 download/CSWvsftpd.prototype eeaf77528b2da0c7730323838f30b7ef download/README.CSW 281c51282cabd9475cceef363bbc699b download/build_options.patch 68178673c7d33baead2d7b97e878ed79 download/changelog.CSW @@ -11,8 +11,6 @@ 8a11892757760e07534a4a455f051e84 download/cswvsftpd 5d093652c802b21dd00a52b2d012d977 download/cswvsftpd.xml 73e59f9ada47d3d20199f7c97849fb13 download/destdir.patch -9b2ae27f98333b73ff2b16ed98ee896a download/i.conf -5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf a9a65f55cbfd01f9d72d1de25e67148d download/set_priv_sep_user.patch 32905b27a67ac3d4c93a52e10a3a80fd download/svc-cswvsftpd 7890b54e7ffa6106ffbdfda53f47fa41 download/vsftpd-2.1.0.tar.gz Modified: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.depend =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.depend 2009-04-12 13:19:37 UTC (rev 4283) +++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.depend 2009-04-12 13:26:16 UTC (rev 4284) @@ -1,2 +1,3 @@ P CSWtcpwrap tcpwrappers (ipv6.4 patched) lib and tools for pre-screening tcp connections P CSWosslrt openssl Openssl meta package +P CSWcswclassutils Modified: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype 2009-04-12 13:19:37 UTC (rev 4283) +++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype 2009-04-12 13:26:16 UTC (rev 4284) @@ -1,8 +1,6 @@ -i i.conf -i r.conf d none /opt/csw/etc/vsftpd 0755 root bin f none /opt/csw/etc/vsftpd/vsftpd.conf.CSW 0755 root bin -e conf /opt/csw/etc/vsftpd/vsftpd.userlist 0755 root bin +f cswpreserveconf /opt/csw/etc/vsftpd/vsftpd.userlist.CSW 0755 root bin f none /opt/csw/sbin/vsftpd 0755 root bin d none /opt/csw/share/doc/vsftpd 0755 root bin d none /opt/csw/share/doc/vsftpd/EXAMPLE 0755 root bin Deleted: csw/mgar/pkg/vsftpd/trunk/files/i.conf =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/i.conf 2009-04-12 13:19:37 UTC (rev 4283) +++ csw/mgar/pkg/vsftpd/trunk/files/i.conf 2009-04-12 13:26:16 UTC (rev 4284) @@ -1,54 +0,0 @@ -# -# Copyright 2006 Yann Rouillard -# All rights reserved. Use is subject to license terms. -# -# Redistribution and/or use, with or without modification, is -# permitted. This code is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# -# i.conf - class script which install configuration files -# -# If the configuration file already exists on the filesystem, -# this script will let the existing file intact and will -# install a copy of the file provided in the package suffixed -# with .CSW -# except for service configuration files which are always installed -# CSW suffixed under Solaris 9 as they are used to enable/disable -# a service according to blastwave standards. -# -umask 0022 - -if [ -z "$PKG_INSTALL_ROOT" ]; then - PKG_INSTALL_ROOT=/ -fi - -while read SRC DEST; do - if [ -f "${PKG_INSTALL_ROOT}/$DEST" ]; then - cp "$SRC" "${PKG_INSTALL_ROOT}/$DEST.CSW" - else - cp "$SRC" "${PKG_INSTALL_ROOT}/$DEST" - fi -done - -# Unfortunately pkgadd doesn't backup the source file if the destination file is identical. -# It's a problem with zones installation where pkgadd try to find the backup files, so -# we do the backup manually -awk '{ if ( $3 == "conf" ) print $2,$3,$4,$5,$6,$7 }' $INST_DATADIR/$PKG/pkgmap | \ - while read FTYPE CLASS FPATH MODE OWNER GROUP; do - if echo $FPATH | grep "^/" >/dev/null; then - INST_PATH="$INST_DATADIR/$PKG/root/$FPATH" - SAVE_PATH="$PKGSAV/pspool/$PKG/root/$FPATH" - else - INST_PATH="$INST_DATADIR/$PKG/reloc/$FPATH" - SAVE_PATH="$PKGSAV/pspool/$PKG/reloc/$FPATH" - fi - - if [ ! -f "$SAVE_PATH" ]; then - mkdir -p "`LANG=C dirname $SAVE_PATH`" - cp "$INST_PATH" "$SAVE_PATH" - fi - done - -exit 0 - Deleted: csw/mgar/pkg/vsftpd/trunk/files/r.conf =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/r.conf 2009-04-12 13:19:37 UTC (rev 4283) +++ csw/mgar/pkg/vsftpd/trunk/files/r.conf 2009-04-12 13:26:16 UTC (rev 4284) @@ -1,21 +0,0 @@ -# -# Copyright 2006 Yann Rouillard -# All rights reserved. Use is subject to license terms. -# -# Redistribution and/or use, with or without modification, is -# permitted. This code is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. -# -# r.conf - class script which removes configuration files -# -# This script doesn't delete config file, only backup ones -# installed by the package. -# - -while read DEST; do - if [ -f "$DEST.CSW" ]; then - rm "$DEST.CSW" - fi -done - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Apr 12 15:32:04 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 12 Apr 2009 13:32:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[4285] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 4285 http://gar.svn.sourceforge.net/gar/?rev=4285&view=rev Author: chninkel Date: 2009-04-12 13:32:03 +0000 (Sun, 12 Apr 2009) Log Message: ----------- vsftpd: switched to dynamic depend files Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.depend Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2009-04-12 13:26:16 UTC (rev 4284) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2009-04-12 13:32:03 UTC (rev 4285) @@ -32,14 +32,18 @@ # (init/smf classes are dynamically added in checkinstall) SPKG_CLASSES = none cswpreserveconf +REQUIRED_PKGS = CSWtcpwrap +REQUIRED_PKGS += CSWosslrt +REQUIRED_PKGS += CSWcswclassutils + ###### Upstream and opencsw files information ####### # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWvsftpd,prototype preinstall depend csw_usrgrp_config) +DISTFILES += $(call admfiles,CSWvsftpd,prototype preinstall csw_usrgrp_config) DISTFILES += changelog.CSW README.CSW DISTFILES += vsftpd.conf vsftpd.userlist DISTFILES += cswvsftpd cswvsftpd.xml svc-cswvsftpd Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2009-04-12 13:26:16 UTC (rev 4284) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2009-04-12 13:32:03 UTC (rev 4285) @@ -1,5 +1,4 @@ 314e73654490c2abe742b7ed7be798b1 download/CSWvsftpd.csw_usrgrp_config -6193a623b66f1132fa0d3e64904ecf15 download/CSWvsftpd.depend 598e429baa86555a44a3da6581a78704 download/CSWvsftpd.gspec a2f5b70fe49839b0463c9d90af0f11dd download/CSWvsftpd.preinstall 3445fbf0fc7e28cc7f2db827dfbaddb0 download/CSWvsftpd.prototype Deleted: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.depend =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.depend 2009-04-12 13:26:16 UTC (rev 4284) +++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.depend 2009-04-12 13:32:03 UTC (rev 4285) @@ -1,3 +0,0 @@ -P CSWtcpwrap tcpwrappers (ipv6.4 patched) lib and tools for pre-screening tcp connections -P CSWosslrt openssl Openssl meta package -P CSWcswclassutils This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Apr 12 15:46:37 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 12 Apr 2009 13:46:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[4286] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 4286 http://gar.svn.sourceforge.net/gar/?rev=4286&view=rev Author: chninkel Date: 2009-04-12 13:46:36 +0000 (Sun, 12 Apr 2009) Log Message: ----------- vsftpd: switched to dynamic gspec Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums Added Paths: ----------- csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec Removed Paths: ------------- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.gspec Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2009-04-12 13:32:03 UTC (rev 4285) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2009-04-12 13:46:36 UTC (rev 4286) @@ -27,23 +27,24 @@ MASTER_SITES = ftp://vsftpd.beasts.org/users/cevans/ +PACKAGES = CSWvsftpd +REQUIRED_PKGS = CSWtcpwrap +REQUIRED_PKGS += CSWosslrt +REQUIRED_PKGS += CSWcswclassutils + # adding configuration handling classes # (init/smf classes are dynamically added in checkinstall) SPKG_CLASSES = none cswpreserveconf -REQUIRED_PKGS = CSWtcpwrap -REQUIRED_PKGS += CSWosslrt -REQUIRED_PKGS += CSWcswclassutils - ###### Upstream and opencsw files information ####### # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWvsftpd,prototype preinstall csw_usrgrp_config) +DISTFILES += CSWvsftpd.prototype CSWvsftpd.preinstall CSWvsftpd.csw_usrgrp_config DISTFILES += changelog.CSW README.CSW DISTFILES += vsftpd.conf vsftpd.userlist DISTFILES += cswvsftpd cswvsftpd.xml svc-cswvsftpd @@ -80,7 +81,12 @@ DOCFILES += EXAMPLE/INTERNET_SITE_NOINETD/README EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf +# little hack to be able to still use old smf support with gar v2 +# until openssh is migrated to cswclassutils init system +DISTFILES += vsftpd_dyngspec.fakespec +_CATEGORY_GSPEC_INCLUDE = ../../$(DOWNLOADDIR)/vsftpd_dyngspec.fakespec + ##### Build and installation information ##### GARCOMPILER = SUN Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2009-04-12 13:32:03 UTC (rev 4285) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2009-04-12 13:46:36 UTC (rev 4286) @@ -1,5 +1,4 @@ 314e73654490c2abe742b7ed7be798b1 download/CSWvsftpd.csw_usrgrp_config -598e429baa86555a44a3da6581a78704 download/CSWvsftpd.gspec a2f5b70fe49839b0463c9d90af0f11dd download/CSWvsftpd.preinstall 3445fbf0fc7e28cc7f2db827dfbaddb0 download/CSWvsftpd.prototype eeaf77528b2da0c7730323838f30b7ef download/README.CSW @@ -15,3 +14,4 @@ 7890b54e7ffa6106ffbdfda53f47fa41 download/vsftpd-2.1.0.tar.gz f6ce22a6959b93e500a4ae800295c2ee download/vsftpd.conf 60c736802e2ce00c531953b01e4a26f6 download/vsftpd.userlist +0b0357e8470ccea567eabe6103daa769 download/vsftpd_dyngspec.fakespec Deleted: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.gspec =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.gspec 2009-04-12 13:32:03 UTC (rev 4285) +++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.gspec 2009-04-12 13:46:36 UTC (rev 4286) @@ -1,7 +0,0 @@ -%var bitname vsftpd -%var pkgname CSWvsftpd -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE -%var SERVICE_CONF_FILES /opt/csw/etc/vsftpd/vsftpd.conf -%include url file://%{PKGLIB}/smf_enabled.gspec -%include url file://files/csw_usrgrp.gspec Added: csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec (rev 0) +++ csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec 2009-04-12 13:46:36 UTC (rev 4286) @@ -0,0 +1,4 @@ +%include url file://%{PKGLIB}/csw_dyngspec.gspec +%var SERVICE_CONF_FILES /opt/csw/etc/vsftpd/vsftpd.conf +%include url file://%{PKGLIB}/smf_enabled.gspec +%include url file://files/csw_usrgrp.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Apr 12 16:05:48 2009 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 12 Apr 2009 14:05:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[4287] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 4287 http://gar.svn.sourceforge.net/gar/?rev=4287&view=rev Author: chninkel Date: 2009-04-12 14:05:48 +0000 (Sun, 12 Apr 2009) Log Message: ----------- vsftpd: switched to cswclassutils cswusergroup Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec Added Paths: ----------- csw/mgar/pkg/vsftpd/trunk/files/cswusergroup Removed Paths: ------------- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.csw_usrgrp_config csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.gspec csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.preinstall Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2009-04-12 13:46:36 UTC (rev 4286) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2009-04-12 14:05:48 UTC (rev 4287) @@ -35,7 +35,7 @@ # adding configuration handling classes # (init/smf classes are dynamically added in checkinstall) -SPKG_CLASSES = none cswpreserveconf +SPKG_CLASSES = none cswpreserveconf cswusergroup ###### Upstream and opencsw files information ####### @@ -44,10 +44,11 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWvsftpd.prototype CSWvsftpd.preinstall CSWvsftpd.csw_usrgrp_config +DISTFILES += CSWvsftpd.prototype CSWvsftpd.preinstall DISTFILES += changelog.CSW README.CSW DISTFILES += vsftpd.conf vsftpd.userlist DISTFILES += cswvsftpd cswvsftpd.xml svc-cswvsftpd +DISTFILES += cswusergroup # build options are set by modifying # builddefs.h, so we patch it to enable @@ -119,11 +120,12 @@ ginstall -d $(DESTDIR)$(docdir)/vsftpd ) -post-merge: merge-doc-files merge-config-files merge-class-files +post-merge: merge-doc-files merge-config-files merge-config-files: ginstall -D "$(WORKDIR_FIRSTMOD)/vsftpd.conf" "$(PKGROOT)$(sysconfdir)/vsftpd/vsftpd.conf.CSW" ginstall -D "$(WORKDIR_FIRSTMOD)/vsftpd.userlist" "$(PKGROOT)$(sysconfdir)/vsftpd/vsftpd.userlist.CSW" + ginstall -D "$(WORKDIR_FIRSTMOD)/cswusergroup" "$(PKGROOT)$(sysconfdir)/pkg/CSWvsftpd/cswusergroup" merge-doc-files: for FILE in $(DOCFILES); do \ @@ -131,6 +133,3 @@ done ginstall -D "$(WORKDIR_FIRSTMOD)/changelog.CSW" "$(PKGROOT)$(docdir)/vsftpd/changelog.CSW" ginstall -D "$(WORKDIR_FIRSTMOD)/README.CSW" "$(PKGROOT)$(docdir)/vsftpd/README.CSW" - -merge-class-files: - ginstall "$(DOWNLOADDIR)/"*.conf $(WORKDIR)/ Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2009-04-12 13:46:36 UTC (rev 4286) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2009-04-12 14:05:48 UTC (rev 4287) @@ -1,11 +1,11 @@ -314e73654490c2abe742b7ed7be798b1 download/CSWvsftpd.csw_usrgrp_config a2f5b70fe49839b0463c9d90af0f11dd download/CSWvsftpd.preinstall -3445fbf0fc7e28cc7f2db827dfbaddb0 download/CSWvsftpd.prototype +accf66084b40cc8ea89037f1cc351833 download/CSWvsftpd.prototype eeaf77528b2da0c7730323838f30b7ef download/README.CSW 281c51282cabd9475cceef363bbc699b download/build_options.patch 68178673c7d33baead2d7b97e878ed79 download/changelog.CSW 54c1c39c6bfa8747a4457f135fd5bca1 download/csw_build_system.patch a9e994d2b57999b76a0e03503745c01a download/csw_paths.patch +98e1d831801985daf5ce2ed01fbc0efd download/cswusergroup 8a11892757760e07534a4a455f051e84 download/cswvsftpd 5d093652c802b21dd00a52b2d012d977 download/cswvsftpd.xml 73e59f9ada47d3d20199f7c97849fb13 download/destdir.patch @@ -14,4 +14,4 @@ 7890b54e7ffa6106ffbdfda53f47fa41 download/vsftpd-2.1.0.tar.gz f6ce22a6959b93e500a4ae800295c2ee download/vsftpd.conf 60c736802e2ce00c531953b01e4a26f6 download/vsftpd.userlist -0b0357e8470ccea567eabe6103daa769 download/vsftpd_dyngspec.fakespec +372d9e524d45e1b62578ef3361c8524c download/vsftpd_dyngspec.fakespec Deleted: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.csw_usrgrp_config =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.csw_usrgrp_config 2009-04-12 13:46:36 UTC (rev 4286) +++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.csw_usrgrp_config 2009-04-12 14:05:48 UTC (rev 4287) @@ -1,4 +0,0 @@ -version=1 -group=vsftpd -user=vsftpd:vsftpd:/opt/csw/var/empty/vsftpd:/bin/false:vsftpd privsep user -user=ftp:nogroup:/opt/csw/var/ftp:/bin/false:ftp user for anonymous access Modified: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype 2009-04-12 13:46:36 UTC (rev 4286) +++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype 2009-04-12 14:05:48 UTC (rev 4287) @@ -1,6 +1,7 @@ d none /opt/csw/etc/vsftpd 0755 root bin -f none /opt/csw/etc/vsftpd/vsftpd.conf.CSW 0755 root bin -f cswpreserveconf /opt/csw/etc/vsftpd/vsftpd.userlist.CSW 0755 root bin +f none /opt/csw/etc/vsftpd/vsftpd.conf.CSW 0644 root bin +f cswpreserveconf /opt/csw/etc/vsftpd/vsftpd.userlist.CSW 0644 root bin +f cswusergroup /opt/csw/etc/pkg/CSWvsftpd/cswusergroup 0644 root bin f none /opt/csw/sbin/vsftpd 0755 root bin d none /opt/csw/share/doc/vsftpd 0755 root bin d none /opt/csw/share/doc/vsftpd/EXAMPLE 0755 root bin Deleted: csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.gspec =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.gspec 2009-04-12 13:46:36 UTC (rev 4286) +++ csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.gspec 2009-04-12 14:05:48 UTC (rev 4287) @@ -1,3 +0,0 @@ -%prototype:merge -i csw_usrgrp_config=CSW%{bitname}.csw_usrgrp_config -%preinstall:merge url file://files/csw_usrgrp.preinstall Deleted: csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.preinstall =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.preinstall 2009-04-12 13:46:36 UTC (rev 4286) +++ csw/mgar/pkg/vsftpd/trunk/files/csw_usrgrp.preinstall 2009-04-12 14:05:48 UTC (rev 4287) @@ -1,79 +0,0 @@ -################################################################################ -# Start csw_usrgrp.postinstall -################################################################################ - -# This was once based upon the preinstallation script from vsftpd - -set -e - -################################################## -# create the given group if it doesn't exist -################################################## -create_group() -{ - NAME=$1 - - if /usr/sbin/chroot "$PKG_INSTALL_ROOT" /usr/bin/getent group $NAME > /dev/null; then - /usr/bin/echo "Group already exist: $NAME" - else - /usr/sbin/chroot "$PKG_INSTALL_ROOT" /usr/sbin/groupadd $NAME - /usr/bin/echo "Group created: $NAME" - fi -} - -################################################## -# create the given user if it doesn't exist -# paramters are: userid gid home shell gecos -################################################## -create_user() -{ - NAME=$1 - GROUP=$2 - HOME=$3 - SHELL=$4 - COMMENT="$5" - - if /usr/sbin/chroot "$PKG_INSTALL_ROOT" /usr/bin/getent passwd $NAME > /dev/null; then - /usr/bin/echo "User already exists: $NAME" - else - /usr/sbin/chroot "$PKG_INSTALL_ROOT" /usr/sbin/useradd -g "$GROUP" -c "$COMMENT" -d $HOME -s $SHELL $NAME - /usr/sbin/chroot "$PKG_INSTALL_ROOT" /usr/bin/pwconv - /usr/bin/echo "User created: $NAME" - fi -} - -PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} - -CSW_USRGRP_CONFIG="$PKGSAV/../install/csw_usrgrp_config" - -# Note to self: do not replace this with a "return" as additional scripts can be merged after this script -if [ -r "$CSW_USRGRP_CONFIG" ] -then - # Read the csw_usrgrp_config file and make sure that it has the correct version - set +e - version=`grep "^version=" "$CSW_USRGRP_CONFIG"` - set -e - - if [ "$version" != "version=1" ] - then - echo "ERROR: invalid csw_usrgrp_config file. Expected version=1" - exit 1 - fi - - OIFS="$IFS"; - IFS=":" - sed -n "s/^group=//p" "$CSW_USRGRP_CONFIG" | while read NAME - do - create_group "$NAME" - done - - sed -n "s/^user=//p" "$CSW_USRGRP_CONFIG" | while read NAME GROUP HOME SHELL COMMENT - do - create_user "$NAME" "$GROUP" "$HOME" "$SHELL" "$COMMENT" - done - IFS="$OIFS" -fi - -################################################################################ -# End csw_usrgrp.postinstall -################################################################################ Added: csw/mgar/pkg/vsftpd/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/vsftpd/trunk/files/cswusergroup 2009-04-12 14:05:48 UTC (rev 4287) @@ -0,0 +1,2 @@ +vsftpd:vsftpd:vsftpd privsep user:/opt/csw/var/empty/vsftpd:/bin/false:: +ftp:nogroup:ftp user for anonymous access:/opt/csw/var/ftp:/bin/false:: Modified: csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec 2009-04-12 13:46:36 UTC (rev 4286) +++ csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec 2009-04-12 14:05:48 UTC (rev 4287) @@ -1,4 +1,3 @@ %include url file://%{PKGLIB}/csw_dyngspec.gspec %var SERVICE_CONF_FILES /opt/csw/etc/vsftpd/vsftpd.conf %include url file://%{PKGLIB}/smf_enabled.gspec -%include url file://files/csw_usrgrp.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 12 17:15:28 2009 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 12 Apr 2009 15:15:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[4288] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 4288 http://gar.svn.sourceforge.net/gar/?rev=4288&view=rev Author: hson Date: 2009-04-12 15:15:28 +0000 (Sun, 12 Apr 2009) Log Message: ----------- imagemagick: Add EXTRA_LD_OPTIONS to force libtool to use built libs instead of installed libs during install phase Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-04-12 14:05:48 UTC (rev 4287) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-04-12 15:15:28 UTC (rev 4288) @@ -45,6 +45,7 @@ # Test has to be run *after* install TEST_SCRIPTS = +EXTRA_LD_OPTIONS = -L./magick/.libs MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 12 22:23:53 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 12 Apr 2009 20:23:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[4289] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 4289 http://gar.svn.sourceforge.net/gar/?rev=4289&view=rev Author: dmichelsen Date: 2009-04-12 20:23:53 +0000 (Sun, 12 Apr 2009) Log Message: ----------- pcre: Update to 7.9 Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2009-04-12 15:15:28 UTC (rev 4288) +++ csw/mgar/pkg/pcre/trunk/Makefile 2009-04-12 20:23:53 UTC (rev 4289) @@ -1,5 +1,5 @@ GARNAME = pcre -GARVERSION = 7.8 +GARVERSION = 7.9 CATEGORIES = lib DESCRIPTION = Perl-compatible regular expression tools Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2009-04-12 15:15:28 UTC (rev 4288) +++ csw/mgar/pkg/pcre/trunk/checksums 2009-04-12 20:23:53 UTC (rev 4289) @@ -1,3 +1 @@ -32fd7c7863b871d408d730e6ffa4aa71 download/pcre-7.8.tar.gz -ab54bd8abaae58cd88a86678977723e0 download/CSWpcre.gspec -9c278a0bbdb2766d198d585e5c73956a download/CSWpcrert.gspec +2256d0a1d0a358265165ca70e7cfc47a download/pcre-7.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 12 22:26:22 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 12 Apr 2009 20:26:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[4290] csw/mgar/pkg/pcre/trunk/Makefile Message-ID: Revision: 4290 http://gar.svn.sourceforge.net/gar/?rev=4290&view=rev Author: dmichelsen Date: 2009-04-12 20:26:21 +0000 (Sun, 12 Apr 2009) Log Message: ----------- pcre: Use isaexec for pcregrep Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2009-04-12 20:23:53 UTC (rev 4289) +++ csw/mgar/pkg/pcre/trunk/Makefile 2009-04-12 20:26:21 UTC (rev 4290) @@ -41,8 +41,6 @@ TEST_TARGET = check -NO_ISAEXEC = 1 - PKGFILES_CSWpcrert = $(PKGFILES_RT) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From valholla at users.sourceforge.net Mon Apr 13 03:41:13 2009 From: valholla at users.sourceforge.net (valholla at users.sourceforge.net) Date: Mon, 13 Apr 2009 01:41:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[4291] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 4291 http://gar.svn.sourceforge.net/gar/?rev=4291&view=rev Author: valholla Date: 2009-04-13 01:41:12 +0000 (Mon, 13 Apr 2009) Log Message: ----------- comment out amd merge Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2009-04-12 20:26:21 UTC (rev 4290) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2009-04-13 01:41:12 UTC (rev 4291) @@ -38,7 +38,7 @@ CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,java,objc ## For cleanliness I split the Configuration into separate files -include files/amd_merge.mk +#include files/amd_merge.mk include files/gar_override.mk include files/package_def.mk include files/pkg_scripts.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 13 16:14:55 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 13 Apr 2009 14:14:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[4292] csw/mgar/pkg/docbook-style-xsl/trunk Message-ID: Revision: 4292 http://gar.svn.sourceforge.net/gar/?rev=4292&view=rev Author: bdwalton Date: 2009-04-13 14:14:55 +0000 (Mon, 13 Apr 2009) Log Message: ----------- converted to dynamic adm script Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile csw/mgar/pkg/docbook-style-xsl/trunk/checksums csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall Modified: csw/mgar/pkg/docbook-style-xsl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2009-04-13 01:41:12 UTC (rev 4291) +++ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2009-04-13 14:14:55 UTC (rev 4292) @@ -33,8 +33,12 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = docbook-xsl-$(GARVERSION).tar.bz2 DISTFILES += docbook-xsl-doc-$(GARVERSION).tar.bz2 -DISTFILES += CSWdocbookxsl.postinstall CSWdocbookxsl.preremove +DISTFILES += CSWdocbookxsl.preremove +#use the dynamic adm script feature so we don't need to edit file at +#version change +include files/CSWdocbookxsl.postinstall + PATCHFILES += add_makefile.patch CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/docbook-style-xsl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2009-04-13 01:41:12 UTC (rev 4291) +++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2009-04-13 14:14:55 UTC (rev 4292) @@ -1,4 +1,3 @@ -c022eb8e15bf110605a4695235f20075 download/CSWdocbookxsl.postinstall 1b98827c1a02fcec57ec0f7376bb8815 download/CSWdocbookxsl.preremove 9ba4d6409de31404b8022f10630016e0 download/add_makefile.patch c77c0c317040b2f2e366842bd9df2218 download/docbook-xsl-1.74.3.tar.bz2 Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2009-04-13 01:41:12 UTC (rev 4291) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2009-04-13 14:14:55 UTC (rev 4292) @@ -1,11 +1,12 @@ +define CSWdocbookxsl_postinstall #!/bin/sh -case "$PKG_INSTALL_ROOT" in +case "$$PKG_INSTALL_ROOT" in ""|"/") PREFIX= ;; - *) PREFIX="chroot $PKG_INSTALL_ROOT ";; + *) PREFIX="chroot $$PKG_INSTALL_ROOT ";; esac -PATH=/opt/csw/bin:$PATH +PATH=/opt/csw/bin:$$PATH CATCMD=/opt/csw/bin/xmlcatalog @@ -14,17 +15,18 @@ CATALOG=/opt/csw/etc/xml/catalog #we need a version here, since that will be referenced in URLS being redirected -VERSION=1.74.3 +VERSION=$(GARVERSION) -$PREFIX $CATCMD --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/$VERSION" \ - "file://$DBHOME/xsl-stylesheets" $CATALOG -$PREFIX $CATCMD --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/$VERSION" \ - "file://$DBHOME/xsl-stylesheets" $CATALOG -$PREFIX $CATCMD --noout --add "rewriteSystem" \ +$$PREFIX $$CATCMD --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/$$VERSION" \ + "file://$DBHOME/xsl-stylesheets" $$CATALOG +$$PREFIX $$CATCMD --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/$$VERSION" \ + "file://$DBHOME/xsl-stylesheets" $$CATALOG +$$PREFIX $$CATCMD --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "file://$DBHOME/xsl-stylesheets" $CATALOG -$PREFIX $CATCMD --noout --add "rewriteURI" \ + "file://$DBHOME/xsl-stylesheets" $$CATALOG +$$PREFIX $$CATCMD --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "file://$DBHOME/xsl-stylesheets" $CATALOG + "file://$DBHOME/xsl-stylesheets" $$CATALOG +endef 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 13 16:30:07 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 13 Apr 2009 14:30:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[4293] csw/mgar/pkg/docbook-style-xsl/trunk/files/ CSWdocbookxsl.postinstall Message-ID: Revision: 4293 http://gar.svn.sourceforge.net/gar/?rev=4293&view=rev Author: bdwalton Date: 2009-04-13 14:30:06 +0000 (Mon, 13 Apr 2009) Log Message: ----------- correct adm script Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2009-04-13 14:14:55 UTC (rev 4292) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2009-04-13 14:30:06 UTC (rev 4293) @@ -19,14 +19,14 @@ $$PREFIX $$CATCMD --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/$$VERSION" \ - "file://$DBHOME/xsl-stylesheets" $$CATALOG + "file://$$DBHOME/xsl-stylesheets" $$CATALOG $$PREFIX $$CATCMD --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/$$VERSION" \ - "file://$DBHOME/xsl-stylesheets" $$CATALOG + "file://$$DBHOME/xsl-stylesheets" $$CATALOG $$PREFIX $$CATCMD --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "file://$DBHOME/xsl-stylesheets" $$CATALOG + "file://$$DBHOME/xsl-stylesheets" $$CATALOG $$PREFIX $$CATCMD --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "file://$DBHOME/xsl-stylesheets" $$CATALOG + "file://$$DBHOME/xsl-stylesheets" $$CATALOG endef 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 13 16:53:03 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 13 Apr 2009 14:53:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[4294] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 4294 http://gar.svn.sourceforge.net/gar/?rev=4294&view=rev Author: bdwalton Date: 2009-04-13 14:53:03 +0000 (Mon, 13 Apr 2009) Log Message: ----------- move GIT_USE_PROXY to .garrc instead of build recipe Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2009-04-13 14:30:06 UTC (rev 4293) +++ csw/mgar/pkg/git/trunk/Makefile 2009-04-13 14:53:03 UTC (rev 4294) @@ -66,7 +66,8 @@ SPKG_DESC_CSWgitdoc = Documentation for Git SPKG_DESC_CSWgitemacs = Git VCS support for Emacs -GIT_USE_PROXY = 1 +#NOTE: If you need to proxy git:// connections, set GIT_USE_PROXY in +# your .garrc file. (That leaves this recipe in a more generic form.) GIT_REPOS = git://git.kernel.org/pub/scm/git/git.git GIT_TREEISH_git.git = v$(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 Mon Apr 13 19:58:15 2009 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 13 Apr 2009 17:58:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[4295] csw/mgar/pkg/docbook-style-xsl/trunk Message-ID: Revision: 4295 http://gar.svn.sourceforge.net/gar/?rev=4295&view=rev Author: bdwalton Date: 2009-04-13 17:58:14 +0000 (Mon, 13 Apr 2009) Log Message: ----------- rework local makefile to be more generic Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/checksums csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch Modified: csw/mgar/pkg/docbook-style-xsl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2009-04-13 14:53:03 UTC (rev 4294) +++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2009-04-13 17:58:14 UTC (rev 4295) @@ -1,4 +1,4 @@ 1b98827c1a02fcec57ec0f7376bb8815 download/CSWdocbookxsl.preremove -9ba4d6409de31404b8022f10630016e0 download/add_makefile.patch +a92b47305b3499396aafda83e4bbfefb download/add_makefile.patch c77c0c317040b2f2e366842bd9df2218 download/docbook-xsl-1.74.3.tar.bz2 2a032a95fbf24367d13acc8210f9cd72 download/docbook-xsl-doc-1.74.3.tar.bz2 Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch 2009-04-13 14:53:03 UTC (rev 4294) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch 2009-04-13 17:58:14 UTC (rev 4295) @@ -1,10 +1,17 @@ ---- /dev/null 2009-04-10 02:03:32.000000000 +0200 -+++ docbook-xsl-1.74.3/Makefile.csw 2009-04-10 04:25:32.872750482 +0200 -@@ -0,0 +1,46 @@ +--- /dev/null 2009-04-13 19:20:44.000000000 +0200 ++++ docbook-xsl-1.74.3/Makefile.csw 2009-04-13 19:24:36.996214871 +0200 +@@ -0,0 +1,43 @@ +DESTDIR ?= ... should be overridden by GAR ... + +SHELL = /opt/csw/bin/bash + ++# directories that don't get installed by the generic install-xsl target ++# note the . (to work around find output) ++SS_EX_DIRS = doc docsrc tools tests . ++# directories that do get installed by install-xsl ++DIRS = $(subst ./,,$(shell gfind . -maxdepth 1 -type d)) ++SS_DIRS = $(foreach D,$(filter-out $(SS_EX_DIRS),$(DIRS)),dir-$(D)) ++ +prefix = $(DESTDIR)/opt/csw +bindir = $(prefix)/bin +datadir = $(prefix)/share @@ -14,33 +21,23 @@ + +all: install + -+install: install-xsl install-img install-misc install-docs ++install: install-xsl install-misc install-docs + -+install-xsl: -+ gmkdir -p $(instdir)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling} -+ cp common/*.dtd $(instdir)/common -+ cp common/*.xml $(instdir)/common -+ cp common/*.xsl $(instdir)/common -+ cp fo/*.xml $(instdir)/fo -+ cp fo/*.xsl $(instdir)/fo -+ cp html/*.xml $(instdir)/html -+ cp html/*.xsl $(instdir)/html -+ cp htmlhelp/*.xsl $(instdir)/htmlhelp -+ cp javahelp/*.xsl $(instdir)/javahelp -+ cp lib/lib.xsl $(instdir)/lib -+ cp template/*.xml $(instdir)/template -+ cp template/*.xsl $(instdir)/template -+ cp xhtml/*.xsl $(instdir)/xhtml -+ cp manpages/*.xsl $(instdir)/manpages -+ cp profiling/*.xsl $(instdir)/profiling ++$(instdir): ++ gmkdir -p $(instdir) + -+install-img: -+ gmkdir -p $(instdir)/images/callouts -+ cp images/*.gif $(instdir)/images -+ cp images/*.png $(instdir)/images -+ cp images/callouts/*.png $(instdir)/images/callouts ++#so we don't get the example bin files, etc. we can always install them ++# 'properly' to csw/bin/ if there is demand. ++dir-epub: $(instdir) ++ gmkdir -p $(instdir)/epub ++ cp epub/*xsl $(instdir)/epub + -+install-misc: ++dir-%: ++ cp -R $*/ $(instdir)/ ++ ++install-xsl: $(instdir) $(SS_DIRS) ++ ++install-misc: $(instdir) + cp VERSION $(instdir) + +install-docs: 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 13 21:29:38 2009 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 13 Apr 2009 19:29:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[4296] csw/mgar/pkg/libtasn1/trunk Message-ID: Revision: 4296 http://gar.svn.sourceforge.net/gar/?rev=4296&view=rev Author: dmichelsen Date: 2009-04-13 19:29:36 +0000 (Mon, 13 Apr 2009) Log Message: ----------- libtasn1: Update to 2.0 Modified Paths: -------------- csw/mgar/pkg/libtasn1/trunk/Makefile csw/mgar/pkg/libtasn1/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libtasn1/trunk/files/CSWlibtasn1.gspec Modified: csw/mgar/pkg/libtasn1/trunk/Makefile =====================