From bdwalton at users.sourceforge.net Wed Jun 1 02:19:34 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 01 Jun 2011 00:19:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[14688] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 14688 http://gar.svn.sourceforge.net/gar/?rev=14688&view=rev Author: bdwalton Date: 2011-06-01 00:19:34 +0000 (Wed, 01 Jun 2011) Log Message: ----------- cswutils/trunk: add an alternative for checkpkg.python, include a symlink to pkgdb Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-05-31 21:43:18 UTC (rev 14687) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-06-01 00:19:34 UTC (rev 14688) @@ -65,8 +65,9 @@ CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/export/medusa|root/opt/csw/lib/python/csw/package_checks_test.py CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/export/medusa|root/opt/csw/lib/python/csw/testdata/rpaths.py -ALTERNATIVES_CSWcswutils = checkpkg -ALTERNATIVE_checkpkg = /opt/csw/bin/checkpkg checkpkg /opt/csw/bin/checkpkg.legacy 5 +ALTERNATIVES_CSWcswutils = legacy python +ALTERNATIVE_legacy = /opt/csw/bin/checkpkg checkpkg /opt/csw/bin/checkpkg.legacy 5 +ALTERNATIVE_python = /opt/csw/bin/checkpkg checkpkg /opt/csw/bin/checkpkg.python 10 include gar/category.mk @@ -90,4 +91,8 @@ $(DESTDIR)$(bindir)/submitpkg @ln -s ../lib/python/csw/csw_upload_pkg.py \ $(DESTDIR)$(bindir)/csw-upload-pkg + @ln -s ../lib/python/csw/checkpkg2.py \ + $(DESTDIR)$(bindir)/checkpkg.python + @ln -s ../lib/python/csw/pkgdb.py \ + $(DESTDIR)$(bindir)/pkgdb @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Jun 1 11:05:10 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 01 Jun 2011 09:05:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14689] csw/mgar/pkg/tnef/trunk Message-ID: Revision: 14689 http://gar.svn.sourceforge.net/gar/?rev=14689&view=rev Author: bonivart Date: 2011-06-01 09:05:10 +0000 (Wed, 01 Jun 2011) Log Message: ----------- tnef/trunk: update to 1.4.8 Modified Paths: -------------- csw/mgar/pkg/tnef/trunk/Makefile csw/mgar/pkg/tnef/trunk/checksums Modified: csw/mgar/pkg/tnef/trunk/Makefile =================================================================== --- csw/mgar/pkg/tnef/trunk/Makefile 2011-06-01 00:19:34 UTC (rev 14688) +++ csw/mgar/pkg/tnef/trunk/Makefile 2011-06-01 09:05:10 UTC (rev 14689) @@ -1,5 +1,5 @@ NAME = tnef -VERSION = 1.4.7 +VERSION = 1.4.8 CATEGORIES = utils DESCRIPTION = Unpacks Microsoft TNEF MIME attachments @@ -10,18 +10,11 @@ endef MASTER_SITES = http://downloads.sourceforge.net/tnef/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.gz -RUNTIME_DEP_PKGS = CSWggettextrt +RUNTIME_DEP_PKGS_CSWtnef += CSWlibintl8 -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=57057 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -#GARCOMPILER=GCC4 CONFIGURE_ARGS = $(DIRPATHS) -#OPT_FLAGS_SOS = -xO2 NOISALIST = 1 Modified: csw/mgar/pkg/tnef/trunk/checksums =================================================================== --- csw/mgar/pkg/tnef/trunk/checksums 2011-06-01 00:19:34 UTC (rev 14688) +++ csw/mgar/pkg/tnef/trunk/checksums 2011-06-01 09:05:10 UTC (rev 14689) @@ -1 +1 @@ -00978a8ad8cc79a1ee605172f882ebe9 tnef-1.4.7.tar.gz +cc6443ac5f30913394c0c16ae7941e4f tnef-1.4.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at opencsw.org Wed Jun 1 12:32:09 2011 From: ellson at opencsw.org (John Ellson) Date: Wed, 01 Jun 2011 06:32:09 -0400 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <4DE51A9E.8060804@opencsw.org> <4DE52A35.6000007@opencsw.org> <4DE5436A.3090008@opencsw.org> Message-ID: <4DE61529.5070406@opencsw.org> Maciej Looks like something got linked to the previously installed libgraph... either dot itself, or possibly libgvc. I couldn't find this install on test9[sx] Is it still around someplace? John On 05/31/2011 05:31 PM, Maciej Blizi?ski wrote: > In the meantime, I installed updated graphviz packages on a test > instance. Here's the end of the terminal session: > > pkgutil -t http://buildfarm.opencsw.org/opencsw/experimental/ellson -y > -i graphvizgd > > Installation of was successful. > > => Installing CSWlibcgraph6-2.28.0,REV=2011.05.31 (4/10) ... > Please see /opt/csw/share/doc/libcgraph6/license for license information. > > Installation of was successful. > > => Installing CSWlibgd2-2.0.36RC1,REV=2011.05.31 (5/10) ... > Please see /opt/csw/share/doc/libgd2/license for license information. > > Installation of was successful. > > => Installing CSWlibcdt5-2.28.0,REV=2011.05.31 (6/10) ... > Please see /opt/csw/share/doc/libcdt5/license for license information. > > Installation of was successful. > > => Installing CSWlibgvpr2-2.28.0,REV=2011.05.31 (7/10) ... > Please see /opt/csw/share/doc/libgvpr2/license for license information. > > Installation of was successful. > > => Installing CSWlibgvc6-2.28.0,REV=2011.05.31 (8/10) ... > Please see /opt/csw/share/doc/libgvc6/license for license information. > > Installation of was successful. > > => Installing CSWgraphviz-2.28.0,REV=2011.05.31 (9/10) ... > Please see /opt/csw/share/doc/graphviz/license for license information. > > dot -c is running now to record available graphviz plugins. > > ld.so.1: dot: fatal: libgraph.so.4: open failed: No such file or directory > Killed > > Installation of was successful. > > => Installing CSWgraphvizgd-2.28.0,REV=2011.05.31 (10/10) ... > Please see /opt/csw/share/doc/graphvizgd/license for license information. > > dot -c is running now to record available graphviz plugins. > > ld.so.1: dot: fatal: libgraph.so.4: open failed: No such file or directory > Killed > > Installation of was successful. > > vsol05 ~ # dot -h > ld.so.1: dot: fatal: libgraph.so.4: open failed: No such file or directory > Killed > > > vsol05 ~ # ldd /opt/csw/bin/dot > libgvc.so.6 => /opt/csw/lib/i386/libgvc.so.6 > libxdot.so.4 => /opt/csw/lib/i386/libxdot.so.4 > libgraph.so.5 => /opt/csw/lib/i386/libgraph.so.5 > libcdt.so.5 => /opt/csw/lib/i386/libcdt.so.5 > libpathplan.so.4 => /opt/csw/lib/i386/libpathplan.so.4 > libexpat.so.1 => /opt/csw/lib/i386/libexpat.so.1 > libsocket.so.1 => /lib/libsocket.so.1 > libnsl.so.1 => /lib/libnsl.so.1 > libz.so.1 => /opt/csw/lib/pentium_pro+mmx/libz.so.1 > libm.so.1 => /lib/libm.so.1 > libltdl.so.7 => /opt/csw/lib/i386/libltdl.so.7 > libdl.so.1 => /lib/libdl.so.1 > libc.so.1 => /lib/libc.so.1 > libgraph.so.4 => (file not found) > libgcc_s.so.1 => /opt/csw/gcc4/lib/libgcc_s.so.1 > libcdt.so.4 => (file not found) > libmp.so.2 => /lib/libmp.so.2 > libmd.so.1 => /lib/libmd.so.1 > libscf.so.1 => /lib/libscf.so.1 > libdoor.so.1 => /lib/libdoor.so.1 > libuutil.so.1 => /lib/libuutil.so.1 > libgen.so.1 => /lib/libgen.so.1 > libm.so.2 => /lib/libm.so.2 > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel > From aigoshin at users.sourceforge.net Wed Jun 1 13:01:45 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Wed, 01 Jun 2011 11:01:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[14690] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 14690 http://gar.svn.sourceforge.net/gar/?rev=14690&view=rev Author: aigoshin Date: 2011-06-01 11:01:44 +0000 (Wed, 01 Jun 2011) Log Message: ----------- nginx: release 20110601 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-06-01 09:05:10 UTC (rev 14689) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-06-01 11:01:44 UTC (rev 14690) @@ -1,5 +1,5 @@ NAME = nginx -VERSION = 1.0.3 +VERSION = 1.0.4 CATEGORIES = server GARCOMPILER = SOS11 Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2011-06-01 09:05:10 UTC (rev 14689) +++ csw/mgar/pkg/nginx/trunk/checksums 2011-06-01 11:01:44 UTC (rev 14690) @@ -1 +1 @@ -eebf1e9c7e86f923923b828ae0156103 nginx-1.0.3.tar.gz +d23f6e6b07b57ac061e790b1ed64bb98 nginx-1.0.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at opencsw.org Wed Jun 1 13:29:38 2011 From: ellson at opencsw.org (John Ellson) Date: Wed, 01 Jun 2011 07:29:38 -0400 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <4DE61529.5070406@opencsw.org> References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <4DE51A9E.8060804@opencsw.org> <4DE52A35.6000007@opencsw.org> <4DE5436A.3090008@opencsw.org> <4DE61529.5070406@opencsw.org> Message-ID: <4DE622A2.4030203@opencsw.org> I need help from a libtool expert. Gar was trying to warn me... CHECKPKG_OVERRIDES_CSWlibgraph5 += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/libgraph.so.5.0.0 Apparently libtool is creating some lib*T files that are wrongly linked. ellson at current9x:.libs> pwd /home/ellson/mgar/pkg/graphviz/trunk/work/solaris9-i386/build-isa-i386/graphviz-2.28.0/lib/graph/.libs ellson at current9x:.libs> ls agxbuf.o graph.o libgraph.a libgraph.so libgraph.so.5.0.0T node.o trie.o attribs.o graphio.o libgraph.la libgraph.so.5 libgraph_C.a parser.o edge.o lexer.o libgraph.lai libgraph.so.5.0.0 libgraph_C.la refstr.o ellson at current9x:.libs> ldd libgraph.so.5.0.0T libcdt.so.4 => /opt/csw/lib/i386/libcdt.so.4 libm.so.1 => /usr/lib/libm.so.1 libltdl.so.7 => /opt/csw/lib/i386/libltdl.so.7 libdl.so.1 => /usr/lib/libdl.so.1 libc.so.1 => /usr/lib/libc.so.1 libgcc_s.so.1 => /opt/csw/gcc4/lib/libgcc_s.so.1 The library without the 'T' in the build tree looks correct. ellson at current9x:.libs> ldd libgraph.so.5.0.0 libcdt.so.5 => /home/ellson/mgar/pkg/graphviz/trunk/work/solaris9-i386/build-isa-i386/graphviz-2.28.0/lib/cdt/.libs/libcdt.so.5 libm.so.1 => /usr/lib/libm.so.1 libltdl.so.7 => /opt/csw/lib/i386/libltdl.so.7 libdl.so.1 => /usr/lib/libdl.so.1 libc.so.1 => /usr/lib/libc.so.1 libgcc_s.so.1 => /opt/csw/gcc4/lib/libgcc_s.so.1 I don't understand whats going on. Why are these lib*T files getting installed? These lib*T files are not created on Fedora. John On 06/01/2011 06:32 AM, John Ellson wrote: > Maciej > > Looks like something got linked to the previously installed > libgraph... either dot itself, or possibly libgvc. > > I couldn't find this install on test9[sx] Is it still around someplace? > > John > > > On 05/31/2011 05:31 PM, Maciej Blizi?ski wrote: >> In the meantime, I installed updated graphviz packages on a test >> instance. Here's the end of the terminal session: >> >> pkgutil -t http://buildfarm.opencsw.org/opencsw/experimental/ellson -y >> -i graphvizgd >> >> Installation of was successful. >> >> => Installing CSWlibcgraph6-2.28.0,REV=2011.05.31 (4/10) ... >> Please see /opt/csw/share/doc/libcgraph6/license for license >> information. >> >> Installation of was successful. >> >> => Installing CSWlibgd2-2.0.36RC1,REV=2011.05.31 (5/10) ... >> Please see /opt/csw/share/doc/libgd2/license for license information. >> >> Installation of was successful. >> >> => Installing CSWlibcdt5-2.28.0,REV=2011.05.31 (6/10) ... >> Please see /opt/csw/share/doc/libcdt5/license for license information. >> >> Installation of was successful. >> >> => Installing CSWlibgvpr2-2.28.0,REV=2011.05.31 (7/10) ... >> Please see /opt/csw/share/doc/libgvpr2/license for license information. >> >> Installation of was successful. >> >> => Installing CSWlibgvc6-2.28.0,REV=2011.05.31 (8/10) ... >> Please see /opt/csw/share/doc/libgvc6/license for license information. >> >> Installation of was successful. >> >> => Installing CSWgraphviz-2.28.0,REV=2011.05.31 (9/10) ... >> Please see /opt/csw/share/doc/graphviz/license for license information. >> >> dot -c is running now to record available graphviz plugins. >> >> ld.so.1: dot: fatal: libgraph.so.4: open failed: No such file or >> directory >> Killed >> >> Installation of was successful. >> >> => Installing CSWgraphvizgd-2.28.0,REV=2011.05.31 (10/10) ... >> Please see /opt/csw/share/doc/graphvizgd/license for license >> information. >> >> dot -c is running now to record available graphviz plugins. >> >> ld.so.1: dot: fatal: libgraph.so.4: open failed: No such file or >> directory >> Killed >> >> Installation of was successful. >> >> vsol05 ~ # dot -h >> ld.so.1: dot: fatal: libgraph.so.4: open failed: No such file or >> directory >> Killed >> >> >> vsol05 ~ # ldd /opt/csw/bin/dot >> libgvc.so.6 => /opt/csw/lib/i386/libgvc.so.6 >> libxdot.so.4 => /opt/csw/lib/i386/libxdot.so.4 >> libgraph.so.5 => /opt/csw/lib/i386/libgraph.so.5 >> libcdt.so.5 => /opt/csw/lib/i386/libcdt.so.5 >> libpathplan.so.4 => /opt/csw/lib/i386/libpathplan.so.4 >> libexpat.so.1 => /opt/csw/lib/i386/libexpat.so.1 >> libsocket.so.1 => /lib/libsocket.so.1 >> libnsl.so.1 => /lib/libnsl.so.1 >> libz.so.1 => /opt/csw/lib/pentium_pro+mmx/libz.so.1 >> libm.so.1 => /lib/libm.so.1 >> libltdl.so.7 => /opt/csw/lib/i386/libltdl.so.7 >> libdl.so.1 => /lib/libdl.so.1 >> libc.so.1 => /lib/libc.so.1 >> libgraph.so.4 => (file not found) >> libgcc_s.so.1 => /opt/csw/gcc4/lib/libgcc_s.so.1 >> libcdt.so.4 => (file not found) >> libmp.so.2 => /lib/libmp.so.2 >> libmd.so.1 => /lib/libmd.so.1 >> libscf.so.1 => /lib/libscf.so.1 >> libdoor.so.1 => /lib/libdoor.so.1 >> libuutil.so.1 => /lib/libuutil.so.1 >> libgen.so.1 => /lib/libgen.so.1 >> libm.so.2 => /lib/libm.so.2 >> _______________________________________________ >> devel mailing list >> devel at lists.opencsw.org >> https://lists.opencsw.org/mailman/listinfo/devel >> > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel From maciej at opencsw.org Wed Jun 1 13:28:02 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Wed, 1 Jun 2011 12:28:02 +0100 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <4DE61529.5070406@opencsw.org> References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <4DE51A9E.8060804@opencsw.org> <4DE52A35.6000007@opencsw.org> <4DE5436A.3090008@opencsw.org> <4DE61529.5070406@opencsw.org> Message-ID: 2011/6/1 John Ellson : > Looks like something got linked to the previously installed libgraph... > either dot itself, or possibly libgvc. > > I couldn't find this install on test9[sx] Is it still around someplace? The sudoers file on test9s is broken, I've sent a request to buildfarm@ to fix it, but no response so far. By the way, why don't you run Solaris 10 in Virtualbox? It's very easy to use and you get a Solaris instance that you have total control of. All you need is a couple of gigabytes of disk space and maybe half a gig of RAM on your workstation or laptop. Maciej From ellson at opencsw.org Wed Jun 1 13:38:21 2011 From: ellson at opencsw.org (John Ellson) Date: Wed, 01 Jun 2011 07:38:21 -0400 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <4DE51A9E.8060804@opencsw.org> <4DE52A35.6000007@opencsw.org> <4DE5436A.3090008@opencsw.org> <4DE61529.5070406@opencsw.org> Message-ID: <4DE624AD.8040209@opencsw.org> On 06/01/2011 07:28 AM, Maciej Blizi?ski wrote: > > By the way, why don't you run Solaris 10 in Virtualbox? It's very > easy to use and you get a Solaris instance that you have total control > of. All you need is a couple of gigabytes of disk space and maybe > half a gig of RAM on your workstation or laptop. I have kvm on my home machine running multiple build hosts (fedora and centos so far). Is there a solaris image that I can use on that? URL? From maciej at opencsw.org Wed Jun 1 13:48:46 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Wed, 1 Jun 2011 12:48:46 +0100 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <4DE624AD.8040209@opencsw.org> References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <4DE51A9E.8060804@opencsw.org> <4DE52A35.6000007@opencsw.org> <4DE5436A.3090008@opencsw.org> <4DE61529.5070406@opencsw.org> <4DE624AD.8040209@opencsw.org> Message-ID: 2011/6/1 John Ellson : > On 06/01/2011 07:28 AM, Maciej Blizi?ski wrote: >> >> By the way, why don't you run Solaris 10 in Virtualbox? ?It's very >> easy to use and you get a Solaris instance that you have total control >> of. ?All you need is a couple of gigabytes of disk space and maybe >> half a gig of RAM on your workstation or laptop. > > I have kvm on my home machine running multiple build hosts (fedora and > centos so far). Is there a solaris image that I can use on that? URL? I'm unaware of a ready image. I suppose that you could boot from a DVD as downloaded from Oracle and boot the installer from it. The kvm website mentions successes with Solaris, but usually a bit of tweaking is necessary. http://www.linux-kvm.org/page/Guest_Support_Status#UNIX_Family:_Solaris.2FOpenSolaris The last time I tried Solaris on kvm, it didn't work, so don't expect the flawless installation experience you get on VirtualBox. Maciej From bonivart at opencsw.org Wed Jun 1 14:00:09 2011 From: bonivart at opencsw.org (Peter Bonivart) Date: Wed, 1 Jun 2011 14:00:09 +0200 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <4DE624AD.8040209@opencsw.org> References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <4DE51A9E.8060804@opencsw.org> <4DE52A35.6000007@opencsw.org> <4DE5436A.3090008@opencsw.org> <4DE61529.5070406@opencsw.org> <4DE624AD.8040209@opencsw.org> Message-ID: On Wed, Jun 1, 2011 at 1:38 PM, John Ellson wrote: > On 06/01/2011 07:28 AM, Maciej Blizi?ski wrote: >> >> By the way, why don't you run Solaris 10 in Virtualbox? ?It's very >> easy to use and you get a Solaris instance that you have total control >> of. ?All you need is a couple of gigabytes of disk space and maybe >> half a gig of RAM on your workstation or laptop. > > I have kvm on my home machine running multiple build hosts (fedora and > centos so far). Is there a solaris image that I can use on that? URL? I don't know about an image either but here's the download page from Oracle: http://www.oracle.com/technetwork/server-storage/solaris/downloads/index.html. It's only an hour to install tops. /peter From dmichelsen at users.sourceforge.net Wed Jun 1 14:47:35 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 01 Jun 2011 12:47:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14691] csw/mgar/pkg/rsync/trunk Message-ID: Revision: 14691 http://gar.svn.sourceforge.net/gar/?rev=14691&view=rev Author: dmichelsen Date: 2011-06-01 12:47:35 +0000 (Wed, 01 Jun 2011) Log Message: ----------- rsync: Update to 3.0.8, relocate rsyncd.conf to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/rsync/trunk/Makefile csw/mgar/pkg/rsync/trunk/checksums Modified: csw/mgar/pkg/rsync/trunk/Makefile =================================================================== --- csw/mgar/pkg/rsync/trunk/Makefile 2011-06-01 11:01:44 UTC (rev 14690) +++ csw/mgar/pkg/rsync/trunk/Makefile 2011-06-01 12:47:35 UTC (rev 14691) @@ -3,20 +3,41 @@ # $Id$ NAME = rsync -VERSION = 3.0.7 +VERSION = 3.0.8 CATEGORIES = utils -DESCRIPTION = utility which provides fast incremental file transfer + +DESCRIPTION = Utility which provides fast incremental file transfer + define BLURB rsync is an open source utility that provides fast incremental file transfer. rsync is freely available under the GNU General Public License and is currently being maintained by Wayne Davison. endef -SPKG_SOURCEURL = http://rsync.samba.org/ -MASTER_SITES = http://samba.anu.edu.au/ftp/rsync/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) -BUILD64 = 1 + +MASTER_SITES = http://samba.anu.edu.au/ftp/rsync/ +DISTFILES = $(DISTNAME).tar.gz + +VENDOR_URL = http://rsync.samba.org/ + RUNTIME_DEP_PKGS_CSWrsync = CSWiconv RUNTIME_DEP_PKGS_CSWrsync += CSWlibpopt + +BUILD64 = 1 +ISAEXEC = 1 + +# The location of rsyncd.conf to OpenCSW standard has been done in 3.0.8 +MIGRATE_FILES = rsyncd.conf +MIGRATE_SOURCE_DIR = /etc + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --with-rsyncd-conf=$(sysconfdir)/rsyncd.conf + include gar/category.mk + +post-install-modulated: + perl -pi \ + -e 's,/etc/rsyncd\.conf,$(sysconfdir)/rsyncd.conf,g;' \ + $(DESTDIR)$(mandir)/man5/rsyncd.conf.5 + perl -pi \ + -e 's,/usr/local,$(prefix),g;' \ + $(DESTDIR)$(mandir)/man1/rsync.1 Modified: csw/mgar/pkg/rsync/trunk/checksums =================================================================== --- csw/mgar/pkg/rsync/trunk/checksums 2011-06-01 11:01:44 UTC (rev 14690) +++ csw/mgar/pkg/rsync/trunk/checksums 2011-06-01 12:47:35 UTC (rev 14691) @@ -1 +1 @@ -b53525900817cf1ba7ad3a516ab5bfe9 rsync-3.0.7.tar.gz +0ee8346ce16bdfe4c88a236e94c752b4 rsync-3.0.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Wed Jun 1 14:48:57 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Wed, 01 Jun 2011 12:48:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14692] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: Revision: 14692 http://gar.svn.sourceforge.net/gar/?rev=14692&view=rev Author: ellson Date: 2011-06-01 12:48:57 +0000 (Wed, 01 Jun 2011) Log Message: ----------- graphviz: the 'soname-not-found' warnings indicate a real problem - don't override Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-06-01 12:47:35 UTC (rev 14691) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-06-01 12:48:57 UTC (rev 14692) @@ -416,44 +416,11 @@ # /usr/local references from the docs are allright CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content -# these dependencies are all provided by this set of packages ! -CHECKPKG_OVERRIDES_CSWlibgvc6 += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/libgvc.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphvizgd += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gd.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so -CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so -CHECKPKG_OVERRIDES_CSWgraphvizguile += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/guile/libgv_guile.so -CHECKPKG_OVERRIDES_CSWlibgvpr2 += soname-not-found|libcgraph.so.5|is|needed|by|opt/csw/lib/libgvpr.so.2.0.0 -CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so -CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so -CHECKPKG_OVERRIDES_CSWgraphvizsharp += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/sharp/libgv_sharp.so -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_neato_layout.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_pango.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_core.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gs.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_rsvg.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_dot_layout.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/libgvplugin_lasi.so.6.0.0 -CHECKPKG_OVERRIDES_CSWgraphviz += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/libgvplugin_gdk_pixbuf.so.6.0.0 -CHECKPKG_OVERRIDES_CSWlibgraph5 += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/libgraph.so.5.0.0 -CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so -CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so -CHECKPKG_OVERRIDES_CSWgraphvizperl += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/perl/libgv_perl.so -CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so -CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so -CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/tcl/libtcldot.so.0.0.0 -CHECKPKG_OVERRIDES_CSWgraphviztcl += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/tcl/libgv_tcl.so -CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libgvc.so.5|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so -CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libgraph.so.4|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so -CHECKPKG_OVERRIDES_CSWgraphvizpython += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/graphviz/python/libgv_python.so -CHECKPKG_OVERRIDES_CSWlibcgraph6 += soname-not-found|libcdt.so.4|is|needed|by|opt/csw/lib/libcgraph.so.6.0.0 - #FIXME - sometime - demo code CHECKPKG_OVERRIDES_CSWgraphvizgraphs += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/graphs/directed/pmpipe.gv CHECKPKG_OVERRIDES_CSWgraphvizperl += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/demo/modgraph.pl -#FIXME - sometime - non-critical feature for now +#FIXME - maybe - poss false alarm? - can't find any "/usr/local" in sources CHECKPKG_OVERRIDES_CSWlibgvpr2 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgvpr.so.2.0.0 CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/gvpr_static This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at opencsw.org Wed Jun 1 15:01:35 2011 From: ellson at opencsw.org (John Ellson) Date: Wed, 01 Jun 2011 09:01:35 -0400 Subject: [csw-devel] graphviz: problem analysis and buildfarm request. Message-ID: <4DE6382F.3090305@opencsw.org> Request first: Would it be possible to uninstall all earlier versions of the graphviz packages on the buildhosts, perhaps just for a few days while I build the graphviz-2.28.0 packages? Problem analysis. The most recent attempt to package graphviz-2.28.0 failed because of a libtool problem. During "make install", libtool relinks libraries against the final installation location. But the dependent libraries from the graphviz packages haven't yet been installed yet, so libtool picks up the old libraries incorrectly. In fact the libtool manual states: "Currently it is not generally possible to install into a temporary staging area that contains needed third-party libraries which are not yet visible at their final location." and yet, the earlier release built ok, so my working theory is that it won't add incorrect libraries during the relink if they don't exist at all. John From maciej at opencsw.org Wed Jun 1 16:05:36 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Wed, 1 Jun 2011 15:05:36 +0100 Subject: [csw-devel] SF.net SVN: gar:[14691] csw/mgar/pkg/rsync/trunk In-Reply-To: References: Message-ID: As far as I can tell, version 3.0.7 of rsync did not ship any configuration file. From maciej at opencsw.org Wed Jun 1 16:07:36 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Wed, 1 Jun 2011 15:07:36 +0100 Subject: [csw-devel] graphviz: problem analysis and buildfarm request. In-Reply-To: <4DE6382F.3090305@opencsw.org> References: <4DE6382F.3090305@opencsw.org> Message-ID: Hi John, For best results, send your buildfarm request to buildfarm@, and your libtool question to maintainers@ (will reach a wider audience of package maintainers). Maciej From dam at opencsw.org Wed Jun 1 20:48:41 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Wed, 1 Jun 2011 20:48:41 +0200 Subject: [csw-devel] SF.net SVN: gar:[14691] csw/mgar/pkg/rsync/trunk In-Reply-To: References: Message-ID: Hi Maciej, Am 01.06.2011 um 16:05 schrieb Maciej Blizi?ski : > As far as I can tell, version 3.0.7 of rsync did not ship any > configuration file. It did not, but looked in /etc instead of /etc/opt/csw by default Best regards -- Dago > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel From dmichelsen at users.sourceforge.net Wed Jun 1 22:56:53 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 01 Jun 2011 20:56:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[14693] csw/mgar/pkg/xmlstarlet/trunk Message-ID: Revision: 14693 http://gar.svn.sourceforge.net/gar/?rev=14693&view=rev Author: dmichelsen Date: 2011-06-01 20:56:53 +0000 (Wed, 01 Jun 2011) Log Message: ----------- xmlstarlet: Update to 1.2.0 Modified Paths: -------------- csw/mgar/pkg/xmlstarlet/trunk/Makefile csw/mgar/pkg/xmlstarlet/trunk/checksums Modified: csw/mgar/pkg/xmlstarlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/Makefile 2011-06-01 12:48:57 UTC (rev 14692) +++ csw/mgar/pkg/xmlstarlet/trunk/Makefile 2011-06-01 20:56:53 UTC (rev 14693) @@ -1,5 +1,5 @@ NAME = xmlstarlet -VERSION = 1.1.0 +VERSION = 1.2.0 CATEGORIES = utils DESCRIPTION = XML transformation utility Modified: csw/mgar/pkg/xmlstarlet/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/checksums 2011-06-01 12:48:57 UTC (rev 14692) +++ csw/mgar/pkg/xmlstarlet/trunk/checksums 2011-06-01 20:56:53 UTC (rev 14693) @@ -1 +1 @@ -1b864b16c1dc78ce87ffc8528f021ab0 xmlstarlet-1.1.0.tar.gz +53541d8b1222b722a9292703d61f924b xmlstarlet-1.2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at opencsw.org Wed Jun 1 23:22:44 2011 From: ellson at opencsw.org (John Ellson) Date: Wed, 01 Jun 2011 17:22:44 -0400 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <4DE51A9E.8060804@opencsw.org> <4DE52A35.6000007@opencsw.org> <4DE5436A.3090008@opencsw.org> <4DE61529.5070406@opencsw.org> <4DE624AD.8040209@opencsw.org> Message-ID: <4DE6ADA4.3030301@opencsw.org> Peter, Maciej, Cool, thanks. It took a lot more than an hour to load - slow disks, I suspect. I was planning to upgrade to SSDs so didn't bother with RAID when I built this system. So now I have Solaris-10 running on KVM on a Fedora-15 host. The downloaded .zip unpacked to an .iso which can be installed directly onto the vhost from the host's filesystem. No messing with physical DVDs or USB sticks. So now, can you tell me what is the magic "pkg-get" command for me to load my graphviz-2.28 experimental packages from csw.org ? John On 06/01/2011 08:00 AM, Peter Bonivart wrote: > On Wed, Jun 1, 2011 at 1:38 PM, John Ellson wrote: >> On 06/01/2011 07:28 AM, Maciej Blizi?ski wrote: >>> By the way, why don't you run Solaris 10 in Virtualbox? It's very >>> easy to use and you get a Solaris instance that you have total control >>> of. All you need is a couple of gigabytes of disk space and maybe >>> half a gig of RAM on your workstation or laptop. >> I have kvm on my home machine running multiple build hosts (fedora and >> centos so far). Is there a solaris image that I can use on that? URL? > I don't know about an image either but here's the download page from > Oracle: http://www.oracle.com/technetwork/server-storage/solaris/downloads/index.html. > It's only an hour to install tops. > > /peter > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel From maciej at opencsw.org Wed Jun 1 23:30:36 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Wed, 1 Jun 2011 22:30:36 +0100 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <4DE6ADA4.3030301@opencsw.org> References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <4DE51A9E.8060804@opencsw.org> <4DE52A35.6000007@opencsw.org> <4DE5436A.3090008@opencsw.org> <4DE61529.5070406@opencsw.org> <4DE624AD.8040209@opencsw.org> <4DE6ADA4.3030301@opencsw.org> Message-ID: 2011/6/1 John Ellson : > So now I have Solaris-10 running on KVM on a Fedora-15 host. Cool! > So now, can you tell me what is the magic "pkg-get" command for me to > load my graphviz-2.28 experimental packages from csw.org ? Visit http://buildfarm.opencsw.org/experimental.html - then look for your user name, the command is printed in the header section of your experimental catalog. Maciej From bonivart at opencsw.org Wed Jun 1 23:47:18 2011 From: bonivart at opencsw.org (Peter Bonivart) Date: Wed, 1 Jun 2011 23:47:18 +0200 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <4DE6ADA4.3030301@opencsw.org> References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <4DE51A9E.8060804@opencsw.org> <4DE52A35.6000007@opencsw.org> <4DE5436A.3090008@opencsw.org> <4DE61529.5070406@opencsw.org> <4DE624AD.8040209@opencsw.org> <4DE6ADA4.3030301@opencsw.org> Message-ID: On Wed, Jun 1, 2011 at 11:22 PM, John Ellson wrote: > So now, can you tell me what is the magic "pkg-get" command for me to > load my graphviz-2.28 experimental packages from csw.org ? Sorry, no magic available when using pkg-get, however this should do it: # pkgutil -t http://buildfarm.opencsw.org/opencsw/experimental/ellson -i /peter From bdwalton at users.sourceforge.net Thu Jun 2 03:05:23 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 02 Jun 2011 01:05:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14694] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 14694 http://gar.svn.sourceforge.net/gar/?rev=14694&view=rev Author: bdwalton Date: 2011-06-02 01:05:23 +0000 (Thu, 02 Jun 2011) Log Message: ----------- cswutils/trunk: version bump for checkpkg changes Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-06-01 20:56:53 UTC (rev 14693) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-06-02 01:05:23 UTC (rev 14694) @@ -1,7 +1,7 @@ # $Id$ NAME = cswutils -VERSION = 1.19 +VERSION = 1.20 CATEGORIES = utils DESCRIPTION = Utilities for CSW maintainers This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Jun 2 14:43:33 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 02 Jun 2011 12:43:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14695] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 14695 http://gar.svn.sourceforge.net/gar/?rev=14695&view=rev Author: rthurner Date: 2011-06-02 12:43:33 +0000 (Thu, 02 Jun 2011) Log Message: ----------- mercurial: upgrade to hg-1.8.4 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2011-06-02 01:05:23 UTC (rev 14694) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2011-06-02 12:43:33 UTC (rev 14695) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 1.8.3 +VERSION = 1.8.4 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2011-06-02 01:05:23 UTC (rev 14694) +++ csw/mgar/pkg/mercurial/trunk/checksums 2011-06-02 12:43:33 UTC (rev 14695) @@ -1 +1 @@ -7afea936dfdb21220064cac6402f8743 mercurial-1.8.3.tar.gz +b3dcc3de473e003dd1cc0500dcd9de47 mercurial-1.8.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Jun 2 20:46:34 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 02 Jun 2011 18:46:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[14696] csw/mgar/pkg/swig/trunk Message-ID: Revision: 14696 http://gar.svn.sourceforge.net/gar/?rev=14696&view=rev Author: rthurner Date: 2011-06-02 18:46:34 +0000 (Thu, 02 Jun 2011) Log Message: ----------- swig: update to 2.0.4, as svn's python bindings fail to compile, swig might be repsonsible? Modified Paths: -------------- csw/mgar/pkg/swig/trunk/Makefile csw/mgar/pkg/swig/trunk/checksums Modified: csw/mgar/pkg/swig/trunk/Makefile =================================================================== --- csw/mgar/pkg/swig/trunk/Makefile 2011-06-02 12:43:33 UTC (rev 14695) +++ csw/mgar/pkg/swig/trunk/Makefile 2011-06-02 18:46:34 UTC (rev 14696) @@ -1,7 +1,7 @@ # $Id$ NAME = swig -VERSION = 2.0.3 +VERSION = 2.0.4 CATEGORIES = devel DESCRIPTION = A scripting interface generator for C/C++ code. Modified: csw/mgar/pkg/swig/trunk/checksums =================================================================== --- csw/mgar/pkg/swig/trunk/checksums 2011-06-02 12:43:33 UTC (rev 14695) +++ csw/mgar/pkg/swig/trunk/checksums 2011-06-02 18:46:34 UTC (rev 14696) @@ -1 +1 @@ -e548ea3882b994c4907d6be86bef90f2 swig-2.0.3.tar.gz +4319c503ee3a13d2a53be9d828c3adc0 swig-2.0.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Thu Jun 2 20:49:36 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Thu, 02 Jun 2011 18:49:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14697] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: Revision: 14697 http://gar.svn.sourceforge.net/gar/?rev=14697&view=rev Author: ellson Date: 2011-06-02 18:49:36 +0000 (Thu, 02 Jun 2011) Log Message: ----------- graphviz: override missing-dependencys provided by this package set Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-06-02 18:46:34 UTC (rev 14696) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-06-02 18:49:36 UTC (rev 14697) @@ -424,6 +424,27 @@ CHECKPKG_OVERRIDES_CSWlibgvpr2 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgvpr.so.2.0.0 CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/gvpr_static +# These are provide by *this* package set, so this a reasonable. +# NB - must unistall anl older CSWgraphvizdevel for this +# +CHECKPKG_OVERRIDES_CSWgraphvizperl += missing-dependency|CSWlibcdt5 +CHECKPKG_OVERRIDES_CSWgraphvizperl += missing-dependency|CSWlibgvc6 +CHECKPKG_OVERRIDES_CSWgraphvizperl += missing-dependency|CSWlibgraph5 +CHECKPKG_OVERRIDES_CSWlibgraph5 += missing-dependency|CSWlibcdt5 +CHECKPKG_OVERRIDES_CSWgraphvizsharp += missing-dependency|CSWlibcdt5 +CHECKPKG_OVERRIDES_CSWgraphvizsharp += missing-dependency|CSWlibgvc6 +CHECKPKG_OVERRIDES_CSWgraphvizsharp += missing-dependency|CSWlibgraph5 +CHECKPKG_OVERRIDES_CSWlibgvc6 += missing-dependency|CSWlibgraph5 +CHECKPKG_OVERRIDES_CSWlibcgraph6 += missing-dependency|CSWlibcdt5 +CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibgvc6 +CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibgvc6 +CHECKPKG_OVERRIDES_CSWgraphvizguile += missing-dependency|CSWlibcdt5 +CHECKPKG_OVERRIDES_CSWgraphvizguile += missing-dependency|CSWlibgvc6 +CHECKPKG_OVERRIDES_CSWgraphvizguile += missing-dependency|CSWlibgraph5 +CHECKPKG_OVERRIDES_CSWlibgvpr2 += missing-dependency|CSWlibcgraph6 +CHECKPKG_OVERRIDES_CSWgraphvizpython += missing-dependency|CSWlibcdt5 +CHECKPKG_OVERRIDES_CSWgraphvizpython += missing-dependency|CSWlibgvc6 +CHECKPKG_OVERRIDES_CSWgraphvizpython += missing-dependency|CSWlibgraph5 include gar/category.mk post-merge: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Jun 2 22:27:58 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 02 Jun 2011 20:27:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[14698] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 14698 http://gar.svn.sourceforge.net/gar/?rev=14698&view=rev Author: rthurner Date: 2011-06-02 20:27:58 +0000 (Thu, 02 Jun 2011) Log Message: ----------- svn: remove fixme.sh as nobody seems to remember what it actually does Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/subversion/trunk/files/fixme.sh Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-06-02 18:49:36 UTC (rev 14697) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-06-02 20:27:58 UTC (rev 14698) @@ -168,7 +168,6 @@ DISTFILES += CSWsvn.checkinstall DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW -DISTFILES += fixme.sh # Fix: Add java headers for nested classes # https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html @@ -249,8 +248,6 @@ # are then used in the "svn-ruby" target. # See http://lists.opencsw.org/pipermail/maintainers/2009-May/002325.html post-configure-modulated: - @echo "~~~ Fixing Libtool ~~~" - $(DOWNLOADDIR)/fixme.sh $(WORKSRC) @echo "~~~ Creating GCC Makefile and libtool for ruby ~~~" gcp $(WORKSRC)/Makefile $(WORKSRC)/Makefile.gcc Deleted: csw/mgar/pkg/subversion/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/subversion/trunk/files/fixme.sh 2011-06-02 18:49:36 UTC (rev 14697) +++ csw/mgar/pkg/subversion/trunk/files/fixme.sh 2011-06-02 20:27:58 UTC (rev 14698) @@ -1,49 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} -done - -LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print) -if [ -f ${LTMAIN} ]; then - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} -fi - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Thu Jun 2 23:31:22 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 2 Jun 2011 23:31:22 +0200 Subject: [csw-devel] Errors from: csw-upload-pkg newpkgs/gd-2.0.36RC1/* In-Reply-To: <4DE61529.5070406@opencsw.org> References: <4DE4E8B3.7070404@opencsw.org> <4DE4F204.1020206@opencsw.org> <4DE51A9E.8060804@opencsw.org> <4DE52A35.6000007@opencsw.org> <4DE5436A.3090008@opencsw.org> <4DE61529.5070406@opencsw.org> Message-ID: <5C11E24E-9C74-4AE2-B3B4-698FF876AAE1@opencsw.org> Hi John, Am 01.06.2011 um 12:32 schrieb John Ellson: > Maciej > > Looks like something got linked to the previously installed libgraph... either dot itself, or possibly libgvc. This may be due to LD_OPTIONS, see http://wiki.opencsw.org/porting-faq#toc8 You can try that with the installed library and then fallback to deinstall afterwards. Best regards -- Dago > > I couldn't find this install on test9[sx] Is it still around someplace? > > John > > > On 05/31/2011 05:31 PM, Maciej Blizi?ski wrote: >> In the meantime, I installed updated graphviz packages on a test >> instance. Here's the end of the terminal session: >> >> pkgutil -t http://buildfarm.opencsw.org/opencsw/experimental/ellson -y >> -i graphvizgd >> >> Installation of was successful. >> >> => Installing CSWlibcgraph6-2.28.0,REV=2011.05.31 (4/10) ... >> Please see /opt/csw/share/doc/libcgraph6/license for license information. >> >> Installation of was successful. >> >> => Installing CSWlibgd2-2.0.36RC1,REV=2011.05.31 (5/10) ... >> Please see /opt/csw/share/doc/libgd2/license for license information. >> >> Installation of was successful. >> >> => Installing CSWlibcdt5-2.28.0,REV=2011.05.31 (6/10) ... >> Please see /opt/csw/share/doc/libcdt5/license for license information. >> >> Installation of was successful. >> >> => Installing CSWlibgvpr2-2.28.0,REV=2011.05.31 (7/10) ... >> Please see /opt/csw/share/doc/libgvpr2/license for license information. >> >> Installation of was successful. >> >> => Installing CSWlibgvc6-2.28.0,REV=2011.05.31 (8/10) ... >> Please see /opt/csw/share/doc/libgvc6/license for license information. >> >> Installation of was successful. >> >> => Installing CSWgraphviz-2.28.0,REV=2011.05.31 (9/10) ... >> Please see /opt/csw/share/doc/graphviz/license for license information. >> >> dot -c is running now to record available graphviz plugins. >> >> ld.so.1: dot: fatal: libgraph.so.4: open failed: No such file or directory >> Killed >> >> Installation of was successful. >> >> => Installing CSWgraphvizgd-2.28.0,REV=2011.05.31 (10/10) ... >> Please see /opt/csw/share/doc/graphvizgd/license for license information. >> >> dot -c is running now to record available graphviz plugins. >> >> ld.so.1: dot: fatal: libgraph.so.4: open failed: No such file or directory >> Killed >> >> Installation of was successful. >> >> vsol05 ~ # dot -h >> ld.so.1: dot: fatal: libgraph.so.4: open failed: No such file or directory >> Killed >> >> >> vsol05 ~ # ldd /opt/csw/bin/dot >> libgvc.so.6 => /opt/csw/lib/i386/libgvc.so.6 >> libxdot.so.4 => /opt/csw/lib/i386/libxdot.so.4 >> libgraph.so.5 => /opt/csw/lib/i386/libgraph.so.5 >> libcdt.so.5 => /opt/csw/lib/i386/libcdt.so.5 >> libpathplan.so.4 => /opt/csw/lib/i386/libpathplan.so.4 >> libexpat.so.1 => /opt/csw/lib/i386/libexpat.so.1 >> libsocket.so.1 => /lib/libsocket.so.1 >> libnsl.so.1 => /lib/libnsl.so.1 >> libz.so.1 => /opt/csw/lib/pentium_pro+mmx/libz.so.1 >> libm.so.1 => /lib/libm.so.1 >> libltdl.so.7 => /opt/csw/lib/i386/libltdl.so.7 >> libdl.so.1 => /lib/libdl.so.1 >> libc.so.1 => /lib/libc.so.1 >> libgraph.so.4 => (file not found) >> libgcc_s.so.1 => /opt/csw/gcc4/lib/libgcc_s.so.1 >> libcdt.so.4 => (file not found) >> libmp.so.2 => /lib/libmp.so.2 >> libmd.so.1 => /lib/libmd.so.1 >> libscf.so.1 => /lib/libscf.so.1 >> libdoor.so.1 => /lib/libdoor.so.1 >> libuutil.so.1 => /lib/libuutil.so.1 >> libgen.so.1 => /lib/libgen.so.1 >> libm.so.2 => /lib/libm.so.2 >> _______________________________________________ >> devel mailing list >> devel at lists.opencsw.org >> https://lists.opencsw.org/mailman/listinfo/devel >> > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 From dmichelsen at users.sourceforge.net Fri Jun 3 00:02:46 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 02 Jun 2011 22:02:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[14699] csw/mgar/pkg/wireshark/trunk Message-ID: Revision: 14699 http://gar.svn.sourceforge.net/gar/?rev=14699&view=rev Author: dmichelsen Date: 2011-06-02 22:02:46 +0000 (Thu, 02 Jun 2011) Log Message: ----------- wireshark: Update to 1.4.7, remove CSW X11 stuff, dependencies still need fixing Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile csw/mgar/pkg/wireshark/trunk/checksums Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2011-06-02 20:27:58 UTC (rev 14698) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2011-06-02 22:02:46 UTC (rev 14699) @@ -1,5 +1,5 @@ NAME = wireshark -VERSION = 1.4.3 +VERSION = 1.4.7 CATEGORIES = apps DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer @@ -27,23 +27,13 @@ CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/wireshark CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libwireshark.so.0.0.1 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +VENDOR_URL = http://www.wireshark.org/ -SPKG_SOURCEURL = http://www.wireshark.org/ - -#EXTRA_INC = $(prefix)/X11/include -#EXTRA_LIB = $(prefix)/X11/lib -#EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib - -# We want to be link with Xrender from $(prefix)/X11/lib not $(prefix)/lib -# since the latter is linked to /usr/openwin/lib/libX11.so.4 -#EXTRA_SOS_LD_FLAGS += -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-usr-local=no CONFIGURE_ARGS += --with-ssl=/opt/csw -TEST_SCRIPTS = +# TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/wireshark/trunk/checksums =================================================================== --- csw/mgar/pkg/wireshark/trunk/checksums 2011-06-02 20:27:58 UTC (rev 14698) +++ csw/mgar/pkg/wireshark/trunk/checksums 2011-06-02 22:02:46 UTC (rev 14699) @@ -1 +1 @@ -ac3dcc8c128c38d9ef3d9c93d1dec83e wireshark-1.4.3.tar.bz2 +b5065426d5524ddc1667314f8256c2b1 wireshark-1.4.7.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Fri Jun 3 01:03:11 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Fri, 3 Jun 2011 00:03:11 +0100 Subject: [csw-devel] SF.net SVN: gar:[14697] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: References: Message-ID: Hi John, 2011/6/2 : > Modified: csw/mgar/pkg/graphviz/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/graphviz/trunk/Makefile ? ? ? ?2011-06-02 18:46:34 UTC (rev 14696) > +++ csw/mgar/pkg/graphviz/trunk/Makefile ? ? ? ?2011-06-02 18:49:36 UTC (rev 14697) > @@ -424,6 +424,27 @@ > ?CHECKPKG_OVERRIDES_CSWlibgvpr2 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgvpr.so.2.0.0 > ?CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/gvpr_static > > +# These are provide by *this* package set, so this a reasonable. Did you look why checkpkg thought that e.g. CSWgraphvizperl needs to depend on CSWlibcdt5? Maciej From ellson at opencsw.org Fri Jun 3 01:19:14 2011 From: ellson at opencsw.org (John Ellson) Date: Thu, 02 Jun 2011 19:19:14 -0400 Subject: [csw-devel] SF.net SVN: gar:[14697] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: References: Message-ID: <4DE81A72.1050209@opencsw.org> Maciej, You asking about the dependency on the *new* libcdt5 from graphviz2.28.0, right? It does depend on it. The perl language binding extends perl with wrapped functions from libgvc, libgraph, libcdt. Of course, since CSWgraphvizperl is in the same package-set as CSWlibcdt5, is has the same problem of a dependency on a library that is not yet installed. John On 06/02/2011 07:03 PM, Maciej Blizi?ski wrote: > Hi John, > > 2011/6/2 : >> Modified: csw/mgar/pkg/graphviz/trunk/Makefile >> =================================================================== >> --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-06-02 18:46:34 UTC (rev 14696) >> +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-06-02 18:49:36 UTC (rev 14697) >> @@ -424,6 +424,27 @@ >> CHECKPKG_OVERRIDES_CSWlibgvpr2 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgvpr.so.2.0.0 >> CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/gvpr_static >> >> +# These are provide by *this* package set, so this a reasonable. > Did you look why checkpkg thought that e.g. CSWgraphvizperl needs to > depend on CSWlibcdt5? > > Maciej > From maciej at opencsw.org Fri Jun 3 01:39:56 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Fri, 3 Jun 2011 00:39:56 +0100 Subject: [csw-devel] SF.net SVN: gar:[14697] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <4DE81A72.1050209@opencsw.org> References: <4DE81A72.1050209@opencsw.org> Message-ID: 2011/6/3 John Ellson : > Maciej, > > You asking about the dependency on the *new* libcdt5 from > graphviz2.28.0, right? Yes, libcdt5 is with the new graphviz, the previous version of graphviz builds libcdt4. > It does depend on it. ? The perl language binding extends perl with > wrapped functions from libgvc, libgraph, libcdt. > > Of course, since CSWgraphvizperl is in the same package-set as > CSWlibcdt5, is has the same problem of a dependency on a library that is > not yet installed. What do you mean by 'the same problem'? Can you expand on your reasoning? Maciej From ellson at opencsw.org Fri Jun 3 02:30:41 2011 From: ellson at opencsw.org (John Ellson) Date: Thu, 02 Jun 2011 20:30:41 -0400 Subject: [csw-devel] SF.net SVN: gar:[14697] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: References: <4DE81A72.1050209@opencsw.org> Message-ID: <4DE82B31.9020904@opencsw.org> The graphviz "package-set" is all the packages built from the same sources (as in same tar.gz). The CSWgraphvizperl contents depend on the CSWlibcdt5 contents from the same package-set. So, CSWlibcdt5 is not installed, can't be installed, while building CSWgraphvizperl. The only way it could be installed is if CSWlibcdt5 sources were separated, so that they weren't all in the same package-set. The language bindings aren't plugins, but this library dependecy issue is the same as for the plugins (e.g CSWgraphvizgd). This problem of library dependencies in the *same package-set* is easily and safely fixed with the overrides. Libtool built and linked them in the build tree, they only become unavailable when installing them into DESTDIR, which is not the final install location, during the "make install" step for constructing the packages. John On 06/02/2011 07:39 PM, Maciej Blizi?ski wrote: > 2011/6/3 John Ellson : >> Maciej, >> >> You asking about the dependency on the *new* libcdt5 from >> graphviz2.28.0, right? > Yes, libcdt5 is with the new graphviz, the previous version of > graphviz builds libcdt4. > >> It does depend on it. The perl language binding extends perl with >> wrapped functions from libgvc, libgraph, libcdt. >> >> Of course, since CSWgraphvizperl is in the same package-set as >> CSWlibcdt5, is has the same problem of a dependency on a library that is >> not yet installed. > What do you mean by 'the same problem'? Can you expand on your reasoning? > > Maciej > From ellson at opencsw.org Fri Jun 3 02:55:08 2011 From: ellson at opencsw.org (John Ellson) Date: Thu, 02 Jun 2011 20:55:08 -0400 Subject: [csw-devel] SF.net SVN: gar:[14697] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <4DE82B31.9020904@opencsw.org> References: <4DE81A72.1050209@opencsw.org> <4DE82B31.9020904@opencsw.org> Message-ID: <4DE830EC.5080108@opencsw.org> I should expand on this: > Libtool built and linked them in the build tree, they only become > unavailable when installing them into DESTDIR, which is not the final > install location, during the "make install" step for constructing the > packages. "make install" uses "libtool install" which relinks the targets using the target install location -L paths. This is what produces the .libs/libfoobar.so.1.2.3T files. These T files that are renamed and packaged in DESTDIR, but of course the library depdencies (shown by ldd) are broken until all of the packages in the package-set are installed. And this all breaks if an old libfoobar.so is already installed, since libtool will pick that up, incorrectly, when linking the T file. Solution to that is to uninstall the -devel package of the old release. Which is what we did today for graphviz. (The -devel package contains libfoobar.so and libfoobar.so.0 softlinks. The real, old libfoobar.0.1.2.so is OK, apparently because libtool knows that its not the version it wants.) John On 06/02/2011 08:30 PM, John Ellson wrote: > The graphviz "package-set" is all the packages built from the same > sources (as in same tar.gz). > > The CSWgraphvizperl contents depend on the CSWlibcdt5 contents from the > same package-set. > So, CSWlibcdt5 is not installed, can't be installed, while building > CSWgraphvizperl. The only way it could be installed is if CSWlibcdt5 > sources were separated, so that they weren't all in the same package-set. > > The language bindings aren't plugins, but this library dependecy issue > is the same as for the plugins (e.g CSWgraphvizgd). > > This problem of library dependencies in the *same package-set* is easily > and safely fixed with the overrides. > Libtool built and linked them in the build tree, they only become > unavailable when installing them into DESTDIR, which is not the final > install location, during the "make install" step for constructing the > packages. > > John > > On 06/02/2011 07:39 PM, Maciej Blizi?ski wrote: >> 2011/6/3 John Ellson : >>> Maciej, >>> >>> You asking about the dependency on the *new* libcdt5 from >>> graphviz2.28.0, right? >> Yes, libcdt5 is with the new graphviz, the previous version of >> graphviz builds libcdt4. >> >>> It does depend on it. The perl language binding extends perl with >>> wrapped functions from libgvc, libgraph, libcdt. >>> >>> Of course, since CSWgraphvizperl is in the same package-set as >>> CSWlibcdt5, is has the same problem of a dependency on a library that is >>> not yet installed. >> What do you mean by 'the same problem'? Can you expand on your reasoning? >> >> Maciej >> > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel From rthurner at users.sourceforge.net Fri Jun 3 06:32:06 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 03 Jun 2011 04:32:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14700] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 14700 http://gar.svn.sourceforge.net/gar/?rev=14700&view=rev Author: rthurner Date: 2011-06-03 04:32:06 +0000 (Fri, 03 Jun 2011) Log Message: ----------- subversion: update to svn-1.6.17 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-06-02 22:02:46 UTC (rev 14699) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-06-03 04:32:06 UTC (rev 14700) @@ -22,7 +22,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.6.16 +VERSION = 1.6.17 CATEGORIES = utils DESCRIPTION = Version control rethought Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2011-06-02 22:02:46 UTC (rev 14699) +++ csw/mgar/pkg/subversion/trunk/checksums 2011-06-03 04:32:06 UTC (rev 14700) @@ -1 +1 @@ -32f25a6724559fe8691d1f57a63f636e subversion-1.6.16.tar.bz2 +81e5dc5beee4b3fc025ac70c0b6caa14 subversion-1.6.17.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 Fri Jun 3 19:21:53 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 03 Jun 2011 17:21:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[14701] csw/mgar/pkg/git/trunk Message-ID: Revision: 14701 http://gar.svn.sourceforge.net/gar/?rev=14701&view=rev Author: bdwalton Date: 2011-06-03 17:21:52 +0000 (Fri, 03 Jun 2011) Log Message: ----------- git/trunk: version bump, switch back to http:// from git:// as the upstream Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-06-03 04:32:06 UTC (rev 14700) +++ csw/mgar/pkg/git/trunk/Makefile 2011-06-03 17:21:52 UTC (rev 14701) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.7.5 +VERSION = 1.7.5.4 #PATCHLEVEL = rc1 CATEGORIES = devel @@ -87,13 +87,10 @@ SPKG_DESC_CSWgit-completion = Bash completion support for Git SPKG_DESC_CSWgit-dev = Headers and static libraries for Git -#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$(VERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL)) +MASTER_SITES = http://kernel.org/pub/software/scm/$(NAME)/ +DISTFILES += $(NAME)-$(VERSION).tar.bz2 +DISTFILES += CSWgit.postinstall -DISTFILES = CSWgit.postinstall - PATCHFILES += 0001-Update-path-in-documentation-to-be-CSW-proper.patch PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch PATCHFILES += 0003-Update-path-in-sample-hook-file.patch Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2011-06-03 04:32:06 UTC (rev 14700) +++ csw/mgar/pkg/git/trunk/checksums 2011-06-03 17:21:52 UTC (rev 14701) @@ -1 +1 @@ -92482ca3b4e8626f428f8878bcc1477f CSWgit.postinstall +4985b774db84d3bbcc2b8d90952552a3 git-1.7.5.4.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 Fri Jun 3 19:33:00 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 03 Jun 2011 17:33:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14702] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 14702 http://gar.svn.sourceforge.net/gar/?rev=14702&view=rev Author: bdwalton Date: 2011-06-03 17:33:00 +0000 (Fri, 03 Jun 2011) Log Message: ----------- git/trunk: accommodate broken release scripts Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-06-03 17:21:52 UTC (rev 14701) +++ csw/mgar/pkg/git/trunk/Makefile 2011-06-03 17:33:00 UTC (rev 14702) @@ -16,12 +16,19 @@ PACKAGES += CSWgit-emacs CSWgit-doc CSWgit-completion CSWgit-dev OBSOLETED_BY_CSWgit-gui = CSWgitgui +CATALOGNAME_CSWgitgui = git_gui_stub OBSOLETED_BY_CSWgit-svn = CSWgitsvn +CATALOGNAME_CSWgitsvn = git_svn_stub OBSOLETED_BY_CSWgit-emacs = CSWgitemacs +CATALOGNAME_CSWgitemacs = git_emacs_stub OBSOLETED_BY_CSWgit-doc = CSWgitdoc +CATALOGNAME_CSWgitdoc = git_doc_stub OBSOLETED_BY_CSWgit-completion = CSWgitcompletion +CATALOGNAME_CSWgitcompletion = git_completion_stub OBSOLETED_BY_CSWgit-dev = CSWgitdevel +CATALOGNAME_CSWgitdevel = git_devel_stub OBSOLETED_BY_CSWgit-cvs = CSWgitcvs +CATALOGNAME_CSWgitcvs = git_cvs_stub CATALOGNAME_CSWgit = git CATALOGNAME_CSWgit-cvs = git_cvs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sat Jun 4 08:42:52 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sat, 4 Jun 2011 07:42:52 +0100 Subject: [csw-devel] SF.net SVN: gar:[14697] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: <4DE830EC.5080108@opencsw.org> References: <4DE81A72.1050209@opencsw.org> <4DE82B31.9020904@opencsw.org> <4DE830EC.5080108@opencsw.org> Message-ID: 2011/6/3 John Ellson : > I should expand on this: > >> Libtool built and linked them in the build tree, they only become >> unavailable when installing them into DESTDIR, which is not the final >> install location, during the "make install" step for constructing the >> packages. > > "make install" uses "libtool install" which relinks the targets using the target install location -L paths. ?This is what produces the .libs/libfoobar.so.1.2.3T files. ?These T files that are renamed and packaged in DESTDIR, but of course the library depdencies (shown by ldd) are broken until all of the packages in the package-set are installed. How are they broken? > And this all breaks if an old libfoobar.so is already installed, since libtool will pick that up, incorrectly, when linking the T file. > Solution to that is to uninstall the -devel package of the old release. ?Which is what we did today for graphviz. > > (The -devel package contains libfoobar.so and libfoobar.so.0 softlinks. ? ?The real, old libfoobar.0.1.2.so is OK, apparently because libtool knows that its not the version it wants.) Alright, so this is an explanation why new binaries link to old libraries. However, in this example, we're discussing a new binary linking to a new library. I'm looking at the graphvizperl metadata: http://buildfarm.opencsw.org/pkgdb/srv4/79aaeb691e603c6f7d6f804fd62f82c0/ Here's an relevant excerpt: 'binaries': ['opt/csw/lib/graphviz/perl/libgv_perl.so'], 'binaries_dump_info': [{'RPATH set': True, 'RUNPATH RPATH the same': True, 'RUNPATH set': True, 'base_name': 'libgv_perl.so', 'needed sonames': ('libm.so.1', 'libpthread.so.1', 'libgvc.so.6', 'libxdot.so.4', 'libpathplan.so.4', 'libexpat.so.1', 'libsocket.so.1', 'libnsl.so.1', 'libz.so.1', 'libgraph.so.5', 'libcdt.so.5', 'libltdl.so.7', 'libdl.so.1', 'libperl.so', 'libc.so.1', 'libstdc++.so.6', 'libgcc_s.so.1'), 'path': 'opt/csw/lib/graphviz/perl/libgv_perl.so', 'runpath': ('/opt/csw/gcc4/lib', '/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/lib'), 'soname': 'libgv_perl.so'}], The binary /opt/csw/lib/graphviz/perl/libgv_perl.so needs libcdt.so.5, so the CSWgraphvizperl package should declare a dependency on CSWlibcdt5, isn't that so? Maciej From ellson at opencsw.org Sat Jun 4 15:08:57 2011 From: ellson at opencsw.org (John Ellson) Date: Sat, 04 Jun 2011 09:08:57 -0400 Subject: [csw-devel] SF.net SVN: gar:[14697] csw/mgar/pkg/graphviz/trunk/Makefile In-Reply-To: References: <4DE81A72.1050209@opencsw.org> <4DE82B31.9020904@opencsw.org> <4DE830EC.5080108@opencsw.org> Message-ID: <4DEA2E69.4060401@opencsw.org> On 06/04/2011 02:42 AM, Maciej Blizi?ski wrote: > 2011/6/3 John Ellson : >> I should expand on this: >> >>> Libtool built and linked them in the build tree, they only become >>> unavailable when installing them into DESTDIR, which is not the final >>> install location, during the "make install" step for constructing the >>> packages. >> "make install" uses "libtool install" which relinks the targets using the target install location -L paths. This is what produces the .libs/libfoobar.so.1.2.3T files. These T files that are renamed and packaged in DESTDIR, but of course the library depdencies (shown by ldd) are broken until all of the packages in the package-set are installed. > How are they broken? If you use ldd on them, before the entire package-set is installed, they will show "not found" on the dependent libraries from the same-package set that are not installed yet. Not really "broken" I suppose. The libs are fine once ther are all installed. >> And this all breaks if an old libfoobar.so is already installed, since libtool will pick that up, incorrectly, when linking the T file. >> Solution to that is to uninstall the -devel package of the old release. Which is what we did today for graphviz. >> >> (The -devel package contains libfoobar.so and libfoobar.so.0 softlinks. The real, old libfoobar.0.1.2.so is OK, apparently because libtool knows that its not the version it wants.) > Alright, so this is an explanation why new binaries link to old > libraries. However, in this example, we're discussing a new binary > linking to a new library. > > I'm looking at the graphvizperl metadata: > > http://buildfarm.opencsw.org/pkgdb/srv4/79aaeb691e603c6f7d6f804fd62f82c0/ > > Here's an relevant excerpt: > > 'binaries': ['opt/csw/lib/graphviz/perl/libgv_perl.so'], > 'binaries_dump_info': [{'RPATH set': True, > 'RUNPATH RPATH the same': True, > 'RUNPATH set': True, > 'base_name': 'libgv_perl.so', > 'needed sonames': ('libm.so.1', > 'libpthread.so.1', > 'libgvc.so.6', > 'libxdot.so.4', > 'libpathplan.so.4', > 'libexpat.so.1', > 'libsocket.so.1', > 'libnsl.so.1', > 'libz.so.1', > 'libgraph.so.5', > 'libcdt.so.5', > 'libltdl.so.7', > 'libdl.so.1', > 'libperl.so', > 'libc.so.1', > 'libstdc++.so.6', > 'libgcc_s.so.1'), > 'path': 'opt/csw/lib/graphviz/perl/libgv_perl.so', > 'runpath': ('/opt/csw/gcc4/lib', > '/opt/csw/lib/$ISALIST', > '/opt/csw/lib', > '/opt/csw/lib'), > 'soname': 'libgv_perl.so'}], > > The binary /opt/csw/lib/graphviz/perl/libgv_perl.so needs libcdt.so.5, > so the CSWgraphvizperl package should declare a dependency on > CSWlibcdt5, isn't that so? Well, yes, I guess. I see there isn't an explicit dependency in the Makefile. But apparently GAR knows that there is one because the pkgcheck wanted me to add the "missing-dependency" override. Ah!, but you're saying I'm interpreting the cause of "missing" incorrectly.... I'm sure you're right ... I'll add the explicit RUNTIME_DEP_PKGS.. Thanks. > Maciej > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel From ellson at users.sourceforge.net Sat Jun 4 15:29:28 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Sat, 04 Jun 2011 13:29:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[14703] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: Revision: 14703 http://gar.svn.sourceforge.net/gar/?rev=14703&view=rev Author: ellson Date: 2011-06-04 13:29:28 +0000 (Sat, 04 Jun 2011) Log Message: ----------- graphviz: add more RUNTIME_DEP_PKGS_... Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-06-03 17:33:00 UTC (rev 14702) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-06-04 13:29:28 UTC (rev 14703) @@ -65,6 +65,13 @@ RUNTIME_DEP_PKGS_CSWgraphviz += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibcgraph6 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgraph5 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgvpr2 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibxdot4 PKGFILES_CSWgraphviz = $(bindir)/(?!(diffimg|dot_static)).* PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_core\.so\..* PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gdk_pixbuf\.so\..* @@ -131,6 +138,7 @@ RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibpathplan4 RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibxdot4 RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibgraph5 +RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibgvc6 PKGFILES_CSWgraphvizgd = $(libdir)/graphviz/libgvplugin_gd\.so\..* PKGFILES_CSWgraphvizgd += $(bindir)/diffimg PKGFILES_CSWgraphvizgd += $(bindir)/dot_static @@ -155,6 +163,9 @@ RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibpathplan4 RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibgraph5 PKGFILES_CSWgraphvizsharp = $(libdir)/graphviz/sharp/.* PKGFILES_CSWgraphvizsharp += $(mandir)/man3/.*\.3sharp PKGFILES_CSWgraphvizsharp += $(sharedstatedir)/graphviz/demo/.*\.cs @@ -168,6 +179,9 @@ RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibpathplan4 RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibgraph5 PKGFILES_CSWgraphvizguile = $(libdir)/graphviz/guile/.* PKGFILES_CSWgraphvizguile += $(mandir)/man3/.*\.3guile PKGFILES_CSWgraphvizguile += $(sharedstatedir)/graphviz/demo/.*\.guile @@ -180,7 +194,11 @@ RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWgcc4corert RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWlibgraph5 PKGFILES_CSWgraphvizjava = $(libdir)/graphviz/java/.* PKGFILES_CSWgraphvizjava += $(mandir)/man3/.*\.3java PKGFILES_CSWgraphvizjava += $(sharedstatedir)/graphviz/demo/.*\.java @@ -193,7 +211,11 @@ RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWgcc4corert RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWlibgraph5 PKGFILES_CSWgraphvizlua = $(libdir)/graphviz/lua/.* PKGFILES_CSWgraphvizlua += $(mandir)/man3/.*\.3lua PKGFILES_CSWgraphvizlua += $(sharedstatedir)/graphviz/demo/.*\.lua @@ -206,7 +228,11 @@ RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWgcc4corert RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWlibgraph5 PKGFILES_CSWgraphvizocaml = $(libdir)/graphviz/ocaml/.* PKGFILES_CSWgraphvizocaml += $(mandir)/man3/.*\.3ocaml PKGFILES_CSWgraphvizocaml += $(sharedstatedir)/graphviz/demo/.*\.ml @@ -221,9 +247,9 @@ RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibpathplan4 RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibxdot4 -PKGFILES_CSWgraphvizperl = $(libdir)/graphviz/perl/.* -PKGFILES_CSWgraphvizperl += $(mandir)/man3/.*\.3perl -PKGFILES_CSWgraphvizperl += $(sharedstatedir)/graphviz/demo/.*\.pl +RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibgraph5 #PACKAGES += CSWgraphvizphp SPKG_DESC_CSWgraphvizphp = Graphviz language binding for php @@ -233,7 +259,11 @@ RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWgcc4corert RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWlibgraph5 PKGFILES_CSWgraphvizphp = $(libdir)/graphviz/php/.* PKGFILES_CSWgraphvizphp += $(mandir)/man3/.*\.3php PKGFILES_CSWgraphvizphp += $(sharedstatedir)/graphviz/demo/.*\.php @@ -249,6 +279,9 @@ RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibpathplan4 RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibgraph5 PKGFILES_CSWgraphvizpython = $(libdir)/graphviz/python/.* PKGFILES_CSWgraphvizpython += $(mandir)/man3/.*\.3python PKGFILES_CSWgraphvizpython += $(sharedstatedir)/graphviz/demo/.*\.py @@ -261,7 +294,11 @@ RUNTIME_DEP_PKGS_CSWgraphvizr += CSWgcc4corert RUNTIME_DEP_PKGS_CSWgraphvizr += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWgraphvizr += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWgraphvizr += CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizr += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizr += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWgraphvizr += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphvizr += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWgraphvizr += CSWlibgraph5 PKGFILES_CSWgraphvizr = $(libdir)/graphviz/R/.* PKGFILES_CSWgraphvizr += $(mandir)/man3/.*\.3r PKGFILES_CSWgraphvizr += $(sharedstatedir)/graphviz/demo/.*\.r @@ -274,7 +311,11 @@ RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWgcc4corert RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWgraphviz +RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibpathplan4 +RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibxdot4 +RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibgraph5 PKGFILES_CSWgraphvizruby = $(libdir)/graphviz/ruby/.* PKGFILES_CSWgraphvizruby += $(mandir)/man3/.*\.3ruby PKGFILES_CSWgraphvizruby += $(sharedstatedir)/graphviz/demo/.*\.rb @@ -303,6 +344,7 @@ RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibpathplan4 RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibxdot4 RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibgraph5 +RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibgvc6 PKGFILES_CSWgraphviztcl = $(libdir)/graphviz/tcl/.* PKGFILES_CSWgraphviztcl += $(mandir)/man3/.*\.3tcl PKGFILES_CSWgraphviztcl += $(mandir)/man3/.*\.3tk @@ -316,7 +358,6 @@ PKGFILES_CSWlibcdt5 += $(call baseisadirs,$(libdir),libcdt\.so\.5\.0\.0) PKGFILES_CSWlibcdt5 += $(call baseisadirs,$(libdir),libcdt\.so\.5(\.\d+)*) SPKG_DESC_CSWlibcdt5 += Graph Visualization Tools, libcdt.so.5 -RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibcdt5 RUNTIME_DEP_PKGS_CSWlibcdt5 += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWlibcdt5 += CSWgcc4corert @@ -325,25 +366,24 @@ PKGFILES_CSWlibcgraph6 += $(call baseisadirs,$(libdir),libcgraph\.so\.6\.0\.0) PKGFILES_CSWlibcgraph6 += $(call baseisadirs,$(libdir),libcgraph\.so\.6(\.\d+)*) SPKG_DESC_CSWlibcgraph6 += Graph Visualization Tools, libcgraph.so.6 -RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibcgraph6 RUNTIME_DEP_PKGS_CSWlibcgraph6 += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWlibcgraph6 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWlibcgraph6 += CCSWlibcdt5 PACKAGES += CSWlibgraph5 CATALOGNAME_CSWlibgraph5 = libgraph5 PKGFILES_CSWlibgraph5 += $(call baseisadirs,$(libdir),libgraph\.so\.5\.0\.0) PKGFILES_CSWlibgraph5 += $(call baseisadirs,$(libdir),libgraph\.so\.5(\.\d+)*) SPKG_DESC_CSWlibgraph5 += Graph Visualization Tools, libgraph.so.5 -RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgraph5 RUNTIME_DEP_PKGS_CSWlibgraph5 += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWlibgraph5 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWlibgraph5 += CSWlibcdt5 PACKAGES += CSWlibgvc6 CATALOGNAME_CSWlibgvc6 = libgvc6 PKGFILES_CSWlibgvc6 += $(call baseisadirs,$(libdir),libgvc\.so\.6\.0\.0) PKGFILES_CSWlibgvc6 += $(call baseisadirs,$(libdir),libgvc\.so\.6(\.\d+)*) SPKG_DESC_CSWlibgvc6 += Graph Visualization Tools, libgvc.so.6 -RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgvc6 RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibpathplan4 RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibxdot4 @@ -351,23 +391,24 @@ RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWzlib RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWexpat RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibgraph5 PACKAGES += CSWlibgvpr2 CATALOGNAME_CSWlibgvpr2 = libgvpr2 PKGFILES_CSWlibgvpr2 += $(call baseisadirs,$(libdir),libgvpr\.so\.2\.0\.0) PKGFILES_CSWlibgvpr2 += $(call baseisadirs,$(libdir),libgvpr\.so\.2(\.\d+)*) SPKG_DESC_CSWlibgvpr2 += Graph Visualization Tools, libgvpr.so.2 -RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgvpr2 RUNTIME_DEP_PKGS_CSWlibgvpr2 += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWlibgvpr2 += CSWlibcdt5 RUNTIME_DEP_PKGS_CSWlibgvpr2 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWlibgvpr2 += CSWlibcgraph6 + PACKAGES += CSWlibpathplan4 CATALOGNAME_CSWlibpathplan4 = libpathplan4 PKGFILES_CSWlibpathplan4 += $(call baseisadirs,$(libdir),libpathplan\.so\.4\.0\.0) PKGFILES_CSWlibpathplan4 += $(call baseisadirs,$(libdir),libpathplan\.so\.4(\.\d+)*) SPKG_DESC_CSWlibpathplan4 += Graph Visualization Tools, libpathplan.so.4 -RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibpathplan4 RUNTIME_DEP_PKGS_CSWlibpathplan4 += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWlibpathplan4 += CSWgcc4corert @@ -376,7 +417,6 @@ PKGFILES_CSWlibxdot4 += $(call baseisadirs,$(libdir),libxdot\.so\.4\.0\.0) PKGFILES_CSWlibxdot4 += $(call baseisadirs,$(libdir),libxdot\.so\.4(\.\d+)*) SPKG_DESC_CSWlibxdot4 += Graph Visualization Tools, libxdot.so.4 -RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibxdot4 RUNTIME_DEP_PKGS_CSWlibxdot4 += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWlibxdot4 += CSWgcc4corert @@ -424,27 +464,6 @@ CHECKPKG_OVERRIDES_CSWlibgvpr2 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgvpr.so.2.0.0 CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/gvpr_static -# These are provide by *this* package set, so this a reasonable. -# NB - must unistall anl older CSWgraphvizdevel for this -# -CHECKPKG_OVERRIDES_CSWgraphvizperl += missing-dependency|CSWlibcdt5 -CHECKPKG_OVERRIDES_CSWgraphvizperl += missing-dependency|CSWlibgvc6 -CHECKPKG_OVERRIDES_CSWgraphvizperl += missing-dependency|CSWlibgraph5 -CHECKPKG_OVERRIDES_CSWlibgraph5 += missing-dependency|CSWlibcdt5 -CHECKPKG_OVERRIDES_CSWgraphvizsharp += missing-dependency|CSWlibcdt5 -CHECKPKG_OVERRIDES_CSWgraphvizsharp += missing-dependency|CSWlibgvc6 -CHECKPKG_OVERRIDES_CSWgraphvizsharp += missing-dependency|CSWlibgraph5 -CHECKPKG_OVERRIDES_CSWlibgvc6 += missing-dependency|CSWlibgraph5 -CHECKPKG_OVERRIDES_CSWlibcgraph6 += missing-dependency|CSWlibcdt5 -CHECKPKG_OVERRIDES_CSWgraphvizgd += missing-dependency|CSWlibgvc6 -CHECKPKG_OVERRIDES_CSWgraphviztcl += missing-dependency|CSWlibgvc6 -CHECKPKG_OVERRIDES_CSWgraphvizguile += missing-dependency|CSWlibcdt5 -CHECKPKG_OVERRIDES_CSWgraphvizguile += missing-dependency|CSWlibgvc6 -CHECKPKG_OVERRIDES_CSWgraphvizguile += missing-dependency|CSWlibgraph5 -CHECKPKG_OVERRIDES_CSWlibgvpr2 += missing-dependency|CSWlibcgraph6 -CHECKPKG_OVERRIDES_CSWgraphvizpython += missing-dependency|CSWlibcdt5 -CHECKPKG_OVERRIDES_CSWgraphvizpython += missing-dependency|CSWlibgvc6 -CHECKPKG_OVERRIDES_CSWgraphvizpython += missing-dependency|CSWlibgraph5 include gar/category.mk post-merge: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Sat Jun 4 16:12:35 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Sat, 04 Jun 2011 14:12:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14704] csw/mgar/pkg/graphviz/trunk Message-ID: Revision: 14704 http://gar.svn.sourceforge.net/gar/?rev=14704&view=rev Author: ellson Date: 2011-06-04 14:12:35 +0000 (Sat, 04 Jun 2011) Log Message: ----------- graphviz: use ggrep instead of grep Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/checksums csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch Modified: csw/mgar/pkg/graphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz/trunk/checksums 2011-06-04 13:29:28 UTC (rev 14703) +++ csw/mgar/pkg/graphviz/trunk/checksums 2011-06-04 14:12:35 UTC (rev 14704) @@ -4,7 +4,7 @@ b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postinstall b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postuninstall d039829d638e26ea600f4db3e213959f configure.patch -85ebea4df5ba1af93d04f52dbf7b94b6 Makefile.am.patch +f2c5f062fb643dbb0db352a25bf09e6c Makefile.am.patch 5ced04f48ec6c223d6a6e51c2f6219d0 trapezoid.c.patch 31f8a6e9e31075ad537fc2b9d2e6ab09 post_process.c.patch a9e6a8d6711f217155272c1e17e7d106 gvpr_Makefile.am.patch Modified: csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch 2011-06-04 13:29:28 UTC (rev 14703) +++ csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch 2011-06-04 14:12:35 UTC (rev 14704) @@ -19,7 +19,7 @@ -graphviz_version.h: config.h - $(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h > graphviz_version.h +$(top_builddir)/graphviz_version.h: config.h -+ -$(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h ++ ggrep 'PACKAGE\|VERSION\|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec \ autogen.sh config/depcomp config/config.rpath \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Sat Jun 4 16:44:19 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sat, 04 Jun 2011 10:44:19 -0400 Subject: [csw-devel] (no subject) Message-ID: <1307198624-sup-9677@pinkfloyd.chass.utoronto.ca> Bcc: Subject: Re: [csw-devel] SF.net SVN: gar:[14704] csw/mgar/pkg/graphviz/trunk In-reply-to: References: Excerpts from ellson's message of Sat Jun 04 10:12:35 -0400 2011: Hi John, > @@ -4,7 +4,7 @@ > b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postinstall > b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postuninstall > d039829d638e26ea600f4db3e213959f configure.patch > -85ebea4df5ba1af93d04f52dbf7b94b6 Makefile.am.patch > +f2c5f062fb643dbb0db352a25bf09e6c Makefile.am.patch Have you seen the makepatch GAR target? It uses git to generate your patch and store a commit message with it (part of the patch file). The basics are: mgar patch # extract source, apply existing patches cd work/solaris.../build-isa.../graphviz-$version/ edit source files cd - mgar makepatch (add commit message) (follow instructions for adding it to your recipe) HTH. -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Sat Jun 4 17:58:50 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 04 Jun 2011 15:58:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14705] csw/mgar/pkg/bacula/trunk Message-ID: Revision: 14705 http://gar.svn.sourceforge.net/gar/?rev=14705&view=rev Author: bdwalton Date: 2011-06-04 15:58:50 +0000 (Sat, 04 Jun 2011) Log Message: ----------- bacula/trunk: update gzipped manpage handling to use a patch instead of post-install target (patch sent upstream) Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/0004-Update-man-page-installation-so-we-don-t-get-gzipped.patch Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-06-04 14:12:35 UTC (rev 14704) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-06-04 15:58:50 UTC (rev 14705) @@ -23,6 +23,7 @@ PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch PATCHFILES += 0003-Make-the-solaris-init-scripts-user-group-aware.patch +PATCHFILES += 0004-Update-man-page-installation-so-we-don-t-get-gzipped.patch BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel BUILD_DEP_PKGS += CSWreadline CSWggettext-dev @@ -327,6 +328,3 @@ mkdir -p pkg/CSWbacula-fd; \ echo ":bacula::::::" > pkg/CSWbacula-fd/cswusergroup; \ echo "bacula-fd 9102/tcp" > pkg/CSWbacula-fd/services) - @echo Unzipping manpages...a hack for now... - @(cd $(PKGROOT)/opt/csw/share/man; \ - find . -name '*gz' -print | xargs gunzip ) Added: csw/mgar/pkg/bacula/trunk/files/0004-Update-man-page-installation-so-we-don-t-get-gzipped.patch =================================================================== --- csw/mgar/pkg/bacula/trunk/files/0004-Update-man-page-installation-so-we-don-t-get-gzipped.patch (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/0004-Update-man-page-installation-so-we-don-t-get-gzipped.patch 2011-06-04 15:58:50 UTC (rev 14705) @@ -0,0 +1,69316 @@ +From a8b41c1381985ffd4654129db881f9f51b672c30 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 4 Jun 2011 17:34:40 +0200 +Subject: [PATCH] Update man page installation so we don't get gzipped manpages + +We now add a variable to the autoconf setup that lets us disable +gzipping the manpages on platforms where man cannot handle .gz files. + +Signed-off-by: Ben Walton +--- + autoconf/configure.in | 3 + + configure |63301 +++++++++++++++++++------------------------------ + manpages/Makefile.in | 32 +- + 3 files changed, 23937 insertions(+), 39399 deletions(-) + +diff --git a/autoconf/configure.in b/autoconf/configure.in +index 1115e7a..36c8aba 100644 +--- a/autoconf/configure.in ++++ b/autoconf/configure.in +@@ -2778,6 +2778,7 @@ PFILES="platforms/Makefile" + PSCMD="ps -e" + WIN32= + MACOSX= ++COMPRESS_MANPAGES=yes + + hostname=`uname -n | cut -d '.' -f 1` + if test x${hostname} = x ; then +@@ -2998,6 +2999,7 @@ slackware) + ;; + solaris) + DISTVER=`uname -r` ++ COMPRESS_MANPAGES= + TAPEDRIVE="/dev/rmt/0cbn" + PSCMD="ps -e -o pid,comm" + PFILES="${PFILES} \ +@@ -3054,6 +3056,7 @@ AC_SUBST(WIN32) + AC_SUBST(MACOSX) + AC_SUBST(DISTNAME) + AC_SUBST(DISTVER) ++AC_SUBST(COMPRESS_MANPAGES) + + dnl common parts of the Makefile + MCOMMON=./autoconf/Make.common +diff --git a/configure b/configure +index 1c24d95..af81ba4 100755 +--- a/configure ++++ b/configure +@@ -1,60 +1,83 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.61. ++# Generated by GNU Autoconf 2.68 for bacula 5.0.3. ++# + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software ++# Foundation, Inc. ++# ++# + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; + esac +- + fi + + +- +- +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' ++as_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' + else +- PATH_SEPARATOR=: ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in #( ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' + fi +- rm -f conf$$.sh ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } + fi + + +@@ -63,20 +86,19 @@ fi + # there to prevent editors from complaining about space-tab. + # (If _AS_PATH_WALK were called with IFS unset, it would disable word + # splitting by setting IFS to empty value.) +-as_nl=' +-' + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++as_myself= ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -87,32 +109,277 @@ if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' + PS4='+ ' + + # NLS nuisances. +-for as_var in \ +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ +- LC_TELEPHONE LC_TIME ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE ++ ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++if test "x$CONFIG_SHELL" = x; then ++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '\${1+\"\$@\"}'='\"\$@\"' ++ setopt NO_GLOB_SUBST ++else ++ case \`(set -o) 2>/dev/null\` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac ++fi ++" ++ as_required="as_fn_return () { (exit \$1); } ++as_fn_success () { as_fn_return 0; } ++as_fn_failure () { as_fn_return 1; } ++as_fn_ret_success () { return 0; } ++as_fn_ret_failure () { return 1; } ++ ++exitcode=0 ++as_fn_success || { exitcode=1; echo as_fn_success failed.; } ++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } ++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } ++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } ++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : ++ ++else ++ exitcode=1; echo positional parameters were not saved. ++fi ++test x\$exitcode = x0 || exit 1" ++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO ++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO ++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && ++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 ++test \$(( 1 + 1 )) = 2 || exit 1" ++ if (eval "$as_required") 2>/dev/null; then : ++ as_have_required=yes ++else ++ as_have_required=no ++fi ++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : ++ ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++as_found=false ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do +- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then +- eval $as_var=C; export $as_var ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ as_found=: ++ case $as_dir in #( ++ /*) ++ for as_base in sh bash ksh sh5; do ++ # Try only shells that exist, to save several forks. ++ as_shell=$as_dir/$as_base ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ CONFIG_SHELL=$as_shell as_have_required=yes ++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ break 2 ++fi ++fi ++ done;; ++ esac ++ as_found=false ++done ++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : ++ CONFIG_SHELL=$SHELL as_have_required=yes ++fi; } ++IFS=$as_save_IFS ++ ++ ++ if test "x$CONFIG_SHELL" != x; then : ++ # We cannot yet assume a decent shell, so we have to provide a ++ # neutralization value for shells without unset; and this also ++ # works around shells that cannot unset nonexistent variables. ++ # Preserve -v and -x to the replacement shell. ++ BASH_ENV=/dev/null ++ ENV=/dev/null ++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++ export CONFIG_SHELL ++ case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++ esac ++ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} ++fi ++ ++ if test x$as_have_required = xno; then : ++ $as_echo "$0: This script requires a shell more modern than all" ++ $as_echo "$0: the shells that I found on your system." ++ if test x${ZSH_VERSION+set} = xset ; then ++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" ++ $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else +- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ $as_echo "$0: Please tell bug-autoconf at gnu.org about your system, ++$0: including any error possibly output before this ++$0: message. Then install a modern shell, or manually run ++$0: the script under such a shell if you do have one." + fi +-done ++ exit 1 ++fi ++fi ++fi ++SHELL=${CONFIG_SHELL-/bin/sh} ++export SHELL ++# Unset more variables known to interfere with behavior of common tools. ++CLICOLOR_FORCE= GREP_OPTIONS= ++unset CLICOLOR_FORCE GREP_OPTIONS ++ ++## --------------------- ## ++## M4sh Shell Functions. ## ++## --------------------- ## ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" ++ ++ ++} # as_fn_mkdir_p ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ ++ ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with STATUS, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 ++ fi ++ $as_echo "$as_me: error: $2" >&2 ++ as_fn_exit $as_status ++} # as_fn_error + +-# Required to use basename. + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -126,13 +393,17 @@ else + as_basename=false + fi + ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi + +-# Name of the executable. + as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X/"$0" | ++$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +@@ -147,411 +418,125 @@ echo X/"$0" | + } + s/.*/./; q'` + +-# CDPATH. +-$as_unset CDPATH ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + +-if test "x$CONFIG_SHELL" = x; then +- if (eval ":") 2>/dev/null; then +- as_have_required=yes +-else +- as_have_required=no +-fi ++ as_lineno_1=$LINENO as_lineno_1a=$LINENO ++ as_lineno_2=$LINENO as_lineno_2a=$LINENO ++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && ++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { ++ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | ++ sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno ++ N ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ ++ t loop ++ s/-\n.*// ++ ' >$as_me.lineno && ++ chmod +x "$as_me.lineno" || ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + +- if test $as_have_required = yes && (eval ": +-(as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 ++ # Don't try to exec as it changes $[0], causing all sort of problems ++ # (the dirname of $[0] is not the place where we might find the ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" ++ # Exit status is that of the last command. ++ exit + } + +-exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in #((((( ++-n*) ++ case `echo 'xy\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac + +-if as_func_ret_success; then +- : ++rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir 2>/dev/null ++fi ++if (echo >conf$$.file) 2>/dev/null; then ++ if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++ elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++ else ++ as_ln_s='cp -p' ++ fi + else +- exitcode=1 +- echo as_func_ret_success failed. ++ as_ln_s='cp -p' + fi ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null + +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p='mkdir -p "$as_dir"' ++else ++ test -d ./-p && rmdir ./-p ++ as_mkdir_p=false + fi + +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' + else +- exitcode=1 +- echo positional parameters were not saved. ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in #( ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' + fi ++as_executable_p=$as_test_x + +-test \$exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=\$LINENO +- as_lineno_2=\$LINENO +- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && +- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +-") 2> /dev/null; then +- : +-else +- as_candidate_shells= +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- case $as_dir in +- /*) +- for as_base in sh bash ksh sh5; do +- as_candidate_shells="$as_candidate_shells $as_dir/$as_base" +- done;; +- esac +-done +-IFS=$as_save_IFS ++# Sed expression to map a string onto a valid CPP name. ++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + ++# Sed expression to map a string onto a valid variable name. ++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + +- for as_shell in $as_candidate_shells $SHELL; do +- # Try only shells that exist, to save several forks. +- if { test -f "$as_shell" || test -f "$as_shell.exe"; } && +- { ("$as_shell") 2> /dev/null <<\_ASEOF +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac + +-fi + +- +-: +-_ASEOF +-}; then +- CONFIG_SHELL=$as_shell +- as_have_required=yes +- if { "$as_shell" 2> /dev/null <<\_ASEOF +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac +- +-fi +- +- +-: +-(as_func_return () { +- (exit $1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} +- +-exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : +-else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = "$1" ); then +- : +-else +- exitcode=1 +- echo positional parameters were not saved. +-fi +- +-test $exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } +- +-_ASEOF +-}; then +- break +-fi +- +-fi +- +- done +- +- if test "x$CONFIG_SHELL" != x; then +- for as_var in BASH_ENV ENV +- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- done +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +-fi +- +- +- if test $as_have_required = no; then +- echo This script requires a shell more modern than all the +- echo shells that I found on your system. Please install a +- echo modern shell, or manually run the script under such a +- echo shell if you do have one. +- { (exit 1); exit 1; } +-fi +- +- +-fi +- +-fi +- +- +- +-(eval "as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} +- +-exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : +-else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : +-else +- exitcode=1 +- echo positional parameters were not saved. +-fi +- +-test \$exitcode = 0") || { +- echo No shell found that supports shell functions. +- echo Please tell autoconf at gnu.org about your system, +- echo including any error possibly output before this +- echo message +-} +- +- +- +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) +- sed -n ' +- p +- /[$]LINENO/= +- ' <$as_myself | +- sed ' +- s/[$]LINENO.*/&-/ +- t lineno +- b +- :lineno +- N +- :loop +- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ +- t loop +- s/-\n.*// +- ' >$as_me.lineno && +- chmod +x "$as_me.lineno" || +- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } +- +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensitive to this). +- . "./$as_me.lineno" +- # Exit status is that of the last command. +- exit +-} +- +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi +- +-ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in +--n*) +- case `echo 'x\c'` in +- *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; +- esac;; +-*) +- ECHO_N='-n';; +-esac +- +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- +-rm -f conf$$ conf$$.exe conf$$.file +-if test -d conf$$.dir; then +- rm -f conf$$.dir/conf$$.file +-else +- rm -f conf$$.dir +- mkdir conf$$.dir +-fi +-echo >conf$$.file +-if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' +-elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln +-else +- as_ln_s='cp -p' +-fi +-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +-rmdir conf$$.dir 2>/dev/null +- +-if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: +-else +- test -d ./-p && rmdir ./-p +- as_mkdir_p=false +-fi +- +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- if ls -dL / >/dev/null 2>&1; then +- as_ls_L_option=L +- else +- as_ls_L_option= +- fi +- as_test_x=' +- eval sh -c '\'' +- if test -d "$1"; then +- test -d "$1/."; +- else +- case $1 in +- -*)set "./$1";; +- esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in +- ???[sx]*):;;*)false;;esac;fi +- '\'' sh +- ' +-fi +-as_executable_p=$as_test_x +- +-# Sed expression to map a string onto a valid CPP name. +-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +- +-# Sed expression to map a string onto a valid variable name. +-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +- +- +- +- +-# Check that we are running under the correct shell. +-SHELL=${CONFIG_SHELL-/bin/sh} ++# Check that we are running under the correct shell. ++SHELL=${CONFIG_SHELL-/bin/sh} + + case X$lt_ECHO in + X*--fallback-echo) +@@ -698,10 +683,11 @@ fi + + + +-exec 7<&0 &1 ++test -n "$DJDIR" || exec 7<&0 &1 + + # Name of the host. +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +@@ -716,14 +702,14 @@ cross_compiling=no + subdirs= + MFLAGS= + MAKEFLAGS= +-SHELL=${CONFIG_SHELL-/bin/sh} + + # Identity of this package. +-PACKAGE_NAME= +-PACKAGE_TARNAME= +-PACKAGE_VERSION= +-PACKAGE_STRING= +-PACKAGE_BUGREPORT= ++PACKAGE_NAME='bacula' ++PACKAGE_TARNAME='bacula' ++PACKAGE_VERSION='5.0.3' ++PACKAGE_STRING='bacula 5.0.3' ++PACKAGE_BUGREPORT='' ++PACKAGE_URL='' + + ac_unique_file="src/version.h" + # Factoring default headers for most tests. +@@ -762,13653 +748,5255 @@ ac_includes_default="\ + # include + #endif" + +-ac_subst_vars='SHELL +-PATH_SEPARATOR +-PACKAGE_NAME +-PACKAGE_TARNAME +-PACKAGE_VERSION +-PACKAGE_STRING +-PACKAGE_BUGREPORT +-exec_prefix +-prefix +-program_transform_name +-bindir +-sbindir +-libexecdir +-datarootdir +-datadir +-sysconfdir +-sharedstatedir +-localstatedir +-includedir +-oldincludedir +-docdir +-infodir +-htmldir +-dvidir +-pdfdir +-psdir +-libdir +-localedir +-mandir +-DEFS +-ECHO_C +-ECHO_N +-ECHO_T +-LIBS +-build_alias +-host_alias +-target_alias +-BUILD_DIR +-TOP_DIR +-WIN32BUILDDIR +-WIN32MAINDIR +-WIN32TOPDIR +-TRUEPRG +-FALSEPRG +-VERSION +-DATE +-LSMDATE +-BACULA +-post_host +-BDB_VERSION +-LIBBAC_LT_RELEASE +-LIBBACCFG_LT_RELEASE +-LIBBACPY_LT_RELEASE +-LIBBACSQL_LT_RELEASE +-LIBBACFIND_LT_RELEASE +-CC +-CFLAGS +-LDFLAGS +-CPPFLAGS +-ac_ct_CC +-EXEEXT +-OBJEXT +-CXX +-CXXFLAGS +-ac_ct_CXX +-CPP +-GREP +-EGREP +-INSTALL_PROGRAM +-INSTALL_SCRIPT +-INSTALL_DATA +-MV +-REMOVE +-CP +-SED +-ECHO +-CMP +-TBL +-AR +-OPENSSL +-MTX +-DD +-MKISOFS +-PYTHON +-GROWISOFS +-DVDRWMEDIAINFO +-DVDRWFORMAT +-PKGCONFIG +-QMAKE +-GMAKE +-WXCONFIG +-WXFLAGS +-CDRECORD +-PIDOF +-AWK +-ARFLAGS +-MAKE_SHELL +-LOCAL_LIBS +-LOCAL_CFLAGS +-LOCAL_LDFLAGS +-LOCAL_DEFS +-LIBTOOL +-build +-build_cpu +-build_vendor +-build_os +-host +-host_cpu +-host_vendor +-host_os +-FGREP +-LD +-DUMPBIN +-ac_ct_DUMPBIN +-NM +-LN_S +-OBJDUMP +-STRIP +-RANLIB +-lt_ECHO +-DSYMUTIL +-NMEDIT +-LIPO +-OTOOL +-OTOOL64 +-CXXCPP +-DEFAULT_OBJECT_TYPE +-DEFAULT_ARCHIVE_TYPE +-DEFAULT_SHARED_OBJECT_TYPE +-LIBTOOL_INSTALL_TARGET +-LIBTOOL_UNINSTALL_TARGET +-LIBTOOL_CLEAN_TARGET +-QMAKE_LIBTOOL +-FD_PLUGIN_DIR +-INCLUDE_INSTALL_TARGET +-INCLUDE_UNINSTALL_TARGET +-HAVE_SUN_OS_TRUE +-HAVE_SUN_OS_FALSE +-HAVE_OSF1_OS_TRUE +-HAVE_OSF1_OS_FALSE +-HAVE_AIX_OS_TRUE +-HAVE_AIX_OS_FALSE +-HAVE_HPUX_OS_TRUE +-HAVE_HPUX_OS_FALSE +-HAVE_LINUX_OS_TRUE +-HAVE_LINUX_OS_FALSE +-HAVE_FREEBSD_OS_TRUE +-HAVE_FREEBSD_OS_FALSE +-HAVE_NETBSD_OS_TRUE +-HAVE_NETBSD_OS_FALSE +-HAVE_OPENBSD_OS_TRUE +-HAVE_OPENBSD_OS_FALSE +-HAVE_BSDI_OS_TRUE +-HAVE_BSDI_OS_FALSE +-HAVE_SGI_OS_TRUE +-HAVE_SGI_OS_FALSE +-HAVE_IRIX_OS_TRUE +-HAVE_IRIX_OS_FALSE +-HAVE_DARWIN_OS_TRUE +-HAVE_DARWIN_OS_FALSE +-SET_MAKE +-MKINSTALLDIRS +-USE_NLS +-MSGFMT +-GMSGFMT +-XGETTEXT +-MSGMERGE +-INTL_MACOSX_LIBS +-LIBICONV +-LTLIBICONV +-INTLLIBS +-LIBINTL +-LTLIBINTL +-POSUB +-GLIBC2 +-ALLOCA +-GLIBC21 +-HAVE_POSIX_PRINTF +-HAVE_ASPRINTF +-HAVE_SNPRINTF +-HAVE_WPRINTF +-INTLBISON +-BUILD_INCLUDED_LIBINTL +-USE_INCLUDED_LIBINTL +-CATOBJEXT +-DATADIRNAME +-INSTOBJEXT +-GENCAT +-INTLOBJS +-INTL_LIBTOOL_SUFFIX_PREFIX +-BAT_DIR +-QWT_INC +-QWT_LDFLAGS +-QWT_LIB +-QWT +-WXCONS_CPPFLAGS +-WXCONS_LDFLAGS +-WX_DIR +-TRAY_MONITOR_CPPFLAGS +-TRAY_MONITOR_LDFLAGS +-TRAY_MONITOR_DIR +-TTOOL_LDFLAGS +-STATIC_FD +-STATIC_SD +-STATIC_DIR +-STATIC_CONS +-STATIC_GNOME_CONS +-STATIC_WX_CONS +-ALL_DIRS +-DIRD_DIR +-DIR_TOOLS +-STORED_DIR +-CONS_INC +-CONS_OBJ +-CONS_SRC +-CONS_LIBS +-CONS_LDFLAGS +-READLINE_SRC +-PYTHON_LIBS +-PYTHON_INCDIR +-OPENSSL_LIBS +-OPENSSL_INC +-working_dir +-archivedir +-basename +-hostname +-scriptdir +-bsrdir +-logdir +-plugindir +-dump_email +-job_email +-smtp_host +-piddir +-subsysdir +-baseport +-dir_port +-fd_port +-sd_port +-dir_password +-fd_password +-sd_password +-mon_dir_password +-mon_fd_password +-mon_sd_password +-db_name +-db_user +-db_password +-db_port +-dir_user +-dir_group +-sd_user +-sd_group +-fd_user +-fd_group +-SBINPERM +-SQL_LFLAGS +-SQL_INCLUDE +-SQL_BINDIR +-DBI_DBD_DRIVERDIR +-uncomment_dbi +-DB_PROG +-DB_PROG_LIB +-cats +-DB_TYPE +-GETCONF +-XMKMF +-X_CFLAGS +-X_PRE_LIBS +-X_LIBS +-X_EXTRA_LIBS +-LIBOBJS +-ZLIBS +-AFS_CFLAGS +-AFS_LIBS +-CAP_LIBS +-FDLIBS +-DEBUG +-DINCLUDE +-DLIB +-DB_LIBS +-WCFLAGS +-WLDFLAGS +-WRAPLIBS +-OBJLIST +-TAPEDRIVE +-PSCMD +-WIN32 +-MACOSX +-DISTNAME ++ac_header_list= ++ac_subst_vars='LTLIBOBJS ++COMPRESS_MANPAGES + DISTVER +-LTLIBOBJS' +-ac_subst_files='MCOMMON' +- ac_precious_vars='build_alias +-host_alias +-target_alias +-CC +-CFLAGS +-LDFLAGS +-LIBS +-CPPFLAGS +-CXX +-CXXFLAGS +-CCC +-CPP +-WXCONFIG +-WXFLAGS +-CXXCPP +-XMKMF' +- +- +-# Initialize some variables set by options. +-ac_init_help= +-ac_init_version=false +-# The variables have the same names as the options, with +-# dashes changed to underlines. +-cache_file=/dev/null +-exec_prefix=NONE +-no_create= +-no_recursion= +-prefix=NONE +-program_prefix=NONE +-program_suffix=NONE +-program_transform_name=s,x,x, +-silent= +-site= +-srcdir= +-verbose= +-x_includes=NONE +-x_libraries=NONE +- +-# Installation directory options. +-# These are left unexpanded so users can "make install exec_prefix=/foo" +-# and all the variables that are supposed to be based on exec_prefix +-# by default will actually change. +-# Use braces instead of parens because sh, perl, etc. also accept them. +-# (The list follows the same order as the GNU Coding Standards.) +-bindir='${exec_prefix}/bin' +-sbindir='${exec_prefix}/sbin' +-libexecdir='${exec_prefix}/libexec' +-datarootdir='${prefix}/share' +-datadir='${datarootdir}' +-sysconfdir='${prefix}/etc' +-sharedstatedir='${prefix}/com' +-localstatedir='${prefix}/var' +-includedir='${prefix}/include' +-oldincludedir='/usr/include' +-docdir='${datarootdir}/doc/${PACKAGE}' +-infodir='${datarootdir}/info' +-htmldir='${docdir}' +-dvidir='${docdir}' +-pdfdir='${docdir}' +-psdir='${docdir}' +-libdir='${exec_prefix}/lib' +-localedir='${datarootdir}/locale' +-mandir='${datarootdir}/man' +- +-ac_prev= +-ac_dashdash= +-for ac_option +-do +- # If the previous option needs an argument, assign it. +- if test -n "$ac_prev"; then +- eval $ac_prev=\$ac_option +- ac_prev= +- continue +- fi +- +- case $ac_option in +- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +- *) ac_optarg=yes ;; +- esac +- +- # Accept the important Cygnus configure options, so we can diagnose typos. +- +- case $ac_dashdash$ac_option in +- --) +- ac_dashdash=yes ;; +- +- -bindir | --bindir | --bindi | --bind | --bin | --bi) +- ac_prev=bindir ;; +- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) +- bindir=$ac_optarg ;; +- +- -build | --build | --buil | --bui | --bu) +- ac_prev=build_alias ;; +- -build=* | --build=* | --buil=* | --bui=* | --bu=*) +- build_alias=$ac_optarg ;; +- +- -cache-file | --cache-file | --cache-fil | --cache-fi \ +- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) +- ac_prev=cache_file ;; +- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ +- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) +- cache_file=$ac_optarg ;; +- +- --config-cache | -C) +- cache_file=config.cache ;; +- +- -datadir | --datadir | --datadi | --datad) +- ac_prev=datadir ;; +- -datadir=* | --datadir=* | --datadi=* | --datad=*) +- datadir=$ac_optarg ;; +- +- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ +- | --dataroo | --dataro | --datar) +- ac_prev=datarootdir ;; +- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ +- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) +- datarootdir=$ac_optarg ;; +- +- -disable-* | --disable-*) +- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` +- # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 +- { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` +- eval enable_$ac_feature=no ;; +- +- -docdir | --docdir | --docdi | --doc | --do) +- ac_prev=docdir ;; +- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) +- docdir=$ac_optarg ;; +- +- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) +- ac_prev=dvidir ;; +- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) +- dvidir=$ac_optarg ;; +- +- -enable-* | --enable-*) +- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` +- # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 +- { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` +- eval enable_$ac_feature=\$ac_optarg ;; +- +- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ +- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +- | --exec | --exe | --ex) +- ac_prev=exec_prefix ;; +- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ +- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ +- | --exec=* | --exe=* | --ex=*) +- exec_prefix=$ac_optarg ;; +- +- -gas | --gas | --ga | --g) +- # Obsolete; use --with-gas. +- with_gas=yes ;; +- +- -help | --help | --hel | --he | -h) +- ac_init_help=long ;; +- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) +- ac_init_help=recursive ;; +- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) +- ac_init_help=short ;; +- +- -host | --host | --hos | --ho) +- ac_prev=host_alias ;; +- -host=* | --host=* | --hos=* | --ho=*) +- host_alias=$ac_optarg ;; +- +- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) +- ac_prev=htmldir ;; +- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ +- | --ht=*) +- htmldir=$ac_optarg ;; +- +- -includedir | --includedir | --includedi | --included | --include \ +- | --includ | --inclu | --incl | --inc) +- ac_prev=includedir ;; +- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ +- | --includ=* | --inclu=* | --incl=* | --inc=*) +- includedir=$ac_optarg ;; +- +- -infodir | --infodir | --infodi | --infod | --info | --inf) +- ac_prev=infodir ;; +- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) +- infodir=$ac_optarg ;; +- +- -libdir | --libdir | --libdi | --libd) +- ac_prev=libdir ;; +- -libdir=* | --libdir=* | --libdi=* | --libd=*) +- libdir=$ac_optarg ;; +- +- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ +- | --libexe | --libex | --libe) +- ac_prev=libexecdir ;; +- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ +- | --libexe=* | --libex=* | --libe=*) +- libexecdir=$ac_optarg ;; +- +- -localedir | --localedir | --localedi | --localed | --locale) +- ac_prev=localedir ;; +- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) +- localedir=$ac_optarg ;; +- +- -localstatedir | --localstatedir | --localstatedi | --localstated \ +- | --localstate | --localstat | --localsta | --localst | --locals) +- ac_prev=localstatedir ;; +- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ +- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) +- localstatedir=$ac_optarg ;; +- +- -mandir | --mandir | --mandi | --mand | --man | --ma | --m) +- ac_prev=mandir ;; +- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) +- mandir=$ac_optarg ;; +- +- -nfp | --nfp | --nf) +- # Obsolete; use --without-fp. +- with_fp=no ;; +- +- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ +- | --no-cr | --no-c | -n) +- no_create=yes ;; +- +- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ +- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) +- no_recursion=yes ;; +- +- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ +- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ +- | --oldin | --oldi | --old | --ol | --o) +- ac_prev=oldincludedir ;; +- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ +- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ +- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) +- oldincludedir=$ac_optarg ;; +- +- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) +- ac_prev=prefix ;; +- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) +- prefix=$ac_optarg ;; +- +- -program-prefix | --program-prefix | --program-prefi | --program-pref \ +- | --program-pre | --program-pr | --program-p) +- ac_prev=program_prefix ;; +- -program-prefix=* | --program-prefix=* | --program-prefi=* \ +- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) +- program_prefix=$ac_optarg ;; +- +- -program-suffix | --program-suffix | --program-suffi | --program-suff \ +- | --program-suf | --program-su | --program-s) +- ac_prev=program_suffix ;; +- -program-suffix=* | --program-suffix=* | --program-suffi=* \ +- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) +- program_suffix=$ac_optarg ;; +- +- -program-transform-name | --program-transform-name \ +- | --program-transform-nam | --program-transform-na \ +- | --program-transform-n | --program-transform- \ +- | --program-transform | --program-transfor \ +- | --program-transfo | --program-transf \ +- | --program-trans | --program-tran \ +- | --progr-tra | --program-tr | --program-t) +- ac_prev=program_transform_name ;; +- -program-transform-name=* | --program-transform-name=* \ +- | --program-transform-nam=* | --program-transform-na=* \ +- | --program-transform-n=* | --program-transform-=* \ +- | --program-transform=* | --program-transfor=* \ +- | --program-transfo=* | --program-transf=* \ +- | --program-trans=* | --program-tran=* \ +- | --progr-tra=* | --program-tr=* | --program-t=*) +- program_transform_name=$ac_optarg ;; +- +- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) +- ac_prev=pdfdir ;; +- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) +- pdfdir=$ac_optarg ;; +- +- -psdir | --psdir | --psdi | --psd | --ps) +- ac_prev=psdir ;; +- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) +- psdir=$ac_optarg ;; +- +- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +- | -silent | --silent | --silen | --sile | --sil) +- silent=yes ;; +- +- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) +- ac_prev=sbindir ;; +- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ +- | --sbi=* | --sb=*) +- sbindir=$ac_optarg ;; +- +- -sharedstatedir | --sharedstatedir | --sharedstatedi \ +- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ +- | --sharedst | --shareds | --shared | --share | --shar \ +- | --sha | --sh) +- ac_prev=sharedstatedir ;; +- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ +- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ +- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ +- | --sha=* | --sh=*) +- sharedstatedir=$ac_optarg ;; +- +- -site | --site | --sit) +- ac_prev=site ;; +- -site=* | --site=* | --sit=*) +- site=$ac_optarg ;; +- +- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) +- ac_prev=srcdir ;; +- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) +- srcdir=$ac_optarg ;; +- +- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ +- | --syscon | --sysco | --sysc | --sys | --sy) +- ac_prev=sysconfdir ;; +- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ +- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) +- sysconfdir=$ac_optarg ;; +- +- -target | --target | --targe | --targ | --tar | --ta | --t) +- ac_prev=target_alias ;; +- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) +- target_alias=$ac_optarg ;; +- +- -v | -verbose | --verbose | --verbos | --verbo | --verb) +- verbose=yes ;; +- +- -version | --version | --versio | --versi | --vers | -V) +- ac_init_version=: ;; +- +- -with-* | --with-*) +- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` +- # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid package name: $ac_package" >&2 +- { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` +- eval with_$ac_package=\$ac_optarg ;; +- +- -without-* | --without-*) +- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` +- # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid package name: $ac_package" >&2 +- { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` +- eval with_$ac_package=no ;; +- +- --x) +- # Obsolete; use --with-x. +- with_x=yes ;; +- +- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ +- | --x-incl | --x-inc | --x-in | --x-i) +- ac_prev=x_includes ;; +- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ +- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) +- x_includes=$ac_optarg ;; +- +- -x-libraries | --x-libraries | --x-librarie | --x-librari \ +- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) +- ac_prev=x_libraries ;; +- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ +- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) +- x_libraries=$ac_optarg ;; +- +- -*) { echo "$as_me: error: unrecognized option: $ac_option +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } +- ;; +- +- *=*) +- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` +- # Reject names that are not valid shell variable names. +- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 +- { (exit 1); exit 1; }; } +- eval $ac_envvar=\$ac_optarg +- export $ac_envvar ;; +- +- *) +- # FIXME: should be removed in autoconf 3.0. +- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 +- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 +- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} +- ;; +- +- esac +-done +- +-if test -n "$ac_prev"; then +- ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- { echo "$as_me: error: missing argument to $ac_option" >&2 +- { (exit 1); exit 1; }; } +-fi +- +-# Be sure to have absolute directory names. +-for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ +- datadir sysconfdir sharedstatedir localstatedir includedir \ +- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ +- libdir localedir mandir +-do +- eval ac_val=\$$ac_var +- case $ac_val in +- [\\/$]* | ?:[\\/]* ) continue;; +- NONE | '' ) case $ac_var in *prefix ) continue;; esac;; +- esac +- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; } +-done +- +-# There might be people who depend on the old broken behavior: `$host' +-# used to hold the argument of --host etc. +-# FIXME: To remove some day. +-build=$build_alias +-host=$host_alias +-target=$target_alias +- +-# FIXME: To remove some day. +-if test "x$host_alias" != x; then +- if test "x$build_alias" = x; then +- cross_compiling=maybe +- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. +- If a cross compiler is detected then cross compile mode will be used." >&2 +- elif test "x$build_alias" != "x$host_alias"; then +- cross_compiling=yes +- fi +-fi +- +-ac_tool_prefix= +-test -n "$host_alias" && ac_tool_prefix=$host_alias- +- +-test "$silent" = yes && exec 6>/dev/null +- +- +-ac_pwd=`pwd` && test -n "$ac_pwd" && +-ac_ls_di=`ls -di .` && +-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- { echo "$as_me: error: Working directory cannot be determined" >&2 +- { (exit 1); exit 1; }; } +-test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- { echo "$as_me: error: pwd does not report name of working directory" >&2 +- { (exit 1); exit 1; }; } +- +- +-# Find the source files, if location was not specified. +-if test -z "$srcdir"; then +- ac_srcdir_defaulted=yes +- # Try the directory containing this script, then the parent directory. +- ac_confdir=`$as_dirname -- "$0" || +-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$0" : 'X\(//\)[^/]' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-echo X"$0" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- srcdir=$ac_confdir +- if test ! -r "$srcdir/$ac_unique_file"; then +- srcdir=.. +- fi +-else +- ac_srcdir_defaulted=no +-fi +-if test ! -r "$srcdir/$ac_unique_file"; then +- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +- { (exit 1); exit 1; }; } +-fi +-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +-ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 +- { (exit 1); exit 1; }; } +- pwd)` +-# When building in place, set srcdir=. +-if test "$ac_abs_confdir" = "$ac_pwd"; then +- srcdir=. +-fi +-# Remove unnecessary trailing slashes from srcdir. +-# Double slashes in file names in object file debugging info +-# mess up M-x gdb in Emacs. +-case $srcdir in +-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +-esac +-for ac_var in $ac_precious_vars; do +- eval ac_env_${ac_var}_set=\${${ac_var}+set} +- eval ac_env_${ac_var}_value=\$${ac_var} +- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} +- eval ac_cv_env_${ac_var}_value=\$${ac_var} +-done +- +-# +-# Report the --help message. +-# +-if test "$ac_init_help" = "long"; then +- # Omit some internal or obsolete options to make the list less imposing. +- # This message is too long to be a string in the A/UX 3.1 sh. +- cat <<_ACEOF +-\`configure' configures this package to adapt to many kinds of systems. +- +-Usage: $0 [OPTION]... [VAR=VALUE]... +- +-To assign environment variables (e.g., CC, CFLAGS...), specify them as +-VAR=VALUE. See below for descriptions of some of the useful variables. +- +-Defaults for the options are specified in brackets. +- +-Configuration: +- -h, --help display this help and exit +- --help=short display options specific to this package +- --help=recursive display the short help of all the included packages +- -V, --version display version information and exit +- -q, --quiet, --silent do not print \`checking...' messages +- --cache-file=FILE cache test results in FILE [disabled] +- -C, --config-cache alias for \`--cache-file=config.cache' +- -n, --no-create do not create output files +- --srcdir=DIR find the sources in DIR [configure dir or \`..'] +- +-Installation directories: +- --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] +- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [PREFIX] +- +-By default, \`make install' will install all the files in +-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +-an installation prefix other than \`$ac_default_prefix' using \`--prefix', +-for instance \`--prefix=\$HOME'. +- +-For better control, use the options below. +- +-Fine tuning of the installation directories: +- --bindir=DIR user executables [EPREFIX/bin] +- --sbindir=DIR system admin executables [EPREFIX/sbin] +- --libexecdir=DIR program executables [EPREFIX/libexec] +- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] +- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] +- --localstatedir=DIR modifiable single-machine data [PREFIX/var] +- --libdir=DIR object code libraries [EPREFIX/lib] +- --includedir=DIR C header files [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc [/usr/include] +- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] +- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] +- --infodir=DIR info documentation [DATAROOTDIR/info] +- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] +- --mandir=DIR man documentation [DATAROOTDIR/man] +- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] +- --htmldir=DIR html documentation [DOCDIR] +- --dvidir=DIR dvi documentation [DOCDIR] +- --pdfdir=DIR pdf documentation [DOCDIR] +- --psdir=DIR ps documentation [DOCDIR] +-_ACEOF +- +- cat <<\_ACEOF +- +-X features: +- --x-includes=DIR X include files are in DIR +- --x-libraries=DIR X library files are in DIR +- +-System types: +- --build=BUILD configure for building on BUILD [guessed] +- --host=HOST cross-compile to build programs to run on HOST [BUILD] +-_ACEOF +-fi +- +-if test -n "$ac_init_help"; then +- +- cat <<\_ACEOF +- +-Optional Features: +- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) +- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] +- --enable-libtool enable building using GNU libtool [default=yes] +- --enable-shared[=PKGS] build shared libraries [default=yes] +- --enable-static[=PKGS] build static libraries [default=no] +- --enable-fast-install[=PKGS] +- optimize for fast installation [default=yes] +- --disable-libtool-lock avoid locking (might break parallel builds) +- --enable-includes enable installing of include files [default=no] +- --disable-nls do not use Native Language Support +- --disable-rpath do not hardcode runtime library paths +- --enable-gnome enable build of bgnome-console GUI [default=no] +- --enable-bat enable build of bat Qt4 GUI [default=no] +- --enable-bwx-console enable build of wxWidgets console [default=no] +- --enable-tray-monitor enable build of Gnome tray monitor (compatible with +- KDE [default=no] +- --enable-smartalloc enable smartalloc debugging support [default=no] +- --enable-lockmgr enable lock manager support [default=no] +- --enable-static-tools enable static tape tools [default=no] +- --enable-static-fd enable static File daemon [default=no] +- --enable-static-sd enable static Storage daemon [default=no] +- --enable-static-dir enable static Director [default=no] +- --enable-static-cons enable static Console [default=no] +- --enable-client-only build client (File daemon) only [default=no] +- --enable-build-dird enable building of dird (Director) [default=yes] +- --enable-build-stored enable building of stored (Storage daemon) +- [default=yes] +- --disable-conio disable conio support [default=no] +- --enable-ipv6 enable ipv6 support [default=yes] +- --disable-readline disable readline support [default=yes] +- --enable-batch-insert enable the DB batch insert code [default=no] +- --disable-largefile omit support for large files +- --disable-afs disable afs support [default=auto] +- --disable-acl disable acl support [default=auto] +- --disable-xattr disable xattr support [default=auto] +- +-Optional Packages: +- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +- --with-pic try to use only PIC/non-PIC objects [default=use +- both] +- --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-gnu-ld assume the C compiler uses GNU ld default=no +- --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib +- --without-libiconv-prefix don't search for libiconv in includedir and libdir +- --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib +- --without-libintl-prefix don't search for libintl in includedir and libdir +- --with-included-gettext use the GNU gettext library included here +- --with-readline[=DIR] specify readline library directory +- --with-python[=DIR] Include Python support. DIR is the Python base +- install directory, default is to search through a +- number of common places for the Python files. +- --with-tcp-wrappers[=DIR] +- enable tcpwrappers support +- --with-openssl[=DIR] Include OpenSSL support. DIR is the OpenSSL base +- --with-working-dir=PATH specify path of Bacula working directory +- --with-archivedir=PATH specify path of SD archive directory +- --with-basename=RESNAME specify base resource name for daemons +- --with-hostname=RESNAME specify host name for daemons +- --with-scriptdir=PATH specify path of Bacula scripts directory +- --with-bsrdir=PATH specify path of Bacula bsrs directory +- --with-logdir=PATH specify path of Bacula logs directory +- --with-plugindir=PATH specify path of Bacula plugins directory +- --with-dump-email=EMAIL dump email address +- --with-job-email=EMAIL job output email address +- --with-smtp-host=HOST SMTP mail host address +- --with-pid-dir=PATH specify location of Bacula pid files +- --with-subsys-dir=PATH specify location of Bacula subsys file +- --with-baseport=PORT specify base port address for daemons +- --with-dir-password=PASSWORD +- specify Director's password +- --with-fd-password=PASSWORD +- specify Client's password +- --with-sd-password=PASSWORD +- specify Storage daemon's password +- --with-mon-dir-password=PASSWORD +- specify Director's password used by the monitor +- --with-mon-fd-password=PASSWORD +- specify Client's password used by the monitor +- --with-mon-sd-password=PASSWORD +- specify Storage daemon's password used by the +- monitor +- --with-db-name=DBNAME specify database name [default=bacula] +- --with-db-user=UNAME specify database user [default=bacula] +- --with-db-password=PWD specify database password [default=*none*] +- --with-db-port=DBPORT specify a database port [default=null] +- --with-dir-user=USER specify user for Director daemon +- --with-dir-group=GROUP specify group for Director daemon +- --with-sd-user=USER specify user for Storage daemon +- --with-sd-group=GROUP specify group for Storage daemon +- --with-fd-user=USER specify user for File daemon +- --with-fd-group=GROUP specify group for File daemon +- --with-sbin-perm=MODE specify permissions for sbin binaries [default=0750] +- --with-postgresql[=DIR] Include PostgreSQL support. DIR is the PostgreSQL +- base install directory, [default=/usr/local/pgsql] +- --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base install +- directory, default is to search through a number of +- common places for the MySQL files. +- --with-embedded-mysql[=DIR] +- Include MySQL support. DIR is the MySQL base install +- directory, default is to search through a number of +- common places for the MySQL files. +- --with-ingres[=DIR] Include Ingres support. DIR is the Ingres base +- install directory, default is to search through a +- number of common places for the Ingres files. +- --with-sqlite3[=DIR] Include SQLite3 support. DIR is the SQLite3 base +- install directory, default is to search through a +- number of common places for the SQLite3 files. +- --with-dbi[=DIR] Include DBI support. DIR is the DBD base install +- directory, default is to search through a number of +- common places for the DBI files. +- --with-dbi-driver[=DRIVER] +- Suport for DBI driver. DRIVER is the one DBI driver +- like Mysql, Postgresql, others. Default is to not +- configure any driver. +- --with-x use the X Window System +- --with-afsdir[=DIR] Directory holding AFS includes/libs +- +-Some influential environment variables: +- CC C compiler command +- CFLAGS C compiler flags +- LDFLAGS linker flags, e.g. -L if you have libraries in a +- nonstandard directory +- LIBS libraries to pass to the linker, e.g. -l +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if +- you have headers in a nonstandard directory +- CXX C++ compiler command +- CXXFLAGS C++ compiler flags +- CPP C preprocessor +- WXCONFIG wx-config command. On some systems, you must set it to +- wx-config-2.6 to use wxWidgets 2.6. +- WXFLAGS Parameters to pass to wx-config (e.g. --unicode=no). +- CXXCPP C++ preprocessor +- XMKMF Path to xmkmf, Makefile generator for X Window System +- +-Use these variables to override the choices made by `configure' or to help +-it to find libraries and programs with nonstandard names/locations. +- +-_ACEOF +-ac_status=$? +-fi +- +-if test "$ac_init_help" = "recursive"; then +- # If there are subdirs, report their specific --help. +- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d "$ac_dir" || continue +- ac_builddir=. +- +-case "$ac_dir" in +-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +-*) +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +- # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` +- case $ac_top_builddir_sub in +- "") ac_top_builddir_sub=. ac_top_build_prefix= ;; +- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +- esac ;; +-esac +-ac_abs_top_builddir=$ac_pwd +-ac_abs_builddir=$ac_pwd$ac_dir_suffix +-# for backward compatibility: +-ac_top_builddir=$ac_top_build_prefix +- +-case $srcdir in +- .) # We are building in place. +- ac_srcdir=. +- ac_top_srcdir=$ac_top_builddir_sub +- ac_abs_top_srcdir=$ac_pwd ;; +- [\\/]* | ?:[\\/]* ) # Absolute name. +- ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir +- ac_abs_top_srcdir=$srcdir ;; +- *) # Relative name. +- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_build_prefix$srcdir +- ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +-esac +-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +- +- cd "$ac_dir" || { ac_status=$?; continue; } +- # Check for guested configure. +- if test -f "$ac_srcdir/configure.gnu"; then +- echo && +- $SHELL "$ac_srcdir/configure.gnu" --help=recursive +- elif test -f "$ac_srcdir/configure"; then +- echo && +- $SHELL "$ac_srcdir/configure" --help=recursive +- else +- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 +- fi || ac_status=$? +- cd "$ac_pwd" || { ac_status=$?; break; } +- done +-fi +- +-test -n "$ac_init_help" && exit $ac_status +-if $ac_init_version; then +- cat <<\_ACEOF +-configure +-generated by GNU Autoconf 2.61 +- +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +-This configure script is free software; the Free Software Foundation +-gives unlimited permission to copy, distribute and modify it. +-_ACEOF +- exit +-fi +-cat >config.log <<_ACEOF +-This file contains any messages produced by compilers while +-running configure, to aid debugging if configure makes a mistake. +- +-It was created by $as_me, which was +-generated by GNU Autoconf 2.61. Invocation command line was +- +- $ $0 $@ +- +-_ACEOF +-exec 5>>config.log +-{ +-cat <<_ASUNAME +-## --------- ## +-## Platform. ## +-## --------- ## +- +-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +-uname -m = `(uname -m) 2>/dev/null || echo unknown` +-uname -r = `(uname -r) 2>/dev/null || echo unknown` +-uname -s = `(uname -s) 2>/dev/null || echo unknown` +-uname -v = `(uname -v) 2>/dev/null || echo unknown` +- +-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +- +-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +- +-_ASUNAME +- +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- echo "PATH: $as_dir" +-done +-IFS=$as_save_IFS +- +-} >&5 +- +-cat >&5 <<_ACEOF +- +- +-## ----------- ## +-## Core tests. ## +-## ----------- ## +- +-_ACEOF +- +- +-# Keep a trace of the command line. +-# Strip out --no-create and --no-recursion so they do not pile up. +-# Strip out --silent because we don't want to record it for future runs. +-# Also quote any args containing shell meta-characters. +-# Make two passes to allow for proper duplicate-argument suppression. +-ac_configure_args= +-ac_configure_args0= +-ac_configure_args1= +-ac_must_keep_next=false +-for ac_pass in 1 2 +-do +- for ac_arg +- do +- case $ac_arg in +- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; +- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +- | -silent | --silent | --silen | --sile | --sil) +- continue ;; +- *\'*) +- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; +- esac +- case $ac_pass in +- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; +- 2) +- ac_configure_args1="$ac_configure_args1 '$ac_arg'" +- if test $ac_must_keep_next = true; then +- ac_must_keep_next=false # Got value, back to normal. +- else +- case $ac_arg in +- *=* | --config-cache | -C | -disable-* | --disable-* \ +- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ +- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ +- | -with-* | --with-* | -without-* | --without-* | --x) +- case "$ac_configure_args0 " in +- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; +- esac +- ;; +- -* ) ac_must_keep_next=true ;; +- esac +- fi +- ac_configure_args="$ac_configure_args '$ac_arg'" +- ;; +- esac +- done +-done +-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +- +-# When interrupted or exit'd, cleanup temporary files, and complete +-# config.log. We remove comments because anyway the quotes in there +-# would cause problems or look ugly. +-# WARNING: Use '\'' to represent an apostrophe within the trap. +-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +-trap 'exit_status=$? +- # Save into config.log some information that might help in debugging. +- { +- echo +- +- cat <<\_ASBOX +-## ---------------- ## +-## Cache variables. ## +-## ---------------- ## +-_ASBOX +- echo +- # The following way of writing the cache mishandles newlines in values, +-( +- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do +- eval ac_val=\$$ac_var +- case $ac_val in #( +- *${as_nl}*) +- case $ac_var in #( +- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; +- esac +- case $ac_var in #( +- _ | IFS | as_nl) ;; #( +- *) $as_unset $ac_var ;; +- esac ;; +- esac +- done +- (set) 2>&1 | +- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( +- *${as_nl}ac_space=\ *) +- sed -n \ +- "s/'\''/'\''\\\\'\'''\''/g; +- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" +- ;; #( +- *) +- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" +- ;; +- esac | +- sort +-) +- echo +- +- cat <<\_ASBOX +-## ----------------- ## +-## Output variables. ## +-## ----------------- ## +-_ASBOX +- echo +- for ac_var in $ac_subst_vars +- do +- eval ac_val=\$$ac_var +- case $ac_val in +- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; +- esac +- echo "$ac_var='\''$ac_val'\''" +- done | sort +- echo +- +- if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------------- ## +-## File substitutions. ## +-## ------------------- ## +-_ASBOX +- echo +- for ac_var in $ac_subst_files +- do +- eval ac_val=\$$ac_var +- case $ac_val in +- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; +- esac +- echo "$ac_var='\''$ac_val'\''" +- done | sort +- echo +- fi +- +- if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## +-## confdefs.h. ## +-## ----------- ## +-_ASBOX +- echo +- cat confdefs.h +- echo +- fi +- test "$ac_signal" != 0 && +- echo "$as_me: caught signal $ac_signal" +- echo "$as_me: exit $exit_status" +- } >&5 +- rm -f core *.core core.conftest.* && +- rm -f -r conftest* confdefs* conf$$* $ac_clean_files && +- exit $exit_status +-' 0 +-for ac_signal in 1 2 13 15; do +- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +-done +-ac_signal=0 +- +-# confdefs.h avoids OS command line length limits that DEFS can exceed. +-rm -f -r conftest* confdefs.h +- +-# Predefined preprocessor variables. +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_NAME "$PACKAGE_NAME" +-_ACEOF +- +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +-_ACEOF +- +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_VERSION "$PACKAGE_VERSION" +-_ACEOF +- +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_STRING "$PACKAGE_STRING" +-_ACEOF +- +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +-_ACEOF +- +- +-# Let the site file select an alternate cache file if it wants to. +-# Prefer explicitly selected file to automatically selected ones. +-if test -n "$CONFIG_SITE"; then +- set x "$CONFIG_SITE" +-elif test "x$prefix" != xNONE; then +- set x "$prefix/share/config.site" "$prefix/etc/config.site" +-else +- set x "$ac_default_prefix/share/config.site" \ +- "$ac_default_prefix/etc/config.site" +-fi +-shift +-for ac_site_file +-do +- if test -r "$ac_site_file"; then +- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +-echo "$as_me: loading site script $ac_site_file" >&6;} +- sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" +- fi +-done +- +-if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then +- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 +-echo "$as_me: loading cache $cache_file" >&6;} +- case $cache_file in +- [\\/]* | ?:[\\/]* ) . "$cache_file";; +- *) . "./$cache_file";; +- esac +- fi +-else +- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +-echo "$as_me: creating cache $cache_file" >&6;} +- >$cache_file +-fi +- +-# Check that the precious variables saved in the cache have kept the same +-# value. +-ac_cache_corrupted=false +-for ac_var in $ac_precious_vars; do +- eval ac_old_set=\$ac_cv_env_${ac_var}_set +- eval ac_new_set=\$ac_env_${ac_var}_set +- eval ac_old_val=\$ac_cv_env_${ac_var}_value +- eval ac_new_val=\$ac_env_${ac_var}_value +- case $ac_old_set,$ac_new_set in +- set,) +- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} +- ac_cache_corrupted=: ;; +- ,set) +- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} +- ac_cache_corrupted=: ;; +- ,);; +- *) +- if test "x$ac_old_val" != "x$ac_new_val"; then +- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +-echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +-echo "$as_me: current value: $ac_new_val" >&2;} +- ac_cache_corrupted=: +- fi;; +- esac +- # Pass precious variables to config.status. +- if test "$ac_new_set" = set; then +- case $ac_new_val in +- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; +- *) ac_arg=$ac_var=$ac_new_val ;; +- esac +- case " $ac_configure_args " in +- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; +- esac +- fi +-done +-if $ac_cache_corrupted; then +- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +-echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} +- { (exit 1); exit 1; }; } +-fi +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +-BUILD_DIR=`pwd` +-cd .. +-TOP_DIR=`pwd` +-cd ${BUILD_DIR} +- +- +-ac_aux_dir= +-for ac_dir in ${BUILD_DIR}/autoconf "$srcdir"/${BUILD_DIR}/autoconf; do +- if test -f "$ac_dir/install-sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install-sh -c" +- break +- elif test -f "$ac_dir/install.sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install.sh -c" +- break +- elif test -f "$ac_dir/shtool"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/shtool install -c" +- break +- fi +-done +-if test -z "$ac_aux_dir"; then +- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ${BUILD_DIR}/autoconf \"$srcdir\"/${BUILD_DIR}/autoconf" >&5 +-echo "$as_me: error: cannot find install-sh or install.sh in ${BUILD_DIR}/autoconf \"$srcdir\"/${BUILD_DIR}/autoconf" >&2;} +- { (exit 1); exit 1; }; } +-fi +- +-# These three variables are undocumented and unsupported, +-# and are intended to be withdrawn in a future Autoconf release. +-# They can cause serious problems if a builder's source tree is in a directory +-# whose full name contains unusual characters. +-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +- +- +-ac_config_headers="$ac_config_headers src/config.h:autoconf/config.h.in" +- +- +-WIN32BUILDDIR=${BUILD_DIR}/src/win32 +-WIN32MAINDIR=${BUILD_DIR} +-WIN32TOPDIR=${TOP_DIR} +- +- +- +- +-for ac_prog in true +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_TRUEPRG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $TRUEPRG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_TRUEPRG="$TRUEPRG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_TRUEPRG="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-TRUEPRG=$ac_cv_path_TRUEPRG +-if test -n "$TRUEPRG"; then +- { echo "$as_me:$LINENO: result: $TRUEPRG" >&5 +-echo "${ECHO_T}$TRUEPRG" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- test -n "$TRUEPRG" && break +-done +-test -n "$TRUEPRG" || TRUEPRG=":" +- +-for ac_prog in false +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_FALSEPRG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $FALSEPRG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_FALSEPRG="$FALSEPRG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_FALSEPRG="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-FALSEPRG=$ac_cv_path_FALSEPRG +-if test -n "$FALSEPRG"; then +- { echo "$as_me:$LINENO: result: $FALSEPRG" >&5 +-echo "${ECHO_T}$FALSEPRG" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- test -n "$FALSEPRG" && break +-done +-test -n "$FALSEPRG" || FALSEPRG=":" +- +- +- +-post_host= +-if test "x$BACULA" != x; then +- post_host=`echo -${BACULA} | tr 'A-Z ' 'a-z-'` +-fi +-BACULA=${BACULA:-Bacula} +-VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +-DATE=`sed -n -e 's/^.* \t*BDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +-LSMDATE=`sed -n -e 's/^.*LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +-BDB_VERSION=`sed -n -e 's/^.*BDB_VERSION \(.*\)$/\1/p' ${srcdir}/src/cats/cats.h` +- +-LIBBAC_LT_RELEASE=`sed -n -e 's/^#.*LIBBAC_LT_RELEASE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +-LIBBACCFG_LT_RELEASE=`sed -n -e 's/^#.*LIBBACCFG_LT_RELEASE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +-LIBBACPY_LT_RELEASE=`sed -n -e 's/^#.*LIBBACPY_LT_RELEASE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +- +-LIBBAC_LT_RELEASE=${LIBBAC_LT_RELEASE:-$VERSION} +-LIBBACCFG_LT_RELEASE=${LIBBACCFG_LT_RELEASE:-$VERSION} +-LIBBACPY_LT_RELEASE=${LIBBACPY_LT_RELEASE:-$VERSION} +- +- +-LIBBACSQL_LT_RELEASE=`sed -n -e 's/^#.*LIBBACSQL_LT_RELEASE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +- +-LIBBACSQL_LT_RELEASE=${LIBBACSQL_LT_RELEASE:-$VERSION} +- +- +-LIBBACFIND_LT_RELEASE=`sed -n -e 's/^#.*LIBBACFIND_LT_RELEASE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +- +-LIBBACFIND_LT_RELEASE=${LIBBACFIND_LT_RELEASE:-$VERSION} +- +- +-echo "configuring for ${BACULA} $VERSION ($DATE)" +- +- +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_CC="${ac_tool_prefix}gcc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "gcc", so it can be a program name with args. +-set dummy gcc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_CC="gcc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- if test "x$ac_ct_CC" = x; then +- CC="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf at gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf at gnu.org." >&2;} +-ac_tool_warned=yes ;; +-esac +- CC=$ac_ct_CC +- fi +-else +- CC="$ac_cv_prog_CC" +-fi +- +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_CC="${ac_tool_prefix}cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- fi +-fi +-if test -z "$CC"; then +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_prog_rejected=no +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +- fi +- ac_cv_prog_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-if test $ac_prog_rejected = yes; then +- # We found a bogon in the path, so make sure we never use it. +- set dummy $ac_cv_prog_CC +- shift +- if test $# != 0; then +- # We chose a different compiler from the bogus one. +- # However, it has the same basename, so the bogon will be chosen +- # first if we set CC to just the basename; use the full file name. +- shift +- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" +- fi +-fi +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +-fi +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- for ac_prog in cl.exe +- do +- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +-set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- test -n "$CC" && break +- done +-fi +-if test -z "$CC"; then +- ac_ct_CC=$CC +- for ac_prog in cl.exe +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_CC="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- test -n "$ac_ct_CC" && break +-done +- +- if test "x$ac_ct_CC" = x; then +- CC="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf at gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf at gnu.org." >&2;} +-ac_tool_warned=yes ;; +-esac +- CC=$ac_ct_CC +- fi +-fi +- +-fi +- +- +-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +- +-# Provide some information about the compiler. +-echo "$as_me:$LINENO: checking for C compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +- +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.exe b.out" +-# Try to create an executable without -o first, disregard a.out. +-# It will help us diagnose broken compilers, and finding out an intuition +-# of exeext. +-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } +-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-# +-# List of possible output files, starting from the most likely. +-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +-# only as a last resort. b.out is created by i960 compilers. +-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +-# +-# The IRIX 6 linker writes into existing files which may not be +-# executable, retaining their permissions. Remove them first so a +-# subsequent execution test works. +-ac_rmfiles= +-for ac_file in $ac_files +-do +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; +- * ) ac_rmfiles="$ac_rmfiles $ac_file";; +- esac +-done +-rm -f $ac_rmfiles +- +-if { (ac_try="$ac_link_default" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link_default") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +-# in a Makefile. We should not override ac_cv_exeext if it was cached, +-# so that the user can short-circuit this test for compilers unknown to +-# Autoconf. +-for ac_file in $ac_files '' +-do +- test -f "$ac_file" || continue +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) +- ;; +- [ab].out ) +- # We found the default executable, but exeext='' is most +- # certainly right. +- break;; +- *.* ) +- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; +- then :; else +- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- fi +- # We set ac_cv_exeext here because the later test for it is not +- # safe: cross compilers may not add the suffix if given an `-o' +- # argument, so we may need to know it at that point already. +- # Even if this section looks crufty: it has the advantage of +- # actually working. +- break;; +- * ) +- break;; +- esac +-done +-test "$ac_cv_exeext" = no && ac_cv_exeext= +- +-else +- ac_file='' +-fi +- +-{ echo "$as_me:$LINENO: result: $ac_file" >&5 +-echo "${ECHO_T}$ac_file" >&6; } +-if test -z "$ac_file"; then +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +-See \`config.log' for more details." >&5 +-echo "$as_me: error: C compiler cannot create executables +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; } +-fi +- +-ac_exeext=$ac_cv_exeext +- +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } +-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +- fi +- fi +-fi +-{ echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- +-rm -f a.out a.exe conftest$ac_cv_exeext b.out +-ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-echo "${ECHO_T}$cross_compiling" >&6; } +- +-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- # If both `conftest.exe' and `conftest' are `present' (well, observable) +-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +-# work properly (i.e., refer to `conftest.exe'), while it won't with +-# `rm'. +-for ac_file in conftest.exe conftest conftest.*; do +- test -f "$ac_file" || continue +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; +- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- break;; +- * ) break;; +- esac +-done +-else +- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-fi +- +-rm -f conftest$ac_cv_exeext +-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +-echo "${ECHO_T}$ac_cv_exeext" >&6; } +- +-rm -f conftest.$ac_ext +-EXEEXT=$ac_cv_exeext +-ac_exeext=$EXEEXT +-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } +-if test "${ac_cv_objext+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.o conftest.obj +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- for ac_file in conftest.o conftest.obj conftest.*; do +- test -f "$ac_file" || continue; +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; +- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` +- break;; +- esac +-done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-fi +- +-rm -f conftest.$ac_cv_objext conftest.$ac_ext +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +-echo "${ECHO_T}$ac_cv_objext" >&6; } +-OBJEXT=$ac_cv_objext +-ac_objext=$OBJEXT +-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +-#ifndef __GNUC__ +- choke me +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_compiler_gnu=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_cv_c_compiler_gnu=$ac_compiler_gnu +- +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +-GCC=`test $ac_compiler_gnu = yes && echo yes` @@ 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 ellson at users.sourceforge.net Sat Jun 4 18:34:15 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Sat, 04 Jun 2011 16:34:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14706] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: Revision: 14706 http://gar.svn.sourceforge.net/gar/?rev=14706&view=rev Author: ellson Date: 2011-06-04 16:34:15 +0000 (Sat, 04 Jun 2011) Log Message: ----------- graphviz: correct silly editing errors Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-06-04 15:58:50 UTC (rev 14705) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-06-04 16:34:15 UTC (rev 14706) @@ -250,6 +250,9 @@ RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibcdt5 RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibgvc6 RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibgraph5 +PKGFILES_CSWgraphvizperl = $(libdir)/graphviz/perl/.* +PKGFILES_CSWgraphvizperl += $(mandir)/man3/.*\.3perl +PKGFILES_CSWgraphvizperl += $(sharedstatedir)/graphviz/demo/.*\.pl #PACKAGES += CSWgraphvizphp SPKG_DESC_CSWgraphvizphp = Graphviz language binding for php @@ -368,7 +371,7 @@ SPKG_DESC_CSWlibcgraph6 += Graph Visualization Tools, libcgraph.so.6 RUNTIME_DEP_PKGS_CSWlibcgraph6 += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWlibcgraph6 += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWlibcgraph6 += CCSWlibcdt5 +RUNTIME_DEP_PKGS_CSWlibcgraph6 += CSWlibcdt5 PACKAGES += CSWlibgraph5 CATALOGNAME_CSWlibgraph5 = libgraph5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at opencsw.org Sat Jun 4 18:40:05 2011 From: ellson at opencsw.org (John Ellson) Date: Sat, 04 Jun 2011 12:40:05 -0400 Subject: [csw-devel] (no subject) In-Reply-To: <1307198624-sup-9677@pinkfloyd.chass.utoronto.ca> References: <1307198624-sup-9677@pinkfloyd.chass.utoronto.ca> Message-ID: <4DEA5FE5.9030604@opencsw.org> On 06/04/2011 10:44 AM, Ben Walton wrote: > Bcc: > Subject: Re: [csw-devel] SF.net SVN: gar:[14704] csw/mgar/pkg/graphviz/trunk > In-reply-to: > References: > > Excerpts from ellson's message of Sat Jun 04 10:12:35 -0400 2011: > > Hi John, > >> @@ -4,7 +4,7 @@ >> b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postinstall >> b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postuninstall >> d039829d638e26ea600f4db3e213959f configure.patch >> -85ebea4df5ba1af93d04f52dbf7b94b6 Makefile.am.patch >> +f2c5f062fb643dbb0db352a25bf09e6c Makefile.am.patch > Have you seen the makepatch GAR target? It uses git to generate your > patch and store a commit message with it (part of the patch file). > > The basics are: > > mgar patch # extract source, apply existing patches > cd work/solaris.../build-isa.../graphviz-$version/ > edit source files > cd - > mgar makepatch > (add commit message) > (follow instructions for adding it to your recipe) > > HTH. > -Ben > -- > Ben Walton > Systems Programmer - CHASS > University of Toronto > C:416.407.5610 | W:416.978.4302 > Ben, I'm not quite understanding what you want me to do? Is there something actually wrong with the patches I have now? You want me to do it a different way because? John From bdwalton at users.sourceforge.net Sat Jun 4 21:30:19 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 04 Jun 2011 19:30:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14707] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14707 http://gar.svn.sourceforge.net/gar/?rev=14707&view=rev Author: bdwalton Date: 2011-06-04 19:30:19 +0000 (Sat, 04 Jun 2011) Log Message: ----------- bacula/trunk: move scriptdir back under sysconfdir (debian does this too) as these are "configurable" scripts Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-06-04 16:34:15 UTC (rev 14706) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-06-04 19:30:19 UTC (rev 14707) @@ -213,7 +213,7 @@ CONFIGURE_ARGS += --with-tcp-wrappers=$(prefix) CONFIGURE_ARGS += --with-openssl=$(prefix) CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql5 -CONFIGURE_ARGS += --with-scriptdir=$(libexecdir_install)/$(NAME) +CONFIGURE_ARGS += --with-scriptdir=$(sysconfdir)/scripts CONFIGURE_ARGS += --with-logdir=$(localstatedir)/log/$(NAME) CONFIGURE_ARGS += --with-pid-dir=$(localstatedir)/run CONFIGURE_ARGS += --with-subsys-dir=$(localstatedir)/run/subsys @@ -276,7 +276,7 @@ PROTOTYPE_CLASS_confgroup = cswpreserveconf PROTOTYPE_GROUP_confgroup = bacula PROTOTYPE_PERMS_confgroup = 0640 -PROTOTYPE_FILES_generalperms = /opt/csw/sbin/.* /opt/csw/libexec/bacula/.* +PROTOTYPE_FILES_generalperms = /opt/csw/sbin/.* /etc/opt/csw/bacula/scripts PROTOTYPE_PERMS_generalperms = 0755 include gar/category.mk @@ -307,11 +307,6 @@ ginstall -d -m 0755 $(DOCD)_$$p; \ ginstall -m 0644 $(WORKDIR)/postmsg $(DOCD)_$$p/README.postmsg; \ done) - @( cd $(DESTDIR)/opt/csw/libexec/bacula/; \ - for f in mtx-changer.conf query.sql; do \ - mv $$f $(DESTDIR)/etc/opt/csw/bacula/$$f; \ - ln -s /etc/opt/csw/bacula/$$f $$f; \ - done) @( cd $(DESTDIR)/etc/opt/csw/bacula; \ perl -pi -e "s!!$(docdir)/$(NAME)!" query.sql ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Sat Jun 4 21:44:24 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Sat, 04 Jun 2011 19:44:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[14708] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: Revision: 14708 http://gar.svn.sourceforge.net/gar/?rev=14708&view=rev Author: ellson Date: 2011-06-04 19:44:24 +0000 (Sat, 04 Jun 2011) Log Message: ----------- graphviz: enable ruby binding Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2011-06-04 19:30:19 UTC (rev 14707) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2011-06-04 19:44:24 UTC (rev 14708) @@ -306,9 +306,10 @@ PKGFILES_CSWgraphvizr += $(mandir)/man3/.*\.3r PKGFILES_CSWgraphvizr += $(sharedstatedir)/graphviz/demo/.*\.r -#PACKAGES += CSWgraphvizruby +PACKAGES += CSWgraphvizruby SPKG_DESC_CSWgraphvizruby = Graphviz language binding for ruby RUNTIME_DEP_PKGS_CSWgraphvizruby = CSWruby +RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibruby18-1 RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWexpat RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWzlib RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWgcc4corert @@ -437,7 +438,6 @@ CONFIGURE_ARGS += --with-lasi CONFIGURE_ARGS += --without-ipsepcola CONFIGURE_ARGS += --with-rsvg -CONFIGURE_ARGS += --disable-ruby CONFIGURE_ARGS += --disable-devil CONFIGURE_ARGS += --disable-java CONFIGURE_ARGS += --disable-lua This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Jun 5 01:47:35 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 04 Jun 2011 23:47:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14709] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 14709 http://gar.svn.sourceforge.net/gar/?rev=14709&view=rev Author: bdwalton Date: 2011-06-04 23:47:35 +0000 (Sat, 04 Jun 2011) Log Message: ----------- gardev/trunk: add CSWmgar as a required package Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2011-06-04 19:44:24 UTC (rev 14708) +++ csw/mgar/pkg/gardev/trunk/Makefile 2011-06-04 23:47:35 UTC (rev 14709) @@ -25,7 +25,7 @@ RUNTIME_DEP_PKGS_CSWgar-dev += CSWxz CSWgfile CSWpy-hachoir-core RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-hachoir-parser CSWpy-libmagic RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-progressbar CSWpy-sqlobject CSWpy-yaml -RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-curl CSWpy-mako +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-curl CSWpy-mako CSWmgar MASTER_SITES = @@ -36,6 +36,7 @@ CHECKPKG_OVERRIDES_CSWgar-dev += archall-devel-package CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWlftp +CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWmgar CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgmake CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgsed CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWggrep 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 Jun 5 11:03:30 2011 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 05 Jun 2011 09:03:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14710] csw/mgar/pkg/nagios/trunk Message-ID: Revision: 14710 http://gar.svn.sourceforge.net/gar/?rev=14710&view=rev Author: j_arndt Date: 2011-06-05 09:03:29 +0000 (Sun, 05 Jun 2011) Log Message: ----------- nagios: update to 3.2.3, rewrite and cleanup of gar recipe Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/Makefile csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall Added Paths: ----------- csw/mgar/pkg/nagios/trunk/files/0002-changed-options-for-ginstall.patch csw/mgar/pkg/nagios/trunk/files/README.CSW csw/mgar/pkg/nagios/trunk/files/cswusergroup Modified: csw/mgar/pkg/nagios/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios/trunk/Makefile 2011-06-04 23:47:35 UTC (rev 14709) +++ csw/mgar/pkg/nagios/trunk/Makefile 2011-06-05 09:03:29 UTC (rev 14710) @@ -9,14 +9,16 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += CSWnagios.checkinstall CSWnagios.preinstall CSWnagios.preremove CSWnagios.prototype CSWnagios.postinstall +DISTFILES += CSWnagios.preinstall +DISTFILES += CSWnagios.postinstall DISTFILES += cswnagios +DISTFILES += cswusergroup +DISTFILES += README.CSW PATCHFILES = patch.diff # cgi/cmd.c - GNU macro __attribute__ unknown to compiler # http://article.gmane.org/gmane.network.nagios.devel/4726 # (Error 2) -PATCHFILES += install-opts.diff # sets in every Makefile.in "INSTALL_OPT="" (empty) - # necessary, so ginstall doesn't get -o and -g options +PATCHFILES += 0002-changed-options-for-ginstall.patch PACKAGES = CSWnagios CATALOGNAME = nagios @@ -26,13 +28,35 @@ RUNTIME_DEP_PKGS_CSWnagios = CSWapache2 CSWgd CSWglib2 CSWiconv CSWjpeg CSWlibtoolrt CSWggettextrt RUNTIME_DEP_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWap2modphp5 CSWbdb +RUNTIME_DEP_PKGS_CSWnagios += CSWcswclassutils -SPKG_CLASSES = none cswpreserveconf cswinitsmf - LICENSE = LICENSE NOISALIST = 1 +# +# prototype +# + +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/etc\/opt\/csw\/nagios/ { $$$$2 = "cswcptemplates" ; $$$$5 = "nagios" ; $$$$6 = "nagios" } \ + $$$$3 ~ /\/var\/opt\/csw\/nagios/ { $$$$2 = "cswcptemplates" ; $$$$5 = "nagios" ; $$$$6 = "nagios" } \ + $$$$3 ~ /\/var\/opt\/csw\/nagios\/rw/ { $$$$2 = "cswcptemplates" ; $$$$4 = "2755" ; $$$$5 = "nagios" ; $$$$6 = "nagioscm" } \ + { print }' + +# +# CSW class action utilities +# + +SPKG_CLASSES = none cswusergroup ugfiles cswmigrateconf cswcptemplates cswinitsmf cswpostmsg + +INITSMF = /etc/opt/csw/init.d/cswnagios +USERGROUP = /etc/opt/csw/pkg/CSWnagios/cswusergroup +POSTMSG = /opt/csw/share/doc/nagios/README.CSW + +# +# configure +# + prefix = $(BUILD_PREFIX)/nagios libexecdir = $(BUILD_PREFIX)/libexec/nagios-plugins sysconfdir = /etc$(prefix) @@ -41,56 +65,104 @@ CONFIGURE_ARGS += --prefix=$(prefix) CONFIGURE_ARGS += --exec-prefix=$(exec_prefix) CONFIGURE_ARGS += --with-command-user=nagios -CONFIGURE_ARGS += --with-command-group=nagios +CONFIGURE_ARGS += --with-command-group=nagioscm CONFIGURE_ARGS += --with-httpd-conf=$(sysconfdir) -CONFIGURE_ARGS += --with-gd-lib-dir=$(BUILD_PREFIX)/lib -CONFIGURE_ARGS += --with-gd-lib-inc=$(BUILD_PREFIX)/inc +CONFIGURE_ARGS += --with-gd-lib=$(BUILD_PREFIX)/lib +CONFIGURE_ARGS += --with-gd-inc=$(BUILD_PREFIX)/inc CONFIGURE_ARGS += --enable-embedded-perl CONFIGURE_ARGS += --with-checkresult-dir=/var/opt/csw/nagios/spool/checkresults CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/nagios/nagios.lock CONFIGURE_ARGS += --localstatedir=/var$(prefix) +CONFIGURE_ENV += install_user=$(USER) install_group=csw # see PATCHFILES +# +# build +# + EXTRA_LIB = $(BUILD_PREFIX)/lib +LD_OPTIONS += -R/opt/csw/lib +LD_OPTIONS += -R/opt/csw/nagios/lib + BUILD_ARGS = all ENABLE_CHECK = 0 TEST_TARGET = none -INSTALL_ARGS += install-init +# +# install +# + +#INSTALL_ARGS += install-init #INSTALL_ARGS += install-config INSTALL_ARGS += install-commandmode -LD_OPTIONS += -R/opt/csw/lib -LD_OPTIONS += -R/opt/csw/nagios/lib - include gar/category.mk -DOCS = Changelog INSTALLING README UPGRADING -DOCDEST = $(DESTDIR)$(BUILD_PREFIX)/share/doc/nagios -HTTPD_CONF = $(DESTDIR)$(sysconfdir) -CFGDIR = /etc/$(prefix) +DOCS = Changelog INSTALLING README UPGRADING +DOCDEST = $(DESTDIR)$(BUILD_PREFIX)/share/doc/nagios +HTTPD_CONF = $(DESTDIR)$(sysconfdir) +CFGDIR = /etc/opt/csw/nagios +TEMPLATEDIR = /opt/csw/etc/templates/CSWnagios/etc/opt/csw/nagios post-install-modulated: + @# + @# copying docs + @# @ginstall -m 755 -d $(DOCDEST) @ginstall -m 755 -d $(HTTPD_CONF) @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) @ginstall -m 644 $(WORKSRC)/LICENSE $(DOCDEST) - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -m 755 $(FILEDIR)/cswnagios $(DESTDIR)/etc/opt/csw/init.d/cswnagios + @ginstall -m 644 $(FILEDIR)/README.CSW $(DOCDEST) + @# + @# Start / Stopp script + @# + @ginstall -d $(DESTDIR)/etc/$(BUILD_PREFIX)/init.d + @ginstall -m 755 $(FILEDIR)/cswnagios $(DESTDIR)/etc/$(BUILD_PREFIX)/init.d/cswnagios + @# + @# creating config dirs + @# @ginstall -m 775 -d $(DESTDIR)$(CFGDIR) @ginstall -m 775 -d $(DESTDIR)$(CFGDIR)/objects - @ginstall -b -m 664 $(WORKSRC)/sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg.CSW - @ginstall -b -m 664 $(WORKSRC)/sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg.CSW - @ginstall -b -m 660 $(WORKSRC)/sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.CSW - @ginstall -b -m 644 $(WORKSRC)/sample-config/httpd.conf $(DESTDIR)$(CFGDIR)/httpd-nagios.conf - @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg.CSW - @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg.CSW - @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg.CSW - @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg.CSW - @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg.CSW - @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg.CSW - @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg.CSW - @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg.CSW + @# + @# preparing default config files -> cswcptemplate + @# + @ginstall -m 775 -d $(DESTDIR)$(TEMPLATEDIR) + @ginstall -m 775 -d $(DESTDIR)$(TEMPLATEDIR)/objects + @ginstall -b -m 664 $(WORKSRC)/sample-config/nagios.cfg $(DESTDIR)$(TEMPLATEDIR)/nagios.cfg + @ginstall -b -m 664 $(WORKSRC)/sample-config/cgi.cfg $(DESTDIR)$(TEMPLATEDIR)/cgi.cfg + @ginstall -b -m 660 $(WORKSRC)/sample-config/resource.cfg $(DESTDIR)$(TEMPLATEDIR)/resource.cfg + @ginstall -b -m 644 $(WORKSRC)/sample-config/httpd.conf $(DESTDIR)$(TEMPLATEDIR)/httpd-nagios.conf + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/templates.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/templates.cfg + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/commands.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/commands.cfg + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/contacts.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/contacts.cfg + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/timeperiods.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/timeperiods.cfg + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/localhost.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/localhost.cfg + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/windows.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/windows.cfg + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/printer.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/printer.cfg + @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/switch.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/switch.cfg + @# + @#ginstall -m 775 -d $(DESTDIR)$(TEMPLATEDIR) + @#ginstall -m 775 -d $(DESTDIR)$(TEMPLATEDIR)/objects + @#ginstall -b -m 664 $(WORKSRC)/sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg.CSW + @#ginstall -b -m 664 $(WORKSRC)/sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg.CSW + @#ginstall -b -m 660 $(WORKSRC)/sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.CSW + @#ginstall -b -m 644 $(WORKSRC)/sample-config/httpd.conf $(DESTDIR)$(CFGDIR)/httpd-nagios.conf.CSW + @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg.CSW + @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg.CSW + @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg.CSW + @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.CSW + @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg.CSW + @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg.CSW + @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg.CSW + @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg.CSW + @# + @# create user and group -> cswusergroup + @# + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWnagios + @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWnagios/cswusergroup + @# + @# end of post-install + @# @$(MAKECOOKIE) Added: csw/mgar/pkg/nagios/trunk/files/0002-changed-options-for-ginstall.patch =================================================================== --- csw/mgar/pkg/nagios/trunk/files/0002-changed-options-for-ginstall.patch (rev 0) +++ csw/mgar/pkg/nagios/trunk/files/0002-changed-options-for-ginstall.patch 2011-06-05 09:03:29 UTC (rev 14710) @@ -0,0 +1,34 @@ +From 104bbe890512e033db7654c1a0251e9a5a00572a Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Thu, 21 Apr 2011 15:41:53 +0200 +Subject: [PATCH] changed options for ginstall + +--- + configure | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 386ed46..db5e00c 100755 +--- a/configure ++++ b/configure +@@ -6127,7 +6127,7 @@ cat >>confdefs.h <<_ACEOF + #define DEFAULT_NAGIOS_GROUP "$nagios_grp" + _ACEOF + +-INSTALL_OPTS="-o $nagios_user -g $nagios_grp" ++INSTALL_OPTS="-o $install_user -g $install_group" + + + +@@ -6148,7 +6148,7 @@ fi + + + +-COMMAND_OPTS="-o $command_user -g $command_grp" ++COMMAND_OPTS="-o $install_user -g $install_group" + + + MAIL_PROG=no +-- +1.7.3.2 + Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall 2011-06-04 23:47:35 UTC (rev 14709) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall 2011-06-05 09:03:29 UTC (rev 14710) @@ -1,28 +1,58 @@ +ETCSRCDIR=/opt/csw/nagios/etc +ETCDESTDIR=/etc/opt/csw/nagios + +VARSRCDIR=/opt/csw/nagios/var +VARDESTDIR=/var/opt/csw/nagios + # -# just print out the warning because of the new config directory +# move contents of olddir to newdir # -cat << EOF +move_contents() +{ + olddir=$1 + newdir=$2 -======================================================================= + export olddir + export newdir -From Nagios 3.2.1 on the configuration and log files for this package -are stored in /etc/opt/csw/nagios/ and /var/opt/csw/nagios/. + if [ -x $olddir ] + then + tar cpf - -C $olddir . | (cd $newdir ; tar xpf -) + rm -r $olddir + fi +} -The standard config files will be moved automatically to the new -location. Files made by your own will remain in /opt/csw/nagios/etc/ -and have to be moved manually by you. +# +# go through all files and set the new path +# -Don't forget to change the pathes in your config files. Verify the -new config with the following command: +replace_path_in_files() +{ + oldpath=$1 + newpath=$2 + curpath=$3 - /opt/csw/nagios/bin/nagios -v /etc/opt/csw/nagios/nagios.cfg + cd $curpath + files=`find ./ -type f` -You can find additional information at: + for file in `echo $files` + do + cp -p $file $file.tmp + cat $file.tmp | sed -e "s;$ETCSRCDIR;$ETCDESTDIR;g" -e "s;$VARSRCDIR;$VARDESTDIR;g" > $file + rm $file.tmp + done +} - http://wiki.opencsw.org/nagios -======================================================================= -EOF +if [ -x $ETCSRCDIR ] +then + move_contents $ETCSRCDIR $ETCDESTDIR + replace_path_in_files $ETCSRCDIR $ETCDESTDIR $ETCDESTDIR +fi - +if [ -x $VARSRCDIR ] +then + move_contents $VARSRCDIR $VARDESTDIR + replace_path_in_files $VARSRCDIR $VARDESTDIR $VARDESTDIR +fi Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall =================================================================== --- csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2011-06-04 23:47:35 UTC (rev 14709) +++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2011-06-05 09:03:29 UTC (rev 14710) @@ -1,64 +1,39 @@ -# This script exists to make sure the required user -# accounts nagios and groups nagios, nagioscm exist. -# 2006-02-27: group nagioscm is required. -# 2007-09-11 Fix PKG_INSTALL_ROOT usage. BASEDIR is not used for non -# relocatable packages. - - echo "Executing preinstall" cat << EOF ======================================================================= -From Nagios 3.2.1 on the configuration and log files for this package +From Nagios 3.2.3 on the configuration and log files for this package are stored in /etc/opt/csw/nagios/ and /var/opt/csw/nagios/. -The standard config files will be moved automatically to the new -location. Files made by your own will remain in /opt/csw/nagios/etc/ -and have to be moved manually by you. +All files under /opt/csw/nagios/etc and /opt/csw/nagios/var will be +moved automatically to their new locations. All path names in these +files will be changed accordingly. In case you created files outside +these directories, please move them manually and check the path names +in them. -Don't forget to change the pathes in your config files. Verify the -new config with the following command: +If you don't have a backup of your configuration, you might want to +do it now. +Please validate the changed configuration with the following command: + /opt/csw/nagios/bin/nagios -v /etc/opt/csw/nagios/nagios.cfg You can find additional information at: http://wiki.opencsw.org/nagios - The installation will proceed in 30 seconds. + The installation will proceed in 15 seconds. Press CTRL+C if you want to stop now. ======================================================================= EOF -sleep 30 +for i in 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 +do + printf "$i " + sleep 1 +done -#If installing package on a filesystem tree not running the OS; then exit. -if [ ! x"$PKG_INSTALL_ROOT" = x"" ] ; then exit 0 ; fi - -NAGIOSHOME=/opt/csw/nagios - -if [ "$NEEDNAGGROUP" = 1 ] ; then - echo adding nagios group - /usr/sbin/groupadd nagios -fi - -if [ "$NEEDNAGUSER" = 1 ] ; then - echo adding nagios user - /usr/sbin/useradd -g nagios nagios - /usr/sbin/usermod -s /bin/false -d $NAGIOSHOME nagios -else - echo not adding user -fi - -if [ "$NEEDCMDGROUP" = 1 ] ; then - echo adding nagioscm group - /usr/sbin/groupadd nagioscm - echo adding nagios user to nagioscm group - /usr/sbin/usermod -G nagioscm nagios -fi - - -exit 0 +echo Added: csw/mgar/pkg/nagios/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/nagios/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/nagios/trunk/files/README.CSW 2011-06-05 09:03:29 UTC (rev 14710) @@ -0,0 +1,19 @@ +======================================================================= + +From Nagios 3.2.3 on the configuration and log files for this package +are stored in /etc/opt/csw/nagios/ and /var/opt/csw/nagios/. + +All files under /opt/csw/nagios/etc and /opt/csw/nagios/var were moved +automatically to their new locations. All path names in these files +were changed accordingly. In case you created files outside these +directories, please move them manually and check the path names in them. + +Please validate the changed configuration with the following command: + + /opt/csw/nagios/bin/nagios -v /etc/opt/csw/nagios/nagios.cfg + +You can find additional information at: + + http://wiki.opencsw.org/nagios + +======================================================================= Added: csw/mgar/pkg/nagios/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/nagios/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/nagios/trunk/files/cswusergroup 2011-06-05 09:03:29 UTC (rev 14710) @@ -0,0 +1,3 @@ +:nagioscm:::::: +:nagios:::::: +nagios:nagios:Nagios user:/etc/opt/csw/nagios::m:r:NP:nagioscm This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Jun 5 15:00:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 05 Jun 2011 13:00:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14711] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14711 http://gar.svn.sourceforge.net/gar/?rev=14711&view=rev Author: bdwalton Date: 2011-06-05 13:00:43 +0000 (Sun, 05 Jun 2011) Log Message: ----------- php5/trunk: add missing makecookie to post-merge after nuking the phar extension handler Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-06-05 09:03:29 UTC (rev 14710) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-06-05 13:00:43 UTC (rev 14711) @@ -349,3 +349,4 @@ post-merge: @(rm $(PKGROOT)/opt/csw/php5/extensions/phar) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Sun Jun 5 20:19:11 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Sun, 05 Jun 2011 18:19:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14712] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 14712 http://gar.svn.sourceforge.net/gar/?rev=14712&view=rev Author: ellson Date: 2011-06-05 18:19:10 +0000 (Sun, 05 Jun 2011) Log Message: ----------- ImageMagic: rebuilding for graphviz-2.28 - that's ok but librsvg2 and libxml2 are broken in unstable Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-06-05 13:00:43 UTC (rev 14711) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-06-05 18:19:10 UTC (rev 14712) @@ -26,7 +26,9 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWftype2 RUNTIME_DEP_PKGS_CSWimagemagick += CSWggettextrt RUNTIME_DEP_PKGS_CSWimagemagick += CSWglib2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWgraphviz +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgraph5 RUNTIME_DEP_PKGS_CSWimagemagick += CSWgs RUNTIME_DEP_PKGS_CSWimagemagick += CSWgtk2 RUNTIME_DEP_PKGS_CSWimagemagick += CSWilmbase @@ -41,7 +43,6 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibsm RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibtoolrt -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmf RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibx11 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxext RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxml2 @@ -52,134 +53,70 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWsunmath RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiff RUNTIME_DEP_PKGS_CSWimagemagick += CSWzlib +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibintl3 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmf +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmflite0-2-7 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibltdl7 +# these should go when rsvg & xml fixed on unstable +CHECKPKG_OVERRIDES_CSWimagemagick += missing-dependency|CSWlibxml2-2 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWggettextrt +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibcairo +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibtoolrt +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibxml2 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibwmf + BUILD_DEP_PKGS += CSWdjvulibredevel BUILD_DEP_PKGS += CSWgraphvizdevel BUILD_DEP_PKGS += CSWilmbasedevel BUILD_DEP_PKGS += CSWlcmsdevel BUILD_DEP_PKGS += CSWlibcairodevel -BUILD_DEP_PKGS += CSWlibcairodevel BUILD_DEP_PKGS += CSWliblqrdevel BUILD_DEP_PKGS += CSWlibwmfdevel BUILD_DEP_PKGS += CSWopenexrdevel BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWimagemagick) -# Old modules are linked to libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|xwd.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dps.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|x.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|xwd.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|hrz.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|miff.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|jpeg.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|rgb.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|url.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|sfw.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|uil.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pwp.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|uyvy.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|xps.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pattern.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|stegano.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|vicar.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|txt.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|mpr.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|cmyk.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|msl.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|ycbcr.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pdb.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|cut.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|jbig.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|inline.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|jp2.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|null.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dds.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|tiff.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|thumbnail.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|cip.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|ept.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|otb.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|hald.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|gif.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|avs.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pdf.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pix.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|mvg.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|exr.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|vid.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|wbmp.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pcd.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|ps2.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|clip.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|tim.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|mpc.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|xcf.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dps.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|ps3.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|mono.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|raw.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pict.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pnm.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|plasma.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|meta.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|viff.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|icon.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dib.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|histogram.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|caption.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|sct.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pcl.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|fax.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|mat.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|rla.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|ps.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|preview.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|sgi.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|png.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|cin.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|cals.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|yuv.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|pcx.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|mtv.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|magick.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|xc.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dpx.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|matte.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|wpg.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|palm.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|bmp.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|avi.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|scr.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|html.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|psd.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|info.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dcm.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|fits.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dot.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|ipl.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|label.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|xbm.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|braille.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|ttf.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|x.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|sun.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|mpeg.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|gradient.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|rle.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|art.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|gray.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|map.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|dng.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|tile.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|xpm.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|tga.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|analyze.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|libMagick.so.10.0.4|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|libMagick++.so.2.0.0|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|libMagickWand.so.2.0.0|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|libMagickCore.so.2.0.0|libX11.so.4 -CHECKPKG_OVERRIDES_CSWimagemagick += linked-against-discouraged-library|libWand.so.10.0.4|libX11.so.4 +# I want to say something rude about libtool and the entire shared lib world! +# Hoping most of this will get fixed by uninstalling imagemagic during build. +CHECKPKG_OVERRIDES_CSWimagemagick += non-uniform-lib-versions-in-package|sonames=libMagick++.so.10,libMagick++.so.2,libMagick++.so.3,libMagick.so.10,libMagickCore.so.2,libMagickCore.so.3,libMagickWand.so.2,libMagickWand.so.3,libWand.so.10 +CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagickCore.so +CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagickWand.so +CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagick++.so +CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagickCore.so +CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagickWand.so +CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagick++.so +CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libMagick++.so.10.0.4 +CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.3.0.0 +CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libMagick++.so.3.0.0 +CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libMagick++.so.3.0.0 +CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/lib|opt/csw/lib/libMagick++.so.3.0.0 +CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS11/SUNWspro/lib/rw7|opt/csw/lib/libMagick++.so.2.0.0 +CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS11/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.2.0.0 +CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS11/SUNWspro/lib|opt/csw/lib/libMagick++.so.2.0.0 +CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libMagick++.so.2.0.0 +CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.2.0.0 +CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/lib|opt/csw/lib/libMagick++.so.2.0.0 +CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS8/SUNWspro/lib/rw7|opt/csw/lib/libMagick++.so.10.0.4 +CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS8/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.10.0.4 +CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS8/SUNWspro/lib|opt/csw/lib/libMagick++.so.10.0.4 +CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.10.0.4 +# pffft! don't bug me! +CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/ImageMagick-6.6.0/config/mime.xml +CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/ImageMagick-6.6.0/ChangeLog +CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/api/MagickCore/magick-config_8h-source.html +CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/api/MagickCore/version_8h.html +CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/perl-magick.html +CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/api/MagickCore/magick-config_8h.html +CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/resources.html +CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/advanced-unix-installation.html +CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/changelog.html +CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore.so.2.0.0 +CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/install-source.html +CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagick.so.10.0.4 +CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore.so.3.0.0 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jun 6 03:55:51 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 06 Jun 2011 01:55:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14713] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 14713 http://gar.svn.sourceforge.net/gar/?rev=14713&view=rev Author: bdwalton Date: 2011-06-06 01:55:51 +0000 (Mon, 06 Jun 2011) Log Message: ----------- libxml2/trunk: drop NOISAEXEC statement Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2011-06-05 18:19:10 UTC (rev 14712) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2011-06-06 01:55:51 UTC (rev 14713) @@ -43,7 +43,6 @@ CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL)) BUILD64 = 1 -NOISAEXEC = 1 PYCOMPILE = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jun 6 14:59:33 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 06 Jun 2011 12:59:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14714] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 14714 http://gar.svn.sourceforge.net/gar/?rev=14714&view=rev Author: bdwalton Date: 2011-06-06 12:59:32 +0000 (Mon, 06 Jun 2011) Log Message: ----------- gardev/trunk: drop CSWmgar dep as it is circular Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2011-06-06 01:55:51 UTC (rev 14713) +++ csw/mgar/pkg/gardev/trunk/Makefile 2011-06-06 12:59:32 UTC (rev 14714) @@ -25,7 +25,7 @@ RUNTIME_DEP_PKGS_CSWgar-dev += CSWxz CSWgfile CSWpy-hachoir-core RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-hachoir-parser CSWpy-libmagic RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-progressbar CSWpy-sqlobject CSWpy-yaml -RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-curl CSWpy-mako CSWmgar +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-curl CSWpy-mako MASTER_SITES = @@ -36,7 +36,6 @@ CHECKPKG_OVERRIDES_CSWgar-dev += archall-devel-package CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWlftp -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWmgar CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgmake CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgsed CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWggrep 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 Jun 6 17:35:24 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 06 Jun 2011 15:35:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[14715] csw/mgar/pkg/wireshark/trunk/Makefile Message-ID: Revision: 14715 http://gar.svn.sourceforge.net/gar/?rev=14715&view=rev Author: dmichelsen Date: 2011-06-06 15:35:24 +0000 (Mon, 06 Jun 2011) Log Message: ----------- wireshark: Split packages and update dependencies Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2011-06-06 12:59:32 UTC (rev 14714) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2011-06-06 15:35:24 UTC (rev 14715) @@ -12,29 +12,100 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.bz2 -RUNTIME_DEP_PKGS_CSWwireshark += CSWgcrypt CSWgeoip CSWggettextrt CSWglib2 -RUNTIME_DEP_PKGS_CSWwireshark += CSWgpgerr CSWgtk2 CSWkrb5lib CSWlibpcap -RUNTIME_DEP_PKGS_CSWwireshark += CSWlua CSWpango CSWzlib -RUNTIME_DEP_PKGS_CSWwireshark += CSWgnutls CSWlibcares -RUNTIME_DEP_PKGS_CSWwireshark += CSWlibsmi -RUNTIME_DEP_PKGS_CSWwireshark += CSWosslrt - PATCHFILES = 0001-Solaris-9-doesn-t-have-stdint.h.patch +VENDOR_URL = http://www.wireshark.org/ + +PACKAGES += CSWwireshark +SPKG_DESC_CSWwireshark = Wireshark (was Ethereal) is a free network protocol analyzer +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWwireshark += CSWgcrypt +RUNTIME_DEP_PKGS_CSWwireshark += CSWglib2 +RUNTIME_DEP_PKGS_CSWwireshark += CSWgpgerr +RUNTIME_DEP_PKGS_CSWwireshark += CSWgtk2 +RUNTIME_DEP_PKGS_CSWwireshark += CSWpango +RUNTIME_DEP_PKGS_CSWwireshark += CSWzlib +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcares2 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibpcap1 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibwireshark0 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibwiretap0 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibwsutil0 + +PACKAGES += CSWlibwireshark0 +PKGFILES_CSWlibwireshark0 += $(call pkgfiles_lib,libwireshark.so.0) +SPKG_DESC_CSWlibwireshark0 += Wireshark library, libwireshark.so.0 +RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibsmi2 +RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlua +RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibwiretap0 +RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibwsutil0 +RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibgnutls26 +RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWgcrypt +RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibcares2 +RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWkrb5lib +RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWglib2 +# This dependency can not be verified by checkpkg +RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibsmi-mibs +CHECKPKG_OVERRIDES_CSWlibwireshark0 += surplus-dependency|CSWlibsmi-mibs + +PACKAGES += CSWlibwiretap0 +PKGFILES_CSWlibwiretap0 += $(call pkgfiles_lib,libwiretap.so.0) +SPKG_DESC_CSWlibwiretap0 += Wireshark library, libwiretap.so.0 +RUNTIME_DEP_PKGS_CSWlibwiretap0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwiretap0 += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibwiretap0 += CSWlibwsutil0 +RUNTIME_DEP_PKGS_CSWlibwiretap0 += CSWzlib + +PACKAGES += CSWlibwsutil0 +PKGFILES_CSWlibwsutil0 += $(call pkgfiles_lib,libwsutil.so.0) +SPKG_DESC_CSWlibwsutil0 += Wireshark library, libwsutil.so.0 +RUNTIME_DEP_PKGS_CSWlibwsutil0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwsutil0 += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibwsutil0 += CSWzlib + +# This is almost empty, do not split for now +#PACKAGES += CSWwireshark-dev +#SPKG_DESC_CSWwireshark-dev = Development files for Wireshark +#PKGFILES_CSWwireshark-dev += $(PKGFILES_DEVEL) +#RUNTIME_DEP_PKGS_CSWwireshark-dev += CSWwireshark +#RUNTIME_DEP_PKGS_CSWwireshark-dev += CSWlibwiretap0 +#RUNTIME_DEP_PKGS_CSWwireshark-dev += CSWlibwireshark0 +#RUNTIME_DEP_PKGS_CSWwireshark-dev += CSWlibwsutil0 + +# This is probably from kerberos, revalidate after re-release of krb5 library CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/dftest CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/rawshark CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/tshark CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/wireshark -CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libwireshark.so.0.0.1 +CHECKPKG_OVERRIDES_CSWlibwireshark0 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libwireshark.so.0.0.1 -VENDOR_URL = http://www.wireshark.org/ +# example, \fI/usr/local/share/wireshark/preferences\fR) on UNIX-compatible +CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/rawshark.1 +CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/wireshark/rawshark.html +# \&\fI/usr/local/lib/wireshark/plugins/$VERSION\fR), and then +# example, \fI/usr/local/share/wireshark/preferences\fR) on UNIX-compatible +CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/wireshark.1 +CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/wireshark/wireshark.html + +# example, \fI/usr/local/share/wireshark/preferences\fR) on UNIX-compatible +CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/tshark.1 +CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/wireshark/tshark.html + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-usr-local=no CONFIGURE_ARGS += --with-ssl=/opt/csw -# TEST_SCRIPTS = - include gar/category.mk PATH := /opt/csw/gnu:$(PATH) + +post-extract-modulated: + @# The path to the libsmi MIBs is hardwired + perl -pi \ + -e 's,/usr/share/snmp/mibs,/opt/csw/share/mibs,;' \ + $(WORKSRC)/epan/oids.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon Jun 6 20:33:21 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 06 Jun 2011 18:33:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[14716] csw/mgar/pkg Message-ID: Revision: 14716 http://gar.svn.sourceforge.net/gar/?rev=14716&view=rev Author: theferret Date: 2011-06-06 18:33:21 +0000 (Mon, 06 Jun 2011) Log Message: ----------- mbrowse: working build tree Added Paths: ----------- csw/mgar/pkg/mbrowse/ csw/mgar/pkg/mbrowse/trunk/ csw/mgar/pkg/mbrowse/trunk/Makefile csw/mgar/pkg/mbrowse/trunk/copyright csw/mgar/pkg/mbrowse/trunk/depend csw/mgar/pkg/mbrowse/trunk/patchfile.preconf csw/mgar/pkg/mbrowse/trunk/pkginfo csw/mgar/pkg/mbrowse/trunk/prototype Property changes on: csw/mgar/pkg/mbrowse/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work cswstage build Added: csw/mgar/pkg/mbrowse/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbrowse/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mbrowse/trunk/Makefile 2011-06-06 18:33:21 UTC (rev 14716) @@ -0,0 +1,173 @@ +# This file is from TEMPLATES/createpkg/Makefile.lib32 +# You MUST build this with gnu make, unfortunately. +# Mainly just because of the ARCH expansion, but also for "?=" + +# Customize your prototype file(s) as needed + +# Organization: variable defintions up top, +# targets in second half. +# Note that assignments with "?=" mean "assign if not already assigned. + +# Where do we keep local downloads of software src files +ARCHIVEDIR ?= /home/src +ARCHIVENAME ?= mbrowse-0.4.3.tar.gz +EXTRACTPROG ?= /usr/sfw/bin/gtar zfx + +# Only use ONE here. The name is used for compat with 'gar'. +MASTER_SITES ?= http://sourceforge.net/projects/mbrowse/files/0.4.3/ + +ARCH := $(shell /bin/uname -p) + +LDFLAGS_COMMON := +# mbrowse is unusual and requires this extra hack for configure +EXTRA_LD_OPTIONS=-R/opt/csw/lib + +SRCDIR= build/* + +# DO NOT specify the arch-64 stuff such as -m64 here. +# the individual targets will do that. + +CFLAGS_COMMON ?= -mt -xnorunpath -xO2 +CXXFLAGS_COMMON ?= -mt -norunpath -xO2 +CFLAGS_sparc ?= -xarch=v8 +CFLAGS_i386 ?= -xarch=386 + +# Keep this arch-neutral if possible. add arch-specific tweaks +# to arch-specific target +CONFIGURE=./configure --prefix=/opt/csw --with-snmp-prefix=/opt/csw \ + --with-snmp-type=net + + + +CREATEPKG=createpkg -r `pwd`/build/*/cswstage + + +all: $(ARCH)-32 +#all: $(ARCH)-32 package + +# ARCH-XX handles configure, build, and stage for its own combo +# + +EXTRACTPROG ?= /bin/echo ERROR: need to set EXTRACTPROG ; exit 1 ; + + + +extract: build/.extract.done + +build/.extract.done: + test -d build || mkdir build + @if test -f $(ARCHIVEDIR)/$(ARCHIVENAME) ; then \ + echo Extracting $(ARCHIVENAME) under build dir... ;\ + ( cd build && $(EXTRACTPROG) $(ARCHIVEDIR)/$(ARCHIVENAME) ) ; \ + else echo Cannot extract - $(ARCHIVEDIR)/$(ARCHIVENAME) does not exist ;\ + exit 1; \ + fi + touch build/.extract.done + + +clean distclean: + @echo Calling $@ in $(SRCDIR) + $(MAKE) -C $(SRCDIR) $@ + + +reallyclean: distclean + @echo Removing any milestone files in build as well... + @rm -f build/.??* + @echo '(However, leaving src tree intact, with any patches in it)' + @echo '(If you want, you could rm -r build, then make extract once more)' + +garchive: + @echo Call the fetch target instead: it does the same thing. + + +# Downloads the source code to the common ARCHIVEDIR +fetch: $(ARCHIVEDIR)/$(ARCHIVENAME) + @echo fetch done + +$(ARCHIVEDIR)/$(ARCHIVENAME): + wget -P $(ARCHIVEDIR) $(MASTER_SITES)/$(ARCHIVENAME) + +patch: + @echo patch: patching is handled automatically as part of the configure phase. + +stage-preserved: + @if test -f preserve-$(ARCH).tar ; then \ + echo Copying preserved arch-specific files; \ + cat preserve-$(ARCH).tar |(cd $(SRCDIR)/cswstage && tar xvf -);\ + fi + @if test -f preserve.tar ; then \ + echo Copying preserved arch-neutral files; \ + cat preserve.tar |(cd $(SRCDIR)/cswstage && tar xvf -);\ + fi + +package: stage-preserved + $(CREATEPKG) + + +# split out generic $(ARCH) sections to platform-specific sections if needed. +# but it usually should not be neccessary + + +$(ARCH)-32 :: configure-$(ARCH)-32 build-$(ARCH)-32 stage-$(ARCH)-32 + @echo Completed $(ARCH)-32 configure, build and stage + touch build/.$(ARCH)-32.done + + + +build/.$(ARCH)-32.done: $(ARCH)-32 + +# Since we share the same src tree, we should only need to +# pre-configure patching one time for all. +build/.patch-preconf.done: build/.extract.done + if test -f patchfile.preconf ; then \ + gpatch -d $(SRCDIR) -p0 prototype + @echo Dont forget to add a COPYING line !! Added: csw/mgar/pkg/mbrowse/trunk/copyright =================================================================== --- csw/mgar/pkg/mbrowse/trunk/copyright (rev 0) +++ csw/mgar/pkg/mbrowse/trunk/copyright 2011-06-06 18:33:21 UTC (rev 14716) @@ -0,0 +1,2 @@ +Please see /opt/csw/share/doc/mbrowse/COPYING for full copyright +(GPL v2) Added: csw/mgar/pkg/mbrowse/trunk/depend =================================================================== --- csw/mgar/pkg/mbrowse/trunk/depend (rev 0) +++ csw/mgar/pkg/mbrowse/trunk/depend 2011-06-06 18:33:21 UTC (rev 14716) @@ -0,0 +1,5 @@ +P CSWcommon +P CSWnetsnmp +P CSWgtk +P CSWglib +P CSWosslrt Added: csw/mgar/pkg/mbrowse/trunk/patchfile.preconf =================================================================== --- csw/mgar/pkg/mbrowse/trunk/patchfile.preconf (rev 0) +++ csw/mgar/pkg/mbrowse/trunk/patchfile.preconf 2011-06-06 18:33:21 UTC (rev 14716) @@ -0,0 +1,43 @@ +--- src/configuration.c.orig 2011-06-03 23:40:45.658211970 +0200 ++++ src/configuration.c 2011-06-06 19:44:12.974821626 +0200 +@@ -67,6 +67,9 @@ + #define STRING 0 + #define INTEGER 1 + ++#ifdef __SUNPRO_CCXX ++#define integer uint32_t ++#endif + config_opt_t config_opts[] = { + { "oid", STRING, {""}, &config.oid }, + { "readcomm", STRING, {"public"}, &config.readcomm }, +@@ -74,18 +77,18 @@ + { "host", STRING, {""}, &config.host }, + { "inst", STRING, {""}, &config.inst }, + { "value", STRING, {""}, &config.value }, +- { "save_sess", INTEGER,{integer:TRUE},&config.save_sess }, +- { "snmp_ver", INTEGER,{integer:SNMP_VERSION_1},&config.snmp_ver }, +- { "snmp_timeout", INTEGER,{integer:2},&config.snmp_timeout }, +- { "snmp_reties", INTEGER,{integer:1},&config.snmp_retries }, +- { "snmp_port", INTEGER,{integer:161},&config.snmp_port }, +- { "tree_line", INTEGER,{integer:1},&config.tree_line }, +- { "out_wrap_mode",INTEGER,{integer:GTK_WRAP_NONE},&config.out_wrap_mode }, +- { "save_window_size", INTEGER, {integer:1}, &config.save_window_size }, +- { "window_width", INTEGER, {integer:-1}, &config.window_width }, +- { "window_height", INTEGER, {integer:-1}, &config.window_height }, +- { "window_maximized", INTEGER, {integer:0}, &config.window_maximized }, +- { NULL, INTEGER, {integer:0},NULL }, ++ { "save_sess", INTEGER,TRUE,&config.save_sess }, ++ { "snmp_ver", INTEGER,{ SNMP_VERSION_1},&config.snmp_ver }, ++ { "snmp_timeout", INTEGER,{ 2},&config.snmp_timeout }, ++ { "snmp_reties", INTEGER,{ 1},&config.snmp_retries }, ++ { "snmp_port", INTEGER,{ 161},&config.snmp_port }, ++ { "tree_line", INTEGER,{ 1},&config.tree_line }, ++ { "out_wrap_mode",INTEGER,{ GTK_WRAP_NONE},&config.out_wrap_mode }, ++ { "save_window_size", INTEGER, { 1}, &config.save_window_size }, ++ { "window_width", INTEGER, { -1}, &config.window_width }, ++ { "window_height", INTEGER, { -1}, &config.window_height }, ++ { "window_maximized", INTEGER, { 0}, &config.window_maximized }, ++ { NULL, INTEGER, { 0},NULL }, + }; + + config_t *get_config() { Added: csw/mgar/pkg/mbrowse/trunk/pkginfo =================================================================== --- csw/mgar/pkg/mbrowse/trunk/pkginfo (rev 0) +++ csw/mgar/pkg/mbrowse/trunk/pkginfo 2011-06-06 18:33:21 UTC (rev 14716) @@ -0,0 +1,8 @@ +PKG=CSWmbrowse +NAME=mbrowse - SNMP MIB browser +VERSION=0.4.3,REV=YYYY.MM.DD +CATEGORY=application +VENDOR=http://sourceforge.net/projects/mbrowse/ packaged for CSW by Philip Brown +HOTLINE=http://www.opencsw.org/bugtrack/ +EMAIL=phil at opencsw.org +OPENCSW_REPOSITORY=https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/mbrowse/trunk Added: csw/mgar/pkg/mbrowse/trunk/prototype =================================================================== --- csw/mgar/pkg/mbrowse/trunk/prototype (rev 0) +++ csw/mgar/pkg/mbrowse/trunk/prototype 2011-06-06 18:33:21 UTC (rev 14716) @@ -0,0 +1,7 @@ +i pkginfo +i copyright +i depend +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/mbrowse 0755 root bin +d none /opt/csw/share/doc/mbrowse 0755 root bin +f none /opt/csw/share/doc/mbrowse/COPYING=COPYING 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon Jun 6 20:45:42 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 06 Jun 2011 18:45:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14717] csw/mgar/pkg/mbrowse/trunk/depend Message-ID: Revision: 14717 http://gar.svn.sourceforge.net/gar/?rev=14717&view=rev Author: theferret Date: 2011-06-06 18:45:42 +0000 (Mon, 06 Jun 2011) Log Message: ----------- mbrowse: correction to depend Modified Paths: -------------- csw/mgar/pkg/mbrowse/trunk/depend Modified: csw/mgar/pkg/mbrowse/trunk/depend =================================================================== --- csw/mgar/pkg/mbrowse/trunk/depend 2011-06-06 18:33:21 UTC (rev 14716) +++ csw/mgar/pkg/mbrowse/trunk/depend 2011-06-06 18:45:42 UTC (rev 14717) @@ -1,5 +1,11 @@ P CSWcommon P CSWnetsnmp -P CSWgtk -P CSWglib +P CSWgtk2 +P CSWglib2 +P CSWlibatk +P CSWfconfig +P CSWftype2 +P CSWlibcairo +P CSWlibintl8 +P CSWpango P CSWosslrt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Jun 6 23:02:16 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 6 Jun 2011 22:02:16 +0100 Subject: [csw-devel] SF.net SVN: gar:[14716] csw/mgar/pkg In-Reply-To: References: Message-ID: 2011/6/6 : > Added: csw/mgar/pkg/mbrowse/trunk/depend > =================================================================== > --- csw/mgar/pkg/mbrowse/trunk/depend ? ? ? ? ? ? ? ? ? ? ? ? ? (rev 0) > +++ csw/mgar/pkg/mbrowse/trunk/depend ? 2011-06-06 18:33:21 UTC (rev 14716) > @@ -0,0 +1,5 @@ > +P ? ? ? CSWcommon > +P ? ? ? CSWnetsnmp > +P ? ? ? CSWgtk > +P ? ? ? CSWglib > +P ? ? ?CSWosslrt Is the SSL dependency needed? The binary doesn't link against the SSL library. > Added: csw/mgar/pkg/mbrowse/trunk/prototype > =================================================================== > --- csw/mgar/pkg/mbrowse/trunk/prototype ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?(rev 0) > +++ csw/mgar/pkg/mbrowse/trunk/prototype ? ? ? ?2011-06-06 18:33:21 UTC (rev 14716) > @@ -0,0 +1,7 @@ > +i pkginfo > +i copyright > +i depend > +d none /opt/csw/bin 0755 root bin The /opt/csw/bin directory is already provided by CSWcommon. From maciej at opencsw.org Mon Jun 6 23:19:17 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 6 Jun 2011 22:19:17 +0100 Subject: [csw-devel] SF.net SVN: gar:[14716] csw/mgar/pkg In-Reply-To: References: Message-ID: 2011/6/6 Philip Brown : > 2011/6/6 Maciej Blizi?ski : >> 2011/6/6 ?: >>> Added: csw/mgar/pkg/mbrowse/trunk/depend >>> =================================================================== >>> --- csw/mgar/pkg/mbrowse/trunk/depend ? ? ? ? ? ? ? ? ? ? ? ? ? (rev 0) >>> +++ csw/mgar/pkg/mbrowse/trunk/depend ? 2011-06-06 18:33:21 UTC (rev 14716) >>> @@ -0,0 +1,5 @@ >>> +P ? ? ? CSWcommon >>> +P ? ? ? CSWnetsnmp >>> +P ? ? ? CSWgtk >>> +P ? ? ? CSWglib >>> +P ? ? ?CSWosslrt >> >> Is the SSL dependency needed? ?The binary doesn't link against the SSL library. > > it linked against libcrypto. Are you sure about this? >>> +d none /opt/csw/bin 0755 root bin >> >> The /opt/csw/bin directory is already provided by CSWcommon. > > doesnt hurt anything. We don't include directories provided by CSWcommon, do we? From theferret at users.sourceforge.net Mon Jun 6 23:33:42 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 06 Jun 2011 21:33:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14718] csw/mgar/pkg/mbrowse/trunk/depend Message-ID: Revision: 14718 http://gar.svn.sourceforge.net/gar/?rev=14718&view=rev Author: theferret Date: 2011-06-06 21:33:42 +0000 (Mon, 06 Jun 2011) Log Message: ----------- mbrowse; unneccessary indirect depend on opensslrt, removed Modified Paths: -------------- csw/mgar/pkg/mbrowse/trunk/depend Modified: csw/mgar/pkg/mbrowse/trunk/depend =================================================================== --- csw/mgar/pkg/mbrowse/trunk/depend 2011-06-06 18:45:42 UTC (rev 14717) +++ csw/mgar/pkg/mbrowse/trunk/depend 2011-06-06 21:33:42 UTC (rev 14718) @@ -8,4 +8,4 @@ P CSWlibcairo P CSWlibintl8 P CSWpango -P CSWosslrt + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Jun 6 23:42:32 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 6 Jun 2011 22:42:32 +0100 Subject: [csw-devel] SF.net SVN: gar:[14716] csw/mgar/pkg In-Reply-To: References: Message-ID: 2011/6/6 Maciej Blizi?ski : > 2011/6/6 Philip Brown : >> 2011/6/6 Maciej Blizi?ski : >>> 2011/6/6 ?: >>>> Added: csw/mgar/pkg/mbrowse/trunk/depend >>>> =================================================================== >>>> --- csw/mgar/pkg/mbrowse/trunk/depend ? ? ? ? ? ? ? ? ? ? ? ? ? (rev 0) >>>> +++ csw/mgar/pkg/mbrowse/trunk/depend ? 2011-06-06 18:33:21 UTC (rev 14716) >>>> @@ -0,0 +1,5 @@ >>>> +P ? ? ? CSWcommon >>>> +P ? ? ? CSWnetsnmp >>>> +P ? ? ? CSWgtk >>>> +P ? ? ? CSWglib >>>> +P ? ? ?CSWosslrt >>> >>> Is the SSL dependency needed? ?The binary doesn't link against the SSL library. >> >> it linked against libcrypto. > > Are you sure about this? For the record: Yes, the dependency on OpenSSL is in fact not needed. Corrected in r14718. http://sourceforge.net/apps/trac/gar/changeset/14718 The benefits of peer review! From dmichelsen at users.sourceforge.net Tue Jun 7 11:09:42 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 09:09:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14719] csw/mgar/pkg/librsvg Message-ID: Revision: 14719 http://gar.svn.sourceforge.net/gar/?rev=14719&view=rev Author: dmichelsen Date: 2011-06-07 09:09:41 +0000 (Tue, 07 Jun 2011) Log Message: ----------- librsvg: Move legacy to tags Added Paths: ----------- csw/mgar/pkg/librsvg/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/librsvg/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jun 7 11:14:12 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 09:14:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14720] csw/mgar/pkg/librsvg/trunk Message-ID: Revision: 14720 http://gar.svn.sourceforge.net/gar/?rev=14720&view=rev Author: dmichelsen Date: 2011-06-07 09:14:12 +0000 (Tue, 07 Jun 2011) Log Message: ----------- librsvg: Update to 2.34.0 and latest standards Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile csw/mgar/pkg/librsvg/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/librsvg/trunk/files/doc_makefile.patch csw/mgar/pkg/librsvg/trunk/files/fixme.sh csw/mgar/pkg/librsvg/trunk/files/librsvg-2.so.2.15.90.i csw/mgar/pkg/librsvg/trunk/files/librsvg-2.so.2.15.90.s csw/mgar/pkg/librsvg/trunk/files/test_makefiles.patch Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2011-06-07 09:09:41 UTC (rev 14719) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2011-06-07 09:14:12 UTC (rev 14720) @@ -1,149 +1,96 @@ NAME = librsvg -VERSION = 2.26 -GARSUBREV = 0 +VERSION = 2.34.0 CATEGORIES = lib DESCRIPTION = Scalable Vector Graphics library define BLURB - This is librsvg - A high performance SVG rendering library associated with the - Gnome Project. - - If you have questions or comments about librsvg, please send email to - librsvg-devel at lists.sourceforge.net. Any bugs should be reported to - http://bugzilla.gnome.org/ - - Also, more information on librsvg can be found at librsvg.sf.net + This is librsvg - A high performance SVG rendering library associated with the Gnome Project. endef -SPKG_VERSION= $(VERSION).$(GARSUBREV) +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(DISTNAME).tar.bz2 -MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(VERSION)/ -DISTFILES = $(NAME)-$(VERSION).$(GARSUBREV).tar.bz2 +# Upstream develops on gcc only +PATCHFILES += pdiff.patch +PATCHFILES += perceptualdiff.patch -DISTNAME = $(NAME)-$(VERSION).$(GARSUBREV) +VENDOR_URL = http://librsvg.sourceforge.net -SPKG_SOURCEURL = http://librsvg.sourceforge.net - LICENSE = COPYING.LIB -PACKAGES = CSWlibrsvg CSWlibrsvgdevel CSWlibrsvgdoc CSWlibrsvgmozilla CSWrsvg CSWlibrsvggnome +PACKAGES += CSWlibrsvg2-2 +SPKG_DESC_CSWlibrsvg2-2 = Scalable Vector Graphics library, librsvg-2.so.2 +PKGFILES_CSWlibrsvg2-2 += $(call pkgfiles_lib,librsvg-2.so.2) +OBSOLETED_BY_CSWlibrsvg2-2 = CSWlibrsvg +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWpango +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWpng +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibcairo +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibcroco +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgsf +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWglib2 -CATALOGNAME_CSWrsvg = rsvg -CATALOGNAME_CSWlibrsvg = librsvg -CATALOGNAME_CSWlibrsvggnome = librsvg_gnome -CATALOGNAME_CSWlibrsvgdevel = librsvg_devel -CATALOGNAME_CSWlibrsvgdoc = librsvg_doc -CATALOGNAME_CSWlibrsvgmozilla = librsvg_mozilla +PACKAGES += CSWlibrsvg-dev +SPKG_DESC_CSWlibrsvg-dev = Development files for librsvg-2.so.2 +PKGFILES_CSWlibrsvg-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibrsvg-dev += CSWlibrsvg2-2 +OBSOLETED_BY_CSWlibrsvg-dev = CSWlibrsvgdevel +CATALOGNAME_CSWlibrsvgdevel = librsvg_devel_stub -SPKG_DESC_CSWrsvg += SVG to raster image conversion utility -SPKG_DESC_CSWlibrsvg += Scalable Vector Graphics library -SPKG_DESC_CSWlibrsvgdevel += Scalable Vector Graphics library - developer package -SPKG_DESC_CSWlibrsvgdoc += Scalable Vector Graphics library - documentation -SPKG_DESC_CSWlibrsvggnome += Scalable Vector Graphics library - Gnome module -SPKG_DESC_CSWlibrsvgmozilla += Scalable Vector Graphics library - Mozilla plugin +PACKAGES += CSWlibrsvg-doc +SPKG_DESC_CSWlibrsvg-doc = Documentation for librsvg +PKGFILES_CSWlibrsvg-doc = $(sharedstatedir)/gtk-doc/.* +ARCHALL_CSWlibrsvg-doc = 1 +OBSOLETED_BY_CSWlibrsvg-doc = CSWlibrsvgdoc +CATALOGNAME_CSWlibrsvgdoc = librsvg_doc_stub -RUNTIME_DEP_PKGS_CSWrsvg += CSWfconfig +PACKAGES += CSWrsvg +SPKG_DESC_CSWrsvg += SVG to raster image conversion utility +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibrsvg2-2 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWrsvg += CSWpng RUNTIME_DEP_PKGS_CSWrsvg += CSWftype2 -RUNTIME_DEP_PKGS_CSWrsvg += CSWggettextrt -RUNTIME_DEP_PKGS_CSWrsvg += CSWglib2 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibcairo RUNTIME_DEP_PKGS_CSWrsvg += CSWgtk2 RUNTIME_DEP_PKGS_CSWrsvg += CSWlibatk -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibcairo +RUNTIME_DEP_PKGS_CSWrsvg += CSWpango RUNTIME_DEP_PKGS_CSWrsvg += CSWlibcroco +RUNTIME_DEP_PKGS_CSWrsvg += CSWfconfig RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgsf -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibrsvg -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibx11 -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWrsvg += CSWpango -RUNTIME_DEP_PKGS_CSWrsvg += CSWpng +RUNTIME_DEP_PKGS_CSWrsvg += CSWglib2 -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWbonobo2 -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWgconf2 -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWggettextrt -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWglib2 -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWgnomevfs2 -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWiconv -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibcairo -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibcroco -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibgsf -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibxrender -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWorbit2 -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWpango -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWpng -RUNTIME_DEP_PKGS_CSWlibrsvg += CSWzlib - -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWfconfig +PACKAGES += CSWlibrsvggnome +CATALOGNAME_CSWlibrsvggnome = librsvg_gnome +PKGFILES_CSWlibrsvggnome = $(libdir)/gtk-2.0/.* +SPKG_DESC_CSWlibrsvggnome += Scalable Vector Graphics library - Gnome module +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibrsvg2-2 +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWpango +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWpng RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWggettextrt -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibcairo RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWgtk2 RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibatk -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibcairo +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibcroco +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWfconfig RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibgsf -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibrsvg -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWpango -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWpng +RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWglib2 -RUNTIME_DEP_PKGS_CSWlibrsvgdevel += CSWlibrsvg -RUNTIME_DEP_PKGS_CSWlibrsvgdoc += -RUNTIME_DEP_PKGS_CSWlibrsvgmozilla += CSWggettextrt CSWglib2 +BUILD_DEP_PKGS += CSWlibxml2-dev -PKGFILES_CSWlibrsvg= $(PKGFILES_RT) -PKGFILES_CSWlibrsvgdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibrsvggnome = $(libdir)/gtk-2.0/.* -PKGFILES_CSWlibrsvgmozilla = $(libdir)/mozilla/.* -PKGFILES_CSWlibrsvgdoc = $(sharedstatedir)/gtk-doc/.* - -ARCHALL_CSWlibrsvgdoc = 1 - -# Only if building mozilla plugin -BUILD_DEP_PKGS += CSWmozilla -BUILD_DEP_PKGS += CSWlibxml2devel - -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - -# Upstream develops on gcc only -PATCHFILES = pdiff.patch -PATCHFILES += perceptualdiff.patch -# Upstream have missed adding some required libs -PATCHFILES += test_makefiles.patch -# gtkdoc-rebase doesn't exist (now it does) -#PATCHFILES += doc_makefile.patch - -LIBS=-lm -EXTRA_COMMON_EXPORTS = LIBS - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared=yes --enable-static=no -CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib - -# We want to be linked with Xrender from $(prefix)/X11/lib not -# $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4 -EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -#EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) - # Won't work until libgsf-1 is 64bit -#BUILD64 = 1 +# BUILD64 = 1 -STRIP_LIBTOOL=1 +STRIP_LIBTOOL = 1 -TEST_TARGET = check - include gar/category.mk - -post-install-isa-sparcv8: - @cp $(FILEDIR)/librsvg-2.so.2.15.90.s $(INSTALLISADIR)/opt/csw/lib/librsvg-2.so.2.15.90 - -post-install-isa-i386: - @cp $(FILEDIR)/librsvg-2.so.2.15.90.i $(INSTALLISADIR)/opt/csw/lib/librsvg-2.so.2.15.90 Modified: csw/mgar/pkg/librsvg/trunk/checksums =================================================================== --- csw/mgar/pkg/librsvg/trunk/checksums 2011-06-07 09:09:41 UTC (rev 14719) +++ csw/mgar/pkg/librsvg/trunk/checksums 2011-06-07 09:14:12 UTC (rev 14720) @@ -1,5 +1 @@ -5eddcc7be3ee182c94ee21691720c6aa doc_makefile.patch -65dbd726a514fe8b797d26254b8efc1e librsvg-2.26.0.tar.bz2 -5b0c0387946c3b7ca7feb913de436936 pdiff.patch -8a26f6d0d0cf1cfce1a1e0365c6624ce perceptualdiff.patch -803a5d10e3e9c9a561b397aade043024 test_makefiles.patch +5eb2fcd0765aa5e47a4999985e3c27ab librsvg-2.34.0.tar.bz2 Deleted: csw/mgar/pkg/librsvg/trunk/files/doc_makefile.patch =================================================================== --- csw/mgar/pkg/librsvg/trunk/files/doc_makefile.patch 2011-06-07 09:09:41 UTC (rev 14719) +++ csw/mgar/pkg/librsvg/trunk/files/doc_makefile.patch 2011-06-07 09:14:12 UTC (rev 14720) @@ -1,13 +0,0 @@ ---- librsvg-2.22.3.orig/doc/Makefile.in 2008-09-23 02:54:51.000000000 +0200 -+++ librsvg-2.22.3/doc/Makefile.in 2009-02-16 14:43:59.506582432 +0100 -@@ -568,8 +568,8 @@ - @GTK_DOC_INSTALLED_TRUE@ done; \ - @GTK_DOC_INSTALLED_TRUE@ echo '-- Installing $(srcdir)/html/index.sgml' ; \ - @GTK_DOC_INSTALLED_TRUE@ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ -- at GTK_DOC_INSTALLED_TRUE@ which gtkdoc-rebase >/dev/null && \ -- at GTK_DOC_INSTALLED_TRUE@ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ -+ at GTK_DOC_INSTALLED_TRUE@ #which gtkdoc-rebase >/dev/null && \ -+ at GTK_DOC_INSTALLED_TRUE@ #gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ - @GTK_DOC_INSTALLED_TRUE@ fi - - @GTK_DOC_INSTALLED_TRUE at uninstall-local: Deleted: csw/mgar/pkg/librsvg/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/librsvg/trunk/files/fixme.sh 2011-06-07 09:09:41 UTC (rev 14719) +++ csw/mgar/pkg/librsvg/trunk/files/fixme.sh 2011-06-07 09:14:12 UTC (rev 14720) @@ -1,49 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - 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 - Deleted: csw/mgar/pkg/librsvg/trunk/files/librsvg-2.so.2.15.90.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/librsvg/trunk/files/librsvg-2.so.2.15.90.s =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/librsvg/trunk/files/test_makefiles.patch =================================================================== --- csw/mgar/pkg/librsvg/trunk/files/test_makefiles.patch 2011-06-07 09:09:41 UTC (rev 14719) +++ csw/mgar/pkg/librsvg/trunk/files/test_makefiles.patch 2011-06-07 09:14:12 UTC (rev 14720) @@ -1,24 +0,0 @@ -diff --speed-large-files --minimal -Nru librsvg-2.22.3.orig/tests/pdiff/Makefile.in librsvg-2.22.3/tests/pdiff/Makefile.in ---- librsvg-2.22.3.orig/tests/pdiff/Makefile.in 2008-09-23 02:54:52.000000000 +0200 -+++ librsvg-2.22.3/tests/pdiff/Makefile.in 2009-02-16 03:35:29.779065807 +0100 -@@ -134,7 +134,7 @@ - LIBRSVG_MAJOR_VERSION = @LIBRSVG_MAJOR_VERSION@ - LIBRSVG_MICRO_VERSION = @LIBRSVG_MICRO_VERSION@ - LIBRSVG_MINOR_VERSION = @LIBRSVG_MINOR_VERSION@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lm - LIBTOOL = @LIBTOOL@ - LIBXML_REQUIRED = @LIBXML_REQUIRED@ - LN_S = @LN_S@ -diff --speed-large-files --minimal -Nru librsvg-2.22.3.orig/tests/Makefile.in librsvg-2.22.3/tests/Makefile.in ---- librsvg-2.22.3.orig/tests/Makefile.in 2008-09-23 02:54:52.000000000 +0200 -+++ librsvg-2.22.3/tests/Makefile.in 2009-02-16 03:35:18.338184863 +0100 -@@ -139,7 +139,7 @@ - LIBRSVG_MAJOR_VERSION = @LIBRSVG_MAJOR_VERSION@ - LIBRSVG_MICRO_VERSION = @LIBRSVG_MICRO_VERSION@ - LIBRSVG_MINOR_VERSION = @LIBRSVG_MINOR_VERSION@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lm - LIBTOOL = @LIBTOOL@ - LIBXML_REQUIRED = @LIBXML_REQUIRED@ - LN_S = @LN_S@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jun 7 11:24:43 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 09:24:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14721] csw/mgar/pkg/librsvg/trunk/Makefile Message-ID: Revision: 14721 http://gar.svn.sourceforge.net/gar/?rev=14721&view=rev Author: dmichelsen Date: 2011-06-07 09:24:42 +0000 (Tue, 07 Jun 2011) Log Message: ----------- librsvg: Add override for gnome package naming Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2011-06-07 09:14:12 UTC (rev 14720) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2011-06-07 09:24:42 UTC (rev 14721) @@ -67,6 +67,8 @@ PACKAGES += CSWlibrsvggnome CATALOGNAME_CSWlibrsvggnome = librsvg_gnome +# This is a legacy package name +CHECKPKG_OVERRIDES_CSWlibrsvggnome += catalogname-does-not-match-pkgname|pkgname=CSWlibrsvggnome|catalogname=librsvg_gnome|expected-catalogname=librsvggnome PKGFILES_CSWlibrsvggnome = $(libdir)/gtk-2.0/.* SPKG_DESC_CSWlibrsvggnome += Scalable Vector Graphics library - Gnome module RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibrsvg2-2 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 Jun 7 11:29:54 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 09:29:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14722] csw/mgar/pkg/libsmi/trunk/Makefile Message-ID: Revision: 14722 http://gar.svn.sourceforge.net/gar/?rev=14722&view=rev Author: dmichelsen Date: 2011-06-07 09:29:54 +0000 (Tue, 07 Jun 2011) Log Message: ----------- libsmi: Fix stub catalog name for MIB package Modified Paths: -------------- csw/mgar/pkg/libsmi/trunk/Makefile Modified: csw/mgar/pkg/libsmi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsmi/trunk/Makefile 2011-06-07 09:24:42 UTC (rev 14721) +++ csw/mgar/pkg/libsmi/trunk/Makefile 2011-06-07 09:29:54 UTC (rev 14722) @@ -40,6 +40,7 @@ PKGFILES_CSWlibsmi-mibs += $(sharedstatedir)/pibs/.* ARCHALL_CSWlibsmi-mibs = 1 OBSOLETED_BY_CSWlibsmi-mibs = CSWlibsmimibs +CATALOGNAME_CSWlibsmimibs = libsmi_mibs_stub BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jun 7 15:00:25 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 13:00:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14723] csw/mgar/pkg Message-ID: Revision: 14723 http://gar.svn.sourceforge.net/gar/?rev=14723&view=rev Author: dmichelsen Date: 2011-06-07 13:00:25 +0000 (Tue, 07 Jun 2011) Log Message: ----------- libwebp: Initial commit Added Paths: ----------- csw/mgar/pkg/libwebp/ csw/mgar/pkg/libwebp/Makefile csw/mgar/pkg/libwebp/branches/ csw/mgar/pkg/libwebp/tags/ csw/mgar/pkg/libwebp/trunk/ csw/mgar/pkg/libwebp/trunk/Makefile csw/mgar/pkg/libwebp/trunk/checksums csw/mgar/pkg/libwebp/trunk/files/ Copied: csw/mgar/pkg/libwebp/Makefile (from rev 14718, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libwebp/Makefile (rev 0) +++ csw/mgar/pkg/libwebp/Makefile 2011-06-07 13:00:25 UTC (rev 14723) @@ -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/libwebp/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/libwebp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libwebp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libwebp/trunk/Makefile 2011-06-07 13:00:25 UTC (rev 14723) @@ -0,0 +1,40 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libwebp +VERSION = 0.1.2 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = An image format that does lossy compression of digital photographic images +define BLURB +endef + +GOOGLE_PROJECT = webp +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +PACKAGES += CSWlibwebp-dev +SPKG_DESC_CSWlibwebp-dev = Development files for libwebp.so.0 +PKGFILES_CSWlibwebp-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibwebp-dev += CSWlibwebp0 + +PACKAGES += CSWlibwebp0 +SPKG_DESC_CSWlibwebp0 = Library for the WebP lossy photographic image format, libwebp.so.0 +PKGFILES_CSWlibwebp0 = $(call pkgfiles_lib,libwebp.so.0) + +PACKAGES += CSWwebp +SPKG_DESC_CSWwebp = An image format that does lossy compression of digital photographic images +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWwebp += CSWlibwebp0 +RUNTIME_DEP_PKGS_CSWwebp += CSWpng +RUNTIME_DEP_PKGS_CSWwebp += CSWjpeg + +BUILD64 = 1 + +include gar/category.mk + +post-extract-modulated: + @# This tarball has not been boostrapped + -cd $(WORKSRC) && ./autogen.sh + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/libwebp/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libwebp/trunk/checksums =================================================================== --- csw/mgar/pkg/libwebp/trunk/checksums (rev 0) +++ csw/mgar/pkg/libwebp/trunk/checksums 2011-06-07 13:00:25 UTC (rev 14723) @@ -0,0 +1 @@ +5534f6e3c8b9f5851a9a5b56bf78f2b0 libwebp-0.1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jun 7 15:34:29 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 13:34:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[14724] csw/mgar/pkg/libwebp/trunk/Makefile Message-ID: Revision: 14724 http://gar.svn.sourceforge.net/gar/?rev=14724&view=rev Author: dmichelsen Date: 2011-06-07 13:34:29 +0000 (Tue, 07 Jun 2011) Log Message: ----------- libwebp: Lower optimizer level on amd64 as it leads to corrupt assembly Modified Paths: -------------- csw/mgar/pkg/libwebp/trunk/Makefile Modified: csw/mgar/pkg/libwebp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libwebp/trunk/Makefile 2011-06-07 13:00:25 UTC (rev 14723) +++ csw/mgar/pkg/libwebp/trunk/Makefile 2011-06-07 13:34:29 UTC (rev 14724) @@ -32,6 +32,10 @@ BUILD64 = 1 +# On amd64 -xO3 results in an assembler error +OPT_FLAGS_SOS-amd64 = -xO2 +OPT_FLAGS_SOS = $(or $(OPT_FLAGS_SOS-$(ISA)),-xO3) + include gar/category.mk post-extract-modulated: 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 Jun 7 15:54:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 13:54:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14725] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 14725 http://gar.svn.sourceforge.net/gar/?rev=14725&view=rev Author: dmichelsen Date: 2011-06-07 13:54:48 +0000 (Tue, 07 Jun 2011) Log Message: ----------- wmf: Fix typo Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2011-06-07 13:34:29 UTC (rev 14724) +++ csw/mgar/pkg/wmf/trunk/Makefile 2011-06-07 13:54:48 UTC (rev 14725) @@ -71,7 +71,7 @@ ARCHALL_CSWlibwmfdevel = 1 # Come on, it has no files CHECKPKG_OVERRIDES_CSWlibwmfdevel += archall-devel-package -RUNTIME_DEP_PKGs_CSWlibwmfdevel = CSWlibwmf-dev +RUNTIME_DEP_PKGS_CSWlibwmfdevel = CSWlibwmf-dev PACKAGES += CSWlibwmf-dev CATALOGNAME_CSWlibwmf-dev = libwmf_dev 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 Jun 7 16:33:43 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 14:33:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14726] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 14726 http://gar.svn.sourceforge.net/gar/?rev=14726&view=rev Author: dmichelsen Date: 2011-06-07 14:33:42 +0000 (Tue, 07 Jun 2011) Log Message: ----------- wmf: Update to latest GAR defaults Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2011-06-07 13:54:48 UTC (rev 14725) +++ csw/mgar/pkg/wmf/trunk/Makefile 2011-06-07 14:33:42 UTC (rev 14726) @@ -35,20 +35,11 @@ RUNTIME_DEP_PKGS_CSWwmf += CSWlibwmflite0-2-7 CHECKPKG_OVERRIDES_CSWwmf += surplus-dependency|CSWwmffonts -PACKAGES += CSWlibwmf -CATALOGNAME_CSWlibwmf = libwmf -SPKG_DESC_CSWlibwmf = Transitional package as contents moved to -PKGFILES_CSWlibwmf = NOFILES -ARCHALL_CSWlibwmf = 1 -RUNTIME_DEP_PKGS_CSWlibwmf += CSWlibwmf0-2-7 -CHECKPKG_OVERRIDES_CSWlibwmf += surplus-dependency|CSWlibwmf0-2-7 -RUNTIME_DEP_PKGS_CSWlibwmf += CSWlibwmflite0-2-7 -CHECKPKG_OVERRIDES_CSWlibwmf += surplus-dependency|CSWlibwmflite0-2-7 - PACKAGES += CSWlibwmflite0-2-7 CATALOGNAME_CSWlibwmflite0-2-7 = libwmflite0_2_7 PKGFILES_CSWlibwmflite0-2-7 += $(call baseisadirs,$(libdir),libwmflite-0\.2\.so\.7(\.\d+)*) SPKG_DESC_CSWlibwmflite0-2-7 += Library and tools for manipulating Windows metafiles - runtime package, libwmflite-0.2.so.7 +OBSOLETED_BY_CSWlibwmflite0-2-7 = CSWlibwmf PACKAGES += CSWlibwmf0-2-7 CATALOGNAME_CSWlibwmf0-2-7 = libwmf0_2_7 @@ -61,24 +52,16 @@ RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWzlib RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWlibxml2 RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWftype2 +OBSOLETED_BY_CSWlibwmf0-2-7 = CSWlibwmf -PACKAGES += CSWlibwmfdevel -CATALOGNAME_CSWlibwmfdevel = libwmf_devel -# This is a legacy name -CHECKPKG_OVERRIDES_CSWlibwmfdevel += catalogname-does-not-match-pkgname|pkgname=CSWlibwmfdevel|catalogname=libwmf_devel|expected-catalogname=libwmfdevel -SPKG_DESC_CSWlibwmfdevel = Transitional package as contents moved to CSWlibwmf-dev -PKGFILES_CSWlibwmfdevel = NOFILES -ARCHALL_CSWlibwmfdevel = 1 -# Come on, it has no files -CHECKPKG_OVERRIDES_CSWlibwmfdevel += archall-devel-package -RUNTIME_DEP_PKGS_CSWlibwmfdevel = CSWlibwmf-dev - PACKAGES += CSWlibwmf-dev CATALOGNAME_CSWlibwmf-dev = libwmf_dev SPKG_DESC_CSWlibwmf-dev += Library and tools for manipulating Windows metafiles - developer package PKGFILES_CSWlibwmf-dev = $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibwmf-dev += CSWlibwmflite0-2-7 RUNTIME_DEP_PKGS_CSWlibwmf-dev += CSWlibwmf0-2-7 +OBSOLETED_BY_CSWlibwmf-dev = CSWlibwmfdevel +CATALOGNAME_CSWlibwmfdevel = libwmf_devel_stub PACKAGES += CSWlibwmfdoc CATALOGNAME_CSWlibwmfdoc = libwmf_doc @@ -113,7 +96,6 @@ CSW_DEFAULT_FONTPATH = $(sharedstatedir)/fonts/truetype BUILD64 = 1 -NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-x @@ -129,11 +111,6 @@ CONFIGURE_ARGS += --with-gsfontmap=$(datadir)/ghostscript/Resource/Init/Fontmap.GS CONFIGURE_ARGS += --with-gsfontdir=$(datadir)/ghostscript/fonts -TEST_TARGET = check - -MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only -MERGE_DIRS_isa-extra = $(libdir) - # These are just docs CHECKPKG_OVERRIDES_CSWlibwmfdoc += file-with-bad-content 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 Jun 7 16:44:16 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 14:44:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14727] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 14727 http://gar.svn.sourceforge.net/gar/?rev=14727&view=rev Author: dmichelsen Date: 2011-06-07 14:44:16 +0000 (Tue, 07 Jun 2011) Log Message: ----------- wmf: Update dependencies Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2011-06-07 14:33:42 UTC (rev 14726) +++ csw/mgar/pkg/wmf/trunk/Makefile 2011-06-07 14:44:16 UTC (rev 14727) @@ -30,7 +30,7 @@ RUNTIME_DEP_PKGS_CSWwmf += CSWzlib RUNTIME_DEP_PKGS_CSWwmf += CSWwmffonts RUNTIME_DEP_PKGS_CSWwmf += CSWiconv -RUNTIME_DEP_PKGS_CSWwmf += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWwmf += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWwmf += CSWlibwmf0-2-7 RUNTIME_DEP_PKGS_CSWwmf += CSWlibwmflite0-2-7 CHECKPKG_OVERRIDES_CSWwmf += surplus-dependency|CSWwmffonts @@ -50,7 +50,7 @@ RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWpng RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWiconv RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWzlib -RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibwmf0-2-7 += CSWftype2 OBSOLETED_BY_CSWlibwmf0-2-7 = CSWlibwmf @@ -85,7 +85,7 @@ CHECKPKG_OVERRIDES_CSWlibwmfgtk += catalogname-does-not-match-pkgname|pkgname=CSWlibwmfgtk|catalogname=libwmf_gtk|expected-catalogname=libwmfgtk SPKG_DESC_CSWlibwmfgtk += Library and tools for manipulating Windows metafiles - GTK loader PKGFILES_CSWlibwmfgtk = $(libdir).*/io-wmf.so -RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWglib2 RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWgtk2 RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWlibwmf0-2-7 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jun 7 17:06:34 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 15:06:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[14728] csw/mgar/pkg Message-ID: Revision: 14728 http://gar.svn.sourceforge.net/gar/?rev=14728&view=rev Author: dmichelsen Date: 2011-06-07 15:06:34 +0000 (Tue, 07 Jun 2011) Log Message: ----------- liblcms2: Initial commit, testsuite dumps core on 64 bit Modified Paths: -------------- csw/mgar/pkg/liblcms2/trunk/Makefile csw/mgar/pkg/liblcms2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/liblcms2/ csw/mgar/pkg/liblcms2/trunk/files/0001-Remove-hardcoded-Wall.patch Modified: csw/mgar/pkg/liblcms2/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblcms/trunk/Makefile 2011-06-06 21:33:42 UTC (rev 14718) +++ csw/mgar/pkg/liblcms2/trunk/Makefile 2011-06-07 15:06:34 UTC (rev 14728) @@ -1,10 +1,7 @@ -NAME = lcms -VERSION = 1.18a +NAME = lcms2 +VERSION = 2.2 CATEGORIES = apps -LCMS_VERSION := $(shell echo $(VERSION) | sed -e 's/[a-z]//g') -LCMS_RELEASE := $(shell echo $(VERSION) | sed -e 's/[^a-z]//g') -DISTNAME = $(NAME)-$(LCMS_VERSION) DESCRIPTION = The little color management system and tools define BLURB Little cms intends to be a small-footprint, speed optimized @@ -17,26 +14,22 @@ as well as being distributed in major linux environments. endef -MASTER_SITES = http://www.littlecms.com/ +SF_PROJ = lcms +MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWlcms -CATALOGNAME_CSWlcms = lcms -SPKG_DESC_CSWlcms = $(DESCRIPTION) +PATCHFILES += 0001-Remove-hardcoded-Wall.patch -RUNTIME_DEP_PKGS_CSWlcms = CSWjpeg CSWtiff CSWzlib +VENDOR_URL = http://www.littlecms.com/ -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +# Probably make separate package for Solaris 10 as it has float support +EXTRA_CPPFLAGS-5.9 = -Dpowf=pow -Dfabsf=labs +EXTRA_CPPFLAGS = $(EXTRA_CPPFLAGS-$(GAROSREL)) -BUILD64 = 1 -STRIP_LIBTOOL = 1 +EXTRA_LINKER_FLAGS = -lm -CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check +OPT_FLAGS_SOS = -xO0 -include gar/category.mk -SPKG_VERSION := $(LCMS_VERSION) -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(LCMS_RELEASE) +BUILD64 = 1 +include gar/category.mk Modified: csw/mgar/pkg/liblcms2/trunk/checksums =================================================================== --- csw/mgar/pkg/liblcms/trunk/checksums 2011-06-06 21:33:42 UTC (rev 14718) +++ csw/mgar/pkg/liblcms2/trunk/checksums 2011-06-07 15:06:34 UTC (rev 14728) @@ -1 +1 @@ -f4abfe1c57ea3f633c2e9d034e74e3e8 download/lcms-1.18a.tar.gz +aaf33c7c25675e6163189ba488ae20f5 lcms2-2.2.tar.gz Added: csw/mgar/pkg/liblcms2/trunk/files/0001-Remove-hardcoded-Wall.patch =================================================================== --- csw/mgar/pkg/liblcms2/trunk/files/0001-Remove-hardcoded-Wall.patch (rev 0) +++ csw/mgar/pkg/liblcms2/trunk/files/0001-Remove-hardcoded-Wall.patch 2011-06-07 15:06:34 UTC (rev 14728) @@ -0,0 +1,25 @@ +From 3e8a1c71e3c350e9a0f31a00cb747959d48d73ba Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 7 Jun 2011 15:32:08 +0200 +Subject: [PATCH] Remove hardcoded -Wall + +--- + testbed/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/testbed/Makefile.in b/testbed/Makefile.in +index 89f5c13..0be576f 100644 +--- a/testbed/Makefile.in ++++ b/testbed/Makefile.in +@@ -81,7 +81,7 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ +-CFLAGS = --pedantic -Wall -std=c99 -O2 ++CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CXX = @CXX@ +-- +1.7.5.4 + 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 Jun 7 17:32:17 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 15:32:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14729] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 14729 http://gar.svn.sourceforge.net/gar/?rev=14729&view=rev Author: dmichelsen Date: 2011-06-07 15:32:17 +0000 (Tue, 07 Jun 2011) Log Message: ----------- ImageMagick: Update to 6.7.0-4, complete rework Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/ImageMagick/trunk/files/Makefile.patch csw/mgar/pkg/ImageMagick/trunk/files/configure.diff Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-06-07 15:06:34 UTC (rev 14728) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-06-07 15:32:17 UTC (rev 14729) @@ -1,6 +1,6 @@ NAME = imagemagick -VERSION = 6.6.0 -GARSUBREV = 9 +VERSION = 6.7.0 +GARSUBREV = 4 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -12,179 +12,265 @@ endef MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/ -DISTFILES = ImageMagick-$(VERSION)-$(GARSUBREV).tar.bz2 - DISTNAME = ImageMagick-$(VERSION)-$(GARSUBREV) +DISTFILES = $(DISTNAME).tar.xz -SPKG_SOURCEURL = http://www.imagemagick.org +VENDOR_URL = http://www.imagemagick.org LICENSE = LICENSE +# Shared library suffix .10 has been used to mean "1.0" + +#PACKAGES += CSWlibmagick++10 +#PKGFILES_CSWlibmagick++10 += $(call pkgfiles_lib,libMagick++.so.10) +#SPKG_DESC_CSWlibmagick++10 += Library from ImageMagick, libMagick++.so.10 +#RUNTIME_DEP_PKGS_CSWlibmagick++10 += CSWlibwand10 +#RUNTIME_DEP_PKGS_CSWlibmagick++10 += CSWftype2 +#RUNTIME_DEP_PKGS_CSWlibmagick++10 += CSWlibmagick10 +#RUNTIME_DEP_PKGS_CSWlibmagick++10 += CSWsunmath +#RUNTIME_DEP_PKGS_CSWlibmagick++10 += CSWzlib + +#PACKAGES += CSWlibmagick++2 +#PKGFILES_CSWlibmagick++2 += $(call pkgfiles_lib,libMagick++.so.2) +#SPKG_DESC_CSWlibmagick++2 += Library from ImageMagick, libMagick++.so.2 +#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWlibmagickwand2 +#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWjpeg +#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWlcmsrt +#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWtiff +#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWzlib +#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWftype2 +#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWlibmagickcore2 +#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWfconfig + +PACKAGES += CSWlibmagick++4 +PKGFILES_CSWlibmagick++4 += $(call pkgfiles_lib,libMagick++.so.4) +SPKG_DESC_CSWlibmagick++4 += Library from ImageMagick, libMagick++.so.4 +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWjpeg +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWliblqr +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWtiff +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibmagickcore4 +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWbzip2 +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibmagickwand4 +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibfftw3-3 +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWliblzma5 + + +#PACKAGES += CSWlibmagick10 +#PKGFILES_CSWlibmagick10 += $(call pkgfiles_lib,libMagick.so.10) +#SPKG_DESC_CSWlibmagick10 += Library from ImageMagick, libMagick.so.10 +#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWjpeg +#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWsunmath +#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWtiff +#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWzlib +#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWftype2 +#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWlcmsrt +#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWbzip2 +#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWfconfig + +#PACKAGES += CSWlibmagickcore2 +#PKGFILES_CSWlibmagickcore2 += $(call pkgfiles_lib,libMagickCore.so.2) +#SPKG_DESC_CSWlibmagickcore2 += Library from ImageMagick, libMagickCore.so.2 +#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWjpeg +#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWlcmsrt +#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWtiff +#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWzlib +#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWftype2 +#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWfconfig + +PACKAGES += CSWlibmagickcore4 +PKGFILES_CSWlibmagickcore4 += $(call pkgfiles_lib,libMagickCore.so.4) +SPKG_DESC_CSWlibmagickcore4 += Library from ImageMagick, libMagickCore.so.4 +RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWjpeg +RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWliblqr +RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWtiff +RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWbzip2 +RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlibfftw3-3 +RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWliblzma5 +# Gnuplot is detected by the magic cookie #!/usr/local/bin/gnuplot +# XXX: Is this correct? +CHECKPKG_OVERRIDES_CSWlibmagickcore4 += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore.so.4.0.1 + +#PACKAGES += CSWlibmagickwand2 +#PKGFILES_CSWlibmagickwand2 += $(call pkgfiles_lib,libMagickWand.so.2) +#SPKG_DESC_CSWlibmagickwand2 += Library from ImageMagick, libMagickWand.so.2 +#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWjpeg +#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWlcmsrt +#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWtiff +#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWzlib +#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWftype2 +#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWlibmagickcore2 +#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWfconfig + +PACKAGES += CSWlibmagickwand4 +PKGFILES_CSWlibmagickwand4 += $(call pkgfiles_lib,libMagickWand.so.4) +SPKG_DESC_CSWlibmagickwand4 += Library from ImageMagick, libMagickWand.so.4 +RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWjpeg +RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWliblqr +RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWtiff +RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibmagickcore4 +RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWbzip2 +RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibfftw3-3 +RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWliblzma5 + +#PACKAGES += CSWlibwand10 +#PKGFILES_CSWlibwand10 += $(call pkgfiles_lib,libWand.so.10) +#SPKG_DESC_CSWlibwand10 += Library from ImageMagick, libWand.so.10 +#RUNTIME_DEP_PKGS_CSWlibwand10 += CSWftype2 +#RUNTIME_DEP_PKGS_CSWlibwand10 += CSWsunmath +#RUNTIME_DEP_PKGS_CSWlibwand10 += CSWlibmagick10 +#RUNTIME_DEP_PKGS_CSWlibwand10 += CSWzlib + +PACKAGES += CSWimagemagick-dev +SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries +PKGFILES_CSWimagemagick-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWimagemagick-dev += $(docdir)/.* +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++4 +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore4 +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand4 +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWperl +# This is all in /opt/csw/share/doc +CHECKPKG_OVERRIDES_CSWimagemagick-dev += file-with-bad-content + +PACKAGES += CSWimagemagick +SPKG_DESC_CSWimagemagick = A comprehensive package supporting automated and interative manipulation of images +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore4 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand4 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlcmsrt RUNTIME_DEP_PKGS_CSWimagemagick += CSWbzip2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWdjvulibrert -RUNTIME_DEP_PKGS_CSWimagemagick += CSWfconfig -RUNTIME_DEP_PKGS_CSWimagemagick += CSWftype2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWggettextrt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWilmbase +RUNTIME_DEP_PKGS_CSWimagemagick += CSWpng +RUNTIME_DEP_PKGS_CSWimagemagick += CSWgtk2 RUNTIME_DEP_PKGS_CSWimagemagick += CSWglib2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgvc6 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcdt5 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgraph5 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWgs -RUNTIME_DEP_PKGS_CSWimagemagick += CSWgtk2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWilmbase +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWjpeg +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfpx RUNTIME_DEP_PKGS_CSWimagemagick += CSWjasper +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiff +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWfconfig RUNTIME_DEP_PKGS_CSWimagemagick += CSWjbigkit -RUNTIME_DEP_PKGS_CSWimagemagick += CSWjpeg -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlcmsrt -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcairo -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfpx -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibice RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblqr +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcdt5 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWzlib +RUNTIME_DEP_PKGS_CSWimagemagick += CSWftype2 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibsm -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibtoolrt -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibx11 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxext -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxt RUNTIME_DEP_PKGS_CSWimagemagick += CSWopenexrrt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWdjvulibrert +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgraph5 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcairo +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgvc6 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWgcc3g++rt RUNTIME_DEP_PKGS_CSWimagemagick += CSWperl -RUNTIME_DEP_PKGS_CSWimagemagick += CSWpng -RUNTIME_DEP_PKGS_CSWimagemagick += CSWsunmath -RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiff -RUNTIME_DEP_PKGS_CSWimagemagick += CSWzlib -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibintl3 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmf +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfftw3-3 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmf0-2-7 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmflite0-2-7 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblzma5 -# these should go when rsvg & xml fixed on unstable -CHECKPKG_OVERRIDES_CSWimagemagick += missing-dependency|CSWlibxml2-2 -CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWggettextrt -CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibcairo -CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibtoolrt -CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibxml2 -CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibwmf - BUILD_DEP_PKGS += CSWdjvulibredevel BUILD_DEP_PKGS += CSWgraphvizdevel BUILD_DEP_PKGS += CSWilmbasedevel BUILD_DEP_PKGS += CSWlcmsdevel BUILD_DEP_PKGS += CSWlibcairodevel BUILD_DEP_PKGS += CSWliblqrdevel -BUILD_DEP_PKGS += CSWlibwmfdevel +BUILD_DEP_PKGS += CSWlibwmf-dev +BUILD_DEP_PKGS += CSWliblzma-dev BUILD_DEP_PKGS += CSWopenexrdevel -BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWimagemagick) -# I want to say something rude about libtool and the entire shared lib world! -# Hoping most of this will get fixed by uninstalling imagemagic during build. -CHECKPKG_OVERRIDES_CSWimagemagick += non-uniform-lib-versions-in-package|sonames=libMagick++.so.10,libMagick++.so.2,libMagick++.so.3,libMagick.so.10,libMagickCore.so.2,libMagickCore.so.3,libMagickWand.so.2,libMagickWand.so.3,libWand.so.10 -CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagickCore.so -CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagickWand.so -CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagick++.so -CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagickCore.so -CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagickWand.so -CHECKPKG_OVERRIDES_CSWimagemagick += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libMagick++.so -CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libMagick++.so.10.0.4 -CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.3.0.0 -CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libMagick++.so.3.0.0 -CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libMagick++.so.3.0.0 -CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/lib|opt/csw/lib/libMagick++.so.3.0.0 -CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS11/SUNWspro/lib/rw7|opt/csw/lib/libMagick++.so.2.0.0 -CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS11/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.2.0.0 -CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS11/SUNWspro/lib|opt/csw/lib/libMagick++.so.2.0.0 -CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libMagick++.so.2.0.0 -CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.2.0.0 -CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/lib|opt/csw/lib/libMagick++.so.2.0.0 -CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS8/SUNWspro/lib/rw7|opt/csw/lib/libMagick++.so.10.0.4 -CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS8/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.10.0.4 -CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/studio/SOS8/SUNWspro/lib|opt/csw/lib/libMagick++.so.10.0.4 -CHECKPKG_OVERRIDES_CSWimagemagick += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.10.0.4 +EXTRA_LINKER_FLAGS = -norunpath -# pffft! don't bug me! -CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/ImageMagick-6.6.0/config/mime.xml -CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/ImageMagick-6.6.0/ChangeLog -CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/api/MagickCore/magick-config_8h-source.html -CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/api/MagickCore/version_8h.html -CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/perl-magick.html -CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/api/MagickCore/magick-config_8h.html -CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/resources.html -CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/advanced-unix-installation.html -CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/changelog.html -CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore.so.2.0.0 -CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/share/doc/ImageMagick/www/install-source.html -CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagick.so.10.0.4 -CHECKPKG_OVERRIDES_CSWimagemagick += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore.so.3.0.0 +# Somehow the above flag does not make it to the linker +CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/lib|opt/csw/lib/libMagick++.so.4.0.1 +CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libMagick++.so.4.0.1 +CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libMagick++.so.4.0.1 +CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.4.0.1 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 - -CONFIGURE_ARGS_COMMON = $(DIRPATHS) -CONFIGURE_ARGS_COMMON += --with-perl=$(bindir)/perl -CONFIGURE_ARGS_COMMON += --enable-shared --disable-static -CONFIGURE_ARGS_COMMON += --with-dps=yes +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-perl=$(bindir)/perl +CONFIGURE_ARGS += --enable-shared --disable-static +CONFIGURE_ARGS += --with-dps=yes # Ghostscript lib is linked to Sun X11 -CONFIGURE_ARGS_COMMON += --with-gslib=no -CONFIGURE_ARGS_COMMON += --x-includes=/opt/csw/X11/include -CONFIGURE_ARGS_COMMON += --x-libraries=/opt/csw/X11/lib +# CONFIGURE_ARGS += --with-gslib=no # Solaris 8 and 9 doesn't have complex.h -CONFIGURE_ARGS_COMMON += --without-fftw -CONFIGURE_ARGS_COMMON += --with-modules=yes +# CONFIGURE_ARGS += --without-fftw +CONFIGURE_ARGS += --with-modules=yes # Let's try to use openmp and see what it does for performance -#CONFIGURE_ARGS_COMMON += --disable-openmp -CONFIGURE_ARGS_COMMON += --disable-silent-rules +#CONFIGURE_ARGS += --disable-openmp +CONFIGURE_ARGS += --disable-silent-rules + # Until librsvg,graphviz and perl is 64bit -#CONFIGURE_ARGS_isa-amd64 += --without-gvc -#CONFIGURE_ARGS_isa-amd64 += --without-rsvg -#CONFIGURE_ARGS_isa-amd64 += --without-perl -#CONFIGURE_ARGS_isa-sparcv9 += --without-gvc -#CONFIGURE_ARGS_isa-sparcv9 += --without-rsvg -#CONFIGURE_ARGS_isa-sparcv9 += --without-perl +CONFIGURE_ARGS-64 += --without-gvc +CONFIGURE_ARGS-64 += --without-rsvg +CONFIGURE_ARGS-64 += --without-perl +CONFIGURE_ARGS-64 += --without-gvc +CONFIGURE_ARGS-64 += --without-rsvg +CONFIGURE_ARGS-64 += --without-perl +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) -CONFIGURE_ARGS = $(CONFIGURE_ARGS_COMMON) $(foreach M,$(MODULATIONS),$(CONFIGURE_ARGS_$M)) +# One test is failing: +# FAIL: Magick++/tests/attributes.sh +# This has been reported upstream at +# http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=18889 +SKIPTEST ?= 1 -PATCHFILES += Makefile.patch -PATCHFILES += configure.diff - -# Test has to be run *after* install -#TEST_TARGET = check -TEST_TARGET = - -#Dependencies not 64-bit yet +# Dependencies not 64-bit yet #BUILD64 = 1 -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -#EXTRA_LDFLAGS = -L./magick/.libs -#EXTRA_LD_OPTIONS = -L./magick/.libs -# -EXTRA_SOS_LD_FLAGS += -L$(shell pwd)/$(WORKSRC)/magick/.libs -EXTRA_SOS_LD_FLAGS += -L$(shell pwd)/$(WORKSRC)/wand/.libs -# We want to be link with Xrender from $(prefix)/X11/lib not $(prefix)/lib -# since the latter is linked to /usr/openwin/lib/libX11.so.4 -EXTRA_SOS_LD_FLAGS += -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +# This is for coders/dps.so to find libdps.so.5 and libdpstk.so.5 +# EXTRA_LIB = /usr/openwin/lib +# Is this really a problem? +CHECKPKG_OVERRIDES_CSWimagemagick += soname-not-found|libdps.so.5|is|needed|by|opt/csw/lib/ImageMagick-6.7.0/modules-Q16/coders/dps.so +CHECKPKG_OVERRIDES_CSWimagemagick += soname-not-found|libdpstk.so.5|is|needed|by|opt/csw/lib/ImageMagick-6.7.0/modules-Q16/coders/dps.so +# Only remove libtool files from the public lib directory, keep the private ones for libtool dlopn MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la + EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod -STRIP_LIBTOOL=1 +STRIP_LIBTOOL = 1 + include gar/category.mk SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV) -post-install-isa-sparcv8: - @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.2.9.s.tar.bz2 |tar xf -) - @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.5.2.s.tar.bz2 |tar xf -) - @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 - @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 - @$(MAKECOOKIE) +#post-install-isa-sparcv8: +# @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.2.9.s.tar.bz2 |tar xf -) +# @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.5.2.s.tar.bz2 |tar xf -) +# @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 +# @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 +# @$(MAKECOOKIE) +# +#post-install-isa-i386: +# @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.2.9.i.tar.bz2 |tar xf -) +# @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.5.2.i.tar.bz2 |tar xf -) +# @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 +# @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 +# @$(MAKECOOKIE) -post-install-isa-i386: - @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.2.9.i.tar.bz2 |tar xf -) - @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.5.2.i.tar.bz2 |tar xf -) - @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 - @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 - @$(MAKECOOKIE) +post-install-modulated: + perl -pi \ + -e 's,/usr/local/bin,$(bindir),g' \ + $(DESTDIR)$(sysconfdir)/ImageMagick/mime.xml Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2011-06-07 15:06:34 UTC (rev 14728) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2011-06-07 15:32:17 UTC (rev 14729) @@ -1,3 +1 @@ -c04030c3d4649bee4d6a891a16e031a3 ImageMagick-6.6.0-9.tar.bz2 -6bd361fe352c7d497d60d8d2cbe7cfd4 Makefile.patch -6e35e7434941ed6aeeabb03de76288d1 configure.diff +90a0fdff3ef323314a3470a0d355d6ca ImageMagick-6.7.0-4.tar.xz Deleted: csw/mgar/pkg/ImageMagick/trunk/files/Makefile.patch =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/files/Makefile.patch 2011-06-07 15:06:34 UTC (rev 14728) +++ csw/mgar/pkg/ImageMagick/trunk/files/Makefile.patch 2011-06-07 15:32:17 UTC (rev 14729) @@ -1,11 +0,0 @@ ---- ImageMagick-6.4.9-4.orig/Makefile.in 2009-02-12 23:04:45.000000000 +0100 -+++ ImageMagick-6.4.9-4/Makefile.in 2009-02-18 07:30:25.392728347 +0100 -@@ -2929,7 +2929,7 @@ - coders_fpx_la_SOURCES = coders/fpx.c - coders_fpx_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) - coders_fpx_la_LDFLAGS = $(MODULECOMMONFLAGS) --coders_fpx_la_LIBADD = $(MAGICKCORE_LIBS) $(FPX_LIBS) -lstdc++ -+coders_fpx_la_LIBADD = $(MAGICKCORE_LIBS) $(FPX_LIBS) - - # GIF coder module - coders_gif_la_SOURCES = coders/gif.c Deleted: csw/mgar/pkg/ImageMagick/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/files/configure.diff 2011-06-07 15:06:34 UTC (rev 14728) +++ csw/mgar/pkg/ImageMagick/trunk/files/configure.diff 2011-06-07 15:32:17 UTC (rev 14729) @@ -1,11 +0,0 @@ ---- ImageMagick-6.6.0-5/configure.orig 2010-03-12 18:57:20.000000000 +0100 -+++ ImageMagick-6.6.0-5/configure 2010-03-14 16:36:37.881895213 +0100 -@@ -28869,7 +28869,7 @@ - - # - # Path to ImageMagick documentation files --DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}" -+DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}" - DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}" - DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/" - case "${build_os}" in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jun 7 17:38:39 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 15:38:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14730] csw/mgar/pkg/liblcms2/trunk/Makefile Message-ID: Revision: 14730 http://gar.svn.sourceforge.net/gar/?rev=14730&view=rev Author: dmichelsen Date: 2011-06-07 15:38:39 +0000 (Tue, 07 Jun 2011) Log Message: ----------- liblcms2: Split packages Modified Paths: -------------- csw/mgar/pkg/liblcms2/trunk/Makefile Modified: csw/mgar/pkg/liblcms2/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblcms2/trunk/Makefile 2011-06-07 15:32:17 UTC (rev 14729) +++ csw/mgar/pkg/liblcms2/trunk/Makefile 2011-06-07 15:38:39 UTC (rev 14730) @@ -22,14 +22,30 @@ VENDOR_URL = http://www.littlecms.com/ +PACKAGES += CSWliblcms2-2 +SPKG_DESC_CSWliblcms2-2 = Color management library, liblcms2.so.2 +PKGFILES_CSWliblcms2-2 += $(call pkgfiles_lib,liblcms2.so.2) + +PACKAGES += CSWliblcms2-dev +SPKG_DESC_CSWliblcms2-dev = Development files for liblcms2.so.2 +PKGFILES_CSWliblcms2-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWliblcms2-dev += CSWliblcms2-2 + +PACKAGES += CSWliblcms2-utils +SPKG_DESC_CSWliblcms2-utils = Utility programs for LCMS (Little Color Management) +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWliblcms2-utils += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWliblcms2-utils += CSWtiff +RUNTIME_DEP_PKGS_CSWliblcms2-utils += CSWjpeg +RUNTIME_DEP_PKGS_CSWliblcms2-utils += CSWzlib + # Probably make separate package for Solaris 10 as it has float support EXTRA_CPPFLAGS-5.9 = -Dpowf=pow -Dfabsf=labs EXTRA_CPPFLAGS = $(EXTRA_CPPFLAGS-$(GAROSREL)) -EXTRA_LINKER_FLAGS = -lm +BUILD64 = 1 -OPT_FLAGS_SOS = -xO0 +# One test with unicode is dumping core on 64 bit, disable for now +SKIPTEST ?= 1 -BUILD64 = 1 - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jun 7 17:54:25 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 15:54:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14731] csw/mgar/pkg/liblasi/trunk/Makefile Message-ID: Revision: 14731 http://gar.svn.sourceforge.net/gar/?rev=14731&view=rev Author: dmichelsen Date: 2011-06-07 15:54:24 +0000 (Tue, 07 Jun 2011) Log Message: ----------- liblasi: Add explicit linkage to libCstd, split packages and rework Modified Paths: -------------- csw/mgar/pkg/liblasi/trunk/Makefile Modified: csw/mgar/pkg/liblasi/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblasi/trunk/Makefile 2011-06-07 15:38:39 UTC (rev 14730) +++ csw/mgar/pkg/liblasi/trunk/Makefile 2011-06-07 15:54:24 UTC (rev 14731) @@ -2,9 +2,6 @@ VERSION = 1.1.0 CATEGORIES = lib -SF_PROJ = lasi -SOURCENAME = libLASi - DESCRIPTION = C++ Unicode support for PostScript define BLURB libLASi is a library written by Larry Siden that provides a C++ stream output @@ -23,56 +20,45 @@ ability to produce Postscript independent of any one application framework. endef +SF_PROJ = lasi MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(SOURCENAME)-$(VERSION).tar.gz +SOURCENAME = libLASi DISTNAME = $(SOURCENAME)-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz -SPKG_SOURCEURL = http://unifont.org/lasi/ - PATCHFILES = liblasi-consts.diff -RUNTIME_DEP_PKGS = CSWftype2 CSWggettextrt CSWglib2 CSWpango CSWzlib +VENDOR_URL = http://unifont.org/lasi/ -PACKAGES = CSWliblasi CSWliblasidevel CSWliblasidoc -CATALOGNAME_CSWliblasi = liblasi -CATALOGNAME_CSWliblasidevel = liblasi_devel -CATALOGNAME_CSWliblasidoc = liblasi_doc +PACKAGES += CSWliblasi0 +SPKG_DESC_CSWliblasi0 = C++ Unicode support for PostScript, libLASi.so.0 +PKGFILES_CSWliblasi0 = $(call pkgfiles_lib,libLASi.so.0) +RUNTIME_DEP_PKGS_CSWliblasi0 += CSWftype2 +RUNTIME_DEP_PKGS_CSWliblasi0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWliblasi0 += CSWglib2 +RUNTIME_DEP_PKGS_CSWliblasi0 += CSWpango +RUNTIME_DEP_PKGS_CSWliblasi0 += CSWfconfig +OBSOLETED_BY_CSWliblasi0 = CSWliblasi -SPKG_DESC_CSWliblasi = C++ Unicode support for PostScript -SPKG_DESC_CSWliblasidevel = C++ Unicode support for PostScript - developer package -SPKG_DESC_CSWliblasidoc = C++ Unicode support for PostScript - documentation package +PACKAGES += CSWliblasi-dev +SPKG_DESC_CSWliblasi-dev = Developer support for libLASi.so.0 +PKGFILES_CSWliblasi-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWliblasi-dev += $(sharedstatedir)/doc/.* +RUNTIME_DEP_PKGS_CSWliblasi-dev += CSWliblasi0 +# That is ok +CHECKPKG_OVERRIDES_CSWliblasi-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liblasi/examples/README -RUNTIME_DEP_PKGS_CSWliblasi += CSWftype2 CSWggettextrt CSWglib2 CSWpango -RUNTIME_DEP_PKGS_CSWliblasi += CSWfconfig -RUNTIME_DEP_PKGS_CSWliblasidevel += CSWliblasi -RUNTIME_DEP_PKGS_CSWliblasidoc = +BUILD64 = 1 -PKGFILES_CSWliblasidevel = $(PKGFILES_DEVEL) -PKGFILES_CSWliblasidoc = $(sharedstatedir)/doc/.* +EXTRA_CXX_FLAGS = -lCstd -norunpath CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom TEST_SCRIPTS = custom INSTALL_SCRIPTS = custom -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(SOURCENAME)-(\d+(?:\.\d+)*).tar.gz - -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# 187113 is the group_id for the liblasi project on sourceforge -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE) = 187113 - -BUILD64 = 1 - -CMAKE_CXX_FLAGS = $(CXXFLAGS) -EXTRA_COMMON_EXPORTS = CMAKE_CXX_FLAGS - include gar/category.mk -#WORKSRC = $(WORKDIR)/$(SOURCENAME)-$(VERSION) - - configure-custom: @echo " ==> Configuring $(NAME) (custom)" @( cd $(WORKSRC) ; \ 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 Jun 7 18:34:26 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 16:34:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[14732] csw/mgar/pkg/librsvg/trunk/Makefile Message-ID: Revision: 14732 http://gar.svn.sourceforge.net/gar/?rev=14732&view=rev Author: dmichelsen Date: 2011-06-07 16:34:26 +0000 (Tue, 07 Jun 2011) Log Message: ----------- librsvg: Remove obsoleted packages which were never released Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2011-06-07 15:54:24 UTC (rev 14731) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2011-06-07 16:34:26 UTC (rev 14732) @@ -36,18 +36,10 @@ PACKAGES += CSWlibrsvg-dev SPKG_DESC_CSWlibrsvg-dev = Development files for librsvg-2.so.2 -PKGFILES_CSWlibrsvg-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibrsvg-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibrsvg-dev += $(sharedstatedir)/gtk-doc/.* RUNTIME_DEP_PKGS_CSWlibrsvg-dev += CSWlibrsvg2-2 -OBSOLETED_BY_CSWlibrsvg-dev = CSWlibrsvgdevel -CATALOGNAME_CSWlibrsvgdevel = librsvg_devel_stub -PACKAGES += CSWlibrsvg-doc -SPKG_DESC_CSWlibrsvg-doc = Documentation for librsvg -PKGFILES_CSWlibrsvg-doc = $(sharedstatedir)/gtk-doc/.* -ARCHALL_CSWlibrsvg-doc = 1 -OBSOLETED_BY_CSWlibrsvg-doc = CSWlibrsvgdoc -CATALOGNAME_CSWlibrsvgdoc = librsvg_doc_stub - PACKAGES += CSWrsvg SPKG_DESC_CSWrsvg += SVG to raster image conversion utility # PKGFILES is catchall @@ -65,25 +57,22 @@ RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgsf RUNTIME_DEP_PKGS_CSWrsvg += CSWglib2 -PACKAGES += CSWlibrsvggnome -CATALOGNAME_CSWlibrsvggnome = librsvg_gnome -# This is a legacy package name -CHECKPKG_OVERRIDES_CSWlibrsvggnome += catalogname-does-not-match-pkgname|pkgname=CSWlibrsvggnome|catalogname=librsvg_gnome|expected-catalogname=librsvggnome -PKGFILES_CSWlibrsvggnome = $(libdir)/gtk-2.0/.* -SPKG_DESC_CSWlibrsvggnome += Scalable Vector Graphics library - Gnome module -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibrsvg2-2 -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWpango -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWpng -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibcairo -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibatk -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibcroco -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibgsf -RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWglib2 +PACKAGES += CSWlibrsvg-gnome +PKGFILES_CSWlibrsvg-gnome = $(libdir)/gtk-2.0/.* +SPKG_DESC_CSWlibrsvg-gnome += Scalable Vector Graphics library - Gnome module +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibrsvg2-2 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWpango +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWpng +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibcairo +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibatk +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibcroco +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgsf +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWglib2 BUILD_DEP_PKGS += CSWlibxml2-dev 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 Jun 7 22:30:30 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 20:30:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14733] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 14733 http://gar.svn.sourceforge.net/gar/?rev=14733&view=rev Author: dmichelsen Date: 2011-06-07 20:30:29 +0000 (Tue, 07 Jun 2011) Log Message: ----------- ImageMagick: Split off Perl module Image::Magick Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-06-07 16:34:26 UTC (rev 14732) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-06-07 20:30:29 UTC (rev 14733) @@ -183,12 +183,17 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcairo RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgvc6 RUNTIME_DEP_PKGS_CSWimagemagick += CSWgcc3g++rt -RUNTIME_DEP_PKGS_CSWimagemagick += CSWperl RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfftw3-3 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmf0-2-7 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmflite0-2-7 RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblzma5 +PACKAGES += CSWpm-imagemagick +SPKG_DESC_CSWpm-imagemagick = Image::Magick: Perl binding for Imagemagick +PKGFILES_CSWpm-imagemagick += $(libdir)/perl/.* +RUNTIME_DEP_PKGS_CSWpm-imagemagick += CSWperl +RUNTIME_DEP_PKGS_CSWpm-imagemagick += CSWlibmagickcore4 + BUILD_DEP_PKGS += CSWdjvulibredevel BUILD_DEP_PKGS += CSWgraphvizdevel BUILD_DEP_PKGS += CSWilmbasedevel @@ -247,7 +252,8 @@ # Only remove libtool files from the public lib directory, keep the private ones for libtool dlopn MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la -EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod +EXTRA_MERGE_EXCLUDE_FILES += .*/perllocal.pod +EXTRA_MERGE_EXCLUDE_FILES += .*/\.packlist STRIP_LIBTOOL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jun 7 22:36:39 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 07 Jun 2011 20:36:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14734] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 14734 http://gar.svn.sourceforge.net/gar/?rev=14734&view=rev Author: dmichelsen Date: 2011-06-07 20:36:38 +0000 (Tue, 07 Jun 2011) Log Message: ----------- ImageMagick: Adust perl module name Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-06-07 20:30:29 UTC (rev 14733) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-06-07 20:36:38 UTC (rev 14734) @@ -188,11 +188,11 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmflite0-2-7 RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblzma5 -PACKAGES += CSWpm-imagemagick -SPKG_DESC_CSWpm-imagemagick = Image::Magick: Perl binding for Imagemagick -PKGFILES_CSWpm-imagemagick += $(libdir)/perl/.* -RUNTIME_DEP_PKGS_CSWpm-imagemagick += CSWperl -RUNTIME_DEP_PKGS_CSWpm-imagemagick += CSWlibmagickcore4 +PACKAGES += CSWpm-image-magick +SPKG_DESC_CSWpm-image-magick = Image::Magick: Perl binding for Imagemagick +PKGFILES_CSWpm-image-magick += $(libdir)/perl/.* +RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWperl +RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWlibmagickcore4 BUILD_DEP_PKGS += CSWdjvulibredevel BUILD_DEP_PKGS += CSWgraphvizdevel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Jun 7 23:42:31 2011 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 07 Jun 2011 21:42:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14735] csw/mgar/pkg/dovecot/trunk/Makefile Message-ID: Revision: 14735 http://gar.svn.sourceforge.net/gar/?rev=14735&view=rev Author: jake_goerzen Date: 2011-06-07 21:42:31 +0000 (Tue, 07 Jun 2011) Log Message: ----------- dovecot: cleanup Makefile Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2011-06-07 20:36:38 UTC (rev 14734) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2011-06-07 21:42:31 UTC (rev 14735) @@ -21,24 +21,19 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -# Sieve plugin is packaged via a post-package hook (see package-sieveplugin:) -PACKAGES = CSWdovecot CSWdovecot-devel CSWdovecot-sieve -NOPACKAGE = CSWdovecot-sieve +PACKAGES = CSWdovecot CSWdovecot-devel CATALOGNAME_CSWdovecot = dovecot CATALOGNAME_CSWdovecot-devel = dovecot_devel -CATALOGNAME_CSWdovecot-sieve = dovecot_sieve SPKG_DESC_CSWdovecot = Secure IMAP server SPKG_DESC_CSWdovecot-devel = Dovecot secure IMAP server header files -SPKG_DESC_CSWdovecot-sieve = Dovecot secure IMAP server sieve plugin RUNTIME_DEP_PKGS_CSWdovecot = CSWosslrt CSWmysql5rt CSWoldaprt CSWlibpq RUNTIME_DEP_PKGS_CSWdovecot += CSWzlib CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWdovecot += CSWbzip2 CSWiconv RUNTIME_DEP_PKGS_CSWdovecot += CSWkrb5lib RUNTIME_DEP_PKGS_CSWdovecot-devel = CSWdovecot -RUNTIME_DEP_PKGS_CSWdovecot-sieve = CSWdovecot BUILD_DEP_PKGS = CSWossldevel CSWosslrt BUILD_DEP_PKGS += CSWmysql5devel CSWmysql5rt @@ -47,7 +42,6 @@ BUILD_DEP_PKGS += CSWkrb5lib CSWkrb5libdev PKGFILES_CSWdovecot-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWdovecot-sieve = .*sieve.* # These directories belong to CSWosslrt PROTOTYPE_FILTER = awk '\ @@ -87,9 +81,12 @@ # cswclassutils integration INITSMF = $(sysconfdir)/init.d/cswdovecot USERGROUP = dovecot:dovecot:Dovecot IMAP Server:/var/opt/csw/run/dovecot/login:/bin/false -SAMPLECONF = .*/dovecot.pem $(sysconfdir)/dovecot.conf -MIGRATE_FILES = dovecot.conf +SAMPLECONF_CSWdovecot = .*/dovecot.pem $(sysconfdir)/dovecot.conf +MIGRATE_FILES_CSWdovecot = dovecot.conf +CHECKPKG_OVERRIDES_CSWdovecot += bad-rpath-entry|/opt/csw/lib/|opt/csw/libexec/dovecot/dovecot-auth +CHECKPKG_OVERRIDES_CSWdovecot += bad-rpath-entry|/opt/csw/lib/|opt/csw/sbin/dovecotpw + include gar/category.mk # Adjust file paths in various files. Not a prerequisite to the remaining @@ -104,9 +101,6 @@ s| /usr/lib/dovecot| /opt/csw/lib/dovecot|; \ s| /usr/local| /opt/csw/|;' \ $(WORKSRC)/*-example.conf -# replace bad paths with /opt/csw in doc/wiki/*.txt - perl -pi -e 's|/usr/share|/opt/csw/share|' $(WORKSRC)/doc/wiki/*.txt - perl -pi -e 's|/usr/local|/opt/csw|' $(WORKSRC)/doc/wiki/*.txt @$(MAKECOOKIE) post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(NAME) @@ -139,13 +133,17 @@ # Copy init script ginstall -Dm 755 $(FILEDIR)/cswdovecot \ $(DESTDIR)/etc/opt/csw/init.d/cswdovecot - @$(MAKECOOKIE) -post-package: package-sieveplugin + # Search replace paths in docs + perl -pi -e 's|/usr/share|/opt/csw/share|' \ + $(DESTDIR)/opt/csw/share/doc/dovecot/wiki/* + perl -pi -e 's|/usr/local|/opt/csw|' \ + $(DESTDIR)/opt/csw/share/doc/dovecot/wiki/* @$(MAKECOOKIE) -# Extra targets for the Sieve plugin build and packaging process, invoked -# via post-install-modulated and post-package. +# Extra targets for the Sieve plugin build process, invoked via post-install-modulated. +# There used to be a separate sieve package but the sieve related files are now included +# in the main CSWdovecot package. SIEVEVERSION = 1.1.8 SIEVEDIST = dovecot-sieve-$(SIEVEVERSION) @@ -163,11 +161,11 @@ $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS); \ $(BUILD_ENV) gmake $(BUILD_ARGS); \ $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) $(INSTALL_ARGS) install; ) + # search and replace paths for sieveplugin doc files + perl -pi -e 's|/usr/share|/opt/csw/share|' \ + $(DESTDIR)/opt/csw/share/doc/dovecot/wiki/* + perl -pi -e 's|/usr/local|/opt/csw|' \ + $(DESTDIR)/opt/csw/share/doc/dovecot/wiki/* + rm -rf $(SIEVEDIST)* @$(MAKECOOKIE) - -# Sieve plugin needs to be packaged with version != $(VERSION) -package-sieveplugin: - gmake -o post-package \ - NOPACKAGE="CSWdovecot CSWdovecot-devel" SPKG_VERSION=$(SIEVEVERSION) \ - repackage This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Jun 8 00:45:25 2011 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 07 Jun 2011 22:45:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14736] csw/mgar/pkg/dovecot/trunk/Makefile Message-ID: Revision: 14736 http://gar.svn.sourceforge.net/gar/?rev=14736&view=rev Author: jake_goerzen Date: 2011-06-07 22:45:25 +0000 (Tue, 07 Jun 2011) Log Message: ----------- dovecot: fix SAMPLECONF, MIGRATE_FILES Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2011-06-07 21:42:31 UTC (rev 14735) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2011-06-07 22:45:25 UTC (rev 14736) @@ -81,8 +81,8 @@ # cswclassutils integration INITSMF = $(sysconfdir)/init.d/cswdovecot USERGROUP = dovecot:dovecot:Dovecot IMAP Server:/var/opt/csw/run/dovecot/login:/bin/false -SAMPLECONF_CSWdovecot = .*/dovecot.pem $(sysconfdir)/dovecot.conf -MIGRATE_FILES_CSWdovecot = dovecot.conf +SAMPLECONF = .*/dovecot.pem $(sysconfdir)/dovecot.conf +MIGRATE_FILES = dovecot.conf CHECKPKG_OVERRIDES_CSWdovecot += bad-rpath-entry|/opt/csw/lib/|opt/csw/libexec/dovecot/dovecot-auth CHECKPKG_OVERRIDES_CSWdovecot += bad-rpath-entry|/opt/csw/lib/|opt/csw/sbin/dovecotpw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Wed Jun 8 01:27:45 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 07 Jun 2011 23:27:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[14737] csw/mgar/pkg/liblasi/trunk/Makefile Message-ID: Revision: 14737 http://gar.svn.sourceforge.net/gar/?rev=14737&view=rev Author: ellson Date: 2011-06-07 23:27:45 +0000 (Tue, 07 Jun 2011) Log Message: ----------- liblasi: use LDFLAGS instead of EXTRA_CXX_FLAGS (how did it work for Dago???) Modified Paths: -------------- csw/mgar/pkg/liblasi/trunk/Makefile Modified: csw/mgar/pkg/liblasi/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblasi/trunk/Makefile 2011-06-07 22:45:25 UTC (rev 14736) +++ csw/mgar/pkg/liblasi/trunk/Makefile 2011-06-07 23:27:45 UTC (rev 14737) @@ -50,7 +50,7 @@ BUILD64 = 1 -EXTRA_CXX_FLAGS = -lCstd -norunpath +LDFLAGS = -L/usr/lib -lCstd -norunpath CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Wed Jun 8 01:48:38 2011 From: bwalton at opencsw.org (Ben Walton) Date: Tue, 07 Jun 2011 19:48:38 -0400 Subject: [csw-devel] SF.net SVN: gar:[14735] csw/mgar/pkg/dovecot/trunk/Makefile In-Reply-To: References: Message-ID: <1307490426-sup-5827@pinkfloyd.chass.utoronto.ca> Excerpts from jake_goerzen's message of Tue Jun 07 17:42:31 -0400 2011: Hi Jake, > +CHECKPKG_OVERRIDES_CSWdovecot += bad-rpath-entry|/opt/csw/lib/|opt/csw/libexec/dovecot/dovecot-auth > +CHECKPKG_OVERRIDES_CSWdovecot += > bad-rpath-entry|/opt/csw/lib/|opt/csw/sbin/dovecotpw This seems like something we could correct without an override...what is the RPATH value in these files? Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Wed Jun 8 02:03:27 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 08 Jun 2011 00:03:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[14738] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14738 http://gar.svn.sourceforge.net/gar/?rev=14738&view=rev Author: bdwalton Date: 2011-06-08 00:03:27 +0000 (Wed, 08 Jun 2011) Log Message: ----------- bacula/trunk: update pkgfiles splitting for the moved scripts directory Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-06-07 23:27:45 UTC (rev 14737) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-06-08 00:03:27 UTC (rev 14738) @@ -57,7 +57,7 @@ RUNTIME_DEP_PKGS_CSWbacula-console += CSWgcc4corert RUNTIME_DEP_PKGS_CSWbacula-console += CSWgcc4g++rt PKGFILES_CSWbacula-console = .*sbin/bconsole .*man8/bconsole.* .*bconsole.conf.CSW -PKGFILES_CSWbacula-console += .*libexec.*bconsole +PKGFILES_CSWbacula-console += /etc/opt/csw/bacula/scripts/bconsole CATALOGNAME_CSWbacula-client = bacula_client SPKG_DESC_CSWbacula-client = $(DESCRIPTION) - Client meta-package @@ -118,7 +118,7 @@ PKGFILES_CSWbacula-common += .*sbin/bsmtp .*sbin/btraceback PKGFILES_CSWbacula-common += .*man1/bsmtp.1 .*man1/btraceback.1 PKGFILES_CSWbacula-common += .*man8/bacula.8 -PKGFILES_CSWbacula-common += .*libexec/bacula/btraceback.* +PKGFILES_CSWbacula-common += /etc/opt/csw//bacula/scripts/btraceback.* CHECKPKG_OVERRIDES_CSWbacula-common += file-with-bad-content|/usr/share|root/opt/csw/share/man/man8/bacula.8 CATALOGNAME_CSWbacula-fd = bacula_fd @@ -152,8 +152,10 @@ RUNTIME_DEP_PKGS_CSWbacula-sd += CSWosslrt RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmtx PKGFILES_CSWbacula-sd += .*init.d/cswbacula-sd -PKGFILES_CSWbacula-sd += .*libexec.*disk-changer .*libexec.*dvd-handler -PKGFILES_CSWbacula-sd += .*libexec.*mtx-changer.* .*bacula/bacula-sd.conf.CSW +PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/.*disk-changer +PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/.*dvd-handler +PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/.*mtx-changer.* +PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/bacula-sd.conf.CSW PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/mtx-changer.conf.CSW PKGFILES_CSWbacula-sd += .*sbin/bacula-sd .*sbin/bextract .*sbin/bls PKGFILES_CSWbacula-sd += .*sbin/bcopy .*sbin/bscan .*sbin/btape @@ -182,13 +184,13 @@ PKGFILES_CSWbacula-director += .*init.d/cswbacula-dir PKGFILES_CSWbacula-director += .*sbin/bregex .*sbin/bwild .*sbin/bacula-dir PKGFILES_CSWbacula-director += .*sbin/dbcheck .*bacula/working -PKGFILES_CSWbacula-director += .*libexec.*catalog_backup.* .*libexec.*query.sql -PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/query.sql.CSW -PKGFILES_CSWbacula-director += .*libexec/bacula/.*_tables -PKGFILES_CSWbacula-director += .*libexec/bacula/.*_database -PKGFILES_CSWbacula-director += .*libexec/bacula/.*_privileges -PKGFILES_CSWbacula-director += .*libexec/bacula/.*_catalog.* -PKGFILES_CSWbacula-director += .*libexec/bacula/update.*tables.* +PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/scripts/catalog_backup.* +PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/scripts/query.sql.CSW +PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/.*_tables +PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/.*_database +PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/.*_privileges +PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/.*_catalog.* +PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/update.*tables.* PKGFILES_CSWbacula-director += .*bacula/bacula-dir.conf.CSW PKGFILES_CSWbacula-director += .*man8/bacula-dir.8 .*man8/dbcheck.8 PKGFILES_CSWbacula-director += /var/opt/csw/run @@ -300,7 +302,7 @@ done; \ ginstall -m 0755 bacula-fd $(INITD)/cswbacula-fd; \ cd ../..; \ - ginstall -m 0755 updatedb/update_mysql_tables_10_to_11 $(DESTDIR)$(prefix)/libexec/bacula; \ + ginstall -m 0755 updatedb/update_mysql_tables_10_to_11 $(DESTDIR)/etc/opt/csw/bacula/scripts; \ gcp -pR examples $(DOCD); \ ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/run;) @(for p in console director sd fd; do \ 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 Jun 8 02:08:31 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 08 Jun 2011 00:08:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14739] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14739 http://gar.svn.sourceforge.net/gar/?rev=14739&view=rev Author: bdwalton Date: 2011-06-08 00:08:31 +0000 (Wed, 08 Jun 2011) Log Message: ----------- bacula/trunk: mark everything in scripts/ as preserveconf Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-06-08 00:03:27 UTC (rev 14738) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-06-08 00:08:31 UTC (rev 14739) @@ -253,8 +253,40 @@ PRESERVECONF = $(sysconfdir)/bacula-dir.conf $(sysconfdir)/bacula-sd.conf PRESERVECONF += $(sysconfdir)/bacula-fd.conf $(sysconfdir)/bconsole.conf -PRESERVECONF += $(sysconfdir)/mtx-changer.conf $(sysconfdir)/query.sql +PRESERVECONF += $(sysconfdir)/mtx-changer.conf PRESERVECONF += $(sysconfdir)/tray-monitor.conf +PRESERVECONF += $(sysconfdir)/bacula/scripts/bacula-ctl-fd +PRESERVECONF += $(sysconfdir)/bacula/scripts/btraceback.dbx +PRESERVECONF += $(sysconfdir)/bacula/scripts/grant_mysql_privileges +PRESERVECONF += $(sysconfdir)/bacula/scripts/drop_mysql_tables +PRESERVECONF += $(sysconfdir)/bacula/scripts/drop_bacula_tables +PRESERVECONF += $(sysconfdir)/bacula/scripts/stopmysql +PRESERVECONF += $(sysconfdir)/bacula/scripts/drop_bacula_database +PRESERVECONF += $(sysconfdir)/bacula/scripts/make_catalog_backup +PRESERVECONF += $(sysconfdir)/bacula/scripts/create_mysql_database +PRESERVECONF += $(sysconfdir)/bacula/scripts/startmysql +PRESERVECONF += $(sysconfdir)/bacula/scripts/delete_catalog_backup +PRESERVECONF += $(sysconfdir)/bacula/scripts/btraceback.mdb +PRESERVECONF += $(sysconfdir)/bacula/scripts/make_mysql_tables +PRESERVECONF += $(sysconfdir)/bacula/scripts/update_mysql_tables +PRESERVECONF += $(sysconfdir)/bacula/scripts/grant_bacula_privileges +PRESERVECONF += $(sysconfdir)/bacula/scripts/mtx-changer +PRESERVECONF += $(sysconfdir)/bacula/scripts/btraceback.gdb +PRESERVECONF += $(sysconfdir)/bacula/scripts/mtx-changer.conf +PRESERVECONF += $(sysconfdir)/bacula/scripts/update_mysql_tables_10_to_11 +PRESERVECONF += $(sysconfdir)/bacula/scripts/disk-changer +PRESERVECONF += $(sysconfdir)/bacula/scripts/make_bacula_tables +PRESERVECONF += $(sysconfdir)/bacula/scripts/bacula-ctl-dir +PRESERVECONF += $(sysconfdir)/bacula/scripts/dvd-handler +PRESERVECONF += $(sysconfdir)/bacula/scripts/bacula-ctl-sd +PRESERVECONF += $(sysconfdir)/bacula/scripts/bacula_config +PRESERVECONF += $(sysconfdir)/bacula/scripts/bacula +PRESERVECONF += $(sysconfdir)/bacula/scripts/query.sql +PRESERVECONF += $(sysconfdir)/bacula/scripts/update_bacula_tables +PRESERVECONF += $(sysconfdir)/bacula/scripts/create_bacula_database +PRESERVECONF += $(sysconfdir)/bacula/scripts/drop_mysql_database +PRESERVECONF += $(sysconfdir)/bacula/scripts/make_catalog_backup.pl +PRESERVECONF += $(sysconfdir)/bacula/scripts/bconsole USERGROUP += /etc/opt/csw/pkg/CSWbacula-director/cswusergroup USERGROUP += /etc/opt/csw/pkg/CSWbacula-sd/cswusergroup 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 Jun 8 02:14:02 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 08 Jun 2011 00:14:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[14740] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14740 http://gar.svn.sourceforge.net/gar/?rev=14740&view=rev Author: bdwalton Date: 2011-06-08 00:14:02 +0000 (Wed, 08 Jun 2011) Log Message: ----------- bacula/trunk: update pkgfiles splitting to handling files marked preserveconf Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-06-08 00:08:31 UTC (rev 14739) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-06-08 00:14:02 UTC (rev 14740) @@ -57,7 +57,7 @@ RUNTIME_DEP_PKGS_CSWbacula-console += CSWgcc4corert RUNTIME_DEP_PKGS_CSWbacula-console += CSWgcc4g++rt PKGFILES_CSWbacula-console = .*sbin/bconsole .*man8/bconsole.* .*bconsole.conf.CSW -PKGFILES_CSWbacula-console += /etc/opt/csw/bacula/scripts/bconsole +PKGFILES_CSWbacula-console += /etc/opt/csw/bacula/scripts/bconsole.CSW CATALOGNAME_CSWbacula-client = bacula_client SPKG_DESC_CSWbacula-client = $(DESCRIPTION) - Client meta-package @@ -152,8 +152,8 @@ RUNTIME_DEP_PKGS_CSWbacula-sd += CSWosslrt RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmtx PKGFILES_CSWbacula-sd += .*init.d/cswbacula-sd -PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/.*disk-changer -PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/.*dvd-handler +PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/.*disk-changer.CSW +PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/.*dvd-handler.CSW PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/.*mtx-changer.* PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/bacula-sd.conf.CSW PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/mtx-changer.conf.CSW @@ -186,11 +186,11 @@ PKGFILES_CSWbacula-director += .*sbin/dbcheck .*bacula/working PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/scripts/catalog_backup.* PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/scripts/query.sql.CSW -PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/.*_tables -PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/.*_database -PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/.*_privileges -PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/.*_catalog.* -PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/update.*tables.* +PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/.*_tables.CSW +PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/.*_database.CSW +PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/.*_privileges.CSW +PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/.*_catalog.*CSW +PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/update.*tables.*CSW PKGFILES_CSWbacula-director += .*bacula/bacula-dir.conf.CSW PKGFILES_CSWbacula-director += .*man8/bacula-dir.8 .*man8/dbcheck.8 PKGFILES_CSWbacula-director += /var/opt/csw/run 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 Jun 8 02:24:29 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 08 Jun 2011 00:24:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[14741] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14741 http://gar.svn.sourceforge.net/gar/?rev=14741&view=rev Author: bdwalton Date: 2011-06-08 00:24:28 +0000 (Wed, 08 Jun 2011) Log Message: ----------- bacula/trunk: override surplus dep on perl (it is .pl.CSW now) Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-06-08 00:14:02 UTC (rev 14740) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-06-08 00:24:28 UTC (rev 14741) @@ -198,6 +198,8 @@ PKGFILES_CSWbacula-director += .*bacula_director/.*postmsg PKGFILES_CSWbacula-director += /etc/opt/csw/pkg/CSWbacula-director/cswusergroup PKGFILES_CSWbacula-director += /etc/opt/csw/pkg/CSWbacula-director/services +# this is because the .pl script is .pl.CSW due to preserveconf +CHECKPKG_OVERRIDES_CSWbacula-director += surplus-dependency|CSWperl # force libraries into a separate subdirectory libdir = $(prefix)/lib/$(NAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jgoerzen at opencsw.org Wed Jun 8 02:43:42 2011 From: jgoerzen at opencsw.org (Jake Goerzen) Date: Tue, 07 Jun 2011 17:43:42 -0700 Subject: [csw-devel] SF.net SVN: gar:[14735] csw/mgar/pkg/dovecot/trunk/Makefile In-Reply-To: <1307490426-sup-5827@pinkfloyd.chass.utoronto.ca> References: <1307490426-sup-5827@pinkfloyd.chass.utoronto.ca> Message-ID: <4DEEC5BE.7090507@opencsw.org> On 06/07/11 16:48, Ben Walton wrote: > Excerpts from jake_goerzen's message of Tue Jun 07 17:42:31 -0400 2011: > > Hi Jake, > >> +CHECKPKG_OVERRIDES_CSWdovecot += bad-rpath-entry|/opt/csw/lib/|opt/csw/libexec/dovecot/dovecot-auth >> +CHECKPKG_OVERRIDES_CSWdovecot += >> bad-rpath-entry|/opt/csw/lib/|opt/csw/sbin/dovecotpw > This seems like something we could correct without an override...what > is the RPATH value in these files? > Hi Ben, for some reason too many /opt/csw/lib are being appended to the RPATH otherwise the RPATH is correct: $ /usr/ccs/bin/elfdump /opt/csw/sbin/dovecotpw | grep RPATH [7] RPATH 0x1692 /opt/csw/mysql5/lib/mysql/$ISALIST:/opt/csw/mysql5/lib/mysql:/opt/csw/postgresql/lib/$ISALIST:/opt/csw/postgresql/lib:/opt/csw/lib/$ISALIST:/opt/csw/lib:/opt/csw/lib:/opt/csw/lib/ $ /usr/ccs/bin/elfdump /opt/csw/libexec/dovecot/dovecot-auth | grep RPATH [17] RPATH 0x3cd1 /opt/csw/mysql5/lib/mysql/$ISALIST:/opt/csw/mysql5/lib/mysql:/opt/csw/postgresql/lib/$ISALIST:/opt/csw/postgresql/lib:/opt/csw/lib/$ISALIST:/opt/csw/lib:/opt/csw/lib:/opt/csw/lib/ The RPATH in the rest of the executable files is correct. I overrided temporarily for now but will look into why Thanks, Jake From bwalton at opencsw.org Wed Jun 8 03:16:26 2011 From: bwalton at opencsw.org (Ben Walton) Date: Tue, 07 Jun 2011 21:16:26 -0400 Subject: [csw-devel] SF.net SVN: gar:[14735] csw/mgar/pkg/dovecot/trunk/Makefile In-Reply-To: <4DEEC5BE.7090507@opencsw.org> References: <1307490426-sup-5827@pinkfloyd.chass.utoronto.ca> <4DEEC5BE.7090507@opencsw.org> Message-ID: <1307495628-sup-374@pinkfloyd.chass.utoronto.ca> Excerpts from Jake Goerzen's message of Tue Jun 07 20:43:42 -0400 2011: Hi Jake, > The RPATH in the rest of the executable files is correct. I overrided > temporarily for now but will look into why Ok, that's not a fatal issue by any means. I've seen this occur in cases where packages pick up CFLAGS or LDFLAGS from things like mysql-config, etc. Sometimes it is an easy fix, other times not (way to cover all the bases!). It generally depends on the sanity of the build system in use. If you can't find the injection point or don't see a fix, feel free to ask for other eyeballs to help. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From ellson at users.sourceforge.net Wed Jun 8 03:49:11 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Wed, 08 Jun 2011 01:49:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14742] csw/mgar/pkg/liblasi/trunk/Makefile Message-ID: Revision: 14742 http://gar.svn.sourceforge.net/gar/?rev=14742&view=rev Author: ellson Date: 2011-06-08 01:49:11 +0000 (Wed, 08 Jun 2011) Log Message: ----------- liblasi: LDFLAGS is ignores, trying CXXFLAGS Modified Paths: -------------- csw/mgar/pkg/liblasi/trunk/Makefile Modified: csw/mgar/pkg/liblasi/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblasi/trunk/Makefile 2011-06-08 00:24:28 UTC (rev 14741) +++ csw/mgar/pkg/liblasi/trunk/Makefile 2011-06-08 01:49:11 UTC (rev 14742) @@ -50,7 +50,7 @@ BUILD64 = 1 -LDFLAGS = -L/usr/lib -lCstd -norunpath +CXXFLAGS = -L/usr/lib -lCstd -norunpath CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Wed Jun 8 03:58:03 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Wed, 08 Jun 2011 01:58:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14743] csw/mgar/pkg/liblasi/trunk/Makefile Message-ID: Revision: 14743 http://gar.svn.sourceforge.net/gar/?rev=14743&view=rev Author: ellson Date: 2011-06-08 01:58:03 +0000 (Wed, 08 Jun 2011) Log Message: ----------- liblasi: disable 64bit - doesn't like libfreetype.so Modified Paths: -------------- csw/mgar/pkg/liblasi/trunk/Makefile Modified: csw/mgar/pkg/liblasi/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblasi/trunk/Makefile 2011-06-08 01:49:11 UTC (rev 14742) +++ csw/mgar/pkg/liblasi/trunk/Makefile 2011-06-08 01:58:03 UTC (rev 14743) @@ -48,7 +48,7 @@ # That is ok CHECKPKG_OVERRIDES_CSWliblasi-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liblasi/examples/README -BUILD64 = 1 +# BUILD64 = 1 CXXFLAGS = -L/usr/lib -lCstd -norunpath This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Wed Jun 8 04:06:15 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Wed, 08 Jun 2011 02:06:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14744] csw/mgar/pkg/liblasi/trunk/Makefile Message-ID: Revision: 14744 http://gar.svn.sourceforge.net/gar/?rev=14744&view=rev Author: ellson Date: 2011-06-08 02:06:15 +0000 (Wed, 08 Jun 2011) Log Message: ----------- liblasi: adjust CHECKPKG_OVERRIDES Modified Paths: -------------- csw/mgar/pkg/liblasi/trunk/Makefile Modified: csw/mgar/pkg/liblasi/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblasi/trunk/Makefile 2011-06-08 01:58:03 UTC (rev 14743) +++ csw/mgar/pkg/liblasi/trunk/Makefile 2011-06-08 02:06:15 UTC (rev 14744) @@ -34,7 +34,6 @@ SPKG_DESC_CSWliblasi0 = C++ Unicode support for PostScript, libLASi.so.0 PKGFILES_CSWliblasi0 = $(call pkgfiles_lib,libLASi.so.0) RUNTIME_DEP_PKGS_CSWliblasi0 += CSWftype2 -RUNTIME_DEP_PKGS_CSWliblasi0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWliblasi0 += CSWglib2 RUNTIME_DEP_PKGS_CSWliblasi0 += CSWpango RUNTIME_DEP_PKGS_CSWliblasi0 += CSWfconfig @@ -45,9 +44,15 @@ PKGFILES_CSWliblasi-dev += $(PKGFILES_DEVEL) PKGFILES_CSWliblasi-dev += $(sharedstatedir)/doc/.* RUNTIME_DEP_PKGS_CSWliblasi-dev += CSWliblasi0 + # That is ok CHECKPKG_OVERRIDES_CSWliblasi-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liblasi/examples/README +# FIXME - I don't understand this - please review +CHECKPKG_OVERRIDES_CSWliblasi0 += binary-architecture-does-not-match-placement|file=opt/csw/lib/libLASi.so.0.0.1|arch_id=18|arch_name=sparcv8+ + +# Didn't like libfreetype.so +# ld: fatal: file /opt/csw/lib/sparcv9/libfreetype.so: wrong ELF class: ELFCLASS64 # BUILD64 = 1 CXXFLAGS = -L/usr/lib -lCstd -norunpath This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Wed Jun 8 04:26:21 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Wed, 8 Jun 2011 03:26:21 +0100 Subject: [csw-devel] SF.net SVN: gar:[14744] csw/mgar/pkg/liblasi/trunk/Makefile In-Reply-To: References: Message-ID: Hi John, 2011/6/8 : > +# FIXME - I don't understand this - please review > +CHECKPKG_OVERRIDES_CSWliblasi0 += binary-architecture-does-not-match-placement|file=opt/csw/lib/libLASi.so.0.0.1|arch_id=18|arch_name=sparcv8+ I wrote a short description on our wiki: http://wiki.opencsw.org/checkpkg-error-tags#toc10 I suspect that CFLAGS are dropped from the build system at some stage, and Solaris Studio is producing binaries with its default 32-bit instruction set, sparcv8+ (instead of sparcv8). Maciej From dmichelsen at users.sourceforge.net Wed Jun 8 12:34:53 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 08 Jun 2011 10:34:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[14745] csw/mgar/pkg/libcairo/trunk Message-ID: Revision: 14745 http://gar.svn.sourceforge.net/gar/?rev=14745&view=rev Author: dmichelsen Date: 2011-06-08 10:34:53 +0000 (Wed, 08 Jun 2011) Log Message: ----------- libcairo: Complete rework, split packages Modified Paths: -------------- csw/mgar/pkg/libcairo/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libcairo/trunk/files/0001-Use-detected-EGREP-instead-of-generic-grep.patch Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2011-06-08 02:06:15 UTC (rev 14744) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2011-06-08 10:34:53 UTC (rev 14745) @@ -1,52 +1,77 @@ -NAME = libcairo -VERSION = 1.10.2 -CATEGORIES = lib +NAME = cairo +VERSION = 1.10.2 +CATEGORIES = lib -DESCRIPTION = The Cairo 2D Graphics Library +DESCRIPTION = The Cairo 2D Graphics Library define BLURB -Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL (through glitz), XCB, BeOS, OS/2, and DirectFB. + Cairo is a 2D graphics library with support for multiple output devices. + Currently supported output targets include the X Window System, Quartz, Win32, + image buffers, PostScript, PDF, and SVG file output. Experimental backends + include OpenGL (through glitz), XCB, BeOS, OS/2, and DirectFB. endef -MASTER_SITES = http://www.cairographics.org/releases/ -DISTNAME = cairo-$(VERSION) -DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = http://www.cairographics.org/releases/ +DISTFILES = $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +# Apply patch until this is fixed: +# https://bugs.freedesktop.org/show_bug.cgi?id=37916 +PATCHFILES += 0001-Use-detected-EGREP-instead-of-generic-grep.patch -PACKAGES += CSWlibcairo -CATALOGNAME_CSWlibcairo = libcairo -SPKG_DESC_CSWlibcairo = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWlibcairo += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibcairo += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibcairo += CSWpixman -RUNTIME_DEP_PKGS_CSWlibcairo += CSWpng -RUNTIME_DEP_PKGS_CSWlibcairo += CSWzlib -RUNTIME_DEP_PKGS_CSWlibcairo += CSWexpat -RUNTIME_DEP_PKGS_CSWlibcairo += CSWiconv +PACKAGES += CSWlibcairo2 +SPKG_DESC_CSWlibcairo2 = The Cairo 2D Graphics Library, libcairo.so.2 +PKGFILES_CSWlibcairo2 = $(call pkgfiles_lib,libcairo.so.2) +RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWpng +RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWlibpixman1-0 +OBSOLETED_BY_CSWlibcairo2 = CSWlibcairo -PACKAGES += CSWlibcairodevel -CATALOGNAME_CSWlibcairodevel = libcairo_devel -SPKG_DESC_CSWlibcairodevel = $(DESCRIPTION) development package -PKGFILES_CSWlibcairodevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibcairodevel += $(docdir)/libcairo_devel/.* -RUNTIME_DEP_PKGS_CSWlibcairodevel = CSWlibcairo +PACKAGES += CSWlibcairo-script-interpreter2 +SPKG_DESC_CSWlibcairo-script-interpreter2 = The Cairo 2D Graphics Library, libcairo-script-interpreter.so.2 +PKGFILES_CSWlibcairo-script-interpreter2 = $(call pkgfiles_lib,libcairo-script-interpreter.so.2) +RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWpng +RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWlibpixman1-0 +OBSOLETED_BY_CSWlibcairo-script-interpreter2 = CSWlibcairo -PACKAGES += CSWlibcairodoc -CATALOGNAME_CSWlibcairodoc = libcairo_doc -SPKG_DESC_CSWlibcairodoc = $(DESCRIPTION) documentation -PKGFILES_CSWlibcairodoc = $(sharedstatedir)/gtk-doc.* -PKGFILES_CSWlibcairodoc += $(docdir)/libcairo_doc/.* -ARCHALL_CSWlibcairodoc = 1 +PACKAGES += CSWlibcairo-gobject2 +SPKG_DESC_CSWlibcairo-gobject2 = The Cairo 2D Graphics Library, libcairo-gobject.so.2 +PKGFILES_CSWlibcairo-gobject2 = $(call pkgfiles_lib,libcairo-gobject.so.2) +RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWpng +RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWglib2 +OBSOLETED_BY_CSWlibcairo-gobject2 = CSWlibcairo -BUILD_DEP_PKGS = CSWlibspectre +PACKAGES += CSWlibcairo-dev +SPKG_DESC_CSWlibcairo-dev = Development files for libcairo.so.2 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibcairo-dev += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibcairo-dev += CSWlibcairo-script-interpreter2 +RUNTIME_DEP_PKGS_CSWlibcairo-dev += CSWlibcairo-gobject2 +OBSOLETED_BY_CSWlibcairo-dev = CSWlibcairodevel +CATALOGNAME_CSWlibcairodevel = libcairo_devel_stub -# imagediff in testsuite needs -lsocket -# EXTRA_LDFLAGS = -lsocket -lnsl +PACKAGES += CSWlibcairo-doc +SPKG_DESC_CSWlibcairo-doc = $(DESCRIPTION) documentation +PKGFILES_CSWlibcairo-doc += $(sharedstatedir)/gtk-doc.* +ARCHALL_CSWlibcairo-doc = 1 +OBSOLETED_BY_CSWlibcairo-doc = CSWlibcairodoc +CATALOGNAME_CSWlibcairodoc = libcairo_doc_stub -# We don't need it and if defined linking breaks if an old Cairo is installed -LD_OPTIONS = -EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) +# We do NOT want -L/opt/csw/lib in there as the pathes are detected properly and this disturbs libtool later on +LINKER_FLAGS = BUILD64 = 1 @@ -70,6 +95,9 @@ # This is broken due to missing stdint.h and use of setenv(3c) CONFIGURE_ARGS += --enable-trace=no +# There are many source tests failing +SKIPTEST ?= 1 + include gar/category.mk # configure has problems with non-gnu utilities Added: csw/mgar/pkg/libcairo/trunk/files/0001-Use-detected-EGREP-instead-of-generic-grep.patch =================================================================== --- csw/mgar/pkg/libcairo/trunk/files/0001-Use-detected-EGREP-instead-of-generic-grep.patch (rev 0) +++ csw/mgar/pkg/libcairo/trunk/files/0001-Use-detected-EGREP-instead-of-generic-grep.patch 2011-06-08 10:34:53 UTC (rev 14745) @@ -0,0 +1,28 @@ +From 68bde8c7426b8d95d6c86397591232dd1efa74a1 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 8 Jun 2011 11:16:21 +0200 +Subject: [PATCH] Use detected EGREP instead of generic grep + +--- + src/Makefile.am | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 5edf706..f94e470 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -69,9 +69,9 @@ cairo.def: cairo-features.h $(enabled_cairo_headers) + @echo Generating $@ + @(echo EXPORTS; \ + (cd $(srcdir); cat $(enabled_cairo_headers) || echo 'cairo_ERROR ()' ) | \ +- grep -v -E '^# *include' | \ ++ $(EGREP) -v '^# *include' | \ + ( cat cairo-features.h - | $(CPP) -D__cplusplus - || echo 'cairo_ERROR ()' ) | \ +- grep -E '^cairo_.* \(' | \ ++ $(EGREP) '^cairo_.* \(' | \ + sed -e 's/[ ].*//' | \ + sort; \ + echo LIBRARY libcairo-$(CAIRO_VERSION_SONUM).dll; \ +-- +1.7.5.4 + 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 Jun 8 12:36:09 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 08 Jun 2011 10:36:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[14746] csw/mgar/pkg/rsync/trunk/Makefile Message-ID: Revision: 14746 http://gar.svn.sourceforge.net/gar/?rev=14746&view=rev Author: dmichelsen Date: 2011-06-08 10:36:09 +0000 (Wed, 08 Jun 2011) Log Message: ----------- rsync: Disable 64 bit as one test is failing Modified Paths: -------------- csw/mgar/pkg/rsync/trunk/Makefile Modified: csw/mgar/pkg/rsync/trunk/Makefile =================================================================== --- csw/mgar/pkg/rsync/trunk/Makefile 2011-06-08 10:34:53 UTC (rev 14745) +++ csw/mgar/pkg/rsync/trunk/Makefile 2011-06-08 10:36:09 UTC (rev 14746) @@ -22,9 +22,6 @@ RUNTIME_DEP_PKGS_CSWrsync = CSWiconv RUNTIME_DEP_PKGS_CSWrsync += CSWlibpopt -BUILD64 = 1 -ISAEXEC = 1 - # The location of rsyncd.conf to OpenCSW standard has been done in 3.0.8 MIGRATE_FILES = rsyncd.conf MIGRATE_SOURCE_DIR = /etc 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 Jun 8 13:32:31 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 08 Jun 2011 11:32:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14747] csw/mgar/pkg/pango/trunk Message-ID: Revision: 14747 http://gar.svn.sourceforge.net/gar/?rev=14747&view=rev Author: dmichelsen Date: 2011-06-08 11:32:30 +0000 (Wed, 08 Jun 2011) Log Message: ----------- pango: Complete rework Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile csw/mgar/pkg/pango/trunk/checksums Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2011-06-08 10:36:09 UTC (rev 14746) +++ csw/mgar/pkg/pango/trunk/Makefile 2011-06-08 11:32:30 UTC (rev 14747) @@ -1,4 +1,4 @@ -NAME = libpango +NAME = pango VERSION = 1.24.5 CATEGORIES = lib @@ -10,59 +10,77 @@ languages. endef -MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/pango/1.24/ -DISTNAME = pango-$(VERSION) +MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += CSWpango.postinstall -PACKAGES = CSWpango CSWpangodevel CSWpangodoc -CATALOGNAME_CSWpango = libpango -CATALOGNAME_CSWpangodevel = libpango_devel -CATALOGNAME_CSWpangodoc = libpango_doc +VENDOR_URL = http://www.pango.org/ -BUILD_DEP_PKGS = CSWgtk-doc CSWlibxslt CSWglib2devel CSWlibxft2devel -RUNTIME_DEP_PKGS_CSWpango = CSWggettextrt CSWglib2 CSWfconfig CSWftype2 -RUNTIME_DEP_PKGS_CSWpango += CSWlibcairo CSWlibxft2 CSWlibxrender CSWlibx11 -RUNTIME_DEP_PKGS_CSWpangodevel = CSWpango - +PACKAGES += CSWpango SPKG_DESC_CSWpango = Pango, a framework for the layout and rendering of international text -SPKG_DESC_CSWpangodevel = Pango Developer Files -SPKG_DESC_CSWpangodoc = Pango Documentation +RUNTIME_DEP_PKGS_CSWpango += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpango += CSWlibxft2 +RUNTIME_DEP_PKGS_CSWpango += CSWglib2 +RUNTIME_DEP_PKGS_CSWpango += CSWlibxrender +RUNTIME_DEP_PKGS_CSWpango += CSWftype2 +RUNTIME_DEP_PKGS_CSWpango += CSWfconfig +RUNTIME_DEP_PKGS_CSWpango += CSWlibcairo2 -SPKG_SOURCEURL = http://www.pango.org/ +# No split for now as it is unclear how the plugins depend on each one +CHECKPKG_OVERRIDES_CSWpango += shared-lib-pkgname-mismatch -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/pango/ -UFILES_REGEX = (\d+(?:\.\d+)*) +#RUNTIME_DEP_PKGS_CSWpango += CSWlibpango1-0-0 +#RUNTIME_DEP_PKGS_CSWpango += CSWlibpangocairo-1-0-0 +#RUNTIME_DEP_PKGS_CSWpango += CSWlibpangoft2-1-0-0 +#RUNTIME_DEP_PKGS_CSWpango += CSWlibpangox1-0-0 +#RUNTIME_DEP_PKGS_CSWpango += CSWlibpangoxft1-0-0 -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +#PACKAGES += CSWlibpango1-0-0 +#SPKG_DESC_CSWlibpango1-0-0 = Pango, a framework for the layout and rendering of international text, libpango-1.0.so.0 +#PKGFILES_CSWlibpango1-0-0 = $(call pkgfiles_lib,libpango-1.0.so.0) +# +#PACKAGES += CSWlibpangocairo-1-0-0 +#SPKG_DESC_CSWlibpangocairo-1-0-0 = Cairo bindings for Pango, libpangocairo-1.0.so.0 +#PKGFILES_CSWlibpangocairo1-0-0 = $(call pkgfiles_lib,libpangocairo-1.0.so.0) +# +#PACKAGES += CSWlibpangoft2-1-0-0 +#SPKG_DESC_CSWlibpangoft2-1-0-0 = Freetype bindings for Pango, libpangoft2-1.0.so.0 +#PKGFILES_CSWlibpangoft2-1-0-0 = $(call pkgfiles_lib,libpangoft2-1.0.so.0) +# +#PACKAGES += CSWlibpangox1-0-0 +#SPKG_DESC_CSWlibpangox1-0-0 = X11 bindings for Pango, libpangox-1.0.so.0 +#PKGFILES_CSWlibpangox1-0-0 = $(call pkgfiles_lib,libpangox-1.0.so.0) +# +#PACKAGES += CSWlibpangoxft1-0-0 +#SPKG_DESC_CSWlibpangoxft1-0-0 = XFT bindings for Pango, libpangoxft-1.0.so.0 +#PKGFILES_CSWlibpangoxft1-0-0 = $(call pkgfiles_lib,libpangoxft-1.0.so.0) -BUILD64 = 1 -NOISALIST = 1 -EXTRA_ISAEXEC_EXCLUDE_FILES = $(bindir)/pango-querymodules -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-x --enable-gtk-doc -CONFIGURE_ARGS += --x-include=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -# CONFIGURE_ARGS += --with-included-modules +PACKAGES += CSWpango-dev +SPKG_DESC_CSWpango-dev = Developer files for libpango-1.0.so.0 and assorted libs +PKGFILES_CSWpango-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWpango-dev += CSWpango +#RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpango1-0-0 +#RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpangocairo-1-0-0 +#RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpangoft2-1-0-0 +#RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpangox1-0-0 +#RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpangoxft1-0-0 +OBSOLETED_BY_CSWpango-dev = CSWpangodevel +CATALOGNAME_CSWpangodevel = libpango_devel_stub -STRIP_LIBTOOL = 1 +PACKAGES += CSWpango-doc +SPKG_DESC_CSWpango-doc = Documentation for Pango +PKGFILES_CSWpango-doc = $(sharedstatedir)/gtk-doc/.* +ARCHALL_CSWpango-doc = 1 +OBSOLETED_BY_CSWpango-doc = CSWpangodoc +CATALOGNAME_CSWpangodoc = libpango_doc_stub -# Dynamic prototype -PKGFILES_CSWpangodevel = $(PKGFILES_DEVEL) -PKGFILES_CSWpangodoc = $(sharedstatedir)/gtk-doc/.* +BUILD_DEP_PKGS += CSWgtk-doc +BUILD_DEP_PKGS += CSWlibxslt +BUILD_DEP_PKGS += CSWglib2devel +BUILD_DEP_PKGS += CSWlibxft2devel -ARCHALL_CSWpangodoc = 1 +BUILD64 = 1 -# Do not execute make test step -TEST_SCRIPTS = - -EXTRA_MERGE_EXCLUDE_FILES = .*/preload\.1\.gz - sysconfdir_isa-sparcv9 = $(prefix)/etc/64 sysconfdir_isa-sparcv8 = $(prefix)/etc sysconfdir_isa-i386 = $(prefix)/etc @@ -70,8 +88,29 @@ sysconfdir_isa-amd64 = $(prefix)/etc/64 sysconfdir = $(sysconfdir_$(MODULATION)) +# EXTRA_ISAEXEC_EXCLUDE_FILES = $(bindir)/pango-querymodules +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-x --enable-gtk-doc +# CONFIGURE_ARGS += --with-included-modules + +STRIP_LIBTOOL = 1 + +# Lots of compiler-specific tests failing (Sun Studio?) +SKIPTEST ?= 1 + +EXTRA_MERGE_EXCLUDE_FILES = .*/preload\.1\.gz + +# We need the binaries to query 64 bit modules +MERGE_DIRS_isa-extra = $(bindir) $(libdir) + include gar/category.mk +post-extract-modulated: + -perl -pi \ + -e 's,#!/bin/sh,#!/bin/bash,' \ + $(WORKSRC)/pango/check.defs + @$(MAKECOOKIE) + post-merge: mkdir -p $(PKGROOT)$(sysconfdir)/64/pango @$(MAKECOOKIE) Modified: csw/mgar/pkg/pango/trunk/checksums =================================================================== --- csw/mgar/pkg/pango/trunk/checksums 2011-06-08 10:36:09 UTC (rev 14746) +++ csw/mgar/pkg/pango/trunk/checksums 2011-06-08 11:32:30 UTC (rev 14747) @@ -1,2 +1 @@ -236547eb782b42500d0d743f25340599 download/CSWpango.postinstall -815416a452e9cccc172fed9862401f37 download/pango-1.24.5.tar.bz2 +815416a452e9cccc172fed9862401f37 pango-1.24.5.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Wed Jun 8 13:45:10 2011 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Wed, 08 Jun 2011 11:45:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14748] csw/mgar/pkg/liblasi/trunk/Makefile Message-ID: Revision: 14748 http://gar.svn.sourceforge.net/gar/?rev=14748&view=rev Author: ellson Date: 2011-06-08 11:45:09 +0000 (Wed, 08 Jun 2011) Log Message: ----------- liblasi: using EXTRA_LIB instead of EXTRA_CXXFLAGS Modified Paths: -------------- csw/mgar/pkg/liblasi/trunk/Makefile Modified: csw/mgar/pkg/liblasi/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblasi/trunk/Makefile 2011-06-08 11:32:30 UTC (rev 14747) +++ csw/mgar/pkg/liblasi/trunk/Makefile 2011-06-08 11:45:09 UTC (rev 14748) @@ -37,6 +37,7 @@ RUNTIME_DEP_PKGS_CSWliblasi0 += CSWglib2 RUNTIME_DEP_PKGS_CSWliblasi0 += CSWpango RUNTIME_DEP_PKGS_CSWliblasi0 += CSWfconfig +RUNTIME_DEP_PKGS_CSWliblasi0 += CSWlibintl8 OBSOLETED_BY_CSWliblasi0 = CSWliblasi PACKAGES += CSWliblasi-dev @@ -48,14 +49,17 @@ # That is ok CHECKPKG_OVERRIDES_CSWliblasi-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liblasi/examples/README -# FIXME - I don't understand this - please review -CHECKPKG_OVERRIDES_CSWliblasi0 += binary-architecture-does-not-match-placement|file=opt/csw/lib/libLASi.so.0.0.1|arch_id=18|arch_name=sparcv8+ +# Not sure about these +CHECKPKG_OVERRIDES_CSWliblasi0 += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libLASi.so.0.0.1 +CHECKPKG_OVERRIDES_CSWliblasi0 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libLASi.so.0.0.1 +CHECKPKG_OVERRIDES_CSWliblasi0 += bad-rpath-entry|/lib|opt/csw/lib/libLASi.so.0.0.1 +CHECKPKG_OVERRIDES_CSWliblasi0 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libLASi.so.0.0.1 # Didn't like libfreetype.so # ld: fatal: file /opt/csw/lib/sparcv9/libfreetype.so: wrong ELF class: ELFCLASS64 # BUILD64 = 1 -CXXFLAGS = -L/usr/lib -lCstd -norunpath +EXTRA_LIB = -L/usr/lib -lCstd -norunpath CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jun 8 14:15:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 08 Jun 2011 12:15:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14749] csw/mgar/pkg/pango/trunk Message-ID: Revision: 14749 http://gar.svn.sourceforge.net/gar/?rev=14749&view=rev Author: dmichelsen Date: 2011-06-08 12:15:49 +0000 (Wed, 08 Jun 2011) Log Message: ----------- pango: Relocate to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile csw/mgar/pkg/pango/trunk/files/CSWpango.postinstall Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2011-06-08 11:45:09 UTC (rev 14748) +++ csw/mgar/pkg/pango/trunk/Makefile 2011-06-08 12:15:49 UTC (rev 14749) @@ -74,6 +74,7 @@ OBSOLETED_BY_CSWpango-doc = CSWpangodoc CATALOGNAME_CSWpangodoc = libpango_doc_stub +BUILD_DEP_PKGS += CSWggettext-dev BUILD_DEP_PKGS += CSWgtk-doc BUILD_DEP_PKGS += CSWlibxslt BUILD_DEP_PKGS += CSWglib2devel @@ -81,12 +82,8 @@ BUILD64 = 1 -sysconfdir_isa-sparcv9 = $(prefix)/etc/64 -sysconfdir_isa-sparcv8 = $(prefix)/etc -sysconfdir_isa-i386 = $(prefix)/etc -sysconfdir_global = $(prefix)/etc -sysconfdir_isa-amd64 = $(prefix)/etc/64 -sysconfdir = $(sysconfdir_$(MODULATION)) +sysconfdir-suffix-64 = /64 +sysconfdir = /etc/opt/csw$(sysconfdir-suffix-$(MEMORYMODEL)) # EXTRA_ISAEXEC_EXCLUDE_FILES = $(bindir)/pango-querymodules CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/pango/trunk/files/CSWpango.postinstall =================================================================== --- csw/mgar/pkg/pango/trunk/files/CSWpango.postinstall 2011-06-08 11:45:09 UTC (rev 14748) +++ csw/mgar/pkg/pango/trunk/files/CSWpango.postinstall 2011-06-08 12:15:49 UTC (rev 14749) @@ -6,14 +6,14 @@ echo 'Updating pango.modules...' test -x ${PKG_ROOT_DIR}/opt/csw/bin/pango-querymodules && \ - chroot "${PKG_ROOT_DIR}" /opt/csw/bin/pango-querymodules >"${PKG_ROOT_DIR}"/opt/csw/etc/pango/pango.modules && - chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWpango /opt/csw/etc/pango/pango.modules f 0644 root bin + chroot "${PKG_ROOT_DIR}" /opt/csw/bin/pango-querymodules >"${PKG_ROOT_DIR}"/etc/opt/csw/pango/pango.modules && + chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWpango /etc/opt/csw/pango/pango.modules f 0644 root bin test -x ${PKG_ROOT_DIR}/opt/csw/bin/sparcv9/pango-querymodules && \ - chroot "${PKG_ROOT_DIR}" /opt/csw/bin/sparcv9/pango-querymodules >"${PKG_ROOT_DIR}"/opt/csw/etc/64/pango/pango.modules && - chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWpango /opt/csw/etc/64/pango/pango.modules f 0644 root bin + chroot "${PKG_ROOT_DIR}" /opt/csw/bin/sparcv9/pango-querymodules >"${PKG_ROOT_DIR}"/etc/opt/csw/64/pango/pango.modules && + chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWpango /etc/opt/csw/64/pango/pango.modules f 0644 root bin test -x ${PKG_ROOT_DIR}/opt/csw/bin/amd64/pango-querymodules && \ - chroot "${PKG_ROOT_DIR}" /opt/csw/bin/amd64/pango-querymodules >"${PKG_ROOT_DIR}"/opt/csw/etc/64/pango/pango.modules && - chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWpango /opt/csw/etc/64/pango/pango.modules f 0644 root bin + chroot "${PKG_ROOT_DIR}" /opt/csw/bin/amd64/pango-querymodules >"${PKG_ROOT_DIR}"/etc/opt/csw/64/pango/pango.modules && + chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWpango /etc/opt/csw/64/pango/pango.modules f 0644 root bin chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f CSWpango /bin/true 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 Jun 8 19:48:38 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 08 Jun 2011 17:48:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[14750] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14750 http://gar.svn.sourceforge.net/gar/?rev=14750&view=rev Author: bdwalton Date: 2011-06-08 17:48:38 +0000 (Wed, 08 Jun 2011) Log Message: ----------- bacula/trunk: some preserveconf and migrateconf fixes for the scripts/ rearrangement Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-06-08 12:15:49 UTC (rev 14749) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-06-08 17:48:38 UTC (rev 14750) @@ -250,45 +250,46 @@ MIGRATE_FILES_CSWbacula-fd = "bacula-fd.conf" MIGRATE_FILES_CSWbacula-console = "bconsole.conf" MIGRATE_FILES_CSWbacula-tray-monitor = "tray-monitor.conf" + MIGRATE_SOURCE_DIR = /opt/csw/etc/bacula MIGRATE_DEST_DIR = $(sysconfdir) +MIGRATE_DEST_DIR_mtx-changer_conf = $(sysconfdir)/scripts PRESERVECONF = $(sysconfdir)/bacula-dir.conf $(sysconfdir)/bacula-sd.conf PRESERVECONF += $(sysconfdir)/bacula-fd.conf $(sysconfdir)/bconsole.conf -PRESERVECONF += $(sysconfdir)/mtx-changer.conf PRESERVECONF += $(sysconfdir)/tray-monitor.conf -PRESERVECONF += $(sysconfdir)/bacula/scripts/bacula-ctl-fd -PRESERVECONF += $(sysconfdir)/bacula/scripts/btraceback.dbx -PRESERVECONF += $(sysconfdir)/bacula/scripts/grant_mysql_privileges -PRESERVECONF += $(sysconfdir)/bacula/scripts/drop_mysql_tables -PRESERVECONF += $(sysconfdir)/bacula/scripts/drop_bacula_tables -PRESERVECONF += $(sysconfdir)/bacula/scripts/stopmysql -PRESERVECONF += $(sysconfdir)/bacula/scripts/drop_bacula_database -PRESERVECONF += $(sysconfdir)/bacula/scripts/make_catalog_backup -PRESERVECONF += $(sysconfdir)/bacula/scripts/create_mysql_database -PRESERVECONF += $(sysconfdir)/bacula/scripts/startmysql -PRESERVECONF += $(sysconfdir)/bacula/scripts/delete_catalog_backup -PRESERVECONF += $(sysconfdir)/bacula/scripts/btraceback.mdb -PRESERVECONF += $(sysconfdir)/bacula/scripts/make_mysql_tables -PRESERVECONF += $(sysconfdir)/bacula/scripts/update_mysql_tables -PRESERVECONF += $(sysconfdir)/bacula/scripts/grant_bacula_privileges -PRESERVECONF += $(sysconfdir)/bacula/scripts/mtx-changer -PRESERVECONF += $(sysconfdir)/bacula/scripts/btraceback.gdb -PRESERVECONF += $(sysconfdir)/bacula/scripts/mtx-changer.conf -PRESERVECONF += $(sysconfdir)/bacula/scripts/update_mysql_tables_10_to_11 -PRESERVECONF += $(sysconfdir)/bacula/scripts/disk-changer -PRESERVECONF += $(sysconfdir)/bacula/scripts/make_bacula_tables -PRESERVECONF += $(sysconfdir)/bacula/scripts/bacula-ctl-dir -PRESERVECONF += $(sysconfdir)/bacula/scripts/dvd-handler -PRESERVECONF += $(sysconfdir)/bacula/scripts/bacula-ctl-sd -PRESERVECONF += $(sysconfdir)/bacula/scripts/bacula_config -PRESERVECONF += $(sysconfdir)/bacula/scripts/bacula -PRESERVECONF += $(sysconfdir)/bacula/scripts/query.sql -PRESERVECONF += $(sysconfdir)/bacula/scripts/update_bacula_tables -PRESERVECONF += $(sysconfdir)/bacula/scripts/create_bacula_database -PRESERVECONF += $(sysconfdir)/bacula/scripts/drop_mysql_database -PRESERVECONF += $(sysconfdir)/bacula/scripts/make_catalog_backup.pl -PRESERVECONF += $(sysconfdir)/bacula/scripts/bconsole +PRESERVECONF += $(sysconfdir)/scripts/bacula-ctl-fd +PRESERVECONF += $(sysconfdir)/scripts/btraceback.dbx +PRESERVECONF += $(sysconfdir)/scripts/grant_mysql_privileges +PRESERVECONF += $(sysconfdir)/scripts/drop_mysql_tables +PRESERVECONF += $(sysconfdir)/scripts/drop_bacula_tables +PRESERVECONF += $(sysconfdir)/scripts/stopmysql +PRESERVECONF += $(sysconfdir)/scripts/drop_bacula_database +PRESERVECONF += $(sysconfdir)/scripts/make_catalog_backup +PRESERVECONF += $(sysconfdir)/scripts/create_mysql_database +PRESERVECONF += $(sysconfdir)/scripts/startmysql +PRESERVECONF += $(sysconfdir)/scripts/delete_catalog_backup +PRESERVECONF += $(sysconfdir)/scripts/btraceback.mdb +PRESERVECONF += $(sysconfdir)/scripts/make_mysql_tables +PRESERVECONF += $(sysconfdir)/scripts/update_mysql_tables +PRESERVECONF += $(sysconfdir)/scripts/grant_bacula_privileges +PRESERVECONF += $(sysconfdir)/scripts/mtx-changer +PRESERVECONF += $(sysconfdir)/scripts/btraceback.gdb +PRESERVECONF += $(sysconfdir)/scripts/mtx-changer.conf +PRESERVECONF += $(sysconfdir)/scripts/update_mysql_tables_10_to_11 +PRESERVECONF += $(sysconfdir)/scripts/disk-changer +PRESERVECONF += $(sysconfdir)/scripts/make_bacula_tables +PRESERVECONF += $(sysconfdir)/scripts/bacula-ctl-dir +PRESERVECONF += $(sysconfdir)/scripts/dvd-handler +PRESERVECONF += $(sysconfdir)/scripts/bacula-ctl-sd +PRESERVECONF += $(sysconfdir)/scripts/bacula_config +PRESERVECONF += $(sysconfdir)/scripts/bacula +PRESERVECONF += $(sysconfdir)/scripts/query.sql +PRESERVECONF += $(sysconfdir)/scripts/update_bacula_tables +PRESERVECONF += $(sysconfdir)/scripts/create_bacula_database +PRESERVECONF += $(sysconfdir)/scripts/drop_mysql_database +PRESERVECONF += $(sysconfdir)/scripts/make_catalog_backup.pl +PRESERVECONF += $(sysconfdir)/scripts/bconsole USERGROUP += /etc/opt/csw/pkg/CSWbacula-director/cswusergroup USERGROUP += /etc/opt/csw/pkg/CSWbacula-sd/cswusergroup This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Wed Jun 8 20:04:23 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Wed, 8 Jun 2011 20:04:23 +0200 Subject: [csw-devel] SF.net SVN: gar:[14735] csw/mgar/pkg/dovecot/trunk/Makefile In-Reply-To: <1307495628-sup-374@pinkfloyd.chass.utoronto.ca> References: <1307490426-sup-5827@pinkfloyd.chass.utoronto.ca> <4DEEC5BE.7090507@opencsw.org> <1307495628-sup-374@pinkfloyd.chass.utoronto.ca> Message-ID: <52645900-7326-4589-B1F9-1702FED67050@opencsw.org> Hi, Am 08.06.2011 um 03:16 schrieb Ben Walton: > Excerpts from Jake Goerzen's message of Tue Jun 07 20:43:42 -0400 2011: > > Hi Jake, > >> The RPATH in the rest of the executable files is correct. I overrided >> temporarily for now but will look into why > > Ok, that's not a fatal issue by any means. I've seen this occur in > cases where packages pick up CFLAGS or LDFLAGS from things like > mysql-config, etc. Sometimes it is an easy fix, other times not (way > to cover all the bases!). It generally depends on the sanity of the > build system in use. If you can't find the injection point or don't > see a fix, feel free to ask for other eyeballs to help. This one is most certainly from Kerberos. Best regard -- Dago -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 From dmichelsen at users.sourceforge.net Wed Jun 8 20:53:24 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 08 Jun 2011 18:53:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[14751] csw/mgar/pkg/rsync/trunk/Makefile Message-ID: Revision: 14751 http://gar.svn.sourceforge.net/gar/?rev=14751&view=rev Author: dmichelsen Date: 2011-06-08 18:53:24 +0000 (Wed, 08 Jun 2011) Log Message: ----------- rsync: Fix missing replacement of rsyncd.conf location Modified Paths: -------------- csw/mgar/pkg/rsync/trunk/Makefile Modified: csw/mgar/pkg/rsync/trunk/Makefile =================================================================== --- csw/mgar/pkg/rsync/trunk/Makefile 2011-06-08 17:48:38 UTC (rev 14750) +++ csw/mgar/pkg/rsync/trunk/Makefile 2011-06-08 18:53:24 UTC (rev 14751) @@ -37,4 +37,5 @@ $(DESTDIR)$(mandir)/man5/rsyncd.conf.5 perl -pi \ -e 's,/usr/local,$(prefix),g;' \ + -e 's,/etc/rsyncd.conf,$(sysconfdir)/rsyncd.conf,g;' \ $(DESTDIR)$(mandir)/man1/rsync.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Jun 8 20:59:51 2011 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 08 Jun 2011 18:59:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14752] csw/mgar/pkg/dovecot/trunk/Makefile Message-ID: Revision: 14752 http://gar.svn.sourceforge.net/gar/?rev=14752&view=rev Author: jake_goerzen Date: 2011-06-08 18:59:50 +0000 (Wed, 08 Jun 2011) Log Message: ----------- dovecot: rename _devel to _dev Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2011-06-08 18:53:24 UTC (rev 14751) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2011-06-08 18:59:50 UTC (rev 14752) @@ -21,19 +21,19 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWdovecot CSWdovecot-devel +PACKAGES = CSWdovecot CSWdovecot-dev CATALOGNAME_CSWdovecot = dovecot -CATALOGNAME_CSWdovecot-devel = dovecot_devel +CATALOGNAME_CSWdovecot-dev = dovecot_dev SPKG_DESC_CSWdovecot = Secure IMAP server -SPKG_DESC_CSWdovecot-devel = Dovecot secure IMAP server header files +SPKG_DESC_CSWdovecot-dev = Dovecot secure IMAP server header files RUNTIME_DEP_PKGS_CSWdovecot = CSWosslrt CSWmysql5rt CSWoldaprt CSWlibpq RUNTIME_DEP_PKGS_CSWdovecot += CSWzlib CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWdovecot += CSWbzip2 CSWiconv RUNTIME_DEP_PKGS_CSWdovecot += CSWkrb5lib -RUNTIME_DEP_PKGS_CSWdovecot-devel = CSWdovecot +RUNTIME_DEP_PKGS_CSWdovecot-dev = CSWdovecot BUILD_DEP_PKGS = CSWossldevel CSWosslrt BUILD_DEP_PKGS += CSWmysql5devel CSWmysql5rt @@ -41,7 +41,7 @@ BUILD_DEP_PKGS += CSWlibpq BUILD_DEP_PKGS += CSWkrb5lib CSWkrb5libdev -PKGFILES_CSWdovecot-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWdovecot-dev = $(PKGFILES_DEVEL) # These directories belong to CSWosslrt PROTOTYPE_FILTER = awk '\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Wed Jun 8 21:21:46 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Wed, 8 Jun 2011 21:21:46 +0200 Subject: [csw-devel] Fwd: SF.net SVN: gar:[14752] csw/mgar/pkg/dovecot/trunk/Makefile References: Message-ID: <2624F6CF-CE1D-40F0-9294-5A8158BCA0EA@opencsw.org> Hi Jake, you may want to add the lower lines for a smooth transition: Best regards -- Dago Anfang der weitergeleiteten E-Mail: > Von: jake_goerzen at users.sourceforge.net > Datum: 8. Juni 2011 20:59:51 MESZ > An: devel at lists.opencsw.org > Betreff: [csw-devel] SF.net SVN: gar:[14752] csw/mgar/pkg/dovecot/trunk/Makefile > Antwort an: Broadcasts commit logs for build descriptions and GAR > > Revision: 14752 > http://gar.svn.sourceforge.net/gar/?rev=14752&view=rev > Author: jake_goerzen > Date: 2011-06-08 18:59:50 +0000 (Wed, 08 Jun 2011) > > Log Message: > ----------- > dovecot: rename _devel to _dev > > Modified Paths: > -------------- > csw/mgar/pkg/dovecot/trunk/Makefile > > Modified: csw/mgar/pkg/dovecot/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/dovecot/trunk/Makefile 2011-06-08 18:53:24 UTC (rev 14751) > +++ csw/mgar/pkg/dovecot/trunk/Makefile 2011-06-08 18:59:50 UTC (rev 14752) > @@ -21,19 +21,19 @@ > DISTFILES = $(NAME)-$(VERSION).tar.gz > UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz > > -PACKAGES = CSWdovecot CSWdovecot-devel > +PACKAGES = CSWdovecot CSWdovecot-dev > > CATALOGNAME_CSWdovecot = dovecot > -CATALOGNAME_CSWdovecot-devel = dovecot_devel > +CATALOGNAME_CSWdovecot-dev = dovecot_dev > > SPKG_DESC_CSWdovecot = Secure IMAP server > -SPKG_DESC_CSWdovecot-devel = Dovecot secure IMAP server header files > +SPKG_DESC_CSWdovecot-dev = Dovecot secure IMAP server header files OBSOLETED_BY_CSWdovecot-dev = CSWdovecotdevel CATALOGNAME_CSWdovecotdevel = dovecot_devel_stub > > RUNTIME_DEP_PKGS_CSWdovecot = CSWosslrt CSWmysql5rt CSWoldaprt CSWlibpq > RUNTIME_DEP_PKGS_CSWdovecot += CSWzlib CSWlibsqlite3-0 > RUNTIME_DEP_PKGS_CSWdovecot += CSWbzip2 CSWiconv > RUNTIME_DEP_PKGS_CSWdovecot += CSWkrb5lib > -RUNTIME_DEP_PKGS_CSWdovecot-devel = CSWdovecot > +RUNTIME_DEP_PKGS_CSWdovecot-dev = CSWdovecot > > BUILD_DEP_PKGS = CSWossldevel CSWosslrt > BUILD_DEP_PKGS += CSWmysql5devel CSWmysql5rt > @@ -41,7 +41,7 @@ > BUILD_DEP_PKGS += CSWlibpq > BUILD_DEP_PKGS += CSWkrb5lib CSWkrb5libdev > > -PKGFILES_CSWdovecot-devel = $(PKGFILES_DEVEL) > +PKGFILES_CSWdovecot-dev = $(PKGFILES_DEVEL) > > # These directories belong to CSWosslrt > PROTOTYPE_FILTER = awk '\ > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 From bdwalton at users.sourceforge.net Thu Jun 9 03:14:26 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 09 Jun 2011 01:14:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[14753] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14753 http://gar.svn.sourceforge.net/gar/?rev=14753&view=rev Author: bdwalton Date: 2011-06-09 01:14:26 +0000 (Thu, 09 Jun 2011) Log Message: ----------- php5/trunk: re-add the php5 dep override for subpackages Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-06-08 18:59:50 UTC (rev 14752) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-06-09 01:14:26 UTC (rev 14753) @@ -81,6 +81,7 @@ RUNTIME_DEP_PKGS_CSWphp5-$(1) ?= CSWphp5 $(2) OBSOLETED_BY_CSWphp5-$(1) ?= CSWphp5$(1) PKGFILES_CSWphp5-$(1) ?= .*lib/php/extensions/.*/$(1).so .*php5/extensions/$(1) +CHECKPKG_OVERRIDES_CSWphp5-$(1) += surplus-dependency|CSWphp5 endef PACKAGES = CSWphp5 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 Jun 9 11:33:26 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 09 Jun 2011 09:33:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[14754] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 14754 http://gar.svn.sourceforge.net/gar/?rev=14754&view=rev Author: bonivart Date: 2011-06-09 09:33:26 +0000 (Thu, 09 Jun 2011) Log Message: ----------- clamav/trunk: update to 0.97.1 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2011-06-09 01:14:26 UTC (rev 14753) +++ csw/mgar/pkg/clamav/trunk/Makefile 2011-06-09 09:33:26 UTC (rev 14754) @@ -1,5 +1,5 @@ NAME = clamav -VERSION = 0.97 +VERSION = 0.97.1 #VERSION = 0.97rc #DISTNAME = $(NAME)-devel-latest CATEGORIES = apps @@ -37,7 +37,7 @@ CATALOGNAME_CSWlibclam6-dev = libclam6_dev SPKG_DESC_CSWlibclam6-dev = $(DESCRIPTION) Development RUNTIME_DEP_PKGS_CSWlibclam6-dev = CSWlibclam6 -INCOMPATIBLE_PKGS_CSWlibclam6-dev = CSWlibclamav-devel +INCOMPATIBLE_PKGS_CSWlibclam6-dev = CSWlibclamav-devel CSWlibclamav6-devel PATCHFILES = CSWclamav.freshclam.conf.p PATCHFILES += CSWclamav.clamd.conf.p @@ -103,10 +103,19 @@ CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node56.html CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node24.html CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node15.html -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.9|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.9|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.9|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.10|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.10|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.10|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6 + +# Should only be necessary during transition of devel -> dev +CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/libclamunrar.so|CSWlibclam6-dev|CSWlibclam6-devel +CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/bin/clamav-config|CSWlibclam6-dev|CSWlibclam6-devel +CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/libclamunrar_iface.so|CSWlibclam6-dev|CSWlibclam6-devel +CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/include/clamav.h|CSWlibclam6-dev|CSWlibclam6-devel +CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/pkgconfig/libclamav.pc|CSWlibclam6-dev|CSWlibclam6-devel +CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/libclamav.so|CSWlibclam6-dev|CSWlibclam6-devel + include gar/category.mk DOCS = AUTHORS BUGS ChangeLog Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2011-06-09 01:14:26 UTC (rev 14753) +++ csw/mgar/pkg/clamav/trunk/checksums 2011-06-09 09:33:26 UTC (rev 14754) @@ -1 +1 @@ -605ed132b2f8e89df11064adea2b183b clamav-0.97.tar.gz +4f3fb74ff1098c25eef8e10721478c29 clamav-0.97.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 Jun 9 13:01:03 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Jun 2011 11:01:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14755] csw/mgar/pkg/libcurl4/trunk/Makefile Message-ID: Revision: 14755 http://gar.svn.sourceforge.net/gar/?rev=14755&view=rev Author: dmichelsen Date: 2011-06-09 11:01:03 +0000 (Thu, 09 Jun 2011) Log Message: ----------- libcurl4: Do not build unnecessary CSWcurlrtfull Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2011-06-09 09:33:26 UTC (rev 14754) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2011-06-09 11:01:03 UTC (rev 14755) @@ -40,8 +40,6 @@ CATALOGNAME_CSWlibcurl4-feature = libcurl4_feature SPKG_DESC_CSWlibcurl4-feature = Full-features library for client-side URL transfers superseding libcurl.so.4 PKGFILES_CSWlibcurl4-feature = $(call pkgfiles_lib,libcurl-feature.so.4) -OBSOLETED_BY_CSWlibcurl4-feature = CSWcurlrtfull -CATALOGNAME_CSWcurlrtfull = curl_rt_full_stub RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWzlib RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibfbopenssl RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibidn11 @@ -141,6 +139,7 @@ # These are not really necessary and they confuse the linker as described in #4550 $(GARCOMPILER)_LD_FLAGS := +# Rebuild the minimal library with AUX linkage to feature library post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libcurl-feature.so.4 post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: rm -f $(WORKSRC)/lib/libcurl.la This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jun 9 13:17:44 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Jun 2011 11:17:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[14756] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 14756 http://gar.svn.sourceforge.net/gar/?rev=14756&view=rev Author: dmichelsen Date: 2011-06-09 11:17:44 +0000 (Thu, 09 Jun 2011) Log Message: ----------- mGAR v2: Fix arch setting for SOS12+ for sparcv8plus Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2011-06-09 11:01:03 UTC (rev 14755) +++ csw/mgar/gar/v2/gar.conf.mk 2011-06-09 11:17:44 UTC (rev 14756) @@ -273,8 +273,8 @@ MEMORYMODEL_sparcv8plus+vis = 32 ARCHFLAGS_SOS11_sparcv8plus = -xarch=v8plus - ARCHFLAGS_SOS12_sparcv8plus = -m32 -xarch=v8plus - ARCHFLAGS_SOS12U1_sparcv8plus = -m32 -xarch=v8plus + ARCHFLAGS_SOS12_sparcv8plus = -m32 -xarch=sparc + ARCHFLAGS_SOS12U1_sparcv8plus = -m32 -xarch=sparc ARCHFLAGS_GCC3_sparcv8plus = -mcpu=v8 -mv8plus ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v8 -mv8plus MEMORYMODEL_sparcv8plus = 32 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 Jun 9 13:26:33 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Jun 2011 11:26:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14757] csw/mgar/pkg/zlib/trunk Message-ID: Revision: 14757 http://gar.svn.sourceforge.net/gar/?rev=14757&view=rev Author: dmichelsen Date: 2011-06-09 11:26:32 +0000 (Thu, 09 Jun 2011) Log Message: ----------- zlib: Complete rework and split packages Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/zlib/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/zlib/trunk/files/license Modified: csw/mgar/pkg/zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2011-06-09 11:17:44 UTC (rev 14756) +++ csw/mgar/pkg/zlib/trunk/Makefile 2011-06-09 11:26:32 UTC (rev 14757) @@ -2,7 +2,7 @@ VERSION = 1.2.5 CATEGORIES = lib -DESCRIPTION = Zlib Data Compression Library +DESCRIPTION = Zlib data compression library define BLURB zlib is designed to be a free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library for use @@ -15,27 +15,31 @@ in compression endef -SF_PROJ=libpng -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += license +MASTER_SITES = http://www.zlib.net/ +DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES += COPYING -SPKG_SOURCEURL = http://www.zlib.net +PATCHFILES += Makefile.in.diff +PATCHFILES += configure.diff -LICENSE = license -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=5624 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) +PACKAGES += CSWlibz1 +SPKG_DESC_CSWlibz1 = Zlib data compression library, libz.so.1 +PKGFILES_CSWlibz1 = $(call pkgfiles_lib,libz.so.1) +OBSOLETED_BY_CSWlibz1 = CSWzlib -PATCHFILES = Makefile.in.diff -PATCHFILES += configure.diff +PACKAGES += CSWzlib-dev +SPKG_DESC_CSWzlib-dev = Development files for libz.so.1 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWzlib-dev = CSWlibz1 BUILD64 = 1 -#NOISAEXEC = 1 + EXTRA_BUILD_ISAS = sparcv8plus sparcv8plus+vis pentium_pro+mmx pentium -CONFIGURE_ARGS = --prefix=$(prefix) --eprefix=$(exec_prefix) -CONFIGURE_ARGS += --libdir=$(libdir) --includedir=$(includedir) --shared +CONFIGURE_ARGS += --prefix=$(prefix) +CONFIGURE_ARGS += --eprefix=$(exec_prefix) +CONFIGURE_ARGS += --libdir=$(libdir) +CONFIGURE_ARGS += --includedir=$(includedir) +CONFIGURE_ARGS += --shared include gar/category.mk Copied: csw/mgar/pkg/zlib/trunk/files/COPYING (from rev 14753, csw/mgar/pkg/zlib/trunk/files/license) =================================================================== --- csw/mgar/pkg/zlib/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/zlib/trunk/files/COPYING 2011-06-09 11:26:32 UTC (rev 14757) @@ -0,0 +1,32 @@ + +Copyright notice: + + (C) 1995-2010 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup at gzip.org madler at alumni.caltech.edu + +If you use the zlib library in a product, we would appreciate *not* receiving +lengthy legal documents to sign. The sources are provided for free but without +warranty of any kind. The library has been entirely written by Jean-loup +Gailly and Mark Adler; it does not include third-party code. + +If you redistribute modified sources, we would appreciate that you include in +the file ChangeLog history information documenting your changes. Please read +the FAQ for more information on the distribution of modified source versions. Deleted: csw/mgar/pkg/zlib/trunk/files/license =================================================================== --- csw/mgar/pkg/zlib/trunk/files/license 2011-06-09 11:17:44 UTC (rev 14756) +++ csw/mgar/pkg/zlib/trunk/files/license 2011-06-09 11:26:32 UTC (rev 14757) @@ -1,32 +0,0 @@ - -Copyright notice: - - (C) 1995-2010 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - jloup at gzip.org madler at alumni.caltech.edu - -If you use the zlib library in a product, we would appreciate *not* receiving -lengthy legal documents to sign. The sources are provided for free but without -warranty of any kind. The library has been entirely written by Jean-loup -Gailly and Mark Adler; it does not include third-party code. - -If you redistribute modified sources, we would appreciate that you include in -the file ChangeLog history information documenting your changes. Please read -the FAQ for more information on the distribution of modified source versions. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jun 9 16:29:25 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Jun 2011 14:29:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14758] csw/mgar/pkg/libcairo/trunk/Makefile Message-ID: Revision: 14758 http://gar.svn.sourceforge.net/gar/?rev=14758&view=rev Author: dmichelsen Date: 2011-06-09 14:29:25 +0000 (Thu, 09 Jun 2011) Log Message: ----------- libcairo: Make sure to let devel depend on pixman Modified Paths: -------------- csw/mgar/pkg/libcairo/trunk/Makefile Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2011-06-09 11:26:32 UTC (rev 14757) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2011-06-09 14:29:25 UTC (rev 14758) @@ -60,6 +60,8 @@ RUNTIME_DEP_PKGS_CSWlibcairo-dev += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWlibcairo-dev += CSWlibcairo-script-interpreter2 RUNTIME_DEP_PKGS_CSWlibcairo-dev += CSWlibcairo-gobject2 +# This is important or pkgconfig on cairo will fail +RUNTIME_DEP_PKGS_CSWlibcairo-dev += CSWlibpixman-dev OBSOLETED_BY_CSWlibcairo-dev = CSWlibcairodevel CATALOGNAME_CSWlibcairodevel = libcairo_devel_stub 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 Jun 9 16:38:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Jun 2011 14:38:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14759] csw/mgar/pkg/wireshark/trunk Message-ID: Revision: 14759 http://gar.svn.sourceforge.net/gar/?rev=14759&view=rev Author: dmichelsen Date: 2011-06-09 14:38:08 +0000 (Thu, 09 Jun 2011) Log Message: ----------- wireshark: Update to 1.6.0, unsplit libs Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile csw/mgar/pkg/wireshark/trunk/checksums Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2011-06-09 14:29:25 UTC (rev 14758) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2011-06-09 14:38:08 UTC (rev 14759) @@ -1,5 +1,5 @@ NAME = wireshark -VERSION = 1.4.7 +VERSION = 1.6.0 CATEGORIES = apps DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer @@ -28,60 +28,18 @@ RUNTIME_DEP_PKGS_CSWwireshark += CSWlibintl8 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcares2 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibpcap1 -RUNTIME_DEP_PKGS_CSWwireshark += CSWlibwireshark0 -RUNTIME_DEP_PKGS_CSWwireshark += CSWlibwiretap0 -RUNTIME_DEP_PKGS_CSWwireshark += CSWlibwsutil0 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibsmi2 +RUNTIME_DEP_PKGS_CSWwireshark += CSWkrb5lib +RUNTIME_DEP_PKGS_CSWwireshark += CSWosslrt +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgnutls26 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlua -PACKAGES += CSWlibwireshark0 -PKGFILES_CSWlibwireshark0 += $(call pkgfiles_lib,libwireshark.so.0) -SPKG_DESC_CSWlibwireshark0 += Wireshark library, libwireshark.so.0 -RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibsmi2 -RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibgpg-error0 -RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlua -RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWzlib -RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibwiretap0 -RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibwsutil0 -RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibgnutls26 -RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWgcrypt -RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibcares2 -RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWkrb5lib -RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWglib2 -# This dependency can not be verified by checkpkg -RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibsmi-mibs -CHECKPKG_OVERRIDES_CSWlibwireshark0 += surplus-dependency|CSWlibsmi-mibs +# No more library splitting unless absolutely necessary +CHECKPKG_OVERRIDES_CSWwireshark += shared-lib-package-contains-so-symlink +CHECKPKG_OVERRIDES_CSWwireshark += non-uniform-lib-versions-in-package -PACKAGES += CSWlibwiretap0 -PKGFILES_CSWlibwiretap0 += $(call pkgfiles_lib,libwiretap.so.0) -SPKG_DESC_CSWlibwiretap0 += Wireshark library, libwiretap.so.0 -RUNTIME_DEP_PKGS_CSWlibwiretap0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibwiretap0 += CSWglib2 -RUNTIME_DEP_PKGS_CSWlibwiretap0 += CSWlibwsutil0 -RUNTIME_DEP_PKGS_CSWlibwiretap0 += CSWzlib - -PACKAGES += CSWlibwsutil0 -PKGFILES_CSWlibwsutil0 += $(call pkgfiles_lib,libwsutil.so.0) -SPKG_DESC_CSWlibwsutil0 += Wireshark library, libwsutil.so.0 -RUNTIME_DEP_PKGS_CSWlibwsutil0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibwsutil0 += CSWglib2 -RUNTIME_DEP_PKGS_CSWlibwsutil0 += CSWzlib - -# This is almost empty, do not split for now -#PACKAGES += CSWwireshark-dev -#SPKG_DESC_CSWwireshark-dev = Development files for Wireshark -#PKGFILES_CSWwireshark-dev += $(PKGFILES_DEVEL) -#RUNTIME_DEP_PKGS_CSWwireshark-dev += CSWwireshark -#RUNTIME_DEP_PKGS_CSWwireshark-dev += CSWlibwiretap0 -#RUNTIME_DEP_PKGS_CSWwireshark-dev += CSWlibwireshark0 -#RUNTIME_DEP_PKGS_CSWwireshark-dev += CSWlibwsutil0 - # This is probably from kerberos, revalidate after re-release of krb5 library -CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/dftest -CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/rawshark -CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/tshark -CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/wireshark -CHECKPKG_OVERRIDES_CSWlibwireshark0 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libwireshark.so.0.0.1 +CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry # example, \fI/usr/local/share/wireshark/preferences\fR) on UNIX-compatible CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/rawshark.1 @@ -96,6 +54,10 @@ CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/tshark.1 CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/wireshark/tshark.html +# Hardwire largefiles unless this is fixed: +# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6012 +EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-usr-local=no CONFIGURE_ARGS += --with-ssl=/opt/csw Modified: csw/mgar/pkg/wireshark/trunk/checksums =================================================================== --- csw/mgar/pkg/wireshark/trunk/checksums 2011-06-09 14:29:25 UTC (rev 14758) +++ csw/mgar/pkg/wireshark/trunk/checksums 2011-06-09 14:38:08 UTC (rev 14759) @@ -1 +1 @@ -b5065426d5524ddc1667314f8256c2b1 wireshark-1.4.7.tar.bz2 +9f9314c89bf1c8b440a7909884838cfd wireshark-1.6.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jun 9 16:52:40 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Jun 2011 14:52:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14760] csw/mgar/pkg/pango/trunk/Makefile Message-ID: Revision: 14760 http://gar.svn.sourceforge.net/gar/?rev=14760&view=rev Author: dmichelsen Date: 2011-06-09 14:52:40 +0000 (Thu, 09 Jun 2011) Log Message: ----------- pango: Add devel dependency to cairo Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2011-06-09 14:38:08 UTC (rev 14759) +++ csw/mgar/pkg/pango/trunk/Makefile 2011-06-09 14:52:40 UTC (rev 14760) @@ -59,6 +59,7 @@ SPKG_DESC_CSWpango-dev = Developer files for libpango-1.0.so.0 and assorted libs PKGFILES_CSWpango-dev = $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWpango-dev += CSWpango +RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibcairo-dev #RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpango1-0-0 #RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpangocairo-1-0-0 #RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpangoft2-1-0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Jun 9 17:07:22 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 09 Jun 2011 15:07:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14761] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14761 http://gar.svn.sourceforge.net/gar/?rev=14761&view=rev Author: bdwalton Date: 2011-06-09 15:07:22 +0000 (Thu, 09 Jun 2011) Log Message: ----------- bacula/trunk: tweak the prototype modifiers to catch the scripts directory itself when setting perms back to 0755 after the confgroup modifier Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-06-09 14:52:40 UTC (rev 14760) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-06-09 15:07:22 UTC (rev 14761) @@ -313,7 +313,7 @@ PROTOTYPE_CLASS_confgroup = cswpreserveconf PROTOTYPE_GROUP_confgroup = bacula PROTOTYPE_PERMS_confgroup = 0640 -PROTOTYPE_FILES_generalperms = /opt/csw/sbin/.* /etc/opt/csw/bacula/scripts +PROTOTYPE_FILES_generalperms = /opt/csw/sbin/.* /etc/opt/csw/bacula/scripts.* PROTOTYPE_PERMS_generalperms = 0755 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 Thu Jun 9 17:09:06 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 09 Jun 2011 15:09:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14762] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14762 http://gar.svn.sourceforge.net/gar/?rev=14762&view=rev Author: bdwalton Date: 2011-06-09 15:09:05 +0000 (Thu, 09 Jun 2011) Log Message: ----------- bacula/trunk: make the confgroup modifier only touch *conf files in sysconfdir Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-06-09 15:07:22 UTC (rev 14761) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-06-09 15:09:05 UTC (rev 14762) @@ -309,7 +309,7 @@ PROTOTYPE_CLASS_usergroupfiles = ugfiles PROTOTYPE_GROUP_usergroupfiles = bacula PROTOTYPE_PERMS_usergroupfiles = 0770 -PROTOTYPE_FILES_confgroup = /etc/opt/csw/bacula/.* +PROTOTYPE_FILES_confgroup = /etc/opt/csw/bacula/.*conf PROTOTYPE_CLASS_confgroup = cswpreserveconf PROTOTYPE_GROUP_confgroup = bacula PROTOTYPE_PERMS_confgroup = 0640 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 Jun 9 17:13:11 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 09 Jun 2011 15:13:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14763] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14763 http://gar.svn.sourceforge.net/gar/?rev=14763&view=rev Author: bdwalton Date: 2011-06-09 15:13:11 +0000 (Thu, 09 Jun 2011) Log Message: ----------- bacula/trunk: update cairo dep for new library naming scheme Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-06-09 15:09:05 UTC (rev 14762) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-06-09 15:13:11 UTC (rev 14763) @@ -95,7 +95,7 @@ RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgtk2 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibatk RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWpango -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibcairo +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWfconfig RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWglib2 PKGFILES_CSWbacula-tray-monitor = .*tray-monitor.* 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 Jun 9 17:13:21 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Jun 2011 15:13:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[14764] csw/mgar/pkg/liblasi/trunk/Makefile Message-ID: Revision: 14764 http://gar.svn.sourceforge.net/gar/?rev=14764&view=rev Author: dmichelsen Date: 2011-06-09 15:13:20 +0000 (Thu, 09 Jun 2011) Log Message: ----------- liblasi: Undo unnecessary changes Modified Paths: -------------- csw/mgar/pkg/liblasi/trunk/Makefile Modified: csw/mgar/pkg/liblasi/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblasi/trunk/Makefile 2011-06-09 15:13:11 UTC (rev 14763) +++ csw/mgar/pkg/liblasi/trunk/Makefile 2011-06-09 15:13:20 UTC (rev 14764) @@ -34,10 +34,10 @@ SPKG_DESC_CSWliblasi0 = C++ Unicode support for PostScript, libLASi.so.0 PKGFILES_CSWliblasi0 = $(call pkgfiles_lib,libLASi.so.0) RUNTIME_DEP_PKGS_CSWliblasi0 += CSWftype2 +RUNTIME_DEP_PKGS_CSWliblasi0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWliblasi0 += CSWglib2 RUNTIME_DEP_PKGS_CSWliblasi0 += CSWpango RUNTIME_DEP_PKGS_CSWliblasi0 += CSWfconfig -RUNTIME_DEP_PKGS_CSWliblasi0 += CSWlibintl8 OBSOLETED_BY_CSWliblasi0 = CSWliblasi PACKAGES += CSWliblasi-dev @@ -45,22 +45,13 @@ PKGFILES_CSWliblasi-dev += $(PKGFILES_DEVEL) PKGFILES_CSWliblasi-dev += $(sharedstatedir)/doc/.* RUNTIME_DEP_PKGS_CSWliblasi-dev += CSWliblasi0 - # That is ok CHECKPKG_OVERRIDES_CSWliblasi-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liblasi/examples/README -# Not sure about these -CHECKPKG_OVERRIDES_CSWliblasi0 += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libLASi.so.0.0.1 -CHECKPKG_OVERRIDES_CSWliblasi0 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libLASi.so.0.0.1 -CHECKPKG_OVERRIDES_CSWliblasi0 += bad-rpath-entry|/lib|opt/csw/lib/libLASi.so.0.0.1 -CHECKPKG_OVERRIDES_CSWliblasi0 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libLASi.so.0.0.1 +BUILD64 = 1 -# Didn't like libfreetype.so -# ld: fatal: file /opt/csw/lib/sparcv9/libfreetype.so: wrong ELF class: ELFCLASS64 -# BUILD64 = 1 +EXTRA_CXX_FLAGS = -lCstd -norunpath -EXTRA_LIB = -L/usr/lib -lCstd -norunpath - CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom TEST_SCRIPTS = custom 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 Jun 9 17:14:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 09 Jun 2011 15:14:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14765] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14765 http://gar.svn.sourceforge.net/gar/?rev=14765&view=rev Author: bdwalton Date: 2011-06-09 15:14:43 +0000 (Thu, 09 Jun 2011) Log Message: ----------- bacula/trunk: add cairo dev package as a build dependency Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-06-09 15:13:20 UTC (rev 14764) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-06-09 15:14:43 UTC (rev 14765) @@ -26,7 +26,7 @@ PATCHFILES += 0004-Update-man-page-installation-so-we-don-t-get-gzipped.patch BUILD_DEP_PKGS = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel -BUILD_DEP_PKGS += CSWreadline CSWggettext-dev +BUILD_DEP_PKGS += CSWreadline CSWggettext-dev CSWlibcairo-dev PACKAGES = CSWbacula-common CSWbacula-fd CSWbacula-sd PACKAGES += CSWbacula-director CSWbacula-client CSWbacula 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 Jun 9 17:17:39 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Jun 2011 15:17:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14766] csw/mgar/pkg/ncurses/trunk Message-ID: Revision: 14766 http://gar.svn.sourceforge.net/gar/?rev=14766&view=rev Author: dmichelsen Date: 2011-06-09 15:17:38 +0000 (Thu, 09 Jun 2011) Log Message: ----------- ncurses: Update to 5.9 and whats necessary for that Modified Paths: -------------- csw/mgar/pkg/ncurses/trunk/Makefile csw/mgar/pkg/ncurses/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/ncurses/trunk/files/patch-xcode.diff Modified: csw/mgar/pkg/ncurses/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncurses/trunk/Makefile 2011-06-09 15:14:43 UTC (rev 14765) +++ csw/mgar/pkg/ncurses/trunk/Makefile 2011-06-09 15:17:38 UTC (rev 14766) @@ -1,7 +1,7 @@ # $Id$ NAME = ncurses -VERSION = 5.7 +VERSION = 5.9 CATEGORIES = lib define BLURB @@ -17,20 +17,78 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES = patch-xcode.diff - LICENSE = README -PACKAGES = CSWncurses CSWterminfo +PACKAGES += CSWncurses +SPKG_DESC_CSWncurses = A free software emulation of curses +RUNTIME_DEP_PKGS_CSWncurses += CSWterminfo +CHECKPKG_OVERRIDES_CSWncurses += surplus-dependency|CSWterminfo +RUNTIME_DEP_PKGS_CSWncurses += CSWlibncursesw5 -SPKG_DESC_CSWncurses = A free software emulation of curses +PACKAGES += CSWlibform5 +PKGFILES_CSWlibform5 += $(call pkgfiles_lib,libform.so.5) +SPKG_DESC_CSWlibform5 += A free software emulation of curses, libform.so.5 +RUNTIME_DEP_PKGS_CSWlibform5 += CSWlibncurses5 + +PACKAGES += CSWlibformw5 +PKGFILES_CSWlibformw5 += $(call pkgfiles_lib,libformw.so.5) +SPKG_DESC_CSWlibformw5 += A free software emulation of curses, libformw.so.5 +RUNTIME_DEP_PKGS_CSWlibformw5 += CSWlibncursesw5 + +PACKAGES += CSWlibmenu5 +CATALOGNAME_CSWlibmenu5 = libmenu5 +PKGFILES_CSWlibmenu5 += $(call pkgfiles_lib,libmenu.so.5) +SPKG_DESC_CSWlibmenu5 += A free software emulation of curses, libmenu.so.5 +RUNTIME_DEP_PKGS_CSWlibmenu5 += CSWlibncurses5 + +PACKAGES += CSWlibmenuw5 +CATALOGNAME_CSWlibmenuw5 = libmenuw5 +PKGFILES_CSWlibmenuw5 += $(call pkgfiles_lib,libmenuw.so.5) +SPKG_DESC_CSWlibmenuw5 += A free software emulation of curses, libmenuw.so.5 +RUNTIME_DEP_PKGS_CSWlibmenuw5 += CSWlibncursesw5 + +PACKAGES += CSWlibncurses5 +CATALOGNAME_CSWlibncurses5 = libncurses5 +PKGFILES_CSWlibncurses5 += $(call pkgfiles_lib,libncurses.so.5) +SPKG_DESC_CSWlibncurses5 += A free software emulation of curses, libncurses.so.5 + +PACKAGES += CSWlibncursesw5 +CATALOGNAME_CSWlibncursesw5 = libncursesw5 +PKGFILES_CSWlibncursesw5 += $(call pkgfiles_lib,libncursesw.so.5) +SPKG_DESC_CSWlibncursesw5 += A free software emulation of curses, libncursesw.so.5 + +PACKAGES += CSWlibpanel5 +CATALOGNAME_CSWlibpanel5 = libpanel5 +PKGFILES_CSWlibpanel5 += $(call pkgfiles_lib,libpanel.so.5) +SPKG_DESC_CSWlibpanel5 += A free software emulation of curses, libpanel.so.5 +RUNTIME_DEP_PKGS_CSWlibpanel5 += CSWlibncurses5 + +PACKAGES += CSWlibpanelw5 +CATALOGNAME_CSWlibpanelw5 = libpanelw5 +PKGFILES_CSWlibpanelw5 += $(call pkgfiles_lib,libpanelw.so.5) +SPKG_DESC_CSWlibpanelw5 += A free software emulation of curses, libpanelw.so.5 +RUNTIME_DEP_PKGS_CSWlibpanelw5 += CSWlibncursesw5 + +PACKAGES += CSWlibncurses-dev +SPKG_DESC_CSWlibncurses-dev = Development files for libncurses.so.5 and assorted libraries +PKGFILES_CSWlibncurses-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibmenuw5 +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibpanel5 +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibformw5 +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibform5 +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibpanelw5 +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibmenu5 + +PACKAGES += CSWterminfo SPKG_DESC_CSWterminfo = Database of terminal information, part of ncurses +ARCHALL_CSWterminfo = 1 +PKGFILES_CSWterminfo = $(datadir)/terminfo.* -SPKG_SOURCEURL = http://www.gnu.org/software/ncurses/ncurses.html +VENDOR_URL = http://www.gnu.org/software/ncurses/ncurses.html BUILD64 = 1 -NOISAEXEC = 1 -RUNPATHQUOTE = 1 EXTRA_MODULATORS = WIDEC MODULATIONS_WIDEC = disable enable @@ -38,6 +96,16 @@ EXTRA_CONFIGURE_WIDEC-disable = --disable-widec EXTRA_CONFIGURE_WIDEC-enable = --enable-widec +# Switch to larger model or these kinds of errors occur: +# ld.so.1: tic: fatal: relocation error: R_AMD64_PC32: file /home/dam/mgar/pkg/ncurses/trunk/work/solaris9-i386/build-isa-amd64-widec-disable/ncurses-5.9/lib/libncurses.so.5: symbol putc: value 0x280010b35b0 does not fit +# (only valid on 64 bit x86) +# See for details +# http://developers.sun.com/solaris/articles/about_amd64_abi.html +#EXTRA_CFLAGS-amd64 = -xmodel=medium +EXTRA_CFLAGS-amd64 = -Kpic +EXTRA_CFLAGS = $(EXTRA_CFLAGS-$(ISA)) +EXTRA_LDFLAGS = $(EXTRA_CFLAGS-$(ISA)) + CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += --bindir=$(bindir) CONFIGURE_ARGS += --libdir=$(libdir) @@ -55,6 +123,8 @@ # CONFIGURE_ARGS += --without-xterm-new +TEST_TARGET = test + MERGE_SCRIPTS_isa-sparcv8-widec-disable = copy-only copy-config-only MERGE_DIRS_isa-sparcv8-widec-disable = $(libdir) $(includedir) MERGE_SCRIPTS_isa-sparcv9-widec-disable = copy-relocated-only copy-config-only @@ -73,12 +143,17 @@ MERGE_SCRIPTS_isa-amd64-widec-enable = copy-relocated-only copy-config-only MERGE_DIRS_isa-amd64-widec-enable = $(libdir) -RUNTIME_DEP_PKGS_CSWncurses = CSWterminfo +# This is termcap location which defaults to +# /etc/termcap, /usr/share/misc/termcap and $HOME/.termcap +# which I think is ok +CHECKPKG_OVERRIDES_CSWlibncurses-dev += file-with-bad-content|/usr/share|root/opt/csw/share/man/man3/ncurses.3x -ARCHALL_CSWterminfo = 1 -PKGFILES_CSWterminfo = $(datadir)/terminfo.* +# I *think* this is a default, but keep an eye on it +CHECKPKG_OVERRIDES_CSWlibncurses-dev += file-with-bad-content|/usr/share|root/opt/csw/include/ncursesw/tic.h +CHECKPKG_OVERRIDES_CSWlibncurses-dev += file-with-bad-content|/usr/share|root/opt/csw/include/ncurses/tic.h -CHECKPKG_OVERRIDES_CSWncurses += surplus-dependency|CSWterminfo +# I have no idea what this is. Inspect on problems. +CHECKPKG_OVERRIDES_CSWterminfo += file-with-bad-content|/usr/share|root/opt/csw/share/terminfo/p/pcmw include gar/category.mk Modified: csw/mgar/pkg/ncurses/trunk/checksums =================================================================== --- csw/mgar/pkg/ncurses/trunk/checksums 2011-06-09 15:14:43 UTC (rev 14765) +++ csw/mgar/pkg/ncurses/trunk/checksums 2011-06-09 15:17:38 UTC (rev 14766) @@ -1,3 +1 @@ -cce05daf61a64501ef6cd8da1f727ec6 download/ncurses-5.7.tar.gz -15d0b480df618fcdf7a8b829fe4a2300 download/CSWncurses.gspec -74e4c56ff1c8d4e29695f1b0d887a070 download/patch-xcode.diff +8cb9c412e5f2d96bc6f459aa8c6282a1 ncurses-5.9.tar.gz Deleted: csw/mgar/pkg/ncurses/trunk/files/patch-xcode.diff =================================================================== --- csw/mgar/pkg/ncurses/trunk/files/patch-xcode.diff 2011-06-09 15:14:43 UTC (rev 14765) +++ csw/mgar/pkg/ncurses/trunk/files/patch-xcode.diff 2011-06-09 15:17:38 UTC (rev 14766) @@ -1,12 +0,0 @@ -diff -Naur ncurses-5.7.orig/configure ncurses-5.7.patched/configure ---- ncurses-5.7.orig/configure 2008-10-26 02:04:38.000000000 +0200 -+++ ncurses-5.7.patched/configure 2009-01-02 16:18:33.593535166 +0100 -@@ -5258,7 +5258,7 @@ - fi - - if test "$GCC" != yes; then -- CC_SHARED_OPTS='-xcode=pic32' -+ CC_SHARED_OPTS='-KPIC' - MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $@' - else - MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@' 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 Jun 9 17:21:00 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 09 Jun 2011 15:21:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14767] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 14767 http://gar.svn.sourceforge.net/gar/?rev=14767&view=rev Author: bdwalton Date: 2011-06-09 15:20:59 +0000 (Thu, 09 Jun 2011) Log Message: ----------- bacula/trunk: correct a missed pkgfiles tweak after the scripts/ move Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2011-06-09 15:17:38 UTC (rev 14766) +++ csw/mgar/pkg/bacula/trunk/Makefile 2011-06-09 15:20:59 UTC (rev 14767) @@ -190,7 +190,7 @@ PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/.*_database.CSW PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/.*_privileges.CSW PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/.*_catalog.*CSW -PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/update.*tables.*CSW +PKGFILES_CSWbacula-director += /etc/opt/csw/bacula/scripts/update.*tables.*CSW PKGFILES_CSWbacula-director += .*bacula/bacula-dir.conf.CSW PKGFILES_CSWbacula-director += .*man8/bacula-dir.8 .*man8/dbcheck.8 PKGFILES_CSWbacula-director += /var/opt/csw/run 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 Jun 9 20:22:14 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Jun 2011 18:22:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14768] csw/mgar/pkg/less/trunk Message-ID: Revision: 14768 http://gar.svn.sourceforge.net/gar/?rev=14768&view=rev Author: dmichelsen Date: 2011-06-09 18:22:14 +0000 (Thu, 09 Jun 2011) Log Message: ----------- less: Update to 444 and new standards 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 2011-06-09 15:20:59 UTC (rev 14767) +++ csw/mgar/pkg/less/trunk/Makefile 2011-06-09 18:22:14 UTC (rev 14768) @@ -1,5 +1,5 @@ NAME = less -VERSION = 443 +VERSION = 444 CATEGORIES = utils DESCRIPTION = Less is a free, open-source file pager @@ -9,18 +9,14 @@ endef MASTER_SITES = http://www.greenwoodsoftware.com/$(NAME)/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz LICENSE = LICENSE -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - RUNTIME_DEP_PKGS_CSWless += CSWncurses RUNTIME_DEP_PKGS_CSWless += CSWlibintl8 NOISALIST = 1 -CONFIGURE_ARGS = $(DIRPATHS) # There is no testsuite TEST_TARGET = Modified: csw/mgar/pkg/less/trunk/checksums =================================================================== --- csw/mgar/pkg/less/trunk/checksums 2011-06-09 15:20:59 UTC (rev 14767) +++ csw/mgar/pkg/less/trunk/checksums 2011-06-09 18:22:14 UTC (rev 14768) @@ -1 +1 @@ -47db098fb3cdaf847b3c4be05ee954fc less-443.tar.gz +56f9f76ffe13f70155f47f6b3c87d421 less-444.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 Jun 9 20:41:23 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Jun 2011 18:41:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14769] csw/mgar/pkg/wireshark/trunk/Makefile Message-ID: Revision: 14769 http://gar.svn.sourceforge.net/gar/?rev=14769&view=rev Author: dmichelsen Date: 2011-06-09 18:41:23 +0000 (Thu, 09 Jun 2011) Log Message: ----------- wireshark: Just depend on new libgpg library package Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2011-06-09 18:22:14 UTC (rev 14768) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2011-06-09 18:41:23 UTC (rev 14769) @@ -21,7 +21,7 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWwireshark += CSWgcrypt RUNTIME_DEP_PKGS_CSWwireshark += CSWglib2 -RUNTIME_DEP_PKGS_CSWwireshark += CSWgpgerr +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWwireshark += CSWgtk2 RUNTIME_DEP_PKGS_CSWwireshark += CSWpango RUNTIME_DEP_PKGS_CSWwireshark += CSWzlib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jun 9 20:57:18 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Jun 2011 18:57:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14770] csw/mgar/pkg/pango/trunk Message-ID: Revision: 14770 http://gar.svn.sourceforge.net/gar/?rev=14770&view=rev Author: dmichelsen Date: 2011-06-09 18:57:18 +0000 (Thu, 09 Jun 2011) Log Message: ----------- pango: Update to 1.28.4 Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile csw/mgar/pkg/pango/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pango/trunk/files/0001-Do-not-use-gcc-specific-flags-unconditionally.patch csw/mgar/pkg/pango/trunk/files/0002-Use-inttypes.h-when-stdint.h-is-not-available.patch Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2011-06-09 18:41:23 UTC (rev 14769) +++ csw/mgar/pkg/pango/trunk/Makefile 2011-06-09 18:57:18 UTC (rev 14770) @@ -1,5 +1,5 @@ NAME = pango -VERSION = 1.24.5 +VERSION = 1.28.4 CATEGORIES = lib DESCRIPTION = A framework for the layout and rendering of international text @@ -14,6 +14,13 @@ DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += CSWpango.postinstall +# Use patch unless this is fixed +# https://bugzilla.gnome.org/show_bug.cgi?id=652228 +PATCHFILES += 0001-Do-not-use-gcc-specific-flags-unconditionally.patch +# Use patch unless this is fixed: +# https://bugzilla.gnome.org/show_bug.cgi?id=652227 +PATCHFILES += 0002-Use-inttypes.h-when-stdint.h-is-not-available.patch + VENDOR_URL = http://www.pango.org/ PACKAGES += CSWpango Modified: csw/mgar/pkg/pango/trunk/checksums =================================================================== --- csw/mgar/pkg/pango/trunk/checksums 2011-06-09 18:41:23 UTC (rev 14769) +++ csw/mgar/pkg/pango/trunk/checksums 2011-06-09 18:57:18 UTC (rev 14770) @@ -1 +1 @@ -815416a452e9cccc172fed9862401f37 pango-1.24.5.tar.bz2 +3f3989700f04e9117d30544a9078b3a0 pango-1.28.4.tar.bz2 Added: csw/mgar/pkg/pango/trunk/files/0001-Do-not-use-gcc-specific-flags-unconditionally.patch =================================================================== --- csw/mgar/pkg/pango/trunk/files/0001-Do-not-use-gcc-specific-flags-unconditionally.patch (rev 0) +++ csw/mgar/pkg/pango/trunk/files/0001-Do-not-use-gcc-specific-flags-unconditionally.patch 2011-06-09 18:57:18 UTC (rev 14770) @@ -0,0 +1,25 @@ +From 8ef6a7aa023c4be33134fc8f022b3e82b3af5ef5 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 9 Jun 2011 20:30:13 +0200 +Subject: [PATCH 1/2] Do not use gcc-specific flags unconditionally + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index d3e10de..4504459 100755 +--- a/configure ++++ b/configure +@@ -5627,7 +5627,7 @@ done + + + # Make sure we don't link to libstdc++ (needs de-gcc-fication) +-CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" ++#CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" + + + # +-- +1.7.5.4 + Added: csw/mgar/pkg/pango/trunk/files/0002-Use-inttypes.h-when-stdint.h-is-not-available.patch =================================================================== --- csw/mgar/pkg/pango/trunk/files/0002-Use-inttypes.h-when-stdint.h-is-not-available.patch (rev 0) +++ csw/mgar/pkg/pango/trunk/files/0002-Use-inttypes.h-when-stdint.h-is-not-available.patch 2011-06-09 18:57:18 UTC (rev 14770) @@ -0,0 +1,29 @@ +From 24496b0da2cd09bc62723e33231cad80105e3a0c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 9 Jun 2011 20:30:55 +0200 +Subject: [PATCH 2/2] Use inttypes.h when stdint.h is not available + +--- + pango/opentype/hb-common.h | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/pango/opentype/hb-common.h b/pango/opentype/hb-common.h +index 11f64ed..a6be6ba 100644 +--- a/pango/opentype/hb-common.h ++++ b/pango/opentype/hb-common.h +@@ -27,7 +27,11 @@ + #ifndef HB_COMMON_H + #define HB_COMMON_H + +-#include ++# ifdef HAVE_STDINT_H ++# include ++# else ifdef HAVE_INTTYPES_H ++# include ++# endif + + # ifdef __cplusplus + # define HB_BEGIN_DECLS extern "C" { +-- +1.7.5.4 + 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 Jun 9 21:02:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Jun 2011 19:02:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14771] csw/mgar/pkg Message-ID: Revision: 14771 http://gar.svn.sourceforge.net/gar/?rev=14771&view=rev Author: dmichelsen Date: 2011-06-09 19:02:08 +0000 (Thu, 09 Jun 2011) Log Message: ----------- pango: Tag legacy 1.28.0 Added Paths: ----------- csw/mgar/pkg/pango/tags/pango-1.28.0-legacy/ Removed Paths: ------------- csw/mgar/pkg/libpango/ 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 Jun 9 21:07:57 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 09 Jun 2011 19:07:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14772] csw/mgar/pkg/pango/branches Message-ID: Revision: 14772 http://gar.svn.sourceforge.net/gar/?rev=14772&view=rev Author: dmichelsen Date: 2011-06-09 19:07:57 +0000 (Thu, 09 Jun 2011) Log Message: ----------- pango: Add old branch pango-x11-reloaded for reference Modified Paths: -------------- csw/mgar/pkg/pango/branches/pango-x11-reloaded/Makefile csw/mgar/pkg/pango/branches/pango-x11-reloaded/checksums Added Paths: ----------- csw/mgar/pkg/pango/branches/pango-x11-reloaded/ csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0001-Do-not-use-fno.-options.patch csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0002-Use-inttypes.h-instead-of-stdint.h.patch Modified: csw/mgar/pkg/pango/branches/pango-x11-reloaded/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2010-05-06 02:02:22 UTC (rev 9822) +++ csw/mgar/pkg/pango/branches/pango-x11-reloaded/Makefile 2011-06-09 19:07:57 UTC (rev 14772) @@ -1,5 +1,5 @@ GARNAME = libpango -GARVERSION = 1.24.5 +GARVERSION = 1.28.0 CATEGORIES = lib DESCRIPTION = A framework for the layout and rendering of international text @@ -10,24 +10,41 @@ languages. endef -MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/pango/1.24/ +GNOME_PROJ = pango +MASTER_SITES = $(GNOME_MIRROR) DISTNAME = pango-$(GARVERSION) DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += CSWpango.postinstall +PATCHFILES = 0001-Do-not-use-fno.-options.patch +PATCHFILES += 0002-Use-inttypes.h-instead-of-stdint.h.patch + +# 1.26.0: +# pango/opentype/hb-common.h includes stdint.h (missing on Solaris 8, +# correctly detected during autoconf, instead of sys/int_types.h) + PACKAGES = CSWpango CSWpangodevel CSWpangodoc -CATALOGNAME_CSWpango = libpango -CATALOGNAME_CSWpangodevel = libpango_devel -CATALOGNAME_CSWpangodoc = libpango_doc +# PACKAGES += CSWcxpango CSWcxpangodevel -BUILD_DEP_PKGS = CSWgtk-doc CSWlibxslt CSWglib2devel CSWlibxft2devel +CATALOGNAME_CSWpango = libpango +CATALOGNAME_CSWpangodevel = libpango_devel +CATALOGNAME_CSWpangodoc = libpango_doc +CATALOGNAME_CSWcxpango = cx_libpango +CATALOGNAME_CSWcxpangodevel = cx_libpango_devel + +BUILD_DEP_PKGS = CSWgtk-doc CSWlibxslt CSWglib2devel RUNTIME_DEP_PKGS_CSWpango = CSWggettextrt CSWglib2 CSWfconfig CSWftype2 -RUNTIME_DEP_PKGS_CSWpango += CSWlibcairo CSWlibxft2 CSWlibxrender CSWlibx11 +RUNTIME_DEP_PKGS_CSWpango += CSWlibcairo CSWlibxft2 CSWlibxrender RUNTIME_DEP_PKGS_CSWpangodevel = CSWpango +RUNTIME_DEP_PKGS_CSWcxpango = CSWggettextrt CSWglib2 CSWfconfig CSWftype2 +RUNTIME_DEP_PKGS_CSWcxpango += CSWcxlibcairo CSWlibxft2 CSWlibxrender CSWlibx11 +RUNTIME_DEP_PKGS_CSWcxpangodevel = CSWcxpango SPKG_DESC_CSWpango = Pango, a framework for the layout and rendering of international text SPKG_DESC_CSWpangodevel = Pango Developer Files SPKG_DESC_CSWpangodoc = Pango Documentation +SPKG_DESC_CSWcxpango = Pango, a framework for the layout and rendering of international text (bound against OpenCSW X11) +SPKG_DESC_CSWcxpangodevel = Pango Developer Files (bound against OpenCSW X11) SPKG_SOURCEURL = http://www.pango.org/ @@ -35,26 +52,55 @@ UPSTREAM_MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/pango/ UFILES_REGEX = (\d+(?:\.\d+)*) -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_MODULATORS = X11 +MODULATIONS_X11 = sunwx11 cswx11 +# We need xrenderproto only +EXTRA_INC_sunwx11 = $(prefix)/X11/include + +EXTRA_INC_cswx11 = $(prefix)/X11/include $(prefix)/include +EXTRA_LIB_cswx11 = $(prefix)/lib +EXTRA_PKG_CONFIG_DIRS_cswx11 = $(prefix)/lib + +EXTRA_INC = $(EXTRA_INC_$(X11)) +EXTRA_LIB = $(EXTRA_LIB_$(X11)) +PKG_CONFIG_DIRS = $(PKG_CONFIG_DIRS_$(X11)) + +prefix_cswx11 = $(BUILD_PREFIX)/X11 +prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX)) + +sysconfdir = $(abspath $(prefix)/etc/$(MM_LIBDIR)) + +STRIP_LIBTOOL = 1 + BUILD64 = 1 NOISALIST = 1 ISAEXEC_EXCLUDE_FILES = $(bindir)/pango-querymodules CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-x --enable-gtk-doc -CONFIGURE_ARGS += --x-include=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +CONFIGURE_ARGS_sunwx11 = --x-include=/usr/openwin/include +CONFIGURE_ARGS_sunwx11 += --x-libraries=$(abspath /usr/openwin/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS_cswx11 = --x-include=$(prefix)/X11/include +CONFIGURE_ARGS_cswx11 += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(X11)) + # CONFIGURE_ARGS += --with-included-modules -STRIP_LIBTOOL = 1 +MERGE_SCRIPTS_isa-default-x11-sunwx11 = copy-all +MERGE_SCRIPTS_isa-default64-x11-sunwx11 = copy-relocated-only +MERGE_DIRS_isa-default64-x11-sunwx11 = $(libdir) +MERGE_SCRIPTS_isa-default-x11-cswx11 = copy-only +MERGE_DIRS_isa-default-x11-cswx11 = $(libdir) $(includedir) +MERGE_SCRIPTS_isa-default64-x11-cswx11 = copy-relocated-only +MERGE_DIRS_isa-default64-x11-cswx11 = $(libdir) # Dynamic prototype PKGFILES_CSWpangodevel = $(PKGFILES_DEVEL) PKGFILES_CSWpangodoc = $(sharedstatedir)/gtk-doc/.* +PKGFILES_CSWcxlibpango = $(call baseisadirs,/opt/csw/X11/lib,[^/]*\.so(\.\d+)*) +PKGFILES_CSWcxlibpangodevel = $(call baseisadirs,/opt/csw/X11/lib,pkgconfig(/.*)?) +PKGFILES_CSWcxlibpangodevel += /opt/csw/X11/include/.* ARCHALL_CSWpangodoc = 1 @@ -63,15 +109,4 @@ EXTRA_MERGE_EXCLUDE_FILES = .*/preload\.1\.gz -sysconfdir_isa-sparcv9 = $(prefix)/etc/64 -sysconfdir_isa-sparcv8 = $(prefix)/etc -sysconfdir_isa-i386 = $(prefix)/etc -sysconfdir_global = $(prefix)/etc -sysconfdir_isa-amd64 = $(prefix)/etc/64 -sysconfdir = $(sysconfdir_$(MODULATION)) - include gar/category.mk - -post-merge: - mkdir -p $(PKGROOT)$(sysconfdir)/64/pango - @$(MAKECOOKIE) Modified: csw/mgar/pkg/pango/branches/pango-x11-reloaded/checksums =================================================================== --- csw/mgar/pkg/pango/trunk/checksums 2010-05-06 02:02:22 UTC (rev 9822) +++ csw/mgar/pkg/pango/branches/pango-x11-reloaded/checksums 2011-06-09 19:07:57 UTC (rev 14772) @@ -1,2 +1,4 @@ -236547eb782b42500d0d743f25340599 download/CSWpango.postinstall -815416a452e9cccc172fed9862401f37 download/pango-1.24.5.tar.bz2 +0d271c3e260126c315003d6019734736 0001-Do-not-use-fno.-options.patch +8e1db1634a431b0b2dd1657b46b7e8de 0002-Use-inttypes.h-instead-of-stdint.h.patch +236547eb782b42500d0d743f25340599 CSWpango.postinstall +545ae8becf7ed74008120f96f4b095f4 pango-1.28.0.tar.bz2 Added: csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0001-Do-not-use-fno.-options.patch =================================================================== --- csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0001-Do-not-use-fno.-options.patch (rev 0) +++ csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0001-Do-not-use-fno.-options.patch 2011-06-09 19:07:57 UTC (rev 14772) @@ -0,0 +1,25 @@ +From 3ca0493a5604435a8eabb6bd3c655fd7f4181f12 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 6 May 2010 14:35:40 +0200 +Subject: [PATCH 1/2] Do not use -fno... options + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index 22cef9c..47664d6 100755 +--- a/configure ++++ b/configure +@@ -6115,7 +6115,7 @@ done + + + # Make sure we don't link to libstdc++ (needs de-gcc-fication) +-CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" ++# CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" + + + # +-- +1.7.0 + Added: csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0002-Use-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0002-Use-inttypes.h-instead-of-stdint.h.patch (rev 0) +++ csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0002-Use-inttypes.h-instead-of-stdint.h.patch 2011-06-09 19:07:57 UTC (rev 14772) @@ -0,0 +1,25 @@ +From 0f13862a85468b38292c93eb3ecd4c840318d7c4 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 6 May 2010 14:36:00 +0200 +Subject: [PATCH 2/2] Use inttypes.h instead of stdint.h + +--- + pango/opentype/hb-common.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/pango/opentype/hb-common.h b/pango/opentype/hb-common.h +index 11f64ed..cfee546 100644 +--- a/pango/opentype/hb-common.h ++++ b/pango/opentype/hb-common.h +@@ -27,7 +27,7 @@ + #ifndef HB_COMMON_H + #define HB_COMMON_H + +-#include ++#include + + # ifdef __cplusplus + # define HB_BEGIN_DECLS extern "C" { +-- +1.7.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Fri Jun 10 01:02:00 2011 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 09 Jun 2011 23:02:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14773] csw/mgar/pkg/dovecot/trunk/Makefile Message-ID: Revision: 14773 http://gar.svn.sourceforge.net/gar/?rev=14773&view=rev Author: jake_goerzen Date: 2011-06-09 23:02:00 +0000 (Thu, 09 Jun 2011) Log Message: ----------- dovecot: adding _stub package transition GAR Makefile variables Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2011-06-09 19:07:57 UTC (rev 14772) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2011-06-09 23:02:00 UTC (rev 14773) @@ -29,6 +29,9 @@ SPKG_DESC_CSWdovecot = Secure IMAP server SPKG_DESC_CSWdovecot-dev = Dovecot secure IMAP server header files +OBSOLETED_BY_CSWdovecot-dev = CSWdovecotdevel +CATALOGNAME_CSWdovecotdevel = dovecot_devel_stub + RUNTIME_DEP_PKGS_CSWdovecot = CSWosslrt CSWmysql5rt CSWoldaprt CSWlibpq RUNTIME_DEP_PKGS_CSWdovecot += CSWzlib CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWdovecot += CSWbzip2 CSWiconv This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jun 10 11:29:52 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 10 Jun 2011 09:29:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[14774] csw/mgar/pkg/gnome-base/libbonobo2/trunk/legacy/ Message-ID: Revision: 14774 http://gar.svn.sourceforge.net/gar/?rev=14774&view=rev Author: dmichelsen Date: 2011-06-10 09:29:52 +0000 (Fri, 10 Jun 2011) Log Message: ----------- gnome-base/libbonobo2: Remove legacy as it is already in tags/legacy Removed Paths: ------------- csw/mgar/pkg/gnome-base/libbonobo2/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jun 10 12:14:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 10 Jun 2011 10:14:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14775] csw/mgar/pkg/gnome-base/orbit2/trunk Message-ID: Revision: 14775 http://gar.svn.sourceforge.net/gar/?rev=14775&view=rev Author: dmichelsen Date: 2011-06-10 10:14:00 +0000 (Fri, 10 Jun 2011) Log Message: ----------- gnome-base/orbit2: Update to 2.14.19, enable tests, update to new defaults Modified Paths: -------------- csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile csw/mgar/pkg/gnome-base/orbit2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gnome-base/orbit2/trunk/files/0001-Make-test-non-interactive-on-Solaris.patch Modified: csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile 2011-06-10 09:29:52 UTC (rev 14774) +++ csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile 2011-06-10 10:14:00 UTC (rev 14775) @@ -1,5 +1,5 @@ NAME = ORBit2 -VERSION = 2.14.18 +VERSION = 2.14.19 CATEGORIES = lib DESCRIPTION = ORBit 2.x CORBA tools and libs @@ -9,33 +9,31 @@ endef MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES = $(DISTNAME).tar.bz2 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +PATCHFILES += 0001-Make-test-non-interactive-on-Solaris.patch PACKAGES = CSWorbit2 CATALOGNAME = orbit2 -RUNTIME_DEP_PKGS = CSWggettextrt CSWglib2 CSWlibidl +RUNTIME_DEP_PKGS += CSWlibintl8 +RUNTIME_DEP_PKGS += CSWglib2 +RUNTIME_DEP_PKGS += CSWlibidl -SPKG_SOURCEURL = http://projects.gnome.org/ORBit2/ +# No package split yet +CHECKPKG_OVERRIDES_CSWorbit2 += shared-lib-pkgname-mismatch +CHECKPKG_OVERRIDES_CSWorbit2 += shared-lib-package-contains-so-symlink +VENDOR_URL = http://projects.gnome.org/ORBit2/ + CPP = /usr/lib/cpp CXXCPP = /usr/lib/cpp EXTRA_COMMON_EXPORTS = CPP CXXCPP -CONFIGURE_ARGS = $(DIRPATHS) STRIP_LIBTOOL = 1 BUILD64 = 1 -NOISAEXEC = 1 -# The test involves one manual step, skip for automatic building -SKIPTEST ?= 1 -TEST_TARGET = check - EXTRA_MERGE_INCLUDE_FILES = $(libdir)/libname-server-2.a -CHECKPKG_OVERRIDES_CSWorbit2 += soname-not-found|libm.so.2 - include gar/category.mk Modified: csw/mgar/pkg/gnome-base/orbit2/trunk/checksums =================================================================== --- csw/mgar/pkg/gnome-base/orbit2/trunk/checksums 2011-06-10 09:29:52 UTC (rev 14774) +++ csw/mgar/pkg/gnome-base/orbit2/trunk/checksums 2011-06-10 10:14:00 UTC (rev 14775) @@ -1 +1 @@ -3e80596171b1ea652707219c7144ff53 ORBit2-2.14.18.tar.bz2 +7082d317a9573ab338302243082d10d1 ORBit2-2.14.19.tar.bz2 Added: csw/mgar/pkg/gnome-base/orbit2/trunk/files/0001-Make-test-non-interactive-on-Solaris.patch =================================================================== --- csw/mgar/pkg/gnome-base/orbit2/trunk/files/0001-Make-test-non-interactive-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/gnome-base/orbit2/trunk/files/0001-Make-test-non-interactive-on-Solaris.patch 2011-06-10 10:14:00 UTC (rev 14775) @@ -0,0 +1,25 @@ +From eaf8384d63f9ed26ba2accc35748af9438ae8237 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 10 Jun 2011 11:41:51 +0200 +Subject: [PATCH] Make test non-interactive on Solaris + +--- + test/timeout.sh | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/test/timeout.sh b/test/timeout.sh +index 4f262e1..3856de8 100755 +--- a/test/timeout.sh ++++ b/test/timeout.sh +@@ -24,6 +24,8 @@ MINGW*) + *) + echo Please kill timeout-server and/or lt-timeout-server from another window, + echo then type something here. ++ pkill -9 timeout-server ++ pkill -9 lt-timeout-server + wait $server + ;; + esac +-- +1.7.5.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jun 10 12:41:02 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 10 Jun 2011 10:41:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[14776] csw/mgar/pkg Message-ID: Revision: 14776 http://gar.svn.sourceforge.net/gar/?rev=14776&view=rev Author: dmichelsen Date: 2011-06-10 10:41:01 +0000 (Fri, 10 Jun 2011) Log Message: ----------- scintilla: Initial commit, much to do Added Paths: ----------- csw/mgar/pkg/scintilla/ csw/mgar/pkg/scintilla/Makefile csw/mgar/pkg/scintilla/branches/ csw/mgar/pkg/scintilla/tags/ csw/mgar/pkg/scintilla/trunk/ csw/mgar/pkg/scintilla/trunk/Makefile csw/mgar/pkg/scintilla/trunk/checksums csw/mgar/pkg/scintilla/trunk/files/ Copied: csw/mgar/pkg/scintilla/Makefile (from rev 14773, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/scintilla/Makefile (rev 0) +++ csw/mgar/pkg/scintilla/Makefile 2011-06-10 10:41:01 UTC (rev 14776) @@ -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/scintilla/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/scintilla/trunk/Makefile =================================================================== --- csw/mgar/pkg/scintilla/trunk/Makefile (rev 0) +++ csw/mgar/pkg/scintilla/trunk/Makefile 2011-06-10 10:41:01 UTC (rev 14776) @@ -0,0 +1,25 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = scintilla +VERSION = 2.26 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = A source code editing component +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(NAME)226.tgz +DISTNAME = scintilla + +LICENSE = License.txt + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +# Ugh, manual makefile. + +include gar/category.mk + Property changes on: csw/mgar/pkg/scintilla/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/scintilla/trunk/checksums =================================================================== --- csw/mgar/pkg/scintilla/trunk/checksums (rev 0) +++ csw/mgar/pkg/scintilla/trunk/checksums 2011-06-10 10:41:01 UTC (rev 14776) @@ -0,0 +1 @@ +6b9fe505979c038bc28e28123c21fe4f scintilla226.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jun 10 14:19:35 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 10 Jun 2011 12:19:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14777] csw/mgar/pkg/glib2/trunk Message-ID: Revision: 14777 http://gar.svn.sourceforge.net/gar/?rev=14777&view=rev Author: dmichelsen Date: 2011-06-10 12:19:34 +0000 (Fri, 10 Jun 2011) Log Message: ----------- glib2: Update to 2.29.6, tests still failing Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile csw/mgar/pkg/glib2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/glib2/trunk/files/0003-Do-not-unconditionally-use-gcc-specific-Wstrict-alia.patch Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2011-06-10 10:41:01 UTC (rev 14776) +++ csw/mgar/pkg/glib2/trunk/Makefile 2011-06-10 12:19:34 UTC (rev 14777) @@ -1,5 +1,5 @@ NAME = glib -VERSION = 2.25.10 +VERSION = 2.29.6 CATEGORIES = lib DESCRIPTION = The GLib library of C routines. @@ -9,21 +9,15 @@ has been split off as of the developers' version 1.1.0. endef -PACKAGES = CSWglib2 CSWglib2devel -CATALOGNAME_CSWglib2 = glib2 -CATALOGNAME_CSWglib2devel = glib2_devel -SPKG_DESC_CSWglib2 = Low level core compatibility library for GTK+ and GNOME -SPKG_DESC_CSWglib2devel = Low level core compatibility library for GTK+ and GNOME development - MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.bz2 -PATCHFILES = glib-typedetect.patch +#PATCHFILES = glib-typedetect.patch # PATCHFILES += FIXED_STR.patch -PATCHFILES += gsize.patch +#PATCHFILES += gsize.patch # PATCHFILES += gconverter.patch -PATCHFILES += CMSG_LEN.patch +#PATCHFILES += CMSG_LEN.patch # Bug reported upstream: # https://bugzilla.gnome.org/show_bug.cgi?id=612300 @@ -32,38 +26,50 @@ PATCHFILES += 0001-Make-sure-we-have-the-include-for-major-minor.patch PATCHFILES += 0001-Replace-.-not-understood-by-Sun-Studio.patch +# Use patch unless this is fixed: +# https://bugzilla.gnome.org/show_bug.cgi?id=652272 +PATCHFILES += 0003-Do-not-unconditionally-use-gcc-specific-Wstrict-alia.patch + +PACKAGES += CSWglib2 +SPKG_DESC_CSWglib2 = Low level core compatibility library for GTK+ and GNOME +RUNTIME_DEP_PKGS_CSWglib2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWglib2 += CSWlibffi5 +RUNTIME_DEP_PKGS_CSWglib2 += CSWiconv +RUNTIME_DEP_PKGS_CSWglib2 += CSWzlib +# No package split yet +CHECKPKG_OVERRIDES_CSWglib2 += non-uniform-lib-versions-in-package + +PACKAGES += CSWglib2-dev +SPKG_DESC_CSWglib2-dev = Low level core compatibility library for GTK+ and GNOME development +RUNTIME_DEP_PKGS_CSWglib2-dev += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWglib2-dev += CSWlibffi5 +RUNTIME_DEP_PKGS_CSWglib2-dev += CSWgamin +RUNTIME_DEP_PKGS_CSWglib2-dev += CSWglib2 +RUNTIME_DEP_PKGS_CSWglib2-dev += CSWiconv +RUNTIME_DEP_PKGS_CSWglib2-dev += CSWpython +RUNTIME_DEP_PKGS_CSWglib2-dev += CSWzlib +OBSOLETED_BY_CSWglib2-dev = CSWglib2devel +CATALOGNAME_CSWglib2devel = glib2_devel_stub + # We don't need it and if defined the test breaks LD_OPTIONS = EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) +EXTRA_CFLAGS = -features=extensions + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv=gnu CONFIGURE_ARGS += --enable-static # DTrace compilation fails for 64 bit, disable for now -CONFIGURE_ARGS += --disable-dtrace +#CONFIGURE_ARGS += --disable-dtrace -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - BUILD64 = 1 -NOISAEXEC = 1 BUILD_DEP_PKGS = CSWggettext -RUNTIME_DEP_PKGS_CSWglib2 += CSWggettextrt -RUNTIME_DEP_PKGS_CSWglib2 += CSWiconv -RUNTIME_DEP_PKGS_CSWglib2 += CSWzlib -RUNTIME_DEP_PKGS_CSWglib2devel += CSWgamin -RUNTIME_DEP_PKGS_CSWglib2devel += CSWggettextrt -RUNTIME_DEP_PKGS_CSWglib2devel += CSWglib2 -RUNTIME_DEP_PKGS_CSWglib2devel += CSWiconv -RUNTIME_DEP_PKGS_CSWglib2devel += CSWpython -RUNTIME_DEP_PKGS_CSWglib2devel += CSWzlib -RUNTIME_DEP_PKGS_CSWglib2devel += CSWperl - # Some tests fail, they may be harmless, disable for now, but check later! -SKIPTEST ?= 1 -TEST_TARGET = check +# SKIPTEST ?= 1 #provided by iconv MERGE_EXCLUDE_FILES = .*/charset.alias Modified: csw/mgar/pkg/glib2/trunk/checksums =================================================================== --- csw/mgar/pkg/glib2/trunk/checksums 2011-06-10 10:41:01 UTC (rev 14776) +++ csw/mgar/pkg/glib2/trunk/checksums 2011-06-10 12:19:34 UTC (rev 14777) @@ -1,7 +1 @@ -39b575a4c1dd2234a88d755a13332458 0001-Make-sure-we-have-the-include-for-major-minor.patch -77188ce430577f5db01ba9d73aed5bcd 0001-Replace-.-not-understood-by-Sun-Studio.patch -9f66027a275eb34d80a68ec8927bf66e CMSG_LEN.patch -f1f3c182f64be06ab57d8b01016af074 FIXED_STR.patch -cdbe09f15536b526e19f06893e9b64ef glib-2.25.10.tar.bz2 -8f683820d9ecab1abd9dbe81997ab9eb glib-typedetect.patch -bb2fb8eef43c995fea6c08563487ace6 gsize.patch +178638858de315a472d45dfa3dd19299 glib-2.29.6.tar.bz2 Added: csw/mgar/pkg/glib2/trunk/files/0003-Do-not-unconditionally-use-gcc-specific-Wstrict-alia.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/0003-Do-not-unconditionally-use-gcc-specific-Wstrict-alia.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/0003-Do-not-unconditionally-use-gcc-specific-Wstrict-alia.patch 2011-06-10 12:19:34 UTC (rev 14777) @@ -0,0 +1,39 @@ +From bb52d09f8b2ad163779b4610dd94d6c48ce95544 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 10 Jun 2011 12:27:34 +0200 +Subject: [PATCH] Do not unconditionally use gcc-specific -Wstrict-aliasing + +--- + glib/tests/Makefile.am | 2 +- + glib/tests/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am +index 513e3cf..fc1c1dc 100644 +--- a/glib/tests/Makefile.am ++++ b/glib/tests/Makefile.am +@@ -182,7 +182,7 @@ unix_nothreads_SOURCES = unix.c + unix_nothreads_LDADD = $(progs_ldadd) + + noinst_PROGRAMS += atomic +-atomic_CFLAGS = -Wstrict-aliasing=2 $(INCLUDES) ++atomic_CFLAGS = $(INCLUDES) + atomic_LDADD = $(progs_ldadd) + + TEST_PROGS += bitlock +diff --git a/glib/tests/Makefile.in b/glib/tests/Makefile.in +index 70d437f..2ee851a 100644 +--- a/glib/tests/Makefile.in ++++ b/glib/tests/Makefile.in +@@ -633,7 +633,7 @@ sort_LDADD = $(progs_ldadd) + @OS_UNIX_TRUE at unix_LDADD = $(progs_ldadd) + @OS_UNIX_TRUE at unix_nothreads_SOURCES = unix.c + @OS_UNIX_TRUE at unix_nothreads_LDADD = $(progs_ldadd) +- at OS_UNIX_TRUE@atomic_CFLAGS = -Wstrict-aliasing=2 $(INCLUDES) ++ at OS_UNIX_TRUE@atomic_CFLAGS = $(INCLUDES) + @OS_UNIX_TRUE at atomic_LDADD = $(progs_ldadd) + @OS_UNIX_TRUE at bitlock_LDADD = $(progs_ldadd) + +-- +1.7.5.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jun 10 14:23:45 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 10 Jun 2011 12:23:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[14778] csw/mgar/pkg/libunique/trunk/Makefile Message-ID: Revision: 14778 http://gar.svn.sourceforge.net/gar/?rev=14778&view=rev Author: dmichelsen Date: 2011-06-10 12:23:45 +0000 (Fri, 10 Jun 2011) Log Message: ----------- libunique: Rework to latest standards Modified Paths: -------------- csw/mgar/pkg/libunique/trunk/Makefile Modified: csw/mgar/pkg/libunique/trunk/Makefile =================================================================== --- csw/mgar/pkg/libunique/trunk/Makefile 2011-06-10 12:19:34 UTC (rev 14777) +++ csw/mgar/pkg/libunique/trunk/Makefile 2011-06-10 12:23:45 UTC (rev 14778) @@ -14,34 +14,39 @@ endef MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTNAME = $(NAME)-$(VERSION) +DISTFILES = $(DISTNAME).tar.bz2 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - -PACKAGES = CSWlibunique CSWlibuniquedevel -CATALOGNAME_CSWlibunique = libunique -CATALOGNAME_CSWlibuniquedevel = libunique_devel - +PACKAGES += CSWlibunique SPKG_DESC_CSWlibunique += Library for writing single instance application -SPKG_DESC_CSWlibuniquedevel += Library for writing single instance application - developer package +RUNTIME_DEP_PKGS_CSWlibunique += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibunique += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibunique += CSWggettextrt +RUNTIME_DEP_PKGS_CSWlibunique += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibunique += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibunique += CSWlibatk +RUNTIME_DEP_PKGS_CSWlibunique += CSWlibcairo +RUNTIME_DEP_PKGS_CSWlibunique += CSWpango +RUNTIME_DEP_PKGS_CSWlibunique += CSWdbusglib +RUNTIME_DEP_PKGS_CSWlibunique += CSWlibdbus -RUNTIME_DEP_PKGS_CSWlibunique += CSWfconfig CSWftype2 CSWggettextrt CSWglib2 -RUNTIME_DEP_PKGS_CSWlibunique += CSWgtk2 CSWlibatk CSWlibcairo CSWpango -RUNTIME_DEP_PKGS_CSWlibunique += CSWdbusglib CSWlibdbus -RUNTIME_DEP_PKGS_CSWlibuniquedevel += CSWlibunique CSWglib2devel CSWgtk2devel CSWlibatkdevel CSWlibcairodevel CSWpangodevel +PACKAGES += CSWlibunique-dev +SPKG_DESC_CSWlibunique-dev = Development files for lib +PKGFILES_CSWlibunique-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibunique-dev += $(sharedstatedir)/gtk-doc/.* +RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWlibunique +RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWglib2devel +RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWgtk2devel +RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWlibatkdevel +RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWlibcairodevel +RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWpangodevel BUILD_DEP_PKGS += CSWdbusglibdev -SPKG_SOURCEURL = http://live.gnome.org/LibUnique +VENDOR_URL = http://live.gnome.org/LibUnique -NOISAEXEC = 1 +BUILD64 = 1 NOISALIST = 1 -# This needs to be fixed first before we can build 64 bit: -# https://www.opencsw.org/mantis/view.php?id=4565 -#BUILD64 = 1 - EXTRA_LINKER_FLAGS = -lsocket -lnsl STRIP_LIBTOOL = 1 @@ -52,20 +57,6 @@ # This needs a newer GTK, 2.18.x does not have it, reenable when GTK has been updated CONFIGURE_ARGS += --enable-introspection=no -TEST_TARGET = check - -ARCHALL_CSWlibuniquedoc = 1 - -PKGFILES_CSWlibuniquedevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibuniquedevel += $(sharedstatedir)/gtk-doc/.* - -CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWlibunique -CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWlibcairodevel -CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWpangodevel -CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWlibatkdevel -CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWglib2devel -CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWgtk2devel - include gar/category.mk PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jun 10 14:29:39 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 10 Jun 2011 12:29:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14779] csw/mgar/pkg/clamav/trunk/Makefile Message-ID: Revision: 14779 http://gar.svn.sourceforge.net/gar/?rev=14779&view=rev Author: bonivart Date: 2011-06-10 12:29:39 +0000 (Fri, 10 Jun 2011) Log Message: ----------- clamav/trunk: fix dep on ncurses5 and overrides Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2011-06-10 12:23:45 UTC (rev 14778) +++ csw/mgar/pkg/clamav/trunk/Makefile 2011-06-10 12:29:39 UTC (rev 14779) @@ -23,7 +23,7 @@ PACKAGES += CSWclamav CATALOGNAME_CSWclamav = clamav SPKG_DESC_CSWclamav = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWclamav = CSWlibclam6 CSWzlib CSWbzip2 CSWiconv CSWncurses +RUNTIME_DEP_PKGS_CSWclamav = CSWlibclam6 CSWzlib CSWbzip2 CSWiconv CSWlibncurses5 RUNTIME_DEP_PKGS_CSWclamav += CSWlibltdl7 PACKAGES += CSWlibclam6 @@ -95,6 +95,7 @@ #SKIPTEST = 1 TEST_TARGET = check +# These are harmless examples CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.CSW CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/README CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/INSTALL.clamav-milter.CSW @@ -104,18 +105,11 @@ CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node24.html CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node15.html +# We don't split to three separate packages CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.10|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.10|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.10|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6 -# Should only be necessary during transition of devel -> dev -CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/libclamunrar.so|CSWlibclam6-dev|CSWlibclam6-devel -CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/bin/clamav-config|CSWlibclam6-dev|CSWlibclam6-devel -CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/libclamunrar_iface.so|CSWlibclam6-dev|CSWlibclam6-devel -CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/include/clamav.h|CSWlibclam6-dev|CSWlibclam6-devel -CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/pkgconfig/libclamav.pc|CSWlibclam6-dev|CSWlibclam6-devel -CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/libclamav.so|CSWlibclam6-dev|CSWlibclam6-devel - include gar/category.mk DOCS = AUTHORS BUGS ChangeLog This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jun 10 15:01:31 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 10 Jun 2011 13:01:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14780] csw/mgar/pkg/scintilla/trunk/Makefile Message-ID: Revision: 14780 http://gar.svn.sourceforge.net/gar/?rev=14780&view=rev Author: dmichelsen Date: 2011-06-10 13:01:31 +0000 (Fri, 10 Jun 2011) Log Message: ----------- scintilla: Builds now Modified Paths: -------------- csw/mgar/pkg/scintilla/trunk/Makefile Modified: csw/mgar/pkg/scintilla/trunk/Makefile =================================================================== --- csw/mgar/pkg/scintilla/trunk/Makefile 2011-06-10 12:29:39 UTC (rev 14779) +++ csw/mgar/pkg/scintilla/trunk/Makefile 2011-06-10 13:01:31 UTC (rev 14780) @@ -16,10 +16,32 @@ LICENSE = License.txt +WORKSRC = $(WORKDIR)/$(DISTNAME)/gtk + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) # Ugh, manual makefile. +CONFIGURE_SCRIPTS = +BUILD_OVERRIDE_VARS = CCOMP CC CONFIGFLAGS CXXFLAGS +BUILD_OVERRIDE_VAR_CCOMP = $(CC) +BUILD_OVERRIDE_VAR_CC = $(CXX) +BUILD_OVERRIDE_VAR_CONFIGFLAGS = $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(bindir_install)/pkg-config --cflags gtk+-2.0) +BUILD_OVERRIDE_VAR_CXXFLAGS = -DGTK -DSCI_LEXER -I ../include -I ../src -I ../lexlib $(CXXFLAGS) + +TEST_SCRIPTS = + +INSTALL_SCRIPTS = custom + include gar/category.mk +install-custom: + mkdir -p $(DESTDIR)$(includedir) + cp $(WORKDIR)/$(DISTNAME)/include/* $(DESTDIR)$(includedir) + mkdir -p $(DESTDIR)$(libdir) + cd $(WORKDIR)/$(DISTNAME)/bin && ld -G -z allextract -h scintilla.so.2 scintilla.a -o $(DESTDIR)$(libdir)/libscintilla.so.2.26 + ln -s libscintilla.so.2.26 $(DESTDIR)$(libdir)/libscintilla.so.2 + ln -s libscintilla.so.2.26 $(DESTDIR)$(libdir)/libscintilla.so + @$(MAKECOOKIE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jun 10 15:28:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 10 Jun 2011 13:28:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14781] csw/mgar/pkg Message-ID: Revision: 14781 http://gar.svn.sourceforge.net/gar/?rev=14781&view=rev Author: dmichelsen Date: 2011-06-10 13:28:00 +0000 (Fri, 10 Jun 2011) Log Message: ----------- scite: Initial commit Added Paths: ----------- csw/mgar/pkg/scite/ csw/mgar/pkg/scite/Makefile csw/mgar/pkg/scite/branches/ csw/mgar/pkg/scite/tags/ csw/mgar/pkg/scite/trunk/ csw/mgar/pkg/scite/trunk/Makefile csw/mgar/pkg/scite/trunk/checksums csw/mgar/pkg/scite/trunk/files/ Copied: csw/mgar/pkg/scite/Makefile (from rev 14773, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/scite/Makefile (rev 0) +++ csw/mgar/pkg/scite/Makefile 2011-06-10 13:28:00 UTC (rev 14781) @@ -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/scite/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/scite/trunk/Makefile =================================================================== --- csw/mgar/pkg/scite/trunk/Makefile (rev 0) +++ csw/mgar/pkg/scite/trunk/Makefile 2011-06-10 13:28:00 UTC (rev 14781) @@ -0,0 +1,19 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = scite +VERSION = 226 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = Text editor +define BLURB + Long description +endef + +SF_PROJ = scintilla +MASTER_SITES = $(SF_MIRROR) +DISTFILES = scite$(VERSION).tgz + +include gar/category.mk + Property changes on: csw/mgar/pkg/scite/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/scite/trunk/checksums =================================================================== --- csw/mgar/pkg/scite/trunk/checksums (rev 0) +++ csw/mgar/pkg/scite/trunk/checksums 2011-06-10 13:28:00 UTC (rev 14781) @@ -0,0 +1 @@ +328865585758aca73292083ab4552af4 scite226.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jun 10 19:25:06 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 10 Jun 2011 17:25:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14782] csw/mgar/pkg/eventlog/trunk Message-ID: Revision: 14782 http://gar.svn.sourceforge.net/gar/?rev=14782&view=rev Author: wahwah Date: 2011-06-10 17:25:06 +0000 (Fri, 10 Jun 2011) Log Message: ----------- Update to 0.2.12, and libraries split. Modified Paths: -------------- csw/mgar/pkg/eventlog/trunk/Makefile csw/mgar/pkg/eventlog/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/eventlog/trunk/Makefile Modified: csw/mgar/pkg/eventlog/trunk/Makefile =================================================================== --- csw/mgar/pkg/eventlog/trunk/Makefile 2011-06-10 13:28:00 UTC (rev 14781) +++ csw/mgar/pkg/eventlog/trunk/Makefile 2011-06-10 17:25:06 UTC (rev 14782) @@ -1,5 +1,7 @@ +# $Id$ + NAME = eventlog -VERSION = 0.2.9 +VERSION = 0.2.12 CATEGORIES = lib DESCRIPTION = Replacement of the simple syslog() API providing structure to messages. @@ -14,15 +16,9 @@ via a configuration file. endef -PACKAGES = CSWeventlog -CATALOGNAME = eventlog - MASTER_SITES = http://www.balabit.com/downloads/files/eventlog/0.2/ DISTFILES = $(NAME)_$(VERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - CONFIGURE_ARGS = $(DIRPATHS) RUNTIME_DEP_PKGS += CSWgcc4corert @@ -30,4 +26,18 @@ GARCOMPILER = GNU TEST_SCRIPTS = +OBSOLETED_BY_CSWeventlog-dev = CSWeventlog + +PACKAGES = CSWlibevtlog0 +CATALOGNAME_CSWlibevtlog0 = libevtlog0 +PKGFILES_CSWlibevtlog0 += $(call baseisadirs,$(libdir),libevtlog\.so\.0\.0\.0) +PKGFILES_CSWlibevtlog0 += $(call baseisadirs,$(libdir),libevtlog\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibevtlog0 += Replacement of the simple syslog() API providing structure to messages., libevtlog.so.0 +RUNTIME_DEP_PKGS_CSWeventlog += CSWlibevtlog0 +PACKAGES += CSWeventlog-dev +PKGFILES_CSWeventlog-dev += $(PKGFILES_DEV) +CATALOGNAME_CSWeventlog-dev = eventlog_dev +SPKG_DESC_CSWeventlog-dev = $(DESCRIPTION) - development files +RUNTIME_DEP_PKGS_CSWeventlog-dev += CSWlibevtlog0 + include gar/category.mk Property changes on: csw/mgar/pkg/eventlog/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/eventlog/trunk/checksums =================================================================== --- csw/mgar/pkg/eventlog/trunk/checksums 2011-06-10 13:28:00 UTC (rev 14781) +++ csw/mgar/pkg/eventlog/trunk/checksums 2011-06-10 17:25:06 UTC (rev 14782) @@ -1 +1 @@ -76e3d7a0b8f335c12099e9b91191fbf1 download/eventlog_0.2.9.tar.gz +3d6ebda8a161d36cb40d09328f78786b eventlog_0.2.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jun 10 19:34:01 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 10 Jun 2011 17:34:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14783] csw/mgar/pkg/eventlog/trunk/Makefile Message-ID: Revision: 14783 http://gar.svn.sourceforge.net/gar/?rev=14783&view=rev Author: wahwah Date: 2011-06-10 17:34:00 +0000 (Fri, 10 Jun 2011) Log Message: ----------- Backward compatibility for packages depending on CSWeventlog Modified Paths: -------------- csw/mgar/pkg/eventlog/trunk/Makefile Modified: csw/mgar/pkg/eventlog/trunk/Makefile =================================================================== --- csw/mgar/pkg/eventlog/trunk/Makefile 2011-06-10 17:25:06 UTC (rev 14782) +++ csw/mgar/pkg/eventlog/trunk/Makefile 2011-06-10 17:34:00 UTC (rev 14783) @@ -27,6 +27,7 @@ TEST_SCRIPTS = OBSOLETED_BY_CSWeventlog-dev = CSWeventlog +OBSOLETED_BY_CSWlibeventlog0 = CSWeventlog PACKAGES = CSWlibevtlog0 CATALOGNAME_CSWlibevtlog0 = libevtlog0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gadavis at users.sourceforge.net Fri Jun 10 22:38:56 2011 From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net) Date: Fri, 10 Jun 2011 20:38:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14784] csw/mgar/pkg/gmt/trunk/Makefile Message-ID: Revision: 14784 http://gar.svn.sourceforge.net/gar/?rev=14784&view=rev Author: gadavis Date: 2011-06-10 20:38:56 +0000 (Fri, 10 Jun 2011) Log Message: ----------- Bump GMT version to 4.5.6 Modified Paths: -------------- csw/mgar/pkg/gmt/trunk/Makefile Modified: csw/mgar/pkg/gmt/trunk/Makefile =================================================================== --- csw/mgar/pkg/gmt/trunk/Makefile 2011-06-10 17:34:00 UTC (rev 14783) +++ csw/mgar/pkg/gmt/trunk/Makefile 2011-06-10 20:38:56 UTC (rev 14784) @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GMT_VERSION = 4.5.5 +GMT_VERSION = 4.5.6 NAME = gmt VERSION = $(GMT_VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gadavis at users.sourceforge.net Fri Jun 10 22:42:42 2011 From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net) Date: Fri, 10 Jun 2011 20:42:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14785] csw/mgar/pkg/netcdf/trunk/Makefile Message-ID: Revision: 14785 http://gar.svn.sourceforge.net/gar/?rev=14785&view=rev Author: gadavis Date: 2011-06-10 20:42:42 +0000 (Fri, 10 Jun 2011) Log Message: ----------- Bump NetCDF Version to 4.1.2, update download path Modified Paths: -------------- csw/mgar/pkg/netcdf/trunk/Makefile Modified: csw/mgar/pkg/netcdf/trunk/Makefile =================================================================== --- csw/mgar/pkg/netcdf/trunk/Makefile 2011-06-10 20:38:56 UTC (rev 14784) +++ csw/mgar/pkg/netcdf/trunk/Makefile 2011-06-10 20:42:42 UTC (rev 14785) @@ -3,11 +3,11 @@ # $Id$ NAME = netcdf -VERSION = 4.1.1 +VERSION = 4.1.2 CATEGORIES = lib DESCRIPTION = Machine-independent data formats for array-oriented scientific data SPKG_SOURCEURL = http://www.unidata.ucar.edu/software/netcdf/ -MASTER_SITES = http://www.unidata.ucar.edu/downloads/netcdf/ftp/ +MASTER_SITES = ftp://ftp.unidata.ucar.edu/pub/netcdf/ DISTFILES += $(NAME)-$(VERSION).tar.gz DISTFILES += CSWlibnetcdf6.cswreleasemgr DISTFILES += CSWlibnetcdff5.cswreleasemgr This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gadavis at users.sourceforge.net Fri Jun 10 22:43:17 2011 From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net) Date: Fri, 10 Jun 2011 20:43:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14786] csw/mgar/pkg/gmt/trunk/checksums Message-ID: Revision: 14786 http://gar.svn.sourceforge.net/gar/?rev=14786&view=rev Author: gadavis Date: 2011-06-10 20:43:17 +0000 (Fri, 10 Jun 2011) Log Message: ----------- Update checksums for GMT 4.5.6 Modified Paths: -------------- csw/mgar/pkg/gmt/trunk/checksums Modified: csw/mgar/pkg/gmt/trunk/checksums =================================================================== --- csw/mgar/pkg/gmt/trunk/checksums 2011-06-10 20:42:42 UTC (rev 14785) +++ csw/mgar/pkg/gmt/trunk/checksums 2011-06-10 20:43:17 UTC (rev 14786) @@ -1,4 +1,4 @@ -0a99b8f820689d872b18cf689efad9b9 GMT4.5.5_doc.tar.bz2 -55b9142fb8ad3e17a49542f42b36d923 GMT4.5.5_share.tar.bz2 -051554f98bff57365eebab2d227e3285 GMT4.5.5_src.tar.bz2 -38e01e420876bfe3cafe60b207c91de6 GMT4.5.5_suppl.tar.bz2 +9a7b78d58311beff31d47b42d0d30bad GMT4.5.6_doc.tar.bz2 +9b29e35a0c939345ae593dc6487c8b00 GMT4.5.6_share.tar.bz2 +79cdb798b48c0411483d9b1c60944163 GMT4.5.6_src.tar.bz2 +1519e3fdfd337a852d53f5ce819ac3cc GMT4.5.6_suppl.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gadavis at users.sourceforge.net Fri Jun 10 22:46:20 2011 From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net) Date: Fri, 10 Jun 2011 20:46:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[14787] csw/mgar/pkg/netcdf/trunk/checksums Message-ID: Revision: 14787 http://gar.svn.sourceforge.net/gar/?rev=14787&view=rev Author: gadavis Date: 2011-06-10 20:46:19 +0000 (Fri, 10 Jun 2011) Log Message: ----------- Update checksums for NetCDF 4.1.2 Modified Paths: -------------- csw/mgar/pkg/netcdf/trunk/checksums Modified: csw/mgar/pkg/netcdf/trunk/checksums =================================================================== --- csw/mgar/pkg/netcdf/trunk/checksums 2011-06-10 20:43:17 UTC (rev 14786) +++ csw/mgar/pkg/netcdf/trunk/checksums 2011-06-10 20:46:19 UTC (rev 14787) @@ -1 +1 @@ -79c5ff14c80d5e18dd8f1fceeae1c8e1 netcdf-4.1.1.tar.gz +4a94ebe2d998d649159aa5665c83fb1a netcdf-4.1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jun 11 15:17:37 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 11 Jun 2011 13:17:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14788] csw/mgar/pkg/pango/trunk/Makefile Message-ID: Revision: 14788 http://gar.svn.sourceforge.net/gar/?rev=14788&view=rev Author: dmichelsen Date: 2011-06-11 13:17:36 +0000 (Sat, 11 Jun 2011) Log Message: ----------- pango: Restore original package names Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2011-06-10 20:46:19 UTC (rev 14787) +++ csw/mgar/pkg/pango/trunk/Makefile 2011-06-11 13:17:36 UTC (rev 14788) @@ -24,6 +24,8 @@ VENDOR_URL = http://www.pango.org/ PACKAGES += CSWpango +CATALOGNAME_CSWpango = libpango +CHECKPKG_OVERRIDES_CSWpango += catalogname-does-not-match-pkgname|pkgname=CSWpango|catalogname=libpango|expected-catalogname=pango SPKG_DESC_CSWpango = Pango, a framework for the layout and rendering of international text RUNTIME_DEP_PKGS_CSWpango += CSWlibintl8 RUNTIME_DEP_PKGS_CSWpango += CSWlibxft2 @@ -62,25 +64,26 @@ #SPKG_DESC_CSWlibpangoxft1-0-0 = XFT bindings for Pango, libpangoxft-1.0.so.0 #PKGFILES_CSWlibpangoxft1-0-0 = $(call pkgfiles_lib,libpangoxft-1.0.so.0) -PACKAGES += CSWpango-dev -SPKG_DESC_CSWpango-dev = Developer files for libpango-1.0.so.0 and assorted libs -PKGFILES_CSWpango-dev = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWpango-dev += CSWpango -RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibcairo-dev +PACKAGES += CSWpangodevel +CATALOGNAME_CSWpangodevel = libpango_devel +CHECKPKG_OVERRIDES_CSWpangodevel += catalogname-does-not-match-pkgname|pkgname=CSWpangodevel|catalogname=libpango_devel|expected-catalogname=pangodevel +SPKG_DESC_CSWpangodevel = Developer files for libpango-1.0.so.0 and assorted libs +PKGFILES_CSWpangodevel = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWpangodevel += CSWpango +RUNTIME_DEP_PKGS_CSWpangodevel += CSWlibcairo-dev #RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpango1-0-0 #RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpangocairo-1-0-0 #RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpangoft2-1-0-0 #RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpangox1-0-0 #RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpangoxft1-0-0 -OBSOLETED_BY_CSWpango-dev = CSWpangodevel -CATALOGNAME_CSWpangodevel = libpango_devel_stub -PACKAGES += CSWpango-doc -SPKG_DESC_CSWpango-doc = Documentation for Pango -PKGFILES_CSWpango-doc = $(sharedstatedir)/gtk-doc/.* -ARCHALL_CSWpango-doc = 1 -OBSOLETED_BY_CSWpango-doc = CSWpangodoc -CATALOGNAME_CSWpangodoc = libpango_doc_stub +PACKAGES += CSWpangodoc +# This is a legacy name +CATALOGNAME_CSWpangodoc = libpango_doc +CHECKPKG_OVERRIDES_CSWpangodoc += catalogname-does-not-match-pkgname|pkgname=CSWpangodoc|catalogname=libpango_doc|expected-catalogname=pangodoc +SPKG_DESC_CSWpangodoc = Documentation for Pango +PKGFILES_CSWpangodoc = $(sharedstatedir)/gtk-doc/.* +ARCHALL_CSWpangodoc = 1 BUILD_DEP_PKGS += CSWggettext-dev BUILD_DEP_PKGS += CSWgtk-doc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jun 12 01:19:14 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 11 Jun 2011 23:19:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14789] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 14789 http://gar.svn.sourceforge.net/gar/?rev=14789&view=rev Author: wahwah Date: 2011-06-11 23:19:14 +0000 (Sat, 11 Jun 2011) Log Message: ----------- pkg/sendmail/trunk: version bump to 8.14.5 and largefile support Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile csw/mgar/pkg/sendmail/trunk/checksums Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-11 13:17:36 UTC (rev 14788) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-11 23:19:14 UTC (rev 14789) @@ -1,5 +1,7 @@ +# $Id$ + NAME = sendmail -VERSION = 8.14.4 +VERSION = 8.14.5 CATEGORIES = server DESCRIPTION = Sendmail MTA @@ -23,9 +25,8 @@ DISTFILES += CSWsendmail.preremove CSWsendmail.preinstall CSWsendmail.space DISTFILES += $(foreach FILE,$(shell cd $(FILEDIR) && ls *.CSW),$(FILE)) -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +# Enable support for files > 2GB in size. +EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE # we require PACKAGES = CSWsendmail Modified: csw/mgar/pkg/sendmail/trunk/checksums =================================================================== --- csw/mgar/pkg/sendmail/trunk/checksums 2011-06-11 13:17:36 UTC (rev 14788) +++ csw/mgar/pkg/sendmail/trunk/checksums 2011-06-11 23:19:14 UTC (rev 14789) @@ -1 +1 @@ -1b23d5000c8e7bfe82ec1a27f2f5fdc5 sendmail.8.14.4.tar.gz +02ccfc331cc81ed00ec8bb5ecfc69018 sendmail.8.14.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jun 12 01:23:08 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 11 Jun 2011 23:23:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14790] csw/mgar/pkg/sendmail/trunk/Makefile Message-ID: Revision: 14790 http://gar.svn.sourceforge.net/gar/?rev=14790&view=rev Author: wahwah Date: 2011-06-11 23:23:07 +0000 (Sat, 11 Jun 2011) Log Message: ----------- pkg/sendmail/trunk: setting the Id keyword Property Changed: ---------------- csw/mgar/pkg/sendmail/trunk/Makefile Property changes on: csw/mgar/pkg/sendmail/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jun 12 16:26:08 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 12 Jun 2011 14:26:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14791] csw/mgar/pkg/cups/trunk Message-ID: Revision: 14791 http://gar.svn.sourceforge.net/gar/?rev=14791&view=rev Author: wahwah Date: 2011-06-12 14:26:07 +0000 (Sun, 12 Jun 2011) Log Message: ----------- pkg/cups/trunk: added a README to cupsclient, used obsoletes for libcups Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cups/trunk/files/CSWcupsclient.README Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2011-06-11 23:23:07 UTC (rev 14790) +++ csw/mgar/pkg/cups/trunk/Makefile 2011-06-12 14:26:07 UTC (rev 14791) @@ -50,6 +50,7 @@ DISTFILES += CSWcupsd.preinstall DISTFILES += CSWcupsd.postremove DISTFILES += client.conf.CSW +DISTFILES += CSWcupsclient.README PATCHFILES = 0001-cswcups-for-service-name.patch PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch @@ -84,22 +85,12 @@ CHECKPKG_OVERRIDES_CSWcups += surplus-dependency|CSWcupsd # Empty transitional package -PACKAGES += CSWlibcups -SPKG_DESC_CSWlibcups = Empty transitional package (was: CUPS libraries) -PKGFILES_CSWlibcups = NONE -RUNTIME_DEP_PKGS_CSWlibcups += CSWlibcups2 -RUNTIME_DEP_PKGS_CSWlibcups += CSWlibcupscgi1 -RUNTIME_DEP_PKGS_CSWlibcups += CSWlibcupsdriver1 -RUNTIME_DEP_PKGS_CSWlibcups += CSWlibcupsimage2 -RUNTIME_DEP_PKGS_CSWlibcups += CSWlibcupsmime1 -RUNTIME_DEP_PKGS_CSWlibcups += CSWlibcupsppdc1 -CHECKPKG_OVERRIDES_CSWlibcups += surplus-dependency|CSWlibcupsppdc1 -CHECKPKG_OVERRIDES_CSWlibcups += surplus-dependency|CSWlibcupsdriver1 -CHECKPKG_OVERRIDES_CSWlibcups += surplus-dependency|CSWlibcups2 -CHECKPKG_OVERRIDES_CSWlibcups += surplus-dependency|CSWlibcupsmime1 -CHECKPKG_OVERRIDES_CSWlibcups += surplus-dependency|CSWlibcupsimage2 -CHECKPKG_OVERRIDES_CSWlibcups += surplus-dependency|CSWlibcupscgi1 -ARCHALL_CSWlibcups = 1 +OBSOLETED_BY_CSWlibcups2 += CSWlibcups +OBSOLETED_BY_CSWlibcupscgi1 += CSWlibcups +OBSOLETED_BY_CSWlibcupsdriver1 += CSWlibcups +OBSOLETED_BY_CSWlibcupsimage2 += CSWlibcups +OBSOLETED_BY_CSWlibcupsmime1 += CSWlibcups +OBSOLETED_BY_CSWlibcupsppdc1 += CSWlibcups # The daemon PACKAGES += CSWcupsd @@ -163,6 +154,7 @@ PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5 PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7 PKGFILES_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW +PKGFILES_CSWcupsclient += $(datadir)/doc/cupsclient.* RUNTIME_DEP_PKGS_CSWcupsclient += CSWosslrt RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcups2 RUNTIME_DEP_PKGS_CSWcupsclient += CSWzlib @@ -214,10 +206,8 @@ ARCHALL_CSWcupsdoc = 1 - - -PKGFILES_CSWcupsdoc = $(datadir)/doc -PKGFILES_CSWcupsdoc += $(datadir)/doc/.* +PKGFILES_CSWcupsdoc += $(datadir)/doc/cups +PKGFILES_CSWcupsdoc += $(datadir)/doc/cups/.* PKGFILES_CSWcupsdoc += $(datadir)/cups/examples.* SPKG_DESC_CSWcupsdoc = CUPS documentation @@ -351,6 +341,10 @@ for f in $(DESTDIR)$(libdir)/cups/backend/*; do \ chmod 0700 $${f}; \ done + # https://www.opencsw.org/mantis/view.php?id=4532 + ginstall -m 755 -d $(DESTDIR)$(datadir)/doc/cupsclient + ginstall -m 755 $(DOWNLOADDIR)/CSWcupsclient.README \ + $(DESTDIR)$(datadir)/doc/cupsclient/README @$(MAKECOOKIE) cupslinks: Added: csw/mgar/pkg/cups/trunk/files/CSWcupsclient.README =================================================================== --- csw/mgar/pkg/cups/trunk/files/CSWcupsclient.README (rev 0) +++ csw/mgar/pkg/cups/trunk/files/CSWcupsclient.README 2011-06-12 14:26:07 UTC (rev 14791) @@ -0,0 +1,4 @@ +This is the CUPS client package, containing client binaries. It only works +with a corresponding CUPS server, either local or remote. If you're looking +at setting up a new CUPS installation, you will need to install the cupsd +package as well. For documentation, look at the cupsdoc package. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Jun 12 22:23:43 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 12 Jun 2011 20:23:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14792] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 14792 http://gar.svn.sourceforge.net/gar/?rev=14792&view=rev Author: bonivart Date: 2011-06-12 20:23:43 +0000 (Sun, 12 Jun 2011) Log Message: ----------- sendmail/trunk: try to simplify makefile, lots of temporary overrides for now Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/sendmail/trunk/files/COPYING Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-12 14:26:07 UTC (rev 14791) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-12 20:23:43 UTC (rev 14792) @@ -9,14 +9,15 @@ Sendmail MTA endef -INSTALLISADIR = $(WORKROOTDIR)/install-$(GAROSREL)-$(MODULATION) -WORKDIR = $(WORKROOTDIR)/build-$(GAROSREL)-$(MODULATION) -WORKDIR_FIRSTMOD = $(WORKROOTDIR)/build-$(GAROSREL)-$(firstword $(MODULATIONS)) -COOKIEDIR = $(COOKIEROOTDIR)/$(GAROSREL)-$(MODULATION) +#INSTALLISADIR = $(WORKROOTDIR)/install-$(GAROSREL)-$(MODULATION) +#WORKDIR = $(WORKROOTDIR)/build-$(GAROSREL)-$(MODULATION) +#WORKDIR_FIRSTMOD = $(WORKROOTDIR)/build-$(GAROSREL)-$(firstword $(MODULATIONS)) +#COOKIEDIR = $(COOKIEROOTDIR)/$(GAROSREL)-$(MODULATION) MASTER_SITES = ftp://ftp.sendmail.org/pub/sendmail/ +SPKG_SOURCEURL = http://www.sendmail.org -MY_CLASSES = CSWsendmail.i.sol9 CSWsendmail.i.sol10 +#MY_CLASSES = CSWsendmail.i.sol9 CSWsendmail.i.sol10 DISTFILES = $(NAME).$(VERSION).tar.gz DISTFILES += README.CSW sendmail.schema CSWsendmail.postinstall @@ -24,31 +25,35 @@ DISTFILES += cswsendmail site.config.m4 $(MY_CLASSES) CSWsendmail.checkinstall DISTFILES += CSWsendmail.preremove CSWsendmail.preinstall CSWsendmail.space DISTFILES += $(foreach FILE,$(shell cd $(FILEDIR) && ls *.CSW),$(FILE)) +DISTFILES += COPYING # Enable support for files > 2GB in size. EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -# we require PACKAGES = CSWsendmail -SPKG_SOURCEURL = http://www.sendmail.org +CATALOGNAME_CSWsendmail = sendmail SPKG_DESC_CSWsendmail = $(DESCRIPTION) -CATALOGNAME_CSWsendmail = sendmail -RUNTIME_DEP_PKGS_CSWsendmail = CSWbdb48 CSWoldaprt CSWosslrt CSWsasl CSWtcpwrap -RUNTIME_DEP_PKGS_CSWsendmail += CSWcswclassutils +RUNTIME_DEP_PKGS_CSWsendmail = CSWbdb48 +RUNTIME_DEP_PKGS_CSWsendmail += CSWoldaprt +RUNTIME_DEP_PKGS_CSWsendmail += CSWosslrt +RUNTIME_DEP_PKGS_CSWsendmail += CSWsasl +RUNTIME_DEP_PKGS_CSWsendmail += CSWtcpwrap -PROTOTYPE_FILTER = awk \ - '$$$$2 ~/i.sol9/ { next } \ - $$$$2 ~/i.sol10/ { next } \ - $$$$3 ~/\/init\.d\/cswsendmail$$$$/ {$$$$2 = "cswinitsmf"} \ - $$$$3 ~/sol9\./ { $$$$2 = "sol9" } \ - $$$$3 ~/sol10\./ { $$$$2 = "sol10" } \ - { print } \ - END { { print "i i.sol9=CSWsendmail.i.sol9" } \ - { print "i i.sol10=CSWsendmail.i.sol10" } }' +INITSMF = /etc/opt/csw/init.d/cswsendmail -ENABLE_CHECK = 0 +#PROTOTYPE_FILTER = awk \ +# '$$$$2 ~/i.sol9/ { next } \ +# $$$$2 ~/i.sol10/ { next } \ +# $$$$3 ~/\/init\.d\/cswsendmail$$$$/ {$$$$2 = "cswinitsmf"} \ +# $$$$3 ~/sol9\./ { $$$$2 = "sol9" } \ +# $$$$3 ~/sol10\./ { $$$$2 = "sol10" } \ +# { print } \ +# END { { print "i i.sol9=CSWsendmail.i.sol9" } \ +# { print "i i.sol10=CSWsendmail.i.sol10" } }' +#ENABLE_CHECK = 0 + # patch away GNUism PATCHFILES = patch-CC-M.m4 @@ -58,6 +63,30 @@ INSTALL_SCRIPTS = custom EXTRA_MERGE_SCRIPTS = OS +# Temporary overrides +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/README +CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man1/mailq.1|CSWpostfix|CSWsendmail +CHECKPKG_OVERRIDES_CSWsendmail += surplus-dependency|CSWbdb48 +CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/bin/newaliases|CSWpostfix|CSWsendmail +CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man5/aliases.5|CSWpostfix|CSWsendmail +CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/bin/mailq|CSWpostfix|CSWsendmail +CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man1/newaliases.1|CSWpostfix|CSWsendmail +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/share|root/opt/csw/share/mail/cf/README +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/smrsh.8 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/sendmail.8 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/ostype/freebsd6.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/ostype/freebsd5.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/ostype/powerux.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/ostype/dragonfly.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/feature/local_procmail.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/cf/mail.cs.mc +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/cf/mail.eecs.mc +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/cf/knecht.mc +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/qpage.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/fax.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/procmail.m4 +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/phquery.m4 + include gar/category.mk ADMSCRIPTS = preremove preinstall space depend i.sol9 i.sol10 Added: csw/mgar/pkg/sendmail/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/sendmail/trunk/files/COPYING 2011-06-12 20:23:43 UTC (rev 14792) @@ -0,0 +1,81 @@ + SENDMAIL LICENSE + +The following license terms and conditions apply, unless a redistribution +agreement or other license is obtained from Sendmail, Inc., 6475 Christie +Ave, Third Floor, Emeryville, CA 94608, USA, or by electronic mail at +license at sendmail.com. + +License Terms: + +Use, Modification and Redistribution (including distribution of any +modified or derived work) in source and binary forms is permitted only if +each of the following conditions is met: + +1. Redistributions qualify as "freeware" or "Open Source Software" under + one of the following terms: + + (a) Redistributions are made at no charge beyond the reasonable cost of + materials and delivery. + + (b) Redistributions are accompanied by a copy of the Source Code or by an + irrevocable offer to provide a copy of the Source Code for up to three + years at the cost of materials and delivery. Such redistributions + must allow further use, modification, and redistribution of the Source + Code under substantially the same terms as this license. For the + purposes of redistribution "Source Code" means the complete compilable + and linkable source code of sendmail and associated libraries and + utilities in the sendmail distribution including all modifications. + +2. Redistributions of Source Code must retain the copyright notices as they + appear in each Source Code file, these license terms, and the + disclaimer/limitation of liability set forth as paragraph 6 below. + +3. Redistributions in binary form must reproduce the Copyright Notice, + these license terms, and the disclaimer/limitation of liability set + forth as paragraph 6 below, in the documentation and/or other materials + provided with the distribution. For the purposes of binary distribution + the "Copyright Notice" refers to the following language: + "Copyright (c) 1998-2010 Sendmail, Inc. All rights reserved." + +4. Neither the name of Sendmail, Inc. nor the University of California nor + names of their contributors may be used to endorse or promote + products derived from this software without specific prior written + permission. The name "sendmail" is a trademark of Sendmail, Inc. + +5. All redistributions must comply with the conditions imposed by the + University of California on certain embedded code, which copyright + Notice and conditions for redistribution are as follows: + + (a) Copyright (c) 1988, 1993 The Regents of the University of + California. All rights reserved. + + (b) Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + (i) Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + (ii) Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + (iii) Neither the name of the University nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +6. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY + SENDMAIL, INC. AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN + NO EVENT SHALL SENDMAIL, INC., THE REGENTS OF THE UNIVERSITY OF + CALIFORNIA OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +$Revision: 8.17 $, Last updated $Date: 2010/12/03 01:10:00 $, Document 139848.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jun 12 22:31:32 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 12 Jun 2011 20:31:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[14793] csw/mgar/gar/v2/lib/web Message-ID: Revision: 14793 http://gar.svn.sourceforge.net/gar/?rev=14793&view=rev Author: wahwah Date: 2011-06-12 20:31:32 +0000 (Sun, 12 Jun 2011) Log Message: ----------- pkgdb-web: Better display of error tag lists Transformed the list into a table, added catalog information, which explains previously seemingly duplicate entries. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-06-12 20:23:43 UTC (rev 14792) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-06-12 20:31:32 UTC (rev 14793) @@ -27,7 +27,6 @@ r'/error-tags/([^/]+)/', 'ErrorTagDetail', r'/catalognames/', 'CatalognameList', r'/catalognames/([^/]+)/', 'Catalogname', - r'/error-tags/', 'ErrorTagList', r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/', 'Catalogs', r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgname-by-filename', 'PkgnameByFilename', @@ -221,7 +220,7 @@ models.Srv4FileStats.q.use_to_generate_catalogs==True, ), join=join, - ).orderBy(('basename', 'tag_info')) + ).orderBy(('basename', 'tag_info', 'os_rel_id', 'arch_id', 'catrel_id')) return render.ErrorTagDetail(tag_name, tags) class ErrorTagList(object): Modified: csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html 2011-06-12 20:23:43 UTC (rev 14792) +++ csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html 2011-06-12 20:31:32 UTC (rev 14793) @@ -8,13 +8,33 @@

$tag_name

-
    + + + + + + + + $for tag in tags: $if tag.srv4_file.registered: -
  • - $tag.srv4_file.basename: +
    • + + + + + + +
    file nameOS releaseArchitectureCatalog releaseAdditional information
    + $tag.srv4_file.basename + + $tag.os_rel.full_name + + $tag.arch.name + + $tag.catrel.name + $tag.tag_info - - +
    This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jun 12 22:37:30 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 12 Jun 2011 20:37:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[14794] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 14794 http://gar.svn.sourceforge.net/gar/?rev=14794&view=rev Author: wahwah Date: 2011-06-12 20:37:30 +0000 (Sun, 12 Jun 2011) Log Message: ----------- pkgdb-web: Adjusting the time offset This would be best handled by proper time zone handling. Hardcoding for now. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-06-12 20:31:32 UTC (rev 14793) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2011-06-12 20:37:30 UTC (rev 14794) @@ -58,7 +58,7 @@ def Ago(timedelta): # Not sure why there is a time difference between mysql and the datetime # module. - timezone_diff = 1.0 + timezone_diff = 2.0 return "%.1fh" % (timedelta.seconds / 60.0 / 60.0 - timezone_diff) pkgs_ago = [(x, Ago(now - x.mtime)) for x in pkgs] return render.Srv4List(pkgs_ago) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jun 12 22:38:21 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 12 Jun 2011 20:38:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[14795] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14795 http://gar.svn.sourceforge.net/gar/?rev=14795&view=rev Author: wahwah Date: 2011-06-12 20:38:20 +0000 (Sun, 12 Jun 2011) Log Message: ----------- file-set-checker: Unit tests refactoring Modified Paths: -------------- csw/mgar/gar/v2/lib/python/file_set_checker.py csw/mgar/gar/v2/lib/python/file_set_checker_test.py Modified: csw/mgar/gar/v2/lib/python/file_set_checker.py =================================================================== --- csw/mgar/gar/v2/lib/python/file_set_checker.py 2011-06-12 20:37:30 UTC (rev 14794) +++ csw/mgar/gar/v2/lib/python/file_set_checker.py 2011-06-12 20:38:20 UTC (rev 14795) @@ -74,8 +74,7 @@ tags.append(tag.CheckpkgTag(None, error_tag_name, catalogname)) return tags - def CheckFiles(self, file_list): - """Checks a set of files. Returns error tags.""" + def _FilesWithMetadata(self, file_list): files_with_metadata = [] for file_path in file_list: pkg_path, basename = os.path.split(file_path) @@ -89,7 +88,11 @@ for arch in archs: for osrel in common_constants.OS_RELS: key = arch, osrel - # catalognames_by_arch.setdefault(key, set()).add(catalogname) + return files_with_metadata + + def CheckFiles(self, file_list): + """Checks a set of files. Returns error tags.""" + files_with_metadata = self._FilesWithMetadata(file_list) tags = [] tags.extend(self._CheckMissingArchs(files_with_metadata)) tags.extend(self._CheckUncommitted(files_with_metadata)) Modified: csw/mgar/gar/v2/lib/python/file_set_checker_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/file_set_checker_test.py 2011-06-12 20:37:30 UTC (rev 14794) +++ csw/mgar/gar/v2/lib/python/file_set_checker_test.py 2011-06-12 20:38:20 UTC (rev 14795) @@ -27,7 +27,8 @@ def testMissingArchitecture(self): fc = file_set_checker.FileSetChecker() expected = [tag.CheckpkgTag(None, 'i386-SunOS5.9-missing', 'libnspr4')] - self.assertEqual(expected, fc.CheckFiles(SAMPLE_FILES)) + files_with_metadata = fc._FilesWithMetadata(SAMPLE_FILES) + self.assertEqual(expected, fc._CheckMissingArchs(files_with_metadata)) def testMissingArchitectureWithOsrel(self): files = [ @@ -39,7 +40,8 @@ ] fc = file_set_checker.FileSetChecker() expected = [tag.CheckpkgTag(None, 'sparc-SunOS5.10-missing', 'foo')] - self.assertEqual(expected, fc.CheckFiles(files)) + files_with_metadata = fc._FilesWithMetadata(files) + self.assertEqual(expected, fc._CheckMissingArchs(files_with_metadata)) def testUncommitted(self): fc = file_set_checker.FileSetChecker() @@ -55,16 +57,21 @@ 'nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-sparc-UNCOMMITTED.pkg.gz', '/home/experimental/maciej/' 'nspr_devel-4.8.6,REV=2010.10.16-SunOS5.9-i386-UNCOMMITTED.pkg.gz'] - self.assertEqual(expected, fc.CheckFiles(files)) + files_with_metadata = fc._FilesWithMetadata(files) + self.assertEqual(expected, fc._CheckUncommitted(files_with_metadata)) def testBadInput(self): fc = file_set_checker.FileSetChecker() expected = [ + tag.CheckpkgTag(None, 'bad-vendor-tag', 'filename=csw-upload-pkg expected=CSW actual=UNKN') + ] + expected_2 = [ tag.CheckpkgTag(None, 'bad-arch-or-os-release', 'csw-upload-pkg arch=pkg osrel=unspecified'), - tag.CheckpkgTag(None, 'bad-vendor-tag', 'filename=csw-upload-pkg expected=CSW actual=UNKN'), ] files = ['csw-upload-pkg'] - self.assertEqual(expected, fc.CheckFiles(files)) + files_with_metadata = fc._FilesWithMetadata(files) + self.assertEqual(expected, fc._CheckUncommitted(files_with_metadata)) + self.assertEqual(expected_2, fc._CheckMissingArchs(files_with_metadata)) if __name__ == '__main__': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jun 12 22:39:31 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 12 Jun 2011 20:39:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14796] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14796 http://gar.svn.sourceforge.net/gar/?rev=14796&view=rev Author: wahwah Date: 2011-06-12 20:39:30 +0000 (Sun, 12 Jun 2011) Log Message: ----------- file-set-checker: Warn on bad filenames Check that package file names end with .pkg or .pkg.gz. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/file_set_checker.py csw/mgar/gar/v2/lib/python/file_set_checker_test.py Modified: csw/mgar/gar/v2/lib/python/file_set_checker.py =================================================================== --- csw/mgar/gar/v2/lib/python/file_set_checker.py 2011-06-12 20:38:20 UTC (rev 14795) +++ csw/mgar/gar/v2/lib/python/file_set_checker.py 2011-06-12 20:39:30 UTC (rev 14796) @@ -29,6 +29,16 @@ parsed_filename["vendortag"]))) return tags + def _CheckFilenames(self, files_with_metadata): + tags = [] + for filename, parsed_filename in files_with_metadata: + if not filename.endswith(".pkg.gz") or not filename.endswith(".pkg"): + tags.append(tag.CheckpkgTag( + None, + "bad-filename", + "filename=%s" % filename)) + return tags + def _CheckMissingArchs(self, files_with_metadata): tags = [] catalognames_by_arch = {} @@ -96,6 +106,7 @@ tags = [] tags.extend(self._CheckMissingArchs(files_with_metadata)) tags.extend(self._CheckUncommitted(files_with_metadata)) + tags.extend(self._CheckFilenames(files_with_metadata)) return tags Modified: csw/mgar/gar/v2/lib/python/file_set_checker_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/file_set_checker_test.py 2011-06-12 20:38:20 UTC (rev 14795) +++ csw/mgar/gar/v2/lib/python/file_set_checker_test.py 2011-06-12 20:39:30 UTC (rev 14796) @@ -73,6 +73,15 @@ self.assertEqual(expected, fc._CheckUncommitted(files_with_metadata)) self.assertEqual(expected_2, fc._CheckMissingArchs(files_with_metadata)) + def testFilenames(self): + fc = file_set_checker.FileSetChecker() + expected = [ + tag.CheckpkgTag(None, 'bad-filename', 'filename=csw-upload-pkg'), + ] + files = ['csw-upload-pkg'] + files_with_metadata = fc._FilesWithMetadata(files) + self.assertEqual(expected, fc._CheckFilenames(files_with_metadata)) + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jun 12 23:26:27 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 12 Jun 2011 21:26:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[14797] csw/mgar/gar/v2/lib/web/templates/index.html Message-ID: Revision: 14797 http://gar.svn.sourceforge.net/gar/?rev=14797&view=rev Author: wahwah Date: 2011-06-12 21:26:27 +0000 (Sun, 12 Jun 2011) Log Message: ----------- pkgdb-web: Home page title updated Modified Paths: -------------- csw/mgar/gar/v2/lib/web/templates/index.html Modified: csw/mgar/gar/v2/lib/web/templates/index.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/index.html 2011-06-12 20:39:30 UTC (rev 14796) +++ csw/mgar/gar/v2/lib/web/templates/index.html 2011-06-12 21:26:27 UTC (rev 14797) @@ -1,12 +1,14 @@ - checkpkg database experimental web app + OpenCSW buildfarm database -

    checkpkg database experimental web app

    +

    + OpenCSW buildfarm database +

    • Recently checked packages 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 Jun 13 03:43:47 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 13 Jun 2011 01:43:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14798] csw/mgar/pkg/etckeeper/ Message-ID: Revision: 14798 http://gar.svn.sourceforge.net/gar/?rev=14798&view=rev Author: bdwalton Date: 2011-06-13 01:43:46 +0000 (Mon, 13 Jun 2011) Log Message: ----------- etckeeper: drop package. never released and uses git:// URL (easy to recreate if interest again...hard to use in a multiple /etc environment) Removed Paths: ------------- csw/mgar/pkg/etckeeper/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jun 13 08:57:09 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 13 Jun 2011 06:57:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[14799] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14799 http://gar.svn.sourceforge.net/gar/?rev=14799&view=rev Author: wahwah Date: 2011-06-13 06:57:09 +0000 (Mon, 13 Jun 2011) Log Message: ----------- file-set-checker: Fix a bug in the file name check Modified Paths: -------------- csw/mgar/gar/v2/lib/python/file_set_checker.py csw/mgar/gar/v2/lib/python/file_set_checker_test.py Modified: csw/mgar/gar/v2/lib/python/file_set_checker.py =================================================================== --- csw/mgar/gar/v2/lib/python/file_set_checker.py 2011-06-13 01:43:46 UTC (rev 14798) +++ csw/mgar/gar/v2/lib/python/file_set_checker.py 2011-06-13 06:57:09 UTC (rev 14799) @@ -32,7 +32,7 @@ def _CheckFilenames(self, files_with_metadata): tags = [] for filename, parsed_filename in files_with_metadata: - if not filename.endswith(".pkg.gz") or not filename.endswith(".pkg"): + if not filename.endswith(".pkg.gz") and not filename.endswith(".pkg"): tags.append(tag.CheckpkgTag( None, "bad-filename", Modified: csw/mgar/gar/v2/lib/python/file_set_checker_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/file_set_checker_test.py 2011-06-13 01:43:46 UTC (rev 14798) +++ csw/mgar/gar/v2/lib/python/file_set_checker_test.py 2011-06-13 06:57:09 UTC (rev 14799) @@ -82,6 +82,13 @@ files_with_metadata = fc._FilesWithMetadata(files) self.assertEqual(expected, fc._CheckFilenames(files_with_metadata)) + def testFilenamesGood(self): + fc = file_set_checker.FileSetChecker() + files = ['/home/experimental/maciej/' + 'nspr-4.8.6,REV=2010.10.16-SunOS5.9-all-CSW.pkg.gz'] + files_with_metadata = fc._FilesWithMetadata(files) + self.assertEqual([], fc._CheckFilenames(files_with_metadata)) + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jun 13 10:13:27 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 13 Jun 2011 08:13:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[14800] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 14800 http://gar.svn.sourceforge.net/gar/?rev=14800&view=rev Author: wahwah Date: 2011-06-13 08:13:27 +0000 (Mon, 13 Jun 2011) Log Message: ----------- pkg/syslog_ng/trunk: Upgrade, not splitting libraries Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile csw/mgar/pkg/syslog_ng/trunk/checksums Added Paths: ----------- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes Property Changed: ---------------- csw/mgar/pkg/syslog_ng/trunk/Makefile Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2011-06-13 06:57:09 UTC (rev 14799) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2011-06-13 08:13:27 UTC (rev 14800) @@ -1,5 +1,7 @@ +# $Id$ + NAME = syslog-ng -VERSION = 3.0.5 +VERSION = 3.2.4 CATEGORIES = server DESCRIPTION = A powerful syslogd replacement @@ -15,13 +17,13 @@ DISTFILES += cswsyslog_ng DISTFILES += CSWsyslogng.preinstall DISTFILES += CSWsyslogng.postremove -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWsyslogng -CATALOGNAME = syslog_ng +DISTFILES += CSWsyslogng.cswreleasenotes + SPKG_SOURCEURL = http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/ INITSMF = /etc/opt/csw/init\.d/cswsyslog_ng SAMPLECONF = /etc/opt/csw/syslog-ng\.conf\.CSW + # shared /opt/csw support: localstatedir = /var/opt/csw sysconfdir = /etc/opt/csw @@ -31,27 +33,41 @@ CONFIGURE_ARGS += --enable-spoof-source=no CONFIGURE_ARGS += --enable-tcp-wrapper -RUNTIME_DEP_PKGS += CSWeventlog -RUNTIME_DEP_PKGS += CSWosslrt -RUNTIME_DEP_PKGS += CSWzlib -RUNTIME_DEP_PKGS += CSWpcrert -RUNTIME_DEP_PKGS += CSWggettextrt -RUNTIME_DEP_PKGS += CSWglib2 -RUNTIME_DEP_PKGS += CSWtcpwrap +GARCOMPILER = GNU +TEST_SCRIPTS = +# The configure script finds -lwrap but doesn't actually use it. +# We need to be more pushy. +EXTRA_LDFLAGS = -L/opt/csw/lib -lwrap -lsocket + +PACKAGES = CSWsyslogng +SPKG_DESC_CSWsyslogng = $(DESCRIPTION) +CATALOGNAME_CSWsyslogng = syslog_ng +RUNTIME_DEP_PKGS_CSWsyslogng += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWsyslogng += CSWglib2 +RUNTIME_DEP_PKGS_CSWsyslogng += CSWlibevtlog0 +RUNTIME_DEP_PKGS_CSWsyslogng += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsyslogng += CSWlibpcre0 +RUNTIME_DEP_PKGS_CSWsyslogng += CSWosslrt +RUNTIME_DEP_PKGS_CSWsyslogng += CSWtcpwrap + BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +BUILD_DEP_PKGS += CSWgcc4core BUILD_DEP_PKGS += CSWggettext BUILD_DEP_PKGS += CSWglib2devel BUILD_DEP_PKGS += CSWpkgconfig -BUILD_DEP_PKGS += CSWgcc4core -GARCOMPILER = GNU -TEST_SCRIPTS = +CHECKPKG_OVERRIDES_CSWsyslogng-dev += catalogname-does-not-match-pkgname|pkgname=CSWsyslogng-dev|catalogname=syslog_ng_dev|expected-catalogname=syslogng_dev +CHECKPKG_OVERRIDES_CSWsyslogng += catalogname-does-not-match-pkgname|pkgname=CSWsyslogng|catalogname=syslog_ng|expected-catalogname=syslogng -# The configure script finds -lwrap but doesn't actually use it. -# We need to be more pushy. -EXTRA_LDFLAGS = -L/opt/csw/lib -lwrap -lsocket +# A reference to /usr/share/lib/zoneinfo +CHECKPKG_OVERRIDES_CSWsyslogng += file-with-bad-content|/usr/share|root/opt/csw/lib/libsyslog-ng.so.0.0.0 +# Not splitting the syslog-ng libraries. There are no known packages linking +# to syslog's shared objects. +CHECKPKG_OVERRIDES_CSWsyslogng += shared-lib-package-contains-so-symlink +CHECKPKG_OVERRIDES_CSWsyslogng += shared-lib-pkgname-mismatch + post-install-modulated: ginstall -d $(DESTDIR)/etc/opt/csw ginstall -m 444 $(WORKDIR)/$(NAME).conf.CSW \ Property changes on: csw/mgar/pkg/syslog_ng/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2011-06-13 06:57:09 UTC (rev 14799) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2011-06-13 08:13:27 UTC (rev 14800) @@ -1,5 +1 @@ -ab950f80af5ca165ef3f5ba2df04f9be CSWsyslogng.postremove -d58b011085f44206053562078c012857 CSWsyslogng.preinstall -b7a833c17d8b1f53528b35d169354f73 cswsyslog_ng -69bad95775b98d26e52db8a8292e2790 syslog-ng.conf.CSW -28f0d9ff2243b330e8cd6311ef9b2f12 syslog-ng_3.0.5.tar.gz +5995f7dad0053a478b60a63f6f754203 syslog-ng_3.2.4.tar.gz Added: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes (rev 0) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.cswreleasenotes 2011-06-13 08:13:27 UTC (rev 14800) @@ -0,0 +1 @@ +The /usr/share reference is for finding /usr/share/lib/zoneinfo. 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 Jun 14 00:21:03 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 13 Jun 2011 22:21:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14801] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 14801 http://gar.svn.sourceforge.net/gar/?rev=14801&view=rev Author: bonivart Date: 2011-06-13 22:21:03 +0000 (Mon, 13 Jun 2011) Log Message: ----------- sendmail/trunk: using CAS Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile csw/mgar/pkg/sendmail/trunk/files/README.CSW Added Paths: ----------- csw/mgar/pkg/sendmail/trunk/files/cswusergroup Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-13 08:13:27 UTC (rev 14800) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-13 22:21:03 UTC (rev 14801) @@ -20,15 +20,16 @@ #MY_CLASSES = CSWsendmail.i.sol9 CSWsendmail.i.sol10 DISTFILES = $(NAME).$(VERSION).tar.gz -DISTFILES += README.CSW sendmail.schema CSWsendmail.postinstall DISTFILES += Sun-sendmail-deactivate.sh Sun-sendmail-reactivate.sh -DISTFILES += cswsendmail site.config.m4 $(MY_CLASSES) CSWsendmail.checkinstall -DISTFILES += CSWsendmail.preremove CSWsendmail.preinstall CSWsendmail.space DISTFILES += $(foreach FILE,$(shell cd $(FILEDIR) && ls *.CSW),$(FILE)) -DISTFILES += COPYING +DISTFILES += README.CSW sendmail.schema +DISTFILES += cswsendmail site.config.m4 +#DISTFILES += CSWsendmail.preremove CSWsendmail.preinstall CSWsendmail.space +#DISTFILES += cswsendmail site.config.m4 $(MY_CLASSES) CSWsendmail.checkinstall +#DISTFILES += README.CSW sendmail.schema CSWsendmail.postinstall +#DISTFILES += COPYING -# Enable support for files > 2GB in size. -EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE +LICENSE = LICENSE PACKAGES = CSWsendmail CATALOGNAME_CSWsendmail = sendmail @@ -41,7 +42,11 @@ RUNTIME_DEP_PKGS_CSWsendmail += CSWtcpwrap INITSMF = /etc/opt/csw/init.d/cswsendmail +USERGROUP = /etc/opt/csw/pkg/CSWsendmail/cswusergroup +# Enable support for files > 2GB in size. +EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + #PROTOTYPE_FILTER = awk \ # '$$$$2 ~/i.sol9/ { next } \ # $$$$2 ~/i.sol10/ { next } \ @@ -89,9 +94,9 @@ include gar/category.mk -ADMSCRIPTS = preremove preinstall space depend i.sol9 i.sol10 +#ADMSCRIPTS = preremove preinstall space depend i.sol9 i.sol10 -SOLVER = sol$(shell uname -r |sed 's/5\.//') +#SOLVER = sol$(shell uname -r |sed 's/5\.//') PLATFORM = $(shell if [ `uname -i` = "i86pc" ] ; then echo i86pc ; else echo sun4 ; fi ) OBJDIR = $(WORKDIR)/$(DISTNAME)/obj.SunOS.$(GAROSREL).$(PLATFORM) LIBFILES = sendmail/sendmail mail.local/mail.local smrsh/smrsh rmail/rmail @@ -105,20 +110,24 @@ rmail/rmail.8 editmap/editmap.8 configure-custom: + @echo " ==> Configuring $(NAME) (custom)" @( gsed 's,%CFLAGS%,$(CFLAGS),;s,%OCSWCC%,$(CC),' \ $(DOWNLOADDIR)/site.config.m4 > \ $(WORKSRC)/devtools/Site/site.config.m4 ) @$(MAKECOOKIE) build-custom: + @echo " ==> Building $(NAME) (custom)" cd $(WORKSRC) && ./Build @$(MAKECOOKIE) test-custom: + @echo " ==> Testing $(NAME) (custom)" @$(MAKECOOKIE) install-custom: @# install dirs + @echo " ==> Installing $(NAME) (custom)" ginstall -d $(DESTDIR)$(libdir) ginstall -d $(DESTDIR)$(bindir) ginstall -d $(DESTDIR)$(sbindir) @@ -142,15 +151,15 @@ done ) @# rename libraries and binaries os-specific - ( for file in `ls $(DESTDIR)$(libdir)`; do \ - mv $(DESTDIR)$(libdir)/$$file $(DESTDIR)$(libdir)/$(SOLVER).$$file; \ - done ) - ( for file in `ls $(DESTDIR)$(bindir)`; do \ - mv $(DESTDIR)$(bindir)/$$file $(DESTDIR)$(bindir)/$(SOLVER).$$file; \ - done ) - ( for file in `ls $(DESTDIR)$(sbindir)`; do \ - mv $(DESTDIR)$(sbindir)/$$file $(DESTDIR)$(sbindir)/$(SOLVER).$$file;\ - done ) +# ( for file in `ls $(DESTDIR)$(libdir)`; do \ +# mv $(DESTDIR)$(libdir)/$$file $(DESTDIR)$(libdir)/$(SOLVER).$$file; \ +# done ) +# ( for file in `ls $(DESTDIR)$(bindir)`; do \ +# mv $(DESTDIR)$(bindir)/$$file $(DESTDIR)$(bindir)/$(SOLVER).$$file; \ +# done ) +# ( for file in `ls $(DESTDIR)$(sbindir)`; do \ +# mv $(DESTDIR)$(sbindir)/$$file $(DESTDIR)$(sbindir)/$(SOLVER).$$file;\ +# done ) @# install manpages ( for file in $(MANFILES1) ; do \ @@ -182,6 +191,7 @@ merge-OS: @# create links in bindir + @echo " ==> Merging $(NAME) (custom)" ln -s $(libdir)/sendmail $(PKGROOT)$(bindir)/newaliases ln -s $(libdir)/sendmail $(PKGROOT)$(bindir)/mailq ln -s $(libdir)/sendmail $(PKGROOT)$(bindir)/purgestats Modified: csw/mgar/pkg/sendmail/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/README.CSW 2011-06-13 08:13:27 UTC (rev 14800) +++ csw/mgar/pkg/sendmail/trunk/files/README.CSW 2011-06-13 22:21:03 UTC (rev 14801) @@ -1,6 +1,8 @@ -2009-07-31 +2011-06-13 Initial GAR version of sendmail. +By Mike Watters, Benny von Mossner, Maciej Blizinski and Peter Bonivart. + 2007-12-09 Previous package versions replaced some of Sun's sendmail files with symlinks to the correponding CSWsendmail file. This does not work properly in a zone Added: csw/mgar/pkg/sendmail/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/sendmail/trunk/files/cswusergroup 2011-06-13 22:21:03 UTC (rev 14801) @@ -0,0 +1,2 @@ +smmsp:smmsp:CSW Sendmail Message Submission Program:/false:/bin/false:::NP +:mail:::::: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Jun 14 03:49:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 14 Jun 2011 01:49:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14802] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14802 http://gar.svn.sourceforge.net/gar/?rev=14802&view=rev Author: bdwalton Date: 2011-06-14 01:49:37 +0000 (Tue, 14 Jun 2011) Log Message: ----------- php5/trunk: MIGRATE_SOURCE_DIR is package specific, not file specific. will need to handle pear.conf alternately (or not at all?) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-06-13 22:21:03 UTC (rev 14801) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-06-14 01:49:37 UTC (rev 14802) @@ -70,8 +70,7 @@ PRESERVECONF = /etc$(prefix)/php5/php.ini /etc$(prefix)/php5/pear.conf PRESERVECONF += /opt/csw/apache2/etc/extra/httpd-php5.conf MIGRATE_FILES_CSWphp5 = "php.ini pear.conf" -MIGRATE_SOURCE_DIR_php_ini = /opt/csw/php5/lib -MIGRATE_SOURCE_DIR_pear_conf = /opt/csw/php5/etc +MIGRATE_SOURCE_DIR_CSWphp5 = /opt/csw/php5/lib MIGRATE_DEST_DIR = $(sysconfdir) define php5_subpackage This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Jun 14 03:55:35 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 14 Jun 2011 01:55:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14803] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14803 http://gar.svn.sourceforge.net/gar/?rev=14803&view=rev Author: bdwalton Date: 2011-06-14 01:55:35 +0000 (Tue, 14 Jun 2011) Log Message: ----------- php5/trunk: drop pear.conf from migration handler as it will not live at that path anyway Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-06-14 01:49:37 UTC (rev 14802) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-06-14 01:55:35 UTC (rev 14803) @@ -69,7 +69,7 @@ PRESERVECONF = /etc$(prefix)/php5/php.ini /etc$(prefix)/php5/pear.conf PRESERVECONF += /opt/csw/apache2/etc/extra/httpd-php5.conf -MIGRATE_FILES_CSWphp5 = "php.ini pear.conf" +MIGRATE_FILES_CSWphp5 = "php.ini" MIGRATE_SOURCE_DIR_CSWphp5 = /opt/csw/php5/lib MIGRATE_DEST_DIR = $(sysconfdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Jun 14 03:56:15 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 14 Jun 2011 01:56:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14804] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14804 http://gar.svn.sourceforge.net/gar/?rev=14804&view=rev Author: bdwalton Date: 2011-06-14 01:56:15 +0000 (Tue, 14 Jun 2011) Log Message: ----------- php5/trunk: drop extra / from sysconfdir setting Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-06-14 01:55:35 UTC (rev 14803) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-06-14 01:56:15 UTC (rev 14804) @@ -218,7 +218,7 @@ NOISALIST = 1 STRIP_LIBTOOL = 1 -sysconfdir = /etc/$(prefix)/php5 +sysconfdir = /etc$(prefix)/php5 CONFIGURE_ARGS += --prefix=$(prefix)/php5 CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Jun 14 03:58:16 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 14 Jun 2011 01:58:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14805] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14805 http://gar.svn.sourceforge.net/gar/?rev=14805&view=rev Author: bdwalton Date: 2011-06-14 01:58:15 +0000 (Tue, 14 Jun 2011) Log Message: ----------- php5/trunk: use sysconfdir instead of hard coded paths in preserveconf statements Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-06-14 01:56:15 UTC (rev 14804) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-06-14 01:58:15 UTC (rev 14805) @@ -67,7 +67,7 @@ # of sqlite... BUILD_DEP_PKGS += CSWsqlite -PRESERVECONF = /etc$(prefix)/php5/php.ini /etc$(prefix)/php5/pear.conf +PRESERVECONF = $(sysconfdir)/php.ini $(sysconfdir)/pear.conf PRESERVECONF += /opt/csw/apache2/etc/extra/httpd-php5.conf MIGRATE_FILES_CSWphp5 = "php.ini" MIGRATE_SOURCE_DIR_CSWphp5 = /opt/csw/php5/lib 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 Jun 14 10:32:24 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Jun 2011 08:32:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[14806] csw/mgar/pkg/lcms/ Message-ID: Revision: 14806 http://gar.svn.sourceforge.net/gar/?rev=14806&view=rev Author: dmichelsen Date: 2011-06-14 08:32:24 +0000 (Tue, 14 Jun 2011) Log Message: ----------- lcms: Remove description as contents is also in liblcms Removed Paths: ------------- csw/mgar/pkg/lcms/ 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 Jun 14 11:45:40 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Jun 2011 09:45:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14807] csw/mgar/pkg/liblcms/trunk Message-ID: Revision: 14807 http://gar.svn.sourceforge.net/gar/?rev=14807&view=rev Author: dmichelsen Date: 2011-06-14 09:45:40 +0000 (Tue, 14 Jun 2011) Log Message: ----------- liblcms: General rework, split package Modified Paths: -------------- csw/mgar/pkg/liblcms/trunk/Makefile csw/mgar/pkg/liblcms/trunk/checksums Added Paths: ----------- csw/mgar/pkg/liblcms/trunk/files/0001-Keep-norunpath-during-libtool-invocation.patch Modified: csw/mgar/pkg/liblcms/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblcms/trunk/Makefile 2011-06-14 08:32:24 UTC (rev 14806) +++ csw/mgar/pkg/liblcms/trunk/Makefile 2011-06-14 09:45:40 UTC (rev 14807) @@ -1,42 +1,71 @@ +# $Id: Makefile 11888 2010-12-12 12:43:48Z skayser $ + NAME = lcms -VERSION = 1.18a -CATEGORIES = apps -LCMS_VERSION := $(shell echo $(VERSION) | sed -e 's/[a-z]//g') -LCMS_RELEASE := $(shell echo $(VERSION) | sed -e 's/[^a-z]//g') +VERSION = 1.19 +GARSUBREV = +CATEGORIES = lib -DISTNAME = $(NAME)-$(LCMS_VERSION) DESCRIPTION = The little color management system and tools define BLURB - Little cms intends to be a small-footprint, speed optimized - color management engine in open source form. Since the initial release, - back in 1998, lcms has been continuously evolving, mostly thanks to - contributions done by skilled programmers, who generously donated - their valuable time to review the engine and the documentation. - For now, little cms has been ported to a big number of platforms and - is currently used in many open source and commercial products, - as well as being distributed in major linux environments. + LittleCMS is a CMM, a color management engine; it implements fast transforms + between ICC profiles. "Little" stands for its small overhead. With a typical + footprint of about 100K including C runtime, you can color-enable your + application without the pain of ActiveX, OCX, redistributables or binaries + of any kind. We are using little cms in several commercial projects, however, + we are offering lcms library free for anybody under an extremely liberal + open source license. endef -MASTER_SITES = http://www.littlecms.com/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(NAME)-$(VERSION)$(GARSUBREV).tar.gz -PACKAGES = CSWlcms -CATALOGNAME_CSWlcms = lcms -SPKG_DESC_CSWlcms = $(DESCRIPTION) +PATCHFILES += 0001-Keep-norunpath-during-libtool-invocation.patch -RUNTIME_DEP_PKGS_CSWlcms = CSWjpeg CSWtiff CSWzlib +VENDOR_URL = http://www.littlecms.com -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWliblcms1 +SPKG_DESC_CSWliblcms1 = Color management library, liblcms.so.1 +PKGFILES_CSWliblcms1 += $(call pkgfiles_lib,liblcms.so.1) +OBSOLETED_BY_CSWliblcms1 = CSWlcmsrt +CATALOGNAME_CSWliblcmsrt = lcms_rt_stub +PACKAGES += CSWliblcms-dev +SPKG_DESC_CSWliblcms-dev = Development files for liblcms.so.1 +PKGFILES_CSWliblcms-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWliblcms-dev += CSWliblcms1 +OBSOLETED_BY_CSWliblcms-dev = CSWlcmsdevel +CATALOGNAME_CSWlcmsdevel = lcms_devel_stub + +PACKAGES += CSWliblcms-utils +SPKG_DESC_CSWliblcms-utils = Utility programs for LCMS (Little Color Management) +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWliblcms-utils += CSWliblcms1 +RUNTIME_DEP_PKGS_CSWliblcms-utils += CSWtiff +RUNTIME_DEP_PKGS_CSWliblcms-utils += CSWjpeg +RUNTIME_DEP_PKGS_CSWliblcms-utils += CSWzlib +OBSOLETED_BY_CSWliblcms-utils = CSWlcms +CATALOGNAME_CSWlcms = lcms_stub + +PACKAGES += CSWpy-lcms +CATALOGNAME_CSWpy-lcms = py_lcms +SPKG_DESC_CSWpy-lcms += Python bindings for LCMS (Little Color Management) +PKGFILES_CSWpy-lcms = $(libdir).*/python/site-packages/.* +RUNTIME_DEP_PKGS_CSWpy-lcms += CSWliblcms1 +RUNTIME_DEP_PKGS_CSWpy-lcms += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-lcms += CSWpython + +EXTRA_LINKER_FLAGS = -norunpath + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --enable-static=no + +CONFIGURE_ARGS-32 += --with-python +CONFIGURE_ARGS-64 += --without-python +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) + BUILD64 = 1 -STRIP_LIBTOOL = 1 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check - include gar/category.mk -SPKG_VERSION := $(LCMS_VERSION) -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(LCMS_RELEASE) +CXXFLAGS += -D_RWSTD_NO_WSTR=1 + Modified: csw/mgar/pkg/liblcms/trunk/checksums =================================================================== --- csw/mgar/pkg/liblcms/trunk/checksums 2011-06-14 08:32:24 UTC (rev 14806) +++ csw/mgar/pkg/liblcms/trunk/checksums 2011-06-14 09:45:40 UTC (rev 14807) @@ -1 +1 @@ -f4abfe1c57ea3f633c2e9d034e74e3e8 download/lcms-1.18a.tar.gz +8af94611baf20d9646c7c2c285859818 lcms-1.19.tar.gz Added: csw/mgar/pkg/liblcms/trunk/files/0001-Keep-norunpath-during-libtool-invocation.patch =================================================================== --- csw/mgar/pkg/liblcms/trunk/files/0001-Keep-norunpath-during-libtool-invocation.patch (rev 0) +++ csw/mgar/pkg/liblcms/trunk/files/0001-Keep-norunpath-during-libtool-invocation.patch 2011-06-14 09:45:40 UTC (rev 14807) @@ -0,0 +1,25 @@ +From 3d795082b4f78d262572c3a00a0bc5fe3fb25e5c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 14 Jun 2011 11:19:58 +0200 +Subject: [PATCH] Keep -norunpath during libtool invocation + +--- + ltmain.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ltmain.sh b/ltmain.sh +index 5b6dd95..25ad8ef 100755 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -1663,7 +1663,7 @@ EOF + # -pg, --coverage pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-pg|--coverage|@*) ++ -t[45]*|-txscale*|-pg|--coverage|@*|-norunpath) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. +-- +1.7.5.4 + 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 Jun 14 13:28:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Jun 2011 11:28:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14808] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 14808 http://gar.svn.sourceforge.net/gar/?rev=14808&view=rev Author: dmichelsen Date: 2011-06-14 11:28:00 +0000 (Tue, 14 Jun 2011) Log Message: ----------- mGAR v2: Variable expansion now works when values contain spaces Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2011-06-14 09:45:40 UTC (rev 14807) +++ csw/mgar/gar/v2/gar.mk 2011-06-14 11:28:00 UTC (rev 14808) @@ -445,7 +445,7 @@ # The rule takes all files from EXPANDVARS and replaces all occurrences of @@ in the file # with the values of from the Makefile. -_var_definitions = $(foreach VAR,$(shell perl -ne 'print "$$1 " if( /@([^@]+)@/ )' <$1),$(VAR)=$($(VAR))) +_var_definitions = $(foreach VAR,$(shell perl -ne 'print "$$1 " if( /@([^@]+)@/ )' <$1),$(VAR)="$($(VAR))") expandvars-%: $(call _var_definitions,$(WORKDIR)/$*) perl -i-unexpanded -npe 's/@([^@]+)@/$$ENV{$$1}/eg' $(WORKDIR)/$* 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 Jun 14 13:39:40 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Jun 2011 11:39:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14809] csw/mgar/pkg/scintilla/trunk/Makefile Message-ID: Revision: 14809 http://gar.svn.sourceforge.net/gar/?rev=14809&view=rev Author: dmichelsen Date: 2011-06-14 11:39:40 +0000 (Tue, 14 Jun 2011) Log Message: ----------- scintilla: Split packages, add compilation flags Modified Paths: -------------- csw/mgar/pkg/scintilla/trunk/Makefile Modified: csw/mgar/pkg/scintilla/trunk/Makefile =================================================================== --- csw/mgar/pkg/scintilla/trunk/Makefile 2011-06-14 11:28:00 UTC (rev 14808) +++ csw/mgar/pkg/scintilla/trunk/Makefile 2011-06-14 11:39:40 UTC (rev 14809) @@ -16,11 +16,24 @@ LICENSE = License.txt +PACKAGES += CSWlibscintilla2 +SPKG_DESC_CSWlibscintilla2 = Library source code editing component, libscintilla.so.2 +PKGFILES_CSWlibscintilla2 = $(call pkgfiles_lib,libscintilla.so.2) + +PACKAGES += CSWlibscintilla-dev +SPKG_DESC_CSWlibscintilla-dev = Development files for libscintilla.so.2 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibscintilla-dev += CSWlibscintilla2 +RUNTIME_DEP_PKGS_CSWlibscintilla-dev += CSWpython + WORKSRC = $(WORKDIR)/$(DISTNAME)/gtk BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +# pic13 is too small +EXTRA_CXXFLAGS = -xcode=pic32 + # Ugh, manual makefile. CONFIGURE_SCRIPTS = @@ -36,11 +49,12 @@ include gar/category.mk +install-custom: _LINK64=$(if $(filter 64,$(MEMORYMODEL)),-64,) install-custom: mkdir -p $(DESTDIR)$(includedir) cp $(WORKDIR)/$(DISTNAME)/include/* $(DESTDIR)$(includedir) mkdir -p $(DESTDIR)$(libdir) - cd $(WORKDIR)/$(DISTNAME)/bin && ld -G -z allextract -h scintilla.so.2 scintilla.a -o $(DESTDIR)$(libdir)/libscintilla.so.2.26 + cd $(WORKDIR)/$(DISTNAME)/bin && ld $(_LINK64) -G -z allextract -h libscintilla.so.2 scintilla.a -o $(DESTDIR)$(libdir)/libscintilla.so.2.26 ln -s libscintilla.so.2.26 $(DESTDIR)$(libdir)/libscintilla.so.2 ln -s libscintilla.so.2.26 $(DESTDIR)$(libdir)/libscintilla.so @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jun 14 14:15:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Jun 2011 12:15:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14810] csw/mgar/pkg/scintilla/trunk/Makefile Message-ID: Revision: 14810 http://gar.svn.sourceforge.net/gar/?rev=14810&view=rev Author: dmichelsen Date: 2011-06-14 12:15:49 +0000 (Tue, 14 Jun 2011) Log Message: ----------- scintilla: Fix linkage Modified Paths: -------------- csw/mgar/pkg/scintilla/trunk/Makefile Modified: csw/mgar/pkg/scintilla/trunk/Makefile =================================================================== --- csw/mgar/pkg/scintilla/trunk/Makefile 2011-06-14 11:39:40 UTC (rev 14809) +++ csw/mgar/pkg/scintilla/trunk/Makefile 2011-06-14 12:15:49 UTC (rev 14810) @@ -19,6 +19,14 @@ PACKAGES += CSWlibscintilla2 SPKG_DESC_CSWlibscintilla2 = Library source code editing component, libscintilla.so.2 PKGFILES_CSWlibscintilla2 = $(call pkgfiles_lib,libscintilla.so.2) +RUNTIME_DEP_PKGS_CSWlibscintilla2 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibscintilla2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibscintilla2 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibscintilla2 += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibscintilla2 += CSWlibatk +RUNTIME_DEP_PKGS_CSWlibscintilla2 += CSWpango +RUNTIME_DEP_PKGS_CSWlibscintilla2 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibscintilla2 += CSWglib2 PACKAGES += CSWlibscintilla-dev SPKG_DESC_CSWlibscintilla-dev = Development files for libscintilla.so.2 @@ -34,6 +42,8 @@ # pic13 is too small EXTRA_CXXFLAGS = -xcode=pic32 +EXTRA_LINKER_FLAGS = -norunpath + # Ugh, manual makefile. CONFIGURE_SCRIPTS = @@ -49,12 +59,12 @@ include gar/category.mk -install-custom: _LINK64=$(if $(filter 64,$(MEMORYMODEL)),-64,) +install-custom: LINKFLAGS_GTK=$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(bindir_install)/pkg-config --libs gtk+-2.0) install-custom: mkdir -p $(DESTDIR)$(includedir) cp $(WORKDIR)/$(DISTNAME)/include/* $(DESTDIR)$(includedir) mkdir -p $(DESTDIR)$(libdir) - cd $(WORKDIR)/$(DISTNAME)/bin && ld $(_LINK64) -G -z allextract -h libscintilla.so.2 scintilla.a -o $(DESTDIR)$(libdir)/libscintilla.so.2.26 + cd $(WORKDIR)/$(DISTNAME)/bin && $(CXX) $(LDFLAGS) -R $(libdir) -lCstd $(LINKFLAGS_GTK) -G -z allextract -h libscintilla.so.2 scintilla.a -o $(DESTDIR)$(libdir)/libscintilla.so.2.26 ln -s libscintilla.so.2.26 $(DESTDIR)$(libdir)/libscintilla.so.2 ln -s libscintilla.so.2.26 $(DESTDIR)$(libdir)/libscintilla.so @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jun 14 14:37:13 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Jun 2011 12:37:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14811] csw/mgar/pkg/netpbm/trunk Message-ID: Revision: 14811 http://gar.svn.sourceforge.net/gar/?rev=14811&view=rev Author: dmichelsen Date: 2011-06-14 12:37:13 +0000 (Tue, 14 Jun 2011) Log Message: ----------- netpbm: Update to 10.35.80, complete rework Modified Paths: -------------- csw/mgar/pkg/netpbm/trunk/Makefile csw/mgar/pkg/netpbm/trunk/checksums Added Paths: ----------- csw/mgar/pkg/netpbm/trunk/files/0001-Reorder-includes-so-that-local-includes-come-before-.patch csw/mgar/pkg/netpbm/trunk/files/0002-Remove-unused-external-references-causing-link-error.patch csw/mgar/pkg/netpbm/trunk/files/0003-Remove-extra-conversion-in-function-call-causing-err.patch csw/mgar/pkg/netpbm/trunk/files/0004-Move-opt-csw-include-to-the-end.patch csw/mgar/pkg/netpbm/trunk/files/Makefile.config Removed Paths: ------------- csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.gspec csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.postinstall csw/mgar/pkg/netpbm/trunk/files/cflags-fix.diff csw/mgar/pkg/netpbm/trunk/files/config_template csw/mgar/pkg/netpbm/trunk/files/csw-perl.diff csw/mgar/pkg/netpbm/trunk/files/depend csw/mgar/pkg/netpbm/trunk/files/gar-base.diff csw/mgar/pkg/netpbm/trunk/files/make-netpbm-config.sh csw/mgar/pkg/netpbm/trunk/files/manweb.diff csw/mgar/pkg/netpbm/trunk/files/netpbm-config.diff csw/mgar/pkg/netpbm/trunk/files/netpbm-doc.diff csw/mgar/pkg/netpbm/trunk/files/netpbm-fix.diff csw/mgar/pkg/netpbm/trunk/files/netpbm-makefile.diff csw/mgar/pkg/netpbm/trunk/files/netpbm-pm_config.h.diff Property Changed: ---------------- csw/mgar/pkg/netpbm/trunk/ Property changes on: csw/mgar/pkg/netpbm/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/netpbm/trunk/Makefile =================================================================== --- csw/mgar/pkg/netpbm/trunk/Makefile 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/Makefile 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,5 +1,5 @@ NAME = netpbm -VERSION = 10.26.43 +VERSION = 10.35.80 CATEGORIES = utils DESCRIPTION = Netpbm is a toolkit for manipulation of graphic images @@ -9,61 +9,69 @@ endef MASTER_SITES += $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tgz netpbm-doc.tgz -DISTFILES += CSWnetpbm.gspec CSWnetpbm.postinstall +DISTFILES += $(DISTNAME).tgz +DISTFILES += Makefile.config -PATCHFILES = netpbm-config.diff netpbm-makefile.diff csw-perl.diff makeman.diff manweb.diff cflags-fix.diff netpbm-pm_config.h.diff +EXPANDVARS += Makefile.config -INSTDIR = $(DESTDIR)/opt/csw +PATCHFILES += 0001-Reorder-includes-so-that-local-includes-come-before-.patch +PATCHFILES += 0002-Remove-unused-external-references-causing-link-error.patch +PATCHFILES += 0003-Remove-extra-conversion-in-function-call-causing-err.patch +PATCHFILES += 0004-Move-opt-csw-include-to-the-end.patch -CONFIGURE_SCRIPTS = -INSTALL_ARGS = package pkgdir=$(INSTDIR) -ENABLE_TEST = 0 +VENDOR_URL = http://netpbm.sourceforge.net/ -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +LICENSE = doc/GPL_LICENSE.txt -NETPBMDOCDIR = $(WORKDIR)/doc +PACKAGES += CSWnetpbm +SPKG_DESC_CSWnetpbm = A toolkit for manipulation of graphic images +RUNTIME_DEP_PKGS_CSWnetpbm += CSWjpeg +RUNTIME_DEP_PKGS_CSWnetpbm += CSWtiff +RUNTIME_DEP_PKGS_CSWnetpbm += CSWpng +RUNTIME_DEP_PKGS_CSWnetpbm += CSWiconv +RUNTIME_DEP_PKGS_CSWnetpbm += CSWzlib +RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibnetpbm10 -pre-install: - rm -rf $(INSTDIR) +PACKAGES += CSWlibnetpbm10 +SPKG_DESC_CSWlibnetpbm10 = Library for manipulation of graphic images, libnetpbm.so.10 +PKGFILES_CSWlibnetpbm10 = $(call pkgfiles_lib,libnetpbm.so.10) -post-install: netpbm-config fix-install install-doc -#.PHONY: post-install +PACKAGES += CSWlibnetpbm-dev +SPKG_DESC_CSWlibnetpbm-dev = Development files for libnetpbm.so.10 +PKGFILES_CSWlibnetpbm-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibnetpbm-dev += CSWlibnetpbm10 -netpbm-config: - cd files && ./make-netpbm-config.sh $(INSTDIR) +CONFIGURE_SCRIPTS = custom -fix-install: - -mkdir -p $(INSTDIR)/share/netpbm - -mv $(INSTDIR)/misc/* $(INSTDIR)/share/netpbm - -rmdir $(INSTDIR)/misc - -rm $(INSTDIR)/pkginfo - -rm $(INSTDIR)/VERSION - -rm $(INSTDIR)/README - -mv $(INSTDIR)/man $(INSTDIR)/share - -rm -rf $(INSTDIR)/link - -cd $(INSTDIR)/lib; ln -s libnetpbm.so.10 libnetpbm.so +EXTRA_CFLAGS += -D__inline= -install-doc: - -mkdir -p $(INSTDIR)/etc - @echo "#Configuration file for Manweb" > $(INSTDIR)/etc/manweb.conf.CSW - @echo "webdir=/opt/csw/share/man/web" >> $(INSTDIR)/etc/manweb.conf.CSW - @echo "#browser=lynx\n" >> $(INSTDIR)/etc/manweb.conf.CSW - -mkdir -p $(INSTDIR)/share/doc/netpbm - cp -r $(NETPBMDOCDIR)/* $(INSTDIR)/share/doc/netpbm -# cd $(NETPBMDOCDIR) && make WORKSRC=$(WORKSRC) DESTDIR=$(INSTDIR) -f /export/home/damjan/csw/utils/netpbm/$(WORKSRC)/buildtools/Makefile.manpage manpages -# cd $(NETPBMDOCDIR) && make WORKSRC=$(WORKSRC) DESTDIR=$(INSTDIR) -f /export/home/damjan/csw/utils/netpbm/$(WORKSRC)/buildtools/Makefile.manpage installman - cd $(INSTDIR)/share/doc/netpbm && /export/home/damjan/csw/utils/netpbm/$(WORKSRC)/buildtools/makecat *.html - cd $(INSTDIR)/share/doc/netpbm && perl -pi.bak -e 's/\/export\/home\/damjan\/tmp\/build.5.8-i386//' *.1 - cd $(INSTDIR)/share/doc/netpbm && rm *.bak - cd $(INSTDIR)/share/doc/netpbm && (mv libnetpbm.1 libnetpbm.3 && mv pam.1 pam.5 && mv pbm.1 pbm.5 && mv pfm.1 pfm.5 && mv pgm.1 pgm.5 && mv pnm.1 pnm.5 && mv ppm.1 ppm.5) - mkdir -p $(INSTDIR)/share/man/cat1 $(INSTDIR)/share/man/cat3 $(INSTDIR)/share/man/cat5 - cd $(INSTDIR)/share/doc/netpbm && (mv *.1 $(INSTDIR)/share/man/cat1 && mv *.3 $(INSTDIR)/share/man/cat3 && mv *.5 $(INSTDIR)/share/man/cat5) - rm -rf $(INSTDIR)/share/man/man? +INSTALL_OVERRIDE_VARS += PKGMANDIR +INSTALL_ARGS = package pkgdir=$(DESTDIR)$(prefix) +INSTALL_OVERRIDE_VAR_PKGMANDIR = share/man +# Package has no testsuite +TEST_SCRIPTS = +EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/README +EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/pkginfo +EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/VERSION +EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/config_template +EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/man/.* +EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/link/.* + +EXTRA_PAX_ARGS = -s ",$(prefix)/misc,$(sharedstatedir)/netpbm," + include gar/category.mk + +configure-custom: + cp $(WORKDIR)/Makefile.config $(WORKSRC) + perl -pi \ + -e 's,(#define\s+RGB_DB1\s+).*,$$1"/opt/csw/share/netpbm/rgb.txt",;' \ + -e 's,(#define\s+RGB_DB2\s+).*,$$1"/usr/openwin/lib/X11/rgb.txt",;' \ + -e 's,(#define\s+RGB_DB3\s+).*,$$1"/usr/openwin/lib/rgb.txt",;' \ + $(WORKSRC)/pm_config.in.h + @$(MAKECOOKIE) + +pre-install-modulated: + mkdir -p $(DESTDIR)/opt Modified: csw/mgar/pkg/netpbm/trunk/checksums =================================================================== --- csw/mgar/pkg/netpbm/trunk/checksums 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/checksums 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,11 +1 @@ -3897ec14dbf586bb1d810a7ff9993968 download/netpbm-10.26.43.tgz -814afbc81ec0f7499d975c3a75c08619 download/netpbm-doc.tgz -17c27e7115c2a68ef793f6583757d213 download/CSWnetpbm.gspec -7f03cc710fa49ccef7a2e40d61514ded download/CSWnetpbm.postinstall -5285bcded129e88eaf30470016664996 download/netpbm-config.diff -0b0ee5d2f4a13e601bbfbe69e9cfa0d7 download/netpbm-makefile.diff -4c4d82da0397562e1a35dee4e62d6a86 download/csw-perl.diff -78cddb21b97c40126428661d2975f49a download/makeman.diff -72c259516a85d817dee99335ba7df169 download/manweb.diff -cf0f2f24662a948a7ebf2439eccb7fab download/cflags-fix.diff -0778496d108623817392daca6e240052 download/netpbm-pm_config.h.diff +2edf98b802a82e5367fc52382e9ac144 netpbm-10.35.80.tgz Added: csw/mgar/pkg/netpbm/trunk/files/0001-Reorder-includes-so-that-local-includes-come-before-.patch =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/0001-Reorder-includes-so-that-local-includes-come-before-.patch (rev 0) +++ csw/mgar/pkg/netpbm/trunk/files/0001-Reorder-includes-so-that-local-includes-come-before-.patch 2011-06-14 12:37:13 UTC (rev 14811) @@ -0,0 +1,25 @@ +From aecad6315ae396625724f7253308b25b4be888c6 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 24 May 2011 12:27:37 +0200 +Subject: [PATCH 1/3] Reorder includes so that local includes come before /opt/csw/include + +--- + Makefile.common | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.common b/Makefile.common +index 2946589..33bfb8a 100644 +--- a/Makefile.common ++++ b/Makefile.common +@@ -68,7 +68,7 @@ + + include $(SRCDIR)/Makefile.version + +-INCLUDES2 := $(INCLUDES) -I$(SRCDIR)/$(SUBDIR) -I. -I importinc ++INCLUDES2 := -I$(SRCDIR)/$(SUBDIR) -I. $(INCLUDES) -I importinc + + ifeq ($(NETPBMLIBTYPE),unixstatic) + NETPBMLIBFNAME = libnetpbm.$(STATICLIBSUFFIX) +-- +1.7.3.2 + Added: csw/mgar/pkg/netpbm/trunk/files/0002-Remove-unused-external-references-causing-link-error.patch =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/0002-Remove-unused-external-references-causing-link-error.patch (rev 0) +++ csw/mgar/pkg/netpbm/trunk/files/0002-Remove-unused-external-references-causing-link-error.patch 2011-06-14 12:37:13 UTC (rev 14811) @@ -0,0 +1,39 @@ +From 80e9de931b2dd00d1513c9d76cac3f93de7d16ff Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 24 May 2011 12:28:06 +0200 +Subject: [PATCH 2/3] Remove unused external references causing link errors + +--- + other/pamx/image.h | 16 ---------------- + 1 files changed, 0 insertions(+), 16 deletions(-) + +diff --git a/other/pamx/image.h b/other/pamx/image.h +index ea597b2..64f8911 100644 +--- a/other/pamx/image.h ++++ b/other/pamx/image.h +@@ -65,22 +65,6 @@ freeImage(Image * const imageP); + unsigned int + depthToColors(unsigned int const depth); + +-extern unsigned short RedIntensity[]; +-extern unsigned short GreenIntensity[]; +-extern unsigned short BlueIntensity[]; +- +-static __inline__ unsigned int +-colorIntensity(unsigned int const red, +- unsigned int const grn, +- unsigned int const blu) { +-/*---------------------------------------------------------------------------- +- Return the (approximate) intensity of a color. +------------------------------------------------------------------------------*/ +- return (RedIntensity[red / 256] + +- GreenIntensity[grn / 256] + +- BlueIntensity[blu / 256]); +-} +- + Image * + pbmLoad(const char * const fullname, + const char * const name, +-- +1.7.3.2 + Added: csw/mgar/pkg/netpbm/trunk/files/0003-Remove-extra-conversion-in-function-call-causing-err.patch =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/0003-Remove-extra-conversion-in-function-call-causing-err.patch (rev 0) +++ csw/mgar/pkg/netpbm/trunk/files/0003-Remove-extra-conversion-in-function-call-causing-err.patch 2011-06-14 12:37:13 UTC (rev 14811) @@ -0,0 +1,49 @@ +From 81091b26250f51d48024f1d7d6627fb1906c41f9 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 24 May 2011 12:29:49 +0200 +Subject: [PATCH 3/3] Remove extra conversion in function call causing errors + +--- + converter/ppm/ppmtompeg/parallel.c | 4 ++-- + converter/ppm/ppmtompeg/psocket.c | 3 +++ + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/converter/ppm/ppmtompeg/parallel.c b/converter/ppm/ppmtompeg/parallel.c +index 021e6d2..66ab2bf 100644 +--- a/converter/ppm/ppmtompeg/parallel.c ++++ b/converter/ppm/ppmtompeg/parallel.c +@@ -145,7 +145,7 @@ int ClientPid[MAX_MACHINES+4]; + *=====================*/ + + +-static void PM_GNU_PRINTF_ATTR(1,2) ++static void + machineDebug(const char format[], ...) { + + va_list args; +@@ -164,7 +164,7 @@ machineDebug(const char format[], ...) { + + + +-static void PM_GNU_PRINTF_ATTR(1,2) ++static void + errorExit(const char format[], ...) { + + const char * const hostname = GetHostName(); +diff --git a/converter/ppm/ppmtompeg/psocket.c b/converter/ppm/ppmtompeg/psocket.c +index 707f1d8..fd4c6d6 100644 +--- a/converter/ppm/ppmtompeg/psocket.c ++++ b/converter/ppm/ppmtompeg/psocket.c +@@ -9,6 +9,9 @@ + + ============================================================================*/ + ++#define PM_GNU_PRINTF_ATTR(a,b) ++ ++ + #define _XOPEN_SOURCE 500 /* Make sure stdio.h contains pclose() */ + /* _ALL_SOURCE is needed on AIX to make the C library include the + socket services (e.g. define struct sockaddr) +-- +1.7.3.2 + Added: csw/mgar/pkg/netpbm/trunk/files/0004-Move-opt-csw-include-to-the-end.patch =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/0004-Move-opt-csw-include-to-the-end.patch (rev 0) +++ csw/mgar/pkg/netpbm/trunk/files/0004-Move-opt-csw-include-to-the-end.patch 2011-06-14 12:37:13 UTC (rev 14811) @@ -0,0 +1,39 @@ +From 094b2208dec73eac12014b3dcf8a03f07e94ab7e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 24 May 2011 15:48:02 +0200 +Subject: [PATCH] Move /opt/csw/include to the end + +--- + Makefile.common | 2 +- + converter/ppm/ppmtompeg/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.common b/Makefile.common +index 2ff30fd..43e7687 100644 +--- a/Makefile.common ++++ b/Makefile.common +@@ -68,7 +68,7 @@ + + include $(SRCDIR)/Makefile.version + +-INCLUDES2 := -I$(SRCDIR)/$(SUBDIR) -I. $(INCLUDES) -I importinc ++INCLUDES2 := -I$(SRCDIR)/$(SUBDIR) -I. $(INCLUDES) -I importinc $(INCLUDES1) + + ifeq ($(NETPBMLIBTYPE),unixstatic) + NETPBMLIBFNAME = libnetpbm.$(STATICLIBSUFFIX) +diff --git a/converter/ppm/ppmtompeg/Makefile b/converter/ppm/ppmtompeg/Makefile +index 4e0ad8d..0a11e8a 100644 +--- a/converter/ppm/ppmtompeg/Makefile ++++ b/converter/ppm/ppmtompeg/Makefile +@@ -22,7 +22,7 @@ INCLUDES = -I$(SRCDIR)/$(SUBDIR)/headers + + ifneq ($(JPEGHDR_DIR),NONE) + ifneq ($(JPEGHDR_DIR)x,x) +- INCLUDES += -I$(JPEGHDR_DIR) ++ INCLUDES1 += -I$(JPEGHDR_DIR) + endif + endif + +-- +1.7.3.2 + Deleted: csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.gspec =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.gspec 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.gspec 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,6 +0,0 @@ -%var bitname netpbm -%var pkgname CSWnetpbm -%copyright url file://%{WORKSRC}/doc/GPL_LICENSE.txt -%depend url file://%{GARDIR}/utils/netpbm/files/depend -%include url file://%{GARDIR}/pkglib/csw_standard.gspec - Deleted: csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.postinstall =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.postinstall 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.postinstall 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,15 +0,0 @@ -#!/bin/sh - -if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR=/ ; fi - -ETCDIR=$PKG_ROOT_DIR/opt/csw/etc - -# check if the manweb.conf file exists before overwriting it. -if [ ! -f $ETCDIR/manweb.conf ] ; then - cp -p $ETCDIR/manweb.conf.CSW $ETCDIR/manweb.conf - echo "manweb.conf doesn't exists. Copying manweb.conf.CSW to manweb.conf" -else - echo "manweb.conf already exists. Not copying manweb.conf.CSW" -fi - -exit 0 Added: csw/mgar/pkg/netpbm/trunk/files/Makefile.config =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/Makefile.config (rev 0) +++ csw/mgar/pkg/netpbm/trunk/files/Makefile.config 2011-06-14 12:37:13 UTC (rev 14811) @@ -0,0 +1,659 @@ +####This file was automatically created by 'configure.' +####Many variables are set twice -- a generic setting, then +####a system-specific override at the bottom of the file. +#### +# This is a make file inclusion, to be included in all the Netpbm make +# files. + +# This file is meant to contain variable settings that customize the +# build for a particular target system configuration. + +# The distribution contains the file Makefile.config.in. You edit +# Makefile.config.in in ways relevant to your particular environment +# to create Makefile.config. The "configure" program will do this +# for you in simple cases. + +# Some of the variables that the including make file must set for this +# file to work: +# +# SRCDIR: The directory at the top of the Netpbm source tree. Note that +# this is typically a relative directory, and it must be relative to the +# make file that includes this file. + +DEFAULT_TARGET = nonmerge +#DEFAULT_TARGET = merge + +# Fiasco has some special requirements that make it fail to compile on +# some systems, and since it isn't very important, just set this to "N" +# and skip it on those systems unless you want to debug it and fix it. +# OpenBSD: +#BUILD_FIASCO = N +BUILD_FIASCO = Y + +# The following are commands for the build process to use. These values +# do not get built into anything. + +# The C compiler (including macro preprocessor) +#CC = gcc +# Note that 'cc' is usually an alias for whatever is the main compiler +# on a system, e.g. the GNU Compiler on Linux. +CC = cc + +# The linker. +LD = $(CC) +#LD = ld +#Tru64: +#LD = cc +#LD = gcc + +#If the linker identified above is a compiler that invokes a linker +#(as in 'cc foo.o -o foo'), set LINKERISCOMPILER. The main difference is +#that we expect a compiler to take linker options in the '-Wl,-opt1,val1' +#syntax whereas the actual linker would take '-opt1 val1'. +LINKERISCOMPILER=Y +#If $(LD) is 'ld': +#LINKERISCOMPILER=N + +#LINKER_CAN_DO_EXPLICIT_LIBRARY means the linker specified above can +#take a library as just another link object argument, as in 'ld +#pnmtojpeg.o /usr/local/lib/libjpeg.so ...' as opposed to requiring a +#-l option as in 'ld pnmtojpeg.o -L/usr/local/lib -l jpeg'. +#This variable controls how 'libopt' gets built. Note that with some +#linkers, you can specify a shared library explicitly, but then it has +#to live in that exact place at run time. That's not good enough for us. + +LINKER_CAN_DO_EXPLICIT_LIBRARY=N +#GNU: +#LINKER_CAN_DO_EXPLICIT_LIBRARY=Y + +# This is the name of the header file that declares the types +# uint32_t, etc. This name is used as #include $(INTTYPES_H) . +# Set to null if the types come automatically without including anything. + +# We have a report (2005.09.17) that on IRIX 5.3 with the native IDO +# cc, inttypes.h and sys/types.h conflict (and Netpbm programs include +# sys/types for other things), so for that environment, +# won't work, but "inttypes_netpbm.h" might. + +INTTYPES_H = +# Linux libc5: +#INTTYPES_H = +# Solaris: +# Solaris has , but it doesn't define int_fast2_t, etc. +#INTTYPES_H = "inttypes_netpbm.h" +# Others: +#INTTYPES_H = +#INTTYPES_H = +# The automatically generated Netpbm version: +#INTTYPES_H = "inttypes_netpbm.h" + +# HAVE_INT64 tells whether, assuming you include the header indicated by +# INTTYPES_H, you have the int64_t type and related stuff. (If you don't +# the build will omit certain code that does 64 bit computations). +HAVE_INT64 = Y +#HAVE_INT64 = N + +# CC and LD are for building the Netpbm programs, which are not necessarily +# intended to run on the same system on which Make is running. But when we +# build a build tool such as Libopt, it is meant to run only on the same +# system on which the Make is running. The variables below define programs +# to use to compile and link build tools. +CC_FOR_BUILD = $(CC) +LD_FOR_BUILD = $(LD) +CFLAGS_FOR_BUILD = $(CFLAGS) + +# MAKE is set automatically by Make to what was used to invoke Make. + +INSTALL = $(SRCDIR)/buildtools/install.sh +#Solaris: +#INSTALL = /usr/ucb/install +#Tru64: +#INSTALL = installbsd +#OSF1: +#INSTALL = $(SRCDIR)/buildtools/installosf +#Red Hat Linux: +#INSTALL = install + +# STRIPFLAG is the option you pass to the above install program to make it +# strip unnecessary information out of binaries. +STRIPFLAG = -s +# If you don't want to strip the binaries, just leave it null: +#STRIPFLAG = + +SYMLINK = ln -s +# At least some Windows environments don't have any concept of symbolic +# links, but direct copies are usually a passable alternative. +#SYMLINK = cp + +#MANPAGE_FORMAT is "nroff" or "cat". It determines in what format the +#pointer man pages are installed (ready to nroff, or ready to cat). +#A pointer man pages is just a single-paragraph pages that tells you there is +#no man page for the program, to look at the HTML documentation instead. +MANPAGE_FORMAT = nroff +#MANPAGE_FORMAT = cat + +AR = ar +RANLIB = ranlib +# IRIX, SCO don't have Ranlib: +#RANLIB = true + +# LEX is the beginning of a shell command that runs a Lex-like +# pattern matcher generator. Null string means there isn't any such +# command. That means the build will skip parts that need one. + +LEX = flex +# Solaris: +# LEX = flex -e +# Windows Mingw: +# LEX = +# +# LEX = lex + +# C compiler options + +# gcc: +# -ansi and -Werror should work too, but are not included +# by default because there's no point in daring the build to fail. +# -pedantic isn't a problem because it causes at worst a warning. +#CFLAGS = -O3 -ffast-math -pedantic -fno-common \ +# -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit \ +# -Wwrite-string -Wmissing-prototypes -Wundef +# The merged programs have a main_XXX subroutine instead of main(), +# which would cause a warning with -Wmissing-declarations or +# -Wmissing-prototypes. +#CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes +# A user of DEC Tru64 4.0F in May 2000 needed -DLONG_32 for ppmtompeg, +# but word size-sensitive code was removed from parallel.c in September 2004. +# A user of Tru64 5.1A in July 2003 needed NOT to have -DLONG_32. In +# theory, you need this if on your system, long is 32 bits and int is not. +# But it may be completely irrelevant today. +#Tru64: +#CFLAGS = -O2 -std1 -DLONG_32 +#CFLAGS = -O2 -std1 +#AIX: +#CFLAGS= -O3 +#HP-UX: +#CFLAGS= -O3 -fPIC +#IRIX: +#CFLAGS= -n32 -O3 +#Amiga with GNU compiler: +#CFLAGS= -m68020-60 -ffast-math -mstackextend +# You can add -noixemul for Amiga and successfully compile most of the +# programs. (Of the remaining ones, if you can supply your own strtod() +# function, most of them will build with -noixemul). So try building +# with 'make --keep-going CADD=-noixemul' first, then just 'make' to build +# everything that failed for lack of the ixemul library in the first step. +# That way, the parts that don't required the ixemul library won't indicate +# a dependency on it. +#OpenBSD: +#CFLAGS = -I/usr/local/include + +# EXE is a suffix that the linker puts on any executable it generates. +# In cygwin, this is .exe and most programs deal with its existence without +# us having to know about it. Some don't though, so set this: + +EXE = +#Cygwin, DJGPP/Windows: +#EXE = .exe + +# linker options. + +# LDFLAGS is often set as an environment variable; A setting here overrides +# it. So either make sure you want to override it, or do a "LDFLAGS +=" here. + +# LDFLAGS is usually not the right place for a -L option, because we put +# LDFLAGS _before_ our own -L options, so it would cancel out our +# specific selection of libraries. For example, if you say +# LDFLAGS=/usr/local/lib and an old copy of the libnetpbm is in +# /usr/local/lib, then you'd be linking against that old copy instead of +# the copy you just built, which is located by a -L option later on the +# link command. LIBS is the right variable for adding -L options. LIBS +# goes after any of our make files' own -L options. + +# Eunice users may want to use -noshare so that the executables can +# run standalone: +#LDFLAGS += -noshare +#Tru64: +# Russ Allberry says on 2001.06.09 that -oldstyle_liblookup may be necessary +# to keep from finding an ancient system libjpeg.so that isn't compatible with +# NetPBM. Michael Long found that /usr/local/lib is not in the default +# search path, or not soon enough, and he was getting an old libjpeg that +# caused all the jpeg symbol references to be unresolved. He had installed +# a new libjpeg in /usr/local/lib. +#LDFLAGS += -call_shared -oldstyle_liblookup -L/usr/local/lib +#AIX: +#LDFLAGS += -L /usr/pubsw/lib +#HP-UX: +#LDFLAGS += -Wl,+b,/usr/pubsw/lib +#IRIX: +#LDFLAGS += -n32 + +# Linker options for created Netpbm shared libraries. + +# Here, $(SONAME) resolves to the soname for the shared library being created. +# The following are gcc options. This works on GNU libc systems. +LDSHLIB = -shared -Wl,-soname,$(SONAME) +# You need -nostart instead of -shared on BeOS. Though the BeOS compiler is +# ostensibly gcc, it has the -nostart option, which is not mentioned in gcc +# documentation and doesn't exist in at least one non-BeOS installation. +# BeOS doesn't have sonames built in. +#LDSHLIB = -nostart +#LDSHLIB = -G +# Solaris, SunOS with GNU Ld, SCO: +# These systems have no soname option. +#LDSHLIB = -shared +# Solaris with Sun Ld: +#LDSHLIB = -Wl,-Bdynamic,-G,-h,$(SONAME) +#Tru64: +#LDSHLIB = -shared -expect_unresolved "*" +#IRIX: +#LDSHLIB = -shared -n32 +#AIX GNU compiler/linker: +#LDSHLIB = -shared +#AIX Visual Age C: +#LDSHLIB = -qmkshrobj + +# LDRELOC is the command to combine two .o files (relocateable object files) +# into a single .o file that can later be linked into something else. NONE +# means no such command is available. + +LDRELOC = NONE +# GNU Ld: +# Older GNU Ld misspells the option as --relocateable. Newer GNU Ld +# correctly spells it --relocatable. The abbreviation --reloc works on +# both. +#LDRELOC = ld --reloc +#LDRELOC = ld -r + + +# On older systems, you have to make shared libraries out of position +# independent code, so you need -fpic or fPIC here. (The rule is: if +# -fpic works, use it. If it bombs, go to fPIC). On newer systems, +# it isn't necessary, but can save real memory at the expense of +# execution speed. Without position independent code, the library +# loader may have to patch addresses into the executable text. On an +# older system, this would cause a program crash because the loader +# would be writing into read-only shared memory. But on newer +# systems, the system silently creates a private mapping of the page +# or segment being modified (the "copy on write" phenomenon). So it +# needs its own private real page frame. In one experiment, A second +# copy of Pbmtext used 16K less real memory when built with -fpic than +# when built without. 2001.06.02. + +# We have seen -fPIC required on IA64 and AMD64 machines (GNU +# compiler/linker). Build-time linking fails without it. I don't +# know why -- history seems to be repeating itself. 2005.02.23. + +CFLAGS_SHLIB = +# Gcc: +#CFLAGS_SHLIB = -fpic +#CFLAGS_SHLIB = -fPIC +# Sun compiler: +#CFLAGS_SHLIB = -Kpic +#CFLAGS_SHLIB = -KPIC + +# SHLIB_CLIB is the link option to include the C library in a shared library, +# normally "-lc". On typical systems, this serves no purpose. On some, +# though, it causes information about which C library to use to be recorded +# in the shared library and thus choose the correct library among several or +# avoid using an incompatible one. But on some systems, the link fails. +# On 2002.09.30, "John H. DuBois III" reports that on +# SCO OpenServer, he gets the following error message with -lc: +# +# -lc; relocations referenced ; from file(s) /usr/ccs/lib/libc.so(random.o); +# fatal error: relocations remain against allocatable but non-writable +# section: ; .text + +SHLIB_CLIB = -lc +# SCO: +SHLIB_CLIB = + +# On some systems you have to build into an executable the list of +# directories where its dynamically linked libraries can be found at +# run time. This is typically done with a -R or -rpath linker +# option. Even on systems that don't require it, you might prefer to do +# that rather than set up environment variables or configuration files +# to tell the system where the libraries are. A "Y" here means to put +# the directory information in the executable at link time. + +NEED_RUNTIME_PATH = N +# Solaris, SunOS, NetBSD, AIX: +#NEED_RUNTIME_PATH = Y + +# RPATHOPTNAME is the option you use on the link command to specify +# a runtime search path for a shared library. It is meaningless unless +# NEED_RUNTIME_PATH is Y. +RPATHOPTNAME = -rpath + +# The following variables tell where your various libraries on which +# Netpbm depends live. The LIBxxx variable is a full file +# specification of the link library (not necessarily the library used +# at run time). e.g. "/usr/local/lib/graphics/libjpeg.so". It usually +# doesn't matter if the library prefix and suffix are right -- you can +# use "lib" and ".so" or ".a" regardless of what your system actually +# uses because these just turn into "-L" and "-l" linker options +# anyway. ".a" implies a static library for some purposes, though. +# If you don't have the library in question, use a value of NONE for +# LIBxxx and the build will simply skip the programs that require that +# library. If the library is in your linker's (or the Netpbm build's) +# default search path, leave off the directory part, e.g. "libjpeg.so". + +# The xxxHDR_DIR variable is the directory in which the interface +# headers for the library live (e.g. /usr/include). If they are in your +# compiler's default search path, set this variable to null. + +# This is where the Netpbm shared libraries will reside when Netpbm is +# fully installed. In some configurations, the Netpbm builder builds +# this information into the Netpbm executables. This does NOT affect +# where the Netpbm installer installs the libraries. A null value +# means the libraries are in a default search path used by the runtime +# library loader. +NETPBMLIB_RUNTIME_PATH = +#NETPBMLIB_RUNTIME_PATH = /usr/lib/netpbm + +# The TIFF library. See above. If you want to build the tiff +# converters, you must have the tiff library already installed. + +TIFFLIB = NONE +TIFFHDR_DIR = + +#TIFFLIB = libtiff.so +#TIFFHDR_DIR = /usr/include/libtiff +#NetBSD: +#TIFFLIB = $(LOCALBASE)/lib/libtiff.so +#TIFFHDR_DIR = $(LOCALBASE)/include +# OSF, Tru64: +#TIFFLIB = /usr/local1/DEC/lib/libtiff.so +#TIFFHDR_DIR = /usr/local1/DEC/include + +# Some TIFF libraries do Jpeg and/or Z (flate) compression and thus any +# program linked with the TIFF library needs a Jpeg and/or Z library. +# Some TIFF libraries have such library statically linked in, but others +# need it to be dynamically linked at program load time. +# Make this 'N' if youf TIFF library doesn't need such dynamic linking. +# As of 2005.01, the most usual build of the TIFF library appears to require +# both. +TIFFLIB_NEEDS_JPEG = Y +TIFFLIB_NEEDS_Z = Y + +# The JPEG library. See above. If you want to build the jpeg +# converters you must have the jpeg library already installed. + +# Tiff files can use JPEG compression, so the Tiff library can reference +# the JPEG library. If your Tiff library references a dynamic JPEG +# library, you must specify at least JPEGLIB here, or the Tiff +# converters will not build. Note that your Tiff library may have the +# JPEG stuff statically linked in, in which case you won't need +# JPEGLIB in order to build the Tiff converters. + +JPEGLIB = NONE +JPEGHDR_DIR = +#JPEGLIB = libjpeg.so +#JPEGHDR_DIR = /usr/include/jpeg +# Netbsd: +#JPEGLIB = ${LOCALBASE}/lib/libjpeg.so +#JPEGHDR_DIR = ${LOCALBASE}/include +# OSF, Tru64: +#JPEGLIB = /usr/local1/DEC/libjpeg.so +#JPEGHDR_DIR = /usr/local1/DEC/include +# Typical: +#JPEGLIB = /usr/local/lib/libjpeg.so +#JPEGHDR_DIR = /usr/local/include +# Don't build JPEG stuff: +#JPEGLIB = NONE + + +# The PNG library. See above. If you want to build the PNG +# converters you must have the PNG library already installed. + +# The PNG library, by convention starting around April 2002, gets installed +# with names that include a version number, such as libpng10.a and header +# files in /usr/include/libpng10. But there is conventionally an unnumbered +# alias (e.g. libpng.a, /usr/include/libpng) for the preferred version. +# +# Recent versions of the library (since some time in the 2002-2006 period) +# have an associated 'libpng-config' that tells how to link it. The make +# files will use that program if it exists (must be in the PATH). In that +# case, PNGLIB and PNGHDR_DIR are irrelevant, but PNGVER is still meaningful, +# because the make file runs 'libpng$(PNGVER)-config'. + +PNGLIB = NONE +PNGHDR_DIR = +PNGVER = +#PNGLIB = libpng$(PNGVER).so +#PNGHDR_DIR = /usr/include/libpng$(PNGVER) +# NetBSD: +#PNGLIB = $(LOCALBASE)/lib/libpng$(PNGVER).so +#PNGHDR_DIR = $(LOCALBASE)/include +# OSF/Tru64: +#PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so +#PNGHDR_DIR = /usr/local1/DEC/include + +# The zlib compression library. See above. You need it to build +# anything that needs the PNG library (see above). If you selected +# NONE for the PNG library, it doesn't matter what you specify here -- +# it won't get used. +# +# If you have 'libpng-config' (see above), these are irrelevant. + +ZLIB = NONE +ZHDR_DIR = +#ZLIB = libz.so + +# The JBIG lossless image compression library (aka JBIG-KIT): + +JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a +JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig + +# The Jasper JPEG-2000 image compression library (aka JasPer): +JASPERLIB = $(INTERNAL_JASPERLIB) +JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR) +# JASPERDEPLIBS is the libraries (-l options or file names) on which +# The Jasper library depends -- i.e. what you have to link into any +# executable that links in the Jasper library. +JASPERDEPLIBS = +#JASPERDEPLIBS = -ljpeg + +# And the Utah Raster Toolkit (aka URT aka RLE) library: + +URTLIB = $(BUILDDIR)/urt/librle.a +URTHDR_DIR = $(SRCDIR)/urt + +# The X11 library has facilities for talking to an X Window System +# server. It is required by Pamx. + +X11LIB = NONE +X11HDR_DIR = + +#X11LIB = /usr/lib/libX11.so +#X11HDR_DIR = + +# The Linux SVGA library (Svgalib) is a facility for displaying graphics +# on the Linux console. It is required by Ppmsvgalib. + +LINUXSVGALIB = NONE +LINUXSVGAHDR_DIR = + +#LINUXSVGALIB = /usr/lib/libvga.so +#LINUXSVGAHDR_DIR = /usr/include/vgalib + +# If you don't want any network functions, set OMIT_NETWORK to "y". +# The only thing that requires network functions is the option in +# ppmtompeg to run it on multiple computers simultaneously. On some +# systems network functions don't work or we haven't figured out how to +# make them work, or they just aren't worth the effort. +OMIT_NETWORK = +#DJGPP/Windows, Tru64: +# (there's some minor header problem that prevents network functions from +# building on Tru64 2000.10.06) +#OMIT_NETWORK = y + +# These are -l options to link in the network libraries. Often, these are +# built into the standard C library, so this can be null. This is irrelevant +# if OMIT_NETWORK is "y". + +NETWORKLD = +# Solaris, SunOS: +#NETWORKLD = -lsocket -lnsl +# SCO: +#NETWORKLD = -lsocket, -lresolv + +VMS = +#VMS: +#VMS = yes + +# DONT_HAVE_PROCESS_MGMT is Y if this system doesn't have the usual +# Unix process management stuff - fork, wait, etc. N for a regular Unix +# system. +DONT_HAVE_PROCESS_MGMT = N + +# The following variables are used only by 'make install' (and the +# variants of it). Paths here don't, for example, get built into any +# programs. + +# This is where everything goes when you do 'make package', unless you +# override it by setting 'pkgdir' on the Make command line. +PKGDIR_DEFAULT = /tmp/netpbm + +# Subdirectory of the package directory ($(pkgdir)) in which man pages +# go. +PKGMANDIR = man + +# File permissions for installed files. +# Note that on some systems (e.g. Solaris), 'install' can't use the +# mnemonic permissions - you have to use octal. + +# binaries (pbmmake, etc) +INSTALL_PERM_BIN = 755 # u=rwx,go=rx +# shared libraries (libpbm.so, etc) +INSTALL_PERM_LIBD = 755 # u=rwx,go=rx +# static libraries (libpbm.a, etc) +INSTALL_PERM_LIBS = 644 # u=rw,go=r +# header files (pbm.h, etc) +INSTALL_PERM_HDR = 644 # u=rw,go=r +# man pages (pbmmake.1, etc) +INSTALL_PERM_MAN = 644 # u=rw,go=r +# data files (pnmtopalm color maps, etc) +INSTALL_PERM_DATA = 644 # u=rw,go=r + +# Specify the suffix that want the man pages to have. + +SUFFIXMANUALS1 = 1 +SUFFIXMANUALS3 = 3 +SUFFIXMANUALS5 = 5 + +#NETPBMLIBTYPE tells the kind of libraries that will get built to hold the +#Netpbm library functions. The value is used only in make file tests. +# "unixshared" means a unix-style shared library, typically named like +# libxyz.so.2.3 +NETPBMLIBTYPE = unixshared +# "unixstatic" means a unix-style static library, (like libxyz.a) +#NETPBMLIBTYPE = unixstatic +# "dll" means a Windows DLL shared library +#NETPBMLIBTYPE = dll +# "dylib" means a Darwin/Mac OS shared library +#NETPBMLIBTYPE = dylib + +#NETPBMLIBSUFFIX is the suffix used on whatever kind of library is +#selected above. All this is used for is to construct library names. +#The make files never examine the actual value. +NETPBMLIBSUFFIX = so + +# "a" is the suffix for unix-style static libraries. It is also +# traditionally used for shared libraries on AIX. The Visual Age C +# manual says sometimes .so works on AIX, and GNU software for AIX +# 5.1.0 does indeed use it. In our experiments, it works fine if you +# name the library file explicitly on the link, but isn't in the -l +# search order. If you name the library explicitly on the link, the +# library must live in exactly the same position at run time, so we +# can't use that. Therefore, you cannot build both static and shared +# libraries with AIX. You have to choose. +#NETPBMLIBSUFFIX = a +# For HP-UX shared libraries: +#NETPBMLIBSUFFIX = sl +# Darwin/Mac OS shared library: +#NETPBMLIBSUFFIX = dylib +# Windows shared library: +#NETPBMLIBSUFFIX = dll + +#STATICLIB_TOO is "y" to signify that you want a static library built +#and installed in addition to whatever library type you specified by +#NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library, +#STATICLIB_TOO simply has no effect. +STATICLIB_TOO = y +#STATICLIB_TOO = n + +#STATICLIBSUFFIX is the suffix that static libraries have. It's +#meaningless if you aren't building static libraries. +STATICLIBSUFFIX = a + +#SHLIBPREFIXLIST is a blank-delimited list of prefixes that a filename +#of a shared library may have on this system. Traditionally, it's +#just "lib", as in libc or libnetpbm. On Windows, though, varying +#prefixes are used when multiple alternative forms of a library are +#available. The first prefix in this list is what we use to name the +#Netpbm shared libraries. +# +# This variable controls how 'libopt' gets built. +# +SHLIBPREFIXLIST = lib +#Cygwin: +#SHLIBPREFIXLIST = cyg lib + +NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST)) + +#DLLVER is used to version the DLLs built on cygwin or other +#windowsish platforms. We can't add this to LIBROOT, or we'd +#version the static libs (which is bad). We can't add this +#at the end of the name (like unix does with so numbers) because +#windows will only load dlls whose name ends in "dll". So, +#we have this variable, which becomes the end of the library "root" name +#for DLLs only. +# +# This variable controls how 'libopt' gets built. +# +DLLVER = +#Cygwin +#DLLVER = $(NETPBM_MAJOR_RELEASE) + +#NETPBM_DOCURL is the URL of the main documentation page for Netpbm. +#This is a directory which contains a file for each Netpbm program, +#library, and file type. E.g. The documentation for jpegtopnm might be in +#http://netpbm.sourceforge.net/doc/jpegtopnm.html . This value gets +#installed in the man pages (which say no more than to read the webpage) +#and in the Webman netpbm.url file. +NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ +#For a system with no web access, but a local copy of the doc: +#NETPBM_DOCURL = file:/usr/doc/netpbm/ + + + + + +####Lines above were copied from Makefile.config.in by 'configure'. +####Lines below were added by 'configure' based on the SOLARIS platform. +DEFAULT_TARGET = nonmerge +NETPBMLIBTYPE=unixshared +NETPBMLIBSUFFIX=so +STATICLIB_TOO=n +NETPBMLIB_RUNTIME_PATH=/opt/csw/lib +LDSHLIB = -Wl,-Bdynamic,-G,-h,$(SONAME) +NEED_RUNTIME_PATH = Y +CFLAGS = @CFLAGS@ +CFLAGS_SHLIB = -Kpic -L/opt/csw/lib +RPATHOPTNAME = -R +NETWORKLD = -lsocket -lnsl +LINKERISCOMPILER = Y +TIFFHDR_DIR = importinc -I/opt/csw/include +TIFFLIB = /opt/csw/lib/libtiff.so +JPEGHDR_DIR = importinc -I/opt/csw/include +JPEGLIB = /opt/csw/lib/libjpeg.so +ZHDR_DIR = importinc -I/opt/csw/include +ZLIB = /opt/csw/lib/libz.so +X11HDR_DIR = /usr/openwin/include/X11 -I/opt/csw/X11/include +X11LIB = /usr/openwin/lib/libX11.so +NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ +INTTYPES_H = "inttypes_netpbm.h" +HAVE_INT64 = N +LDFLAGS = -L/opt/csw/lib +PATH:=/opt/csw/bin:$(PATH) Deleted: csw/mgar/pkg/netpbm/trunk/files/cflags-fix.diff =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/cflags-fix.diff 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/files/cflags-fix.diff 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,34 +0,0 @@ -diff --speed-large-files --minimal -Nru netpbm-10.26.20.orig/Makefile.common netpbm-10.26.20/Makefile.common ---- netpbm-10.26.20.orig/Makefile.common 2005-12-10 07:58:27.640868000 -0500 -+++ netpbm-10.26.20/Makefile.common 2005-12-10 07:50:13.881577000 -0500 -@@ -299,7 +299,7 @@ - # produce a merge.o file, but not every directory has anything to contribute - # to the merge. - empty.o: %.o: %.c -- $(CC) -c $(CFLAGS_PERSONAL) $(CADD) $< -o $@ -+ $(CC) -c $(CFLAGS) $(CFLAGS_PERSONAL) $(CADD) $< -o $@ - empty.c: - cat /dev/null >empty.c - -diff --speed-large-files --minimal -Nru netpbm-10.26.20.orig/buildtools/Makefile netpbm-10.26.20/buildtools/Makefile ---- netpbm-10.26.20.orig/buildtools/Makefile 2005-12-10 07:58:33.176455000 -0500 -+++ netpbm-10.26.20/buildtools/Makefile 2005-12-10 05:43:24.005413000 -0500 -@@ -28,15 +28,15 @@ - endif - - libopt.o: libopt.c -- $(CC_FOR_BUILD) -c -DSHLIBPREFIXLIST="\"$(SHLIBPREFIXLIST)\"" \ -+ $(CC_FOR_BUILD) -c $(CFLAGS) -DSHLIBPREFIXLIST="\"$(SHLIBPREFIXLIST)\"" \ - $(STRIP_DLL_VERSION) $(EXPLICIT) $(CFLAGS_PERSONAL) $(CADD) \ - -o $@ $< - - typegen.o endiangen.o:%.o:%.c -- $(CC_FOR_BUILD) -c -o $@ $< -+ $(CC_FOR_BUILD) -c $(CFLAGS) -D__EXTENSIONS__ -o $@ $< - - $(PROGS):%:%.o -- $(LD_FOR_BUILD) -o $@ $< -+ $(LD_FOR_BUILD) -o $@ $< - - clean: cleanlocal - .PHONY: cleanlocal Deleted: csw/mgar/pkg/netpbm/trunk/files/config_template =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/config_template 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/files/config_template 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,52 +0,0 @@ -@ This is a template to be processed into a Bourne shell program. -@ -#!/bin/sh - -# This program was generated by the Netpbm installer. Its purpose is to -# allow other programs to find out about how Netpbm is installed on this -# system. This program is supposed to be invoked via the PATH. - -@ The following @xxx@ strings get replaced by Installnetpbm when it turns -@ this template into an actual Bourne shell program. -version='@VERSION@' -datadir='@DATADIR@' -linkdir='@LINKDIR@' -includedir='@INCLUDEDIR@' -bindir='@BINDIR@' - - -if test $# -eq 0; then - echo >&2 "You need to specify one of these options:" - echo >&2 " --version" - echo >&2 " --datadir" - echo >&2 " --linkdir" - echo >&2 " --includedir" - echo >&2 " --bindir" - exit 100 - fi - -case "$1" in - --version) - echo $version - exit 0 - ;; - --datadir) - echo $datadir - exit 0 - ;; - --linkdir) - echo $linkdir - exit 0 - ;; - --includedir) - echo $includedir - exit 0 - ;; - --bindir) - echo $bindir - exit 0 - ;; - *) - echo >&2 "Unrecognized option to $0: $1" - exit 100 - esac Deleted: csw/mgar/pkg/netpbm/trunk/files/csw-perl.diff =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/csw-perl.diff 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/files/csw-perl.diff 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,63 +0,0 @@ -diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/editor/pnmflip netpbm-10.26.18/editor/pnmflip ---- netpbm-10.26.18.orig/editor/pnmflip 2005-11-13 16:36:50.000000000 -0500 -+++ netpbm-10.26.18/editor/pnmflip 2005-11-13 16:36:16.610001000 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!/opt/csw/bin/perl -w - - #============================================================================ - # This is a compatibility interface to Pamflip. -diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/editor/pnmquant netpbm-10.26.18/editor/pnmquant ---- netpbm-10.26.18.orig/editor/pnmquant 2005-11-13 16:36:51.000000000 -0500 -+++ netpbm-10.26.18/editor/pnmquant 2005-11-13 16:35:41.230002000 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!/opt/csw/bin/perl -w - - ############################################################################## - # pnmquant -diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/editor/ppmfade netpbm-10.26.18/editor/ppmfade ---- netpbm-10.26.18.orig/editor/ppmfade 2005-11-13 16:36:50.000000000 -0500 -+++ netpbm-10.26.18/editor/ppmfade 2005-11-13 16:34:50.460003000 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!/opt/csw/bin/perl -w - #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - # - # This program creates a fade (a sequence of frames) between two images. -diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/editor/ppmquant netpbm-10.26.18/editor/ppmquant ---- netpbm-10.26.18.orig/editor/ppmquant 2005-11-13 16:36:50.000000000 -0500 -+++ netpbm-10.26.18/editor/ppmquant 2005-11-13 16:35:27.770001000 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!/opt/csw/bin/perl -w - ############################################################################## - # This is nothing but a compatibility interface for Pnmquant. - # An old program coded to call Ppmquant will continue working because -diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/editor/ppmshadow netpbm-10.26.18/editor/ppmshadow ---- netpbm-10.26.18.orig/editor/ppmshadow 2005-11-13 16:36:50.000000000 -0500 -+++ netpbm-10.26.18/editor/ppmshadow 2005-11-13 16:36:00.060002000 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!/opt/csw/bin/perl -w - - # P P M S H A D O W - -diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/generator/ppmrainbow netpbm-10.26.18/generator/ppmrainbow ---- netpbm-10.26.18.orig/generator/ppmrainbow 2005-11-13 16:36:52.000000000 -0500 -+++ netpbm-10.26.18/generator/ppmrainbow 2005-11-13 16:36:32.310000000 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -wl -+#!/opt/csw/bin/perl -wl - use strict; - use Getopt::Long; - -diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/manweb netpbm-10.26.18/manweb ---- netpbm-10.26.18.orig/manweb 2005-11-13 16:36:57.000000000 -0500 -+++ netpbm-10.26.18/manweb 2005-11-13 16:36:42.040003000 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!/opt/csw/bin/perl -w - - use strict; - use English; Deleted: csw/mgar/pkg/netpbm/trunk/files/depend =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/depend 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/files/depend 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,8 +0,0 @@ -P CSWcommon common - common files and dirs for CSW packages -P CSWjpeg jpeg - lib and tools for JPEG image format -P CSWpng png - library for Portable Network Graphics format (PNG) -P CSWtiff tiff - lib and tools for Tag Image File Format -P CSWzlib zlib - Zlib Data Compression Library -P CSWperl perl - A high-level, general-purpose programming language. -P SUNWcsl Core Solaris, (Shared Libs) -P SUNWlibms Sun WorkShop Bundled shared libm Deleted: csw/mgar/pkg/netpbm/trunk/files/gar-base.diff =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/gar-base.diff 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/files/gar-base.diff 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -Nru netpbm-10.26.42.orig/GNUmakefile netpbm-10.26.42/GNUmakefile ---- netpbm-10.26.42.orig/GNUmakefile 2004-10-16 16:27:50.000000000 -0400 -+++ netpbm-10.26.42/GNUmakefile 2007-06-23 11:49:29.790538000 -0400 -@@ -177,7 +177,7 @@ - echo " make package PKGDIR=/tmp/newnetpbm "; \ - false; \ - fi -- mkdir $(PKGDIR) -+ mkdir -p $(PKGDIR) - echo "Netpbm install package made by 'make package'" \ - >$(PKGDIR)/pkginfo - date >>$(PKGDIR)/pkginfo Deleted: csw/mgar/pkg/netpbm/trunk/files/make-netpbm-config.sh =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/make-netpbm-config.sh 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/files/make-netpbm-config.sh 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,24 +0,0 @@ -#!/bin/sh - -VERSION=`cat $1/VERSION` - -prefix='\/opt\/csw' -bindir=$prefix'\/bin' -libdir=$prefix'\/lib' -datadir=$prefix'\/share\/netpbm' -incdir=$prefix'\/include' -mandir=$prefix'\/man' - -sed -e ' -/^\@/d -s/\@VERSION\@/'"$VERSION"'/ -s/\@BINDIR\@/'"$bindir"'/ -s/\@LIBDIR\@/'"$libdir"'/ -s/\@LINKDIR\@/'"$libdir"'/ -s/\@DATADIR\@/'"$datadir"'/ -s/\@INCLUDEDIR\@/'"$incdir"'/ -s/\@MANDIR\@/'"$mandir"'/ -' config_template > $1/bin/netpbm-config - -chmod 0755 $1/bin/netpbm-config - Deleted: csw/mgar/pkg/netpbm/trunk/files/manweb.diff =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/manweb.diff 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/files/manweb.diff 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,20 +0,0 @@ ---- netpbm-10.26.19/manweb 2005-11-20 12:40:53.984621000 -0500 -+++ netpbm-10.26.19/manweb 2005-11-20 13:00:57.566416000 -0500 -@@ -300,7 +300,7 @@ - - sub readConfFile($) { - #----------------------------------------------------------------------------- --# Read the configuration file (/etc/manweb.conf or value of -+# Read the configuration file (/opt/csw/etc/manweb.conf or value of - # MANWEB_CONF_FILE or named by our argument). Return values set in - # it, or defaults. - #----------------------------------------------------------------------------- -@@ -315,7 +315,7 @@ - if (defined($envVblValue)) { - $confFile = $envVblValue; - } else { -- $confFile = "/etc/manweb.conf"; -+ $confFile = "/opt/csw/etc/manweb.conf"; - } - } - Deleted: csw/mgar/pkg/netpbm/trunk/files/netpbm-config.diff =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/netpbm-config.diff 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/files/netpbm-config.diff 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,597 +0,0 @@ -diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/Makefile.config netpbm-10.26.18/Makefile.config ---- netpbm-10.26.18.orig/Makefile.config 1969-12-31 19:00:00.000000000 -0500 -+++ netpbm-10.26.18/Makefile.config 2005-11-12 16:46:54.680002000 -0500 -@@ -0,0 +1,593 @@ -+####This file was automatically created by 'configure.' -+####Many variables are set twice -- a generic setting, then -+####a system-specific override at the bottom of the file. -+#### -+# This is a make file inclusion, to be included in all the Netpbm make -+# files. -+ -+# This file is meant to contain variable settings that customize the -+# build for a particular target system configuration. -+ -+# The distribution contains the file Makefile.config.in. You edit -+# Makefile.config.in in ways relevant to your particular environment -+# to create Makefile.config. The "configure" program will do this -+# for you in simple cases. -+ -+# Some of the variables that the including make file must set for this -+# file to work: -+# -+# SRCDIR: The directory at the top of the Netpbm source tree. Note that -+# this is typically a relative directory, and it must be relative to the -+# make file that includes this file. -+ -+DEFAULT_TARGET = nonmerge -+#DEFAULT_TARGET = merge -+ -+# Fiasco has some special requirements that make it fail to compile on -+# some systems, and since it isn't very important, just set this to "N" -+# and skip it on those systems unless you want to debug it and fix it. -+# OpenBSD: -+#BUILD_FIASCO = N -+BUILD_FIASCO = Y -+ -+# The following are commands for the build process to use. These values -+# do not get built into anything. -+ -+# The C compiler (including macro preprocessor) -+#CC = gcc -+# Note that 'cc' is usually an alias for whatever is the main compiler -+# on a system, e.g. the GNU Compiler on Linux. -+CC = cc -+ -+# The linker. -+LD = $(CC) -+#LD = ld -+#Tru64: -+#LD = cc -+#LD = gcc -+ -+#If the linker identified above is a compiler that invokes a linker -+#(as in 'cc foo.o -o foo'), set LINKERISCOMPILER. The main difference is -+#that we expect a compiler to take linker options in the '-Wl,-opt1,val1' -+#syntax whereas the actual linker would take '-opt1 val1'. -+LINKERISCOMPILER=Y -+#If $(LD) is 'ld': -+#LINKERISCOMPILER=N -+ -+#LINKER_CAN_DO_EXPLICIT_LIBRARY means the linker specified above can -+#take a library as just another link object argument, as in 'ld -+#pnmtojpeg.o /usr/local/lib/libjpeg.so ...' as opposed to requiring a -+#-l option as in 'ld pnmtojpeg.o -L/usr/local/lib -l jpeg'. -+#This variable controls how 'libopt' gets built. Note that with some -+#linkers, you can specify a shared library explicitly, but then it has -+#to live in that exact place at run time. That's not good enough for us. -+ -+LINKER_CAN_DO_EXPLICIT_LIBRARY=N -+#GNU: -+#LINKER_CAN_DO_EXPLICIT_LIBRARY=Y -+ -+# This is the name of the header file that declares the types -+# uint32_t, etc. This name is used as #include $(INTTYPES_H) . -+# Set to null if the types come automatically without including anything. -+INTTYPES_H = -+# Linux libc5: -+#INTTYPES_H = -+# Solaris: -+#INTTYPES_H = -+# Others: -+#INTTYPES_H = -+#INTTYPES_H = -+# The automatically generated Netpbm version: -+#INTTYPES_H = "inttypes_netpbm.h" -+ -+# CC and LD are for building the Netpbm programs, which are not necessarily -+# intended to run on the same system on which Make is running. But when we -+# build a build tool such as Libopt, it is meant to run only on the same -+# system on which the Make is running. The variables below define programs -+# to use to compile and link build tools. -+CC_FOR_BUILD = $(CC) -+LD_FOR_BUILD = $(LD) -+ -+# MAKE is set automatically by Make to what was used to invoke Make. -+ -+INSTALL = $(SRCDIR)/buildtools/install.sh -+#Solaris: -+#INSTALL = /usr/ucb/install -+#Tru64: -+#INSTALL = installbsd -+#OSF1: -+#INSTALL = $(SRCDIR)/buildtools/installosf -+#Red Hat Linux: -+#INSTALL = install -+ -+# STRIPFLAG is the option you pass to the above install program to make it -+# strip unnecessary information out of binaries. -+STRIPFLAG = -s -+# If you don't want to strip the binaries, just leave it null: -+#STRIPFLAG = -+ -+SYMLINK = ln -s -+# At least some Windows environments don't have any concept of symbolic -+# links, but direct copies are usually a passable alternative. -+#SYMLINK = cp -+ -+#MANPAGE_FORMAT is "nroff" or "cat". It determines in what format the -+#pointer man pages are installed (ready to nroff, or ready to cat). -+#A pointer man pages is just a single-paragraph pages that tells you there is -+#no man page for the program, to look at the HTML documentation instead. -+MANPAGE_FORMAT = nroff -+#MANPAGE_FORMAT = cat -+ -+AR = ar -+RANLIB = ranlib -+# IRIX, SCO don't have Ranlib: -+#RANLIB = true -+LEX = flex -+# Solaris: -+# LEX = flex -e -+# Or just skip parts that need Lex: -+# LEX = -+ -+# C compiler options -+ -+# gcc: -+# -ansi and -Werror should work too, but are not included -+# by default because there's no point in daring the build to fail. -+# -pedantic isn't a problem because it causes at worst a warning. -+#CFLAGS = -O3 -fast-math -pedantic \ -+# -Wall -Wno-uninitialized -Wmissing-declarations -+# The merged programs have a main_XXX subroutine instead of main(), -+# which would cause a warning with -Wmissing-declarations or -+# -Wmissing-prototypes. -+#CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes -+# A user of DEC Tru64 4.0F in May 2000 needed -DLONG_32 for ppmtompeg, -+# but word size-sensitive code was removed from parallel.c in September 2004. -+# A user of Tru64 5.1A in July 2003 needed NOT to have -DLONG_32. In -+# theory, you need this if on your system, long is 32 bits and int is not. -+# But it may be completely irrelevant today. -+#Tru64: -+#CFLAGS = -O2 -std1 -DLONG_32 -+#CFLAGS = -O2 -std1 -+#AIX: -+#CFLAGS= -O3 -+#HP-UX: -+#CFLAGS= -O3 -fPIC -+#IRIX: -+#CFLAGS= -n32 -O3 -+#Amiga with GNU compiler: -+#CFLAGS= -m68020-60 -ffast-math -mstackextend -+# You can add -noixemul for Amiga and successfully compile most of the -+# programs. (Of the remaining ones, if you can supply your own strtod() -+# function, most of them will build with -noixemul). So try building -+# with 'make --keep-going CADD=-noixemul' first, then just 'make' to build -+# everything that failed for lack of the ixemul library in the first step. -+# That way, the parts that don't required the ixemul library won't indicate -+# a dependency on it. -+#OpenBSD: -+#CFLAGS = -I/usr/local/include -+ -+# EXE is a suffix that the linker puts on any executable it generates. -+# In cygwin, this is .exe and most programs deal with its existence without -+# us having to know about it. Some don't though, so set this: -+ -+EXE = -+#Cygwin, DJGPP/Windows: -+#EXE = .exe -+ -+# linker options. -+ -+# LDFLAGS is often set as an environment variable; A setting here overrides -+# it. So either make sure you want to override it, or do a "LDFLAGS +=" here. -+ -+# Eunice users may want to use -noshare so that the executables can -+# run standalone: -+#LDFLAGS += -noshare -+#Tru64: -+# Russ Allberry says on 2001.06.09 that -oldstyle_liblookup may be necessary -+# to keep from finding an ancient system libjpeg.so that isn't compatible with -+# NetPBM. Michael Long found that /usr/local/lib is not in the default -+# search path, or not soon enough, and he was getting an old libjpeg that -+# caused all the jpeg symbol references to be unresolved. He had installed -+# a new libjpeg in /usr/local/lib. -+#LDFLAGS += -call_shared -oldstyle_liblookup -L/usr/local/lib -+#AIX: -+#LDFLAGS += -L /usr/pubsw/lib -+#HP-UX: -+#LDFLAGS += -Wl,+b,/usr/pubsw/lib -+#IRIX: -+#LDFLAGS += -n32 -+#FreeBSD, OpenBSD: -+# (04.03.15 This may be a mistake. LDFLAGS may already be set to this as -+# an environment variable. We used to override the environment variable -+# here with LDFLAGS =, which would mean we had to override with the same -+# value it already had. I suspect it will work fine with no LDFLAGS -+# setting at all; need to confirm this on real FreeBSD and OpenBSD systems) -+#LDFLAGS += -L/usr/local/lib -+ -+# Linker options for created Netpbm shared libraries. -+ -+# Here, $(SONAME) resolves to the soname for the shared library being created. -+# The following are gcc options. This works on GNU libc systems. -+LDSHLIB = -shared -Wl,-soname,$(SONAME) -+# You need -nostart instead of -shared on BeOS. Though the BeOS compiler is -+# ostensibly gcc, it has the -nostart option, which is not mentioned in gcc -+# documentation and doesn't exist in at least one non-BeOS installation. -+# BeOS doesn't have sonames built in. -+#LDSHLIB = -nostart -+#LDSHLIB = -G -+# Solaris, SunOS with GNU Ld, SCO: -+# These systems have no soname option. -+#LDSHLIB = -shared -+# Solaris with Sun Ld: -+#LDSHLIB = -Wl,-Bdynamic,-G,-h,$(SONAME) -+#Tru64: -+#LDSHLIB = -shared -expect_unresolved "*" -+#IRIX: -+#LDSHLIB = -shared -n32 -+#AIX GNU compiler/linker: -+#LDSHLIB = -shared -+#AIX Visual Age C: -+#LDSHLIB = -qmkshrobj -+ -+# LDRELOC is the command to combine two .o files (relocateable object files) -+# into a single .o file that can later be linked into something else. NONE -+# means no such command is available. -+ -+LDRELOC = NONE -+# GNU Ld: -+# Older GNU Ld misspells the option as --relocateable. Newer GNU Ld -+# correctly spells it --relocatable. The abbreviation --reloc works on -+# both. -+#LDRELOC = ld --reloc -+#LDRELOC = ld -r -+ -+ -+# On older systems, you have to make shared libraries out of position -+# independent code, so you need -fpic or fPIC here. (The rule is: if -+# -fpic works, use it. If it bombs, go to fPIC). On newer systems, -+# it isn't necessary, but can save real memory at the expense of -+# execution speed. Without position independent code, the library -+# loader may have to patch addresses into the executable text. On an -+# older system, this would cause a program crash because the loader -+# would be writing into read-only shared memory. But on newer -+# systems, the system silently creates a private mapping of the page -+# or segment being modified (the "copy on write" phenomenon). So it -+# needs its own private real page frame. In one experiment, A second -+# copy of Pbmtext used 16K less real memory when built with -fpic than -+# when built without. 2001.06.02. -+ -+CFLAGS_SHLIB = -+# Solaris or SunOS with gcc, and NetBSD: -+#CFLAGS_SHLIB = -fpic -+#CFLAGS_SHLIB = -fPIC -+# Sun compiler: -+#CFLAGS_SHLIB = -Kpic -+#CFLAGS_SHLIB = -KPIC -+ -+# SHLIB_CLIB is the link option to include the C library in a shared library, -+# normally "-lc". On typical systems, this serves no purpose. On some, -+# though, it causes information about which C library to use to be recorded -+# in the shared library and thus choose the correct library among several or -+# avoid using an incompatible one. But on some systems, the link fails. -+# On 2002.09.30, "John H. DuBois III" reports that on -+# SCO OpenServer, he gets the following error message with -lc: -+# -+# -lc; relocations referenced ; from file(s) /usr/ccs/lib/libc.so(random.o); -+# fatal error: relocations remain against allocatable but non-writable -+# section: ; .text -+ -+SHLIB_CLIB = -lc -+# SCO: -+SHLIB_CLIB = -+ -+# On some systems you have to build into an executable the list of -+# directories where its dynamically linked libraries can be found at -+# run time. This is typically done with a -R or -rpath linker -+# option. Even on systems that don't require it, you might prefer to do -+# that rather than set up environment variables or configuration files -+# to tell the system where the libraries are. A "Y" here means to put -+# the directory information in the executable at link time. -+ -+NEED_RUNTIME_PATH = N -+# Solaris, SunOS, NetBSD, AIX: -+#NEED_RUNTIME_PATH = Y -+ -+# RPATHOPTNAME is the option you use on the link command to specify -+# a runtime search path for a shared library. It is meaningless unless -+# NEED_RUNTIME_PATH is Y. -+RPATHOPTNAME = -rpath -+ -+# The following variables tell where your various libraries on which -+# Netpbm depends live. The LIBxxx variable is a full file -+# specification of the link library (not necessarily the library used -+# at run time). e.g. "/usr/local/lib/graphics/libpng.so". It usually -+# doesn't matter if the library prefix and suffix are right -- you can -+# use "lib" and ".so" or ".a" regardless of what your system actually -+# uses because these just turn into "-L" and "-l" linker options -+# anyway. ".a" implies a static library for some purposes, though. -+# If you don't have the library in question, use a value of NONE for -+# LIBxxx and the build will simply skip the programs that require that -+# library. If the library is in your linker's (or the Netpbm build's) -+# default search path, leave off the directory part, e.g. "libpng.so". -+ -+# The xxxHDR_DIR variable is the directory in which the interface -+# headers for the library live (e.g. /usr/include). If they are in your -+# compiler's default search path, set this variable to null. -+ -+# This is where the Netpbm shared libraries will reside when Netpbm is -+# fully installed. In some configurations, the Netpbm builder builds -+# this information into the Netpbm executables. This does NOT affect -+# where the Netpbm installer installs the libraries. A null value -+# means the libraries are in a default search path used by the runtime -+# library loader. -+NETPBMLIB_RUNTIME_PATH = -+#NETPBMLIB_RUNTIME_PATH = /usr/lib/netpbm -+ -+# The TIFF library. See above. If you want to build the tiff -+# converters, you must have the tiff library already installed. -+ -+TIFFLIB = NONE -+TIFFHDR_DIR = -+ -+#TIFFLIB = libtiff.so -+#TIFFHDR_DIR = /usr/include/libtiff -+#NetBSD: -+#TIFFLIB = $(LOCALBASE)/lib/libtiff.so -+#TIFFHDR_DIR = $(LOCALBASE)/include -+# OSF, Tru64: -+#TIFFLIB = /usr/local1/DEC/lib/libtiff.so -+#TIFFHDR_DIR = /usr/local1/DEC/include -+ -+# Some TIFF libraries do Jpeg and/or Z (flate) compression and thus any -+# program linked with the TIFF library needs a Jpeg and/or Z library. -+# Some TIFF libraries have such library statically linked in, but others -+# need it to be dynamically linked at program load time. -+# Make this 'N' if youf TIFF library doesn't need such dynamic linking. -+# As of 2005.01, the most usual build of the TIFF library appears to require -+# both. -+TIFFLIB_NEEDS_JPEG = Y -+TIFFLIB_NEEDS_Z = Y -+ -+# The JPEG library. See above. If you want to build the jpeg -+# converters you must have the jpeg library already installed. -+ -+# Tiff files can use JPEG compression, so the Tiff library can reference -+# the JPEG library. If your Tiff library references a dynamic JPEG -+# library, you must specify at least JPEGLIB here, or the Tiff -+# converters will not build. Note that your Tiff library may have the -+# JPEG stuff statically linked in, in which case you won't need -+# JPEGLIB in order to build the Tiff converters. -+ -+JPEGLIB = NONE -+JPEGHDR_DIR = -+#JPEGLIB = libjpeg.so -+#JPEGHDR_DIR = /usr/include/jpeg -+# Netbsd: -+#JPEGLIB = ${LOCALBASE}/lib/libjpeg.so -+#JPEGHDR_DIR = ${LOCALBASE}/include -+# OSF, Tru64: -+#JPEGLIB = /usr/local1/DEC/libjpeg.so -+#JPEGHDR_DIR = /usr/local1/DEC/include -+# Typical: -+#JPEGLIB = /usr/local/lib/libjpeg.so -+#JPEGHDR_DIR = /usr/local/include -+# Don't build JPEG stuff: -+#JPEGLIB = NONE -+ -+ -+# The PNG library. See above. If you want to build the PNG -+# converters you must have the PNG library already installed. -+ -+# The PNG library, by convention starting around April 2002, gets installed -+# with names that include a version number, such as libpng10.a and header -+# files in /usr/include/libpng10. -+# option. -+PNGLIB = NONE -+PNGHDR_DIR = -+PNGVER = -+#PNGLIB = libpng$(PNGVER).so -+#PNGHDR_DIR = /usr/include/libpng$(PNGVER) -+# NetBSD: -+#PNGLIB = $(LOCALBASE)/lib/libpng$(PNGVER).so -+#PNGHDR_DIR = $(LOCALBASE)/include -+# OSF/Tru64: -+#PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so -+#PNGHDR_DIR = /usr/local1/DEC/include -+ -+# The zlib compression library. See above. You need it to build -+# anything that needs the PNG library (see above). If you selected -+# NONE for the PNG library, it doesn't matter what you specify here -- -+# it won't get used. -+ -+ZLIB = NONE -+ZHDR_DIR = -+#ZLIB = libz.so -+ -+# The JBIG lossless image compression library (aka JBIG-KIT): -+ -+JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a -+JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig -+ -+# The Jasper JPEG-2000 image compression library (aka JasPer): -+JASPERLIB = $(INTERNAL_JASPERLIB) -+JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR) -+ -+# And the Utah Raster Toolkit (aka URT aka RLE) library: -+ -+URTLIB = $(BUILDDIR)/urt/librle.a -+URTHDR_DIR = $(SRCDIR)/urt -+ -+# The Linux SVGA library (Svgalib) is a facility for displaying graphics -+# on the Linux console. It is required by Ppmsvgalib. -+ -+LINUXSVGALIB = NONE -+LINUXSVGAHDR_DIR = -+ -+#LINUXSVGALIB_DIR = -+#LINUXSVGAHDR_DIR = /usr/include/vgalib -+ -+# If you don't want any network functions, set OMIT_NETWORK to "y". -+# The only thing that requires network functions is the option in -+# ppmtompeg to run it on multiple computers simultaneously. On some -+# systems network functions don't work or we haven't figured out how to -+# make them work, or they just aren't worth the effort. -+OMIT_NETWORK = -+#DJGPP/Windows, Tru64: -+# (there's some minor header problem that prevents network functions from -+# building on Tru64 2000.10.06) -+#OMIT_NETWORK = Y -+ -+# These are -l options to link in the network libraries. Often, these are -+# built into the standard C library, so this can be null. This is irrelevant -+# if OMIT_NETWORK is "y". -+ -+NETWORKLD = -+# Solaris, SunOS: -+#NETWORKLD = -lsocket -lnsl -+# SCO: -+#NETWORKLD = -lsocket, -lresolv -+ -+VMS = -+#VMS: -+#VMS = yes -+ -+# The following variables are used only by 'make install' (and the -+# variants of it). Paths here don't, for example, get built into any -+# programs. -+ -+# This is where everything goes when you do 'make package', unless you -+# override it by setting 'pkgdir' on the Make command line. -+PKGDIR_DEFAULT = /tmp/netpbm -+ -+# File permissions for installed files. -+# Note that on some systems (e.g. Solaris), 'install' can't use the -+# mnemonic permissions - you have to use octal. -+ -+# binaries (pbmmake, etc) -+INSTALL_PERM_BIN = 755 # u=rwx,go=rx -+# shared libraries (libpbm.so, etc) -+INSTALL_PERM_LIBD = 755 # u=rwx,go=rx -+# static libraries (libpbm.a, etc) -+INSTALL_PERM_LIBS = 644 # u=rw,go=r -+# header files (pbm.h, etc) -+INSTALL_PERM_HDR = 644 # u=rw,go=r -+# man pages (pbmmake.1, etc) -+INSTALL_PERM_MAN = 644 # u=rw,go=r -+# data files (pnmtopalm color maps, etc) -+INSTALL_PERM_DATA = 644 # u=rw,go=r -+ -+# Specify the suffix that want the man pages to have. -+ -+SUFFIXMANUALS1 = 1 -+SUFFIXMANUALS3 = 3 -+SUFFIXMANUALS5 = 5 -+ -+#NETPBMLIBTYPE tells the kind of libraries that will get built to hold the -+#Netpbm library functions. The value is used only in make file tests. -+# "unixshared" means a unix-style shared library, typically named like -+# libxyz.so.2.3 -+NETPBMLIBTYPE = unixshared -+# "unixstatic" means a unix-style static library, (like libxyz.a) -+#NETPBMLIBTYPE = unixstatic -+# "dll" means a Windows DLL shared library -+#NETPBMLIBTYPE = dll -+# "dylib" means a Darwin/Mac OS shared library -+#NETPBMLIBTYPE = dylib -+ -+#NETPBMLIBSUFFIX is the suffix used on whatever kind of library is -+#selected above. All this is used for is to construct library names. -+#The make files never examine the actual value. -+NETPBMLIBSUFFIX = so -+ -+# "a" is the suffix for unix-style static libraries. It is also -+# traditionally used for shared libraries on AIX. The Visual Age C -+# manual says sometimes .so works on AIX, and GNU software for AIX -+# 5.1.0 does indeed use it. In our experiments, it works fine if you -+# name the library file explicitly on the link, but isn't in the -l -+# search order. If you name the library explicitly on the link, the -+# library must live in exactly the same position at run time, so we -+# can't use that. Therefore, you cannot build both static and shared -+# libraries with AIX. You have to choose. -+#NETPBMLIBSUFFIX = a -+# For HP-UX shared libraries: -+#NETPBMLIBSUFFIX = sl -+# Darwin/Mac OS shared library: -+#NETPBMLIBSUFFIX = dylib -+# Windows shared library: -+#NETPBMLIBSUFFIX = dll -+ -+#STATICLIB_TOO is "y" to signify that you want a static library built -+#and installed in addition to whatever library type you specified by -+#NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library, -+#STATICLIB_TOO simply has no effect. -+STATICLIB_TOO = y -+#STATICLIB_TOO = n -+ -+#STATICLIBSUFFIX is the suffix that static libraries have. It's -+#meaningless if you aren't building static libraries. -+STATICLIBSUFFIX = a -+ -+#SHLIBPREFIXLIST is a blank-delimited list of prefixes that a filename -+#of a shared library may have on this system. Traditionally, it's -+#just "lib", as in libc or libpbm. On Windows, though, varying -+#prefixes are used when multiple alternative forms of a library are -+#available. The first prefix in this list is what we use to name the -+#Netpbm shared libraries. -+# -+# This variable controls how 'libopt' gets built. -+# -+SHLIBPREFIXLIST = lib -+#Cygwin: -+#SHLIBPREFIXLIST = cyg lib -+ -+NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST)) -+ -+#DLLVER is used to version the DLLs built on cygwin or other -+#windowsish platforms. We can't add this to LIBROOT, or we'd -+#version the static libs (which is bad). We can't add this -+#at the end of the name (like unix does with so numbers) because -+#windows will only load dlls whose name ends in "dll". So, -+#we have this variable, which becomes the end of the library "root" name -+#for DLLs only. -+# -+# This variable controls how 'libopt' gets built. -+# -+DLLVER = -+#Cygwin -+#DLLVER = $(NETPBM_MAJOR_RELEASE) -+ -+#NETPBM_DOCURL is the URL of the main documentation page for Netpbm. -+#This is a directory which contains a file for each Netpbm program, -+#library, and file type. E.g. The documentation for jpegtopnm might be in -+#http://netpbm.sourceforge.net/doc/jpegtopnm.html . This value gets -+#installed in the man pages (which say no more than to read the webpage) -+#and in the Webman netpbm.url file. -+NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ -+#For a system with no web access, but a local copy of the doc: -+#NETPBM_DOCURL = file:/usr/doc/netpbm/ -+ -+ -+ -+ -+####Lines above were copied from Makefile.config.in by 'configure'. -+####Lines below were added by 'configure' based on the SOLARIS platform. -+DEFAULT_TARGET = merge -+NETPBMLIBTYPE=unixshared -+NETPBMLIBSUFFIX=so -+STATICLIB_TOO=n -+NETPBMLIB_RUNTIME_PATH=/opt/csw/lib -+LDSHLIB = -Wl,-Bdynamic,-G,-h,$(SONAME) -+NEED_RUNTIME_PATH = Y -+CFLAGS = -fast -xnolibmopt -xdepend -xstrconst $(LDFLAGS) -xildoff -+CFLAGS_SHLIB = -Kpic -+RPATHOPTNAME = -R -+NETWORKLD = -lsocket -lnsl -+LINKERISCOMPILER = Y -+TIFFHDR_DIR = /opt/csw/include -+TIFFLIB = libtiff.so -+JPEGHDR_DIR = /opt/csw/include -+JPEGLIB = libjpeg.so -+PNGHDR_DIR = /opt/csw/include -+PNGLIB = libpng.so -+ZLIB = libz.so -+NETPBM_DOCURL = file:///opt/csw/share/doc/netpbm/ Deleted: csw/mgar/pkg/netpbm/trunk/files/netpbm-doc.diff =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/netpbm-doc.diff 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/files/netpbm-doc.diff 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,21 +0,0 @@ -diff --speed-large-files --minimal -Nru x/doc.orig/pnmtopng.html x/doc/pnmtopng.html ---- doc.orig/pnmtopng.html 2005-09-25 20:19:36.000000000 -0400 -+++ doc/pnmtopng.html 2005-11-20 10:02:25.078711000 -0500 -@@ -100,7 +100,7 @@ - - 
      - 
--   pnmtopng -phys 800 800 0 input.pnm >output.png
-+   pnmtopng -phys 800 800 0 input.pnm >output.png
- 
-
      - -@@ -108,7 +108,7 @@ - - 
      - 
--   pnmtopng -size "800 800 0" input.pnm >output.png
-+   pnmtopng -size "800 800 0" input.pnm >output.png
- 
-
      - Deleted: csw/mgar/pkg/netpbm/trunk/files/netpbm-fix.diff =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/netpbm-fix.diff 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/files/netpbm-fix.diff 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,36 +0,0 @@ -diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/converter/other/jpeg2000/Makefile netpbm-10.26.18/converter/other/jpeg2000/Makefile ---- netpbm-10.26.18.orig/converter/other/jpeg2000/Makefile 2005-11-12 16:50:41.000000000 -0500 -+++ netpbm-10.26.18/converter/other/jpeg2000/Makefile 2005-11-12 16:46:54.730001000 -0500 -@@ -18,7 +18,7 @@ - endif - endif - --INTERNAL_JASPERLIB = $(BUILDDIR)/$(SUBDIR)/libjasper/libjasper.a -+INTERNAL_JASPERLIB = libjasper/libjasper.a - INTERNAL_JASPERHDR_DIR = $(BUILDDIR)/$(SUBDIR)/libjasper/include - - ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB)) -diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/converter/other/pamtouil.c netpbm-10.26.18/converter/other/pamtouil.c ---- netpbm-10.26.18.orig/converter/other/pamtouil.c 2005-11-12 16:50:39.000000000 -0500 -+++ netpbm-10.26.18/converter/other/pamtouil.c 2005-11-12 16:47:36.140004000 -0500 -@@ -29,7 +29,7 @@ - #define LOW_CHAR '`' - #define HIGH_CHAR '~' - --struct cmdlineInfo { -+static struct cmdlineInfo { - /* All the information the user supplied in the command line, - in a form easy for the program to use. - */ -diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/editor/pnmcrop.c netpbm-10.26.18/editor/pnmcrop.c ---- netpbm-10.26.18.orig/editor/pnmcrop.c 2005-11-12 16:50:13.000000000 -0500 -+++ netpbm-10.26.18/editor/pnmcrop.c 2005-11-12 16:48:02.400004000 -0500 -@@ -28,7 +28,7 @@ - - enum bg_choice {BG_BLACK, BG_WHITE, BG_DEFAULT, BG_SIDES}; - --struct cmdline_info { -+static struct cmdline_info { - /* All the information the user supplied in the command line, - in a form easy for the program to use. - */ Deleted: csw/mgar/pkg/netpbm/trunk/files/netpbm-makefile.diff =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/netpbm-makefile.diff 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/files/netpbm-makefile.diff 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,66 +0,0 @@ -diff --speed-large-files --minimal -Nru netpbm-10.26.42.orig/GNUmakefile netpbm-10.26.42/GNUmakefile ---- netpbm-10.26.42.orig/GNUmakefile 2004-10-16 16:27:50.000000000 -0400 -+++ netpbm-10.26.42/GNUmakefile 2007-06-23 11:49:29.790538000 -0400 -@@ -177,7 +177,7 @@ - echo " make package PKGDIR=/tmp/newnetpbm "; \ - false; \ - fi -- mkdir $(PKGDIR) -+ mkdir -p $(PKGDIR) - echo "Netpbm install package made by 'make package'" \ - >$(PKGDIR)/pkginfo - date >>$(PKGDIR)/pkginfo -@@ -267,7 +267,7 @@ - netpbm:%:%.o $(OBJECT_DEP) $(NETPBMLIB) $(URTLIBDEP) $(LIBOPT) - # Note that LDFLAGS might contain -L options, so order is important. - $(LD) -o $@ $< $(OBJECT_LIST) \ -- $(LDFLAGS) `$(LIBOPT) $(NETPBMLIB) $(MERGELIBS)` \ -+ -L $(BUILDDIR)/lib $(LDFLAGS) `$(LIBOPT) $(NETPBMLIB) $(MERGELIBS)` \ - $(MATHLIB) $(NETWORKLD) $(LADD) - - netpbm.o: mergetrylist -diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/buildtools/Makefile.manpage netpbm-10.26.18/buildtools/Makefile.manpage ---- netpbm-10.26.18.orig/buildtools/Makefile.manpage 2005-11-12 20:53:22.000000000 -0500 -+++ netpbm-10.26.18/buildtools/Makefile.manpage 2005-11-12 20:52:49.040002000 -0500 -@@ -2,9 +2,9 @@ - - # Make Unix man pages from Netpbm HTML user manual - --MAKEMAN = makeman -+MAKEMAN = /export/home/damjan/csw/utils/netpbm/$(WORKSRC)/buildtools/makeman - --MANDIR = /usr/share/man/man1 -+MANDIR = $(DESTDIR)/share/man - - # These can convert to man pages cleanly - MAN1 = \ -@@ -343,13 +343,13 @@ - # This will install the generated man pages - installman: manpages - for f in $(MAN1); do \ -- if [ -f $$f ]; then gzip <$$f >$(MANDIR)/man1/$$f.gz; fi; \ -+ if [ -f $$f ]; then cat <$$f >$(MANDIR)/man1/$$f; fi; \ - done - for f in $(MAN3); do \ -- if [ -f $$f ]; then gzip <$$f >$(MANDIR)/man3/$$f.gz; fi; \ -+ if [ -f $$f ]; then cat <$$f >$(MANDIR)/man3/$$f; fi; \ - done - for f in $(MAN5); do \ -- if [ -f $$f ]; then gzip <$$f >$(MANDIR)/man5/$$f.gz; fi; \ -+ if [ -f $$f ]; then cat <$$f >$(MANDIR)/man5/$$f; fi; \ - done - # Clean up old locations on Fedora Core 2 - rm -f $(MANDIR)/man1/extendedopacity.1.gz -@@ -357,9 +357,9 @@ - rm -f $(MANDIR)/man3/libnetpbm_dir.3.gz - # remove pointer man pages (that say, "The man page isn't here") - # which might have been installed previously -- for f in $(MAN1); do rm -f $(MANDIR)/man1/$$f; done -- for f in $(MAN3); do rm -f $(MANDIR)/man3/$$f; done -- for f in $(MAN5); do rm -f $(MANDIR)/man5/$$f; done -+ # for f in $(MAN1); do rm -f $(MANDIR)/man1/$$f; done -+ # for f in $(MAN3); do rm -f $(MANDIR)/man3/$$f; done -+ # for f in $(MAN5); do rm -f $(MANDIR)/man5/$$f; done - - clean: - @rm -f *.[135] $(XML) Deleted: csw/mgar/pkg/netpbm/trunk/files/netpbm-pm_config.h.diff =================================================================== --- csw/mgar/pkg/netpbm/trunk/files/netpbm-pm_config.h.diff 2011-06-14 12:15:49 UTC (rev 14810) +++ csw/mgar/pkg/netpbm/trunk/files/netpbm-pm_config.h.diff 2011-06-14 12:37:13 UTC (rev 14811) @@ -1,52 +0,0 @@ -diff --speed-large-files --minimal -Nru netpbm-10.26.42.orig/pm_config.in.h netpbm-10.26.42/pm_config.in.h ---- netpbm-10.26.42.orig/pm_config.in.h 2004-08-24 17:21:46.000000000 -0400 -+++ netpbm-10.26.42/pm_config.in.h 2007-06-21 11:42:52.416466000 -0400 -@@ -30,6 +30,48 @@ - /* #define MSDOS */ - #endif - -+/* Add declarations which are not available in Solaris 8 */ -+#if defined(_CHAR_IS_SIGNED) -+typedef char int_fast8_t; -+#else -+#if defined(__STDC__) -+typedef signed char int_fast8_t; -+#endif -+#endif -+typedef int int_fast16_t; -+typedef int int_fast32_t; -+#ifdef _LP64 -+typedef long int_fast64_t; -+#else /* _ILP32 */ -+typedef long long int_fast64_t; -+#endif -+ -+typedef unsigned char uint_fast8_t; -+typedef unsigned int uint_fast16_t; -+typedef unsigned int uint_fast32_t; -+#ifdef _LP64 -+typedef unsigned long uint_fast64_t; -+#else /* _ILP32 */ -+typedef unsigned long long uint_fast64_t; -+#endif -+ -+#if defined(_CHAR_IS_SIGNED) || defined(__STDC__) -+#define INT_FAST8_MAX INT8_MAX -+#endif -+#define INT_FAST16_MAX INT16_MAX -+#define INT_FAST32_MAX INT32_MAX -+#ifdef INT64_MAX -+#define INT_FAST64_MAX INT64_MAX -+#endif -+ -+#define UINT_FAST8_MAX UINT8_MAX -+#define UINT_FAST16_MAX UINT16_MAX -+#define UINT_FAST32_MAX UINT32_MAX -+#ifdef UINT64_MAX -+#define UINT_FAST64_MAX UINT64_MAX -+#endif -+ -+ - /* Switch macros like _POSIX_SOURCE are supposed to add features from - the indicated standard to the C library. A source file defines one - of these macros to declare that it uses features of that standard 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 Jun 14 16:26:09 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 14 Jun 2011 14:26:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[14812] csw/mgar/pkg/xmms/trunk Message-ID: Revision: 14812 http://gar.svn.sourceforge.net/gar/?rev=14812&view=rev Author: dmichelsen Date: 2011-06-14 14:26:09 +0000 (Tue, 14 Jun 2011) Log Message: ----------- xmms: Split packages Modified Paths: -------------- csw/mgar/pkg/xmms/trunk/Makefile csw/mgar/pkg/xmms/trunk/checksums Modified: csw/mgar/pkg/xmms/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmms/trunk/Makefile 2011-06-14 12:37:13 UTC (rev 14811) +++ csw/mgar/pkg/xmms/trunk/Makefile 2011-06-14 14:26:09 UTC (rev 14812) @@ -6,7 +6,7 @@ VERSION = 1.2.11 CATEGORIES = gnome -DESCRIPTION = The X MultiMedia System. +DESCRIPTION = The X MultiMedia System define BLURB XMMS is a multimedia player based on the look of WinAmp. XMMS plays MPEG layer 1/2/3, Ogg Vorbis, WAV, all formats supported by libmikmod, and CD audio. XMMS @@ -16,8 +16,33 @@ MASTER_SITES = http://www.xmms.org/files/1.2.x/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +PACKAGES += CSWlibxmms1 +SPKG_DESC_CSWlibxmms1 += The X MultiMedia System library, libxmms.so.1 +PKGFILES_CSWlibxmms1 += $(call pkgfiles_lib,libxmms.so.1) +RUNTIME_DEP_PKGS_CSWlibxmms1 += CSWglib +RUNTIME_DEP_PKGS_CSWlibxmms1 += CSWgtk + +PACKAGES += CSWlibxmms-dev +SPKG_DESC_CSWlibxmms-dev = Development files for libxmms.so.1 +PKGFILES_CSWlibxmms-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibxmms-dev += CSWlibxmms1 + +PACKAGES += CSWxmms +SPKG_DESC_CSWxmms = The X MultiMedia System +RUNTIME_DEP_PKGS_CSWxmms += CSWlibxmms1 +RUNTIME_DEP_PKGS_CSWxmms += CSWiconv +RUNTIME_DEP_PKGS_CSWxmms += CSWzlib +RUNTIME_DEP_PKGS_CSWxmms += CSWmesa +RUNTIME_DEP_PKGS_CSWxmms += CSWglib +RUNTIME_DEP_PKGS_CSWxmms += CSWmikmod +RUNTIME_DEP_PKGS_CSWxmms += CSWgtk +RUNTIME_DEP_PKGS_CSWxmms += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWxmms += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWxmms += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWxmms += CSWlibvorbisfile3 +RUNTIME_DEP_PKGS_CSWxmms += CSWlibesd0 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-glib-prefix=$(prefix) CONFIGURE_ARGS += --with-gtk-prefix=$(prefix) @@ -30,15 +55,4 @@ # No test suite TEST_SCRIPTS = -RUNTIME_DEP_PKGS_CSWxmms += CSWglib -RUNTIME_DEP_PKGS_CSWxmms += CSWmesa -RUNTIME_DEP_PKGS_CSWxmms += CSWesound -RUNTIME_DEP_PKGS_CSWxmms += CSWvorbis -RUNTIME_DEP_PKGS_CSWxmms += CSWlibogg -RUNTIME_DEP_PKGS_CSWxmms += CSWmikmod -RUNTIME_DEP_PKGS_CSWxmms += CSWiconv -RUNTIME_DEP_PKGS_CSWxmms += CSWgtk -RUNTIME_DEP_PKGS_CSWxmms += CSWzlib -RUNTIME_DEP_PKGS_CSWxmms += CSWggettextrt - include gar/category.mk Modified: csw/mgar/pkg/xmms/trunk/checksums =================================================================== --- csw/mgar/pkg/xmms/trunk/checksums 2011-06-14 12:37:13 UTC (rev 14811) +++ csw/mgar/pkg/xmms/trunk/checksums 2011-06-14 14:26:09 UTC (rev 14812) @@ -1 +1 @@ -f3e6dbaf0b3f571a532ab575656be506 download/xmms-1.2.11.tar.bz2 +f3e6dbaf0b3f571a532ab575656be506 xmms-1.2.11.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Jun 14 22:39:03 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 14 Jun 2011 20:39:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14813] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 14813 http://gar.svn.sourceforge.net/gar/?rev=14813&view=rev Author: bonivart Date: 2011-06-14 20:39:03 +0000 (Tue, 14 Jun 2011) Log Message: ----------- sendmail/trunk: fix usergroup, cpsampleconf Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/sendmail/trunk/files/COPYING Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-14 14:26:09 UTC (rev 14812) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-14 20:39:03 UTC (rev 14813) @@ -1,5 +1,11 @@ # $Id$ +# - post message + +# + cpsample conf files +# + remove COPYING file +# + copy usergroup file into place + NAME = sendmail VERSION = 8.14.5 CATEGORIES = server @@ -42,6 +48,15 @@ RUNTIME_DEP_PKGS_CSWsendmail += CSWtcpwrap INITSMF = /etc/opt/csw/init.d/cswsendmail +SAMPLECONF = /etc/opt/csw/mail/aliases.CSW +SAMPLECONF += /etc/opt/csw/mail/helpfile.CSW +SAMPLECONF += /etc/opt/csw/mail/local-host-names.CSW +SAMPLECONF += /etc/opt/csw/mail/README.CSW +SAMPLECONF += /etc/opt/csw/mail/sendmail.cf.CSW +SAMPLECONF += /etc/opt/csw/mail/sm-client.st.CSW +SAMPLECONF += /etc/opt/csw/mail/statistics.CSW +SAMPLECONF += /etc/opt/csw/mail/submit.cf.CSW +SAMPLECONF += /etc/opt/csw/mail/trusted-users.CSW USERGROUP = /etc/opt/csw/pkg/CSWsendmail/cswusergroup # Enable support for files > 2GB in size. @@ -187,6 +202,8 @@ done ) ( mv $(DESTDIR)$(sysconfdir)/mail/sm-client.st.CSW \ $(DESTDIR)/var/opt/csw/spool/clientmqueue/ ) + @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail + @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail/ @$(MAKECOOKIE) merge-OS: Deleted: csw/mgar/pkg/sendmail/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/COPYING 2011-06-14 14:26:09 UTC (rev 14812) +++ csw/mgar/pkg/sendmail/trunk/files/COPYING 2011-06-14 20:39:03 UTC (rev 14813) @@ -1,81 +0,0 @@ - SENDMAIL LICENSE - -The following license terms and conditions apply, unless a redistribution -agreement or other license is obtained from Sendmail, Inc., 6475 Christie -Ave, Third Floor, Emeryville, CA 94608, USA, or by electronic mail at -license at sendmail.com. - -License Terms: - -Use, Modification and Redistribution (including distribution of any -modified or derived work) in source and binary forms is permitted only if -each of the following conditions is met: - -1. Redistributions qualify as "freeware" or "Open Source Software" under - one of the following terms: - - (a) Redistributions are made at no charge beyond the reasonable cost of - materials and delivery. - - (b) Redistributions are accompanied by a copy of the Source Code or by an - irrevocable offer to provide a copy of the Source Code for up to three - years at the cost of materials and delivery. Such redistributions - must allow further use, modification, and redistribution of the Source - Code under substantially the same terms as this license. For the - purposes of redistribution "Source Code" means the complete compilable - and linkable source code of sendmail and associated libraries and - utilities in the sendmail distribution including all modifications. - -2. Redistributions of Source Code must retain the copyright notices as they - appear in each Source Code file, these license terms, and the - disclaimer/limitation of liability set forth as paragraph 6 below. - -3. Redistributions in binary form must reproduce the Copyright Notice, - these license terms, and the disclaimer/limitation of liability set - forth as paragraph 6 below, in the documentation and/or other materials - provided with the distribution. For the purposes of binary distribution - the "Copyright Notice" refers to the following language: - "Copyright (c) 1998-2010 Sendmail, Inc. All rights reserved." - -4. Neither the name of Sendmail, Inc. nor the University of California nor - names of their contributors may be used to endorse or promote - products derived from this software without specific prior written - permission. The name "sendmail" is a trademark of Sendmail, Inc. - -5. All redistributions must comply with the conditions imposed by the - University of California on certain embedded code, which copyright - Notice and conditions for redistribution are as follows: - - (a) Copyright (c) 1988, 1993 The Regents of the University of - California. All rights reserved. - - (b) Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - (i) Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - (ii) Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - (iii) Neither the name of the University nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -6. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY - SENDMAIL, INC. AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - NO EVENT SHALL SENDMAIL, INC., THE REGENTS OF THE UNIVERSITY OF - CALIFORNIA OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -$Revision: 8.17 $, Last updated $Date: 2010/12/03 01:10:00 $, Document 139848.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Jun 15 04:04:31 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 15 Jun 2011 02:04:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14814] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14814 http://gar.svn.sourceforge.net/gar/?rev=14814&view=rev Author: bdwalton Date: 2011-06-15 02:04:31 +0000 (Wed, 15 Jun 2011) Log Message: ----------- php5/trunk: tweak the deps for the curl subpackage Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-06-14 20:39:03 UTC (rev 14813) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-06-15 02:04:31 UTC (rev 14814) @@ -140,7 +140,7 @@ $(eval $(call php5_subpackage,bz2,CSWbzip2)) $(eval $(call php5_subpackage,calendar)) $(eval $(call php5_subpackage,ctype)) -$(eval $(call php5_subpackage,curl,CSWcurlrt CSWlibidn11 CSWoldaprt CSWosslrt CSWzlib CSWlibcares2)) +$(eval $(call php5_subpackage,curl,CSWlibcurl4 CSWlibidn11 CSWosslrt CSWzlib)) $(eval $(call php5_subpackage,dba,CSWlibgdbm3 CSWbdb42)) $(eval $(call php5_subpackage,dom,CSWiconv CSWlibxml2-2 CSWzlib)) PKGFILES_CSWphp5-dom += .*include/php/ext/dom.* 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 Jun 15 10:04:04 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 Jun 2011 08:04:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[14815] csw/mgar/pkg/sendmail/trunk/Makefile Message-ID: Revision: 14815 http://gar.svn.sourceforge.net/gar/?rev=14815&view=rev Author: bonivart Date: 2011-06-15 08:04:03 +0000 (Wed, 15 Jun 2011) Log Message: ----------- sendmail/trunk: fix sampleconf Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-15 02:04:31 UTC (rev 14814) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-15 08:04:03 UTC (rev 14815) @@ -1,6 +1,7 @@ # $Id$ # - post message +# - libmilter # + cpsample conf files # + remove COPYING file @@ -48,15 +49,15 @@ RUNTIME_DEP_PKGS_CSWsendmail += CSWtcpwrap INITSMF = /etc/opt/csw/init.d/cswsendmail -SAMPLECONF = /etc/opt/csw/mail/aliases.CSW -SAMPLECONF += /etc/opt/csw/mail/helpfile.CSW -SAMPLECONF += /etc/opt/csw/mail/local-host-names.CSW -SAMPLECONF += /etc/opt/csw/mail/README.CSW -SAMPLECONF += /etc/opt/csw/mail/sendmail.cf.CSW -SAMPLECONF += /etc/opt/csw/mail/sm-client.st.CSW -SAMPLECONF += /etc/opt/csw/mail/statistics.CSW -SAMPLECONF += /etc/opt/csw/mail/submit.cf.CSW -SAMPLECONF += /etc/opt/csw/mail/trusted-users.CSW +SAMPLECONF = /etc/opt/csw/mail/aliases +SAMPLECONF += /etc/opt/csw/mail/helpfile +SAMPLECONF += /etc/opt/csw/mail/local-host-names +SAMPLECONF += /etc/opt/csw/mail/README +SAMPLECONF += /etc/opt/csw/mail/sendmail.cf +SAMPLECONF += /etc/opt/csw/mail/sm-client.st +SAMPLECONF += /etc/opt/csw/mail/statistics +SAMPLECONF += /etc/opt/csw/mail/submit.cf +SAMPLECONF += /etc/opt/csw/mail/trusted-users USERGROUP = /etc/opt/csw/pkg/CSWsendmail/cswusergroup # Enable support for files > 2GB in size. @@ -123,6 +124,8 @@ MANFILES8 = sendmail/sendmail.8 mailstats/mailstats.8 makemap/makemap.8 \ praliases/praliases.8 smrsh/smrsh.8 mail.local/mail.local.8 \ rmail/rmail.8 editmap/editmap.8 +CONFFILES = aliases helpfile local-host-names README sendmail.cf \ + sm-client.st statistics submit.cf trusted-users configure-custom: @echo " ==> Configuring $(NAME) (custom)" @@ -196,8 +199,8 @@ cp -p $(DOWNLOADDIR)/cswsendmail $(DESTDIR)/etc/opt/csw/init.d @# install configurations, XXX missing submit.cf/sendmail.cf - ( for file in `cd $(DOWNLOADDIR) && ls *.CSW`; do \ - ginstall -m 644 $(DOWNLOADDIR)/$$file \ + ( for file in $(CONFFILES) ; do \ + ginstall -m 644 $(DOWNLOADDIR)/$$file \ $(DESTDIR)$(sysconfdir)/mail/$$file; \ done ) ( mv $(DESTDIR)$(sysconfdir)/mail/sm-client.st.CSW \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jun 15 10:41:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 15 Jun 2011 08:41:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14816] csw/mgar/pkg/cpan/Text-CSV_XS/trunk Message-ID: Revision: 14816 http://gar.svn.sourceforge.net/gar/?rev=14816&view=rev Author: dmichelsen Date: 2011-06-15 08:41:49 +0000 (Wed, 15 Jun 2011) Log Message: ----------- cpan/Text-CSV_XS/trunk: Fixup Modified Paths: -------------- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums Modified: csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2011-06-15 08:04:03 UTC (rev 14815) +++ csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2011-06-15 08:41:49 UTC (rev 14816) @@ -1,5 +1,5 @@ NAME = Text-CSV_XS -VERSION = 0.70 +VERSION = 0.81 CATEGORIES = cpan AUTHOR = HMBRAND @@ -10,13 +10,17 @@ fields into a CSV string and parse a CSV string into fields. endef -PACKAGES = CSWpmtextcsvxs -CATALOGNAME = pm_textcsvxs +# This module uses .tgz instead of .tar.gz :-( +MODDIST = $(NAME)-$(VERSION).tgz +PACKAGES = CSWpm-text-csv-xs +CATALOGNAME = pm_text_csv_xs +SPKG_DESC_CSWpm-text-csv-xs = Comma-separated values manipulation routines +OBSOLETED_BY_CSWpm-text-csv-xs = CSWpmtextcsvxs +RUNTIME_DEP_PKGS_CSWpm-text-csv-xs = CSWpm-text-csv + # This was the previous name. Note the typo! INCOMPATIBLE_PKGS = CSWpmttextcsvxs -# This module uses .tgz instead of .tar.gz :-( -MODDIST = $(NAME)-$(VERSION).tgz include gar/category.mk Modified: csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums 2011-06-15 08:04:03 UTC (rev 14815) +++ csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums 2011-06-15 08:41:49 UTC (rev 14816) @@ -1 +1 @@ -93b7d88ddd8b8f616efcf75239b68290 Text-CSV_XS-0.70.tgz +1819e3d443f1611c8d0a0fb0ab4a17c7 Text-CSV_XS-0.81.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Jun 15 10:47:17 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 Jun 2011 08:47:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14817] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 14817 http://gar.svn.sourceforge.net/gar/?rev=14817&view=rev Author: bonivart Date: 2011-06-15 08:47:17 +0000 (Wed, 15 Jun 2011) Log Message: ----------- sendmail/trunk: more fixes for sampleconf Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/sendmail/trunk/files/aliases csw/mgar/pkg/sendmail/trunk/files/helpfile csw/mgar/pkg/sendmail/trunk/files/local-host-names csw/mgar/pkg/sendmail/trunk/files/sendmail.cf csw/mgar/pkg/sendmail/trunk/files/sm-client.st csw/mgar/pkg/sendmail/trunk/files/statistics csw/mgar/pkg/sendmail/trunk/files/submit.cf csw/mgar/pkg/sendmail/trunk/files/trusted-users Removed Paths: ------------- csw/mgar/pkg/sendmail/trunk/files/aliases.CSW csw/mgar/pkg/sendmail/trunk/files/helpfile.CSW csw/mgar/pkg/sendmail/trunk/files/local-host-names.CSW csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW csw/mgar/pkg/sendmail/trunk/files/sm-client.st.CSW csw/mgar/pkg/sendmail/trunk/files/statistics.CSW csw/mgar/pkg/sendmail/trunk/files/submit.cf.CSW csw/mgar/pkg/sendmail/trunk/files/trusted-users.CSW Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-15 08:41:49 UTC (rev 14816) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-15 08:47:17 UTC (rev 14817) @@ -28,9 +28,11 @@ DISTFILES = $(NAME).$(VERSION).tar.gz DISTFILES += Sun-sendmail-deactivate.sh Sun-sendmail-reactivate.sh -DISTFILES += $(foreach FILE,$(shell cd $(FILEDIR) && ls *.CSW),$(FILE)) +DISTFILES += aliases helpfile local-host-names sendmail.cf +DISTFILES += sm-client.st statistics submit.cf trusted-users DISTFILES += README.CSW sendmail.schema DISTFILES += cswsendmail site.config.m4 +#DISTFILES += $(foreach FILE,$(shell cd $(FILEDIR) && ls *.CSW),$(FILE)) #DISTFILES += CSWsendmail.preremove CSWsendmail.preinstall CSWsendmail.space #DISTFILES += cswsendmail site.config.m4 $(MY_CLASSES) CSWsendmail.checkinstall #DISTFILES += README.CSW sendmail.schema CSWsendmail.postinstall @@ -52,7 +54,6 @@ SAMPLECONF = /etc/opt/csw/mail/aliases SAMPLECONF += /etc/opt/csw/mail/helpfile SAMPLECONF += /etc/opt/csw/mail/local-host-names -SAMPLECONF += /etc/opt/csw/mail/README SAMPLECONF += /etc/opt/csw/mail/sendmail.cf SAMPLECONF += /etc/opt/csw/mail/sm-client.st SAMPLECONF += /etc/opt/csw/mail/statistics @@ -124,7 +125,7 @@ MANFILES8 = sendmail/sendmail.8 mailstats/mailstats.8 makemap/makemap.8 \ praliases/praliases.8 smrsh/smrsh.8 mail.local/mail.local.8 \ rmail/rmail.8 editmap/editmap.8 -CONFFILES = aliases helpfile local-host-names README sendmail.cf \ +CONFFILES = aliases helpfile local-host-names README.CSW sendmail.cf \ sm-client.st statistics submit.cf trusted-users configure-custom: @@ -203,10 +204,13 @@ ginstall -m 644 $(DOWNLOADDIR)/$$file \ $(DESTDIR)$(sysconfdir)/mail/$$file; \ done ) - ( mv $(DESTDIR)$(sysconfdir)/mail/sm-client.st.CSW \ + ( mv $(DESTDIR)$(sysconfdir)/mail/sm-client.st \ $(DESTDIR)/var/opt/csw/spool/clientmqueue/ ) + + @# usergroup @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail/ + @$(MAKECOOKIE) merge-OS: Copied: csw/mgar/pkg/sendmail/trunk/files/aliases (from rev 14812, csw/mgar/pkg/sendmail/trunk/files/aliases.CSW) =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/aliases (rev 0) +++ csw/mgar/pkg/sendmail/trunk/files/aliases 2011-06-15 08:47:17 UTC (rev 14817) @@ -0,0 +1,65 @@ +# +# $Id: aliases,v 8.5 2002/06/05 22:54:26 gshapiro Exp $ +# @(#)aliases 8.2 (Berkeley) 3/5/94 +# +# Aliases in this file will NOT be expanded in the header from +# Mail, but WILL be visible over networks. +# +# >>>>>>>>>> The program "newaliases" must be run after +# >> NOTE >> this file is updated for any changes to +# >>>>>>>>>> show through to sendmail. +# +# +# See also RFC 2142, `MAILBOX NAMES FOR COMMON SERVICES, ROLES +# AND FUNCTIONS', May 1997 + +# Pretty much everything else in this file points to "root", so +# you should forward root's email to the system administrator. +# Delivering mail to root's mailbox or reading mail as root is +# inadvisable. + +# Uncomment and *CHANGE* this! +# root: insert-human-being-here + +# Basic system aliases -- these MUST be present +MAILER-DAEMON: postmaster +postmaster: root + +# General redirections for pseudo accounts +bin: root +daemon: root +games: root +mailnull: postmaster +smmsp: postmaster +ingres: root +nobody: root +system: root +toor: root + +# Well-known aliases +manager: root +dumper: root +operator: root + +# RFC 2142: BUSINESS-RELATED MAILBOX NAMES +# info: root +# marketing: root +# sales: root +# support: root + +# RFC 2142: NETWORK OPERATIONS MAILBOX NAMES +abuse: root +noc: root +security: root + +# RFC 2142: SUPPORT MAILBOX NAMES FOR SPECIFIC INTERNET SERVICES +hostmaster: root +usenet: root +news: usenet +webmaster: root +www: webmaster +uucp: root +ftp: root + +# Trap decode to catch security attacks +decode: root Deleted: csw/mgar/pkg/sendmail/trunk/files/aliases.CSW =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/aliases.CSW 2011-06-15 08:41:49 UTC (rev 14816) +++ csw/mgar/pkg/sendmail/trunk/files/aliases.CSW 2011-06-15 08:47:17 UTC (rev 14817) @@ -1,65 +0,0 @@ -# -# $Id: aliases,v 8.5 2002/06/05 22:54:26 gshapiro Exp $ -# @(#)aliases 8.2 (Berkeley) 3/5/94 -# -# Aliases in this file will NOT be expanded in the header from -# Mail, but WILL be visible over networks. -# -# >>>>>>>>>> The program "newaliases" must be run after -# >> NOTE >> this file is updated for any changes to -# >>>>>>>>>> show through to sendmail. -# -# -# See also RFC 2142, `MAILBOX NAMES FOR COMMON SERVICES, ROLES -# AND FUNCTIONS', May 1997 - -# Pretty much everything else in this file points to "root", so -# you should forward root's email to the system administrator. -# Delivering mail to root's mailbox or reading mail as root is -# inadvisable. - -# Uncomment and *CHANGE* this! -# root: insert-human-being-here - -# Basic system aliases -- these MUST be present -MAILER-DAEMON: postmaster -postmaster: root - -# General redirections for pseudo accounts -bin: root -daemon: root -games: root -mailnull: postmaster -smmsp: postmaster -ingres: root -nobody: root -system: root -toor: root - -# Well-known aliases -manager: root -dumper: root -operator: root - -# RFC 2142: BUSINESS-RELATED MAILBOX NAMES -# info: root -# marketing: root -# sales: root -# support: root - -# RFC 2142: NETWORK OPERATIONS MAILBOX NAMES -abuse: root -noc: root -security: root - -# RFC 2142: SUPPORT MAILBOX NAMES FOR SPECIFIC INTERNET SERVICES -hostmaster: root -usenet: root -news: usenet -webmaster: root -www: webmaster -uucp: root -ftp: root - -# Trap decode to catch security attacks -decode: root Copied: csw/mgar/pkg/sendmail/trunk/files/helpfile (from rev 14812, csw/mgar/pkg/sendmail/trunk/files/helpfile.CSW) =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/helpfile (rev 0) +++ csw/mgar/pkg/sendmail/trunk/files/helpfile 2011-06-15 08:47:17 UTC (rev 14817) @@ -0,0 +1,137 @@ +#vers 2 +cpyr +cpyr Copyright (c) 1998-2000, 2002, 2004-2007 Sendmail, Inc. and its suppliers. +cpyr All rights reserved. +cpyr Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. +cpyr Copyright (c) 1988, 1993 +cpyr The Regents of the University of California. All rights reserved. +cpyr +cpyr +cpyr By using this file, you agree to the terms and conditions set +cpyr forth in the LICENSE file which can be found at the top level of +cpyr the sendmail distribution. +cpyr +cpyr $$Id: helpfile,v 8.48 2007/02/01 18:29:44 ca Exp $$ +cpyr +smtp This is sendmail version $v +smtp Topics: +smtp HELO EHLO MAIL RCPT DATA +smtp RSET NOOP QUIT HELP VRFY +smtp EXPN VERB ETRN DSN AUTH +smtp STARTTLS +smtp For more info use "HELP ". +smtp To report bugs in the implementation see +smtp http://www.sendmail.org/email-addresses.html +smtp For local information send email to Postmaster at your site. +help HELP [ ] +help The HELP command gives help info. +helo HELO +helo Introduce yourself. +ehlo EHLO +ehlo Introduce yourself, and request extended SMTP mode. +ehlo Possible replies include: +ehlo SEND Send as mail [RFC821] +ehlo SOML Send as mail or terminal [RFC821] +ehlo SAML Send as mail and terminal [RFC821] +ehlo EXPN Expand the mailing list [RFC821] +ehlo HELP Supply helpful information [RFC821] +ehlo TURN Turn the operation around [RFC821] +ehlo 8BITMIME Use 8-bit data [RFC1652] +ehlo SIZE Message size declaration [RFC1870] +ehlo VERB Verbose [Allman] +ehlo CHUNKING Chunking [RFC1830] +ehlo BINARYMIME Binary MIME [RFC1830] +ehlo PIPELINING Command Pipelining [RFC1854] +ehlo DSN Delivery Status Notification [RFC1891] +ehlo ETRN Remote Message Queue Starting [RFC1985] +ehlo STARTTLS Secure SMTP [RFC2487] +ehlo AUTH Authentication [RFC2554] +ehlo ENHANCEDSTATUSCODES Enhanced status codes [RFC2034] +ehlo DELIVERBY Deliver By [RFC2852] +mail MAIL From: [ ] +mail Specifies the sender. Parameters are ESMTP extensions. +mail See "HELP DSN" for details. +rcpt RCPT To: [ ] +rcpt Specifies the recipient. Can be used any number of times. +rcpt Parameters are ESMTP extensions. See "HELP DSN" for details. +data DATA +data Following text is collected as the message. +data End with a single dot. +rset RSET +rset Resets the system. +quit QUIT +quit Exit sendmail (SMTP). +auth AUTH mechanism [initial-response] +auth Start authentication. +starttls STARTTLS +starttls Start TLS negotiation. +verb VERB +verb Go into verbose mode. This sends 0xy responses that are +verb not RFC821 standard (but should be) They are recognized +verb by humans and other sendmail implementations. +vrfy VRFY +vrfy Verify an address. If you want to see what it aliases +vrfy to, use EXPN instead. +expn EXPN +expn Expand an address. If the address indicates a mailing +expn list, return the contents of that list. +noop NOOP +noop Do nothing. +send SEND FROM: +send replaces the MAIL command, and can be used to send +send directly to a users terminal. Not supported in this +send implementation. +soml SOML FROM: +soml Send or mail. If the user is logged in, send directly, +soml otherwise mail. Not supported in this implementation. +saml SAML FROM: +saml Send and mail. Send directly to the user's terminal, +saml and also mail a letter. Not supported in this +saml implementation. +turn TURN +turn Reverses the direction of the connection. Not currently +turn implemented. +etrn ETRN [ | @ | \# ] +etrn Run the queue for the specified , or +etrn all hosts within a given , or a specially-named +etrn (implementation-specific). +dsn MAIL From: [ RET={ FULL | HDRS} ] [ ENVID= ] +dsn RCPT To: [ NOTIFY={NEVER,SUCCESS,FAILURE,DELAY} ] +dsn [ ORCPT= ] +dsn SMTP Delivery Status Notifications. +dsn Descriptions: +dsn RET Return either the full message or only headers. +dsn ENVID Sender's "envelope identifier" for tracking. +dsn NOTIFY When to send a DSN. Multiple options are OK, comma- +dsn delimited. NEVER must appear by itself. +dsn ORCPT Original recipient. +-bt Help for test mode: +-bt ? :this help message. +-bt .Dmvalue :define macro `m' to `value'. +-bt .Ccvalue :add `value' to class `c'. +-bt =Sruleset :dump the contents of the indicated ruleset. +-bt =M :display the known mailers. +-bt -ddebug-spec :equivalent to the command-line -d debug flag. +-bt $$m :print the value of macro $$m. +-bt $$=c :print the contents of class $$=c. +-bt /mx host :returns the MX records for `host'. +-bt /parse address :parse address, returning the value of crackaddr, and +-bt the parsed address. +-bt /try mailer addr :rewrite address into the form it will have when +-bt presented to the indicated mailer. +-bt /tryflags flags :set flags used by parsing. The flags can be `H' for +-bt Header or `E' for Envelope, and `S' for Sender or `R' +-bt for Recipient. These can be combined, `HR' sets +-bt flags for header recipients. +-bt /canon hostname :try to canonify hostname. +-bt /map mapname key :look up `key' in the indicated `mapname'. +-bt /quit :quit address test mode. +-bt rules addr :run the indicated address through the named rules. +-bt Rules can be a comma separated list of rules. +control Help for smcontrol: +control help This message. +control restart Restart sendmail. +control shutdown Shutdown sendmail. +control status Show sendmail status. +control mstat Show sendmail status (machine readable format). +control memdump Dump allocated memory list (for debugging only). Deleted: csw/mgar/pkg/sendmail/trunk/files/helpfile.CSW =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/helpfile.CSW 2011-06-15 08:41:49 UTC (rev 14816) +++ csw/mgar/pkg/sendmail/trunk/files/helpfile.CSW 2011-06-15 08:47:17 UTC (rev 14817) @@ -1,137 +0,0 @@ -#vers 2 -cpyr -cpyr Copyright (c) 1998-2000, 2002, 2004-2007 Sendmail, Inc. and its suppliers. -cpyr All rights reserved. -cpyr Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. -cpyr Copyright (c) 1988, 1993 -cpyr The Regents of the University of California. All rights reserved. -cpyr -cpyr -cpyr By using this file, you agree to the terms and conditions set -cpyr forth in the LICENSE file which can be found at the top level of -cpyr the sendmail distribution. -cpyr -cpyr $$Id: helpfile,v 8.48 2007/02/01 18:29:44 ca Exp $$ -cpyr -smtp This is sendmail version $v -smtp Topics: -smtp HELO EHLO MAIL RCPT DATA -smtp RSET NOOP QUIT HELP VRFY -smtp EXPN VERB ETRN DSN AUTH -smtp STARTTLS -smtp For more info use "HELP ". -smtp To report bugs in the implementation see -smtp http://www.sendmail.org/email-addresses.html -smtp For local information send email to Postmaster at your site. -help HELP [ ] -help The HELP command gives help info. -helo HELO -helo Introduce yourself. -ehlo EHLO -ehlo Introduce yourself, and request extended SMTP mode. -ehlo Possible replies include: -ehlo SEND Send as mail [RFC821] -ehlo SOML Send as mail or terminal [RFC821] -ehlo SAML Send as mail and terminal [RFC821] -ehlo EXPN Expand the mailing list [RFC821] -ehlo HELP Supply helpful information [RFC821] -ehlo TURN Turn the operation around [RFC821] -ehlo 8BITMIME Use 8-bit data [RFC1652] -ehlo SIZE Message size declaration [RFC1870] -ehlo VERB Verbose [Allman] -ehlo CHUNKING Chunking [RFC1830] -ehlo BINARYMIME Binary MIME [RFC1830] -ehlo PIPELINING Command Pipelining [RFC1854] -ehlo DSN Delivery Status Notification [RFC1891] -ehlo ETRN Remote Message Queue Starting [RFC1985] -ehlo STARTTLS Secure SMTP [RFC2487] -ehlo AUTH Authentication [RFC2554] -ehlo ENHANCEDSTATUSCODES Enhanced status codes [RFC2034] -ehlo DELIVERBY Deliver By [RFC2852] -mail MAIL From: [ ] -mail Specifies the sender. Parameters are ESMTP extensions. -mail See "HELP DSN" for details. -rcpt RCPT To: [ ] -rcpt Specifies the recipient. Can be used any number of times. -rcpt Parameters are ESMTP extensions. See "HELP DSN" for details. -data DATA -data Following text is collected as the message. -data End with a single dot. -rset RSET -rset Resets the system. -quit QUIT -quit Exit sendmail (SMTP). -auth AUTH mechanism [initial-response] -auth Start authentication. -starttls STARTTLS -starttls Start TLS negotiation. -verb VERB -verb Go into verbose mode. This sends 0xy responses that are -verb not RFC821 standard (but should be) They are recognized -verb by humans and other sendmail implementations. -vrfy VRFY -vrfy Verify an address. If you want to see what it aliases -vrfy to, use EXPN instead. -expn EXPN -expn Expand an address. If the address indicates a mailing -expn list, return the contents of that list. -noop NOOP -noop Do nothing. -send SEND FROM: -send replaces the MAIL command, and can be used to send -send directly to a users terminal. Not supported in this -send implementation. -soml SOML FROM: -soml Send or mail. If the user is logged in, send directly, -soml otherwise mail. Not supported in this implementation. -saml SAML FROM: -saml Send and mail. Send directly to the user's terminal, -saml and also mail a letter. Not supported in this -saml implementation. -turn TURN -turn Reverses the direction of the connection. Not currently -turn implemented. -etrn ETRN [ | @ | \# ] -etrn Run the queue for the specified , or -etrn all hosts within a given , or a specially-named -etrn (implementation-specific). -dsn MAIL From: [ RET={ FULL | HDRS} ] [ ENVID= ] -dsn RCPT To: [ NOTIFY={NEVER,SUCCESS,FAILURE,DELAY} ] -dsn [ ORCPT= ] -dsn SMTP Delivery Status Notifications. -dsn Descriptions: -dsn RET Return either the full message or only headers. -dsn ENVID Sender's "envelope identifier" for tracking. -dsn NOTIFY When to send a DSN. Multiple options are OK, comma- -dsn delimited. NEVER must appear by itself. -dsn ORCPT Original recipient. --bt Help for test mode: --bt ? :this help message. --bt .Dmvalue :define macro `m' to `value'. --bt .Ccvalue :add `value' to class `c'. --bt =Sruleset :dump the contents of the indicated ruleset. --bt =M :display the known mailers. --bt -ddebug-spec :equivalent to the command-line -d debug flag. --bt $$m :print the value of macro $$m. --bt $$=c :print the contents of class $$=c. --bt /mx host :returns the MX records for `host'. --bt /parse address :parse address, returning the value of crackaddr, and --bt the parsed address. --bt /try mailer addr :rewrite address into the form it will have when --bt presented to the indicated mailer. --bt /tryflags flags :set flags used by parsing. The flags can be `H' for --bt Header or `E' for Envelope, and `S' for Sender or `R' --bt for Recipient. These can be combined, `HR' sets --bt flags for header recipients. --bt /canon hostname :try to canonify hostname. --bt /map mapname key :look up `key' in the indicated `mapname'. --bt /quit :quit address test mode. --bt rules addr :run the indicated address through the named rules. --bt Rules can be a comma separated list of rules. -control Help for smcontrol: -control help This message. -control restart Restart sendmail. -control shutdown Shutdown sendmail. -control status Show sendmail status. -control mstat Show sendmail status (machine readable format). -control memdump Dump allocated memory list (for debugging only). Copied: csw/mgar/pkg/sendmail/trunk/files/local-host-names (from rev 14812, csw/mgar/pkg/sendmail/trunk/files/local-host-names.CSW) =================================================================== Deleted: csw/mgar/pkg/sendmail/trunk/files/local-host-names.CSW =================================================================== Copied: csw/mgar/pkg/sendmail/trunk/files/sendmail.cf (from rev 14812, csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW) =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/sendmail.cf (rev 0) +++ csw/mgar/pkg/sendmail/trunk/files/sendmail.cf 2011-06-15 08:47:17 UTC (rev 14817) @@ -0,0 +1,1467 @@ +# +# Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers. +# All rights reserved. +# Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved. +# Copyright (c) 1988, 1993 +# The Regents of the University of California. All rights reserved. +# +# By using this file, you agree to the terms and conditions set +# forth in the LICENSE file which can be found at the top level of +# the sendmail distribution. +# +# + +###################################################################### +###################################################################### +##### +##### SENDMAIL CONFIGURATION FILE +##### +##### built by dt73646 at rc-osg-revo on Thu Jul 30 16:59:32 CDT 2009 +##### in /dst/home/dt73646/opencsw/mgar/pkg/sendmail/trunk/work/build-isa-sparcv8/sendmail-8.14.3/cf/cf +##### using ../ as configuration include directory +##### +###################################################################### +##### +##### DO NOT EDIT THIS FILE! Only edit the source .mc file. +##### +###################################################################### +###################################################################### + +##### $Id: cfhead.m4,v 8.116 2004/01/28 22:02:22 ca Exp $ ##### +##### $Id: cf.m4,v 8.32 1999/02/07 07:26:14 gshapiro Exp $ ##### +##### $Id: generic-solaris.mc,v 8.13 2001/06/27 21:46:30 gshapiro Exp $ ##### + +##### $Id: solaris2.m4,v 8.22 1999/09/24 21:43:53 ca Exp $ ##### + +##### $Id: generic.m4,v 8.15 1999/04/04 00:51:09 ca Exp $ ##### + +##### $Id: redirect.m4,v 8.15 1999/08/06 01:47:36 gshapiro Exp $ ##### + +##### $Id: use_cw_file.m4,v 8.11 2001/08/26 20:58:57 gshapiro Exp $ ##### + + + +##### $Id: proto.m4,v 8.734 2008/01/24 23:42:01 ca Exp $ ##### + +# level 10 config file format +V10/Berkeley + +# override file safeties - setting this option compromises system security, +# addressing the actual file configuration problem is preferred +# need to set this before any file actions are encountered in the cf file +#O DontBlameSendmail=safe + +# default LDAP map specification +# need to set this now before any LDAP maps are defined +#O LDAPDefaultSpec=-h localhost + +################## +# local info # +################## + +# my LDAP cluster +# need to set this before any LDAP lookups are done (including classes) +#D{sendmailMTACluster}$m + +Cwlocalhost +# file containing names of hosts for which we receive email +Fw/opt/csw/etc/mail/local-host-names + +# my official domain name +# ... define this only if sendmail cannot automatically determine your domain +#Dj$w.Foo.COM + +# host/domain names ending with a token in class P are canonical +CP. + +# "Smart" relay host (may be null) +DS + + +# operators that cannot be in local usernames (i.e., network indicators) +CO @ % ! + +# a class with just dot (for identifying canonical names) +C.. + +# a class with just a left bracket (for identifying domain literals) +C[[ + + +# Resolve map (to check if a host exists in check_mail) +Kresolve host -a -T +C{ResOk}OKR + + +# Hosts for which relaying is permitted ($=R) +FR-o /opt/csw/etc/mail/relay-domains + +# arithmetic map +Karith arith + + + + + +# dequoting map +Kdequote dequote + +# class E: names that should be exposed as from this host, even if we masquerade +# class L: names that should be delivered locally, even if we have a relay +# class M: domains that should be converted to $M +# class N: domains that should not be converted to $M +#CL root +C{E}root + + + +# my name for error messages +DnMAILER-DAEMON + + +CPREDIRECT + +# Configuration version number +DZ8.14.3 + + +############### +# Options # +############### + +# strip message body to 7 bits on input? +O SevenBitInput=False + +# 8-bit data handling +#O EightBitMode=pass8 + +# wait for alias file rebuild (default units: minutes) +O AliasWait=10 + +# location of alias file +O AliasFile=/opt/csw/etc/mail/aliases + +# minimum number of free blocks on filesystem +O MinFreeBlocks=100 + +# maximum message size +#O MaxMessageSize=0 + +# substitution for space (blank) characters +O BlankSub=. + +# avoid connecting to "expensive" mailers on initial submission? +O HoldExpensive=False + +# checkpoint queue runs after every N successful deliveries +#O CheckpointInterval=10 + +# default delivery mode +O DeliveryMode=background + +# error message header/file +#O ErrorHeader=/opt/csw/etc/mail/error-header + +# error mode +#O ErrorMode=print + +# save Unix-style "From_" lines at top of header? +#O SaveFromLine=False + +# queue file mode (qf files) +#O QueueFileMode=0600 + +# temporary file mode +O TempFileMode=0600 + +# match recipients against GECOS field? +#O MatchGECOS=False + +# maximum hop count +#O MaxHopCount=25 + +# location of help file +O HelpFile=/opt/csw/etc/mail/helpfile + +# ignore dots as terminators in incoming messages? +#O IgnoreDots=False + +# name resolver options +#O ResolverOptions=+AAONLY + +# deliver MIME-encapsulated error messages? +O SendMimeErrors=True + +# Forward file search path +O ForwardPath=$z/.forward.$w+$h:$z/.forward+$h:$z/.forward.$w:$z/.forward + +# open connection cache size +O ConnectionCacheSize=2 + +# open connection cache timeout +O ConnectionCacheTimeout=5m + +# persistent host status directory +#O HostStatusDirectory=.hoststat + +# single thread deliveries (requires HostStatusDirectory)? +#O SingleThreadDelivery=False + +# use Errors-To: header? +O UseErrorsTo=False + +# log level +O LogLevel=9 + +# send to me too, even in an alias expansion? +#O MeToo=True + +# verify RHS in newaliases? +O CheckAliases=False + +# default messages to old style headers if no special punctuation? +O OldStyleHeaders=True + +# SMTP daemon options +O DaemonPortOptions=Name=MTA +O DaemonPortOptions=Port=587, Name=MSA, M=E + +# SMTP client options +#O ClientPortOptions=Family=inet, Address=0.0.0.0 + +# Modifiers to define {daemon_flags} for direct submissions +#O DirectSubmissionModifiers + +# Use as mail submission program? See sendmail/SECURITY +#O UseMSP + +# privacy flags +O PrivacyOptions=authwarnings + +# who (if anyone) should get extra copies of error messages +#O PostmasterCopy=Postmaster + +# slope of queue-only function +#O QueueFactor=600000 + +# limit on number of concurrent queue runners +#O MaxQueueChildren + +# maximum number of queue-runners per queue-grouping with multiple queues +#O MaxRunnersPerQueue=1 + +# priority of queue runners (nice(3)) +#O NiceQueueRun + +# shall we sort the queue by hostname first? +#O QueueSortOrder=priority + +# minimum time in queue before retry +#O MinQueueAge=30m + +# how many jobs can you process in the queue? +#O MaxQueueRunSize=0 + +# perform initial split of envelope without checking MX records +#O FastSplit=1 + +# queue directory +O QueueDirectory=/var/spool/mqueue + +# key for shared memory; 0 to turn off, -1 to auto-select +#O SharedMemoryKey=0 + +# file to store auto-selected key for shared memory (SharedMemoryKey = -1) +#O SharedMemoryKeyFile + +# timeouts (many of these) +#O Timeout.initial=5m +#O Timeout.connect=5m +#O Timeout.aconnect=0s +#O Timeout.iconnect=5m +#O Timeout.helo=5m +#O Timeout.mail=10m +#O Timeout.rcpt=1h +#O Timeout.datainit=5m +#O Timeout.datablock=1h +#O Timeout.datafinal=1h +#O Timeout.rset=5m +#O Timeout.quit=2m +#O Timeout.misc=2m +#O Timeout.command=1h +#O Timeout.ident=5s +#O Timeout.fileopen=60s +#O Timeout.control=2m +O Timeout.queuereturn=5d +#O Timeout.queuereturn.normal=5d +#O Timeout.queuereturn.urgent=2d +#O Timeout.queuereturn.non-urgent=7d +#O Timeout.queuereturn.dsn=5d +O Timeout.queuewarn=4h +#O Timeout.queuewarn.normal=4h +#O Timeout.queuewarn.urgent=1h +#O Timeout.queuewarn.non-urgent=12h +#O Timeout.queuewarn.dsn=4h +#O Timeout.hoststatus=30m +#O Timeout.resolver.retrans=5s +#O Timeout.resolver.retrans.first=5s +#O Timeout.resolver.retrans.normal=5s +#O Timeout.resolver.retry=4 +#O Timeout.resolver.retry.first=4 +#O Timeout.resolver.retry.normal=4 +#O Timeout.lhlo=2m +#O Timeout.auth=10m +#O Timeout.starttls=1h + +# time for DeliverBy; extension disabled if less than 0 +#O DeliverByMin=0 + +# should we not prune routes in route-addr syntax addresses? +#O DontPruneRoutes=False + +# queue up everything before forking? +O SuperSafe=True + +# status file +#O StatusFile + +# time zone handling: +# if undefined, use system default +# if defined but null, use TZ envariable passed in +# if defined and non-null, use that info +#O TimeZoneSpec= + +# default UID (can be username or userid:groupid) +#O DefaultUser=mailnull + +# list of locations of user database file (null means no lookup) +#O UserDatabaseSpec=/opt/csw/etc/mail/userdb + +# fallback MX host +#O FallbackMXhost=fall.back.host.net + +# fallback smart host +#O FallbackSmartHost=fall.back.host.net + +# if we are the best MX host for a site, try it directly instead of config err +#O TryNullMXList=False + +# load average at which we just queue messages +#O QueueLA=8 + +# load average at which we refuse connections +#O RefuseLA=12 + +# log interval when refusing connections for this long +#O RejectLogInterval=3h + +# load average at which we delay connections; 0 means no limit +#O DelayLA=0 + +# maximum number of children we allow at one time +#O MaxDaemonChildren=0 + +# maximum number of new connections per second +#O ConnectionRateThrottle=0 + +# Width of the window +#O ConnectionRateWindowSize=60s + +# work recipient factor +#O RecipientFactor=30000 + +# deliver each queued job in a separate process? +#O ForkEachJob=False + +# work class factor +#O ClassFactor=1800 + +# work time factor +#O RetryFactor=90000 + +# default character set +#O DefaultCharSet=unknown-8bit + +# service switch file (name hardwired on Solaris, Ultrix, OSF/1, others) +#O ServiceSwitchFile=/opt/csw/etc/mail/service.switch + +# hosts file (normally /etc/hosts) +#O HostsFile=/etc/hosts + +# dialup line delay on connection failure +#O DialDelay=0s + +# action to take if there are no recipients in the message +#O NoRecipientAction=none + +# chrooted environment for writing to files +#O SafeFileEnvironment + +# are colons OK in addresses? +#O ColonOkInAddr=True + +# shall I avoid expanding CNAMEs (violates protocols)? +#O DontExpandCnames=False + +# SMTP initial login message (old $e macro) +O SmtpGreetingMessage=$j Sendmail $v/$Z; $b + +# UNIX initial From header format (old $l macro) +O UnixFromLine=From $g $d + +# From: lines that have embedded newlines are unwrapped onto one line +#O SingleLineFromHeader=False + +# Allow HELO SMTP command that does not include a host name +#O AllowBogusHELO=False + +# Characters to be quoted in a full name phrase (@,;:\()[] are automatic) +#O MustQuoteChars=. + +# delimiter (operator) characters (old $o macro) +O OperatorChars=.:%@!^/[]+ + +# shall I avoid calling initgroups(3) because of high NIS costs? +#O DontInitGroups=False + +# are group-writable :include: and .forward files (un)trustworthy? +# True (the default) means they are not trustworthy. +#O UnsafeGroupWrites=True + + +# where do errors that occur when sending errors get sent? +#O DoubleBounceAddress=postmaster + +# issue temporary errors (4xy) instead of permanent errors (5xy)? +#O SoftBounce=False + +# where to save bounces if all else fails +#O DeadLetterDrop=/var/tmp/dead.letter + +# what user id do we assume for the majority of the processing? +#O RunAsUser=sendmail + +# maximum number of recipients per SMTP envelope +#O MaxRecipientsPerMessage=0 + +# limit the rate recipients per SMTP envelope are accepted +# once the threshold number of recipients have been rejected +#O BadRcptThrottle=0 + +# shall we get local names from our installed interfaces? +#O DontProbeInterfaces=False + +# Return-Receipt-To: header implies DSN request +#O RrtImpliesDsn=False + +# override connection address (for testing) +#O ConnectOnlyTo=0.0.0.0 + +# Trusted user for file ownership and starting the daemon +#O TrustedUser=root + +# Control socket for daemon management +#O ControlSocketName=/var/spool/mqueue/.control + +# Maximum MIME header length to protect MUAs +#O MaxMimeHeaderLength=0/0 + +# Maximum length of the sum of all headers +O MaxHeadersLength=32768 + +# Maximum depth of alias recursion +#O MaxAliasRecursion=10 + +# location of pid file +#O PidFile=/var/run/sendmail.pid + +# Prefix string for the process title shown on 'ps' listings +#O ProcessTitlePrefix=prefix + +# Data file (df) memory-buffer file maximum size +#O DataFileBufferSize=4096 + +# Transcript file (xf) memory-buffer file maximum size +#O XscriptFileBufferSize=4096 + +# lookup type to find information about local mailboxes +#O MailboxDatabase=pw + +# override compile time flag REQUIRES_DIR_FSYNC +#O RequiresDirfsync=true + +# list of authentication mechanisms +#O AuthMechanisms=EXTERNAL GSSAPI KERBEROS_V4 DIGEST-MD5 CRAM-MD5 + +# Authentication realm +#O AuthRealm + +# default authentication information for outgoing connections +#O DefaultAuthInfo=/opt/csw/etc/mail/default-auth-info + +# SMTP AUTH flags +#O AuthOptions + +# SMTP AUTH maximum encryption strength +#O AuthMaxBits + +# SMTP STARTTLS server options +#O TLSSrvOptions + +# Input mail filters +#O InputMailFilters + + +# CA directory +#O CACertPath +# CA file +#O CACertFile +# Server Cert +#O ServerCertFile +# Server private key +#O ServerKeyFile +# Client Cert +#O ClientCertFile +# Client private key +#O ClientKeyFile +# File containing certificate revocation lists +#O CRLFile +# DHParameters (only required if DSA/DH is used) +#O DHParameters +# Random data source (required for systems without /dev/urandom under OpenSSL) +#O RandFile + +# Maximum number of "useless" commands before slowing down +#O MaxNOOPCommands=20 + +# Name to use for EHLO (defaults to $j) +#O HeloName + +############################ +# QUEUE GROUP DEFINITIONS # +############################ + + +########################### +# Message precedences # +########################### + +Pfirst-class=0 +Pspecial-delivery=100 +Plist=-30 +Pbulk=-60 +Pjunk=-100 + +##################### +# Trusted users # +##################### + +# this is equivalent to setting class "t" +#Ft/opt/csw/etc/mail/trusted-users +Troot +Tdaemon +Tuucp + +######################### +# Format of headers # +######################### + +H?P?Return-Path: <$g> +HReceived: $?sfrom $s $.$?_($?s$|from $.$_) + $.$?{auth_type}(authenticated$?{auth_ssf} bits=${auth_ssf}$.) + $.by $j ($v/$Z)$?r with $r$. id $i$?{tls_version} + (version=${tls_version} cipher=${cipher} bits=${cipher_bits} verify=${verify})$.$?u + for $u; $|; + $.$b +H?D?Resent-Date: $a +H?D?Date: $a +H?F?Resent-From: $?x$x <$g>$|$g$. +H?F?From: $?x$x <$g>$|$g$. +H?x?Full-Name: $x +# HPosted-Date: $a +# H?l?Received-Date: $b +H?M?Resent-Message-Id: <$t.$i@$j> +H?M?Message-Id: <$t.$i@$j> + +# +###################################################################### +###################################################################### +##### +##### REWRITING RULES +##### +###################################################################### +###################################################################### + +############################################ +### Ruleset 3 -- Name Canonicalization ### +############################################ +Scanonify=3 + +# handle null input (translate to <@> special case) +R$@ $@ <@> + +# strip group: syntax (not inside angle brackets!) and trailing semicolon +R$* $: $1 <@> mark addresses +R$* < $* > $* <@> $: $1 < $2 > $3 unmark +R@ $* <@> $: @ $1 unmark @host:... +R$* [ IPv6 : $+ ] <@> $: $1 [ IPv6 : $2 ] unmark IPv6 addr +R$* :: $* <@> $: $1 :: $2 unmark node::addr +R:include: $* <@> $: :include: $1 unmark :include:... +R$* : $* [ $* ] $: $1 : $2 [ $3 ] <@> remark if leading colon +R$* : $* <@> $: $2 strip colon if marked +R$* <@> $: $1 unmark +R$* ; $1 strip trailing semi +R$* < $+ :; > $* $@ $2 :; <@> catch +R$* < $* ; > $1 < $2 > bogus bracketed semi + +# null input now results from list:; syntax +R$@ $@ :; <@> + +# strip angle brackets -- note RFC733 heuristic to get innermost item +R$* $: < $1 > housekeeping <> +R$+ < $* > < $2 > strip excess on left +R< $* > $+ < $1 > strip excess on right +R<> $@ < @ > MAIL FROM:<> case +R< $+ > $: $1 remove housekeeping <> + +# strip route address <@a, at b, at c:user at d> -> +R@ $+ , $+ $2 +R@ [ $* ] : $+ $2 +R@ $+ : $+ $2 + +# find focus for list syntax +R $+ : $* ; @ $+ $@ $>Canonify2 $1 : $2 ; < @ $3 > list syntax +R $+ : $* ; $@ $1 : $2; list syntax + +# find focus for @ syntax addresses +R$+ @ $+ $: $1 < @ $2 > focus on domain +R$+ < $+ @ $+ > $1 $2 < @ $3 > move gaze right +R$+ < @ $+ > $@ $>Canonify2 $1 < @ $2 > already canonical + + +# convert old-style addresses to a domain-based address +R$- ! $+ $@ $>Canonify2 $2 < @ $1 .UUCP > resolve uucp names +R$+ . $- ! $+ $@ $>Canonify2 $3 < @ $1 . $2 > domain uucps +R$+ ! $+ $@ $>Canonify2 $2 < @ $1 .UUCP > uucp subdomains + +# if we have % signs, take the rightmost one +R$* % $* $1 @ $2 First make them all @s. +R$* @ $* @ $* $1 % $2 @ $3 Undo all but the last. +R$* @ $* $@ $>Canonify2 $1 < @ $2 > Insert < > and finish + +# else we must be a local name +R$* $@ $>Canonify2 $1 + + +################################################ +### Ruleset 96 -- bottom half of ruleset 3 ### +################################################ + +SCanonify2=96 + +# handle special cases for local names +R$* < @ localhost > $* $: $1 < @ $j . > $2 no domain at all +R$* < @ localhost . $m > $* $: $1 < @ $j . > $2 local domain +R$* < @ localhost . UUCP > $* $: $1 < @ $j . > $2 .UUCP domain + +# check for IPv4/IPv6 domain literal +R$* < @ [ $+ ] > $* $: $1 < @@ [ $2 ] > $3 mark [addr] +R$* < @@ $=w > $* $: $1 < @ $j . > $3 self-literal +R$* < @@ $+ > $* $@ $1 < @ $2 > $3 canon IP addr + + + + + +# if really UUCP, handle it immediately + +# try UUCP traffic as a local address +R$* < @ $+ . UUCP > $* $: $1 < @ $[ $2 $] . UUCP . > $3 +R$* < @ $+ . . UUCP . > $* $@ $1 < @ $2 . > $3 + +# hostnames ending in class P are always canonical +R$* < @ $* $=P > $* $: $1 < @ $2 $3 . > $4 +R$* < @ $* $~P > $* $: $&{daemon_flags} $| $1 < @ $2 $3 > $4 +R$* CC $* $| $* < @ $+.$+ > $* $: $3 < @ $4.$5 . > $6 +R$* CC $* $| $* $: $3 +# pass to name server to make hostname canonical +R$* $| $* < @ $* > $* $: $2 < @ $[ $3 $] > $4 +R$* $| $* $: $2 + +# local host aliases and pseudo-domains are always canonical +R$* < @ $=w > $* $: $1 < @ $2 . > $3 +R$* < @ $=M > $* $: $1 < @ $2 . > $3 +R$* < @ $* . . > $* $1 < @ $2 . > $3 + + +################################################## +### Ruleset 4 -- Final Output Post-rewriting ### +################################################## +Sfinal=4 + +R$+ :; <@> $@ $1 : handle +R$* <@> $@ handle <> and list:; + +# strip trailing dot off possibly canonical name +R$* < @ $+ . > $* $1 < @ $2 > $3 + +# eliminate internal code +R$* < @ *LOCAL* > $* $1 < @ $j > $2 + +# externalize local domain info +R$* < $+ > $* $1 $2 $3 defocus +R@ $+ : @ $+ : $+ @ $1 , @ $2 : $3 canonical +R@ $* $@ @ $1 ... and exit + +# UUCP must always be presented in old form +R$+ @ $- . UUCP $2!$1 u at h.UUCP => h!u + +# delete duplicate local names +R$+ % $=w @ $=w $1 @ $2 u%host at host => u at host + + + +############################################################## +### Ruleset 97 -- recanonicalize and call ruleset zero ### +### (used for recursive calls) ### +############################################################## + +SRecurse=97 +R$* $: $>canonify $1 +R$* $@ $>parse $1 + + +###################################### +### Ruleset 0 -- Parse Address ### +###################################### + +Sparse=0 + +R$* $: $>Parse0 $1 initial parsing +R<@> $#local $: <@> special case error msgs +R$* $: $>ParseLocal $1 handle local hacks +R$* $: $>Parse1 $1 final parsing + +# +# Parse0 -- do initial syntax checking and eliminate local addresses. +# This should either return with the (possibly modified) input +# or return with a #error mailer. It should not return with a +# #mailer other than the #error mailer. +# + +SParse0 +R<@> $@ <@> special case error msgs +R$* : $* ; <@> $#error $@ 5.1.3 $: "553 List:; syntax illegal for recipient addresses" +R@ <@ $* > < @ $1 > catch "@@host" bogosity +R<@ $+> $#error $@ 5.1.3 $: "553 User address required" +R$+ <@> $#error $@ 5.1.3 $: "553 Hostname required" +R$* $: <> $1 +R<> $* < @ [ $* ] : $+ > $* $1 < @ [ $2 ] : $3 > $4 +R<> $* < @ [ $* ] , $+ > $* $1 < @ [ $2 ] , $3 > $4 +R<> $* < @ [ $* ] $+ > $* $#error $@ 5.1.2 $: "553 Invalid address" +R<> $* < @ [ $+ ] > $* $1 < @ [ $2 ] > $3 +R<> $* <$* : $* > $* $#error $@ 5.1.3 $: "553 Colon illegal in host name part" +R<> $* $1 +R$* < @ . $* > $* $#error $@ 5.1.2 $: "553 Invalid host name" +R$* < @ $* .. $* > $* $#error $@ 5.1.2 $: "553 Invalid host name" +R$* < @ $* @ > $* $#error $@ 5.1.2 $: "553 Invalid route address" +R$* @ $* < @ $* > $* $#error $@ 5.1.3 $: "553 Invalid route address" +R$* , $~O $* $#error $@ 5.1.3 $: "553 Invalid route address" + + +# now delete the local info -- note $=O to find characters that cause forwarding +R$* < @ > $* $@ $>Parse0 $>canonify $1 user@ => user +R< @ $=w . > : $* $@ $>Parse0 $>canonify $2 @here:... -> ... +R$- < @ $=w . > $: $(dequote $1 $) < @ $2 . > dequote "foo"@here +R< @ $+ > $#error $@ 5.1.3 $: "553 User address required" +R$* $=O $* < @ $=w . > $@ $>Parse0 $>canonify $1 $2 $3 ... at here -> ... +R$- $: $(dequote $1 $) < @ *LOCAL* > dequote "foo" +R< @ *LOCAL* > $#error $@ 5.1.3 $: "553 User address required" +R$* $=O $* < @ *LOCAL* > + $@ $>Parse0 $>canonify $1 $2 $3 ...@*LOCAL* -> ... +R$* < @ *LOCAL* > $: $1 + +# +# Parse1 -- the bottom half of ruleset 0. +# + +SParse1 + +# handle numeric address spec +R$* < @ [ $+ ] > $* $: $>ParseLocal $1 < @ [ $2 ] > $3 numeric internet spec +R$* < @ [ $+ ] > $* $: $1 < @ [ $2 ] : $S > $3 Add smart host to path +R$* < @ [ $+ ] : > $* $#esmtp $@ [$2] $: $1 < @ [$2] > $3 no smarthost: send +R$* < @ [ $+ ] : $- : $*> $* $#$3 $@ $4 $: $1 < @ [$2] > $5 smarthost with mailer +R$* < @ [ $+ ] : $+ > $* $#esmtp $@ $3 $: $1 < @ [$2] > $4 smarthost without mailer + + +# short circuit local delivery so forwarded email works + + +R$=L < @ $=w . > $#local $: @ $1 special local names +R$+ < @ $=w . > $#local $: $1 regular local name + + +# resolve remotely connected UUCP links (if any) + +# resolve fake top level domains by forwarding to other hosts + + + +# pass names that still have a host to a smarthost (if defined) +R$* < @ $* > $* $: $>MailerToTriple < $S > $1 < @ $2 > $3 glue on smarthost name + +# deal with other remote names +R$* < @$* > $* $#esmtp $@ $2 $: $1 < @ $2 > $3 user at host.domain + +# handle locally delivered names +R$=L $#local $: @ $1 special local names +R$+ $#local $: $1 regular local names + +########################################################################### +### Ruleset 5 -- special rewriting after aliases have been expanded ### +########################################################################### + +SLocal_localaddr +Slocaladdr=5 +R$+ $: $1 $| $>"Local_localaddr" $1 +R$+ $| $#ok $@ $1 no change +R$+ $| $#$* $#$2 +R$+ $| $* $: $1 + + + + +# deal with plussed users so aliases work nicely +R$+ + * $#local $@ $&h $: $1 +R$+ + $* $#local $@ + $2 $: $1 + * + +# prepend an empty "forward host" on the front +R$+ $: <> $1 + + + +R< > $+ $: < > < $1 <> $&h > nope, restore +detail + +R< > < $+ <> + $* > $: < > < $1 + $2 > check whether +detail +R< > < $+ <> $* > $: < > < $1 > else discard +R< > < $+ + $* > $* < > < $1 > + $2 $3 find the user part +R< > < $+ > + $* $#local $@ $2 $: @ $1 strip the extra + +R< > < $+ > $@ $1 no +detail +R$+ $: $1 <> $&h add +detail back in + +R$+ <> + $* $: $1 + $2 check whether +detail +R$+ <> $* $: $1 else discard +R< local : $* > $* $: $>MailerToTriple < local : $1 > $2 no host extension +R< error : $* > $* $: $>MailerToTriple < error : $1 > $2 no host extension + +R< $~[ : $+ > $+ $: $>MailerToTriple < $1 : $2 > $3 < @ $2 > + +R< $+ > $+ $@ $>MailerToTriple < $1 > $2 < @ $1 > + + +################################################################### +### Ruleset 95 -- canonify mailer:[user@]host syntax to triple ### +################################################################### + +SMailerToTriple=95 +R< > $* $@ $1 strip off null relay +R< error : $-.$-.$- : $+ > $* $#error $@ $1.$2.$3 $: $4 +R< error : $- : $+ > $* $#error $@ $(dequote $1 $) $: $2 +R< error : $+ > $* $#error $: $1 +R< local : $* > $* $>CanonLocal < $1 > $2 +R< $~[ : $+ @ $+ > $*<$*>$* $# $1 $@ $3 $: $2<@$3> use literal user +R< $~[ : $+ > $* $# $1 $@ $2 $: $3 try qualified mailer +R< $=w > $* $@ $2 delete local host +R< $+ > $* $#relay $@ $1 $: $2 use unqualified mailer + +################################################################### +### Ruleset CanonLocal -- canonify local: syntax ### +################################################################### + +SCanonLocal +# strip local host from routed addresses +R< $* > < @ $+ > : $+ $@ $>Recurse $3 +R< $* > $+ $=O $+ < @ $+ > $@ $>Recurse $2 $3 $4 + +# strip trailing dot from any host name that may appear +R< $* > $* < @ $* . > $: < $1 > $2 < @ $3 > + +# handle local: syntax -- use old user, either with or without host +R< > $* < @ $* > $* $#local $@ $1@$2 $: $1 +R< > $+ $#local $@ $1 $: $1 + +# handle local:user at host syntax -- ignore host part +R< $+ @ $+ > $* < @ $* > $: < $1 > $3 < @ $4 > + +# handle local:user syntax +R< $+ > $* <@ $* > $* $#local $@ $2@$3 $: $1 +R< $+ > $* $#local $@ $2 $: $1 + +################################################################### +### Ruleset 93 -- convert header names to masqueraded form ### +################################################################### + +SMasqHdr=93 + + +# do not masquerade anything in class N +R$* < @ $* $=N . > $@ $1 < @ $2 $3 . > + +R$* < @ *LOCAL* > $@ $1 < @ $j . > + +################################################################### +### Ruleset 94 -- convert envelope names to masqueraded form ### +################################################################### + +SMasqEnv=94 +R$* < @ *LOCAL* > $* $: $1 < @ $j . > $2 + +################################################################### +### Ruleset 98 -- local part of ruleset zero (can be null) ### +################################################################### + +SParseLocal=98 + +# addresses sent to foo at host.REDIRECT will give a 551 error code +R$* < @ $+ .REDIRECT. > $: $1 < @ $2 . REDIRECT . > < ${opMode} > +R$* < @ $+ .REDIRECT. > $: $1 < @ $2 . REDIRECT. > +R$* < @ $+ .REDIRECT. > < $- > $#error $@ 5.1.1 $: "551 User has moved; please try " <$1@$2> + + + + + +###################################################################### +### CanonAddr -- Convert an address into a standard form for +### relay checking. Route address syntax is +### crudely converted into a %-hack address. +### +### Parameters: +### $1 -- full recipient address +### +### Returns: +### parsed address, not in source route form +###################################################################### + +SCanonAddr +R$* $: $>Parse0 $>canonify $1 make domain canonical + + +###################################################################### +### ParseRecipient -- Strip off hosts in $=R as well as possibly +### $* $=m or the access database. +### Check user portion for host separators. +### +### Parameters: +### $1 -- full recipient address +### +### Returns: +### parsed, non-local-relaying address +###################################################################### + +SParseRecipient +R$* $: $>CanonAddr $1 +R $* < @ $* . > $1 < @ $2 > strip trailing dots +R $- < @ $* > $: $(dequote $1 $) < @ $2 > dequote local part + +# if no $=O character, no host in the user portion, we are done +R $* $=O $* < @ $* > $: $1 $2 $3 < @ $4> +R $* $@ $1 + + +R $* < @ $* $=R > $: $1 < @ $2 $3 > + + + +R $* < @ $* > $@ $>ParseRecipient $1 +R<$+> $* $@ $2 + + +###################################################################### +### check_relay -- check hostname/address on SMTP startup +###################################################################### + + + +SLocal_check_relay +Scheck_relay +R$* $: $1 $| $>"Local_check_relay" $1 +R$* $| $* $| $#$* $#$3 +R$* $| $* $| $* $@ $>"Basic_check_relay" $1 $| $2 + +SBasic_check_relay +# check for deferred delivery mode +R$* $: < $&{deliveryMode} > $1 +R< d > $* $@ deferred +R< $* > $* $: $2 + + + + +###################################################################### +### check_mail -- check SMTP `MAIL FROM:' command argument +###################################################################### + +SLocal_check_mail +Scheck_mail +R$* $: $1 $| $>"Local_check_mail" $1 +R$* $| $#$* $#$2 +R$* $| $* $@ $>"Basic_check_mail" $1 + +SBasic_check_mail +# check for deferred delivery mode +R$* $: < $&{deliveryMode} > $1 +R< d > $* $@ deferred +R< $* > $* $: $2 + +# authenticated? +R$* $: $1 $| $>"tls_client" $&{verify} $| MAIL +R$* $| $#$+ $#$2 +R$* $| $* $: $1 + +R<> $@ we MUST accept <> (RFC 1123) +R$+ $: $1 +R<$+> $: <@> <$1> +R$+ $: <@> <$1> +R$* $: $&{daemon_flags} $| $1 +R$* f $* $| <@> < $* @ $- > $: < ? $&{client_name} > < $3 @ $4 > +R$* u $* $| <@> < $* > $: < $3 > +R$* $| $* $: $2 +# handle case of @localhost on address +R<@> < $* @ localhost > $: < ? $&{client_name} > < $1 @ localhost > +R<@> < $* @ [127.0.0.1] > + $: < ? $&{client_name} > < $1 @ [127.0.0.1] > +R<@> < $* @ localhost.$m > + $: < ? $&{client_name} > < $1 @ localhost.$m > +R<@> < $* @ localhost.UUCP > + $: < ? $&{client_name} > < $1 @ localhost.UUCP > +R<@> $* $: $1 no localhost as domain +R $* $: $2 local client: ok +R <$+> $#error $@ 5.5.4 $: "553 Real domain name required for sender address" +R $* $: $1 +R$* $: $>CanonAddr $1 canonify sender address and mark it +R $* < @ $+ . > $1 < @ $2 > strip trailing dots +# handle non-DNS hostnames (*.bitnet, *.decnet, *.uucp, etc) +R $* < @ $* $=P > $: $1 < @ $2 $3 > +R $* < @ $j > $: $1 < @ $j > +R $* < @ $+ > $: $) > $1 < @ $2 > +R> $* < @ $+ > + $: <$2> $3 < @ $4 > + + +# handle case of no @domain on address +R $* $: $&{daemon_flags} $| $1 +R$* u $* $| $* $: $3 +R$* $| $* $: $2 +R $* $: < ? $&{client_addr} > $1 +R $* $@ ...local unqualed ok +R $* $#error $@ 5.5.4 $: "553 Domain name required for sender address " $&f + ...remote is not +# check results +R $* $: @ $1 mark address: nothing known about it +R<$={ResOk}> $* $: @ $2 domain ok +R $* $#error $@ 4.1.8 $: "451 Domain of sender address " $&f " does not resolve" +R $* $#error $@ 5.1.8 $: "553 Domain of sender address " $&f " does not exist" + + + +###################################################################### +### check_rcpt -- check SMTP `RCPT TO:' command argument +###################################################################### + +SLocal_check_rcpt +Scheck_rcpt +R$* $: $1 $| $>"Local_check_rcpt" $1 +R$* $| $#$* $#$2 +R$* $| $* $@ $>"Basic_check_rcpt" $1 + +SBasic_check_rcpt +# empty address? +R<> $#error $@ nouser $: "553 User address required" +R$@ $#error $@ nouser $: "553 User address required" +# check for deferred delivery mode +R$* $: < $&{deliveryMode} > $1 +R< d > $* $@ deferred +R< $* > $* $: $2 + + +###################################################################### +R$* $: $1 $| @ $>"Rcpt_ok" $1 +R$* $| @ $#TEMP $+ $: $1 $| T $2 +R$* $| @ $#$* $#$2 +R$* $| @ RELAY $@ RELAY +R$* $| @ $* $: O $| $>"Relay_ok" $1 +R$* $| T $+ $: T $2 $| $>"Relay_ok" $1 +R$* $| $#TEMP $+ $#error $2 +R$* $| $#$* $#$2 +R$* $| RELAY $@ RELAY +R T $+ $| $* $#error $1 +# anything else is bogus +R$* $#error $@ 5.7.1 $: "550 Relaying denied" + + +###################################################################### +### Rcpt_ok: is the recipient ok? +###################################################################### +SRcpt_ok +R$* $: $>ParseRecipient $1 strip relayable hosts + + + + +# authenticated via TLS? +R$* $: $1 $| $>RelayTLS client authenticated? +R$* $| $# $+ $# $2 error/ok? +R$* $| $* $: $1 no + +R$* $: $1 $| $>"Local_Relay_Auth" $&{auth_type} +R$* $| $# $* $# $2 +R$* $| NO $: $1 +R$* $| $* $: $1 $| $&{auth_type} +R$* $| $: $1 +R$* $| $={TrustAuthMech} $# RELAY +R$* $| $* $: $1 +# anything terminating locally is ok +R$+ < @ $=w > $@ RELAY +R$+ < @ $* $=R > $@ RELAY + + + + +# check for local user (i.e. unqualified address) +R$* $: $1 +R $* < @ $+ > $: $1 < @ $2 > +# local user is ok +R $+ $@ RELAY +R<$+> $* $: $2 + +###################################################################### +### Relay_ok: is the relay/sender ok? +###################################################################### +SRelay_ok +# anything originating locally is ok +# check IP address +R$* $: $&{client_addr} +R$@ $@ RELAY originated locally +R0 $@ RELAY originated locally +R127.0.0.1 $@ RELAY originated locally +RIPv6:::1 $@ RELAY originated locally +R$=R $* $@ RELAY relayable IP address +R$* $: [ $1 ] put brackets around it... +R$=w $@ RELAY ... and see if it is local + + +# check client name: first: did it resolve? +R$* $: < $&{client_resolve} > +R $#TEMP $@ 4.4.0 $: "450 Relaying temporarily denied. Cannot resolve PTR record for " $&{client_addr} +R $#error $@ 5.7.1 $: "550 Relaying denied. IP name possibly forged " $&{client_name} +R $#error $@ 5.7.1 $: "550 Relaying denied. IP name lookup failed " $&{client_name} +R$* $: <@> $&{client_name} +# pass to name server to make hostname canonical +R<@> $* $=P $: $1 $2 +R<@> $+ $: $[ $1 $] +R$* . $1 strip trailing dots +R $=w $@ RELAY +R $* $=R $@ RELAY + + + + + +###################################################################### +### trust_auth: is user trusted to authenticate as someone else? +### +### Parameters: +### $1: AUTH= parameter from MAIL command +###################################################################### + +SLocal_trust_auth +Strust_auth +R$* $: $&{auth_type} $| $1 +# required by RFC 2554 section 4. +R$@ $| $* $#error $@ 5.7.1 $: "550 not authenticated" +R$* $| $&{auth_authen} $@ identical +R$* $| <$&{auth_authen}> $@ identical +R$* $| $* $: $1 $| $>"Local_trust_auth" $2 +R$* $| $#$* $#$2 +R$* $#error $@ 5.7.1 $: "550 " $&{auth_authen} " not allowed to act as " $&{auth_author} + +###################################################################### +### Relay_Auth: allow relaying based on authentication? +### +### Parameters: +### $1: ${auth_type} +###################################################################### +SLocal_Relay_Auth + +###################################################################### +### srv_features: which features to offer to a client? +### (done in server) +###################################################################### +Ssrv_features + + +###################################################################### +### try_tls: try to use STARTTLS? +### (done in client) +###################################################################### +Stry_tls + + +###################################################################### +### tls_rcpt: is connection with server "good" enough? +### (done in client, per recipient) +### +### Parameters: +### $1: recipient +###################################################################### +Stls_rcpt + + +###################################################################### +### tls_client: is connection with client "good" enough? +### (done in server) +### +### Parameters: +### ${verify} $| (MAIL|STARTTLS) +###################################################################### +Stls_client +R$* $| $* $@ $>"TLS_connection" $1 + +###################################################################### +### tls_server: is connection with server "good" enough? +### (done in client) +### +### Parameter: +### ${verify} +###################################################################### +Stls_server +R$* $@ $>"TLS_connection" $1 + +###################################################################### +### TLS_connection: is TLS connection "good" enough? +### +### Parameters: +### ${verify} +### Requirement: RHS from access map, may be ? for none. +###################################################################### +STLS_connection +RSOFTWARE $#error $@ 4.7.0 $: "403 TLS handshake." + + +###################################################################### +### RelayTLS: allow relaying based on TLS authentication +### +### Parameters: +### none +###################################################################### +SRelayTLS +# authenticated? + +###################################################################### +### authinfo: lookup authinfo in the access map +### +### Parameters: +### $1: {server_name} +### $2: {server_addr} +###################################################################### +Sauthinfo + + + + + +# +###################################################################### +###################################################################### +##### +##### MAIL FILTER DEFINITIONS +##### +###################################################################### +###################################################################### + +# +###################################################################### +###################################################################### +##### +##### MAILER DEFINITIONS +##### +###################################################################### +###################################################################### + + +################################################## +### Local and Program Mailer specification ### +################################################## + +##### $Id: local.m4,v 8.59 2004/11/23 00:37:25 ca Exp $ ##### + +# +# Envelope sender rewriting +# +SEnvFromL +R<@> $n errors to mailer-daemon +R@ <@ $*> $n temporarily bypass Sun bogosity +R$+ $: $>AddDomain $1 add local domain if needed +R$* $: $>MasqEnv $1 do masquerading + +# +# Envelope recipient rewriting +# +SEnvToL +R$+ < @ $* > $: $1 strip host part +R$+ + $* $: < $&{addr_type} > $1 + $2 mark with addr type +R $+ + $* $: $1 remove +detail for sender +R< $* > $+ $: $2 else remove mark + +# +# Header sender rewriting +# +SHdrFromL +R<@> $n errors to mailer-daemon +R@ <@ $*> $n temporarily bypass Sun bogosity +R$+ $: $>AddDomain $1 add local domain if needed +R$* $: $>MasqHdr $1 do masquerading + +# +# Header recipient rewriting +# +SHdrToL +R$+ $: $>AddDomain $1 add local domain if needed +R$* < @ *LOCAL* > $* $: $1 < @ $j . > $2 + +# +# Common code to add local domain name (only if always-add-domain) +# +SAddDomain + +Mlocal, P=/usr/lib/mail.local, F=lsDFMAw5:/|@qfSmn9, S=EnvFromL/HdrFromL, R=EnvToL/HdrToL, + T=DNS/RFC822/X-Unix, + A=mail.local -d $u +Mprog, P=/bin/sh, F=lsDFMoqeu9, S=EnvFromL/HdrFromL, R=EnvToL/HdrToL, D=$z:/, + T=X-Unix/X-Unix/X-Unix, + A=sh -c $u + +##################################### +### SMTP Mailer specification ### +##################################### + +##### $Id: smtp.m4,v 8.65 2006/07/12 21:08:10 ca Exp $ ##### + +# +# common sender and masquerading recipient rewriting +# +SMasqSMTP +R$* < @ $* > $* $@ $1 < @ $2 > $3 already fully qualified +R$+ $@ $1 < @ *LOCAL* > add local qualification + +# +# convert pseudo-domain addresses to real domain addresses +# +SPseudoToReal + +# pass s through +R< @ $+ > $* $@ < @ $1 > $2 resolve + +# output fake domains as user%fake at relay + +# do UUCP heuristics; note that these are shared with UUCP mailers +R$+ < @ $+ .UUCP. > $: < $2 ! > $1 convert to UUCP form +R$+ < @ $* > $* $@ $1 < @ $2 > $3 not UUCP form + +# leave these in .UUCP form to avoid further tampering +R< $&h ! > $- ! $+ $@ $2 < @ $1 .UUCP. > +R< $&h ! > $-.$+ ! $+ $@ $3 < @ $1.$2 > +R< $&h ! > $+ $@ $1 < @ $&h .UUCP. > +R< $+ ! > $+ $: $1 ! $2 < @ $Y > use UUCP_RELAY +R$+ < @ $~[ $* : $+ > $@ $1 < @ $4 > strip mailer: part +R$+ < @ > $: $1 < @ *LOCAL* > if no UUCP_RELAY + + +# +# envelope sender rewriting +# +SEnvFromSMTP +R$+ $: $>PseudoToReal $1 sender/recipient common +R$* :; <@> $@ list:; special case +R$* $: $>MasqSMTP $1 qualify unqual'ed names +R$+ $: $>MasqEnv $1 do masquerading + + +# +# envelope recipient rewriting -- +# also header recipient if not masquerading recipients +# +SEnvToSMTP +R$+ $: $>PseudoToReal $1 sender/recipient common +R$+ $: $>MasqSMTP $1 qualify unqual'ed names +R$* < @ *LOCAL* > $* $: $1 < @ $j . > $2 + +# +# header sender and masquerading header recipient rewriting +# +SHdrFromSMTP +R$+ $: $>PseudoToReal $1 sender/recipient common +R:; <@> $@ list:; special case + +# do special header rewriting +R$* <@> $* $@ $1 <@> $2 pass null host through +R< @ $* > $* $@ < @ $1 > $2 pass route-addr through +R$* $: $>MasqSMTP $1 qualify unqual'ed names +R$+ $: $>MasqHdr $1 do masquerading + + +# +# relay mailer header masquerading recipient rewriting +# +SMasqRelay +R$+ $: $>MasqSMTP $1 +R$+ $: $>MasqHdr $1 + +Msmtp, P=[IPC], F=mDFMuX, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, + T=DNS/RFC822/SMTP, + A=TCP $h +Mesmtp, P=[IPC], F=mDFMuXa, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, + T=DNS/RFC822/SMTP, + A=TCP $h +Msmtp8, P=[IPC], F=mDFMuX8, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, + T=DNS/RFC822/SMTP, + A=TCP $h +Mdsmtp, P=[IPC], F=mDFMuXa%, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, + T=DNS/RFC822/SMTP, + A=TCP $h +Mrelay, P=[IPC], F=mDFMuXa8, S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP, E=\r\n, L=2040, + T=DNS/RFC822/SMTP, + A=TCP $h + +### sendmail.mc ### +# divert(-1) +# # +# # Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers. +# # All rights reserved. +# # Copyright (c) 1983 Eric P. Allman. All rights reserved. +# # Copyright (c) 1988, 1993 +# # The Regents of the University of California. All rights reserved. +# # +# # By using this file, you agree to the terms and conditions set +# # forth in the LICENSE file which can be found at the top level of +# # the sendmail distribution. +# # +# # +# +# # +# # This is a generic configuration file for SunOS 5.x (a.k.a. Solaris 2.x +# # and Solaris 7 through the present version). +# # +# # It has support for local and SMTP mail only. If you want to +# # customize it, copy it to a name appropriate for your environment +# # and do the modifications there. +# # +# +# divert(0)dnl +# VERSIONID(`$Id: generic-solaris.mc,v 8.13 2001/06/27 21:46:30 gshapiro Exp $') +# OSTYPE(solaris2)dnl +# DOMAIN(generic)dnl +# MAILER(local)dnl +# MAILER(smtp)dnl Deleted: csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW 2011-06-15 08:41:49 UTC (rev 14816) +++ csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW 2011-06-15 08:47:17 UTC (rev 14817) @@ -1,1467 +0,0 @@ -# -# Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers. -# All rights reserved. -# Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved. -# Copyright (c) 1988, 1993 -# The Regents of the University of California. All rights reserved. -# -# By using this file, you agree to the terms and conditions set -# forth in the LICENSE file which can be found at the top level of -# the sendmail distribution. -# -# - -###################################################################### -###################################################################### -##### -##### SENDMAIL CONFIGURATION FILE -##### -##### built by dt73646 at rc-osg-revo on Thu Jul 30 16:59:32 CDT 2009 -##### in /dst/home/dt73646/opencsw/mgar/pkg/sendmail/trunk/work/build-isa-sparcv8/sendmail-8.14.3/cf/cf -##### using ../ as configuration include directory -##### -###################################################################### -##### -##### DO NOT EDIT THIS FILE! Only edit the source .mc file. -##### -###################################################################### -###################################################################### - -##### $Id: cfhead.m4,v 8.116 2004/01/28 22:02:22 ca Exp $ ##### -##### $Id: cf.m4,v 8.32 1999/02/07 07:26:14 gshapiro Exp $ ##### -##### $Id: generic-solaris.mc,v 8.13 2001/06/27 21:46:30 gshapiro Exp $ ##### - -##### $Id: solaris2.m4,v 8.22 1999/09/24 21:43:53 ca Exp $ ##### - -##### $Id: generic.m4,v 8.15 1999/04/04 00:51:09 ca Exp $ ##### - -##### $Id: redirect.m4,v 8.15 1999/08/06 01:47:36 gshapiro Exp $ ##### - -##### $Id: use_cw_file.m4,v 8.11 2001/08/26 20:58:57 gshapiro Exp $ ##### - - - -##### $Id: proto.m4,v 8.734 2008/01/24 23:42:01 ca Exp $ ##### - -# level 10 config file format -V10/Berkeley - -# override file safeties - setting this option compromises system security, -# addressing the actual file configuration problem is preferred -# need to set this before any file actions are encountered in the cf file -#O DontBlameSendmail=safe - -# default LDAP map specification -# need to set this now before any LDAP maps are defined -#O LDAPDefaultSpec=-h localhost - -################## -# local info # -################## - -# my LDAP cluster -# need to set this before any LDAP lookups are done (including classes) -#D{sendmailMTACluster}$m - -Cwlocalhost -# file containing names of hosts for which we receive email -Fw/opt/csw/etc/mail/local-host-names - -# my official domain name -# ... define this only if sendmail cannot automatically determine your domain -#Dj$w.Foo.COM - -# host/domain names ending with a token in class P are canonical -CP. - -# "Smart" relay host (may be null) -DS - - -# operators that cannot be in local usernames (i.e., network indicators) -CO @ % ! - -# a class with just dot (for identifying canonical names) -C.. - -# a class with just a left bracket (for identifying domain literals) -C[[ - - -# Resolve map (to check if a host exists in check_mail) -Kresolve host -a -T -C{ResOk}OKR - - -# Hosts for which relaying is permitted ($=R) -FR-o /opt/csw/etc/mail/relay-domains - -# arithmetic map -Karith arith - - - - - -# dequoting map -Kdequote dequote - -# class E: names that should be exposed as from this host, even if we masquerade -# class L: names that should be delivered locally, even if we have a relay -# class M: domains that should be converted to $M -# class N: domains that should not be converted to $M -#CL root -C{E}root - - - -# my name for error messages -DnMAILER-DAEMON - - -CPREDIRECT - -# Configuration version number -DZ8.14.3 - - -############### -# Options # -############### - -# strip message body to 7 bits on input? -O SevenBitInput=False - -# 8-bit data handling -#O EightBitMode=pass8 - -# wait for alias file rebuild (default units: minutes) -O AliasWait=10 - -# location of alias file -O AliasFile=/opt/csw/etc/mail/aliases - -# minimum number of free blocks on filesystem -O MinFreeBlocks=100 - -# maximum message size -#O MaxMessageSize=0 - -# substitution for space (blank) characters -O BlankSub=. - -# avoid connecting to "expensive" mailers on initial submission? -O HoldExpensive=False - -# checkpoint queue runs after every N successful deliveries -#O CheckpointInterval=10 - -# default delivery mode -O DeliveryMode=background - -# error message header/file -#O ErrorHeader=/opt/csw/etc/mail/error-header - -# error mode -#O ErrorMode=print - -# save Unix-style "From_" lines at top of header? -#O SaveFromLine=False - -# queue file mode (qf files) -#O QueueFileMode=0600 - -# temporary file mode -O TempFileMode=0600 - -# match recipients against GECOS field? -#O MatchGECOS=False - -# maximum hop count -#O MaxHopCount=25 - -# location of help file -O HelpFile=/opt/csw/etc/mail/helpfile - -# ignore dots as terminators in incoming messages? -#O IgnoreDots=False - -# name resolver options -#O ResolverOptions=+AAONLY - -# deliver MIME-encapsulated error messages? -O SendMimeErrors=True - -# Forward file search path -O ForwardPath=$z/.forward.$w+$h:$z/.forward+$h:$z/.forward.$w:$z/.forward - -# open connection cache size -O ConnectionCacheSize=2 - -# open connection cache timeout -O ConnectionCacheTimeout=5m - -# persistent host status directory -#O HostStatusDirectory=.hoststat - -# single thread deliveries (requires HostStatusDirectory)? -#O SingleThreadDelivery=False - -# use Errors-To: header? -O UseErrorsTo=False - -# log level -O LogLevel=9 - -# send to me too, even in an alias expansion? -#O MeToo=True - -# verify RHS in newaliases? -O CheckAliases=False - -# default messages to old style headers if no special punctuation? -O OldStyleHeaders=True - -# SMTP daemon options -O DaemonPortOptions=Name=MTA -O DaemonPortOptions=Port=587, Name=MSA, M=E - -# SMTP client options -#O ClientPortOptions=Family=inet, Address=0.0.0.0 - -# Modifiers to define {daemon_flags} for direct submissions -#O DirectSubmissionModifiers - -# Use as mail submission program? See sendmail/SECURITY -#O UseMSP - -# privacy flags -O PrivacyOptions=authwarnings - -# who (if anyone) should get extra copies of error messages -#O PostmasterCopy=Postmaster - -# slope of queue-only function -#O QueueFactor=600000 - -# limit on number of concurrent queue runners -#O MaxQueueChildren - -# maximum number of queue-runners per queue-grouping with multiple queues -#O MaxRunnersPerQueue=1 - -# priority of queue runners (nice(3)) -#O NiceQueueRun - -# shall we sort the queue by hostname first? -#O QueueSortOrder=priority - -# minimum time in queue before retry -#O MinQueueAge=30m - -# how many jobs can you process in the queue? -#O MaxQueueRunSize=0 - -# perform initial split of envelope without checking MX records -#O FastSplit=1 - -# queue directory -O QueueDirectory=/var/spool/mqueue - -# key for shared memory; 0 to turn off, -1 to auto-select -#O SharedMemoryKey=0 - -# file to store auto-selected key for shared memory (SharedMemoryKey = -1) -#O SharedMemoryKeyFile - -# timeouts (many of these) -#O Timeout.initial=5m -#O Timeout.connect=5m -#O Timeout.aconnect=0s -#O Timeout.iconnect=5m -#O Timeout.helo=5m -#O Timeout.mail=10m -#O Timeout.rcpt=1h -#O Timeout.datainit=5m -#O Timeout.datablock=1h -#O Timeout.datafinal=1h -#O Timeout.rset=5m -#O Timeout.quit=2m -#O Timeout.misc=2m -#O Timeout.command=1h -#O Timeout.ident=5s -#O Timeout.fileopen=60s -#O Timeout.control=2m -O Timeout.queuereturn=5d -#O Timeout.queuereturn.normal=5d -#O Timeout.queuereturn.urgent=2d -#O Timeout.queuereturn.non-urgent=7d -#O Timeout.queuereturn.dsn=5d -O Timeout.queuewarn=4h -#O Timeout.queuewarn.normal=4h -#O Timeout.queuewarn.urgent=1h -#O Timeout.queuewarn.non-urgent=12h -#O Timeout.queuewarn.dsn=4h -#O Timeout.hoststatus=30m -#O Timeout.resolver.retrans=5s -#O Timeout.resolver.retrans.first=5s -#O Timeout.resolver.retrans.normal=5s -#O Timeout.resolver.retry=4 -#O Timeout.resolver.retry.first=4 -#O Timeout.resolver.retry.normal=4 -#O Timeout.lhlo=2m -#O Timeout.auth=10m -#O Timeout.starttls=1h - -# time for DeliverBy; extension disabled if less than 0 -#O DeliverByMin=0 - -# should we not prune routes in route-addr syntax addresses? -#O DontPruneRoutes=False - -# queue up everything before forking? -O SuperSafe=True - -# status file -#O StatusFile - -# time zone handling: -# if undefined, use system default -# if defined but null, use TZ envariable passed in -# if defined and non-null, use that info -#O TimeZoneSpec= - -# default UID (can be username or userid:groupid) -#O DefaultUser=mailnull - -# list of locations of user database file (null means no lookup) -#O UserDatabaseSpec=/opt/csw/etc/mail/userdb - -# fallback MX host -#O FallbackMXhost=fall.back.host.net - -# fallback smart host -#O FallbackSmartHost=fall.back.host.net - -# if we are the best MX host for a site, try it directly instead of config err -#O TryNullMXList=False - -# load average at which we just queue messages -#O QueueLA=8 - -# load average at which we refuse connections -#O RefuseLA=12 - -# log interval when refusing connections for this long -#O RejectLogInterval=3h - -# load average at which we delay connections; 0 means no limit -#O DelayLA=0 - -# maximum number of children we allow at one time -#O MaxDaemonChildren=0 - -# maximum number of new connections per second -#O ConnectionRateThrottle=0 - -# Width of the window -#O ConnectionRateWindowSize=60s - -# work recipient factor -#O RecipientFactor=30000 - -# deliver each queued job in a separate process? -#O ForkEachJob=False - -# work class factor -#O ClassFactor=1800 - -# work time factor -#O RetryFactor=90000 - -# default character set -#O DefaultCharSet=unknown-8bit - -# service switch file (name hardwired on Solaris, Ultrix, OSF/1, others) -#O ServiceSwitchFile=/opt/csw/etc/mail/service.switch - -# hosts file (normally /etc/hosts) -#O HostsFile=/etc/hosts - -# dialup line delay on connection failure -#O DialDelay=0s - -# action to take if there are no recipients in the message -#O NoRecipientAction=none - -# chrooted environment for writing to files -#O SafeFileEnvironment - -# are colons OK in addresses? -#O ColonOkInAddr=True - -# shall I avoid expanding CNAMEs (violates protocols)? -#O DontExpandCnames=False - -# SMTP initial login message (old $e macro) -O SmtpGreetingMessage=$j Sendmail $v/$Z; $b - -# UNIX initial From header format (old $l macro) -O UnixFromLine=From $g $d - -# From: lines that have embedded newlines are unwrapped onto one line -#O SingleLineFromHeader=False - -# Allow HELO SMTP command that does not include a host name -#O AllowBogusHELO=False - -# Characters to be quoted in a full name phrase (@,;:\()[] are automatic) -#O MustQuoteChars=. - -# delimiter (operator) characters (old $o macro) -O OperatorChars=.:%@!^/[]+ - -# shall I avoid calling initgroups(3) because of high NIS costs? -#O DontInitGroups=False - -# are group-writable :include: and .forward files (un)trustworthy? -# True (the default) means they are not trustworthy. -#O UnsafeGroupWrites=True - - -# where do errors that occur when sending errors get sent? -#O DoubleBounceAddress=postmaster - -# issue temporary errors (4xy) instead of permanent errors (5xy)? -#O SoftBounce=False - -# where to save bounces if all else fails -#O DeadLetterDrop=/var/tmp/dead.letter - -# what user id do we assume for the majority of the processing? -#O RunAsUser=sendmail - -# maximum number of recipients per SMTP envelope -#O MaxRecipientsPerMessage=0 - -# limit the rate recipients per SMTP envelope are accepted -# once the threshold number of recipients have been rejected -#O BadRcptThrottle=0 - -# shall we get local names from our installed interfaces? -#O DontProbeInterfaces=False - -# Return-Receipt-To: header implies DSN request -#O RrtImpliesDsn=False - -# override connection address (for testing) -#O ConnectOnlyTo=0.0.0.0 - -# Trusted user for file ownership and starting the daemon -#O TrustedUser=root - -# Control socket for daemon management -#O ControlSocketName=/var/spool/mqueue/.control - -# Maximum MIME header length to protect MUAs -#O MaxMimeHeaderLength=0/0 - -# Maximum length of the sum of all headers -O MaxHeadersLength=32768 - -# Maximum depth of alias recursion -#O MaxAliasRecursion=10 - -# location of pid file -#O PidFile=/var/run/sendmail.pid - -# Prefix string for the process title shown on 'ps' listings -#O ProcessTitlePrefix=prefix - -# Data file (df) memory-buffer file maximum size -#O DataFileBufferSize=4096 - -# Transcript file (xf) memory-buffer file maximum size -#O XscriptFileBufferSize=4096 - -# lookup type to find information about local mailboxes -#O MailboxDatabase=pw - -# override compile time flag REQUIRES_DIR_FSYNC -#O RequiresDirfsync=true - -# list of authentication mechanisms -#O AuthMechanisms=EXTERNAL GSSAPI KERBEROS_V4 DIGEST-MD5 CRAM-MD5 - -# Authentication realm -#O AuthRealm - -# default authentication information for outgoing connections -#O DefaultAuthInfo=/opt/csw/etc/mail/default-auth-info - -# SMTP AUTH flags -#O AuthOptions - -# SMTP AUTH maximum encryption strength -#O AuthMaxBits - -# SMTP STARTTLS server options -#O TLSSrvOptions - -# Input mail filters -#O InputMailFilters - - -# CA directory -#O CACertPath -# CA file -#O CACertFile -# Server Cert -#O ServerCertFile -# Server private key -#O ServerKeyFile -# Client Cert -#O ClientCertFile -# Client private key -#O ClientKeyFile -# File containing certificate revocation lists -#O CRLFile -# DHParameters (only required if DSA/DH is used) -#O DHParameters -# Random data source (required for systems without /dev/urandom under OpenSSL) -#O RandFile - -# Maximum number of "useless" commands before slowing down -#O MaxNOOPCommands=20 - -# Name to use for EHLO (defaults to $j) -#O HeloName - -############################ -# QUEUE GROUP DEFINITIONS # -############################ - - -########################### -# Message precedences # -########################### - -Pfirst-class=0 -Pspecial-delivery=100 -Plist=-30 -Pbulk=-60 -Pjunk=-100 - -##################### -# Trusted users # -##################### - -# this is equivalent to setting class "t" -#Ft/opt/csw/etc/mail/trusted-users -Troot -Tdaemon -Tuucp - -######################### -# Format of headers # -######################### - -H?P?Return-Path: <$g> -HReceived: $?sfrom $s $.$?_($?s$|from $.$_) - $.$?{auth_type}(authenticated$?{auth_ssf} bits=${auth_ssf}$.) - $.by $j ($v/$Z)$?r with $r$. id $i$?{tls_version} - (version=${tls_version} cipher=${cipher} bits=${cipher_bits} verify=${verify})$.$?u - for $u; $|; - $.$b -H?D?Resent-Date: $a -H?D?Date: $a -H?F?Resent-From: $?x$x <$g>$|$g$. -H?F?From: $?x$x <$g>$|$g$. -H?x?Full-Name: $x -# HPosted-Date: $a -# H?l?Received-Date: $b -H?M?Resent-Message-Id: <$t.$i@$j> -H?M?Message-Id: <$t.$i@$j> - -# -###################################################################### -###################################################################### -##### -##### REWRITING RULES -##### -###################################################################### -###################################################################### - -############################################ -### Ruleset 3 -- Name Canonicalization ### -############################################ -Scanonify=3 - -# handle null input (translate to <@> special case) -R$@ $@ <@> - -# strip group: syntax (not inside angle brackets!) and trailing semicolon -R$* $: $1 <@> mark addresses -R$* < $* > $* <@> $: $1 < $2 > $3 unmark -R@ $* <@> $: @ $1 unmark @host:... -R$* [ IPv6 : $+ ] <@> $: $1 [ IPv6 : $2 ] unmark IPv6 addr -R$* :: $* <@> $: $1 :: $2 unmark node::addr -R:include: $* <@> $: :include: $1 unmark :include:... -R$* : $* [ $* ] $: $1 : $2 [ $3 ] <@> remark if leading colon -R$* : $* <@> $: $2 strip colon if marked -R$* <@> $: $1 unmark -R$* ; $1 strip trailing semi -R$* < $+ :; > $* $@ $2 :; <@> catch -R$* < $* ; > $1 < $2 > bogus bracketed semi - -# null input now results from list:; syntax -R$@ $@ :; <@> - -# strip angle brackets -- note RFC733 heuristic to get innermost item -R$* $: < $1 > housekeeping <> -R$+ < $* > < $2 > strip excess on left -R< $* > $+ < $1 > strip excess on right -R<> $@ < @ > MAIL FROM:<> case -R< $+ > $: $1 remove housekeeping <> - -# strip route address <@a, at b, at c:user at d> -> -R@ $+ , $+ $2 -R@ [ $* ] : $+ $2 -R@ $+ : $+ $2 - -# find focus for list syntax -R $+ : $* ; @ $+ $@ $>Canonify2 $1 : $2 ; < @ $3 > list syntax -R $+ : $* ; $@ $1 : $2; list syntax - -# find focus for @ syntax addresses -R$+ @ $+ $: $1 < @ $2 > focus on domain -R$+ < $+ @ $+ > $1 $2 < @ $3 > move gaze right -R$+ < @ $+ > $@ $>Canonify2 $1 < @ $2 > already canonical - - -# convert old-style addresses to a domain-based address -R$- ! $+ $@ $>Canonify2 $2 < @ $1 .UUCP > resolve uucp names -R$+ . $- ! $+ $@ $>Canonify2 $3 < @ $1 . $2 > domain uucps -R$+ ! $+ $@ $>Canonify2 $2 < @ $1 .UUCP > uucp subdomains - -# if we have % signs, take the rightmost one -R$* % $* $1 @ $2 First make them all @s. -R$* @ $* @ $* $1 % $2 @ $3 Undo all but the last. -R$* @ $* $@ $>Canonify2 $1 < @ $2 > Insert < > and finish - -# else we must be a local name -R$* $@ $>Canonify2 $1 - - -################################################ -### Ruleset 96 -- bottom half of ruleset 3 ### -################################################ - -SCanonify2=96 - -# handle special cases for local names -R$* < @ localhost > $* $: $1 < @ $j . > $2 no domain at all -R$* < @ localhost . $m > $* $: $1 < @ $j . > $2 local domain -R$* < @ localhost . UUCP > $* $: $1 < @ $j . > $2 .UUCP domain - -# check for IPv4/IPv6 domain literal -R$* < @ [ $+ ] > $* $: $1 < @@ [ $2 ] > $3 mark [addr] -R$* < @@ $=w > $* $: $1 < @ $j . > $3 self-literal -R$* < @@ $+ > $* $@ $1 < @ $2 > $3 canon IP addr - - - - - -# if really UUCP, handle it immediately - -# try UUCP traffic as a local address -R$* < @ $+ . UUCP > $* $: $1 < @ $[ $2 $] . UUCP . > $3 -R$* < @ $+ . . UUCP . > $* $@ $1 < @ $2 . > $3 - -# hostnames ending in class P are always canonical -R$* < @ $* $=P > $* $: $1 < @ $2 $3 . > $4 -R$* < @ $* $~P > $* $: $&{daemon_flags} $| $1 < @ $2 $3 > $4 -R$* CC $* $| $* < @ $+.$+ > $* $: $3 < @ $4.$5 . > $6 -R$* CC $* $| $* $: $3 -# pass to name server to make hostname canonical -R$* $| $* < @ $* > $* $: $2 < @ $[ $3 $] > $4 -R$* $| $* $: $2 - -# local host aliases and pseudo-domains are always canonical -R$* < @ $=w > $* $: $1 < @ $2 . > $3 -R$* < @ $=M > $* $: $1 < @ $2 . > $3 -R$* < @ $* . . > $* $1 < @ $2 . > $3 - - -################################################## -### Ruleset 4 -- Final Output Post-rewriting ### -################################################## -Sfinal=4 - -R$+ :; <@> $@ $1 : handle -R$* <@> $@ handle <> and list:; - -# strip trailing dot off possibly canonical name -R$* < @ $+ . > $* $1 < @ $2 > $3 - -# eliminate internal code -R$* < @ *LOCAL* > $* $1 < @ $j > $2 - -# externalize local domain info -R$* < $+ > $* $1 $2 $3 defocus -R@ $+ : @ $+ : $+ @ $1 , @ $2 : $3 canonical -R@ $* $@ @ $1 ... and exit - -# UUCP must always be presented in old form -R$+ @ $- . UUCP $2!$1 u at h.UUCP => h!u - -# delete duplicate local names -R$+ % $=w @ $=w $1 @ $2 u%host at host => u at host - - - -############################################################## -### Ruleset 97 -- recanonicalize and call ruleset zero ### -### (used for recursive calls) ### -############################################################## - -SRecurse=97 -R$* $: $>canonify $1 -R$* $@ $>parse $1 - - -###################################### -### Ruleset 0 -- Parse Address ### -###################################### - -Sparse=0 - -R$* $: $>Parse0 $1 initial parsing -R<@> $#local $: <@> special case error msgs -R$* $: $>ParseLocal $1 handle local hacks -R$* $: $>Parse1 $1 final parsing - -# -# Parse0 -- do initial syntax checking and eliminate local addresses. -# This should either return with the (possibly modified) input -# or return with a #error mailer. It should not return with a -# #mailer other than the #error mailer. -# - -SParse0 -R<@> $@ <@> special case error msgs -R$* : $* ; <@> $#error $@ 5.1.3 $: "553 List:; syntax illegal for recipient addresses" -R@ <@ $* > < @ $1 > catch "@@host" bogosity -R<@ $+> $#error $@ 5.1.3 $: "553 User address required" -R$+ <@> $#error $@ 5.1.3 $: "553 Hostname required" -R$* $: <> $1 -R<> $* < @ [ $* ] : $+ > $* $1 < @ [ $2 ] : $3 > $4 -R<> $* < @ [ $* ] , $+ > $* $1 < @ [ $2 ] , $3 > $4 -R<> $* < @ [ $* ] $+ > $* $#error $@ 5.1.2 $: "553 Invalid address" -R<> $* < @ [ $+ ] > $* $1 < @ [ $2 ] > $3 -R<> $* <$* : $* > $* $#error $@ 5.1.3 $: "553 Colon illegal in host name part" -R<> $* $1 -R$* < @ . $* > $* $#error $@ 5.1.2 $: "553 Invalid host name" -R$* < @ $* .. $* > $* $#error $@ 5.1.2 $: "553 Invalid host name" -R$* < @ $* @ > $* $#error $@ 5.1.2 $: "553 Invalid route address" -R$* @ $* < @ $* > $* $#error $@ 5.1.3 $: "553 Invalid route address" -R$* , $~O $* $#error $@ 5.1.3 $: "553 Invalid route address" - - -# now delete the local info -- note $=O to find characters that cause forwarding -R$* < @ > $* $@ $>Parse0 $>canonify $1 user@ => user -R< @ $=w . > : $* $@ $>Parse0 $>canonify $2 @here:... -> ... -R$- < @ $=w . > $: $(dequote $1 $) < @ $2 . > dequote "foo"@here -R< @ $+ > $#error $@ 5.1.3 $: "553 User address required" -R$* $=O $* < @ $=w . > $@ $>Parse0 $>canonify $1 $2 $3 ... at here -> ... -R$- $: $(dequote $1 $) < @ *LOCAL* > dequote "foo" -R< @ *LOCAL* > $#error $@ 5.1.3 $: "553 User address required" -R$* $=O $* < @ *LOCAL* > - $@ $>Parse0 $>canonify $1 $2 $3 ...@*LOCAL* -> ... -R$* < @ *LOCAL* > $: $1 - -# -# Parse1 -- the bottom half of ruleset 0. -# - -SParse1 - -# handle numeric address spec -R$* < @ [ $+ ] > $* $: $>ParseLocal $1 < @ [ $2 ] > $3 numeric internet spec -R$* < @ [ $+ ] > $* $: $1 < @ [ $2 ] : $S > $3 Add smart host to path -R$* < @ [ $+ ] : > $* $#esmtp $@ [$2] $: $1 < @ [$2] > $3 no smarthost: send -R$* < @ [ $+ ] : $- : $*> $* $#$3 $@ $4 $: $1 < @ [$2] > $5 smarthost with mailer -R$* < @ [ $+ ] : $+ > $* $#esmtp $@ $3 $: $1 < @ [$2] > $4 smarthost without mailer - - -# short circuit local delivery so forwarded email works - - -R$=L < @ $=w . > $#local $: @ $1 special local names -R$+ < @ $=w . > $#local $: $1 regular local name - - -# resolve remotely connected UUCP links (if any) - -# resolve fake top level domains by forwarding to other hosts - - - -# pass names that still have a host to a smarthost (if defined) -R$* < @ $* > $* $: $>MailerToTriple < $S > $1 < @ $2 > $3 glue on smarthost name - -# deal with other remote names -R$* < @$* > $* $#esmtp $@ $2 $: $1 < @ $2 > $3 user at host.domain - -# handle locally delivered names -R$=L $#local $: @ $1 special local names -R$+ $#local $: $1 regular local names - -########################################################################### -### Ruleset 5 -- special rewriting after aliases have been expanded ### -########################################################################### - -SLocal_localaddr -Slocaladdr=5 -R$+ $: $1 $| $>"Local_localaddr" $1 -R$+ $| $#ok $@ $1 no change -R$+ $| $#$* $#$2 -R$+ $| $* $: $1 - - - - -# deal with plussed users so aliases work nicely -R$+ + * $#local $@ $&h $: $1 -R$+ + $* $#local $@ + $2 $: $1 + * - -# prepend an empty "forward host" on the front -R$+ $: <> $1 - - - -R< > $+ $: < > < $1 <> $&h > nope, restore +detail - -R< > < $+ <> + $* > $: < > < $1 + $2 > check whether +detail -R< > < $+ <> $* > $: < > < $1 > else discard -R< > < $+ + $* > $* < > < $1 > + $2 $3 find the user part -R< > < $+ > + $* $#local $@ $2 $: @ $1 strip the extra + -R< > < $+ > $@ $1 no +detail -R$+ $: $1 <> $&h add +detail back in - -R$+ <> + $* $: $1 + $2 check whether +detail -R$+ <> $* $: $1 else discard -R< local : $* > $* $: $>MailerToTriple < local : $1 > $2 no host extension -R< error : $* > $* $: $>MailerToTriple < error : $1 > $2 no host extension - -R< $~[ : $+ > $+ $: $>MailerToTriple < $1 : $2 > $3 < @ $2 > - -R< $+ > $+ $@ $>MailerToTriple < $1 > $2 < @ $1 > - - -################################################################### -### Ruleset 95 -- canonify mailer:[user@]host syntax to triple ### -################################################################### - -SMailerToTriple=95 -R< > $* $@ $1 strip off null relay -R< error : $-.$-.$- : $+ > $* $#error $@ $1.$2.$3 $: $4 -R< error : $- : $+ > $* $#error $@ $(dequote $1 $) $: $2 -R< error : $+ > $* $#error $: $1 -R< local : $* > $* $>CanonLocal < $1 > $2 -R< $~[ : $+ @ $+ > $*<$*>$* $# $1 $@ $3 $: $2<@$3> use literal user -R< $~[ : $+ > $* $# $1 $@ $2 $: $3 try qualified mailer -R< $=w > $* $@ $2 delete local host -R< $+ > $* $#relay $@ $1 $: $2 use unqualified mailer - -################################################################### -### Ruleset CanonLocal -- canonify local: syntax ### -################################################################### - -SCanonLocal -# strip local host from routed addresses -R< $* > < @ $+ > : $+ $@ $>Recurse $3 -R< $* > $+ $=O $+ < @ $+ > $@ $>Recurse $2 $3 $4 - -# strip trailing dot from any host name that may appear -R< $* > $* < @ $* . > $: < $1 > $2 < @ $3 > - -# handle local: syntax -- use old user, either with or without host -R< > $* < @ $* > $* $#local $@ $1@$2 $: $1 -R< > $+ $#local $@ $1 $: $1 - -# handle local:user at host syntax -- ignore host part -R< $+ @ $+ > $* < @ $* > $: < $1 > $3 < @ $4 > - -# handle local:user syntax -R< $+ > $* <@ $* > $* $#local $@ $2@$3 $: $1 -R< $+ > $* $#local $@ $2 $: $1 - -################################################################### -### Ruleset 93 -- convert header names to masqueraded form ### -################################################################### - -SMasqHdr=93 - - -# do not masquerade anything in class N -R$* < @ $* $=N . > $@ $1 < @ $2 $3 . > - -R$* < @ *LOCAL* > $@ $1 < @ $j . > - -################################################################### -### Ruleset 94 -- convert envelope names to masqueraded form ### -################################################################### - -SMasqEnv=94 -R$* < @ *LOCAL* > $* $: $1 < @ $j . > $2 - -################################################################### -### Ruleset 98 -- local part of ruleset zero (can be null) ### -################################################################### - -SParseLocal=98 - -# addresses sent to foo at host.REDIRECT will give a 551 error code -R$* < @ $+ .REDIRECT. > $: $1 < @ $2 . REDIRECT . > < ${opMode} > -R$* < @ $+ .REDIRECT. > $: $1 < @ $2 . REDIRECT. > -R$* < @ $+ .REDIRECT. > < $- > $#error $@ 5.1.1 $: "551 User has moved; please try " <$1@$2> - - - - - -###################################################################### -### CanonAddr -- Convert an address into a standard form for -### relay checking. Route address syntax is -### crudely converted into a %-hack address. -### -### Parameters: -### $1 -- full recipient address -### -### Returns: -### parsed address, not in source route form -###################################################################### - -SCanonAddr -R$* $: $>Parse0 $>canonify $1 make domain canonical - - -###################################################################### -### ParseRecipient -- Strip off hosts in $=R as well as possibly -### $* $=m or the access database. -### Check user portion for host separators. -### -### Parameters: -### $1 -- full recipient address -### -### Returns: -### parsed, non-local-relaying address -###################################################################### - -SParseRecipient -R$* $: $>CanonAddr $1 -R $* < @ $* . > $1 < @ $2 > strip trailing dots -R $- < @ $* > $: $(dequote $1 $) < @ $2 > dequote local part - -# if no $=O character, no host in the user portion, we are done -R $* $=O $* < @ $* > $: $1 $2 $3 < @ $4> -R $* $@ $1 - - -R $* < @ $* $=R > $: $1 < @ $2 $3 > - - - -R $* < @ $* > $@ $>ParseRecipient $1 -R<$+> $* $@ $2 - - -###################################################################### -### check_relay -- check hostname/address on SMTP startup -###################################################################### - - - -SLocal_check_relay -Scheck_relay -R$* $: $1 $| $>"Local_check_relay" $1 -R$* $| $* $| $#$* $#$3 -R$* $| $* $| $* $@ $>"Basic_check_relay" $1 $| $2 - -SBasic_check_relay -# check for deferred delivery mode -R$* $: < $&{deliveryMode} > $1 -R< d > $* $@ deferred -R< $* > $* $: $2 - - - - -###################################################################### -### check_mail -- check SMTP `MAIL FROM:' command argument -###################################################################### - -SLocal_check_mail -Scheck_mail -R$* $: $1 $| $>"Local_check_mail" $1 -R$* $| $#$* $#$2 -R$* $| $* $@ $>"Basic_check_mail" $1 - -SBasic_check_mail -# check for deferred delivery mode -R$* $: < $&{deliveryMode} > $1 -R< d > $* $@ deferred -R< $* > $* $: $2 - -# authenticated? -R$* $: $1 $| $>"tls_client" $&{verify} $| MAIL -R$* $| $#$+ $#$2 -R$* $| $* $: $1 - -R<> $@ we MUST accept <> (RFC 1123) -R$+ $: $1 -R<$+> $: <@> <$1> -R$+ $: <@> <$1> -R$* $: $&{daemon_flags} $| $1 -R$* f $* $| <@> < $* @ $- > $: < ? $&{client_name} > < $3 @ $4 > -R$* u $* $| <@> < $* > $: < $3 > -R$* $| $* $: $2 -# handle case of @localhost on address -R<@> < $* @ localhost > $: < ? $&{client_name} > < $1 @ localhost > -R<@> < $* @ [127.0.0.1] > - $: < ? $&{client_name} > < $1 @ [127.0.0.1] > -R<@> < $* @ localhost.$m > - $: < ? $&{client_name} > < $1 @ localhost.$m > -R<@> < $* @ localhost.UUCP > - $: < ? $&{client_name} > < $1 @ localhost.UUCP > -R<@> $* $: $1 no localhost as domain -R $* $: $2 local client: ok -R <$+> $#error $@ 5.5.4 $: "553 Real domain name required for sender address" -R $* $: $1 -R$* $: $>CanonAddr $1 canonify sender address and mark it -R $* < @ $+ . > $1 < @ $2 > strip trailing dots -# handle non-DNS hostnames (*.bitnet, *.decnet, *.uucp, etc) -R $* < @ $* $=P > $: $1 < @ $2 $3 > -R $* < @ $j > $: $1 < @ $j > -R $* < @ $+ > $: $) > $1 < @ $2 > -R> $* < @ $+ > - $: <$2> $3 < @ $4 > - - -# handle case of no @domain on address -R $* $: $&{daemon_flags} $| $1 -R$* u $* $| $* $: $3 -R$* $| $* $: $2 -R $* $: < ? $&{client_addr} > $1 -R $* $@ ...local unqualed ok -R $* $#error $@ 5.5.4 $: "553 Domain name required for sender address " $&f - ...remote is not -# check results -R $* $: @ $1 mark address: nothing known about it -R<$={ResOk}> $* $: @ $2 domain ok -R $* $#error $@ 4.1.8 $: "451 Domain of sender address " $&f " does not resolve" -R $* $#error $@ 5.1.8 $: "553 Domain of sender address " $&f " does not exist" - - - -###################################################################### -### check_rcpt -- check SMTP `RCPT TO:' command argument -###################################################################### - -SLocal_check_rcpt -Scheck_rcpt -R$* $: $1 $| $>"Local_check_rcpt" $1 -R$* $| $#$* $#$2 -R$* $| $* $@ $>"Basic_check_rcpt" $1 - -SBasic_check_rcpt -# empty address? -R<> $#error $@ nouser $: "553 User address required" -R$@ $#error $@ nouser $: "553 User address required" -# check for deferred delivery mode -R$* $: < $&{deliveryMode} > $1 -R< d > $* $@ deferred -R< $* > $* $: $2 - - -###################################################################### -R$* $: $1 $| @ $>"Rcpt_ok" $1 -R$* $| @ $#TEMP $+ $: $1 $| T $2 -R$* $| @ $#$* $#$2 -R$* $| @ RELAY $@ RELAY -R$* $| @ $* $: O $| $>"Relay_ok" $1 -R$* $| T $+ $: T $2 $| $>"Relay_ok" $1 -R$* $| $#TEMP $+ $#error $2 -R$* $| $#$* $#$2 -R$* $| RELAY $@ RELAY -R T $+ $| $* $#error $1 -# anything else is bogus -R$* $#error $@ 5.7.1 $: "550 Relaying denied" - - -###################################################################### -### Rcpt_ok: is the recipient ok? -###################################################################### -SRcpt_ok -R$* $: $>ParseRecipient $1 strip relayable hosts - - - - -# authenticated via TLS? -R$* $: $1 $| $>RelayTLS client authenticated? -R$* $| $# $+ $# $2 error/ok? -R$* $| $* $: $1 no - -R$* $: $1 $| $>"Local_Relay_Auth" $&{auth_type} -R$* $| $# $* $# $2 -R$* $| NO $: $1 -R$* $| $* $: $1 $| $&{auth_type} -R$* $| $: $1 -R$* $| $={TrustAuthMech} $# RELAY -R$* $| $* $: $1 -# anything terminating locally is ok -R$+ < @ $=w > $@ RELAY -R$+ < @ $* $=R > $@ RELAY - - - - -# check for local user (i.e. unqualified address) -R$* $: $1 -R $* < @ $+ > $: $1 < @ $2 > -# local user is ok -R $+ $@ RELAY -R<$+> $* $: $2 - -###################################################################### -### Relay_ok: is the relay/sender ok? -###################################################################### -SRelay_ok -# anything originating locally is ok -# check IP address -R$* $: $&{client_addr} -R$@ $@ RELAY originated locally -R0 $@ RELAY originated locally -R127.0.0.1 $@ RELAY originated locally -RIPv6:::1 $@ RELAY originated locally -R$=R $* $@ RELAY relayable IP address -R$* $: [ $1 ] put brackets around it... -R$=w $@ RELAY ... and see if it is local - - -# check client name: first: did it resolve? -R$* $: < $&{client_resolve} > -R $#TEMP $@ 4.4.0 $: "450 Relaying temporarily denied. Cannot resolve PTR record for " $&{client_addr} -R $#error $@ 5.7.1 $: "550 Relaying denied. IP name possibly forged " $&{client_name} -R $#error $@ 5.7.1 $: "550 Relaying denied. IP name lookup failed " $&{client_name} -R$* $: <@> $&{client_name} -# pass to name server to make hostname canonical -R<@> $* $=P $: $1 $2 -R<@> $+ $: $[ $1 $] -R$* . $1 strip trailing dots -R $=w $@ RELAY -R $* $=R $@ RELAY - - - - - -###################################################################### -### trust_auth: is user trusted to authenticate as someone else? -### -### Parameters: -### $1: AUTH= parameter from MAIL command -###################################################################### - -SLocal_trust_auth -Strust_auth -R$* $: $&{auth_type} $| $1 -# required by RFC 2554 section 4. -R$@ $| $* $#error $@ 5.7.1 $: "550 not authenticated" -R$* $| $&{auth_authen} $@ identical -R$* $| <$&{auth_authen}> $@ identical -R$* $| $* $: $1 $| $>"Local_trust_auth" $2 -R$* $| $#$* $#$2 -R$* $#error $@ 5.7.1 $: "550 " $&{auth_authen} " not allowed to act as " $&{auth_author} - -###################################################################### -### Relay_Auth: allow relaying based on authentication? -### -### Parameters: -### $1: ${auth_type} -###################################################################### -SLocal_Relay_Auth - -###################################################################### -### srv_features: which features to offer to a client? -### (done in server) -###################################################################### -Ssrv_features - - -###################################################################### -### try_tls: try to use STARTTLS? -### (done in client) -###################################################################### -Stry_tls - - -###################################################################### -### tls_rcpt: is connection with server "good" enough? -### (done in client, per recipient) -### -### Parameters: -### $1: recipient -###################################################################### -Stls_rcpt - - -###################################################################### -### tls_client: is connection with client "good" enough? -### (done in server) -### -### Parameters: -### ${verify} $| (MAIL|STARTTLS) -###################################################################### -Stls_client -R$* $| $* $@ $>"TLS_connection" $1 - -###################################################################### -### tls_server: is connection with server "good" enough? -### (done in client) -### -### Parameter: -### ${verify} -###################################################################### -Stls_server -R$* $@ $>"TLS_connection" $1 - -###################################################################### -### TLS_connection: is TLS connection "good" enough? -### -### Parameters: -### ${verify} -### Requirement: RHS from access map, may be ? for none. -###################################################################### -STLS_connection -RSOFTWARE $#error $@ 4.7.0 $: "403 TLS handshake." - - -###################################################################### -### RelayTLS: allow relaying based on TLS authentication -### -### Parameters: -### none -###################################################################### -SRelayTLS -# authenticated? - -###################################################################### -### authinfo: lookup authinfo in the access map -### -### Parameters: -### $1: {server_name} -### $2: {server_addr} -###################################################################### -Sauthinfo - - - - - -# -###################################################################### -###################################################################### -##### -##### MAIL FILTER DEFINITIONS -##### -###################################################################### -###################################################################### - -# -###################################################################### -###################################################################### -##### -##### MAILER DEFINITIONS -##### -###################################################################### -###################################################################### - - -################################################## -### Local and Program Mailer specification ### -################################################## - -##### $Id: local.m4,v 8.59 2004/11/23 00:37:25 ca Exp $ ##### - -# -# Envelope sender rewriting -# -SEnvFromL -R<@> $n errors to mailer-daemon -R@ <@ $*> $n temporarily bypass Sun bogosity -R$+ $: $>AddDomain $1 add local domain if needed -R$* $: $>MasqEnv $1 do masquerading - -# -# Envelope recipient rewriting -# -SEnvToL -R$+ < @ $* > $: $1 strip host part -R$+ + $* $: < $&{addr_type} > $1 + $2 mark with addr type -R $+ + $* $: $1 remove +detail for sender -R< $* > $+ $: $2 else remove mark - -# -# Header sender rewriting -# -SHdrFromL -R<@> $n errors to mailer-daemon -R@ <@ $*> $n temporarily bypass Sun bogosity -R$+ $: $>AddDomain $1 add local domain if needed -R$* $: $>MasqHdr $1 do masquerading - -# -# Header recipient rewriting -# -SHdrToL -R$+ $: $>AddDomain $1 add local domain if needed -R$* < @ *LOCAL* > $* $: $1 < @ $j . > $2 - -# -# Common code to add local domain name (only if always-add-domain) -# -SAddDomain - -Mlocal, P=/usr/lib/mail.local, F=lsDFMAw5:/|@qfSmn9, S=EnvFromL/HdrFromL, R=EnvToL/HdrToL, - T=DNS/RFC822/X-Unix, - A=mail.local -d $u -Mprog, P=/bin/sh, F=lsDFMoqeu9, S=EnvFromL/HdrFromL, R=EnvToL/HdrToL, D=$z:/, - T=X-Unix/X-Unix/X-Unix, - A=sh -c $u - -##################################### -### SMTP Mailer specification ### -##################################### - -##### $Id: smtp.m4,v 8.65 2006/07/12 21:08:10 ca Exp $ ##### - -# -# common sender and masquerading recipient rewriting -# -SMasqSMTP -R$* < @ $* > $* $@ $1 < @ $2 > $3 already fully qualified -R$+ $@ $1 < @ *LOCAL* > add local qualification - -# -# convert pseudo-domain addresses to real domain addresses -# -SPseudoToReal - -# pass s through -R< @ $+ > $* $@ < @ $1 > $2 resolve - -# output fake domains as user%fake at relay - -# do UUCP heuristics; note that these are shared with UUCP mailers -R$+ < @ $+ .UUCP. > $: < $2 ! > $1 convert to UUCP form -R$+ < @ $* > $* $@ $1 < @ $2 > $3 not UUCP form - -# leave these in .UUCP form to avoid further tampering -R< $&h ! > $- ! $+ $@ $2 < @ $1 .UUCP. > -R< $&h ! > $-.$+ ! $+ $@ $3 < @ $1.$2 > -R< $&h ! > $+ $@ $1 < @ $&h .UUCP. > -R< $+ ! > $+ $: $1 ! $2 < @ $Y > use UUCP_RELAY -R$+ < @ $~[ $* : $+ > $@ $1 < @ $4 > strip mailer: part -R$+ < @ > $: $1 < @ *LOCAL* > if no UUCP_RELAY - - -# -# envelope sender rewriting -# -SEnvFromSMTP -R$+ $: $>PseudoToReal $1 sender/recipient common -R$* :; <@> $@ list:; special case -R$* $: $>MasqSMTP $1 qualify unqual'ed names -R$+ $: $>MasqEnv $1 do masquerading - - -# -# envelope recipient rewriting -- @@ 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 Wed Jun 15 14:08:51 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 15 Jun 2011 12:08:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14818] csw/mgar/pkg/rl/trunk Message-ID: Revision: 14818 http://gar.svn.sourceforge.net/gar/?rev=14818&view=rev Author: dmichelsen Date: 2011-06-15 12:08:51 +0000 (Wed, 15 Jun 2011) Log Message: ----------- rl: Update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/rl/trunk/Makefile csw/mgar/pkg/rl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rl/trunk/files/0001-Add-missing-typedef.patch Removed Paths: ------------- csw/mgar/pkg/rl/trunk/files/CSWrl.gspec Property Changed: ---------------- csw/mgar/pkg/rl/trunk/ Property changes on: csw/mgar/pkg/rl/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/rl/trunk/Makefile =================================================================== --- csw/mgar/pkg/rl/trunk/Makefile 2011-06-15 08:47:17 UTC (rev 14817) +++ csw/mgar/pkg/rl/trunk/Makefile 2011-06-15 12:08:51 UTC (rev 14818) @@ -4,18 +4,17 @@ DESCRIPTION = A command-line tool that randomizes lines of input. define BLURB - rl is a command-line tool that reads lines from an input file or stdin, randomizes the lines and outputs a specified number of lines. It does this with only a single pass over the input while trying to use as little memory as possible. + rl is a command-line tool that reads lines from an input file or stdin, randomizes the + lines and outputs a specified number of lines. It does this with only a single pass over + the input while trying to use as little memory as possible. endef -MASTER_SITES = http://ch.tudelft.nl/~arthur/rl/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += $(call admfiles,CSWrl,) +MASTER_SITES = http://arthurdejong.org/rl/ +DISTFILES = $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PATCHFILES += 0001-Add-missing-typedef.patch -CONFIGURE_ARGS = $(DIRPATHS) # Not gonna do it -TEST_SCRIPTS = +# TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/rl/trunk/checksums =================================================================== --- csw/mgar/pkg/rl/trunk/checksums 2011-06-15 08:47:17 UTC (rev 14817) +++ csw/mgar/pkg/rl/trunk/checksums 2011-06-15 12:08:51 UTC (rev 14818) @@ -1,2 +1 @@ -ed2e6c81a0524653203e0be8fa511eae download/rl-0.2.7.tar.gz -70c4ff70bf0d59f4c79262375470f82f download/CSWrl.gspec +ed2e6c81a0524653203e0be8fa511eae rl-0.2.7.tar.gz Added: csw/mgar/pkg/rl/trunk/files/0001-Add-missing-typedef.patch =================================================================== --- csw/mgar/pkg/rl/trunk/files/0001-Add-missing-typedef.patch (rev 0) +++ csw/mgar/pkg/rl/trunk/files/0001-Add-missing-typedef.patch 2011-06-15 12:08:51 UTC (rev 14818) @@ -0,0 +1,25 @@ +From 97d4b71f64427ad6ad79b8e28c80ba25de540044 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 15 Jun 2011 14:04:17 +0200 +Subject: [PATCH] Add missing typedef + +--- + getopt_long.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/getopt_long.h b/getopt_long.h +index ed32878..0f03e4d 100644 +--- a/getopt_long.h ++++ b/getopt_long.h +@@ -28,7 +28,7 @@ + #define optional_argument 2 + + +-struct option { ++typedef struct option { + const char *name; + int has_arg; + int *flag; +-- +1.7.5.4 + Deleted: csw/mgar/pkg/rl/trunk/files/CSWrl.gspec =================================================================== --- csw/mgar/pkg/rl/trunk/files/CSWrl.gspec 2011-06-15 08:47:17 UTC (rev 14817) +++ csw/mgar/pkg/rl/trunk/files/CSWrl.gspec 2011-06-15 12:08:51 UTC (rev 14818) @@ -1,5 +0,0 @@ -%var bitname rl -%var pkgname CSWrl -%var hotline http://www.opencsw.org/bugtrack -%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 Jun 15 14:53:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 15 Jun 2011 12:53:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14819] csw/mgar/pkg/liblcms/trunk/Makefile Message-ID: Revision: 14819 http://gar.svn.sourceforge.net/gar/?rev=14819&view=rev Author: dmichelsen Date: 2011-06-15 12:53:49 +0000 (Wed, 15 Jun 2011) Log Message: ----------- liblcms: Add 64 bit binaries with isaexec Modified Paths: -------------- csw/mgar/pkg/liblcms/trunk/Makefile Modified: csw/mgar/pkg/liblcms/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblcms/trunk/Makefile 2011-06-15 12:08:51 UTC (rev 14818) +++ csw/mgar/pkg/liblcms/trunk/Makefile 2011-06-15 12:53:49 UTC (rev 14819) @@ -64,6 +64,7 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) BUILD64 = 1 +ISAEXEC = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jun 15 14:53:56 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 15 Jun 2011 12:53:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14820] csw/mgar/pkg/liblcms2/trunk/Makefile Message-ID: Revision: 14820 http://gar.svn.sourceforge.net/gar/?rev=14820&view=rev Author: dmichelsen Date: 2011-06-15 12:53:56 +0000 (Wed, 15 Jun 2011) Log Message: ----------- liblcms2: Add 64 bit binaries with isaexec Modified Paths: -------------- csw/mgar/pkg/liblcms2/trunk/Makefile Modified: csw/mgar/pkg/liblcms2/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblcms2/trunk/Makefile 2011-06-15 12:53:49 UTC (rev 14819) +++ csw/mgar/pkg/liblcms2/trunk/Makefile 2011-06-15 12:53:56 UTC (rev 14820) @@ -44,6 +44,7 @@ EXTRA_CPPFLAGS = $(EXTRA_CPPFLAGS-$(GAROSREL)) BUILD64 = 1 +ISAEXEC = 1 # One test with unicode is dumping core on 64 bit, disable for now SKIPTEST ?= 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Jun 15 22:03:34 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 Jun 2011 20:03:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[14821] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 14821 http://gar.svn.sourceforge.net/gar/?rev=14821&view=rev Author: bonivart Date: 2011-06-15 20:03:34 +0000 (Wed, 15 Jun 2011) Log Message: ----------- sendmail/trunk: change sysconfdir to /etc/opt/csw/mail Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile csw/mgar/pkg/sendmail/trunk/files/site.config.m4 Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-15 12:53:56 UTC (rev 14820) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-15 20:03:34 UTC (rev 14821) @@ -1,7 +1,14 @@ # $Id$ +# TODO +# - migrate conf from /opt/csw/etc/mail # - post message # - libmilter +# - try to fix bugs +# - 2915 Must stop built-in sendmail manually +# - 3864 Sendmail must be relinked with new berekeley db +# - 4150 Sendmail 8.14.4 released +# - 4486 Provide sendmail's contrib/ tools as a separate package? # + cpsample conf files # + remove COPYING file @@ -36,7 +43,6 @@ #DISTFILES += CSWsendmail.preremove CSWsendmail.preinstall CSWsendmail.space #DISTFILES += cswsendmail site.config.m4 $(MY_CLASSES) CSWsendmail.checkinstall #DISTFILES += README.CSW sendmail.schema CSWsendmail.postinstall -#DISTFILES += COPYING LICENSE = LICENSE @@ -44,22 +50,16 @@ CATALOGNAME_CSWsendmail = sendmail SPKG_DESC_CSWsendmail = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWsendmail = CSWbdb48 -RUNTIME_DEP_PKGS_CSWsendmail += CSWoldaprt +RUNTIME_DEP_PKGS_CSWsendmail = CSWoldaprt RUNTIME_DEP_PKGS_CSWsendmail += CSWosslrt RUNTIME_DEP_PKGS_CSWsendmail += CSWsasl RUNTIME_DEP_PKGS_CSWsendmail += CSWtcpwrap +#RUNTIME_DEP_PKGS_CSWsendmail += CSWbdb48 # not needed? makemap not compiled with hash support? -INITSMF = /etc/opt/csw/init.d/cswsendmail -SAMPLECONF = /etc/opt/csw/mail/aliases -SAMPLECONF += /etc/opt/csw/mail/helpfile -SAMPLECONF += /etc/opt/csw/mail/local-host-names -SAMPLECONF += /etc/opt/csw/mail/sendmail.cf -SAMPLECONF += /etc/opt/csw/mail/sm-client.st -SAMPLECONF += /etc/opt/csw/mail/statistics -SAMPLECONF += /etc/opt/csw/mail/submit.cf -SAMPLECONF += /etc/opt/csw/mail/trusted-users -USERGROUP = /etc/opt/csw/pkg/CSWsendmail/cswusergroup +INITSMF = /etc/opt/csw/init.d/cswsendmail +SAMPLECONF += $(addprefix /etc/opt/csw/mail/,$(CONFFILES)) +SAMPLECONF += /var/opt/csw/spool/clientmqueue/sm-client.st +USERGROUP = /etc/opt/csw/pkg/CSWsendmail/cswusergroup # Enable support for files > 2GB in size. EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE @@ -76,7 +76,7 @@ #ENABLE_CHECK = 0 -# patch away GNUism +# Patch away GNUism PATCHFILES = patch-CC-M.m4 CONFIGURE_SCRIPTS = custom @@ -85,14 +85,14 @@ INSTALL_SCRIPTS = custom EXTRA_MERGE_SCRIPTS = OS -# Temporary overrides -CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/README +# Collisions with Postfix naming it's files after the Sendmail de facto standard CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man1/mailq.1|CSWpostfix|CSWsendmail -CHECKPKG_OVERRIDES_CSWsendmail += surplus-dependency|CSWbdb48 CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/bin/newaliases|CSWpostfix|CSWsendmail CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man5/aliases.5|CSWpostfix|CSWsendmail CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/bin/mailq|CSWpostfix|CSWsendmail CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man1/newaliases.1|CSWpostfix|CSWsendmail +# Look thru these to see if they are harmless, e.g. examples +CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/README CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/share|root/opt/csw/share/mail/cf/README CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/smrsh.8 CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/sendmail.8 @@ -125,8 +125,8 @@ MANFILES8 = sendmail/sendmail.8 mailstats/mailstats.8 makemap/makemap.8 \ praliases/praliases.8 smrsh/smrsh.8 mail.local/mail.local.8 \ rmail/rmail.8 editmap/editmap.8 -CONFFILES = aliases helpfile local-host-names README.CSW sendmail.cf \ - sm-client.st statistics submit.cf trusted-users +CONFFILES = aliases helpfile local-host-names sendmail.cf \ + statistics submit.cf trusted-users configure-custom: @echo " ==> Configuring $(NAME) (custom)" @@ -204,13 +204,17 @@ ginstall -m 644 $(DOWNLOADDIR)/$$file \ $(DESTDIR)$(sysconfdir)/mail/$$file; \ done ) - ( mv $(DESTDIR)$(sysconfdir)/mail/sm-client.st \ + ( mv $(DOWNLOADDIR)/sm-client.st \ $(DESTDIR)/var/opt/csw/spool/clientmqueue/ ) @# usergroup @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail/ + @# README + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME) + @ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(NAME)/ + @$(MAKECOOKIE) merge-OS: Modified: csw/mgar/pkg/sendmail/trunk/files/site.config.m4 =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2011-06-15 12:53:56 UTC (rev 14820) +++ csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2011-06-15 20:03:34 UTC (rev 14821) @@ -10,7 +10,7 @@ define(`confEBINDIR',`/opt/csw/lib') define(`confUBINDIR',`/opt/csw/bin') define(`confSBINDIR',`/opt/csw/sbin') -define(`confSTDIR', `/opt/csw/etc/mail') +define(`confSTDIR', `/etc/opt/csw/mail') define(`confSHAREDLIBDIR', `/opt/csw/lib') define(`confMANROOT', `/opt/csw/share/man/cat') define(`confMANROOTMAN', `/opt/csw/share/man/man') @@ -22,6 +22,13 @@ APPENDDEF(`confINCDIRS', `-I/opt/csw/include') APPENDDEF(`conf_sendmail_ENVDEF', `-I/opt/csw/include') +dnl ### add BerkeleyDB hash support +dnl APPENDDEF(`confLIBDIRS', `-L/opt/csw/bdb48/lib') +dnl APPENDDEF(`confINCDIRS', `-I/opt/csw/bdb48/include') +dnl APPENDDEF(`confLIBDIRS', `-L/opt/csw/lib') +dnl APPENDDEF(`confINCDIRS', `-I/opt/csw/include') +dnl APPENDDEF(`confENVDEF', `-DNEWDB') + dnl ### add NIS/NIS+ support APPENDDEF(`confENVDEF', `-DNIS') APPENDDEF(`confENVDEF', `-DNISPLUS') 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 Jun 15 23:09:59 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 15 Jun 2011 21:09:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[14822] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 14822 http://gar.svn.sourceforge.net/gar/?rev=14822&view=rev Author: bonivart Date: 2011-06-15 21:09:59 +0000 (Wed, 15 Jun 2011) Log Message: ----------- sendmail/trunk: add bdb hash support Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile csw/mgar/pkg/sendmail/trunk/files/site.config.m4 Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-15 20:03:34 UTC (rev 14821) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-15 21:09:59 UTC (rev 14822) @@ -54,7 +54,7 @@ RUNTIME_DEP_PKGS_CSWsendmail += CSWosslrt RUNTIME_DEP_PKGS_CSWsendmail += CSWsasl RUNTIME_DEP_PKGS_CSWsendmail += CSWtcpwrap -#RUNTIME_DEP_PKGS_CSWsendmail += CSWbdb48 # not needed? makemap not compiled with hash support? +RUNTIME_DEP_PKGS_CSWsendmail += CSWbdb48 INITSMF = /etc/opt/csw/init.d/cswsendmail SAMPLECONF += $(addprefix /etc/opt/csw/mail/,$(CONFFILES)) @@ -204,7 +204,7 @@ ginstall -m 644 $(DOWNLOADDIR)/$$file \ $(DESTDIR)$(sysconfdir)/mail/$$file; \ done ) - ( mv $(DOWNLOADDIR)/sm-client.st \ + ( ginstall -m 644 $(DOWNLOADDIR)/sm-client.st \ $(DESTDIR)/var/opt/csw/spool/clientmqueue/ ) @# usergroup Modified: csw/mgar/pkg/sendmail/trunk/files/site.config.m4 =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2011-06-15 20:03:34 UTC (rev 14821) +++ csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2011-06-15 21:09:59 UTC (rev 14822) @@ -23,11 +23,9 @@ APPENDDEF(`conf_sendmail_ENVDEF', `-I/opt/csw/include') dnl ### add BerkeleyDB hash support -dnl APPENDDEF(`confLIBDIRS', `-L/opt/csw/bdb48/lib') -dnl APPENDDEF(`confINCDIRS', `-I/opt/csw/bdb48/include') -dnl APPENDDEF(`confLIBDIRS', `-L/opt/csw/lib') -dnl APPENDDEF(`confINCDIRS', `-I/opt/csw/include') -dnl APPENDDEF(`confENVDEF', `-DNEWDB') +APPENDDEF(`confLIBDIRS', `-L/opt/csw/bdb48/lib -R/opt/csw/bdb48/lib') +APPENDDEF(`confINCDIRS', `-I/opt/csw/bdb48/include') +APPENDDEF(`confENVDEF', `-DNEWDB') dnl ### add NIS/NIS+ support APPENDDEF(`confENVDEF', `-DNIS') 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 Jun 16 09:11:15 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 16 Jun 2011 07:11:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[14823] csw/mgar/pkg/libflac8/trunk/Makefile Message-ID: Revision: 14823 http://gar.svn.sourceforge.net/gar/?rev=14823&view=rev Author: dmichelsen Date: 2011-06-16 07:11:14 +0000 (Thu, 16 Jun 2011) Log Message: ----------- libflac8: Fix catalogname of legacy CSWxmmsflac Modified Paths: -------------- csw/mgar/pkg/libflac8/trunk/Makefile Modified: csw/mgar/pkg/libflac8/trunk/Makefile =================================================================== --- csw/mgar/pkg/libflac8/trunk/Makefile 2011-06-15 21:09:59 UTC (rev 14822) +++ csw/mgar/pkg/libflac8/trunk/Makefile 2011-06-16 07:11:14 UTC (rev 14823) @@ -64,8 +64,8 @@ RUNTIME_DEP_PKGS_CSWxmms-flac += CSWlibflac8 RUNTIME_DEP_PKGS_CSWxmms-flac += CSWxmms OBSOLETED_BY_CSWxmms-flac = CSWxmmsflac +CATALOGNAME_CSWxmmsflac = xmms_flac_stub - VENDOR_URL = http://flac.sourceforge.net/ LICENSE = $(foreach lic,FDL GPL LGPL Xiph,COPYING.$(lic)) 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 Jun 16 09:32:01 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 16 Jun 2011 07:32:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14824] csw/mgar/pkg/libflac8/trunk/Makefile Message-ID: Revision: 14824 http://gar.svn.sourceforge.net/gar/?rev=14824&view=rev Author: dmichelsen Date: 2011-06-16 07:32:01 +0000 (Thu, 16 Jun 2011) Log Message: ----------- libflac8: Fix dependency Modified Paths: -------------- csw/mgar/pkg/libflac8/trunk/Makefile Modified: csw/mgar/pkg/libflac8/trunk/Makefile =================================================================== --- csw/mgar/pkg/libflac8/trunk/Makefile 2011-06-16 07:11:14 UTC (rev 14823) +++ csw/mgar/pkg/libflac8/trunk/Makefile 2011-06-16 07:32:01 UTC (rev 14824) @@ -62,7 +62,7 @@ RUNTIME_DEP_PKGS_CSWxmms-flac += CSWlibogg0 RUNTIME_DEP_PKGS_CSWxmms-flac += CSWgtk RUNTIME_DEP_PKGS_CSWxmms-flac += CSWlibflac8 -RUNTIME_DEP_PKGS_CSWxmms-flac += CSWxmms +RUNTIME_DEP_PKGS_CSWxmms-flac += CSWlibxmms1 OBSOLETED_BY_CSWxmms-flac = CSWxmmsflac CATALOGNAME_CSWxmmsflac = xmms_flac_stub 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 Jun 16 10:49:01 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 16 Jun 2011 08:49:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14825] csw/mgar/pkg/libao/trunk/Makefile Message-ID: Revision: 14825 http://gar.svn.sourceforge.net/gar/?rev=14825&view=rev Author: dmichelsen Date: 2011-06-16 08:49:00 +0000 (Thu, 16 Jun 2011) Log Message: ----------- libao: Update to new defaults Modified Paths: -------------- csw/mgar/pkg/libao/trunk/Makefile Modified: csw/mgar/pkg/libao/trunk/Makefile =================================================================== --- csw/mgar/pkg/libao/trunk/Makefile 2011-06-16 07:32:01 UTC (rev 14824) +++ csw/mgar/pkg/libao/trunk/Makefile 2011-06-16 08:49:00 UTC (rev 14825) @@ -10,7 +10,7 @@ endef MASTER_SITES = http://downloads.xiph.org/releases/ao/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTFILES).tar.gz VENDOR_URL = http://www.xiph.org/ao/ @@ -42,10 +42,7 @@ PRESERVECONF = $(LIBAO_CONF) BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check - include gar/category.mk post-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jun 16 10:55:57 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 16 Jun 2011 08:55:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14826] csw/mgar/pkg/libao2/trunk/Makefile Message-ID: Revision: 14826 http://gar.svn.sourceforge.net/gar/?rev=14826&view=rev Author: dmichelsen Date: 2011-06-16 08:55:57 +0000 (Thu, 16 Jun 2011) Log Message: ----------- libao2: Use standard location for libao.conf as libao4 already does Modified Paths: -------------- csw/mgar/pkg/libao2/trunk/Makefile Modified: csw/mgar/pkg/libao2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libao2/trunk/Makefile 2011-06-16 08:49:00 UTC (rev 14825) +++ csw/mgar/pkg/libao2/trunk/Makefile 2011-06-16 08:55:57 UTC (rev 14826) @@ -22,9 +22,12 @@ PKGFILES_CSWlibao2 += $(call baseisadirs,$(libdir),ao/.*) RUNTIME_DEP_PKGS_CSWlibao2 += CSWlibesd0 +# Default is /etc/libao.conf +LIBAO_CONF = $(sysconfdir)/libao.conf +EXTRA_CPPFLAGS = -DAO_SYSTEM_CONFIG=\\\"$(LIBAO_CONF)\\\" + +# The file libao.conf is delivered with the newer libao4 + BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jun 16 11:30:50 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 16 Jun 2011 09:30:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14827] csw/mgar/pkg/mpg321/trunk Message-ID: Revision: 14827 http://gar.svn.sourceforge.net/gar/?rev=14827&view=rev Author: dmichelsen Date: 2011-06-16 09:30:50 +0000 (Thu, 16 Jun 2011) Log Message: ----------- mpg321: Update to 0.2.13-2 and latest standards Modified Paths: -------------- csw/mgar/pkg/mpg321/trunk/Makefile csw/mgar/pkg/mpg321/trunk/checksums Modified: csw/mgar/pkg/mpg321/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpg321/trunk/Makefile 2011-06-16 08:55:57 UTC (rev 14826) +++ csw/mgar/pkg/mpg321/trunk/Makefile 2011-06-16 09:30:50 UTC (rev 14827) @@ -3,30 +3,47 @@ # $Id$ NAME = mpg321 -VERSION = 0.2.11 -DISTFILE_SUFFIX = -2 +VERSION = 0.2.13_2 CATEGORIES = apps DESCRIPTION = A Free, fast fixed-point math replacement for mpg123 -SPKG_SOURCEURL = http://mpg321.sourceforge.net/ + define BLURB endef + MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION)$(DISTFILE_SUFFIX).tar.gz -RUNTIME_DEP_PKGS_CSWmpg321 += CSWlibao +DISTNAME = $(NAME)-$(subst _,-,$(VERSION)) +DISTFILES = $(DISTNAME).tar.gz + +VENDOR_URL = http://mpg321.sourceforge.net/ + +RUNTIME_DEP_PKGS_CSWmpg321 += CSWlibao4 +RUNTIME_DEP_PKGS_CSWmpg321 += CSWlibmad0 RUNTIME_DEP_PKGS_CSWmpg321 += CSWlibid3tag -RUNTIME_DEP_PKGS_CSWmpg321 += CSWlibmad RUNTIME_DEP_PKGS_CSWmpg321 += CSWzlib -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWmpg321) -TEST_TARGET = check -CONFIGURE_ARGS = $(DIRPATHS) -# A fix for an inline function and 'symbol not found'. -EXTRA_CFLAGS = -features=no%extinl +RUNTIME_DEP_PKGS_CSWmpg321 += CSWlibgnugetopt +BUILD_DEP_PKGS += CSWlibao-dev +BUILD_DEP_PKGS += CSWlibmad-dev +BUILD_DEP_PKGS += CSWlibid3tag +BUILD_DEP_PKGS += CSWzlib +BUILD_DEP_PKGS += CSWlibgnugetopt + +# We don't have round on Solaris 9 +EXTRA_CPPFLAGS = -Dround=floor + +EXTRA_LINKER_FLAGS += -lrt +EXTRA_LINKER_FLAGS += -lgnugetopt + ALTERNATIVES = mpg321 - ALTERNATIVE_mpg321 = $(bindir)/mpg123 mpg123 $(bindir)/mpg321 50 +# Checkpkg can't check this +CHECKPKG_OVERRIDES_CSWmpg321 += surplus-dependency|CSWalternatives + +# Location explicitly stated for Debian +CHECKPKG_OVERRIDES_CSWmpg321 += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/mpg321.1 + include gar/category.mk post-merge: Modified: csw/mgar/pkg/mpg321/trunk/checksums =================================================================== --- csw/mgar/pkg/mpg321/trunk/checksums 2011-06-16 08:55:57 UTC (rev 14826) +++ csw/mgar/pkg/mpg321/trunk/checksums 2011-06-16 09:30:50 UTC (rev 14827) @@ -1 +1 @@ -dff0ce31869847db251878561a621ae0 mpg321-0.2.11-2.tar.gz +1398ef00439a94bebd4342e98b30c3a3 mpg321-0.2.13-2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Jun 16 11:30:54 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 Jun 2011 09:30:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14828] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 14828 http://gar.svn.sourceforge.net/gar/?rev=14828&view=rev Author: bonivart Date: 2011-06-16 09:30:54 +0000 (Thu, 16 Jun 2011) Log Message: ----------- sendmail/trunk: fix paths Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile csw/mgar/pkg/sendmail/trunk/files/site.config.m4 Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-16 09:30:50 UTC (rev 14827) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-16 09:30:54 UTC (rev 14828) @@ -10,6 +10,8 @@ # - 4150 Sendmail 8.14.4 released # - 4486 Provide sendmail's contrib/ tools as a separate package? +# + path to sendmail.cf (/etc/opt/csw/mail) +# + bdb hash support # + cpsample conf files # + remove COPYING file # + copy usergroup file into place Modified: csw/mgar/pkg/sendmail/trunk/files/site.config.m4 =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2011-06-16 09:30:50 UTC (rev 14827) +++ csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2011-06-16 09:30:54 UTC (rev 14828) @@ -32,7 +32,9 @@ APPENDDEF(`confENVDEF', `-DNISPLUS') dnl ### use our sendmail.cf path -APPENDDEF(`confENVDEF', `-DUSE_VENDOR_CF_PATH') +dnl APPENDDEF(`confENVDEF', `-DUSE_VENDOR_CF_PATH') +APPENDDEF(`confENVDEF', `-D_PATH_SENDMAILCF=\"/etc/opt/csw/mail/sendmail.cf\"') +APPENDDEF(`confENVDEF', `-D_DIR_SENDMAILCF=\"/etc/opt/csw/mail/\"') dnl ### add LDAP support APPENDDEF(`conf_libsm_ENVDEF', `-DLDAPMAP') 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 Jun 16 11:31:54 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 16 Jun 2011 09:31:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14829] csw/mgar/pkg/mpg123/trunk Message-ID: Revision: 14829 http://gar.svn.sourceforge.net/gar/?rev=14829&view=rev Author: dmichelsen Date: 2011-06-16 09:31:54 +0000 (Thu, 16 Jun 2011) Log Message: ----------- mpg123: Update to 1.13.3, add alternatives Modified Paths: -------------- csw/mgar/pkg/mpg123/trunk/Makefile csw/mgar/pkg/mpg123/trunk/checksums Modified: csw/mgar/pkg/mpg123/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpg123/trunk/Makefile 2011-06-16 09:30:54 UTC (rev 14828) +++ csw/mgar/pkg/mpg123/trunk/Makefile 2011-06-16 09:31:54 UTC (rev 14829) @@ -1,5 +1,5 @@ NAME = mpg123 -VERSION = 1.10.0 +VERSION = 1.13.3 CATEGORIES = apps DESCRIPTION = A command-line MP3 player @@ -12,16 +12,16 @@ endef MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES = $(DISTNAME).tar.bz2 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +RUNTIME_DEP_PKGS_CSWmpg123 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWmpg123 += CSWlibesd0 +RUNTIME_DEP_PKGS_CSWmpg123 += CSWnas +RUNTIME_DEP_PKGS_CSWmpg123 += CSWlibsdl -RUNTIME_DEP_PKGS = CSWesound CSWlibsdl CSWlibtoolrt - BUILD64 = 1 -NOISAEXEC = 1 EXTRA_BUILD_ISAS = sparcv8plus+vis pentium + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-cpu=generic_fpu @@ -29,13 +29,21 @@ CONFIGURE_ARGS_mm-64 += --disable-largefile CONFIGURE_ARGS += $(CONFIGURE_ARGS_mm-$(MEMORYMODEL)) -TEST_TARGET = check - # Looks like we do need libtool files for plugins: # http://www.opencsw.org/mantis/view.php?id=4145 # Skip for libmpg123, though. MERGE_EXCLUDE_LIBTOOL = $(libdir)/[^/]*\.la -MERGE_DIRS_isa-extra = $(libdir) +# The other one is mpg321 +# This fixes #4342 +ALTERNATIVES = mpg123 +ALTERNATIVE_mpg123 = $(bindir)/mpg123 mpg123 $(bindir)/mpg123 100 +# Checkpkg can't check this +CHECKPKG_OVERRIDES_CSWmpg123 += surplus-dependency|CSWalternatives + +# No package split as nobody seems to use the library +CHECKPKG_OVERRIDES_CSWmpg123 += shared-lib-package-contains-so-symlink +CHECKPKG_OVERRIDES_CSWmpg123 += shared-lib-pkgname-mismatch + include gar/category.mk Modified: csw/mgar/pkg/mpg123/trunk/checksums =================================================================== --- csw/mgar/pkg/mpg123/trunk/checksums 2011-06-16 09:30:54 UTC (rev 14828) +++ csw/mgar/pkg/mpg123/trunk/checksums 2011-06-16 09:31:54 UTC (rev 14829) @@ -1 +1 @@ -0005c9a89c381484e2d2ff450b3dfe5e mpg123-1.10.0.tar.bz2 +b1f990ce76dcf2fdf9d53ac39fc6bc7e mpg123-1.13.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Jun 16 12:25:14 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 16 Jun 2011 10:25:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14830] csw/mgar/pkg/lang-python Message-ID: Revision: 14830 http://gar.svn.sourceforge.net/gar/?rev=14830&view=rev Author: skayser Date: 2011-06-16 10:25:13 +0000 (Thu, 16 Jun 2011) Log Message: ----------- lang-python/fabric/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/fabric/ csw/mgar/pkg/lang-python/fabric/branches/ csw/mgar/pkg/lang-python/fabric/tags/ csw/mgar/pkg/lang-python/fabric/trunk/ csw/mgar/pkg/lang-python/fabric/trunk/Makefile csw/mgar/pkg/lang-python/fabric/trunk/checksums csw/mgar/pkg/lang-python/fabric/trunk/files/ csw/mgar/pkg/lang-python/fabric/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/lang-python/fabric/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/lang-python/fabric/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/fabric/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/fabric/trunk/Makefile 2011-06-16 10:25:13 UTC (rev 14830) @@ -0,0 +1,25 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = fabric +VERSION = 1.0.1 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Remote deployment and orchestration tool +define BLURB + Fabric is a Python (2.5 or higher) library and command-line tool for + streamlining the use of SSH for application deployment or systems + administration tasks. It provides a basic suite of operations for + executing local or remote shell commands (normally or via sudo) and + uploading/downloading files, as well as auxiliary functionality such as + prompting the running user for input, or aborting execution. +endef + +MASTER_SITES = http://code.fabfile.org/projects/fabric/files/ +DISTNAME = Fabric-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/fabric/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/fabric/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/fabric/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/fabric/trunk/checksums 2011-06-16 10:25:13 UTC (rev 14830) @@ -0,0 +1 @@ +2d8bc8055be51e4fd4247ceac8b79c05 Fabric-1.0.1.tar.gz Added: csw/mgar/pkg/lang-python/fabric/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lang-python/fabric/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/lang-python/fabric/trunk/files/changelog.CSW 2011-06-16 10:25:13 UTC (rev 14830) @@ -0,0 +1,5 @@ +fabric (1.0.1,REV=2011.06.16) + + * Initial release. + + -- Sebastian Kayser Thu, 16 Jun 2011 12:21:04 +0200 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 Jun 16 12:42:46 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 16 Jun 2011 10:42:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[14831] csw/mgar/pkg/lang-python Message-ID: Revision: 14831 http://gar.svn.sourceforge.net/gar/?rev=14831&view=rev Author: skayser Date: 2011-06-16 10:42:46 +0000 (Thu, 16 Jun 2011) Log Message: ----------- lang-python/pycrypto/trunk: initial commit, doesn't build yet Added Paths: ----------- csw/mgar/pkg/lang-python/pycrypto/ csw/mgar/pkg/lang-python/pycrypto/branches/ csw/mgar/pkg/lang-python/pycrypto/tags/ csw/mgar/pkg/lang-python/pycrypto/trunk/ csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile csw/mgar/pkg/lang-python/pycrypto/trunk/checksums csw/mgar/pkg/lang-python/pycrypto/trunk/files/ Property changes on: csw/mgar/pkg/lang-python/pycrypto/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/lang-python/pycrypto/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2011-06-16 10:42:46 UTC (rev 14831) @@ -0,0 +1,28 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +# ! Build fails +# "src/RIPEMD160.c", line 47: cannot find include file: +# "/opt/csw/include/python2.6/pyconfig.h", line 1016: warning: macro redefined: _FILE_OFFSET_BITS +# cc: acomp failed for src/RIPEMD160.c +# error: command '/opt/SUNWspro/bin/cc' failed with exit status 2 +# + +NAME = pycrypto +VERSION = 2.3 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = The Python Cryptography Toolkit +define BLURB + The Python cryptography toolkit is intended to provide a reliable and + stable base for writing Python programs that require cryptographic + functions. +endef + +MASTER_SITES = http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/ +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/pycrypto/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/checksums 2011-06-16 10:42:46 UTC (rev 14831) @@ -0,0 +1 @@ +2b811cfbfc342d83ee614097effb8101 pycrypto-2.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Jun 16 12:45:39 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 16 Jun 2011 10:45:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[14832] csw/mgar/pkg/lang-python Message-ID: Revision: 14832 http://gar.svn.sourceforge.net/gar/?rev=14832&view=rev Author: skayser Date: 2011-06-16 10:45:39 +0000 (Thu, 16 Jun 2011) Log Message: ----------- lang-python/paramiko/trunk: initial commit, needs pycrypto first Added Paths: ----------- csw/mgar/pkg/lang-python/paramiko/ csw/mgar/pkg/lang-python/paramiko/branches/ csw/mgar/pkg/lang-python/paramiko/tags/ csw/mgar/pkg/lang-python/paramiko/trunk/ csw/mgar/pkg/lang-python/paramiko/trunk/Makefile csw/mgar/pkg/lang-python/paramiko/trunk/checksums csw/mgar/pkg/lang-python/paramiko/trunk/files/ Property changes on: csw/mgar/pkg/lang-python/paramiko/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/lang-python/paramiko/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/paramiko/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/paramiko/trunk/Makefile 2011-06-16 10:45:39 UTC (rev 14832) @@ -0,0 +1,24 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +# ! Needs pycrypto to be built/released/installed first +# +NAME = paramiko +VERSION = 1.7.7.1 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Python module that implements the SSH2 protocol +define BLURB + Paramiko is a module for Python 2.2 (or higher) that implements the SSH2 + protocol for secure (encrypted and authenticated) connections to remote + machines. It is written entirely in python and contains no C or + platform-dependent code. +endef + +MASTER_SITES = http://www.lag.net/paramiko/download/ +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/lang-python/paramiko/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/paramiko/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/paramiko/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/paramiko/trunk/checksums 2011-06-16 10:45:39 UTC (rev 14832) @@ -0,0 +1 @@ +ce8e2c254378312a264206f65c354d72 paramiko-1.7.7.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Jun 16 18:42:27 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 16 Jun 2011 16:42:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[14833] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 14833 http://gar.svn.sourceforge.net/gar/?rev=14833&view=rev Author: bonivart Date: 2011-06-16 16:42:27 +0000 (Thu, 16 Jun 2011) Log Message: ----------- sendmail/trunk: try alternatives, disable extra merge, disabe autoenable, test post message Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile csw/mgar/pkg/sendmail/trunk/files/cswsendmail Added Paths: ----------- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-16 10:45:39 UTC (rev 14832) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-16 16:42:27 UTC (rev 14833) @@ -1,8 +1,9 @@ # $Id$ # TODO +# - use alternatives to clear collisions with postfix, see gnuplot as example +# - tcpwrap, mutt. set 100 on both sendmail/postfix # - migrate conf from /opt/csw/etc/mail -# - post message # - libmilter # - try to fix bugs # - 2915 Must stop built-in sendmail manually @@ -10,6 +11,8 @@ # - 4150 Sendmail 8.14.4 released # - 4486 Provide sendmail's contrib/ tools as a separate package? +# + post message +# + never start cswsendmail by default (collides with system sendmail) # + path to sendmail.cf (/etc/opt/csw/mail) # + bdb hash support # + cpsample conf files @@ -62,6 +65,7 @@ SAMPLECONF += $(addprefix /etc/opt/csw/mail/,$(CONFFILES)) SAMPLECONF += /var/opt/csw/spool/clientmqueue/sm-client.st USERGROUP = /etc/opt/csw/pkg/CSWsendmail/cswusergroup +POSTMSG = $(docdir)/sendmail/README.postinstall # Enable support for files > 2GB in size. EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE @@ -85,14 +89,23 @@ BUILD_SCRIPTS = custom TEST_SCRIPTS = custom INSTALL_SCRIPTS = custom -EXTRA_MERGE_SCRIPTS = OS +#EXTRA_MERGE_SCRIPTS = OS +# Some files collide with CSWpostfix +ALTERNATIVE = $(bindir)/mailq mailq $(bindir)/mailq1.sendmail 100 +ALTERNATIVE += $(bindir)/newaliases newaliases $(bindir)/newaliases.sendmail 100 +ALTERNATIVE += $(mandir)/man1/mailq.1 mailq1.1 $(mandir)/man1/mailq1.1.sendmail 100 +ALTERNATIVE += $(mandir)/man1/newaliases.1 newaliases.1 $(mandir)/man1/newaliases.1.sendmail 100 +ALTERNATIVE += $(mandir)/man5/aliases.5 aliases.5 $(mandir)/man5/aliases.5.sendmail 100 + # Collisions with Postfix naming it's files after the Sendmail de facto standard -CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man1/mailq.1|CSWpostfix|CSWsendmail -CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/bin/newaliases|CSWpostfix|CSWsendmail -CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man5/aliases.5|CSWpostfix|CSWsendmail -CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/bin/mailq|CSWpostfix|CSWsendmail -CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man1/newaliases.1|CSWpostfix|CSWsendmail +#CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/bin/mailq|CSWpostfix|CSWsendmail +#CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/bin/newaliases|CSWpostfix|CSWsendmail +#CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man1/mailq.1|CSWpostfix|CSWsendmail +#CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man1/newaliases.1|CSWpostfix|CSWsendmail +#CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man5/aliases.5|CSWpostfix|CSWsendmail +# Surely this should not be needed +CHECKPKG_OVERRIDES_CSWsendmail += surplus-dependency|CSWalternatives # Look thru these to see if they are harmless, e.g. examples CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/README CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/share|root/opt/csw/share/mail/cf/README @@ -147,7 +160,7 @@ @$(MAKECOOKIE) install-custom: - @# install dirs + @# Install dirs @echo " ==> Installing $(NAME) (custom)" ginstall -d $(DESTDIR)$(libdir) ginstall -d $(DESTDIR)$(bindir) @@ -160,12 +173,12 @@ ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -d $(DESTDIR)$(sysconfdir)/mail - @# install the libraries + @# Install the libraries @( for file in $(LIBFILES) ; do \ ginstall -c -m 755 $(OBJDIR)/$$file $(DESTDIR)$(libdir) ; \ done ) - @# install the binaries + @# Install the binaries ginstall -m 755 $(OBJDIR)/$(BINFILES) $(DESTDIR)$(bindir) ( for file in $(SBINFILES) ; do \ ginstall -m 755 $(OBJDIR)/$$file $(DESTDIR)$(sbindir) ; \ @@ -182,7 +195,7 @@ # mv $(DESTDIR)$(sbindir)/$$file $(DESTDIR)$(sbindir)/$(SOLVER).$$file;\ # done ) - @# install manpages + @# Install manpages ( for file in $(MANFILES1) ; do \ ginstall -m 644 $(OBJDIR)/$$file $(DESTDIR)$(mandir)/man1 ; \ done ) @@ -193,15 +206,15 @@ ginstall -m 644 $(OBJDIR)/$$file $(DESTDIR)$(mandir)/man8 ; \ done ) - @# install m4/cf macros + @# Install m4/cf macros find $(WORKSRC)/cf -type f -exec chmod 644 {} + cp -r $(WORKSRC)/cf $(DESTDIR)$(sharedstatedir)/mail - @# install startup script + @# Install startup script chmod +x $(DOWNLOADDIR)/cswsendmail && \ cp -p $(DOWNLOADDIR)/cswsendmail $(DESTDIR)/etc/opt/csw/init.d - @# install configurations, XXX missing submit.cf/sendmail.cf + @# Install configurations, XXX missing submit.cf/sendmail.cf ( for file in $(CONFFILES) ; do \ ginstall -m 644 $(DOWNLOADDIR)/$$file \ $(DESTDIR)$(sysconfdir)/mail/$$file; \ @@ -217,11 +230,27 @@ @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME) @ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(NAME)/ + @# Create links in bindir + ln -s $(libdir)/sendmail $(DESTDIR)$(bindir)/newaliases + ln -s $(libdir)/sendmail $(DESTDIR)$(bindir)/mailq + ln -s $(libdir)/sendmail $(DESTDIR)$(bindir)/purgestats + ln -s $(libdir)/sendmail $(DESTDIR)$(bindir)/hoststat + + @# Fix alternatives files + mv $(DESTDIR)$(bindir)/mailq $(DESTDIR)$(bindir)/mailq1.sendmail + mv $(DESTDIR)$(bindir)/newaliases $(DESTDIR)$(bindir)/newaliases.sendmail + mv $(DESTDIR)$(mandir)/man1/mailq.1 $(DESTDIR)$(mandir)/man1/mailq1.1.sendmail + mv $(DESTDIR)$(mandir)/man1/newaliases.1 $(DESTDIR)$(mandir)/man1/newaliases.1.sendmail + mv $(DESTDIR)$(mandir)/man5/aliases.5 $(DESTDIR)$(mandir)/man5/aliases.5.sendmail + + @# Post install message + @ginstall -m 444 $(FILEDIR)/CSWsendmail.postmsg $(DESTDIR)$(docdir)/sendmail/README.postinstall + @$(MAKECOOKIE) merge-OS: + @echo " ==> Merging $(NAME) (custom)" @# create links in bindir - @echo " ==> Merging $(NAME) (custom)" ln -s $(libdir)/sendmail $(PKGROOT)$(bindir)/newaliases ln -s $(libdir)/sendmail $(PKGROOT)$(bindir)/mailq ln -s $(libdir)/sendmail $(PKGROOT)$(bindir)/purgestats Added: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg (rev 0) +++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg 2011-06-16 16:42:27 UTC (rev 14833) @@ -0,0 +1,45 @@ +=== SAMPLE FROM OTHER PACKAGES === + +--- POSTFIX --- + +Note for users upgrading from postfix 2.4.6 and previous +-------------------------------------------------------- + +- Starting with postfix 2.6.x the spool location has changed from + + /opt/csw/var/spool/postfix to + /var/opt/csw/spool/postfix + + If you have any pending email in the old spool location, please move + it to the new spool location and run "postsuper" before starting + postfix. An example script on how this can be done is shipped with the + package (migrate-queuefiles.sh). Make sure to understand what you are + doing. + +- Starting with postfix 2.6.x this package will _not_ automatically + substitute the common sendmail binaries with links to the postfix + binaries any more. Thus, the following files will be untouched and + possibly belong to the system sendmail installation. + + /usr/lib/sendmail + /usr/bin/mailq + /usr/bin/newaliases + + This makes the package installation less troublesome for shared zones + and leaves the choice of fully replacing your system sendmail up to you. + If you intend to replace those binaries above with the ones from this + postfix package, please see README.CSW. + +--- MUTT --- + +There are now two versions of mutt on the system installed: + + * mutt-ncurses with ncurses interface + * mutt-slang with slang interface (per default linked to 'mutt') + +You can easily select between the versions with the alternatives(8) +system by executing + + /opt/csw/sbin/alternatives --config mutt + +See http://www.opencsw.org/packages/alternatives for details. Modified: csw/mgar/pkg/sendmail/trunk/files/cswsendmail =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/cswsendmail 2011-06-16 10:45:39 UTC (rev 14832) +++ csw/mgar/pkg/sendmail/trunk/files/cswsendmail 2011-06-16 16:42:27 UTC (rev 14833) @@ -6,6 +6,9 @@ #ident "@(#)sendmail 1.19 01/12/05 SMI" # Modified for CSW by Alex Moore 01/01/2004 +# Magic comments for use with cswinitsmf +#AUTOENABLE no + ERRMSG1='WARNING: /var/mail is NFS-mounted without setting actimeo=0,' ERRMSG2='this can cause mailbox locking and access problems.' SERVER_PID_FILE="/var/run/sendmail.pid" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jun 17 11:53:37 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 17 Jun 2011 09:53:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14834] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14834 http://gar.svn.sourceforge.net/gar/?rev=14834&view=rev Author: wahwah Date: 2011-06-17 09:53:36 +0000 (Fri, 17 Jun 2011) Log Message: ----------- checkpkg: A check for the alternatives dependency If one of the files in the package is of the 'cswalternatives' class, checkpkg declares that the package needs the /opt/csw/sbin/alteratives file. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2011-06-16 16:42:27 UTC (rev 14833) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2011-06-17 09:53:36 UTC (rev 14834) @@ -1283,3 +1283,18 @@ return if "UNCOMMITTED" in pkginfo[repotag]: error_mgr.ReportError("pkginfo-opencsw-repository-uncommitted") + +def CheckAlternativesDependency( + pkg_data, error_mgr, logger, messenger): + + need_alternatives = False + for entry in pkg_data["pkgmap"]: + if not entry["path"]: + continue + if entry["class"] == "cswalternatives": + need_alternatives = True + break + if need_alternatives: + error_mgr.NeedFile( + "/opt/csw/sbin/alternatives", + "The alternatives subsystem is used") Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-06-16 16:42:27 UTC (rev 14833) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-06-17 09:53:36 UTC (rev 14834) @@ -1735,5 +1735,25 @@ self.RunCheckpkgTest(self.CheckpkgTest2) +class TestCheckAlternativesDependency(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckAlternativesDependency' + ALTERNATIVES_EXECUTABLE = "/opt/csw/sbin/alternatives" + def CheckpkgTest(self): + self.pkg_data["pkgmap"].append({ + 'class': 'cswalternatives', + 'group': 'bin', + 'line': ('1 f cswalternatives /opt/csw/share/alternatives/sendmail ' + '0644 root bin 408 36322 1308243112'), + 'mode': '0644', + 'path': '/opt/csw/share/alternatives/sendmail', + 'target': None, + 'type': 'f', + 'user': 'root', + }) + self.error_mgr_mock.NeedFile( + self.ALTERNATIVES_EXECUTABLE, + "The alternatives subsystem is used") + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jun 17 11:55:35 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 17 Jun 2011 09:55:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14835] csw/mgar/gar/v2/lib/web/releases_web.py Message-ID: Revision: 14835 http://gar.svn.sourceforge.net/gar/?rev=14835&view=rev Author: wahwah Date: 2011-06-17 09:55:34 +0000 (Fri, 17 Jun 2011) Log Message: ----------- pkgdb-web: Return errors when pkg aren't inserted The previous behavior was to silently ignore errors. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2011-06-17 09:53:36 UTC (rev 14834) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2011-06-17 09:55:34 UTC (rev 14835) @@ -195,7 +195,7 @@ "error_message": unicode(e), }) web.header('Content-Length', len(response)) - return response + raise web.notacceptable(data=response) def DELETE(self, catrel_name, arch_name, osrel_name, md5_sum): configuration.SetUpSqlobjectConnection() 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 Jun 18 04:36:54 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 18 Jun 2011 02:36:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14836] csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Message-ID: Revision: 14836 http://gar.svn.sourceforge.net/gar/?rev=14836&view=rev Author: bdwalton Date: 2011-06-18 02:36:54 +0000 (Sat, 18 Jun 2011) Log Message: ----------- php5/trunk: update the postinstall for the new extension directory Modified Paths: -------------- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2011-06-17 09:55:34 UTC (rev 14835) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2011-06-18 02:36:54 UTC (rev 14836) @@ -2,10 +2,12 @@ PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin -extdir="no-debug-non-zts-20060613" -curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' /etc/opt/csw/php5/php.ini` +curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' /etc/opt/csw/php +5/php.ini` -if [ "no-debug-non-zts-20060613" != "$curextdir" ]; then - echo "updating extension_dir..." - perl -i.bak -plne "s,no-debug-non-zts-[0-9]+,no-debug-non-zts-20060613," /etc/opt/csw/php5/php.ini +# the new php.ini doesn't have this line at all, but the old one might. +# update it if required. +if [ "no-debug-non-zts-20090626" != "$curextdir" ]; then + echo "Updating extension_dir..." + perl -i.bak -plne "s,no-debug-non-zts-[0-9]+,no-debug-non-zts-20090626," /etc/opt/csw/php5/php.ini fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Sat Jun 18 05:13:09 2011 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 17 Jun 2011 23:13:09 -0400 Subject: [csw-devel] proposed checkpkg test Message-ID: <1308366408-sup-5339@pinkfloyd.chass.utoronto.ca> Hi All, After noticing that bacula wanted to gzip manpages by default, I took a look through the file database and noticed that several other packages[1] provide gzipped manpages. As solaris man can't handle these, I'd consider it a bug in the packaging. I propose this addition to checkpkg: $ svn diff Index: package_checks.py =================================================================== --- package_checks.py (revision 14836) +++ package_checks.py (working copy) @@ -220,6 +220,12 @@ if re.search(perllocal_re, entry["path"]): error_mgr.ReportError("perllocal-pod-in-pkgmap", entry["path"]) +def CheckGzippedManpages(pkg_data, error_mgr, logger, messenger): + gzipman_re = re.compile(r'share/man/man.*/.*\.gz$') + for entry in pkg_data["pkgmap"]: + if entry["path"]: + if re.search(gzipman_re, entry["path"]): + error_mgr.ReportError("gzipped-manpage-in-pkgmap", entry["path"]) def CheckMultipleDepends(pkg_data, error_mgr, logger, messenger): new_depends = set() I tested it against CSWpuppet and I think it works as expected. Maciej? Thanks -Ben [1] CSWbochs, CSWpuppet, CSWconvmv -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From maciej at opencsw.org Sat Jun 18 08:43:33 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sat, 18 Jun 2011 07:43:33 +0100 Subject: [csw-devel] proposed checkpkg test In-Reply-To: <1308366408-sup-5339@pinkfloyd.chass.utoronto.ca> References: <1308366408-sup-5339@pinkfloyd.chass.utoronto.ca> Message-ID: 2011/6/18 Ben Walton : > After noticing that bacula wanted to gzip manpages by default, I took > a look through the file database and noticed that several other > packages[1] provide gzipped manpages. ?As solaris man can't handle > these, I'd consider it a bug in the packaging. ?I propose this > addition to checkpkg: > > > $ svn diff > Index: package_checks.py > =================================================================== > --- package_checks.py ? (revision 14836) > +++ package_checks.py ? (working copy) > @@ -220,6 +220,12 @@ > ? ? ? if re.search(perllocal_re, entry["path"]): > ? ? ? ? error_mgr.ReportError("perllocal-pod-in-pkgmap", > ? ? ? ? entry["path"]) > > +def CheckGzippedManpages(pkg_data, error_mgr, logger, messenger): > + ?gzipman_re = re.compile(r'share/man/man.*/.*\.gz$') > + ?for entry in pkg_data["pkgmap"]: > + ? ?if entry["path"]: > + ? ? ?if re.search(gzipman_re, entry["path"]): > + ? ? ? ?error_mgr.ReportError("gzipped-manpage-in-pkgmap", > entry["path"]) The code looks good. A unit test would be a good thing to have. I can think of three test cases: - a non .gz manpage (no error) - a .gz manpage (error) - a .gz manpage outside of share/man (no error?) Do you need any help with the unit test? Maciej From skayser at users.sourceforge.net Sat Jun 18 13:51:58 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 18 Jun 2011 11:51:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[14837] csw/mgar/pkg/lang-python/pycrypto/trunk Message-ID: Revision: 14837 http://gar.svn.sourceforge.net/gar/?rev=14837&view=rev Author: skayser Date: 2011-06-18 11:51:57 +0000 (Sat, 18 Jun 2011) Log Message: ----------- lang-python/pycrypto/trunk: fix stdint.h related build errors Modified Paths: -------------- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/pycrypto/trunk/files/0001-On-Solaris-Use-sys-inttypes.h-instead-of-stdint.h.patch Modified: csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2011-06-18 02:36:54 UTC (rev 14836) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2011-06-18 11:51:57 UTC (rev 14837) @@ -1,12 +1,13 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # -# ! Build fails -# "src/RIPEMD160.c", line 47: cannot find include file: +# * pyconfig.h (via "Python.h") unconditionally sets _FILE_OFFSET_BITS = 64. # "/opt/csw/include/python2.6/pyconfig.h", line 1016: warning: macro redefined: _FILE_OFFSET_BITS -# cc: acomp failed for src/RIPEMD160.c -# error: command '/opt/SUNWspro/bin/cc' failed with exit status 2 # +# * setup.py unconditionally passes gcc flags +# cc: Warning: illegal option -d=c99 +# cc: Warning: illegal option -fomit-frame-pointer +# NAME = pycrypto VERSION = 2.3 @@ -23,6 +24,9 @@ MASTER_SITES = http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/ DISTFILES = $(DISTNAME).tar.gz +# c.f. https://bugs.launchpad.net/pycrypto/+bug/518871 +PATCHFILES += 0001-On-Solaris-Use-sys-inttypes.h-instead-of-stdint.h.patch + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Added: csw/mgar/pkg/lang-python/pycrypto/trunk/files/0001-On-Solaris-Use-sys-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/files/0001-On-Solaris-Use-sys-inttypes.h-instead-of-stdint.h.patch (rev 0) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/files/0001-On-Solaris-Use-sys-inttypes.h-instead-of-stdint.h.patch 2011-06-18 11:51:57 UTC (rev 14837) @@ -0,0 +1,70 @@ +From 002603e46cedd91813e2aa0dd1b2b0e24497079e Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Sat, 18 Jun 2011 12:54:05 +0200 +Subject: [PATCH] On Solaris, Use sys/inttypes.h instead of stdint.h + +Required because Solaris < 10 doesn't ship with stdint.h. On Solaris 10, +both (sys/inttypes.h and stdint.h) end up including sys/int_types.h, so +this should also be fine for Solaris 10. +--- + src/Blowfish.c | 6 ++++++ + src/RIPEMD160.c | 6 ++++++ + src/_counter.h | 5 +++++ + 3 files changed, 17 insertions(+), 0 deletions(-) + +diff --git a/src/Blowfish.c b/src/Blowfish.c +index f0d8594..d6e4b7c 100644 +--- a/src/Blowfish.c ++++ b/src/Blowfish.c +@@ -27,7 +27,13 @@ + */ + + #include ++ ++#if defined(__sun) || defined(__sun__) ++#include ++#else + #include ++#endif ++ + #include + #include "Python.h" + +diff --git a/src/RIPEMD160.c b/src/RIPEMD160.c +index da2e72c..51cfcac 100644 +--- a/src/RIPEMD160.c ++++ b/src/RIPEMD160.c +@@ -44,7 +44,13 @@ + */ + + #include ++ ++#if defined(__sun) || defined(__sun__) ++#include ++#else + #include ++#endif ++ + #include + #include "Python.h" + +diff --git a/src/_counter.h b/src/_counter.h +index faaf63f..1f2a31c 100644 +--- a/src/_counter.h ++++ b/src/_counter.h +@@ -24,7 +24,12 @@ + #ifndef PCT__COUNTER_H + #define PCT__COUNTER_H + ++#if defined(__sun) || defined(__sun__) ++#include ++#else + #include ++#endif ++ + #include "Python.h" + + typedef struct { +-- +1.7.5.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Jun 18 14:06:44 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 18 Jun 2011 12:06:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[14838] csw/mgar/pkg/lang-python/pycrypto/trunk/files/ changelog.CSW Message-ID: Revision: 14838 http://gar.svn.sourceforge.net/gar/?rev=14838&view=rev Author: skayser Date: 2011-06-18 12:06:44 +0000 (Sat, 18 Jun 2011) Log Message: ----------- lang-python/pycrypto/trunk: add changelog.CSW Added Paths: ----------- csw/mgar/pkg/lang-python/pycrypto/trunk/files/changelog.CSW Added: csw/mgar/pkg/lang-python/pycrypto/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/files/changelog.CSW 2011-06-18 12:06:44 UTC (rev 14838) @@ -0,0 +1,5 @@ +pycrypto (2.3,REV=2011.06.18) + + * Initial release. + + -- Sebastian Kayser Sat, 18 Jun 2011 14:05:18 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Jun 18 14:43:28 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 18 Jun 2011 12:43:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[14839] csw/mgar/pkg/lang-python/pycrypto/trunk Message-ID: Revision: 14839 http://gar.svn.sourceforge.net/gar/?rev=14839&view=rev Author: skayser Date: 2011-06-18 12:43:27 +0000 (Sat, 18 Jun 2011) Log Message: ----------- lang-python/pycrypto/trunk: add runtime deps and license, adjust package name, drop superfluous CONFIGURE_ARGS Modified Paths: -------------- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/pycrypto/trunk/files/0002-Substitute-hardcoded-usr-local-bin-python.patch Modified: csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2011-06-18 12:06:44 UTC (rev 14838) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2011-06-18 12:43:27 UTC (rev 14839) @@ -23,10 +23,14 @@ MASTER_SITES = http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/ DISTFILES = $(DISTNAME).tar.gz +LICENSE = COPYRIGHT +PACKAGES = CSWpy-crypto +RUNTIME_DEP_PKGS = CSWlibgmp +RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 + # c.f. https://bugs.launchpad.net/pycrypto/+bug/518871 PATCHFILES += 0001-On-Solaris-Use-sys-inttypes.h-instead-of-stdint.h.patch +PATCHFILES += 0002-Substitute-hardcoded-usr-local-bin-python.patch -CONFIGURE_ARGS = $(DIRPATHS) - include gar/category.mk Added: csw/mgar/pkg/lang-python/pycrypto/trunk/files/0002-Substitute-hardcoded-usr-local-bin-python.patch =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/files/0002-Substitute-hardcoded-usr-local-bin-python.patch (rev 0) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/files/0002-Substitute-hardcoded-usr-local-bin-python.patch 2011-06-18 12:43:27 UTC (rev 14839) @@ -0,0 +1,22 @@ +From c2c98941699d20c6797d8dfd21938d0b299c5fd3 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Sat, 18 Jun 2011 14:27:02 +0200 +Subject: [PATCH] Substitute hardcoded /usr/local/bin/python + +--- + lib/Crypto/Util/RFC1751.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/Crypto/Util/RFC1751.py b/lib/Crypto/Util/RFC1751.py +index 85e0e99..f25ed8f 100644 +--- a/lib/Crypto/Util/RFC1751.py ++++ b/lib/Crypto/Util/RFC1751.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/env python + # rfc1751.py : Converts between 128-bit strings and a human-readable + # sequence of words, as defined in RFC1751: "A Convention for + # Human-Readable 128-bit Keys", by Daniel L. McDonald. +-- +1.7.5.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Sat Jun 18 15:28:05 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sat, 18 Jun 2011 09:28:05 -0400 Subject: [csw-devel] proposed checkpkg test In-Reply-To: References: <1308366408-sup-5339@pinkfloyd.chass.utoronto.ca> Message-ID: <1308403482-sup-4314@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Sat Jun 18 02:43:33 -0400 2011: > The code looks good. A unit test would be a good thing to have. I > can think of three test cases: Agreed. I'll add those and send an update. I didn't want to do that if the code was wrong up front. I'll also expand the wiki page detailing the error tags. > - a .gz manpage outside of share/man (no error?) Is this even worth checking then? > Do you need any help with the unit test? I think I can handle it. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bwalton at opencsw.org Sat Jun 18 21:14:52 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sat, 18 Jun 2011 15:14:52 -0400 Subject: [csw-devel] proposed checkpkg test In-Reply-To: References: <1308366408-sup-5339@pinkfloyd.chass.utoronto.ca> Message-ID: <1308424445-sup-4716@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Sat Jun 18 02:43:33 -0400 2011: > The code looks good. A unit test would be a good thing to have. I > can think of three test cases: How about this then? Index: package_checks_test.py =================================================================== --- package_checks_test.py (revision 14836) +++ package_checks_test.py (working copy) @@ -950,6 +950,39 @@ 'This path is already provided by CSWcommon ' 'or is not allowed for other reasons.') + +class TestCheckGzippedManpages(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = "CheckGzippedManpages" + def CheckpkgTest(self): + self.pkg_data["pkgmap"].append({ + "class": "none", + "group": "bin", + "line": "", + "mode": '0755', + "path": "/opt/csw/share/man/man5/puppet.conf.5.gz", + "type": "f", + "user": "root" + }) + self.error_mgr_mock.ReportError( + 'gzipped-manpage-in-pkgmap', 'opt/csw/share/man/man5/puppet.conf.5.gz', + "Solaris' man cannot automatically inflate man pages." + "Solution: man page should be gunzipped.") + + +class TestCheckGzippedManpages_good(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = "CheckGzippedManpages" + def CheckpkgTest(self): + self.pkg_data["pkgmap"].append({ + "class": "none", + "group": "bin", + "line": "", + "mode": '0755', + "path": "/opt/csw/share/man/man5/puppet.conf.5", + "type": "f", + "user": "root" + }) + + class TestCheckArchitecture_sparcv8plus(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = "CheckArchitecture" Index: package_checks.py =================================================================== --- package_checks.py (revision 14836) +++ package_checks.py (working copy) @@ -220,6 +220,15 @@ if re.search(perllocal_re, entry["path"]): error_mgr.ReportError("perllocal-pod-in-pkgmap", entry["path"]) +def CheckGzippedManpages(pkg_data, error_mgr, logger, messenger): + gzipman_re = re.compile(r'share/man/man.*/.*\.gz$') + for entry in pkg_data["pkgmap"]: + if entry["path"]: + if re.search(gzipman_re, entry["path"]): + error_mgr.ReportError( + 'gzipped-manpage-in-pkgmap', entry["path"], + "Solaris' man cannot automatically inflate man pages." + "Solution: man page should be gunzipped.") def CheckMultipleDepends(pkg_data, error_mgr, logger, messenger): new_depends = set() -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From opk at users.sourceforge.net Mon Jun 20 16:33:46 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Mon, 20 Jun 2011 14:33:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[14840] csw/mgar/pkg/zsh/trunk Message-ID: Revision: 14840 http://gar.svn.sourceforge.net/gar/?rev=14840&view=rev Author: opk Date: 2011-06-20 14:33:45 +0000 (Mon, 20 Jun 2011) Log Message: ----------- update to 4.3.12 Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile csw/mgar/pkg/zsh/trunk/checksums Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2011-06-18 12:43:27 UTC (rev 14839) +++ csw/mgar/pkg/zsh/trunk/Makefile 2011-06-20 14:33:45 UTC (rev 14840) @@ -1,5 +1,5 @@ NAME = zsh -VERSION = 4.3.11 +VERSION = 4.3.12 CATEGORIES = devel DESCRIPTION = Powerful UNIX shell Modified: csw/mgar/pkg/zsh/trunk/checksums =================================================================== --- csw/mgar/pkg/zsh/trunk/checksums 2011-06-18 12:43:27 UTC (rev 14839) +++ csw/mgar/pkg/zsh/trunk/checksums 2011-06-20 14:33:45 UTC (rev 14840) @@ -1 +1 @@ -3225c7f53b69f395e95723585d6785ed zsh-4.3.11.tar.bz2 +7a82c0bf0635e046ca4e9ec1bdef3811 zsh-4.3.12.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jun 20 17:28:18 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 20 Jun 2011 15:28:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14841] csw/mgar/pkg/sendmail/trunk/Makefile Message-ID: Revision: 14841 http://gar.svn.sourceforge.net/gar/?rev=14841&view=rev Author: bonivart Date: 2011-06-20 15:28:18 +0000 (Mon, 20 Jun 2011) Log Message: ----------- sendmail/trunk: test new syntax for alternatives Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-20 14:33:45 UTC (rev 14840) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-20 15:28:18 UTC (rev 14841) @@ -1,6 +1,8 @@ # $Id$ # TODO +# - Tests? +# - Build separate 9/10 packages? # - use alternatives to clear collisions with postfix, see gnuplot as example # - tcpwrap, mutt. set 100 on both sendmail/postfix # - migrate conf from /opt/csw/etc/mail @@ -92,11 +94,16 @@ #EXTRA_MERGE_SCRIPTS = OS # Some files collide with CSWpostfix -ALTERNATIVE = $(bindir)/mailq mailq $(bindir)/mailq1.sendmail 100 -ALTERNATIVE += $(bindir)/newaliases newaliases $(bindir)/newaliases.sendmail 100 -ALTERNATIVE += $(mandir)/man1/mailq.1 mailq1.1 $(mandir)/man1/mailq1.1.sendmail 100 -ALTERNATIVE += $(mandir)/man1/newaliases.1 newaliases.1 $(mandir)/man1/newaliases.1.sendmail 100 -ALTERNATIVE += $(mandir)/man5/aliases.5 aliases.5 $(mandir)/man5/aliases.5.sendmail 100 +ALTERNATIVE = $(bindir)/mailq mta $(bindir)/mailq1.sendmail 100 +ALTERNATIVE += $(bindir)/newaliases mta $(bindir)/newaliases.sendmail 100 +ALTERNATIVE += $(mandir)/man1/mailq.1 mta $(mandir)/man1/mailq1.1.sendmail 100 +ALTERNATIVE += $(mandir)/man1/newaliases.1 mta $(mandir)/man1/newaliases.1.sendmail 100 +ALTERNATIVE += $(mandir)/man5/aliases.5 mta $(mandir)/man5/aliases.5.sendmail 100 +#ALTERNATIVE = $(bindir)/mailq mailq $(bindir)/mailq1.sendmail 100 +#ALTERNATIVE += $(bindir)/newaliases newaliases $(bindir)/newaliases.sendmail 100 +#ALTERNATIVE += $(mandir)/man1/mailq.1 mailq1.1 $(mandir)/man1/mailq1.1.sendmail 100 +#ALTERNATIVE += $(mandir)/man1/newaliases.1 newaliases.1 $(mandir)/man1/newaliases.1.sendmail 100 +#ALTERNATIVE += $(mandir)/man5/aliases.5 aliases.5 $(mandir)/man5/aliases.5.sendmail 100 # Collisions with Postfix naming it's files after the Sendmail de facto standard #CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/bin/mailq|CSWpostfix|CSWsendmail @@ -105,7 +112,7 @@ #CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man1/newaliases.1|CSWpostfix|CSWsendmail #CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man5/aliases.5|CSWpostfix|CSWsendmail # Surely this should not be needed -CHECKPKG_OVERRIDES_CSWsendmail += surplus-dependency|CSWalternatives +#CHECKPKG_OVERRIDES_CSWsendmail += surplus-dependency|CSWalternatives # Look thru these to see if they are harmless, e.g. examples CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/README CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/share|root/opt/csw/share/mail/cf/README This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jun 20 18:19:17 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 20 Jun 2011 16:19:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14842] csw/mgar/pkg/sendmail/trunk/Makefile Message-ID: Revision: 14842 http://gar.svn.sourceforge.net/gar/?rev=14842&view=rev Author: bonivart Date: 2011-06-20 16:19:17 +0000 (Mon, 20 Jun 2011) Log Message: ----------- sendmail/trunk: yet another twist of alternatives Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-20 15:28:18 UTC (rev 14841) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-20 16:19:17 UTC (rev 14842) @@ -94,11 +94,13 @@ #EXTRA_MERGE_SCRIPTS = OS # Some files collide with CSWpostfix -ALTERNATIVE = $(bindir)/mailq mta $(bindir)/mailq1.sendmail 100 -ALTERNATIVE += $(bindir)/newaliases mta $(bindir)/newaliases.sendmail 100 -ALTERNATIVE += $(mandir)/man1/mailq.1 mta $(mandir)/man1/mailq1.1.sendmail 100 -ALTERNATIVE += $(mandir)/man1/newaliases.1 mta $(mandir)/man1/newaliases.1.sendmail 100 -ALTERNATIVE += $(mandir)/man5/aliases.5 mta $(mandir)/man5/aliases.5.sendmail 100 +ALTERNATIVES_CSWsendmail = sendmail +ALTERNATIVE_sendmail = $(bindir)/mailq mailq $(bindir)/mailq1.sendmail 100 +ALTERNATIVE_sendmail += $(bindir)/newaliases newaliases $(bindir)/newaliases.sendmail +ALTERNATIVE_sendmail += $(mandir)/man1/mailq.1 mailq.1 $(mandir)/man1/mailq1.1.sendmail +ALTERNATIVE_sendmail += $(mandir)/man1/newaliases.1 newaliases.1 $(mandir)/man1/newaliases.1.sendmail +ALTERNATIVE_sendmail += $(mandir)/man5/aliases.5 aliases.5 $(mandir)/man5/aliases.5.sendmail + #ALTERNATIVE = $(bindir)/mailq mailq $(bindir)/mailq1.sendmail 100 #ALTERNATIVE += $(bindir)/newaliases newaliases $(bindir)/newaliases.sendmail 100 #ALTERNATIVE += $(mandir)/man1/mailq.1 mailq1.1 $(mandir)/man1/mailq1.1.sendmail 100 @@ -111,8 +113,7 @@ #CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man1/mailq.1|CSWpostfix|CSWsendmail #CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man1/newaliases.1|CSWpostfix|CSWsendmail #CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man5/aliases.5|CSWpostfix|CSWsendmail -# Surely this should not be needed -#CHECKPKG_OVERRIDES_CSWsendmail += surplus-dependency|CSWalternatives + # Look thru these to see if they are harmless, e.g. examples CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/README CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/share|root/opt/csw/share/mail/cf/README This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jun 20 18:35:11 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 20 Jun 2011 16:35:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14843] csw/mgar/pkg/sendmail/trunk/Makefile Message-ID: Revision: 14843 http://gar.svn.sourceforge.net/gar/?rev=14843&view=rev Author: bonivart Date: 2011-06-20 16:35:11 +0000 (Mon, 20 Jun 2011) Log Message: ----------- sendmail/trunk: one more try... Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-20 16:19:17 UTC (rev 14842) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-20 16:35:11 UTC (rev 14843) @@ -94,12 +94,12 @@ #EXTRA_MERGE_SCRIPTS = OS # Some files collide with CSWpostfix -ALTERNATIVES_CSWsendmail = sendmail -ALTERNATIVE_sendmail = $(bindir)/mailq mailq $(bindir)/mailq1.sendmail 100 -ALTERNATIVE_sendmail += $(bindir)/newaliases newaliases $(bindir)/newaliases.sendmail -ALTERNATIVE_sendmail += $(mandir)/man1/mailq.1 mailq.1 $(mandir)/man1/mailq1.1.sendmail -ALTERNATIVE_sendmail += $(mandir)/man1/newaliases.1 newaliases.1 $(mandir)/man1/newaliases.1.sendmail -ALTERNATIVE_sendmail += $(mandir)/man5/aliases.5 aliases.5 $(mandir)/man5/aliases.5.sendmail +ALTERNATIVES_CSWsendmail = mailq newaliases mailq.1 newaliases.1 aliases.5 +ALTERNATIVE_mailq = $(bindir)/mailq mailq $(bindir)/mailq1.sendmail 100 +ALTERNATIVE_newaliases += $(bindir)/newaliases newaliases $(bindir)/newaliases.sendmail 100 +ALTERNATIVE_mailq.1 += $(mandir)/man1/mailq.1 mailq.1 $(mandir)/man1/mailq1.1.sendmail 100 +ALTERNATIVE_newaliases.1 += $(mandir)/man1/newaliases.1 newaliases.1 $(mandir)/man1/newaliases.1.sendmail 100 +ALTERNATIVE_aliases.5 += $(mandir)/man5/aliases.5 aliases.5 $(mandir)/man5/aliases.5.sendmail 100 #ALTERNATIVE = $(bindir)/mailq mailq $(bindir)/mailq1.sendmail 100 #ALTERNATIVE += $(bindir)/newaliases newaliases $(bindir)/newaliases.sendmail 100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jun 20 20:42:33 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 20 Jun 2011 18:42:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14844] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 14844 http://gar.svn.sourceforge.net/gar/?rev=14844&view=rev Author: bonivart Date: 2011-06-20 18:42:33 +0000 (Mon, 20 Jun 2011) Log Message: ----------- sendmail/trunk: build libmilter Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/sendmail/trunk/files/0001-add-libmilter-to-the-Makefile.patch csw/mgar/pkg/sendmail/trunk/files/0002-no-gnuism.patch Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-20 16:35:11 UTC (rev 14843) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-20 18:42:33 UTC (rev 14844) @@ -1,18 +1,18 @@ # $Id$ # TODO +# - Include activate/deactivate scripts # - Tests? # - Build separate 9/10 packages? -# - use alternatives to clear collisions with postfix, see gnuplot as example -# - tcpwrap, mutt. set 100 on both sendmail/postfix # - migrate conf from /opt/csw/etc/mail -# - libmilter # - try to fix bugs # - 2915 Must stop built-in sendmail manually # - 3864 Sendmail must be relinked with new berekeley db # - 4150 Sendmail 8.14.4 released # - 4486 Provide sendmail's contrib/ tools as a separate package? +# + libmilter +# + use alternatives to clear collisions with postfix, see sudo as example # + post message # + never start cswsendmail by default (collides with system sendmail) # + path to sendmail.cf (/etc/opt/csw/mail) @@ -53,18 +53,27 @@ LICENSE = LICENSE -PACKAGES = CSWsendmail -CATALOGNAME_CSWsendmail = sendmail -SPKG_DESC_CSWsendmail = $(DESCRIPTION) - +PACKAGES = CSWsendmail +CATALOGNAME_CSWsendmail = sendmail +SPKG_DESC_CSWsendmail = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWsendmail = CSWoldaprt RUNTIME_DEP_PKGS_CSWsendmail += CSWosslrt RUNTIME_DEP_PKGS_CSWsendmail += CSWsasl RUNTIME_DEP_PKGS_CSWsendmail += CSWtcpwrap RUNTIME_DEP_PKGS_CSWsendmail += CSWbdb48 +PACKAGES += CSWlibmilter +CATALOGNAME_CSWlibmilter = libmilter +SPKG_DESC_CSWlibmilter = Sendmail MTA milter +PKGFILES_CSWlibmilter = $(docdir)/libmilter/.* +PKGFILES_CSWlibmilter += /opt/csw/include/libmilter.h +PKGFILES_CSWlibmilter += $(libdir)/libmilter.a +PKGFILES_CSWlibmilter += $(libdir)/libsm.a +PKGFILES_CSWlibmilter += $(libdir)/libsmdb.a +PKGFILES_CSWlibmilter += $(libdir)/libsmutil.a + INITSMF = /etc/opt/csw/init.d/cswsendmail -SAMPLECONF += $(addprefix /etc/opt/csw/mail/,$(CONFFILES)) +SAMPLECONF = $(addprefix /etc/opt/csw/mail/,$(CONFFILES)) SAMPLECONF += /var/opt/csw/spool/clientmqueue/sm-client.st USERGROUP = /etc/opt/csw/pkg/CSWsendmail/cswusergroup POSTMSG = $(docdir)/sendmail/README.postinstall @@ -72,6 +81,9 @@ # Enable support for files > 2GB in size. EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE +# Do not remove the static libs from libmilter +MERGE_EXCLUDE_STATICLIBS = + #PROTOTYPE_FILTER = awk \ # '$$$$2 ~/i.sol9/ { next } \ # $$$$2 ~/i.sol10/ { next } \ @@ -85,8 +97,11 @@ #ENABLE_CHECK = 0 # Patch away GNUism -PATCHFILES = patch-CC-M.m4 +#PATCHFILES = patch-CC-M.m4 +PATCHFILES += 0001-add-libmilter-to-the-Makefile.patch +PATCHFILES += 0002-no-gnuism.patch + CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom TEST_SCRIPTS = custom @@ -95,25 +110,12 @@ # Some files collide with CSWpostfix ALTERNATIVES_CSWsendmail = mailq newaliases mailq.1 newaliases.1 aliases.5 -ALTERNATIVE_mailq = $(bindir)/mailq mailq $(bindir)/mailq1.sendmail 100 +ALTERNATIVE_mailq = $(bindir)/mailq mailq $(bindir)/mailq.sendmail 100 ALTERNATIVE_newaliases += $(bindir)/newaliases newaliases $(bindir)/newaliases.sendmail 100 ALTERNATIVE_mailq.1 += $(mandir)/man1/mailq.1 mailq.1 $(mandir)/man1/mailq1.1.sendmail 100 ALTERNATIVE_newaliases.1 += $(mandir)/man1/newaliases.1 newaliases.1 $(mandir)/man1/newaliases.1.sendmail 100 ALTERNATIVE_aliases.5 += $(mandir)/man5/aliases.5 aliases.5 $(mandir)/man5/aliases.5.sendmail 100 -#ALTERNATIVE = $(bindir)/mailq mailq $(bindir)/mailq1.sendmail 100 -#ALTERNATIVE += $(bindir)/newaliases newaliases $(bindir)/newaliases.sendmail 100 -#ALTERNATIVE += $(mandir)/man1/mailq.1 mailq1.1 $(mandir)/man1/mailq1.1.sendmail 100 -#ALTERNATIVE += $(mandir)/man1/newaliases.1 newaliases.1 $(mandir)/man1/newaliases.1.sendmail 100 -#ALTERNATIVE += $(mandir)/man5/aliases.5 aliases.5 $(mandir)/man5/aliases.5.sendmail 100 - -# Collisions with Postfix naming it's files after the Sendmail de facto standard -#CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/bin/mailq|CSWpostfix|CSWsendmail -#CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/bin/newaliases|CSWpostfix|CSWsendmail -#CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man1/mailq.1|CSWpostfix|CSWsendmail -#CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man1/newaliases.1|CSWpostfix|CSWsendmail -#CHECKPKG_OVERRIDES_CSWsendmail += file-collision|/opt/csw/share/man/man5/aliases.5|CSWpostfix|CSWsendmail - # Look thru these to see if they are harmless, e.g. examples CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/README CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/share|root/opt/csw/share/mail/cf/README @@ -132,6 +134,12 @@ CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/procmail.m4 CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/phquery.m4 +# The static libs from libmilter +CHECKPKG_OVERRIDES_CSWlibmilter += discouraged-path-in-pkgmap|/opt/csw/lib/libsmutil.a +CHECKPKG_OVERRIDES_CSWlibmilter += discouraged-path-in-pkgmap|/opt/csw/lib/libmilter.a +CHECKPKG_OVERRIDES_CSWlibmilter += discouraged-path-in-pkgmap|/opt/csw/lib/libsm.a +CHECKPKG_OVERRIDES_CSWlibmilter += discouraged-path-in-pkgmap|/opt/csw/lib/libsmdb.a + include gar/category.mk #ADMSCRIPTS = preremove preinstall space depend i.sol9 i.sol10 @@ -140,6 +148,7 @@ PLATFORM = $(shell if [ `uname -i` = "i86pc" ] ; then echo i86pc ; else echo sun4 ; fi ) OBJDIR = $(WORKDIR)/$(DISTNAME)/obj.SunOS.$(GAROSREL).$(PLATFORM) LIBFILES = sendmail/sendmail mail.local/mail.local smrsh/smrsh rmail/rmail +LIBMILTER = libmilter/libmilter.a libsm/libsm.a libsmdb/libsmdb.a libsmutil/libsmutil.a BINFILES = vacation/vacation SBINFILES = makemap/makemap editmap/editmap praliases/praliases \ mailstats/mailstats @@ -150,6 +159,7 @@ rmail/rmail.8 editmap/editmap.8 CONFFILES = aliases helpfile local-host-names sendmail.cf \ statistics submit.cf trusted-users +INCLFILES = libmilter/libmilter.h configure-custom: @echo " ==> Configuring $(NAME) (custom)" @@ -180,9 +190,10 @@ ginstall -d $(DESTDIR)$(sharedstatedir)/mail ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -d $(DESTDIR)$(sysconfdir)/mail + ginstall -d $(DESTDIR)/opt/csw/include @# Install the libraries - @( for file in $(LIBFILES) ; do \ + ( for file in $(LIBFILES) ; do \ ginstall -c -m 755 $(OBJDIR)/$$file $(DESTDIR)$(libdir) ; \ done ) @@ -214,6 +225,16 @@ ginstall -m 644 $(OBJDIR)/$$file $(DESTDIR)$(mandir)/man8 ; \ done ) + @# Install milter lib files + ( for file in $(LIBMILTER) ; do \ + ginstall -m 444 $(OBJDIR)/$$file $(DESTDIR)$(libdir) ; \ + done ) + + @# Install include files + ( for file in $(INCLFILES) ; do \ + ginstall -m 444 $(OBJDIR)/$$file $(DESTDIR)/opt/csw/include ; \ + done ) + @# Install m4/cf macros find $(WORKSRC)/cf -type f -exec chmod 644 {} + cp -r $(WORKSRC)/cf $(DESTDIR)$(sharedstatedir)/mail @@ -231,12 +252,12 @@ $(DESTDIR)/var/opt/csw/spool/clientmqueue/ ) @# usergroup - @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail - @ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail/ + ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail + ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail/ @# README - @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME) - @ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(NAME)/ + ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME) + ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(NAME)/ @# Create links in bindir ln -s $(libdir)/sendmail $(DESTDIR)$(bindir)/newaliases @@ -245,15 +266,19 @@ ln -s $(libdir)/sendmail $(DESTDIR)$(bindir)/hoststat @# Fix alternatives files - mv $(DESTDIR)$(bindir)/mailq $(DESTDIR)$(bindir)/mailq1.sendmail + mv $(DESTDIR)$(bindir)/mailq $(DESTDIR)$(bindir)/mailq.sendmail mv $(DESTDIR)$(bindir)/newaliases $(DESTDIR)$(bindir)/newaliases.sendmail mv $(DESTDIR)$(mandir)/man1/mailq.1 $(DESTDIR)$(mandir)/man1/mailq1.1.sendmail mv $(DESTDIR)$(mandir)/man1/newaliases.1 $(DESTDIR)$(mandir)/man1/newaliases.1.sendmail mv $(DESTDIR)$(mandir)/man5/aliases.5 $(DESTDIR)$(mandir)/man5/aliases.5.sendmail @# Post install message - @ginstall -m 444 $(FILEDIR)/CSWsendmail.postmsg $(DESTDIR)$(docdir)/sendmail/README.postinstall + ginstall -m 444 $(FILEDIR)/CSWsendmail.postmsg $(DESTDIR)$(docdir)/sendmail/README.postinstall + @# Milter doc files + ginstall -m 755 -d $(DESTDIR)$(docdir)/libmilter + ginstall -m 644 $(WORKSRC)/libmilter/docs/* $(DESTDIR)$(docdir)/libmilter + @$(MAKECOOKIE) merge-OS: Added: csw/mgar/pkg/sendmail/trunk/files/0001-add-libmilter-to-the-Makefile.patch =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/0001-add-libmilter-to-the-Makefile.patch (rev 0) +++ csw/mgar/pkg/sendmail/trunk/files/0001-add-libmilter-to-the-Makefile.patch 2011-06-20 18:42:33 UTC (rev 14844) @@ -0,0 +1,25 @@ +From 17828185f9dc37075de6bcff9d60bdb0f4ad6245 Mon Sep 17 00:00:00 2001 +From: Peter Bonivart +Date: Mon, 20 Jun 2011 20:06:35 +0200 +Subject: [PATCH] add libmilter to the Makefile + +--- + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index 97b2afc..ca7804f 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ + + SHELL= /bin/sh + SUBDIRS= libsm libsmutil libsmdb sendmail editmap mail.local \ +- mailstats makemap praliases rmail smrsh vacation ++ mailstats makemap praliases rmail smrsh vacation libmilter + # libmilter: requires pthread + BUILD= ./Build + OPTIONS= $(CONFIG) $(FLAGS) +-- +1.7.5.4 + Added: csw/mgar/pkg/sendmail/trunk/files/0002-no-gnuism.patch =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/0002-no-gnuism.patch (rev 0) +++ csw/mgar/pkg/sendmail/trunk/files/0002-no-gnuism.patch 2011-06-20 18:42:33 UTC (rev 14844) @@ -0,0 +1,24 @@ +From 7ca2bd12a799ed09e84112a5299346323cb5c0f9 Mon Sep 17 00:00:00 2001 +From: Peter Bonivart +Date: Mon, 20 Jun 2011 20:09:55 +0200 +Subject: [PATCH 3/3] no gnuism + +--- + devtools/M4/depend/CC-M.m4 | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/devtools/M4/depend/CC-M.m4 b/devtools/M4/depend/CC-M.m4 +index 2db655f..ba9e51f 100644 +--- a/devtools/M4/depend/CC-M.m4 ++++ b/devtools/M4/depend/CC-M.m4 +@@ -3,6 +3,6 @@ depend: ${BEFORE} ${LINKS} + @mv Makefile Makefile.old + @sed -e '/^# Do not edit or remove this line or anything below it.$$/,$$d' < Makefile.old > Makefile + @echo "# Do not edit or remove this line or anything below it." >> Makefile +- ${CC} -M ${COPTS} ${SRCS} >> Makefile ++ ${CC} -xM ${COPTS} ${SRCS} >> Makefile + + # End of $RCSfile: CC-M.m4,v $ +-- +1.7.5.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Jun 20 21:53:14 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 20 Jun 2011 19:53:14 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[373] web/wordpresscsw/wp-content/themes/opencsw Message-ID: Revision: 373 http://opencsw.svn.sourceforge.net/opencsw/?rev=373&view=rev Author: wbonnet Date: 2011-06-20 19:53:13 +0000 (Mon, 20 Jun 2011) Log Message: ----------- Fix typo Modified Paths: -------------- web/wordpresscsw/wp-content/themes/opencsw/requestPackage.php web/wordpresscsw/wp-content/themes/opencsw/sendPackageRequest.php Modified: web/wordpresscsw/wp-content/themes/opencsw/requestPackage.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/requestPackage.php 2011-05-30 20:36:09 UTC (rev 372) +++ web/wordpresscsw/wp-content/themes/opencsw/requestPackage.php 2011-06-20 19:53:13 UTC (rev 373) @@ -31,7 +31,7 @@

      - +

      Modified: web/wordpresscsw/wp-content/themes/opencsw/sendPackageRequest.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/sendPackageRequest.php 2011-05-30 20:36:09 UTC (rev 372) +++ web/wordpresscsw/wp-content/themes/opencsw/sendPackageRequest.php 2011-06-20 19:53:13 UTC (rev 373) @@ -62,7 +62,7 @@ } // Remove default value from the field (in case is was not removed by user) - $softwareName = str_replace ("[Software ou would like to have packaged]", "", $softwareName); + $softwareName = str_replace ("[Software you would like to have packaged]", "", $softwareName); if ( strlen($softwareName) == 0) { echo "

      Software name cannot be empty

      "; $hasError = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Jun 21 01:54:16 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 20 Jun 2011 23:54:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14845] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 14845 http://gar.svn.sourceforge.net/gar/?rev=14845&view=rev Author: bdwalton Date: 2011-06-20 23:54:15 +0000 (Mon, 20 Jun 2011) Log Message: ----------- apache2/trunk: must depend on perl for apxs; mantis id 4788 Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2011-06-20 18:42:33 UTC (rev 14844) +++ csw/mgar/pkg/apache2/trunk/Makefile 2011-06-20 23:54:15 UTC (rev 14845) @@ -88,7 +88,7 @@ RUNTIME_DEP_PKGS_CSWapache2 += CSWexpat CSWiconv CSWosslutils RUNTIME_DEP_PKGS_CSWapache2 += CSWoldaprt CSWosslrt CSWzlib RUNTIME_DEP_PKGS_CSWapache2 += CSWapr CSWapr-util CSWbdb48 -RUNTIME_DEP_PKGS_CSWapache2 += CSWapache2c +RUNTIME_DEP_PKGS_CSWapache2 += CSWapache2c CSWperl RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 RUNTIME_DEP_PKGS_CSWapache2-dev = CSWapache2 RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 @@ -100,6 +100,7 @@ CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2c +CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWperl CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2c CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWap2prefork This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Jun 21 03:31:07 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 21 Jun 2011 01:31:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[14846] csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Message-ID: Revision: 14846 http://gar.svn.sourceforge.net/gar/?rev=14846&view=rev Author: bdwalton Date: 2011-06-21 01:31:06 +0000 (Tue, 21 Jun 2011) Log Message: ----------- php5/trunk: join lines that were mistakenly split in the postinstall script Modified Paths: -------------- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall Modified: csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall =================================================================== --- csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2011-06-20 23:54:15 UTC (rev 14845) +++ csw/mgar/pkg/php5/trunk/files/CSWphp5.postinstall 2011-06-21 01:31:06 UTC (rev 14846) @@ -2,8 +2,7 @@ PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin -curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' /etc/opt/csw/php -5/php.ini` +curextdir=`perl -lne '/(no-debug-non-zts-[0-9]+)/ && print $1' /etc/opt/csw/php5/php.ini` # the new php.ini doesn't have this line at all, but the old one might. # update it if required. 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 Jun 21 10:57:46 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 21 Jun 2011 08:57:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[14847] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 14847 http://gar.svn.sourceforge.net/gar/?rev=14847&view=rev Author: bonivart Date: 2011-06-21 08:57:45 +0000 (Tue, 21 Jun 2011) Log Message: ----------- sendmail/trunk: build contrib package, migrate config Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-deactivate.sh csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-reactivate.sh Removed Paths: ------------- csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-deactivate.sh csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-reactivate.sh csw/mgar/pkg/sendmail/trunk/files/patch-CC-M.m4 Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-21 01:31:06 UTC (rev 14846) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-21 08:57:45 UTC (rev 14847) @@ -1,16 +1,12 @@ # $Id$ # TODO -# - Include activate/deactivate scripts -# - Tests? # - Build separate 9/10 packages? -# - migrate conf from /opt/csw/etc/mail -# - try to fix bugs -# - 2915 Must stop built-in sendmail manually -# - 3864 Sendmail must be relinked with new berekeley db -# - 4150 Sendmail 8.14.4 released -# - 4486 Provide sendmail's contrib/ tools as a separate package? +# + #4486 Provide sendmail's contrib/ tools as a separate package? +# + Include activate/deactivate scripts +# + migrate conf from /opt/csw/etc/mail +# + Tests? Not really possible to test during build # + libmilter # + use alternatives to clear collisions with postfix, see sudo as example # + post message @@ -20,6 +16,9 @@ # + cpsample conf files # + remove COPYING file # + copy usergroup file into place +# + #3864 Sendmail must be relinked with new berkeley db -> bdb48 +# + #2915 Must stop built-in sendmail manually -> n/a +# + #4150 Sendmail 8.14.4 released -> this is 8.14.5 NAME = sendmail VERSION = 8.14.5 @@ -41,11 +40,11 @@ #MY_CLASSES = CSWsendmail.i.sol9 CSWsendmail.i.sol10 DISTFILES = $(NAME).$(VERSION).tar.gz -DISTFILES += Sun-sendmail-deactivate.sh Sun-sendmail-reactivate.sh DISTFILES += aliases helpfile local-host-names sendmail.cf DISTFILES += sm-client.st statistics submit.cf trusted-users -DISTFILES += README.CSW sendmail.schema -DISTFILES += cswsendmail site.config.m4 +DISTFILES += README.CSW sendmail.schema site.config.m4 +DISTFILES += oracle-sendmail-deactivate.sh oracle-sendmail-reactivate.sh +DISTFILES += cswsendmail cswusergroup #DISTFILES += $(foreach FILE,$(shell cd $(FILEDIR) && ls *.CSW),$(FILE)) #DISTFILES += CSWsendmail.preremove CSWsendmail.preinstall CSWsendmail.space #DISTFILES += cswsendmail site.config.m4 $(MY_CLASSES) CSWsendmail.checkinstall @@ -62,16 +61,41 @@ RUNTIME_DEP_PKGS_CSWsendmail += CSWtcpwrap RUNTIME_DEP_PKGS_CSWsendmail += CSWbdb48 -PACKAGES += CSWlibmilter -CATALOGNAME_CSWlibmilter = libmilter -SPKG_DESC_CSWlibmilter = Sendmail MTA milter -PKGFILES_CSWlibmilter = $(docdir)/libmilter/.* -PKGFILES_CSWlibmilter += /opt/csw/include/libmilter.h -PKGFILES_CSWlibmilter += $(libdir)/libmilter.a -PKGFILES_CSWlibmilter += $(libdir)/libsm.a -PKGFILES_CSWlibmilter += $(libdir)/libsmdb.a -PKGFILES_CSWlibmilter += $(libdir)/libsmutil.a +PACKAGES += CSWlibmilter +CATALOGNAME_CSWlibmilter = libmilter +SPKG_DESC_CSWlibmilter = Sendmail MTA milter +PKGFILES_CSWlibmilter = $(docdir)/libmilter/.* +PKGFILES_CSWlibmilter += /opt/csw/include/libmilter.h +PKGFILES_CSWlibmilter += $(libdir)/libmilter.a +PKGFILES_CSWlibmilter += $(libdir)/libsm.a +PKGFILES_CSWlibmilter += $(libdir)/libsmdb.a +PKGFILES_CSWlibmilter += $(libdir)/libsmutil.a +PACKAGES += CSWsendmail-contrib +CATALOGNAME_CSWsendmail-contrib = sendmail_contrib +SPKG_DESC_CSWsendmail-contrib = Sendmail MTA contrib +RUNTIME_DEP_PKGS_CSWsendmail-contrib = CSWperl +ARCHALL_CSWsendmail-contrib = 1 +PKGFILES_CSWsendmail-contrib = $(docdir)/sendmail_contrib/.* +PKGFILES_CSWsendmail-contrib += $(bindir)/link_hash.sh +PKGFILES_CSWsendmail-contrib += $(bindir)/movemail.pl +PKGFILES_CSWsendmail-contrib += $(bindir)/smcontrol.pl +PKGFILES_CSWsendmail-contrib += $(bindir)/passwd-to-alias.pl +PKGFILES_CSWsendmail-contrib += $(bindir)/socketmapClient.pl +PKGFILES_CSWsendmail-contrib += $(bindir)/bounce-resender.pl +PKGFILES_CSWsendmail-contrib += $(bindir)/doublebounce.pl +PKGFILES_CSWsendmail-contrib += $(bindir)/mailprio +PKGFILES_CSWsendmail-contrib += $(bindir)/socketmapServer.pl +PKGFILES_CSWsendmail-contrib += $(bindir)/qtool.pl +PKGFILES_CSWsendmail-contrib += $(bindir)/buildvirtuser +PKGFILES_CSWsendmail-contrib += $(bindir)/etrn.pl +PKGFILES_CSWsendmail-contrib += $(bindir)/re-mqueue.pl +PKGFILES_CSWsendmail-contrib += $(bindir)/cidrexpand +PKGFILES_CSWsendmail-contrib += $(bindir)/expn.pl +PKGFILES_CSWsendmail-contrib += $(mandir)/man1/etrn.0 +PKGFILES_CSWsendmail-contrib += $(mandir)/man8/qtool.8 +PKGFILES_CSWsendmail-contrib += $(sysconfdir)/movemail.conf + INITSMF = /etc/opt/csw/init.d/cswsendmail SAMPLECONF = $(addprefix /etc/opt/csw/mail/,$(CONFFILES)) SAMPLECONF += /var/opt/csw/spool/clientmqueue/sm-client.st @@ -94,14 +118,15 @@ # END { { print "i i.sol9=CSWsendmail.i.sol9" } \ # { print "i i.sol10=CSWsendmail.i.sol10" } }' -#ENABLE_CHECK = 0 - # Patch away GNUism -#PATCHFILES = patch-CC-M.m4 - PATCHFILES += 0001-add-libmilter-to-the-Makefile.patch PATCHFILES += 0002-no-gnuism.patch +MIGRATE_FILES_CSWsendmail = aliases helpfile local-host-names sendmail.cf +MIGRATE_FILES_CSWsendmail += statistics submit.cf trusted-users +MIGRATE_SOURCE_DIR_CSWsendmail = /opt/csw/etc/mail +MIGRATE_DEST_DIR_CSWsendmail = /etc/opt/csw/mail + CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom TEST_SCRIPTS = custom @@ -133,6 +158,14 @@ CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/fax.m4 CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/procmail.m4 CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/phquery.m4 +CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/etc/opt/csw/movemail.conf +CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sendmail_contrib/mmuegel +CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/etrn.pl +CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/doublebounce.pl +CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/movemail.pl +CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/expn.pl +CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/bounce-resender.pl +CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/re-mqueue.pl # The static libs from libmilter CHECKPKG_OVERRIDES_CSWlibmilter += discouraged-path-in-pkgmap|/opt/csw/lib/libsmutil.a @@ -160,6 +193,15 @@ CONFFILES = aliases helpfile local-host-names sendmail.cf \ statistics submit.cf trusted-users INCLFILES = libmilter/libmilter.h +CONTBIN = link_hash.sh movemail.pl smcontrol.pl \ + passwd-to-alias.pl socketmapClient.pl bounce-resender.pl \ + doublebounce.pl mailprio socketmapServer.pl \ + qtool.pl buildvirtuser etrn.pl re-mqueue.pl \ + cidrexpand expn.pl +CONTDOC = dnsblaccess.m4 domainmap.m4 mmuegel +CONTMAN1 = etrn.0 +CONTMAN8 = qtool.8 +CONTCONF = movemail.conf configure-custom: @echo " ==> Configuring $(NAME) (custom)" @@ -178,8 +220,9 @@ @$(MAKECOOKIE) install-custom: + @echo " ==> Installing $(NAME) (custom)" + @# Install dirs - @echo " ==> Installing $(NAME) (custom)" ginstall -d $(DESTDIR)$(libdir) ginstall -d $(DESTDIR)$(bindir) ginstall -d $(DESTDIR)$(sbindir) @@ -191,6 +234,10 @@ ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -d $(DESTDIR)$(sysconfdir)/mail ginstall -d $(DESTDIR)/opt/csw/include + ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME) + ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME)_contrib + ginstall -m 755 -d $(DESTDIR)$(docdir)/libmilter + ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail @# Install the libraries ( for file in $(LIBFILES) ; do \ @@ -252,11 +299,9 @@ $(DESTDIR)/var/opt/csw/spool/clientmqueue/ ) @# usergroup - ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail/ @# README - ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME) ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(NAME)/ @# Create links in bindir @@ -276,9 +321,29 @@ ginstall -m 444 $(FILEDIR)/CSWsendmail.postmsg $(DESTDIR)$(docdir)/sendmail/README.postinstall @# Milter doc files - ginstall -m 755 -d $(DESTDIR)$(docdir)/libmilter ginstall -m 644 $(WORKSRC)/libmilter/docs/* $(DESTDIR)$(docdir)/libmilter + @# Contrib files + ( for file in $(CONTBIN) ; do \ + ginstall -m 755 $(WORKSRC)/contrib/$$file $(DESTDIR)$(bindir) ; \ + done ) + ( for file in $(CONTCONF) ; do \ + ginstall -m 644 $(WORKSRC)/contrib/$$file $(DESTDIR)$(sysconfdir) ; \ + done ) + ( for file in $(CONTDOC) ; do \ + ginstall -m 444 $(WORKSRC)/contrib/$$file $(DESTDIR)$(docdir)/sendmail_contrib ; \ + done ) + ( for file in $(CONTMAN1) ; do \ + ginstall -m 644 $(WORKSRC)/contrib/$$file $(DESTDIR)$(mandir)/man1 ; \ + done ) + ( for file in $(CONTMAN8) ; do \ + ginstall -m 644 $(WORKSRC)/contrib/$$file $(DESTDIR)$(mandir)/man8 ; \ + done ) + + @# Deactivate/reactivate scripts + ginstall -m 755 $(DOWNLOADDIR)/oracle-sendmail-deactivate.sh $(DESTDIR)$(docdir)/sendmail + ginstall -m 755 $(DOWNLOADDIR)/oracle-sendmail-reactivate.sh $(DESTDIR)$(docdir)/sendmail + @$(MAKECOOKIE) merge-OS: Deleted: csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-deactivate.sh =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-deactivate.sh 2011-06-21 01:31:06 UTC (rev 14846) +++ csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-deactivate.sh 2011-06-21 08:57:45 UTC (rev 14847) @@ -1,106 +0,0 @@ -#!/bin/sh -# 2007-12-09 Initial version created from old CSWsendmail Postinstall script -# - -# Make backup of Sun sendmail files -# /usr/sbin/newaliases or /usr/bin/newaliases - if /bin/test ! -L /usr/sbin/newaliases.OFF && /bin/test -L /usr/sbin/newaliases ; then - echo "Moving /usr/sbin/newaliases to newaliases.OFF" - mv /usr/sbin/newaliases /usr/sbin/newaliases.OFF - fi - if /bin/test ! -L /usr/bin/newaliases.OFF && /bin/test -L /usr/bin/newaliases ; then - echo "Moving /usr/bin/newaliases to newaliases.OFF" - mv /usr/bin/newaliases /usr/bin/newaliases.OFF - fi -# /usr/bin/mailq. In Solaris 8, mailq is a file. In Solaris 9, -# mailq is a symlink. In CSW sendmail, mailq is symlink. - if /bin/test ! -f /usr/bin/mailq.OFF && /bin/test -f /usr/bin/mailq ; then - echo "Moving /usr/bin/mailq to mailq.OFF" - mv /usr/bin/mailq /usr/bin/mailq.OFF - fi - if /bin/test ! -L /usr/bin/mailq.OFF && /bin/test -L /usr/bin/mailq ; then - echo "Moving /usr/bin/mailq to mailq.OFF" - mv /usr/bin/mailq /usr/bin/mailq.OFF - fi -# /usr/bin/vacation - if /bin/test ! -f /usr/bin/vacation.OFF && /bin/test -f /usr/bin/vacation ; then - echo "Moving /usr/bin/vacation to vacation.OFF" - mv /usr/bin/vacation /usr/bin/vacation.OFF - fi -# /usr/bin/mailstats - if /bin/test ! -f /usr/bin/mailstats.OFF && /bin/test -f /usr/bin/mailstats ; then - echo "Moving /usr/bin/mailstats to mailstats.OFF" - mv /usr/bin/mailstats /usr/bin/mailstats.OFF - fi -# /usr/sbin/makemap - if /bin/test ! -f /usr/sbin/makemap.OFF && /bin/test -f /usr/sbin/makemap ; then - echo "Moving /usr/sbin/makemap to makemap.OFF" - mv /usr/sbin/makemap /usr/sbin/makemap.OFF - fi -# /usr/bin/praliases - if /bin/test ! -f /usr/bin/praliases.OFF && /bin/test -f /usr/bin/praliases ; then - echo "Moving /usr/bin/praliases to praliases.OFF" - mv /usr/bin/praliases /usr/bin/praliases.OFF - fi -# /usr/lib/smrsh - if /bin/test ! -f /usr/lib/smrsh.OFF && /bin/test -f /usr/lib/smrsh ; then - echo "Moving /usr/lib/smrsh to smrsh.OFF" - mv /usr/lib/smrsh /usr/lib/smrsh.OFF - fi -# /usr/lib/mail.local - if /bin/test ! -f /usr/lib/mail.local.OFF && /bin/test -f /usr/lib/mail.local ; then - echo "Moving /usr/lib/mail.local to mail.local.OFF" - mv /usr/lib/mail.local /usr/lib/mail.local.OFF - fi -# /etc/mail/sendmail.cf - if /bin/test ! -f /etc/mail/sendmail.cf.OFF && /bin/test -f /etc/mail/sendmail.cf ; then - echo "Moving /etc/mail/sendmail.cf to sendmail.cf.OFF" - mv /etc/mail/sendmail.cf /etc/mail/sendmail.cf.OFF - fi -# /usr/lib/sendmail - if /bin/test ! -f /usr/lib/sendmail.OFF && /bin/test -f /usr/lib/sendmail ; then - echo "Moving /usr/lib/sendmail to sendmail.OFF" - mv /usr/lib/sendmail /usr/lib/sendmail.OFF - fi -# - echo "Making symbolic links in /usr for CSWsendmail files." - if /bin/test -L /usr/bin/newaliases.OFF ; then - echo "Making symlink /usr/bin/newaliases" - ln -s /opt/csw/lib/sendmail /usr/bin/newaliases - fi - if /bin/test -L /usr/sbin/newaliases.OFF ; then - echo "Making symlink /usr/sbin/newaliases" - ln -s /opt/csw/lib/sendmail /usr/sbin/newaliases - fi - if /bin/test ! -L /usr/bin/mailq ; then - echo "Making symlink /usr/bin/mailq" - ln -s /opt/csw/lib/sendmail /usr/bin/mailq - fi - if /bin/test ! -L /usr/bin/vacation ; then - echo "Making symlink /usr/bin/vacation" - ln -s /opt/csw/bin/vacation /usr/bin/vacation - fi - if /bin/test ! -L /usr/bin/mailstats ; then - echo "Making symlink /usr/bin/mailstats" - ln -s /opt/csw/sbin/mailstats /usr/bin/mailstats - fi - if /bin/test ! -L /usr/sbin/makemap ; then - echo "Making symlink /usr/sbin/makemap" - ln -s /opt/csw/sbin/makemap /usr/sbin/makemap - fi - if /bin/test ! -L /usr/bin/praliases ; then - echo "Making symlink /usr/bin/praliases" - ln -s /opt/csw/sbin/praliases /usr/bin/praliases - fi - if /bin/test ! -L /usr/lib/smrsh ; then - echo "Making symlink /usr/lib/smrsh" - ln -s /opt/csw/lib/smrsh /usr/lib/smrsh - fi - if /bin/test ! -L /usr/lib/mail.local ; then - echo "Making symlink /usr/lib/mail.local" - ln -s /opt/csw/lib/mail.local /usr/lib/mail.local - fi - if /bin/test ! -L /usr/lib/sendmail ; then - echo "Making symlink /usr/lib/sendmail" - ln -s /opt/csw/lib/sendmail /usr/lib/sendmail - fi Deleted: csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-reactivate.sh =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-reactivate.sh 2011-06-21 01:31:06 UTC (rev 14846) +++ csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-reactivate.sh 2011-06-21 08:57:45 UTC (rev 14847) @@ -1,75 +0,0 @@ -#!/bin/sh -# 2007-12-09 Initial version created from the old CSWsendmail preremove script -# -# Remove the symlinks for using CSWsendmail and return filesystem to -# using Sun's sendmail. - -# Remove the symlinks to CSW files - echo "Removing the symlinks to CSW files." -# /usr/bin/newaliases or /usr/sbin/newaliases - if /bin/test -L /usr/bin/newaliases ; then rm -f /usr/bin/newaliases ; fi - if /bin/test -L /usr/sbin/newaliases ; then rm -f /usr/sbin/newaliases ; fi -# /usr/bin/mailq. mailq is either a symlink or a file, depending -# on the version of Solaris - if /bin/test -L /usr/bin/mailq ; then rm -f /usr/bin/mailq ; fi -# /usr/bin/vacation - if /bin/test -L /usr/bin/vacation ; then rm -f /usr/bin/vacation ; fi -# /usr/bin/mailstats - if /bin/test -L /usr/bin/mailstats ; then rm -f /usr/bin/mailstats ; fi -# /usr/sbin/makemap - if /bin/test -L /usr/sbin/makemap ; then rm -f /usr/sbin/makemap ; fi -# /usr/bin/praliases - if /bin/test -L /usr/bin/praliases ; then rm -f /usr/bin/praliases ; fi -# /usr/lib/smrsh - if /bin/test -L /usr/lib/smrsh ; then rm -f /usr/lib/smrsh ; fi -# /usr/lib/mail.local - if /bin/test -L /usr/lib/mail.local ; then rm -f /usr/lib/mail.local ; fi -# /usr/lib/sendmail - if /bin/test -L /usr/lib/sendmail ; then rm -f /usr/lib/sendmail ; fi -# - echo "Symlinks to CSW files removed." -# -# Return to Sun files -# /usr/bin/newaliases or /usr/sbin/newaliases - if /bin/test -L /usr/bin/newaliases.OFF ; then - mv -f /usr/bin/newaliases.OFF /usr/bin/newaliases - fi - if /bin/test -L /usr/sbin/newaliases.OFF ; then - mv -f /usr/sbin/newaliases.OFF /usr/sbin/newaliases - fi - if /bin/test -L /usr/bin/mailq.OFF || /bin/test -f /usr/bin/mailq.OFF ; then - mv -f /usr/bin/mailq.OFF /usr/bin/mailq - fi -# /usr/bin/vacation - if /bin/test -f /usr/bin/vacation.OFF ; then - mv -f /usr/bin/vacation.OFF /usr/bin/vacation - fi -# /usr/bin/mailstats - if /bin/test -f /usr/bin/mailstats.OFF ; then - mv -f /usr/bin/mailstats.OFF /usr/bin/mailstats - fi -# /usr/sbin/makemap - if /bin/test -f /usr/sbin/makemap.OFF ; then - mv -f /usr/sbin/makemap.OFF /usr/sbin/makemap - fi -# /usr/bin/praliases - if /bin/test -f /usr/bin/praliases.OFF ; then - mv -f /usr/bin/praliases.OFF /usr/bin/praliases - fi -# /usr/lib/smrsh - if /bin/test -f /usr/lib/smrsh.OFF ; then - mv -f /usr/lib/smrsh.OFF /usr/lib/smrsh - fi -# /usr/lib/mail.local - if /bin/test -f /usr/lib/mail.local.OFF ; then - mv -f /usr/lib/mail.local.OFF /usr/lib/mail.local - fi -# /usr/lib/sendmail - if /bin/test -f /usr/lib/sendmail.OFF ; then - mv -f /usr/lib/sendmail.OFF /usr/lib/sendmail - fi -# /etc/mail/sendmail.cf - if /bin/test -f /etc/mail/sendmail.cf.OFF ; then - mv -f /etc/mail/sendmail.cf.OFF /etc/mail/sendmail.cf - fi - echo "Sun sendmail files restored." Copied: csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-deactivate.sh (from rev 14839, csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-deactivate.sh) =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-deactivate.sh (rev 0) +++ csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-deactivate.sh 2011-06-21 08:57:45 UTC (rev 14847) @@ -0,0 +1,106 @@ +#!/bin/sh +# 2007-12-09 Initial version created from old CSWsendmail Postinstall script +# + +# Make backup of Sun sendmail files +# /usr/sbin/newaliases or /usr/bin/newaliases + if /bin/test ! -L /usr/sbin/newaliases.OFF && /bin/test -L /usr/sbin/newaliases ; then + echo "Moving /usr/sbin/newaliases to newaliases.OFF" + mv /usr/sbin/newaliases /usr/sbin/newaliases.OFF + fi + if /bin/test ! -L /usr/bin/newaliases.OFF && /bin/test -L /usr/bin/newaliases ; then + echo "Moving /usr/bin/newaliases to newaliases.OFF" + mv /usr/bin/newaliases /usr/bin/newaliases.OFF + fi +# /usr/bin/mailq. In Solaris 8, mailq is a file. In Solaris 9, +# mailq is a symlink. In CSW sendmail, mailq is symlink. + if /bin/test ! -f /usr/bin/mailq.OFF && /bin/test -f /usr/bin/mailq ; then + echo "Moving /usr/bin/mailq to mailq.OFF" + mv /usr/bin/mailq /usr/bin/mailq.OFF + fi + if /bin/test ! -L /usr/bin/mailq.OFF && /bin/test -L /usr/bin/mailq ; then + echo "Moving /usr/bin/mailq to mailq.OFF" + mv /usr/bin/mailq /usr/bin/mailq.OFF + fi +# /usr/bin/vacation + if /bin/test ! -f /usr/bin/vacation.OFF && /bin/test -f /usr/bin/vacation ; then + echo "Moving /usr/bin/vacation to vacation.OFF" + mv /usr/bin/vacation /usr/bin/vacation.OFF + fi +# /usr/bin/mailstats + if /bin/test ! -f /usr/bin/mailstats.OFF && /bin/test -f /usr/bin/mailstats ; then + echo "Moving /usr/bin/mailstats to mailstats.OFF" + mv /usr/bin/mailstats /usr/bin/mailstats.OFF + fi +# /usr/sbin/makemap + if /bin/test ! -f /usr/sbin/makemap.OFF && /bin/test -f /usr/sbin/makemap ; then + echo "Moving /usr/sbin/makemap to makemap.OFF" + mv /usr/sbin/makemap /usr/sbin/makemap.OFF + fi +# /usr/bin/praliases + if /bin/test ! -f /usr/bin/praliases.OFF && /bin/test -f /usr/bin/praliases ; then + echo "Moving /usr/bin/praliases to praliases.OFF" + mv /usr/bin/praliases /usr/bin/praliases.OFF + fi +# /usr/lib/smrsh + if /bin/test ! -f /usr/lib/smrsh.OFF && /bin/test -f /usr/lib/smrsh ; then + echo "Moving /usr/lib/smrsh to smrsh.OFF" + mv /usr/lib/smrsh /usr/lib/smrsh.OFF + fi +# /usr/lib/mail.local + if /bin/test ! -f /usr/lib/mail.local.OFF && /bin/test -f /usr/lib/mail.local ; then + echo "Moving /usr/lib/mail.local to mail.local.OFF" + mv /usr/lib/mail.local /usr/lib/mail.local.OFF + fi +# /etc/mail/sendmail.cf + if /bin/test ! -f /etc/mail/sendmail.cf.OFF && /bin/test -f /etc/mail/sendmail.cf ; then + echo "Moving /etc/mail/sendmail.cf to sendmail.cf.OFF" + mv /etc/mail/sendmail.cf /etc/mail/sendmail.cf.OFF + fi +# /usr/lib/sendmail + if /bin/test ! -f /usr/lib/sendmail.OFF && /bin/test -f /usr/lib/sendmail ; then + echo "Moving /usr/lib/sendmail to sendmail.OFF" + mv /usr/lib/sendmail /usr/lib/sendmail.OFF + fi +# + echo "Making symbolic links in /usr for CSWsendmail files." + if /bin/test -L /usr/bin/newaliases.OFF ; then + echo "Making symlink /usr/bin/newaliases" + ln -s /opt/csw/lib/sendmail /usr/bin/newaliases + fi + if /bin/test -L /usr/sbin/newaliases.OFF ; then + echo "Making symlink /usr/sbin/newaliases" + ln -s /opt/csw/lib/sendmail /usr/sbin/newaliases + fi + if /bin/test ! -L /usr/bin/mailq ; then + echo "Making symlink /usr/bin/mailq" + ln -s /opt/csw/lib/sendmail /usr/bin/mailq + fi + if /bin/test ! -L /usr/bin/vacation ; then + echo "Making symlink /usr/bin/vacation" + ln -s /opt/csw/bin/vacation /usr/bin/vacation + fi + if /bin/test ! -L /usr/bin/mailstats ; then + echo "Making symlink /usr/bin/mailstats" + ln -s /opt/csw/sbin/mailstats /usr/bin/mailstats + fi + if /bin/test ! -L /usr/sbin/makemap ; then + echo "Making symlink /usr/sbin/makemap" + ln -s /opt/csw/sbin/makemap /usr/sbin/makemap + fi + if /bin/test ! -L /usr/bin/praliases ; then + echo "Making symlink /usr/bin/praliases" + ln -s /opt/csw/sbin/praliases /usr/bin/praliases + fi + if /bin/test ! -L /usr/lib/smrsh ; then + echo "Making symlink /usr/lib/smrsh" + ln -s /opt/csw/lib/smrsh /usr/lib/smrsh + fi + if /bin/test ! -L /usr/lib/mail.local ; then + echo "Making symlink /usr/lib/mail.local" + ln -s /opt/csw/lib/mail.local /usr/lib/mail.local + fi + if /bin/test ! -L /usr/lib/sendmail ; then + echo "Making symlink /usr/lib/sendmail" + ln -s /opt/csw/lib/sendmail /usr/lib/sendmail + fi Copied: csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-reactivate.sh (from rev 14839, csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-reactivate.sh) =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-reactivate.sh (rev 0) +++ csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-reactivate.sh 2011-06-21 08:57:45 UTC (rev 14847) @@ -0,0 +1,75 @@ +#!/bin/sh +# 2007-12-09 Initial version created from the old CSWsendmail preremove script +# +# Remove the symlinks for using CSWsendmail and return filesystem to +# using Sun's sendmail. + +# Remove the symlinks to CSW files + echo "Removing the symlinks to CSW files." +# /usr/bin/newaliases or /usr/sbin/newaliases + if /bin/test -L /usr/bin/newaliases ; then rm -f /usr/bin/newaliases ; fi + if /bin/test -L /usr/sbin/newaliases ; then rm -f /usr/sbin/newaliases ; fi +# /usr/bin/mailq. mailq is either a symlink or a file, depending +# on the version of Solaris + if /bin/test -L /usr/bin/mailq ; then rm -f /usr/bin/mailq ; fi +# /usr/bin/vacation + if /bin/test -L /usr/bin/vacation ; then rm -f /usr/bin/vacation ; fi +# /usr/bin/mailstats + if /bin/test -L /usr/bin/mailstats ; then rm -f /usr/bin/mailstats ; fi +# /usr/sbin/makemap + if /bin/test -L /usr/sbin/makemap ; then rm -f /usr/sbin/makemap ; fi +# /usr/bin/praliases + if /bin/test -L /usr/bin/praliases ; then rm -f /usr/bin/praliases ; fi +# /usr/lib/smrsh + if /bin/test -L /usr/lib/smrsh ; then rm -f /usr/lib/smrsh ; fi +# /usr/lib/mail.local + if /bin/test -L /usr/lib/mail.local ; then rm -f /usr/lib/mail.local ; fi +# /usr/lib/sendmail + if /bin/test -L /usr/lib/sendmail ; then rm -f /usr/lib/sendmail ; fi +# + echo "Symlinks to CSW files removed." +# +# Return to Sun files +# /usr/bin/newaliases or /usr/sbin/newaliases + if /bin/test -L /usr/bin/newaliases.OFF ; then + mv -f /usr/bin/newaliases.OFF /usr/bin/newaliases + fi + if /bin/test -L /usr/sbin/newaliases.OFF ; then + mv -f /usr/sbin/newaliases.OFF /usr/sbin/newaliases + fi + if /bin/test -L /usr/bin/mailq.OFF || /bin/test -f /usr/bin/mailq.OFF ; then + mv -f /usr/bin/mailq.OFF /usr/bin/mailq + fi +# /usr/bin/vacation + if /bin/test -f /usr/bin/vacation.OFF ; then + mv -f /usr/bin/vacation.OFF /usr/bin/vacation + fi +# /usr/bin/mailstats + if /bin/test -f /usr/bin/mailstats.OFF ; then + mv -f /usr/bin/mailstats.OFF /usr/bin/mailstats + fi +# /usr/sbin/makemap + if /bin/test -f /usr/sbin/makemap.OFF ; then + mv -f /usr/sbin/makemap.OFF /usr/sbin/makemap + fi +# /usr/bin/praliases + if /bin/test -f /usr/bin/praliases.OFF ; then + mv -f /usr/bin/praliases.OFF /usr/bin/praliases + fi +# /usr/lib/smrsh + if /bin/test -f /usr/lib/smrsh.OFF ; then + mv -f /usr/lib/smrsh.OFF /usr/lib/smrsh + fi +# /usr/lib/mail.local + if /bin/test -f /usr/lib/mail.local.OFF ; then + mv -f /usr/lib/mail.local.OFF /usr/lib/mail.local + fi +# /usr/lib/sendmail + if /bin/test -f /usr/lib/sendmail.OFF ; then + mv -f /usr/lib/sendmail.OFF /usr/lib/sendmail + fi +# /etc/mail/sendmail.cf + if /bin/test -f /etc/mail/sendmail.cf.OFF ; then + mv -f /etc/mail/sendmail.cf.OFF /etc/mail/sendmail.cf + fi + echo "Sun sendmail files restored." Deleted: csw/mgar/pkg/sendmail/trunk/files/patch-CC-M.m4 =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/patch-CC-M.m4 2011-06-21 01:31:06 UTC (rev 14846) +++ csw/mgar/pkg/sendmail/trunk/files/patch-CC-M.m4 2011-06-21 08:57:45 UTC (rev 14847) @@ -1,10 +0,0 @@ ---- sendmail-8.14.3.orig/devtools/M4/depend/CC-M.m4 1999-05-28 00:03:28.000000000 +0200 -+++ sendmail-8.14.3/devtools/M4/depend/CC-M.m4 2009-07-30 17:49:02.234202786 +0200 -@@ -3,6 +3,6 @@ - @mv Makefile Makefile.old - @sed -e '/^# Do not edit or remove this line or anything below it.$$/,$$d' < Makefile.old > Makefile - @echo "# Do not edit or remove this line or anything below it." >> Makefile -- ${CC} -M ${COPTS} ${SRCS} >> Makefile -+ ${CC} -xM ${COPTS} ${SRCS} >> Makefile - - # End of $RCSfile: CC-M.m4,v $ 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 Jun 21 11:02:17 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 21 Jun 2011 09:02:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14848] csw/mgar/pkg/lang-python/paramiko/trunk Message-ID: Revision: 14848 http://gar.svn.sourceforge.net/gar/?rev=14848&view=rev Author: skayser Date: 2011-06-21 09:02:17 +0000 (Tue, 21 Jun 2011) Log Message: ----------- lang-python/paramiko/trunk: added deps, adjusted /usrlocal/references, added changelog.CSW Modified Paths: -------------- csw/mgar/pkg/lang-python/paramiko/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/paramiko/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lang-python/paramiko/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/paramiko/trunk/Makefile 2011-06-21 08:57:45 UTC (rev 14847) +++ csw/mgar/pkg/lang-python/paramiko/trunk/Makefile 2011-06-21 09:02:17 UTC (rev 14848) @@ -1,8 +1,6 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # -# ! Needs pycrypto to be built/released/installed first -# NAME = paramiko VERSION = 1.7.7.1 GARTYPE = v2 @@ -18,7 +16,16 @@ MASTER_SITES = http://www.lag.net/paramiko/download/ DISTFILES = $(DISTNAME).tar.gz +ARCHALL = 1 +RUNTIME_DEP_PKGS = CSWpy-crypto +CHECKPKG_OVERRIDES = surplus-dependency|CSWpy-crypto + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk + +post-merge-modulated: + gsed -ie 's,/usr/local/etc/moduli,/opt/csw/etc/ssh/moduli,' \ + $(PKGROOT)$(libdir)/python/site-packages/paramiko/transport.py + @$(MAKECOOKIE) Added: csw/mgar/pkg/lang-python/paramiko/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lang-python/paramiko/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/lang-python/paramiko/trunk/files/changelog.CSW 2011-06-21 09:02:17 UTC (rev 14848) @@ -0,0 +1,5 @@ +paramiko (1.7.7.1,REV=2011.06.21) + + * Initial release. + + -- Sebastian Kayser Tue, 21 Jun 2011 11:00:49 +0200 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 Jun 21 11:07:58 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 21 Jun 2011 09:07:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[14849] csw/mgar/pkg/lang-python/paramiko/trunk/Makefile Message-ID: Revision: 14849 http://gar.svn.sourceforge.net/gar/?rev=14849&view=rev Author: skayser Date: 2011-06-21 09:07:58 +0000 (Tue, 21 Jun 2011) Log Message: ----------- lang-python/paramiko/trunk: fix erroneously gsed in-place backup file creation Modified Paths: -------------- csw/mgar/pkg/lang-python/paramiko/trunk/Makefile Modified: csw/mgar/pkg/lang-python/paramiko/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/paramiko/trunk/Makefile 2011-06-21 09:02:17 UTC (rev 14848) +++ csw/mgar/pkg/lang-python/paramiko/trunk/Makefile 2011-06-21 09:07:58 UTC (rev 14849) @@ -26,6 +26,6 @@ include gar/category.mk post-merge-modulated: - gsed -ie 's,/usr/local/etc/moduli,/opt/csw/etc/ssh/moduli,' \ + gsed -i 's,/usr/local/etc/moduli,/opt/csw/etc/ssh/moduli,' \ $(PKGROOT)$(libdir)/python/site-packages/paramiko/transport.py @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Jun 21 14:26:49 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 21 Jun 2011 12:26:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14850] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 14850 http://gar.svn.sourceforge.net/gar/?rev=14850&view=rev Author: bonivart Date: 2011-06-21 12:26:49 +0000 (Tue, 21 Jun 2011) Log Message: ----------- sendmail/trunk: clean up Makefile, adjust paths in sendmail.cf and init script, edit post message Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg csw/mgar/pkg/sendmail/trunk/files/cswsendmail csw/mgar/pkg/sendmail/trunk/files/sendmail.cf Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-21 09:07:58 UTC (rev 14849) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-21 12:26:49 UTC (rev 14850) @@ -3,13 +3,14 @@ # TODO # - Build separate 9/10 packages? +# + post message +# + Fix paths in sendmail.cf and cswsendmail # + #4486 Provide sendmail's contrib/ tools as a separate package? # + Include activate/deactivate scripts # + migrate conf from /opt/csw/etc/mail # + Tests? Not really possible to test during build -# + libmilter +# + build libmilter # + use alternatives to clear collisions with postfix, see sudo as example -# + post message # + never start cswsendmail by default (collides with system sendmail) # + path to sendmail.cf (/etc/opt/csw/mail) # + bdb hash support @@ -29,26 +30,15 @@ Sendmail MTA endef -#INSTALLISADIR = $(WORKROOTDIR)/install-$(GAROSREL)-$(MODULATION) -#WORKDIR = $(WORKROOTDIR)/build-$(GAROSREL)-$(MODULATION) -#WORKDIR_FIRSTMOD = $(WORKROOTDIR)/build-$(GAROSREL)-$(firstword $(MODULATIONS)) -#COOKIEDIR = $(COOKIEROOTDIR)/$(GAROSREL)-$(MODULATION) - MASTER_SITES = ftp://ftp.sendmail.org/pub/sendmail/ SPKG_SOURCEURL = http://www.sendmail.org -#MY_CLASSES = CSWsendmail.i.sol9 CSWsendmail.i.sol10 - DISTFILES = $(NAME).$(VERSION).tar.gz DISTFILES += aliases helpfile local-host-names sendmail.cf DISTFILES += sm-client.st statistics submit.cf trusted-users DISTFILES += README.CSW sendmail.schema site.config.m4 DISTFILES += oracle-sendmail-deactivate.sh oracle-sendmail-reactivate.sh DISTFILES += cswsendmail cswusergroup -#DISTFILES += $(foreach FILE,$(shell cd $(FILEDIR) && ls *.CSW),$(FILE)) -#DISTFILES += CSWsendmail.preremove CSWsendmail.preinstall CSWsendmail.space -#DISTFILES += cswsendmail site.config.m4 $(MY_CLASSES) CSWsendmail.checkinstall -#DISTFILES += README.CSW sendmail.schema CSWsendmail.postinstall LICENSE = LICENSE @@ -108,16 +98,6 @@ # Do not remove the static libs from libmilter MERGE_EXCLUDE_STATICLIBS = -#PROTOTYPE_FILTER = awk \ -# '$$$$2 ~/i.sol9/ { next } \ -# $$$$2 ~/i.sol10/ { next } \ -# $$$$3 ~/\/init\.d\/cswsendmail$$$$/ {$$$$2 = "cswinitsmf"} \ -# $$$$3 ~/sol9\./ { $$$$2 = "sol9" } \ -# $$$$3 ~/sol10\./ { $$$$2 = "sol10" } \ -# { print } \ -# END { { print "i i.sol9=CSWsendmail.i.sol9" } \ -# { print "i i.sol10=CSWsendmail.i.sol10" } }' - # Patch away GNUism PATCHFILES += 0001-add-libmilter-to-the-Makefile.patch PATCHFILES += 0002-no-gnuism.patch @@ -131,7 +111,6 @@ BUILD_SCRIPTS = custom TEST_SCRIPTS = custom INSTALL_SCRIPTS = custom -#EXTRA_MERGE_SCRIPTS = OS # Some files collide with CSWpostfix ALTERNATIVES_CSWsendmail = mailq newaliases mailq.1 newaliases.1 aliases.5 @@ -175,9 +154,6 @@ include gar/category.mk -#ADMSCRIPTS = preremove preinstall space depend i.sol9 i.sol10 - -#SOLVER = sol$(shell uname -r |sed 's/5\.//') PLATFORM = $(shell if [ `uname -i` = "i86pc" ] ; then echo i86pc ; else echo sun4 ; fi ) OBJDIR = $(WORKDIR)/$(DISTNAME)/obj.SunOS.$(GAROSREL).$(PLATFORM) LIBFILES = sendmail/sendmail mail.local/mail.local smrsh/smrsh rmail/rmail @@ -250,17 +226,6 @@ ginstall -m 755 $(OBJDIR)/$$file $(DESTDIR)$(sbindir) ; \ done ) - @# rename libraries and binaries os-specific -# ( for file in `ls $(DESTDIR)$(libdir)`; do \ -# mv $(DESTDIR)$(libdir)/$$file $(DESTDIR)$(libdir)/$(SOLVER).$$file; \ -# done ) -# ( for file in `ls $(DESTDIR)$(bindir)`; do \ -# mv $(DESTDIR)$(bindir)/$$file $(DESTDIR)$(bindir)/$(SOLVER).$$file; \ -# done ) -# ( for file in `ls $(DESTDIR)$(sbindir)`; do \ -# mv $(DESTDIR)$(sbindir)/$$file $(DESTDIR)$(sbindir)/$(SOLVER).$$file;\ -# done ) - @# Install manpages ( for file in $(MANFILES1) ; do \ ginstall -m 644 $(OBJDIR)/$$file $(DESTDIR)$(mandir)/man1 ; \ @@ -345,23 +310,3 @@ ginstall -m 755 $(DOWNLOADDIR)/oracle-sendmail-reactivate.sh $(DESTDIR)$(docdir)/sendmail @$(MAKECOOKIE) - -merge-OS: - @echo " ==> Merging $(NAME) (custom)" - @# create links in bindir - ln -s $(libdir)/sendmail $(PKGROOT)$(bindir)/newaliases - ln -s $(libdir)/sendmail $(PKGROOT)$(bindir)/mailq - ln -s $(libdir)/sendmail $(PKGROOT)$(bindir)/purgestats - ln -s $(libdir)/sendmail $(PKGROOT)$(bindir)/hoststat - - @# Install the other install trees - ( for dir in `ls -d $(abspath $(WORKROOTDIR)/install*-$(MODULATION))` ; do \ - ( if [ "x`echo $$dir |sed "s/.*install-\(5.[0-9]*\)-$(MODULATION).*/\1/"`x" != "x$(GAROSREL)x" ]; then \ - cd $$dir$(bindir) && \ - /usr/bin/pax -rw -v * $(PKGROOT)$(bindir);\ - cd $$dir$(sbindir) && \ - /usr/bin/pax -rw -v * $(PKGROOT)$(sbindir);\ - cd $$dir$(libdir) && \ - /usr/bin/pax -rw -v * $(PKGROOT)$(libdir); \ - fi ) \ - done ) Modified: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg 2011-06-21 09:07:58 UTC (rev 14849) +++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg 2011-06-21 12:26:49 UTC (rev 14850) @@ -1,45 +1,67 @@ -=== SAMPLE FROM OTHER PACKAGES === +Notes for users of previous versions of CSWsendmail +=================================================== ---- POSTFIX --- +Solaris built-in Sendmail +------------------------- -Note for users upgrading from postfix 2.4.6 and previous --------------------------------------------------------- +The CSWsendmail package no longer tries to deactivate the built-in +Sendmail in Solaris. Instead you get similar scripts that you can +run yourself if you don't want to do the modifications manually. -- Starting with postfix 2.6.x the spool location has changed from + * /opt/csw/share/doc/sendmail/oracle-sendmail-deactivate.sh + * /opt/csw/share/doc/sendmail/oracle-sendmail-reactivate.sh - /opt/csw/var/spool/postfix to - /var/opt/csw/spool/postfix +You should, as a minimum, disable the built-in Sendmail from starting +at boot to avoid port 25 conflicts. Also, many utilities using mail +expect Sendmail to be located in /usr/lib/sendmail e.g. - If you have any pending email in the old spool location, please move - it to the new spool location and run "postsuper" before starting - postfix. An example script on how this can be done is shipped with the - package (migrate-queuefiles.sh). Make sure to understand what you are - doing. +If you disable the rc-script in Solaris 9 and create links to +CSWsendmail binaries manually or with the above mentioned script +please be aware that Oracle patches may very well restore this. +You have to be aware of this when patching as long as the built-in +Sendmail packages are on your system. -- Starting with postfix 2.6.x this package will _not_ automatically - substitute the common sendmail binaries with links to the postfix - binaries any more. Thus, the following files will be untouched and - possibly belong to the system sendmail installation. - - /usr/lib/sendmail - /usr/bin/mailq - /usr/bin/newaliases - - This makes the package installation less troublesome for shared zones - and leaves the choice of fully replacing your system sendmail up to you. - If you intend to replace those binaries above with the ones from this - postfix package, please see README.CSW. +Default paths +------------- ---- MUTT --- +The default paths are now: -There are now two versions of mutt on the system installed: + * /etc/opt/csw/mail + * /var/opt/csw/spool - * mutt-ncurses with ncurses interface - * mutt-slang with slang interface (per default linked to 'mutt') +Your configuration files in /opt/csw/etc/mail will be migrated to +the new location automatically. -You can easily select between the versions with the alternatives(8) -system by executing +You can of course control almost everything by building a new +sendmail.cf, take a look in /opt/csw/share/mail/cf. The init script +(/etc/opt/csw/init.d/cswsendmail) may also need modification if you +want to use other paths. - /opt/csw/sbin/alternatives --config mutt +Alternatives +------------ +A few files are provided by both the Sendmail and Postfix packages: + + * /opt/csw/bin/mailq + * /opt/csw/bin/newaliases + * /opt/csw/share/man/man1/aliases.1 + * /opt/csw/share/man/man1/mailq.1 + * /opt/csw/share/man/man1/newaliases.1 + +Normally you don't have both those packages on the same system but +if you do you can easily select between the versions with the +alternatives(8) system by executing e.g.: + + # /opt/csw/sbin/alternatives --config mailq + See http://www.opencsw.org/packages/alternatives for details. + +Contrib +------- + +There's a new package, CSWsendmail-contrib, which contains the +contents of the contrib dir in the Sendmail source. There's some +useful scripts there. + +-- +Peter Bonivart, OpenCSW, 2011-06-21 Modified: csw/mgar/pkg/sendmail/trunk/files/cswsendmail =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/cswsendmail 2011-06-21 09:07:58 UTC (rev 14849) +++ csw/mgar/pkg/sendmail/trunk/files/cswsendmail 2011-06-21 12:26:49 UTC (rev 14850) @@ -13,8 +13,8 @@ ERRMSG2='this can cause mailbox locking and access problems.' SERVER_PID_FILE="/var/run/sendmail.pid" CLIENT_PID_FILE="/var/opt/csw/spool/clientmqueue/sm-client.pid" -DEFAULT_FILE="/opt/csw/etc/default/sendmail" -ALIASES_FILE="/opt/csw/etc/mail/aliases" +DEFAULT_FILE="/etc/opt/csw/default/sendmail" +ALIASES_FILE="/etc/opt/csw/mail/aliases" check_queue_interval_syntax() { @@ -36,7 +36,7 @@ ;; 'start') - if [ -f /opt/csw/lib/sendmail -a -f /opt/csw/etc/mail/sendmail.cf ]; then + if [ -f /opt/csw/lib/sendmail -a -f /etc/opt/csw/mail/sendmail.cf ]; then if [ ! -d /var/opt/csw/spool/mqueue ]; then /usr/bin/mkdir -pm 0750 /var/opt/csw/spool/mqueue /usr/bin/chown root:bin /var/opt/csw/spool/mqueue Modified: csw/mgar/pkg/sendmail/trunk/files/sendmail.cf =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/sendmail.cf 2011-06-21 09:07:58 UTC (rev 14849) +++ csw/mgar/pkg/sendmail/trunk/files/sendmail.cf 2011-06-21 12:26:49 UTC (rev 14850) @@ -65,7 +65,7 @@ Cwlocalhost # file containing names of hosts for which we receive email -Fw/opt/csw/etc/mail/local-host-names +Fw/etc/opt/csw/mail/local-host-names # my official domain name # ... define this only if sendmail cannot automatically determine your domain @@ -94,7 +94,7 @@ # Hosts for which relaying is permitted ($=R) -FR-o /opt/csw/etc/mail/relay-domains +FR-o /etc/opt/csw/mail/relay-domains # arithmetic map Karith arith @@ -139,7 +139,7 @@ O AliasWait=10 # location of alias file -O AliasFile=/opt/csw/etc/mail/aliases +O AliasFile=/etc/opt/csw/mail/aliases # minimum number of free blocks on filesystem O MinFreeBlocks=100 @@ -160,7 +160,7 @@ O DeliveryMode=background # error message header/file -#O ErrorHeader=/opt/csw/etc/mail/error-header +#O ErrorHeader=/etc/opt/csw/mail/error-header # error mode #O ErrorMode=print @@ -181,7 +181,7 @@ #O MaxHopCount=25 # location of help file -O HelpFile=/opt/csw/etc/mail/helpfile +O HelpFile=/etc/opt/csw/mail/helpfile # ignore dots as terminators in incoming messages? #O IgnoreDots=False @@ -266,7 +266,7 @@ #O FastSplit=1 # queue directory -O QueueDirectory=/var/spool/mqueue +O QueueDirectory=/var/opt/csw/spool/mqueue # key for shared memory; 0 to turn off, -1 to auto-select #O SharedMemoryKey=0 @@ -335,7 +335,7 @@ #O DefaultUser=mailnull # list of locations of user database file (null means no lookup) -#O UserDatabaseSpec=/opt/csw/etc/mail/userdb +#O UserDatabaseSpec=/etc/opt/csw/mail/userdb # fallback MX host #O FallbackMXhost=fall.back.host.net @@ -383,7 +383,7 @@ #O DefaultCharSet=unknown-8bit # service switch file (name hardwired on Solaris, Ultrix, OSF/1, others) -#O ServiceSwitchFile=/opt/csw/etc/mail/service.switch +#O ServiceSwitchFile=/etc/opt/csw/mail/service.switch # hosts file (normally /etc/hosts) #O HostsFile=/etc/hosts @@ -461,7 +461,7 @@ #O TrustedUser=root # Control socket for daemon management -#O ControlSocketName=/var/spool/mqueue/.control +#O ControlSocketName=/var/opt/csw/spool/mqueue/.control # Maximum MIME header length to protect MUAs #O MaxMimeHeaderLength=0/0 @@ -497,7 +497,7 @@ #O AuthRealm # default authentication information for outgoing connections -#O DefaultAuthInfo=/opt/csw/etc/mail/default-auth-info +#O DefaultAuthInfo=/etc/opt/csw/mail/default-auth-info # SMTP AUTH flags #O AuthOptions @@ -557,7 +557,7 @@ ##################### # this is equivalent to setting class "t" -#Ft/opt/csw/etc/mail/trusted-users +#Ft/etc/opt/csw/mail/trusted-users Troot Tdaemon Tuucp 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 Jun 21 14:36:25 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 21 Jun 2011 12:36:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14851] csw/mgar/pkg/sendmail/trunk/files Message-ID: Revision: 14851 http://gar.svn.sourceforge.net/gar/?rev=14851&view=rev Author: bonivart Date: 2011-06-21 12:36:25 +0000 (Tue, 21 Jun 2011) Log Message: ----------- sendmail/trunk: adjust paths in submit.cf, remove obsolete files Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/files/submit.cf Removed Paths: ------------- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol8 csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.space Deleted: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol8 =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol8 2011-06-21 12:26:49 UTC (rev 14850) +++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol8 2011-06-21 12:36:25 UTC (rev 14851) @@ -1,12 +0,0 @@ -# -echo "Installing class ." -while read src dest -do - # Keep pkgadd happy by copying the file as defined - /usr/bin/cp $src $dest || exit 2 - # Copy the version specific file to the original name - dest2="`echo $dest | sed 's/sol8.//g'`" || exit 2 - echo $dest2 - /usr/bin/cp $src $dest2 || exit 2 -done -exit 0 Deleted: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.space =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.space 2011-06-21 12:26:49 UTC (rev 14850) +++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.space 2011-06-21 12:36:25 UTC (rev 14851) @@ -1,3 +0,0 @@ -# No additional space is actually needed. -# In fact, only one set of the Solaris release specific files are installed. -# So the space required for this package is less than what is in pkgmap. Modified: csw/mgar/pkg/sendmail/trunk/files/submit.cf =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/submit.cf 2011-06-21 12:26:49 UTC (rev 14850) +++ csw/mgar/pkg/sendmail/trunk/files/submit.cf 2011-06-21 12:36:25 UTC (rev 14851) @@ -86,7 +86,7 @@ # Hosts for which relaying is permitted ($=R) -FR-o /opt/csw/etc/mail/relay-domains +FR-o /etc/opt/csw/mail/relay-domains # arithmetic map Karith arith @@ -131,7 +131,7 @@ O AliasWait=10 # location of alias file -#O AliasFile=/opt/csw/etc/mail/aliases +#O AliasFile=/etc/opt/csw/mail/aliases # minimum number of free blocks on filesystem O MinFreeBlocks=100 @@ -152,7 +152,7 @@ O DeliveryMode=i # error message header/file -#O ErrorHeader=/opt/csw/etc/mail/error-header +#O ErrorHeader=/etc/opt/csw/mail/error-header # error mode #O ErrorMode=print @@ -173,7 +173,7 @@ #O MaxHopCount=25 # location of help file -O HelpFile=/opt/csw/etc/mail/helpfile +O HelpFile=/etc/opt/csw/mail/helpfile # ignore dots as terminators in incoming messages? #O IgnoreDots=False @@ -258,7 +258,7 @@ #O FastSplit=1 # queue directory -O QueueDirectory=/var/spool/clientmqueue +O QueueDirectory=/var/opt/csw/spool/clientmqueue # key for shared memory; 0 to turn off, -1 to auto-select #O SharedMemoryKey=0 @@ -315,7 +315,7 @@ O SuperSafe=True # status file -O StatusFile=/var/spool/clientmqueue/sm-client.st +O StatusFile=/var/opt/csw/spool/clientmqueue/sm-client.st # time zone handling: # if undefined, use system default @@ -327,7 +327,7 @@ #O DefaultUser=mailnull # list of locations of user database file (null means no lookup) -#O UserDatabaseSpec=/opt/csw/etc/mail/userdb +#O UserDatabaseSpec=/etc/opt/csw/mail/userdb # fallback MX host #O FallbackMXhost=fall.back.host.net @@ -375,7 +375,7 @@ #O DefaultCharSet=unknown-8bit # service switch file (name hardwired on Solaris, Ultrix, OSF/1, others) -#O ServiceSwitchFile=/opt/csw/etc/mail/service.switch +#O ServiceSwitchFile=/etc/opt/csw/mail/service.switch # hosts file (normally /etc/hosts) #O HostsFile=/etc/hosts @@ -453,7 +453,7 @@ O TrustedUser=smmsp # Control socket for daemon management -#O ControlSocketName=/var/spool/mqueue/.control +#O ControlSocketName=/var/opt/csw/spool/clientmqueue/.control # Maximum MIME header length to protect MUAs #O MaxMimeHeaderLength=0/0 @@ -465,7 +465,7 @@ #O MaxAliasRecursion=10 # location of pid file -O PidFile=/var/spool/clientmqueue/sm-client.pid +O PidFile=/var/run/sm-client.pid # Prefix string for the process title shown on 'ps' listings #O ProcessTitlePrefix=prefix @@ -489,7 +489,7 @@ #O AuthRealm # default authentication information for outgoing connections -#O DefaultAuthInfo=/opt/csw/etc/mail/default-auth-info +#O DefaultAuthInfo=/etc/opt/csw/mail/default-auth-info # SMTP AUTH flags #O AuthOptions @@ -549,7 +549,7 @@ ##################### # this is equivalent to setting class "t" -#Ft/opt/csw/etc/mail/trusted-users +#Ft/etc/opt/csw/mail/trusted-users Troot Tdaemon Tuucp 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 Jun 21 14:40:46 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 21 Jun 2011 12:40:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[14852] csw/mgar/pkg/sendmail/trunk/files Message-ID: Revision: 14852 http://gar.svn.sourceforge.net/gar/?rev=14852&view=rev Author: bonivart Date: 2011-06-21 12:40:45 +0000 (Tue, 21 Jun 2011) Log Message: ----------- sendmail/trunk: remove obsolete files Removed Paths: ------------- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.checkinstall csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol10 csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol9 csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postinstall csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.preinstall csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.preremove Deleted: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.checkinstall =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.checkinstall 2011-06-21 12:36:25 UTC (rev 14851) +++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.checkinstall 2011-06-21 12:40:45 UTC (rev 14852) @@ -1,24 +0,0 @@ -# checkinstall for CSWsendmail -# 2007-12-09 installation no longer moves files in Sun's sendmail package. -# -trap `exit 3` 15 - -# Assign Solaris release class to install release specific files -if [ `uname -r` = 5.8 ] -then - CLASSES='none sol8 cswinitsmf' -elif [ `uname -r` = 5.9 ] -then - CLASSES='none sol9 cswinitsmf' -elif [ `uname -r` = 5.10 ] -then - CLASSES='none sol10 cswinitsmf' -fi - -# Make env variables available to other packaging scripts - -cat >$1 <." -while read src dest -do - # Keep pkgadd happy by copying the file as defined - /usr/bin/cp $src $dest || exit 2 - # Copy the version specific file to the original name - dest2="`echo $dest | sed 's/sol10.//g'`" || exit 2 - echo $dest2 - /usr/bin/cp $src $dest2 || exit 2 -done -exit 0 Deleted: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol9 =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol9 2011-06-21 12:36:25 UTC (rev 14851) +++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol9 2011-06-21 12:40:45 UTC (rev 14852) @@ -1,13 +0,0 @@ -# -echo "Installing class ." -while read src dest -do - # Keep pkgadd happy by copying the file as defined - /usr/bin/cp $src $dest || exit 2 - # Copy the version specific file to the original name - dest2="`echo $dest | sed 's/sol9.//g'`" || exit 2 - echo $dest2 - /usr/bin/cp $src $dest2 || exit 2 -done - -exit 0 Deleted: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postinstall =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postinstall 2011-06-21 12:36:25 UTC (rev 14851) +++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postinstall 2011-06-21 12:40:45 UTC (rev 14852) @@ -1,89 +0,0 @@ -#!/bin/sh -PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin - -CONFDIR=/opt/csw/etc/mail -SOLVER="sol`uname -r |sed 's/5\.//'`" - -for file in `cd ${CONFDIR} && ls *.CSW 2>/dev/null` -do - real_file="`echo ${file} |sed 's/\.CSW$//'`" - if [ ! -f ${CONFDIR}/${real_file} ] - then - cp ${CONFDIR}/${file} ${CONFDIR}/${real_file} - else - echo "Preserving ${real_file}..." - fi -done - -echo "Updating Package Dtabase for /opt/csw/bin/vacation" -chmod 0555 /opt/csw/bin/vacation -chown root:bin /opt/csw/bin/vacation -installf -c ${SOLVER} $PKGINST /opt/csw/bin/vacation f 0555 root bin || exit 2 -echo "Updating Package Dtabase for /opt/csw/lib/mail.local" -chown root:bin /opt/csw/lib/mail.local -chmod 0555 /opt/csw/lib/mail.local -installf -c ${SOLVER} $PKGINST /opt/csw/lib/mail.local f 0555 root bin || exit 2 -echo "Updating Package Dtabase for /opt/csw/lib/rmail" -chown root:bin /opt/csw/lib/rmail -chmod 0555 /opt/csw/lib/rmail -installf -c ${SOLVER} $PKGINST /opt/csw/lib/rmail f 0555 root bin || exit 2 -echo "Updating Package Dtabase for /opt/csw/lib/sendmail" -chown root:smmsp /opt/csw/lib/sendmail -chmod 2555 /opt/csw/lib/sendmail -installf -c ${SOLVER} $PKGINST /opt/csw/lib/sendmail f 2555 root smmsp || exit 2 -echo "Updating Package Dtabase for /opt/csw/lib/smrsh" -chown root:bin /opt/csw/lib/smrsh -chmod 0555 /opt/csw/lib/smrsh -installf -c ${SOLVER} $PKGINST /opt/csw/lib/smrsh f 0555 root bin || exit 2 -echo "Updating Package Dtabase for /opt/csw/sbin/mailstats" -chown root:bin /opt/csw/sbin/mailstats -chmod 0555 /opt/csw/sbin/mailstats -installf -c ${SOLVER} $PKGINST /opt/csw/sbin/mailstats f 0555 root bin || exit 2 -echo "Updating Package Dtabase for /opt/csw/sbin/praliases" -chown root:bin /opt/csw/sbin/praliases -chmod 0555 /opt/csw/sbin/praliases -installf -c ${SOLVER} $PKGINST /opt/csw/sbin/praliases f 0555 root bin || exit 2 -echo "Updating Package Dtabase for /opt/csw/sbin/editmap" -chown root:bin /opt/csw/sbin/editmap -chmod 0555 /opt/csw/sbin/editmap -installf -c ${SOLVER} $PKGINST /opt/csw/sbin/editmap f 0555 root bin || exit 2 -echo "Updating Package Dtabase for /opt/csw/sbin/makemap" -chown root:bin /opt/csw/sbin/makemap -chmod 0555 /opt/csw/sbin/makemap -installf -c ${SOLVER} $PKGINST /opt/csw/sbin/makemap f 0555 root bin || exit 2 - -installf -f -c ${SOLVER} $PKGINST - -## Cleanup of OS Versioned Class files -echo "Updating Pacakge Database for /opt/csw/bin/${SOLVER}.vacation" -rm -f /opt/csw/bin/${SOLVER}.vacation -removef $PKGINST /opt/csw/bin/${SOLVER}.vacation -echo "Updating Pacakge Database for /opt/csw/lib/${SOLVER}.mail.local" -rm -f /opt/csw/lib/${SOLVER}.mail.local -removef $PKGINST /opt/csw/lib/${SOLVER}.mail.local -echo "Updating Pacakge Database for /opt/csw/lib/${SOLVER}.rmail" -rm -f /opt/csw/lib/${SOLVER}.rmail -removef $PKGINST /opt/csw/lib/${SOLVER}.rmail -echo "Updating Pacakge Database for /opt/csw/lib/${SOLVER}.sendmail" -rm -f /opt/csw/lib/${SOLVER}.sendmail -removef $PKGINST /opt/csw/lib/${SOLVER}.sendmail -echo "Updating Pacakge Database for /opt/csw/lib/${SOLVER}.smrsh" -rm -f /opt/csw/lib/${SOLVER}.smrsh -removef $PKGINST /opt/csw/lib/${SOLVER}.smrsh -echo "Updating Pacakge Database for /opt/csw/sbin/${SOLVER}.mailstats" -rm -f /opt/csw/sbin/${SOLVER}.mailstats -removef $PKGINST /opt/csw/sbin/${SOLVER}.mailstats -echo "Updating Pacakge Database for /opt/csw/sbin/${SOLVER}.praliases" -rm -f /opt/csw/sbin/${SOLVER}.praliases -removef $PKGINST /opt/csw/sbin/${SOLVER}.praliases -echo "Updating Pacakge Database for /opt/csw/sbin/${SOLVER}.editmap" -rm -f /opt/csw/sbin/${SOLVER}.editmap -removef $PKGINST /opt/csw/sbin/${SOLVER}.editmap -echo "Updating Pacakge Database for /opt/csw/sbin/${SOLVER}.makemap" -rm -f /opt/csw/sbin/${SOLVER}.makemap -removef $PKGINST /opt/csw/sbin/${SOLVER}.makemap -removef -f $PKGINST - -exit 0 - - Deleted: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.preinstall =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.preinstall 2011-06-21 12:36:25 UTC (rev 14851) +++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.preinstall 2011-06-21 12:40:45 UTC (rev 14852) @@ -1,61 +0,0 @@ -# This script exists for the sole purpose of making sure -# the required user accounts exist. -# specifically, "user smmsp, group smmsp, group mail" - -# If installing on a filesystem that is not running the OS, exit this script. -if [ ! x"$PKG_INSTALL_ROOT" = x"" -a ! x"$PKG_INSTALL_ROOT" = x"/" ] ; then exit 0 ; fi - -if [ x"$PKG_INSTALL_ROOT" = x"" ] ; then - PKG_INSTALL_ROOT="/" -fi - -MYHOME=/ - -#First check target machines password file, THEN check -#NIS/NIS+/whatever - -/usr/bin/grep '^smmsp:' /etc/passwd >/dev/null -if [ $? -ne 0 ] ; then - /usr/bin/getent passwd smmsp >/dev/null - if [ $? -ne 0 ] ; then - NEEDUSER=1 - fi -fi - -/usr/bin/grep '^smmsp:' /etc/group >/dev/null -if [ $? -ne 0 ] ; then - /usr/bin/getent group smmsp >/dev/null - if [ $? -ne 0 ] ; then - NEEDGROUP=1 - fi -fi - -/usr/bin/grep '^mail:' /etc/group >/dev/null -if [ $? -ne 0 ] ; then - /usr/bin/getent group mail >/dev/null - if [ $? -ne 0 ] ; then - NEEDMAILGROUP=1 - fi -fi - -if [ "$NEEDGROUP" = 1 ] ; then - echo adding smmsp group - chroot $PKG_INSTALL_ROOT /usr/sbin/groupadd smmsp -else - echo smmsp group detected -fi - -if [ "$NEEDUSER" = 1 ] ; then - echo adding smmsp user - chroot $PKG_INSTALL_ROOT /usr/sbin/useradd -g smmsp smmsp - chroot $PKG_INSTALL_ROOT /usr/sbin/usermod -c "SendMail Message Submission Program" -d $MYHOME smmsp -else - echo smmsp user detected -fi - -if [ "$NEEDMAILGROUP" = 1 ] ; then - echo adding mail group - chroot $PKG_INSTALL_ROOT /usr/sbin/groupadd mail -else - echo mail group detected -fi Deleted: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.preremove =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.preremove 2011-06-21 12:36:25 UTC (rev 14851) +++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.preremove 2011-06-21 12:40:45 UTC (rev 14852) @@ -1,55 +0,0 @@ -# preremove - CSWsendmail -# 2004-02-28. Correct error on rename mailq -# 2005-12-14 Fix problem with stopping sendmail -# 2007-02-25 Add support for Solaris 10+ zone enabled hosts. -# Replacing Sun's sendmail is no longer done. - -# Stop sendmail if it is running -smf=no -if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi - -VER=`uname -r` -if [ x"$VER" = x5.8 -o x"$VER" = x5.9 ] ; then - SERVER_PID=`pgrep -x -u 0 sendmail` -else - if [ -x /usr/bin/zonename ] ; then - ZONE=`/usr/bin/zonename` - SERVER_PID=`pgrep -x -u 0 -z "$ZONE" sendmail` - else - SERVER_PID=`pgrep -x -u 0 sendmail` - fi -fi - -if [ $SERVER_PID ]; then - echo "## Stopping sendmail" - if [ $smf = yes ] - then - # Disable service - /usr/sbin/svcadm disable -s svc:network/smtp:cswsendmail >/dev/null 2>&1 - else - /etc/init.d/cswsendmail stop >/dev/null 2>&1 - fi - while [ $SERVER_PID ] - do - sleep 1 - # See if server pid still exists. - VER=`uname -r` - if [ x"$VER" = x5.8 -o x"$VER" = x5.9 ] ; then - SERVER_PID=`pgrep -x -u 0 sendmail` - else - if [ -x /usr/bin/zonename ] ; then - ZONE=`/usr/bin/zonename` - SERVER_PID=`pgrep -x -u 0 -z "$ZONE" sendmail` - else - SERVER_PID=`pgrep -x -u 0 sendmail` - fi - fi - done -fi - -if [ $smf = yes ] ; then - # Unregister with SMF - /usr/sbin/svccfg delete svc:network/smtp:cswsendmail >/dev/null 2>&1 -fi - -exit 0 \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jun 21 14:55:47 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 21 Jun 2011 12:55:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14853] csw/mgar/pkg/lang-python/ipython/trunk Message-ID: Revision: 14853 http://gar.svn.sourceforge.net/gar/?rev=14853&view=rev Author: skayser Date: 2011-06-21 12:55:47 +0000 (Tue, 21 Jun 2011) Log Message: ----------- lang-python/ipython/trunk: update to 0.10.2, cleanup Modified Paths: -------------- csw/mgar/pkg/lang-python/ipython/trunk/Makefile csw/mgar/pkg/lang-python/ipython/trunk/checksums Modified: csw/mgar/pkg/lang-python/ipython/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/ipython/trunk/Makefile 2011-06-21 12:40:45 UTC (rev 14852) +++ csw/mgar/pkg/lang-python/ipython/trunk/Makefile 2011-06-21 12:55:47 UTC (rev 14853) @@ -1,39 +1,26 @@ +# $Id: Makefile 14849 2011-06-21 09:07:58Z skayser $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +# ! Remove /usr references in $(docdir) +# ! Determine how to run the integrated test suite (iptest/nose) and run it +# NAME = ipython -VERSION = 0.10 -CATEGORIES = lang +VERSION = 0.10.2 +CATEGORIES = python -DESCRIPTION = Python toolkit for generation of output for the web +DESCRIPTION = Enhanced interactive python shell define BLURB - Genshi is a Python library that provides an integrated set of - components for parsing, generating, and processing HTML, XML - or other textual content for output generation on the web endef MASTER_SITES = http://ipython.scipy.org/dist/$(VERSION)/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.gz +ARCHALL = 1 -ARCHALL_CSWipython = 1 -PACKAGES = CSWipython -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc -# comment what this does or remove it -# PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES = none cswpycompile -RUNTIME_DEP_PKGS += CSWcswclassutils +# /opt/csw/share/doc/ipython/ contains plenty of references, override +# them for now and focus on whether ipython actually stops segfaulting +CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local +CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local -RUNTIME_DEP_PKGS_CSWipython = CSWpython-rt -CATALOGNAME_CSWipython = ipython -SPKG_DESC_CSWipython = $(DESCRIPTION) +SKIPTEST = 1 -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*) - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = $(WORKSRC)/setup.py -TEST_SCRIPTS = -INSTALL_SCRIPTS = $(WORKSRC)/setup.py - -INSTALL_ARGS += --root=$(DESTDIR) - include gar/category.mk - Modified: csw/mgar/pkg/lang-python/ipython/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/ipython/trunk/checksums 2011-06-21 12:40:45 UTC (rev 14852) +++ csw/mgar/pkg/lang-python/ipython/trunk/checksums 2011-06-21 12:55:47 UTC (rev 14853) @@ -1 +1 @@ -dd10cd1b622c16c1afca2239fcc0dfdf download/ipython-0.10.tar.gz +dda59bfc6e256ce786c4bc4aadb220a4 ipython-0.10.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jun 21 15:29:21 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 21 Jun 2011 13:29:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[14854] csw/mgar/pkg/lang-python/ipython/trunk/Makefile Message-ID: Revision: 14854 http://gar.svn.sourceforge.net/gar/?rev=14854&view=rev Author: skayser Date: 2011-06-21 13:29:21 +0000 (Tue, 21 Jun 2011) Log Message: ----------- lang-python/ipython/trunk: adjust package / catalogname, fix override Modified Paths: -------------- csw/mgar/pkg/lang-python/ipython/trunk/Makefile Modified: csw/mgar/pkg/lang-python/ipython/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/ipython/trunk/Makefile 2011-06-21 12:55:47 UTC (rev 14853) +++ csw/mgar/pkg/lang-python/ipython/trunk/Makefile 2011-06-21 13:29:21 UTC (rev 14854) @@ -1,8 +1,10 @@ # $Id: Makefile 14849 2011-06-21 09:07:58Z skayser $ # TODO (release-critical prefixed with !, non release-critical with *) # -# ! Remove /usr references in $(docdir) +# ! Remove /usr references in $(docdir) and drop overrides # ! Determine how to run the integrated test suite (iptest/nose) and run it +# ! Package contains ipythonx which doesn't work w/o wxpython (can we skip +# shipping ipythonx?) # NAME = ipython VERSION = 0.10.2 @@ -15,11 +17,11 @@ MASTER_SITES = http://ipython.scipy.org/dist/$(VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.gz ARCHALL = 1 +PACKAGES = CSWipython +CATALOGNAME = ipython -# /opt/csw/share/doc/ipython/ contains plenty of references, override -# them for now and focus on whether ipython actually stops segfaulting CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local -CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local +CHECKPKG_OVERRIDES += file-with-bad-content|/usr/share SKIPTEST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jun 21 23:48:27 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 21 Jun 2011 21:48:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[14855] csw/mgar/gar/v2/category.mk Message-ID: Revision: 14855 http://gar.svn.sourceforge.net/gar/?rev=14855&view=rev Author: skayser Date: 2011-06-21 21:48:27 +0000 (Tue, 21 Jun 2011) Log Message: ----------- gar/v2: add sanity checks for required make features Modified Paths: -------------- csw/mgar/gar/v2/category.mk Modified: csw/mgar/gar/v2/category.mk =================================================================== --- csw/mgar/gar/v2/category.mk 2011-06-21 13:29:21 UTC (rev 14854) +++ csw/mgar/gar/v2/category.mk 2011-06-21 21:48:27 UTC (rev 14855) @@ -5,7 +5,20 @@ # is slightly misleading and could be subject to future change. # -# Determine this file's directory, i.e. the GAR base directory +# Safety check, we need GNU make >= 3.81 for the magic further below, +# more precisly: 3.80 for $(MAKEFILE_LIST), 3.81 for $(lastword ...) +# c.f.: http://cvs.savannah.gnu.org/viewvc/make/NEWS?root=make&view=markup +ifeq (,$(and $(MAKEFILE_LIST),$(lastword test))) +define error_msg +GNU make >= 3.81 required. +Try "pkgutil -i gmake" and prepend /opt/csw/bin to your $$PATH. +endef + $(error $(error_msg)) +endif + +# Determine this file's directory, i.e. the GAR base directory. We +# need to do this dynamically as we don't want to rely on the presence +# of gar/ symlinks in each build directory. GARDIR := $(dir $(lastword $(MAKEFILE_LIST))) ifeq (,$(wildcard $(GARDIR)/categories/$(CATEGORIES)/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 Jun 22 03:31:42 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 22 Jun 2011 01:31:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14856] csw/mgar/gar/v2/bin/php5ext_build_scripts Message-ID: Revision: 14856 http://gar.svn.sourceforge.net/gar/?rev=14856&view=rev Author: bdwalton Date: 2011-06-22 01:31:42 +0000 (Wed, 22 Jun 2011) Log Message: ----------- gar/v2: tweak php.ini path in php5ext_build_scripts cas helper Modified Paths: -------------- csw/mgar/gar/v2/bin/php5ext_build_scripts Modified: csw/mgar/gar/v2/bin/php5ext_build_scripts =================================================================== --- csw/mgar/gar/v2/bin/php5ext_build_scripts 2011-06-21 21:48:27 UTC (rev 14855) +++ csw/mgar/gar/v2/bin/php5ext_build_scripts 2011-06-22 01:31:42 UTC (rev 14856) @@ -18,7 +18,7 @@ PIR=\${PKG_INSTALL_ROOT:-'/'} PHP5_PREFIX=/opt/csw/php5 PHP5_BINDIR=\$PHP5_PREFIX/bin -PHP5_CONFIG=\$PHP5_PREFIX/lib/php.ini +PHP5_CONFIG=/etc/opt/csw/php5/php.ini PHPEXT=\$PHP5_BINDIR/phpext if [ "\$1" = install ]; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Jun 22 09:36:50 2011 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 22 Jun 2011 07:36:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14857] csw/mgar/pkg/iftop/trunk/Makefile Message-ID: Revision: 14857 http://gar.svn.sourceforge.net/gar/?rev=14857&view=rev Author: janholzh Date: 2011-06-22 07:36:50 +0000 (Wed, 22 Jun 2011) Log Message: ----------- iftop: fix RUNTIME_DEP and rebuild to see if it works again Modified Paths: -------------- csw/mgar/pkg/iftop/trunk/Makefile Modified: csw/mgar/pkg/iftop/trunk/Makefile =================================================================== --- csw/mgar/pkg/iftop/trunk/Makefile 2011-06-22 01:31:42 UTC (rev 14856) +++ csw/mgar/pkg/iftop/trunk/Makefile 2011-06-22 07:36:50 UTC (rev 14857) @@ -20,7 +20,8 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -RUNTIME_DEP_PKGS = CSWlibpcap CSWncurses +RUNTIME_DEP_PKGS_CSWiftop += CSWncurses +RUNTIME_DEP_PKGS_CSWiftop += CSWlibpcap1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Jun 22 18:19:37 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 22 Jun 2011 16:19:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14858] csw/mgar/pkg/GeoIP/trunk Message-ID: Revision: 14858 http://gar.svn.sourceforge.net/gar/?rev=14858&view=rev Author: bonivart Date: 2011-06-22 16:19:36 +0000 (Wed, 22 Jun 2011) Log Message: ----------- GeoIP/trunk: update to 1.4.7 Modified Paths: -------------- csw/mgar/pkg/GeoIP/trunk/Makefile csw/mgar/pkg/GeoIP/trunk/checksums Modified: csw/mgar/pkg/GeoIP/trunk/Makefile =================================================================== --- csw/mgar/pkg/GeoIP/trunk/Makefile 2011-06-22 07:36:50 UTC (rev 14857) +++ csw/mgar/pkg/GeoIP/trunk/Makefile 2011-06-22 16:19:36 UTC (rev 14858) @@ -1,5 +1,5 @@ NAME = GeoIP -VERSION = 1.4.6 +VERSION = 1.4.7 CATEGORIES = net DESCRIPTION = GeoIP C API @@ -9,7 +9,7 @@ MASTER_SITES = http://geolite.maxmind.com/download/geoip/api/c/ DISTFILES = $(NAME)-$(VERSION).tar.gz -VENDOR_URL = http://www.maxmind.com/app/api +VENDOR_URL = http://www.maxmind.com/app/c PACKAGES += CSWgeoip CATALOGNAME_CSWgeoip = geoip @@ -20,29 +20,31 @@ CATALOGNAME_CSWgeoip-dev = geoip_dev SPKG_DESC_CSWgeoip-dev = GeoIP C API development support RUNTIME_DEP_PKGS_CSWgeoip-dev = CSWgeoip +PKGFILES_CSWgeoip-dev = $(PKGFILES_DEVEL) GARCOMPILER = GCC4 -TEST_TARGET = check -PKGFILES_CSWgeoip-dev = $(PKGFILES_DEVEL) +#TEST_TARGET = check +TEST_TARGET = EXTRA_MERGE_EXCLUDE_FILES = .*GeoIP.dat$ # Do not exclude static libs (needed for devel package) -MERGE_EXCLUDE_STATICLIBS = +#MERGE_EXCLUDE_STATICLIBS = +BUILD64 = 1 +STRIP_LIBTOOL = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw +CONFIGURE_ARGS += --disable-static CHECKPKG_OVERRIDES_CSWgeoip += non-uniform-lib-versions-in-package|sonames=libGeoIP.so.1,libGeoIPUpdate.so.0 CHECKPKG_OVERRIDES_CSWgeoip += surplus-dependency|CSWgeolitedb -CHECKPKG_OVERRIDES_CSWgeoip-dev += discouraged-path-in-pkgmap|/opt/csw/lib/libGeoIP.a -CHECKPKG_OVERRIDES_CSWgeoip-dev += discouraged-path-in-pkgmap|/opt/csw/lib/libGeoIPUpdate.a + # Dev package renamed, remove next time CHECKPKG_OVERRIDES_CSWgeoip-dev += file-collision|/opt/csw/include/GeoIPCity.h|CSWgeoip-dev|CSWgeoipdevel CHECKPKG_OVERRIDES_CSWgeoip-dev += file-collision|/opt/csw/include/GeoIP.h|CSWgeoip-dev|CSWgeoipdevel -CHECKPKG_OVERRIDES_CSWgeoip-dev += file-collision|/opt/csw/lib/libGeoIPUpdate.a|CSWgeoip-dev|CSWgeoipdevel CHECKPKG_OVERRIDES_CSWgeoip-dev += file-collision|/opt/csw/include/GeoIPUpdate.h|CSWgeoip-dev|CSWgeoipdevel -CHECKPKG_OVERRIDES_CSWgeoip-dev += file-collision|/opt/csw/lib/libGeoIP.a|CSWgeoip-dev|CSWgeoipdevel include gar/category.mk Modified: csw/mgar/pkg/GeoIP/trunk/checksums =================================================================== --- csw/mgar/pkg/GeoIP/trunk/checksums 2011-06-22 07:36:50 UTC (rev 14857) +++ csw/mgar/pkg/GeoIP/trunk/checksums 2011-06-22 16:19:36 UTC (rev 14858) @@ -1 +1 @@ -cb14b1beeb40631a12676b11ca0c309a download/GeoIP-1.4.6.tar.gz +a802175d5b7e2b57b540a7dd308d9205 GeoIP-1.4.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Thu Jun 23 15:03:49 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Thu, 23 Jun 2011 13:03:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14859] csw/mgar/pkg/facter/trunk Message-ID: Revision: 14859 http://gar.svn.sourceforge.net/gar/?rev=14859&view=rev Author: phipsy Date: 2011-06-23 13:03:49 +0000 (Thu, 23 Jun 2011) Log Message: ----------- Facter 1.5.9 with nasty hack. THIS IS NOT TO BE RELEASED Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile csw/mgar/pkg/facter/trunk/checksums Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2011-06-22 16:19:36 UTC (rev 14858) +++ csw/mgar/pkg/facter/trunk/Makefile 2011-06-23 13:03:49 UTC (rev 14859) @@ -3,7 +3,7 @@ # $Id$ NAME = facter -VERSION = 1.5.8 +VERSION = 1.5.9 CATEGORIES = apps DESCRIPTION = A system fact gatherer @@ -22,11 +22,12 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz SPKG_SOURCEURL = http://puppetlabs.com/ -RUNTIME_DEP_PKGS = CSWruby +RUNTIME_DEP_PKGS = CSWruby18 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -ARCHALL=1 +PATCHFILES += 0001-Patch-to-prtconf-run-in-memory.rb.patch +ARCHALL = 1 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -35,9 +36,8 @@ CHECKPKG_OVERRIDES_CSWfacter += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/facter/ssh.rb CHECKPKG_OVERRIDES_CSWfacter += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/facter/Cfkey.rb CHECKPKG_OVERRIDES_CSWfacter += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/facter/util/manufacturer.rb -CHECKPKG_OVERRIDES_CSWfacter += pkginfo-description-not-starting-with-uppercase|a|system|fact|gatherer +CHECKPKG_OVERRIDES_CSWfacter += pkginfo-opencsw-repository-uncommitted - include gar/category.mk install-facter: Modified: csw/mgar/pkg/facter/trunk/checksums =================================================================== --- csw/mgar/pkg/facter/trunk/checksums 2011-06-22 16:19:36 UTC (rev 14858) +++ csw/mgar/pkg/facter/trunk/checksums 2011-06-23 13:03:49 UTC (rev 14859) @@ -1,2 +1,3 @@ 21db7b613fe14a54e72ef062f3d5e190 facter-1.5.7.tar.gz 4dd4daebc59fa985b8aa7eb247ac4030 facter-1.5.8.tar.gz +435553aace9781ecff5dae593abc15fa facter-1.5.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Thu Jun 23 15:04:22 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Thu, 23 Jun 2011 13:04:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14860] csw/mgar/pkg/facter/trunk/files/ 0001-Patch-to-prtconf-run-in-memory.rb.patch Message-ID: Revision: 14860 http://gar.svn.sourceforge.net/gar/?rev=14860&view=rev Author: phipsy Date: 2011-06-23 13:04:22 +0000 (Thu, 23 Jun 2011) Log Message: ----------- And actually including the facter nasty patch Added Paths: ----------- csw/mgar/pkg/facter/trunk/files/0001-Patch-to-prtconf-run-in-memory.rb.patch Added: csw/mgar/pkg/facter/trunk/files/0001-Patch-to-prtconf-run-in-memory.rb.patch =================================================================== --- csw/mgar/pkg/facter/trunk/files/0001-Patch-to-prtconf-run-in-memory.rb.patch (rev 0) +++ csw/mgar/pkg/facter/trunk/files/0001-Patch-to-prtconf-run-in-memory.rb.patch 2011-06-23 13:04:22 UTC (rev 14860) @@ -0,0 +1,25 @@ +From a99e009edb9c5b948947466a9247a820ea907cb4 Mon Sep 17 00:00:00 2001 +From: Mark Phillips +Date: Tue, 31 May 2011 19:35:05 +0200 +Subject: [PATCH] Patch to prtconf run in memory.rb + +--- + lib/facter/memory.rb | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/facter/memory.rb b/lib/facter/memory.rb +index 9dd2e29..fdb3099 100644 +--- a/lib/facter/memory.rb ++++ b/lib/facter/memory.rb +@@ -172,7 +172,7 @@ if Facter.value(:kernel) == "SunOS" + end + + # Total memory size available from prtconf +- pconf = Facter::Util::Resolution.exec('/usr/sbin/prtconf') ++ pconf = Facter::Util::Resolution.exec('/usr/sbin/prtconf 2>/dev/null') + phymem = "" + pconf.each do |line| + if line =~ /^Memory size:\s+(\d+) Megabytes/ +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Thu Jun 23 15:09:21 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Thu, 23 Jun 2011 13:09:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[14861] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 14861 http://gar.svn.sourceforge.net/gar/?rev=14861&view=rev Author: phipsy Date: 2011-06-23 13:09:21 +0000 (Thu, 23 Jun 2011) Log Message: ----------- Puppet 2.7.1 Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2011-06-23 13:04:22 UTC (rev 14860) +++ csw/mgar/pkg/puppet/trunk/Makefile 2011-06-23 13:09:21 UTC (rev 14861) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.6.8 +VERSION = 2.7.1 CATEGORIES = apps define BLURB @@ -28,10 +28,12 @@ DISTFILES += CSWpuppet.postinstall # pkgutil.rb is from https://github.com/gw42/puppet/blob/tickets%2Fmaster%2F4258-dev/lib/puppet/provider/package/pkgutil.rb # Dom Cleal of RedHat has advised this is a good working version -DISTFILES += pkgutil.rb +# DISTFILES += pkgutil.rb DISTFILES += README.CSW DISTFILES += puppet.conf.example-CSW SPKG_SOURCEURL = http://puppetlabs.com/ +LICENSE_CSWpuppet = LICENSE +LICENSE_CSWpuppetmaster = LICENSE INITSMF += $(sysconfdir)/init\.d/cswpuppetd INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd @@ -69,19 +71,14 @@ INSTALL_SCRIPTS = puppet PATCHFILES = 0003-Use-opt-csw-share-puppet-modules-as-default.patch -# https://projects.puppetlabs.com/issues/6324 -PATCHFILES += 0004-patch-to-smf-provider-6324.patch -CHECKPKG_OVERRIDES_CSWpuppetmaster = surplus-dependency|CSWruby - +CHECKPKG_OVERRIDES_CSWpuppetmaster = surplus-dependency|CSWruby18 CHECKPKG_OVERRIDES_CSWpuppet = surplus-dependency|CSWfacter CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWrubyaugeas CHECKPKG_OVERRIDES_CSWpuppet += missing-dependency|CSWpython - # Puppet has hardcoded paths to look at for many OSes, many of which involve # /usr/share and /usr/local. CHECKPKG_OVERRIDES_CSWpuppet += file-with-bad-content - # These files are quite deliberate - without them users will not get CSW # behaviour. The README explains CHECKPKG_OVERRIDES_CSWpuppet += bad-location-of-file|file=/etc/puppet @@ -106,7 +103,6 @@ --bindir=$(bindir) \ --sbindir=$(sbindir) \ --full - ginstall -m 755 $(FILEDIR)/pkgutil.rb $(DESTDIR)$(rubysitelibdir)/puppet/provider/package cd $(DESTDIR)$(mandir)/man8 && gunzip * (cd $(WORKSRC)/examples/etc/puppet && \ for f in *; do \ Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2011-06-23 13:04:22 UTC (rev 14860) +++ csw/mgar/pkg/puppet/trunk/checksums 2011-06-23 13:09:21 UTC (rev 14861) @@ -2,3 +2,4 @@ 645543a18050f1d991796d865c53f9a4 puppet-2.6.5.tar.gz 58315e94ff00aedc4a19177877c3e865 puppet-2.6.6.tar.gz 588dc3343ea66983010e8c4eb58af6af puppet-2.6.8.tar.gz +7a0346758af0222dc5e2b2b1a99c44ec puppet-2.7.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Thu Jun 23 16:33:05 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Thu, 23 Jun 2011 14:33:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14862] csw/mgar/pkg/augeas/trunk Message-ID: Revision: 14862 http://gar.svn.sourceforge.net/gar/?rev=14862&view=rev Author: phipsy Date: 2011-06-23 14:33:04 +0000 (Thu, 23 Jun 2011) Log Message: ----------- augeas ramped to 0.8.1. No, it's not split libs. that doesn't fit with how the rest of the community build augeas - I'm keen on linux/solaris cross platform consistency Modified Paths: -------------- csw/mgar/pkg/augeas/trunk/Makefile csw/mgar/pkg/augeas/trunk/checksums Modified: csw/mgar/pkg/augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/augeas/trunk/Makefile 2011-06-23 13:09:21 UTC (rev 14861) +++ csw/mgar/pkg/augeas/trunk/Makefile 2011-06-23 14:33:04 UTC (rev 14862) @@ -1,5 +1,5 @@ NAME = augeas -VERSION = 0.7.0 +VERSION = 0.8.1 CATEGORIES = lib DESCRIPTION = A configuration editing tool @@ -11,27 +11,28 @@ MASTER_SITES = http://augeas.net/download/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES = 0001-Do-not-use-_N-already-taken-on-Solaris.patch -PATCHFILES += 0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch - -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - +#PATCHFILES = 0001-Do-not-use-_N-already-taken-on-Solaris.patch +#PATCHFILES += 0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch VENDOR_URL = http://augeas.net RUNTIME_DEP_PKGS = CSWgcc4corert CSWlibgnugetopt CSWreadline - GARCOMPILER = GCC4 - EXTRA_LDFLAGS = -lgnugetopt -# Building on Solaris 10 doesn't work as it support C99 and the above fixes are not necessary there. +# Building on Solaris 10 doesn't work as it support C99 and the above fixes are +# not necessary there. # Disable 64 bit for now. # BUILD64 = 1 -NOISAEXEC = 1 +# NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +CHECKPKG_OVERRIDES_CSWaugeas += file-with-bad-content +CHECKPKG_OVERRIDES_CSWaugeas += non-uniform-lib-versions-in-package|sonames=libaugeas.so.0,libfa.so.1 +CHECKPKG_OVERRIDES_CSWaugeas += shared-lib-package-contains-so-symlink + + EXTRA_MERGE_EXCLUDE_FILES = .*/charset.alias MERGE_DIRS_isa-extra = $(libdir) Modified: csw/mgar/pkg/augeas/trunk/checksums =================================================================== --- csw/mgar/pkg/augeas/trunk/checksums 2011-06-23 13:09:21 UTC (rev 14861) +++ csw/mgar/pkg/augeas/trunk/checksums 2011-06-23 14:33:04 UTC (rev 14862) @@ -1,3 +1,5 @@ eed0e7f40f22e580ccf5d78884ebe1a0 0001-Do-not-use-_N-already-taken-on-Solaris.patch b9cbbe07e58bba1572838ec0cb1f6c49 0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch a6a6a5515d7bbebe61c1e90db12eef72 augeas-0.7.0.tar.gz +e425bcfc46fd5b18473a4ff47c2878d3 augeas-0.8.0.tar.gz +62d47bdc60e175f93aed3b81cb8e2785 augeas-0.8.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From i.galic at brainsware.org Thu Jun 23 16:43:48 2011 From: i.galic at brainsware.org (Igor =?utf-8?Q?Gali=C4=87?=) Date: Thu, 23 Jun 2011 14:43:48 -0000 (UTC) Subject: [csw-devel] 0004791: checkpkg: incompatible with 'p' files in /var/sadm/install/contents In-Reply-To: <2348b562-a591-4d4b-9712-df07d2245faf@iris> Message-ID: Hi folks, As a fix for: https://www.opencsw.org/mantis/view.php?id=4791 Please find attached a patch to patch to several checkpkg files -- n.b.: this is probably not complete yet! So long, i -- Igor Gali? Tel: +43 (0) 664 886 22 883 Mail: i.galic at brainsware.org URL: http://brainsware.org/ -------------- next part -------------- A non-text attachment was scrubbed... Name: gar_pkgmap_pipe.patch Type: text/x-patch Size: 2730 bytes Desc: not available URL: From phipsy at users.sourceforge.net Thu Jun 23 16:52:05 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Thu, 23 Jun 2011 14:52:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14863] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 14863 http://gar.svn.sourceforge.net/gar/?rev=14863&view=rev Author: phipsy Date: 2011-06-23 14:52:05 +0000 (Thu, 23 Jun 2011) Log Message: ----------- Puppet 2.6.9 Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/pkgutil.rb Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2011-06-23 14:33:04 UTC (rev 14862) +++ csw/mgar/pkg/puppet/trunk/Makefile 2011-06-23 14:52:05 UTC (rev 14863) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.7.1 +VERSION = 2.6.9 CATEGORIES = apps define BLURB @@ -26,9 +26,9 @@ DISTFILES += cswpuppetmasterd DISTFILES += cswusergroup DISTFILES += CSWpuppet.postinstall -# pkgutil.rb is from https://github.com/gw42/puppet/blob/tickets%2Fmaster%2F4258-dev/lib/puppet/provider/package/pkgutil.rb -# Dom Cleal of RedHat has advised this is a good working version -# DISTFILES += pkgutil.rb +# pkgutil.rb is from https://raw.github.com/domcleal/puppet/tickets/master/8011/lib/puppet/provider/package/pkgutil.rb +# Should be headed into 2.7 code - supports -t REPO +DISTFILES += pkgutil.rb DISTFILES += README.CSW DISTFILES += puppet.conf.example-CSW SPKG_SOURCEURL = http://puppetlabs.com/ @@ -71,7 +71,10 @@ INSTALL_SCRIPTS = puppet PATCHFILES = 0003-Use-opt-csw-share-puppet-modules-as-default.patch +# https://projects.puppetlabs.com/issues/6324 +PATCHFILES += 0004-patch-to-smf-provider-6324.patch + CHECKPKG_OVERRIDES_CSWpuppetmaster = surplus-dependency|CSWruby18 CHECKPKG_OVERRIDES_CSWpuppet = surplus-dependency|CSWfacter CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWrubyaugeas @@ -103,6 +106,7 @@ --bindir=$(bindir) \ --sbindir=$(sbindir) \ --full + ginstall -m 755 $(FILEDIR)/pkgutil.rb $(DESTDIR)$(rubysitelibdir)/puppet/provider/package cd $(DESTDIR)$(mandir)/man8 && gunzip * (cd $(WORKSRC)/examples/etc/puppet && \ for f in *; do \ Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2011-06-23 14:33:04 UTC (rev 14862) +++ csw/mgar/pkg/puppet/trunk/checksums 2011-06-23 14:52:05 UTC (rev 14863) @@ -2,4 +2,5 @@ 645543a18050f1d991796d865c53f9a4 puppet-2.6.5.tar.gz 58315e94ff00aedc4a19177877c3e865 puppet-2.6.6.tar.gz 588dc3343ea66983010e8c4eb58af6af puppet-2.6.8.tar.gz +b41bee893aea4624b441a3c29e760c31 puppet-2.6.9.tar.gz 7a0346758af0222dc5e2b2b1a99c44ec puppet-2.7.1.tar.gz Modified: csw/mgar/pkg/puppet/trunk/files/pkgutil.rb =================================================================== --- csw/mgar/pkg/puppet/trunk/files/pkgutil.rb 2011-06-23 14:33:04 UTC (rev 14862) +++ csw/mgar/pkg/puppet/trunk/files/pkgutil.rb 2011-06-23 14:52:05 UTC (rev 14863) @@ -1,76 +1,127 @@ # Packaging using Peter Bonivart's pkgutil program. Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun do desc "Package management using Peter Bonivart's ``pkgutil`` command on Solaris." - pkguti = "pkgutil" + + pkgutil_bin = "pkgutil" if FileTest.executable?("/opt/csw/bin/pkgutil") - pkguti = "/opt/csw/bin/pkgutil" + pkgutil_bin = "/opt/csw/bin/pkgutil" end confine :operatingsystem => :solaris - commands :pkguti => pkguti + commands :pkguti => pkgutil_bin - def self.extended(mod) - unless command(:pkguti) != "pkgutil" - raise Puppet::Error, - "The pkgutil command is missing; pkgutil packaging unavailable" - end - + def self.healthcheck() unless FileTest.exists?("/var/opt/csw/pkgutil/admin") Puppet.notice "It is highly recommended you create '/var/opt/csw/pkgutil/admin'." Puppet.notice "See /var/opt/csw/pkgutil" end + + correct_wgetopts = false + [ "/opt/csw/etc/pkgutil.conf", "/etc/opt/csw/pkgutil.conf" ].each do |confpath| + File.open(confpath) do |conf| + conf.each {|line| correct_wgetopts = true if line =~ /^\s*wgetopts\s*=.*(-nv|-q|--no-verbose|--quiet)/ } + end + end + if ! correct_wgetopts + Puppet.notice "It is highly recommended that you set 'wgetopts=-nv' in your pkgutil.conf." + end end def self.instances(hash = {}) - pkglist(hash).collect do |bhash| - bhash.delete(:avail) - new(bhash) + healthcheck + + # Use the available pkg list (-a) to work out aliases + aliases = {} + availlist.each do |pkg| + aliases[pkg[:name]] = pkg[:alias] end + + # The -c pkglist lists installed packages + pkginsts = [] + output = pkguti(["-c"]) + parse_pkglist(output).each do |pkg| + pkg.delete(:avail) + pkginsts << new(pkg) + + # Create a second instance with the alias if it's different + pkgalias = aliases[pkg[:name]] + if pkgalias and pkg[:name] != pkgalias + apkg = pkg.dup + apkg[:name] = pkgalias + pkginsts << new(apkg) + end + end + + pkginsts end + # Turns a pkgutil -a listing into hashes with the common alias, full + # package name and available version + def self.availlist + output = pkguti ["-a"] + + list = output.split("\n").collect do |line| + next if line =~ /^common\s+package/ # header of package list + next if noise?(line) + + if line =~ /\s*(\S+)\s+(\S+)\s+(.*)/ + { :alias => $1, :name => $2, :avail => $3 } + else + Puppet.warning "Cannot match %s" % line + end + end.reject { |h| h.nil? } + end + + # Turn our pkgutil -c listing into a hash for a single package. + def pkgsingle(resource) + # The --single option speeds up the execution, because it queries + # the package managament system for one package only. + command = ["-c", "--single", resource[:name]] + self.class.parse_pkglist(run_pkgutil(resource, command), { :justme => resource[:name] }) + end + # Turn our pkgutil -c listing into a bunch of hashes. - # Supports :justme => packagename, which uses the optimised --single arg - def self.pkglist(hash) - command = ["-c"] + def self.parse_pkglist(output, hash = {}) + output = output.split("\n") - if hash[:justme] - # The --single option speeds up the execution, because it queries - # the package managament system for one package only. - command << "--single" - command << hash[:justme] + if output[-1] == "Not in catalog" + Puppet.warning "Package not in pkgutil catalog: %s" % hash[:justme] + return nil end - output = pkguti command - - list = output.split("\n").collect do |line| - next if line =~ /^#/ + list = output.collect do |line| next if line =~ /installed\s+catalog/ # header of package list - next if line =~ /^Checking integrity / # use_gpg - next if line =~ /^gpg: / # gpg verification - next if line =~ /^=+> / # catalog fetch - next if line =~ /\d+:\d+:\d+ URL:/ # wget without -q + next if noise?(line) - pkgsplit(line, hash[:justme]) + pkgsplit(line) end.reject { |h| h.nil? } if hash[:justme] - # Ensure we picked up the package line, not any pkgutil noise. - list.reject! { |h| h[:name] != hash[:justme] } - return list[-1] + # Single queries may have been for an alias so return the name requested + if list.any? + list[-1][:name] = hash[:justme] + return list[-1] + end else list.reject! { |h| h[:ensure] == :absent } return list end + end + # Identify common types of pkgutil noise as it downloads catalogs etc + def self.noise?(line) + true if line =~ /^#/ + true if line =~ /^Checking integrity / # use_gpg + true if line =~ /^gpg: / # gpg verification + true if line =~ /^=+> / # catalog fetch + true if line =~ /\d+:\d+:\d+ URL:/ # wget without -q + false end # Split the different lines into hashes. - def self.pkgsplit(line, justme) - if line == "Not in catalog" - Puppet.warning "Package not in pkgutil catalog: %s" % justme - return nil - elsif line =~ /\s*(\S+)\s+(\S+)\s+(.*)/ + def self.pkgsplit(line) + if line =~ /\s*(\S+)\s+(\S+)\s+(.*)/ hash = {} hash[:name] = $1 hash[:ensure] = if $2 == "notinst" @@ -80,10 +131,6 @@ end hash[:avail] = $3 - if justme - hash[:name] = justme - end - if hash[:avail] =~ /^SAME\s*$/ hash[:avail] = hash[:ensure] end @@ -98,18 +145,28 @@ end end + def run_pkgutil(resource, *args) + # Allow source to be one or more URLs pointing to a repository that all + # get passed to pkgutil via one or more -t options + if resource[:source] + pkguti *[resource[:source].map{|src| [ "-t", src ]}, *args].flatten + else + pkguti *args.flatten + end + end + def install - pkguti "-y", "-i", @resource[:name] + run_pkgutil @resource, "-y", "-i", @resource[:name] end # Retrieve the version from the current package file. def latest - hash = self.class.pkglist(:justme => @resource[:name]) + hash = pkgsingle(@resource) hash[:avail] if hash end def query - if hash = self.class.pkglist(:justme => @resource[:name]) + if hash = pkgsingle(@resource) hash else {:ensure => :absent} @@ -117,11 +174,11 @@ end def update - pkguti "-y", "-u", @resource[:name] + run_pkgutil @resource, "-y", "-u", @resource[:name] end def uninstall - pkguti "-y", "-r", @resource[:name] + run_pkgutil @resource, "-y", "-r", @resource[:name] end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Thu Jun 23 16:52:54 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Thu, 23 Jun 2011 14:52:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14864] csw/mgar/pkg/puppet/tags/puppet-2.6.9, REV=2011.06. 23/ Message-ID: Revision: 14864 http://gar.svn.sourceforge.net/gar/?rev=14864&view=rev Author: phipsy Date: 2011-06-23 14:52:54 +0000 (Thu, 23 Jun 2011) Log Message: ----------- puppet: Tag as release 2.6.9,REV=2011.06.23 Added Paths: ----------- csw/mgar/pkg/puppet/tags/puppet-2.6.9,REV=2011.06.23/ 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 Jun 23 18:31:50 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 23 Jun 2011 16:31:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14865] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 14865 http://gar.svn.sourceforge.net/gar/?rev=14865&view=rev Author: bonivart Date: 2011-06-23 16:31:50 +0000 (Thu, 23 Jun 2011) Log Message: ----------- sendmail/trunk: fix ownership of client queue, include Makefile, rename pid files Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg csw/mgar/pkg/sendmail/trunk/files/cswsendmail csw/mgar/pkg/sendmail/trunk/files/sendmail.cf csw/mgar/pkg/sendmail/trunk/files/site.config.m4 csw/mgar/pkg/sendmail/trunk/files/submit.cf Added Paths: ----------- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.Makefile Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-23 14:52:54 UTC (rev 14864) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-23 16:31:50 UTC (rev 14865) @@ -2,7 +2,13 @@ # TODO # - Build separate 9/10 packages? +# - One big "mta" switch in alternatives between sendmail/postfix +# - csw-sm-client.pid, csw-sendmail.pid +# - smmsp:smmsp /var/opt/csw/spool/clientmqueue +# - -rw-r--r-- 1 smmsp smmsp 47 2011-06-22 23:53 sm-client.pid +# - Include Makefile in /etc/opt/csw/mail + # + post message # + Fix paths in sendmail.cf and cswsendmail # + #4486 Provide sendmail's contrib/ tools as a separate package? @@ -35,7 +41,7 @@ DISTFILES = $(NAME).$(VERSION).tar.gz DISTFILES += aliases helpfile local-host-names sendmail.cf -DISTFILES += sm-client.st statistics submit.cf trusted-users +DISTFILES += statistics submit.cf trusted-users DISTFILES += README.CSW sendmail.schema site.config.m4 DISTFILES += oracle-sendmail-deactivate.sh oracle-sendmail-reactivate.sh DISTFILES += cswsendmail cswusergroup @@ -88,7 +94,6 @@ INITSMF = /etc/opt/csw/init.d/cswsendmail SAMPLECONF = $(addprefix /etc/opt/csw/mail/,$(CONFFILES)) -SAMPLECONF += /var/opt/csw/spool/clientmqueue/sm-client.st USERGROUP = /etc/opt/csw/pkg/CSWsendmail/cswusergroup POSTMSG = $(docdir)/sendmail/README.postinstall @@ -107,6 +112,11 @@ MIGRATE_SOURCE_DIR_CSWsendmail = /opt/csw/etc/mail MIGRATE_DEST_DIR_CSWsendmail = /etc/opt/csw/mail +PROTOTYPE_MODIFIERS = 1 +PROTOTYPE_FILES_1 = /var/opt/csw/spool/clientmqueue +PROTOTYPE_USER_1 = smmsp +PROTOTYPE_GROUP_1 = smmsp + CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom TEST_SCRIPTS = custom @@ -260,8 +270,6 @@ ginstall -m 644 $(DOWNLOADDIR)/$$file \ $(DESTDIR)$(sysconfdir)/mail/$$file; \ done ) - ( ginstall -m 644 $(DOWNLOADDIR)/sm-client.st \ - $(DESTDIR)/var/opt/csw/spool/clientmqueue/ ) @# usergroup ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail/ @@ -309,4 +317,7 @@ ginstall -m 755 $(DOWNLOADDIR)/oracle-sendmail-deactivate.sh $(DESTDIR)$(docdir)/sendmail ginstall -m 755 $(DOWNLOADDIR)/oracle-sendmail-reactivate.sh $(DESTDIR)$(docdir)/sendmail + @# Makefile for databases + ginstall -m 644 $(FILEDIR)/CSWsendmail.Makefile $(DESTDIR)$(sysconfdir)/mail/Makefile + @$(MAKECOOKIE) Added: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.Makefile (rev 0) +++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.Makefile 2011-06-23 16:31:50 UTC (rev 14865) @@ -0,0 +1,9 @@ +# Simple Makefile to help with updating the databases + +all: sendmail.cf virtusertable.db access.db domaintable.db mailertable.db + +%.db: % + /opt/csw/sbin/makemap hash $@ < $< + +%.cf: %.mc + m4 $< > $@; Modified: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg 2011-06-23 14:52:54 UTC (rev 14864) +++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg 2011-06-23 16:31:50 UTC (rev 14865) @@ -1,3 +1,4 @@ + Notes for users of previous versions of CSWsendmail =================================================== Modified: csw/mgar/pkg/sendmail/trunk/files/cswsendmail =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/cswsendmail 2011-06-23 14:52:54 UTC (rev 14864) +++ csw/mgar/pkg/sendmail/trunk/files/cswsendmail 2011-06-23 16:31:50 UTC (rev 14865) @@ -11,8 +11,8 @@ ERRMSG1='WARNING: /var/mail is NFS-mounted without setting actimeo=0,' ERRMSG2='this can cause mailbox locking and access problems.' -SERVER_PID_FILE="/var/run/sendmail.pid" -CLIENT_PID_FILE="/var/opt/csw/spool/clientmqueue/sm-client.pid" +SERVER_PID_FILE="/var/run/csw-sendmail.pid" +CLIENT_PID_FILE="/var/run/csw-sm-client.pid" DEFAULT_FILE="/etc/opt/csw/default/sendmail" ALIASES_FILE="/etc/opt/csw/mail/aliases" @@ -74,7 +74,7 @@ # the :client part is optional; see etrn(1M) for details. # server is the name of the server to prod; a mail queue run # is requested for each client name. This is comparable to - # running "/usr/lib/sendmail -qRclient" on the host server. + # running "/opt/csw/lib/sendmail -qRclient" on the host server. # # See RFC 1985 for more information. # Modified: csw/mgar/pkg/sendmail/trunk/files/sendmail.cf =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/sendmail.cf 2011-06-23 14:52:54 UTC (rev 14864) +++ csw/mgar/pkg/sendmail/trunk/files/sendmail.cf 2011-06-23 16:31:50 UTC (rev 14865) @@ -473,7 +473,7 @@ #O MaxAliasRecursion=10 # location of pid file -#O PidFile=/var/run/sendmail.pid +O PidFile=/var/run/csw-sendmail.pid # Prefix string for the process title shown on 'ps' listings #O ProcessTitlePrefix=prefix Modified: csw/mgar/pkg/sendmail/trunk/files/site.config.m4 =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2011-06-23 14:52:54 UTC (rev 14864) +++ csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2011-06-23 16:31:50 UTC (rev 14865) @@ -4,16 +4,16 @@ define(`confCC', `%OCSWCC%') APPENDDEF(`confCCOPTS', `%CFLAGS%') define(`confEBINDIR',`/opt/csw/lib') -define(`confMANROOT',`/usr/csw/share/man') -define(`confMANROOTMAN',`/usr/csw/share/man') +define(`confMANROOT',`/opt/csw/share/man') +define(`confMANROOTMAN',`/opt/csw/share/man') define(`confMBINDIR',`/opt/csw/lib') define(`confEBINDIR',`/opt/csw/lib') define(`confUBINDIR',`/opt/csw/bin') define(`confSBINDIR',`/opt/csw/sbin') define(`confSTDIR', `/etc/opt/csw/mail') define(`confSHAREDLIBDIR', `/opt/csw/lib') -define(`confMANROOT', `/opt/csw/share/man/cat') -define(`confMANROOTMAN', `/opt/csw/share/man/man') +dnl define(`confMANROOT', `/opt/csw/share/man/cat') +dnl define(`confMANROOTMAN', `/opt/csw/share/man/man') define(`confNO_STATISTICS_INSTALL',`True') define(`confHFDIR', `/opt/csw/share/mail') define(`confMSP_QUEUE_DIR', `/var/opt/csw/spool/clientmqueue') Modified: csw/mgar/pkg/sendmail/trunk/files/submit.cf =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/submit.cf 2011-06-23 14:52:54 UTC (rev 14864) +++ csw/mgar/pkg/sendmail/trunk/files/submit.cf 2011-06-23 16:31:50 UTC (rev 14865) @@ -465,7 +465,7 @@ #O MaxAliasRecursion=10 # location of pid file -O PidFile=/var/run/sm-client.pid +O PidFile=/var/run/csw-sm-client.pid # Prefix string for the process title shown on 'ps' listings #O ProcessTitlePrefix=prefix 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 Jun 23 18:41:47 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 23 Jun 2011 16:41:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14866] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 14866 http://gar.svn.sourceforge.net/gar/?rev=14866&view=rev Author: bdwalton Date: 2011-06-23 16:41:47 +0000 (Thu, 23 Jun 2011) Log Message: ----------- gardev/trunk: update dependency set, drop overrides Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2011-06-23 16:31:50 UTC (rev 14865) +++ csw/mgar/pkg/gardev/trunk/Makefile 2011-06-23 16:41:47 UTC (rev 14866) @@ -18,14 +18,35 @@ # git and netcat are required if a GAR repo is tracking a git repo instead # of upstream tarballs. svn is required for commiting gar recipes -RUNTIME_DEP_PKGS_CSWgar-dev = CSWgmake CSWgtar CSWggrep CSWdiffutils -RUNTIME_DEP_PKGS_CSWgar-dev += CSWwget CSWfindutils CSWgsed CSWcoreutils -RUNTIME_DEP_PKGS_CSWgar-dev += CSWgawk CSWbzip2 CSWlftp CSWgit CSWnetcat -RUNTIME_DEP_PKGS_CSWgar-dev += CSWsvn CSWpython CSWpy-cheetah -RUNTIME_DEP_PKGS_CSWgar-dev += CSWxz CSWgfile CSWpy-hachoir-core -RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-hachoir-parser CSWpy-libmagic -RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-progressbar CSWpy-sqlobject CSWpy-yaml -RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-curl CSWpy-mako +RUNTIME_DEP_PKGS_CSWgar-dev = CSWgmake +RUNTIME_DEP_PKGS_CSWgar-dev += CSWbzip2 +RUNTIME_DEP_PKGS_CSWgar-dev += CSWcoreutils +RUNTIME_DEP_PKGS_CSWgar-dev += CSWdiffutils +RUNTIME_DEP_PKGS_CSWgar-dev += CSWfindutils +RUNTIME_DEP_PKGS_CSWgar-dev += CSWgawk +RUNTIME_DEP_PKGS_CSWgar-dev += CSWgfile +RUNTIME_DEP_PKGS_CSWgar-dev += CSWggrep +RUNTIME_DEP_PKGS_CSWgar-dev += CSWgit +RUNTIME_DEP_PKGS_CSWgar-dev += CSWgsed +RUNTIME_DEP_PKGS_CSWgar-dev += CSWgtar +RUNTIME_DEP_PKGS_CSWgar-dev += CSWlftp +RUNTIME_DEP_PKGS_CSWgar-dev += CSWnetcat +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-cheetah +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-curl +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-hachoir-core +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-hachoir-parser +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-libmagic +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-mako +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-mox +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpymysql +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-progressbar +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-sqlobject +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-unittest2 +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-yaml +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpython +RUNTIME_DEP_PKGS_CSWgar-dev += CSWsvn +RUNTIME_DEP_PKGS_CSWgar-dev += CSWwget +RUNTIME_DEP_PKGS_CSWgar-dev += CSWxz MASTER_SITES = @@ -35,30 +56,6 @@ INSTALL_SCRIPTS = custom CHECKPKG_OVERRIDES_CSWgar-dev += archall-devel-package -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWlftp -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgmake -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgsed -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWggrep -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgtar -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWwget -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWfindutils -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-cheetah -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWbzip2 -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWsvn -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWcoreutils -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgawk -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWdiffutils -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWnetcat -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWxz -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWgfile -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-hachoir-core -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-hachoir-parser -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-libmagic -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-progressbar -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-sqlobject -CHECKPKG_OVERRIDES_CSWgar-dev += surplus-dependency|CSWpy-yaml include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Jun 23 18:49:12 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 23 Jun 2011 16:49:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14867] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 14867 http://gar.svn.sourceforge.net/gar/?rev=14867&view=rev Author: bonivart Date: 2011-06-23 16:49:12 +0000 (Thu, 23 Jun 2011) Log Message: ----------- sendmail/trunk: fix ownership and perms of client pid file Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile csw/mgar/pkg/sendmail/trunk/files/cswsendmail Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-23 16:41:47 UTC (rev 14866) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-23 16:49:12 UTC (rev 14867) @@ -116,6 +116,7 @@ PROTOTYPE_FILES_1 = /var/opt/csw/spool/clientmqueue PROTOTYPE_USER_1 = smmsp PROTOTYPE_GROUP_1 = smmsp +PROTOTYPE_PERMS_1 = 0750 CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom Modified: csw/mgar/pkg/sendmail/trunk/files/cswsendmail =================================================================== --- csw/mgar/pkg/sendmail/trunk/files/cswsendmail 2011-06-23 16:41:47 UTC (rev 14866) +++ csw/mgar/pkg/sendmail/trunk/files/cswsendmail 2011-06-23 16:49:12 UTC (rev 14867) @@ -5,6 +5,7 @@ # #ident "@(#)sendmail 1.19 01/12/05 SMI" # Modified for CSW by Alex Moore 01/01/2004 +# Modified for CSW by Peter Bonivart 2011-06-23 # Magic comments for use with cswinitsmf #AUTOENABLE no @@ -41,6 +42,11 @@ /usr/bin/mkdir -pm 0750 /var/opt/csw/spool/mqueue /usr/bin/chown root:bin /var/opt/csw/spool/mqueue fi + if [ ! -f $CLIENT_PID_FILE ]; then + /usr/bin/touch $CLIENT_PID_FILE + /usr/bin/chown smmsp:smmsp $CLIENT_PID_FILE + /usr/bin/chmod 0600 $CLIENT_PID_FILE + fi if [ ! -f $ALIASES_FILE.db ] && [ ! -f $ALIASES_FILE.dir ] \ && [ ! -f $ALIASES_FILE.pag ]; then /opt/csw/bin/newaliases This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jonbcraig at users.sourceforge.net Thu Jun 23 21:03:24 2011 From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net) Date: Thu, 23 Jun 2011 19:03:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[14868] csw/mgar/pkg/cpan Message-ID: Revision: 14868 http://gar.svn.sourceforge.net/gar/?rev=14868&view=rev Author: jonbcraig Date: 2011-06-23 19:03:23 +0000 (Thu, 23 Jun 2011) Log Message: ----------- Log::Dispatch::FileRotate, a new package to be enjoyed by all. Added Paths: ----------- csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/ csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/branches/ csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/tags/ csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/ csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/Makefile csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/checksums csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/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/Log-Dispatch-FileRotate/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/Makefile 2011-06-23 19:03:23 UTC (rev 14868) @@ -0,0 +1,23 @@ +NAME = Log-Dispatch-FileRotate +VERSION = 1.19 +CATEGORIES = cpan +AUTHOR = MARKPF + +DESCRIPTION = Log::Dispatch::FileRotate - Log to files that archive/rotate themselves +define BLURB + This module provides a simple object for logging to files under the + Log::Dispatch::* system, and automatically rotating them according + to different constraints. This is basically a Log::Dispatch::File + wrapper with additions. +endef + +PACKAGES = CSWpm-logdispatchfilerotate +CATALOGNAME = pm_logdispatchfilerotate + +DEP_PKGS = CSWpmlogdispatch + +LICENSE=files/COPYING + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/checksums 2011-06-23 19:03:23 UTC (rev 14868) @@ -0,0 +1 @@ +8fabfe387bb070580f7c97c18853ae25 Log-Dispatch-FileRotate-1.19.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jonbcraig at users.sourceforge.net Thu Jun 23 21:12:14 2011 From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net) Date: Thu, 23 Jun 2011 19:12:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14869] csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/ files/COPYING Message-ID: Revision: 14869 http://gar.svn.sourceforge.net/gar/?rev=14869&view=rev Author: jonbcraig Date: 2011-06-23 19:12:14 +0000 (Thu, 23 Jun 2011) Log Message: ----------- oops, one must remember the copyright Added Paths: ----------- csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/files/COPYING Added: csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/files/COPYING 2011-06-23 19:12:14 UTC (rev 14869) @@ -0,0 +1,11 @@ + Copyright 2005-2006, Mark Pfeiffer + + This code may be copied only under the terms of the Artistic License + which may be found in the Perl 5 source kit. + + Use 'perldoc perlartistic' to see the Artistic License. + + Complete documentation for Perl, including FAQ lists, should be found on + this system using `man perl' or `perldoc perl'. If you have access to + the Internet, point your browser at http://www.perl.org/, the Perl Home + Page. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jonbcraig at users.sourceforge.net Thu Jun 23 22:00:43 2011 From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net) Date: Thu, 23 Jun 2011 20:00:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14870] csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/ Makefile Message-ID: Revision: 14870 http://gar.svn.sourceforge.net/gar/?rev=14870&view=rev Author: jonbcraig Date: 2011-06-23 20:00:43 +0000 (Thu, 23 Jun 2011) Log Message: ----------- fixed catalog/package naming Modified Paths: -------------- csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/Makefile Modified: csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/Makefile 2011-06-23 19:12:14 UTC (rev 14869) +++ csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/Makefile 2011-06-23 20:00:43 UTC (rev 14870) @@ -11,8 +11,8 @@ wrapper with additions. endef -PACKAGES = CSWpm-logdispatchfilerotate -CATALOGNAME = pm_logdispatchfilerotate +PACKAGES = CSWpm-log-dispatch-filerotate +CATALOGNAME = pm_log_dispatch_filerotate DEP_PKGS = CSWpmlogdispatch 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 Jun 23 22:17:11 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 23 Jun 2011 20:17:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[14871] csw/mgar/pkg/sendmail/trunk Message-ID: Revision: 14871 http://gar.svn.sourceforge.net/gar/?rev=14871&view=rev Author: bonivart Date: 2011-06-23 20:17:10 +0000 (Thu, 23 Jun 2011) Log Message: ----------- sendmail/trunk: remove statistics Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/sendmail/trunk/files/sm-client.st csw/mgar/pkg/sendmail/trunk/files/statistics Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-23 20:00:43 UTC (rev 14870) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-23 20:17:10 UTC (rev 14871) @@ -4,11 +4,10 @@ # - Build separate 9/10 packages? # - One big "mta" switch in alternatives between sendmail/postfix -# - csw-sm-client.pid, csw-sendmail.pid -# - smmsp:smmsp /var/opt/csw/spool/clientmqueue -# - -rw-r--r-- 1 smmsp smmsp 47 2011-06-22 23:53 sm-client.pid -# - Include Makefile in /etc/opt/csw/mail - +# + remove statistics +# + csw-sm-client.pid, csw-sendmail.pid +# + smmsp:smmsp /var/opt/csw/spool/clientmqueue +# + Include Makefile in /etc/opt/csw/mail # + post message # + Fix paths in sendmail.cf and cswsendmail # + #4486 Provide sendmail's contrib/ tools as a separate package? @@ -41,7 +40,7 @@ DISTFILES = $(NAME).$(VERSION).tar.gz DISTFILES += aliases helpfile local-host-names sendmail.cf -DISTFILES += statistics submit.cf trusted-users +DISTFILES += submit.cf trusted-users DISTFILES += README.CSW sendmail.schema site.config.m4 DISTFILES += oracle-sendmail-deactivate.sh oracle-sendmail-reactivate.sh DISTFILES += cswsendmail cswusergroup @@ -108,7 +107,7 @@ PATCHFILES += 0002-no-gnuism.patch MIGRATE_FILES_CSWsendmail = aliases helpfile local-host-names sendmail.cf -MIGRATE_FILES_CSWsendmail += statistics submit.cf trusted-users +MIGRATE_FILES_CSWsendmail += submit.cf trusted-users MIGRATE_SOURCE_DIR_CSWsendmail = /opt/csw/etc/mail MIGRATE_DEST_DIR_CSWsendmail = /etc/opt/csw/mail @@ -178,7 +177,7 @@ praliases/praliases.8 smrsh/smrsh.8 mail.local/mail.local.8 \ rmail/rmail.8 editmap/editmap.8 CONFFILES = aliases helpfile local-host-names sendmail.cf \ - statistics submit.cf trusted-users + submit.cf trusted-users INCLFILES = libmilter/libmilter.h CONTBIN = link_hash.sh movemail.pl smcontrol.pl \ passwd-to-alias.pl socketmapClient.pl bounce-resender.pl \ Deleted: csw/mgar/pkg/sendmail/trunk/files/sm-client.st =================================================================== Deleted: csw/mgar/pkg/sendmail/trunk/files/statistics =================================================================== 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 Jun 24 02:41:21 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 24 Jun 2011 00:41:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[14872] csw/mgar/pkg/apache2/trunk/files/cswapache2 Message-ID: Revision: 14872 http://gar.svn.sourceforge.net/gar/?rev=14872&view=rev Author: bdwalton Date: 2011-06-24 00:41:21 +0000 (Fri, 24 Jun 2011) Log Message: ----------- apache2/trunk: update init script to honour use of CONF_FILE variable; mantis id 4793 Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/files/cswapache2 Modified: csw/mgar/pkg/apache2/trunk/files/cswapache2 =================================================================== --- csw/mgar/pkg/apache2/trunk/files/cswapache2 2011-06-23 20:17:10 UTC (rev 14871) +++ csw/mgar/pkg/apache2/trunk/files/cswapache2 2011-06-24 00:41:21 UTC (rev 14872) @@ -41,4 +41,4 @@ ;; esac -exec $APACHECTL -k $cmd 2>&1 +exec $APACHECTL -f $CONF_FILE -k $cmd 2>&1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Jun 24 03:11:40 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 24 Jun 2011 01:11:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14873] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 14873 http://gar.svn.sourceforge.net/gar/?rev=14873&view=rev Author: bdwalton Date: 2011-06-24 01:11:40 +0000 (Fri, 24 Jun 2011) Log Message: ----------- apache2/trunk: disable libtool patch as it does not apply and now seems unnecessary Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2011-06-24 00:41:21 UTC (rev 14872) +++ csw/mgar/pkg/apache2/trunk/Makefile 2011-06-24 01:11:40 UTC (rev 14873) @@ -48,7 +48,7 @@ DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork DISTFILES += README.CSW.apache2rt -PATCHFILES += 0001-Apply-a-large-hammer-to-buildconf-to-fix-libtool-set.patch +#PATCHFILES += 0001-Apply-a-large-hammer-to-buildconf-to-fix-libtool-set.patch PATCHFILES += 0002-Adjust-a-few-usr-local-paths-in-the-man-pages.patch PATCHFILES += 0003-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jun 24 03:23:51 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 24 Jun 2011 01:23:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14874] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14874 http://gar.svn.sourceforge.net/gar/?rev=14874&view=rev Author: wahwah Date: 2011-06-24 01:23:51 +0000 (Fri, 24 Jun 2011) Log Message: ----------- pkgdb: Support for pipe file types Patch by Igor Gali?\196?\135. Signed-off-by: Maciej Blizi?\197?\132ski Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgmap.py csw/mgar/gar/v2/lib/python/pkgmap_test.py csw/mgar/gar/v2/lib/python/system_pkgmap.py csw/mgar/gar/v2/lib/python/system_pkgmap_test.py Modified: csw/mgar/gar/v2/lib/python/pkgmap.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgmap.py 2011-06-24 01:11:40 UTC (rev 14873) +++ csw/mgar/gar/v2/lib/python/pkgmap.py 2011-06-24 01:23:51 UTC (rev 14874) @@ -26,7 +26,8 @@ "s": "symlink", "l": "link", "i": "script", - "e": "editable file" + "e": "editable file", + "p": "pipe" } def __init__(self, input, permissions=False, @@ -62,7 +63,7 @@ target = None if len(fields) < 2: return None - elif line_type in ('f', 'd'): + elif line_type in ('f', 'd', 'p'): # Files and directories line_to_add = fields[3] installed_path = fields[3] Modified: csw/mgar/gar/v2/lib/python/pkgmap_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgmap_test.py 2011-06-24 01:11:40 UTC (rev 14873) +++ csw/mgar/gar/v2/lib/python/pkgmap_test.py 2011-06-24 01:23:51 UTC (rev 14874) @@ -23,6 +23,7 @@ 1 e build /opt/csw/apache2/ap2mod/suexec ? ? ? 1472 50478 1289099700 1 d none /opt/csw/apache2/libexec 0755 root bin 1 f none /opt/csw/apache2/libexec/mod_suexec.so 0755 root bin 6852 52597 1289092061 +1 p none /etc/scn/scn_aa_read 0600 root sys """ class PkgmapUnitTest(unittest.TestCase): Modified: csw/mgar/gar/v2/lib/python/system_pkgmap.py =================================================================== --- csw/mgar/gar/v2/lib/python/system_pkgmap.py 2011-06-24 01:11:40 UTC (rev 14873) +++ csw/mgar/gar/v2/lib/python/system_pkgmap.py 2011-06-24 01:23:51 UTC (rev 14874) @@ -148,7 +148,7 @@ elif file_type == 'l': # ftype l: path l class package f_path, f_type, f_class, f_pkgname = parts - elif file_type in ('d', 'x'): + elif file_type in ('d', 'x', 'p'): # ftype d: path d class mode owner group package(s) # ftype x: path x class mode owner group package f_path, f_type, f_class, f_mode, f_owner, f_group = parts[:6] Modified: csw/mgar/gar/v2/lib/python/system_pkgmap_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/system_pkgmap_test.py 2011-06-24 01:11:40 UTC (rev 14873) +++ csw/mgar/gar/v2/lib/python/system_pkgmap_test.py 2011-06-24 01:23:51 UTC (rev 14874) @@ -26,6 +26,7 @@ "1250803966 SUNWcsl") PKGMAP_LINE_7 = ("/opt/csw/include/mozilla/accessibility/nsAccessNode.h " "f none 0644 root bin 5557 10685 1068611657 !CSWmozilla") +PKGMAP_LINE_8 = ("/etc/scn/scn_aa_read p none 0600 root sys SUNWscn-agentfacade-r") class IndexerUnitTest(unittest.TestCase): @@ -85,6 +86,27 @@ } self.assertEqual(expected, spi._ParsePkgmapLine(PKGMAP_LINE_5)) + def test_ParsePkgmapLineTypePipe(self): + """A pipe is a valid type and we have to cope with it.""" + spi = system_pkgmap.Indexer() + expected = { + 'modtime': None, + 'major': None, + 'pkgnames': ['SUNWscn-agentfacade-r'], + 'cksum': None, + 'owner': 'root', + 'path': '/etc/scn/scn_aa_read', + 'line': PKGMAP_LINE_8, + 'class': 'none', + 'size': None, + 'group': 'sys', + 'target': None, + 'mode': '0600', + 'type': 'p', + 'minor': None, + } + self.assertEqual(expected, spi._ParsePkgmapLine(PKGMAP_LINE_8)) + def test_ParsePkgmapLibc(self): """A question mark is not a valid type, but we have to cope with it.""" spi = system_pkgmap.Indexer() 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 Jun 24 04:58:21 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 24 Jun 2011 02:58:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[14875] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 14875 http://gar.svn.sourceforge.net/gar/?rev=14875&view=rev Author: bdwalton Date: 2011-06-24 02:58:21 +0000 (Fri, 24 Jun 2011) Log Message: ----------- apache2/trunk: set proper test target Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2011-06-24 01:23:51 UTC (rev 14874) +++ csw/mgar/pkg/apache2/trunk/Makefile 2011-06-24 02:58:21 UTC (rev 14875) @@ -226,6 +226,8 @@ #PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { print }' +TEST_TARGET = test + include gar/category.mk CFLAGS := -DSSL_EXPERIMENTAL -DSSL_ENGINE $(CFLAGS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jun 24 10:35:13 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 24 Jun 2011 08:35:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14876] csw/mgar/pkg/spamassassin/trunk Message-ID: Revision: 14876 http://gar.svn.sourceforge.net/gar/?rev=14876&view=rev Author: bonivart Date: 2011-06-24 08:35:12 +0000 (Fri, 24 Jun 2011) Log Message: ----------- spamassassin/trunk: update to 3.3.2 Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/checksums csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.README.CSW Removed Paths: ------------- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.xml.CSW csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.svc-spamd.CSW Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2011-06-24 02:58:21 UTC (rev 14875) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2011-06-24 08:35:12 UTC (rev 14876) @@ -1,6 +1,6 @@ NAME = spamassassin SPKG_NAME = Mail-SpamAssassin -VERSION = 3.3.1 +VERSION = 3.3.2 CATEGORIES = net DESCRIPTION = Mail filter with a wide range of tests @@ -10,8 +10,8 @@ DNS blocklists, and collaborative filtering databases. endef +MASTER_SITES = http://apache.dataphone.se/spamassassin/source/ #MASTER_SITES = http://people.apache.org/~jm/devel/ -MASTER_SITES = http://apache.dataphone.se/spamassassin/source/ DISTFILES = $(SPKG_NAME)-$(VERSION).tar.gz #DISTFILES = $(SPKG_NAME)-$(VERSION)-rc3.tar.gz DISTFILES += COPYING @@ -37,45 +37,65 @@ RUNTIME_DEP_PKGS += CSWrazor RUNTIME_DEP_PKGS += CSWzlib -UFILES_REGEX = $(SPKG_NAME)-(\d+(?:\.\d+)*).tar.gz - SAMPLECONF = /etc/opt/csw/spamassassin/.+\.pre\.CSW SAMPLECONF += /etc/opt/csw/spamassassin/local\.cf\.CSW SAMPLECONF += /etc/opt/csw/spamassassin/spamd\.CSW -USERGROUP = /etc/opt/csw/pkg/CSWspamassassin/cswusergroup -#INITSMF = /opt/csw/etc/init.d/cswspamd -INITSMF = /etc/opt/csw/init.d/cswspamd -POSTMSG = /opt/csw/share/doc/spamassassin/README.upgrade +USERGROUP = /etc/opt/csw/pkg/CSWspamassassin/cswusergroup +INITSMF = /etc/opt/csw/init.d/cswspamd +POSTMSG = /opt/csw/share/doc/spamassassin/README.upgrade -MIGRATE_FILES = init.pre local.cf v310.pre v312.pre v320.pre +MIGRATE_FILES = init.pre local.cf v310.pre v312.pre v320.pre MIGRATE_SOURCE_DIR = /opt/csw/etc/spamassassin -MIGRATE_DEST_DIR = /etc/opt/csw/spamassassin +MIGRATE_DEST_DIR = /etc/opt/csw/spamassassin CONFIGURE_SCRIPTS = custom -BUILD_SCRIPTS = custom -TEST_SCRIPTS = custom -#TEST_SCRIPTS = -INSTALL_SCRIPTS = custom +BUILD_SCRIPTS = custom +TEST_SCRIPTS = custom +#TEST_SCRIPTS = +INSTALL_SCRIPTS = custom -CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmaildkim -CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmiosocketssl -CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmipcountry CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmnetdns +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-mime-base64 +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWgnupg +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-netaddr-ip +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-ldap +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-dbi +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-io-socket-ssl +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmailspf CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWrazor -CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmdbi -CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmnetaddrip -CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmlibwww -CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmimebase64 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmuri -CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmailspf -CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmhtmlparser -CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmldap -CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmiosocketinet6 +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-io-socket-inet6 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmailtools CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWzlib -CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWgnupg +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-libwww-perl +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmiozlib CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWosslrt -CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmiozlib +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmipcountry +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmaildkim +CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-html-parser +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/local|root/opt/csw/bin/spamassassin +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/local|root/opt/csw/share/perl/csw/Mail/SpamAssassin.pm +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/spamassassin.1 +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/local|root/opt/csw/share/doc/spamassassin/sql/README +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/bin/spamd +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/bin/spamassassin +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/local|root/opt/csw/share/doc/spamassassin/README +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/bin/sa-compile +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/bin/sa-learn +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Mail/SpamAssassin/Util/DependencyInfo.pm +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Mail/SpamAssassin/Conf.pm +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/spamassassin-run.pod +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Mail/SpamAssassin.pm +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Mail/SpamAssassin/Locales.pm +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/sa-learn.1 +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/spamd.1 +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/sa-compile.1 +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/spamassassin.1 +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man3/spamassassin-run.3perl +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/spamassassin-run.1 +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man3/Mail::SpamAssassin::Conf.3perl +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/doc/spamassassin/README +CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/doc/spamassassin/USAGE include gar/category.mk Modified: csw/mgar/pkg/spamassassin/trunk/checksums =================================================================== --- csw/mgar/pkg/spamassassin/trunk/checksums 2011-06-24 02:58:21 UTC (rev 14875) +++ csw/mgar/pkg/spamassassin/trunk/checksums 2011-06-24 08:35:12 UTC (rev 14876) @@ -1,2 +1 @@ -3b83ef96387f14655fc854ddc3c6bd57 COPYING -5a93f81fda315411560ff5da099382d2 Mail-SpamAssassin-3.3.1.tar.gz +d1d62cc5c6eac57e88c4006d9633b81e Mail-SpamAssassin-3.3.2.tar.gz Modified: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.README.CSW =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.README.CSW 2011-06-24 02:58:21 UTC (rev 14875) +++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.README.CSW 2011-06-24 08:35:12 UTC (rev 14876) @@ -1,5 +1,8 @@ Notes for the CSW spamassassin distribution ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Update 2011-06-24 +This update includes SpamAssassin 3.3.2. + update 2008.10.21 This update includes SpamAssassin 3.2.5 and the package has been moved into the GAR build system. Deleted: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.xml.CSW =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.xml.CSW 2011-06-24 02:58:21 UTC (rev 14875) +++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.xml.CSW 2011-06-24 08:35:12 UTC (rev 14876) @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.svc-spamd.CSW =================================================================== --- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.svc-spamd.CSW 2011-06-24 02:58:21 UTC (rev 14875) +++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.svc-spamd.CSW 2011-06-24 08:35:12 UTC (rev 14876) @@ -1,46 +0,0 @@ -#!/sbin/sh -# -# From: skod at ises-llc.com (Scott Griffith, ISES-LLC) -# To: , -# Subject: Re: [Spamassassin-talk] SysV-style startup script -# Date: Sat, 24 Nov 2001 12:09:16 -0700 -# Modified for CSW by Alex Moore -# Changed for SMF -# -# In case there are any Solaris folks out there who aren't comfortable -# with their own rc scripts, here's what I've been using for Solaris 7 -# from day 1 with no problems. Filename: -# - -. /lib/svc/share/smf_include.sh - -PATH=$PATH:/usr/bin:/opt/csw/bin - -case "$1" in -'start') - if [ -x /usr/bin/spamd -o -x /opt/csw/bin/spamd ] - then - spamd -d -i 127.0.0.1 -m 10 --min-children=2 --max-conn-per-child=50 -s local2 --syslog-socket=inet -u spamd -x -r /opt/csw/var/spamd/spamd.pid - fi - ;; - -'stop') - /usr/bin/pkill -9 -x -u 0 '(spamd)' - ;; - -restart) - stop - while pgrep spamd > /dev/null - do - sleep 1 - done - start - ;; - -*) - echo "Usage: $0 { start | stop | restart }" - exit 1 - ;; -esac -exit 0 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Fri Jun 24 11:54:49 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Fri, 24 Jun 2011 10:54:49 +0100 Subject: [csw-devel] 0004791: checkpkg: incompatible with 'p' files in /var/sadm/install/contents In-Reply-To: References: <2348b562-a591-4d4b-9712-df07d2245faf@iris> Message-ID: Thanks, Igor. Your patch is now submitted to the repository. http://sourceforge.net/apps/trac/gar/changeset/14874 Maciej From bonivart at users.sourceforge.net Fri Jun 24 13:39:36 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 24 Jun 2011 11:39:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14877] csw/mgar/pkg/gnupg/trunk/Makefile Message-ID: Revision: 14877 http://gar.svn.sourceforge.net/gar/?rev=14877&view=rev Author: bonivart Date: 2011-06-24 11:39:35 +0000 (Fri, 24 Jun 2011) Log Message: ----------- gnupg/trunk: update to 1.4.11 Modified Paths: -------------- csw/mgar/pkg/gnupg/trunk/Makefile Modified: csw/mgar/pkg/gnupg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile 2011-06-24 08:35:12 UTC (rev 14876) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2011-06-24 11:39:35 UTC (rev 14877) @@ -9,16 +9,20 @@ PACKAGES = CSWgnupg CATALOGNAME = gnupg -SPKG_DESC = GnuPG is a complete and free replacement for PGP. +SPKG_DESC = GnuPG is a complete and free replacement for PGP +RUNTIME_DEP_PKGS_CSWgnupg = CSWbzip2 +RUNTIME_DEP_PKGS_CSWgnupg += CSWcurlrt +RUNTIME_DEP_PKGS_CSWgnupg += CSWreadline +RUNTIME_DEP_PKGS_CSWgnupg += CSWiconv +RUNTIME_DEP_PKGS_CSWgnupg += CSWoldaprt +RUNTIME_DEP_PKGS_CSWgnupg += CSWzlib +RUNTIME_DEP_PKGS_CSWgnupg += CSWlibintl8 + SPKG_SOURCEURL = http://www.gnupg.org/ MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libcurl=$(prefix) CONFIGURE_ARGS += --with-ldap=$(prefix) @@ -33,14 +37,17 @@ CONFIGURE_ARGS += --disable-asm EXTRA_MERGE_EXCLUDE_FILES += .*/charset.alias +EXTRA_MERGE_EXCLUDE_FILES += .*/gpg-zip.1 -PROTOTYPE_MODIFIERS = suid +PROTOTYPE_MODIFIERS = suid PROTOTYPE_FILES_suid = .*/gpg PROTOTYPE_PERMS_suid = 4755 -RUNTIME_DEP_PKGS_CSWgnupg = CSWbzip2 CSWcurlrt CSWggettextrt CSWiconv -RUNTIME_DEP_PKGS_CSWgnupg += CSWoldaprt CSWreadline CSWzlib - TEST_TARGET = check +CHECKPKG_OVERRIDES_CSWgnupg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gpg.ru.1 +CHECKPKG_OVERRIDES_CSWgnupg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gpg.1 +CHECKPKG_OVERRIDES_CSWgnupg += file-with-bad-content|/usr/local|root/opt/csw/share/info/gnupg1.info +#CHECKPKG_OVERRIDES_CSWgnupg += file-collision|/opt/csw/share/man/man1/gpg-zip.1|CSWgnupg|CSWgnupg2 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jun 24 14:05:40 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 24 Jun 2011 12:05:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14878] csw/mgar/pkg/gnupg/trunk/Makefile Message-ID: Revision: 14878 http://gar.svn.sourceforge.net/gar/?rev=14878&view=rev Author: bonivart Date: 2011-06-24 12:05:40 +0000 (Fri, 24 Jun 2011) Log Message: ----------- gnupg/trunk: clean up Modified Paths: -------------- csw/mgar/pkg/gnupg/trunk/Makefile Modified: csw/mgar/pkg/gnupg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile 2011-06-24 11:39:35 UTC (rev 14877) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2011-06-24 12:05:40 UTC (rev 14878) @@ -1,5 +1,5 @@ -NAME = gnupg -VERSION = 1.4.11 +NAME = gnupg +VERSION = 1.4.11 CATEGORIES = apps DESCRIPTION = GnuPG is a complete and free replacement for PGP. @@ -37,6 +37,7 @@ CONFIGURE_ARGS += --disable-asm EXTRA_MERGE_EXCLUDE_FILES += .*/charset.alias +# Collision with gnupg2 EXTRA_MERGE_EXCLUDE_FILES += .*/gpg-zip.1 PROTOTYPE_MODIFIERS = suid @@ -48,6 +49,5 @@ CHECKPKG_OVERRIDES_CSWgnupg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gpg.ru.1 CHECKPKG_OVERRIDES_CSWgnupg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gpg.1 CHECKPKG_OVERRIDES_CSWgnupg += file-with-bad-content|/usr/local|root/opt/csw/share/info/gnupg1.info -#CHECKPKG_OVERRIDES_CSWgnupg += file-collision|/opt/csw/share/man/man1/gpg-zip.1|CSWgnupg|CSWgnupg2 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jun 24 14:25:53 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 24 Jun 2011 12:25:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[14879] csw/mgar/pkg/gnupg/trunk/Makefile Message-ID: Revision: 14879 http://gar.svn.sourceforge.net/gar/?rev=14879&view=rev Author: bonivart Date: 2011-06-24 12:25:53 +0000 (Fri, 24 Jun 2011) Log Message: ----------- gnupg/trunk: add CSWlibncurses5 dep Modified Paths: -------------- csw/mgar/pkg/gnupg/trunk/Makefile Modified: csw/mgar/pkg/gnupg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile 2011-06-24 12:05:40 UTC (rev 14878) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2011-06-24 12:25:53 UTC (rev 14879) @@ -18,6 +18,8 @@ RUNTIME_DEP_PKGS_CSWgnupg += CSWoldaprt RUNTIME_DEP_PKGS_CSWgnupg += CSWzlib RUNTIME_DEP_PKGS_CSWgnupg += CSWlibintl8 +# Needed because of missing in CSWncurses, checkpkg only requires readline +RUNTIME_DEP_PKGS_CSWgnupg += CSWlibncurses5 SPKG_SOURCEURL = http://www.gnupg.org/ MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/ @@ -49,5 +51,7 @@ CHECKPKG_OVERRIDES_CSWgnupg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gpg.ru.1 CHECKPKG_OVERRIDES_CSWgnupg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gpg.1 CHECKPKG_OVERRIDES_CSWgnupg += file-with-bad-content|/usr/local|root/opt/csw/share/info/gnupg1.info +# Remove after checkpkg/ncurses bugs fixed +CHECKPKG_OVERRIDES_CSWgnupg += surplus-dependency|CSWlibncurses5 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jonbcraig at users.sourceforge.net Fri Jun 24 18:32:16 2011 From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net) Date: Fri, 24 Jun 2011 16:32:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[14880] csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/tags/ Log-Dispatch-FileRotate-1.19, REV=2011.06.24/ Message-ID: Revision: 14880 http://gar.svn.sourceforge.net/gar/?rev=14880&view=rev Author: jonbcraig Date: 2011-06-24 16:32:16 +0000 (Fri, 24 Jun 2011) Log Message: ----------- Log-Dispatch-FileRotate: Tag as release 1.19,REV=2011.06.24 Added Paths: ----------- csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/tags/Log-Dispatch-FileRotate-1.19,REV=2011.06.24/ 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 Jun 24 19:33:03 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 24 Jun 2011 17:33:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14881] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14881 http://gar.svn.sourceforge.net/gar/?rev=14881&view=rev Author: bdwalton Date: 2011-06-24 17:33:03 +0000 (Fri, 24 Jun 2011) Log Message: ----------- php5/trunk: include symlinks for binaries in top-level bin dir Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-06-24 16:32:16 UTC (rev 14880) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-06-24 17:33:03 UTC (rev 14881) @@ -345,6 +345,11 @@ @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST) @rm -rf $(DESTDIR)/.cha* $(DESTDIR)/.dep* $(DESTDIR)/.reg* $(DESTDIR)/.l* $(DESTDIR)/.f* @perl -pi -e 's!s:17:"http://proxy:3128!s:0:"!' $(DESTDIR)$(sysconfdir)/pear.conf* + @mkdir -p $(DESTDIR)/opt/csw/bin + @( cd $(DESTDIR)/opt/csw/bin; \ + for f in pear peardev pecl phar php php-config; do \ + ln -s ../php5/bin/$$f $$f; \ + done ) @$(MAKECOOKIE) post-merge: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Fri Jun 24 19:48:31 2011 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 24 Jun 2011 13:48:31 -0400 Subject: [csw-devel] proposed checkpkg test Message-ID: <1308937693-sup-9319@pinkfloyd.chass.utoronto.ca> A resend. Thanks -Ben Excerpts from Maciej Blizi?ski's message of Sat Jun 18 02:43:33 -0400 2011: > The code looks good. A unit test would be a good thing to have. I > can think of three test cases: How about this then? Index: package_checks_test.py =================================================================== --- package_checks_test.py (revision 14836) +++ package_checks_test.py (working copy) @@ -950,6 +950,39 @@ 'This path is already provided by CSWcommon ' 'or is not allowed for other reasons.') + +class TestCheckGzippedManpages(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = "CheckGzippedManpages" + def CheckpkgTest(self): + self.pkg_data["pkgmap"].append({ + "class": "none", + "group": "bin", + "line": "", + "mode": '0755', + "path": "/opt/csw/share/man/man5/puppet.conf.5.gz", + "type": "f", + "user": "root" + }) + self.error_mgr_mock.ReportError( + 'gzipped-manpage-in-pkgmap', 'opt/csw/share/man/man5/puppet.conf.5.gz', + "Solaris' man cannot automatically inflate man pages." + "Solution: man page should be gunzipped.") + + +class TestCheckGzippedManpages_good(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = "CheckGzippedManpages" + def CheckpkgTest(self): + self.pkg_data["pkgmap"].append({ + "class": "none", + "group": "bin", + "line": "", + "mode": '0755', + "path": "/opt/csw/share/man/man5/puppet.conf.5", + "type": "f", + "user": "root" + }) + + class TestCheckArchitecture_sparcv8plus(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = "CheckArchitecture" Index: package_checks.py =================================================================== --- package_checks.py (revision 14836) +++ package_checks.py (working copy) @@ -220,6 +220,15 @@ if re.search(perllocal_re, entry["path"]): error_mgr.ReportError("perllocal-pod-in-pkgmap", entry["path"]) +def CheckGzippedManpages(pkg_data, error_mgr, logger, messenger): + gzipman_re = re.compile(r'share/man/man.*/.*\.gz$') + for entry in pkg_data["pkgmap"]: + if entry["path"]: + if re.search(gzipman_re, entry["path"]): + error_mgr.ReportError( + 'gzipped-manpage-in-pkgmap', entry["path"], + "Solaris' man cannot automatically inflate man pages." + "Solution: man page should be gunzipped.") def CheckMultipleDepends(pkg_data, error_mgr, logger, messenger): new_depends = set() --- End forwarded message --- -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From i.galic at brainsware.org Fri Jun 24 22:16:51 2011 From: i.galic at brainsware.org (Igor =?utf-8?Q?Gali=C4=87?=) Date: Fri, 24 Jun 2011 20:16:51 -0000 (UTC) Subject: [csw-devel] Making checkpkg work outside the build farm, one bug at a time. In-Reply-To: Message-ID: Hi folks, I'd like to divert some attention at the latest two bugs I filed against checkpkg: https://www.opencsw.org/mantis/view.php?id=4794 https://www.opencsw.org/mantis/view.php?id=4795 I hope I'm not seeming too blue-eyed here, but I'd really like to get checkpkg work: I think it's a very different kind of confidence for a package-developer to know his (first) submission won't be out right rejected for the most trivial of reasons (Which is probably why I haven't submitted my packages yet ;) So long, i -- Igor Gali? Tel: +43 (0) 664 886 22 883 Mail: i.galic at brainsware.org URL: http://brainsware.org/ From dmichelsen at users.sourceforge.net Fri Jun 24 22:33:56 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 24 Jun 2011 20:33:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14882] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 14882 http://gar.svn.sourceforge.net/gar/?rev=14882&view=rev Author: dmichelsen Date: 2011-06-24 20:33:56 +0000 (Fri, 24 Jun 2011) Log Message: ----------- ImageMagick: Update to 6.7.0-7, skip compiler runpath, work towards 64 bit, rename compare Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ImageMagick/trunk/files/0001-Do-not-strip-norunpath.patch Removed Paths: ------------- csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.i.tar.bz2 csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.s.tar.bz2 csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.i.tar.bz2 csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.s.tar.bz2 Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-06-24 17:33:03 UTC (rev 14881) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-06-24 20:33:56 UTC (rev 14882) @@ -1,6 +1,6 @@ NAME = imagemagick VERSION = 6.7.0 -GARSUBREV = 4 +GARSUBREV = 7 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -15,33 +15,12 @@ DISTNAME = ImageMagick-$(VERSION)-$(GARSUBREV) DISTFILES = $(DISTNAME).tar.xz +PATCHFILES += 0001-Do-not-strip-norunpath.patch + VENDOR_URL = http://www.imagemagick.org LICENSE = LICENSE -# Shared library suffix .10 has been used to mean "1.0" - -#PACKAGES += CSWlibmagick++10 -#PKGFILES_CSWlibmagick++10 += $(call pkgfiles_lib,libMagick++.so.10) -#SPKG_DESC_CSWlibmagick++10 += Library from ImageMagick, libMagick++.so.10 -#RUNTIME_DEP_PKGS_CSWlibmagick++10 += CSWlibwand10 -#RUNTIME_DEP_PKGS_CSWlibmagick++10 += CSWftype2 -#RUNTIME_DEP_PKGS_CSWlibmagick++10 += CSWlibmagick10 -#RUNTIME_DEP_PKGS_CSWlibmagick++10 += CSWsunmath -#RUNTIME_DEP_PKGS_CSWlibmagick++10 += CSWzlib - -#PACKAGES += CSWlibmagick++2 -#PKGFILES_CSWlibmagick++2 += $(call pkgfiles_lib,libMagick++.so.2) -#SPKG_DESC_CSWlibmagick++2 += Library from ImageMagick, libMagick++.so.2 -#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWlibmagickwand2 -#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWjpeg -#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWlcmsrt -#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWtiff -#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWzlib -#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWftype2 -#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWlibmagickcore2 -#RUNTIME_DEP_PKGS_CSWlibmagick++2 += CSWfconfig - PACKAGES += CSWlibmagick++4 PKGFILES_CSWlibmagick++4 += $(call pkgfiles_lib,libMagick++.so.4) SPKG_DESC_CSWlibmagick++4 += Library from ImageMagick, libMagick++.so.4 @@ -61,29 +40,6 @@ RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibfftw3-3 RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWliblzma5 - -#PACKAGES += CSWlibmagick10 -#PKGFILES_CSWlibmagick10 += $(call pkgfiles_lib,libMagick.so.10) -#SPKG_DESC_CSWlibmagick10 += Library from ImageMagick, libMagick.so.10 -#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWjpeg -#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWsunmath -#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWtiff -#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWzlib -#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWftype2 -#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWlcmsrt -#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWbzip2 -#RUNTIME_DEP_PKGS_CSWlibmagick10 += CSWfconfig - -#PACKAGES += CSWlibmagickcore2 -#PKGFILES_CSWlibmagickcore2 += $(call pkgfiles_lib,libMagickCore.so.2) -#SPKG_DESC_CSWlibmagickcore2 += Library from ImageMagick, libMagickCore.so.2 -#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWjpeg -#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWlcmsrt -#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWtiff -#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWzlib -#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWftype2 -#RUNTIME_DEP_PKGS_CSWlibmagickcore2 += CSWfconfig - PACKAGES += CSWlibmagickcore4 PKGFILES_CSWlibmagickcore4 += $(call pkgfiles_lib,libMagickCore.so.4) SPKG_DESC_CSWlibmagickcore4 += Library from ImageMagick, libMagickCore.so.4 @@ -104,17 +60,6 @@ # XXX: Is this correct? CHECKPKG_OVERRIDES_CSWlibmagickcore4 += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore.so.4.0.1 -#PACKAGES += CSWlibmagickwand2 -#PKGFILES_CSWlibmagickwand2 += $(call pkgfiles_lib,libMagickWand.so.2) -#SPKG_DESC_CSWlibmagickwand2 += Library from ImageMagick, libMagickWand.so.2 -#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWjpeg -#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWlcmsrt -#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWtiff -#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWzlib -#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWftype2 -#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWlibmagickcore2 -#RUNTIME_DEP_PKGS_CSWlibmagickwand2 += CSWfconfig - PACKAGES += CSWlibmagickwand4 PKGFILES_CSWlibmagickwand4 += $(call pkgfiles_lib,libMagickWand.so.4) SPKG_DESC_CSWlibmagickwand4 += Library from ImageMagick, libMagickWand.so.4 @@ -133,14 +78,6 @@ RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibfftw3-3 RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWliblzma5 -#PACKAGES += CSWlibwand10 -#PKGFILES_CSWlibwand10 += $(call pkgfiles_lib,libWand.so.10) -#SPKG_DESC_CSWlibwand10 += Library from ImageMagick, libWand.so.10 -#RUNTIME_DEP_PKGS_CSWlibwand10 += CSWftype2 -#RUNTIME_DEP_PKGS_CSWlibwand10 += CSWsunmath -#RUNTIME_DEP_PKGS_CSWlibwand10 += CSWlibmagick10 -#RUNTIME_DEP_PKGS_CSWlibwand10 += CSWzlib - PACKAGES += CSWimagemagick-dev SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries PKGFILES_CSWimagemagick-dev += $(PKGFILES_DEVEL) @@ -207,14 +144,20 @@ EXTRA_LINKER_FLAGS = -norunpath # Somehow the above flag does not make it to the linker -CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/lib|opt/csw/lib/libMagick++.so.4.0.1 -CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libMagick++.so.4.0.1 -CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libMagick++.so.4.0.1 -CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.4.0.1 +#CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/lib|opt/csw/lib/libMagick++.so.4.0.1 +#CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libMagick++.so.4.0.1 +#CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libMagick++.so.4.0.1 +#CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.4.0.1 +# This is for libdps, skipping this line makes the following tests fail: +# FAIL: tests/validate-formats-on-disk.sh +# FAIL: Magick++/tests/coderInfo.sh +EXTRA_LIB = /usr/openwin/lib + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-perl=$(bindir)/perl CONFIGURE_ARGS += --enable-shared --disable-static +CONFIGURE_ARGS += --enable-hdri CONFIGURE_ARGS += --with-dps=yes # Ghostscript lib is linked to Sun X11 # CONFIGURE_ARGS += --with-gslib=no @@ -229,9 +172,6 @@ CONFIGURE_ARGS-64 += --without-gvc CONFIGURE_ARGS-64 += --without-rsvg CONFIGURE_ARGS-64 += --without-perl -CONFIGURE_ARGS-64 += --without-gvc -CONFIGURE_ARGS-64 += --without-rsvg -CONFIGURE_ARGS-64 += --without-perl CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) # One test is failing: @@ -243,11 +183,9 @@ # Dependencies not 64-bit yet #BUILD64 = 1 -# This is for coders/dps.so to find libdps.so.5 and libdpstk.so.5 -# EXTRA_LIB = /usr/openwin/lib # Is this really a problem? -CHECKPKG_OVERRIDES_CSWimagemagick += soname-not-found|libdps.so.5|is|needed|by|opt/csw/lib/ImageMagick-6.7.0/modules-Q16/coders/dps.so -CHECKPKG_OVERRIDES_CSWimagemagick += soname-not-found|libdpstk.so.5|is|needed|by|opt/csw/lib/ImageMagick-6.7.0/modules-Q16/coders/dps.so +#CHECKPKG_OVERRIDES_CSWimagemagick += soname-not-found|libdps.so.5|is|needed|by|opt/csw/lib/ImageMagick-6.7.0/modules-Q16/coders/dps.so +#CHECKPKG_OVERRIDES_CSWimagemagick += soname-not-found|libdpstk.so.5|is|needed|by|opt/csw/lib/ImageMagick-6.7.0/modules-Q16/coders/dps.so # Only remove libtool files from the public lib directory, keep the private ones for libtool dlopn MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la @@ -255,27 +193,14 @@ EXTRA_MERGE_EXCLUDE_FILES += .*/perllocal.pod EXTRA_MERGE_EXCLUDE_FILES += .*/\.packlist +EXTRA_PAX_ARGS = -s ',$(bindir)/compare,$(bindir)/compare-imagemagick,' + STRIP_LIBTOOL = 1 - include gar/category.mk SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV) -#post-install-isa-sparcv8: -# @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.2.9.s.tar.bz2 |tar xf -) -# @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.5.2.s.tar.bz2 |tar xf -) -# @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 -# @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 -# @$(MAKECOOKIE) -# -#post-install-isa-i386: -# @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.2.9.i.tar.bz2 |tar xf -) -# @( cd $(INSTALLISADIR)$(libdir) ; bzip2 -dc $(CURDIR)/$(FILEDIR)/6.5.2.i.tar.bz2 |tar xf -) -# @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 -# @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 -# @$(MAKECOOKIE) - post-install-modulated: perl -pi \ -e 's,/usr/local/bin,$(bindir),g' \ Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2011-06-24 17:33:03 UTC (rev 14881) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2011-06-24 20:33:56 UTC (rev 14882) @@ -1 +1 @@ -90a0fdff3ef323314a3470a0d355d6ca ImageMagick-6.7.0-4.tar.xz +b4fbc24494b6bcbb5b8b6b75077f46b8 ImageMagick-6.7.0-7.tar.xz Added: csw/mgar/pkg/ImageMagick/trunk/files/0001-Do-not-strip-norunpath.patch =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/files/0001-Do-not-strip-norunpath.patch (rev 0) +++ csw/mgar/pkg/ImageMagick/trunk/files/0001-Do-not-strip-norunpath.patch 2011-06-24 20:33:56 UTC (rev 14882) @@ -0,0 +1,25 @@ +From f3557e6124bf881179fe8c81857c057692eb866e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 15 Jun 2011 10:13:53 +0200 +Subject: [PATCH] Do not strip -norunpath + +--- + config/ltmain.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/config/ltmain.sh b/config/ltmain.sh +index 78cf017..2e947f8 100755 +--- a/config/ltmain.sh ++++ b/config/ltmain.sh +@@ -5840,7 +5840,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-norunpath) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +-- +1.7.5.4 + Deleted: csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.i.tar.bz2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/trunk/files/6.2.9.s.tar.bz2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.i.tar.bz2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ImageMagick/trunk/files/6.5.2.s.tar.bz2 =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Sat Jun 25 01:01:29 2011 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 24 Jun 2011 19:01:29 -0400 Subject: [csw-devel] Fwd: Re: Making checkpkg work outside the build farm, one bug at a time. Message-ID: <1308956465-sup-4076@pinkfloyd.chass.utoronto.ca> My mail client picked the wrong address on this reply...(and then I didn't notice). Thanks -Ben --- Begin forwarded message from Ben Walton --- From: Ben Walton To: Igor Gali? Cc: devel Date: Fri, 24 Jun 2011 19:00:08 -0400 Subject: Re: [csw-devel] Making checkpkg work outside the build farm, one bug at a time. Excerpts from Igor Gali?'s message of Fri Jun 24 20:16:51 UTC 2011: Hi Igor, > I'd like to divert some attention at the latest two > bugs I filed against checkpkg: > https://www.opencsw.org/mantis/view.php?id=4794 > https://www.opencsw.org/mantis/view.php?id=4795 Will do! It's good to see new people poking at this. > I hope I'm not seeming too blue-eyed here, but I'd really like to > get checkpkg work: I think it's a very different kind of confidence > for a package-developer to know his (first) submission won't be out > right rejected for the most trivial of reasons (Which is probably > why I haven't submitted my packages yet ;) You could also request a buildfarm account (mail board@) and build there too? That being said, getting this working off-farm is a good thing too. Thanks -Ben --- End forwarded message --- -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bonivart at users.sourceforge.net Sat Jun 25 11:25:01 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 25 Jun 2011 09:25:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14883] csw/mgar/pkg/clamavsigs/trunk Message-ID: Revision: 14883 http://gar.svn.sourceforge.net/gar/?rev=14883&view=rev Author: bonivart Date: 2011-06-25 09:25:00 +0000 (Sat, 25 Jun 2011) Log Message: ----------- clamavsigs/trunk: respin to clean up deps Modified Paths: -------------- csw/mgar/pkg/clamavsigs/trunk/Makefile csw/mgar/pkg/clamavsigs/trunk/checksums Modified: csw/mgar/pkg/clamavsigs/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamavsigs/trunk/Makefile 2011-06-24 20:33:56 UTC (rev 14882) +++ csw/mgar/pkg/clamavsigs/trunk/Makefile 2011-06-25 09:25:00 UTC (rev 14883) @@ -10,8 +10,9 @@ endef MASTER_SITES = http://www.inetmsg.com/pub/ -DISTFILES = clamav-unofficial-sigs-$(VERSION).tar.gz -PATCHFILES = 0001-use-ksh-instead-of-sh-on-solaris.patch +DISTFILES = clamav-unofficial-sigs-$(VERSION).tar.gz + +PATCHFILES = 0001-use-ksh-instead-of-sh-on-solaris.patch PATCHFILES += 0002-make-defaults-match-csw-clamav.patch LICENSE = LICENSE @@ -19,22 +20,22 @@ RUNTIME_DEP_PKGS = CSWgnupg CSWrsync CSWcurl CSWsocat -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWrsync CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWgnupg CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWsocat CHECKPKG_OVERRIDES_CSWclamavsigs += surplus-dependency|CSWcurl +CHECKPKG_OVERRIDES_CSWclamavsigs += file-with-bad-content|/usr/local|root/etc/opt/csw/clamav-unofficial-sigs.conf.CSW +CHECKPKG_OVERRIDES_CSWclamavsigs += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamavsigs/CHANGELOG +CHECKPKG_OVERRIDES_CSWclamavsigs += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamavsigs/INSTALL CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -TEST_SCRIPTS = -INSTALL_SCRIPTS = custom +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom SAMPLECONF = /etc/opt/csw/clamav-unofficial-sigs.conf -POSTMSG = /opt/csw/share/doc/clamavsigs/README.CSW -CRONTABS = /etc/opt/csw/pkg/CSWclamavsigs/crontabs/root +POSTMSG = /opt/csw/share/doc/clamavsigs/README.CSW +CRONTABS = /etc/opt/csw/pkg/CSWclamavsigs/crontabs/root include gar/category.mk Modified: csw/mgar/pkg/clamavsigs/trunk/checksums =================================================================== --- csw/mgar/pkg/clamavsigs/trunk/checksums 2011-06-24 20:33:56 UTC (rev 14882) +++ csw/mgar/pkg/clamavsigs/trunk/checksums 2011-06-25 09:25:00 UTC (rev 14883) @@ -1,3 +1 @@ -94eb4d03fefa038bc05c404e631464f4 0001-use-ksh-instead-of-sh-on-solaris.patch -e5ec9ce29aab113c74ad01d11fd774a0 0002-make-defaults-match-csw-clamav.patch c00f38cd0ff51672e3cbb638aec8d124 clamav-unofficial-sigs-3.7.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Jun 25 11:50:48 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 25 Jun 2011 09:50:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14884] csw/mgar/pkg/namebench/trunk/Makefile Message-ID: Revision: 14884 http://gar.svn.sourceforge.net/gar/?rev=14884&view=rev Author: bonivart Date: 2011-06-25 09:50:47 +0000 (Sat, 25 Jun 2011) Log Message: ----------- namebench/trunk: respin to clean up deps Modified Paths: -------------- csw/mgar/pkg/namebench/trunk/Makefile Modified: csw/mgar/pkg/namebench/trunk/Makefile =================================================================== --- csw/mgar/pkg/namebench/trunk/Makefile 2011-06-25 09:25:00 UTC (rev 14883) +++ csw/mgar/pkg/namebench/trunk/Makefile 2011-06-25 09:50:47 UTC (rev 14884) @@ -10,13 +10,14 @@ MASTER_SITES = http://namebench.googlecode.com/files/ DISTFILES = $(NAME)-$(VERSION)-source.tgz +LICENSE = COPYING + +PACKAGES = CSWnamebench +CATALOGNAME = namebench SPKG_SOURCEURL = http://code.google.com/p/namebench RUNTIME_DEP_PKGS = CSWpython-tk -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz - ARCHALL = 1 TEST_SCRIPTS = @@ -24,5 +25,8 @@ CHECKPKG_OVERRIDES_CSWnamebench += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWnamebench += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWnamebench += surplus-dependency|CSWpython-tk +CHECKPKG_OVERRIDES_CSWnamebench += file-with-bad-content|/usr/local|root/opt/csw/namebench/config/data_sources.cfg +CHECKPKG_OVERRIDES_CSWnamebench += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/libnamebench/util.py +CHECKPKG_OVERRIDES_CSWnamebench += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/libnamebench/util.py include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jun 25 11:52:06 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 25 Jun 2011 09:52:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[14885] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14885 http://gar.svn.sourceforge.net/gar/?rev=14885&view=rev Author: wahwah Date: 2011-06-25 09:52:06 +0000 (Sat, 25 Jun 2011) Log Message: ----------- pkgdb: Bugfix for pkgname->catalogname mapping For the purpose of /var/sadm/install/contents file indexing, fake package objects need to be created. It was possible that two different pkgnames were mapped to one catalogname, which caused a catalogname conflict. This patch removes one problem, when the only difference between two pkgnames is a number. Patch by Igor Gali?\196?\135. Signed-off-by: Maciej Blizi?\197?\132ski Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/opencsw_test.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2011-06-25 09:50:47 UTC (rev 14884) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2011-06-25 09:52:06 UTC (rev 14885) @@ -484,7 +484,7 @@ casechange = [False] + [x != y for x, y in neighbors] str_list = [(cc * "_") + l.lower() for l, cc in zip(s, casechange)] s2 = "".join(str_list) - return re.findall(r"[a-z]+", s2) + return re.findall(r"[a-z0-9]+", s2) def CatalogNameGroupName(catalogname_list): Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2011-06-25 09:50:47 UTC (rev 14884) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2011-06-25 09:52:06 UTC (rev 14885) @@ -399,6 +399,10 @@ self.assertEquals("stuf_with_some_dashes", opencsw.PkgnameToCatName("STUFwith-some-dashes")) + def testPkgnameToCatName5(self): + self.assertNotEquals(opencsw.PkgnameToCatName("SUNWi4rf"), + opencsw.PkgnameToCatName("SUNWi7rf")) + def test_4(self): pkginfo_dict = opencsw.ParsePkginfo(TEST_PKGINFO.splitlines()) expected = "sunw_bash-11.10.0,REV=2005.01.08.01.09-SunOS5.10-i386-SUNW.pkg" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Jun 25 12:01:22 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 25 Jun 2011 10:01:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[14886] csw/mgar/pkg/phpsysinfo/trunk Message-ID: Revision: 14886 http://gar.svn.sourceforge.net/gar/?rev=14886&view=rev Author: bonivart Date: 2011-06-25 10:01:21 +0000 (Sat, 25 Jun 2011) Log Message: ----------- phpsysinfo/trunk: respin to clean up deps Modified Paths: -------------- csw/mgar/pkg/phpsysinfo/trunk/Makefile csw/mgar/pkg/phpsysinfo/trunk/checksums Modified: csw/mgar/pkg/phpsysinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpsysinfo/trunk/Makefile 2011-06-25 09:52:06 UTC (rev 14885) +++ csw/mgar/pkg/phpsysinfo/trunk/Makefile 2011-06-25 10:01:21 UTC (rev 14886) @@ -1,5 +1,5 @@ NAME = phpsysinfo -VERSION = 3.0.4 +VERSION = 3.0.11 CATEGORIES = utils DESCRIPTION = Displays information about the host being accessed @@ -18,9 +18,6 @@ RUNTIME_DEP_PKGS = CSWapache2 CSWap2modphp5 CSWphp5 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - ARCHALL = 1 CONFIGURE_SCRIPTS = @@ -35,6 +32,7 @@ CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWphp5 CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWap2modphp5 CHECKPKG_OVERRIDES_CSWphpsysinfo += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWphpsysinfo += file-with-bad-content|/usr/local|root/opt/csw/share/www/phpsysinfo/includes/class.CommonFunctions.inc.php include gar/category.mk Modified: csw/mgar/pkg/phpsysinfo/trunk/checksums =================================================================== --- csw/mgar/pkg/phpsysinfo/trunk/checksums 2011-06-25 09:52:06 UTC (rev 14885) +++ csw/mgar/pkg/phpsysinfo/trunk/checksums 2011-06-25 10:01:21 UTC (rev 14886) @@ -1 +1 @@ -a9a3819dec3a91b802ffb871a02704a1 phpsysinfo-3.0.4.tar.gz +e07b4bc9da80466bee9bf9ee4bea727b phpsysinfo-3.0.11.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Jun 25 12:15:25 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 25 Jun 2011 10:15:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14887] csw/mgar/pkg/qpopper/trunk Message-ID: Revision: 14887 http://gar.svn.sourceforge.net/gar/?rev=14887&view=rev Author: bonivart Date: 2011-06-25 10:15:25 +0000 (Sat, 25 Jun 2011) Log Message: ----------- qpopper/trunk: update to 4.1.0, respin to clean up deps Modified Paths: -------------- csw/mgar/pkg/qpopper/trunk/Makefile csw/mgar/pkg/qpopper/trunk/checksums csw/mgar/pkg/qpopper/trunk/files/README.CSW Modified: csw/mgar/pkg/qpopper/trunk/Makefile =================================================================== --- csw/mgar/pkg/qpopper/trunk/Makefile 2011-06-25 10:01:21 UTC (rev 14886) +++ csw/mgar/pkg/qpopper/trunk/Makefile 2011-06-25 10:15:25 UTC (rev 14887) @@ -1,5 +1,5 @@ NAME = qpopper -VERSION = 4.0.19 +VERSION = 4.1.0 WORKSRC = $(WORKDIR)/$(NAME)$(VERSION) CATEGORIES = apps @@ -15,9 +15,6 @@ DISTFILES = $(NAME)$(VERSION).tar.gz DISTFILES += README.CSW -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)(\d+(?:\.\d+)*).tar.gz - PACKAGES = CSWqpopper CATALOGNAME_CSWqpopper = qpopper SPKG_DESC_CSWqpopper = $(DESCRIPTION) @@ -29,8 +26,11 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-specialauth +TEST_SCRIPTS = INSTALL_SCRIPTS = custom +CHECKPKG_OVERRIDES_CSWqpopper += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/popper.8 + include gar/category.mk install-custom: Modified: csw/mgar/pkg/qpopper/trunk/checksums =================================================================== --- csw/mgar/pkg/qpopper/trunk/checksums 2011-06-25 10:01:21 UTC (rev 14886) +++ csw/mgar/pkg/qpopper/trunk/checksums 2011-06-25 10:15:25 UTC (rev 14887) @@ -1,2 +1 @@ -26d16c0e628390b36a49fa459e252db8 README.CSW -91059c5cc320df8267eac1b9c27ff3ea qpopper4.0.19.tar.gz +3b62b70fbcd16bb17795e1762dd33765 qpopper4.1.0.tar.gz Modified: csw/mgar/pkg/qpopper/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/qpopper/trunk/files/README.CSW 2011-06-25 10:01:21 UTC (rev 14886) +++ csw/mgar/pkg/qpopper/trunk/files/README.CSW 2011-06-25 10:15:25 UTC (rev 14887) @@ -1,6 +1,9 @@ README.CSW ========== +The description below is for manual installation, the inetd configuration +should now be handled automatically. + Installation ------------ 1. Add two lines to /etc/inetd.conf: @@ -25,4 +28,4 @@ controlled by SMF. -bonivart/071009 +bonivart/110625 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jun 25 12:46:12 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 25 Jun 2011 10:46:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14888] csw/mgar/gar/v2/doc/upload-application Message-ID: Revision: 14888 http://gar.svn.sourceforge.net/gar/?rev=14888&view=rev Author: wahwah Date: 2011-06-25 10:46:12 +0000 (Sat, 25 Jun 2011) Log Message: ----------- gar/v2/doc/upload-application: mime types Property Changed: ---------------- csw/mgar/gar/v2/doc/upload-application/opencsw-upload-process-application.html csw/mgar/gar/v2/doc/upload-application/upload-process.svg Property changes on: csw/mgar/gar/v2/doc/upload-application/opencsw-upload-process-application.html ___________________________________________________________________ Added: svn:mime-type + text/html Property changes on: csw/mgar/gar/v2/doc/upload-application/upload-process.svg ___________________________________________________________________ Added: svn:mime-type + image/svg+xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Jun 25 14:07:36 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 25 Jun 2011 12:07:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14889] csw/mgar/pkg/phpsysinfo/trunk/Makefile Message-ID: Revision: 14889 http://gar.svn.sourceforge.net/gar/?rev=14889&view=rev Author: bonivart Date: 2011-06-25 12:07:36 +0000 (Sat, 25 Jun 2011) Log Message: ----------- phpsysinfo/trunk: add mbstring dep Modified Paths: -------------- csw/mgar/pkg/phpsysinfo/trunk/Makefile Modified: csw/mgar/pkg/phpsysinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpsysinfo/trunk/Makefile 2011-06-25 10:46:12 UTC (rev 14888) +++ csw/mgar/pkg/phpsysinfo/trunk/Makefile 2011-06-25 12:07:36 UTC (rev 14889) @@ -16,7 +16,10 @@ SPKG_DESC = $(DESCRIPTION) SPKG_SOURCEURL = http://phpsysinfo.sourceforge.net -RUNTIME_DEP_PKGS = CSWapache2 CSWap2modphp5 CSWphp5 +RUNTIME_DEP_PKGS = CSWapache2 +RUNTIME_DEP_PKGS += CSWap2modphp5 +RUNTIME_DEP_PKGS += CSWphp5 +RUNTIME_DEP_PKGS += CSWphp5-mbstring ARCHALL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Jun 25 16:15:00 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 25 Jun 2011 14:15:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14890] csw/mgar/pkg/template/trunk/Makefile Message-ID: Revision: 14890 http://gar.svn.sourceforge.net/gar/?rev=14890&view=rev Author: bonivart Date: 2011-06-25 14:15:00 +0000 (Sat, 25 Jun 2011) Log Message: ----------- fix typo Modified Paths: -------------- csw/mgar/pkg/template/trunk/Makefile Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2011-06-25 12:07:36 UTC (rev 14889) +++ csw/mgar/pkg/template/trunk/Makefile 2011-06-25 14:15:00 UTC (rev 14890) @@ -82,7 +82,7 @@ ## INCOMPATIBLE_PKGS = ## ## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details +## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRight for details ## on including and displaying licenses. ## LICENSE = ## This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jun 25 18:37:07 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 25 Jun 2011 16:37:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[14891] csw/mgar/pkg/nspr/trunk Message-ID: Revision: 14891 http://gar.svn.sourceforge.net/gar/?rev=14891&view=rev Author: wahwah Date: 2011-06-25 16:37:07 +0000 (Sat, 25 Jun 2011) Log Message: ----------- pkg/nspr/trunk: Update to 4.8.7, 4.8.8 doesn't build. Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile csw/mgar/pkg/nspr/trunk/checksums Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2011-06-25 14:15:00 UTC (rev 14890) +++ csw/mgar/pkg/nspr/trunk/Makefile 2011-06-25 16:37:07 UTC (rev 14891) @@ -8,7 +8,7 @@ NAME = nspr MAJOR_VERSION = 4 -MIN_VERSION = 8.6 +MIN_VERSION = 8.7 VERSION = $(MAJOR_VERSION).$(MIN_VERSION) CATEGORIES = lib @@ -23,33 +23,42 @@ DISTFILES += LICENSE PATCHFILES = nspr-4.6.1-config.patch -PACKAGES += CSWnspr -PACKAGES += CSWnspr-devel -PACKAGES += CSWlibnspr4-devel +PACKAGES = CSWnspr-dev +CATALOGNAME_CSWnspr-dev = nspr_dev +SPKG_DESC_CSWnspr-dev = Netscape Portable Runtime, header files +PKGFILES_CSWnspr-dev += $(prefix)/include.* +PKGFILES_CSWnspr-dev += $(bindir).*nspr-config +PKGFILES_CSWnspr-dev += .*/nspr\.pc +PKGFILES_CSWnspr-dev += .*compile-et\.pl +RUNTIME_DEP_PKGS_CSWnspr-dev = CSWlibnspr4 +RUNTIME_DEP_PKGS_CSWnspr-dev += CSWperl +OBSOLETED_BY_CSWnspr-dev = CSWnspr-devel + +# Library splits + PACKAGES += CSWlibnspr4 -PKGFILES_CSWlibnspr4-devel += $(PKGFILES_DEVEL) -PKGFILES_CSWlibnspr4-devel += $(bindir).*nspr-config -PKGFILES_CSWlibnspr4-devel += .*/nspr\.pc -PKGFILES_CSWlibnspr4-devel += .*compile-et\.pl -PKGFILES_CSWnspr = Invisible-Pink-Unicorn -PKGFILES_CSWnspr-devel = Flying-Spaghetti-Monster +CATALOGNAME_CSWlibnspr4 = libnspr4 +SPKG_DESC_CSWlibnspr4 = Netscape Portable Runtime, libnspr4.so +PKGFILES_CSWlibnspr4 += $(call baseisadirs,$(libdir),libnspr4.so) +OBSOLETED_BY_CSWlibnspr4 = CSWnspr +CHECKPKG_OVERRIDES_CSWlibnspr4 += soname-equals-filename -SPKG_DESC_CSWnspr = Empty, transitional package (CSWnspr) -SPKG_DESC_CSWnspr-devel = Empty, transitional package (CSWnspr-devel) -SPKG_DESC_CSWlibnspr4 = Netscape Portable Runtime -SPKG_DESC_CSWlibnspr4-devel = Netscape Portable Runtime, header files -CATALOGNAME_CSWnspr-devel = nspr_devel -CATALOGNAME_CSWlibnspr4-devel = libnspr4_devel -RUNTIME_DEP_PKGS_CSWnspr = CSWlibnspr4 -RUNTIME_DEP_PKGS_CSWnspr-devel = CSWlibnspr4-devel -RUNTIME_DEP_PKGS_CSWlibnspr4-devel = CSWlibnspr4 -RUNTIME_DEP_PKGS_CSWlibnspr4-devel += CSWperl -ARCHALL_CSWnspr = 1 +PACKAGES += CSWlibplc4 +CATALOGNAME_CSWlibplc4 = libplc4 +SPKG_DESC_CSWlibplc4 = Netscape Portable Runtime, libplc4.so +PKGFILES_CSWlibplc4 += $(call baseisadirs,$(libdir),libplc4.so) +RUNTIME_DEP_PKGS_CSWlibplc4 += CSWlibnspr4 +CHECKPKG_OVERRIDES_CSWlibplc4 += soname-equals-filename -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWlibnspr-flt4 +CATALOGNAME_CSWlibnspr-flt4 = libnspr_flt4 +SPKG_DESC_CSWlibnspr-flt4 = Netscape Portable Runtime, libnspr-flt4.so +PKGFILES_CSWlibnspr-flt4 += $(libdir).*/libnspr_flt4\.so +CHECKPKG_OVERRIDES_CSWlibnspr-flt4 += soname-equals-filename PERL = /opt/csw/bin/perl + CONFIGURE_SCRIPTS = nspr BUILD_SCRIPTS = nspr # TEST_SCRIPTS = nspr @@ -80,16 +89,10 @@ LICENSE = LICENSE -# Checkpkg suggests CSWlibp (the longest common substring), but we want the -# three libraries to be in one package. -CHECKPKG_OVERRIDES_CSWlibnspr4 += shared-lib-pkgname-mismatch +# # Checkpkg suggests CSWlibp (the longest common substring), but we want the +# # three libraries to be in one package. +# CHECKPKG_OVERRIDES_CSWlibnspr4 += shared-lib-pkgname-mismatch -CHECKPKG_OVERRIDES_CSWlibnspr4-devel += surplus-dependency|CSWlibnspr4 - -# For transitional packages -CHECKPKG_OVERRIDES_CSWnspr += surplus-dependency|CSWlibnspr4 -CHECKPKG_OVERRIDES_CSWnspr-devel += surplus-dependency|CSWlibnspr4-devel - include gar/category.mk configure-nspr: Modified: csw/mgar/pkg/nspr/trunk/checksums =================================================================== --- csw/mgar/pkg/nspr/trunk/checksums 2011-06-25 14:15:00 UTC (rev 14890) +++ csw/mgar/pkg/nspr/trunk/checksums 2011-06-25 16:37:07 UTC (rev 14891) @@ -1 +1 @@ -592c275728c29d193fdba8009165990b nspr-4.8.6.tar.gz +97e30989a56ab813453b71261849c200 nspr-4.8.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Jun 25 19:13:42 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 25 Jun 2011 17:13:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14892] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14892 http://gar.svn.sourceforge.net/gar/?rev=14892&view=rev Author: bdwalton Date: 2011-06-25 17:13:41 +0000 (Sat, 25 Jun 2011) Log Message: ----------- php5/trunk: move a few symlinks in bin to the -dev package Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-06-25 16:37:07 UTC (rev 14891) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-06-25 17:13:41 UTC (rev 14892) @@ -102,8 +102,10 @@ RUNTIME_DEP_PKGS_CSWphp5-dev = CSWphp5 OBSOLETED_BY_CSWphp5-dev = CSWphp5devel PKGFILES_CSWphp5-dev = $(prefix)/php5/bin/php-config +PKGFILES_CSWphp5-dev = $(prefix)/bin/php-config PKGFILES_CSWphp5-dev += $(prefix)/php5/bin/phpize PKGFILES_CSWphp5-dev += $(prefix)/php5/bin/peardev +PKGFILES_CSWphp5-dev += $(prefix)/bin/peardev PKGFILES_CSWphp5-dev += $(prefix)/php5/lib/php/build/.* PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/TSRM.* PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/Zend.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jun 25 19:20:59 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 25 Jun 2011 17:20:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[14893] csw/mgar/pkg/libffi/trunk Message-ID: Revision: 14893 http://gar.svn.sourceforge.net/gar/?rev=14893&view=rev Author: wahwah Date: 2011-06-25 17:20:59 +0000 (Sat, 25 Jun 2011) Log Message: ----------- set -L to libdir/ffi Modified Paths: -------------- csw/mgar/pkg/libffi/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libffi/trunk/files/0006-Set-libdir-to-opt-csw-lib-ffi.patch Modified: csw/mgar/pkg/libffi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libffi/trunk/Makefile 2011-06-25 17:13:41 UTC (rev 14892) +++ csw/mgar/pkg/libffi/trunk/Makefile 2011-06-25 17:20:59 UTC (rev 14893) @@ -28,9 +28,11 @@ # originally for icc, but at least get the stuff to compile PATCHFILES += ffi64.c.patch PATCHFILES += 0005-libffi.pc-should-point-at-opt-csw-include.patch +PATCHFILES += 0006-Set-libdir-to-opt-csw-lib-ffi.patch OBSOLETED_BY_CSWlibffi5 = CSWlibffi OBSOLETED_BY_CSWlibffi5-dev = CSWlibffi +INCOMPATIBLE_PKGS_CSWlibffi5 = CSWlibffi PACKAGES += CSWlibffi-dev CATALOGNAME_CSWlibffi-dev = libffi_dev Added: csw/mgar/pkg/libffi/trunk/files/0006-Set-libdir-to-opt-csw-lib-ffi.patch =================================================================== --- csw/mgar/pkg/libffi/trunk/files/0006-Set-libdir-to-opt-csw-lib-ffi.patch (rev 0) +++ csw/mgar/pkg/libffi/trunk/files/0006-Set-libdir-to-opt-csw-lib-ffi.patch 2011-06-25 17:20:59 UTC (rev 14893) @@ -0,0 +1,23 @@ +From 003977c00c9523f4a3a913b40b1460eb718b5d0e Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 25 Jun 2011 19:18:48 +0200 +Subject: [PATCH] Set libdir to /opt/csw/lib/ffi. + +--- + libffi.pc.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libffi.pc.in b/libffi.pc.in +index 692296d..88391dc 100644 +--- a/libffi.pc.in ++++ b/libffi.pc.in +@@ -6,5 +6,5 @@ includedir=${prefix}/include + Name: @PACKAGE_NAME@ + Description: Library supporting Foreign Function Interfaces + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lffi ++Libs: -L${libdir}/ffi -lffi + Cflags: -I${includedir} +-- +1.7.5.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jun 25 19:25:58 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 25 Jun 2011 17:25:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[14894] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 14894 http://gar.svn.sourceforge.net/gar/?rev=14894&view=rev Author: wahwah Date: 2011-06-25 17:25:58 +0000 (Sat, 25 Jun 2011) Log Message: ----------- add libplds4, deprecate mozilla and sunbird Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2011-06-25 17:20:59 UTC (rev 14893) +++ csw/mgar/pkg/nspr/trunk/Makefile 2011-06-25 17:25:58 UTC (rev 14894) @@ -26,13 +26,17 @@ PACKAGES = CSWnspr-dev CATALOGNAME_CSWnspr-dev = nspr_dev SPKG_DESC_CSWnspr-dev = Netscape Portable Runtime, header files -PKGFILES_CSWnspr-dev += $(prefix)/include.* -PKGFILES_CSWnspr-dev += $(bindir).*nspr-config -PKGFILES_CSWnspr-dev += .*/nspr\.pc -PKGFILES_CSWnspr-dev += .*compile-et\.pl +# PKGFILES_CSWnspr-dev += $(prefix)/include.* +# PKGFILES_CSWnspr-dev += $(bindir).*nspr-config +# PKGFILES_CSWnspr-dev += .*/nspr\.pc +# PKGFILES_CSWnspr-dev += .*compile-et\.pl RUNTIME_DEP_PKGS_CSWnspr-dev = CSWlibnspr4 RUNTIME_DEP_PKGS_CSWnspr-dev += CSWperl OBSOLETED_BY_CSWnspr-dev = CSWnspr-devel +OBSOLETED_BY_CSWnspr-dev += CSWmozilla +OBSOLETED_BY_CSWnspr-dev += CSWsunbird +INCOMPATIBLE_PKGS_CSWnspr-dev = CSWmozilla +INCOMPATIBLE_PKGS_CSWnspr-dev += CSWsunbird # Library splits @@ -50,6 +54,13 @@ RUNTIME_DEP_PKGS_CSWlibplc4 += CSWlibnspr4 CHECKPKG_OVERRIDES_CSWlibplc4 += soname-equals-filename +PACKAGES += CSWlibplds4 +CATALOGNAME_CSWlibplds4 = libplds4 +SPKG_DESC_CSWlibplds4 = Netscape Portable Runtime, libplds4.so +PKGFILES_CSWlibplds4 += $(call baseisadirs,$(libdir),libplds4.so) +RUNTIME_DEP_PKGS_CSWlibplds4 += CSWlibnspr4 +CHECKPKG_OVERRIDES_CSWlibplds4 += soname-equals-filename + PACKAGES += CSWlibnspr-flt4 CATALOGNAME_CSWlibnspr-flt4 = libnspr_flt4 SPKG_DESC_CSWlibnspr-flt4 = Netscape Portable Runtime, libnspr-flt4.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Jun 25 22:43:23 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 25 Jun 2011 20:43:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14895] csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/ Makefile Message-ID: Revision: 14895 http://gar.svn.sourceforge.net/gar/?rev=14895&view=rev Author: wbonnet Date: 2011-06-25 20:43:22 +0000 (Sat, 25 Jun 2011) Log Message: ----------- Upgrade to 1.11 Modified Paths: -------------- csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/Makefile Modified: csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/Makefile 2011-06-25 17:25:58 UTC (rev 14894) +++ csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/Makefile 2011-06-25 20:43:22 UTC (rev 14895) @@ -19,4 +19,6 @@ ARCHALL = 1 +CHECKPKG_OVERRIDES_CSWpmxmlnssupp += catalogname-does-not-match-pkgname|pkgname=CSWpmxmlnssupp|catalogname=pm_xmlnssupp|expected-catalogname=pmxmlnssupp + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Jun 25 23:03:57 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 25 Jun 2011 21:03:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14896] csw/mgar/pkg/cpan/Text-Glob/trunk Message-ID: Revision: 14896 http://gar.svn.sourceforge.net/gar/?rev=14896&view=rev Author: wbonnet Date: 2011-06-25 21:03:57 +0000 (Sat, 25 Jun 2011) Log Message: ----------- Upgrade to 0.09 Modified Paths: -------------- csw/mgar/pkg/cpan/Text-Glob/trunk/Makefile csw/mgar/pkg/cpan/Text-Glob/trunk/checksums Modified: csw/mgar/pkg/cpan/Text-Glob/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-Glob/trunk/Makefile 2011-06-25 20:43:22 UTC (rev 14895) +++ csw/mgar/pkg/cpan/Text-Glob/trunk/Makefile 2011-06-25 21:03:57 UTC (rev 14896) @@ -1,5 +1,5 @@ NAME = Text-Glob -VERSION = 0.08 +VERSION = 0.09 CATEGORIES = cpan AUTHOR = RCLAMP @@ -14,4 +14,6 @@ ARCHALL = 1 +CHECKPKG_OVERRIDES_CSWpmtextglob += catalogname-does-not-match-pkgname|pkgname=CSWpmtextglob|catalogname=pm_textglob|expected-catalogname=pmtextglob + include gar/category.mk Modified: csw/mgar/pkg/cpan/Text-Glob/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-Glob/trunk/checksums 2011-06-25 20:43:22 UTC (rev 14895) +++ csw/mgar/pkg/cpan/Text-Glob/trunk/checksums 2011-06-25 21:03:57 UTC (rev 14896) @@ -1 +1 @@ -39a1a3e890cd5d3f51a707579098bc1c Text-Glob-0.08.tar.gz +1daa10e087f891c49b720a5c551a024b Text-Glob-0.09.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Jun 25 23:11:33 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 25 Jun 2011 21:11:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14897] csw/mgar/pkg/cpan/Path-Class/trunk Message-ID: Revision: 14897 http://gar.svn.sourceforge.net/gar/?rev=14897&view=rev Author: wbonnet Date: 2011-06-25 21:11:32 +0000 (Sat, 25 Jun 2011) Log Message: ----------- Upgrade to 0.24 Modified Paths: -------------- csw/mgar/pkg/cpan/Path-Class/trunk/Makefile csw/mgar/pkg/cpan/Path-Class/trunk/checksums Modified: csw/mgar/pkg/cpan/Path-Class/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Path-Class/trunk/Makefile 2011-06-25 21:03:57 UTC (rev 14896) +++ csw/mgar/pkg/cpan/Path-Class/trunk/Makefile 2011-06-25 21:11:32 UTC (rev 14897) @@ -1,5 +1,5 @@ NAME = Path-Class -VERSION = 0.23 +VERSION = 0.24 CATEGORIES = cpan AUTHOR = KWILLIAMS @@ -26,6 +26,7 @@ CHECKPKG_OVERRIDES_CSWpmpathclass += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/Path::Class::Dir.3perl CHECKPKG_OVERRIDES_CSWpmpathclass += file-with-bad-content|/usr/local|root/opt/csw/share/perl/csw/Path/Class/File.pm CHECKPKG_OVERRIDES_CSWpmpathclass += file-with-bad-content|/usr/local|root/opt/csw/share/perl/csw/Path/Class/Dir.pm +CHECKPKG_OVERRIDES_CSWpmpathclass += catalogname-does-not-match-pkgname|pkgname=CSWpmpathclass|catalogname=pm_pathclass|expected-catalogname=pmpathclass include gar/category.mk Modified: csw/mgar/pkg/cpan/Path-Class/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Path-Class/trunk/checksums 2011-06-25 21:03:57 UTC (rev 14896) +++ csw/mgar/pkg/cpan/Path-Class/trunk/checksums 2011-06-25 21:11:32 UTC (rev 14897) @@ -1 +1 @@ -afff1b24d09674575d37c6a61e1e8b5a Path-Class-0.23.tar.gz +ea0fcec77c63d833a4296ce5b27a5bf2 Path-Class-0.24.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Jun 25 23:16:08 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 25 Jun 2011 21:16:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14898] csw/mgar/pkg/cpan/Object-Accessor/trunk Message-ID: Revision: 14898 http://gar.svn.sourceforge.net/gar/?rev=14898&view=rev Author: wbonnet Date: 2011-06-25 21:16:08 +0000 (Sat, 25 Jun 2011) Log Message: ----------- Upgrade to 0.42 Modified Paths: -------------- csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile csw/mgar/pkg/cpan/Object-Accessor/trunk/checksums Modified: csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile 2011-06-25 21:11:32 UTC (rev 14897) +++ csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile 2011-06-25 21:16:08 UTC (rev 14898) @@ -1,5 +1,5 @@ NAME = Object-Accessor -VERSION = 0.38 +VERSION = 0.42 CATEGORIES = cpan AUTHOR = BINGOS Modified: csw/mgar/pkg/cpan/Object-Accessor/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Object-Accessor/trunk/checksums 2011-06-25 21:11:32 UTC (rev 14897) +++ csw/mgar/pkg/cpan/Object-Accessor/trunk/checksums 2011-06-25 21:16:08 UTC (rev 14898) @@ -1 +1 @@ -7852cac814a2307d5a360b03b83370d7 Object-Accessor-0.38.tar.gz +86ee1ed688da062529d4373c39fa2a81 Object-Accessor-0.42.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Jun 25 23:19:23 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 25 Jun 2011 21:19:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14899] csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile Message-ID: Revision: 14899 http://gar.svn.sourceforge.net/gar/?rev=14899&view=rev Author: wbonnet Date: 2011-06-25 21:19:22 +0000 (Sat, 25 Jun 2011) Log Message: ----------- Upgrade to 0.42 Modified Paths: -------------- csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile Modified: csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile 2011-06-25 21:16:08 UTC (rev 14898) +++ csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile 2011-06-25 21:19:22 UTC (rev 14899) @@ -20,6 +20,8 @@ EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3\/.* .*\/man\/man1\/.* +CHECKPKG_OVERRIDES_CSWpmobjaccessor += catalogname-does-not-match-pkgname|pkgname=CSWpmobjaccessor|catalogname=pm_objaccessor|expected-catalogname=pmobjaccessor + include gar/category.mk post-extract: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Jun 25 23:26:53 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 25 Jun 2011 21:26:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[14900] csw/mgar/pkg/cpan/FCGI/trunk Message-ID: Revision: 14900 http://gar.svn.sourceforge.net/gar/?rev=14900&view=rev Author: wbonnet Date: 2011-06-25 21:26:52 +0000 (Sat, 25 Jun 2011) Log Message: ----------- Upgrade to 0.73 Modified Paths: -------------- csw/mgar/pkg/cpan/FCGI/trunk/Makefile csw/mgar/pkg/cpan/FCGI/trunk/checksums Modified: csw/mgar/pkg/cpan/FCGI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/FCGI/trunk/Makefile 2011-06-25 21:19:22 UTC (rev 14899) +++ csw/mgar/pkg/cpan/FCGI/trunk/Makefile 2011-06-25 21:26:52 UTC (rev 14900) @@ -1,5 +1,5 @@ NAME = FCGI -VERSION = 0.71 +VERSION = 0.73 CATEGORIES = cpan AUTHOR = FLORA Modified: csw/mgar/pkg/cpan/FCGI/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/FCGI/trunk/checksums 2011-06-25 21:19:22 UTC (rev 14899) +++ csw/mgar/pkg/cpan/FCGI/trunk/checksums 2011-06-25 21:26:52 UTC (rev 14900) @@ -1 +1 @@ -26bc4ea53ccc9c9c16695e88e46a1cfb FCGI-0.71.tar.gz +b55c8b93ccd175b3c0e4473f1a6c0bdd FCGI-0.73.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Jun 25 23:30:47 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 25 Jun 2011 21:30:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14901] csw/mgar/pkg/cpan/FCGI/trunk/Makefile Message-ID: Revision: 14901 http://gar.svn.sourceforge.net/gar/?rev=14901&view=rev Author: wbonnet Date: 2011-06-25 21:30:47 +0000 (Sat, 25 Jun 2011) Log Message: ----------- Upgrade to 0.73 Modified Paths: -------------- csw/mgar/pkg/cpan/FCGI/trunk/Makefile Modified: csw/mgar/pkg/cpan/FCGI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/FCGI/trunk/Makefile 2011-06-25 21:26:52 UTC (rev 14900) +++ csw/mgar/pkg/cpan/FCGI/trunk/Makefile 2011-06-25 21:30:47 UTC (rev 14901) @@ -13,4 +13,6 @@ LICENSE = README +CHECKPKG_OVERRIDES_CSWpmfcgi += catalogname-does-not-match-pkgname|pkgname=CSWpmfcgi|catalogname=pm_fcgi|expected-catalogname=pmfcgi + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jun 26 00:12:33 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 25 Jun 2011 22:12:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14902] csw/mgar/pkg/cpan/XML-Atom/trunk Message-ID: Revision: 14902 http://gar.svn.sourceforge.net/gar/?rev=14902&view=rev Author: wbonnet Date: 2011-06-25 22:12:33 +0000 (Sat, 25 Jun 2011) Log Message: ----------- Upgrade to 0.39 Modified Paths: -------------- csw/mgar/pkg/cpan/XML-Atom/trunk/Makefile csw/mgar/pkg/cpan/XML-Atom/trunk/checksums Modified: csw/mgar/pkg/cpan/XML-Atom/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-Atom/trunk/Makefile 2011-06-25 21:30:47 UTC (rev 14901) +++ csw/mgar/pkg/cpan/XML-Atom/trunk/Makefile 2011-06-25 22:12:33 UTC (rev 14902) @@ -1,5 +1,5 @@ NAME = XML-Atom -VERSION = 0.37 +VERSION = 0.39 CATEGORIES = cpan AUTHOR = MIYAGAWA Modified: csw/mgar/pkg/cpan/XML-Atom/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-Atom/trunk/checksums 2011-06-25 21:30:47 UTC (rev 14901) +++ csw/mgar/pkg/cpan/XML-Atom/trunk/checksums 2011-06-25 22:12:33 UTC (rev 14902) @@ -1 +1 @@ -f4cbbb2feb893d42893f000e90464842 XML-Atom-0.37.tar.gz +5537d57f4d8a64022ecf82265e2a0594 XML-Atom-0.39.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jun 26 00:21:03 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 25 Jun 2011 22:21:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[14903] csw/mgar/pkg/java/ajcpool/trunk Message-ID: Revision: 14903 http://gar.svn.sourceforge.net/gar/?rev=14903&view=rev Author: wbonnet Date: 2011-06-25 22:21:03 +0000 (Sat, 25 Jun 2011) Log Message: ----------- Upgrade to 1.5.6 Modified Paths: -------------- csw/mgar/pkg/java/ajcpool/trunk/Makefile csw/mgar/pkg/java/ajcpool/trunk/checksums Modified: csw/mgar/pkg/java/ajcpool/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcpool/trunk/Makefile 2011-06-25 22:12:33 UTC (rev 14902) +++ csw/mgar/pkg/java/ajcpool/trunk/Makefile 2011-06-25 22:21:03 UTC (rev 14903) @@ -1,5 +1,5 @@ SHORTNAME = pool -VERSION = 1.5.5 +VERSION = 1.5.6 NAME = commons-$(SHORTNAME) CATEGORIES = java Modified: csw/mgar/pkg/java/ajcpool/trunk/checksums =================================================================== --- csw/mgar/pkg/java/ajcpool/trunk/checksums 2011-06-25 22:12:33 UTC (rev 14902) +++ csw/mgar/pkg/java/ajcpool/trunk/checksums 2011-06-25 22:21:03 UTC (rev 14903) @@ -1 +1 @@ -d6249971b825b6a52c592e192f8fdca8 commons-pool-1.5.5-bin.tar.gz +c00611bcee0f72696d7d15ff94aba9f0 commons-pool-1.5.6-bin.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jun 26 00:43:02 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 25 Jun 2011 22:43:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[14904] csw/mgar/pkg/java/ajcnet/trunk Message-ID: Revision: 14904 http://gar.svn.sourceforge.net/gar/?rev=14904&view=rev Author: wbonnet Date: 2011-06-25 22:43:02 +0000 (Sat, 25 Jun 2011) Log Message: ----------- Upgrade to 3.0.1 Modified Paths: -------------- csw/mgar/pkg/java/ajcnet/trunk/Makefile csw/mgar/pkg/java/ajcnet/trunk/checksums Modified: csw/mgar/pkg/java/ajcnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajcnet/trunk/Makefile 2011-06-25 22:21:03 UTC (rev 14903) +++ csw/mgar/pkg/java/ajcnet/trunk/Makefile 2011-06-25 22:43:02 UTC (rev 14904) @@ -1,5 +1,5 @@ SHORTNAME = net -VERSION = 2.2 +VERSION = 3.0.1 NAME = commons-$(SHORTNAME) CATEGORIES = java @@ -53,7 +53,8 @@ @ginstall -d $(DESTDIR)$(datadir)/java @gcp -fp $(WORKSRC)/$(DISTNAME)/$(NAME)-$(VERSION).jar $(DESTDIR)$(datadir)/java @( cd $(DESTDIR)$(datadir)/java ; \ - ln -s $(NAME)-$(VERSION).jar $(NAME)-2.jar ; \ + ln -s $(NAME)-$(VERSION).jar $(NAME)-3.0.jar ; \ + ln -s $(NAME)-$(VERSION).jar $(NAME)-3.jar ; \ ln -s $(NAME)-$(VERSION).jar $(NAME).jar ) @ginstall -d $(DESTDIR)$(datadir)/doc/$(NAME) @gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(NAME) Modified: csw/mgar/pkg/java/ajcnet/trunk/checksums =================================================================== --- csw/mgar/pkg/java/ajcnet/trunk/checksums 2011-06-25 22:21:03 UTC (rev 14903) +++ csw/mgar/pkg/java/ajcnet/trunk/checksums 2011-06-25 22:43:02 UTC (rev 14904) @@ -1 +1 @@ -9da0cd8e4d8d174eb08f5c9d3b9ec2ae commons-net-2.2-bin.tar.gz +39589eb2dcd0b1b65bcb48508f6470bc commons-net-3.0.1-bin.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jun 26 00:47:05 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 25 Jun 2011 22:47:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14905] csw/mgar/pkg/java/ajccodec/trunk Message-ID: Revision: 14905 http://gar.svn.sourceforge.net/gar/?rev=14905&view=rev Author: wbonnet Date: 2011-06-25 22:47:05 +0000 (Sat, 25 Jun 2011) Log Message: ----------- Upgrade to 1.5 Modified Paths: -------------- csw/mgar/pkg/java/ajccodec/trunk/Makefile csw/mgar/pkg/java/ajccodec/trunk/checksums Modified: csw/mgar/pkg/java/ajccodec/trunk/Makefile =================================================================== --- csw/mgar/pkg/java/ajccodec/trunk/Makefile 2011-06-25 22:43:02 UTC (rev 14904) +++ csw/mgar/pkg/java/ajccodec/trunk/Makefile 2011-06-25 22:47:05 UTC (rev 14905) @@ -1,5 +1,5 @@ SHORTNAME = codec -VERSION = 1.4 +VERSION = 1.5 NAME = commons-$(SHORTNAME) CATEGORIES = java Modified: csw/mgar/pkg/java/ajccodec/trunk/checksums =================================================================== --- csw/mgar/pkg/java/ajccodec/trunk/checksums 2011-06-25 22:43:02 UTC (rev 14904) +++ csw/mgar/pkg/java/ajccodec/trunk/checksums 2011-06-25 22:47:05 UTC (rev 14905) @@ -1 +1 @@ -413c2d2ede7865db7037ad49e3535957 commons-codec-1.4-bin.tar.gz +de51a26bfdb6024bcbb282f5139b1254 commons-codec-1.5-bin.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jonbcraig at users.sourceforge.net Sun Jun 26 02:40:44 2011 From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net) Date: Sun, 26 Jun 2011 00:40:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[14906] csw/mgar/pkg Message-ID: Revision: 14906 http://gar.svn.sourceforge.net/gar/?rev=14906&view=rev Author: jonbcraig Date: 2011-06-26 00:40:44 +0000 (Sun, 26 Jun 2011) Log Message: ----------- new package sipcalc to make network addressing easier Added Paths: ----------- csw/mgar/pkg/sipcalc/ csw/mgar/pkg/sipcalc/branches/ csw/mgar/pkg/sipcalc/tags/ csw/mgar/pkg/sipcalc/trunk/ csw/mgar/pkg/sipcalc/trunk/Makefile csw/mgar/pkg/sipcalc/trunk/checksums csw/mgar/pkg/sipcalc/trunk/files/ Property changes on: csw/mgar/pkg/sipcalc/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/sipcalc/trunk/Makefile =================================================================== --- csw/mgar/pkg/sipcalc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/sipcalc/trunk/Makefile 2011-06-26 00:40:44 UTC (rev 14906) @@ -0,0 +1,41 @@ +# $Id$ +NAME = sipcalc +VERSION = 1.1.5 +CATEGORIES = net + +DESCRIPTION = Advanced console-based ip subnet calculator +define BLURB + Sipcalc is an advanced console-based IP subnet calculator. It can take + multiple forms of input (IPv4/IPv6/interface/hostname) and output a + multitude of information about a given subnet. + + Features include: + - IPv4 + * Retrieving of address information from interfaces. + * Classfull and CIDR output. + * Multiple address and netmask input and output formats (dotted + quad, hex, number of bits). + * Output of broadcast address, network class, Cisco wildcard, hosts/range, + network range. + * The ability to "split" a network based on a smaller netmask, now also with + recursive runs on the generated subnets. (also IPv6) + - IPv6 + * Compressed and expanded input and output addresses. + * Standard IPv6 network output. + * v4 in v6 output. + * Reverse DNS address generation. +endef + +MASTER_SITES = http://www.routemeister.net/projects/sipcalc/files/ +DISTFILES = $(NAME)-$(VERSION).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/sipcalc/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/sipcalc/trunk/checksums =================================================================== --- csw/mgar/pkg/sipcalc/trunk/checksums (rev 0) +++ csw/mgar/pkg/sipcalc/trunk/checksums 2011-06-26 00:40:44 UTC (rev 14906) @@ -0,0 +1 @@ +8d59e70d21d8f0568e310d342e3e2306 sipcalc-1.1.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jonbcraig at users.sourceforge.net Sun Jun 26 02:45:40 2011 From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net) Date: Sun, 26 Jun 2011 00:45:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[14907] csw/mgar/pkg/sipcalc/trunk/Makefile Message-ID: Revision: 14907 http://gar.svn.sourceforge.net/gar/?rev=14907&view=rev Author: jonbcraig Date: 2011-06-26 00:45:39 +0000 (Sun, 26 Jun 2011) Log Message: ----------- added a runtime dependency Modified Paths: -------------- csw/mgar/pkg/sipcalc/trunk/Makefile Modified: csw/mgar/pkg/sipcalc/trunk/Makefile =================================================================== --- csw/mgar/pkg/sipcalc/trunk/Makefile 2011-06-26 00:40:44 UTC (rev 14906) +++ csw/mgar/pkg/sipcalc/trunk/Makefile 2011-06-26 00:45:39 UTC (rev 14907) @@ -32,9 +32,7 @@ # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = +RUNTIME_DEP_PKGS_CSWsipcalc += CSWlibgnugetopt CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jonbcraig at users.sourceforge.net Sun Jun 26 02:52:48 2011 From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net) Date: Sun, 26 Jun 2011 00:52:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14908] csw/mgar/pkg/sipcalc/tags/sipcalc-1.1.5, REV=2011.06 .26/ Message-ID: Revision: 14908 http://gar.svn.sourceforge.net/gar/?rev=14908&view=rev Author: jonbcraig Date: 2011-06-26 00:52:47 +0000 (Sun, 26 Jun 2011) Log Message: ----------- sipcalc: Tag as release 1.1.5,REV=2011.06.26 Added Paths: ----------- csw/mgar/pkg/sipcalc/tags/sipcalc-1.1.5,REV=2011.06.26/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Sun Jun 26 18:31:05 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Sun, 26 Jun 2011 16:31:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14909] csw/mgar/pkg/puppet/trunk/Makefile Message-ID: Revision: 14909 http://gar.svn.sourceforge.net/gar/?rev=14909&view=rev Author: phipsy Date: 2011-06-26 16:31:04 +0000 (Sun, 26 Jun 2011) Log Message: ----------- Puppet 2.7.1 Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2011-06-26 00:52:47 UTC (rev 14908) +++ csw/mgar/pkg/puppet/trunk/Makefile 2011-06-26 16:31:04 UTC (rev 14909) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.6.9 +VERSION = 2.7.1 CATEGORIES = apps define BLURB @@ -71,10 +71,7 @@ INSTALL_SCRIPTS = puppet PATCHFILES = 0003-Use-opt-csw-share-puppet-modules-as-default.patch -# https://projects.puppetlabs.com/issues/6324 -PATCHFILES += 0004-patch-to-smf-provider-6324.patch - CHECKPKG_OVERRIDES_CSWpuppetmaster = surplus-dependency|CSWruby18 CHECKPKG_OVERRIDES_CSWpuppet = surplus-dependency|CSWfacter CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWrubyaugeas This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Sun Jun 26 18:33:50 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Sun, 26 Jun 2011 16:33:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14910] csw/mgar/pkg/puppet/tags/puppet-2.7.1, REV=2011.06. 26/ Message-ID: Revision: 14910 http://gar.svn.sourceforge.net/gar/?rev=14910&view=rev Author: phipsy Date: 2011-06-26 16:33:50 +0000 (Sun, 26 Jun 2011) Log Message: ----------- puppet: Tag as release 2.7.1,REV=2011.06.26 Added Paths: ----------- csw/mgar/pkg/puppet/tags/puppet-2.7.1,REV=2011.06.26/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jun 26 23:35:23 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 26 Jun 2011 21:35:23 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[374] utilities/packagesStatistics/tools/ updateQaStatistics.pl Message-ID: Revision: 374 http://opencsw.svn.sourceforge.net/opencsw/?rev=374&view=rev Author: wbonnet Date: 2011-06-26 21:35:22 +0000 (Sun, 26 Jun 2011) Log Message: ----------- Initial commit Added Paths: ----------- utilities/packagesStatistics/tools/updateQaStatistics.pl Added: utilities/packagesStatistics/tools/updateQaStatistics.pl =================================================================== --- utilities/packagesStatistics/tools/updateQaStatistics.pl (rev 0) +++ utilities/packagesStatistics/tools/updateQaStatistics.pl 2011-06-26 21:35:22 UTC (rev 374) @@ -0,0 +1,289 @@ +#!/opt/csw/bin/perl +# +# The contents of this file are subject to the COMMON DEVELOPMENT AND +# DISTRIBUTION LICENSE (CDDL) (the "License"); you may not use this +# file except in compliance with the License. +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPL"), +# in which case the provisions of the GPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL, and not to allow others to +# use your version of this file under the terms of the CDDL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the CDDL, or the GPL. +# +# Copyright 2011 (http://www.opencsw.org). All rights reserved. +# Use is subject to license terms. +# +# +# Contributors list : +# +# William Bonnet wbonnet at opencsw.org +# +# +# Version : +# +# $Id: $ +# +# + +use strict; +use warnings; + +use Getopt::Long; +use Switch; +use DBD::mysql; +use DBI(); + +# ----------------------------------------------------------------------------- +# +# Definition of the variables that will receive command lines values after parsing +# +# ----------------------------------------------------------------------------- + +# Database connection +my $dbHost = "localhost"; # Variable containing the database hostname +my $dbUser = "qa_stat"; # Variable containing the username for database connection +my $dbPasswd = "qa_stat"; # Variable containing the password for database connection +my $dbSchema = "qa_stat"; # Variable containing the schema for database connection +my $DSN; # Variable containing the database connection string +my $dbConnect; # Variable containing the database connection + +# Schema +my $dbTablePrefix = "QA_STATS_"; # Prefix to all tables names +my $dbTableUwatch = $dbTablePrefix . "UWATCH"; # Name of the table containg the uwatch stats +my $dbTableBugs = $dbTablePrefix . "BUGS"; # Name of the table containg the bugs stats + +# Uwatch schema +my $dbUWatchTablePrefix = "UWATCH_"; # Prefix to all uwatch tables names +my $dbUWatchTablePackages = $dbUWatchTablePrefix . "PKG_VERSION"; # Name of the table containg the packages +my $dbUWatchTableHistory = $dbUWatchTablePrefix . "VERSION_HISTORY"; # Name of the table containg the version history + +# Command line arguments +my $command; # Command to process +my $verbose; # Versbose flag + +# Date override +my $forceYear; # Override, from the command line, the value of the current date +my $forceMonth; # Override, from the command line, the value of the current date +my $forceDay; # Override, from the command line, the value of the current date +my $noDateCheck; # Override, the control on the date using this option you can update with old data + + +# ----------------------------------------------------------------------------- +# +# args : year and month to increase +# +# This functions increase the update counter for the given month and year +# +# ----------------------------------------------------------------------------- +sub updateUwatchStatisticsErrorCount { + + # Pop the packages list from the arguments + my $dbConnect = shift; # Database connection + my $dayToUpdate = shift; # Day of the record to update + my $monthToUpdate = shift; # Month of the record to update + my $yearToUpdate = shift; # Year of the record to update + + # Try to retrieve the record containing the field to update + my $sqlQuery = "select count(1) from " . $dbUWatchTablePackages . " where PKG_LAST_UPSTREAM_CHECK_STATUS = 0 and PKG_GAR_PATH is not null limit 1"; + + # Now retrieve data from the table. + my $sth = $dbConnect->prepare($sqlQuery) or die "Error:" . $dbConnect->errstr . "\n"; + + # Execute the query + $sth->execute() or die "Error when executing query : " . $sqlQuery . "\n"; + + # Fetch the result into ref variable + my @row = $sth->fetchrow_array(); + + # We have to finish previous query + $sth->finish(); + + my $count = 0; + + # If ref is not empty then the record already exist in database + if (scalar @row) { + $count = $row[0]; + } + + # Try to retrieve the record containing the field to update + $sqlQuery = "select ID_STU from " . $dbTableUwatch . " where STU_YEAR = '" . $yearToUpdate. "' and STU_MONTH = '" . $monthToUpdate. "' and STU_DAY = '" . $dayToUpdate. "'"; + + # Now retrieve data from the table. + $sth = $dbConnect->prepare($sqlQuery) or die "Error:" . $dbConnect->errstr . "\n"; + + # Execute the query + $sth->execute() or die "Error when executing query : " . $sqlQuery . "\n"; + + # Fetch the result into ref variable + @row = $sth->fetchrow_array(); + + # We have to finish previous query + $sth->finish(); + + # If ref is not empty then the record already exist in database + if (scalar @row) { + # Copy the row id into a local variable and finish the query. Nothing else to do... + my $idDb = $row[0]; + + # The only two fields we set yet are the package name and the catalog name + $sqlQuery = "update $dbTableUwatch set STU_UWATCH_ERROR_COUNT = ? where ID_STU = ?"; + + # Execute the query + $dbConnect->do($sqlQuery, undef, $count, $idDb) or die "Error:" . $dbConnect->errstr . "\n"; + + } else { + + # Entry does not exist, then we have to create it with the update counter set to one + $sqlQuery = "insert into $dbTableUwatch (STU_YEAR, STU_MONTH, STU_DAY, STU_UWATCH_ERROR_COUNT) values (?, ?, ?, ?)" ; + + # Execute the query + $dbConnect->do($sqlQuery, undef, $yearToUpdate, $monthToUpdate, $dayToUpdate, $count) or die "Error:" . $dbConnect->errstr . "\n"; + } +} + +# ----------------------------------------------------------------------------- +# +# args : year and month to increase +# +# This functions increase the update counter for the given month and year +# +# ----------------------------------------------------------------------------- +sub updateUwatchStatistics { + + # Variables used to store current time + my $curSecond; my $curMinute; my $curHour; my $curDay; my $curMonth; my $curYear; my $curWeekDay; my $curDayOfYear; my $curIsDST; + + # Connect to database + $DSN = "DBI:mysql:database=" . $dbSchema . ";host=" . $dbHost ; + $dbConnect = DBI->connect($DSN, $dbUser, $dbPasswd, {'RaiseError' => 1}) or die "Couldn't connect to database: " . DBI->errstr; + + # Retrieve execution date + ($curSecond, $curMinute, $curHour, $curDay, $curMonth, $curYear, $curWeekDay, $curDayOfYear, $curIsDST) = localtime(time); + $curYear += 1900; + $curMonth++; + + # Process date overriding. If command line has defined the variables, then we replace local time values + if (defined($forceYear)) { $curYear = $forceYear; } + if (defined($forceMonth)) { $curMonth = $forceMonth; } + if (defined($forceDay)) { $curDay = $forceDay; } + + # Update the statistics about the number of errors + &updateUwatchStatisticsErrorCount($dbConnect, $curDay, $curMonth, $curYear); + + # Disconnect from the database. + $dbConnect->disconnect(); +} + + + +# ----------------------------------------------------------------------------- +# +# args : package list list to import +# +# This functions compare each package version with the one in the database +# and updates if necessary +# +# ----------------------------------------------------------------------------- +sub updateBugStatistics { + +} + + +# ----------------------------------------------------------------------------- +# +# args : none +# +# Display command usage to stdout +# +# ----------------------------------------------------------------------------- +sub displayUsage { + print "updateQaStatistics version: 0.1\n" ; + print "Copyright (C) 2011 OpenCSW http://www.opencsw.org\n" ; + print "\n" ; + print "This tool is used to produce weekly QA statistics.\n" ; + print "updateQaStatistics process the uwatch and bug tables and compute statistics used by the web site to display the qa statistics pages\n" ; + print "\n" ; + print "Usage : updateQaStatistics [OPTIONS] cmd1 cmd2 ...\n" ; + print "\n" ; + print " Command list :\n" ; + print " --command=[command]\n" ; + print " updateUwatchStatistics : Parse a catalog and stores statistics in the database\n" ; + print " updateBugStatistics : Parse a 'newpkgs' email, and stores update only statistics in the database\n" ; + print "\n" ; + print " Options list :\n" ; + print " Database options\n" ; + print " --dbHost=[mySQL hostname] defaults to : $dbHost\n"; + print " Defines the database host to use in the connection string\n" ; + print " --dbUser=[mySQL userame] defaults to : $dbUser\n"; + print " Defines the database user to use in the connection string\n" ; + print " --dbPasswd=[mySQL password] defaults to : $dbPasswd\n"; + print " Defines the database password to use in the connection string\n" ; + print " --dbSchema=[mySQL database name] defaults to : $dbSchema\n"; + print " Defines the database to use in the connection string\n" ; + print "\n" ; + print " Old catalog import options\n" ; + print " --forceYear=[year] defaults to : \n"; + print " If set, force the year value used when updating packages and statistics\n" ; + print " --forceMonth=[month] defaults to : \n"; + print " If set, force the month value used when updating packages and statistics\n" ; + print " --forceDay=[day] defaults to : \n"; + print " If set, force the day value used when updating packages and statistics\n" ; + print " --verbose defaults to : \n" ; + print " Make output a bit more verbose\n" ; + print "\n" ; +} + +# ----------------------------------------------------------------------------- +# +# Main part of the script +# +# ----------------------------------------------------------------------------- + +# Check for the number of arguments. If zero then display usage and exit +my $numArgs = $#ARGV + 1; +if ($numArgs == 0) { + displayUsage() ; + exit ; +} + +# Parse the arguments +my $result = GetOptions ("command=s" => \$command, + "dbHost=s" => \$dbHost, + "dbUser=s" => \$dbUser, + "dbPasswd=s" => \$dbPasswd, + "dbSchema=s" => \$dbSchema, + "forceYear=i" => \$forceYear, + "forceMonth=i" => \$forceMonth, + "forceDay=i" => \$forceDay, + "noDateCheck" => \$noDateCheck, + "verbose" => \$verbose); + +die ("Error : missing command\n") unless defined ($command); + +# Select the procedure to call to handle the command +SWITCH: for ($command) { + # Command is : import a catalog file in pkg-get format + /updateUwatchStatistics/i && do { + &updateUwatchStatistics ; + last ; + } ; + + # Command is : update packages and stats from the content of the newpkgs emails + /updateBugStatistics/i && do { + &updateBugStatistics ; + last ; + } ; + + # Default is : unknown command. Exit with an error message + die ("unknown command : $command\n") ; +} Property changes on: utilities/packagesStatistics/tools/updateQaStatistics.pl ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jun 27 00:19:01 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 26 Jun 2011 22:19:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14911] csw/mgar/pkg/template/trunk/Makefile Message-ID: Revision: 14911 http://gar.svn.sourceforge.net/gar/?rev=14911&view=rev Author: wahwah Date: 2011-06-26 22:19:01 +0000 (Sun, 26 Jun 2011) Log Message: ----------- template: Updating compiler information (SOS12) Modified Paths: -------------- csw/mgar/pkg/template/trunk/Makefile Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2011-06-26 16:33:50 UTC (rev 14910) +++ csw/mgar/pkg/template/trunk/Makefile 2011-06-26 22:19:01 UTC (rev 14911) @@ -175,8 +175,9 @@ ## OPT_FLAGS_SOS = -xO3 ## OPT_FLAGS_GCC = -O2 -pipe ## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 +## The compiler to use. This can be also: SOS11, GCC3, GCC4. +## Specifying GNU will default to GCC4, specifying SUN will default to SOS12 +## GARCOMPILER = SOS12 ## # Remove the following rules and uncomment the # include before building. 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 Jun 27 12:38:04 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 27 Jun 2011 10:38:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[14912] csw/mgar/pkg/parallel/trunk Message-ID: Revision: 14912 http://gar.svn.sourceforge.net/gar/?rev=14912&view=rev Author: dmichelsen Date: 2011-06-27 10:38:04 +0000 (Mon, 27 Jun 2011) Log Message: ----------- parallel: Update to 20110622 Modified Paths: -------------- csw/mgar/pkg/parallel/trunk/Makefile csw/mgar/pkg/parallel/trunk/checksums Modified: csw/mgar/pkg/parallel/trunk/Makefile =================================================================== --- csw/mgar/pkg/parallel/trunk/Makefile 2011-06-26 22:19:01 UTC (rev 14911) +++ csw/mgar/pkg/parallel/trunk/Makefile 2011-06-27 10:38:04 UTC (rev 14912) @@ -1,6 +1,6 @@ # $Id$ NAME = parallel -VERSION = 20110522 +VERSION = 20110622 CATEGORIES = utils DESCRIPTION = Shell tool for executing jobs in parallel Modified: csw/mgar/pkg/parallel/trunk/checksums =================================================================== --- csw/mgar/pkg/parallel/trunk/checksums 2011-06-26 22:19:01 UTC (rev 14911) +++ csw/mgar/pkg/parallel/trunk/checksums 2011-06-27 10:38:04 UTC (rev 14912) @@ -1 +1 @@ -83c12186d740698cddb3795420d0e1f8 parallel-20110522.tar.bz2 +101ce0d674d43b3051c868bbc8b3ed60 parallel-20110622.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jun 27 12:48:35 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 27 Jun 2011 10:48:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14913] csw/mgar/pkg/rbgems Message-ID: Revision: 14913 http://gar.svn.sourceforge.net/gar/?rev=14913&view=rev Author: dmichelsen Date: 2011-06-27 10:48:34 +0000 (Mon, 27 Jun 2011) Log Message: ----------- rbgems/ruby-ip: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/ruby-ip/ csw/mgar/pkg/rbgems/ruby-ip/Makefile csw/mgar/pkg/rbgems/ruby-ip/branches/ csw/mgar/pkg/rbgems/ruby-ip/tags/ csw/mgar/pkg/rbgems/ruby-ip/trunk/ csw/mgar/pkg/rbgems/ruby-ip/trunk/Makefile csw/mgar/pkg/rbgems/ruby-ip/trunk/checksums csw/mgar/pkg/rbgems/ruby-ip/trunk/files/ Copied: csw/mgar/pkg/rbgems/ruby-ip/Makefile (from rev 14858, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/rbgems/ruby-ip/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/ruby-ip/Makefile 2011-06-27 10:48:34 UTC (rev 14913) @@ -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/rbgems/ruby-ip/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/ruby-ip/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/ruby-ip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/ruby-ip/trunk/Makefile 2011-06-27 10:48:34 UTC (rev 14913) @@ -0,0 +1,15 @@ +NAME = ruby-ip +VERSION = 0.9.0 +CATEGORIES = rbgems + +DESCRIPTION = IP address manipulation library + +define BLURB + IP adres manipulation library +endef + +LICENSE = LICENSE.txt + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/rbgems/ruby-ip/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/ruby-ip/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/ruby-ip/trunk/checksums 2011-06-27 10:48:34 UTC (rev 14913) @@ -0,0 +1 @@ +fd383bd1e5af284d622598ed9a31390f ruby-ip-0.9.0.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jun 27 14:21:57 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 27 Jun 2011 12:21:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14914] csw/mgar/pkg/ncurses/trunk/Makefile Message-ID: Revision: 14914 http://gar.svn.sourceforge.net/gar/?rev=14914&view=rev Author: dmichelsen Date: 2011-06-27 12:21:56 +0000 (Mon, 27 Jun 2011) Log Message: ----------- ncurses: Add dependencies from CSWncurses to libraries for legacy packages as reported in #4797 Modified Paths: -------------- csw/mgar/pkg/ncurses/trunk/Makefile Modified: csw/mgar/pkg/ncurses/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncurses/trunk/Makefile 2011-06-27 10:48:34 UTC (rev 14913) +++ csw/mgar/pkg/ncurses/trunk/Makefile 2011-06-27 12:21:56 UTC (rev 14914) @@ -24,6 +24,14 @@ RUNTIME_DEP_PKGS_CSWncurses += CSWterminfo CHECKPKG_OVERRIDES_CSWncurses += surplus-dependency|CSWterminfo RUNTIME_DEP_PKGS_CSWncurses += CSWlibncursesw5 +# These are legacy dependencies for packages still depending on CSWncurses +# instead of the specific libraries +RUNTIME_DEP_PKGS_CSWncurses += CSWlibncurses5 +CHECKPKG_OVERRIDES_CSWncurses += surplus-dependency|CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWncurses += CSWlibpanel5 +CHECKPKG_OVERRIDES_CSWncurses += surplus-dependency|CSWlibpanel5 +RUNTIME_DEP_PKGS_CSWncurses += CSWlibpanelw5 +CHECKPKG_OVERRIDES_CSWncurses += surplus-dependency|CSWlibpanelw5 PACKAGES += CSWlibform5 PKGFILES_CSWlibform5 += $(call pkgfiles_lib,libform.so.5) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jun 27 14:25:37 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 27 Jun 2011 12:25:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14915] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 14915 http://gar.svn.sourceforge.net/gar/?rev=14915&view=rev Author: dmichelsen Date: 2011-06-27 12:25:37 +0000 (Mon, 27 Jun 2011) Log Message: ----------- ImageMagick: Update to 6.7.0-8, fix dupe of bin/compare, update deps, fix perl module package Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-06-27 12:21:56 UTC (rev 14914) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-06-27 12:25:37 UTC (rev 14915) @@ -1,6 +1,6 @@ NAME = imagemagick VERSION = 6.7.0 -GARSUBREV = 7 +GARSUBREV = 8 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -26,7 +26,7 @@ SPKG_DESC_CSWlibmagick++4 += Library from ImageMagick, libMagick++.so.4 RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWjpeg -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWliblcms2-2 RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWliblqr RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWtiff @@ -45,7 +45,7 @@ SPKG_DESC_CSWlibmagickcore4 += Library from ImageMagick, libMagickCore.so.4 RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWjpeg -RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWliblcms2-2 RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWliblqr RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWtiff @@ -65,7 +65,7 @@ SPKG_DESC_CSWlibmagickwand4 += Library from ImageMagick, libMagickWand.so.4 RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWjpeg -RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWliblcms2-2 RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWliblqr RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWtiff @@ -80,6 +80,8 @@ PACKAGES += CSWimagemagick-dev SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries +# In man3 there is just the manpage for the Perl module +PKGFILES_DEVEL_MAN3_MANPAGE = PKGFILES_CSWimagemagick-dev += $(PKGFILES_DEVEL) PKGFILES_CSWimagemagick-dev += $(docdir)/.* RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++4 @@ -94,7 +96,7 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore4 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand4 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlcmsrt +RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblcms2-2 RUNTIME_DEP_PKGS_CSWimagemagick += CSWbzip2 RUNTIME_DEP_PKGS_CSWimagemagick += CSWilmbase RUNTIME_DEP_PKGS_CSWimagemagick += CSWpng @@ -124,22 +126,26 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmf0-2-7 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmflite0-2-7 RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblzma5 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwebp0 PACKAGES += CSWpm-image-magick SPKG_DESC_CSWpm-image-magick = Image::Magick: Perl binding for Imagemagick PKGFILES_CSWpm-image-magick += $(libdir)/perl/.* +PKGFILES_CSWpm-image-magick += $(mandir)/.*\.3perl + RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWperl RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWlibmagickcore4 BUILD_DEP_PKGS += CSWdjvulibredevel BUILD_DEP_PKGS += CSWgraphvizdevel BUILD_DEP_PKGS += CSWilmbasedevel -BUILD_DEP_PKGS += CSWlcmsdevel +BUILD_DEP_PKGS += CSWliblcms-dev BUILD_DEP_PKGS += CSWlibcairodevel BUILD_DEP_PKGS += CSWliblqrdevel BUILD_DEP_PKGS += CSWlibwmf-dev BUILD_DEP_PKGS += CSWliblzma-dev BUILD_DEP_PKGS += CSWopenexrdevel +BUILD_DEP_PKGS += CSWlibwebp-dev EXTRA_LINKER_FLAGS = -norunpath @@ -154,6 +160,10 @@ # FAIL: Magick++/tests/coderInfo.sh EXTRA_LIB = /usr/openwin/lib +# We especially don't want ISALIST for the above /usr/openwin/lib +# This should be reworked after a general rework of ISALIST in GAR +RUNPATH_ISALIST = $(libpath_install) + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-perl=$(bindir)/perl CONFIGURE_ARGS += --enable-shared --disable-static @@ -193,7 +203,8 @@ EXTRA_MERGE_EXCLUDE_FILES += .*/perllocal.pod EXTRA_MERGE_EXCLUDE_FILES += .*/\.packlist -EXTRA_PAX_ARGS = -s ',$(bindir)/compare,$(bindir)/compare-imagemagick,' +EXTRA_PAX_ARGS += -s ',$(bindir)/compare,$(bindir)/compare-imagemagick,' +EXTRA_PAX_ARGS += -s ',$(mandir)/man1/compare\.1,$(mandir)/man1/compare-imagemagick.1,' STRIP_LIBTOOL = 1 Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2011-06-27 12:21:56 UTC (rev 14914) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2011-06-27 12:25:37 UTC (rev 14915) @@ -1 +1 @@ -b4fbc24494b6bcbb5b8b6b75077f46b8 ImageMagick-6.7.0-7.tar.xz +67d8631c20fc9a2409343c02b159407d ImageMagick-6.7.0-8.tar.xz 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 Jun 27 14:28:02 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 27 Jun 2011 12:28:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[14916] csw/mgar/pkg/grep/trunk Message-ID: Revision: 14916 http://gar.svn.sourceforge.net/gar/?rev=14916&view=rev Author: dmichelsen Date: 2011-06-27 12:28:02 +0000 (Mon, 27 Jun 2011) Log Message: ----------- grep: Update to 2.9 Modified Paths: -------------- csw/mgar/pkg/grep/trunk/Makefile csw/mgar/pkg/grep/trunk/checksums Modified: csw/mgar/pkg/grep/trunk/Makefile =================================================================== --- csw/mgar/pkg/grep/trunk/Makefile 2011-06-27 12:25:37 UTC (rev 14915) +++ csw/mgar/pkg/grep/trunk/Makefile 2011-06-27 12:28:02 UTC (rev 14916) @@ -1,5 +1,5 @@ NAME = grep -VERSION = 2.8 +VERSION = 2.9 CATEGORIES = utils DESCRIPTION = GNU grep Modified: csw/mgar/pkg/grep/trunk/checksums =================================================================== --- csw/mgar/pkg/grep/trunk/checksums 2011-06-27 12:25:37 UTC (rev 14915) +++ csw/mgar/pkg/grep/trunk/checksums 2011-06-27 12:28:02 UTC (rev 14916) @@ -1 +1 @@ -b59003c42b330bdabd417e00d07102da grep-2.8.tar.xz +25e41b2aa201104354740961ef36005a grep-2.9.tar.xz 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 Jun 27 15:33:33 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 27 Jun 2011 13:33:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14917] csw/mgar/pkg/liblcms/trunk/Makefile Message-ID: Revision: 14917 http://gar.svn.sourceforge.net/gar/?rev=14917&view=rev Author: dmichelsen Date: 2011-06-27 13:33:32 +0000 (Mon, 27 Jun 2011) Log Message: ----------- liblcms: Fix legacy stub name Modified Paths: -------------- csw/mgar/pkg/liblcms/trunk/Makefile Modified: csw/mgar/pkg/liblcms/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblcms/trunk/Makefile 2011-06-27 12:28:02 UTC (rev 14916) +++ csw/mgar/pkg/liblcms/trunk/Makefile 2011-06-27 13:33:32 UTC (rev 14917) @@ -27,7 +27,7 @@ SPKG_DESC_CSWliblcms1 = Color management library, liblcms.so.1 PKGFILES_CSWliblcms1 += $(call pkgfiles_lib,liblcms.so.1) OBSOLETED_BY_CSWliblcms1 = CSWlcmsrt -CATALOGNAME_CSWliblcmsrt = lcms_rt_stub +CATALOGNAME_CSWlcmsrt = lcms_rt_stub PACKAGES += CSWliblcms-dev SPKG_DESC_CSWliblcms-dev = Development files for liblcms.so.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jun 27 22:42:45 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 27 Jun 2011 20:42:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[14918] csw/mgar/pkg/sendmail/trunk/Makefile Message-ID: Revision: 14918 http://gar.svn.sourceforge.net/gar/?rev=14918&view=rev Author: dmichelsen Date: 2011-06-27 20:42:45 +0000 (Mon, 27 Jun 2011) Log Message: ----------- sendmail: Redo alternatives similar to r14842 Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-27 13:33:32 UTC (rev 14917) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-27 20:42:45 UTC (rev 14918) @@ -123,12 +123,12 @@ INSTALL_SCRIPTS = custom # Some files collide with CSWpostfix -ALTERNATIVES_CSWsendmail = mailq newaliases mailq.1 newaliases.1 aliases.5 -ALTERNATIVE_mailq = $(bindir)/mailq mailq $(bindir)/mailq.sendmail 100 -ALTERNATIVE_newaliases += $(bindir)/newaliases newaliases $(bindir)/newaliases.sendmail 100 -ALTERNATIVE_mailq.1 += $(mandir)/man1/mailq.1 mailq.1 $(mandir)/man1/mailq1.1.sendmail 100 -ALTERNATIVE_newaliases.1 += $(mandir)/man1/newaliases.1 newaliases.1 $(mandir)/man1/newaliases.1.sendmail 100 -ALTERNATIVE_aliases.5 += $(mandir)/man5/aliases.5 aliases.5 $(mandir)/man5/aliases.5.sendmail 100 +ALTERNATIVES_CSWsendmail = sendmail +ALTERNATIVE_sendmail = $(bindir)/mailq sendmail $(bindir)/mailq.sendmail 100 +ALTERNATIVE_sendmail += $(bindir)/newaliases newaliases $(bindir)/newaliases.sendmail +ALTERNATIVE_sendmail += $(mandir)/man1/mailq.1 mailq.1 $(mandir)/man1/mailq1.1.sendmail +ALTERNATIVE_sendmail += $(mandir)/man1/newaliases.1 newaliases.1 $(mandir)/man1/newaliases.1.sendmail +ALTERNATIVE_sendmail += $(mandir)/man5/aliases.5 aliases.5 $(mandir)/man5/aliases.5.sendmail # Look thru these to see if they are harmless, e.g. examples CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/README This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jun 28 11:23:38 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 28 Jun 2011 09:23:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[14919] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14919 http://gar.svn.sourceforge.net/gar/?rev=14919&view=rev Author: wahwah Date: 2011-06-28 09:23:38 +0000 (Tue, 28 Jun 2011) Log Message: ----------- pkgdb: Fall back to unittest if necessary Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py 2011-06-27 20:42:45 UTC (rev 14918) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py 2011-06-28 09:23:38 UTC (rev 14919) @@ -1,6 +1,11 @@ #!/usr/bin/env python2.6 -import unittest2 as unittest +# Try to use unittest2, fall back to unittest +try: + import unittest2 as unittest +except ImportError: + import unittest + import checkpkg_lib import copy import cPickle Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2011-06-27 20:42:45 UTC (rev 14918) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py 2011-06-28 09:23:38 UTC (rev 14919) @@ -1,6 +1,11 @@ #!/usr/bin/env python2.6 -import unittest2 as unittest +# Try to use unittest2, fall back to unittest +try: + import unittest2 as unittest +except ImportError: + import unittest + import csw_upload_pkg import mox import rest This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jun 28 11:25:37 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 28 Jun 2011 09:25:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14920] csw/mgar/gar/v2/lib/python/checkpkg_lib.py Message-ID: Revision: 14920 http://gar.svn.sourceforge.net/gar/?rev=14920&view=rev Author: wahwah Date: 2011-06-28 09:25:37 +0000 (Tue, 28 Jun 2011) Log Message: ----------- checkpkg: Memoizing GetPkgByPath Speeds up execution of certain tests. In the case of CSWncurses, the analysis time goes down from 17m to 1m30s. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-06-28 09:23:38 UTC (rev 14919) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-06-28 09:25:37 UTC (rev 14920) @@ -302,6 +302,7 @@ self.catrel = catrel self.catalog = catalog self.common_paths = {} + self.pkgs_by_path_cache = {} if lines_dict: self.lines_dict = lines_dict else: @@ -353,19 +354,22 @@ def GetPkgByPath(self, file_path): """Proxies calls to self.system_pkgmap.""" - pkgs_in_catalog = self.catalog.GetPkgByPath( - file_path, self.osrel, self.arch, self.catrel) - # This response comes from catalog; we need to simulate the state the - # catalog would have if the set under test in the catalog. First, we - # remove all packages that are under test. - pkgs = set(pkgs_in_catalog.difference(set(self.pkg_set_files))) - if file_path in self.pkgs_by_file: - for pkg in self.pkgs_by_file[file_path]: - pkgs.add(pkg) - logging_response = pprint.pformat(pkgs) - logging.debug("GetPkgByPath(%s).AndReturn(%s)" - % (file_path, logging_response)) - return pkgs + key = (file_path, self.osrel, self.arch, self.catrel) + if not key in self.pkgs_by_path_cache: + pkgs_in_catalog = self.catalog.GetPkgByPath( + file_path, self.osrel, self.arch, self.catrel) + # This response comes from catalog; we need to simulate the state the + # catalog would have if the set under test in the catalog. First, we + # remove old versions of packages under test. + pkgs = set(pkgs_in_catalog.difference(set(self.pkg_set_files))) + if file_path in self.pkgs_by_file: + for pkg in self.pkgs_by_file[file_path]: + pkgs.add(pkg) + logging_response = pprint.pformat(pkgs) + logging.debug("GetPkgByPath(%s).AndReturn(%s)" + % (file_path, logging_response)) + self.pkgs_by_path_cache[key] = pkgs + return self.pkgs_by_path_cache[key] def GetInstalledPackages(self): return self.catalog.GetInstalledPackages( @@ -624,8 +628,10 @@ ] ] """ - logging.debug("_ReportMissingDependencies(error_mgr, %s, %s, %s)", - pkgname, declared_deps, pprint.pformat(req_pkgs_reasons)) + # Disabling the logging, because pprint.pformat can take an awful lot of + # time. + # logging.debug("_ReportMissingDependencies(error_mgr, %s, %s, %s)", + # pkgname, declared_deps, pprint.pformat(req_pkgs_reasons)) missing_reasons_by_pkg = {} for reason_group in req_pkgs_reasons: for pkg, reason in reason_group: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jun 28 11:29:50 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 28 Jun 2011 09:29:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14921] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14921 http://gar.svn.sourceforge.net/gar/?rev=14921&view=rev Author: wahwah Date: 2011-06-28 09:29:50 +0000 (Tue, 28 Jun 2011) Log Message: ----------- checkpkg: Relocatable package support GAR packages are not relocatable, but there is a couple of relocatable packages in the catalog. There's one function responsible from returning the basedir, but without the trailing slash, because that't the convention of keeping paths in checkpkg. When constructing pkgmap however, the slash needs to be added back - paths in the files table and in the pkgmap list need to be absolute. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/README csw/mgar/gar/v2/lib/python/inspective_package.py csw/mgar/gar/v2/lib/python/inspective_package_test.py csw/mgar/gar/v2/lib/python/package.py csw/mgar/gar/v2/lib/python/pkgmap.py Modified: csw/mgar/gar/v2/lib/python/README =================================================================== --- csw/mgar/gar/v2/lib/python/README 2011-06-28 09:25:37 UTC (rev 14920) +++ csw/mgar/gar/v2/lib/python/README 2011-06-28 09:29:50 UTC (rev 14921) @@ -61,6 +61,7 @@ given as alternatives, but the reason is common. - Notify maintainers when their package is available from mirrors - Add support for the 'overridden' field in the database +- Support for relocatable packages Known problems: - libmagic fails sometimes when processing the whole catalog Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2011-06-28 09:25:37 UTC (rev 14920) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2011-06-28 09:29:50 UTC (rev 14921) @@ -37,18 +37,21 @@ if not self.files_metadata: self.CheckPkgpathExists() self.files_metadata = [] - files_root = os.path.join(self.directory, "root") + files_root = self.GetFilesDir() all_files = self.GetAllFilePaths() def StripRe(x, strip_re): return re.sub(strip_re, "", x) - root_re = re.compile(r"^root/") + root_re = re.compile(r"^(reloc|root)/") file_magic = FileMagic() + basedir = self.GetBasedir() for file_path in all_files: full_path = unicode(self.MakeAbsolutePath(file_path)) file_info = { "path": StripRe(file_path, root_re), "mime_type": file_magic.GetFileMimeType(full_path) } + if basedir: + file_info["path"] = os.path.join(basedir, file_info["path"]) if not file_info["mime_type"]: logging.error("Could not establish the mime type of %s", full_path) @@ -108,32 +111,57 @@ self.binaries.sort() return self.binaries + def GetPathsInSubdir(self, remove_prefix, subdir): + file_paths = [] + for root, dirs, files in os.walk(os.path.join(self.pkgpath, subdir)): + full_paths = [os.path.join(root, f) for f in files] + file_paths.extend([f.replace(remove_prefix, "") for f in full_paths]) + return file_paths + def GetAllFilePaths(self): """Returns a list of all paths from the package.""" if not self.file_paths: + # Support for relocatable packages + basedir = self.GetBasedir() self.CheckPkgpathExists() remove_prefix = "%s/" % self.pkgpath - self.file_paths = [] - for root, dirs, files in os.walk(os.path.join(self.pkgpath, "root")): - full_paths = [os.path.join(root, f) for f in files] - self.file_paths.extend([f.replace(remove_prefix, "") for f in full_paths]) + self.file_paths = self.GetPathsInSubdir(remove_prefix, "root") + self.file_paths += self.GetPathsInSubdir(remove_prefix, "reloc") return self.file_paths + def GetFilesDir(self): + """Returns the subdirectory in which files, are either "reloc" or "root".""" + if os.path.exists(os.path.join(self.directory, "reloc")): + return "reloc" + else: + return "root" + def GetBinaryDumpInfo(self): # Binaries. This could be split off to a separate function. # man ld.so.1 for more info on this hack env = copy.copy(os.environ) env["LD_NOAUXFLTR"] = "1" binaries_dump_info = [] + basedir = self.GetBasedir() for binary in self.ListBinaries(): - binary_abs_path = os.path.join(self.directory, "root", binary) - binary_base_name = os.path.basename(binary) + # Relocatable packages complicate things. Binaries returns paths with + # the basedir, but files in reloc are in paths without the basedir, so + # we need to strip that bit. + binary_in_tmp_dir = binary + if basedir: + binary_in_tmp_dir = binary_in_tmp_dir[len(basedir):] + binary_in_tmp_dir = binary_in_tmp_dir.lstrip("/") + binary_abs_path = os.path.join(self.directory, self.GetFilesDir(), binary_in_tmp_dir) + binary_base_name = os.path.basename(binary_in_tmp_dir) args = [common_constants.DUMP_BIN, "-Lv", binary_abs_path] + logging.debug("Running: %s", args) dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) stdout, stderr = dump_proc.communicate() ret = dump_proc.wait() binary_data = ldd_emul.ParseDumpOutput(stdout) binary_data["path"] = binary + if basedir: + binary_data["path"] = os.path.join(basedir, binary_data["path"]) binary_data["base_name"] = binary_base_name binaries_dump_info.append(binary_data) return binaries_dump_info Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2011-06-28 09:25:37 UTC (rev 14920) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2011-06-28 09:29:50 UTC (rev 14921) @@ -21,7 +21,7 @@ class InspectivePackageUnitTest(mox.MoxTestBase): - def testOne(self): + def testInstantiate(self): self.mox.StubOutWithMock(hachoir_parser, 'createParser', use_mock_anything=True) hachoir_parser_mock = self.mox.CreateMockAnything() Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2011-06-28 09:25:37 UTC (rev 14920) +++ csw/mgar/gar/v2/lib/python/package.py 2011-06-28 09:29:50 UTC (rev 14921) @@ -271,9 +271,21 @@ self.ShellCommand(args, quiet=True) return target_path + def GetBasedir(self): + basedir_id = "BASEDIR" + pkginfo = self.GetParsedPkginfo() + if basedir_id in pkginfo: + basedir = pkginfo[basedir_id] + else: + basedir = "" + # The convention in checkpkg is to not include the leading slash in paths. + basedir = basedir.lstrip("/") + return basedir + def GetPkgmap(self, analyze_permissions=False, strip=None): fd = open(os.path.join(self.directory, "pkgmap"), "r") - return pkgmap.Pkgmap(fd, analyze_permissions, strip) + basedir = self.GetBasedir() + return pkgmap.Pkgmap(fd, analyze_permissions, strip, basedir) def SetPkginfoEntry(self, key, value): pkginfo = self.GetParsedPkginfo() Modified: csw/mgar/gar/v2/lib/python/pkgmap.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgmap.py 2011-06-28 09:25:37 UTC (rev 14920) +++ csw/mgar/gar/v2/lib/python/pkgmap.py 2011-06-28 09:29:50 UTC (rev 14921) @@ -31,14 +31,22 @@ } def __init__(self, input, permissions=False, - strip=None): + strip=None, basedir=""): self.paths = set() self.analyze_permissions = permissions self.entries = [] self.classes = None self.strip = strip + self.basedir = basedir for line in input: entry, line_to_add = self._ParseLine(line) + # Relocatable packages support + if "path" in entry and entry["path"]: + entry["path"] = os.path.join(basedir, entry["path"]) + # basedir here does not include the leading slash, but in pkgmap we + # need it. + if not entry["path"].startswith("/"): + entry["path"] = "/" + entry["path"] self.entries.append(entry) if line_to_add: self.paths.add(line_to_add) 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 Jun 28 11:59:45 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 28 Jun 2011 09:59:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[14922] csw/mgar/pkg/rl/trunk Message-ID: Revision: 14922 http://gar.svn.sourceforge.net/gar/?rev=14922&view=rev Author: dmichelsen Date: 2011-06-28 09:59:44 +0000 (Tue, 28 Jun 2011) Log Message: ----------- rl: Add missing patch Modified Paths: -------------- csw/mgar/pkg/rl/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/rl/trunk/files/0002-Rename-option.patch Modified: csw/mgar/pkg/rl/trunk/Makefile =================================================================== --- csw/mgar/pkg/rl/trunk/Makefile 2011-06-28 09:29:50 UTC (rev 14921) +++ csw/mgar/pkg/rl/trunk/Makefile 2011-06-28 09:59:44 UTC (rev 14922) @@ -13,6 +13,7 @@ DISTFILES = $(DISTNAME).tar.gz PATCHFILES += 0001-Add-missing-typedef.patch +PATCHFILES += 0002-Rename-option.patch # Not gonna do it # TEST_SCRIPTS = Added: csw/mgar/pkg/rl/trunk/files/0002-Rename-option.patch =================================================================== --- csw/mgar/pkg/rl/trunk/files/0002-Rename-option.patch (rev 0) +++ csw/mgar/pkg/rl/trunk/files/0002-Rename-option.patch 2011-06-28 09:59:44 UTC (rev 14922) @@ -0,0 +1,48 @@ +From 18d824bd040abbed1d0259e655ab67eefa11a915 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 28 Jun 2011 11:55:17 +0200 +Subject: [PATCH] Rename option + +--- + getopt_long.c | 2 +- + getopt_long.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/getopt_long.c b/getopt_long.c +index 09f6245..a53d677 100644 +--- a/getopt_long.c ++++ b/getopt_long.c +@@ -37,7 +37,7 @@ + int + getopt_long(int argc,char * const argv[], + const char *optstring, +- const struct option *longopts,int *longindex) ++ const struct _option *longopts,int *longindex) + { + int i; /* for looping through options */ + int l; /* for length */ +diff --git a/getopt_long.h b/getopt_long.h +index 0f03e4d..de715ef 100644 +--- a/getopt_long.h ++++ b/getopt_long.h +@@ -28,7 +28,7 @@ + #define optional_argument 2 + + +-typedef struct option { ++typedef struct _option { + const char *name; + int has_arg; + int *flag; +@@ -44,7 +44,7 @@ typedef struct option { + */ + int getopt_long(int argc,char * const argv[], + const char *optstring, +- const struct option *longopts,int *longindex); ++ const struct _option *longopts,int *longindex); + + + #endif /* _GETOPT_LONG_H */ +-- +1.7.5.4 + 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 Jun 28 13:37:04 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 28 Jun 2011 11:37:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[14923] csw/mgar/pkg/clusterit/trunk Message-ID: Revision: 14923 http://gar.svn.sourceforge.net/gar/?rev=14923&view=rev Author: dmichelsen Date: 2011-06-28 11:37:04 +0000 (Tue, 28 Jun 2011) Log Message: ----------- clusterit: Update to mGAR v2, full rework Modified Paths: -------------- csw/mgar/pkg/clusterit/trunk/Makefile csw/mgar/pkg/clusterit/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/clusterit/trunk/files/CSWclusterit.gspec Property Changed: ---------------- csw/mgar/pkg/clusterit/trunk/ Property changes on: csw/mgar/pkg/clusterit/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/clusterit/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterit/trunk/Makefile 2011-06-28 09:59:44 UTC (rev 14922) +++ csw/mgar/pkg/clusterit/trunk/Makefile 2011-06-28 11:37:04 UTC (rev 14923) @@ -4,28 +4,48 @@ DESCRIPTION = Suite of tools for managing large clusters of machines define BLURB - This is a collection of clustering tools, to turn your ordinary everyday pile of UNIX workstations into a speedy parallel beast. Initially this work was based on the work of IBM's PSSP, and copied heavily from the ideas there. Its also lightly based on the work pioneered in GLUnix. + This is a collection of clustering tools, to turn your ordinary everyday pile of + UNIX workstations into a speedy parallel beast. Initially this work was based on + the work of IBM's PSSP, and copied heavily from the ideas there. + Its also lightly based on the work pioneered in GLUnix. endef -SF_PROJ = $(NAME) MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += $(call admfiles,CSWclusterit,) +DISTFILES = $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=154528 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*) +VENDOR_URL = http://clusterit.sourceforge.net/ +LICENSE = README -PREFIX = /opt/csw/$(NAME) -CONFIGURE_ARGS = --prefix=$(PREFIX) +EXTRA_PAX_ARGS += -s ',$(bindir),/opt/csw/clusterit/bin,' +EXTRA_PAX_ARGS += -s ',\.1$$,.1clusterit,' -# Not gonna do it -TEST_SCRIPTS = +BINS += barrier +BINS += barrierd +BINS += clustersed +BINS += dsh +BINS += dshbak +BINS += dtop +BINS += dvt +BINS += jsd +# CSWschilyutils +COLLIDING_BINS += jsh +# CSWsynce +COLLIDING_BINS += pcp +BINS += pdf +# CSWsynce +COLLIDING_BINS += prm +BINS += rseq +BINS += run +BINS += rvt +# This is an example path +CHECKPKG_OVERRIDES_CSWclusterit += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/pcp.1clusterit + include gar/category.mk -pre-install: - ( if [ ! -d $(DESTDIR)/opt/csw/bin ] ; then mkdir -p $(DESTDIR)/opt/csw/bin ; fi ) - ( cd $(DESTDIR)/opt/csw/bin && for f in barrier catman dsh dtop dvt jsd pcp rvt ; do ln -s ../$(NAME)/bin/$$f . ; done ) +post-merge: + if [ ! -d $(PKGROOT)/opt/csw/bin ] ; then mkdir -p $(PKGROOT)/opt/csw/bin ; fi + $(foreach B,$(BINS),ln -s ../clusterit/bin/$B $(PKGROOT)/opt/csw/bin/$B;) + $(foreach B,$(COLLIDING_BINS),ln -s ../clusterit/bin/$B $(PKGROOT)/opt/csw/bin/$B-clusterit;) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/clusterit/trunk/checksums =================================================================== --- csw/mgar/pkg/clusterit/trunk/checksums 2011-06-28 09:59:44 UTC (rev 14922) +++ csw/mgar/pkg/clusterit/trunk/checksums 2011-06-28 11:37:04 UTC (rev 14923) @@ -1,2 +1 @@ -f0e772e07122e388de629fb57f7237ab download/clusterit-2.5.tar.gz -4f32e05cc785d92abb4f189caf376744 download/CSWclusterit.gspec +f0e772e07122e388de629fb57f7237ab clusterit-2.5.tar.gz Deleted: csw/mgar/pkg/clusterit/trunk/files/CSWclusterit.gspec =================================================================== --- csw/mgar/pkg/clusterit/trunk/files/CSWclusterit.gspec 2011-06-28 09:59:44 UTC (rev 14922) +++ csw/mgar/pkg/clusterit/trunk/files/CSWclusterit.gspec 2011-06-28 11:37:04 UTC (rev 14923) @@ -1,4 +0,0 @@ -%var bitname clusterit -%var pkgname CSWclusterit -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/README 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 Jun 28 15:13:36 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 28 Jun 2011 13:13:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[14924] csw/mgar/pkg/p7zip/trunk Message-ID: Revision: 14924 http://gar.svn.sourceforge.net/gar/?rev=14924&view=rev Author: dmichelsen Date: 2011-06-28 13:13:36 +0000 (Tue, 28 Jun 2011) Log Message: ----------- p7zip: Update to 9.20.1 Modified Paths: -------------- csw/mgar/pkg/p7zip/trunk/Makefile csw/mgar/pkg/p7zip/trunk/checksums Added Paths: ----------- csw/mgar/pkg/p7zip/trunk/files/0001-Disable-unrecognized-pragma.patch Modified: csw/mgar/pkg/p7zip/trunk/Makefile =================================================================== --- csw/mgar/pkg/p7zip/trunk/Makefile 2011-06-28 11:37:04 UTC (rev 14923) +++ csw/mgar/pkg/p7zip/trunk/Makefile 2011-06-28 13:13:36 UTC (rev 14924) @@ -1,5 +1,5 @@ NAME = p7zip -VERSION = 9.04 +VERSION = 9.20.1 CATEGORIES = utils DESCRIPTION = File archiver with high compression ratio @@ -22,32 +22,45 @@ * Self-extracting capability for 7z format endef -MASTER_SITES = http://garr.dl.sourceforge.net/sourceforge/p7zip/ -DISTFILES = $(NAME)_$(VERSION)_src_all.tar.bz2 +MASTER_SITES = $(SF_MIRROR) +DISTNAME = $(NAME)_$(VERSION) +DISTFILES = $(DISTNAME)_src_all.tar.bz2 +PATCHFILES += patch-CPP-7zip-Archive-Zip-ZipHandler.cpp +PATCHFILES += patch-install.sh +PATCHFILES += 0001-Disable-unrecognized-pragma.patch -# We define upstream file regex so we can be notifed of new upstream software -# release, atm not used -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +VENDOR_URL = http://p7zip.sourceforge.net/ +LICENSE = DOCS/License.txt # since there is no configure script, this is intentionally left empty CONFIGURE_SCRIPTS = -# add CFLAGS -BUILD_ARGS = LOCAL_FLAGS="$(CFLAGS)" +# Defaults taken from makefile.solaris_sparc_CC_32 +EXTRA_CPPFLAGS = -s -mt \ + -DHAVE_LONG_LONG \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DENV_UNIX \ + -DNDEBUG -D_REENTRANT +EXTRA_CPPFLAGS += -DBREAK_HANDLER -DUNICODE -D_UNICODE +EXTRA_CPPFLAGS += -I../../C -# add INSTALL arguments -INSTALL_ARGS = DEST_HOME="$(DESTDIR)/$(prefix)" -INSTALL_ARGS += DEST_MAN="$(DESTDIR)/$(mandir)" +BUILD_OVERRIDE_VARS = CXX CC CC_SHARED LINK_SHARED LOCAL_LIBS LOCAL_LIBS_DLL OBJ_CRC32 +BUILD_OVERRIDE_VAR_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) +BUILD_OVERRIDE_VAR_CC = $(CC) $(CPPFLAGS) $(CFLAGS) +BUILD_OVERRIDE_VAR_CC_SHARED = $(LDFLAGS) -KPIC +BUILD_OVERRIDE_VAR_LINK_SHARED = $(LDFLAGS) -KPIC -G +BUILD_OVERRIDE_VAR_LOCAL_LIBS = -lpthread -lCrun +BUILD_OVERRIDE_VAR_LOCAL_LIBS += -norunpath +BUILD_OVERRIDE_VAR_LOCAL_LIBS_DLL = -lpthread -lCrun -ldl +BUILD_OVERRIDE_VAR_LOCAL_LIBS_DLL += -norunpath +BUILD_OVERRIDE_VAR_OBJ_CRC32 = $$(OBJ_CRC32_C) -# fix distname -DISTNAME = $(NAME)_$(VERSION) +INSTALL_ARGS = DEST_HOME="$(DESTDIR)$(prefix)" +INSTALL_ARGS += DEST_MAN="$(DESTDIR)$(mandir)" -# patch files -PATCHFILES = patch-CPP-7zip-Archive-Zip-ZipHandler.cpp -PATCHFILES += patch-install.sh +# Location of the system locale +CHECKPKG_OVERRIDES_CSWp7zip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/p7zip/README +# This is an example +CHECKPKG_OVERRIDES_CSWp7zip += file-with-bad-content|/usr/local|root/opt/csw/share/doc/p7zip/README include gar/category.mk - -# makefile -pre-build-modulated: - @cp $(WORKSRC)/makefile.solaris_sparc_CC_32 $(WORKSRC)/makefile.machine Modified: csw/mgar/pkg/p7zip/trunk/checksums =================================================================== --- csw/mgar/pkg/p7zip/trunk/checksums 2011-06-28 11:37:04 UTC (rev 14923) +++ csw/mgar/pkg/p7zip/trunk/checksums 2011-06-28 13:13:36 UTC (rev 14924) @@ -1,3 +1 @@ -9194ebf9a2b3735d236aed001de5f6f8 p7zip_9.04_src_all.tar.bz2 -6d31812ad3facefbc8ba8bd750522be7 patch-CPP-7zip-Archive-Zip-ZipHandler.cpp -06482af0e45c61b245b2f664602e4742 patch-install.sh +bd6caaea567dc0d995c990c5cc883c89 p7zip_9.20.1_src_all.tar.bz2 Added: csw/mgar/pkg/p7zip/trunk/files/0001-Disable-unrecognized-pragma.patch =================================================================== --- csw/mgar/pkg/p7zip/trunk/files/0001-Disable-unrecognized-pragma.patch (rev 0) +++ csw/mgar/pkg/p7zip/trunk/files/0001-Disable-unrecognized-pragma.patch 2011-06-28 13:13:36 UTC (rev 14924) @@ -0,0 +1,34 @@ +From 64f606a0f73a205186f35579a739380f6f92ba4c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 28 Jun 2011 11:45:39 +0200 +Subject: [PATCH 3/3] Disable unrecognized pragma + +--- + C/Ppmd.h | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/C/Ppmd.h b/C/Ppmd.h +index 621d927..d0ecf4a 100644 +--- a/C/Ppmd.h ++++ b/C/Ppmd.h +@@ -29,7 +29,7 @@ EXTERN_C_BEGIN + #define PPMD_N4 ((128 + 3 - 1 * PPMD_N1 - 2 * PPMD_N2 - 3 * PPMD_N3) / 4) + #define PPMD_NUM_INDEXES (PPMD_N1 + PPMD_N2 + PPMD_N3 + PPMD_N4) + +-#pragma pack(push,1) ++/* #pragma pack(push,1) */ + + /* SEE-contexts for PPM-contexts with masked symbols */ + typedef struct +@@ -50,7 +50,7 @@ typedef struct + UInt16 SuccessorHigh; + } CPpmd_State; + +-#pragma pack(pop) ++/* #pragma pack(pop) */ + + typedef + #ifdef PPMD_32BIT +-- +1.7.5.4 + 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 Jun 28 19:18:54 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 28 Jun 2011 17:18:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14925] csw/mgar/pkg/pcp/trunk Message-ID: Revision: 14925 http://gar.svn.sourceforge.net/gar/?rev=14925&view=rev Author: bonivart Date: 2011-06-28 17:18:54 +0000 (Tue, 28 Jun 2011) Log Message: ----------- pcp/trunk: fix license Modified Paths: -------------- csw/mgar/pkg/pcp/trunk/Makefile csw/mgar/pkg/pcp/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pcp/trunk/files/COPYING Modified: csw/mgar/pkg/pcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcp/trunk/Makefile 2011-06-28 13:13:36 UTC (rev 14924) +++ csw/mgar/pkg/pcp/trunk/Makefile 2011-06-28 17:18:54 UTC (rev 14925) @@ -8,7 +8,8 @@ endef MASTER_SITES = http://www.unix.ms/pcp/ -DISTFILES = pcp.txt +DISTFILES = pcp.txt +DISTFILES += COPYING ARCHALL = 1 @@ -17,8 +18,6 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -CHECKPKG_OVERRIDES = license-missing - include gar/category.mk install-custom: Modified: csw/mgar/pkg/pcp/trunk/checksums =================================================================== --- csw/mgar/pkg/pcp/trunk/checksums 2011-06-28 13:13:36 UTC (rev 14924) +++ csw/mgar/pkg/pcp/trunk/checksums 2011-06-28 17:18:54 UTC (rev 14925) @@ -1 +1 @@ -380ab508bcee1bc34436e987f07dbf39 pcp.txt +38197da1b0ffb953b7818eb2a64f0a44 pcp.txt Added: csw/mgar/pkg/pcp/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/pcp/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/pcp/trunk/files/COPYING 2011-06-28 17:18:54 UTC (rev 14925) @@ -0,0 +1,4 @@ +# (C) Sam Nelson sam @ unix.ms +# +# Many thanks Daniel Trinkle trinkle @ cs.purdue.edu +# for the help, much appreciated. 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 Jun 28 19:52:35 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 28 Jun 2011 17:52:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14926] csw/mgar/pkg/GeoIP/trunk/Makefile Message-ID: Revision: 14926 http://gar.svn.sourceforge.net/gar/?rev=14926&view=rev Author: bonivart Date: 2011-06-28 17:52:35 +0000 (Tue, 28 Jun 2011) Log Message: ----------- GeoIP/trunk: remove some overrides, add i-dep Modified Paths: -------------- csw/mgar/pkg/GeoIP/trunk/Makefile Modified: csw/mgar/pkg/GeoIP/trunk/Makefile =================================================================== --- csw/mgar/pkg/GeoIP/trunk/Makefile 2011-06-28 17:18:54 UTC (rev 14925) +++ csw/mgar/pkg/GeoIP/trunk/Makefile 2011-06-28 17:52:35 UTC (rev 14926) @@ -16,22 +16,20 @@ SPKG_DESC_CSWgeoip = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWgeoip = CSWgeolitedb CSWzlib CSWgcc4corert -PACKAGES += CSWgeoip-dev -CATALOGNAME_CSWgeoip-dev = geoip_dev -SPKG_DESC_CSWgeoip-dev = GeoIP C API development support -RUNTIME_DEP_PKGS_CSWgeoip-dev = CSWgeoip -PKGFILES_CSWgeoip-dev = $(PKGFILES_DEVEL) +PACKAGES += CSWgeoip-dev +CATALOGNAME_CSWgeoip-dev = geoip_dev +SPKG_DESC_CSWgeoip-dev = GeoIP C API development support +RUNTIME_DEP_PKGS_CSWgeoip-dev = CSWgeoip +INCOMPATIBLE_PKGS_CSWgeoip-dev = CSWgeoipdevel +PKGFILES_CSWgeoip-dev = $(PKGFILES_DEVEL) GARCOMPILER = GCC4 -#TEST_TARGET = check +# Tests require internet connection TEST_TARGET = EXTRA_MERGE_EXCLUDE_FILES = .*GeoIP.dat$ -# Do not exclude static libs (needed for devel package) -#MERGE_EXCLUDE_STATICLIBS = - BUILD64 = 1 STRIP_LIBTOOL = 1 @@ -42,9 +40,4 @@ CHECKPKG_OVERRIDES_CSWgeoip += non-uniform-lib-versions-in-package|sonames=libGeoIP.so.1,libGeoIPUpdate.so.0 CHECKPKG_OVERRIDES_CSWgeoip += surplus-dependency|CSWgeolitedb -# Dev package renamed, remove next time -CHECKPKG_OVERRIDES_CSWgeoip-dev += file-collision|/opt/csw/include/GeoIPCity.h|CSWgeoip-dev|CSWgeoipdevel -CHECKPKG_OVERRIDES_CSWgeoip-dev += file-collision|/opt/csw/include/GeoIP.h|CSWgeoip-dev|CSWgeoipdevel -CHECKPKG_OVERRIDES_CSWgeoip-dev += file-collision|/opt/csw/include/GeoIPUpdate.h|CSWgeoip-dev|CSWgeoipdevel - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jun 28 23:05:31 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 28 Jun 2011 21:05:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14927] csw/mgar/pkg/autossh/trunk Message-ID: Revision: 14927 http://gar.svn.sourceforge.net/gar/?rev=14927&view=rev Author: skayser Date: 2011-06-28 21:05:30 +0000 (Tue, 28 Jun 2011) Log Message: ----------- autossh/trunk: add license file, update changelog, drop non-observable AUTOSSH_PORT issue Modified Paths: -------------- csw/mgar/pkg/autossh/trunk/Makefile csw/mgar/pkg/autossh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/autossh/trunk/Makefile =================================================================== --- csw/mgar/pkg/autossh/trunk/Makefile 2011-06-28 17:52:35 UTC (rev 14926) +++ csw/mgar/pkg/autossh/trunk/Makefile 2011-06-28 21:05:30 UTC (rev 14927) @@ -1,12 +1,12 @@ # TODO (release-critical prefixed with !, non release-critical with *) -# ! As soon as AUTOSSH_PORT is set, the invocation of autossh will -# pass wrong options to ssh. +# # * man page doesn't properly format on Solaris. Upstream notified on # 2009-06-24, intends to work on it, has access to his own Solaris -# box. In case of a new upstream version, verify whether man page +# box. In case of a upstream version >1.4b, verify whether man page # formats properly (for now see install-preformatted-manpage: below). # * DESTDIR and --with-ssh handling could be fixed. See the Debian # patch tracker: http://patch-tracker.debian.org/package/autossh/1.4b-1 +# NAME = autossh VERSION = 1.4b CATEGORIES = net @@ -23,7 +23,7 @@ DISTFILES = $(NAME)-$(VERSION).tgz TEST_SCRIPTS = -INSTALL_SCRIPTS = custom preformatted-manpage +INSTALL_SCRIPTS = custom preformatted-manpage extracted-license CONFIGURE_ARGS = $(DIRPATHS) NORUNPATH = 1 @@ -31,9 +31,6 @@ # --with-ssh=/usr/bin/ssh doesn't work -> checking for ssh... /opt/csw/bin/ssh BUILD_ARGS = 'SSH=/usr/bin/ssh' -# autossh doesn't ship a license and can't find one on $VENDOR_URL either -CHECKPKG_OVERRIDES_CSWautossh += license-missing - include gar/category.mk # Makefile install target doesn't honor $(DESTDIR) so we install manually @@ -49,7 +46,6 @@ cp $(WORKSRC)/autossh $(DESTDIR)$(prefix)/libexec/autossh cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) cp $(addprefix $(WORKSRC)/,autossh.host rscreen) $(DOCDEST)/examples - cp $(FILEDIR)/changelog.CSW $(DOCDEST) @$(MAKECOOKIE) @@ -63,3 +59,18 @@ groff -m doc -Tascii -P-cuob $(WORKSRC)/autossh.1 > \ $(DESTDIR)$(mandir)/catman1/autossh.1 @$(MAKECOOKIE) + +# autossh doesn't ship with an explicit license file, thus we extract +# the license that's given in the source code +install-extracted-license: DOCDEST=$(DESTDIR)$(docdir)/$(NAME) +install-extracted-license: assert-no-upstream-license + sed -n '/ \* Copyright/,/ \*\//p' $(WORKSRC)/autossh.c | \ + sed 's, \*[ /]*,,' > $(DOCDEST)/license + @$(MAKECOOKIE) + +assert-no-upstream-license: + if [ -f $(WORKSRC)/$(LICENSE) ]; then \ + echo "Target install-extracted-license is obsolete!"; \ + exit 2; \ + fi + @$(MAKECOOKIE) Modified: csw/mgar/pkg/autossh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/autossh/trunk/files/changelog.CSW 2011-06-28 17:52:35 UTC (rev 14926) +++ csw/mgar/pkg/autossh/trunk/files/changelog.CSW 2011-06-28 21:05:30 UTC (rev 14927) @@ -1,12 +1,13 @@ -autossh (1.4b,REV=2010.02.23) +autossh (1.4b,REV=2011.06.28) * Merged version suffix into package version. (Closes #4003) + * Added license file. * Package now ships with a preformatted autossh.1 catman page so that "man autossh" works with Solaris nroff. - -- Sebastian Kayser Tue, 23 Feb 2010 21:01:41 +0100 + -- Sebastian Kayser Tue, 28 Jun 2011 23:01:56 +0200 -autossh (1.4b,REV=2009.06.25) +autossh (1.4,REV=2009.06.25_b) * Initial release. 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 Jun 28 23:17:46 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 28 Jun 2011 21:17:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[14928] csw/mgar/pkg/autossh/trunk/Makefile Message-ID: Revision: 14928 http://gar.svn.sourceforge.net/gar/?rev=14928&view=rev Author: skayser Date: 2011-06-28 21:17:46 +0000 (Tue, 28 Jun 2011) Log Message: ----------- autossh/trunk: adjust /usr/local references Modified Paths: -------------- csw/mgar/pkg/autossh/trunk/Makefile Modified: csw/mgar/pkg/autossh/trunk/Makefile =================================================================== --- csw/mgar/pkg/autossh/trunk/Makefile 2011-06-28 21:05:30 UTC (rev 14927) +++ csw/mgar/pkg/autossh/trunk/Makefile 2011-06-28 21:17:46 UTC (rev 14928) @@ -46,6 +46,7 @@ cp $(WORKSRC)/autossh $(DESTDIR)$(prefix)/libexec/autossh cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) cp $(addprefix $(WORKSRC)/,autossh.host rscreen) $(DOCDEST)/examples + gsed -i 's,/usr/local/bin/ssh,/usr/bin/ssh,' $(DOCDEST)/examples/* @$(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 Tue Jun 28 23:29:45 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 28 Jun 2011 21:29:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[14929] csw/mgar/pkg/autossh/trunk/Makefile Message-ID: Revision: 14929 http://gar.svn.sourceforge.net/gar/?rev=14929&view=rev Author: skayser Date: 2011-06-28 21:29:45 +0000 (Tue, 28 Jun 2011) Log Message: ----------- autossh/trunk: re-add changelog.CSW, rename upstream CHANGES to changelog Modified Paths: -------------- csw/mgar/pkg/autossh/trunk/Makefile Modified: csw/mgar/pkg/autossh/trunk/Makefile =================================================================== --- csw/mgar/pkg/autossh/trunk/Makefile 2011-06-28 21:17:46 UTC (rev 14928) +++ csw/mgar/pkg/autossh/trunk/Makefile 2011-06-28 21:29:45 UTC (rev 14929) @@ -21,9 +21,11 @@ VENDOR_URL = http://www.harding.motd.ca/autossh/ MASTER_SITES = http://www.harding.motd.ca/autossh/ DISTFILES = $(NAME)-$(VERSION).tgz +DISTFILES += changelog.CSW TEST_SCRIPTS = INSTALL_SCRIPTS = custom preformatted-manpage extracted-license +EXTRA_PAX_ARGS = '-s,CHANGES,changelog,p' CONFIGURE_ARGS = $(DIRPATHS) NORUNPATH = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Jun 29 03:40:26 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 29 Jun 2011 01:40:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[14930] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14930 http://gar.svn.sourceforge.net/gar/?rev=14930&view=rev Author: bdwalton Date: 2011-06-29 01:40:25 +0000 (Wed, 29 Jun 2011) Log Message: ----------- php5/trunk: commit the required configure arg for a scan dir, but leave it commented for now Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-06-28 21:29:45 UTC (rev 14929) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-06-29 01:40:25 UTC (rev 14930) @@ -231,6 +231,8 @@ CONFIGURE_ARGS += --enable-xml CONFIGURE_ARGS += --with-libxml-dir=$(prefix) CONFIGURE_ARGS += --with-config-file-path=$(sysconfdir) +# enable this for the next release... +#CONFIGURE_ARGS += --with-config-file-scan-dir=$(sysconfdir)/conf.d ifeq ($(SAPI),ap2) CONFIGURE_ARGS += --enable-bcmath=shared 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 Jun 29 04:34:04 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 29 Jun 2011 02:34:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[14931] csw/mgar/pkg/git/trunk Message-ID: Revision: 14931 http://gar.svn.sourceforge.net/gar/?rev=14931&view=rev Author: bdwalton Date: 2011-06-29 02:34:04 +0000 (Wed, 29 Jun 2011) Log Message: ----------- git/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-06-29 01:40:25 UTC (rev 14930) +++ csw/mgar/pkg/git/trunk/Makefile 2011-06-29 02:34:04 UTC (rev 14931) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.7.5.4 +VERSION = 1.7.6 #PATCHLEVEL = rc1 CATEGORIES = devel Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2011-06-29 01:40:25 UTC (rev 14930) +++ csw/mgar/pkg/git/trunk/checksums 2011-06-29 02:34:04 UTC (rev 14931) @@ -1 +1 @@ -4985b774db84d3bbcc2b8d90952552a3 git-1.7.5.4.tar.bz2 +9e0a438eb71e89eedb61f89470ed32a0 git-1.7.6.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jun 29 11:48:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 Jun 2011 09:48:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14932] csw/mgar/pkg/clusterit/trunk/Makefile Message-ID: Revision: 14932 http://gar.svn.sourceforge.net/gar/?rev=14932&view=rev Author: dmichelsen Date: 2011-06-29 09:48:08 +0000 (Wed, 29 Jun 2011) Log Message: ----------- clusterit: Add fix for #3616 Modified Paths: -------------- csw/mgar/pkg/clusterit/trunk/Makefile Modified: csw/mgar/pkg/clusterit/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterit/trunk/Makefile 2011-06-29 02:34:04 UTC (rev 14931) +++ csw/mgar/pkg/clusterit/trunk/Makefile 2011-06-29 09:48:08 UTC (rev 14932) @@ -16,6 +16,9 @@ VENDOR_URL = http://clusterit.sourceforge.net/ LICENSE = README +# As reported in #3616 +RUNTIME_DEP_PKGS_CSWclusterit += CSWgawk + EXTRA_PAX_ARGS += -s ',$(bindir),/opt/csw/clusterit/bin,' EXTRA_PAX_ARGS += -s ',\.1$$,.1clusterit,' 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 Jun 29 13:07:33 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 Jun 2011 11:07:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14933] csw/mgar/pkg/mtools/trunk Message-ID: Revision: 14933 http://gar.svn.sourceforge.net/gar/?rev=14933&view=rev Author: dmichelsen Date: 2011-06-29 11:07:33 +0000 (Wed, 29 Jun 2011) Log Message: ----------- mtools: Update to 4.0.17 Modified Paths: -------------- csw/mgar/pkg/mtools/trunk/Makefile csw/mgar/pkg/mtools/trunk/checksums Modified: csw/mgar/pkg/mtools/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtools/trunk/Makefile 2011-06-29 09:48:08 UTC (rev 14932) +++ csw/mgar/pkg/mtools/trunk/Makefile 2011-06-29 11:07:33 UTC (rev 14933) @@ -1,5 +1,5 @@ NAME = mtools -VERSION = 4.0.16 +VERSION = 4.0.17 CATEGORIES = utils DESCRIPTION = Read/write/list/format DOS disks under Unix @@ -11,11 +11,8 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.lz +DISTFILES = $(DISTNAME).tar.lz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.lz - RUNTIME_DEP_PKGS = CSWiconv EXTRA_LINKER_FLAGS = -liconv -lnsl Modified: csw/mgar/pkg/mtools/trunk/checksums =================================================================== --- csw/mgar/pkg/mtools/trunk/checksums 2011-06-29 09:48:08 UTC (rev 14932) +++ csw/mgar/pkg/mtools/trunk/checksums 2011-06-29 11:07:33 UTC (rev 14933) @@ -1 +1 @@ -324c85788e895c628755bcbef35b1114 mtools-4.0.16.tar.lz +f6548c7796e4b515138a5779bbc62487 mtools-4.0.17.tar.lz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jun 29 13:32:24 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 Jun 2011 11:32:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[14934] csw/mgar/pkg/libksba/trunk Message-ID: Revision: 14934 http://gar.svn.sourceforge.net/gar/?rev=14934&view=rev Author: dmichelsen Date: 2011-06-29 11:32:24 +0000 (Wed, 29 Jun 2011) Log Message: ----------- libksba: Update to 1.2.0, split packages Modified Paths: -------------- csw/mgar/pkg/libksba/trunk/Makefile csw/mgar/pkg/libksba/trunk/checksums Modified: csw/mgar/pkg/libksba/trunk/Makefile =================================================================== --- csw/mgar/pkg/libksba/trunk/Makefile 2011-06-29 11:07:33 UTC (rev 14933) +++ csw/mgar/pkg/libksba/trunk/Makefile 2011-06-29 11:32:24 UTC (rev 14934) @@ -1,5 +1,5 @@ NAME = libksba -VERSION = 1.0.8 +VERSION = 1.2.0 CATEGORIES = lib DESCRIPTION = Libksba is a CMS and X.509 access library @@ -11,20 +11,21 @@ endef MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/libksba/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES = $(DISTNAME).tar.bz2 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(VERSION)-(\d+(?:\.\d+)*).tar.bz2 +VENDOR_URL = http://www.gnupg.org/related_software/libksba/ -SPKG_SOURCEURL = http://www.gnupg.org/related_software/libksba/ +PACKAGES += CSWlibksba8 +SPKG_DESC_CSWlibksba8 = CMS and X.509 access library, libksba.so.8 +PKGFILES_CSWlibksba8 = $(call pkgfiles_lib,libksba.so.8) +RUNTIME_DEP_PKGS_CSWlibksba8 += CSWlibgpg-error0 +OBSOLETED_BY_CSWlibksba8 += CSWlibksba -RUNTIME_DEP_PKGS = CSWgpgerr +PACKAGES += CSWlibksba-dev +SPKG_DESC_CSWlibksba-dev = Development files for libksba.so.8 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibksba-dev += CSWlibksba8 BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - include gar/category.mk Modified: csw/mgar/pkg/libksba/trunk/checksums =================================================================== --- csw/mgar/pkg/libksba/trunk/checksums 2011-06-29 11:07:33 UTC (rev 14933) +++ csw/mgar/pkg/libksba/trunk/checksums 2011-06-29 11:32:24 UTC (rev 14934) @@ -1 +1 @@ -8acac0b3cbd0030dfc6d0f6a58c9b5b2 libksba-1.0.8.tar.bz2 +e797f370b69b4dc776499d6a071ae137 libksba-1.2.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jun 29 13:34:07 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 Jun 2011 11:34:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[14935] csw/mgar/pkg/libassuan/trunk Message-ID: Revision: 14935 http://gar.svn.sourceforge.net/gar/?rev=14935&view=rev Author: dmichelsen Date: 2011-06-29 11:34:07 +0000 (Wed, 29 Jun 2011) Log Message: ----------- libassuan: Update to 2.0.2 and split packages Modified Paths: -------------- csw/mgar/pkg/libassuan/trunk/Makefile csw/mgar/pkg/libassuan/trunk/checksums Modified: csw/mgar/pkg/libassuan/trunk/Makefile =================================================================== --- csw/mgar/pkg/libassuan/trunk/Makefile 2011-06-29 11:32:24 UTC (rev 14934) +++ csw/mgar/pkg/libassuan/trunk/Makefile 2011-06-29 11:34:07 UTC (rev 14935) @@ -1,5 +1,5 @@ NAME = libassuan -VERSION = 2.0.1 +VERSION = 2.0.2 CATEGORIES = lib DESCRIPTION = IPC library used by some GnuPG related software @@ -7,31 +7,34 @@ endef MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/libassuan/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES = $(DISTNAME).tar.bz2 # Use this patch unless this is fixed: # https://bugs.g10code.com/gnupg/issue1282 -PATCHFILES = 0001-Add-INADDR_NONE-for-Solaris.patch +#PATCHFILES = 0001-Add-INADDR_NONE-for-Solaris.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 +VENDOR_URL = http://www.gnupg.org/download/#libassuan -SPKG_SOURCEURL = http://www.gnupg.org/download/#libassuan +BUILD_DEP_PKGS += CSWgpgerr +BUILD_DEP_PKGS += CSWpth -BUILD_DEP_PKGS = CSWgpgerr CSWpth -RUNTIME_DEP_PKGS = CSWgpgerr +PACKAGES += CSWlibassuan0 +SPKG_DESC_CSWlibassuan0 = IPC library used by some GnuPG related software, libassuan.so.0 +PKGFILES_CSWlibassuan0 += $(call pkgfiles_lib,libassuan.so.0) +RUNTIME_DEP_PKGS_CSWlibassuan0 += CSWlibgpg-error0 +OBSOLETED_BY_CSWlibassuan0 += CSWlibassuan +PACKAGES += CSWlibassuan-dev +SPKG_DESC_CSWlibassuan-dev = Development files for libassuan.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibassuan-dev += CSWlibassuan0 + BUILD64 = 1 -NOISAEXEC = 1 # EXTRA_LDFLAGS = -lrt -lsocket -lnsl -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - # Disable tests until this is fixed: # https://bugs.g10code.com/gnupg/msg3633 -SKIPTEST ?= 1 +# SKIPTEST ?= 1 include gar/category.mk Modified: csw/mgar/pkg/libassuan/trunk/checksums =================================================================== --- csw/mgar/pkg/libassuan/trunk/checksums 2011-06-29 11:32:24 UTC (rev 14934) +++ csw/mgar/pkg/libassuan/trunk/checksums 2011-06-29 11:34:07 UTC (rev 14935) @@ -1 +1 @@ -53a7d4c22af909d7236d17d454ef935b libassuan-2.0.1.tar.bz2 +3e7d00fd2ee8a0b9c51ac7616ef3f1ec libassuan-2.0.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jun 29 14:14:46 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 Jun 2011 12:14:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[14936] csw/mgar/pkg/cpan/X11-Protocol/trunk Message-ID: Revision: 14936 http://gar.svn.sourceforge.net/gar/?rev=14936&view=rev Author: dmichelsen Date: 2011-06-29 12:14:46 +0000 (Wed, 29 Jun 2011) Log Message: ----------- cpan/X11-Protocol: Update to new package name Modified Paths: -------------- csw/mgar/pkg/cpan/X11-Protocol/trunk/Makefile csw/mgar/pkg/cpan/X11-Protocol/trunk/checksums Modified: csw/mgar/pkg/cpan/X11-Protocol/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/X11-Protocol/trunk/Makefile 2011-06-29 11:34:07 UTC (rev 14935) +++ csw/mgar/pkg/cpan/X11-Protocol/trunk/Makefile 2011-06-29 12:14:46 UTC (rev 14936) @@ -5,15 +5,16 @@ DESCRIPTION = Perl module for the X Window System Protocol, version 11 define BLURB - X11::Protocol is a client-side interface to the X11 Protocol, allowing perl programs to display windows and graphics on X11 servers. + X11::Protocol is a client-side interface to the X11 Protocol, allowing + perl programs to display windows and graphics on X11 servers. endef -DISTFILES += CSWpmx11protocol.gspec CSWpmx11protocol.depend +LICENSE = README -DEPENDS += cpan/X11-Protocol -BUILDDEPS += cpan/Test-Manifest +PACKAGES += CSWpm-x11-protocol +SPKG_DESC_CSWpm-x11-protocol = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-x11-protocol += CSWpmx11protocol -TEST_SCRIPTS = +ARCHALL_CSWpm-x11-protocol = 1 - include gar/category.mk Modified: csw/mgar/pkg/cpan/X11-Protocol/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/X11-Protocol/trunk/checksums 2011-06-29 11:34:07 UTC (rev 14935) +++ csw/mgar/pkg/cpan/X11-Protocol/trunk/checksums 2011-06-29 12:14:46 UTC (rev 14936) @@ -1,3 +1 @@ -08eeb8547e713982703ef4136dc6618d download/CSWpmx11protocol.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWpmx11protocol.depend -2260bad68d373b201b17c60d761e0f0a download/X11-Protocol-0.56.tar.gz +2260bad68d373b201b17c60d761e0f0a X11-Protocol-0.56.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jun 29 14:27:02 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 Jun 2011 12:27:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[14937] csw/mgar/pkg/cpan/X11-Protocol/trunk/Makefile Message-ID: Revision: 14937 http://gar.svn.sourceforge.net/gar/?rev=14937&view=rev Author: dmichelsen Date: 2011-06-29 12:27:01 +0000 (Wed, 29 Jun 2011) Log Message: ----------- cpan/X11-Protocol: Beauty :-) Modified Paths: -------------- csw/mgar/pkg/cpan/X11-Protocol/trunk/Makefile Modified: csw/mgar/pkg/cpan/X11-Protocol/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/X11-Protocol/trunk/Makefile 2011-06-29 12:14:46 UTC (rev 14936) +++ csw/mgar/pkg/cpan/X11-Protocol/trunk/Makefile 2011-06-29 12:27:01 UTC (rev 14937) @@ -13,8 +13,7 @@ PACKAGES += CSWpm-x11-protocol SPKG_DESC_CSWpm-x11-protocol = $(DESCRIPTION) +ARCHALL_CSWpm-x11-protocol = 1 OBSOLETED_BY_CSWpm-x11-protocol += CSWpmx11protocol -ARCHALL_CSWpm-x11-protocol = 1 - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jun 29 16:12:42 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 Jun 2011 14:12:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14938] csw/mgar/pkg/libassuan/trunk Message-ID: Revision: 14938 http://gar.svn.sourceforge.net/gar/?rev=14938&view=rev Author: dmichelsen Date: 2011-06-29 14:12:42 +0000 (Wed, 29 Jun 2011) Log Message: ----------- libassuan: General cleanup Modified Paths: -------------- csw/mgar/pkg/libassuan/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libassuan/trunk/files/0001-Add-INADDR_NONE-for-Solaris.patch csw/mgar/pkg/libassuan/trunk/files/patch-pth_config_dir.diff Modified: csw/mgar/pkg/libassuan/trunk/Makefile =================================================================== --- csw/mgar/pkg/libassuan/trunk/Makefile 2011-06-29 12:27:01 UTC (rev 14937) +++ csw/mgar/pkg/libassuan/trunk/Makefile 2011-06-29 14:12:42 UTC (rev 14938) @@ -9,14 +9,9 @@ MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/libassuan/ DISTFILES = $(DISTNAME).tar.bz2 -# Use this patch unless this is fixed: -# https://bugs.g10code.com/gnupg/issue1282 -#PATCHFILES = 0001-Add-INADDR_NONE-for-Solaris.patch - VENDOR_URL = http://www.gnupg.org/download/#libassuan -BUILD_DEP_PKGS += CSWgpgerr -BUILD_DEP_PKGS += CSWpth +BUILD_DEP_PKGS += CSWlibgpgerr-dev PACKAGES += CSWlibassuan0 SPKG_DESC_CSWlibassuan0 = IPC library used by some GnuPG related software, libassuan.so.0 @@ -31,10 +26,8 @@ BUILD64 = 1 -# EXTRA_LDFLAGS = -lrt -lsocket -lnsl - # Disable tests until this is fixed: -# https://bugs.g10code.com/gnupg/msg3633 -# SKIPTEST ?= 1 +# https://bugs.g10code.com/gnupg/msg4081 +SKIPTEST ?= 1 include gar/category.mk Deleted: csw/mgar/pkg/libassuan/trunk/files/0001-Add-INADDR_NONE-for-Solaris.patch =================================================================== --- csw/mgar/pkg/libassuan/trunk/files/0001-Add-INADDR_NONE-for-Solaris.patch 2011-06-29 12:27:01 UTC (rev 14937) +++ csw/mgar/pkg/libassuan/trunk/files/0001-Add-INADDR_NONE-for-Solaris.patch 2011-06-29 14:12:42 UTC (rev 14938) @@ -1,26 +0,0 @@ -From f7b3397155b616637aa0b8ca51c78fa62b9a302b Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 16 Sep 2010 15:56:10 +0200 -Subject: [PATCH] Add INADDR_NONE for Solaris - ---- - src/assuan-socket-connect.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c -index 13b8aa5..8d5a09e 100644 ---- a/src/assuan-socket-connect.c -+++ b/src/assuan-socket-connect.c -@@ -51,6 +51,9 @@ - #ifndef AF_LOCAL - # define AF_LOCAL AF_UNIX - #endif -+#ifndef INADDR_NONE -+# define INADDR_NONE ((unsigned long) -1) -+#endif - - #ifndef SUN_LEN - # define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \ --- -1.7.1 - Deleted: csw/mgar/pkg/libassuan/trunk/files/patch-pth_config_dir.diff =================================================================== --- csw/mgar/pkg/libassuan/trunk/files/patch-pth_config_dir.diff 2011-06-29 12:27:01 UTC (rev 14937) +++ csw/mgar/pkg/libassuan/trunk/files/patch-pth_config_dir.diff 2011-06-29 14:12:42 UTC (rev 14938) @@ -1,30 +0,0 @@ -diff -Nru libassuan-1.0.5.orig/configure libassuan-1.0.5/configure ---- libassuan-1.0.5.orig/configure 2008-05-25 03:00:36.000000000 -0500 -+++ libassuan-1.0.5/configure 2009-02-04 13:25:18.940318965 -0600 -@@ -1320,6 +1320,7 @@ - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pth-prefix=PFX prefix where GNU Pth is installed (optional) -+ --with-pth-config-dir=DIR Directory containing pth-config (optionl) - - Some influential environment variables: - CC C compiler command -@@ -4264,6 +4265,18 @@ - if test x$pth_config_prefix != x ; then - PTH_CONFIG="$pth_config_prefix/bin/pth-config" - fi -+ -+ ## Check for --with-pth-prefix and override -+ ## --with-pth-prefix PTH_CONFIG to -+ ## --with-pth-config-dir PTH_CONFIG -+ if test "${with_pth_config_dir+set}" = set; then -+ withval=$with_pth_config_dir -+ PTH_CONFIG="${withval}/pth-config" -+ if test ! -x ${PTH_CONFIG}; then -+ PTH_CONFIG="" -+ fi -+ fi -+ - # Extract the first word of "pth-config", so it can be a program name with args. - set dummy pth-config; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jun 29 16:13:59 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 Jun 2011 14:13:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[14939] csw/mgar/pkg/gtar/trunk Message-ID: Revision: 14939 http://gar.svn.sourceforge.net/gar/?rev=14939&view=rev Author: dmichelsen Date: 2011-06-29 14:13:59 +0000 (Wed, 29 Jun 2011) Log Message: ----------- gtar: Update to 1.26, remove artifacts Modified Paths: -------------- csw/mgar/pkg/gtar/trunk/Makefile csw/mgar/pkg/gtar/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/gtar/trunk/files/verify.diff csw/mgar/pkg/gtar/trunk/files/xgetcwd.diff Modified: csw/mgar/pkg/gtar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtar/trunk/Makefile 2011-06-29 14:12:42 UTC (rev 14938) +++ csw/mgar/pkg/gtar/trunk/Makefile 2011-06-29 14:13:59 UTC (rev 14939) @@ -1,5 +1,5 @@ NAME = tar -VERSION = 1.25 +VERSION = 1.26 CATEGORIES = utils DESCRIPTION = GNU tape archiver @@ -17,34 +17,18 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -# These two patches are from -# http://cvs.opensolaris.org/source/xref/sfw/usr/src/cmd/gtar/Patches/ -PATCHFILES += verify.diff -PATCHFILES += xgetcwd.diff +VENDOR_URL = http://www.gnu.org/software/tar/ -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 - PACKAGES = CSWgtar -CATALOGNAME_CSWgtar = gtar -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -VENDOR_URL = http://www.gnu.org/software/tar/ - BUILD_DEP_PKGS = CSWgcpio -RUNTIME_DEP_PKGS_CSWgtar += CSWggettextrt +RUNTIME_DEP_PKGS_CSWgtar += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgtar += CSWiconv RUNTIME_DEP_PKGS_CSWgtar += CSWgcpio NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g CONFIGURE_ARGS += --with-rmt=/opt/csw/libexec/grmt -# As suggested in http://lists.gnu.org/archive/html/bug-tar/2010-11/msg00073.html -CONFIGURE_ARGS-sol5.9 += gl_cv_func_futimesat_works=yes -CONFIGURE_ARGS += $(CONFIGURE_ARGS-sol$(GAROSREL)) -TEST_TARGET = check EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias Modified: csw/mgar/pkg/gtar/trunk/checksums =================================================================== --- csw/mgar/pkg/gtar/trunk/checksums 2011-06-29 14:12:42 UTC (rev 14938) +++ csw/mgar/pkg/gtar/trunk/checksums 2011-06-29 14:13:59 UTC (rev 14939) @@ -1 +1 @@ -0e48e9e473a72f135d0ebbc8af2762cc tar-1.25.tar.gz +00d1e769c6af702c542cca54b728920d tar-1.26.tar.gz Deleted: csw/mgar/pkg/gtar/trunk/files/verify.diff =================================================================== --- csw/mgar/pkg/gtar/trunk/files/verify.diff 2011-06-29 14:12:42 UTC (rev 14938) +++ csw/mgar/pkg/gtar/trunk/files/verify.diff 2011-06-29 14:13:59 UTC (rev 14939) @@ -1,25 +0,0 @@ -From 24214ca5d506f56dc0cb2a2e1312256472039475 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Mon, 15 Nov 2010 08:07:53 +0000 -Subject: tar: fix --verify option, which broke in 1.24 - -* src/compare.c (verify_volume): Decode the header before invoking -diff_archive, as diff_archive no longer does this as of the -2010-06-28 commit. Also, don't try to invoke diff_archive on a -zero block. ---- -diff --git a/src/compare.c b/src/compare.c -index 6b7e6d8..f3112c6 100644 ---- a/src/compare.c -+++ b/src/compare.c -@@ -611,8 +611,10 @@ verify_volume (void) - (0, 0, _("A lone zero block at %s"), - STRINGIFY_BIGINT (current_block_ordinal (), buf))); - } -+ continue; - } - -+ decode_header (current_header, ¤t_stat_info, ¤t_format, 1); - diff_archive (); - tar_stat_destroy (¤t_stat_info); - } Deleted: csw/mgar/pkg/gtar/trunk/files/xgetcwd.diff =================================================================== --- csw/mgar/pkg/gtar/trunk/files/xgetcwd.diff 2011-06-29 14:12:42 UTC (rev 14938) +++ csw/mgar/pkg/gtar/trunk/files/xgetcwd.diff 2011-06-29 14:13:59 UTC (rev 14939) @@ -1,18 +0,0 @@ ---- tar-1.25/gnu/xgetcwd.c.orig Mon Nov 8 06:23:04 2010 -+++ tar-1.25/gnu/xgetcwd.c Mon Nov 8 06:29:04 2010 -@@ -36,7 +36,14 @@ - char * - xgetcwd (void) - { -- char *cwd = getcwd (NULL, 0); -+ char *cwd; -+#ifdef HAVE_PARTLY_WORKING_GETCWD -+ cwd = getcwd (NULL, 0); -+#else -+ cwd = malloc(PATH_MAX); -+ if (cwd) -+ getcwd (cwd, PATH_MAX); -+#endif - if (! cwd && errno == ENOMEM) - xalloc_die (); - return cwd; 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 Jun 29 16:41:12 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 Jun 2011 14:41:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14940] csw/mgar/pkg/gtar/trunk Message-ID: Revision: 14940 http://gar.svn.sourceforge.net/gar/?rev=14940&view=rev Author: dmichelsen Date: 2011-06-29 14:41:12 +0000 (Wed, 29 Jun 2011) Log Message: ----------- gtar: Readd xgetcwd patch Modified Paths: -------------- csw/mgar/pkg/gtar/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gtar/trunk/files/0001-Partial-working-xgetcwd.patch Modified: csw/mgar/pkg/gtar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtar/trunk/Makefile 2011-06-29 14:13:59 UTC (rev 14939) +++ csw/mgar/pkg/gtar/trunk/Makefile 2011-06-29 14:41:12 UTC (rev 14940) @@ -16,6 +16,7 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz +PATCHFILES += 0001-Partial-working-xgetcwd.patch VENDOR_URL = http://www.gnu.org/software/tar/ @@ -34,6 +35,9 @@ CHECKPKG_OVERRIDES_CSWgtar += file-with-bad-content|/usr/local|root/opt/csw/share/info/tar.info-1 +# Test 56 is failing, reported upstream +SKIPTEST ?= 1 + include gar/category.mk post-install-modulated: Added: csw/mgar/pkg/gtar/trunk/files/0001-Partial-working-xgetcwd.patch =================================================================== --- csw/mgar/pkg/gtar/trunk/files/0001-Partial-working-xgetcwd.patch (rev 0) +++ csw/mgar/pkg/gtar/trunk/files/0001-Partial-working-xgetcwd.patch 2011-06-29 14:41:12 UTC (rev 14940) @@ -0,0 +1,40 @@ +From 8f6d3dd4fde6da12ea84807d0afc07ff56a62e10 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 29 Jun 2011 16:38:07 +0200 +Subject: [PATCH] Partial working xgetcwd + +--- + gnu/xgetcwd.c | 10 +++++++++- + 1 files changed, 9 insertions(+), 1 deletions(-) + +diff --git a/gnu/xgetcwd.c b/gnu/xgetcwd.c +index 2f1da89..fd4c2f9 100644 +--- a/gnu/xgetcwd.c ++++ b/gnu/xgetcwd.c +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + #include "xalloc.h" + +@@ -36,7 +37,14 @@ + char * + xgetcwd (void) + { +- char *cwd = getcwd (NULL, 0); ++ char *cwd; ++#ifdef HAVE_PARTLY_WORKING_GETCWD ++ cwd = getcwd (NULL, 0); ++#else ++ cwd = malloc(PATH_MAX); ++ if (cwd) ++ getcwd (cwd, PATH_MAX); ++#endif + if (! cwd && errno == ENOMEM) + xalloc_die (); + return cwd; +-- +1.7.5.4 + 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 Jun 29 16:50:09 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 Jun 2011 14:50:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[14941] csw/mgar/pkg/libgcrypt/trunk Message-ID: Revision: 14941 http://gar.svn.sourceforge.net/gar/?rev=14941&view=rev Author: dmichelsen Date: 2011-06-29 14:50:09 +0000 (Wed, 29 Jun 2011) Log Message: ----------- libgcrypt: Update to 1.5.0 and split packages Modified Paths: -------------- csw/mgar/pkg/libgcrypt/trunk/Makefile csw/mgar/pkg/libgcrypt/trunk/checksums Modified: csw/mgar/pkg/libgcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/Makefile 2011-06-29 14:41:12 UTC (rev 14940) +++ csw/mgar/pkg/libgcrypt/trunk/Makefile 2011-06-29 14:50:09 UTC (rev 14941) @@ -1,5 +1,5 @@ NAME = libgcrypt -VERSION = 1.4.6 +VERSION = 1.5.0 CATEGORIES = lib DESCRIPTION = GNU libgcrypt @@ -8,21 +8,29 @@ endef MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/libgcrypt/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES = $(DISTNAME).tar.bz2 -PACKAGES = CSWgcrypt -CATALOGNAME = libgcrypt +VENDOR_URL = http://www.gnupg.org/related_software/libraries.en.html#lib-libgcrypt -SPKG_SOURCEURL = http://www.gnupg.org/related_software/libraries.en.html#lib-libgcrypt +PACKAGES += CSWlibgcrypt11 +SPKG_DESC_CSWlibgcrypt11 = GNU libgcrypt, libgcrypt.so.11 +PKGFILES_CSWlibgcrypt11 += $(call pkgfiles_lib,libgcrypt.so.11) +RUNTIME_DEP_PKGS_CSWlibgcrypt11 += CSWlibgpg-error0 -RUNTIME_DEP_PKGS = CSWgpgerr +PACKAGES += CSWlibgcrypt-dev +SPKG_DESC_CSWlibgcrypt-dev = Development files for libgcrypt.so.11 +PKGFILES_CSWlibgcrypt-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibgcrypt-dev += CSWlibgcrypt11 +PACKAGES += CSWlibgcrypt-utils +SPKG_DESC_CSWlibgcrypt-utils = Utility programs for libgcrypt +# PKGFILES is catchall +OBSOLETED_BY_CSWlibgcrypt-utils = CSWgcrypt +CATALOGNAME_CSWgcrypt = libgcrypt_stub + BUILD64 = 1 -NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-asm -TEST_TARGET = check - include gar/category.mk Modified: csw/mgar/pkg/libgcrypt/trunk/checksums =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/checksums 2011-06-29 14:41:12 UTC (rev 14940) +++ csw/mgar/pkg/libgcrypt/trunk/checksums 2011-06-29 14:50:09 UTC (rev 14941) @@ -1 +1 @@ -dbf99425a4fe9217c84ce3a35d938634 libgcrypt-1.4.6.tar.bz2 +693f9c64d50c908bc4d6e01da3ff76d8 libgcrypt-1.5.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jun 29 17:30:20 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 Jun 2011 15:30:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[14942] csw/mgar/pkg/gtar/trunk Message-ID: Revision: 14942 http://gar.svn.sourceforge.net/gar/?rev=14942&view=rev Author: dmichelsen Date: 2011-06-29 15:30:20 +0000 (Wed, 29 Jun 2011) Log Message: ----------- gtar: Add patch against recursion Modified Paths: -------------- csw/mgar/pkg/gtar/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gtar/trunk/files/0002-Fix-endless-recursion-when-compiling-on-Solaris-9-an.patch Modified: csw/mgar/pkg/gtar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtar/trunk/Makefile 2011-06-29 14:50:09 UTC (rev 14941) +++ csw/mgar/pkg/gtar/trunk/Makefile 2011-06-29 15:30:20 UTC (rev 14942) @@ -18,6 +18,10 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES += 0001-Partial-working-xgetcwd.patch +# Apply patch from +# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8230#20 +PATCHFILES += 0002-Fix-endless-recursion-when-compiling-on-Solaris-9-an.patch + VENDOR_URL = http://www.gnu.org/software/tar/ PACKAGES = CSWgtar Added: csw/mgar/pkg/gtar/trunk/files/0002-Fix-endless-recursion-when-compiling-on-Solaris-9-an.patch =================================================================== --- csw/mgar/pkg/gtar/trunk/files/0002-Fix-endless-recursion-when-compiling-on-Solaris-9-an.patch (rev 0) +++ csw/mgar/pkg/gtar/trunk/files/0002-Fix-endless-recursion-when-compiling-on-Solaris-9-an.patch 2011-06-29 15:30:20 UTC (rev 14942) @@ -0,0 +1,63 @@ +From 265b9d3dfad6bd260610413f3200f5050e81af49 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 29 Jun 2011 17:16:04 +0200 +Subject: [PATCH] Fix endless recursion when compiling on Solaris 9 and + running on Solaris 10 + +--- + gnu/sys_stat.in.h | 16 ++++++++++++++-- + 1 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/gnu/sys_stat.in.h b/gnu/sys_stat.in.h +index 70f43e2..6346bd4 100644 +--- a/gnu/sys_stat.in.h ++++ b/gnu/sys_stat.in.h +@@ -357,7 +357,11 @@ _GL_WARN_ON_USE (fstatat, "fstatat is not portable - " + + + #if @GNULIB_FUTIMENS@ +-# if @REPLACE_FUTIMENS@ ++/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our futimens ++ implementation relies on futimesat, which on Solaris 10 makes an invocation ++ to futimens that is meant to invoke the libc's futimens(), not gnulib's ++ futimens(). */ ++# if @REPLACE_FUTIMENS@ || defined __sun + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef futimens + # define futimens rpl_futimens +@@ -370,7 +374,9 @@ _GL_FUNCDECL_SYS (futimens, int, (int fd, struct timespec const times[2])); + # endif + _GL_CXXALIAS_SYS (futimens, int, (int fd, struct timespec const times[2])); + # endif ++# if @HAVE_FUTIMENS@ + _GL_CXXALIASWARN (futimens); ++# endif + #elif defined GNULIB_POSIXCHECK + # undef futimens + # if HAVE_RAW_DECL_FUTIMENS +@@ -614,7 +620,11 @@ _GL_WARN_ON_USE (stat, "stat is unportable - " + + + #if @GNULIB_UTIMENSAT@ +-# if @REPLACE_UTIMENSAT@ ++/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our utimensat ++ implementation relies on futimesat, which on Solaris 10 makes an invocation ++ to utimensat that is meant to invoke the libc's utimensat(), not gnulib's ++ utimensat(). */ ++# if @REPLACE_UTIMENSAT@ || defined __sun + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef utimensat + # define utimensat rpl_utimensat +@@ -633,7 +643,9 @@ _GL_FUNCDECL_SYS (utimensat, int, (int fd, char const *name, + _GL_CXXALIAS_SYS (utimensat, int, (int fd, char const *name, + struct timespec const times[2], int flag)); + # endif ++# if @HAVE_UTIMENSAT@ + _GL_CXXALIASWARN (utimensat); ++# endif + #elif defined GNULIB_POSIXCHECK + # undef utimensat + # if HAVE_RAW_DECL_UTIMENSAT +-- +1.7.5.4 + 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 Jun 29 17:51:35 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 29 Jun 2011 15:51:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[14943] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 14943 http://gar.svn.sourceforge.net/gar/?rev=14943&view=rev Author: bdwalton Date: 2011-06-29 15:51:35 +0000 (Wed, 29 Jun 2011) Log Message: ----------- git/trunk: update curl runtime dependency for package split Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-06-29 15:30:20 UTC (rev 14942) +++ csw/mgar/pkg/git/trunk/Makefile 2011-06-29 15:51:35 UTC (rev 14943) @@ -53,7 +53,7 @@ BUILD_DEP_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs BUILD_DEP_PKGS += CSWpython -RUNTIME_DEP_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt +RUNTIME_DEP_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWlibcurl4 CSWosslrt RUNTIME_DEP_PKGS_CSWgit += CSWosshclient CSWiconv CSWexpat CSWbash CSWpmerror RUNTIME_DEP_PKGS_CSWgit += CSWpmtermreadkey CSWpmnetsmtpssl CSWless 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 Jun 29 23:27:38 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 29 Jun 2011 21:27:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[14944] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 14944 http://gar.svn.sourceforge.net/gar/?rev=14944&view=rev Author: bonivart Date: 2011-06-29 21:27:38 +0000 (Wed, 29 Jun 2011) Log Message: ----------- pkgutil/trunk: arch all, modern gar/checkpkg, Solaris 9 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype Added Paths: ----------- csw/mgar/pkg/pkgutil/trunk/files/COPYING Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2011-06-29 15:51:35 UTC (rev 14943) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2011-06-29 21:27:38 UTC (rev 14944) @@ -1,9 +1,5 @@ -# Do not update gar, new gar doesn't work on sol8! If removed, recreate with: -# svn co -r 9999 https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 gar - NAME = pkgutil VERSION = 2.4 -GARVERSION = $(VERSION) CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -17,11 +13,16 @@ # Disable inclusion of CSWcommon by default. COMMON_PKG_DEPENDS = -#MASTER_SITES = $(SF_MIRRORS) -MASTER_SITES = http://sourceforge.net/projects/pkgutil/files/pkgutil/2.4/ +MASTER_SITES = $(SF_MIRRORS) +#MASTER_SITES = http://sourceforge.net/projects/pkgutil/files/pkgutil/2.4/ DISTFILES = $(NAME)-$(VERSION).zip -DISTFILES += $(call admfiles,CSWpkgutil,prototype preremove postinstall) +#DISTFILES += $(call admfiles,CSWpkgutil,prototype preremove postinstall) +#DISTFILES += CSWpkgutil.prototype +DISTFILES += CSWpkgutil.postinstall +DISTFILES += CSWpkgutil.preremove +DISTFILES += COPYING + #DISTFILES += $(call admfiles,CSWpkgutil,preremove postinstall) #ifeq ($(shell uname -p), sparc) # DISTFILES += CSWpkgutilsparc.prototype @@ -33,26 +34,36 @@ DISTFILES += opencsw.py DISTFILES += cswcatalog -PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGES = CSWpkgutil +CATALOGNAME_CSWpkgutil = pkgutil +SPKG_DESC_CSWpkgutil = $(DESCRIPTION) +ARCHALL_CSWpkgutil = 1 -CHECKPKG_OVERRIDES_CSWpkgutilplus += unidentified-dependency|CSWpmstringapprox -CHECKPKG_OVERRIDES_CSWpkgutilplus += surplus-dependency|CSWpmstringapprox +PACKAGES += CSWpkgutilplus +CATALOGNAME_CSWpkgutilplus = pkgutilplus +SPKG_DESC_CSWpkgutilplus = Extends pkgutil functionality +ARCHALL_CSWpkgutilplus = 1 + +# Explicitly depend on CSWcommon here since it's not the default +RUNTIME_DEP_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil +RUNTIME_DEP_PKGS_CSWpkgutilplus += CSWcswpkgloghooks CSWpython CSWpmstringapprox +#RUNTIME_DEP_PKGS_CSWpkgutilplus += CSWpmwwwcurl + +CHECKPKG_OVERRIDES_CSWpkgutil += file-with-bad-content|/usr/local|root/opt/csw/bin/pkgutil +CHECKPKG_OVERRIDES_CSWpkgutil += discouraged-path-in-pkgmap|/opt/csw/var/pkgutil +CHECKPKG_OVERRIDES_CSWpkgutil += discouraged-path-in-pkgmap|/opt/csw/var/pkgutil/admin.CSW +CHECKPKG_OVERRIDES_CSWpkgutil += archall-with-arch-paths|/opt/csw/libexec/pkgutil/wget-i386 +CHECKPKG_OVERRIDES_CSWpkgutil += archall-with-binaries|opt/csw/libexec/pkgutil/wget-i386 +CHECKPKG_OVERRIDES_CSWpkgutil += archall-with-binaries|opt/csw/libexec/pkgutil/wget-sparc +CHECKPKG_OVERRIDES_CSWpkgutil += binary-wrong-architecture|file=opt/csw/libexec/pkgutil/wget-i386|pkginfo-says=all|actual-binary=i386 +CHECKPKG_OVERRIDES_CSWpkgutil += binary-wrong-architecture|file=opt/csw/libexec/pkgutil/wget-sparc|pkginfo-says=all|actual-binary=sparc CHECKPKG_OVERRIDES_CSWpkgutilplus += surplus-dependency|CSWperl CHECKPKG_OVERRIDES_CSWpkgutilplus += surplus-dependency|CSWcswpkgloghooks CHECKPKG_OVERRIDES_CSWpkgutilplus += surplus-dependency|CSWgnupg +CHECKPKG_OVERRIDES_CSWpkgutilplus += surplus-dependency|CSWpmstringapprox CHECKPKG_OVERRIDES_CSWpkgutilplus += surplus-dependency|CSWpkgutil -CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path +CHECKPKG_OVERRIDES_CSWpkgutilplus += file-with-bad-content|/export/home|root/opt/csw/bin/cswcatalog -PACKAGES = CSWpkgutil CSWpkgutilplus - -SPKG_DESC_CSWpkgutil = $(DESCRIPTION) -SPKG_DESC_CSWpkgutilplus = Extends pkgutil functionality - -# Explicitly depend on CSWcommon here since it's not the default -RUNTIME_DEP_PKGS_CSWpkgutilplus = CSWcommon CSWperl CSWgnupg CSWpkgutil -RUNTIME_DEP_PKGS_CSWpkgutilplus += CSWcswpkgloghooks CSWpython CSWpmstringapprox -#RUNTIME_DEP_PKGS_CSWpkgutilplus += CSWpmwwwcurl - PKGFILES_CSWpkgutilplus = .*bldcat.* PKGFILES_CSWpkgutilplus += .*chkcat.* PKGFILES_CSWpkgutilplus += .*pkgutilplus.* @@ -60,8 +71,6 @@ PKGFILES_CSWpkgutilplus += .*opencsw.py PKGFILES_CSWpkgutilplus += .*cswcatalog -ARCHALL_CSWpkgutilplus = 1 - CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -70,7 +79,7 @@ include gar/category.mk WORKSRC = $(WORKDIR) -SPKG_SOURCEURL = http://pkgutil.wikidot.com/ +SPKG_SOURCEURL = http://pkgutil.net/ install-custom: @echo " ==> Installing $(NAME) (custom)" @@ -84,8 +93,8 @@ @ginstall -m 755 -d $(DESTDIR)/opt/csw/etc @ginstall -m 644 $(WORKSRC)/$(NAME).conf $(DESTDIR)/opt/csw/etc/$(NAME).conf.CSW @ginstall -m 755 -d $(DESTDIR)/opt/csw/libexec/$(NAME) -# @ginstall -m 755 $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(NAME)/ - @ginstall -m 755 $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(NAME)/wget + @ginstall -m 755 $(WORKSRC)/wget-* $(DESTDIR)/opt/csw/libexec/$(NAME)/ +# @ginstall -m 755 $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(NAME)/wget @ginstall -m 755 $(FILEDIR)/build_sun_catalog.py $(FILEDIR)/opencsw.py $(DESTDIR)/opt/csw/libexec/$(NAME) @ln -s ../libexec/pkgutil/build_sun_catalog.py $(DESTDIR)$(bindir)/build_sun_catalog @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME) Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2011-06-29 15:51:35 UTC (rev 14943) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2011-06-29 21:27:38 UTC (rev 14944) @@ -1,8 +1 @@ -a16c6f81bc537d6172fd65d8da1aeecc CSWpkgutil.gspec -27c7b032074b150935681e921b7b5774 CSWpkgutil.postinstall -9f8c677877f3c86c41dc3955c9c36ea0 CSWpkgutil.preremove -ce3d565aaf32be17716a9869087dec5c CSWpkgutil.prototype -b5fffa0be100ddbb7262ce3a0a4e3bb7 build_sun_catalog.py -7ad27336f90e73da3254a61d91025ee5 cswcatalog -3a6b789b3d5e05f41d2363dd26a92acf opencsw.py e87b64770282e68713692dce6e0808c3 pkgutil-2.4.zip Added: csw/mgar/pkg/pkgutil/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/pkgutil/trunk/files/COPYING 2011-06-29 21:27:38 UTC (rev 14944) @@ -0,0 +1,3 @@ + +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 2011-06-29 15:51:35 UTC (rev 14943) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2011-06-29 21:27:38 UTC (rev 14944) @@ -1,5 +1,6 @@ i pkginfo=CSWpkgutil.pkginfo i copyright=CSWpkgutil.copyright +i checkpkg_override=CSWpkgutil.checkpkg_override d none /etc/opt/csw 0755 root bin f none /etc/opt/csw/pkgutil.conf.CSW 644 root bin d none /opt/csw 0755 root bin @@ -11,9 +12,6 @@ d none /opt/csw/libexec/pkgutil 0755 root bin f none /opt/csw/libexec/pkgutil/wget 755 root bin d none /opt/csw/share 0755 root bin -d none /opt/csw/share/checkpkg 0755 root bin -d none /opt/csw/share/checkpkg/overrides 0755 root bin -f none /opt/csw/share/checkpkg/overrides/pkgutil 0644 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 444 root bin 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 Jun 29 23:40:51 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 29 Jun 2011 21:40:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14945] csw/mgar/pkg/pkgutil/trunk/Makefile Message-ID: Revision: 14945 http://gar.svn.sourceforge.net/gar/?rev=14945&view=rev Author: bonivart Date: 2011-06-29 21:40:51 +0000 (Wed, 29 Jun 2011) Log Message: ----------- pkgutil/trunk: fix license Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2011-06-29 21:27:38 UTC (rev 14944) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2011-06-29 21:40:51 UTC (rev 14945) @@ -21,7 +21,7 @@ #DISTFILES += CSWpkgutil.prototype DISTFILES += CSWpkgutil.postinstall DISTFILES += CSWpkgutil.preremove -DISTFILES += COPYING +#DISTFILES += COPYING #DISTFILES += $(call admfiles,CSWpkgutil,preremove postinstall) #ifeq ($(shell uname -p), sparc) 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 Jun 30 03:48:51 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 30 Jun 2011 01:48:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[14946] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14946 http://gar.svn.sourceforge.net/gar/?rev=14946&view=rev Author: bdwalton Date: 2011-06-30 01:48:51 +0000 (Thu, 30 Jun 2011) Log Message: ----------- php5/trunk: drop --enable-mbregex=shared to make it actually work; mantis 4520 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-06-29 21:40:51 UTC (rev 14945) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-06-30 01:48:51 UTC (rev 14946) @@ -249,7 +249,6 @@ CONFIGURE_ARGS += --enable-hash=shared CONFIGURE_ARGS += --enable-json=shared CONFIGURE_ARGS += --enable-magic-quotes -CONFIGURE_ARGS += --enable-mbregex=shared CONFIGURE_ARGS += --enable-mbstring=shared CONFIGURE_ARGS += --enable-pcntl=shared CONFIGURE_ARGS += --enable-pdo=shared This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jun 30 16:55:12 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 30 Jun 2011 14:55:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[14947] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 14947 http://gar.svn.sourceforge.net/gar/?rev=14947&view=rev Author: wahwah Date: 2011-06-30 14:55:12 +0000 (Thu, 30 Jun 2011) Log Message: ----------- pkg/lang-python/python/trunk: Updating dependencies Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2011-06-30 01:48:51 UTC (rev 14946) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2011-06-30 14:55:12 UTC (rev 14947) @@ -83,7 +83,7 @@ # This doesn't work here, as _PYCOMPILE_FILES is not the directory Python uses. # PYCOMPILE = 1 -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc +EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc # use prototype filters to set the class PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' @@ -93,6 +93,9 @@ PACKAGES += CSWpython$(CVER)-test PACKAGES += CSWpython$(CVER)-tk PACKAGES += CSWlibpython$(DVER)-1-0 +CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0 +PKGFILES_CSWlibpython$(DVER)-1-0 += $(call baseisadirs,$(libdir),libpython$(VER)\.so\.1\.0(\.\d+)*) +SPKG_DESC_CSWlibpython$(DVER)-1-0 = Python shared library ($(VER)) INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils OBSOLETED_BY_CSWpython$(CVER)-dev = CSWpython$(CVER)-devel @@ -106,6 +109,7 @@ # No idea why would this be in CSWpython, and no good idea for a better package # to put it. PKGFILES_CSWpython$(CVER)-dev += $(bindir)/smtpd.py + PKGFILES_CSWpython$(CVER)-tk = $(libdir)/.*/lib-tk/.* PKGFILES_CSWpython$(CVER)-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* PKGFILES_CSWpython$(CVER)-test = $(libdir)/python/test/.* @@ -116,7 +120,6 @@ PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/json/tests.* PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/lib2to3/tests.* PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/sqlite3/test.* -PKGFILES_CSWlibpython$(DVER)-1-0 += $(libdir)/libpython$(VER)\.so\.[0-9\.]+ ARCHALL_CSWpython$(CVER)-test = 1 ARCHALL_CSWidle$(CVER) = 1 @@ -126,10 +129,11 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbdb47 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbzip2 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm3 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWncurses +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpanel5 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWosslrt RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWreadline RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWsqlite3rt @@ -160,14 +164,12 @@ CATALOGNAME_CSWpython$(CVER)-dev = python$(CVER)_dev CATALOGNAME_CSWpython$(CVER)-tk = python$(CVER)_tk CATALOGNAME_CSWpython$(CVER)-test = python$(CVER)_test -CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0 SPKG_DESC_CSWidle$(CVER) = Python IDE SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series SPKG_DESC_CSWpython$(CVER)-dev = Development Files for Python SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) SPKG_DESC_CSWpython$(CVER)-test = Python Test modules -SPKG_DESC_CSWlibpython$(DVER)-1-0 = Python shared library ($(VER)) LICENSE = LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jonbcraig at users.sourceforge.net Thu Jun 30 20:12:46 2011 From: jonbcraig at users.sourceforge.net (jonbcraig at users.sourceforge.net) Date: Thu, 30 Jun 2011 18:12:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[14948] csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/ Makefile Message-ID: Revision: 14948 http://gar.svn.sourceforge.net/gar/?rev=14948&view=rev Author: jonbcraig Date: 2011-06-30 18:12:46 +0000 (Thu, 30 Jun 2011) Log Message: ----------- Fixed package description Modified Paths: -------------- csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/Makefile Modified: csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/Makefile 2011-06-30 14:55:12 UTC (rev 14947) +++ csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/Makefile 2011-06-30 18:12:46 UTC (rev 14948) @@ -3,7 +3,7 @@ CATEGORIES = cpan AUTHOR = MARKPF -DESCRIPTION = Log::Dispatch::FileRotate - Log to files that archive/rotate themselves +DESCRIPTION = Log to files that archive/rotate themselves define BLURB This module provides a simple object for logging to files under the Log::Dispatch::* system, and automatically rotating them according This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.